diff --git a/.hgignore b/.hgignore
index 4a0311dcc..1fbad60fd 100644
--- a/.hgignore
+++ b/.hgignore
@@ -144,6 +144,8 @@ external
 external_stlport
 3rdParty
 .svn
+thumbs.db
+Thumbs.db
 
 # build
 code/nel/build/*
@@ -206,3 +208,5 @@ code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service
 code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service
 code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service
 code/ryzom/server/src/tick_service/tick_service
+# WebTT temp dir
+code/ryzom/tools/server/www/webtt/app/tmp
diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 4d429e693..b73545d14 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -91,6 +91,7 @@ NL_CONFIGURE_CHECKS()
 #Platform specifics
 
 SETUP_EXTERNAL()
+NL_GEN_REVISION_H()
 
 IF(WIN32)
   SET(WINSOCK2_LIB ws2_32.lib)
@@ -256,7 +257,7 @@ IF(WIN32)
   IF(WITH_TOOLS)
     SET(CMAKE_INSTALL_MFC_LIBRARIES TRUE)
   ENDIF(WITH_TOOLS)
-  INCLUDE(InstallRequiredSystemLibraries)
+  #INCLUDE(InstallRequiredSystemLibraries)
 ENDIF(WIN32)
 
 INCLUDE(CPack)
diff --git a/code/CMakeModules/FindDirectXSDK.cmake b/code/CMakeModules/FindDirectXSDK.cmake
index 1f832cf95..9947778db 100644
--- a/code/CMakeModules/FindDirectXSDK.cmake
+++ b/code/CMakeModules/FindDirectXSDK.cmake
@@ -14,17 +14,22 @@ FIND_PATH(DXSDK_DIR
   "Include/dxsdkver.h"
   PATHS
   "$ENV{DXSDK_DIR}"
+  "C:/Program Files (x86)/Microsoft DirectX SDK (June 2010)"
+  "C:/Program Files/Microsoft DirectX SDK (June 2010)"
+  "C:/Program Files (x86)/Microsoft DirectX SDK (February 2010)"
+  "C:/Program Files/Microsoft DirectX SDK (February 2010)"
+  "C:/Program Files (x86)/Microsoft DirectX SDK (November 2007)"
+  "C:/Program Files/Microsoft DirectX SDK (November 2007)"
+  "C:/Program Files (x86)/Microsoft DirectX SDK"
+  "C:/Program Files/Microsoft DirectX SDK"
 )
 
 MACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)        
   FIND_LIBRARY(${MYLIBRARY}
                NAMES ${MYLIBRARYNAME}
                PATHS
-			   "${DXSDK_LIBRARY_DIR}"
-               "$ENV{DXSDK_DIR}"
-               "$ENV{DXSDK_DIR}/Lib"
-               "$ENV{DXSDK_DIR}/Lib/x86"
-               )               
+               "${DXSDK_LIBRARY_DIR}"
+               )
 ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
 IF(DXSDK_DIR)
diff --git a/code/CMakeModules/FindFreeType.cmake b/code/CMakeModules/FindFreeType.cmake
index b9d00d96a..4f3c84cbe 100644
--- a/code/CMakeModules/FindFreeType.cmake
+++ b/code/CMakeModules/FindFreeType.cmake
@@ -57,6 +57,13 @@ FIND_LIBRARY(FREETYPE_LIBRARY
 
 IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
   SET(FREETYPE_FOUND "YES")
+  IF(WITH_STATIC_EXTERNAL AND APPLE)
+    FIND_PACKAGE(BZip2)
+    IF(BZIP2_FOUND)
+      SET(FREETYPE_INCLUDE_DIRS ${FREETYPE_INCLUDE_DIRS} ${BZIP2_INCLUDE_DIR})
+      SET(FREETYPE_LIBRARY ${FREETYPE_LIBRARY} ${BZIP2_LIBRARIES})
+    ENDIF(BZIP2_FOUND)
+  ENDIF(WITH_STATIC_EXTERNAL AND APPLE)
   IF(NOT FREETYPE_FIND_QUIETLY)
     MESSAGE(STATUS "Found FreeType: ${FREETYPE_LIBRARY}")
   ENDIF(NOT FREETYPE_FIND_QUIETLY)
diff --git a/code/CMakeModules/FindGTK2.cmake b/code/CMakeModules/FindGTK2.cmake
index 7aa65e100..e3e91ed21 100644
--- a/code/CMakeModules/FindGTK2.cmake
+++ b/code/CMakeModules/FindGTK2.cmake
@@ -66,6 +66,7 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
         /usr/lib64/glib-2.0/include
         /usr/lib/glib-2.0/include
         /sw/lib/glib-2.0/include
+        /usr/lib/x86_64-linux-gnu/glib-2.0/include
     )
     gtk2_debug_message("GTK2_GLIBCONFIG_INCLUDE_DIR is ${GTK2_GLIBCONFIG_INCLUDE_DIR}")
 
@@ -95,9 +96,25 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
         /usr/lib/gtk-2.0/include
         /usr/lib64/gtk-2.0/include
         /sw/lib/gtk-2.0/include
+        /usr/lib/x86_64-linux-gnu/gtk-2.0/include
     )
     gtk2_debug_message("GTK2_GDK_INCLUDE_DIR is ${GTK2_GDK_INCLUDE_DIR}")
 
+    find_path(GTK2_GDK_PIXBUF_INCLUDE_DIR
+      NAMES
+        gdk-pixbuf/gdk-pixbuf.h
+      PATHS
+        ${_GDK2IncDir}
+        /opt/gnome/lib/gtk-2.0/include
+        /opt/gnome/lib64/gtk-2.0/include
+        /opt/lib/gtk-2.0/include
+        /usr/lib/gtk-2.0/include
+        /usr/lib64/gtk-2.0/include
+        /sw/lib/gtk-2.0/include
+        /usr/include/gdk-pixbuf-2.0
+    )
+    gtk2_debug_message("GTK2_GDK_PIXBUF_INCLUDE_DIR is ${GTK2_GDK_PIXBUF_INCLUDE_DIR}")
+
     find_path(GTK2_GTKGL_INCLUDE_DIR
       NAMES
         gtkgl/gtkglarea.h
@@ -357,6 +374,7 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
       ${GTK2_GLIBCONFIG_INCLUDE_DIR}
       ${GTK2_GLIB_INCLUDE_DIR}
       ${GTK2_GDK_INCLUDE_DIR}
+      ${GTK2_GDK_PIXBUF_INCLUDE_DIR}
       ${GTK2_GLADE_INCLUDE_DIR}
       ${GTK2_PANGO_INCLUDE_DIR}
       ${GTK2_CAIRO_INCLUDE_DIR}
@@ -364,7 +382,7 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
     )
 
     if (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR)
-      if (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR)
+      if (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR AND GTK2_GDK_PIXBUF_INCLUDE_DIR)
         if (GTK2_GMODULE_LIBRARY)
           if (GTK2_GTHREAD_LIBRARY)
             if (GTK2_GOBJECT_LIBRARY)
@@ -423,9 +441,9 @@ else (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
         else (GTK2_GMODULE_LIBRARY)
           message(SEND_ERROR "Could not find GMODULE")
         endif (GTK2_GMODULE_LIBRARY)
-      else (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR)
+      else (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR AND GTK2_GDK_PIXBUF_INCLUDE_DIR)
         message(SEND_ERROR "Could not find GDK (GDK_PIXBUF)")
-      endif (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR)
+      endif (GTK2_GDK_LIBRARY AND GTK2_GDK_PIXBUF_LIBRARY AND GTK2_GDK_INCLUDE_DIR AND GTK2_GDK_PIXBUF_INCLUDE_DIR)
     else (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR)
       message(SEND_ERROR "Could not find GTK2-X11")
     endif (GTK2_GTK_LIBRARY AND GTK2_GTK_INCLUDE_DIR)
diff --git a/code/CMakeModules/FindMercurial.cmake b/code/CMakeModules/FindMercurial.cmake
new file mode 100644
index 000000000..9c252ad17
--- /dev/null
+++ b/code/CMakeModules/FindMercurial.cmake
@@ -0,0 +1,108 @@
+# - Extract information from a subversion working copy
+# The module defines the following variables:
+#  Mercurial_HG_EXECUTABLE - path to hg command line client
+#  Mercurial_VERSION_HG - version of hg command line client
+#  Mercurial_FOUND - true if the command line client was found
+#  MERCURIAL_FOUND - same as Mercurial_FOUND, set for compatiblity reasons
+#
+# The minimum required version of Mercurial can be specified using the
+# standard syntax, e.g. FIND_PACKAGE(Mercurial 1.4)
+#
+# If the command line client executable is found two macros are defined:
+#  Mercurial_WC_INFO(<dir> <var-prefix>)
+#  Mercurial_WC_LOG(<dir> <var-prefix>)
+# Mercurial_WC_INFO extracts information of a subversion working copy at
+# a given location. This macro defines the following variables:
+#  <var-prefix>_WC_URL - url of the repository (at <dir>)
+#  <var-prefix>_WC_ROOT - root url of the repository
+#  <var-prefix>_WC_REVISION - current revision
+#  <var-prefix>_WC_LAST_CHANGED_AUTHOR - author of last commit
+#  <var-prefix>_WC_LAST_CHANGED_DATE - date of last commit
+#  <var-prefix>_WC_LAST_CHANGED_REV - revision of last commit
+#  <var-prefix>_WC_INFO - output of command `hg info <dir>'
+# Mercurial_WC_LOG retrieves the log message of the base revision of a
+# subversion working copy at a given location. This macro defines the
+# variable:
+#  <var-prefix>_LAST_CHANGED_LOG - last log of base revision
+# Example usage:
+#  FIND_PACKAGE(Mercurial)
+#  IF(MERCURIAL_FOUND)
+#    Mercurial_WC_INFO(${PROJECT_SOURCE_DIR} Project)
+#    MESSAGE("Current revision is ${Project_WC_REVISION}")
+#    Mercurial_WC_LOG(${PROJECT_SOURCE_DIR} Project)
+#    MESSAGE("Last changed log is ${Project_LAST_CHANGED_LOG}")
+#  ENDIF(MERCURIAL_FOUND)
+
+#=============================================================================
+# Copyright 2006-2009 Kitware, Inc.
+# Copyright 2006 Tristan Carel
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
+
+FIND_PROGRAM(Mercurial_HG_EXECUTABLE hg
+  DOC "mercurial command line client")
+MARK_AS_ADVANCED(Mercurial_HG_EXECUTABLE)
+
+IF(Mercurial_HG_EXECUTABLE)
+  EXECUTE_PROCESS(COMMAND ${Mercurial_HG_EXECUTABLE} --version
+    OUTPUT_VARIABLE Mercurial_VERSION_HG
+    OUTPUT_STRIP_TRAILING_WHITESPACE)
+	
+  STRING(REGEX REPLACE ".*version ([\\.0-9]+).*"
+    "\\1" Mercurial_VERSION_HG "${Mercurial_VERSION_HG}")
+	
+  MACRO(Mercurial_WC_INFO dir prefix)
+    EXECUTE_PROCESS(COMMAND ${Mercurial_HG_EXECUTABLE} tip
+      WORKING_DIRECTORY ${dir}
+      OUTPUT_VARIABLE ${prefix}_WC_INFO
+      ERROR_VARIABLE Mercurial_hg_info_error
+      RESULT_VARIABLE Mercurial_hg_info_result
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    IF(NOT ${Mercurial_hg_info_result} EQUAL 0)
+      MESSAGE(SEND_ERROR "Command \"${Mercurial_HG_EXECUTABLE} tip\" failed with output:\n${Mercurial_hg_info_error}")
+    ELSE(NOT ${Mercurial_hg_info_result} EQUAL 0)
+
+      STRING(REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
+        "\\2" ${prefix}_WC_ROOT "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?changeset: *([0-9]+).*"
+        "\\2" ${prefix}_WC_REVISION "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
+        "\\2" ${prefix}_WC_LAST_CHANGED_AUTHOR "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
+        "\\2" ${prefix}_WC_LAST_CHANGED_REV "${${prefix}_WC_INFO}")
+      STRING(REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
+        "\\2" ${prefix}_WC_LAST_CHANGED_DATE "${${prefix}_WC_INFO}")
+
+    ENDIF(NOT ${Mercurial_hg_info_result} EQUAL 0)
+
+  ENDMACRO(Mercurial_WC_INFO)
+
+  MACRO(Mercurial_WC_LOG dir prefix)
+    # This macro can block if the certificate is not signed:
+    # hg ask you to accept the certificate and wait for your answer
+    # This macro requires a hg server network access (Internet most of the time)
+    # and can also be slow since it access the hg server
+    EXECUTE_PROCESS(COMMAND
+      ${Mercurial_HG_EXECUTABLE} --non-interactive log -r BASE ${dir}
+      OUTPUT_VARIABLE ${prefix}_LAST_CHANGED_LOG
+      ERROR_VARIABLE Mercurial_hg_log_error
+      RESULT_VARIABLE Mercurial_hg_log_result
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    IF(NOT ${Mercurial_hg_log_result} EQUAL 0)
+      MESSAGE(SEND_ERROR "Command \"${Mercurial_HG_EXECUTABLE} log -r BASE ${dir}\" failed with output:\n${Mercurial_hg_log_error}")
+    ENDIF(NOT ${Mercurial_hg_log_result} EQUAL 0)
+  ENDMACRO(Mercurial_WC_LOG)
+ENDIF(Mercurial_HG_EXECUTABLE)
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Mercurial DEFAULT_MSG Mercurial_HG_EXECUTABLE)
diff --git a/code/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake
index b9970f63c..a00e36992 100644
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@@ -54,10 +54,14 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
 
   IF(MYSQL_INCLUDE_DIR)
     IF(MYSQL_LIBRARY_RELEASE)
-      SET(MYSQL_LIBRARIES "optimized;${MYSQL_LIBRARY_RELEASE}")
+      SET(MYSQL_LIBRARIES optimized ${MYSQL_LIBRARY_RELEASE})
       IF(MYSQL_LIBRARY_DEBUG)
-        SET(MYSQL_LIBRARIES "${MYSQL_LIBRARIES};debug;${MYSQL_LIBRARY_DEBUG}")
+        SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} debug ${MYSQL_LIBRARY_DEBUG})
       ENDIF(MYSQL_LIBRARY_DEBUG)
+      FIND_PACKAGE(OpenSSL)
+      IF(OPENSSL_FOUND)
+        SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} ${OPENSSL_LIBRARIES})
+      ENDIF(OPENSSL_FOUND)
     ENDIF(MYSQL_LIBRARY_RELEASE)
   ENDIF(MYSQL_INCLUDE_DIR)
 
diff --git a/code/CMakeModules/GetRevision.cmake b/code/CMakeModules/GetRevision.cmake
new file mode 100644
index 000000000..d38215aba
--- /dev/null
+++ b/code/CMakeModules/GetRevision.cmake
@@ -0,0 +1,60 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3)
+
+# ROOT_DIR should be set to root of the repository (where to find the .svn or .hg directory)
+# SOURCE_DIR should be set to root of your code (where to find CMakeLists.txt)
+
+# Replace spaces by semi-columns
+IF(CMAKE_MODULE_PATH)
+  STRING(REPLACE " " ";" CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
+ENDIF(CMAKE_MODULE_PATH)
+
+SET(CMAKE_MODULE_PATH ${SOURCE_DIR}/CMakeModules ${CMAKE_MODULE_PATH})
+
+IF(NOT ROOT_DIR AND SOURCE_DIR)
+  SET(ROOT_DIR ${SOURCE_DIR})
+ENDIF(NOT ROOT_DIR AND SOURCE_DIR)
+
+IF(NOT SOURCE_DIR AND ROOT_DIR)
+  SET(SOURCE_DIR ${ROOT_DIR})
+ENDIF(NOT SOURCE_DIR AND ROOT_DIR)
+
+MACRO(NOW RESULT)
+  IF (WIN32)
+    EXECUTE_PROCESS(COMMAND "wmic" "os" "get" "localdatetime" OUTPUT_VARIABLE DATETIME)
+    IF(NOT DATETIME MATCHES "ERROR")
+      STRING(REGEX REPLACE ".*\n([0-9][0-9][0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9])([0-9][0-9]).*" "\\1-\\2-\\3 \\4:\\5:\\6" ${RESULT} "${DATETIME}")
+    ENDIF(NOT DATETIME MATCHES "ERROR")
+  ELSEIF(UNIX)
+    EXECUTE_PROCESS(COMMAND "date" "+%Y-%m-%d %H:%M:%S" OUTPUT_VARIABLE DATETIME)
+    STRING(REGEX REPLACE "([0-9: -]+).*" "\\1" ${RESULT} "${DATETIME}")
+  ELSE (WIN32)
+    MESSAGE(SEND_ERROR "date not implemented")
+    SET(${RESULT} "0000-00-00 00:00:00")
+  ENDIF (WIN32)
+ENDMACRO(NOW)
+
+IF(EXISTS "${ROOT_DIR}/.svn/")
+  FIND_PACKAGE(Subversion)
+
+  IF(SUBVERSION_FOUND)
+    Subversion_WC_INFO(${ROOT_DIR} ER)
+    SET(REVISION ${ER_WC_REVISION})
+  ENDIF(SUBVERSION_FOUND)
+ENDIF(EXISTS "${ROOT_DIR}/.svn/")
+
+IF(EXISTS "${ROOT_DIR}/.hg/")
+  FIND_PACKAGE(Mercurial)
+
+  IF(MERCURIAL_FOUND)
+    Mercurial_WC_INFO(${ROOT_DIR} ER)
+    SET(REVISION ${ER_WC_REVISION})
+  ENDIF(MERCURIAL_FOUND)
+ENDIF(EXISTS "${ROOT_DIR}/.hg/")
+
+IF(REVISION)
+  IF(EXISTS ${SOURCE_DIR}/revision.h.in)
+    NOW(BUILD_DATE)
+    CONFIGURE_FILE(${SOURCE_DIR}/revision.h.in revision.h.txt)
+    EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy revision.h.txt revision.h) # copy_if_different
+  ENDIF(EXISTS ${SOURCE_DIR}/revision.h.in)
+ENDIF(REVISION)
diff --git a/code/CMakeModules/PCHSupport.cmake b/code/CMakeModules/PCHSupport.cmake
index bb34aebfe..ae5b30ee2 100644
--- a/code/CMakeModules/PCHSupport.cmake
+++ b/code/CMakeModules/PCHSupport.cmake
@@ -8,44 +8,40 @@
 #   ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use
 #   ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp
 
-IF(CMAKE_COMPILER_IS_GNUCXX)
-
-	EXEC_PROGRAM(
-		${CMAKE_CXX_COMPILER}
-		ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
-		OUTPUT_VARIABLE gcc_compiler_version)
+IF(MSVC)
+	SET(PCHSupport_FOUND TRUE)
+	SET(_PCH_include_prefix "/I")
+ELSE(MSVC)
+	IF(CMAKE_COMPILER_IS_GNUCXX)
+		EXEC_PROGRAM(${CMAKE_CXX_COMPILER}
+			ARGS ${CMAKE_CXX_COMPILER_ARG1} -dumpversion
+			OUTPUT_VARIABLE gcc_compiler_version)
 
-	IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-		SET(PCHSupport_FOUND TRUE)
-	ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
-		IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+		IF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
 			SET(PCHSupport_FOUND TRUE)
-		ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
-	ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+		ELSE(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+			IF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+				SET(PCHSupport_FOUND TRUE)
+			ENDIF(gcc_compiler_version MATCHES "3\\.4\\.[0-9]")
+		ENDIF(gcc_compiler_version MATCHES "4\\.[0-9]\\.[0-9]")
+	ELSE(CMAKE_COMPILER_IS_GNUCXX)
+		# TODO: make tests for other compilers than GCC
+		SET(PCHSupport_FOUND TRUE)
+	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
 
 	SET(_PCH_include_prefix "-I")
-
-ELSE(CMAKE_COMPILER_IS_GNUCXX)
-
-	IF(WIN32)
-		SET(PCHSupport_FOUND TRUE) # for experimental msvc support
-		SET(_PCH_include_prefix "/I")
-	ELSE(WIN32)
-		SET(PCHSupport_FOUND FALSE)
-	ENDIF(WIN32)
-
-ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+ENDIF(MSVC)
 
 MACRO(_PCH_GET_COMPILE_FLAGS _out_compile_flags)
 	STRING(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _flags_var_name)
 	SET(${_out_compile_flags} ${${_flags_var_name}} )
 
-	IF(CMAKE_COMPILER_IS_GNUCXX)
+	IF(NOT MSVC)
 		GET_TARGET_PROPERTY(_targetType ${_PCH_current_target} TYPE)
 		IF(${_targetType} STREQUAL SHARED_LIBRARY OR ${_targetType} STREQUAL MODULE_LIBRARY)
 			LIST(APPEND ${_out_compile_flags} "-fPIC")
 		ENDIF(${_targetType} STREQUAL SHARED_LIBRARY OR ${_targetType} STREQUAL MODULE_LIBRARY)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ENDIF(NOT MSVC)
 
 	GET_DIRECTORY_PROPERTY(DIRINC INCLUDE_DIRECTORIES )
 	FOREACH(item ${DIRINC})
@@ -100,17 +96,13 @@ MACRO(_PCH_GET_COMPILE_COMMAND out_command _input _inputcpp _output)
 		SET(pchsupport_compiler_cxx_arg1 "")
 	ENDIF(CMAKE_CXX_COMPILER_ARG1)
 
-	IF(CMAKE_COMPILER_IS_GNUCXX)
-		SET(${out_command}
-			${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	-x c++-header -o ${_output} -c ${_input}
-			)
-	ELSE(CMAKE_COMPILER_IS_GNUCXX)
+	IF(MSVC)
 		_PCH_GET_PDB_FILENAME(PDB_FILE ${_PCH_current_target})
-		SET(${out_command}
-			${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	/Yc  /Fp\"${_output}\" ${_inputcpp} /c /Fd\"${PDB_FILE}\"
-			)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
-ENDMACRO(_PCH_GET_COMPILE_COMMAND )
+		SET(${out_command} ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	/Yc  /Fp\"${_output}\" ${_inputcpp} /c /Fd\"${PDB_FILE}\")
+	ELSE(MSVC)
+		SET(${out_command} ${CMAKE_CXX_COMPILER} ${pchsupport_compiler_cxx_arg1} ${_compile_FLAGS}	-x c++-header -o ${_output} -c ${_input})
+	ENDIF(MSVC)
+ENDMACRO(_PCH_GET_COMPILE_COMMAND)
 
 MACRO(GET_PRECOMPILED_HEADER_OUTPUT _targetName _input _output)
 	IF(MSVC)
@@ -128,7 +120,9 @@ MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
 		SET(oldProps "")
 	ENDIF(${oldProps} MATCHES NOTFOUND)
 
-	IF(CMAKE_COMPILER_IS_GNUCXX)
+	IF(MSVC)
+		SET(_target_cflags "${oldProps} /Yu\"${_input}\" /FI\"${_input}\" /Fp\"${_pch_output_to_use}\"")
+	ELSE(MSVC)
 		# to do: test whether compiler flags match between target  _targetName
 		# and _pch_output_to_use
 		FILE(TO_NATIVE_PATH ${_pch_output_to_use} _native_pch_path)
@@ -137,11 +131,7 @@ MACRO(ADD_PRECOMPILED_HEADER_TO_TARGET _targetName _input _pch_output_to_use )
 		# on all remote machines set
 		# PCH_ADDITIONAL_COMPILER_FLAGS to -fpch-preprocess
 		SET(_target_cflags "${oldProps} ${PCH_ADDITIONAL_COMPILER_FLAGS}-include ${_input} -Winvalid-pch")
-	ELSE(CMAKE_COMPILER_IS_GNUCXX)
-		IF(MSVC)
-			SET(_target_cflags "${oldProps} /Yu\"${_input}\" /FI\"${_input}\" /Fp\"${_pch_output_to_use}\"")
-		ENDIF(MSVC)
-	ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+	ENDIF(MSVC)
 
 	SET_TARGET_PROPERTIES(${_targetName} PROPERTIES COMPILE_FLAGS ${_target_cflags})
 	IF(oldProps)
@@ -184,8 +174,31 @@ MACRO(ADD_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 	ADD_PRECOMPILED_HEADER_TO_TARGET(${_targetName} ${_inputh} ${_output})
 ENDMACRO(ADD_PRECOMPILED_HEADER)
 
+# Macro to move PCH creation file to the front of files list
+MACRO(FIX_PRECOMPILED_HEADER _files _pch)
+	# Remove .cpp creating PCH from the list
+	LIST(REMOVE_ITEM ${_files} ${_pch})
+	# Prepend .cpp creating PCH to the list
+	LIST(INSERT ${_files} 0 ${_pch})
+ENDMACRO(FIX_PRECOMPILED_HEADER)
+
 MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
-	IF(CMAKE_GENERATOR MATCHES Visual*)
+	SET(PCH_METHOD 0)
+
+	# 0 => creating a new target for PCH, works for all makefiles
+	# 1 => setting PCH for VC++ project, works for VC++ projects
+	# 2 => setting PCH for XCode project, works for XCode projects
+	IF(CMAKE_GENERATOR MATCHES "Visual Studio")
+		SET(PCH_METHOD 1)
+	ELSEIF(CMAKE_GENERATOR MATCHES "NMake Makefiles" AND MFC_FOUND AND CMAKE_MFC_FLAG)
+		# To fix a bug with MFC
+		# Don't forget to use FIX_PRECOMPILED_HEADER before creating the target
+#		SET(PCH_METHOD 1)
+	ELSEIF(CMAKE_GENERATOR MATCHES "Xcode")
+		SET(PCH_METHOD 2)
+	ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio")
+
+	IF(PCH_METHOD EQUAL 1)
 		# Auto include the precompile (useful for moc processing, since the use of
 		# precompiled is specified at the target level
 		# and I don't want to specifiy /F- for each moc/res/ui generated files (using Qt)
@@ -200,26 +213,24 @@ MACRO(ADD_NATIVE_PRECOMPILED_HEADER _targetName _inputh _inputcpp)
 
 		#also inlude ${oldProps} to have the same compile options
 		SET_SOURCE_FILES_PROPERTIES(${_inputcpp} PROPERTIES COMPILE_FLAGS "${oldProps} /Yc\"${_inputh}\"")
-	ELSE(CMAKE_GENERATOR MATCHES Visual*)
-		IF(CMAKE_GENERATOR MATCHES Xcode)
-			# For Xcode, cmake needs my patch to process
-			# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
-
-			GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
-			IF(${oldProps} MATCHES NOTFOUND)
-				SET(oldProps "")
-			ENDIF(${oldProps} MATCHES NOTFOUND)
-
-			# When buiding out of the tree, precompiled may not be located
-			# Use full path instead.
-			GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE)
-
-			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
-			SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
-		ELSE(CMAKE_GENERATOR MATCHES Xcode)
-			#Fallback to the "old" precompiled suppport
-			ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp})
-		ENDIF(CMAKE_GENERATOR MATCHES Xcode)
-	ENDIF(CMAKE_GENERATOR MATCHES Visual*)
+	ELSEIF(PCH_METHOD EQUAL 2)
+		# For Xcode, cmake needs my patch to process
+		# GCC_PREFIX_HEADER and GCC_PRECOMPILE_PREFIX_HEADER as target properties
+
+		GET_TARGET_PROPERTY(oldProps ${_targetName} COMPILE_FLAGS)
+		IF(${oldProps} MATCHES NOTFOUND)
+			SET(oldProps "")
+		ENDIF(${oldProps} MATCHES NOTFOUND)
+
+		# When buiding out of the tree, precompiled may not be located
+		# Use full path instead.
+		GET_FILENAME_COMPONENT(fullPath ${_inputh} ABSOLUTE)
+
+		SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${fullPath}")
+		SET_TARGET_PROPERTIES(${_targetName} PROPERTIES XCODE_ATTRIBUTE_GCC_PRECOMPILE_PREFIX_HEADER "YES")
+	ELSE(PCH_METHOD EQUAL 1)
+		#Fallback to the "old" precompiled suppport
+		ADD_PRECOMPILED_HEADER(${_targetName} ${_inputh} ${_inputcpp})
+	ENDIF(PCH_METHOD EQUAL 1)
 
 ENDMACRO(ADD_NATIVE_PRECOMPILED_HEADER)
diff --git a/code/CMakeModules/nel.cmake b/code/CMakeModules/nel.cmake
index 5c5efc4a9..e6bf57101 100644
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@@ -1,3 +1,11 @@
+# Force Release configuration for compiler checks
+SET(CMAKE_TRY_COMPILE_CONFIGURATION "Release")
+
+# Force Release configuration by default
+IF(NOT CMAKE_BUILD_TYPE)
+  SET(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
+ENDIF(NOT CMAKE_BUILD_TYPE)
+
 ###
 # Helper macro that generates .pc and installs it.
 # Argument: name - the name of the .pc package, e.g. "nel-pacs.pc"
@@ -5,10 +13,41 @@
 MACRO(NL_GEN_PC name)
   IF(NOT WIN32 AND WITH_INSTALL_LIBRARIES)
     CONFIGURE_FILE(${name}.in "${CMAKE_CURRENT_BINARY_DIR}/${name}")
-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}" DESTINATION lib/pkgconfig)
+    IF(CMAKE_LIBRARY_ARCHITECTURE)
+      INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}" DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig)
+    ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+      INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}" DESTINATION lib/pkgconfig)
+    ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
   ENDIF(NOT WIN32 AND WITH_INSTALL_LIBRARIES)
 ENDMACRO(NL_GEN_PC)
 
+###
+# Helper macro that generates revision.h from revision.h.in
+###
+MACRO(NL_GEN_REVISION_H)
+  IF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h.in)
+    INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+    ADD_DEFINITIONS(-DHAVE_REVISION_H)
+    SET(HAVE_REVISION_H ON)
+
+    # a custom target that is always built
+    ADD_CUSTOM_TARGET(revision ALL
+      DEPENDS ${CMAKE_BINARY_DIR}/revision.h)
+
+    # creates revision.h using cmake script
+    ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_BINARY_DIR}/revision.h
+      COMMAND ${CMAKE_COMMAND}
+      -DSOURCE_DIR=${CMAKE_SOURCE_DIR}
+      -DROOT_DIR=${CMAKE_SOURCE_DIR}/..
+      -P ${CMAKE_SOURCE_DIR}/CMakeModules/GetRevision.cmake)
+
+    # revision.h is a generated file
+    SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/revision.h
+      PROPERTIES GENERATED TRUE
+      HEADER_FILE_ONLY TRUE)
+  ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/revision.h.in)
+ENDMACRO(NL_GEN_REVISION_H)
+
 ###
 #
 ###
@@ -37,7 +76,10 @@ ENDMACRO(NL_TARGET_DRIVER)
 # Argument:
 ###
 MACRO(NL_DEFAULT_PROPS name label)
-  SET_TARGET_PROPERTIES(${name} PROPERTIES PROJECT_LABEL ${label})
+  # Note: This is just a workaround for a CMake bug generating VS10 files with a colon in the project name.
+  # CMake Bug ID: http://www.cmake.org/Bug/view.php?id=11819
+  STRING(REGEX REPLACE "\\:" " -" proj_label ${label})
+  SET_TARGET_PROPERTIES(${name} PROPERTIES PROJECT_LABEL ${proj_label})
   GET_TARGET_PROPERTY(type ${name} TYPE)
   IF(${type} STREQUAL SHARED_LIBRARY)
     # Set versions only if target is a shared library
@@ -156,7 +198,7 @@ Remove the CMakeCache.txt file and try again from another folder, e.g.:
    rm CMakeCache.txt
    mkdir cmake
    cd cmake
-   cmake -G \"Unix Makefiles\" ..
+   cmake ..
     ")
   ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 
@@ -201,6 +243,17 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
   ###
   # Optional support
   ###
+
+  # Check if CMake is launched from a Debian packaging script
+  SET(DEB_HOST_GNU_CPU $ENV{DEB_HOST_GNU_CPU})
+
+  # Don't strip if generating a .deb
+  IF(DEB_HOST_GNU_CPU)
+    OPTION(WITH_SYMBOLS           "Keep debug symbols in binaries"                 ON )
+  ELSE(DEB_HOST_GNU_CPU)
+    OPTION(WITH_SYMBOLS           "Keep debug symbols in binaries"                 OFF)
+  ENDIF(DEB_HOST_GNU_CPU)
+
   IF(WIN32)
     OPTION(WITH_STLPORT           "With STLport support."                         ON )
   ELSE(WIN32)
@@ -302,27 +355,80 @@ MACRO(NL_SETUP_BUILD)
     ENDIF(CMAKE_BUILD_TYPE MATCHES "Release")
   ENDIF(CMAKE_BUILD_TYPE MATCHES "Debug")
 
-  # Determine target CPU
-#  IF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
-    IF(NOT CMAKE_SIZEOF_VOID_P)
-      INCLUDE (CheckTypeSize)
-      CHECK_TYPE_SIZE("void*"  CMAKE_SIZEOF_VOID_P)
-    ENDIF(NOT CMAKE_SIZEOF_VOID_P)
+  SET(HOST_CPU ${CMAKE_SYSTEM_PROCESSOR})
 
-    # Using 32 or 64 bits libraries
+  IF(HOST_CPU MATCHES "amd64")
+    SET(HOST_CPU "x86_64")
+  ELSEIF(HOST_CPU MATCHES "i.86")
+    SET(HOST_CPU "x86")
+  ENDIF(HOST_CPU MATCHES "amd64")
+  
+  # Determine target CPU
+  IF(NOT TARGET_CPU)
+    SET(TARGET_CPU $ENV{DEB_HOST_GNU_CPU})
+  ENDIF(NOT TARGET_CPU)
+
+  # If not specified, use the same CPU as host
+  IF(NOT TARGET_CPU)
+    SET(TARGET_CPU ${CMAKE_SYSTEM_PROCESSOR})
+  ENDIF(NOT TARGET_CPU)
+
+  IF(TARGET_CPU MATCHES "amd64")
+    SET(TARGET_CPU "x86_64")
+  ELSEIF(TARGET_CPU MATCHES "i.86")
+    SET(TARGET_CPU "x86")
+  ENDIF(TARGET_CPU MATCHES "amd64")
+
+  # DEB_HOST_ARCH_ENDIAN is 'little' or 'big'
+  # DEB_HOST_ARCH_BITS is '32' or '64'
+
+  # If target and host CPU are the same
+  IF("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+    # x86-compatible CPU
+    IF(HOST_CPU MATCHES "x86")
+      IF(NOT CMAKE_SIZEOF_VOID_P)
+        INCLUDE (CheckTypeSize)
+        CHECK_TYPE_SIZE("void*"  CMAKE_SIZEOF_VOID_P)
+      ENDIF(NOT CMAKE_SIZEOF_VOID_P)
+
+      # Using 32 or 64 bits libraries
+      IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(TARGET_CPU "x86_64")
+      ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
+        SET(TARGET_CPU "x86")
+      ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    ENDIF(HOST_CPU MATCHES "x86")
+    # TODO: add checks for ARM and PPC
+  ELSE("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+    MESSAGE(STATUS "Compiling on ${HOST_CPU} for ${TARGET_CPU}")
+  ENDIF("${HOST_CPU}" STREQUAL "${TARGET_CPU}")
+
+  IF(TARGET_CPU STREQUAL "x86_64")
+    SET(TARGET_X64 1)
+    SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DHAVE_X86_64")
+  ELSEIF(TARGET_CPU STREQUAL "x86")
     SET(TARGET_X86 1)
-    IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      SET(ARCH "x86_64")
-      SET(TARGET_X64 1)
-      ADD_DEFINITIONS(-DHAVE_X86_64)
-    ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
-      SET(ARCH "x86")
-      ADD_DEFINITIONS(-DHAVE_X86)
-    ENDIF(CMAKE_SIZEOF_VOID_P EQUAL 8)
-#     ADD_DEFINITIONS(-DHAVE_IA64)
-#  ENDIF(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86")
+    SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DHAVE_X86")
+  ENDIF(TARGET_CPU STREQUAL "x86_64")
 
-  IF(WIN32)
+  # Fix library paths suffixes for Debian MultiArch
+  SET(DEBIAN_MULTIARCH $ENV{DEB_HOST_MULTIARCH})
+
+  IF(DEBIAN_MULTIARCH)
+    SET(CMAKE_LIBRARY_ARCHITECTURE ${DEBIAN_MULTIARCH})
+  ENDIF(DEBIAN_MULTIARCH)
+
+  IF(CMAKE_LIBRARY_ARCHITECTURE)
+    SET(CMAKE_LIBRARY_PATH /lib/${CMAKE_LIBRARY_ARCHITECTURE} /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} ${CMAKE_LIBRARY_PATH})
+    IF(TARGET_X64)
+      SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib64 /usr/lib64)
+    ENDIF(TARGET_X64)
+    IF(TARGET_X86)
+      SET(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /lib32 /usr/lib32)
+    ENDIF(TARGET_X86)
+  ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
+
+  IF(MSVC)
     IF(MSVC10)
       # /Ox is working with VC++ 2010, but custom optimizations don't exist
       SET(SPEED_OPTIMIZATIONS "/Ox /GF /GS-")
@@ -342,10 +448,10 @@ MACRO(NL_SETUP_BUILD)
       MESSAGE(FATAL_ERROR "Can't determine compiler version ${MSVC_VERSION}")
     ENDIF(MSVC10)
 
-    SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /W3 /Zi /Zm1000 /MP /Gy-")
+    SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /W3 /Zm1000 /MP /Gy-")
 
     # Common link flags
-    SET(PLATFORM_LINKFLAGS "-DEBUG")
+    SET(PLATFORM_LINKFLAGS "")
 
     IF(TARGET_X64)
       # Fix a bug with Intellisense
@@ -360,12 +466,32 @@ MACRO(NL_SETUP_BUILD)
     # Exceptions are only set for C++
     SET(PLATFORM_CXXFLAGS "${PLATFORM_CFLAGS} /EHa")
 
-    SET(NL_DEBUG_CFLAGS "/MDd /RTC1 /D_DEBUG ${MIN_OPTIMIZATIONS}")
-    SET(NL_RELEASE_CFLAGS "/MD /D NDEBUG ${SPEED_OPTIMIZATIONS}")
-    SET(NL_DEBUG_LINKFLAGS "/NODEFAULTLIB:msvcrt /INCREMENTAL:YES")
-    SET(NL_RELEASE_LINKFLAGS "/OPT:REF /OPT:ICF /INCREMENTAL:NO")
-  ELSE(WIN32)
-    SET(PLATFORM_CFLAGS "-g -pipe -ftemplate-depth-48 -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
+    IF(WITH_SYMBOLS)
+      SET(NL_RELEASE_CFLAGS "/Zi ${NL_RELEASE_CFLAGS}")
+      SET(NL_RELEASE_LINKFLAGS "/DEBUG ${NL_RELEASE_LINKFLAGS}")
+    ELSE(WITH_SYMBOLS)
+      SET(NL_RELEASE_LINKFLAGS "/RELEASE ${NL_RELEASE_LINKFLAGS}")
+    ENDIF(WITH_SYMBOLS)
+
+    SET(NL_DEBUG_CFLAGS "/Zi /MDd /RTC1 /D_DEBUG ${MIN_OPTIMIZATIONS} ${NL_DEBUG_CFLAGS}")
+    SET(NL_RELEASE_CFLAGS "/MD /DNDEBUG ${SPEED_OPTIMIZATIONS} ${NL_RELEASE_CFLAGS}")
+    SET(NL_DEBUG_LINKFLAGS "/DEBUG /OPT:NOREF /OPT:NOICF /NODEFAULTLIB:msvcrt /INCREMENTAL:YES ${NL_DEBUG_LINKFLAGS}")
+    SET(NL_RELEASE_LINKFLAGS "/OPT:REF /OPT:ICF /INCREMENTAL:NO ${NL_RELEASE_LINKFLAGS}")
+  ELSE(MSVC)
+    IF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
+      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m32 -march=i686")
+    ENDIF(HOST_CPU STREQUAL "x86_64" AND TARGET_CPU STREQUAL "x86")
+
+    IF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
+      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -m64")
+    ENDIF(HOST_CPU STREQUAL "x86" AND TARGET_CPU STREQUAL "x86_64")
+
+    SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -D_REENTRANT -pipe -ftemplate-depth-48 -Wall -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-unused -fno-strict-aliasing")
+
+    IF(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+      SET(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -ansi")
+    ENDIF(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+
     IF(WITH_COVERAGE)
       SET(PLATFORM_CFLAGS "-fprofile-arcs -ftest-coverage ${PLATFORM_CFLAGS}")
     ENDIF(WITH_COVERAGE)
@@ -382,12 +508,20 @@ MACRO(NL_SETUP_BUILD)
     SET(PLATFORM_CXXFLAGS ${PLATFORM_CFLAGS})
 
     IF(NOT APPLE)
-      SET(PLATFORM_LINKFLAGS "-Wl,--no-undefined -Wl,--as-needed")
+      SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Wl,--no-undefined -Wl,--as-needed")
     ENDIF(NOT APPLE)
 
-    SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -D_DEBUG")
-    SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -DNDEBUG -O6")
-  ENDIF(WIN32)
+    IF(WITH_SYMBOLS)
+      SET(NL_RELEASE_CFLAGS "${NL_RELEASE_CFLAGS} -g")
+    ELSE(WITH_SYMBOLS)
+      IF(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+        SET(NL_RELEASE_LINKFLAGS "-Wl,-s ${NL_RELEASE_LINKFLAGS}")
+      ENDIF(NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+    ENDIF(WITH_SYMBOLS)
+
+    SET(NL_DEBUG_CFLAGS "-DNL_DEBUG -D_DEBUG ${NL_DEBUG_CFLAGS}")
+    SET(NL_RELEASE_CFLAGS "-DNL_RELEASE -DNDEBUG -O3 ${NL_RELEASE_CFLAGS}")
+  ENDIF(MSVC)
 ENDMACRO(NL_SETUP_BUILD)
 
 MACRO(NL_SETUP_BUILD_FLAGS)
@@ -451,7 +585,11 @@ MACRO(NL_SETUP_PREFIX_PATHS)
     IF(WIN32)
       SET(NL_LIB_PREFIX "../lib" CACHE PATH "Installation path for libraries.")
     ELSE(WIN32)
-      SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation path for libraries.")
+      IF(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Installation path for libraries.")
+      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_LIB_PREFIX "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation path for libraries.")
+      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
     ENDIF(WIN32)
   ENDIF(NOT NL_LIB_PREFIX)
 
@@ -460,7 +598,11 @@ MACRO(NL_SETUP_PREFIX_PATHS)
     IF(WIN32)
       SET(NL_DRIVER_PREFIX "../lib" CACHE PATH "Installation path for drivers.")
     ELSE(WIN32)
-      SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/nel" CACHE PATH "Installation path for drivers.")
+      IF(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}/nel" CACHE PATH "Installation path for drivers.")
+      ELSE(CMAKE_LIBRARY_ARCHITECTURE)
+        SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/nel" CACHE PATH "Installation path for drivers.")
+      ENDIF(CMAKE_LIBRARY_ARCHITECTURE)
     ENDIF(WIN32)
   ENDIF(NOT NL_DRIVER_PREFIX)
 
@@ -529,50 +671,67 @@ MACRO(SETUP_EXTERNAL)
   ENDIF(WITH_EXTERNAL)
 
   IF(WIN32)
-    INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
+    FIND_PACKAGE(External REQUIRED)
+
     IF(MSVC10)
       IF(NOT MSVC10_REDIST_DIR)
         # If you have VC++ 2010 Express, put x64/Microsoft.VC100.CRT/*.dll in ${EXTERNAL_PATH}/redist
         SET(MSVC10_REDIST_DIR "${EXTERNAL_PATH}/redist")
       ENDIF(NOT MSVC10_REDIST_DIR)
-      GET_FILENAME_COMPONENT(VC_ROOT_DIR "[HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\10.0_Config;InstallDir]" ABSOLUTE)
-      # VC_ROOT_DIR is set to "registry" when a key is not found
-      IF(VC_ROOT_DIR MATCHES "registry")
-        GET_FILENAME_COMPONENT(VC_ROOT_DIR "[HKEY_CURRENT_USER\\Software\\Microsoft\\VCExpress\\10.0_Config;InstallDir]" ABSOLUTE)
-        IF(VC_ROOT_DIR MATCHES "registry")
-          MESSAGE(FATAL_ERROR "Unable to find VC++ 2010 directory!")
-        ENDIF(VC_ROOT_DIR MATCHES "registry")
-      ENDIF(VC_ROOT_DIR MATCHES "registry")
-      # convert IDE fullpath to VC++ path
-      STRING(REGEX REPLACE "Common7/.*" "VC" VC_DIR ${VC_ROOT_DIR})
-    ELSE(MSVC10)
-      IF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
+
+      IF(NOT VC_DIR)
+        IF(NOT VC_ROOT_DIR)
+          GET_FILENAME_COMPONENT(VC_ROOT_DIR "[HKEY_CURRENT_USER\\Software\\Microsoft\\VisualStudio\\10.0_Config;InstallDir]" ABSOLUTE)
+          # VC_ROOT_DIR is set to "registry" when a key is not found
+          IF(VC_ROOT_DIR MATCHES "registry")
+            GET_FILENAME_COMPONENT(VC_ROOT_DIR "[HKEY_CURRENT_USER\\Software\\Microsoft\\VCExpress\\10.0_Config;InstallDir]" ABSOLUTE)
+            IF(VC_ROOT_DIR MATCHES "registry")
+              FILE(TO_CMAKE_PATH $ENV{VS100COMNTOOLS} VC_ROOT_DIR)
+              IF(NOT VC_ROOT_DIR)
+                MESSAGE(FATAL_ERROR "Unable to find VC++ 2010 directory!")
+              ENDIF(NOT VC_ROOT_DIR)
+            ENDIF(VC_ROOT_DIR MATCHES "registry")
+          ENDIF(VC_ROOT_DIR MATCHES "registry")
+        ENDIF(NOT VC_ROOT_DIR)
         # convert IDE fullpath to VC++ path
-        STRING(REGEX REPLACE "Common7/.*" "VC" VC_DIR ${CMAKE_MAKE_PROGRAM})
-      ELSE(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
-        # convert compiler fullpath to VC++ path
-        STRING(REGEX REPLACE "VC/bin/.+" "VC" VC_DIR ${CMAKE_CXX_COMPILER})
-      ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
+        STRING(REGEX REPLACE "Common7/.*" "VC" VC_DIR ${VC_ROOT_DIR})
+      ENDIF(NOT VC_DIR)
+    ELSE(MSVC10)
+      IF(NOT VC_DIR)
+        IF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
+          # convert IDE fullpath to VC++ path
+          STRING(REGEX REPLACE "Common7/.*" "VC" VC_DIR ${CMAKE_MAKE_PROGRAM})
+        ELSE(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
+          # convert compiler fullpath to VC++ path
+          STRING(REGEX REPLACE "VC/bin/.+" "VC" VC_DIR ${CMAKE_CXX_COMPILER})
+        ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
+      ENDIF(NOT VC_DIR)
     ENDIF(MSVC10)
   ELSE(WIN32)
-    IF(CMAKE_FIND_LIBRARY_SUFFIXES AND NOT APPLE)
+    IF(APPLE)
+      IF(WITH_STATIC_EXTERNAL)
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .dylib .so)
+      ELSE(WITH_STATIC_EXTERNAL)
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .dylib .so .a)
+      ENDIF(WITH_STATIC_EXTERNAL)
+    ELSE(APPLE)
       IF(WITH_STATIC_EXTERNAL)
-        SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .a .so)
       ELSE(WITH_STATIC_EXTERNAL)
-        SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so")
+        SET(CMAKE_FIND_LIBRARY_SUFFIXES .so .a)
       ENDIF(WITH_STATIC_EXTERNAL)
-    ENDIF(CMAKE_FIND_LIBRARY_SUFFIXES AND NOT APPLE)
+    ENDIF(APPLE)
   ENDIF(WIN32)
 
   IF(WITH_STLPORT)
     FIND_PACKAGE(STLport REQUIRED)
     INCLUDE_DIRECTORIES(${STLPORT_INCLUDE_DIR})
-    IF(WIN32)
+    IF(MSVC)
       SET(VC_INCLUDE_DIR "${VC_DIR}/include")
 
       FIND_PACKAGE(WindowsSDK REQUIRED)
       # use VC++ and Windows SDK include paths
       INCLUDE_DIRECTORIES(${VC_INCLUDE_DIR} ${WINSDK_INCLUDE_DIR})
-    ENDIF(WIN32)
+    ENDIF(MSVC)
   ENDIF(WITH_STLPORT)
 ENDMACRO(SETUP_EXTERNAL)
diff --git a/code/acinclude.m4 b/code/acinclude.m4
deleted file mode 100644
index 1f9286bf9..000000000
--- a/code/acinclude.m4
+++ /dev/null
@@ -1,1396 +0,0 @@
-# =========================================================================
-#
-# Macros used by Nevrax in configure.in files.
-#
-# $Id: acinclude.m4,v 1.20 2005-04-04 10:07:29 cado Exp $
-# 
-# =========================================================================
-
-# =========================================================================
-# WARNING: The original version of this file is placed in the $CVSROOT/code
-#          directory.
-#          There is links in the $CVSROOT/code sub-directories to that file
-#          (ex: $CVSROOT/code/nel), so be careful of the consequences of
-#          any modification of that file.
-# =========================================================================
-
-# =========================================================================
-# Macros available in that file.
-#
-#
-# AM_NEL_DEBUG
-#
-#    Option:      none.
-#    Description: manage the different debug and the release mode by setting
-#                 correctly the CFLAGS and CXXFLAGS variables.
-#
-#
-# AM_PATH_NEL
-#
-#    Option:      none.
-#    Description: check the instalation of the NeL library and set the
-#                 CXXFLAGS and LIBS variables to use it.
-#
-#
-# AM_PATH_STLPORT
-#
-#    Option:      none.
-#    Description: check the instalation of the STLPort library and set the
-#                 CXXFLAGS and LIBS variables to use it.
-#
-#
-# AM_PATH_OPENGL
-#
-#    Option:      "yes" if the use of the OpenGL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENGL_CFLAGS and OPENGL_LIBS variables to use it.
-#
-#
-# AM_PATH_FREETYPE
-#
-#    Option:      "yes" if the use of the Freetype library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it.
-#
-#
-# AM_PATH_XF86VIDMODE
-#
-#    Option:      none.
-#    Description: check the instalation of the OpenGL library and set the
-#                 XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it.
-#
-#
-# AM_PATH_OPENAL
-#
-#    Option:      "yes" if the use of the OpenAL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENAL_CFLAGS and OPENAL_LIBS variables to use it.
-#
-#
-# AM_PATH_PYTHON
-#
-#    Option:      "yes" if the use of the Python library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 PYTHON_CFLAGS and PYTHON_LIBS variables to use it.
-#
-# AM_PATH_CCACHE
-#
-#    Option:      none.
-#    Description: check the instalation of the Ccache utility.
-#
-# =========================================================================
-
-
-# =========================================================================
-# AM_NEL_DEBUG
-
-AC_DEFUN([AM_NEL_DEBUG],
-[
-
-MAX_C_OPTIMIZE="-O6"
-
-STL_DEBUG="-D__STL_DEBUG"
-
-NL_DEBUG="-DNL_DEBUG"
-NL_DEBUG_FAST="-DNL_DEBUG_FAST"
-NL_RELEASE_DEBUG="-DNL_RELEASE_DEBUG"
-NL_RELEASE="-DNL_RELEASE_DEBUG"
-
-AC_ARG_WITH(debug,
-    [  --with-debug[=full|medium|fast]
-                          Build a debug version (huge libraries).
-                          Full mode set only NeL and STL debug flags.
-                          Medium mode set NeL debug flags with inline
-                          optimization (default mode).
-                          Fast mode is like the Medium mode with some basic
-                          optimization.
-  --without-debug         Build without debugging code (default)],
-    [with_debug=$withval],
-    [with_debug=no])
-
-# Build optimized or debug version ?
-# First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
-then
-    DEBUG_CFLAGS="-g"
-    DEBUG_OPTIMIZE_CC="-O"
-    OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
-else
-    DEBUG_CFLAGS="-g"
-    DEBUG_OPTIMIZE_CC=""
-    OPTIMIZE_CFLAGS=""
-fi
-
-if test "$ac_cv_prog_cxx_g" = "yes"
-then
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_OPTIMIZE_CXX="-O"
-    OPTIMIZE_CXXFLAGS="-O3"
-    OPTIMIZE_INLINE_CXXFLAGS="-finline-functions"
-else
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_OPTIMIZE_CXX=""
-    OPTIMIZE_CXXFLAGS=""
-    OPTIMIZE_INLINE_CXXFLAGS=""
-fi
-
-if test "$with_debug" = "yes" -o "$with_debug" = "medium"
-then
-    # Medium debug. Inline optimization
-    CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $NL_DEBUG_FAST $CFLAGS"
-    CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $NL_DEBUG_FAST $CXXFLAGS"
-else
-    if test "$with_debug" = "full"
-    then
-        # Full debug. Very slow in some cases
-        CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $STL_DEBUG $CFLAGS"
-        CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $STL_DEBUG $CXXFLAGS"
-    else
-        if test "$with_debug" = "fast"
-        then
-            # Fast debug.
-            CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS"
-            CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-        else
-            # Optimized version. No debug
-            CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE_DEBUG $CFLAGS"
-            CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE_DEBUG $CXXFLAGS"
-        fi
-    fi
-fi
-
-# AC_MSG_RESULT([CFLAGS = $CFLAGS])
-# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS])
-
-])
-
-
-# =========================================================================
-# MY_NEL_HEADER_CHK : NeL header files checking macros
-
-AC_DEFUN([MY_NEL_HEADER_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-header="$2"
-macro="$3"
-is_mandatory="$4"
-
-if test $is_mandatory = "yes"
-then
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $NEL_CFLAGS"
-
-    AC_MSG_CHECKING(for $header)
-
-    AC_EGREP_CPP( yo_header,
-[#include <$header>
-#ifdef $macro
-   yo_header
-#endif],
-  have_header="yes",
-  have_header="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_header" = "yes"
-    then
-        AC_MSG_RESULT(yes)
-    else
-        if test "$is_mandatory" = "yes"
-        then
-            AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).])
-        else
-            AC_MSG_RESULT(no)
-        fi
-    fi
-fi
-
-        
-])
-
-
-# =========================================================================
-# MY_NEL_LIB_CHK : NeL library checking macros
-
-AC_DEFUN([MY_NEL_LIB_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-nel_test_lib="$2"
-is_mandatory="$3"
-
-if test $is_mandatory = "yes"
-then
-
-    AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).])])
-fi
-])
-
-
-# =========================================================================
-# AM_PATH_NEL : NeL checking macros
-AC_DEFUN([AM_PATH_NEL],
-[ AC_REQUIRE_CPP()
-
-AC_ARG_WITH( nel,
-    [  --with-nel=<path>       path to the NeL install files directory.
-                          e.g. /usr/local/nel])
-
-AC_ARG_WITH( nel-include,
-    [  --with-nel-include=<path>
-                          path to the NeL header files directory.
-                          e.g. /usr/local/nel/include])
-
-AC_ARG_WITH( nel-lib,
-    [  --with-nel-lib=<path>
-                          path to the NeL library files directory.
-                          e.g. /usr/local/nel/lib])
-
-
-nelmisc_is_mandatory="$1"
-nelnet_is_mandatory="$2"
-nel3d_is_mandatory="$3"
-nelpacs_is_mandatory="$4"
-nelsound_is_mandatory="$5"
-nelai_is_mandatory="$6"
-nelgeorges_is_mandatory="$7"
-
-# Check for nel-config
-AC_PATH_PROG(NEL_CONFIG, nel-config, no)
-
-# 
-# Configure options (--with-nel*) have precendence 
-# over nel-config only set variables if they are not 
-# specified
-#
-if test "$NEL_CONFIG" != "no"
-then
-    if test -z "$with_nel" -a -z "$with_nel_include"
-    then
-	CXXFLAGS="$CXXFLAGS `nel-config --cflags`"
-    fi
-
-    if test -z "$with_nel" -a -z "$with_nel_lib"
-    then
-	LDFLAGS="`nel-config --ldflags` $LDFLAGS"
-    fi
-fi
-
-#
-# Set nel_libraries and nel_includes according to
-# user specification (--with-nel*) if any. 
-# --with-nel-include and --with-nel-lib have precendence
-# over --with-nel
-#
-if test "$with_nel" = "no"
-then
-    # The user explicitly disabled the use of the NeL
-    AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel])
-else
-    if test "$with_nel" -a "$with_nel" != "yes"
-    then
-	nel_includes="$with_nel/include"
-	nel_libraries="$with_nel/lib"
-    fi
-fi
-
-if test "$with_nel_include"
-then
-    nel_includes="$with_nel_include"
-fi
-
-if test "$with_nel_lib"
-then
-    nel_libraries="$with_nel_lib"
-fi
-
-#
-# Set compilation variables 
-#
-if test "$nel_includes"
-then
-    CXXFLAGS="$CXXFLAGS -I$nel_includes"
-fi
-
-if test "$nel_libraries"
-then
-    LDFLAGS="-L$nel_libraries $LDFLAGS"
-fi
-
-#
-# Collect headers information and bark if missing and
-# mandatory
-#
-
-MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)
-MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory)
-MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory)
-MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory)
-
-#
-# Collect libraries information and bark if missing and
-# mandatory
-#
-
-MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory)
-MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory)
-MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory)
-MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory)
-MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory)
-MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory)
-MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory)
-
-])
-
-
-# =========================================================================
-# AM_PATH_STLPORT : STLPort checking macros
-
-AC_DEFUN([AM_PATH_STLPORT],
-[ AC_REQUIRE_CPP()
-
-AC_ARG_WITH( stlport,
-    [  --with-stlport=<path>   path to the STLPort install files directory.
-                          e.g. /usr/local/stlport])
-
-AC_ARG_WITH( stlport-include,
-    [  --with-stlport-include=<path>
-                          path to the STLPort header files directory.
-                          e.g. /usr/local/stlport/stlport])
-
-AC_ARG_WITH( stlport-lib,
-    [  --with-stlport-lib=<path>
-                          path to the STLPort library files directory.
-                          e.g. /usr/local/stlport/lib])
-
-if test "$with_debug" = "full"
-then
- stlport_lib="stlport_gcc_debug"
-else
- stlport_lib="stlport_gcc"
-fi
-
-if test "$with_debug" = "full"
-then
- stlport_lib2="stlport_gcc_debug"
-else
- stlport_lib2="stlport_gcc"
-fi
-
-if test "$with_stlport" = no
-then
-    # The user explicitly disabled the use of the STLPorts
-    AC_MSG_ERROR([STLPort is mandatory: do not specify --without-stlport])
-else
-    stlport_includes="/usr/include/stlport"
-    if test "$with_stlport" -a "$with_stlport" != yes
-    then
-        stlport_includes="$with_stlport/stlport"
-        stlport_libraries="$with_stlport/lib"
-
-        if test ! -d "$stlport_includes"
-        then
-            stlport_includes="$with_stlport/include/stlport"
-        fi
-    fi
-fi
-
-if test "$with_stlport_include"
-then
-    stlport_includes="$with_stlport_include"
-fi
-
-if test "$with_stlport_lib"
-then
-    stlport_libraries="$with_stlport_lib"
-fi
-
-# Check for the 'pthread' library. SLTPort needs it.
-AC_CHECK_LIB(pthread, main, , [AC_MSG_ERROR([cannot find the pthread library.])])
-AC_CHECK_LIB(dl, dlopen, , [AC_MSG_ERROR([cannot find the dl library.])])
-
-AC_LANG_SAVE
-AC_LANG_CPLUSPLUS
-
-# Put STLPorts includes in CXXFLAGS
-if test "$stlport_includes"
-then
-    CXXFLAGS="$CXXFLAGS -I$stlport_includes"
-fi
-
-# Put STLPorts libraries directory in LIBS
-if test "$stlport_libraries"
-then
-    LIBS="-L$stlport_libraries $LIBS"
-else
-    stlport_libraries='default'
-fi
-
-# Put STLPort GCC libraries directory in LIBS
-if test "$stlport_libraries2"
-then
-    LIBS="-L$stlport_libraries2 $LIBS"
-else
-    stlport_libraries2='default'
-fi
-
-# Test the headers
-
-AC_CHECK_HEADER(algorithm,
-    have_stlport_headers="yes",
-    have_stlport_headers="no" )
-
-AC_MSG_CHECKING(for STLPort headers)
-
-if test "$have_stlport_headers" = "yes"
-then
-    AC_MSG_RESULT([$stlport_includes])
-else
-    AC_MSG_RESULT(no)
-fi
-
-AC_CHECK_LIB($stlport_lib, main,, have_stlport_libraries="no")
-
-AC_MSG_CHECKING(for STLPort library)
-
-if test "$have_stlport_libraries" != "no"
-then
-    AC_MSG_RESULT([$stlport_libraries])
-else
-    AC_MSG_RESULT(no)
-fi
-
-AC_CHECK_LIB($stlport_lib2, main,, have_stlport_libraries="no")
-
-AC_MSG_CHECKING(for STLPort GCC library)
-
-if test "$have_stlport_libraries2" != "no"
-then
-    AC_MSG_RESULT([$stlport_libraries2])
-else
-    AC_MSG_RESULT(no)
-fi
-
-if test "$have_stlport_headers" = "yes" &&
-    (test "$have_stlport_libraries" != "no" || test "$have_stlport_libraries2" != "no")
-then
-    have_stlport="yes"
-else
-    have_stlport="no"
-fi
-
-if test "$have_stlport" = "no"
-then
-    AC_MSG_ERROR([STLPort must be installed (http://www.stlport.org).])
-fi
-
-AC_LANG_RESTORE
-
-])
-
-
-# =========================================================================
-# AM_PATH_OPENGL : OpenGL checking macros
-
-AC_DEFUN([AM_PATH_OPENGL],
-[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2)
-
-is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( opengl,
-    [  --with-opengl=<path>    path to the OpenGL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( opengl-include,
-    [  --with-opengl-include=<path>
-                          path to the OpenGL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( opengl-lib,
-    [  --with-opengl-lib=<path>
-                          path to the OpenGL library files directory.
-                          e.g. /usr/local/lib])
-
-opengl_lib="GL"
-
-if test "$with_opengl"
-then
-    opengl_includes="$with_opengl/include"
-    opengl_libraries="$with_opengl/lib"
-fi
-
-if test "$with_opengl_include"
-then
-    opengl_includes="$with_opengl_include"
-fi
-
-if test "$with_opengl_lib"
-then
-    opengl_libraries="$with_opengl_lib"
-fi
-
-# Set OPENGL_CFLAGS
-if test "$opengl_includes"
-then
-    OPENGL_CFLAGS="-I$opengl_includes"
-fi
-
-# Set OPENGL_LIBS
-if test "$opengl_libraries"
-then
-    OPENGL_LIBS="-L$opengl_libraries"
-fi
-OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib"
-
-# Test the headers
-_CPPFLAGS="$CPPFLAGS"
-
-CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS"
-
-AC_EGREP_CPP( yo_opengl,
-[#include <GL/gl.h>       
-#if defined(GL_VERSION_1_2)
-   yo_opengl
-#endif],
-  have_opengl_headers="yes", 
-  have_opengl_headers="no" )
-
-if test "$have_opengl_headers" = "yes"
-then
-    if test "$opengl_includes"
-    then
-        AC_MSG_RESULT([$opengl_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Checking the GLEXT version >= 7
-AC_MSG_CHECKING(for <GL/glext.h> and GLEXT version >= 7)
-
-AC_EGREP_CPP( yo_glext_version,
-[#include <GL/glext.h>
-#ifdef GL_GLEXT_VERSION
-#if GL_GLEXT_VERSION >= 7
-   yo_glext_version
-#endif
-#endif],
-  have_glext="yes",
-  have_glext="no" )
-
-if test "$have_glext" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT([no, <GL/glext.h> can be downloaded from http://oss.sgi.com/projects/ogl-sample/ABI/])
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for OpenGL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENGL_LIBS"
-
-AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_opengl_libraries" = "yes"
-then
-    if test "$opengl_libraries"
-    then
-        AC_MSG_RESULT([$opengl_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-opengl_libraries="$opengl_libraries"
-
-if test "$have_opengl_headers" = "yes" \
-        -a "$have_glext" = "yes" \
-        -a "$have_opengl_libraries" = "yes"
-then
-    have_opengl="yes"
-else
-    have_opengl="no"
-fi
-
-if test "$have_opengl" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)])
-fi
-
-AC_SUBST(OPENGL_CFLAGS)
-AC_SUBST(OPENGL_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_FREETYPE : FreeType checking macros
-
-AC_DEFUN([AM_PATH_FREETYPE],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( freetype,
-    [  --with-freetype=<path>   path to the FreeType install files directory.
-                          e.g. /usr/local/freetype])
-
-AC_ARG_WITH( freetype-include,
-    [  --with-freetype-include=<path>
-                          path to the FreeType header files directory.
-                          e.g. /usr/local/freetype/include])
-
-AC_ARG_WITH( freetype-lib,
-    [  --with-freetype-lib=<path>
-                          path to the FreeType library files directory.
-                          e.g. /usr/local/freetype/lib])
-
-freetype_lib="freetype"
-
-
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-  
-if test "$FREETYPE_CONFIG" = "no"
-then
-    have_freetype_config="no"
-else
-    FREETYPE_CFLAGS=`freetype-config --cflags`
-    FREETYPE_LIBS=`freetype-config --libs`
-    have_freetype_config="yes"
-fi
-
-if test "$with_freetype"
-then
-    freetype_includes="$with_freetype/include"
-    freetype_libraries="$with_freetype/lib"
-fi
-
-if test "$with_freetype_include"
-then
-    freetype_includes="$with_freetype_include"
-fi
-
-if test "$with_freetype_lib"
-then
-    freetype_libraries="$with_freetype_lib"
-fi
-
-if test "$freetype_includes"
-then
-    FREETYPE_CFLAGS="-I$freetype_includes"
-fi
-
-# Checking the FreeType 2 instalation
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
-
-AC_MSG_CHECKING(for FreeType version = 2)
-
-AC_EGREP_CPP( yo_freetype2,
-[#include <freetype/freetype.h>
-#if FREETYPE_MAJOR == 2
-   yo_freetype2
-#endif],
-  have_freetype2="yes",
-  have_freetype2="no")
-
-if test "$have_freetype2" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT(no)
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for FreeType libraries)
-        
-if test $freetype_libraries
-then
-    FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"
-fi
-
-CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS"
-    
-AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_freetype_libraries" = "yes"
-then    
-    if test "$freetype_libraries"
-    then
-        AC_MSG_RESULT([$freetype_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes"
-then
-    have_freetype="yes"
-else
-    have_freetype="no"
-fi
-
-if test "$have_freetype" = "no" && test "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)])
-fi
-
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_XF86VIDMODE : XF86VidMode checking macros
-
-AC_DEFUN([AM_PATH_XF86VIDMODE],
-[ AC_MSG_CHECKING(for XF86VidMode extension)
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( xf86vidmode-lib,
-    [  --with-xf86vidmode-lib=<path>
-                          path to the XF86VidMode library.
-                          e.g. /usr/X11R6/lib] )
-
-xf86vidmode_lib="Xxf86vm"
-
-if test "$with_xf86vidmode_lib" = no
-then
-    # The user explicitly disabled the use of XF86VidMode
-    have_xf86vidmode="disabled"
-    AC_MSG_RESULT(disabled)
-else
-    if test "$with_xf86vidmode_lib"
-    then
-        xf86vidmode_libraries="$with_xf86vidmode_lib"
-    fi
-
-    XF86VIDMODE_CFLAGS="-DXF86VIDMODE"
-fi
-
-if test -z "$have_xf86vidmode"
-# -a "$with_xf86vidmode_lib"
-then
-    if test "$xf86vidmode_libraries"
-    then
-        XF86VIDMODE_LIBS="-L$xf86vidmode_libraries"
-    fi
-
-    XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS"
-
-    AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_xf86vidmode_libraries" = "yes"
-    then
-        have_xf86vidmode="yes"
-        if test "$xf86vidmode_libraries"
-        then
-            AC_MSG_RESULT($xf86vidmode_libraries)
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        have_xf86vidmode="no"
-        AC_MSG_RESULT(no, no fullscreen support available.)
-    fi
-
-    xf86vidmode_libraries="$xf86vidmode_libraries"
-
-fi
-
-AC_SUBST(XF86VIDMODE_CFLAGS)
-AC_SUBST(XF86VIDMODE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_OPENAL : OpenAL checking macros
-
-AC_DEFUN([AM_PATH_OPENAL],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the OpenAL files location
-AC_ARG_WITH( openal,
-    [  --with-openal=<path>   path to the OpenAL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( openal-include,
-    [  --with-openal-include=<path>
-                          path to the OpenAL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( openal-lib,
-    [  --with-openal-lib=<path>
-                          path to the OpenAL library files directory.
-                          e.g. /usr/local/lib])
-
-openal_lib="openal"
-
-if test $with_openal
-then
-    openal_includes="$with_openal/include"
-    openal_libraries="$with_openal/lib"
-fi
-
-if test "$with_openal_include"
-then
-    openal_includes="$with_openal_include"
-fi
-
-if test "$with_openal_lib"
-then
-    openal_libraries="$with_openal_lib"
-fi
-
-
-# Set OPENAL_CFLAGS
-if test "$openal_includes"
-then
-    OPENAL_CFLAGS="-I$openal_includes"
-fi
-
-# Set OPENAL_LIBS
-if test "$openal_libraries"
-then
-    OPENAL_LIBS="-L$openal_libraries"
-fi
-OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS"
-
-AC_MSG_CHECKING(for OpenAL headers)
-AC_EGREP_CPP( yo_openal,
-[#include <AL/altypes.h>
-#ifdef AL_VERSION
-   yo_openal
-#endif],
-  have_openal_headers="yes",
-  have_openal_headers="no" )
-
-if test "$have_openal_headers" = "yes"
-then
-    if test "$openal_includes"
-    then
-        AC_MSG_RESULT([$openal_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for OpenAL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENAL_LIBS"
-
-AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_openal_libraries" = "yes"
-then
-    if test "$openal_libraries"
-    then
-        AC_MSG_RESULT([$openal_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-openal_libraries="$openal_libraries"
-
-if test "$have_openal_headers" = "yes" \
-   && test "$have_openal_libraries" = "yes"
-then
-    have_openal="yes"
-else
-    have_openal="no"
-fi
-
-if test "$have_openal" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).])
-fi
-
-AC_SUBST(OPENAL_CFLAGS)
-AC_SUBST(OPENAL_LIBS)
-
-
-])
-
-
-# =========================================================================
-# AM_PATH_PYTHON : Python checking macros
-
-AC_DEFUN([AM_PATH_PYTHON],
-[ python_version_required="$1"
-
-is_mandatory="$2"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the Python files location
-AC_ARG_WITH( python,
-    [  --with-python=<path>    path to the Python prefix installation directory.
-                          e.g. /usr/local],
-    [ PYTHON_PREFIX=$with_python ]
-)
-
-AC_ARG_WITH( python-version,
-    [  --with-python-version=<version>
-                          Python version to use, e.g. 1.5],
-    [ PYTHON_VERSION=$with_python_version ]
-)
-
-if test ! "$PYTHON_PREFIX" = ""
-then
-    PATH="$PYTHON_PREFIX/bin:$PATH"
-fi
-
-if test ! "$PYTHON_VERSION" = ""
-then
-    PYTHON_EXEC="python$PYTHON_VERSION"
-else
-    PYTHON_EXEC="python python2.1 python2.0 python1.5"
-fi
-
-AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH)
-
-if test "$PYTHON" != "no"
-then
-    PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'`
-    PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'`
-
-    is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION`
-fi
-
-
-if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1"
-then
-
-    if test "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)])
-    else
-        have_python="no"
-    fi
-
-else
-
-    python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION"
-    python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config"
-    python_lib="python$PYTHON_VERSION"
-
-    PYTHON_CFLAGS="-I$python_includes"
-    PYTHON_LIBS="-L$python_libraries -l$python_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}"
-
-    # Test the headers
-    AC_MSG_CHECKING(for Python headers)
-
-    AC_EGREP_CPP( yo_python,
-    [#include <Python.h>
-   yo_python
-    ],
-      have_python_headers="yes",
-      have_python_headers="no" )
-
-    if test "$have_python_headers" = "yes"
-    then
-        AC_MSG_RESULT([$python_includes])
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    # Test the libraries
-    AC_MSG_CHECKING(for Python libraries)
-
-    CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
-
-    AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_python_libraries" = "yes"
-    then
-        if test "$python_libraries"
-        then
-            AC_MSG_RESULT([$python_libraries])
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    if test "$have_python_headers" = "yes" \
-       && test "$have_python_libraries" = "yes"
-    then
-        have_python="yes"
-    else
-        have_python="no"
-    fi
-
-    if test "$have_python" = "no" -a "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).])
-    fi
-
-    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_LIBS)
-
-fi
-
-])
-
-
-# =========================================================================
-# AM_PATH_CCACHE : Ccache checking macros
-
-AC_DEFUN([AM_PATH_CCACHE],
-[
-
-AC_ARG_WITH( ccache,
-    [  --with-ccache           use ccache for compiling.],
-    [ using_ccache=$with_ccache ]
-)
-
-AC_PATH_PROG(CCACHE, ccache)
-if test "$CCACHE" -a "$using_ccache" = "yes"
-then
-    CC="ccache $CC"
-    CXX="ccache $CXX"
-fi
-
-])
-
-# =========================================================================
-# AM_PATH_MYSQL : MySQL library
-
-# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
-#
-AC_DEFUN([AM_PATH_MYSQL],
-[# 
-# Get the cflags and libraries from the mysql_config script
-#
-AC_ARG_WITH(mysql-prefix,[  --with-mysql-prefix=PFX   Prefix where MYSQL is installed (optional)],
-            mysql_prefix="$withval", mysql_prefix="")
-AC_ARG_WITH(mysql-exec-prefix,[  --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)],
-            mysql_exec_prefix="$withval", mysql_exec_prefix="")
-AC_ARG_ENABLE(mysqltest, [  --disable-mysqltest       Do not try to compile and run a test MYSQL program],
-		    , enable_mysqltest=yes)
-
-  if test x$mysql_exec_prefix != x ; then
-     mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config
-     fi
-  fi
-  if test x$mysql_prefix != x ; then
-     mysql_args="$mysql_args --prefix=$mysql_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_prefix/bin/mysql_config
-     fi
-  fi
-
-  AC_REQUIRE([AC_CANONICAL_TARGET])
-  AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no)
-  min_mysql_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version)
-  no_mysql=""
-  if test "$MYSQL_CONFIG" = "no" ; then
-    no_mysql=yes
-  else
-    MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"`
-    MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"`
-
-    mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_mysqltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-      LIBS="$LIBS $MYSQL_LIBS"
-#
-# Now check if the installed MYSQL is sufficiently new. (Also sanity
-# checks the results of mysql_config to some extent
-#
-      rm -f conf.mysqltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mysql.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.mysqltest");
-  */
-  { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_mysql_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_mysql_version");
-     exit(1);
-   }
-
-   if (($mysql_major_version > major) ||
-      (($mysql_major_version == major) && ($mysql_minor_version > minor)) ||
-      (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version);
-      printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n");
-      printf("*** to point to the correct copy of mysql_config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_mysql" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$MYSQL_CONFIG" = "no" ; then
-       echo "*** The mysql_config script installed by MYSQL could not be found"
-       echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the MYSQL_CONFIG environment variable to the"
-       echo "*** full path to mysql_config."
-     else
-       if test -f conf.mysqltest ; then
-        :
-       else
-          echo "*** Could not run MYSQL test program, checking why..."
-          CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-          LIBS="$LIBS $MYSQL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <mysql.h>
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding MYSQL or finding the wrong"
-          echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means MYSQL was incorrectly installed"
-          echo "*** or that you have moved MYSQL since it was installed. In the latter case, you"
-          echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     MYSQL_CFLAGS=""
-     MYSQL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(MYSQL_CFLAGS)
-  AC_SUBST(MYSQL_LIBS)
-  rm -f conf.mysqltest
-])
-
-# =========================================================================
-# AM_PATH_FMOD : FMOD checking macros
-
-AC_DEFUN([AM_PATH_FMOD],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the FMOD files location
-AC_ARG_WITH( fmod,
-    [  --with-fmod=<path>   path to the FMOD install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( fmod-include,
-    [  --with-fmod-include=<path>
-                          path to the FMOD header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( fmod-lib,
-    [  --with-fmod-lib=<path>
-                          path to the FMOD library files directory.
-                          e.g. /usr/local/lib])
-
-fmod_lib="fmod"
-
-if test $with_fmod
-then
-    fmod_includes="$with_fmod/include"
-    fmod_libraries="$with_fmod/lib"
-fi
-
-if test "$with_fmod_include"
-then
-    fmod_includes="$with_fmod_include"
-fi
-
-if test "$with_fmod_lib"
-then
-    fmod_libraries="$with_fmod_lib"
-fi
-
-
-# Set FMOD_CFLAGS
-if test "$fmod_includes"
-then
-    FMOD_CFLAGS="-I$fmod_includes"
-fi
-
-# Set FMOD_LIBS
-if test "$fmod_libraries"
-then
-    FMOD_LIBS="-L$fmod_libraries"
-fi
-FMOD_LIBS="$FMOD_LIBS -l$fmod_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS"
-
-AC_MSG_CHECKING(for FMOD headers)
-AC_EGREP_CPP( yo_fmod,
-[#include <fmod.h>
-#ifdef FMOD_VERSION
-   yo_fmod
-#endif],
-  have_fmod_headers="yes",
-  have_fmod_headers="no" )
-
-if test "$have_fmod_headers" = "yes"
-then
-    if test "$fmod_includes"
-    then
-        AC_MSG_RESULT([$fmod_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for FMOD libraries)
-
-CPPFLAGS="$CXXFLAGS $FMOD_LIBS"
-
-AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_fmod_libraries" = "yes"
-then
-    if test "$fmod_libraries"
-    then
-        AC_MSG_RESULT([$fmod_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-fmod_libraries="$fmod_libraries"
-
-if test "$have_fmod_headers" = "yes" \
-   && test "$have_fmod_libraries" = "yes"
-then
-    have_fmod="yes"
-else
-    have_fmod="no"
-fi
-
-if test "$have_fmod" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).])
-fi
-
-AC_SUBST(FMOD_CFLAGS)
-AC_SUBST(FMOD_LIBS)
-
-])
-
-# =========================================================================
-# End of file
-
diff --git a/code/nel/Makefile.am b/code/nel/Makefile.am
deleted file mode 100644
index f2af0b6d0..000000000
--- a/code/nel/Makefile.am
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES	=	Makefile.in		\
-				configure		\
-				libtool			\
-				config.guess		\
-				config.sub		\
-				ltconfig		\
-				aclocal.m4		\
-				config.h.in		\
-				install-sh		\
-				missing			\
-				mkinstalldirs		\
-				ltmain.sh		\
-				include/nelconfig.h	\
-				include/nelconfig.h.in	\
-				include/nel/nelconfig.h
-
-DISTCLEANFILES		=	include/stamp-h		\
-				include/stamp-h.in 
-
-SUBDIRS			= 	include src @TOOLS_SUBDIR@ @SAMPLE_SUBDIR@
-
-bin_SCRIPTS		=	nel-config
-
-EXTRA_DIST		=	nel.dsw			\
-				nel.sln			\
-				nel_8.sln		\
-				autogen.sh		\
-				nel.m4			\
-				automacros		\
-				doc			\
-				kdevelop		\
-				tools			\
-				samples
-
-dist-hook:
-	find $(distdir) -name CVS -print | xargs rm -fr
-	find $(distdir) -name .svn -print | xargs rm -fr
-
-m4datadir = $(datadir)/aclocal
-m4data_DATA = nel.m4
-
-# End of Makefile.am
-
diff --git a/code/nel/acinclude.m4 b/code/nel/acinclude.m4
deleted file mode 100644
index 7a6655bff..000000000
--- a/code/nel/acinclude.m4
+++ /dev/null
@@ -1,1214 +0,0 @@
-# =========================================================================
-#
-# Macros used by Nevrax in configure.in files.
-#
-# 
-# =========================================================================
-
-# =========================================================================
-# WARNING: The original version of this file is placed in the $CVSROOT/code
-#          directory.
-#          There is links in the $CVSROOT/code sub-directories to that file
-#          (ex: $CVSROOT/code/nel), so be careful of the consequences of
-#          any modification of that file.
-# =========================================================================
-
-# =========================================================================
-# Macros available in that file.
-#
-#
-# AM_NEL_DEBUG
-#
-#    Option:      none.
-#    Description: manage the different debug and the release mode by setting
-#                 correctly the CFLAGS and CXXFLAGS variables.
-#
-#
-# AM_PATH_NEL
-#
-#    Option:      none.
-#    Description: check the instalation of the NeL library and set the
-#                 CXXFLAGS and LIBS variables to use it.
-#
-#
-# AM_PATH_OPENGL
-#
-#    Option:      "yes" if the use of the OpenGL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENGL_CFLAGS and OPENGL_LIBS variables to use it.
-#
-#
-# AM_PATH_FREETYPE
-#
-#    Option:      "yes" if the use of the Freetype library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it.
-#
-#
-# AM_PATH_XF86VIDMODE
-#
-#    Option:      none.
-#    Description: check the instalation of the OpenGL library and set the
-#                 XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it.
-#
-#
-# AM_PATH_OPENAL
-#
-#    Option:      "yes" if the use of the OpenAL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENAL_CFLAGS and OPENAL_LIBS variables to use it.
-#
-#
-# AM_PATH_PYTHON
-#
-#    Option:      "yes" if the use of the Python library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 PYTHON_CFLAGS and PYTHON_LIBS variables to use it.
-#
-# =========================================================================
-
-
-# =========================================================================
-# AM_NEL_DEBUG
-
-AC_DEFUN([AM_NEL_DEBUG],
-[
-
-MAX_C_OPTIMIZE="-O6"
-
-NL_DEBUG="-DNL_DEBUG"
-NL_RELEASE="-DNL_RELEASE"
-
-AC_ARG_WITH(debug,
-    [  --with-debug[=full|medium|fast]
-                          Build a debug version (huge libraries).
-                          Full mode set no optimization.
-                          Medium mode set NeL debug flags with inline
-                          optimization (default mode).
-                          Fast mode is like the Medium mode with some basic
-                          optimization.
-  --without-debug         Build without debugging code (default)],
-    [with_debug=$withval],
-    [with_debug=no])
-
-# Build optimized or debug version ?
-# First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
-then
-    DEBUG_CFLAGS="-g -O0"
-    DEBUG_OPTIMIZE_CC="-O"
-    OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
-else
-    DEBUG_CFLAGS=""
-    DEBUG_OPTIMIZE_CC=""
-    OPTIMIZE_CFLAGS=""
-fi
-
-if test "$ac_cv_prog_cxx_g" = "yes"
-then
-    DEBUG_CXXFLAGS="-g -O0"
-    DEBUG_OPTIMIZE_CXX="-O"
-    OPTIMIZE_CXXFLAGS="-O3"
-    OPTIMIZE_INLINE_CXXFLAGS="-finline-functions"
-else
-    DEBUG_CXXFLAGS=""
-    DEBUG_OPTIMIZE_CXX=""
-    OPTIMIZE_CXXFLAGS=""
-    OPTIMIZE_INLINE_CXXFLAGS=""
-fi
-
-if test "$with_debug" = "yes" -o "$with_debug" = "medium"
-then
-    # Medium debug. Inline optimization
-    CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS"
-    CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-else
-    if test "$with_debug" = "full"
-    then
-        # Full debug. Very slow in some cases
-        CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $CFLAGS"
-        CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-    else
-        if test "$with_debug" = "fast"
-        then
-            # Fast debug.
-            CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS"
-            CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-        else
-            # Optimized version. No debug
-            CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE $CFLAGS"
-            CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE $CXXFLAGS"
-        fi
-    fi
-fi
-
-# AC_MSG_RESULT([CFLAGS = $CFLAGS])
-# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS])
-
-])
-
-
-# =========================================================================
-# MY_NEL_HEADER_CHK : NeL header files checking macros
-
-AC_DEFUN([MY_NEL_HEADER_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-header="$2"
-macro="$3"
-is_mandatory="$4"
-
-if test $is_mandatory = "yes"
-then
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $NEL_CFLAGS"
-
-    AC_MSG_CHECKING(for $header)
-
-    AC_EGREP_CPP( yo_header,
-[#include <$header>
-#ifdef $macro
-   yo_header
-#endif],
-  have_header="yes",
-  have_header="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_header" = "yes"
-    then
-        AC_MSG_RESULT(yes)
-    else
-        if test "$is_mandatory" = "yes"
-        then
-            AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).])
-        else
-            AC_MSG_RESULT(no)
-        fi
-    fi
-fi
-
-        
-])
-
-
-# =========================================================================
-# MY_NEL_LIB_CHK : NeL library checking macros
-
-AC_DEFUN([MY_NEL_LIB_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-nel_test_lib="$2"
-is_mandatory="$3"
-
-if test $is_mandatory = "yes"
-then
-
-    AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).])])
-fi
-])
-
-
-# =========================================================================
-# AM_PATH_NEL : NeL checking macros
-AC_DEFUN([AM_PATH_NEL],
-[ AC_REQUIRE_CPP()
-
-AC_ARG_WITH( nel,
-    [  --with-nel=<path>       path to the NeL install files directory.
-                          e.g. /usr/local/nel])
-
-AC_ARG_WITH( nel-include,
-    [  --with-nel-include=<path>
-                          path to the NeL header files directory.
-                          e.g. /usr/local/nel/include])
-
-AC_ARG_WITH( nel-lib,
-    [  --with-nel-lib=<path>
-                          path to the NeL library files directory.
-                          e.g. /usr/local/nel/lib])
-
-
-nelmisc_is_mandatory="$1"
-nelnet_is_mandatory="$2"
-nel3d_is_mandatory="$3"
-nelpacs_is_mandatory="$4"
-nelsound_is_mandatory="$5"
-nelai_is_mandatory="$6"
-nelgeorges_is_mandatory="$7"
-
-# Check for nel-config
-AC_PATH_PROG(NEL_CONFIG, nel-config, no)
-
-# 
-# Configure options (--with-nel*) have precendence 
-# over nel-config only set variables if they are not 
-# specified
-#
-if test "$NEL_CONFIG" != "no"
-then
-    if test -z "$with_nel" -a -z "$with_nel_include"
-    then
-	CXXFLAGS="$CXXFLAGS `nel-config --cflags`"
-    fi
-
-    if test -z "$with_nel" -a -z "$with_nel_lib"
-    then
-	LDFLAGS="`nel-config --ldflags` $LDFLAGS"
-    fi
-fi
-
-#
-# Set nel_libraries and nel_includes according to
-# user specification (--with-nel*) if any. 
-# --with-nel-include and --with-nel-lib have precendence
-# over --with-nel
-#
-if test "$with_nel" = "no"
-then
-    # The user explicitly disabled the use of the NeL
-    AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel])
-else
-    if test "$with_nel" -a "$with_nel" != "yes"
-    then
-	nel_includes="$with_nel/include"
-	nel_libraries="$with_nel/lib"
-    fi
-fi
-
-if test "$with_nel_include"
-then
-    nel_includes="$with_nel_include"
-fi
-
-if test "$with_nel_lib"
-then
-    nel_libraries="$with_nel_lib"
-fi
-
-#
-# Set compilation variables 
-#
-if test "$nel_includes"
-then
-    CXXFLAGS="$CXXFLAGS -I$nel_includes"
-fi
-
-if test "$nel_libraries"
-then
-    LDFLAGS="-L$nel_libraries $LDFLAGS"
-fi
-
-#
-# Collect headers information and bark if missing and
-# mandatory
-#
-
-MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)
-MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory)
-MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory)
-MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory)
-
-#
-# Collect libraries information and bark if missing and
-# mandatory
-#
-
-MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory)
-MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory)
-MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory)
-MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory)
-MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory)
-MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory)
-MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory)
-
-])
-
-# =========================================================================
-# AM_PATH_OPENGL : OpenGL checking macros
-
-AC_DEFUN([AM_PATH_OPENGL],
-[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2)
-
-is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( opengl,
-    [  --with-opengl=<path>    path to the OpenGL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( opengl-include,
-    [  --with-opengl-include=<path>
-                          path to the OpenGL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( opengl-lib,
-    [  --with-opengl-lib=<path>
-                          path to the OpenGL library files directory.
-                          e.g. /usr/local/lib])
-
-opengl_lib="GL"
-
-if test "$with_opengl"
-then
-    opengl_includes="$with_opengl/include"
-    opengl_libraries="$with_opengl/lib"
-fi
-
-if test "$with_opengl_include"
-then
-    opengl_includes="$with_opengl_include"
-fi
-
-if test "$with_opengl_lib"
-then
-    opengl_libraries="$with_opengl_lib"
-fi
-
-# Set OPENGL_CFLAGS
-if test "$opengl_includes"
-then
-    OPENGL_CFLAGS="-I$opengl_includes"
-fi
-
-# Set OPENGL_LIBS
-if test "$opengl_libraries"
-then
-    OPENGL_LIBS="-L$opengl_libraries"
-fi
-OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib"
-
-# Test the headers
-_CPPFLAGS="$CPPFLAGS"
-
-CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS"
-
-AC_EGREP_CPP( yo_opengl,
-[#include <GL/gl.h>       
-#if defined(GL_VERSION_1_2)
-   yo_opengl
-#endif],
-  have_opengl_headers="yes", 
-  have_opengl_headers="no" )
-
-if test "$have_opengl_headers" = "yes"
-then
-    if test "$opengl_includes"
-    then
-        AC_MSG_RESULT([$opengl_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Checking the GLEXT version >= 7
-AC_MSG_CHECKING(for <GL/glext.h> and GLEXT version >= 7)
-
-AC_EGREP_CPP( yo_glext_version,
-[#include <GL/glext.h>
-#ifdef GL_GLEXT_VERSION
-#if GL_GLEXT_VERSION >= 7
-   yo_glext_version
-#endif
-#endif],
-  have_glext="yes",
-  have_glext="no" )
-
-if test "$have_glext" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT([no, <GL/glext.h> can be downloaded from http://www.opengl.org/registry/])
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for OpenGL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENGL_LIBS"
-
-AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_opengl_libraries" = "yes"
-then
-    if test "$opengl_libraries"
-    then
-        AC_MSG_RESULT([$opengl_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-opengl_libraries="$opengl_libraries"
-
-if test "$have_opengl_headers" = "yes" \
-        -a "$have_glext" = "yes" \
-        -a "$have_opengl_libraries" = "yes"
-then
-    have_opengl="yes"
-else
-    have_opengl="no"
-fi
-
-if test "$have_opengl" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)])
-fi
-
-AC_SUBST(OPENGL_CFLAGS)
-AC_SUBST(OPENGL_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_FREETYPE : FreeType checking macros
-
-AC_DEFUN([AM_PATH_FREETYPE],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( freetype,
-    [  --with-freetype=<path>   path to the FreeType install files directory.
-                          e.g. /usr/local/freetype])
-
-AC_ARG_WITH( freetype-include,
-    [  --with-freetype-include=<path>
-                          path to the FreeType header files directory.
-                          e.g. /usr/local/freetype/include])
-
-AC_ARG_WITH( freetype-lib,
-    [  --with-freetype-lib=<path>
-                          path to the FreeType library files directory.
-                          e.g. /usr/local/freetype/lib])
-
-freetype_lib="freetype"
-
-
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-  
-if test "$FREETYPE_CONFIG" = "no"
-then
-    have_freetype_config="no"
-else
-    FREETYPE_CFLAGS=`freetype-config --cflags`
-    FREETYPE_LIBS=`freetype-config --libs`
-    have_freetype_config="yes"
-fi
-
-if test "$with_freetype"
-then
-    freetype_includes="$with_freetype/include"
-    freetype_libraries="$with_freetype/lib"
-fi
-
-if test "$with_freetype_include"
-then
-    freetype_includes="$with_freetype_include"
-fi
-
-if test "$with_freetype_lib"
-then
-    freetype_libraries="$with_freetype_lib"
-fi
-
-if test "$freetype_includes"
-then
-    FREETYPE_CFLAGS="-I$freetype_includes"
-fi
-
-# Checking the FreeType 2 instalation
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
-
-AC_MSG_CHECKING(for FreeType version = 2)
-
-AC_EGREP_CPP( yo_freetype2,
-[#include <freetype/freetype.h>
-#if FREETYPE_MAJOR == 2
-   yo_freetype2
-#endif],
-  have_freetype2="yes",
-  have_freetype2="no")
-
-if test "$have_freetype2" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT(no)
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for FreeType libraries)
-        
-if test $freetype_libraries
-then
-    FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"
-fi
-
-CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS"
-    
-AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_freetype_libraries" = "yes"
-then    
-    if test "$freetype_libraries"
-    then
-        AC_MSG_RESULT([$freetype_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes"
-then
-    have_freetype="yes"
-else
-    have_freetype="no"
-fi
-
-if test "$have_freetype" = "no" && test "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)])
-fi
-
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_XF86VIDMODE : XF86VidMode checking macros
-
-AC_DEFUN([AM_PATH_XF86VIDMODE],
-[ AC_MSG_CHECKING(for XF86VidMode extension)
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( xf86vidmode-lib,
-    [  --with-xf86vidmode-lib=<path>
-                          path to the XF86VidMode library.
-                          e.g. /usr/X11R6/lib] )
-
-xf86vidmode_lib="Xxf86vm"
-
-if test "$with_xf86vidmode_lib" = no
-then
-    # The user explicitly disabled the use of XF86VidMode
-    have_xf86vidmode="disabled"
-    AC_MSG_RESULT(disabled)
-else
-    if test "$with_xf86vidmode_lib"
-    then
-        xf86vidmode_libraries="$with_xf86vidmode_lib"
-    fi
-
-    XF86VIDMODE_CFLAGS="-DXF86VIDMODE"
-fi
-
-if test -z "$have_xf86vidmode"
-# -a "$with_xf86vidmode_lib"
-then
-    if test "$xf86vidmode_libraries"
-    then
-        XF86VIDMODE_LIBS="-L$xf86vidmode_libraries"
-    fi
-
-    XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS"
-
-    AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_xf86vidmode_libraries" = "yes"
-    then
-        have_xf86vidmode="yes"
-        if test "$xf86vidmode_libraries"
-        then
-            AC_MSG_RESULT($xf86vidmode_libraries)
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        have_xf86vidmode="no"
-        AC_MSG_RESULT(no, no fullscreen support available.)
-    fi
-
-    xf86vidmode_libraries="$xf86vidmode_libraries"
-
-fi
-
-AC_SUBST(XF86VIDMODE_CFLAGS)
-AC_SUBST(XF86VIDMODE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_OPENAL : OpenAL checking macros
-
-AC_DEFUN([AM_PATH_OPENAL],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the OpenAL files location
-AC_ARG_WITH( openal,
-    [  --with-openal=<path>   path to the OpenAL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( openal-include,
-    [  --with-openal-include=<path>
-                          path to the OpenAL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( openal-lib,
-    [  --with-openal-lib=<path>
-                          path to the OpenAL library files directory.
-                          e.g. /usr/local/lib])
-
-openal_lib="openal"
-alut_lib="alut"
-
-if test $with_openal
-then
-    openal_includes="$with_openal/include"
-    openal_libraries="$with_openal/lib"
-fi
-
-if test "$with_openal_include"
-then
-    openal_includes="$with_openal_include"
-fi
-
-if test "$with_openal_lib"
-then
-    openal_libraries="$with_openal_lib"
-fi
-
-
-# Set OPENAL_CFLAGS
-if test "$openal_includes"
-then
-    OPENAL_CFLAGS="-I$openal_includes"
-fi
-
-# Set OPENAL_LIBS
-if test "$openal_libraries"
-then
-    OPENAL_LIBS="-L$openal_libraries"
-fi
-OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib -l$alut_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS"
-
-AC_MSG_CHECKING(for OpenAL headers)
-AC_EGREP_CPP( yo_openal,
-[#include <AL/al.h>
-#include <AL/alut.h>
-#ifdef AL_VERSION
-   yo_openal
-#endif],
-  have_openal_headers="yes",
-  have_openal_headers="no" )
-
-if test "$have_openal_headers" = "yes"
-then
-    if test "$openal_includes"
-    then
-        AC_MSG_RESULT([$openal_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for OpenAL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENAL_LIBS"
-
-AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_openal_libraries" = "yes"
-then
-    if test "$openal_libraries"
-    then
-        AC_MSG_RESULT([$openal_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-openal_libraries="$openal_libraries"
-
-if test "$have_openal_headers" = "yes" \
-   && test "$have_openal_libraries" = "yes"
-then
-    have_openal="yes"
-else
-    have_openal="no"
-fi
-
-if test "$have_openal" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).])
-fi
-
-AC_SUBST(OPENAL_CFLAGS)
-AC_SUBST(OPENAL_LIBS)
-AC_SUBST([have_openal])
-
-])
-
-
-# =========================================================================
-# AM_PATH_PYTHON : Python checking macros
-
-AC_DEFUN([AM_PATH_PYTHON],
-[ python_version_required="$1"
-
-is_mandatory="$2"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the Python files location
-AC_ARG_WITH( python,
-    [  --with-python=<path>    path to the Python prefix installation directory.
-                          e.g. /usr/local],
-    [ PYTHON_PREFIX=$with_python ]
-)
-
-AC_ARG_WITH( python-version,
-    [  --with-python-version=<version>
-                          Python version to use, e.g. 1.5],
-    [ PYTHON_VERSION=$with_python_version ]
-)
-
-if test ! "$PYTHON_PREFIX" = ""
-then
-    PATH="$PYTHON_PREFIX/bin:$PATH"
-fi
-
-if test ! "$PYTHON_VERSION" = ""
-then
-    PYTHON_EXEC="python$PYTHON_VERSION"
-else
-    PYTHON_EXEC="python python2.1 python2.0 python1.5"
-fi
-
-AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH)
-
-if test "$PYTHON" != "no"
-then
-    PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'`
-    PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'`
-
-    is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION`
-fi
-
-
-if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1"
-then
-
-    if test "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)])
-    else
-        have_python="no"
-    fi
-
-else
-
-    python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION"
-    python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config"
-    python_lib="python$PYTHON_VERSION"
-
-    PYTHON_CFLAGS="-I$python_includes"
-    PYTHON_LIBS="-L$python_libraries -l$python_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}"
-
-    # Test the headers
-    AC_MSG_CHECKING(for Python headers)
-
-    AC_EGREP_CPP( yo_python,
-    [#include <Python.h>
-   yo_python
-    ],
-      have_python_headers="yes",
-      have_python_headers="no" )
-
-    if test "$have_python_headers" = "yes"
-    then
-        AC_MSG_RESULT([$python_includes])
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    # Test the libraries
-    AC_MSG_CHECKING(for Python libraries)
-
-    CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
-
-    AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_python_libraries" = "yes"
-    then
-        if test "$python_libraries"
-        then
-            AC_MSG_RESULT([$python_libraries])
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    if test "$have_python_headers" = "yes" \
-       && test "$have_python_libraries" = "yes"
-    then
-        have_python="yes"
-    else
-        have_python="no"
-    fi
-
-    if test "$have_python" = "no" -a "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).])
-    fi
-
-    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_LIBS)
-
-fi
-
-])
-
-# =========================================================================
-# AM_PATH_MYSQL : MySQL library
-
-# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
-#
-AC_DEFUN([AM_PATH_MYSQL],
-[# 
-# Get the cflags and libraries from the mysql_config script
-#
-AC_ARG_WITH(mysql-prefix,[  --with-mysql-prefix=PFX   Prefix where MYSQL is installed (optional)],
-            mysql_prefix="$withval", mysql_prefix="")
-AC_ARG_WITH(mysql-exec-prefix,[  --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)],
-            mysql_exec_prefix="$withval", mysql_exec_prefix="")
-AC_ARG_ENABLE(mysqltest, [  --disable-mysqltest       Do not try to compile and run a test MYSQL program],
-		    , enable_mysqltest=yes)
-
-  if test x$mysql_exec_prefix != x ; then
-     mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config
-     fi
-  fi
-  if test x$mysql_prefix != x ; then
-     mysql_args="$mysql_args --prefix=$mysql_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_prefix/bin/mysql_config
-     fi
-  fi
-
-  AC_REQUIRE([AC_CANONICAL_TARGET])
-  AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no)
-  min_mysql_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version)
-  no_mysql=""
-  if test "$MYSQL_CONFIG" = "no" ; then
-    no_mysql=yes
-  else
-    MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"`
-    MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"`
-
-    mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_mysqltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-      LIBS="$LIBS $MYSQL_LIBS"
-#
-# Now check if the installed MYSQL is sufficiently new. (Also sanity
-# checks the results of mysql_config to some extent
-#
-      rm -f conf.mysqltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mysql.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.mysqltest");
-  */
-  { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_mysql_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_mysql_version");
-     exit(1);
-   }
-
-   if (($mysql_major_version > major) ||
-      (($mysql_major_version == major) && ($mysql_minor_version > minor)) ||
-      (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version);
-      printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n");
-      printf("*** to point to the correct copy of mysql_config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_mysql" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$MYSQL_CONFIG" = "no" ; then
-       echo "*** The mysql_config script installed by MYSQL could not be found"
-       echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the MYSQL_CONFIG environment variable to the"
-       echo "*** full path to mysql_config."
-     else
-       if test -f conf.mysqltest ; then
-        :
-       else
-          echo "*** Could not run MYSQL test program, checking why..."
-          CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-          LIBS="$LIBS $MYSQL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <mysql.h>
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding MYSQL or finding the wrong"
-          echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means MYSQL was incorrectly installed"
-          echo "*** or that you have moved MYSQL since it was installed. In the latter case, you"
-          echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     MYSQL_CFLAGS=""
-     MYSQL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(MYSQL_CFLAGS)
-  AC_SUBST(MYSQL_LIBS)
-  rm -f conf.mysqltest
-])
-
-# =========================================================================
-# AM_PATH_FMOD : FMOD checking macros
-
-AC_DEFUN([AM_PATH_FMOD],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the FMOD files location
-AC_ARG_WITH( fmod,
-    [  --with-fmod=<path>   path to the FMOD install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( fmod-include,
-    [  --with-fmod-include=<path>
-                          path to the FMOD header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( fmod-lib,
-    [  --with-fmod-lib=<path>
-                          path to the FMOD library files directory.
-                          e.g. /usr/local/lib])
-
-fmod_lib="fmod"
-
-if test $with_fmod
-then
-    fmod_includes="$with_fmod/include"
-    fmod_libraries="$with_fmod/lib"
-fi
-
-if test "$with_fmod_include"
-then
-    fmod_includes="$with_fmod_include"
-fi
-
-if test "$with_fmod_lib"
-then
-    fmod_libraries="$with_fmod_lib"
-fi
-
-
-# Set FMOD_CFLAGS
-if test "$fmod_includes"
-then
-    FMOD_CFLAGS="-I$fmod_includes"
-fi
-
-# Set FMOD_LIBS
-if test "$fmod_libraries"
-then
-    FMOD_LIBS="-L$fmod_libraries"
-fi
-FMOD_LIBS="$FMOD_LIBS -l$fmod_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS"
-
-AC_MSG_CHECKING(for FMOD headers)
-AC_EGREP_CPP( yo_fmod,
-[#include <fmod.h>
-#ifdef FMOD_VERSION
-   yo_fmod
-#endif],
-  have_fmod_headers="yes",
-  have_fmod_headers="no" )
-
-if test "$have_fmod_headers" = "yes"
-then
-    if test "$fmod_includes"
-    then
-        AC_MSG_RESULT([$fmod_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for FMOD libraries)
-
-CPPFLAGS="$CXXFLAGS $FMOD_LIBS"
-
-AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_fmod_libraries" = "yes"
-then
-    if test "$fmod_libraries"
-    then
-        AC_MSG_RESULT([$fmod_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-fmod_libraries="$fmod_libraries"
-
-if test "$have_fmod_headers" = "yes" \
-   && test "$have_fmod_libraries" = "yes"
-then
-    have_fmod="yes"
-else
-    have_fmod="no"
-fi
-
-if test "$have_fmod" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).])
-fi
-
-AC_SUBST(FMOD_CFLAGS)
-AC_SUBST(FMOD_LIBS)
-AC_SUBST([have_fmod])
-
-])
-
-# =========================================================================
-# End of file
-
diff --git a/code/nel/autogen.sh b/code/nel/autogen.sh
deleted file mode 100755
index b863e1067..000000000
--- a/code/nel/autogen.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh -
-
-WANT_AUTOMAKE="1.6"
-
-case `uname -s` in
-Darwin)
-	LIBTOOLIZE=glibtoolize
-	;;
-*)
-	LIBTOOLIZE=libtoolize
-	;;
-esac
-
-# be able to customize the aclocal (for example to add extra param)
-if test "x$ACLOCAL" = "x"
-then
-	ACLOCAL=aclocal
-fi
-
-echo "Creating macros..." && \
-$ACLOCAL -I automacros/ && \
-echo "Creating library tools..." && \
-$LIBTOOLIZE --force && \
-echo "Creating header templates..." && \
-autoheader && \
-echo "Creating Makefile templates..." && \
-automake --gnu --add-missing && \
-echo "Creating 'configure'..." && \
-autoconf && \
-echo "" && \
-echo "Run: ./configure; make; make install" && \
-echo ""
diff --git a/code/nel/automacros/gtk-2.0.m4 b/code/nel/automacros/gtk-2.0.m4
deleted file mode 100644
index 3deba01be..000000000
--- a/code/nel/automacros/gtk-2.0.m4
+++ /dev/null
@@ -1,196 +0,0 @@
-# Configure paths for GTK+
-# Owen Taylor     1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, 
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl 
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [  --disable-gtktest       do not try to compile and run a test GTK+ program],
-		    , enable_gtktest=yes)
-
-  pkg_config_args=gtk+-2.0
-  for module in . $4
-  do
-      case "$module" in
-         gthread) 
-             pkg_config_args="$pkg_config_args gthread-2.0"
-         ;;
-      esac
-  done
-
-  no_gtk=""
-
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
-  if test x$PKG_CONFIG != xno ; then
-    if pkg-config --atleast-pkgconfig-version 0.7 ; then
-      :
-    else
-      echo "*** pkg-config too old; version 0.7 or better required."
-      no_gtk=yes
-      PKG_CONFIG=no
-    fi
-  else
-    no_gtk=yes
-  fi
-
-  min_gtk_version=ifelse([$1], ,2.0.0,$1)
-  AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
-  if test x$PKG_CONFIG != xno ; then
-    ## don't try to run the test against uninstalled libtool libs
-    if $PKG_CONFIG --uninstalled $pkg_config_args; then
-	  echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-	  enable_gtktest=no
-    fi
-
-    if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-	  :
-    else
-	  no_gtk=yes
-    fi
-  fi
-
-  if test x"$no_gtk" = x ; then
-    GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-    GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-    gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_gtktest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $GTK_CFLAGS"
-      LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
-      rm -f conf.gtktest
-      AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int 
-main ()
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  system ("touch conf.gtktest");
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = g_strdup("$min_gtk_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-  if ((gtk_major_version != $gtk_config_major_version) ||
-      (gtk_minor_version != $gtk_config_minor_version) ||
-      (gtk_micro_version != $gtk_config_micro_version))
-    {
-      printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
-             $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-             gtk_major_version, gtk_minor_version, gtk_micro_version);
-      printf ("*** was found! If pkg-config was correct, then it is best\n");
-      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-      printf("*** required on your system.\n");
-      printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-      printf("*** to point to the correct configuration files\n");
-    } 
-  else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-	   (gtk_minor_version != GTK_MINOR_VERSION) ||
-           (gtk_micro_version != GTK_MICRO_VERSION))
-    {
-      printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-	     GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-      printf("*** library (version %d.%d.%d)\n",
-	     gtk_major_version, gtk_minor_version, gtk_micro_version);
-    }
-  else
-    {
-      if ((gtk_major_version > major) ||
-        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-      {
-        return 0;
-       }
-     else
-      {
-        printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-               gtk_major_version, gtk_minor_version, gtk_micro_version);
-        printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-	       major, minor, micro);
-        printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-        printf("***\n");
-        printf("*** If you have already installed a sufficiently new version, this error\n");
-        printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-        printf("*** being found. The easiest way to fix this is to remove the old version\n");
-        printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-        printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-        printf("*** so that the correct libraries are found at run-time))\n");
-      }
-    }
-  return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_gtk" = x ; then
-     AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$PKG_CONFIG" = "no" ; then
-       echo "*** A new enough version of pkg-config was not found."
-       echo "*** See http://pkgconfig.sourceforge.net"
-     else
-       if test -f conf.gtktest ; then
-        :
-       else
-          echo "*** Could not run GTK+ test program, checking why..."
-	  ac_save_CFLAGS="$CFLAGS"
-	  ac_save_LIBS="$LIBS"
-          CFLAGS="$CFLAGS $GTK_CFLAGS"
-          LIBS="$LIBS $GTK_LIBS"
-          AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-],      [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-          echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(GTK_CFLAGS)
-  AC_SUBST(GTK_LIBS)
-  rm -f conf.gtktest
-])
diff --git a/code/nel/automacros/ogg.m4 b/code/nel/automacros/ogg.m4
deleted file mode 100644
index 0e1f1abf5..000000000
--- a/code/nel/automacros/ogg.m4
+++ /dev/null
@@ -1,102 +0,0 @@
-# Configure paths for libogg
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-
-dnl XIPH_PATH_OGG([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libogg, and define OGG_CFLAGS and OGG_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_OGG],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(ogg,[  --with-ogg=PFX   Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="")
-AC_ARG_WITH(ogg-libraries,[  --with-ogg-libraries=DIR   Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="")
-AC_ARG_WITH(ogg-includes,[  --with-ogg-includes=DIR   Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="")
-AC_ARG_ENABLE(oggtest, [  --disable-oggtest       Do not try to compile and run a test Ogg program],, enable_oggtest=yes)
-
-  if test "x$ogg_libraries" != "x" ; then
-    OGG_LIBS="-L$ogg_libraries"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_LIBS="-L$ogg_prefix/lib"
-  elif test "x$prefix" != "xNONE" ; then
-    OGG_LIBS="-L$prefix/lib"
-  fi
-
-  OGG_LIBS="$OGG_LIBS -logg"
-
-  if test "x$ogg_includes" != "x" ; then
-    OGG_CFLAGS="-I$ogg_includes"
-  elif test "x$ogg_prefix" != "x" ; then
-    OGG_CFLAGS="-I$ogg_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    OGG_CFLAGS="-I$prefix/include"
-  fi
-
-  AC_MSG_CHECKING(for Ogg)
-  no_ogg=""
-
-
-  if test "x$enable_oggtest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $OGG_CFLAGS"
-    LIBS="$LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Ogg is sufficiently new.
-dnl
-      rm -f conf.oggtest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ogg/ogg.h>
-
-int main ()
-{
-  system("touch conf.oggtest");
-  return 0;
-}
-
-],, no_ogg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_ogg" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.oggtest ; then
-       :
-     else
-       echo "*** Could not run Ogg test program, checking why..."
-       CFLAGS="$CFLAGS $OGG_CFLAGS"
-       LIBS="$LIBS $OGG_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <ogg/ogg.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Ogg or finding the wrong"
-       echo "*** version of Ogg. If it is not finding Ogg, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Ogg was incorrectly installed"
-       echo "*** or that you have moved Ogg since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     OGG_CFLAGS=""
-     OGG_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(OGG_CFLAGS)
-  AC_SUBST(OGG_LIBS)
-  rm -f conf.oggtest
-])
diff --git a/code/nel/automacros/pkg.m4 b/code/nel/automacros/pkg.m4
deleted file mode 100644
index c29b6c057..000000000
--- a/code/nel/automacros/pkg.m4
+++ /dev/null
@@ -1,157 +0,0 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-    if test -n "$$1"; then
-        pkg_cv_[]$1="$$1"
-    else
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-    fi
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT
-])],
-		[AC_MSG_RESULT([no])
-                $4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
diff --git a/code/nel/automacros/vorbis.m4 b/code/nel/automacros/vorbis.m4
deleted file mode 100644
index 300cc6c7d..000000000
--- a/code/nel/automacros/vorbis.m4
+++ /dev/null
@@ -1,122 +0,0 @@
-# Configure paths for libvorbis
-# Jack Moffitt <jack@icecast.org> 10-21-2000
-# Shamelessly stolen from Owen Taylor and Manish Singh
-# thomasvs added check for vorbis_bitrate_addblock which is new in rc3
-
-dnl XIPH_PATH_VORBIS([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
-dnl Test for libvorbis, and define VORBIS_CFLAGS and VORBIS_LIBS
-dnl
-AC_DEFUN([XIPH_PATH_VORBIS],
-[dnl 
-dnl Get the cflags and libraries
-dnl
-AC_ARG_WITH(vorbis,[  --with-vorbis=PFX   Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="")
-AC_ARG_WITH(vorbis-libraries,[  --with-vorbis-libraries=DIR   Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="")
-AC_ARG_WITH(vorbis-includes,[  --with-vorbis-includes=DIR   Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="")
-AC_ARG_ENABLE(vorbistest, [  --disable-vorbistest       Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes)
-
-  if test "x$vorbis_libraries" != "x" ; then
-    VORBIS_LIBS="-L$vorbis_libraries"
-  elif test "x$vorbis_prefix" != "x" ; then
-    VORBIS_LIBS="-L$vorbis_prefix/lib"
-  elif test "x$prefix" != "xNONE"; then
-    VORBIS_LIBS="-L$prefix/lib"
-  fi
-
-  VORBIS_LIBS="$VORBIS_LIBS -lvorbis -lm"
-  VORBISFILE_LIBS="-lvorbisfile"
-  VORBISENC_LIBS="-lvorbisenc"
-
-  if test "x$vorbis_includes" != "x" ; then
-    VORBIS_CFLAGS="-I$vorbis_includes"
-  elif test "x$vorbis_prefix" != "x" ; then
-    VORBIS_CFLAGS="-I$vorbis_prefix/include"
-  elif test "x$prefix" != "xNONE"; then
-    VORBIS_CFLAGS="-I$prefix/include"
-  fi
-
-
-  AC_MSG_CHECKING(for Vorbis)
-  no_vorbis=""
-
-
-  if test "x$enable_vorbistest" = "xyes" ; then
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $VORBIS_CFLAGS $OGG_CFLAGS"
-    LIBS="$LIBS $VORBIS_LIBS $VORBISENC_LIBS $OGG_LIBS"
-dnl
-dnl Now check if the installed Vorbis is sufficiently new.
-dnl
-      rm -f conf.vorbistest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
-
-int main ()
-{
-    vorbis_block 	vb;
-    vorbis_dsp_state	vd;
-    vorbis_info		vi;
-
-    vorbis_info_init (&vi);
-    vorbis_encode_init (&vi, 2, 44100, -1, 128000, -1);
-    vorbis_analysis_init (&vd, &vi);
-    vorbis_block_init (&vd, &vb);
-    /* this function was added in 1.0rc3, so this is what we're testing for */
-    vorbis_bitrate_addblock (&vb);
-
-    system("touch conf.vorbistest");
-    return 0;
-}
-
-],, no_vorbis=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-  fi
-
-  if test "x$no_vorbis" = "x" ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$1], , :, [$1])     
-  else
-     AC_MSG_RESULT(no)
-     if test -f conf.vorbistest ; then
-       :
-     else
-       echo "*** Could not run Vorbis test program, checking why..."
-       CFLAGS="$CFLAGS $VORBIS_CFLAGS"
-       LIBS="$LIBS $VORBIS_LIBS $OGG_LIBS"
-       AC_TRY_LINK([
-#include <stdio.h>
-#include <vorbis/codec.h>
-],     [ return 0; ],
-       [ echo "*** The test program compiled, but did not run. This usually means"
-       echo "*** that the run-time linker is not finding Vorbis or finding the wrong"
-       echo "*** version of Vorbis. If it is not finding Vorbis, you'll need to set your"
-       echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-       echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-       echo "*** is required on your system"
-       echo "***"
-       echo "*** If you have an old version installed, it is best to remove it, although"
-       echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-       [ echo "*** The test program failed to compile or link. See the file config.log for the"
-       echo "*** exact error that occured. This usually means Vorbis was incorrectly installed"
-       echo "*** or that you have moved Vorbis since it was installed." ])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-     VORBIS_CFLAGS=""
-     VORBIS_LIBS=""
-     VORBISFILE_LIBS=""
-     VORBISENC_LIBS=""
-     ifelse([$2], , :, [$2])
-  fi
-  AC_SUBST(VORBIS_CFLAGS)
-  AC_SUBST(VORBIS_LIBS)
-  AC_SUBST(VORBISFILE_LIBS)
-  AC_SUBST(VORBISENC_LIBS)
-  rm -f conf.vorbistest
-])
diff --git a/code/nel/configure.ac b/code/nel/configure.ac
deleted file mode 100644
index 84edccc05..000000000
--- a/code/nel/configure.ac
+++ /dev/null
@@ -1,599 +0,0 @@
-# ====================================================================
-# Configuration script for NeL
-# ====================================================================
-#
-# $Id: configure.ac,v 1.8 2005/04/14 15:54:32 cado Exp $
-# 
-
-# ====================================================================
-# Process this file with autoconf to produce a configure script.
-# ====================================================================
-
-# If you want to change the version, must must change AC_INIT
-# *and* AC_SUBST(LIBTOOL_VERSION)
-
-AC_PREREQ(2.57)
-AC_INIT([nel],[0.8.0],[nel-all@nevrax.org])
-AM_INIT_AUTOMAKE([tar-ustar])
-
-AC_CONFIG_SRCDIR(include/nel/misc/types_nl.h)
-AM_CONFIG_HEADER(include/nelconfig.h)
-
-AC_SUBST(LIBTOOL_VERSION, [0:7:0])
-
-# Checks for programs.
-AC_CANONICAL_HOST
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_YACC
-AC_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL
-AM_SANITY_CHECK
-
-AC_SYS_LARGEFILE
-
-AM_MAINTAINER_MODE
-
-
-# Template needed to generate the nelconfig.h.in
-AH_TEMPLATE([NEL_DEFAULT_DISPLAYER],[Define to 1 if you want log on standard output])
-AH_TEMPLATE([NEL_LOG_IN_FILE],[Define to 1 if you want a debug log.log file in the current directory])
-AH_TEMPLATE([HAVE_X86],[Define to 1 if you are on a INTEL compatible processor])
-AH_TEMPLATE([HAVE_X86_64],[Define to 1 if you are on AMD opteron 64bits processor])
-AH_TEMPLATE([NL_USE_GTK], [Define to 1 if you want GTK support])
-
-# Get host type info
-if test "$host_cpu" = "i386" -o "$host_cpu" = "i486" -o "$host_cpu" = "i586" \
-     -o "$host_cpu" = "i686" -o "$host_cpu" = "i786" -o "$host_cpu" = "x86_64"
-then
-    AC_DEFINE([HAVE_X86])
-fi
-
-if test "$host_cpu" = "x86_64"
-then
-    AC_DEFINE([HAVE_X86_64])
-fi
-
-# The following hack should ensure that configure doesnt add optimizing
-# or debugging flags to CFLAGS or CXXFLAGS
-CXXFLAGS="$CXXFLAGS -fno-strict-aliasing -ftemplate-depth-24 -fno-stack-protector"
-
-
-# ====================================================================
-# Checks NeL modules (net, 3d) to install / Disable
-# ====================================================================
-
-# The misc is mandatory, it is use by the other modules.
-
-NEL_SUBDIRS="misc"
-
-# NeL libraries that are enabled by default
-
-# Network library
-AC_ARG_ENABLE([net],
-              AC_HELP_STRING([--disable-net],
-                             [disable compilation and install of NeL Network]),
-              [],
-              [enable_net=yes])
-
-if test "$enable_net" = "no"
-then
-   AC_MSG_RESULT([disable NeL Network])
-else
-   NEL_SUBDIRS="$NEL_SUBDIRS net"
-fi
-
-# 3D library
-AC_ARG_ENABLE([3d],
-              AC_HELP_STRING([--disable-3d],
-                             [disable compilation and install of NeL 3D]),
-              [],
-              [enable_3d=yes])
-
-if test "$enable_3d" = "no"
-then
-   AC_MSG_RESULT([disable NeL 3D])
-else
-   NEL_SUBDIRS="$NEL_SUBDIRS 3d"
-fi
-
-# PACS library
-AC_ARG_ENABLE([pacs],
-              AC_HELP_STRING([--disable-pacs],
-                             [disable compilation and install of NeL PACS]),
-              [],
-              [enable_pacs=yes])
-
-if test "$enable_pacs" = "no"
-then
-   AC_MSG_RESULT([disable NeL PACS])
-else
-   NEL_SUBDIRS="$NEL_SUBDIRS pacs"
-fi
-
-# Georges library
-AC_ARG_ENABLE([georges],
-              AC_HELP_STRING([--disable-georges],
-                             [disable compilation and install of NeL Georges]),
-              [],
-              [enable_georges=yes])
-
-if test "$enable_georges" = "no"
-then
-   AC_MSG_RESULT([disable NeL Georges])
-else
-   NEL_SUBDIRS="$NEL_SUBDIRS georges"
-fi
-
-# Ligo library
-AC_ARG_ENABLE([ligo],
-              AC_HELP_STRING([--disable-ligo],
-                             [disable compilation and install of NeL Ligo]),
-              [],
-              [enable_ligo=yes])
-
-if test "$enable_ligo" = "no"
-then
-   AC_MSG_RESULT([disable NeL Ligo])
-else
-   NEL_SUBDIRS="$NEL_SUBDIRS ligo"
-fi
-
-
-# NeL libraries that are disabled by default
-
-# Sound library
-AC_ARG_ENABLE([sound],
-              AC_HELP_STRING([--enable-sound],
-                             [enable compilation and install of NeL Sound]),
-              [],
-              [enable_sound=no])
-
-if test "$enable_sound" = "yes"
-then
-   AC_MSG_RESULT([enable NeL Sound])
-   NEL_SUBDIRS="$NEL_SUBDIRS sound"
-fi
-
-# CEGUI Renderer library
-AC_ARG_ENABLE([cegui],
-              AC_HELP_STRING([--enable-cegui],
-                             [enable compilation and install of NeL CEGUI Renderer]),
-              [],
-              [enable_cegui=no])
-
-CEGUI_SUBDIR=""
-if test "$enable_cegui" = "yes"
-then
-   AC_MSG_RESULT([enable NeL CEGUI Renderer])
-   NEL_SUBDIRS="$NEL_SUBDIRS cegui"
-   CEGUI_SUBDIR="cegui"
-fi
-
-# Unit Tests
-AC_ARG_ENABLE([tests],
-		AC_HELP_STRING([--enable-tests],
-				[enable unit tests of NeL]),
-		[],
-		[enable_tests=no])
-
-if test "$enable_tests" = "yes"
-then
-	AC_MSG_RESULT([enable NeL Unit Tests])
-fi
-
-# Code Coverage
-AC_ARG_ENABLE([coverage],
-	AC_HELP_STRING([--enable-coverage],
-			[enable code coverage generation]),
-		[]
-		[enable_coverage=no])
-
-if test "$enable_coverage" = "yes"
-then
-	AC_MSG_RESULT([enable Code Coverage generation])
-
-	CXXFLAGS="$CXXFLAGS -fprofile-arcs -ftest-coverage"
-fi
-
-# Enable/disable samples compilation.
-AC_ARG_ENABLE([samples],
-	AC_HELP_STRING([--disable-samples],
-			[disable sample code]),
-		[],
-		[enable_samples="yes"])
-
-if test "$enable_samples" = "no"
-then
-	AC_MSG_RESULT([disable sample code.])
-	SAMPLE_SUBDIR=""
-else
-	SAMPLE_SUBDIR="samples"
-fi
-
-# Enable/disable tools compilation.
-AC_ARG_ENABLE([tools],
-	AC_HELP_STRING([--disable-tools],
-			[disable tools code]),
-		[],
-		[enable_tools="yes"])
-
-if test "$enable_tools" = "no"
-then
-	AC_MSG_RESULT([disable tools code.])
-	TOOLS_SUBDIR=""
-else
-	TOOLS_SUBDIR="tools"
-fi
-
-AC_SUBST([enable_net])
-AC_SUBST([enable_3d])
-AC_SUBST([enable_pacs])
-AC_SUBST([enable_sound])
-AC_SUBST([enable_georges])
-AC_SUBST([enable_ligo])
-AC_SUBST([enable_cegui])
-
-AC_SUBST([NEL_SUBDIRS])
-AC_SUBST([SAMPLE_SUBDIR])
-AC_SUBST([TOOLS_SUBDIR])
-AC_SUBST([CEGUI_SUBDIR])
-
-# ====================================================================
-# Checks for programs.
-# ====================================================================
-
-# ====================================================================
-# Configure Settings
-# ====================================================================
-
-# Disable the static linking by default
-# AC_DISABLE_STATIC
-
-# Use C++ compiler as a default for the compilation tests.
-AC_LANG([C++])
-
-
-# ====================================================================
-# Debug/optimized compilation mode
-# ====================================================================
-
-AM_NEL_DEBUG
-
-AC_ARG_WITH([logging],
-            AC_HELP_STRING([--without-logging],
-                           [be silent on stdout and in no log.log]),
-            [],
-            [with_logging=yes])
-
-if test "$with_logging" = "yes"
-then
-	AC_DEFINE([NEL_DEFAULT_DISPLAYER], 1)
-	AC_DEFINE([NEL_LOG_IN_FILE], 1)
-fi
-
-# ====================================================================
-# Checks for typedefs, structures, and compiler characteristics.
-# ====================================================================
-
-# Test endianness
-AC_C_BIGENDIAN
-
-# Supress GCC "multi-character character constant" warnings.
-if test "$ac_cv_cxx_compiler_gnu" = "yes";
-then
-    if test "$with_debug" = "yes"
-    then
-	#
-	# When debugging variables are declared for the sole purpose of
-	# inspecting their content with a debugger. They are not used
-	# in the code itself and this is legitimate, hence the -Wno-unused
-	#
-        CXXFLAGS="$CXXFLAGS -Wno-unused"
-    fi
-fi
-
-# Add some common define
-if test "$ac_cv_cxx_compiler_gnu" = "yes";
-then
-    CXXFLAGS="$CXXFLAGS -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused"
-fi
-
-
-# ====================================================================
-# Checks for header and lib files.
-# ====================================================================
-
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_TIME
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h sys/time.h])
-AC_CHECK_LIB([pthread], [pthread_create])
-AC_CHECK_LIB([dl], [dlopen])
-
-
-# ====================================================================
-# Checks for typedefs, structures, and compiler characteristics.
-# ====================================================================
-
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_C_VOLATILE
-AC_CHECK_TYPES([ptrdiff_t])
-AC_CHECK_TYPES([size_t])
-AC_CHECK_TYPES([uintptr_t])
-
-
-# ====================================================================
-# Checks for library functions.
-# ====================================================================
-
-AC_FUNC_CLOSEDIR_VOID
-AC_FUNC_ERROR_AT_LINE
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_REALLOC
-AC_FUNC_SELECT_ARGTYPES
-AC_TYPE_SIGNAL
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_FORK
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([floor getcwd gethostbyaddr gethostbyname gethostname gettimeofday inet_ntoa memmove memset mkdir pow select socket sqrt strcasecmp strchr strdup strerror strrchr strstr strtoul sys/time.h])
-
-
-# ====================================================================
-# X11
-
-AC_PATH_X
-
-if test ! "$no_x" = "yes"
-then
-    if test ! X"$x_libraries" = X
-    then
-        LIBS="$LIBS -L$x_libraries"
-    fi
-
-    if test ! X"$x_includes" = X
-    then
-        CXXFLAGS="$CXXFLAGS -I$x_includes"
-    fi
-else
-    if test "$enable_3d" = "yes"
-    then
-        AC_MSG_ERROR([X11 must be installed for NeL 3d library, use --disable-3d if you don't need NeL 3d library])
-    fi
-fi
-
-# ====================================================================
-# LibXML
-
-# Use C compiler as a default for the libxml tests.
-AC_LANG([C])
-
-AM_PATH_XML2([2.0.0], [], [AC_MSG_ERROR([libxml2 must be installed])])
-
-CXXFLAGS="$CXXFLAGS $XML_CFLAGS $XML_CPPFLAGS"
-
-LIBS="$LIBS $XML_LIBS"
-
-# Use C++ compiler as a default for the compilation tests.
-AC_LANG([C++])
-
-# ====================================================================
-# libpng
-
-AC_CHECK_HEADER(png.h, [], AC_MSG_ERROR([libpng must be installed]))
-
-# ====================================================================
-# libjpeg
-
-AC_CHECK_HEADER(jpeglib.h, [], AC_MSG_ERROR([libjpeg must be installed]))
-
-# ====================================================================
-# Checks for libraries.
-# ====================================================================
-
-# ====================================================================
-# GTK 2.0+
-
-AC_ARG_WITH([gtk],
-            AC_HELP_STRING([--with-gtk],
-                           [add GTK dependent code like GTK displayer]),
-            [],
-            [with_gtk=no])
-
-if test "$with_gtk" = "yes"
-then
-  AC_LANG([C])
-
-  AM_PATH_GTK_2_0([2.0.0],
-    CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
-    LIBS="$LIBS $GTK_LIBS"
-    AC_DEFINE(NL_USE_GTK, [], [Undef if you don't want to use anything GTK based like the GTK Displayer]
-)
-  )
-
-  AC_LANG([C++])
-
-  AC_SUBST([with_gtk])
-fi
-
-# ====================================================================
-# CEGUI
-
-if test "$enable_cegui" = "yes"
-then
-	PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.4,
-		[],
-		[
-			AC_MSG_ERROR([Couldn't find CEGUI or tests failed:
-$CEGUI_PKG_ERRORS
-Please go to http://crayzedsgui.sourceforge.net to get the latest, or check
-config.log to see why the tests failed, and fix it.])
-		])
-fi
-
-# ====================================================================
-# FreeType 2
-
-AM_PATH_FREETYPE($enable_3d)
-
-
-# ====================================================================
-# OpenGL
-
-AM_PATH_OPENGL($enable_3d)
-
-
-# ====================================================================
-# Check for XF86VidMode extension (-lXxf86vm)
-
-AM_PATH_XF86VIDMODE
-
-
-# ====================================================================
-# FMOD, OpenAL
- 
-if test "$enable_sound" = "yes"
-then
-  AM_PATH_FMOD("no")
-  AM_PATH_OPENAL("no")
-  if test "$have_fmod" = "no" -a "$have_openal" = "no"
-  then
-    AC_MSG_ERROR([Either FMod or OpenAL must be installed to use sound.])
-  fi
-  if test "$have_fmod" = "yes"
-  then
-    SOUND_SUBDIRS="fmod"
-  else
-    SOUND_SUBDIRS=""
-  fi
-  if test "$have_openal" = "yes"
-  then
-    SOUND_SUBDIRS="$SOUND_SUBDIRS openal"
-
-    XIPH_PATH_OGG([], AC_MSG_ERROR([Driver OpenAL Requires libogg!]))
-    XIPH_PATH_VORBIS([], AC_MSG_ERROR([Driver OpenAL Requires libvorbis!]))
-  fi
-  AC_SUBST([SOUND_SUBDIRS])
-fi
-
-
-# ====================================================================
-# CppTest 
-
-#AM_PATH_CPPTEST($enable_tests)
-
-# ====================================================================
-# Arrange for the include directory to be in the search path even when
-# build is done outside the source tree
-# Put the nelconfig.h define
-CXXFLAGS="$CXXFLAGS -I\${top_srcdir}/include -DHAVE_NELCONFIG_H"
-
-# ====================================================================
-# Checks for library functions.
-# ====================================================================
-
-
-# ====================================================================
-# Output files to generate.
-# ====================================================================
-
-AC_CONFIG_FILES([Makefile                                  \
-           include/Makefile                                \
-           include/nel/Makefile                            \
-           include/nel/ligo/Makefile                       \
-           include/nel/misc/Makefile                       \
-           include/nel/net/Makefile                        \
-           include/nel/3d/Makefile                         \
-           include/nel/pacs/Makefile                       \
-           include/nel/sound/Makefile                      \
-           include/nel/georges/Makefile                    \
-           include/nel/cegui/Makefile                      \
-           src/Makefile                                    \
-           src/misc/Makefile                               \
-           src/misc/nel-misc.pc                            \
-           src/misc/config_file/Makefile                   \
-           src/net/Makefile                                \
-           src/3d/Makefile                                 \
-           src/3d/nel-3d.pc                                \
-           src/3d/driver/Makefile                          \
-           src/3d/driver/opengl/Makefile                   \
-           src/3d/driver/opengl/nel-driverogl.pc           \
-           src/pacs/Makefile                               \
-           src/sound/Makefile                              \
-           src/sound/driver/Makefile                       \
-           src/sound/driver/fmod/Makefile                  \
-           src/sound/driver/openal/Makefile                \
-           src/georges/Makefile                            \
-           src/ligo/Makefile                               \
-           src/cegui/Makefile                              \
-           tools/Makefile                                  \
-           tools/3d/Makefile                               \
-           tools/3d/build_coarse_mesh/Makefile             \
-           tools/3d/build_far_bank/Makefile                \
-           tools/3d/build_smallbank/Makefile               \
-           tools/3d/ig_lighter/Makefile                    \
-           tools/3d/ig_lighter_lib/Makefile                \
-           tools/3d/panoply_maker/Makefile                 \
-           tools/3d/zone_dependencies/Makefile             \
-           tools/3d/zone_ig_lighter/Makefile               \
-           tools/3d/zone_lib/Makefile                      \
-           tools/3d/zone_lighter/Makefile                  \
-           tools/3d/zone_welder/Makefile                   \
-           tools/misc/Makefile                             \
-           tools/misc/bnp_make/Makefile                    \
-           tools/misc/disp_sheet_id/Makefile               \
-           tools/misc/make_sheet_id/Makefile               \
-           tools/misc/xml_packer/Makefile                  \
-           tools/pacs/Makefile                             \
-           tools/pacs/build_ig_boxes/Makefile              \
-           tools/pacs/build_indoor_rbank/Makefile          \
-           tools/pacs/build_rbank/Makefile                 \
-           samples/Makefile                                \
-           samples/sound_sources/Makefile                  \
-           samples/pacs/Makefile                           \
-           samples/georges/Makefile                        \
-           samples/3d/Makefile                             \
-           samples/3d/font/Makefile                        \
-           samples/3d/cluster_viewer/Makefile              \
-           samples/3d/cluster_viewer/shapes/Makefile       \
-           samples/3d/cluster_viewer/groups/Makefile       \
-           samples/3d/cluster_viewer/fonts/Makefile        \
-           samples/3d/cegui/Makefile                       \
-	   samples/misc/Makefile                           \
-	   samples/misc/command/Makefile                   \
-	   samples/misc/configfile/Makefile                \
-	   samples/misc/debug/Makefile                     \
-	   samples/misc/i18n/Makefile                      \
-	   samples/misc/log/Makefile                       \
-	   samples/misc/strings/Makefile                   \
-	   samples/misc/types_check/Makefile               \
-	   samples/net/Makefile                            \
-	   samples/net/chat/Makefile                       \
-	   samples/net/udp/Makefile                        \
-	   samples/net/login_system/Makefile               \
-           nel-config
-		
-])
-AC_OUTPUT
-
-#	   samples/net/class_transport/Makefile            \
-#           tools/nel_unit_test/Makefile                    \
-#           tools/nel_unit_test/misc_ut/Makefile            \
-#           tools/nel_unit_test/ligo_ut/Makefile            \
-#           tools/nel_unit_test/net_ut/Makefile             \
-#           tools/nel_unit_test/net_ut/net_service_lib_test/Makefile \
-#           tools/nel_unit_test/net_ut/net_module_lib_test/Makefile  \
-# End of configure.in
diff --git a/code/nel/include/Makefile.am b/code/nel/include/Makefile.am
deleted file mode 100644
index 193d2e405..000000000
--- a/code/nel/include/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = nel
-
-pkginclude_HEADERS   = nelconfig.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/3d/Makefile.am b/code/nel/include/nel/3d/Makefile.am
deleted file mode 100644
index 8118d8348..000000000
--- a/code/nel/include/nel/3d/Makefile.am
+++ /dev/null
@@ -1,343 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/3d
-
-include_HEADERS      = \
-animatable.h \
-animated_lightmap.h \
-animated_material.h \
-animated_morph.h \
-animated_value.h \
-animation.h \
-animation_optimizer.h \
-animation_playlist.h \
-animation_set.h \
-animation_set_user.h \
-animation_time.h \
-anim_ctrl.h \
-anim_detail_trav.h \
-async_file_manager_3d.h \
-async_texture_block.h \
-async_texture_manager.h \
-bezier_patch.h \
-bloom_effect.h \
-bone.h \
-bsp_tree.h \
-camera_col.h \
-camera.h \
-channel_mixer.h \
-clip_trav.h \
-cloud.h \
-cloud_scape.h \
-cloud_scape_user.h \
-cluster.h \
-coarse_mesh_build.h \
-coarse_mesh_manager.h \
-computed_string.h \
-cube_grid.h \
-cube_map_builder.h \
-debug_vb.h \
-deform_2d.h \
-driver.h \
-driver_material_inline.h \
-driver_user.h \
-dru.h \
-event_mouse_listener.h \
-fasthls_modifier.h \
-fast_ptr_list.h \
-flare_model.h \
-flare_shape.h \
-font_generator.h \
-font_manager.h \
-frustum.h \
-heat_haze.h \
-height_map.h \
-hls_color_texture.h \
-hls_texture_bank.h \
-hls_texture_manager.h \
-hrc_trav.h \
-ig_surface_light_build.h \
-ig_surface_light.h \
-index_buffer.h \
-init_3d.h \
-instance_group_user.h \
-instance_lighter.h \
-key.h \
-landscape_collision_grid.h \
-landscape_def.h \
-landscape_face_vector_manager.h \
-landscape.h \
-landscapeig_manager.h \
-landscape_model.h \
-landscape_profile.h \
-landscape_user.h \
-landscapevb_allocator.h \
-landscapevb_info.h \
-landscape_vegetable_block.h \
-layered_ordering_table.h \
-light_contribution.h \
-light.h \
-light_influence_interpolator.h \
-lighting_manager.h \
-light_trav.h \
-light_user.h \
-load_balancing_trav.h \
-lod_character_builder.h \
-lod_character_instance.h \
-lod_character_manager.h \
-lod_character_shape_bank.h \
-lod_character_shape.h \
-lod_character_texture.h \
-logic_info.h \
-material.h \
-matrix_3x4.h \
-mesh_base.h \
-mesh_base_instance.h \
-mesh_blender.h \
-mesh_block_manager.h \
-mesh_geom.h \
-mesh.h \
-mesh_instance.h \
-mesh_morpher.h \
-mesh_mrm.h \
-mesh_mrm_instance.h \
-mesh_mrm_skinned.h \
-mesh_mrm_skinned_instance.h \
-mesh_multi_lod.h \
-mesh_multi_lod_instance.h \
-mesh_vertex_program.h \
-meshvp_per_pixel_light.h \
-meshvp_wind_tree.h \
-mini_col.h \
-motion_blur.h \
-mrm_builder.h \
-mrm_internal.h \
-mrm_level_detail.h \
-mrm_mesh.h \
-mrm_parameters.h \
-nelu.h \
-noise_3d.h \
-occlusion_query.h \
-ordering_table.h \
-packed_world.h \
-packed_zone.h \
-particle_system.h \
-particle_system_manager.h \
-particle_system_model.h \
-particle_system_process.h \
-particle_system_shape.h \
-patchdlm_context.h \
-patch.h \
-patch_rdr_pass.h \
-patchuv_locator.h \
-play_list_manager.h \
-play_list_manager_user.h \
-play_list_user.h \
-point_light.h \
-point_light_influence.h \
-point_light_model.h \
-point_light_named_array.h \
-point_light_named.h \
-portal.h \
-primitive_profile.h \
-ps_allocator.h \
-ps_attrib.h \
-ps_attrib_maker_bin_op.h \
-ps_attrib_maker_bin_op_inline.h \
-ps_attrib_maker.h \
-ps_attrib_maker_helper.h \
-ps_attrib_maker_iterators.h \
-ps_attrib_maker_template.h \
-ps_color.h \
-ps_direction.h \
-ps_dot.h \
-ps_edit.h \
-ps_emitter.h \
-ps_face.h \
-ps_face_look_at.h \
-ps_fan_light.h \
-ps_float.h \
-ps_force.h \
-ps_int.h \
-ps_iterator.h \
-ps_light.h \
-ps_located.h \
-ps_lod.h \
-ps_macro.h \
-ps_mesh.h \
-ps_misc.h \
-ps_particle2.h \
-ps_particle_basic.h \
-ps_particle.h \
-ps_plane_basis.h \
-ps_plane_basis_maker.h \
-ps_quad.h \
-ps_register_color_attribs.h \
-ps_register_float_attribs.h \
-ps_register_int_attribs.h \
-ps_register_plane_basis_attribs.h \
-ps_ribbon_base.h \
-ps_ribbon.h \
-ps_ribbon_look_at.h \
-ps_shockwave.h \
-ps_sound.h \
-ps_spawn_info.h \
-ps_tail_dot.h \
-ps_util.h \
-ps_zone.h \
-ptr_set.h \
-quad_effect.h \
-quad_grid_clip_cluster.h \
-quad_grid_clip_manager.h \
-quad_grid.h \
-quad_tree.h \
-radix_sort.h \
-raw_skin.h \
-raw_skinned.h \
-ray_mesh.h \
-register_3d.h \
-render_trav.h \
-root_model.h \
-scene_group.h \
-scene.h \
-scene_user.h \
-scissor.h \
-seg_remanence.h \
-seg_remanence_shape.h \
-shader.h \
-shadow_map.h \
-shadow_map_manager.h \
-shadow_poly_receiver.h \
-shadow_skin.h \
-shape_bank.h \
-shape_bank_user.h \
-shape.h \
-shape_info.h \
-shifted_triangle_cache.h \
-skeleton_model.h \
-skeleton_shape.h \
-skeleton_spawn_script.h \
-skeleton_weight.h \
-static_quad_grid.h \
-stripifier.h \
-surface_light_grid.h \
-tangent_space_build.h \
-target_anim_ctrl.h \
-tess_block.h \
-tessellation.h \
-tess_face_priority_list.h \
-tess_list.h \
-text_context.h \
-text_context_user.h \
-texture_blank.h \
-texture_blend.h \
-texture_bloom.h \
-texture_bump.h \
-texture_cube.h \
-texture_dlm.h \
-texture_emboss.h \
-texture_far.h \
-texture_file.h \
-texture_font.h \
-texture_grouped.h \
-texture.h \
-texture_mem.h \
-texture_multi_file.h \
-texture_near.h \
-texture_user.h \
-tile_bank.h \
-tile_color.h \
-tile_element.h \
-tile_far_bank.h \
-tile_light_influence.h \
-tile_lumel.h \
-tile_noise_map.h \
-tile_vegetable_desc.h \
-track_bezier.h \
-track.h \
-track_keyframer.h \
-track_sampled_common.h \
-track_sampled_quat.h \
-track_sampled_quat_small_header.h \
-track_sampled_vector.h \
-track_tcb.h \
-transformable.h \
-transform.h \
-transform_shape.h \
-trav_scene.h \
-u_3d_mouse_listener.h \
-u_animation.h \
-u_animation_set.h \
-u_bone.h \
-u_camera.h \
-u_cloud_scape.h \
-u_driver.h \
-u_instance_group.h \
-u_instance.h \
-u_instance_material.h \
-u_landscape.h \
-u_light.h \
-u_material.h \
-u_particle_system_instance.h \
-u_particle_system_sound.h \
-u_play_list.h \
-u_play_list_manager.h \
-u_point_light.h \
-u_ps_sound_impl.h \
-u_ps_sound_interface.h \
-u_scene.h \
-u_shape_bank.h \
-u_shape.h \
-u_skeleton.h \
-u_text_context.h \
-u_texture.h \
-u_track.h \
-u_transformable.h \
-u_transform.h \
-u_visual_collision_entity.h \
-u_visual_collision_manager.h \
-u_visual_collision_mesh.h \
-u_water_env_map.h \
-u_water.h \
-vegetable_blend_layer_model.h \
-vegetable_clip_block.h \
-vegetable_def.h \
-vegetable.h \
-vegetable_instance_group.h \
-vegetable_light_ex.h \
-vegetable_manager.h \
-vegetable_quadrant.h \
-vegetable_shape.h \
-vegetable_sort_block.h \
-vegetable_uv8.h \
-vegetablevb_allocator.h \
-vertex_buffer.h \
-vertex_buffer_heap.h \
-vertex_program.h \
-vertex_program_parse.h \
-vertex_stream_manager.h \
-viewport.h \
-visual_collision_entity.h \
-visual_collision_entity_user.h \
-visual_collision_manager.h \
-visual_collision_manager_user.h \
-visual_collision_mesh.h \
-water_env_map.h \
-water_env_map_user.h \
-water_height_map.h \
-water_model.h \
-water_pool_manager.h \
-water_shape.h \
-zone_corner_smoother.h \
-zone.h \
-zone_lighter.h \
-zone_manager.h \
-zone_search.h \
-zone_smoother.h \
-zone_symmetrisation.h \
-zone_tgt_smoother.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/3d/computed_string.h b/code/nel/include/nel/3d/computed_string.h
index 16fe70fcb..914fa324e 100644
--- a/code/nel/include/nel/3d/computed_string.h
+++ b/code/nel/include/nel/3d/computed_string.h
@@ -27,12 +27,16 @@
 #include <vector>
 #include <limits>
 
+namespace NLMISC {
+
+class CMatrix;
+
+}
 
 
 namespace NL3D {
 
 class CTextureFont;
-class CMatrix;
 struct CComputedString;
 
 // ***************************************************************************
diff --git a/code/nel/include/nel/3d/cube_grid.h b/code/nel/include/nel/3d/cube_grid.h
index 427aed624..483ea8000 100644
--- a/code/nel/include/nel/3d/cube_grid.h
+++ b/code/nel/include/nel/3d/cube_grid.h
@@ -227,7 +227,7 @@ void CCubeGrid<TCell>::compile()
 		// build the _StaticGrid
 		_StaticGrids[i].build(_Grids[i]);
 		// And reset the grid. contReset is necessary to clean the CBlockMemory.
-		contReset(_Grids[i]);
+		NLMISC::contReset(_Grids[i]);
 	}
 
 	// done
diff --git a/code/nel/include/nel/3d/index_buffer.h b/code/nel/include/nel/3d/index_buffer.h
index 320a06020..7beaafe0b 100644
--- a/code/nel/include/nel/3d/index_buffer.h
+++ b/code/nel/include/nel/3d/index_buffer.h
@@ -782,7 +782,7 @@ inline void CIndexBuffer::lock (CIndexBufferRead &accessor, uint first, uint las
 
 // ***************************************************************************
 
-inline void CIndexBuffer::unlock (uint first, uint end)
+inline void CIndexBuffer::unlock (uint /* first */, uint /* end */)
 {
 	nlassertex (_LockCounter!=0, ("Index buffer not locked"));
 	nlassert (_LockedBuffer || (!isResident() && _NonResidentIndexes.empty()));
diff --git a/code/nel/include/nel/3d/instance_lighter.h b/code/nel/include/nel/3d/instance_lighter.h
index 7b1dbb6e7..8b1ccf80a 100644
--- a/code/nel/include/nel/3d/instance_lighter.h
+++ b/code/nel/include/nel/3d/instance_lighter.h
@@ -147,7 +147,7 @@ public:
 	static void addTriangles (const IShape &shape, const NLMISC::CMatrix& modelMT, std::vector<CTriangle>& triangleArray, sint instanceId);
 
 	// Progress callback
-	virtual void progress (const char *message, float progress) {}
+	virtual void progress (const char * /* message */, float /* progress */) {}
 
 
 	/// \name Static PointLights mgt.
diff --git a/code/nel/include/nel/3d/ps_attrib.h b/code/nel/include/nel/3d/ps_attrib.h
index fc17dc787..83549a7b0 100644
--- a/code/nel/include/nel/3d/ps_attrib.h
+++ b/code/nel/include/nel/3d/ps_attrib.h
@@ -96,7 +96,7 @@ public:
 		try
 		{
 			newStart = new uint8[sizeof(T) * capacity + (1 << snapPower)];
-			T *newTab = (T *) ( (uint) (newStart + (1 << snapPower))  & ~((1 << snapPower) - 1)); // snap to a page
+			T *newTab = (T *) ( (size_t) (newStart + (1 << snapPower))  & ~((1 << snapPower) - 1)); // snap to a page
 
 
 
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
index 4370fdeaa..285fa9b26 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op.h
@@ -157,7 +157,7 @@ public:
 		}
 
 		/// return true if an operation is supported. The default support all ops
-		bool supportOp(CPSBinOp::BinOp op) { return true; }
+		bool supportOp(CPSBinOp::BinOp /* op */) { return true; }
 
 		/// get the current operator
 		CPSBinOp::BinOp getOp(void) const { return _Op; }
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
index c25c051a5..8d98a1544 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker_bin_op_inline.h
@@ -57,13 +57,13 @@ inline CPlaneBasis PSBinOpModulate(CPlaneBasis p1, CPlaneBasis p2)
 
 }
 template <>
-inline CPlaneBasis PSBinOpAdd(CPlaneBasis p1, CPlaneBasis p2)
+inline CPlaneBasis PSBinOpAdd(CPlaneBasis /* p1 */, CPlaneBasis /* p2 */)
 {
 	nlassert(0); // not allowed for now
 	return CPlaneBasis(NLMISC::CVector::Null);
 }
 template <>
-inline CPlaneBasis PSBinOpSubtract(CPlaneBasis p1, CPlaneBasis p2)
+inline CPlaneBasis PSBinOpSubtract(CPlaneBasis /* p1 */, CPlaneBasis /* p2 */)
 {
 	nlassert(0); // not allowed for now
 	return CPlaneBasis(NLMISC::CVector::Null);
diff --git a/code/nel/include/nel/3d/ps_attrib_maker_iterators.h b/code/nel/include/nel/3d/ps_attrib_maker_iterators.h
index 8729ffb10..d9cfbcdd3 100644
--- a/code/nel/include/nel/3d/ps_attrib_maker_iterators.h
+++ b/code/nel/include/nel/3d/ps_attrib_maker_iterators.h
@@ -60,7 +60,7 @@ namespace NL3D
 	{
 		GET_INLINE float get() const { return float(rand() * (1 / double(RAND_MAX))); } // this may be optimized with a table...
 		void  advance() {}
-		void  advance(uint quantity) {}
+		void  advance(uint /* quantity */) {}
 	};
 
 	/// this iterator just return the same value
@@ -69,7 +69,7 @@ namespace NL3D
 		float Value;
 		GET_INLINE float get() const { return Value; }
 		void  advance() {}
-		void  advance(uint quantity) {}
+		void  advance(uint /* quantity */) {}
 	};
 
 	/// iterator that use dist to compute the value
diff --git a/code/nel/include/nel/3d/ps_direction.h b/code/nel/include/nel/3d/ps_direction.h
index 609278a80..eb8bbd827 100644
--- a/code/nel/include/nel/3d/ps_direction.h
+++ b/code/nel/include/nel/3d/ps_direction.h
@@ -38,7 +38,7 @@ public :
 	/** The direction is taken from a global vector defined in the particle system
 	  * NULL or an empty string as a name disable the use of a global value
 	  */
-	virtual void				enableGlobalVectorValue(const std::string &name) {}
+	virtual void				enableGlobalVectorValue(const std::string &/* name */) {}
 	virtual std::string         getGlobalVectorValueName() const { return ""; }
 };
 
diff --git a/code/nel/include/nel/3d/ps_edit.h b/code/nel/include/nel/3d/ps_edit.h
index d3e1a53de..8342868f8 100644
--- a/code/nel/include/nel/3d/ps_edit.h
+++ b/code/nel/include/nel/3d/ps_edit.h
@@ -65,13 +65,13 @@ struct IPSMover
 	virtual bool					supportNonUniformScaling(void) const {	NL_PS_FUNC(supportNonUniformScaling); return false ; }
 
 	// set the scale of the object (uniform scale). The default does nothing
-	virtual void					setScale(uint32 index, float scale) {} ;
+	virtual void					setScale(uint32 /* index */, float /* scale */) {}
 
 	// set a non uniform scale (if supported)
-	virtual void					setScale(uint32 index, const NLMISC::CVector &s) { NL_PS_FUNC(setScale); }
+	virtual void					setScale(uint32 /* index */, const NLMISC::CVector &/* s */) { NL_PS_FUNC(setScale); }
 
 	// get the scale of the object
-	virtual	NLMISC::CVector			getScale(uint32 index) const { NL_PS_FUNC(getScale); return NLMISC::CVector(1.f, 1.f, 1.f) ; }
+	virtual	NLMISC::CVector			getScale(uint32 /* index */) const { NL_PS_FUNC(getScale); return NLMISC::CVector(1.f, 1.f, 1.f) ; }
 
 	/** some object may not store a whole matrix (e.g planes)
 	 *  this return true if only a normal is needed to set the orientation of the object
@@ -79,10 +79,10 @@ struct IPSMover
 	virtual bool					onlyStoreNormal(void) const { NL_PS_FUNC(onlyStoreNormal); return false ; }
 
 	///  if the object only needs a normal, this return the normal. If not, is return (0, 0, 0)
-	virtual NLMISC::CVector			getNormal(uint32 index) { NL_PS_FUNC(getNormal); return NLMISC::CVector::Null ; }
+	virtual NLMISC::CVector			getNormal(uint32 /* index */) { NL_PS_FUNC(getNormal); return NLMISC::CVector::Null ; }
 
 	/// if the object only stores a normal, this set the normal of the object. Otherwise it has no effect
-	virtual void					setNormal(uint32 index, NLMISC::CVector n) { NL_PS_FUNC(setNormal); }
+	virtual void					setNormal(uint32 /* index */, NLMISC::CVector /* n */) { NL_PS_FUNC(setNormal); }
 
 	// set a new orthogonal matrix for the object
 	virtual void					setMatrix(uint32 index, const NLMISC::CMatrix &m) = 0 ;
diff --git a/code/nel/include/nel/3d/ps_force.h b/code/nel/include/nel/3d/ps_force.h
index 5e961dc43..15e28948a 100644
--- a/code/nel/include/nel/3d/ps_force.h
+++ b/code/nel/include/nel/3d/ps_force.h
@@ -87,9 +87,9 @@ public:
 	  * 'accumulate' set to false.
 	  * NB : works only with integrable forces
 	  */
-	 virtual void integrate(float date, CPSLocated *src, uint32 startIndex, uint32 numObjects, NLMISC::CVector *destPos = NULL, NLMISC::CVector *destSpeed = NULL,
-							bool accumulate = false,
-							uint posStride = sizeof(NLMISC::CVector), uint speedStride = sizeof(NLMISC::CVector)
+	 virtual void integrate(float /* date */, CPSLocated * /* src */, uint32 /* startIndex */, uint32 /* numObjects */, NLMISC::CVector * /* destPos */ = NULL, NLMISC::CVector * /* destSpeed */ = NULL,
+							bool /* accumulate */ = false,
+							uint /* posStride */ = sizeof(NLMISC::CVector), uint /* speedStride */ = sizeof(NLMISC::CVector)
 							) const
 	 {
 		 nlassert(0); // not an integrable force
@@ -100,11 +100,11 @@ public:
 	  * If the start date is lower than the creation date, the initial position is used
 	  * NB : works only with integrable forces
 	  */
-	virtual void integrateSingle(float startDate, float deltaT, uint numStep,
-								 const CPSLocated *src, uint32 indexInLocated,
-								 NLMISC::CVector *destPos,
-								 bool accumulate = false,
-								 uint posStride = sizeof(NLMISC::CVector)) const
+	virtual void integrateSingle(float /* startDate */, float /* deltaT */, uint /* numStep */,
+								 const CPSLocated * /* src */, uint32 /* indexInLocated */,
+								 NLMISC::CVector * /* destPos */,
+								 bool /* accumulate */ = false,
+								 uint /* posStride */ = sizeof(NLMISC::CVector)) const
 	{
 		 nlassert(0); // not an integrable force
 	}
@@ -170,7 +170,7 @@ public:
 	virtual void setIntensityScheme(CPSAttribMaker<float> *scheme);
 
 	// deriver have here the opportunity to setup the functor object. The default does nothing
-	virtual void setupFunctor(uint32 indexInLocated) { }
+	virtual void setupFunctor(uint32 /* indexInLocated */) { }
 
 	/// get the attribute maker for a non constant intensity
 	CPSAttribMaker<float> *getIntensityScheme(void) { return _IntensityScheme; }
@@ -493,22 +493,22 @@ public:
 	#ifdef NL_OS_WINDOWS
 		__forceinline
 	#endif
-	 void operator() (const NLMISC::CVector &pos, NLMISC::CVector &speed, float invMass)
-	 {
+	void operator() (const NLMISC::CVector &/* pos */, NLMISC::CVector &speed, float invMass)
+	{
 		speed -= (CParticleSystem::EllapsedTime * _K * invMass * speed);
-	 }
+	}
 
-	 virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
-	 {
-		 f.serialVersion(1);
-		 // we don't save intensity info : it is saved by the owning object (and set before each use of this functor)
-	 }
+	virtual void serial(NLMISC::IStream &f) throw(NLMISC::EStream)
+	{
+		f.serialVersion(1);
+		// we don't save intensity info : it is saved by the owning object (and set before each use of this functor)
+	}
 
-	 // get the friction coefficient
-	 float getK(void) const { return _K; }
+	// get the friction coefficient
+	float getK(void) const { return _K; }
 
-	 // set the friction coefficient
-	 void setK(float coeff) { _K = coeff; }
+	// set the friction coefficient
+	void setK(float coeff) { _K = coeff; }
 protected:
 	// the friction coeff
 	float _K;
@@ -630,7 +630,7 @@ struct CPSTurbulForceFunc
 	#ifdef NL_OS_WINDOWS
 		__forceinline
 	#endif
-	void operator() (const NLMISC::CVector &pos, NLMISC::CVector &speed, float invMass)
+	void operator() (const NLMISC::CVector &/* pos */, NLMISC::CVector &/* speed */, float /* invMass */)
 	{
 		nlassert(0);
 
diff --git a/code/nel/include/nel/3d/static_quad_grid.h b/code/nel/include/nel/3d/static_quad_grid.h
index 7890e12f4..5a0383c9e 100644
--- a/code/nel/include/nel/3d/static_quad_grid.h
+++ b/code/nel/include/nel/3d/static_quad_grid.h
@@ -172,7 +172,7 @@ template<class T>
 void			CStaticQuadGrid<T>::build(CQuadGrid<T> &quadGrid)
 {
 	clear();
-	contReset(_Grid);
+	NLMISC::contReset(_Grid);
 
 	// Copy from quadGrid, and init quads
 	_Size= quadGrid.getSize();
diff --git a/code/nel/include/nel/3d/track_tcb.h b/code/nel/include/nel/3d/track_tcb.h
index 8daf5cc2a..fc9c227e4 100644
--- a/code/nel/include/nel/3d/track_tcb.h
+++ b/code/nel/include/nel/3d/track_tcb.h
@@ -218,7 +218,7 @@ protected:
 			date*= previous->OODeltaTime;
 			NLMISC::clamp(date, 0,1);
 
-			date = ease(previous, date);
+			date = this->ease(previous, date);
 
 			float hb[4];
 			this->computeHermiteBasis(date, hb);
@@ -242,7 +242,7 @@ protected:
 		ITrackKeyFramer<CKeyT>::compile();
 
 		// Ease Precompute.
-		compileTCBEase(this->_MapKey, this->getLoopMode());
+		this->compileTCBEase(this->_MapKey, this->getLoopMode());
 
 
 		// Tangents Precompute.
@@ -314,7 +314,7 @@ private:
 		float	ksm,ksp,kdm,kdp;
 
 		// compute tangents factors.
-		computeTCBFactors(key, timeBefore, time, timeAfter, rangeDelta, firstKey, endKey, isLoop, ksm,ksp,kdm,kdp);
+		this->computeTCBFactors(key, timeBefore, time, timeAfter, rangeDelta, firstKey, endKey, isLoop, ksm,ksp,kdm,kdp);
 
 		// Delta.
 		TKeyValueType	delm, delp;
@@ -413,7 +413,7 @@ public:
 		ITrackKeyFramer<CKeyTCBQuat>::compile();
 
 		// Ease Precompute.
-		compileTCBEase(_MapKey, getLoopMode());
+		this->compileTCBEase(_MapKey, getLoopMode());
 
 		TMapTimeCKey::iterator	it;
 		TMapTimeCKey::iterator	itNext;
diff --git a/code/nel/include/nel/3d/vertex_buffer.h b/code/nel/include/nel/3d/vertex_buffer.h
index 83b2b90ea..a64ec0c2c 100644
--- a/code/nel/include/nel/3d/vertex_buffer.h
+++ b/code/nel/include/nel/3d/vertex_buffer.h
@@ -1223,7 +1223,7 @@ inline void CVertexBuffer::lock (CVertexBufferRead &accessor, uint first, uint l
 
 // --------------------------------------------------
 
-inline void CVertexBuffer::unlock (uint first, uint end)
+inline void CVertexBuffer::unlock (uint /* first */, uint /* end */)
 {
 	nlassertex (_LockCounter!=0, ("Vertex buffer not locked"));
 	nlassert (_LockedBuffer || (!isResident() && _NonResidentVertices.empty()));
diff --git a/code/nel/include/nel/Makefile.am b/code/nel/include/nel/Makefile.am
deleted file mode 100644
index 7e4686f14..000000000
--- a/code/nel/include/nel/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-DIST_SUBDIRS      = net 3d pacs sound misc georges ligo
-
-SUBDIRS              = @NEL_SUBDIRS@
-
-includedir           = ${prefix}/include/nel
-
-# End of Makefile.am
-
diff --git a/code/nel/include/nel/cegui/Makefile.am b/code/nel/include/nel/cegui/Makefile.am
deleted file mode 100644
index ba2530dff..000000000
--- a/code/nel/include/nel/cegui/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2001-08-01 08:45:06 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/cegui
-
-include_HEADERS      = nelrenderer.h nelresourceprovider.h neltexture.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/georges/Makefile.am b/code/nel/include/nel/georges/Makefile.am
deleted file mode 100644
index 153e9b102..000000000
--- a/code/nel/include/nel/georges/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/georges
-
-include_HEADERS      =	load_form.h		\
-			u_form_dfn.h		\
-			u_form_elm.h		\
-			u_form.h		\
-			u_form_loader.h		\
-			u_type.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/ligo/Makefile.am b/code/nel/include/nel/ligo/Makefile.am
deleted file mode 100644
index 48fb3c54b..000000000
--- a/code/nel/include/nel/ligo/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/ligo
-
-include_HEADERS      =	ligo_config.h			\
-			primitive_class.h		\
-			primitive_configuration.h	\
-			primitive.h			\
-			primitive_utils.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/misc/Makefile.am b/code/nel/include/nel/misc/Makefile.am
deleted file mode 100644
index 75bde6b95..000000000
--- a/code/nel/include/nel/misc/Makefile.am
+++ /dev/null
@@ -1,143 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/misc
-
-include_HEADERS      =	aabbox.h			\
-			algo.h				\
-			app_context.h			\
-			array_2d.h			\
-			async_file_manager.h		\
-			big_file.h			\
-			bitmap.h			\
-			bit_mem_stream.h		\
-			bit_set.h			\
-			block_memory.h			\
-			bsphere.h			\
-			buf_fifo.h			\
-			check_fpu.h			\
-			class_id.h			\
-			class_registry.h		\
-			command.h			\
-			common.h			\
-			config_file.h			\
-			contiguous_block_allocator.h	\
-			co_task.h			\
-			cpu_time_stat.h			\
-			debug.h				\
-			di_event_emitter.h		\
-			diff_tool.h			\
-			displayer.h			\
-			dummy_window.h			\
-			dynloadlib.h			\
-			eid_translator.h		\
-			entity_id.h			\
-			enum_bitset.h			\
-			eval_num_expr.h			\
-			event_emitter.h			\
-			event_emitter_multi.h		\
-			event_listener.h		\
-			event_server.h			\
-			events.h			\
-			factory.h			\
-			fast_floor.h			\
-			fast_mem.h			\
-			file.h				\
-			fixed_size_allocator.h		\
-			game_device_events.h		\
-			game_device.h			\
-			geom_ext.h			\
-			grid_traversal.h		\
-			gtk_displayer.h			\
-			heap_memory.h			\
-			hierarchical_timer.h		\
-			historic.h			\
-			i18n.h				\
-			input_device.h			\
-			input_device_manager.h		\
-			input_device_server.h		\
-			inter_window_msg_queue.h	\
-			i_xml.h				\
-			keyboard_device.h		\
-			line.h				\
-			log.h				\
-			matrix.h			\
-			md5.h				\
-			mem_displayer.h			\
-			mem_stream.h			\
-			mouse_device.h			\
-			mouse_smoother.h		\
-			mutable_container.h		\
-			mutex.h				\
-			noise_value.h			\
-			object_arena_allocator.h	\
-			object_vector.h			\
-			o_xml.h				\
-			path.h				\
-			plane.h				\
-			plane_inline.h			\
-			polygon.h			\
-			pool_memory.h			\
-			progress_callback.h		\
-			p_thread.h			\
-			quad.h				\
-			quat.h				\
-			random.h			\
-			reader_writer.h			\
-			rect.h				\
-			report.h			\
-			resource_ptr.h			\
-			resource_ptr_inline.h		\
-			rgba.h				\
-			sha1.h				\
-			shared_memory.h			\
-			sheet_id.h			\
-			singleton.h			\
-			smart_ptr.h			\
-			smart_ptr_inline.h		\
-			speaker_listener.h		\
-			sstring.h			\
-			static_map.h			\
-			stl_block_allocator.h		\
-			stl_block_list.h		\
-			stop_watch.h			\
-			stream.h			\
-			stream_inline.h			\
-			string_common.h			\
-			string_conversion.h		\
-			string_id_array.h		\
-			string_mapper.h			\
-			string_stream.h			\
-			system_info.h			\
-			task_manager.h			\
-			tds.h				\
-			thread.h			\
-			time_nl.h			\
-			timeout_assertion_thread.h	\
-			traits_nl.h			\
-			triangle.h			\
-			twin_map.h			\
-			types_nl.h			\
-			ucstring.h			\
-			uv.h				\
-			value_smoother.h		\
-			variable.h			\
-			vector_2d.h			\
-			vector_2f.h			\
-			vectord.h			\
-			vectord_inline.h		\
-			vector.h			\
-			vector_h.h			\
-			vector_inline.h			\
-			win32_util.h			\
-			win_displayer.h			\
-			window_displayer.h		\
-			win_event_emitter.h		\
-			win_thread.h			\
-			win_tray.h			\
-			words_dictionary.h		\
-			xml_pack.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/misc/bit_mem_stream.h b/code/nel/include/nel/misc/bit_mem_stream.h
index 8a1af34cc..b294d5454 100644
--- a/code/nel/include/nel/misc/bit_mem_stream.h
+++ b/code/nel/include/nel/misc/bit_mem_stream.h
@@ -209,6 +209,8 @@ public:
 	{
 #ifdef NL_DEBUG
 		std::swap(_DbgData, other._DbgData);
+#else
+		nlunreferenced(other);
 #endif
 	}
 
@@ -225,6 +227,10 @@ public:
 		TBMSSerialInfo serialItem( bitpos, size, type, _DbgData->NextSymbol );
 		_DbgData->List.push_back( serialItem );
 		_DbgData->NextSymbol = NULL;
+#else
+		nlunreferenced(bitpos);
+		nlunreferenced(size);
+		nlunreferenced(type);
 #endif
 	}
 
@@ -258,6 +264,10 @@ public:
 			nlwarning( "Missing reserve() corresponding to poke()" );
 		}
 		_DbgData->NextSymbol = NULL;
+#else
+		nlunreferenced(bitpos);
+		nlunreferenced(size);
+		nlunreferenced(type);
 #endif
 	}
 
@@ -266,6 +276,8 @@ public:
 	{
 #ifdef NL_DEBUG
 		_DbgData->NextSymbol = symbol;
+#else
+		nlunreferenced(symbol);
 #endif
 	}
 
@@ -308,6 +320,8 @@ public:
 			}
 			//nlassert( bitpos < (*_List)[_CurrentBrowsedItem].BitPos ); // occurs if stream overflow
 		}
+#else
+		nlunreferenced(bitpos);
 #endif
 		*eventId = -1;
 		return std::string();
@@ -380,7 +394,7 @@ public:
 	 * If you are using the stream only in output mode, you can use this method as a faster version
 	 * of clear() *if you don't serialize pointers*.
 	 */
-	void			resetBufPos()
+	virtual void		resetBufPos()
 	{
 		// This is ensured in CMemStream::CMemStream() and CMemStream::clear()
 		//if ( (!isReading()) && _Buffer.empty() )
@@ -463,7 +477,7 @@ public:
 	}
 
 	/// See doc in CMemStream::bufferToFill()
-	uint8			*bufferToFill( uint32 msgsize )
+	virtual uint8		*bufferToFill( uint32 msgsize )
 	{
 		_FreeBits = 8;
 		_DbgInfo.clear();
@@ -640,7 +654,7 @@ public:
 	virtual void	serial(ucstring &b);
 
 	virtual void	serial(CBitMemStream &b) { serialMemStream(b); }
-	virtual void	serialMemStream(CBitMemStream &b);
+	virtual void	serialMemStream(CMemStream &b);
 
 
 	//@}
@@ -787,11 +801,7 @@ void	displayBitStream( const CBitMemStream& msg, sint beginbitpos, sint endbitpo
 inline std::string CBMSDbgInfo::getEventLegendAtBitPos( CBitMemStream& bms, sint32 eventId )
 {
 #ifdef NL_DEBUG
-	if ( eventId == -1 )
-	{
-		return std::string();
-	}
-	else
+	if ( eventId != -1 )
 	{
 		nlassert( eventId < (sint32)_DbgData->List.size() );
 		TBMSSerialInfo& serialItem = _DbgData->List[eventId]; // works only with a vector!
@@ -800,8 +810,11 @@ inline std::string CBMSDbgInfo::getEventLegendAtBitPos( CBitMemStream& bms, sint
 					bms.getSerialItem( serialItem ).c_str(), (serialItem.Symbol!=NULL)?serialItem.Symbol:"" );
 	}
 #else
-	return std::string();
+	nlunreferenced(bms);
+	nlunreferenced(eventId);
 #endif
+
+	return std::string();
 }
 
 
diff --git a/code/ryzom/client/src/cdb.h b/code/nel/include/nel/misc/cdb.h
similarity index 83%
rename from code/ryzom/client/src/cdb.h
rename to code/nel/include/nel/misc/cdb.h
index 24c2dd5eb..d23986b0c 100644
--- a/code/ryzom/client/src/cdb.h
+++ b/code/nel/include/nel/misc/cdb.h
@@ -20,20 +20,20 @@
 #define CDB_H
 
 // misc
-#include "nel/misc/types_nl.h"
-#include "nel/misc/smart_ptr.h"
-#include "nel/misc/string_mapper.h"
+#include "types_nl.h"
+#include "smart_ptr.h"
+#include "string_mapper.h"
+#include "sstring.h"
 
 #include <libxml/parser.h>
 
 namespace NLMISC
 {
-	class IProgressCallback;
-	class CBitMemStream;
-}
-
+class IProgressCallback;
+class CBitMemStream;
 class CCDBNodeLeaf;
 class CCDBNodeBranch;
+class CCDBBankHandler;
 
 ///global bool, must be set to true if we want to display database modification. See displayDBModifs in commands.cpp
 extern bool VerboseDatabase;
@@ -48,7 +48,7 @@ extern bool VerboseDatabase;
  * \date 2002
  */
 
-class ICDBNode : public NLMISC::CRefCount
+class ICDBNode : public CRefCount
 {
 	//-----------------------------------------------------------------------
 	// end of IDBNode interface
@@ -78,7 +78,7 @@ public:
 	 * \author Nevrax France
 	 * \date 2002
 	 */
-	class IPropertyObserver : public NLMISC::CRefCount
+	class IPropertyObserver : public CRefCount
 	{
 	public :
 		virtual ~IPropertyObserver()	{}
@@ -198,7 +198,7 @@ public :
 	 *	Build the structure of the database from a file
 	 * \param f is the stream
 	 */
-	virtual void init( xmlNodePtr node, NLMISC::IProgressCallback &progressCallBack, bool mapBanks=false ) = 0;
+	virtual void init( xmlNodePtr node, IProgressCallback &progressCallBack, bool mapBanks=false, CCDBBankHandler *bankHandler = NULL ) = 0;
 
 	/**
 	 * Save a backup of the database
@@ -212,7 +212,7 @@ public :
 	 * \param gc the server gameCycle of this update. Any outdated update are aborted
 	 * \param f : the stream.
 	 */
-	virtual void readDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream & f ) = 0;
+	virtual void readDelta( TGameCycle gc, CBitMemStream & f ) = 0;
 
 	/**
 	 * Get a node . Create it if it does not exist yet
@@ -252,7 +252,7 @@ public :
 	virtual bool setProp( CTextId& id, sint64 value ) = 0;
 
 	/// Reset all leaf data from this point
-	virtual void resetData(NLMISC::TGameCycle gc, bool forceReset=false) = 0;
+	virtual void resetData(TGameCycle gc, bool forceReset=false) = 0;
 
 	/**
 	 * Clear the node and his children
@@ -302,10 +302,10 @@ public :
 	virtual CCDBNodeLeaf	*findLeafAtCount( uint& count ) = 0;
 
 	/// Set the atomic branch flag (when all the modified nodes of a branch should be tranmitted at the same time)
-	void					setAtomic( bool atomicBranch ) { _Atomic = atomicBranch; }
+	void					setAtomic( bool atomicBranch ) { _AtomicFlag = atomicBranch; }
 
 	/// Return true if the branch has the atomic flag
-	bool					isAtomic() const { return _Atomic; }
+	bool					isAtomic() const { return _AtomicFlag; }
 
 	// test if the node is a leaf
 	virtual bool			isLeaf() const = 0;
@@ -314,16 +314,16 @@ public :
 	virtual void display (const std::string &/* prefix */){}
 
 	/// Return the string id corresponding to the argument
-	static NLMISC::TStringId getStringId(const std::string& nodeName)
+	static TStringId getStringId(const std::string& nodeName)
 	{
-		if (_DBSM == NULL) _DBSM = NLMISC::CStringMapper::createLocalMapper();
+		if (_DBSM == NULL) _DBSM = CStringMapper::createLocalMapper();
 		return _DBSM->localMap(nodeName);
 	}
 
 	/// Return a pointer to the string corresponding to the argument
-	static const std::string *getStringFromId(NLMISC::TStringId nodeStringId)
+	static const std::string *getStringFromId(TStringId nodeStringId)
 	{
-		if (_DBSM == NULL) _DBSM = NLMISC::CStringMapper::createLocalMapper();
+		if (_DBSM == NULL) _DBSM = CStringMapper::createLocalMapper();
 		return &_DBSM->localUnmap(nodeStringId);
 	}
 
@@ -333,34 +333,36 @@ public :
 protected:
 
 	/// Constructor
-	ICDBNode() : _Atomic(false)
+	ICDBNode() : _AtomicFlag(false)
 	{
-		if (_DBSM == NULL) _DBSM = NLMISC::CStringMapper::createLocalMapper();
-		_Name = NLMISC::CStringMapper::emptyId();
+		if (_DBSM == NULL) _DBSM = CStringMapper::createLocalMapper();
+		_Name = CStringMapper::emptyId();
 	}
 
 	/// Constructor
-	ICDBNode (const std::string &name) : _Atomic(false)
+	ICDBNode (const std::string &name) : _AtomicFlag(false)
 	{
-		if (_DBSM == NULL) _DBSM = NLMISC::CStringMapper::createLocalMapper();
+		if (_DBSM == NULL) _DBSM = CStringMapper::createLocalMapper();
 		_Name = _DBSM->localMap(name);
 		//_NameDbg = name;
 	}
 
 	// utility to build full name efficiently (without reallocating the string at each parent level)
-	void _buildFullName(NLMISC::CSString &fullName);
+	void _buildFullName(CSString &fullName);
 
 	/// Atomic flag: is the branch an atomic group, or is the leaf a member of an atomic group
-	bool			_Atomic		: 1;
+	bool			_AtomicFlag		: 1;
 
 	/// Name of the node
-	NLMISC::TStringId	_Name;
+	TStringId	_Name;
 	//std::string _NameDbg;
 
-	static NLMISC::CStringMapper *_DBSM;
+	static CStringMapper *_DBSM;
 
 };
 
 
+}
+
 
 #endif // CDB_H
diff --git a/code/nel/include/nel/misc/cdb_bank_handler.h b/code/nel/include/nel/misc/cdb_bank_handler.h
new file mode 100644
index 000000000..102026f4d
--- /dev/null
+++ b/code/nel/include/nel/misc/cdb_bank_handler.h
@@ -0,0 +1,139 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef CDB_BANK_HANDLER
+#define CDB_BANK_HANDLER
+
+#include <vector>
+#include "nel/misc/types_nl.h"
+
+namespace NLMISC{
+
+/**
+ @brief Manages the bank names and mappings of the CDB it's associated with
+
+ Banks are numeric identifiers for the top-level branches of the CDB.
+ They are used for saving bandwidth, because the local CDBs are updated with deltas,
+ that identify the updatable top-level branch with this id.
+ The CCDBBankHandler manages the mapping of banks to their names, unified (node) index,
+ and the other way around.
+
+ */
+class CCDBBankHandler{
+public:
+	/**
+	 @brief The class' constructor
+	 @param maxbanks the maximum number of banks we need to handle
+	*/
+	CCDBBankHandler( uint maxbanks );
+
+	/// Very surprisingly this is the destructor
+	~CCDBBankHandler(){}
+
+	/**
+	 @brief   Returns the unified (node) index for the specified bank Id.
+	 @param   bank The bank whose uid we need.
+	 @return  Returns an uid or static_cast< uint >( -1 ) on failure.
+	*/
+	uint getUIDForBank( uint bank ) const;
+
+	/**
+	 @brief   Returns the bank Id for the specified unified (node) index.
+	 @param   uid The unified (node) index we need to translate to bank Id.
+	 @return  Returns a bank Id.
+	*/
+	uint getBankForUID( uint uid ) const{ return _UnifiedIndexToBank[ uid ]; }
+
+	/// Returns the last unified (node) index we mapped.
+	uint getLastUnifiedIndex() const{ return _CDBLastUnifiedIndex; }
+
+	/**
+	 @brief   Returns the number of bits used to store the number of nodes that belong to this bank.
+	 @param   bank The banks whose id bits we need.
+	 @return  Returns the number of bits used to store the number of nodes that belong to this bank.
+	*/
+	uint getFirstLevelIdBits( uint bank ) const{ return _FirstLevelIdBitsByBank[ bank ]; }
+
+	/**
+	 @brief   Returns the name of the specified bank.
+	 @param   bank The id of the bank we need the name of.
+	 @return  Returns the name of the specified bank.
+	*/
+	std::string getBankName( uint bank ) const{ return _CDBBankNames[ bank ]; }
+
+	/**
+	 @brief   Looks up the bank Id of the bank name specified.
+	 @param   name The name of the bank whose Id we need.
+	 @return  Returns the id of the bank, or static_cast< uint >( -1 ) on fail.
+	*/
+	uint getBankByName( const std::string &name ) const;
+
+	/**
+	 @brief   Maps the specified bank name to a unified (node) index and vica versa.
+	 @param   bankName Name of the bank to map.
+	*/
+	void mapNodeByBank( const std::string &bankName );
+
+	/**
+	 @brief   Loads the known bank names from an array ( the order decides the bank Id ).
+	 @param   strings The array of the banks names.
+	 @param   size    The size of the array.
+	*/
+	void fillBankNames( const char **strings, uint size );
+
+	/// Resets the node to bank mapping vector
+	void resetNodeBankMapping(){ _UnifiedIndexToBank.clear(); }
+
+	/// Resets all maps, and sets _CDBLastUnifiedIndex to 0.
+	void reset();
+
+	uint getUnifiedIndexToBankSize() const{ return _UnifiedIndexToBank.size(); }
+
+	/// Calculates the number of bits used to store the number of nodes that belong to the banks.
+	void calcIdBitsByBank();
+
+	/**
+	 @brief   Looks up the unified (node) index of a bank node.
+	 @param   bank  The bank id of the node we are looking up.
+	 @param   index The index of the node within the bank.
+	 @return  Returns the unified (node) index of the specified bank node.
+	*/
+	uint getServerToClientUIDMapping( uint bank, uint index ) const{ return _CDBBankToUnifiedIndexMapping[ bank ][ index ]; }
+
+private:
+	/// Mapping from server database index to client database index (first-level nodes)
+	std::vector< std::vector< uint > > _CDBBankToUnifiedIndexMapping;
+	
+	/// Mapping from client database index to bank IDs (first-level nodes)
+	std::vector< uint > _UnifiedIndexToBank;
+	
+	/// Last index mapped
+	uint _CDBLastUnifiedIndex;
+	
+	/// Number of bits for first-level branches, by bank
+	std::vector< uint > _FirstLevelIdBitsByBank;
+
+	/// Names of the CDB banks
+	std::vector< std::string > _CDBBankNames;
+
+	/// The number of banks used
+	uint maxBanks;
+};
+
+}
+
+#endif
+
diff --git a/code/ryzom/client/src/cdb_branch.h b/code/nel/include/nel/misc/cdb_branch.h
similarity index 53%
rename from code/ryzom/client/src/cdb_branch.h
rename to code/nel/include/nel/misc/cdb_branch.h
index 405c7c479..a2255ca09 100644
--- a/code/ryzom/client/src/cdb_branch.h
+++ b/code/nel/include/nel/misc/cdb_branch.h
@@ -20,7 +20,8 @@
 #define CDB_BRANCH_H
 
 #include "cdb.h"
-#include "game_share/ryzom_database_banks.h"
+
+namespace NLMISC{
 
 /**
  * Database Node which contains a set of properties
@@ -32,6 +33,21 @@ class CCDBNodeBranch : public ICDBNode
 {
 public:
 
+	class ICDBDBBranchObserverHandle
+	{
+	public:
+		virtual ~ICDBDBBranchObserverHandle(){}
+
+		virtual ICDBNode* owner()                                 = 0;
+		virtual IPropertyObserver* observer()                     = 0;
+		virtual bool observesLeaf( const std::string &leafName )  = 0;
+		virtual bool inList( uint list )                          = 0;
+		virtual void addToFlushableList()                         = 0;
+		virtual void removeFromFlushableList( uint list )         = 0;
+		virtual void removeFromFlushableList()                    = 0;
+
+	};
+
 	// default constructor
 	CCDBNodeBranch(const std::string &name) : ICDBNode(name)
 	{
@@ -44,7 +60,7 @@ public:
 	 *	Build the structure of the database from a file
 	 * \param f is the stream
 	 */
-	void init( xmlNodePtr node, class NLMISC::IProgressCallback &progressCallBack, bool mapBanks=false );
+	void init( xmlNodePtr node, class IProgressCallback &progressCallBack, bool mapBanks=false, CCDBBankHandler *bankHandler = NULL );
 
 	/**
 	 * Add a new sub node
@@ -93,10 +109,10 @@ public:
 	void write( CTextId& id, FILE * f);
 
 	/// Update the database from the delta, but map the first level with the bank mapping (see _CDBBankToUnifiedIndexMapping)
-	void readAndMapDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, TCDBBank bank );
+	void readAndMapDelta( TGameCycle gc, CBitMemStream& s, uint bank, CCDBBankHandler *bankHandler );
 
 	/// Update the database from a stream coming from the FE
-	void readDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream & f );
+	void readDelta( TGameCycle gc, CBitMemStream & f );
 
 	/**
 	 * Return the value of a property (the update flag is set to false)
@@ -118,19 +134,16 @@ public:
 	/// Clear the node and his children
 	void clear();
 
-	/// Reset the data corresponding to the bank (works only on top level node)
-	void resetBank( NLMISC::TGameCycle gc, TCDBBank bank)
+	void resetNode( TGameCycle gc, uint node )
 	{
-		//nlassert( getParent() == NULL );
-		for ( uint i=0; i!=_Nodes.size(); ++i )
-		{
-			if ( _UnifiedIndexToBank[i] == bank )
-				_Nodes[i]->resetData(gc);
-		}
+		if( node > _Nodes.size() )
+			return;
+		
+		_Nodes[ node ]->resetData( gc );
 	}
 
 	/// Reset all leaf data from this point
-	void resetData(NLMISC::TGameCycle gc, bool forceReset=false)
+	void resetData(TGameCycle gc, bool forceReset=false)
 	{
 		for ( uint i=0; i!=_Nodes.size(); ++i )
 		{
@@ -165,7 +178,7 @@ public:
 
 	virtual void display (const std::string &prefix);
 
-	void removeNode (CTextId& id);
+	void removeNode (const CTextId& id);
 
 	/**
 	* add an observer to a property
@@ -190,7 +203,7 @@ public:
 	 * and setting a branch observer on it, except you don't need to change your database paths
 	 * and update large amounts of code!).
 	 */
-	void addBranchObserver(IPropertyObserver* observer, const std::vector<std::string>& positiveLeafNameFilter=std::vector<std::string>());
+	void addBranchObserver( ICDBDBBranchObserverHandle* handle, const std::vector<std::string>& positiveLeafNameFilter=std::vector<std::string>());
 
 	/**
 	 * Easy version of addBranchObserver() (see above).
@@ -198,7 +211,7 @@ public:
 	 * "" -> this node
 	 * "FOO:BAR" ->  sub-branch "BAR" of "FOO" which is a sub-branch of this node
 	 */
-	void addBranchObserver(const char *dbPathFromThisNode, ICDBNode::IPropertyObserver& observer, const char **positiveLeafNameFilter=NULL, uint positiveLeafNameFilterSize=0);
+	void addBranchObserver( ICDBDBBranchObserverHandle *handle, const char *dbPathFromThisNode, const char **positiveLeafNameFilter=NULL, uint positiveLeafNameFilterSize=0);
 
 	// Remove observer from all sub-leaves
 	bool removeBranchObserver(IPropertyObserver* observer);
@@ -208,82 +221,14 @@ public:
 
 	virtual bool isLeaf() const { return false; }
 
-	/** Update all observers of branchs that have been modified
-	  */
-	static void flushObserversCalls();
-
 	// mark this branch and parent branch as 'modified'. This is usually called by sub-leaves
-	void linkInModifiedNodeList(NLMISC::TStringId modifiedLeafName);
+	void onLeafChanged( TStringId leafName );
 
 	/// Find a subnode at this level
 	ICDBNode * find (const std::string &nodeName);
 
-	/// Main init
-	static void resetNodeBankMapping() { _UnifiedIndexToBank.clear(); }
-
-	// reset all static mappings
-	static void reset();
-
-	/// Internal use only
-	static void mapNodeByBank( ICDBNode *node, const std::string& bankStr, bool clientOnly, uint nodeIndex );
-
 protected:
-
-
-		/** Struct identifying an observer of a db branch
-	  * This struct can be linked in a list so that we can update observers only once per pass.
-	  * An observer that watch a whole branch can be updated once and only once after each element of the branch has been modified
-	  */
-	class CDBBranchObsInfo
-	{
-		public:
-			NLMISC::CRefPtr<IPropertyObserver> Observer;
-			// 2 linked list are required : while the observer is notified, it can triger one other observer, so we must link it in another list
-			bool               Touched[2];
-			CDBBranchObsInfo   *PrevNotifiedObserver[2]; // NULL means this is the head
-			CDBBranchObsInfo   *NextNotifiedObserver[2];
-			ICDBNode		   *Owner;
-
-			// If non-empty, only a leaf whose name is found here will notify something
-			// This is equivalent to creating a sub-branch containing only the specified leaves
-			// and setting a branch observer on it, except you don't need to change your database paths
-			// and update large amounts of code and script!
-			std::vector<NLMISC::TStringId> PositiveLeafNameFilter;
-
-		public:
-
-			/// Constructor. See above for usage of positiveLeafNameFilter.
-			CDBBranchObsInfo(IPropertyObserver *obs = NULL, ICDBNode *owner = NULL, const std::vector<std::string>& positiveLeafNameFilter=std::vector<std::string>())
-			{
-				Owner = owner;
-				Observer = obs;
-				Touched[0] = Touched[1] = false;
-				PrevNotifiedObserver[0] = PrevNotifiedObserver[1] = NULL;
-				NextNotifiedObserver[0] = NextNotifiedObserver[1]  = NULL;
-				for (std::vector<std::string>::const_iterator ipf=positiveLeafNameFilter.begin(); ipf!=positiveLeafNameFilter.end(); ++ipf)
-				{
-					PositiveLeafNameFilter.push_back(ICDBNode::getStringId(*ipf)); // the ids are also mapped at database init, we don't need to unmap them in destructor
-				}
-			}
-			~CDBBranchObsInfo()
-			{
-				// should have been unlinked
-				nlassert(Touched[0] == false);
-				nlassert(Touched[1] == false);
-				nlassert(PrevNotifiedObserver[0] == NULL);
-				nlassert(PrevNotifiedObserver[1] == NULL);
-				nlassert(NextNotifiedObserver[0] == NULL);
-				nlassert(NextNotifiedObserver[1] == NULL);
-			}
-			// Unlink from the given list. This also clear the '_Touched' flag
-			void unlink(uint list);			
-			void link(uint list, NLMISC::TStringId modifiedLeafName);
-	};
-
-	typedef std::list<CDBBranchObsInfo> TObsList; // must use a list because pointers on CDBObserverInfo instances must remains valids
-
-protected:
-
+	typedef std::list< ICDBDBBranchObserverHandle* > TObserverHandleList;
 
 	CCDBNodeBranch			*_Parent;
 
@@ -298,34 +243,13 @@ protected:
 	bool					_Sorted : 1;
 
 	// observers for this node or branch
-	TObsList				_Observers;
-
-	friend class CDBBranchObsInfo;
-	// Global list of modified nodes
-	static CDBBranchObsInfo *_FirstNotifiedObs[2];
-	static CDBBranchObsInfo *_LastNotifiedObs[2];
-	static uint			   _CurrNotifiedObsList; // 0 or 1 => tell in which list observers of modified values must be added
-	// current & next observers being notified : if such observer if removed during notification, pointer will be valids
-	static CDBBranchObsInfo *_CurrNotifiedObs;
-	static CDBBranchObsInfo *_NextNotifiedObs;
-
-	/// Mapping from server database index to client database index (first-level nodes)
-	static std::vector<uint> _CDBBankToUnifiedIndexMapping [NB_CDB_BANKS];
-
-	// Mapping from client database index to TCDBBank (first-level nodes)
-	static std::vector<TCDBBank> _UnifiedIndexToBank;
-
-	/// Last index mapped
-	static uint				_CDBLastUnifiedIndex;
-
-	/// Number of bits for first-level branches, by bank
-	static uint				_FirstLevelIdBitsByBank [NB_CDB_BANKS];
+	TObserverHandleList		observerHandles;
 
 	/// called by clear
 	void			removeAllBranchObserver();
-	void			removeBranchInfoIt(TObsList::iterator it);
 };
 
+}
 
 #endif // CDB_BRANCH_H
 
diff --git a/code/nel/include/nel/misc/cdb_branch_observing_handler.h b/code/nel/include/nel/misc/cdb_branch_observing_handler.h
new file mode 100644
index 000000000..d7ec508af
--- /dev/null
+++ b/code/nel/include/nel/misc/cdb_branch_observing_handler.h
@@ -0,0 +1,128 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef CDB_BRANCH_OBS_HNDLR
+#define CDB_BRANCH_OBS_HNDLR
+
+#include "nel/misc/cdb_branch.h"
+
+namespace NLMISC{
+
+	/**
+	 @brief Manages the CDB branch observers.
+
+	 When a leaf's data changes, it notifies the branch, which then marks the observers as notifiable.
+	 The marked observers can then be notified and flushed on request.
+
+	 */
+	class CCDBBranchObservingHandler{
+
+		enum{
+			MAX_OBS_LST  = 2
+		};
+
+	public:
+		CCDBBranchObservingHandler();
+
+		~CCDBBranchObservingHandler();
+
+		/// Notifies the observers, and flushes the list
+		void flushObserverCalls();
+
+		void reset();
+
+		void addBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver *observer, const std::vector< std::string >& positiveLeafNameFilter );
+
+		void addBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer, const char **positiveLeafNameFilter, uint positiveLeafNameFilterSize );
+
+		void removeBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver* observer );
+
+		void removeBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer );
+		
+		
+		///Observer for branch observer flush events.
+		class IBranchObserverCallFlushObserver : public CRefCount{
+		public:
+			virtual ~IBranchObserverCallFlushObserver(){}
+			virtual void onObserverCallFlush() = 0;
+		};
+	
+	private:
+		void triggerFlushObservers();
+	
+	public:
+		void addFlushObserver( IBranchObserverCallFlushObserver *observer );
+		void removeFlushObserver( IBranchObserverCallFlushObserver *observer );
+	
+	private:
+
+		/**
+		 @brief Handle to a branch observer.
+
+		 The handle stores the owner branch, the observer and remembers if it's marked for notifying the observer.
+		 Also it manages adding/removing itself to/from the marked observer handles list, which is handled by CCDBBranchObservingHandler.
+
+		 */
+		class CCDBDBBranchObserverHandle : public CCDBNodeBranch::ICDBDBBranchObserverHandle{
+
+		public:
+
+			CCDBDBBranchObserverHandle( ICDBNode::IPropertyObserver *observer, CCDBNodeBranch *owner, CCDBBranchObservingHandler *handler );
+
+			~CCDBDBBranchObserverHandle();
+
+			ICDBNode* owner(){ return _owner; }
+
+			ICDBNode::IPropertyObserver* observer(){ return _observer; }
+
+			bool observesLeaf( const std::string &leafName );
+
+			bool inList( uint list );
+
+			void addToFlushableList();
+
+			void removeFromFlushableList( uint list );
+
+			void removeFromFlushableList();
+
+		private:
+
+			bool _inList[ MAX_OBS_LST ];
+
+			std::vector< std::string > _observedLeaves;
+
+			CCDBNodeBranch *_owner;
+
+			NLMISC::CRefPtr< ICDBNode::IPropertyObserver > _observer;
+
+			CCDBBranchObservingHandler *_handler;
+
+		};
+
+		std::list< CCDBNodeBranch::ICDBDBBranchObserverHandle* > flushableObservers[ MAX_OBS_LST ];
+
+		CCDBNodeBranch::ICDBDBBranchObserverHandle *currentHandle;
+
+		uint currentList;
+
+		std::vector< IBranchObserverCallFlushObserver* > flushObservers;
+
+	};
+}
+
+#endif
+
+
diff --git a/code/ryzom/client/src/cdb_check_sum.h b/code/nel/include/nel/misc/cdb_check_sum.h
similarity index 93%
rename from code/ryzom/client/src/cdb_check_sum.h
rename to code/nel/include/nel/misc/cdb_check_sum.h
index df0cf3959..02ce8f18b 100644
--- a/code/ryzom/client/src/cdb_check_sum.h
+++ b/code/nel/include/nel/misc/cdb_check_sum.h
@@ -19,8 +19,9 @@
 #ifndef NL_CDB_CHECK_SUM_H
 #define NL_CDB_CHECK_SUM_H
 
-#include "nel/misc/types_nl.h"
+#include "types_nl.h"
 
+namespace NLMISC{
 
 /**
  * class implementing check sum for the client database
@@ -81,6 +82,7 @@ private:
 };
 
 
+}
 
 #endif // NL_CDB_CHECK_SUM_H
 
diff --git a/code/ryzom/client/src/cdb_leaf.h b/code/nel/include/nel/misc/cdb_leaf.h
similarity index 88%
rename from code/ryzom/client/src/cdb_leaf.h
rename to code/nel/include/nel/misc/cdb_leaf.h
index d28cff2c2..566394d97 100644
--- a/code/ryzom/client/src/cdb_leaf.h
+++ b/code/nel/include/nel/misc/cdb_leaf.h
@@ -21,7 +21,10 @@
 
 #include "cdb.h"
 #include "cdb_branch.h"
-#include "nel/misc/time_nl.h"
+#include "time_nl.h"
+#include "rgba.h"
+
+namespace NLMISC{
 
 /**
  * Database node which contains a unique property
@@ -50,16 +53,16 @@ public:
 	void setValue8 (sint8 prop);
 	inline bool getValueBool() { return (_Property!=(sint64)0 ); }
 	void setValueBool (bool prop);
-	inline NLMISC::CRGBA getValueRGBA()
+	inline CRGBA getValueRGBA()
 	{
-		NLMISC::CRGBA col;
+		CRGBA col;
 		col.R = (uint8)(_Property&0xff);
 		col.G = (uint8)((_Property>>8)&0xff);
 		col.B = (uint8)((_Property>>16)&0xff);
 		col.A = (uint8)((_Property>>24)&0xff);
 		return col;
 	}
-	void setValueRGBA (const NLMISC::CRGBA &color);
+	void setValueRGBA (const CRGBA &color);
 
 	/// Return the value of the property before the database change
 	inline sint64 getOldValue64() { return _oldProperty; }
@@ -98,7 +101,7 @@ public:
 	 *	Build the structure of the database from a file
 	 * \param f is the stream
 	 */
-	void init( xmlNodePtr node, NLMISC::IProgressCallback &progressCallBack, bool mapBanks=false );
+	void init( xmlNodePtr node, IProgressCallback &progressCallBack, bool mapBanks=false, CCDBBankHandler *bankHandler = NULL );
 
 	/**
 	 * Get a node
@@ -132,7 +135,7 @@ public:
 	 * Update the database from a stream coming from the FE
 	 * \param f : the stream.
 	 */
-	void readDelta(NLMISC::TGameCycle gc, NLMISC::CBitMemStream & f );
+	void readDelta(TGameCycle gc, CBitMemStream & f );
 
 	/**
 	 * Return the value of a property (the update flag is set to false)
@@ -154,10 +157,10 @@ public:
 	/**
 	 * Set the value of a property, only if gc>=_LastChangeGC
 	 */
-	bool setPropCheckGC(NLMISC::TGameCycle gc, sint64 value);
+	bool setPropCheckGC(TGameCycle gc, sint64 value);
 
 	/// Reset all leaf data from this point
-	void resetData(NLMISC::TGameCycle gc, bool forceReset=false);
+	void resetData(TGameCycle gc, bool forceReset=false);
 
 	/**
 	 * Clear the node and his children
@@ -215,7 +218,7 @@ public:
 
 
 	/// get the last change GameCycle (server tick) for this value
-	NLMISC::TGameCycle	getLastChangeGC() const {return _LastChangeGC;}
+	TGameCycle	getLastChangeGC() const {return _LastChangeGC;}
 
 
 private:
@@ -234,7 +237,7 @@ private:
 
 	/// gamecycle (servertick) of the last change for this value.
 	/// change are made in readDelta only for change >= _LastChangeGC
-	NLMISC::TGameCycle	_LastChangeGC;
+	TGameCycle	_LastChangeGC;
 
 	/// observers to call when the value really change
 	std::vector<IPropertyObserver*> _Observers;
@@ -249,7 +252,7 @@ private:
 ////////////////////
 
 
-
+}
 
 
 #endif // CDB_LEAF_H
diff --git a/code/nel/include/nel/misc/cdb_manager.h b/code/nel/include/nel/misc/cdb_manager.h
new file mode 100644
index 000000000..de6ccd20f
--- /dev/null
+++ b/code/nel/include/nel/misc/cdb_manager.h
@@ -0,0 +1,184 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+#ifndef CDB_MANAGER_H
+#define CDB_MANAGER_H
+
+#include "nel/misc/cdb_branch.h"
+#include "nel/misc/cdb_leaf.h"
+#include "nel/misc/cdb_bank_handler.h"
+#include "nel/misc/cdb_branch_observing_handler.h"
+
+namespace NLMISC{
+
+	/// Class that encapsulates the separate CDB components
+	class CCDBManager{
+	
+	public:
+		/**
+		 The constructor
+		 @param maxBanks  -  The maximum number of banks to be used
+
+		 */
+		CCDBManager( const char *rootNodeName, uint maxBanks );
+
+		~CCDBManager();
+
+
+		/**
+		 Returns the specified leaf node from the database.
+		 @param name The name of the leaf node.
+		 @param create Specifies if the node should be created if it doesn't exist yet.
+
+		 */
+		CCDBNodeLeaf* getDbLeaf( const std::string &name, bool create = true );
+
+
+
+		/**
+		 Returns the specified branch node from the database.
+		 @param name The name of the branch.
+
+		 */
+		CCDBNodeBranch* getDbBranch( const std::string &name );
+
+
+		/**
+		 Deletes the specified database node.
+		 @param name The name of the database node.
+
+		 */
+		void delDbNode( const std::string &name );
+		
+		/**
+		 Adds an observer to a branch of the database.
+		 @param branchName The name of the branch we want to observe
+		 @param observer   The observer we want to add
+		 @param positiveLeafNameFilter A vector of strings containing the names of the leaves we want to observe
+
+		 */
+		void addBranchObserver( const char *branchName, ICDBNode::IPropertyObserver *observer, const std::vector< std::string >& positiveLeafNameFilter = std::vector< std::string >() );
+
+		/**
+		 Adds an observer to a branch of the database.
+		 @param branch  The branch we want to observe
+		 @param observer   The observer we want to add
+		 @param positiveLeafNameFilter A vector of strings containing the names of the leaves we want to observe
+
+		 */
+		void addBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver *observer, const std::vector< std::string >& positiveLeafNameFilter = std::vector< std::string >() );
+
+
+		/**
+		 Adds an observer to a branch of the database.
+		 @param branchName The name of the branch we start from
+		 @param dbPathFromThisNode The path to the branch we want to observe
+		 @param observer   The observer we want to add
+		 @param positiveLeafNameFilter An array of strings containing the names of the leaves we want to observe
+		 @param positiveLeafNameFilterSize The size of the array
+
+		 */
+		void addBranchObserver( const char *branchName, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer, const char **positiveLeafNameFilter = NULL, uint positiveLeafNameFilterSize = 0 );
+
+		
+		/**
+		 Adds an observer to a branch of the database.
+		 @param branch The branch we start from
+		 @param dbPathFromThisNode The path to the branch we want to observe
+		 @param observer   The observer we want to add
+		 @param positiveLeafNameFilter An array of strings containing the names of the leaves we want to observe
+		 @param positiveLeafNameFilterSize The size of the array
+
+		 */
+		void addBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer, const char **positiveLeafNameFilter, uint positiveLeafNameFilterSize );
+
+
+		/**
+		 Removes an observer from a branch in the database.
+		 @param branchName The name of the branch
+		 @param observer The observer we want to remove
+
+		 */
+		void removeBranchObserver( const char *branchName, ICDBNode::IPropertyObserver* observer );
+
+
+		/**
+		 Removes an observer from a branch in the database.
+		 @param branch The branch
+		 @param observer The observer we want to remove
+
+		 */
+		void removeBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver* observer );
+
+
+		/**
+		 Removes an observer from a branch in the database.
+		 @param branchName The name of the branch we start from
+		 @param dbPathFromThisNode The path to the branch we want to observe from the starting branch
+		 @param observer The observer we want to remove
+
+		 */
+		void removeBranchObserver( const char *branchName, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer );
+
+
+		/**
+		 Removes an observer from a branch in the database.
+		 @param branchName The name of the branch we start from
+		 @param dbPathFromThisNode The path to the branch we want to observe from the starting branch
+		 @param observer The observer we want to remove
+
+		 */
+		void removeBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer );
+
+
+		/**
+		 Adds a branch observer call flush observer. ( These are notified after the branch observers are notified )
+		 @param observer The observer
+
+		 */
+		void addFlushObserver( CCDBBranchObservingHandler::IBranchObserverCallFlushObserver *observer );
+
+
+		/**
+		 Removes a branch observer call flush observer.
+		 @param observer The observer
+		 */
+		void removeFlushObserver( CCDBBranchObservingHandler::IBranchObserverCallFlushObserver *observer );
+
+		/**
+		 Notifies the observers whose observed branches were updated.
+		 */
+		void flushObserverCalls();
+
+		/**
+		 Resets the specified bank.
+		 @param gc GameCycle ( no idea what it is exactly, probably some time value )
+		 @param bank The banks we want to reset
+
+		 */
+		void resetBank( uint gc, uint bank );
+	
+	protected:
+		CCDBBankHandler bankHandler;
+		CCDBBranchObservingHandler branchObservingHandler;
+		CRefPtr< CCDBNodeBranch > _Database;
+	};
+
+}
+
+#endif
+
diff --git a/code/nel/include/nel/misc/common.h b/code/nel/include/nel/misc/common.h
index 42bf56d3b..fa9272386 100644
--- a/code/nel/include/nel/misc/common.h
+++ b/code/nel/include/nel/misc/common.h
@@ -342,6 +342,8 @@ std::string secondsToHumanReadable (uint32 time);
 /// Get a bytes or time in string format and convert it in seconds or bytes
 uint32 fromHumanReadable (const std::string &str);
 
+/// Add digit grouping seperator to if value >= 10 000. Assumes input is numerical string.
+std::string formatThousands(const std::string& s);
 
 /// This function executes a program in the background and returns instantly (used for example to launch services in AES).
 /// The program will be launched in the current directory
diff --git a/code/nel/include/nel/misc/diff_tool.h b/code/nel/include/nel/misc/diff_tool.h
index 64989fcaf..2f291c6a0 100644
--- a/code/nel/include/nel/misc/diff_tool.h
+++ b/code/nel/include/nel/misc/diff_tool.h
@@ -501,8 +501,8 @@ namespace STRING_MANAGER
 
 //						callback->onSwap(it - context.Reference.begin(), refCount, context);
 						callback->onSwap(index, refCount, context);
-//						swap(*it, context.Reference[refCount]);
-						swap(context.Reference[index], context.Reference[refCount]);
+//						std::swap(*it, context.Reference[refCount]);
+						std::swap(context.Reference[index], context.Reference[refCount]);
 					}
 				}
 				else if (getHashValue(context.Addition, addCount) != getHashValue(context.Reference, refCount))
diff --git a/code/nel/include/nel/misc/eid_translator.h b/code/nel/include/nel/misc/eid_translator.h
index 695f7724e..9937b72fd 100644
--- a/code/nel/include/nel/misc/eid_translator.h
+++ b/code/nel/include/nel/misc/eid_translator.h
@@ -146,6 +146,8 @@ public:
 
 	TAdditionalInfoCb	EntityInfoCallback;
 
+	static void removeShardFromName(ucstring& name);
+
 private:
 	// get all eid for a user using the user name or the user id
 	void				getByUser (uint32 uid, std::vector<NLMISC::CEntityId> &res);
diff --git a/code/nel/include/nel/misc/event_emitter.h b/code/nel/include/nel/misc/event_emitter.h
index e678c2674..5c547d07f 100644
--- a/code/nel/include/nel/misc/event_emitter.h
+++ b/code/nel/include/nel/misc/event_emitter.h
@@ -49,7 +49,7 @@ public:
 	 * \param server
 	 */
 	virtual void submitEvents(CEventServer & server, bool allWindows) = 0;
-	
+
 	/**
 	 * Instruct the event emitter to send CGDMouseMove instead of CEventMouseMove.
 	 * 
diff --git a/code/nel/include/nel/misc/fast_id_map.h b/code/nel/include/nel/misc/fast_id_map.h
new file mode 100644
index 000000000..dbd05bc76
--- /dev/null
+++ b/code/nel/include/nel/misc/fast_id_map.h
@@ -0,0 +1,151 @@
+/**
+ * \file fast_id_map.h
+ * \brief CFastIdMap
+ * \date 2012-04-10 19:28GMT
+ * \author Jan Boon (Kaetemi)
+ * CFastIdMap
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLMISC_FAST_ID_MAP_H
+#define NLMISC_FAST_ID_MAP_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+// Project includes
+
+namespace NLMISC {
+
+/**
+ * \brief CFastIdMap
+ * \date 2012-04-10 19:28GMT
+ * \author Jan Boon (Kaetemi)
+ * This template allows for assigning unique uint32 identifiers to pointers.
+ * Useful when externally only exposing an identifier, when pointers may have been deleted.
+ * The identifier is made from two uint16's, one being the direct index in the identifier vector, 
+ * and the other being a verification value that is increased when the identifier index is re-used.
+ * TId must be a typedef of uint32.
+ * TValue should be a pointer.
+ */
+template<typename TId, class TValue>
+class CFastIdMap
+{
+protected:
+	struct CIdInfo
+	{
+		CIdInfo() { }
+		CIdInfo(uint16 verification, uint16 next, TValue value) : 
+			Verification(verification), Next(next), Value(value) { }
+		uint16 Verification;
+		uint16 Next;
+		TValue Value;
+	};
+	/// ID memory
+	std::vector<CIdInfo> m_Ids;
+	/// Nb of assigned IDs
+	uint m_Size;
+	/// Assigned IDs
+	uint16 m_Next;
+
+public:
+	CFastIdMap(TValue defaultValue) : m_Size(0), m_Next(0)
+	{
+		// Id 0 will contain the last available unused id, and be 0 if no more unused id's are available
+		// defaultValue will be returned when the ID is not found
+		m_Ids.push_back(CIdInfo(0, 0, defaultValue));
+	}
+
+	virtual ~CFastIdMap() { }
+
+	void clear()
+	{
+		m_Ids.resize(1);
+		m_Ids[0].Next = 0;
+	}
+
+	TId insert(TValue value)
+	{
+		// get next unused index
+		uint16 idx = m_Ids[0].Next;
+		if (idx == 0)
+		{
+			// size of used elements must be equal to the vector size minus one, when everything is allocated
+			nlassert((m_Ids.size() - 1) == m_Size);
+			
+			idx = m_Ids.size();
+			uint16 verification = rand();
+			m_Ids.push_back(CIdInfo(verification, m_Next, value));
+			m_Next = idx;
+			return (TId)(((uint32)verification) << 16) & idx;
+		}
+		else
+		{
+			m_Ids[0].Next = m_Ids[idx].Next; // restore the last unused id
+			m_Ids[idx].Value = value;
+			return (TId)(((uint32)m_Ids[idx].Verification) << 16) & idx;
+		}
+	}
+
+	void erase(TId id)
+	{
+		uint32 idx = ((uint32)id) & 0xFFFF;
+		uint16 verification = (uint16)(((uint32)id) >> 16);
+		if (m_Ids[idx].Verification == verification)
+		{
+			m_Ids[idx].Value = m_Ids[0].Value; // clean value for safety
+			m_Ids[idx].Verification = (uint16)(((uint32)m_Ids[idx].Verification + 1) & 0xFFFF); // change verification value, allow overflow :)
+			m_Ids[idx].Next = m_Ids[0].Next; // store the last unused id
+			m_Ids[0].Next = (uint16)idx; // set this as last unused id
+		}
+		else
+		{
+			nlwarning("Invalid ID");
+		}
+	}
+
+	TValue get(TId id)
+	{
+		uint32 idx = ((uint32)id) & 0xFFFF;
+		uint16 verification = (uint16)(((uint32)id) >> 16);
+		if (m_Ids[idx].Verification == verification)
+		{
+			return m_Ids[idx].Value;
+		}
+		else
+		{
+			nldebug("Invalid ID");
+			return m_Ids[0].Value;
+		}
+	}
+
+	inline uint size() { return m_Size; }
+
+}; /* class CFastIdMap */
+
+} /* namespace NLMISC */
+
+#endif /* #ifndef NLMISC_FAST_ID_MAP_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/misc/mem_stream.h b/code/nel/include/nel/misc/mem_stream.h
index 2102129dd..1da99a48d 100644
--- a/code/nel/include/nel/misc/mem_stream.h
+++ b/code/nel/include/nel/misc/mem_stream.h
@@ -301,7 +301,7 @@ public:
 	 * If you are using the stream only in output mode, you can use this method as a faster version
 	 * of clear() *if you don't serialize pointers*.
 	 */
-	void			resetBufPos() { _Buffer.Pos = 0; }
+	virtual void		resetBufPos() { _Buffer.Pos = 0; }
 
 	/**
 	 * Resize the message buffer and fill data at position 0.
@@ -340,7 +340,7 @@ public:
 	 * fill it with raw data using any filling function (warning: don't fill more than 'msgsize'
 	 * bytes!), then you are ready to read, using serial(), the data you've just filled.
 	 */
-	uint8			*bufferToFill( uint32 msgsize )
+	virtual uint8		*bufferToFill( uint32 msgsize )
 	{
 #ifdef NL_DEBUG
 		nlassert( isReading() );
diff --git a/code/nel/include/nel/misc/mutex.h b/code/nel/include/nel/misc/mutex.h
index e2205d666..1c01a6134 100644
--- a/code/nel/include/nel/misc/mutex.h
+++ b/code/nel/include/nel/misc/mutex.h
@@ -717,11 +717,11 @@ class CAutoMutex
 	TMutex	&_Mutex;
 
 	// forbeden copy or assignent
-	CAutoMutex(const CAutoMutex &other)
+	CAutoMutex(const CAutoMutex &/* other */)
 	{
 	}
 
-	CAutoMutex &operator = (const CAutoMutex &other)
+	CAutoMutex &operator = (const CAutoMutex &/* other */)
 	{
 		return *this;
 	}
diff --git a/code/nel/include/nel/misc/p_thread.h b/code/nel/include/nel/misc/p_thread.h
index cd027aa37..7e6a4d5a5 100644
--- a/code/nel/include/nel/misc/p_thread.h
+++ b/code/nel/include/nel/misc/p_thread.h
@@ -36,6 +36,12 @@ namespace NLMISC {
 class CPThread : public IThread
 {
 public:
+	enum TThreadState
+	{
+		ThreadStateNone, 
+		ThreadStateRunning, 
+		ThreadStateFinished, 
+	};
 
 	/// Constructor
 	CPThread( IRunnable *runnable, uint32 stackSize);
@@ -48,6 +54,7 @@ public:
 	virtual void wait();
 	virtual bool setCPUMask(uint64 cpuMask);
 	virtual uint64 getCPUMask();
+	virtual void setPriority(TThreadPriority priority);
 	virtual std::string getUserName();
 
 	virtual IRunnable *getRunnable()
@@ -58,10 +65,11 @@ public:
 	/// Internal use
 	IRunnable	*Runnable;
 
+	TThreadState	_State;
+	pthread_t	_ThreadHandle;
+
 private:
-	uint8		_State; // 0=not created, 1=started, 2=finished
 	uint32		_StackSize;
-	pthread_t	_ThreadHandle;
 };
 
 /**
diff --git a/code/nel/include/nel/misc/speaker_listener.h b/code/nel/include/nel/misc/speaker_listener.h
index 7481e12c8..5f9f86352 100644
--- a/code/nel/include/nel/misc/speaker_listener.h
+++ b/code/nel/include/nel/misc/speaker_listener.h
@@ -118,7 +118,7 @@ namespace NLMISC
 			_Speaker->registerListener(this);
 		}
 
-		void unregisterListener(ISpeaker *speaker)
+		void unregisterListener(ISpeaker * /* speaker */)
 		{
 			nlassert(_Speaker != NULL);
 			_Speaker->unregisterListener(this);
diff --git a/code/nel/include/nel/misc/sstring.h b/code/nel/include/nel/misc/sstring.h
index 513c681c9..fc17d67f5 100644
--- a/code/nel/include/nel/misc/sstring.h
+++ b/code/nel/include/nel/misc/sstring.h
@@ -55,7 +55,7 @@ public:
 	///	ctor
 	CSString(int i,const char *fmt="%d");
 	///	ctor
-	CSString(unsigned u,const char *fmt="%u");
+	CSString(uint32 u,const char *fmt="%u");
 	/// ctor
 	CSString(double d,const char *fmt="%f");
 	///	ctor
@@ -76,14 +76,14 @@ public:
 	char back() const;
 
 	/// Return the n left hand most characters of a string
-	CSString left(unsigned count) const;
+	CSString left(uint32 count) const;
 	/// Return the n right hand most characters of a string
-	CSString right(unsigned count) const;
+	CSString right(uint32 count) const;
 
 	/// Return the string minus the n left hand most characters of a string
-	CSString leftCrop(unsigned count) const;
+	CSString leftCrop(uint32 count) const;
 	/// Return the string minus the n right hand most characters of a string
-	CSString rightCrop(unsigned count) const;
+	CSString rightCrop(uint32 count) const;
 
 	/// Return sub string up to but not including first instance of given character, starting at 'iterator'
 	/// on exit 'iterator' indexes first character after extracted string segment
@@ -116,9 +116,9 @@ public:
 	/// Return sub string remaining after the first word
 	CSString tailFromFirstWord() const;
 	/// Count the number of words in a string
-	unsigned countWords() const;
+	uint32 countWords() const;
 	/// Extract the given word
-	CSString word(unsigned idx) const;
+	CSString word(uint32 idx) const;
 
 	/// Return first word or quote-encompassed sub-string - can remove extracted sub-string from source string
 	CSString firstWordOrWords(bool truncateThis=false,bool useSlashStringEscape=true,bool useRepeatQuoteStringEscape=true);
@@ -127,9 +127,9 @@ public:
 	/// Return sub string following first word (or quote-encompassed sub-string)
 	CSString tailFromFirstWordOrWords(bool useSlashStringEscape=true,bool useRepeatQuoteStringEscape=true) const;
 	/// Count the number of words (or quote delimited sub-strings) in a string
-	unsigned countWordOrWords(bool useSlashStringEscape=true,bool useRepeatQuoteStringEscape=true) const;
+	uint32 countWordOrWords(bool useSlashStringEscape=true,bool useRepeatQuoteStringEscape=true) const;
 	/// Extract the given words (or quote delimited sub-strings)
-	CSString wordOrWords(unsigned idx,bool useSlashStringEscape=true,bool useRepeatQuoteStringEscape=true) const;
+	CSString wordOrWords(uint32 idx,bool useSlashStringEscape=true,bool useRepeatQuoteStringEscape=true) const;
 
 	/// Return first line - can remove extracted line from source string
 	CSString firstLine(bool truncateThis=false);
@@ -138,9 +138,9 @@ public:
 	/// Return sub string remaining after the first line
 	CSString tailFromFirstLine() const;
 	/// Count the number of lines in a string
-	unsigned countLines() const;
+	uint32 countLines() const;
 	/// Extract the given line
-	CSString line(unsigned idx) const;
+	CSString line(uint32 idx) const;
 
 	/// A handy utility routine for knowing if a character is a white space character or not (' ','\t','\n','\r',26)
 	static bool isWhiteSpace(char c);
@@ -377,7 +377,7 @@ public:
 	/// assignment operator
 	CSString& operator=(int i);
 	/// assignment operator
-	CSString& operator=(unsigned u);
+	CSString& operator=(uint32 u);
 	/// assignment operator
 	CSString& operator=(double d);
 
@@ -561,7 +561,7 @@ inline CSString::CSString(int i,const char *fmt)
 	*this=buf;
 }
 
-inline CSString::CSString(unsigned u,const char *fmt)
+inline CSString::CSString(uint32 u,const char *fmt)
 {
 	char buf[1024];
 	sprintf(buf,fmt,u);
@@ -611,26 +611,26 @@ inline char CSString::back() const
 	return (*this)[size()-1];
 }
 
-inline CSString CSString::right(unsigned count) const
+inline CSString CSString::right(uint32 count) const
 {
 	if (count>=size())
 		return *this;
 	return substr(size()-count);
 }
 
-inline CSString CSString::rightCrop(unsigned count) const
+inline CSString CSString::rightCrop(uint32 count) const
 {
 	if (count>=size())
 		return CSString();
 	return substr(0,size()-count);
 }
 
-inline CSString CSString::left(unsigned count) const
+inline CSString CSString::left(uint32 count) const
 {
 	return substr(0,count);
 }
 
-inline CSString CSString::leftCrop(unsigned count) const
+inline CSString CSString::leftCrop(uint32 count) const
 {
 	if (count>=size())
 		return CSString();
@@ -639,7 +639,7 @@ inline CSString CSString::leftCrop(unsigned count) const
 
 inline CSString CSString::splitToWithIterator(char c,uint32& iterator) const
 {
-	unsigned i;
+	uint32 i;
 	CSString result;
 	for (i=iterator;i<size() && (*this)[i]!=c;++i)
 		result+=(*this)[i];
@@ -713,7 +713,7 @@ inline bool CSString::isPrintable(char c)
 	if (c==',') return true;
 	if (c==';') return true;
 	if (c=='$') return true;
-	if ((unsigned char)c==156) return true; // Sterling Pound char causing error in gcc 4.1.2
+	if ((uint8)c==156) return true; // Sterling Pound char causing error in gcc 4.1.2
 	if (c=='^') return true;
 	if (c=='~') return true;
 	if (c=='\'') return true;
@@ -784,7 +784,7 @@ inline CSString& CSString::operator=(int i)
 	return *this;
 }
 
-inline CSString& CSString::operator=(unsigned u)
+inline CSString& CSString::operator=(uint32 u)
 {
 	CSString other(u);
 	*this = other;
diff --git a/code/nel/include/nel/misc/static_map.h b/code/nel/include/nel/misc/static_map.h
index 0fd1f8857..b5ec3e228 100644
--- a/code/nel/include/nel/misc/static_map.h
+++ b/code/nel/include/nel/misc/static_map.h
@@ -93,7 +93,7 @@ public:
 	{
 	}
 
-	explicit CStaticMap (const Comp& __comp) : _DataSorted(true)
+	explicit CStaticMap (const Comp& /* __comp */) : _DataSorted(true)
 	{
 	}
 
diff --git a/code/nel/include/nel/misc/stl_block_allocator.h b/code/nel/include/nel/misc/stl_block_allocator.h
index 97486c20c..441d49560 100644
--- a/code/nel/include/nel/misc/stl_block_allocator.h
+++ b/code/nel/include/nel/misc/stl_block_allocator.h
@@ -61,7 +61,7 @@ namespace NLMISC {
 	{
 	public:
 		/// Constructor. Must gives a blockMemory to ctor. NB: must gives a CBlockMemory<T, false> !!!
-		CSTLBlockAllocator(CBlockMemory<T, false> *bm)
+		CSTLBlockAllocator(CBlockMemory<T, false> * /* bm */)
 		{
 		}
 		/// copy ctor
diff --git a/code/nel/include/nel/misc/thread.h b/code/nel/include/nel/misc/thread.h
index 82ef78a13..983e6b12a 100644
--- a/code/nel/include/nel/misc/thread.h
+++ b/code/nel/include/nel/misc/thread.h
@@ -68,6 +68,16 @@ public:
 	}
 };
 
+/// Thread priorities, numbering follows Win32 for now
+enum TThreadPriority
+{
+	ThreadPriorityLowest = -2,
+	ThreadPriorityLow = -1,
+	ThreadPriorityNormal = 0,
+	ThreadPriorityHigh = 1,
+	ThreadPriorityHighest = 2,
+};
+
 /**
  * Thread base interface, must be implemented for all OS
  * \author Vianney Lecroart
@@ -119,6 +129,9 @@ public:
 	  */
 	virtual uint64 getCPUMask()=0;
 
+	/// Set the thread priority. Thread must have been started before.
+	virtual void setPriority(TThreadPriority priority) = 0;
+
 	/**
 	  * Get the thread user name.
 	  * Under Linux return thread owner, under windows return the name of the logon user.
diff --git a/code/nel/include/nel/misc/win_thread.h b/code/nel/include/nel/misc/win_thread.h
index a2e8b5389..628942dde 100644
--- a/code/nel/include/nel/misc/win_thread.h
+++ b/code/nel/include/nel/misc/win_thread.h
@@ -49,6 +49,7 @@ public:
 	virtual void wait();
 	virtual bool setCPUMask(uint64 cpuMask);
 	virtual uint64 getCPUMask();
+	virtual void setPriority(TThreadPriority priority);
 	virtual std::string getUserName();
 
 	virtual IRunnable *getRunnable()
@@ -69,8 +70,7 @@ public:
 	void suspend();
 	// Resume the thread. No-op if already resumed
 	void resume();
-	// set priority as defined by "SetThreadpriority"
-	void setPriority(int priority);
+	// Priority boost
 	void enablePriorityBoost(bool enabled);
 
 	/// private use
diff --git a/code/nel/include/nel/net/Makefile.am b/code/nel/include/nel/net/Makefile.am
deleted file mode 100644
index 7a5dfe1be..000000000
--- a/code/nel/include/nel/net/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/net
-
-include_HEADERS      =	admin.h			\
-			buf_client.h		\
-			buf_net_base.h		\
-			buf_server.h		\
-			buf_sock.h		\
-			callback_client.h	\
-			callback_net_base.h	\
-			callback_server.h	\
-			cvar_log_filter.h	\
-			dummy_tcp_sock.h	\
-			email.h			\
-			inet_address.h		\
-			listen_sock.h		\
-			login_client.h		\
-			login_cookie.h		\
-			login_server.h		\
-			message.h		\
-			message_recorder.h	\
-			module_builder_parts.h	\
-			module_common.h		\
-			module_gateway.h	\
-			module.h		\
-			module_manager.h	\
-			module_message.h	\
-			module_socket.h		\
-			naming_client.h		\
-			net_displayer.h		\
-			net_log.h		\
-			net_manager.h		\
-			pacs_client.h		\
-			service.h		\
-			sock.h			\
-			tcp_sock.h		\
-			transport_class.h	\
-			udp_sim_sock.h		\
-			udp_sock.h		\
-			unified_network.h	\
-			unitime.h		\
-			varpath.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/net/module_builder_parts.h b/code/nel/include/nel/net/module_builder_parts.h
index b080e521f..d2e653315 100644
--- a/code/nel/include/nel/net/module_builder_parts.h
+++ b/code/nel/include/nel/net/module_builder_parts.h
@@ -188,8 +188,8 @@ namespace NLNET
 
 		// unused interceptors
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
-		bool				fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message)	{return false;}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy * /* moduleProxy */) {}
+		bool				fwdOnProcessModuleMessage(NLNET::IModuleProxy * /* sender */, const NLNET::CMessage &/* message */)	{return false;}
 
 		// check module up
 		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)
diff --git a/code/nel/include/nel/net/transport_class.h b/code/nel/include/nel/net/transport_class.h
index 11161d7cd..f1110e492 100644
--- a/code/nel/include/nel/net/transport_class.h
+++ b/code/nel/include/nel/net/transport_class.h
@@ -75,7 +75,7 @@ public:
 	enum TProp {
 		PropUInt8, PropUInt16, PropUInt32, PropUInt64,
 		PropSInt8, PropSInt16, PropSInt32, PropSInt64,
-		PropBool, PropFloat, PropDouble, PropString, PropDataSetRow, PropSheetId, PropUKN };
+		PropBool, PropFloat, PropDouble, PropString, PropDataSetRow, PropSheetId, PropUCString, PropUKN };
 //		PropBool, PropFloat, PropDouble, PropString, PropDataSetRow, PropEntityId, PropSheetId, PropUKN };
 
 
@@ -160,6 +160,7 @@ public:
 		case PropString: nlassert(sizeof(T) == sizeof (std::string)); break;
 //		case PropEntityId: nlassert(sizeof(T) == sizeof (NLMISC::CEntityId)); break;
 		case PropSheetId: nlassert(sizeof(T) == sizeof (NLMISC::CSheetId)); break;
+		case PropUCString: nlassert(sizeof(T) == sizeof (ucstring)); break;
 		default: nlerror ("property %s have unknown type %d", name.c_str(), type);
 		}
 
@@ -334,7 +335,7 @@ protected:
 
 		T *Value;
 
-		virtual void serialDefaultValue (NLMISC::IStream &f)
+		virtual void serialDefaultValue (NLMISC::IStream &/* f */)
 		{
 			// nothing
 		}
diff --git a/code/nel/include/nel/pacs/Makefile.am b/code/nel/include/nel/pacs/Makefile.am
deleted file mode 100644
index 7160ec65c..000000000
--- a/code/nel/include/nel/pacs/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/pacs
-
-include_HEADERS      =	u_collision_desc.h	\
-			u_global_position.h	\
-			u_global_retriever.h	\
-			u_move_container.h	\
-			u_move_primitive.h	\
-			u_primitive_block.h	\
-			u_retriever_bank.h
-
-# End of Makefile.am
-
diff --git a/code/nel/include/nel/sound/Makefile.am b/code/nel/include/nel/sound/Makefile.am
deleted file mode 100644
index 77dd246a6..000000000
--- a/code/nel/include/nel/sound/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-includedir           = ${prefix}/include/nel/sound
-
-include_HEADERS      =	sound_animation.h	\
-			sound_anim_manager.h	\
-			sound_anim_marker.h	\
-			u_audio_mixer.h		\
-			u_listener.h		\
-			u_source.h
-
-# End of Makefile.am
diff --git a/code/nel/include/nel/sound/audio_decoder.h b/code/nel/include/nel/sound/audio_decoder.h
new file mode 100644
index 000000000..3babc1de1
--- /dev/null
+++ b/code/nel/include/nel/sound/audio_decoder.h
@@ -0,0 +1,107 @@
+/**
+ * \file audio_decoder.h
+ * \brief IAudioDecoder
+ * \date 2012-04-11 09:34GMT
+ * \author Jan Boon (Kaetemi)
+ * IAudioDecoder
+ */
+
+/* 
+ * Copyright (C) 2008-2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_AUDIO_DECODER_H
+#define NLSOUND_AUDIO_DECODER_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+
+// Project includes
+
+namespace NLSOUND {
+
+/**
+ * \brief IAudioDecoder
+ * \date 2008-08-30 11:38GMT
+ * \author Jan Boon (Kaetemi)
+ * IAudioDecoder is only used by the driver implementation to stream 
+ * music files into a readable format (it's a simple decoder interface).
+ * You should not call these functions (getSongTitle) on nlsound or user level, 
+ * as a driver might have additional music types implemented.
+ * TODO: Split IAudioDecoder into IAudioDecoder (actual decoding) and IMediaDemuxer (stream splitter), and change the interface to make more sense.
+ * TODO: Allow user application to register more decoders.
+ * TODO: Look into libavcodec for decoding audio?
+ */
+class IAudioDecoder
+{
+private:
+	// pointers
+	/// Stream from file created by IAudioDecoder
+	NLMISC::IStream *_InternalStream;
+
+public:
+	IAudioDecoder();
+	virtual ~IAudioDecoder();
+
+	/// Create a new music buffer, may return NULL if unknown type, destroy with delete. Filepath lookup done here. If async is true, it will stream from hd, else it will load in memory first.
+	static IAudioDecoder *createAudioDecoder(const std::string &filepath, bool async, bool loop);
+
+	/// Create a new music buffer from a stream, type is file extension like "ogg" etc.
+	static IAudioDecoder *createAudioDecoder(const std::string &type, NLMISC::IStream *stream, bool loop);
+
+	/// Get information on a music file (only artist and title at the moment).
+	static bool getInfo(const std::string &filepath, std::string &artist, std::string &title);
+	
+	/// Get audio/container extensions that are currently supported by the nel sound library.
+	static void getMusicExtensions(std::vector<std::string> &extensions);
+
+	/// Return if a music extension is supported by the nel sound library.
+	static bool isMusicExtensionSupported(const std::string &extension);
+
+	/// Get how many bytes the music buffer requires for output minimum.
+	virtual uint32 getRequiredBytes() = 0;
+
+	/// Get an amount of bytes between minimum and maximum (can be lower than minimum if at end).
+	virtual uint32 getNextBytes(uint8 *buffer, uint32 minimum, uint32 maximum) = 0;
+
+	/// Get the amount of channels (2 is stereo) in output.
+	virtual uint8 getChannels() = 0;
+
+	/// Get the samples per second (often 44100) in output.
+	virtual uint getSamplesPerSec() = 0;
+
+	/// Get the bits per sample (often 16) in output.
+	virtual uint8 getBitsPerSample() = 0;
+
+	/// Get if the music has ended playing (never true if loop).
+	virtual bool isMusicEnded() = 0;
+
+	/// Get the total time in seconds.
+	virtual float getLength() = 0;
+
+	/// Set looping
+	virtual void setLooping(bool loop) = 0;
+}; /* class IAudioDecoder */
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_AUDIO_DECODER_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/sound/driver/music_buffer_vorbis.h b/code/nel/include/nel/sound/audio_decoder_vorbis.h
similarity index 50%
rename from code/nel/include/nel/sound/driver/music_buffer_vorbis.h
rename to code/nel/include/nel/sound/audio_decoder_vorbis.h
index 978f393da..bd7e45019 100644
--- a/code/nel/include/nel/sound/driver/music_buffer_vorbis.h
+++ b/code/nel/include/nel/sound/audio_decoder_vorbis.h
@@ -1,21 +1,33 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef NLSOUND_MUSIC_BUFFER_VORBIS_H
-#define NLSOUND_MUSIC_BUFFER_VORBIS_H
+/**
+ * \file audio_decoder_vorbis.h
+ * \brief CAudioDecoderVorbis
+ * \date 2012-04-11 09:35GMT
+ * \author Jan Boon (Kaetemi)
+ * CAudioDecoderVorbis
+ */
+
+/* 
+ * Copyright (C) 2008-2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_AUDIO_DECODER_VORBIS_H
+#define NLSOUND_AUDIO_DECODER_VORBIS_H
+#include <nel/misc/types_nl.h>
 
 // STL includes
 
@@ -30,21 +42,20 @@
 #endif
 
 // NeL includes
+#include <nel/sound/audio_decoder.h>
 
 // Project includes
-#include "music_buffer.h"
 
-namespace NLSOUND
-{
+namespace NLSOUND {
 
 /**
- * \brief CMusicBufferVorbis
+ * \brief CAudioDecoderVorbis
  * \date 2008-08-30 11:38GMT
  * \author Jan Boon (Kaetemi)
- * CMusicBufferVorbis
- * Create trough IMusicBuffer, type "ogg"
+ * CAudioDecoderVorbis
+ * Create trough IAudioDecoder, type "ogg"
  */
-class CMusicBufferVorbis : public IMusicBuffer
+class CAudioDecoderVorbis : public IAudioDecoder
 {
 protected:
 	// outside pointers
@@ -59,8 +70,8 @@ protected:
 	sint32 _StreamOffset;
 	sint32 _StreamSize;
 public:
-	CMusicBufferVorbis(NLMISC::IStream *stream, bool loop);
-	virtual ~CMusicBufferVorbis();
+	CAudioDecoderVorbis(NLMISC::IStream *stream, bool loop);
+	virtual ~CAudioDecoderVorbis();
 	inline NLMISC::IStream *getStream() { return _Stream; }
 	inline sint32 getStreamSize() { return _StreamSize; }
 	inline sint32 getStreamOffset() { return _StreamOffset; }
@@ -78,7 +89,7 @@ public:
 	virtual uint8 getChannels();
 
 	/// Get the samples per second (often 44100) in output.
-	virtual uint32 getSamplesPerSec();
+	virtual uint getSamplesPerSec();
 
 	/// Get the bits per sample (often 16) in output.
 	virtual uint8 getBitsPerSample();
@@ -89,12 +100,12 @@ public:
 	/// Get the total time in seconds.
 	virtual float getLength();
 
-	/// Get the size of uncompressed data in bytes.
-	virtual uint getUncompressedSize();
-}; /* class CMusicBufferVorbis */
+	/// Set looping
+	virtual void setLooping(bool loop);
+}; /* class CAudioDecoderVorbis */
 
 } /* namespace NLSOUND */
 
-#endif /* #ifndef NLSOUND_MUSIC_BUFFER_VORBIS_H */
+#endif /* #ifndef NLSOUND_AUDIO_DECODER_VORBIS_H */
 
 /* end of file */
diff --git a/code/nel/include/nel/sound/audio_mixer_user.h b/code/nel/include/nel/sound/audio_mixer_user.h
index 7cd0de051..9c9fd5c86 100644
--- a/code/nel/include/nel/sound/audio_mixer_user.h
+++ b/code/nel/include/nel/sound/audio_mixer_user.h
@@ -34,6 +34,11 @@
 #include "nel/sound/mixing_track.h"
 #include "nel/sound/sound.h"
 #include "nel/sound/music_channel_fader.h"
+#include "nel/sound/group_controller_root.h"
+
+// Current version is 2, Ryzom Live uses 1
+// Provided to allow compatibility with old binary files
+#define NLSOUND_SHEET_VERSION_BUILT 1
 
 namespace NLLIGO {
 	class CLigoConfig;
@@ -51,26 +56,6 @@ namespace NLSOUND {
 	class CMusicSoundManager;
 	class IReverbEffect;
 
-/// Hasher functor for hashed container with pointer key.
-template <class Pointer>
-struct THashPtr : public std::unary_function<const Pointer &, size_t>
-{
-	static const size_t bucket_size = 4;
-	static const size_t min_buckets = 8;
-	size_t operator () (const Pointer &ptr) const
-	{
-		//CHashSet<uint>::hasher	h;
-		// transtype the pointer into int then hash it
-		//return h.operator()(uint(uintptr_t(ptr)));
-		return (size_t)(uintptr_t)ptr;
-	}
-	inline bool operator() (const Pointer &ptr1, const Pointer &ptr2) const
-	{
-		// delegate the work to someone else as well?
-		return (uintptr_t)ptr1 < (uintptr_t)ptr2;
-	}
-};
-
 /**
  * Implementation of UAudioMixer
  *
@@ -197,6 +182,9 @@ public:
 	/// Get a TSoundId from a name (returns NULL if not found)
 	virtual TSoundId			getSoundId( const NLMISC::TStringId &name );
 
+	/// Gets the group controller for the given group tree path with separator '/', if it doesn't exist yet it will be created.
+	/// Examples: "music", "effects", "dialog", "music/background", "music/loading", "music/player", etcetera
+	virtual UGroupController *getGroupController(const std::string &path);
 
 	/** Add a logical sound source (returns NULL if name not found).
 	 * If spawn is true, the source will auto-delete after playing. If so, the return USource* pointer
@@ -204,9 +192,9 @@ public:
 	 * pass a callback function that will be called (if not NULL) just before deleting the spawned
 	 * source.
 	 */
-	virtual USource				*createSource( const NLMISC::TStringId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0 );
+	virtual USource				*createSource( const NLMISC::TStringId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL);
 	/// Add a logical sound source (by sound id). To remove a source, just delete it. See createSource(const char*)
-	virtual USource				*createSource( TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0 );
+	virtual USource				*createSource( TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *cbUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL);
 	/// Add a source which was created by an EnvSound
 	void						addSource( CSourceCommon *source );
 	/** Delete a logical sound source. If you don't call it, the source will be auto-deleted
@@ -242,6 +230,8 @@ public:
 	virtual uint				getSourcesInstanceCount() const { return (uint)_Sources.size(); }
 	/// Return the number of playing sources (slow)
 	virtual uint				getPlayingSourcesCount() const;
+	uint 						countPlayingSimpleSources() const; // debug
+	uint						countSimpleSources() const; // debug
 	/// Return the number of available tracks
 	virtual uint				getAvailableTracksCount() const;
 	/// Return the number of used tracks
@@ -415,6 +405,7 @@ public:
 
 	/// Add a source for play as possible (for non discadable sound)
 	void						addSourceWaitingForPlay(CSourceCommon *source);
+	void						removeSourceWaitingForPlay(CSourceCommon *source);
 
 	/// Read all user controled var sheets
 	void						initUserVar();
@@ -431,8 +422,6 @@ private:
 	// utility function for automatic sample bank loading.
 	bool tryToLoadSampleBank(const std::string &sampleName);
 
-
-	typedef CHashSet<CSourceCommon*, THashPtr<CSourceCommon*> >					TSourceContainer;
 	typedef CHashSet<IMixerUpdate*, THashPtr<IMixerUpdate*> >						TMixerUpdateContainer;
 	typedef CHashMap<IBuffer*, std::vector<class CSound*>, THashPtr<IBuffer*> >	TBufferToSourceContainer;
 //	typedef std::multimap<NLMISC::TTime, IMixerEvent*>									TTimedEventContainer;
@@ -565,6 +554,9 @@ private:
 	// Instance of the background music manager
 	CMusicSoundManager			*_BackgroundMusicManager;
 
+	/// Group controller
+	CGroupControllerRoot		_GroupController;
+
 public:
 	struct TSampleBankHeader
 	{
diff --git a/code/nel/include/nel/sound/background_source.h b/code/nel/include/nel/sound/background_source.h
index cdf044776..14ea1cf53 100644
--- a/code/nel/include/nel/sound/background_source.h
+++ b/code/nel/include/nel/sound/background_source.h
@@ -36,7 +36,7 @@ class CBackgroundSource : public CSourceCommon , public CAudioMixerUser::IMixerU
 {
 public:
 	/// Constructor
-	CBackgroundSource	(CBackgroundSound *backgroundSound=NULL, bool spawn=false, TSpawnEndCallback cb=0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0);
+	CBackgroundSource	(CBackgroundSound *backgroundSound=NULL, bool spawn=false, TSpawnEndCallback cb=0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0, CGroupController *groupController = NULL);
 	/// Destructor
 	~CBackgroundSource	();
 
diff --git a/code/nel/include/nel/sound/complex_source.h b/code/nel/include/nel/sound/complex_source.h
index d27b5af5b..d1135b1ad 100644
--- a/code/nel/include/nel/sound/complex_source.h
+++ b/code/nel/include/nel/sound/complex_source.h
@@ -34,7 +34,7 @@ class CComplexSource : public CSourceCommon, public CAudioMixerUser::IMixerEvent
 {
 public:
 	/// Constructor
-	CComplexSource	(CComplexSound *soundPattern=NULL, bool spawn=false, TSpawnEndCallback cb=0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0);
+	CComplexSource	(CComplexSound *soundPattern=NULL, bool spawn=false, TSpawnEndCallback cb=0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0, CGroupController *groupController = NULL);
 	/// Destructor
 	~CComplexSource	();
 
diff --git a/code/nel/include/nel/sound/containers.h b/code/nel/include/nel/sound/containers.h
new file mode 100644
index 000000000..bd4fe7fb9
--- /dev/null
+++ b/code/nel/include/nel/sound/containers.h
@@ -0,0 +1,67 @@
+/**
+ * \file containers.h
+ * \brief CContainers
+ * \date 2012-04-10 13:57GMT
+ * \author Unknown (Unknown)
+ * CContainers
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_CONTAINERS_H
+#define NLSOUND_CONTAINERS_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+
+// Project includes
+
+namespace NLSOUND {
+	class CSourceCommon;
+
+/// Hasher functor for hashed container with pointer key.
+template <class Pointer>
+struct THashPtr : public std::unary_function<const Pointer &, size_t>
+{
+	static const size_t bucket_size = 4;
+	static const size_t min_buckets = 8;
+	size_t operator () (const Pointer &ptr) const
+	{
+		//CHashSet<uint>::hasher	h;
+		// transtype the pointer into int then hash it
+		//return h.operator()(uint(uintptr_t(ptr)));
+		return (size_t)(uintptr_t)ptr;
+	}
+	inline bool operator() (const Pointer &ptr1, const Pointer &ptr2) const
+	{
+		// delegate the work to someone else as well?
+		return (uintptr_t)ptr1 < (uintptr_t)ptr2;
+	}
+};
+
+typedef CHashSet<CSourceCommon*, THashPtr<CSourceCommon*> > TSourceContainer;
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_CONTAINERS_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/sound/driver/buffer.h b/code/nel/include/nel/sound/driver/buffer.h
index 5d488f1c7..27a8d9f00 100644
--- a/code/nel/include/nel/sound/driver/buffer.h
+++ b/code/nel/include/nel/sound/driver/buffer.h
@@ -48,6 +48,8 @@ public:
 		/// Intel/DVI ADPCM format, only available for 1 channel at 16 bits per sample, encoded at 4 bits per sample.
 		/// This is only implemented in the DSound and XAudio2 driver.
 		FormatDviAdpcm = 11, 
+		/// No format set. Used when a TBufferFormat value has not been set to any value yet.
+		FormatNotSet = (~0),
 	};
 	/// The storage mode of this buffer. Also controls the X-RAM extension of OpenAL.
 	enum TStorageMode
diff --git a/code/nel/include/nel/sound/driver/music_buffer.h b/code/nel/include/nel/sound/driver/music_buffer.h
deleted file mode 100644
index 571e27a31..000000000
--- a/code/nel/include/nel/sound/driver/music_buffer.h
+++ /dev/null
@@ -1,119 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef NLSOUND_MUSIC_BUFFER_H
-#define NLSOUND_MUSIC_BUFFER_H
-
-namespace NLMISC
-{
-	class IStream;
-	class CIFile;
-}
-
-namespace NLSOUND
-{
-
-	/*
-	 * TODO: Streaming
-	 * Some kind of decent streaming functionality, to get rid of the current music implementation. Audio decoding should be done on nlsound level. IBuffer needs a writable implementation, it allocates and owns the data memory, which can be written to by nlsound. When buffer is written, a function needs to be called to 'finalize' the buffer (so it can be submitted to OpenAL for example). 
-	 * Required interface functions, IBuffer:
-	 * /// Allocate a new writable buffer. If this buffer was already allocated, the previous data is released.
-	 * /// May return NULL if the format or frequency is not supported by the driver.
-	 * uint8 *IBuffer::openWritable(uint size, TBufferFormat bufferFormat, uint8 channels, uint8 bitsPerSample, uint32 frequency);
-	 * /// Tell that you are done writing to this buffer, so it can be copied over to hardware if needed.
-	 * /// If keepLocal is true, a local copy of the buffer will be kept (so allocation can be re-used later).
-	 * /// keepLocal overrides the OptionLocalBufferCopy flag. The buffer can use this function internally.
-	 * void IBuffer::lockWritable(bool keepLocal);
-	 * Required interface functions, ISource:
-	 * /// Enable or disable the streaming facilities.
-	 * void ISource::setStreaming(bool streaming);
-	 * /// Submits a new buffer to the stream. A buffer of 100ms length is optimal for streaming.
-	 * /// Should be called by a thread which checks countStreamingBuffers every 100ms
-	 * void ISource::submitStreamingBuffer(IBuffer *buffer);
-	 * /// Returns the number of buffers that are queued (includes playing buffer). 3 buffers is optimal.
-	 * uint ISource::countStreamingBuffers();
-	 * Other required interface functions, ISource:
-	 * /// Enable or disable 3d calculations (to send directly to speakers).
-	 * void ISource::set3DMode(bool enable);
-	 * For compatibility with music trough fmod, ISoundDriver:
-	 * /// Returns true if the sound driver has a native implementation of IMusicChannel (bad!).
-	 * /// If this returns false, use the nlsound music channel, which goes trough Ctrack/ISource,
-	 * /// The nlsound music channel requires support for IBuffer/ISource streaming.
-	 * bool ISoundDriver::hasMusicChannel();
-	 */
-
-/**
- * \brief IMusicBuffer
- * \date 2008-08-30 11:38GMT
- * \author Jan Boon (Kaetemi)
- * IMusicBuffer is only used by the driver implementation to stream 
- * music files into a readable format (it's a simple decoder interface).
- * You should not call these functions (getSongTitle) on nlsound or user level, 
- * as a driver might have additional music types implemented.
- * TODO: Change IMusicBuffer to IAudioDecoder, and change the interface to make more sense.
- * TODO: Allow user application to register more decoders.
- * TODO: Look into libavcodec for decoding audio.
- */
-class IMusicBuffer
-{
-private:
-	// pointers
-	/// Stream from file created by IMusicBuffer
-	NLMISC::IStream *_InternalStream;
-
-public:
-	IMusicBuffer();
-	virtual ~IMusicBuffer();
-
-	/// Create a new music buffer, may return NULL if unknown type, destroy with delete. Filepath lookup done here. If async is true, it will stream from hd, else it will load in memory first.
-	static IMusicBuffer *createMusicBuffer(const std::string &filepath, bool async, bool loop);
-
-	/// Create a new music buffer from a stream, type is file extension like "ogg" etc.
-	static IMusicBuffer *createMusicBuffer(const std::string &type, NLMISC::IStream *stream, bool loop);
-
-	/// Get information on a music file (only artist and title at the moment).
-	static bool getInfo(const std::string &filepath, std::string &artist, std::string &title);
-
-	/// Get how many bytes the music buffer requires for output minimum.
-	virtual uint32 getRequiredBytes() =0;
-
-	/// Get an amount of bytes between minimum and maximum (can be lower than minimum if at end).
-	virtual uint32 getNextBytes(uint8 *buffer, uint32 minimum, uint32 maximum) =0;
-
-	/// Get the amount of channels (2 is stereo) in output.
-	virtual uint8 getChannels() =0;
-
-	/// Get the samples per second (often 44100) in output.
-	virtual uint32 getSamplesPerSec() =0;
-
-	/// Get the bits per sample (often 16) in output.
-	virtual uint8 getBitsPerSample() =0;
-
-	/// Get if the music has ended playing (never true if loop).
-	virtual bool isMusicEnded() =0;
-
-	/// Get the total time in seconds.
-	virtual float getLength() =0;
-
-	/// Get the size of uncompressed data in bytes.
-	virtual uint getUncompressedSize() =0;
-}; /* class IMusicBuffer */
-
-} /* namespace NLSOUND */
-
-#endif /* #ifndef NLSOUND_MUSIC_BUFFER_H */
-
-/* end of file */
diff --git a/code/nel/include/nel/sound/driver/music_channel.h b/code/nel/include/nel/sound/driver/music_channel.h
index 9878744c5..116865628 100644
--- a/code/nel/include/nel/sound/driver/music_channel.h
+++ b/code/nel/include/nel/sound/driver/music_channel.h
@@ -45,6 +45,9 @@ public:
 	/// Stop the music previously loaded and played (the Memory is also freed)
 	virtual void stop() =0;
 
+	/// Makes sure any resources are freed, but keeps available for next play call
+	virtual void reset() =0;
+
 	/// Pause the music previously loaded and played (the Memory is not freed)
 	virtual void pause() =0;
 	
diff --git a/code/nel/include/nel/sound/driver/sound_driver.h b/code/nel/include/nel/sound/driver/sound_driver.h
index 193026a42..c9551f16b 100644
--- a/code/nel/include/nel/sound/driver/sound_driver.h
+++ b/code/nel/include/nel/sound/driver/sound_driver.h
@@ -39,9 +39,11 @@ namespace NLSOUND
 #endif
 
 /*
- * Sound sample format
+ * Deprecated sound sample format.
+ * For compatibility with old code.
+ * Do not modify.
  */
-enum TSampleFormat { SampleFormatUnknown, Mono8, Mono16ADPCM, Mono16, Stereo8, Stereo16 };
+enum TSampleFormat { Mono8, Mono16ADPCM, Mono16, Stereo8, Stereo16, SampleFormatUnknown = (~0) };
 
 /**
  * Abstract sound driver (implemented in sound driver dynamic library)
diff --git a/code/nel/include/nel/sound/driver/source.h b/code/nel/include/nel/sound/driver/source.h
index 1858e6f24..b43c83914 100644
--- a/code/nel/include/nel/sound/driver/source.h
+++ b/code/nel/include/nel/sound/driver/source.h
@@ -353,7 +353,7 @@ public:
 	 * In streaming mode, the time spent during buffer outruns is not 
 	 * counted towards the playback time, and the playback time is 
 	 * be the current time position in the entire submitted queue.
-	 * When using static buffers, the result is the tot time that the 
+	 * When using static buffers, the result is the total time that the 
 	 * attached buffer has been playing. If the source is looping, the 
 	 * time will be the total of all playbacks of the buffer.
 	 * When the source is stopped, this will return the time where the 
@@ -397,7 +397,7 @@ public:
 	virtual void setSourceRelativeMode(bool mode = true) = 0;
 	/// Get the source relative mode
 	virtual bool getSourceRelativeMode() const = 0;
-	/// Set the min and max distances (default: 1, MAX_FLOAT) (3D mode only)
+	/// Set the min and max distances (default: 1, sqrt(MAX_FLOAT)) (3D mode only)
 	virtual void setMinMaxDistances(float mindist, float maxdist, bool deferred = true) = 0;
 	/// Get the min and max distances
 	virtual void getMinMaxDistances(float& mindist, float& maxdist) const = 0;
diff --git a/code/nel/include/nel/sound/group_controller.h b/code/nel/include/nel/sound/group_controller.h
new file mode 100644
index 000000000..25b7034b6
--- /dev/null
+++ b/code/nel/include/nel/sound/group_controller.h
@@ -0,0 +1,102 @@
+/**
+ * \file group_controller.h
+ * \brief CGroupController
+ * \date 2012-04-10 09:29GMT
+ * \author Jan Boon (Kaetemi)
+ * CGroupController
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_GROUP_CONTROLLER_H
+#define NLSOUND_GROUP_CONTROLLER_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+#include <string>
+#include <map>
+
+// NeL includes
+#include <nel/misc/common.h>
+#include <nel/sound/u_group_controller.h>
+#include <nel/sound/containers.h>
+
+// Project includes
+
+namespace NLSOUND {
+	class CGroupControllerRoot;
+
+/**
+ * \brief CGroupController
+ * \date 2012-04-10 09:29GMT
+ * \author Jan Boon (Kaetemi)
+ * CGroupController
+ */
+class CGroupController : public UGroupController
+{
+public:
+	friend class CGroupControllerRoot;
+
+private:
+	CGroupController *m_Parent;
+	std::map<std::string, CGroupController *> m_Children;
+	
+	/// Gain as set by the interface
+	float m_Gain;
+	
+	/// Gain including parent gain
+	float m_FinalGain;
+
+	int m_NbSourcesInclChild;
+	TSourceContainer m_Sources;
+
+public:
+	CGroupController(CGroupController *parent);
+
+	/// \name UGroupController
+	//@{
+	virtual void setGain(float gain) { NLMISC::clamp(gain, 0.0f, 1.0f); if (m_Gain != gain) { m_Gain = gain; updateSourceGain(); } }
+	virtual float getGain() { return m_Gain; }
+	//@}
+	
+	inline float getFinalGain() const { return m_FinalGain; }
+	
+	void addSource(CSourceCommon *source);
+	void removeSource(CSourceCommon *source);
+	
+	virtual std::string getPath();
+	
+protected:
+	virtual ~CGroupController(); // subnodes can only be deleted by the root
+
+private:
+	inline float calculateTotalGain() { return m_Gain; }
+	virtual void calculateFinalGain();
+	virtual void increaseSources();
+	virtual void decreaseSources();
+	void updateSourceGain();
+
+}; /* class CGroupController */
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_GROUP_CONTROLLER_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/sound/group_controller_root.h b/code/nel/include/nel/sound/group_controller_root.h
new file mode 100644
index 000000000..2081fa28a
--- /dev/null
+++ b/code/nel/include/nel/sound/group_controller_root.h
@@ -0,0 +1,70 @@
+/**
+ * \file group_controller_root.h
+ * \brief CGroupControllerRoot
+ * \date 2012-04-10 09:44GMT
+ * \author Jan Boon (Kaetemi)
+ * CGroupControllerRoot
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_GROUP_CONTROLLER_ROOT_H
+#define NLSOUND_GROUP_CONTROLLER_ROOT_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+#include <nel/misc/singleton.h>
+
+// Project includes
+#include <nel/sound/group_controller.h>
+
+namespace NLSOUND {
+
+/**
+ * \brief CGroupControllerRoot
+ * \date 2012-04-10 09:44GMT
+ * \author Jan Boon (Kaetemi)
+ * CGroupControllerRoot
+ */
+class CGroupControllerRoot : public CGroupController, public NLMISC::CManualSingleton<CGroupControllerRoot>
+{
+public:
+	CGroupControllerRoot();
+	virtual ~CGroupControllerRoot();
+
+	/// Gets the group controller in a certain path with separator '/', if it doesn't exist yet it will be created.
+	CGroupController *getGroupController(const std::string &path);
+
+protected:
+	virtual std::string getPath();
+	virtual void calculateFinalGain();
+	virtual void increaseSources();
+	virtual void decreaseSources();
+	static bool isReservedName(const std::string &nodeName);
+
+}; /* class CGroupControllerRoot */
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_GROUP_CONTROLLER_ROOT_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/sound/music_channel_fader.h b/code/nel/include/nel/sound/music_channel_fader.h
index 4e6d35de4..8513c21e5 100644
--- a/code/nel/include/nel/sound/music_channel_fader.h
+++ b/code/nel/include/nel/sound/music_channel_fader.h
@@ -87,6 +87,8 @@ public:
 	void init(ISoundDriver *soundDriver);
 	void release();
 
+	void reset();
+
 	void update(); // time in seconds
 	inline bool isInitOk() { return _SoundDriver != NULL; }
 
diff --git a/code/nel/include/nel/sound/music_source.h b/code/nel/include/nel/sound/music_source.h
index a23547c6c..be09c1837 100644
--- a/code/nel/include/nel/sound/music_source.h
+++ b/code/nel/include/nel/sound/music_source.h
@@ -35,7 +35,7 @@ class CMusicSource : public CSourceCommon
 {
 public:
 	/// Constructor
-	CMusicSource	(class CMusicSound *sound=NULL, bool spawn=false, TSpawnEndCallback cb=0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0);
+	CMusicSource	(class CMusicSound *sound=NULL, bool spawn=false, TSpawnEndCallback cb=0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0, CGroupController *groupController = NULL);
 	/// Destructor
 	~CMusicSource	();
 
diff --git a/code/nel/include/nel/sound/simple_source.h b/code/nel/include/nel/sound/simple_source.h
index ac2af0099..c330fd7fa 100644
--- a/code/nel/include/nel/sound/simple_source.h
+++ b/code/nel/include/nel/sound/simple_source.h
@@ -40,7 +40,7 @@ class CSimpleSource : public CSourceCommon, public CAudioMixerUser::IMixerEvent
 {
 public:
 	/// Constructor
-	CSimpleSource(CSimpleSound *simpleSound = NULL, bool spawn = false, TSpawnEndCallback cb = 0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0);
+	CSimpleSource(CSimpleSound *simpleSound = NULL, bool spawn = false, TSpawnEndCallback cb = 0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0, CGroupController *groupController = NULL);
 	/// Destructor
 	virtual ~CSimpleSource();
 	
@@ -97,14 +97,7 @@ public:
 	 * 1.0 -> no attenuation
 	 * values > 1 (amplification) not supported by most drivers
 	 */
-	virtual void					setGain( float gain );
-	/** Set the gain amount (value inside [0, 1]) to map between 0 and the nominal gain
-	 * (which is getSource()->getGain()). Does nothing if getSource() is null.
-	 */
-	virtual void					setRelativeGain( float gain );
-	/** Shift the frequency. 1.0f equals identity, each reduction of 50% equals a pitch shift
-	 * of one octave. 0 is not a legal value.
-	 */
+	virtual void					updateFinalGain();
 	virtual void					setPitch( float pitch );
 	/// Set the source relative mode. If true, positions are interpreted relative to the listener position (default: false)
 	virtual void					setSourceRelativeMode( bool mode );
@@ -149,6 +142,8 @@ private:
 	/// True when the sound is played muted and until the mixer event notifying the end.
 	bool							_PlayMuted;
 
+	bool							_WaitingForPlay;
+
 };
 
 
diff --git a/code/nel/include/nel/sound/sound.h b/code/nel/include/nel/sound/sound.h
index 2112a0e73..e9d4f755c 100644
--- a/code/nel/include/nel/sound/sound.h
+++ b/code/nel/include/nel/sound/sound.h
@@ -30,6 +30,7 @@ namespace NLSOUND {
 class ISoundDriver;
 class IBuffer;
 class CSound;
+class CGroupController;
 
 
 /// Sound names hash map
@@ -60,8 +61,9 @@ public:
 		SOUND_COMPLEX,
 		SOUND_BACKGROUND,
 		SOUND_CONTEXT,
-		SOUND_MUSIC,
-		SOUND_STREAM
+		SOUND_MUSIC, // soon to be deprecated hopefully
+		SOUND_STREAM,
+		SOUND_STREAM_FILE
 	};
 
 
@@ -104,6 +106,8 @@ public:
 	/// Return the max distance (if detailed())
 	virtual float		getMaxDistance() const				{ return _MaxDist; }
 
+	inline CGroupController *getGroupController() const { return _GroupController; }
+
 	/// Set looping
 	void				setLooping( bool looping ) { _Looping = looping; }
 
@@ -142,6 +146,9 @@ protected:
 	/// An optional user var controler.
 	NLMISC::TStringId	_UserVarControler;
 
+	/// The group controller, always exists, owned by the audio mixer
+	CGroupController	*_GroupController;
+
 };
 
 
diff --git a/code/nel/include/nel/sound/source_common.h b/code/nel/include/nel/sound/source_common.h
index 7781cfb02..1180fd68e 100644
--- a/code/nel/include/nel/sound/source_common.h
+++ b/code/nel/include/nel/sound/source_common.h
@@ -22,7 +22,7 @@
 #include "nel/sound/u_stream_source.h"
 #include "nel/3d/cluster.h"
 #include "nel/sound/sound.h"
-
+#include "nel/sound/group_controller.h"
 
 namespace NLSOUND {
 
@@ -36,11 +36,13 @@ public:
 		SOURCE_SIMPLE,
 		SOURCE_COMPLEX,
 		SOURCE_BACKGROUND,
-		SOURCE_MUSIC,
-		SOURCE_STREAM
+		SOURCE_MUSIC, // DEPRECATED
+		SOURCE_STREAM,
+		SOURCE_STREAM_FILE
 	};
 
-	CSourceCommon(TSoundId id, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster);
+	/// When groupController is NULL it will use the groupcontroller specified in the TSoundId. You should manually specify the groupController if this source is a child of another source, so that the parent source controller of the user-specified .sound file is the one that will be used.
+	CSourceCommon(TSoundId id, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController);
 
 	~CSourceCommon();
 
@@ -63,6 +65,8 @@ public:
 	void					setGain( float gain );
 	void					setRelativeGain( float gain );
 	float					getRelativeGain() const;
+	/// Called whenever the gain is changed trough setGain, setRelativeGain or the group controller's gain settings change.
+	virtual void					updateFinalGain()							{ }
 	void					setSourceRelativeMode( bool mode );
 	/// return the user param for the user callback
 	void							*getCallbackUserParam(void) const			{ return _CbUserParam; }
@@ -74,6 +78,8 @@ public:
 	virtual void					getDirection( NLMISC::CVector& dir ) const	{ dir = _Direction; }
 	/// Get the gain
 	virtual float					getGain() const								{ return _Gain; }
+	/// Get the final gain, including group controller changes. Use this when setting the physical source output gain.
+	inline float					getFinalGain() const						{ return _Gain * _GroupController->getFinalGain(); }
 	/// Get the pitch
 	virtual float					getPitch() const							{ return _Pitch; }
 	/// Get the source relative mode
@@ -99,15 +105,15 @@ public:
 	/// \name Streaming source controls
 	//@{
 	/// Set the sample format. (channels = 1, 2, ...; bitsPerSample = 8, 16; frequency = samples per second, 44100, ...)
-	virtual void					setFormat(uint8 channels, uint8 bitsPerSample, uint32 frequency) { nlassert(false); }
+	virtual void					setFormat(uint8 /* channels */, uint8 /* bitsPerSample */, uint32 /* frequency */) { nlassert(false); }
 	/// Return the sample format information.
-	virtual void					getFormat(uint8 &channels, uint8 &bitsPerSample, uint32 &frequency) const { nlassert(false); }
+	virtual void					getFormat(uint8 &/* channels */, uint8 &/* bitsPerSample */, uint32 &/* frequency */) const { nlassert(false); }
 	/// Get a writable pointer to the buffer of specified size. Use capacity to specify the required bytes. Returns NULL when all the buffer space is already filled. Call setFormat() first.
-	virtual uint8					*lock(uint capacity) { nlassert(false); return NULL; }
+	virtual uint8					*lock(uint /* capacity */) { nlassert(false); return NULL; }
 	/// Notify that you are done writing to the locked buffer, so it can be copied over to hardware if needed. Set size to the number of bytes actually written to the buffer. Returns true if ok.
-	virtual bool					unlock(uint size) { nlassert(false); return false; }
+	virtual bool					unlock(uint /* size */) { nlassert(false); return false; }
 	/// Get the recommended buffer size to use with lock()/unlock()
-	virtual void					getRecommendedBufferSize(uint &samples, uint &bytes) const { nlassert(false); }
+	virtual void					getRecommendedBufferSize(uint &/* samples */, uint &/* bytes */) const { nlassert(false); }
 	/// Get the recommended sleep time based on the size of the last submitted buffer and the available buffer space
 	virtual uint32					getRecommendedSleepTime() const { nlassert(false); return 0; }
 	/// Return if there are still buffers available for playback.
@@ -145,6 +151,9 @@ protected:
 	/// An optional user var controler.
 	NLMISC::TStringId				_UserVarControler;
 
+	/// Group controller for gain
+	CGroupController				*_GroupController;
+
 };
 
 } // NLSOUND
diff --git a/code/nel/include/nel/sound/source_music_channel.h b/code/nel/include/nel/sound/source_music_channel.h
new file mode 100644
index 000000000..7ec71fb66
--- /dev/null
+++ b/code/nel/include/nel/sound/source_music_channel.h
@@ -0,0 +1,100 @@
+/**
+ * \file source_music_channel.h
+ * \brief CSourceMusicChannel
+ * \date 2012-04-11 16:08GMT
+ * \author Jan Boon (Kaetemi)
+ * CSourceMusicChannel
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_SOURCE_MUSIC_CHANNEL_H
+#define NLSOUND_SOURCE_MUSIC_CHANNEL_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+#include <nel/sound/driver/music_channel.h>
+#include <nel/sound/stream_file_sound.h>
+
+// Project includes
+
+namespace NLSOUND {
+	class CStreamFileSource;
+
+/**
+ * \brief CSourceMusicChannel
+ * \date 2012-04-11 16:08GMT
+ * \author Jan Boon (Kaetemi)
+ * CSourceMusicChannel
+ */
+class CSourceMusicChannel : public IMusicChannel
+{
+public:
+	CSourceMusicChannel();
+	virtual ~CSourceMusicChannel();
+
+	/** Play some music (.ogg etc...)
+	 *	NB: if an old music was played, it is first stop with stopMusic()
+	 *	\param filepath file path, CPath::lookup is done here
+	 *  \param async stream music from hard disk, preload in memory if false
+	 *	\param loop must be true to play the music in loop. 
+	 */
+	virtual bool play(const std::string &filepath, bool async, bool loop); 
+	
+	/// Stop the music previously loaded and played (the Memory is also freed)
+	virtual void stop();
+
+	/// Makes sure any resources are freed, but keeps available for next play call
+	virtual void reset();
+	
+	/// Pause the music previously loaded and played (the Memory is not freed)
+	virtual void pause();
+	
+	/// Resume the music previously paused
+	virtual void resume();
+	
+	/// Return true if a song is finished.
+	virtual bool isEnded();
+	
+	/// Return true if the song is still loading asynchronously and hasn't started playing yet (false if not async), used to delay fading
+	virtual bool isLoadingAsync();
+	
+	/// Return the total length (in second) of the music currently played
+	virtual float getLength();
+	
+	/** Set the music volume (if any music played). (volume value inside [0 , 1]) (default: 1)
+	 *	NB: the volume of music is NOT affected by IListener::setGain()
+	 */
+	virtual void setVolume(float gain);
+	
+private:
+	CStreamFileSound m_Sound;
+	CStreamFileSource *m_Source;
+	float m_Gain;
+
+}; /* class CSourceMusicChannel */
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_SOURCE_MUSIC_CHANNEL_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/sound/stream_file_sound.h b/code/nel/include/nel/sound/stream_file_sound.h
new file mode 100644
index 000000000..8c1cc1634
--- /dev/null
+++ b/code/nel/include/nel/sound/stream_file_sound.h
@@ -0,0 +1,94 @@
+/**
+ * \file stream_file_sound.h
+ * \brief CStreamFileSound
+ * \date 2012-04-11 09:57GMT
+ * \author Jan Boon (Kaetemi)
+ * CStreamFileSound
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_STREAM_FILE_SOUND_H
+#define NLSOUND_STREAM_FILE_SOUND_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+
+// Project includes
+#include <nel/sound/stream_sound.h>
+
+namespace NLSOUND {
+	class CSourceMusicChannel;
+
+/**
+ * \brief CStreamFileSound
+ * \date 2012-04-11 09:57GMT
+ * \author Jan Boon (Kaetemi)
+ * CStreamFileSound
+ */
+class CStreamFileSound : public CStreamSound
+{
+public:
+	friend class CSourceMusicChannel;
+
+public:
+	CStreamFileSound();
+	virtual ~CStreamFileSound();
+
+	/// Get the type of the sound.
+	virtual TSOUND_TYPE getSoundType()						{ return SOUND_STREAM_FILE; }
+
+	/// Load the sound parameters from georges' form
+	virtual void		importForm(const std::string& filename, NLGEORGES::UFormElm& formRoot);
+
+	/// Used by the george sound plugin to check sound recursion (ie sound 'toto' use sound 'titi' witch also use sound 'toto' ...).
+	virtual void		getSubSoundList(std::vector<std::pair<std::string, CSound*> > &/* subsounds */) const { }
+
+	/// Serialize the sound data.
+	virtual void		serial(NLMISC::IStream &s);
+
+	/// Return the length of the sound in ms
+	virtual uint32		getDuration()						{ return 0; }
+
+	inline bool			getAsync()							{ return m_Async; }
+
+	inline const std::string &getFilePath()					{ return m_FilePath; }
+
+private:
+	/// Used by CSourceMusicChannel to set the filePath and default settings on other parameters.
+	void setMusicFilePath(const std::string &filePath, bool async = true, bool loop = false);
+
+private:
+	CStreamFileSound(const CStreamFileSound &);
+	CStreamFileSound &operator=(const CStreamFileSound &);
+
+private:
+	bool				m_Async;
+	std::string			m_FilePath;
+
+}; /* class CStreamFileSound */
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_STREAM_FILE_SOUND_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/sound/stream_file_source.h b/code/nel/include/nel/sound/stream_file_source.h
new file mode 100644
index 000000000..0cfee14d1
--- /dev/null
+++ b/code/nel/include/nel/sound/stream_file_source.h
@@ -0,0 +1,110 @@
+/**
+ * \file stream_file_source.h
+ * \brief CStreamFileSource
+ * \date 2012-04-11 09:57GMT
+ * \author Jan Boon (Kaetemi)
+ * CStreamFileSource
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_STREAM_FILE_SOURCE_H
+#define NLSOUND_STREAM_FILE_SOURCE_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+#include <nel/misc/thread.h>
+
+// Project includes
+#include <nel/sound/stream_source.h>
+#include <nel/sound/stream_file_sound.h>
+
+namespace NLSOUND {
+	class IAudioDecoder;
+
+/**
+ * \brief CStreamFileSource
+ * \date 2012-04-11 09:57GMT
+ * \author Jan Boon (Kaetemi)
+ * CStreamFileSource
+ */
+class CStreamFileSource : public CStreamSource, private NLMISC::IRunnable
+{
+public:
+	CStreamFileSource(CStreamFileSound *streamFileSound = NULL, bool spawn = false, TSpawnEndCallback cb = 0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0, CGroupController *groupController = NULL);
+	virtual ~CStreamFileSource();
+
+	/// Return the source type
+	TSOURCE_TYPE					getType() const								{ return SOURCE_STREAM_FILE; }
+
+	/// \name Playback control
+	//@{
+	/// Play
+	virtual void					play();
+	/// Stop playing
+	virtual void					stop();
+	/// Get playing state. Return false even if the source has stopped on its own.
+	virtual bool					isPlaying();
+	/// Pause (following legacy music channel implementation)
+	void pause();
+	/// Resume (following legacy music channel implementation)
+	void resume();
+	/// check if song ended (following legacy music channel implementation)
+	bool isEnded();
+	/// (following legacy music channel implementation)
+	float getLength();
+	/// check if still loading (following legacy music channel implementation)
+	bool isLoadingAsync();
+	//@}
+
+	/// \name Decoding thread
+	//@{
+	virtual void getName (std::string &result) const { result = "CStreamFileSource"; }
+	virtual void run();
+	//@}
+
+	// TODO: getTime
+
+private:
+	bool prepareDecoder();
+	inline bool bufferMore(uint bytes);
+
+private:
+	CStreamFileSource(const CStreamFileSource &);
+	CStreamFileSource &operator=(const CStreamFileSource &);
+
+private:
+	inline CStreamFileSound *getStreamFileSound() { return static_cast<CStreamFileSound *>(m_StreamSound); }
+
+	NLMISC::IThread *m_Thread;
+
+	IAudioDecoder *m_AudioDecoder;
+	
+	bool m_Paused;
+
+}; /* class CStreamFileSource */
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_STREAM_FILE_SOURCE_H */
+
+/* end of file */
diff --git a/code/nel/include/nel/sound/stream_sound.h b/code/nel/include/nel/sound/stream_sound.h
index 39e6c733c..4b0debe0c 100644
--- a/code/nel/include/nel/sound/stream_sound.h
+++ b/code/nel/include/nel/sound/stream_sound.h
@@ -46,7 +46,7 @@ public:
 	virtual void		importForm(const std::string& filename, NLGEORGES::UFormElm& formRoot);
 
 	/// Used by the george sound plugin to check sound recursion (ie sound 'toto' use sound 'titi' witch also use sound 'toto' ...).
-	virtual void		getSubSoundList(std::vector<std::pair<std::string, CSound*> > &subsounds) const { }
+	virtual void		getSubSoundList(std::vector<std::pair<std::string, CSound*> > &/* subsounds */) const { }
 
 	/// Serialize the sound data.
 	virtual void		serial(NLMISC::IStream &s);
diff --git a/code/nel/include/nel/sound/stream_source.h b/code/nel/include/nel/sound/stream_source.h
index a5ac7c9f8..40ed82e11 100644
--- a/code/nel/include/nel/sound/stream_source.h
+++ b/code/nel/include/nel/sound/stream_source.h
@@ -41,7 +41,7 @@ namespace NLSOUND {
 class CStreamSource : public CSourceCommon
 {
 public:
-	CStreamSource(CStreamSound *streamSound = NULL, bool spawn = false, TSpawnEndCallback cb = 0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0);
+	CStreamSource(CStreamSound *streamSound = NULL, bool spawn = false, TSpawnEndCallback cb = 0, void *cbUserParam = 0, NL3D::CCluster *cluster = 0, CGroupController *groupController = NULL);
 	virtual ~CStreamSource();
 	
 	/// Return the sound binded to the source (or NULL if there is no sound)
@@ -55,6 +55,9 @@ public:
 	virtual void					setLooping(bool l);
 	/// Play
 	virtual void					play();
+protected:
+	void							stopInt();
+public:
 	/// Stop playing
 	virtual void					stop();
 	/// Get playing state. Return false even if the source has stopped on its own.
@@ -80,18 +83,7 @@ public:
 	virtual void					setVelocity(const NLMISC::CVector& vel);
 	/// Set the direction vector (3D mode only, ignored in stereo mode) (default: (0,0,0) as non-directional)
 	virtual void					setDirection(const NLMISC::CVector& dir);
-	/** Set the gain (volume value inside [0 , 1]). (default: 1)
-	 * 0.0 -> silence
-	 * 0.5 -> -6dB
-	 * 1.0 -> no attenuation
-	 * values > 1 (amplification) not supported by most drivers
-	 */
-	virtual void					setGain(float gain);
-	
-	/** Set the gain amount (value inside [0, 1]) to map between 0 and the nominal gain
-	 * (which is getSource()->getGain()). Does nothing if getSource() is null.
-	 */
-	virtual void					setRelativeGain(float gain);
+	virtual void					updateFinalGain();
 	/** Shift the frequency. 1.0f equals identity, each reduction of 50% equals a pitch shift
 	 * of one octave. 0 is not a legal value.
 	 */
@@ -118,6 +110,9 @@ public:
 	virtual bool					hasFilledBuffersAvailable() const;
 	//@}
 	
+	/// Prepare the buffers in this stream for the given maximum capacity. (TODO: Move this into UStreamSource)
+	void preAllocate(uint capacity);
+	
 	/// Return the track
 	CTrack							*getTrack()									{ return m_Track; }
 
@@ -125,7 +120,7 @@ private:
 	CStreamSource(const CStreamSource &);
 	CStreamSource &operator=(const CStreamSource &);
 	
-private:
+protected:
 	/// Return the source type
 	TSOURCE_TYPE					getType() const								{ return SOURCE_STREAM; }
 
@@ -173,7 +168,13 @@ private:
 
 	/// The bytes per second according to the buffer format
 	uint							m_BytesPerSecond;
-	
+
+	/// Waiting for play for high priority sources
+	bool							m_WaitingForPlay;
+
+	/// Inverse pitch
+	float							m_PitchInv;
+
 }; /* class CStreamSource */
 
 } /* namespace NLSOUND */
diff --git a/code/nel/include/nel/sound/u_audio_mixer.h b/code/nel/include/nel/sound/u_audio_mixer.h
index e1c2a274e..c4702c3f8 100644
--- a/code/nel/include/nel/sound/u_audio_mixer.h
+++ b/code/nel/include/nel/sound/u_audio_mixer.h
@@ -20,6 +20,7 @@
 #include "nel/misc/types_nl.h"
 #include "nel/misc/string_mapper.h"
 #include "nel/sound/u_source.h"
+#include "nel/sound/u_group_controller.h"
 #include "nel/ligo/primitive.h"
 #include <vector>
 
@@ -285,15 +286,19 @@ public:
 	/// Get a TSoundId from a name (returns NULL if not found)
 	virtual TSoundId	getSoundId( const NLMISC::TStringId &name ) = 0;
 
+	/// Gets the group controller for the given group tree path with separator '/', if it doesn't exist yet it will be created.
+	/// Examples: "music", "effects", "dialog", "music/background", "music/loading", "music/player", etcetera
+	virtual UGroupController *getGroupController(const std::string &path) = 0;
+
 	/** Add a logical sound source (returns NULL if name not found).
 	 * If spawn is true, the source will auto-delete after playing. If so, the return USource* pointer
 	 * is valid only before the time when calling play() plus the duration of the sound. You can
 	 * pass a callback function that will be called (if not NULL) just before deleting the spawned
 	 * source.
 	 */
-	virtual USource		*createSource( const NLMISC::TStringId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context=0) = 0;
+	virtual USource		*createSource(const NLMISC::TStringId &name, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context  = 0, UGroupController *groupController = NULL) = 0;
 	/// Add a logical sound source (by sound id). To remove a source, just delete it. See createSource(const char*)
-	virtual USource		*createSource( TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam  = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context=0 ) = 0;
+	virtual USource		*createSource(TSoundId id, bool spawn=false, TSpawnEndCallback cb=NULL, void *callbackUserParam  = NULL, NL3D::CCluster *cluster = 0, CSoundContext *context = 0, UGroupController *groupController = NULL) = 0;
 
 	/** Use this method to set the listener position instead of using getListener->setPos();
 	 * It's because we have to update the background sounds in this case.
diff --git a/code/nel/include/nel/sound/u_group_controller.h b/code/nel/include/nel/sound/u_group_controller.h
new file mode 100644
index 000000000..5aadeb25c
--- /dev/null
+++ b/code/nel/include/nel/sound/u_group_controller.h
@@ -0,0 +1,65 @@
+/**
+ * \file u_group_controller.h
+ * \brief UGroupController
+ * \date 2012-04-10 12:49GMT
+ * \author Jan Boon (Kaetemi)
+ * UGroupController
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NLSOUND_U_GROUP_CONTROLLER_H
+#define NLSOUND_U_GROUP_CONTROLLER_H
+#include <nel/misc/types_nl.h>
+
+// STL includes
+
+// NeL includes
+
+// Project includes
+
+#define NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER "sound:effects:game"
+#define NLSOUND_SHEET_V1_DEFAULT_SOUND_MUSIC_GROUP_CONTROLLER "sound:music:game"
+#define NLSOUND_SHEET_V1_DEFAULT_SOUND_STREAM_GROUP_CONTROLLER "sound:dialog:game"
+
+namespace NLSOUND {
+
+/**
+ * \brief UGroupController
+ * \date 2012-04-10 12:49GMT
+ * \author Jan Boon (Kaetemi)
+ * UGroupController
+ */
+class UGroupController
+{
+public:
+	virtual void setGain(float gain) = 0;
+	virtual float getGain() = 0;
+
+protected:
+	virtual ~UGroupController() { }
+
+}; /* class UGroupController */
+
+} /* namespace NLSOUND */
+
+#endif /* #ifndef NLSOUND_U_GROUP_CONTROLLER_H */
+
+/* end of file */
diff --git a/code/nel/samples/3d/Makefile.am b/code/nel/samples/3d/Makefile.am
deleted file mode 100644
index d00e99366..000000000
--- a/code/nel/samples/3d/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/04 09:45:05 cado Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = font cluster_viewer @CEGUI_SUBDIR@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/3d/cegui/Makefile.am b/code/nel/samples/3d/cegui/Makefile.am
deleted file mode 100644
index afc817166..000000000
--- a/code/nel/samples/3d/cegui/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= demonel_8.sln demonel_8.vcproj demonel.rc demonel.sln demonel.vcproj icon1.ico datafiles
-
-bin_PROGRAMS              = nel_sample_cegui
-
-nel_sample_cegui_SOURCES = main.cpp NeLDriver.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src @CEGUI_CFLAGS@
-
-nel_sample_cegui_LDADD   = ../../../src/misc/libnelmisc.la \
-                           ../../../src/3d/libnel3d.la \
-			   ../../../src/cegui/libnelceguirenderer.la \
-			   @CEGUI_LIBS@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/3d/cluster_viewer/Makefile.am b/code/nel/samples/3d/cluster_viewer/Makefile.am
deleted file mode 100644
index 5814a0394..000000000
--- a/code/nel/samples/3d/cluster_viewer/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-SUBDIRS = shapes groups fonts
-
-bin_PROGRAMS              = cluster_viewer
-
-cluster_viewer_SOURCES = main.cpp
-
-cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer
-
-cluster_viewer_DATA = readme.txt main.cvs
-
-AM_CXXFLAGS               = -DCV_DIR="\"$(cluster_viewerdir)\"" -I$(top_srcdir)/src 
-
-cluster_viewer_LDADD   = ../../../src/misc/libnelmisc.la \
-                         ../../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/3d/cluster_viewer/fonts/Makefile.am b/code/nel/samples/3d/cluster_viewer/fonts/Makefile.am
deleted file mode 100644
index 11e9a8f31..000000000
--- a/code/nel/samples/3d/cluster_viewer/fonts/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer/fonts/
-
-cluster_viewer_DATA	=	n019003l.pfb
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/3d/cluster_viewer/groups/Makefile.am b/code/nel/samples/3d/cluster_viewer/groups/Makefile.am
deleted file mode 100644
index 54cdb5867..000000000
--- a/code/nel/samples/3d/cluster_viewer/groups/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer/groups/
-
-cluster_viewer_DATA	=	street.ig
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/3d/cluster_viewer/shapes/Makefile.am b/code/nel/samples/3d/cluster_viewer/shapes/Makefile.am
deleted file mode 100644
index 3b251867a..000000000
--- a/code/nel/samples/3d/cluster_viewer/shapes/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-cluster_viewerdir = $(datadir)/nel/samples/cluster_viewer/shapes/
-
-cluster_viewer_DATA	=	box02.shape \
-				sphere01.shape \
-				sphere02.shape \
-				sphere03.shape \
-				sphere04.shape \
-				sphere05.shape \
-				sphere06.shape \
-				sphere07.shape \
-				sphere08.shape 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/3d/font/Makefile.am b/code/nel/samples/3d/font/Makefile.am
deleted file mode 100644
index 5548ec8f6..000000000
--- a/code/nel/samples/3d/font/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-bin_PROGRAMS              = font
-
-font_SOURCES = main.cpp
-
-fontdir = $(datadir)/nel/samples/font
-font_DATA = beteckna.ttf
-
-AM_CXXFLAGS               = -DFONT_DIR="\"$(fontdir)\"" -I$(top_srcdir)/src 
-
-font_LDADD   = ../../../src/misc/libnelmisc.la \
-               ../../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/CMakeLists.txt b/code/nel/samples/CMakeLists.txt
index 4f38264a0..5abcd985a 100644
--- a/code/nel/samples/CMakeLists.txt
+++ b/code/nel/samples/CMakeLists.txt
@@ -17,5 +17,5 @@ IF(WITH_PACS)
 ENDIF(WITH_PACS)
 
 IF(WITH_SOUND)
-  ADD_SUBDIRECTORY(sound_sources)
+  ADD_SUBDIRECTORY(sound)
 ENDIF(WITH_SOUND)
diff --git a/code/nel/samples/Makefile.am b/code/nel/samples/Makefile.am
deleted file mode 100644
index 98edb586d..000000000
--- a/code/nel/samples/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# $Id: Makefile.am,v 1.2 2005/04/13 12:37:26 cado Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-DIST_SUBDIRS              = sound_sources pacs georges 3d net misc
-
-SUBDIRS              = pacs georges 3d net misc
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/georges/Makefile.am b/code/nel/samples/georges/Makefile.am
deleted file mode 100644
index bf2c83d5f..000000000
--- a/code/nel/samples/georges/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST = georges_sample_8.vcproj georges_sample.sln georges_sample.vcproj
-
-bin_PROGRAMS              = georges
-
-georges_SOURCES = main.cpp
-
-georgesdir = $(datadir)/nel/samples/georges
-
-georges_DATA = boolean.typ coolfilesinfo.dfn default.sample_config int.typ positiondata.dfn sample_config.dfn string.typ
-
-AM_CXXFLAGS               = -DGF_DIR="\"$(georgesdir)\"" -I$(top_srcdir)/src
-
-
-georges_LDADD   = ../../src/misc/libnelmisc.la \
-                  ../../src/georges/libnelgeorges.la
-
-
-# End of Makefile.am
diff --git a/code/nel/samples/misc/Makefile.am b/code/nel/samples/misc/Makefile.am
deleted file mode 100644
index 0e13cb6f1..000000000
--- a/code/nel/samples/misc/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id: Makefile.am,v 1.2 2005-04-13 12:37:26 cado Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS			= command configfile debug i18n log strings 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/misc/command/Makefile.am b/code/nel/samples/misc/command/Makefile.am
deleted file mode 100644
index 890a9fa18..000000000
--- a/code/nel/samples/misc/command/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= command_8.vcproj main.dsp main.dsw
-
-bin_PROGRAMS              = command
-
-command_SOURCES = main.cpp
-
-commanddir = $(datadir)/nel/samples/command
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-command_LDADD   = ../../../src/misc/libnelmisc.la 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/misc/configfile/Makefile.am b/code/nel/samples/misc/configfile/Makefile.am
deleted file mode 100644
index 538d3af28..000000000
--- a/code/nel/samples/misc/configfile/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= configfile_8.vcproj main.dsp main.dsw
-
-bin_PROGRAMS              = configfile
-
-configfile_SOURCES = main.cpp
-
-configfiledir = $(datadir)/nel/samples/configfile
-
-configfile_DATA = simpletest.txt
-
-AM_CXXFLAGS               = -DCF_DIR="\"$(configfiledir)\"" -I$(top_srcdir)/src 
-
-configfile_LDADD   = ../../../src/misc/libnelmisc.la 
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/misc/debug/Makefile.am b/code/nel/samples/misc/debug/Makefile.am
deleted file mode 100644
index d8d2c733a..000000000
--- a/code/nel/samples/misc/debug/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= debug_8.vcproj main.dsp main.dsw
-
-bin_PROGRAMS              = debug
-
-debug_SOURCES = main.cpp
-
-debugdir = $(datadir)/nel/samples/debug
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-debug_LDADD   = ../../../src/misc/libnelmisc.la 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/misc/i18n/Makefile.am b/code/nel/samples/misc/i18n/Makefile.am
deleted file mode 100644
index 6c9c574c9..000000000
--- a/code/nel/samples/misc/i18n/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= i18n_8.vcproj main.dsp main.dsw
-
-bin_PROGRAMS              = i18n
-
-i18n_SOURCES = main.cpp
-
-i18ndir = $(datadir)/nel/samples/i18n
-
-i18n_DATA = en.uxt fr.uxt de.uxt
-
-AM_CXXFLAGS               = -DI18N_DIR="\"$(i18ndir)\"" -I$(top_srcdir)/src 
-
-i18n_LDADD   = ../../../src/misc/libnelmisc.la 
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/misc/log/Makefile.am b/code/nel/samples/misc/log/Makefile.am
deleted file mode 100644
index 3d57e533d..000000000
--- a/code/nel/samples/misc/log/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= log_8.vcproj main.dsp main.dsw
-
-bin_PROGRAMS              = log
-
-log_SOURCES = main.cpp
-
-logdir = $(datadir)/nel/samples/log
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-log_LDADD   = ../../../src/misc/libnelmisc.la 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/misc/strings/Makefile.am b/code/nel/samples/misc/strings/Makefile.am
deleted file mode 100644
index 151e8ef32..000000000
--- a/code/nel/samples/misc/strings/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= main.dsp main.dsw strings_8.vcproj
-
-bin_PROGRAMS              = strings
-
-strings_SOURCES = main.cpp
-
-stringsdir = $(datadir)/nel/samples/strings
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-strings_LDADD   = ../../../src/misc/libnelmisc.la 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/misc/types_check/Makefile.am b/code/nel/samples/misc/types_check/Makefile.am
deleted file mode 100644
index 9c79d6aa2..000000000
--- a/code/nel/samples/misc/types_check/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= main.dsp main.dsw types_check_8.vcproj
-
-bin_PROGRAMS              = types_check
-
-types_check_SOURCES = main.cpp
-
-types_checkdir = $(datadir)/nel/samples/types_check
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-types_check_LDADD   = ../../../src/misc/libnelmisc.la 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/net/Makefile.am b/code/nel/samples/net/Makefile.am
deleted file mode 100644
index ad7388761..000000000
--- a/code/nel/samples/net/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/13 12:37:26 cado Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = chat udp login_system
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/net/chat/Makefile.am b/code/nel/samples/net/chat/Makefile.am
deleted file mode 100644
index bc2df9ef9..000000000
--- a/code/nel/samples/net/chat/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/13 12:37:26 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-bin_PROGRAMS              = chatserver chatclient
-
-chatserver_SOURCES = server.cpp
-
-chatclient_SOURCES = client.cpp kbhit.h kbhit.cpp
-
-chatserverdir=$(datadir)/nel/samples/net/chat
-chatserver_DATA=chat_service.cfg
-
-chatclientdir=$(datadir)/nel/samples/net/chat
-chatclient_DATA=client.cfg
-
-AM_CXXFLAGS               = -DCHAT_DIR="\"$(chatclientdir)\"" -I$(top_srcdir)/src 
-
-chatserver_LDADD   = ../../../src/misc/libnelmisc.la \
-                     ../../../src/net/libnelnet.la 
-
-chatclient_LDADD   = ../../../src/misc/libnelmisc.la \
-                     ../../../src/net/libnelnet.la 
-
-# End of Makefile.am
diff --git a/code/nel/samples/net/login_system/Makefile.am b/code/nel/samples/net/login_system/Makefile.am
deleted file mode 100644
index 5ef4fe26c..000000000
--- a/code/nel/samples/net/login_system/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-13 12:37:26 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= main.dsw client.dsp client.cfg frontend_service.cfg frontend_service.dsp
-
-bin_PROGRAMS              = nls_login_client nls_frontend_service
-
-nls_frontend_service_SOURCES = frontend_service.cpp
-
-nls_login_client_SOURCES = client.cpp
-
-nls_frontend_servicedir=$(datadir)/nel/samples/net/udp
-nls_frontend_service_DATA=frontend_service.cfg
-
-nls_login_clientdir=$(datadir)/nel/samples/net/udp
-nls_login_client_DATA=client.cfg
-
-AM_CXXFLAGS               = -DLC_DIR="\"$(nls_login_clientdir)\"" -I$(top_srcdir)/src 
-
-nls_frontend_service_LDADD   = ../../../src/misc/libnelmisc.la \
-                     ../../../src/net/libnelnet.la 
-
-nls_login_client_LDADD   = ../../../src/misc/libnelmisc.la \
-                     ../../../src/net/libnelnet.la 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/net/udp/Makefile.am b/code/nel/samples/net/udp/Makefile.am
deleted file mode 100644
index 07a131fd8..000000000
--- a/code/nel/samples/net/udp/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005-04-13 12:37:26 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST		= main.dsw main.sln bench_service_8.vcproj bench_service.vcproj bench_service.dsp client_8.vcproj client.dsp client.vcproj readme.txt
-
-bin_PROGRAMS              = udp_bench_service udp_bench_client
-
-udp_bench_service_SOURCES = bench_service.cpp receive_task.cpp receive_task.h
-
-udp_bench_client_SOURCES = client.cpp graph.cpp graph.h simlag.cpp simlag.h
-
-noinst_HEADERS		= receive_task.h graph.h simlag.h
-
-udp_bench_servicedir=$(datadir)/nel/samples/net/udp
-udp_bench_service_DATA= bench_service.cfg
-
-udp_bench_clientdir=$(datadir)/nel/samples/net/udp
-udp_bench_client_DATA=client.cfg
-
-AM_CXXFLAGS               = -DUDP_DIR="\"$(udp_bench_clientdir)\"" -I$(top_srcdir)/src 
-
-udp_bench_service_LDADD   = ../../../src/misc/libnelmisc.la \
-                     ../../../src/net/libnelnet.la 
-
-udp_bench_client_LDADD   = ../../../src/misc/libnelmisc.la \
-                     ../../../src/net/libnelnet.la 
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/pacs/Makefile.am b/code/nel/samples/pacs/Makefile.am
deleted file mode 100644
index d7a552769..000000000
--- a/code/nel/samples/pacs/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-bin_PROGRAMS              = pacs_sample
-
-pacs_sample_SOURCES = main.cpp object.cpp object.h
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-pacs_sample_LDADD   = ../../src/misc/libnelmisc.la \
-                      ../../src/3d/libnel3d.la \
-                      ../../src/pacs/libnelpacs.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/samples/sound/CMakeLists.txt b/code/nel/samples/sound/CMakeLists.txt
new file mode 100644
index 000000000..6a7696fa4
--- /dev/null
+++ b/code/nel/samples/sound/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+ADD_SUBDIRECTORY(sound_sources)
+ADD_SUBDIRECTORY(stream_file)
+ADD_SUBDIRECTORY(stream_ogg_vorbis)
+
diff --git a/code/nel/samples/sound_sources/CMakeLists.txt b/code/nel/samples/sound/sound_sources/CMakeLists.txt
similarity index 85%
rename from code/nel/samples/sound_sources/CMakeLists.txt
rename to code/nel/samples/sound/sound_sources/CMakeLists.txt
index 4cf1ea427..b0f481e7c 100644
--- a/code/nel/samples/sound_sources/CMakeLists.txt
+++ b/code/nel/samples/sound/sound_sources/CMakeLists.txt
@@ -7,7 +7,7 @@ ADD_DEFINITIONS(-DNL_SOUND_DATA="\\"${NL_SHARE_PREFIX}/nl_sample_sound/\\"" ${LI
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nl_sample_sound_sources nelmisc nelsound)
-NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound System")
+NL_DEFAULT_PROPS(nl_sample_sound_sources "NeL, Samples: Sound: Sound Sources")
 NL_ADD_RUNTIME_FLAGS(nl_sample_sound_sources)
 
 INSTALL(TARGETS nl_sample_sound_sources RUNTIME DESTINATION bin COMPONENT samplessound)
diff --git a/code/nel/samples/sound_sources/data/DFN/alpha.typ b/code/nel/samples/sound/sound_sources/data/DFN/alpha.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/alpha.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/alpha.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/angle.typ b/code/nel/samples/sound/sound_sources/data/DFN/angle.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/angle.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/angle.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/backgound_sound_item.dfn b/code/nel/samples/sound/sound_sources/data/DFN/backgound_sound_item.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/backgound_sound_item.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/backgound_sound_item.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/background_flag_config.dfn b/code/nel/samples/sound/sound_sources/data/DFN/background_flag_config.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/background_flag_config.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/background_flag_config.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/background_sound.dfn b/code/nel/samples/sound/sound_sources/data/DFN/background_sound.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/background_sound.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/background_sound.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/_typ.dfn b/code/nel/samples/sound/sound_sources/data/DFN/basics/_typ.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/_typ.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/_typ.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/_type.typ b/code/nel/samples/sound/sound_sources/data/DFN/basics/_type.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/_type.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/_type.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/boolean.typ b/code/nel/samples/sound/sound_sources/data/DFN/basics/boolean.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/boolean.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/boolean.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/filename.typ b/code/nel/samples/sound/sound_sources/data/DFN/basics/filename.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/filename.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/filename.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/float.typ b/code/nel/samples/sound/sound_sources/data/DFN/basics/float.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/float.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/float.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/iboolean.typ b/code/nel/samples/sound/sound_sources/data/DFN/basics/iboolean.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/iboolean.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/iboolean.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/int.typ b/code/nel/samples/sound/sound_sources/data/DFN/basics/int.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/int.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/int.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/string.typ b/code/nel/samples/sound/sound_sources/data/DFN/basics/string.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/string.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/string.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/basics/typ.dfn b/code/nel/samples/sound/sound_sources/data/DFN/basics/typ.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/basics/typ.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/basics/typ.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/complex_sound.dfn b/code/nel/samples/sound/sound_sources/data/DFN/complex_sound.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/complex_sound.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/complex_sound.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/context_sound.dfn b/code/nel/samples/sound/sound_sources/data/DFN/context_sound.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/context_sound.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/context_sound.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/direction.dfn b/code/nel/samples/sound/sound_sources/data/DFN/direction.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/direction.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/direction.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/distance.typ b/code/nel/samples/sound/sound_sources/data/DFN/distance.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/distance.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/distance.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/doppler.typ b/code/nel/samples/sound/sound_sources/data/DFN/doppler.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/doppler.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/doppler.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/gain.typ b/code/nel/samples/sound/sound_sources/data/DFN/gain.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/gain.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/gain.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/listener.dfn b/code/nel/samples/sound/sound_sources/data/DFN/listener.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/listener.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/listener.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/mixer_config.dfn b/code/nel/samples/sound/sound_sources/data/DFN/mixer_config.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/mixer_config.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/mixer_config.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/music_sound.dfn b/code/nel/samples/sound/sound_sources/data/DFN/music_sound.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/music_sound.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/music_sound.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/parameter_id.typ b/code/nel/samples/sound/sound_sources/data/DFN/parameter_id.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/parameter_id.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/parameter_id.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/pattern_mode.typ b/code/nel/samples/sound/sound_sources/data/DFN/pattern_mode.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/pattern_mode.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/pattern_mode.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/priority.typ b/code/nel/samples/sound/sound_sources/data/DFN/priority.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/priority.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/priority.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/rolloff.typ b/code/nel/samples/sound/sound_sources/data/DFN/rolloff.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/rolloff.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/rolloff.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/simple_sound.dfn b/code/nel/samples/sound/sound_sources/data/DFN/simple_sound.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/simple_sound.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/simple_sound.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/sound.dfn b/code/nel/samples/sound/sound_sources/data/DFN/sound.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/sound.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/sound.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/sound_group.dfn b/code/nel/samples/sound/sound_sources/data/DFN/sound_group.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/sound_group.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/sound_group.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/sound_group_item.dfn b/code/nel/samples/sound/sound_sources/data/DFN/sound_group_item.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/sound_group_item.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/sound_group_item.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/soundbank.dfn b/code/nel/samples/sound/sound_sources/data/DFN/soundbank.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/soundbank.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/soundbank.dfn
diff --git a/code/nel/samples/sound_sources/data/DFN/transposition.typ b/code/nel/samples/sound/sound_sources/data/DFN/transposition.typ
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/transposition.typ
rename to code/nel/samples/sound/sound_sources/data/DFN/transposition.typ
diff --git a/code/nel/samples/sound_sources/data/DFN/user_var_binding.dfn b/code/nel/samples/sound/sound_sources/data/DFN/user_var_binding.dfn
similarity index 100%
rename from code/nel/samples/sound_sources/data/DFN/user_var_binding.dfn
rename to code/nel/samples/sound/sound_sources/data/DFN/user_var_binding.dfn
diff --git a/code/nel/samples/sound_sources/data/animations/readme.txt b/code/nel/samples/sound/sound_sources/data/animations/readme.txt
similarity index 100%
rename from code/nel/samples/sound_sources/data/animations/readme.txt
rename to code/nel/samples/sound/sound_sources/data/animations/readme.txt
diff --git a/code/nel/samples/sound_sources/data/animations/test_anim.sound_anim b/code/nel/samples/sound/sound_sources/data/animations/test_anim.sound_anim
similarity index 100%
rename from code/nel/samples/sound_sources/data/animations/test_anim.sound_anim
rename to code/nel/samples/sound/sound_sources/data/animations/test_anim.sound_anim
diff --git a/code/nel/samples/sound_sources/data/background_sounds/background_sound.primitive b/code/nel/samples/sound/sound_sources/data/background_sounds/background_sound.primitive
similarity index 100%
rename from code/nel/samples/sound_sources/data/background_sounds/background_sound.primitive
rename to code/nel/samples/sound/sound_sources/data/background_sounds/background_sound.primitive
diff --git a/code/nel/samples/sound_sources/data/background_sounds/readme.txt b/code/nel/samples/sound/sound_sources/data/background_sounds/readme.txt
similarity index 100%
rename from code/nel/samples/sound_sources/data/background_sounds/readme.txt
rename to code/nel/samples/sound/sound_sources/data/background_sounds/readme.txt
diff --git a/code/nel/samples/sound_sources/data/cluster_sound/readme.txt b/code/nel/samples/sound/sound_sources/data/cluster_sound/readme.txt
similarity index 100%
rename from code/nel/samples/sound_sources/data/cluster_sound/readme.txt
rename to code/nel/samples/sound/sound_sources/data/cluster_sound/readme.txt
diff --git a/code/nel/samples/sound_sources/data/cluster_sound/test_clusters.sound_group b/code/nel/samples/sound/sound_sources/data/cluster_sound/test_clusters.sound_group
similarity index 100%
rename from code/nel/samples/sound_sources/data/cluster_sound/test_clusters.sound_group
rename to code/nel/samples/sound/sound_sources/data/cluster_sound/test_clusters.sound_group
diff --git a/code/nel/samples/sound_sources/data/default.mixer_config b/code/nel/samples/sound/sound_sources/data/default.mixer_config
similarity index 100%
rename from code/nel/samples/sound_sources/data/default.mixer_config
rename to code/nel/samples/sound/sound_sources/data/default.mixer_config
diff --git a/code/nel/samples/sound_sources/data/samplebank/base_samples/beep.wav b/code/nel/samples/sound/sound_sources/data/samplebank/base_samples/beep.wav
similarity index 100%
rename from code/nel/samples/sound_sources/data/samplebank/base_samples/beep.wav
rename to code/nel/samples/sound/sound_sources/data/samplebank/base_samples/beep.wav
diff --git a/code/nel/samples/sound_sources/data/samplebank/base_samples/tuut.wav b/code/nel/samples/sound/sound_sources/data/samplebank/base_samples/tuut.wav
similarity index 100%
rename from code/nel/samples/sound_sources/data/samplebank/base_samples/tuut.wav
rename to code/nel/samples/sound/sound_sources/data/samplebank/base_samples/tuut.wav
diff --git a/code/nel/samples/sound_sources/data/soundbank/beep.sound b/code/nel/samples/sound/sound_sources/data/soundbank/beep.sound
similarity index 100%
rename from code/nel/samples/sound_sources/data/soundbank/beep.sound
rename to code/nel/samples/sound/sound_sources/data/soundbank/beep.sound
diff --git a/code/nel/samples/sound_sources/data/soundbank/tuut.sound b/code/nel/samples/sound/sound_sources/data/soundbank/tuut.sound
similarity index 100%
rename from code/nel/samples/sound_sources/data/soundbank/tuut.sound
rename to code/nel/samples/sound/sound_sources/data/soundbank/tuut.sound
diff --git a/code/nel/samples/sound_sources/data/world_editor_classes.xml b/code/nel/samples/sound/sound_sources/data/world_editor_classes.xml
similarity index 100%
rename from code/nel/samples/sound_sources/data/world_editor_classes.xml
rename to code/nel/samples/sound/sound_sources/data/world_editor_classes.xml
diff --git a/code/nel/samples/sound_sources/main.cpp b/code/nel/samples/sound/sound_sources/main.cpp
similarity index 100%
rename from code/nel/samples/sound_sources/main.cpp
rename to code/nel/samples/sound/sound_sources/main.cpp
diff --git a/code/nel/samples/sound/stream_file/CMakeLists.txt b/code/nel/samples/sound/stream_file/CMakeLists.txt
new file mode 100644
index 000000000..0552387cb
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/CMakeLists.txt
@@ -0,0 +1,12 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(nl_sample_stream_file ${SRC})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(nl_sample_stream_file nelmisc nelsound)
+NL_DEFAULT_PROPS(nl_sample_stream_file "NeL, Samples: Sound: Stream File")
+NL_ADD_RUNTIME_FLAGS(nl_sample_stream_file)
+
+INSTALL(TARGETS nl_sample_stream_file RUNTIME DESTINATION bin COMPONENT samplessound)
+
diff --git a/code/nel/samples/sound/stream_file/base_samples.sample_bank b/code/nel/samples/sound/stream_file/base_samples.sample_bank
new file mode 100644
index 000000000..8e9b5b898
Binary files /dev/null and b/code/nel/samples/sound/stream_file/base_samples.sample_bank differ
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/_typ.dfn b/code/nel/samples/sound/stream_file/data/DFN/basics/_typ.dfn
new file mode 100644
index 000000000..2f8971932
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/_typ.dfn
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<DFN Version="0.0" State="modified">
+  <ELEMENT Name="Designation" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="Substitute" Type="Type" Filename="string.typ"/>
+  <COMMENTS></COMMENTS>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/_type.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/_type.typ
new file mode 100644
index 000000000..233beca79
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/_type.typ
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<TYPE Type="String" UI="NonEditableCombo" Version="0.0" State="modified">
+  <DEFINITION Label="string" Value="string"/>
+  <DEFINITION Label="sint" Value="sint"/>
+  <DEFINITION Label="uint" Value="uint"/>
+  <DEFINITION Label="double" Value="double"/>
+  <DEFINITION Label="filename" Value="filename"/>
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/boolean.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/boolean.typ
new file mode 100644
index 000000000..fb6821f08
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/boolean.typ
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<TYPE Type="String" UI="NonEditableCombo" Default="false" Version="0.0" State="modified">
+  <DEFINITION Label="true" Value="true"/>
+  <DEFINITION Label="false" Value="false"/>
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/filename.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/filename.typ
new file mode 100644
index 000000000..bdad39a48
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/filename.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="String" UI="FileBrowser" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/float.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/float.typ
new file mode 100644
index 000000000..250620f5e
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/float.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="Double" UI="EditSpin" Default="0.0" Min="-3.402823466e+38" Max="3.402823466e+38F" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/iboolean.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/iboolean.typ
new file mode 100644
index 000000000..d29217bed
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/iboolean.typ
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<TYPE Type="UnsignedInt" UI="NonEditableCombo" Default="0" Min="0" Max="1" Version="0.0" State="modified">
+  <DEFINITION Label="true" Value="1"/>
+  <DEFINITION Label="false" Value="0"/>
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/int.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/int.typ
new file mode 100644
index 000000000..5b88c4fc4
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/int.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="SignedInt" UI="EditSpin" Default="0" Min="-9223372036854775808" Max="9223372036854775807" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint16.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint16.typ
new file mode 100644
index 000000000..0adba3ad0
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint16.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="SignedInt" UI="EditSpin" Default="0" Min="-32768" Max="32767" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint32.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint32.typ
new file mode 100644
index 000000000..ce470d5fe
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint32.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="SignedInt" UI="EditSpin" Default="0" Min="-2147483648" Max="2147483647" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint64.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint64.typ
new file mode 100644
index 000000000..5b88c4fc4
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint64.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="SignedInt" UI="EditSpin" Default="0" Min="-9223372036854775808" Max="9223372036854775807" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/sint8.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint8.typ
new file mode 100644
index 000000000..462eab92c
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/sint8.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="SignedInt" UI="EditSpin" Default="0" Min="-128" Max="127" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/string.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/string.typ
new file mode 100644
index 000000000..89191b1eb
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/string.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="String" UI="Edit" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/typ.dfn b/code/nel/samples/sound/stream_file/data/DFN/basics/typ.dfn
new file mode 100644
index 000000000..d3c9e1757
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/typ.dfn
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<DFN Version="0.0" State="modified">
+  <ELEMENT Name="Type" Type="Type" Filename="_type.typ"/>
+  <ELEMENT Name="Enum" Type="Type" Filename="boolean.typ"/>
+  <ELEMENT Name="Formula" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="Lowlimit" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="Highlimit" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="DefaultValue" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="Predef" Type="Dfn" Filename="_typ.dfn" Array="true"/>
+  <COMMENTS></COMMENTS>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint16.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint16.typ
new file mode 100644
index 000000000..d0e98aad1
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint16.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="UnsignedInt" UI="EditSpin" Default="0" Min="0" Max="65535" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint32.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint32.typ
new file mode 100644
index 000000000..60dc00b3c
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint32.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="UnsignedInt" UI="EditSpin" Default="0" Min="0" Max="4294967295" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint64.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint64.typ
new file mode 100644
index 000000000..936a619c8
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint64.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="UnsignedInt" UI="EditSpin" Default="0" Min="0" Max="18446744073709551615" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/basics/uint8.typ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint8.typ
new file mode 100644
index 000000000..3dee1c5c8
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/basics/uint8.typ
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<TYPE Type="UnsignedInt" UI="EditSpin" Default="0" Min="0" Max="255" Version="0.0" State="modified">
+  <COMMENTS></COMMENTS>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/alpha.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/alpha.typ
new file mode 100644
index 000000000..a6f7d3bff
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/alpha.typ
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<TYPE Type="Double" UI="Edit" Default="0" Min="-1.0" Max="1.0" Version="0.1" State="modified"/>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/angle.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/angle.typ
new file mode 100644
index 000000000..db94698e0
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/angle.typ
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<TYPE Type="UnsignedInt" UI="EditSpin" Default="360" Min="0" Max="360" Version="0.8" State="modified"/>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn
new file mode 100644
index 000000000..bbdfdf82a
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/backgound_sound_item.dfn
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="Sound" Type="Type" Filename="filename.typ" FilenameExt="*.sound"/>
+  <ELEMENT Name="Filter00" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter01" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter02" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter03" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter04" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter05" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter06" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter07" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter08" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter09" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter10" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter11" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter12" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter13" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter14" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter15" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter16" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter17" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter18" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter19" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter20" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter21" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter22" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter23" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter24" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter25" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter26" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter27" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter28" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter29" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter30" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Filter31" Type="Type" Filename="boolean.typ" Default="false"/>
+  <LOG>Tue Oct 08 14:39:12 2002 (boucher) Dfn Structure = 
+Tue Oct 08 15:03:40 2002 (boucher) Dfn Structure = 
+Mon Oct 14 16:09:48 2002 (boucher) Dfn Structure = 
+Wed Oct 16 18:22:30 2002 (boucher) Dfn Structure = 
+Thu Dec 19 16:26:49 2002 (boucher) Dfn Structure = 
+Wed Apr 09 19:38:51 2003 (AmazingSound) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn
new file mode 100644
index 000000000..bce6d82a8
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/background_flag_config.dfn
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="Name" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="ShortName" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="FadeIn" Type="Type" Filename="int.typ" Default="10000"/>
+  <ELEMENT Name="FadeOut" Type="Type" Filename="int.typ" Default="10000"/>
+  <ELEMENT Name="InitialState" Type="Type" Filename="boolean.typ" Default="false"/>
+  <LOG>Thu Jan 02 14:38:32 2003 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/background_sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/background_sound.dfn
new file mode 100644
index 000000000..41288d7b8
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/background_sound.dfn
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="Sounds" Type="Dfn" Filename="backgound_sound_item.dfn" Array="true"/>
+  <LOG>Tue Oct 08 14:55:03 2002 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn
new file mode 100644
index 000000000..8164b9d7a
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/complex_sound.dfn
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="Mode" Type="Type" Filename="pattern_mode.typ" Default="Chained"/>
+  <ELEMENT Name="SoundList" Type="Type" Filename="filename.typ" Array="true"/>
+  <ELEMENT Name="SoundSeq" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="DelaySeq" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="Beat" Type="Type" Filename="float.typ" Default="1.0"/>
+  <ELEMENT Name="XFadeLenght" Type="Type" Filename="int.typ" Default="3"/>
+  <ELEMENT Name="DoFadeIn" Type="Type" Filename="boolean.typ" Default="true"/>
+  <ELEMENT Name="DoFadeOut" Type="Type" Filename="boolean.typ" Default="true"/>
+  <LOG>Tue Oct 08 14:29:42 2002 (boucher) Dfn Structure = 
+Tue Oct 08 14:35:40 2002 (boucher) Dfn Structure = 
+Thu Oct 10 16:15:18 2002 (boucher) Dfn Structure = 
+Fri Oct 11 10:26:17 2002 (boucher) Dfn Structure = 
+Fri Oct 11 11:14:25 2002 (boucher) Dfn Structure = 
+Fri Oct 11 11:15:41 2002 (boucher) Dfn Structure = 
+Fri Oct 11 16:01:43 2002 (boucher) Dfn Structure = 
+Wed Oct 16 11:36:41 2002 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/context_sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/context_sound.dfn
new file mode 100644
index 000000000..f8d05e697
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/context_sound.dfn
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="PatternName" Type="Type" Filename="string.typ"/>
+  <LOG>Thu Nov 07 14:01:21 2002 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/direction.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/direction.dfn
new file mode 100644
index 000000000..190223cc1
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/direction.dfn
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<DFN Version="0.1" State="modified">
+  <ELEMENT Name="X" Type="Type" Filename="float.typ" Default="0.0"/>
+  <ELEMENT Name="Y" Type="Type" Filename="float.typ" Default="1.0"/>
+  <ELEMENT Name="Z" Type="Type" Filename="float.typ" Default="0.0"/>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/distance.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/distance.typ
new file mode 100644
index 000000000..0981c09a0
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/distance.typ
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<TYPE Type="Double" UI="EditSpin" Default="1.0" Min="0.00001" Max="10000.0" Version="0.1" State="modified"/>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/doppler.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/doppler.typ
new file mode 100644
index 000000000..2419f2d6c
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/doppler.typ
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<TYPE Type="Double" UI="EditSpin" Default="1.0" Min="0.0" Max="10.0" Version="0.1" State="modified"/>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/gain.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/gain.typ
new file mode 100644
index 000000000..2000b2652
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/gain.typ
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<TYPE Type="SignedInt" UI="NonEditableCombo" Default="0dB" Min="-100dB" Max="0dB" Version="0.13" State="modified">
+  <DEFINITION Label="0dB" Value="0"/>
+  <DEFINITION Label="-1dB" Value="-1"/>
+  <DEFINITION Label="-2dB" Value="-2"/>
+  <DEFINITION Label="-3dB" Value="-3"/>
+  <DEFINITION Label="-4dB" Value="-4"/>
+  <DEFINITION Label="-5dB" Value="-5"/>
+  <DEFINITION Label="-6dB" Value="-6"/>
+  <DEFINITION Label="-7dB" Value="-7"/>
+  <DEFINITION Label="-8dB" Value="-8"/>
+  <DEFINITION Label="-9dB" Value="-9"/>
+  <DEFINITION Label="-10dB" Value="-10"/>
+  <DEFINITION Label="-11dB" Value="-11"/>
+  <DEFINITION Label="-12dB" Value="-12"/>
+  <DEFINITION Label="-15dB" Value="-15"/>
+  <DEFINITION Label="-18dB" Value="-18"/>
+  <DEFINITION Label="-21dB" Value="-21"/>
+  <DEFINITION Label="-24dB" Value="-24"/>
+  <DEFINITION Label="-27dB" Value="-27"/>
+  <DEFINITION Label="-30dB" Value="-30"/>
+  <DEFINITION Label="-33dB" Value="-33"/>
+  <DEFINITION Label="-36dB" Value="-36"/>
+  <DEFINITION Label="-39dB" Value="-39"/>
+  <DEFINITION Label="-42dB" Value="-42"/>
+  <DEFINITION Label="-45dB" Value="-45"/>
+  <DEFINITION Label="-48dB" Value="-48"/>
+  <DEFINITION Label="-51dB" Value="-51"/>
+  <DEFINITION Label="-54dB" Value="-54"/>
+  <DEFINITION Label="-57dB" Value="-57"/>
+  <DEFINITION Label="-60dB" Value="-60"/>
+  <DEFINITION Label="-72dB" Value="-72"/>
+  <DEFINITION Label="-84dB" Value="-84"/>
+  <DEFINITION Label="-96dB" Value="-96"/>
+  <DEFINITION Label="-100dB" Value="-100"/>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/listener.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/listener.dfn
new file mode 100644
index 000000000..ba52b5af0
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/listener.dfn
@@ -0,0 +1,5 @@
+<?xml version="1.0"?>
+<DFN Version="0.7" State="modified">
+  <ELEMENT Name="Doppler" Type="Type" Filename="doppler.typ"/>
+  <ELEMENT Name="Rolloff" Type="Type" Filename="rolloff.typ"/>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn
new file mode 100644
index 000000000..61daec64b
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/mixer_config.dfn
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="UseEax" Type="Type" Filename="boolean.typ" Default="true"/>
+  <ELEMENT Name="HighestPriorityReserve" Type="Type" Filename="int.typ" Default="32"/>
+  <ELEMENT Name="HighPriorityReserve" Type="Type" Filename="int.typ" Default="32"/>
+  <ELEMENT Name="MidPriorityReserve" Type="Type" Filename="int.typ" Default="32"/>
+  <ELEMENT Name="LowPriorityReserve" Type="Type" Filename="int.typ" Default="32"/>
+  <ELEMENT Name="LowWaterMark" Type="Type" Filename="int.typ" Default="2"/>
+  <ELEMENT Name="SampleBanks" Type="Type" Filename="string.typ" Array="true"/>
+  <ELEMENT Name="BackgroundFlags" Type="Dfn" Filename="background_flag_config.dfn" Array="true"/>
+  <LOG>Thu Jan 02 14:33:42 2003 (boucher) Dfn Structure = 
+Thu Jan 02 14:40:05 2003 (boucher) Dfn Structure = 
+Thu Jan 02 14:41:32 2003 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/music_sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/music_sound.dfn
new file mode 100644
index 000000000..1935511b2
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/music_sound.dfn
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="FileName" Type="Type" Filename="filename.typ"/>
+  <ELEMENT Name="FadeInLength" Type="Type" Filename="int.typ" Default="2000"/>
+  <ELEMENT Name="FadeOutLength" Type="Type" Filename="int.typ" Default="2000"/>
+  <ELEMENT Name="MinimumPlayTime" Type="Type" Filename="int.typ" Default="10000"/>
+  <ELEMENT Name="TimeBeforeCanReplay" Type="Type" Filename="int.typ" Default="0"/>
+  <LOG>Tue Nov 02 11:28:10 2004 (berenguier) Dfn Structure = 
+Tue Nov 02 11:30:14 2004 (berenguier) Dfn Structure = 
+Tue Nov 02 11:40:09 2004 (berenguier) Dfn Structure = 
+Tue Nov 02 11:40:29 2004 (berenguier) Dfn Structure = 
+Wed Nov 03 10:54:07 2004 (berenguier) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/parameter_id.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/parameter_id.typ
new file mode 100644
index 000000000..bc284afb2
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/parameter_id.typ
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<TYPE Type="String" UI="NonEditableCombo" Revision="$Revision: 1.1 $" State="modified">
+  <DEFINITION Label="Gain controler" Value="Gain"/>
+  <DEFINITION Label="Pitch controler" Value="Pitch"/>
+  <LOG>Mon Feb 10 17:31:53 2003 (boucher) Type Predef = 
+Mon Feb 10 17:31:53 2003 (boucher) Type Type = String
+Mon Feb 10 17:31:53 2003 (boucher) Type UI = NonEditableCombo</LOG>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ
new file mode 100644
index 000000000..b0ac96de5
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/pattern_mode.typ
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<TYPE Type="String" UI="NonEditableCombo" Default="Chained" Revision="$Revision: 1.1 $" State="modified">
+  <DEFINITION Label="Chained" Value="Chained"/>
+  <DEFINITION Label="AllInOne" Value="AllInOne"/>
+  <DEFINITION Label="Sparse" Value="Sparse"/>
+  <LOG>Tue Oct 08 14:27:39 2002 (boucher) Type Default = Chained
+Tue Oct 08 14:27:39 2002 (boucher) Type Predef = 
+Tue Oct 08 14:27:39 2002 (boucher) Type Type = String
+Tue Oct 08 14:27:39 2002 (boucher) Type UI = NonEditableCombo</LOG>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/priority.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/priority.typ
new file mode 100644
index 000000000..d9bdbbd07
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/priority.typ
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<TYPE Type="UnsignedInt" UI="NonEditableCombo" Default="Normal" Min="Low" Max="Highest" Version="0.6" State="modified">
+  <DEFINITION Label="Highest" Value="3"/>
+  <DEFINITION Label="High" Value="2"/>
+  <DEFINITION Label="Normal" Value="1"/>
+  <DEFINITION Label="Low" Value="0"/>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/rolloff.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/rolloff.typ
new file mode 100644
index 000000000..a5818a1a6
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/rolloff.typ
@@ -0,0 +1,2 @@
+<?xml version="1.0"?>
+<TYPE Type="Double" UI="EditSpin" Default="1.0" Min="0.0" Max="10.0" Version="0.4" State="modified"/>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn
new file mode 100644
index 000000000..60e97cc35
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/simple_sound.dfn
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="Filename" Type="Type" Filename="filename.typ"/>
+  <ELEMENT Name="MinDistance" Type="Type" Filename="distance.typ" Default="1.0"/>
+  <ELEMENT Name="MaxDistance" Type="Type" Filename="distance.typ" Default="15.0"/>
+  <ELEMENT Name="Alpha" Type="Type" Filename="alpha.typ" Default="1.0"/>
+  <LOG>Wed Apr 09 21:13:23 2003 (AmazingSound) Dfn Structure = 
+Thu Apr 10 15:38:18 2003 (AmazingSound) Dfn Structure = 
+Thu Apr 10 16:24:05 2003 (AmazingSound) Dfn Structure = 
+Wed Apr 30 12:44:51 2003 (AmazingSound) Dfn Structure = 
+Wed Apr 30 12:45:39 2003 (AmazingSound) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/sound.dfn
new file mode 100644
index 000000000..a8c336b0b
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/sound.dfn
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="SoundType" Type="DfnPointer"/>
+  <ELEMENT Name="Loop" Type="Type" Filename="boolean.typ" Default="false"/>
+  <ELEMENT Name="Gain" Type="Type" Filename="gain.typ" Default="0dB"/>
+  <ELEMENT Name="Transpose" Type="Type" Filename="transposition.typ" Default="0"/>
+  <ELEMENT Name="InternalConeAngle" Type="Type" Filename="angle.typ" Default="360"/>
+  <ELEMENT Name="ExternalConeAngle" Type="Type" Filename="angle.typ" Default="360"/>
+  <ELEMENT Name="ExternalGain" Type="Type" Filename="gain.typ" Default="-100dB"/>
+  <ELEMENT Name="Direction" Type="Dfn" Filename="direction.dfn"/>
+  <ELEMENT Name="AbsolutePosition" Type="Type" Filename="boolean.typ" Default="true"/>
+  <ELEMENT Name="Priority" Type="Type" Filename="priority.typ" Default="Normal"/>
+  <ELEMENT Name="Indoor" Type="Type" Filename="boolean.typ" Default="true"/>
+  <ELEMENT Name="Outdoor" Type="Type" Filename="boolean.typ" Default="true"/>
+  <LOG>Tue Oct 08 12:33:33 2002 (boucher) Dfn Structure = 
+Tue Oct 08 14:35:19 2002 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group.dfn
new file mode 100644
index 000000000..b058b36ff
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group.dfn
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="Items" Type="Dfn" Filename="sound_group_item.dfn" Array="true"/>
+  <LOG>Thu Jan 09 11:48:30 2003 (boucher) Dfn Structure = 
+Thu Jan 09 11:51:28 2003 (boucher) Dfn Structure = 
+Thu Jan 09 11:52:03 2003 (boucher) Dfn Structure = 
+Thu Jan 09 11:52:08 2003 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn
new file mode 100644
index 000000000..00420dbb9
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/sound_group_item.dfn
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="SoundGroup" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="Sound" Type="Type" Filename="filename.typ" FilenameExt="*.sound"/>
+  <LOG>Thu Jan 09 11:47:55 2003 (boucher) Dfn Structure = 
+Thu Jan 09 11:53:15 2003 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/soundbank.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/soundbank.dfn
new file mode 100644
index 000000000..38a60a89a
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/soundbank.dfn
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<DFN Version="0.4" State="modified">
+  <ELEMENT Name="Sounds" Type="Dfn" Filename="sound.dfn" Array="true"/>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn
new file mode 100644
index 000000000..7293fc854
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/stream_file_sound.dfn
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="MinDistance" Type="Type" Filename="distance.typ" Default="1.0"/>
+  <ELEMENT Name="MaxDistance" Type="Type" Filename="distance.typ" Default="15.0"/>
+  <ELEMENT Name="Alpha" Type="Type" Filename="alpha.typ" Default="1.0"/>
+  <ELEMENT Name="Async" Type="Type" Filename="boolean.typ" Default="true"/>
+  <ELEMENT Name="FilePath" Type="Type" Filename="string.typ" Default=""/>
+  <LOG></LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn
new file mode 100644
index 000000000..82eaa9a6d
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/stream_sound.dfn
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="MinDistance" Type="Type" Filename="distance.typ" Default="1.0"/>
+  <ELEMENT Name="MaxDistance" Type="Type" Filename="distance.typ" Default="15.0"/>
+  <ELEMENT Name="Alpha" Type="Type" Filename="alpha.typ" Default="1.0"/>
+  <LOG></LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/transposition.typ b/code/nel/samples/sound/stream_file/data/DFN/sound/transposition.typ
new file mode 100644
index 000000000..2d05a4471
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/transposition.typ
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<TYPE Type="SignedInt" UI="NonEditableCombo" Default="0" Min="-24" Max="+24" Version="0.8" State="modified">
+  <DEFINITION Label="24" Value="24"/>
+  <DEFINITION Label="23" Value="23"/>
+  <DEFINITION Label="22" Value="22"/>
+  <DEFINITION Label="21" Value="21"/>
+  <DEFINITION Label="20" Value="20"/>
+  <DEFINITION Label="19" Value="19"/>
+  <DEFINITION Label="18" Value="18"/>
+  <DEFINITION Label="17" Value="17"/>
+  <DEFINITION Label="16" Value="16"/>
+  <DEFINITION Label="15" Value="15"/>
+  <DEFINITION Label="14" Value="14"/>
+  <DEFINITION Label="13" Value="13"/>
+  <DEFINITION Label="12" Value="12"/>
+  <DEFINITION Label="11" Value="11"/>
+  <DEFINITION Label="10" Value="10"/>
+  <DEFINITION Label="9" Value="9"/>
+  <DEFINITION Label="8" Value="8"/>
+  <DEFINITION Label="7" Value="7"/>
+  <DEFINITION Label="6" Value="6"/>
+  <DEFINITION Label="5" Value="5"/>
+  <DEFINITION Label="4" Value="4"/>
+  <DEFINITION Label="3" Value="3"/>
+  <DEFINITION Label="2" Value="2"/>
+  <DEFINITION Label="1" Value="1"/>
+  <DEFINITION Label="0" Value="0"/>
+  <DEFINITION Label="-1" Value="-1"/>
+  <DEFINITION Label="-2" Value="-2"/>
+  <DEFINITION Label="-3" Value="-3"/>
+  <DEFINITION Label="-4" Value="-4"/>
+  <DEFINITION Label="-5" Value="-5"/>
+  <DEFINITION Label="-6" Value="-6"/>
+  <DEFINITION Label="-7" Value="-7"/>
+  <DEFINITION Label="-8" Value="-8"/>
+  <DEFINITION Label="-9" Value="-9"/>
+  <DEFINITION Label="-10" Value="-10"/>
+  <DEFINITION Label="-11" Value="-11"/>
+  <DEFINITION Label="-12" Value="-12"/>
+  <DEFINITION Label="-13" Value="-13"/>
+  <DEFINITION Label="-14" Value="-14"/>
+  <DEFINITION Label="-15" Value="-15"/>
+  <DEFINITION Label="-16" Value="-16"/>
+  <DEFINITION Label="-17" Value="-17"/>
+  <DEFINITION Label="-18" Value="-18"/>
+  <DEFINITION Label="-19" Value="-19"/>
+  <DEFINITION Label="-20" Value="-20"/>
+  <DEFINITION Label="-21" Value="-21"/>
+  <DEFINITION Label="-22" Value="-22"/>
+  <DEFINITION Label="-23" Value="-23"/>
+  <DEFINITION Label="-24" Value="-24"/>
+</TYPE>
diff --git a/code/nel/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn b/code/nel/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn
new file mode 100644
index 000000000..d2740f489
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/DFN/sound/user_var_binding.dfn
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<DFN Revision="$Revision: 1.1 $" State="modified">
+  <ELEMENT Name="Name" Type="Type" Filename="string.typ"/>
+  <ELEMENT Name="ParamId" Type="Type" Filename="parameter_id.typ"/>
+  <ELEMENT Name="Sounds" Type="Type" Filename="filename.typ" FilenameExt="*.sound" Array="true"/>
+  <LOG>Mon Feb 10 17:32:55 2003 (boucher) Dfn Structure = 
+Mon Feb 10 17:34:17 2003 (boucher) Dfn Structure = 
+Tue Feb 11 09:49:09 2003 (boucher) Dfn Structure = </LOG>
+</DFN>
diff --git a/code/nel/samples/sound/stream_file/data/animations/readme.txt b/code/nel/samples/sound/stream_file/data/animations/readme.txt
new file mode 100644
index 000000000..43c7f150a
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/animations/readme.txt
@@ -0,0 +1,3 @@
+This folder contains the sound track for animation.
+	
+Put here all the .sound_anim file generated with NeL Object Viewer.
\ No newline at end of file
diff --git a/code/nel/samples/sound/stream_file/data/animations/test_anim.sound_anim b/code/nel/samples/sound/stream_file/data/animations/test_anim.sound_anim
new file mode 100644
index 000000000..4377e81b6
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/animations/test_anim.sound_anim
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<SOUNDANIMATION>
+  <MARKER time="0.233333">
+    <SOUND name="beet"/>
+  </MARKER>
+  <MARKER time="0.533333">
+    <SOUND name="tuut"/>
+  </MARKER>
+</SOUNDANIMATION>
diff --git a/code/nel/samples/sound/stream_file/data/background_sounds/background_sound.primitive b/code/nel/samples/sound/stream_file/data/background_sounds/background_sound.primitive
new file mode 100644
index 000000000..26ff875f1
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/background_sounds/background_sound.primitive
@@ -0,0 +1,144 @@
+<?xml version="1.0"?>
+<PRIMITIVES VERSION="1">
+  <ROOT_PRIMITIVE TYPE="CPrimNode">
+    <ALIAS LAST_GENERATED="0"/>
+<!--@expanded-->
+    <CHILD TYPE="CPrimNode">
+<!--@selected@expanded-->
+      <PROPERTY TYPE="string">
+        <NAME>class</NAME>
+        <STRING>audio</STRING>
+      </PROPERTY>
+      <PROPERTY TYPE="string">
+        <NAME>name</NAME>
+        <STRING>test_audio</STRING>
+      </PROPERTY>
+      <CHILD TYPE="CPrimNode">
+<!--@expanded-->
+        <PROPERTY TYPE="string">
+          <NAME>class</NAME>
+          <STRING>sounds</STRING>
+        </PROPERTY>
+        <PROPERTY TYPE="string">
+          <NAME>name</NAME>
+          <STRING>sounds</STRING>
+        </PROPERTY>
+        <CHILD TYPE="CPrimZone">
+          <PT X="1528.726440" Y="-1102.857666" Z="0.000000"/>
+          <PT X="1546.326416" Y="-1311.857666" Z="0.000000"/>
+          <PT X="1742.126465" Y="-1316.257690" Z="0.000000"/>
+          <PT X="1746.526367" Y="-1061.057617" Z="0.000000" SELECTED="true"/>
+<!--@expanded-->
+          <PROPERTY TYPE="string">
+            <NAME>class</NAME>
+            <STRING>sound_zone</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>name</NAME>
+            <STRING>test_zone</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>sound</NAME>
+            <STRING>beep.sound</STRING>
+          </PROPERTY>
+        </CHILD>
+        <CHILD TYPE="CPrimPath">
+          <PT X="1744.326416" Y="-1001.657654" Z="0.000000"/>
+          <PT X="1805.926392" Y="-1131.457642" Z="0.000000"/>
+          <PT X="1805.926392" Y="-1283.257690" Z="0.000000"/>
+          <PT X="1722.326416" Y="-1377.857666" Z="0.000000"/>
+          <PT X="1605.726440" Y="-1402.057617" Z="0.000000" SELECTED="true"/>
+<!--@expanded-->
+          <PROPERTY TYPE="string">
+            <NAME>class</NAME>
+            <STRING>sound_path</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>name</NAME>
+            <STRING>test_path</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>sound</NAME>
+            <STRING>tuut.sound</STRING>
+          </PROPERTY>
+        </CHILD>
+        <CHILD TYPE="CPrimPoint">
+          <PT X="1379.126465" Y="-1152.357544" Z="0.000000"/>
+<!--@expanded-->
+          <PROPERTY TYPE="string">
+            <NAME>class</NAME>
+            <STRING>sound_point</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>name</NAME>
+            <STRING>test_point</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>sound</NAME>
+            <STRING>tuut.sound</STRING>
+          </PROPERTY>
+        </CHILD>
+      </CHILD>
+      <CHILD TYPE="CPrimNode">
+<!--@expanded-->
+        <PROPERTY TYPE="string">
+          <NAME>class</NAME>
+          <STRING>sample_banks</STRING>
+        </PROPERTY>
+        <PROPERTY TYPE="string">
+          <NAME>name</NAME>
+          <STRING>sample_banks</STRING>
+        </PROPERTY>
+        <CHILD TYPE="CPrimZone">
+          <PT X="1262.800293" Y="-1123.099976" Z="0.000000"/>
+          <PT X="1515.800293" Y="-1481.699951" Z="0.000000"/>
+          <PT X="2087.800293" Y="-1334.299927" Z="0.000000"/>
+          <PT X="1744.600342" Y="-898.699951" Z="0.000000" SELECTED="true"/>
+<!--@expanded-->
+          <PROPERTY TYPE="string_array">
+            <NAME>bank_names</NAME>
+            <STRING>base_samples</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>class</NAME>
+            <STRING>sample_bank_zone</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>name</NAME>
+            <STRING>base_sample_zone</STRING>
+          </PROPERTY>
+        </CHILD>
+      </CHILD>
+      <CHILD TYPE="CPrimNode">
+<!--@expanded-->
+        <PROPERTY TYPE="string">
+          <NAME>class</NAME>
+          <STRING>env_fx</STRING>
+        </PROPERTY>
+        <PROPERTY TYPE="string">
+          <NAME>name</NAME>
+          <STRING>env_fx</STRING>
+        </PROPERTY>
+        <CHILD TYPE="CPrimZone">
+          <PT X="1623.326416" Y="-1120.457642" Z="0.000000"/>
+          <PT X="1559.526367" Y="-1228.257690" Z="0.000000"/>
+          <PT X="1700.326416" Y="-1265.657715" Z="0.000000"/>
+          <PT X="1720.126465" Y="-1168.857666" Z="0.000000" SELECTED="true"/>
+<!--@expanded-->
+          <PROPERTY TYPE="string">
+            <NAME>class</NAME>
+            <STRING>env_fx_zone</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>fx_name</NAME>
+            <STRING>BATHROOM</STRING>
+          </PROPERTY>
+          <PROPERTY TYPE="string">
+            <NAME>name</NAME>
+            <STRING>test_fx</STRING>
+          </PROPERTY>
+        </CHILD>
+      </CHILD>
+    </CHILD>
+  </ROOT_PRIMITIVE>
+</PRIMITIVES>
diff --git a/code/nel/samples/sound/stream_file/data/background_sounds/readme.txt b/code/nel/samples/sound/stream_file/data/background_sounds/readme.txt
new file mode 100644
index 000000000..6103b141c
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/background_sounds/readme.txt
@@ -0,0 +1 @@
+This folder contains the background sound primitive files.
\ No newline at end of file
diff --git a/code/nel/samples/sound/stream_file/data/cluster_sound/readme.txt b/code/nel/samples/sound/stream_file/data/cluster_sound/readme.txt
new file mode 100644
index 000000000..2668e737a
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/cluster_sound/readme.txt
@@ -0,0 +1,11 @@
+This folder contains Georges sheets that link sound group defined in 
+the cluster system (edited in 3DS Max) to a sound sheet.
+	
+This allow to put sound inside the cluster systems.
+
+Each sheet can contains any number of association. 
+It is a good practice to merge into a single sheet all
+the sound groups/sound sheets thet belong the the
+same building.
+	
+ 
\ No newline at end of file
diff --git a/code/nel/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group b/code/nel/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group
new file mode 100644
index 000000000..0ee91ba18
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/cluster_sound/test_clusters.sound_group
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.1 $" State="modified">
+  <STRUCT>
+    <ARRAY Name="Items">
+      <STRUCT>
+        <ATOM Name="SoundGroup" Value="A_SOUND_GROUP"/>
+        <ATOM Name="Sound" Value="beep.sound"/>
+      </STRUCT>
+      <STRUCT>
+        <ATOM Name="SoundGroup" Value="ANOTHER_GROUP"/>
+        <ATOM Name="Sound" Value="tuut.sound"/>
+      </STRUCT>
+    </ARRAY>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+</FORM>
diff --git a/code/nel/samples/sound/stream_file/data/default.mixer_config b/code/nel/samples/sound/stream_file/data/default.mixer_config
new file mode 100644
index 000000000..fd9ca5a59
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/default.mixer_config
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.1 $" State="modified">
+  <STRUCT>
+    <ATOM Name="HighestPriorityReserve" Value="2"/>
+    <ATOM Name="HighPriorityReserve" Value="4"/>
+    <ATOM Name="MidPriorityReserve" Value="6"/>
+    <ATOM Name="LowPriorityReserve" Value="8"/>
+    <ARRAY Name="SampleBanks">
+      <ATOM Value="base_samples"/>
+    </ARRAY>
+    <ARRAY Name="BackgroundFlags">
+      <STRUCT>
+        <ATOM Name="Name" Value="day"/>
+        <ATOM Name="ShortName" Value="d"/>
+        <ATOM Name="FadeIn" Value="10*1000"/>
+        <ATOM Name="FadeOut" Value="10*1000"/>
+        <ATOM Name="InitialState" Value="false"/>
+      </STRUCT>
+      <STRUCT>
+        <ATOM Name="Name" Value="night"/>
+        <ATOM Name="ShortName" Value="n"/>
+        <ATOM Name="FadeIn" Value="10*1000"/>
+        <ATOM Name="FadeOut" Value="10*1000"/>
+        <ATOM Name="InitialState" Value="false"/>
+      </STRUCT>
+      <STRUCT>
+        <ATOM Name="Name" Value="fair"/>
+        <ATOM Name="ShortName" Value="f"/>
+        <ATOM Name="FadeIn" Value="10*1000"/>
+        <ATOM Name="FadeOut" Value="10*1000"/>
+        <ATOM Name="InitialState" Value="false"/>
+      </STRUCT>
+      <STRUCT>
+        <ATOM Name="Name" Value="rain"/>
+        <ATOM Name="ShortName" Value="r"/>
+        <ATOM Name="FadeIn" Value="10*1000"/>
+        <ATOM Name="FadeOut" Value="10*1000"/>
+        <ATOM Name="InitialState" Value="false"/>
+      </STRUCT>
+      <STRUCT>
+        <ATOM Name="Name" Value="quick_mute"/>
+        <ATOM Name="ShortName" Value="q"/>
+        <ATOM Name="FadeIn" Value="10*1000"/>
+        <ATOM Name="FadeOut" Value="100"/>
+        <ATOM Name="InitialState" Value="false"/>
+      </STRUCT>
+    </ARRAY>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG>Fri Oct 15 15:26:53 2004 (boucher) .SampleBanks[0] = base_samples</LOG>
+</FORM>
diff --git a/code/nel/samples/sound/stream_file/data/samplebank/base_samples/beep.wav b/code/nel/samples/sound/stream_file/data/samplebank/base_samples/beep.wav
new file mode 100644
index 000000000..8b4108a4c
Binary files /dev/null and b/code/nel/samples/sound/stream_file/data/samplebank/base_samples/beep.wav differ
diff --git a/code/nel/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav b/code/nel/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav
new file mode 100644
index 000000000..bae70bc0f
Binary files /dev/null and b/code/nel/samples/sound/stream_file/data/samplebank/base_samples/tuut.wav differ
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/beep.sound b/code/nel/samples/sound/stream_file/data/soundbank/beep.sound
new file mode 100644
index 000000000..dbda3735c
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/soundbank/beep.sound
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.1 $" State="modified">
+  <STRUCT>
+    <VSTRUCT DfnName="simple_sound.dfn" Name="SoundType">
+      <ATOM Name="Filename" Value="beep.wav"/>
+      <ATOM Name="MinDistance" Value="1.2"/>
+      <ATOM Name="MaxDistance" Value="1000"/>
+    </VSTRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG>Fri Oct 15 15:23:46 2004 (boucher) .SoundType = simple_sound.dfn
+Fri Oct 15 15:23:46 2004 (boucher) .SoundType.Filename = beep.wav
+Fri Oct 15 15:23:46 2004 (boucher) .SoundType.MaxDistance = 1000
+Fri Oct 15 15:23:46 2004 (boucher) .SoundType.MinDistance = 1.2
+Fri Oct 15 15:27:24 2004 (boucher) .SoundType.Alpha = </LOG>
+</FORM>
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/default_stream.sound b/code/nel/samples/sound/stream_file/data/soundbank/default_stream.sound
new file mode 100644
index 000000000..c757128fc
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/soundbank/default_stream.sound
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <VSTRUCT DfnName="stream_sound.dfn" Name="SoundType">
+      <ATOM Name="MinDistance" Value="100000"/>
+      <ATOM Name="MaxDistance" Value="200000"/>
+    </VSTRUCT>
+    <ATOM Name="AbsolutePosition" Value="false"/>
+    <ATOM Name="Priority" Value="Highest"/>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG>Thu Jan 28 23:30:44 2010 (Kaetemi) .AbsolutePosition = false
+Thu Jan 28 23:30:44 2010 (Kaetemi) .Priority = Highest
+Thu Jan 28 23:30:44 2010 (Kaetemi) .SoundType = stream_sound.dfn
+Thu Jan 28 23:30:44 2010 (Kaetemi) .SoundType.MaxDistance = 100000
+Thu Jan 28 23:30:44 2010 (Kaetemi) .SoundType.MinDistance = 200000</LOG>
+</FORM>
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/stream_file.sound b/code/nel/samples/sound/stream_file/data/soundbank/stream_file.sound
new file mode 100644
index 000000000..a98ae3a3c
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/soundbank/stream_file.sound
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision$" State="modified">
+  <STRUCT>
+    <VSTRUCT DfnName="stream_file_sound.dfn" Name="SoundType">
+      <ATOM Name="MinDistance" Value="100000"/>
+      <ATOM Name="MaxDistance" Value="200000"/>
+	  <ATOM Name="Async" Value ="true"/>
+	  <ATOM Name="FilePath" Value="Pyr Entrance.ogg"/>
+    </VSTRUCT>
+    <ATOM Name="AbsolutePosition" Value="false"/>
+    <ATOM Name="Priority" Value="Highest"/>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/code/nel/samples/sound/stream_file/data/soundbank/tuut.sound b/code/nel/samples/sound/stream_file/data/soundbank/tuut.sound
new file mode 100644
index 000000000..c45cfba63
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/soundbank/tuut.sound
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.1 $" State="modified">
+  <STRUCT>
+    <VSTRUCT DfnName="simple_sound.dfn" Name="SoundType">
+      <ATOM Name="Filename" Value="tuut.wav"/>
+      <ATOM Name="MinDistance" Value="5"/>
+      <ATOM Name="MaxDistance" Value="50"/>
+      <ATOM Name="Alpha" Value="0.5"/>
+    </VSTRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG>Fri Oct 15 15:24:54 2004 (boucher) .SoundType = simple_sound.dfn
+Fri Oct 15 15:24:54 2004 (boucher) .SoundType.Alpha = 0.5
+Fri Oct 15 15:24:54 2004 (boucher) .SoundType.Filename = tuut.wav
+Fri Oct 15 15:24:54 2004 (boucher) .SoundType.MaxDistance = 50
+Fri Oct 15 15:24:54 2004 (boucher) .SoundType.MinDistance = 5</LOG>
+</FORM>
diff --git a/code/nel/samples/sound/stream_file/data/world_editor_classes.xml b/code/nel/samples/sound/stream_file/data/world_editor_classes.xml
new file mode 100644
index 000000000..68ba22ace
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/data/world_editor_classes.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0"?>
+<NEL_LIGO_PRIMITIVE_CLASS>
+
+	<!-- Alias resolution 
+		Alias are coded on 32bits, the upper part
+		of the alias is assigned by static configuration 
+		for each primitive file.
+		The lower part is generated by world edit.
+		This ensure uniqueness of alias across any
+		primitive.
+		The standard configuration is set to 20 bits dynamic
+		and 12 bits static (4096 files and 1 million alias by
+		file)
+	-->
+	<ALIAS_DYNAMIC_BITS BIT_COUNT="20"/>
+	<!-- The file that contains the index for each
+	     primitive file.
+		 This index is used to build the static part of the alias.
+	-->
+	<ALIAS_STATIC_FILE_ID FILE_NAME="file_index.cfg"/>
+
+	<!-- Root primitive -->
+	<PRIMITIVE CLASS_NAME="root" TYPE="node" AUTO_INIT="true" DELETABLE="true">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
+		<PARAMETER NAME="path" TYPE="string" VISIBLE="true"/>
+		<!-- <DYNAMIC_CHILD CLASS_NAME="test"/> -->
+		<DYNAMIC_CHILD CLASS_NAME="audio"/>
+	</PRIMITIVE>
+
+	<!-- the alias class, used by all other class that need persistent aliases-->
+	<PRIMITIVE CLASS_NAME="alias" TYPE="alias" AUTO_INIT="true" DELETABLE="false"/>
+
+	<!-- *********************************************************************************** -->
+	<!-- ************************************** AUDIO ************************************** -->
+	<!-- *********************************************************************************** -->
+	<!-- audio root : base container for the audio related primitives -->
+	<PRIMITIVE CLASS_NAME="audio" NAME="audio" TYPE="node" AUTO_INIT="true" DELETABLE="true">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
+		<STATIC_CHILD CLASS_NAME="env_fx" NAME="env_fx"/>
+		<STATIC_CHILD CLASS_NAME="sample_banks" NAME="sample_banks"/>
+		<STATIC_CHILD CLASS_NAME="sounds" NAME="sounds"/>
+	</PRIMITIVE>
+	<!-- Sounds primitive : base container for a list of sound or sub sound_folder -->
+	<PRIMITIVE CLASS_NAME="sounds" NAME="sounds" TYPE="node" AUTO_INIT="true" DELETABLE="false">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
+		<DYNAMIC_CHILD CLASS_NAME="sound_folder"/>
+		<DYNAMIC_CHILD CLASS_NAME="sound_zone"/>
+		<DYNAMIC_CHILD CLASS_NAME="sound_path"/>
+		<DYNAMIC_CHILD CLASS_NAME="sound_point"/>
+	</PRIMITIVE>
+	<!-- sound_folder primitive : container for a list of sound -->
+	<PRIMITIVE CLASS_NAME="sound_folder" TYPE="node" AUTO_INIT="false" DELETABLE="true">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true"/>
+		<DYNAMIC_CHILD CLASS_NAME="sound_zone"/>
+		<DYNAMIC_CHILD CLASS_NAME="sound_path"/>
+		<DYNAMIC_CHILD CLASS_NAME="sound_point"/>
+	</PRIMITIVE>
+	<!-- sound_zone -->
+	<PRIMITIVE CLASS_NAME="sound_zone" TYPE="zone" R="64" G="128" B="192" A="128" DELETABLE="true">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="$sound$"/>
+		<PARAMETER NAME="sound" TYPE="string" VISIBLE="true" FILE_EXTENSION="sound" FOLDER="data/soundbank" />
+		<PARAMETER NAME="layer" TYPE="const_string" VISIBLE="true">
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_0"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_1"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_2"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_3"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_4"/>
+			</COMBO_VALUES>
+		</PARAMETER>
+	</PRIMITIVE>
+	<!-- sound_path -->
+	<PRIMITIVE CLASS_NAME="sound_path" TYPE="path" R="64" G="128" B="192" A="128" DELETABLE="true">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="$sound$"/>
+		<PARAMETER NAME="sound" TYPE="string" VISIBLE="true" FILE_EXTENSION="sound" FOLDER="data/soundbank" />
+		<PARAMETER NAME="layer" TYPE="const_string" VISIBLE="true">
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_0"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_1"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_2"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_3"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_4"/>
+			</COMBO_VALUES>
+		</PARAMETER>
+	</PRIMITIVE>
+	<!-- sound_point -->
+	<PRIMITIVE CLASS_NAME="sound_point" TYPE="point" R="64" G="128" B="192" A="128" DELETABLE="true" SHOW_ARROW="false">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="$sound$"/>
+		<PARAMETER NAME="sound" TYPE="string" VISIBLE="true" FILE_EXTENSION="sound" FOLDER="data/soundbank" />
+		<PARAMETER NAME="layer" TYPE="const_string" VISIBLE="true">
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_0"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_1"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_2"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_3"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="layer_4"/>
+			</COMBO_VALUES>
+		</PARAMETER>
+	</PRIMITIVE>
+	<!-- sample_banks : container for sample_bank zone -->
+	<PRIMITIVE CLASS_NAME="sample_banks" NAME="sample_banks" TYPE="node" AUTO_INIT="true" DELETABLE="false">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true">
+		</PARAMETER>
+		<DYNAMIC_CHILD CLASS_NAME="sample_bank_zone"/>
+	</PRIMITIVE>
+	<!-- sample_bank zone : this is a list of sample banks to keep loaded inside the zone -->
+	<PRIMITIVE CLASS_NAME="sample_bank_zone" TYPE="zone" R="128" G="64" B="88" A="128" DELETABLE="true">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true">
+		</PARAMETER>
+		<PARAMETER NAME="bank_names" TYPE="string_array" VISIBLE="true" FOLDER="data/samplebanks"  WIDGET_HEIGHT="100"/>
+	</PRIMITIVE>
+	<!-- env_fx : container for all env fx zone -->
+	<PRIMITIVE CLASS_NAME="env_fx" NAME="env_fx" TYPE="node" AUTO_INIT="true" DELETABLE="false">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true">
+		</PARAMETER>
+		<DYNAMIC_CHILD CLASS_NAME="env_fx_zone"/>
+	</PRIMITIVE>
+	<!-- env_fx_zone : this an environement fx name to use inside this zone -->
+	<PRIMITIVE CLASS_NAME="env_fx_zone" TYPE="zone" R="88" G="64" B="128" A="128" DELETABLE="true">
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true">
+		</PARAMETER>
+		<PARAMETER NAME="fx_name" TYPE="const_string" VISIBLE="true">
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="GENERIC"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="PADDEDCELL"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="ROOM"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="BATHROOM"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="LIVINGROOM"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="STONEROOM"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="AUDITORIUM"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="CONCERTHALL"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="CAVE"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="ARENA"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="HANGAR"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="CARPETEDHALLWAY"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="HALLWAY"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="STONECORRIDOR"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="ALLEY"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="FOREST"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="CITY"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="MOUNTAINS"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="QUARRY"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="PLAIN"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="PARKINGLOT"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="SEWERPIPE"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="UNDERWATER"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="DRUGGED"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="DIZZY"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="PSYCHOTIC"/>
+			</COMBO_VALUES>
+		</PARAMETER>
+	</PRIMITIVE>
+
+
+	<!-- *********************************************************************************** -->
+	<!-- ************************************** TESTS ************************************** -->
+	<!-- *********************************************************************************** -->
+	<PRIMITIVE CLASS_NAME="test" TYPE="node" AUTO_INIT="false" DELETABLE="true" NUMBERIZE="false">
+		<DYNAMIC_CHILD CLASS_NAME="test"/>
+		<PARAMETER NAME="name" TYPE="string" VISIBLE="true" AUTONAME="$String$">
+		</PARAMETER>
+		<PARAMETER NAME="String" TYPE="string" VISIBLE="true" FILENAME="false">
+			<DEFAULT_VALUE VALUE="Bidule"/>
+		</PARAMETER>
+		<PARAMETER NAME="String2" TYPE="string" VISIBLE="true" FILENAME="false" >
+			<DEFAULT_VALUE GEN_ID="true"/>
+		</PARAMETER>
+		<PARAMETER NAME="String3" TYPE="string" VISIBLE="true" FILENAME="false" AUTONAME="Autoname-$String$-$String2$-">
+		</PARAMETER>
+		<PARAMETER NAME="Bool" TYPE="boolean" VISIBLE="true" FILENAME="false">
+			<DEFAULT_VALUE VALUE="true"/>
+		</PARAMETER>
+		<PARAMETER NAME="Bool2" TYPE="boolean" VISIBLE="true" FILENAME="false">
+			<DEFAULT_VALUE VALUE="false"/>
+		</PARAMETER>
+		<PARAMETER NAME="Bool3" TYPE="boolean" VISIBLE="true" FILENAME="false" AUTONAME="$Bool$">
+			<DEFAULT_VALUE VALUE="false"/>
+		</PARAMETER>
+		<PARAMETER NAME="Const" TYPE="const_string" VISIBLE="true" FILENAME="false" >
+			<COMBO_VALUES CONTEXT_NAME="default">
+			<CONTEXT_VALUE VALUE="additif"/>
+		</COMBO_VALUES>
+		<COMBO_VALUES CONTEXT_NAME="default">
+			<CONTEXT_VALUE VALUE="ae"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="af"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="blend"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="mix"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="replace"/>
+			</COMBO_VALUES>
+			<DEFAULT_VALUE VALUE="replace"/>
+		</PARAMETER>
+		<PARAMETER NAME="Const2" TYPE="const_string" VISIBLE="true" FILENAME="false">
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="additif"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="ae"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="af"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="blend"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="mix"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="replace"/>
+			</COMBO_VALUES>
+		</PARAMETER>
+
+		<PARAMETER NAME="Const3" TYPE="const_string" VISIBLE="true" FILENAME="false" AUTONAME="$Const$">
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="additif"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="ae"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="af"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="blend"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="mix"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="replace"/>
+			</COMBO_VALUES>
+		</PARAMETER>
+
+<!--		<PARAMETER NAME="Array" TYPE="string_array" VISIBLE="true" FILENAME="false"  WIDGET_HEIGHT="100">
+			<DEFAULT_VALUE VALUE="0"/>
+			<DEFAULT_VALUE VALUE="1"/>
+			<DEFAULT_VALUE VALUE="2"/>
+		</PARAMETER>
+		<PARAMETER NAME="Array2" TYPE="string_array" VISIBLE="true" FILENAME="false" WIDGET_HEIGHT="100">
+		</PARAMETER>
+		<PARAMETER NAME="Array3" TYPE="string_array" VISIBLE="true" FILENAME="false" AUTONAME="Autoname-$Array$-$Array2$-" WIDGET_HEIGHT="100">
+		</PARAMETER>-->
+		<PARAMETER NAME="ConstArray" TYPE="const_string_array" VISIBLE="true" FILENAME="true" WIDGET_HEIGHT="100" FILE_EXTENSION="flora" LOOKUP="true">
+			<COMBO_FILES CONTEXT_NAME="default" PATH="l:/leveldesign/game_elem/plant/flora_template/forest"/>
+			<COMBO_VALUES CONTEXT_NAME="jungle">
+				<CONTEXT_VALUE VALUE="jungle0"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="jungle">
+				<CONTEXT_VALUE VALUE="jungle1"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="value0"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="value1"/>
+			</COMBO_VALUES>
+			<DEFAULT_VALUE VALUE="default 0"/>
+			<DEFAULT_VALUE VALUE="default 1"/>
+			<DEFAULT_VALUE VALUE="default 2"/>
+			<DEFAULT_VALUE VALUE="default 3"/>
+		</PARAMETER>
+
+		<PARAMETER NAME="ConstArray2" TYPE="const_string_array" VISIBLE="true" FILENAME="true" WIDGET_HEIGHT="100" FILE_EXTENSION="flora" LOOKUP="true" AUTONAME="$ConstArray$">
+			<COMBO_FILES CONTEXT_NAME="default" PATH="l:/leveldesign/game_elem/plant/flora_template/forest"/>
+			<COMBO_VALUES CONTEXT_NAME="jungle">
+				<CONTEXT_VALUE VALUE="jungle0"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="jungle">
+				<CONTEXT_VALUE VALUE="jungle1"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="value0"/>
+			</COMBO_VALUES>
+			<COMBO_VALUES CONTEXT_NAME="default">
+				<CONTEXT_VALUE VALUE="value1"/>
+			</COMBO_VALUES>
+
+			<DEFAULT_VALUE VALUE="default 0"/>
+			<DEFAULT_VALUE VALUE="default 1"/>
+			<DEFAULT_VALUE VALUE="default 2"/>
+			<DEFAULT_VALUE VALUE="default 3"/>
+
+		</PARAMETER>
+
+		<PARAMETER NAME="Array" TYPE="string_array" VISIBLE="true" WIDGET_HEIGHT="100">
+			<DEFAULT_VALUE VALUE="default 0"/>
+			<DEFAULT_VALUE VALUE="default 1"/>
+			<DEFAULT_VALUE VALUE="default 2"/>
+			<DEFAULT_VALUE VALUE="default 3"/>
+		
+		</PARAMETER>
+
+		<PARAMETER NAME="Array2" TYPE="string_array" VISIBLE="true" WIDGET_HEIGHT="100" AUTONAME="$Array$">
+			<DEFAULT_VALUE VALUE="default 0"/>
+			<DEFAULT_VALUE VALUE="default 1"/>
+			<DEFAULT_VALUE VALUE="default 2"/>
+			<DEFAULT_VALUE VALUE="default 3"/>
+		</PARAMETER>
+	</PRIMITIVE>
+</NEL_LIGO_PRIMITIVE_CLASS>
diff --git a/code/nel/samples/sound/stream_file/stream_file.cpp b/code/nel/samples/sound/stream_file/stream_file.cpp
new file mode 100644
index 000000000..623ee4ff0
--- /dev/null
+++ b/code/nel/samples/sound/stream_file/stream_file.cpp
@@ -0,0 +1,184 @@
+// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include <nel/misc/types_nl.h>
+
+// STL includes
+#include <stdio.h>
+#ifdef NL_OS_WINDOWS
+#	include <conio.h>
+#else
+#	include <curses.h>
+#endif
+
+// NeL includes
+#include <nel/misc/app_context.h>
+#include <nel/misc/debug.h>
+#include <nel/misc/time_nl.h>
+#include <nel/misc/path.h>
+#include <nel/misc/vector.h>
+#include <nel/misc/i18n.h>
+#include <nel/sound/u_audio_mixer.h>
+#include <nel/sound/u_listener.h>
+#include <nel/sound/u_group_controller.h>
+#include <nel/misc/hierarchical_timer.h>
+
+// For direct play/pause control.
+// You should never include this!
+#include <nel/sound/stream_file_source.h>
+
+// Project includes
+
+#ifndef NL_SOUND_DATA
+#define NL_SOUND_DATA "."
+#endif // NL_SOUND_DATA
+
+#define RYZOM_DATA "P:/data"
+#define SAMPLE_OGG "Pyr Entrance.ogg"
+
+using namespace std;
+using namespace NLMISC;
+using namespace NLSOUND;
+
+namespace NLSAMPLE {
+
+static UAudioMixer *s_AudioMixer = NULL;
+static USource *s_Source = NULL;
+static CStreamFileSource *s_StreamFileSource = NULL;
+static UGroupController *s_GroupController = NULL;
+
+static void initSample()
+{
+	if (!INelContext::isContextInitialised())
+		new CApplicationContext();
+	CPath::addSearchPath(NL_SOUND_DATA"/data", true, false);
+	
+	printf("Sample demonstrating OGG playback using stream file .sound sheets.");
+	printf("\n\n");
+	
+	s_AudioMixer = UAudioMixer::createAudioMixer();
+	
+	// Set the sample path before init, this allow the mixer to build the sample banks
+	s_AudioMixer->setSamplePath(NL_SOUND_DATA"/data/samplebank");
+	// Packed sheet option, this mean we want packed sheet generated in 'data' folder
+	s_AudioMixer->setPackedSheetOption(NL_SOUND_DATA"/data", true);
+	
+	printf("Select NLSOUND Driver:\n");
+	printf(" [1] FMod\n");
+	printf(" [2] OpenAl\n");
+	printf(" [3] DSound\n");
+	printf(" [4] XAudio2\n");
+	printf("> ");
+	int selection = getchar(); getchar();
+	printf("\n");
+	
+	// init with 8 tracks, EAX enabled, no ADPCM, and automatic sample bank loading
+	s_AudioMixer->init(8, true, false, NULL, true, (UAudioMixer::TDriver)(selection - '0'));
+	s_AudioMixer->setLowWaterMark(1);
+	
+	CVector initpos(0.0f, 0.0f, 0.0f);
+	CVector frontvec(0.0f, 1.0f, 0.0f);
+	CVector upvec(0.0f, 0.0f, 1.0f);
+	s_AudioMixer->getListener()->setPos(initpos);
+	s_AudioMixer->getListener()->setOrientation(frontvec, upvec);
+
+	CPath::addSearchPath(RYZOM_DATA, true, false);
+	
+	//NLMISC::CHTimer::startBench();
+
+	s_Source = s_AudioMixer->createSource(CStringMapper::map("stream_file"));
+	nlassert(s_Source);
+	s_StreamFileSource = dynamic_cast<CStreamFileSource *>(s_Source);
+	nlassert(s_StreamFileSource);
+	// s_Source->setSourceRelativeMode(true);	
+	// s_Source->setPitch(2.0f);
+
+	s_GroupController = s_AudioMixer->getGroupController("sound:dialog");
+}
+
+static void runSample()
+{
+	s_Source->play();
+	
+	printf("Change volume with - and +\n");
+	printf("Press ANY other key to exit\n");
+	for (; ; )
+	{
+#ifdef NL_OS_WINDOWS
+		if (_kbhit())
+		{
+			switch (_getch())
+#else
+		char ch;
+		if (read(0, &ch, 1))
+		{
+			switch (ch)
+#endif
+			{
+			case '+':
+				s_GroupController->setGain(s_GroupController->getGain() + 0.1f);
+				break;
+			case '-':
+				s_GroupController->setGain(s_GroupController->getGain() - 0.1f);
+				break;
+			case 'x':
+				s_Source->stop();
+				break;
+			case 's':
+				s_Source->play();
+				break;
+			case 'p':
+				s_StreamFileSource->pause();
+				break;
+			case 'r':
+				s_StreamFileSource->resume();
+				break;
+			case 'e':
+				s_AudioMixer->playMusic(SAMPLE_OGG, 1000, true, false);
+				break;
+			default:
+				return;
+			}
+		}
+
+		s_AudioMixer->update();
+		
+		nlSleep(40);
+	}
+}
+
+static void releaseSample()
+{
+	//NLMISC::CHTimer::clear();
+	s_GroupController = NULL;
+	s_StreamFileSource = NULL;
+	delete s_Source; s_Source = NULL;
+	delete s_AudioMixer; s_AudioMixer = NULL;
+}
+
+
+
+} /* namespace NLSAMPLE */
+
+int main()
+{
+	NLSAMPLE::initSample();
+	NLSAMPLE::runSample();
+	NLSAMPLE::releaseSample();
+	return 0;
+}
+
+/* end of file */
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt b/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
new file mode 100644
index 000000000..db978fc88
--- /dev/null
+++ b/code/nel/samples/sound/stream_ogg_vorbis/CMakeLists.txt
@@ -0,0 +1,12 @@
+FILE(GLOB SRC *.cpp *.h)
+
+ADD_EXECUTABLE(nl_sample_stream_ogg_vorbis ${SRC})
+
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(nl_sample_stream_ogg_vorbis nelmisc nelsound)
+NL_DEFAULT_PROPS(nl_sample_stream_ogg_vorbis "NeL, Samples: Sound: Stream OGG Vorbis")
+NL_ADD_RUNTIME_FLAGS(nl_sample_stream_ogg_vorbis)
+
+INSTALL(TARGETS nl_sample_stream_ogg_vorbis RUNTIME DESTINATION bin COMPONENT samplessound)
+
diff --git a/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp b/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp
index 441eee932..e0f0df705 100644
--- a/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp
+++ b/code/nel/samples/sound/stream_ogg_vorbis/stream_ogg_vorbis.cpp
@@ -18,16 +18,10 @@
 
 // STL includes
 #include <stdio.h>
-#include <conio.h>
-
-// 3rd Party includes
-#ifdef NL_OS_WINDOWS
-#	pragma warning( push )
-#	pragma warning( disable : 4244 )
-#endif
-#include <vorbis/vorbisfile.h>
 #ifdef NL_OS_WINDOWS
-#	pragma warning( pop )
+#	include <conio.h>
+#else
+#	include <curses.h>
 #endif
 
 // NeL includes
@@ -40,6 +34,8 @@
 #include <nel/sound/u_audio_mixer.h>
 #include <nel/sound/u_listener.h>
 #include <nel/sound/u_stream_source.h>
+#include <nel/sound/u_group_controller.h>
+#include <nel/sound/audio_decoder.h>
 #include <nel/misc/hierarchical_timer.h>
 
 // Project includes
@@ -48,7 +44,7 @@
 #define NL_SOUND_DATA "."
 #endif // NL_SOUND_DATA
 
-#define SAMPLE_OGG "O:/src/samples/music_stream/data/aeon_1_10_mystic_river.ogg"
+#define SAMPLE_OGG "D:/source/kaetemi/toverhex/src/samples/music_stream/data/aeon_1_10_mystic_river.ogg"
 
 using namespace std;
 using namespace NLMISC;
@@ -56,275 +52,10 @@ using namespace NLSOUND;
 
 namespace NLSAMPLE {
 
-/**
- * \brief IAudioDecoder
- * \date 2008-08-30 11:38GMT
- * \author Jan Boon (Kaetemi)
- * IAudioDecoder is only used by the driver implementation to stream 
- * music files into a readable format (it's a simple decoder interface).
- * You should not call these functions (getSongTitle) on nlsound or user level, 
- * as a driver might have additional music types implemented.
- * TODO: Split IAudioDecoder into IAudioDecoder (actual decoding) and IMediaDemuxer (stream splitter), and change the interface to make more sense.
- * TODO: Allow user application to register more decoders.
- * TODO: Look into libavcodec for decoding audio?
- */
-class IAudioDecoder
-{
-private:
-	// pointers
-	/// Stream from file created by IAudioDecoder
-	NLMISC::IStream *_InternalStream;
-
-public:
-	IAudioDecoder();
-	virtual ~IAudioDecoder();
-
-	/// Create a new music buffer, may return NULL if unknown type, destroy with delete. Filepath lookup done here. If async is true, it will stream from hd, else it will load in memory first.
-	static IAudioDecoder *createAudioDecoder(const std::string &filepath, bool async, bool loop);
-
-	/// Create a new music buffer from a stream, type is file extension like "ogg" etc.
-	static IAudioDecoder *createAudioDecoder(const std::string &type, NLMISC::IStream *stream, bool loop);
-
-	/// Get information on a music file (only artist and title at the moment).
-	static bool getInfo(const std::string &filepath, std::string &artist, std::string &title);
-	
-	/// Get audio/container extensions that are currently supported by the nel sound library.
-	static void getMusicExtensions(std::vector<std::string> &extensions);
-
-	/// Return if a music extension is supported by the nel sound library.
-	static bool isMusicExtensionSupported(const std::string &extension);
-
-	/// Get how many bytes the music buffer requires for output minimum.
-	virtual uint32 getRequiredBytes() = 0;
-
-	/// Get an amount of bytes between minimum and maximum (can be lower than minimum if at end).
-	virtual uint32 getNextBytes(uint8 *buffer, uint32 minimum, uint32 maximum) = 0;
-
-	/// Get the amount of channels (2 is stereo) in output.
-	virtual uint8 getChannels() = 0;
-
-	/// Get the samples per second (often 44100) in output.
-	virtual uint getSamplesPerSec() = 0;
-
-	/// Get the bits per sample (often 16) in output.
-	virtual uint8 getBitsPerSample() = 0;
-
-	/// Get if the music has ended playing (never true if loop).
-	virtual bool isMusicEnded() = 0;
-
-	/// Get the total time in seconds.
-	virtual float getLength() = 0;
-}; /* class IAudioDecoder */
-
-/**
- * \brief CAudioDecoderVorbis
- * \date 2008-08-30 11:38GMT
- * \author Jan Boon (Kaetemi)
- * CAudioDecoderVorbis
- * Create trough IAudioDecoder, type "ogg"
- */
-class CAudioDecoderVorbis : public IAudioDecoder
-{
-protected:
-	// outside pointers
-	NLMISC::IStream *_Stream;
-
-	// pointers
-	
-	// instances
-	OggVorbis_File _OggVorbisFile;
-	bool _Loop;
-	bool _IsMusicEnded;
-	sint32 _StreamOffset;
-	sint32 _StreamSize;
-public:
-	CAudioDecoderVorbis(NLMISC::IStream *stream, bool loop);
-	virtual ~CAudioDecoderVorbis();
-	inline NLMISC::IStream *getStream() { return _Stream; }
-	inline sint32 getStreamSize() { return _StreamSize; }
-	inline sint32 getStreamOffset() { return _StreamOffset; }
-
-	/// Get information on a music file (only artist and title at the moment).
-	static bool getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title);
-
-	/// Get how many bytes the music buffer requires for output minimum.
-	virtual uint32 getRequiredBytes();
-
-	/// Get an amount of bytes between minimum and maximum (can be lower than minimum if at end).
-	virtual uint32 getNextBytes(uint8 *buffer, uint32 minimum, uint32 maximum);
-
-	/// Get the amount of channels (2 is stereo) in output.
-	virtual uint8 getChannels();
-
-	/// Get the samples per second (often 44100) in output.
-	virtual uint getSamplesPerSec();
-
-	/// Get the bits per sample (often 16) in output.
-	virtual uint8 getBitsPerSample();
-
-	/// Get if the music has ended playing (never true if loop).
-	virtual bool isMusicEnded();
-
-	/// Get the total time in seconds.
-	virtual float getLength();
-}; /* class CAudioDecoderVorbis */
-
-IAudioDecoder::IAudioDecoder() : _InternalStream(NULL)
-{
-	
-}
-
-IAudioDecoder::~IAudioDecoder()
-{
-	if (_InternalStream) { delete _InternalStream; _InternalStream = NULL; }
-}
-
-IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &filepath, bool async, bool loop)
-{
-	string lookup = CPath::lookup(filepath, false);
-	if (lookup.empty())
-	{ 
-		nlwarning("Music file %s does not exist!", filepath.c_str());
-		return NULL; 
-	}
-	string type = CFile::getExtension(filepath);
-
-	CIFile *ifile = new CIFile();
-	ifile->setCacheFileOnOpen(!async);
-	ifile->allowBNPCacheFileOnOpen(!async);
-	ifile->open(lookup);
-
-	IAudioDecoder *mb = createAudioDecoder(type, ifile, loop);
-
-	if (mb) mb->_InternalStream = ifile;
-	else delete ifile;
-
-	return mb;
-}
-
-IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC::IStream *stream, bool loop)
-{
-	if (!stream)
-	{
-		nlwarning("Stream is NULL");
-		return NULL;
-	}
-	string type_lower = toLower(type);
-	if (type_lower == "ogg")
-	{
-		return new CAudioDecoderVorbis(stream, loop);
-	}
-	else
-	{
-		nlwarning("Music file type unknown: '%s'", type_lower.c_str());
-		return NULL;
-	}
-}
-
-bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, std::string &title)
-{
-	string lookup = CPath::lookup(filepath, false);
-	if (lookup.empty())
-	{ 
-		nlwarning("Music file %s does not exist!", filepath.c_str());
-		return false; 
-	}
-	string type = CFile::getExtension(filepath);
-	string type_lower = toLower(type);
-
-	if (type_lower == "ogg")
-	{
-		CIFile ifile; 
-		ifile.setCacheFileOnOpen(false); 
-		ifile.allowBNPCacheFileOnOpen(false);
-		ifile.open(lookup);
-		return CAudioDecoderVorbis::getInfo(&ifile, artist, title);
-	}
-	else
-	{
-		nlwarning("Music file type unknown: '%s'", type_lower.c_str());
-		artist.clear(); title.clear();
-		return false;
-	}
-}
-
-/// Get audio/container extensions that are currently supported by the nel sound library.
-void IAudioDecoder::getMusicExtensions(std::vector<std::string> &extensions)
-{
-	extensions.push_back("ogg");
-	// extensions.push_back("wav"); // TODO: Easy.
-}
-
-/// Return if a music extension is supported by the nel sound library.
-bool IAudioDecoder::isMusicExtensionSupported(const std::string &extension)
-{
-	return (extension == "ogg");
-}
-
-size_t vorbisReadFunc(void *ptr, size_t size, size_t nmemb, void *datasource)
-{
-	CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
-	NLMISC::IStream *stream = audio_decoder_vorbis->getStream();
-	nlassert(stream->isReading());
-	sint32 length = (sint32)(size * nmemb);
-	if (length > audio_decoder_vorbis->getStreamSize() - stream->getPos())
-		length = audio_decoder_vorbis->getStreamSize() - stream->getPos();
-	stream->serialBuffer((uint8 *)ptr, length);
-	return length;
-}
-
-int vorbisSeekFunc(void *datasource, ogg_int64_t offset, int whence)
-{
-	if (whence == SEEK_CUR && offset == 0)
-	{
-		// nlwarning(NLSOUND_XAUDIO2_PREFIX "This seek call doesn't do a damn thing, wtf.");
-		return 0; // ooookkaaaaaayyy
-	}
-
-	CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
-
-	NLMISC::IStream::TSeekOrigin origin;
-	switch (whence)
-	{
-	case SEEK_SET:
-		origin = NLMISC::IStream::begin;
-		break;
-	case SEEK_CUR:
-		origin = NLMISC::IStream::current;
-		break;
-	case SEEK_END:
-		origin = NLMISC::IStream::end;
-		break;
-	default:
-		// nlwarning(NLSOUND_XAUDIO2_PREFIX "Seeking to fake origin.");
-		return -1;
-	}
-
-	if (audio_decoder_vorbis->getStream()->seek(SEEK_SET ? audio_decoder_vorbis->getStreamOffset() + (sint32)offset : (sint32)offset, origin)) return 0;
-	else return -1;
-}
-
-//int vorbisCloseFunc(void *datasource)
-//{
-//	//CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
-//}
-
-long vorbisTellFunc(void *datasource)
-{
-	CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
-	return (long)(audio_decoder_vorbis->getStream()->getPos() - audio_decoder_vorbis->getStreamOffset());
-}
-
-static ov_callbacks OV_CALLBACKS_NLMISC_STREAM = {
-  (size_t (*)(void *, size_t, size_t, void *))  vorbisReadFunc,
-  (int (*)(void *, ogg_int64_t, int))		  vorbisSeekFunc,
-  (int (*)(void *))							 NULL, //vorbisCloseFunc,
-  (long (*)(void *))							vorbisTellFunc
-};
-
 static UAudioMixer *s_AudioMixer = NULL;
 static UStreamSource *s_StreamSource = NULL;
 static IAudioDecoder *s_AudioDecoder = NULL;
+static UGroupController *s_GroupController = NULL;
 
 static void initSample()
 {
@@ -367,6 +98,9 @@ static void initSample()
 	string sample = SAMPLE_OGG;
 	s_AudioDecoder = IAudioDecoder::createAudioDecoder(sample, false, false);
 	s_StreamSource->setFormat(s_AudioDecoder->getChannels(), s_AudioDecoder->getBitsPerSample(), (uint32)s_AudioDecoder->getSamplesPerSec());
+	//s_StreamSource->setPitch(2.0f);
+
+	s_GroupController = s_AudioMixer->getGroupController("sound:dialog");
 }
 
 //CMutex *s_Mutex = NULL;
@@ -404,15 +138,33 @@ static void runSample()
 
 	s_StreamSource->play();
 	
-	printf("Press ANY key to exit\n");
+	printf("Change volume with - and +\n");
+	printf("Press ANY other key to exit\n");
 	while (!s_AudioDecoder->isMusicEnded())
 	{
+#ifdef NL_OS_WINDOWS
 		if (_kbhit())
 		{
-			_getch();
-			return;
+			switch (_getch())
+#else
+		char ch;
+		if (read(0, &ch, 1))
+		{
+			switch (ch)
+#endif
+			{
+			case '+':
+				s_GroupController->setGain(s_GroupController->getGain() + 0.1f);
+				break;
+			case '-':
+				s_GroupController->setGain(s_GroupController->getGain() - 0.1f);
+				break;
+			default:
+				return;
+			}
 		}
 		bufferMore(bytes);
+		s_AudioMixer->update();
 		//if (!s_StreamSource->asUSource()->isst)
 		//{
 		//	printf("*!playing!*");
@@ -424,122 +176,32 @@ static void runSample()
 	while (s_StreamSource->hasFilledBuffersAvailable())
 	{
 		nlSleep(40);
+		s_AudioMixer->update();
 	}
 	
 	s_StreamSource->stop();
 	
 	printf("End of song\n");
 	printf("Press ANY key to exit\n");
-	while (!_kbhit()) { s_AudioMixer->update(); Sleep(10); } _getch();
+#ifdef NL_OS_WINDOWS
+	while (!_kbhit()) 
+#else
+	char ch;
+	while (!read(0, &ch, 1))
+#endif
+	{ s_AudioMixer->update(); nlSleep(10); }
 	return;
 }
 
 static void releaseSample()
 {
 	//NLMISC::CHTimer::clear();
+	s_GroupController = NULL;
 	delete s_AudioDecoder; s_AudioDecoder = NULL;
 	delete s_StreamSource; s_StreamSource = NULL;
 	delete s_AudioMixer; s_AudioMixer = NULL;
 }
 
-CAudioDecoderVorbis::CAudioDecoderVorbis(NLMISC::IStream *stream, bool loop) 
-: _Stream(stream), _Loop(loop), _StreamSize(0), _IsMusicEnded(false)
-{
-	_StreamOffset = stream->getPos();
-	stream->seek(0, NLMISC::IStream::end);
-	_StreamSize = stream->getPos();
-	stream->seek(_StreamOffset, NLMISC::IStream::begin);
-	ov_open_callbacks(this, &_OggVorbisFile, NULL, 0, OV_CALLBACKS_NLMISC_STREAM);
-}
-
-CAudioDecoderVorbis::~CAudioDecoderVorbis()
-{
-	ov_clear(&_OggVorbisFile);
-}
-
-/// Get information on a music file (only artist and title at the moment).
-bool CAudioDecoderVorbis::getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title)
-{
-	CAudioDecoderVorbis mbv(stream, false); // just opens and closes the oggvorbisfile thing :)
-	vorbis_comment *vc = ov_comment(&mbv._OggVorbisFile, -1);
-	char *title_c = vorbis_comment_query(vc, "title", 0);
-	if (title_c) title = title_c; else title.clear();
-	char *artist_c = vorbis_comment_query(vc, "artist", 0);
-	if (artist_c) artist = artist_c; else artist.clear();
-	return true;
-}
-
-uint32 CAudioDecoderVorbis::getRequiredBytes()
-{
-	return 0; // no minimum requirement of bytes to buffer out
-}
-
-uint32 CAudioDecoderVorbis::getNextBytes(uint8 *buffer, uint32 minimum, uint32 maximum)
-{
-	int current_section = 0; // ???
-	if (_IsMusicEnded) return 0;
-	nlassert(minimum <= maximum); // can't have this..
-	uint32 bytes_read = 0;
-	do
-	{
-		// signed 16-bit or unsigned 8-bit little-endian samples
-		int br = ov_read(&_OggVorbisFile, (char *)&buffer[bytes_read], maximum - bytes_read, 
-			0, // Specifies big or little endian byte packing. 0 for little endian, 1 for b ig endian. Typical value is 0.
-			getBitsPerSample() == 8 ? 1 : 2, 
-			getBitsPerSample() == 8 ? 0 : 1, // Signed or unsigned data. 0 for unsigned, 1 for signed. Typically 1.
-			&current_section);
-		// nlinfo(NLSOUND_XAUDIO2_PREFIX "current_section: %i", current_section);
-		if (br <= 0) 
-		{ 
-			if (br == 0)
-			{
-				if (_Loop)
-				{
-					ov_pcm_seek(&_OggVorbisFile, 0);
-					//_Stream->seek(0, NLMISC::IStream::begin);
-				}
-				else 
-				{
-					_IsMusicEnded = true;
-					break; 
-				}
-			}
-			else
-			{
-				nlwarning("ov_read: %i", br);
-			}
-		}
-		else bytes_read += (uint32)br;
-	} while (bytes_read < minimum);
-	return bytes_read;
-}
-
-uint8 CAudioDecoderVorbis::getChannels()
-{
-	vorbis_info *vi = ov_info(&_OggVorbisFile, -1);
-	return (uint8)vi->channels;
-}
-
-uint CAudioDecoderVorbis::getSamplesPerSec()
-{
-	vorbis_info *vi = ov_info(&_OggVorbisFile, -1);
-	return (uint)vi->rate;
-}
-
-uint8 CAudioDecoderVorbis::getBitsPerSample()
-{
-	return 16;
-}
-
-bool CAudioDecoderVorbis::isMusicEnded()
-{
-	return _IsMusicEnded;
-}
-
-float CAudioDecoderVorbis::getLength()
-{
-	return (float)ov_time_total(&_OggVorbisFile, -1);
-}
 
 
 } /* namespace NLSAMPLE */
diff --git a/code/nel/samples/sound_sources/Makefile.am b/code/nel/samples/sound_sources/Makefile.am
deleted file mode 100644
index 1e05afa90..000000000
--- a/code/nel/samples/sound_sources/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2005/04/04 09:45:06 cado Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-bin_PROGRAMS              = sound_sources
-
-sound_sources_SOURCES = main.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-sound_sources_LDADD   = ../../src/misc/libnelmisc.la \
-                        ../../src/sound/libnelsnd.la \
-                        ../../src/sound/driver/libnelsnd_lowlevel.la \
-                        ../../src/sound/driver/fmod/libnel_drv_fmod.la \
-			../../src/ligo/libnelligo.la \
-			../../src/georges/libnelgeorges.la \
-                        ../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/3d/Makefile.am b/code/nel/src/3d/Makefile.am
deleted file mode 100644
index 441c4ee47..000000000
--- a/code/nel/src/3d/Makefile.am
+++ /dev/null
@@ -1,616 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = driver
-
-lib_LTLIBRARIES      = libnel3d.la
-
-EXTRA_DIST           = mesh_mrm_skin_template.cpp mesh_mrm_skinned_template.cpp
-
-libnel3d_la_SOURCES  = \
-	anim_ctrl.cpp \
-	anim_detail_trav.cpp \
-	anim_detail_trav.h \
-	animatable.cpp \
-	animatable.h \
-	animated_lightmap.cpp \
-	animated_lightmap.h \
-	animated_material.cpp \
-	animated_material.h \
-	animated_morph.cpp \
-	animated_morph.h \
-	animated_value.cpp \
-	animated_value.h \
-	animation.cpp \
-	animation.h \
-	animation_optimizer.cpp \
-	animation_optimizer.h \
-	animation_playlist.cpp \
-	animation_playlist.h \
-	animation_set.cpp \
-	animation_set.h \
-	animation_set_user.cpp \
-	animation_set_user.h \
-	animation_time.cpp \
-	async_file_manager_3d.cpp \
-	async_file_manager_3d.h \
-	async_texture_block.cpp \
-	async_texture_block.h \
-	async_texture_manager.cpp \
-	async_texture_manager.h \
-	bezier_patch.cpp \
-	bezier_patch.h \
-	bloom_effect.cpp \
-	bloom_effect.h \
-	bone.cpp \
-	bone.h \
-	bsp_tree.h \
-	camera.cpp \
-	camera.h \
-	camera_col.cpp \
-	camera_col.h \
-	channel_mixer.cpp \
-	channel_mixer.h \
-	clip_trav.cpp \
-	clip_trav.h \
-	cloud.cpp \
-	cloud.h \
-	cloud_scape.cpp \
-	cloud_scape.h \
-	cloud_scape_user.cpp \
-	cloud_scape_user.h \
-	cluster.cpp \
-	cluster.h \
-	coarse_mesh_build.cpp \
-	coarse_mesh_build.h \
-	coarse_mesh_manager.cpp \
-	coarse_mesh_manager.h \
-	computed_string.cpp \
-	computed_string.h \
-	cube_grid.cpp \
-	cube_grid.h \
-	cube_map_builder.cpp \
-	cube_map_builder.h \
-	debug_vb.cpp \
-	debug_vb.h \
-	deform_2d.cpp \
-	deform_2d.h \
-	driver.cpp \
-	driver.h \
-	driver_material_inline.h \
-	driver_user.cpp \
-	driver_user.h \
-	driver_user2.cpp \
-	dru.cpp \
-	dru.h \
-	event_mouse_listener.cpp \
-	event_mouse_listener.h \
-	fast_ptr_list.cpp \
-	fast_ptr_list.h \
-	fasthls_modifier.cpp \
-	fasthls_modifier.h \
-	flare_model.cpp \
-	flare_model.h \
-	flare_shape.cpp \
-	flare_shape.h \
-	font_generator.cpp \
-	font_generator.h \
-	font_manager.cpp \
-	font_manager.h \
-	frustum.cpp \
-	heat_haze.cpp \
-	heat_haze.h \
-	height_map.cpp \
-	hls_color_texture.cpp \
-	hls_color_texture.h \
-	hls_texture_bank.cpp \
-	hls_texture_bank.h \
-	hls_texture_manager.cpp \
-	hls_texture_manager.h \
-	hrc_trav.cpp \
-	hrc_trav.h \
-	ig_surface_light.cpp \
-	ig_surface_light.h \
-	ig_surface_light_build.cpp \
-	ig_surface_light_build.h \
-	index_buffer.cpp \
-	index_buffer.h \
-	init_3d.cpp \
-	init_3d.h \
-	instance_group_user.cpp \
-	instance_group_user.h \
-	instance_lighter.cpp \
-	instance_lighter.h \
-	key.cpp \
-	key.h \
-	landscape.cpp \
-	landscape.h \
-	landscape_collision_grid.cpp \
-	landscape_collision_grid.h \
-	landscape_def.cpp \
-	landscape_def.h \
-	landscape_face_vector_manager.cpp \
-	landscape_face_vector_manager.h \
-	landscape_model.cpp \
-	landscape_model.h \
-	landscape_profile.cpp \
-	landscape_profile.h \
-	landscape_user.cpp \
-	landscape_user.h \
-	landscape_vegetable_block.cpp \
-	landscape_vegetable_block.h \
-	landscapeig_manager.cpp \
-	landscapevb_allocator.cpp \
-	landscapevb_allocator.h \
-	landscapevb_info.cpp \
-	landscapevb_info.h \
-	layered_ordering_table.h \
-	light.cpp \
-	light.h \
-	light_contribution.cpp \
-	light_contribution.h \
-	light_influence_interpolator.cpp \
-	light_influence_interpolator.h \
-	light_trav.cpp \
-	light_trav.h \
-	light_user.cpp \
-	light_user.h \
-	lighting_manager.cpp \
-	lighting_manager.h \
-	load_balancing_trav.cpp \
-	load_balancing_trav.h \
-	lod_character_builder.cpp \
-	lod_character_builder.h \
-	lod_character_instance.cpp \
-	lod_character_instance.h \
-	lod_character_manager.cpp \
-	lod_character_manager.h \
-	lod_character_shape.cpp \
-	lod_character_shape.h \
-	lod_character_shape_bank.cpp \
-	lod_character_shape_bank.h \
-	lod_character_texture.cpp \
-	lod_character_texture.h \
-	logic_info.cpp \
-	material.cpp \
-	material.h \
-	matrix_3x4.cpp \
-	matrix_3x4.h \
-	mesh.cpp \
-	mesh.h \
-	mesh_base.cpp \
-	mesh_base.h \
-	mesh_base_instance.cpp \
-	mesh_base_instance.h \
-	mesh_blender.cpp \
-	mesh_blender.h \
-	mesh_block_manager.cpp \
-	mesh_block_manager.h \
-	mesh_geom.cpp \
-	mesh_geom.h \
-	mesh_instance.cpp \
-	mesh_instance.h \
-	mesh_morpher.cpp \
-	mesh_morpher.h \
-	mesh_mrm.cpp \
-	mesh_mrm.h \
-	mesh_mrm_instance.cpp \
-	mesh_mrm_instance.h \
-	mesh_mrm_skin.cpp \
-	mesh_mrm_skin_template.cpp \
-	mesh_mrm_skinned.cpp \
-	mesh_mrm_skinned.h \
-	mesh_mrm_skinned_instance.cpp \
-	mesh_mrm_skinned_instance.h \
-	mesh_mrm_skinned_template.cpp \
-	mesh_multi_lod.cpp \
-	mesh_multi_lod.h \
-	mesh_multi_lod_instance.cpp \
-	mesh_multi_lod_instance.h \
-	mesh_vertex_program.cpp \
-	mesh_vertex_program.h \
-	meshvp_per_pixel_light.cpp \
-	meshvp_per_pixel_light.h \
-	meshvp_wind_tree.cpp \
-	meshvp_wind_tree.h \
-	mini_col.cpp \
-	mini_col.h \
-	motion_blur.cpp \
-	motion_blur.h \
-	mrm_builder.cpp \
-	mrm_builder.h \
-	mrm_internal.cpp \
-	mrm_internal.h \
-	mrm_level_detail.cpp \
-	mrm_level_detail.h \
-	mrm_mesh.cpp \
-	mrm_mesh.h \
-	mrm_parameters.cpp \
-	mrm_parameters.h \
-	nelu.cpp \
-	nelu.h \
-	noise_3d.cpp \
-	noise_3d.h \
-	occlusion_query.h \
-	ordering_table.h \
-	packed_zone.cpp \
-	packed_zone.h \
-	packed_world.cpp \
-	packed_world.h \
-	particle_system.cpp \
-	particle_system.h \
-	particle_system_manager.cpp \
-	particle_system_manager.h \
-	particle_system_model.cpp \
-	particle_system_model.h \
-	particle_system_process.cpp \
-	particle_system_process.h \
-	particle_system_shape.cpp \
-	particle_system_shape.h \
-	particle_system_sound_user.cpp \
-	patch.cpp \
-	patch.h \
-	patch_lightmap.cpp \
-	patch_noise.cpp \
-	patch_rdr_pass.cpp \
-	patch_rdr_pass.h \
-	patch_render.cpp \
-	patch_vegetable.cpp \
-	patchdlm_context.cpp \
-	patchdlm_context.h \
-	patchuv_locator.cpp \
-	patchuv_locator.h \
-	play_list_manager.cpp \
-	play_list_manager.h \
-	play_list_manager_user.cpp \
-	play_list_manager_user.h \
-	play_list_user.cpp \
-	play_list_user.h \
-	point_light.cpp \
-	point_light.h \
-	point_light_model.cpp \
-	point_light_model.h \
-	point_light_named.cpp \
-	point_light_named.h \
-	point_light_named_array.cpp \
-	point_light_named_array.h \
-	portal.cpp \
-	portal.h \
-	primitive_profile.cpp \
-	ps_allocator.cpp \
-	ps_allocator.h \
-	ps_attrib.h \
-	ps_attrib_maker.h \
-	ps_attrib_maker_bin_op.cpp \
-	ps_attrib_maker_bin_op.h \
-	ps_attrib_maker_bin_op_inline.h \
-	ps_attrib_maker_helper.cpp \
-	ps_attrib_maker_helper.h \
-	ps_attrib_maker_iterators.h \
-	ps_attrib_maker_template.cpp \
-	ps_attrib_maker_template.h \
-	ps_color.cpp \
-	ps_color.h \
-	ps_direction.h \
-	ps_dot.cpp \
-	ps_dot.h \
-	ps_edit.h \
-	ps_emitter.cpp \
-	ps_emitter.h \
-	ps_face.cpp \
-	ps_face.h \
-	ps_face_look_at.cpp \
-	ps_face_look_at.h \
-	ps_fan_light.cpp \
-	ps_fan_light.h \
-	ps_float.cpp \
-	ps_float.h \
-	ps_force.cpp \
-	ps_force.h \
-	ps_int.cpp \
-	ps_int.h \
-	ps_iterator.h \
-	ps_light.cpp \
-	ps_light.h \
-	ps_located.cpp \
-	ps_located.h \
-	ps_lod.h \
-	ps_macro.h \
-	ps_mesh.cpp \
-	ps_mesh.h \
-	ps_misc.h \
-	ps_particle.cpp \
-	ps_particle.h \
-	ps_particle2.cpp \
-	ps_particle2.h \
-	ps_particle_basic.cpp \
-	ps_particle_basic.h \
-	ps_plane_basis.h \
-	ps_plane_basis_maker.cpp \
-	ps_plane_basis_maker.h \
-	ps_quad.cpp \
-	ps_quad.h \
-	ps_register_attribs.cpp \
-	ps_register_color_attribs.h \
-	ps_register_emitters.cpp \
-	ps_register_float_attribs.h \
-	ps_register_forces.cpp \
-	ps_register_int_attribs.h \
-	ps_register_particles.cpp \
-	ps_register_plane_basis_attribs.h \
-	ps_register_zones.cpp \
-	ps_ribbon.cpp \
-	ps_ribbon.h \
-	ps_ribbon_base.cpp \
-	ps_ribbon_base.h \
-	ps_ribbon_look_at.cpp \
-	ps_ribbon_look_at.h \
-	ps_shockwave.cpp \
-	ps_shockwave.h \
-	ps_spawn_info.h \
-	ps_sound.cpp \
-	ps_sound.h \
-	ps_tail_dot.cpp \
-	ps_tail_dot.h \
-	ps_util.cpp \
-	ps_util.h \
-	ps_zone.cpp \
-	ps_zone.h \
-	ptr_set.cpp \
-	ptr_set.h \
-	quad_effect.cpp \
-	quad_effect.h \
-	quad_grid.cpp \
-	quad_grid.h \
-	quad_grid_clip_cluster.cpp \
-	quad_grid_clip_cluster.h \
-	quad_grid_clip_manager.cpp \
-	quad_grid_clip_manager.h \
-	radix_sort.cpp \
-	radix_sort.h \
-	raw_skin.cpp \
-	raw_skin.h \
-	raw_skinned.cpp \
-	raw_skinned.h \
-	ray_mesh.cpp \
-	ray_mesh.h \
-	register_3d.cpp \
-	register_3d.h \
-	render_trav.cpp \
-	render_trav.h \
-	root_model.cpp \
-	root_model.h \
-	scene.cpp \
-	scene.h \
-	scene_group.cpp \
-	scene_group.h \
-	scene_user.cpp \
-	scene_user.h \
-	scissor.cpp \
-	seg_remanence.cpp \
-	seg_remanence.h \
-	seg_remanence_shape.cpp \
-	seg_remanence_shape.h \
-	shader.cpp \
-	shader.h \
-	shadow_map.cpp \
-	shadow_map.h \
-	shadow_map_manager.cpp \
-	shadow_map_manager.h \
-	shadow_poly_receiver.cpp \
-	shadow_poly_receiver.h \
-	shadow_skin.cpp \
-	shadow_skin.h \
-	shape.cpp \
-	shape.h \
-	shape_bank.cpp \
-	shape_bank.h \
-	shape_bank_user.cpp \
-	shape_bank_user.h \
-	shape_info.cpp \
-	shape_info.h \
-	shifted_triangle_cache.cpp \
-	shifted_triangle_cache.h \
-	skeleton_model.cpp \
-	skeleton_model.h \
-	skeleton_shape.cpp \
-	skeleton_shape.h \
-	skeleton_spawn_script.cpp \
-	skeleton_spawn_script.h \
-	skeleton_weight.cpp \
-	skeleton_weight.h \
-	static_quad_grid.cpp \
-	static_quad_grid.h \
-	std3d.cpp \
-	std3d.h \
-	stripifier.cpp \
-	stripifier.h \
-	surface_light_grid.cpp \
-	surface_light_grid.h \
-	tangent_space_build.cpp \
-	tangent_space_build.h \
-	target_anim_ctrl.cpp \
-	tess_block.cpp \
-	tess_block.h \
-	tess_face_priority_list.cpp \
-	tess_face_priority_list.h \
-	tess_list.cpp \
-	tess_list.h \
-	tessellation.cpp \
-	tessellation.h \
-	text_context.cpp \
-	text_context.h \
-	text_context_user.cpp \
-	text_context_user.h \
-	texture.cpp \
-	texture.h \
-	texture_blank.cpp \
-	texture_blank.h \
-	texture_bloom.cpp \
-	texture_bloom.h \
-	texture_blend.cpp \
-	texture_blend.h \
-	texture_bump.cpp \
-	texture_bump.h \
-	texture_cube.cpp \
-	texture_cube.h \
-	texture_dlm.cpp \
-	texture_dlm.h \
-	texture_emboss.cpp \
-	texture_emboss.h \
-	texture_far.cpp \
-	texture_far.h \
-	texture_file.cpp \
-	texture_file.h \
-	texture_font.cpp \
-	texture_font.h \
-	texture_grouped.cpp \
-	texture_grouped.h \
-	texture_mem.cpp \
-	texture_mem.h \
-	texture_multi_file.cpp \
-	texture_multi_file.h \
-	texture_near.cpp \
-	texture_near.h \
-	texture_user.cpp \
-	texture_user.h \
-	tile_bank.cpp \
-	tile_bank.h \
-	tile_color.cpp \
-	tile_color.h \
-	tile_element.cpp \
-	tile_element.h \
-	tile_far_bank.cpp \
-	tile_far_bank.h \
-	tile_light_influence.cpp \
-	tile_light_influence.h \
-	tile_lumel.cpp \
-	tile_lumel.h \
-	tile_noise_map.cpp \
-	tile_noise_map.h \
-	tile_vegetable_desc.cpp \
-	tile_vegetable_desc.h \
-	track.cpp \
-	track.h \
-	track_bezier.h \
-	track_keyframer.cpp \
-	track_keyframer.h \
-	track_sampled_common.cpp \
-	track_sampled_common.h \
-	track_sampled_quat.cpp \
-	track_sampled_quat.h \
-	track_sampled_quat_small_header.cpp \
-	track_sampled_quat_small_header.h \
-	track_sampled_vector.cpp \
-	track_sampled_vector.h \
-	track_tcb.h \
-	transform.cpp \
-	transform.h \
-	transform_shape.cpp \
-	transform_shape.h \
-	transformable.cpp \
-	transformable.h \
-	trav_scene.cpp \
-	trav_scene.h \
-	u_bone.cpp \
-	u_camera.cpp \
-	u_instance.cpp \
-	u_instance_material.cpp \
-	u_material.cpp \
-	u_particle_system_instance.cpp \
-	u_point_light.cpp \
-	u_shape.cpp \
-	u_skeleton.cpp \
-	u_transform.cpp \
-	u_transformable.cpp \
-	u_visual_collision_mesh.cpp \
-	u_water.cpp \
-	vegetable.cpp \
-	vegetable.h \
-	vegetable_blend_layer_model.cpp \
-	vegetable_blend_layer_model.h \
-	vegetable_clip_block.cpp \
-	vegetable_clip_block.h \
-	vegetable_def.cpp \
-	vegetable_def.h \
-	vegetable_instance_group.cpp \
-	vegetable_instance_group.h \
-	vegetable_light_ex.cpp \
-	vegetable_light_ex.h \
-	vegetable_manager.cpp \
-	vegetable_manager.h \
-	vegetable_quadrant.cpp \
-	vegetable_quadrant.h \
-	vegetable_shape.cpp \
-	vegetable_shape.h \
-	vegetable_sort_block.cpp \
-	vegetable_sort_block.h \
-	vegetable_uv8.cpp \
-	vegetable_uv8.h \
-	vegetablevb_allocator.cpp \
-	vegetablevb_allocator.h \
-	vertex_buffer.cpp \
-	vertex_buffer.h \
-	vertex_buffer_heap.cpp \
-	vertex_buffer_heap.h \
-	vertex_program.cpp \
-	vertex_program.h \
-	vertex_program_parse.cpp \
-	vertex_program_parse.h \
-	vertex_stream_manager.cpp \
-	vertex_stream_manager.h \
-	viewport.cpp \
-	visual_collision_entity.cpp \
-	visual_collision_entity.h \
-	visual_collision_entity_user.cpp \
-	visual_collision_entity_user.h \
-	visual_collision_manager.cpp \
-	visual_collision_manager.h \
-	visual_collision_manager_user.cpp \
-	visual_collision_manager_user.h \
-	visual_collision_mesh.cpp \
-	visual_collision_mesh.h \
-	water_env_map.cpp \
-	water_env_map.h \
-	water_env_map_user.cpp \
-	water_env_map_user.h \
-	water_height_map.cpp \
-	water_height_map.h \
-	water_model.cpp \
-	water_model.h \
-	water_pool_manager.cpp \
-	water_pool_manager.h \
-	water_shape.cpp \
-	water_shape.h \
-	zone.cpp \
-	zone.h \
-	zone_corner_smoother.cpp \
-	zone_corner_smoother.h \
-	zone_lighter.cpp \
-	zone_lighter.h \
-	zone_manager.cpp \
-	zone_manager.h \
-	zone_search.cpp \
-	zone_search.h \
-	zone_smoother.cpp \
-	zone_smoother.h \
-	zone_symmetrisation.cpp \
-	zone_symmetrisation.h \
-	zone_tgt_smoother.cpp \
-	zone_tgt_smoother.h
-
-noinst_HEADERS	     = std3d.h
-# mesh_vertex_program.h meshvp_wind_tree.h
-
-AM_CXXFLAGS          = -I$(top_srcdir)/src @FREETYPE_CFLAGS@
-
-libnel3d_la_LIBADD   = @FREETYPE_LIBS@ -lc -ldl -lpthread
-
-libnel3d_la_LDFLAGS  = -version-info @LIBTOOL_VERSION@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = nel-3d.pc
-
-# End of Makefile.am
diff --git a/code/nel/src/3d/driver/Makefile.am b/code/nel/src/3d/driver/Makefile.am
deleted file mode 100644
index 0603c2362..000000000
--- a/code/nel/src/3d/driver/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES	= Makefile.in
-
-EXTRA_DIST		= direct3d
-
-SUBDIRS			= opengl
-
-# End of Makefile.am
diff --git a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
index 5ac1d2906..bfbd3fdb7 100644
--- a/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
+++ b/code/nel/src/3d/driver/direct3d/driver_direct3d.cpp
@@ -1228,7 +1228,7 @@ bool CDriverD3D::init (uint windowIcon, emptyProc exitFunc)
 	ExitFunc = exitFunc;
 
 	createCursors();
-	
+
 	// Register a window class
 	WNDCLASSW		wc;
 
diff --git a/code/nel/src/3d/driver/opengl/Makefile.am b/code/nel/src/3d/driver/opengl/Makefile.am
deleted file mode 100644
index 744801217..000000000
--- a/code/nel/src/3d/driver/opengl/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES		= Makefile.in
-
-EXTRA_DIST			=	driver_opengl_8.vcproj	\
-					driver_opengl.vcproj	\
-					driver_opengl.dsp	\
-					driver_opengl.def
-
-lib_LTLIBRARIES			= libnel_drv_opengl.la
-
-libnel_drv_opengl_la_SOURCES = driver_opengl.cpp                 \
-                               driver_opengl.h                   \
-                               driver_opengl_extension.cpp       \
-                               driver_opengl_extension.h         \
-                               driver_opengl_extension_def.h     \
-                               driver_opengl_light.cpp           \
-							   driver_opengl_mac.cpp             \
-                               driver_opengl_material.cpp        \
-                               driver_opengl_matrix.cpp          \
-                               driver_opengl_states.cpp          \
-                               driver_opengl_states.h            \
-                               driver_opengl_texture.cpp         \
-                               driver_opengl_vertex.cpp          \
-                               driver_opengl_vertex_buffer_hard.cpp \
-                               driver_opengl_vertex_buffer_hard.h \
-                               driver_opengl_vertex_program.cpp  \
-                               stdopengl.cpp                     \
-                               stdopengl.h                       \
-                               unix_event_emitter.cpp            \
-                               unix_event_emitter.h
-
-
-noinst_HEADERS		     = stdopengl.h
-
-AM_CXXFLAGS                  = -I$(top_srcdir)/src \
-                               @OPENGL_CFLAGS@ @XF86VIDMODE_CFLAGS@
-
-libnel_drv_opengl_la_LIBADD  = @OPENGL_LIBS@ @XF86VIDMODE_LIBS@ -lXmu
-libnel_drv_opengl_la_LDFLAGS = -no-undefined
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = nel-driverogl.pc
-
-# End of Makefile.am
-
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
index e5c3cff6e..2fc25f94a 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_light.cpp
@@ -138,7 +138,7 @@ void	CDriverGL::setLightInternal(uint8 num, const CLight& light)
 		}
 		else
 		{
-			// Deactivate spot properties
+			// Disable spot properties
 #ifdef USE_OPENGLES
 			glLightf (lightNum, GL_SPOT_CUTOFF, 180.f);
 			glLightf (lightNum, GL_SPOT_EXPONENT, 0.f);
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
index 502c971f1..7241d499b 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
+++ b/code/nel/src/3d/driver/opengl/driver_opengl_vertex.cpp
@@ -978,7 +978,7 @@ void		CDriverGL::setupGlArraysStd(CVertexBufferInfo &vb)
 				// Check type
 				nlassert (vb.Type[CVertexBuffer::Normal]==CVertexBuffer::Float3);
 				_DriverGLStates.enableNormalArray(true);
-					nglArrayObjectATI(GL_NORMAL_ARRAY, 3, GL_FLOAT, vb.VertexSize, vb.VertexObjectId, (ptrdiff_t) vb.ValuePtr[CVertexBuffer::Normal]);
+				nglArrayObjectATI(GL_NORMAL_ARRAY, 3, GL_FLOAT, vb.VertexSize, vb.VertexObjectId, (ptrdiff_t) vb.ValuePtr[CVertexBuffer::Normal]);
 			}
 			else
 			{
diff --git a/code/nel/src/3d/nelu.cpp b/code/nel/src/3d/nelu.cpp
index 80ef89ec4..3d143bce1 100644
--- a/code/nel/src/3d/nelu.cpp
+++ b/code/nel/src/3d/nelu.cpp
@@ -58,7 +58,7 @@ bool			CNELU::initDriver (uint w, uint h, uint bpp, bool windowed, nlWindow syst
 	CNELU::Driver = NULL;
 
 	// Init driver.
-#if defined(NL_OS_WINDOWS)
+#ifdef NL_OS_WINDOWS
 	if (direct3d)
 	{
 		CNELU::Driver= CDRU::createD3DDriver();
@@ -75,6 +75,7 @@ bool			CNELU::initDriver (uint w, uint h, uint bpp, bool windowed, nlWindow syst
 		nlwarning ("CNELU::initDriver: no driver found");
 		return false;
 	}
+
 	if (!CNELU::Driver->init())
 	{
 		nlwarning ("CNELU::initDriver: init() failed");
diff --git a/code/nel/src/3d/particle_system_shape.cpp b/code/nel/src/3d/particle_system_shape.cpp
index 5e41ba530..fb7aaa405 100644
--- a/code/nel/src/3d/particle_system_shape.cpp
+++ b/code/nel/src/3d/particle_system_shape.cpp
@@ -39,7 +39,11 @@ namespace NL3D {
 using NLMISC::CIFile;
 
 
+namespace {
 
+NLMISC::CMutex s_PSSMutex;
+
+} /* anonymous namespace */
 
 // private usage : macro to check the memory integrity
 #if defined(NL_DEBUG) && defined(NL_OS_WINDOWS)
@@ -220,9 +224,8 @@ CParticleSystem *CParticleSystemShape::instanciatePS(CScene &scene, NLMISC::CCon
 		return _SharedSystem;
 	}
 
-	// avoid prb with concurent thread (may append if an instance group containing ps is loaded in background)
-	NLMISC::CMutex mutex;
-	mutex.enter();
+	// avoid prb with concurrent thread (may happen if an instance group containing ps is loaded in background)
+	s_PSSMutex.enter();
 
 
 	#ifdef PS_FAST_ALLOC
@@ -295,7 +298,7 @@ CParticleSystem *CParticleSystemShape::instanciatePS(CScene &scene, NLMISC::CCon
 		}
 	#endif
 
-	mutex.leave();
+	s_PSSMutex.leave();
 
 	/*NLMISC::TTicks end = NLMISC::CTime::getPerformanceTime();
 	nlinfo("instanciation time = %.2f", (float) (1000 * NLMISC::CTime::ticksToSecond(end - start)));	*/
@@ -390,8 +393,7 @@ void CParticleSystemShape::flushTextures(IDriver &driver, uint selectedTexture)
 	}
 	else
 	{
-		NLMISC::CMutex mutex;
-		mutex.enter();
+		s_PSSMutex.enter();
 
 		// must create an instance just to flush the textures
 		CParticleSystem *myInstance = NULL;
@@ -436,7 +438,7 @@ void CParticleSystemShape::flushTextures(IDriver &driver, uint selectedTexture)
 		#ifdef PS_FAST_ALLOC
 			PSBlockAllocator = NULL;
 		#endif
-		mutex.leave();
+		s_PSSMutex.leave();
 	}
 	for(uint k = 0; k < _CachedTex.size(); ++k)
 	{
diff --git a/code/nel/src/Makefile.am b/code/nel/src/Makefile.am
deleted file mode 100644
index dbedcae88..000000000
--- a/code/nel/src/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-DIST_SUBDIRS	     = net 3d pacs sound misc georges ligo
-
-SUBDIRS              = @NEL_SUBDIRS@
-
-EXTRA_DIST           =	3d.vcproj	\
-			georges.vcproj	\
-			ligo.vcproj	\
-			logic.vcproj	\
-			misc.vcproj	\
-			net.vcproj	\
-			pacs.vcproj	\
-			sound.vcproj
-
-# End of Makefile.am
diff --git a/code/nel/src/Rules.mk b/code/nel/src/Rules.mk
deleted file mode 100644
index cb5d3dc57..000000000
--- a/code/nel/src/Rules.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# A few basic default rules and intrinsic rules
-
-# Load objects dependencies
-ifeq (Dependencies.mk,$(wildcard Dependencies.mk))
-include Dependencies.mk
-check-deps:
-	@echo
-	@echo Dependencies found [OK]
-	@echo
-else
-check-deps:
-	@echo 
-	@echo "No dependencies found [ERROR]"
-	@echo "You should try 'make update' first"
-	@echo
-	@exit 1
-endif
-
-# Start off by over-riding the default build rules with our own intrinsics
-.SUFFIXES:
-.SUFFIXES: .cpp .o
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $< -o $@
-
-# remove object files and core (if any)
-clean:
-	find . -name "core*" -exec $(RM) {} \;
-	find . -name "*.o" -exec $(RM) {} \;
-	find . -name "*~" -exec $(RM) {} \;
-	find . -name "Dependencies.mk" -exec $(RM) {} \;
-
-# remove object files, core dump, and executable (if any)
-distclean:
-	$(MAKE) clean
-	$(RM) $(TARGETS)
-	$(RM) $(TARGETS)_debug
-
-# make the thing again from scratch
-again:
-	$(MAKE) distclean
-	$(MAKE) $(TARGETS)
-
-UPDATE_OBJS=`cat ../$(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g' | sed -e 's/\.cpp /\.o /g'`
-
-UPDATE_SRCS=`cat ../$(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g'`
-
-dep: update
-
-update:
-	../gen_deps.sh $(CXX) $(CXXFLAGS) -- $(UPDATE_SRCS) > Dependencies.mk
-	echo "OBJS=$(UPDATE_OBJS)" > Objects.mk
-
-touch:
-	$(RM) $(TARGETS)
-	$(RM) $(TARGETS)_debug
diff --git a/code/nel/src/Variables.mk b/code/nel/src/Variables.mk
deleted file mode 100644
index 216b4b1c8..000000000
--- a/code/nel/src/Variables.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-#############################################################################
-# Setting up the global compiler settings...
-
-# The names of the executables
-CXX           = c++
-RM            = rm -f
-MAKE          = make
-
-DBG           = off
-
-FLAGS_CMN     = -g -pipe -Wno-ctor-dtor-privacy -Wno-multichar -D_REENTRANT -DHAVE_X86
-
-FLAGS_DBG_on  = -O0 -finline-functions -DNL_DEBUG -DNL_DEBUG_FAST
-FLAGS_DBG_off = -O3 -ftemplate-depth-24 -funroll-loops -DNL_RELEASE_DEBUG
-DIR_DBG_on    = debug
-DIR_DBG_off   = release
-
-ifeq (Objects.mk,$(wildcard Objects.mk))
-include Objects.mk
-endif
diff --git a/code/nel/src/cegui/Makefile.am b/code/nel/src/cegui/Makefile.am
deleted file mode 100644
index 43786d8e8..000000000
--- a/code/nel/src/cegui/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# $Id: Makefile.am,v 1.7 2002-06-10 17:02:05 cado Exp $
-#
-
-MAINTAINERCLEANFILES     = Makefile.in
-
-lib_LTLIBRARIES          = libnelceguirenderer.la
-
-libnelceguirenderer_la_SOURCES = nelrenderer.cpp nelresourceprovider.cpp neltexture.cpp
-
-AM_CXXFLAGS         	 = -I$(top_srcdir)/src @CEGUI_CFLAGS@
-
-libnelceguirenderer_la_LIBADD  = -lc -lpthread @CEGUI_LIBS@
-
-libnelceguirenderer_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/gen_deps.sh b/code/nel/src/gen_deps.sh
deleted file mode 100755
index 45f41e17f..000000000
--- a/code/nel/src/gen_deps.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-command=''
-sources=''
-phase=0
-for arg in $*
-do
-    if [ "$phase" == 0 ] && [ "$arg" == '--' ]
-    then
-        phase=1
-    elif [ "$phase" == 0 ]
-    then
-        command="$command $arg"
-    elif [ "$phase" == 1 ]
-    then
-        sources="$sources $arg"
-    fi
-done
-
-for src in $sources
-do
-    obj=`echo $src | sed -e 's/.cpp$/.o/'`
-    $command -MT $obj -M $src
-done
-
diff --git a/code/nel/src/georges/Makefile.am b/code/nel/src/georges/Makefile.am
deleted file mode 100644
index 389110b9f..000000000
--- a/code/nel/src/georges/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES     = Makefile.in
-
-EXTRA_DIST		= georges_file_format.txt
-
-lib_LTLIBRARIES          = libnelgeorges.la
-
-libnelgeorges_la_SOURCES = form.cpp                        \
-			   form.h                          \
-                           form_loader.cpp                 \
-                           form_loader.h                   \
-			   form_dfn.cpp                    \
-			   form_dfn.h                      \
-			   form_elm.cpp                    \
-			   form_elm.h                      \
-                           stdgeorges.cpp                  \
-                           stdgeorges.h                    \
-			   header.cpp                      \
-			   header.h                        \
-			   load_form.cpp                   \
-			   type.cpp                        \
-			   type.h  
-
-AM_CXXFLAGS         	 = -I$(top_srcdir)/src
-
-libnelgeorges_la_LIBADD  = -lc -lpthread
-
-libnelgeorges_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/ligo/Makefile.am b/code/nel/src/ligo/Makefile.am
deleted file mode 100644
index db6e5d423..000000000
--- a/code/nel/src/ligo/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES     = Makefile.in
-
-lib_LTLIBRARIES          = libnelligo.la
-
-libnelligo_la_SOURCES = ligo_config.cpp                        \
-                        ligo_error.cpp                 \
-                        ligo_error.h                 \
-			ligo_material.cpp                    \
-			ligo_material.h                    \
-			primitive.cpp                    \
-			primitive_class.cpp                    \
-			primitive_configuration.cpp		\
-                        transition.cpp                  \
-                        transition.h                  \
-                        zone_bank.cpp                    \
-                        zone_bank.h                    \
-			zone_edge.cpp                      \
-			zone_edge.h                      \
-			zone_region.cpp                   \
-			zone_region.h                   \
-			zone_template.cpp		\
-			zone_template.h		\
-			primitive_utils.cpp
-
-AM_CXXFLAGS         	 = -I$(top_srcdir)/src
-
-libnelligo_la_LIBADD  = -lc -lpthread
-
-libnelligo_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/misc/Makefile.am b/code/nel/src/misc/Makefile.am
deleted file mode 100644
index 345a210c4..000000000
--- a/code/nel/src/misc/Makefile.am
+++ /dev/null
@@ -1,142 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES  = Makefile.in
-
-SUBDIRS               = config_file
-
-lib_LTLIBRARIES       = libnelmisc.la
-
-libnelmisc_la_SOURCES = \
-	aabbox.cpp \
-	app_context.cpp \
-	algo.cpp \
-	async_file_manager.cpp \
-	big_file.cpp \
-	bit_mem_stream.cpp \
-	bit_set.cpp \
-	bitmap.cpp \
-	bitmap_jpeg.cpp \
-	bitmap_png.cpp \
-	block_memory.cpp \
-	bsphere.cpp \
-	buf_fifo.cpp \
-	class_id.cpp \
-	class_registry.cpp \
-	command.cpp \
-	common.cpp \
-	contiguous_block_allocator.cpp \
-	cpu_time_stat.cpp \
-	debug.cpp \
-	di_event_emitter.cpp \
-	di_game_device.cpp \
-	di_game_device.h \
-	di_keyboard_device.cpp \
-	di_keyboard_device.h \
-	di_mouse_device.cpp \
-	di_mouse_device.h \
-	diff_tool.cpp \
-	displayer.cpp \
-	eid_translator.cpp \
-	entity_id.cpp \
-	eval_num_expr.cpp \
-	event_emitter.cpp \
-	event_emitter_multi.cpp \
-	event_listener.cpp \
-	event_server.cpp \
-	events.cpp \
-	fast_floor.cpp \
-	fast_mem.cpp \
-	file.cpp \
-	fixed_size_allocator.cpp \
-	game_device.cpp \
-	game_device_events.cpp \
-	geom_ext.cpp \
-	grid_traversal.cpp \
-	gtk_displayer.cpp \
-	heap_memory.cpp \
-	hierarchical_timer.cpp \
-	i18n.cpp \
-	i_xml.cpp \
-	input_device.cpp \
-	input_device_server.cpp \
-	keyboard_device.cpp \
-	line.cpp \
-	log.cpp \
-	matrix.cpp \
-	md5.cpp \
-	mem_displayer.cpp \
-	mem_stream.cpp \
-	mouse_smoother.cpp \
-	mutex.cpp \
-	noise_value.cpp \
-	o_xml.cpp \
-	object_arena_allocator.cpp \
-	object_vector.cpp \
-	p_thread.cpp \
-	path.cpp \
-	plane.cpp \
-	polygon.cpp \
-	progress_callback.cpp \
-	quad.cpp \
-	quat.cpp \
-	reader_writer.cpp \
-	rect.cpp \
-	report.cpp \
-	rgba.cpp \
-	sha1.cpp \
-	shared_memory.cpp \
-	sheet_id.cpp \
-	smart_ptr.cpp \
-	stdmisc.cpp \
-	stdmisc.h \
-	stl_block_allocator.cpp \
-	stl_block_list.cpp \
-	stop_watch.cpp \
-	stream.cpp \
-	string_common.cpp \
-	string_id_array.cpp \
-	string_mapper.cpp \
-	system_info.cpp \
-	system_utils.cpp \
-	task_manager.cpp \
-	tds.cpp \
-	time_nl.cpp \
-	triangle.cpp \
-	uv.cpp \
-	unicode.cpp \
-	value_smoother.cpp \
-	variable.cpp \
-	vector.cpp \
-	vector_2d.cpp \
-	vector_2f.cpp \
-	vector_h.cpp \
-	vectord.cpp \
-	win_displayer.cpp \
-	win_event_emitter.cpp \
-	win_thread.cpp \
-	window_displayer.cpp \
-	words_dictionary.cpp \
-	dynloadlib.cpp \
-	sstring.cpp \
-	co_task.cpp \
-	xml_pack.cpp \
-	inter_window_msg_queue.cpp \
-	win32_util.cpp
-
-
-noinst_HEADERS        = di_game_device.h \
-                        di_keyboard_device.h \
-                        di_mouse_device.h \
-                        stdmisc.h
-
-
-libnelmisc_la_LIBADD  = config_file/libconfig.la -lc -lpthread -lrt -ldl -lpng -ljpeg
-
-libnelmisc_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = nel-misc.pc
-
-# End of Makefile.am
-
diff --git a/code/nel/src/misc/bit_mem_stream.cpp b/code/nel/src/misc/bit_mem_stream.cpp
index c050d9c61..007b95cbc 100644
--- a/code/nel/src/misc/bit_mem_stream.cpp
+++ b/code/nel/src/misc/bit_mem_stream.cpp
@@ -599,7 +599,7 @@ void	CBitMemStream::append( const CBitMemStream& newBits )
 /*
  * Serial bitmemstream
  */
-void	CBitMemStream::serialMemStream(CBitMemStream &b)
+void	CBitMemStream::serialMemStream(CMemStream &b)
 {
 #ifdef LOG_ALL_TRAFFIC
 	sint32 bitpos = getPosInBit();
diff --git a/code/nel/src/misc/bitmap_jpeg.cpp b/code/nel/src/misc/bitmap_jpeg.cpp
index 835110d86..a4eaaa0b9 100644
--- a/code/nel/src/misc/bitmap_jpeg.cpp
+++ b/code/nel/src/misc/bitmap_jpeg.cpp
@@ -109,7 +109,7 @@ static void jpgDecompressSkip(j_decompress_ptr cinfo, long num_bytes)
 	}
 }
 
-static void jpgDecompressTerm(j_decompress_ptr cinfo)
+static void jpgDecompressTerm(j_decompress_ptr /* cinfo */)
 {
 }
 
diff --git a/code/ryzom/client/src/cdb.cpp b/code/nel/src/misc/cdb.cpp
similarity index 90%
rename from code/ryzom/client/src/cdb.cpp
rename to code/nel/src/misc/cdb.cpp
index f670932ec..8d4c6527f 100644
--- a/code/ryzom/client/src/cdb.cpp
+++ b/code/nel/src/misc/cdb.cpp
@@ -16,21 +16,19 @@
 
 
 
-#include "stdpch.h"
-
 //////////////
 // Includes //
 //////////////
-#include "cdb.h"
-#include "cdb_branch.h"
-#include <nel/misc/bit_mem_stream.h>
+#include "nel/misc/cdb.h"
+#include "nel/misc/cdb_branch.h"
+#include "nel/misc/bit_mem_stream.h"
 
 ////////////////
 // Namespaces //
 ////////////////
-using namespace NLMISC;
 using namespace std;
 
+namespace NLMISC{
 
 CStringMapper *ICDBNode::_DBSM = NULL;
 
@@ -82,3 +80,6 @@ void ICDBNode::releaseStringMapper()
 		delete _DBSM;
 	_DBSM = NULL;
 }
+
+}
+
diff --git a/code/nel/src/misc/cdb_bank_handler.cpp b/code/nel/src/misc/cdb_bank_handler.cpp
new file mode 100644
index 000000000..f090ece4c
--- /dev/null
+++ b/code/nel/src/misc/cdb_bank_handler.cpp
@@ -0,0 +1,96 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "nel/misc/cdb_bank_handler.h"
+
+namespace NLMISC{
+	CCDBBankHandler::CCDBBankHandler(uint maxbanks) :
+_CDBBankToUnifiedIndexMapping( maxbanks, std::vector< uint >() ),
+_FirstLevelIdBitsByBank( maxbanks )
+	{
+		std::fill( _FirstLevelIdBitsByBank.begin(), _FirstLevelIdBitsByBank.end(), 0 );
+		maxBanks = maxbanks;
+	}
+
+	uint CCDBBankHandler::getUIDForBank( uint bank ) const
+	{
+		uint uid = static_cast< uint >( -1 );
+
+		for( uint i = 0; i < _UnifiedIndexToBank.size(); i++ )
+			if( _UnifiedIndexToBank[ i ] == bank )
+				return i;
+
+		return uid;
+	}
+
+	uint CCDBBankHandler::getBankByName( const std::string &name ) const
+	{
+		uint b = static_cast< uint >( -1 );
+
+		for( uint i = 0; i < _CDBBankNames.size(); i++ )
+			if( _CDBBankNames[ i ].compare( name ) == 0 )
+				return i;
+
+		return b;
+	}
+
+	void CCDBBankHandler::mapNodeByBank( const std::string &bankName )
+	{
+		uint b = getBankByName( bankName );
+		// no such bank
+		if( b == static_cast< uint >( -1 ) )
+			return;
+		
+		_CDBBankToUnifiedIndexMapping[ b ].push_back( _CDBLastUnifiedIndex );
+		++_CDBLastUnifiedIndex;
+		_UnifiedIndexToBank.push_back( b );
+	}
+
+	void CCDBBankHandler::fillBankNames( const char **strings, uint size )
+	{
+		_CDBBankNames.clear();
+
+		for( uint i = 0; i < size; i++ )
+			_CDBBankNames.push_back( std::string( strings[ i ] ) );
+	}
+
+	void CCDBBankHandler::reset()
+	{
+		for( std::vector< std::vector< uint > >::iterator itr =_CDBBankToUnifiedIndexMapping.begin();
+			itr != _CDBBankToUnifiedIndexMapping.end(); ++itr )
+			itr->clear();
+
+		_UnifiedIndexToBank.clear();
+		_CDBLastUnifiedIndex = 0;
+	}
+
+	void CCDBBankHandler::calcIdBitsByBank()
+	{
+		for( uint bank = 0; bank != maxBanks; bank++ )
+		{
+			uint nbNodesOfBank = static_cast< uint >( _CDBBankToUnifiedIndexMapping[ bank ].size() );
+			uint idb = 0; 
+			
+			if ( nbNodesOfBank > 0 )
+				for ( idb = 1; nbNodesOfBank > unsigned( 1 << idb ) ; idb++ )
+					;
+
+			_FirstLevelIdBitsByBank[ bank ] = idb;
+		}
+	}
+}
+
+
diff --git a/code/ryzom/client/src/cdb_branch.cpp b/code/nel/src/misc/cdb_branch.cpp
similarity index 67%
rename from code/ryzom/client/src/cdb_branch.cpp
rename to code/nel/src/misc/cdb_branch.cpp
index d7e3f185f..6d8301049 100644
--- a/code/ryzom/client/src/cdb_branch.cpp
+++ b/code/nel/src/misc/cdb_branch.cpp
@@ -16,8 +16,6 @@
 
 
 
-#include "stdpch.h"
-
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA
 //#define TRACE_SET_VALUE
@@ -28,16 +26,14 @@
 //////////////
 // Includes //
 //////////////
-#include "cdb_branch.h"
-#include "cdb_leaf.h"
+#include "nel/misc/cdb_branch.h"
+#include "nel/misc/cdb_leaf.h"
 #include "nel/misc/xml_auto_ptr.h"
 //#include <iostream.h>
-#include "interface_v3/interface_manager.h"
 
 ////////////////
 // Namespaces //
 ////////////////
-using namespace NLMISC;
 using namespace std;
 
 
@@ -46,6 +42,9 @@ using namespace std;
 #include "nel/misc/file.h"
 #include "nel/misc/i_xml.h"
 #include "nel/misc/progress_callback.h"
+#include "nel/misc/bit_mem_stream.h"
+#include "nel/misc/bit_set.h"
+#include "nel/misc/cdb_bank_handler.h"
 
 #include <libxml/parser.h>
 //#include <io.h>
@@ -56,76 +55,9 @@ using namespace std;
 
 
 using namespace std;
-using namespace NLMISC;
-
-/////////////
-// GLOBALS //
-/////////////
-
-CCDBNodeBranch::CDBBranchObsInfo *CCDBNodeBranch::_FirstNotifiedObs[2] = { NULL, NULL };
-CCDBNodeBranch::CDBBranchObsInfo *CCDBNodeBranch::_LastNotifiedObs[2] = { NULL, NULL };
-CCDBNodeBranch::CDBBranchObsInfo *CCDBNodeBranch::_CurrNotifiedObs = NULL;
-CCDBNodeBranch::CDBBranchObsInfo *CCDBNodeBranch::_NextNotifiedObs = NULL;
-
-//
-uint CCDBNodeBranch::_CurrNotifiedObsList = 0;
-
-// Mapping from server database index to client database index (first-level nodes)
-vector<uint> CCDBNodeBranch::_CDBBankToUnifiedIndexMapping [NB_CDB_BANKS];
-
-// Mapping from client database index to TCDBBank (first-level nodes)
-vector<TCDBBank> CCDBNodeBranch::_UnifiedIndexToBank;
-
-// Last index mapped
-uint CCDBNodeBranch::_CDBLastUnifiedIndex = 0;
-
-// Number of bits for first-level branches, by bank
-uint CCDBNodeBranch::_FirstLevelIdBitsByBank [NB_CDB_BANKS];
-
-extern const char *CDBBankNames[INVALID_CDB_BANK+1];
-
-// reset all static data
-void CCDBNodeBranch::reset()
-{
-	for ( uint b=0; b<NB_CDB_BANKS; ++b )
-		_CDBBankToUnifiedIndexMapping[b].clear();
-	_UnifiedIndexToBank.clear();
-	_CDBLastUnifiedIndex = 0;
-
-	_FirstNotifiedObs[0] = NULL;
-	_FirstNotifiedObs[1] = NULL;
-	_LastNotifiedObs[0] = NULL;
-	_LastNotifiedObs[1] = NULL;
-	_CurrNotifiedObsList = 0;
-	_CurrNotifiedObs = NULL;
-	_NextNotifiedObs = NULL;
-}
 
-// Internal use only. First-level bank-mapping.
-void CCDBNodeBranch::mapNodeByBank( ICDBNode * /* node */, const string& bankStr, bool /* clientOnly */, uint /* nodeIndex */ )
-{
-	/*if ( clientOnly )
-	{
-		//nldebug( "CDB: Unified.%u is ClientOnly", _CDBLastUnifiedIndex );
-		++_CDBLastUnifiedIndex;
-		_UnifiedIndexToBank.push_back( CDBPlayer );
-	}
-	else*/ // now clientOnly indices are known by the server as well
-	{
-		for ( uint b=0; b!=INVALID_CDB_BANK; ++b )
-		{
-			if ( string(CDBBankNames[b]) == bankStr )
-			{
-				//nldebug( "CDB: Mapping %s.%u to Unified.%u", CDBBankNames[b], _CDBBankToUnifiedIndexMapping[b].size(), _CDBLastUnifiedIndex );
-				_CDBBankToUnifiedIndexMapping[b].push_back( _CDBLastUnifiedIndex );
-				++_CDBLastUnifiedIndex;
-				_UnifiedIndexToBank.push_back( (TCDBBank)b );
-				break;
-			}
-		}
-	}
-}
 
+namespace NLMISC{
 
 //-----------------------------------------------
 //	init
@@ -135,8 +67,8 @@ static /*inline*/ void addNode( ICDBNode *newNode, std::string newName, CCDBNode
 						    std::vector<ICDBNode *> &nodes, std::vector<ICDBNode *> &nodesSorted,
 							xmlNodePtr &child, const string& bankName,
 							bool atomBranch, bool clientOnly,
-							NLMISC::IProgressCallback &progressCallBack,
-							bool mapBanks )
+							IProgressCallback &progressCallBack,
+							bool mapBanks, CCDBBankHandler *bankHandler = NULL )
 {
 	nodesSorted.push_back(newNode);
 	nodes.push_back(newNode);
@@ -149,7 +81,7 @@ static /*inline*/ void addNode( ICDBNode *newNode, std::string newName, CCDBNode
 	{
 		if ( ! bankName.empty() )
 		{
-			CCDBNodeBranch::mapNodeByBank( newNode, bankName, clientOnly, (uint)nodes.size()-1 );
+			bankHandler->mapNodeByBank( bankName );
 			//nldebug( "CDB: Mapping %s for %s (node %u)", newName.c_str(), bankName.c_str(), nodes.size()-1 );
 		}
 		else
@@ -159,7 +91,7 @@ static /*inline*/ void addNode( ICDBNode *newNode, std::string newName, CCDBNode
 	}
 }
 
-void CCDBNodeBranch::init( xmlNodePtr node, NLMISC::IProgressCallback &progressCallBack, bool mapBanks )
+void CCDBNodeBranch::init( xmlNodePtr node, IProgressCallback &progressCallBack, bool mapBanks, CCDBBankHandler *bankHandler )
 {
 	xmlNodePtr child;
 
@@ -198,7 +130,7 @@ void CCDBNodeBranch::init( xmlNodePtr node, NLMISC::IProgressCallback &progressC
 
 //				nlinfo("+ %s%d",name,i);
 				string newName = string(name.getDatas())+toString(i);
-				addNode( new CCDBNodeBranch(newName), newName, this, _Nodes, _NodesByName, child, sBank, sAtom=="1", sClientonly=="1", progressCallBack, mapBanks );
+				addNode( new CCDBNodeBranch(newName), newName, this, _Nodes, _NodesByName, child, sBank, sAtom=="1", sClientonly=="1", progressCallBack, mapBanks, bankHandler );
 //				nlinfo("-");
 
 				// Progress bar
@@ -210,7 +142,7 @@ void CCDBNodeBranch::init( xmlNodePtr node, NLMISC::IProgressCallback &progressC
 			// dealing with a single entry
 //			nlinfo("+ %s",name);
 			string newName = string(name.getDatas());
-			addNode( new CCDBNodeBranch(newName), newName, this, _Nodes, _NodesByName, child, sBank, sAtom=="1", sClientonly=="1", progressCallBack, mapBanks );
+			addNode( new CCDBNodeBranch(newName), newName, this, _Nodes, _NodesByName, child, sBank, sAtom=="1", sClientonly=="1", progressCallBack, mapBanks, bankHandler );
 //			nlinfo("-");
 		}
 
@@ -247,7 +179,7 @@ void CCDBNodeBranch::init( xmlNodePtr node, NLMISC::IProgressCallback &progressC
 
 //				nlinfo("  %s%d",name,i);
 				string newName = string(name.getDatas())+toString(i);
-				addNode( new CCDBNodeLeaf(newName), newName, this, _Nodes, _NodesByName, child, sBank, false, false, progressCallBack, mapBanks );
+				addNode( new CCDBNodeLeaf(newName), newName, this, _Nodes, _NodesByName, child, sBank, false, false, progressCallBack, mapBanks, bankHandler );
 
 				// Progress bar
 				progressCallBack.popCropedValues ();
@@ -257,7 +189,7 @@ void CCDBNodeBranch::init( xmlNodePtr node, NLMISC::IProgressCallback &progressC
 		{
 //			nlinfo("  %s",name);
 			string newName = string(name.getDatas());
-			addNode( new CCDBNodeLeaf(newName), newName, this, _Nodes, _NodesByName, child, sBank, false, false, progressCallBack, mapBanks );
+			addNode( new CCDBNodeLeaf(newName), newName, this, _Nodes, _NodesByName, child, sBank, false, false, progressCallBack, mapBanks, bankHandler );
 		}
 
 		// Progress bar
@@ -267,18 +199,11 @@ void CCDBNodeBranch::init( xmlNodePtr node, NLMISC::IProgressCallback &progressC
 
 	// count number of bits required to store the id
 	if ( (mapBanks) && (getParent() == NULL) )
-	{
-		nlassertex( _UnifiedIndexToBank.size() == countNode, ("Mapped: %u Nodes: %u", _UnifiedIndexToBank.size(), countNode) );
-
+	{		
+		nlassert( bankHandler != NULL );
+		nlassertex( bankHandler->getUnifiedIndexToBankSize() == countNode, ("Mapped: %u Nodes: %u", bankHandler->getUnifiedIndexToBankSize(), countNode) );
+		bankHandler->calcIdBitsByBank();
 		_IdBits = 0;
-		for ( uint b=0; b!=NB_CDB_BANKS; ++b )
-		{
-			uint nbNodesOfBank = (uint)_CDBBankToUnifiedIndexMapping[b].size();
-			uint idb = 0;
-			if ( nbNodesOfBank > 0 )
-				for ( idb=1; nbNodesOfBank > unsigned(1<<idb) ; idb++ ) {}
-			_FirstLevelIdBitsByBank[b] = idb;
-		}
 	}
 	else
 	{
@@ -460,16 +385,16 @@ bool CCDBNodeBranch::setProp( CTextId& id, sint64 value )
 /*
  * Update the database from the delta, but map the first level with the bank mapping (see _CDBBankToUnifiedIndexMapping)
  */
-void CCDBNodeBranch::readAndMapDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, TCDBBank bank )
+void CCDBNodeBranch::readAndMapDelta( TGameCycle gc, CBitMemStream& s, uint bank, CCDBBankHandler *bankHandler )
 {
 	nlassert( ! isAtomic() ); // root node mustn't be atomic
 
 	// Read index
 	uint32 idx;
-	s.serial( idx, _FirstLevelIdBitsByBank[bank] );
+	s.serial( idx, bankHandler->getFirstLevelIdBits( bank ) );
 
 	// Translate bank index -> unified index
-	idx = _CDBBankToUnifiedIndexMapping[bank][idx];
+	idx = bankHandler->getServerToClientUIDMapping( bank, idx );
 	if (idx >= _Nodes.size())
 	{
 		throw Exception ("idx %d > _Nodes.size() %d ", idx, _Nodes.size());
@@ -492,7 +417,7 @@ void CCDBNodeBranch::readAndMapDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStre
 //	readDelta
 //
 //-----------------------------------------------
-void CCDBNodeBranch::readDelta( NLMISC::TGameCycle gc, CBitMemStream & f )
+void CCDBNodeBranch::readDelta( TGameCycle gc, CBitMemStream & f )
 {
 	if ( isAtomic() )
 	{
@@ -628,7 +553,7 @@ void CCDBNodeBranch::display (const std::string &prefix)
 	}
 }
 
-void CCDBNodeBranch::removeNode (CTextId& id)
+void CCDBNodeBranch::removeNode (const CTextId& id)
 {
 	// Look for the node
 	CCDBNodeBranch *pNode = dynamic_cast<CCDBNodeBranch*>(getNode(id,false));
@@ -674,126 +599,14 @@ void CCDBNodeBranch::removeNode (CTextId& id)
 	delete pNode;
 }
 
-
-
-
-//-----------------------------------------------
-void CCDBNodeBranch::flushObserversCalls()
+void CCDBNodeBranch::onLeafChanged( NLMISC::TStringId leafName )
 {
-	H_AUTO ( RZ_Interface_flushObserversCalls )
+	for( TObserverHandleList::iterator itr = observerHandles.begin(); itr != observerHandles.end(); ++itr )
+		if( (*itr)->observesLeaf( *leafName ) )
+			(*itr)->addToFlushableList();
 
-//	nlassert(_CrtCheckMemory());
-	_CurrNotifiedObs = _FirstNotifiedObs[_CurrNotifiedObsList];
-	while (_CurrNotifiedObs)
-	{
-		// modified node should now store them in other list when they're modified
-		_CurrNotifiedObsList = 1 - _CurrNotifiedObsList;
-		// switch list so that modified node are stored in the other list
-		while (_CurrNotifiedObs)
-		{
-			_NextNotifiedObs = _CurrNotifiedObs->NextNotifiedObserver[1 - _CurrNotifiedObsList];
-			nlassert(_CurrNotifiedObs->Owner);
-			if (_CurrNotifiedObs->Observer)
-				_CurrNotifiedObs->Observer->update(_CurrNotifiedObs->Owner);
-			if (_CurrNotifiedObs) // this may be modified by the call (if current observer is removed)
-			{
-				_CurrNotifiedObs->unlink(1 - _CurrNotifiedObsList);
-			}
-			_CurrNotifiedObs = _NextNotifiedObs;
-		}
-		nlassert(_FirstNotifiedObs[1 - _CurrNotifiedObsList] == NULL);
-		nlassert(_LastNotifiedObs[1 - _CurrNotifiedObsList] == NULL);
-		// update triggered link
-		CInterfaceLink::updateTrigeredLinks();
-		// examine other list to see if nodes have been registered
-		_CurrNotifiedObs = _FirstNotifiedObs[_CurrNotifiedObsList];
-	}
-	CInterfaceLink::updateTrigeredLinks(); // should call it at least once
-//	nlassert(_CrtCheckMemory());
-}
-
-//-----------------------------------------------
-void CCDBNodeBranch::CDBBranchObsInfo::link(uint list, NLMISC::TStringId modifiedLeafName)
-{
-	// If there a filter set?
-	if (!PositiveLeafNameFilter.empty())
-	{
-		// Don't link if modifiedLeafName is not in the filter
-		if (std::find(PositiveLeafNameFilter.begin(), PositiveLeafNameFilter.end(), modifiedLeafName) == PositiveLeafNameFilter.end())
-			return;
-	}
-
-//	nlassert(_CrtCheckMemory());
-	nlassert(list < 2);
-	if (Touched[list]) return; // already inserted in list
-	Touched[list] = true;
-	nlassert(!PrevNotifiedObserver[list]);
-	nlassert(!NextNotifiedObserver[list]);
-	if (!_FirstNotifiedObs[list])
-	{
-		_FirstNotifiedObs[list] = _LastNotifiedObs[list] = this;
-	}
-	else
-	{
-		nlassert(!_LastNotifiedObs[list]->NextNotifiedObserver[list]);
-		_LastNotifiedObs[list]->NextNotifiedObserver[list] = this;
-		PrevNotifiedObserver[list] = _LastNotifiedObs[list];
-		_LastNotifiedObs[list] = this;
-	}
-//	nlassert(_CrtCheckMemory());
-}
-
-//-----------------------------------------------
-void CCDBNodeBranch::CDBBranchObsInfo::unlink(uint list)
-{
-//	nlassert(_CrtCheckMemory());
-	nlassert(list < 2);
-	if (!Touched[list])
-	{
-		// not linked in this list
-		nlassert(PrevNotifiedObserver[list] == NULL);
-		nlassert(NextNotifiedObserver[list] == NULL);
-		return;
-	}
-	if (PrevNotifiedObserver[list])
-	{
-		PrevNotifiedObserver[list]->NextNotifiedObserver[list] = NextNotifiedObserver[list];
-	}
-	else
-	{
-		// this was the first node
-		_FirstNotifiedObs[list] = NextNotifiedObserver[list];
-	}
-	if (NextNotifiedObserver[list])
-	{
-		NextNotifiedObserver[list]->PrevNotifiedObserver[list] = PrevNotifiedObserver[list];
-	}
-	else
-	{
-		// this was the last node
-		_LastNotifiedObs[list] = PrevNotifiedObserver[list];
-	}
-	PrevNotifiedObserver[list] = NULL;
-	NextNotifiedObserver[list] = NULL;
-	Touched[list] = false;
-//	nlassert(_CrtCheckMemory());
-}
-
-//-----------------------------------------------
-void CCDBNodeBranch::linkInModifiedNodeList(NLMISC::TStringId modifiedLeafName)
-{
-//	nlassert(_CrtCheckMemory());
-	CCDBNodeBranch *curr = this;
-	do
-	{
-		for(TObsList::iterator it = curr->_Observers.begin(); it != curr->_Observers.end(); ++it)
-		{
-			it->link(_CurrNotifiedObsList, modifiedLeafName);
-		}
-		curr = curr->getParent();
-	}
-	while(curr);
-//	nlassert(_CrtCheckMemory());
+	if( _Parent != NULL )
+		_Parent->onLeafChanged( leafName );
 }
 
 
@@ -866,14 +679,21 @@ bool CCDBNodeBranch::removeObserver(IPropertyObserver* observer, CTextId& id)
 
 
 //-----------------------------------------------
-void CCDBNodeBranch::addBranchObserver(IPropertyObserver* observer, const std::vector<std::string>& positiveLeafNameFilter)
+void CCDBNodeBranch::addBranchObserver( ICDBDBBranchObserverHandle *handle, const std::vector<std::string>& positiveLeafNameFilter)
 {
-	CDBBranchObsInfo oi(observer, this, positiveLeafNameFilter);
-	_Observers.push_front(oi);
+	CCDBNodeBranch::TObserverHandleList::iterator itr
+		= std::find( observerHandles.begin(), observerHandles.end(), handle );
+
+	if( itr != observerHandles.end() ){
+		delete handle;
+		return;
+	}
+
+	observerHandles.push_back( handle );
 }
 
 //-----------------------------------------------
-void CCDBNodeBranch::addBranchObserver(const char *dbPathFromThisNode, ICDBNode::IPropertyObserver& observer, const char **positiveLeafNameFilter, uint positiveLeafNameFilterSize)
+void CCDBNodeBranch::addBranchObserver( ICDBDBBranchObserverHandle *handle, const char *dbPathFromThisNode, const char **positiveLeafNameFilter, uint positiveLeafNameFilterSize)
 {
 	CCDBNodeBranch *branchNode;
 	if (dbPathFromThisNode[0] == '\0') // empty string
@@ -883,21 +703,37 @@ void CCDBNodeBranch::addBranchObserver(const char *dbPathFromThisNode, ICDBNode:
 	else
 	{
 		branchNode = safe_cast<CCDBNodeBranch*>(getNode(ICDBNode::CTextId(dbPathFromThisNode), false));
-		BOMB_IF (!branchNode, (*getName()) << ":" << dbPathFromThisNode << " branch missing in DB", return);
+		if( branchNode == NULL ){
+			std::string msg = *getName();
+			msg += ":";
+			msg += dbPathFromThisNode;
+			msg += " branch missing in DB";
+
+			nlerror( msg.c_str() );
+			delete handle;
+			return;
+		}
 	}
 	std::vector<std::string> leavesToMonitor(positiveLeafNameFilterSize);
 	for (uint i=0; i!=positiveLeafNameFilterSize; ++i)
 	{
 		leavesToMonitor[i] = string(positiveLeafNameFilter[i]);
 	}
-	branchNode->addBranchObserver(&observer, leavesToMonitor);
+	branchNode->addBranchObserver(handle, leavesToMonitor);
 }
 
 //-----------------------------------------------
 void CCDBNodeBranch::removeBranchObserver(const char *dbPathFromThisNode, ICDBNode::IPropertyObserver& observer)
 {
 	CCDBNodeBranch *branchNode = safe_cast<CCDBNodeBranch*>(getNode(ICDBNode::CTextId(dbPathFromThisNode), false));
-	BOMB_IF (!branchNode, (*getName()) << ":" << dbPathFromThisNode << " branch missing in DB", return);
+	if( branchNode == NULL ){
+		std::string msg = *getName();
+		msg += ":";
+		msg += dbPathFromThisNode;
+		msg += " branch missing in DB";
+		nlerror( msg.c_str() );
+		return;
+	}
 	branchNode->removeBranchObserver(&observer);
 }
 
@@ -906,55 +742,38 @@ void CCDBNodeBranch::removeBranchObserver(const char *dbPathFromThisNode, ICDBNo
 bool CCDBNodeBranch::removeBranchObserver(IPropertyObserver* observer)
 {
 	bool found = false;
-	TObsList::iterator it = _Observers.begin();
-	while (it != _Observers.end())
+
+	TObserverHandleList::iterator itr = observerHandles.begin();
+	while( itr != observerHandles.end() )
 	{
-		if (it->Observer == observer)
+		if( (*itr)->observer() == observer )
 		{
-			removeBranchInfoIt(it);
-			it = _Observers.erase(it);
+			(*itr)->removeFromFlushableList();
+			delete *itr;
+			itr = observerHandles.erase( itr );
 			found = true;
 		}
 		else
 		{
-			++it;
+			++itr;
 		}
 	}
+
 	return found;
 }
 
 //-----------------------------------------------
 void CCDBNodeBranch::removeAllBranchObserver()
 {
-	TObsList::iterator it = _Observers.begin();
-	while (it != _Observers.end())
-	{
-		removeBranchInfoIt(it);
-		++it;
+	for( TObserverHandleList::iterator itr = observerHandles.begin();
+		itr != observerHandles.end(); ++itr ){
+		(*itr)->removeFromFlushableList();
+		delete *itr;
 	}
-	_Observers.clear();
-}
 
-//-----------------------------------------------
-void CCDBNodeBranch::removeBranchInfoIt(TObsList::iterator it)
-{
-	CDBBranchObsInfo *oi = &(*it);
-	// if this node is currenlty being notified, update iterators
-	if (oi == _CurrNotifiedObs)
-	{
-		_CurrNotifiedObs = NULL;
-	}
-	if (oi == _NextNotifiedObs)
-	{
-		nlassert(_CurrNotifiedObsList < 2);
-		_NextNotifiedObs = _NextNotifiedObs->NextNotifiedObserver[1 - _CurrNotifiedObsList];
-	}
-	// unlink observer from both update lists
-	oi->unlink(0);
-	oi->unlink(1);
+	observerHandles.clear();
 }
 
-
 //-----------------------------------------------
 // Useful for find
 //-----------------------------------------------
@@ -1013,3 +832,5 @@ ICDBNode *CCDBNodeBranch::find(const std::string &nodeName)
 #undef TRACE_SET_VALUE
 #endif
 
+}
+
diff --git a/code/nel/src/misc/cdb_branch_observing_handler.cpp b/code/nel/src/misc/cdb_branch_observing_handler.cpp
new file mode 100644
index 000000000..8f531b9a3
--- /dev/null
+++ b/code/nel/src/misc/cdb_branch_observing_handler.cpp
@@ -0,0 +1,201 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "nel/misc/cdb_branch_observing_handler.h"
+
+namespace NLMISC{
+	CCDBBranchObservingHandler::CCDBBranchObservingHandler()
+	{
+		reset();
+	}
+
+	CCDBBranchObservingHandler::~CCDBBranchObservingHandler()
+	{
+		reset();
+	}
+
+	void CCDBBranchObservingHandler::flushObserverCalls()
+	{
+		bool flushed = false;
+
+		do
+		{
+			flushed = false;
+			uint oldList = currentList;
+			currentList = 1 - currentList;
+			
+			std::list< CCDBNodeBranch::ICDBDBBranchObserverHandle* >::iterator itr
+				= flushableObservers[ oldList ].begin();
+			
+			while( itr != flushableObservers[ oldList ].end() )
+			{
+				currentHandle = *itr;
+				++itr;
+				
+				if( currentHandle->observer() != NULL )
+					currentHandle->observer()->update( currentHandle->owner() );
+				
+				// Update might have removed it
+				if( currentHandle != NULL )
+					currentHandle->removeFromFlushableList( oldList );
+
+				currentHandle = NULL;
+				flushed = true;
+			}
+			triggerFlushObservers();
+
+		}while( flushed );
+
+		triggerFlushObservers();
+	}
+
+	void CCDBBranchObservingHandler::reset()
+	{
+		currentList = 0;
+		currentHandle = NULL;
+
+		for( uint i = 0; i < MAX_OBS_LST; i++ )
+			flushableObservers[ i ].clear();
+	}
+
+	void CCDBBranchObservingHandler::addBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver *observer, const std::vector< std::string >& positiveLeafNameFilter )
+	{
+		if( branch == NULL )
+			return;
+
+		CCDBDBBranchObserverHandle *handle = new CCDBDBBranchObserverHandle( observer, branch, this );
+		branch->addBranchObserver( handle, positiveLeafNameFilter );
+	}
+
+	void CCDBBranchObservingHandler::addBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer, const char **positiveLeafNameFilter, uint positiveLeafNameFilterSize )
+	{
+		if( branch == NULL )
+			return;
+
+		CCDBDBBranchObserverHandle *handle = new CCDBDBBranchObserverHandle( &observer, branch, this );
+		branch->addBranchObserver( handle, dbPathFromThisNode, positiveLeafNameFilter, positiveLeafNameFilterSize );
+	}
+
+	void CCDBBranchObservingHandler::removeBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver* observer )
+	{
+		branch->removeBranchObserver( observer );
+	}
+
+	void CCDBBranchObservingHandler::removeBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer )
+	{
+		branch->removeBranchObserver( dbPathFromThisNode, observer );
+	}
+	
+	void CCDBBranchObservingHandler::triggerFlushObservers()
+	{
+		for( std::vector< IBranchObserverCallFlushObserver* >::iterator itr = flushObservers.begin();
+			 itr != flushObservers.end(); itr++ )
+			 (*itr)->onObserverCallFlush();
+	}
+	
+	void CCDBBranchObservingHandler::addFlushObserver( IBranchObserverCallFlushObserver *observer )
+	{
+		std::vector< IBranchObserverCallFlushObserver* >::iterator itr
+			= std::find( flushObservers.begin(), flushObservers.end(), observer );
+		
+		if( itr != flushObservers.end() )
+			return;
+		
+		flushObservers.push_back( observer );
+	}
+	
+	void CCDBBranchObservingHandler::removeFlushObserver( IBranchObserverCallFlushObserver *observer )
+	{
+		std::vector< IBranchObserverCallFlushObserver* >::iterator itr
+			= std::find( flushObservers.begin(), flushObservers.end(), observer );
+		
+		if( itr == flushObservers.end() )
+			return;
+		
+		flushObservers.erase( itr );
+	}
+
+	CCDBBranchObservingHandler::CCDBDBBranchObserverHandle::CCDBDBBranchObserverHandle( NLMISC::ICDBNode::IPropertyObserver *observer, NLMISC::CCDBNodeBranch *owner, CCDBBranchObservingHandler *handler )
+	{
+		std::fill( _inList, _inList + MAX_OBS_LST, false );
+		_observer = observer;
+		_owner = owner;
+		_handler = handler;
+	}
+
+	CCDBBranchObservingHandler::CCDBDBBranchObserverHandle::~CCDBDBBranchObserverHandle()
+	{
+		_observer = NULL;
+	}
+
+	bool CCDBBranchObservingHandler::CCDBDBBranchObserverHandle::observesLeaf( const std::string &leafName )
+	{
+		if( !_observedLeaves.empty() ){
+			std::vector< std::string >::iterator itr
+				= std::find( _observedLeaves.begin(), _observedLeaves.end(), leafName );
+			
+			if( itr == _observedLeaves.end() )
+				return false;
+			else
+				return true;
+		}
+
+		return true;
+	}
+
+	bool CCDBBranchObservingHandler::CCDBDBBranchObserverHandle::inList( uint list )
+	{
+		return _inList[ list ];
+	}
+
+	void CCDBBranchObservingHandler::CCDBDBBranchObserverHandle::addToFlushableList()
+	{
+		uint list = _handler->currentList;
+
+		if( _inList[ list ] )
+			return;
+
+		_handler->flushableObservers[ list ].push_back( this );
+		_inList[ list ] = true;
+	}
+
+	void CCDBBranchObservingHandler::CCDBDBBranchObserverHandle::removeFromFlushableList( uint list )
+	{
+		if( !_inList[ list ] )
+			return;
+
+		std::list< CCDBNodeBranch::ICDBDBBranchObserverHandle* >::iterator itr
+			= std::find( _handler->flushableObservers[ list ].begin(),
+			             _handler->flushableObservers[ list ].end(), this );
+
+		if( itr == _handler->flushableObservers[ list ].end() )
+			return;
+
+		if( _handler->currentHandle == this )
+			_handler->currentHandle = NULL;
+
+		_handler->flushableObservers[ list ].erase( itr );
+		_inList[ list ] = false;
+		
+	}
+
+	void CCDBBranchObservingHandler::CCDBDBBranchObserverHandle::removeFromFlushableList()
+	{
+		for( uint i = 0; i < MAX_OBS_LST; i++ )
+			removeFromFlushableList( i );
+	}
+}
+
diff --git a/code/ryzom/client/src/cdb_check_sum.cpp b/code/nel/src/misc/cdb_check_sum.cpp
similarity index 91%
rename from code/ryzom/client/src/cdb_check_sum.cpp
rename to code/nel/src/misc/cdb_check_sum.cpp
index 44782fea3..4f5f32030 100644
--- a/code/ryzom/client/src/cdb_check_sum.cpp
+++ b/code/nel/src/misc/cdb_check_sum.cpp
@@ -16,10 +16,11 @@
 
 
 
-#include "stdpch.h"
-#include "cdb_check_sum.h"
+#include "nel/misc/cdb_check_sum.h"
 
 
+namespace NLMISC{
+
 /*
  * Constructor
  */
@@ -40,3 +41,6 @@ void CCDBCheckSum::add(uint8 el)
 	_Factor = (cipher + _Factor) * _Const1 + _Const2;
 	_Sum += cipher;
 }
+
+}
+
diff --git a/code/ryzom/client/src/cdb_leaf.cpp b/code/nel/src/misc/cdb_leaf.cpp
similarity index 90%
rename from code/ryzom/client/src/cdb_leaf.cpp
rename to code/nel/src/misc/cdb_leaf.cpp
index b65f79c24..fce66bd4a 100644
--- a/code/ryzom/client/src/cdb_leaf.cpp
+++ b/code/nel/src/misc/cdb_leaf.cpp
@@ -16,9 +16,6 @@
 
 
 
-#include "stdpch.h"
-
-
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA
 //#define TRACE_SET_VALUE
@@ -28,22 +25,23 @@
 //////////////
 // Includes //
 //////////////
-#include "cdb_leaf.h"
+#include "nel/misc/cdb_leaf.h"
 #include "nel/misc/xml_auto_ptr.h"
+#include "nel/misc/bit_mem_stream.h"
 //#include <iostream.h>
-#include "interface_v3/interface_manager.h"
 
 ////////////////
 // Namespaces //
 ////////////////
-using namespace NLMISC;
 using namespace std;
 
+namespace NLMISC{
+
 
 //-----------------------------------------------
 //	init
 //-----------------------------------------------
-void CCDBNodeLeaf::init(  xmlNodePtr node, NLMISC::IProgressCallback &/* progressCallBack */, bool /* mapBanks */ )
+void CCDBNodeLeaf::init(  xmlNodePtr node, IProgressCallback &/* progressCallBack */, bool /* mapBanks */, CCDBBankHandler * /* bankHandler */ )
 {
 	CXMLAutoPtr type((const char*)xmlGetProp (node, (xmlChar*)"type"));
 	nlassert((const char *) type != NULL);
@@ -128,7 +126,7 @@ void CCDBNodeLeaf::write( CTextId& id, FILE * f)
 //-----------------------------------------------
 //	readDelta
 //-----------------------------------------------
-void CCDBNodeLeaf::readDelta(NLMISC::TGameCycle gc, CBitMemStream & f )
+void CCDBNodeLeaf::readDelta(TGameCycle gc, CBitMemStream & f )
 {
 	// If the property Type is valid.
 	if(_Type > UNKNOWN && _Type < Nb_Prop_Type)
@@ -184,7 +182,7 @@ void CCDBNodeLeaf::readDelta(NLMISC::TGameCycle gc, CBitMemStream & f )
 //-----------------------------------------------
 // resetData
 //-----------------------------------------------
-void CCDBNodeLeaf::resetData(NLMISC::TGameCycle gc, bool forceReset)
+void CCDBNodeLeaf::resetData(TGameCycle gc, bool forceReset)
 {
 	if(forceReset)
 	{
@@ -251,7 +249,7 @@ bool CCDBNodeLeaf::setProp( CTextId& id, sint64 value )
 //-----------------------------------------------
 //	setPropCheckGC
 //-----------------------------------------------
-bool CCDBNodeLeaf::setPropCheckGC(NLMISC::TGameCycle gc, sint64 value)
+bool CCDBNodeLeaf::setPropCheckGC(TGameCycle gc, sint64 value)
 {
 	// Apply only if happens after the DB change
 	if(gc>=_LastChangeGC)
@@ -322,7 +320,7 @@ void CCDBNodeLeaf::setValueBool(bool prop)
 	setValue64(newVal);
 }
 
-void CCDBNodeLeaf::setValueRGBA (const NLMISC::CRGBA &color)
+void CCDBNodeLeaf::setValueRGBA (const CRGBA &color)
 {
 	sint64 newVal = (uint32)(color.R+(color.G<<8)+(color.B<<16)+(color.A<<24));
 	setValue64(newVal);
@@ -367,9 +365,7 @@ void CCDBNodeLeaf::notifyObservers()
 	}
 	// mark parent branchs
 	if (_Parent)
-	{
-		_Parent->linkInModifiedNodeList(_Name);
-	}
+		_Parent->onLeafChanged( _Name );
 }
 
 
@@ -390,3 +386,5 @@ void CCDBNodeLeaf::notifyObservers()
 #endif
 //#############################################################################################
 
+}
+
diff --git a/code/nel/src/misc/cdb_manager.cpp b/code/nel/src/misc/cdb_manager.cpp
new file mode 100644
index 000000000..a13527217
--- /dev/null
+++ b/code/nel/src/misc/cdb_manager.cpp
@@ -0,0 +1,149 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "nel/misc/cdb_manager.h"
+
+namespace NLMISC{
+
+	CCDBManager::CCDBManager( const char *rootNodeName, uint maxBanks ) : bankHandler( maxBanks )
+	{
+		_Database = new CCDBNodeBranch( std::string( rootNodeName ) );
+	}
+
+	CCDBManager::~CCDBManager()
+	{
+		if( _Database != NULL )
+		{
+			_Database->clear();
+			delete _Database;
+			_Database = NULL;
+		}
+	}
+
+	CCDBNodeLeaf* CCDBManager::getDbLeaf( const std::string &name, bool create )
+	{
+		if( name.empty() )
+			return NULL;
+
+		CCDBNodeLeaf *leaf = NULL;
+		leaf = dynamic_cast< CCDBNodeLeaf* >( _Database->getNode( ICDBNode::CTextId( name ), create ) );
+		return leaf;
+	}
+
+	CCDBNodeBranch* CCDBManager::getDbBranch( const std::string &name )
+	{
+		if( name.empty() )
+			return NULL;
+		
+		CCDBNodeBranch	*branch = NULL;
+		branch = dynamic_cast< CCDBNodeBranch* >( _Database->getNode( ICDBNode::CTextId( name ), false ) );
+		return branch;
+	}
+
+
+	void CCDBManager::delDbNode( const stlpx_std::string &name )
+	{
+		if( name.empty() )
+			return;
+		
+		_Database->removeNode( ICDBNode::CTextId( name ) );
+	}
+	
+	void CCDBManager::addBranchObserver( const char *branchName, ICDBNode::IPropertyObserver *observer, const std::vector< std::string >& positiveLeafNameFilter )
+	{
+		CCDBNodeBranch *b = dynamic_cast< CCDBNodeBranch* >( _Database->getNode( ICDBNode::CTextId( std::string( branchName ) ), false ) );
+		if( b == NULL )
+			return;
+		branchObservingHandler.addBranchObserver( b, observer, positiveLeafNameFilter );
+	}
+	
+	void CCDBManager::addBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver *observer, const std::vector< std::string >& positiveLeafNameFilter )
+	{
+		if( branch == NULL )
+			return;
+		branchObservingHandler.addBranchObserver( branch, observer, positiveLeafNameFilter );
+	}
+	
+	void CCDBManager::addBranchObserver( const char *branchName, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer, const char **positiveLeafNameFilter, uint positiveLeafNameFilterSize )
+	{
+		CCDBNodeBranch *b = dynamic_cast< CCDBNodeBranch* >( _Database->getNode( ICDBNode::CTextId( std::string( branchName ) ), false ) );
+		if( b == NULL )
+			return;
+		branchObservingHandler.addBranchObserver( b, dbPathFromThisNode, observer, positiveLeafNameFilter, positiveLeafNameFilterSize );
+	}
+	
+	void CCDBManager::addBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer, const char **positiveLeafNameFilter, uint positiveLeafNameFilterSize )
+	{
+		if( branch == NULL )
+			return;
+		branchObservingHandler.addBranchObserver( branch, dbPathFromThisNode, observer, positiveLeafNameFilter, positiveLeafNameFilterSize );
+	}
+	
+	void CCDBManager::removeBranchObserver( const char *branchName, ICDBNode::IPropertyObserver* observer )
+	{
+		CCDBNodeBranch *b = dynamic_cast< CCDBNodeBranch* >( _Database->getNode( ICDBNode::CTextId( std::string( branchName ) ), false ) );
+		if( b == NULL )
+			return;
+		branchObservingHandler.removeBranchObserver( b, observer );
+	}
+	
+	void CCDBManager::removeBranchObserver( CCDBNodeBranch *branch, ICDBNode::IPropertyObserver* observer )
+	{
+		if( branch == NULL )
+			return;
+		branchObservingHandler.removeBranchObserver( branch, observer );
+	}
+	
+	void CCDBManager::removeBranchObserver( const char *branchName, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer )
+	{
+		CCDBNodeBranch *b = dynamic_cast< CCDBNodeBranch* >( _Database->getNode( ICDBNode::CTextId( std::string( branchName ) ), false ) );
+		if( b == NULL )
+			return;
+		branchObservingHandler.removeBranchObserver( b, dbPathFromThisNode, observer );
+	}
+	
+	void CCDBManager::removeBranchObserver( CCDBNodeBranch *branch, const char *dbPathFromThisNode, ICDBNode::IPropertyObserver &observer )
+	{
+		if( branch == NULL )
+			return;
+		branchObservingHandler.removeBranchObserver( branch, dbPathFromThisNode, observer );
+	}
+	
+	void CCDBManager::addFlushObserver( CCDBBranchObservingHandler::IBranchObserverCallFlushObserver *observer )
+	{
+		if( observer == NULL )
+			return;
+		branchObservingHandler.addFlushObserver( observer );
+	}
+	
+	void CCDBManager::removeFlushObserver( CCDBBranchObservingHandler::IBranchObserverCallFlushObserver *observer )
+	{
+		if( observer == NULL )
+			return;
+		branchObservingHandler.removeFlushObserver( observer );
+	}
+	
+	void CCDBManager::flushObserverCalls()
+	{
+		branchObservingHandler.flushObserverCalls();
+	}
+
+	void CCDBManager::resetBank( uint gc, uint bank )
+	{
+		_Database->resetNode( gc, bankHandler.getUIDForBank( bank ) );
+	}
+
+}
diff --git a/code/nel/src/misc/co_task.cpp b/code/nel/src/misc/co_task.cpp
index 1880be06c..c66941a40 100644
--- a/code/nel/src/misc/co_task.cpp
+++ b/code/nel/src/misc/co_task.cpp
@@ -237,12 +237,15 @@ namespace NLMISC
 		_PImpl = new TCoTaskData(this);
 //		_PImpl->_TaskThreadId = 0;
 //		_PImpl->_ParentThreadId = 0;
+		nlunreferenced(stackSize);
 #else //NL_USE_THREAD_COTASK
 		// allocate platform specific data storage
 		_PImpl = new TCoTaskData;
+		nlunreferenced(stackSize);
 #if defined (NL_OS_WINDOWS)
 		_PImpl->_Fiber = NULL;
 		_PImpl->_ParentFiber = NULL;
+		nlunreferenced(stackSize);
 #elif defined(NL_OS_UNIX)
 		// allocate the stack
 		_PImpl->_Stack = new uint8[stackSize];
diff --git a/code/nel/src/misc/command.cpp b/code/nel/src/misc/command.cpp
index 80d074386..f2b422d69 100644
--- a/code/nel/src/misc/command.cpp
+++ b/code/nel/src/misc/command.cpp
@@ -650,6 +650,9 @@ ICommand *CCommandRegistry::getCommand(const std::string &commandName)
 
 NLMISC_CATEGORISED_COMMAND(nel,help,"display help on a specific variable/commands or on all variables and commands", "[<variable>|<command>]")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
 //	nlassert (_Commands != NULL);
 
 	// make sure we have a valid number of parameters
diff --git a/code/nel/src/misc/common.cpp b/code/nel/src/misc/common.cpp
index fb9a9c6f5..d89708c4e 100644
--- a/code/nel/src/misc/common.cpp
+++ b/code/nel/src/misc/common.cpp
@@ -30,6 +30,7 @@
 
 #include "nel/misc/command.h"
 #include "nel/misc/path.h"
+#include "nel/misc/i18n.h"
 
 using namespace std;
 
@@ -372,6 +373,10 @@ uint32 humanReadableToBytes (const string &str)
 
 NLMISC_CATEGORISED_COMMAND(nel,btohr, "Convert a bytes number into an human readable number", "<int>")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
 	if (args.size() != 1)
 		return false;
 
@@ -383,6 +388,10 @@ NLMISC_CATEGORISED_COMMAND(nel,btohr, "Convert a bytes number into an human read
 
 NLMISC_CATEGORISED_COMMAND(nel,hrtob, "Convert a human readable number into a bytes number", "<hr>")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
 	if (args.size() != 1)
 		return false;
 
@@ -445,6 +454,10 @@ uint32 fromHumanReadable (const std::string &str)
 
 NLMISC_CATEGORISED_COMMAND(nel,stohr, "Convert a second number into an human readable time", "<int>")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
 	if (args.size() != 1)
 		return false;
 
@@ -526,6 +539,31 @@ void		toUpper(char *str)
 	}
 }
 
+std::string formatThousands(const std::string& s)
+{
+	sint i, k;
+	sint remaining = (sint)s.length() - 1;
+	static std::string separator = NLMISC::CI18N::get("uiThousandsSeparator").toUtf8();
+
+	// Don't add separator if the number is < 10k
+	if (remaining < 4) return s;
+
+	std::string ns;
+
+	do
+	{
+		for (i = remaining, k = 0; i >= 0 && k < 3; --i, ++k )
+		{
+			ns = s[i] + ns; // New char is added to front of ns
+			if ( i > 0 && k == 2) ns = separator + ns; // j > 0 means still more digits
+		}
+
+		remaining -= 3;
+	}
+	while (remaining >= 0);
+
+	return ns;
+}
 
 //
 // Exceptions
@@ -803,6 +841,7 @@ int	nlfseek64( FILE *stream, sint64 offset, int origin )
 	return fsetpos (stream, &pos64);
 
 #else // NL_OS_WINDOWS
+	// TODO: to fix for Linux and Mac OS X
 
 	// This code doesn't work under windows : fseek() implementation uses a signed 32 bits offset. What ever we do, it can't seek more than 2 Go.
 	// For the moment, i don't know if it works under linux for seek of more than 2 Go.
@@ -845,6 +884,9 @@ sint64 nlftell64(FILE *stream)
 	}
 	else return -1;
 #else
+	nlunreferenced(stream);
+
+	// TODO: implement for Linux and Mac OS X
 	nlerror("Not implemented");
 	return -1;
 #endif
@@ -859,9 +901,14 @@ sint64 nlftell64(FILE *stream)
 
 NLMISC_CATEGORISED_COMMAND(nel, sleep, "Freeze the service for N seconds (for debug purpose)", "<N>")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
 	if(args.size() != 1) return false;
 
-	sint32 n = atoi (args[0].c_str());
+	sint32 n;
+	fromString(args[0], n);
 
 	log.displayNL ("Sleeping during %d seconds", n);
 
@@ -871,6 +918,10 @@ NLMISC_CATEGORISED_COMMAND(nel, sleep, "Freeze the service for N seconds (for de
 
 NLMISC_CATEGORISED_COMMAND(nel, system, "Execute the command line using system() function call (wait until the end of the command)", "<commandline>")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
 	if(args.size() != 1) return false;
 
 	string cmd = args[0];
@@ -889,6 +940,10 @@ NLMISC_CATEGORISED_COMMAND(nel, system, "Execute the command line using system()
 
 NLMISC_CATEGORISED_COMMAND(nel, launchProgram, "Execute the command line using launcProgram() function call (launch in background task without waiting the end of the execution)", "<programName> <arguments>")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
 	if(args.size() != 2) return false;
 
 	string cmd = args[0];
@@ -901,6 +956,10 @@ NLMISC_CATEGORISED_COMMAND(nel, launchProgram, "Execute the command line using l
 
 NLMISC_CATEGORISED_COMMAND(nel, killProgram, "kill a program given the pid", "<pid>")
 {
+	nlunreferenced(rawCommandString);
+	nlunreferenced(quiet);
+	nlunreferenced(human);
+
 	if(args.size() != 1) return false;
 	uint32 pid;
 	fromString(args[0], pid);
@@ -1004,6 +1063,9 @@ bool openDoc (const char *document)
     }
 	else
 		return true;
+#else
+	// TODO: implement for Linux and Mac OS X
+	nlunreferenced(document);
 #endif // NL_OS_WINDOWS
 	return false;
 }
diff --git a/code/nel/src/misc/config_file/Makefile.am b/code/nel/src/misc/config_file/Makefile.am
deleted file mode 100644
index ee72fe42c..000000000
--- a/code/nel/src/misc/config_file/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES    = Makefile.in
-
-noinst_LTLIBRARIES      = libconfig.la
-
-AM_YFLAGS = --defines=cf_gramatical.h -p cf
-
-AM_LFLAGS = -f -8 -Pcf -olex.yy.c
-
-EXTRA_DIST = cf_gramatical.h cf_bison.simple cf_flex.skl do.bat
-
-libconfig_la_SOURCES    = cf_lexical.lpp             \
-                          cf_gramatical.ypp          \
-                          config_file.cpp 
-
-#libconfig_la_SOURCES    = config_file.cpp 
-
-# End of Makefile.am
-
diff --git a/code/nel/src/misc/eid_translator.cpp b/code/nel/src/misc/eid_translator.cpp
index 36ea84247..e254831c4 100644
--- a/code/nel/src/misc/eid_translator.cpp
+++ b/code/nel/src/misc/eid_translator.cpp
@@ -417,6 +417,17 @@ void CEntityIdTranslator::checkEntity (const CEntityId &eid, const ucstring &ent
 	}
 }
 
+void CEntityIdTranslator::removeShardFromName(ucstring& name)
+{
+	// The string must contain a '(' and a ')'
+	ucstring::size_type	p0= name.find('(');
+	ucstring::size_type	p1= name.find(')');
+	if (p0 == ucstring::npos || p1 == ucstring::npos || p1 <= p0)
+		return;
+
+	name = name.substr(0, p0) + name.substr(p1 + 1);
+}
+
 // this callback is call when the file is changed
 void cbInvalidEntityNamesFilename(const std::string &invalidEntityNamesFilename)
 {
diff --git a/code/nel/src/misc/events.cpp b/code/nel/src/misc/events.cpp
index 4d3979416..7cef02f44 100644
--- a/code/nel/src/misc/events.cpp
+++ b/code/nel/src/misc/events.cpp
@@ -178,7 +178,7 @@ static const CStringConversion<TKey>::CPair stringTable [] =
 	{ "KeyZOOM", KeyZOOM },
 	{ "KeyNONAME", KeyNONAME },
 	{ "KeyPA1", KeyPA1 },
-	{ "KeyOEM_CLEAR", KeyOEM_CLEAR },
+	{ "KeyOEM_CLEAR", KeyOEM_CLEAR }
 };
 
 
diff --git a/code/nel/src/misc/fast_id_map.cpp b/code/nel/src/misc/fast_id_map.cpp
new file mode 100644
index 000000000..f32d6edd8
--- /dev/null
+++ b/code/nel/src/misc/fast_id_map.cpp
@@ -0,0 +1,44 @@
+/**
+ * \file fast_id_map.cpp
+ * \brief CFastIdMap
+ * \date 2012-04-10 19:28GMT
+ * \author Jan Boon (Kaetemi)
+ * CFastIdMap
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <nel/misc/types_nl.h>
+#include <nel/misc/fast_id_map.h>
+
+// STL includes
+
+// NeL includes
+// #include <nel/misc/debug.h>
+
+// Project includes
+
+namespace NLMISC {
+
+void dummytoavoidthecompilerwarningfastidmap() { }
+
+} /* namespace NLMISC */
+
+/* end of file */
diff --git a/code/nel/src/misc/p_thread.cpp b/code/nel/src/misc/p_thread.cpp
index d4f1582b4..f752f4bdf 100644
--- a/code/nel/src/misc/p_thread.cpp
+++ b/code/nel/src/misc/p_thread.cpp
@@ -84,6 +84,17 @@ static void *ProxyFunc( void *arg )
 	// Run the code of the thread
 	parent->Runnable->run();
 
+	{
+		pthread_t thread_self = pthread_self();
+		// Make sure the parent still cares
+		// If this thread was replaced with a new thread (which should not happen),
+		// and the IThread object has been deleted, this will likely crash.
+		if (parent->_ThreadHandle == thread_self)
+			parent->_State = CPThread::ThreadStateFinished;
+		else
+			throw EThread("Thread ended after being detached, this should not happen");
+	}
+
 	// Allow some clean
 //	pthread_exit(0);
 	return NULL;
@@ -96,7 +107,7 @@ static void *ProxyFunc( void *arg )
  */
 CPThread::CPThread(IRunnable *runnable, uint32 stackSize)
 	:	Runnable(runnable),
-		_State(0),
+		_State(ThreadStateNone),
 		_StackSize(stackSize)
 {}
 
@@ -106,10 +117,9 @@ CPThread::CPThread(IRunnable *runnable, uint32 stackSize)
  */
 CPThread::~CPThread()
 {
-	if(_State == 1)
-		terminate(); // force the end of the thread if not already ended
+	terminate(); // force the end of the thread if not already ended
 
-	if(_State > 0)
+	if (_State != ThreadStateNone)
 		pthread_detach(_ThreadHandle); // free allocated resources only if it was created
 }
 
@@ -119,26 +129,51 @@ CPThread::~CPThread()
 void CPThread::start()
 {
 	pthread_attr_t tattr;
-	pthread_t tid;
 	int ret;
 
-	/* initialized with default attributes */
-	ret = pthread_attr_init(&tattr);
+	if (_StackSize != 0)
+	{
+		/* initialized with default attributes */
+		ret = pthread_attr_init(&tattr);
 
-	/* setting the size of the stack also */
-	ret = pthread_attr_setstacksize(&tattr, _StackSize);
+		/* setting the size of the stack also */
+		ret = pthread_attr_setstacksize(&tattr, _StackSize);
+	}
+	
+	bool detach_old_thread = false;
+	pthread_t old_thread_handle;
+	if (_State != ThreadStateNone)
+	{
+		if (_State == ThreadStateRunning)
+		{
+			// I don't know if this behaviour is allowed, but neither thread implementations
+			// check the start function, and both simply let the existing running thread for what it is...
+			// From now on, this is not allowed.
+			throw EThread("Starting a thread that is already started, existing thread will continue running, this should not happen");
+		}
+		detach_old_thread = true;
+		old_thread_handle = _ThreadHandle;
+	}
 
-	if(pthread_create(&_ThreadHandle, _StackSize != 0 ? &tattr : 0, ProxyFunc, this) != 0)
+	if (pthread_create(&_ThreadHandle, _StackSize != 0 ? &tattr : NULL, ProxyFunc, this) != 0)
 	{
 		throw EThread("Cannot start new thread");
 	}
-	_State = 1;
+	_State = ThreadStateRunning;
+
+	if (detach_old_thread)
+	{
+		// Docs don't say anything about what happens when pthread_create is called with existing handle referenced.
+		if (old_thread_handle == _ThreadHandle)
+			throw EThread("Thread handle did not change, this should not happen");
+		// Don't care about old thread, free resources when it terminates.
+		pthread_detach(old_thread_handle);
+	}
 }
 
 bool CPThread::isRunning()
 {
-	// TODO : need a real implementation here that check thread status
-	return _State == 1;
+	return _State == ThreadStateRunning;
 }
 
 /*
@@ -146,11 +181,11 @@ bool CPThread::isRunning()
  */
 void CPThread::terminate()
 {
-	if(_State == 1)
+	if (_State == ThreadStateRunning)
 	{
 		// cancel only if started
 		pthread_cancel(_ThreadHandle);
-		_State = 2;	// set to finished
+		_State = ThreadStateFinished; // set to finished
 	}
 }
 
@@ -159,13 +194,24 @@ void CPThread::terminate()
  */
 void CPThread::wait ()
 {
-	if(_State == 1)
+	if (_State == ThreadStateRunning)
 	{
-		if(pthread_join(_ThreadHandle, 0) != 0)
+		int error = pthread_join(_ThreadHandle, 0);
+		switch (error)
 		{
-			throw EThread( "Cannot join with thread" );
+		case 0:
+			break;
+		case EINVAL:
+			throw EThread("Thread is not joinable");
+		case ESRCH:
+			throw EThread("No thread found with this id");
+		case EDEADLK:
+			throw EThread("Deadlock detected or calling thread waits for itself");
+		default:
+			throw EThread("Unknown thread join error");
 		}
-		_State = 2;	// set to finished
+		if(_State != ThreadStateFinished)
+			throw EThread("Thread did not finish, this should not happen");
 	}
 }
 
@@ -207,6 +253,34 @@ uint64 CPThread::getCPUMask()
 	return cpuMask;
 }
 
+void CPThread::setPriority(TThreadPriority priority)
+{
+	// TODO: Test this
+	sched_param sp;
+	switch (priority)
+	{
+	case ThreadPriorityHigh:
+	{
+		int minPrio = sched_get_priority_min(SCHED_FIFO);
+		int maxPrio = sched_get_priority_max(SCHED_FIFO);
+		sp.sched_priority = ((maxPrio - minPrio) / 4) + minPrio;
+		pthread_setschedparam(_ThreadHandle, SCHED_FIFO, &sp);
+		break;
+	}
+	case ThreadPriorityHighest:
+	{
+		int minPrio = sched_get_priority_min(SCHED_FIFO);
+		int maxPrio = sched_get_priority_max(SCHED_FIFO);
+		sp.sched_priority = ((maxPrio - minPrio) / 2) + minPrio;
+		pthread_setschedparam(_ThreadHandle, SCHED_FIFO, &sp);
+		break;
+	}
+	default:
+		sp.sched_priority = 0;
+		pthread_setschedparam(_ThreadHandle, SCHED_OTHER, &sp);
+	}
+}
+
 /*
  * getUserName
  */
diff --git a/code/nel/src/misc/rgba.cpp b/code/nel/src/misc/rgba.cpp
index 844a100cf..598d8eb53 100644
--- a/code/nel/src/misc/rgba.cpp
+++ b/code/nel/src/misc/rgba.cpp
@@ -643,6 +643,8 @@ bool CRGBA::convertToHLS(float &h, float &l, float &s) const
 	{
 		h = 2.f + (b - r) / diff;
 	}
+#if defined(GCC_VERSION) && (GCC_VERSION == 40204)
+	// use the fix only if using the specific GCC version
 	else if (maxV == b)
 	{
 		h = 4.f + (r - g) / diff;
@@ -652,6 +654,12 @@ bool CRGBA::convertToHLS(float &h, float &l, float &s) const
 		// this case is to fix a compiler bug
 		h = (g - b) / diff;
 	}
+#else
+	else
+	{
+		h = 4.f + (r - g) / diff;
+	}
+#endif
 
 	h *= 60.f; // scale to [0..360]
 
diff --git a/code/nel/src/misc/sheet_id.cpp b/code/nel/src/misc/sheet_id.cpp
index 0eaad3a7a..617c994b7 100644
--- a/code/nel/src/misc/sheet_id.cpp
+++ b/code/nel/src/misc/sheet_id.cpp
@@ -592,7 +592,7 @@ uint32 CSheetId::typeFromFileExtension(const std::string &fileExtension)
 {
 	if (!_Initialised) init(false);
 
-	unsigned i;
+	uint i;
 	for (i=0;i<_FileExtensions.size();i++)
 		if (toLower(fileExtension)==_FileExtensions[i])
 			return i;
diff --git a/code/nel/src/misc/sstring.cpp b/code/nel/src/misc/sstring.cpp
index 4c37b1f1a..ef1584361 100644
--- a/code/nel/src/misc/sstring.cpp
+++ b/code/nel/src/misc/sstring.cpp
@@ -37,14 +37,14 @@ namespace NLMISC
 			return token;
 		}
 
-		unsigned int i;
+		uint i;
 		CSString result;
 
 		// skip leading junk
 		for (i=0;i<size();++i)
 		{
 			// look for the next character in the 'separator' character list supplied
-			unsigned j;
+			uint j;
 			for (j=0;separators[j] && (*this)[i]!=separators[j];++j)
 			{}
 			// if not found then we're at end of leading junk
@@ -56,7 +56,7 @@ namespace NLMISC
 		for (;i<size();++i)
 		{
 			// look for the next character in the 'separator' character list supplied
-			unsigned j;
+			uint j;
 			for (j=0;separators[j] && (*this)[i]!=separators[j];++j)
 			{}
 			// if not found then we're at end of text chunk
@@ -69,7 +69,7 @@ namespace NLMISC
 		for (;i<size();++i)
 		{
 			// look for the next character in the 'separator' character list supplied
-			unsigned j;
+			uint j;
 			for (j=0;separators[j] && (*this)[i]!=separators[j];++j)
 			{}
 			// if not found then we're at end of leading junk
@@ -684,7 +684,7 @@ namespace NLMISC
 
 	CSString CSString::splitTo(char c) const
 	{
-		unsigned i;
+		uint i;
 		CSString result;
 		for (i=0;i<size() && (*this)[i]!=c;++i)
 			result+=(*this)[i];
@@ -693,7 +693,7 @@ namespace NLMISC
 
 	CSString CSString::splitTo(char c,bool truncateThis,bool absorbSeparator)
 	{
-		unsigned i;
+		uint i;
 		CSString result;
 		for (i=0;i<size() && (*this)[i]!=c;++i)
 			result+=(*this)[i];
@@ -714,7 +714,7 @@ namespace NLMISC
 
 	CSString CSString::splitTo(const char *s,bool truncateThis)
 	{
-		unsigned i;
+		uint i;
 		CSString result;
 		for (i=0;i<size();++i)
 		{
@@ -762,12 +762,12 @@ namespace NLMISC
 
 	CSString CSString::splitFrom(const char *s) const
 	{
-		unsigned int i;
+		uint i;
 		CSString result;
 		for (i=0;i<size();++i)
 		{
 			// perform a quick string compare
-			unsigned int j;
+			uint j;
 			for (j=0;i+j<size() && s[j]!=0 && s[j]==(*this)[i+j];++j)
 			{
 			}
@@ -789,7 +789,7 @@ namespace NLMISC
 			return CSString();
 
 		CSString result;
-		unsigned i=0;
+		uint i=0;
 		// skip white space
 		for (i=0;i<size() && isWhiteSpace((*this)[i]);++i)
 		{}
@@ -847,7 +847,7 @@ namespace NLMISC
 		return count;
 	}
 
-	CSString CSString::word(unsigned idx) const
+	CSString CSString::word(uint32 idx) const
 	{
 		CSString hold=strip();
 
@@ -901,7 +901,7 @@ namespace NLMISC
 		return count;
 	}
 
-	CSString CSString::wordOrWords(unsigned idx,bool useSlashStringEscape,bool useRepeatQuoteStringEscape) const
+	CSString CSString::wordOrWords(uint32 idx,bool useSlashStringEscape,bool useRepeatQuoteStringEscape) const
 	{
 		CSString hold=strip();
 
@@ -941,7 +941,7 @@ namespace NLMISC
 		return count;
 	}
 
-	CSString CSString::line(unsigned idx) const
+	CSString CSString::line(uint32 idx) const
 	{
 		CSString hold=strip();
 
diff --git a/code/nel/src/misc/win_event_emitter.cpp b/code/nel/src/misc/win_event_emitter.cpp
index 2c46a7530..c216e3e1a 100644
--- a/code/nel/src/misc/win_event_emitter.cpp
+++ b/code/nel/src/misc/win_event_emitter.cpp
@@ -153,6 +153,13 @@ bool CWinEventEmitter::processMessage (HWND hWnd, uint32 msg, WPARAM wParam, LPA
 			if ((int)wParam==VK_SHIFT)
 				_ShiftButton=false;
 
+			// As Print Screen button does not trigger a WM_KEYDOWN msg, simulate it here
+			if ((int)wParam==VK_SNAPSHOT)
+			{
+				if (wParam < KeyCount)
+					server->postEvent (new CEventKeyDown ((NLMISC::TKey)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), true, this));
+			}
+
 			// Post the message
 			if (wParam < KeyCount)
 				server->postEvent (new CEventKeyUp ((NLMISC::TKey)wParam, getKeyButton(_AltButton, _ShiftButton, _CtrlButton), this));
diff --git a/code/nel/src/misc/win_thread.cpp b/code/nel/src/misc/win_thread.cpp
index 4192e927b..c9bfc90a1 100644
--- a/code/nel/src/misc/win_thread.cpp
+++ b/code/nel/src/misc/win_thread.cpp
@@ -73,6 +73,20 @@ CWinThread::CWinThread (IRunnable *runnable, uint32 stackSize)
 	_MainThread = false;
 }
 
+namespace {
+class CWinCriticalSection
+{
+private:
+	CRITICAL_SECTION cs;
+public:
+	CWinCriticalSection() { InitializeCriticalSection(&cs); }
+	~CWinCriticalSection() { DeleteCriticalSection(&cs); }
+	inline void enter() { EnterCriticalSection(&cs); }
+	inline void leave() { LeaveCriticalSection(&cs); }
+};
+CWinCriticalSection s_CS;
+}/* anonymous namespace */
+
 CWinThread::CWinThread (void* threadHandle, uint32 threadId)
 {
 	// Main thread
@@ -99,14 +113,11 @@ CWinThread::CWinThread (void* threadHandle, uint32 threadId)
 		nlassert(0); // WARNING: following code has not tested! don't know if it work fo real ...
 					 // This is just a suggestion of a possible solution, should this situation one day occur ...
 		// Ensure that this thread don't get deleted, or we could suspend the main thread
-		CRITICAL_SECTION cs;
-		InitializeCriticalSection(&cs);
-		EnterCriticalSection(&cs);
+		s_CS.enter();
 		// the 2 following statement must be executed atomicaly among the threads of the current process !
 		SuspendThread(threadHandle);
 		_SuspendCount = ResumeThread(threadHandle);
-		LeaveCriticalSection(&cs);
-		DeleteCriticalSection(&cs);
+		s_CS.leave();
 	}
 }
 
@@ -148,10 +159,10 @@ void CWinThread::resume()
 	}
 }
 
-void CWinThread::setPriority(int priority)
+void CWinThread::setPriority(TThreadPriority priority)
 {
 	nlassert(ThreadHandle); // 'start' was not called !!
-	BOOL result = SetThreadPriority(ThreadHandle, priority);
+	BOOL result = SetThreadPriority(ThreadHandle, (int)priority);
 	nlassert(result);
 }
 
@@ -179,6 +190,9 @@ CWinThread::~CWinThread ()
 
 void CWinThread::start ()
 {
+	if (isRunning())
+		throw EThread("Starting a thread that is already started, existing thread will continue running, this should not happen");	
+	
 //	ThreadHandle = (void *) ::CreateThread (NULL, _StackSize, ProxyFunc, this, 0, (DWORD *)&ThreadId);
 	ThreadHandle = (void *) ::CreateThread (NULL, 0, ProxyFunc, this, 0, (DWORD *)&ThreadId);
 //	nldebug("NLMISC: thread %x started for runnable '%x'", typeid( Runnable ).name());
diff --git a/code/nel/src/net/Makefile.am b/code/nel/src/net/Makefile.am
deleted file mode 100644
index ef0d956be..000000000
--- a/code/nel/src/net/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-lib_LTLIBRARIES      = libnelnet.la
-
-libnelnet_la_SOURCES = buf_client.cpp                      \
-                       buf_net_base.cpp                    \
-                       buf_server.cpp                      \
-                       buf_sock.cpp                        \
-                       callback_client.cpp                 \
-                       callback_net_base.cpp               \
-                       callback_server.cpp                 \
-                       dummy_tcp_sock.cpp                  \
-                       inet_address.cpp                    \
-                       listen_sock.cpp                     \
-                       login_client.cpp                    \
-                       login_cookie.cpp                    \
-                       login_server.cpp                    \
-                       message.cpp                         \
-                       message_recorder.cpp                \
-                       naming_client.cpp                   \
-                       net_displayer.cpp                   \
-                       net_log.cpp                         \
-                       service.cpp                         \
-                       sock.cpp                            \
-                       tcp_sock.cpp                        \
-                       udp_sock.cpp                        \
-                       udp_sim_sock.cpp                    \
-                       unitime.cpp                         \
-                       unified_network.cpp                 \
-                       varpath.cpp			   \
-                       transport_class.cpp                 \
-                       email.cpp                           \
-                       admin.cpp                           \
-		       stdin_monitor_thread.cpp		   \
-		       stdin_monitor_thread.h		   \
-                       module.cpp                          \
-                       module_common.cpp                   \
-                       module_gateway.cpp                  \
-                       module_manager.cpp                  \
-                       module_message.cpp                  \
-					   module_socket.cpp                   \
-					   module_gateway_transport.cpp		   \
-					   module_l5_transport.cpp			\
-					   module_local_gateway.cpp \
-					   stdnet.cpp
-
-noinst_HEADERS	     = stdnet.h
-
-AM_CXXFLAGS          = -I$(top_srcdir)/src
-
-libnelnet_la_LIBADD  = -lc -lpthread
-
-libnelnet_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/net/transport_class.cpp b/code/nel/src/net/transport_class.cpp
index a5f826728..dca866916 100644
--- a/code/nel/src/net/transport_class.cpp
+++ b/code/nel/src/net/transport_class.cpp
@@ -77,7 +77,7 @@ string typeToString (CTransportClass::TProp type)
 	string conv[] = {
 		"PropUInt8", "PropUInt16", "PropUInt32", "PropUInt64",
 		"PropSInt8", "PropSInt16", "PropSInt32", "PropSInt64",
-		"PropBool", "PropFloat", "PropDouble", "PropString", "PropDataSetRow", "PropSheetId", "PropUKN" };
+		"PropBool", "PropFloat", "PropDouble", "PropString", "PropDataSetRow", "PropSheetId", "PropUCString", "PropUKN" };
 //		"PropBool", "PropFloat", "PropDouble", "PropString", "PropDataSetRow", "PropEntityId", "PropSheetId", "PropUKN" };
 
 	if (type > CTransportClass::PropUKN)
@@ -352,6 +352,7 @@ void CTransportClass::init ()
 //	nlassert (PropDataSetRow < PropUKN); DummyProp[PropDataSetRow] = new CTransportClass::CRegisteredProp<TDataSetRow>;
 //	nlassert (PropEntityId < PropUKN); DummyProp[PropEntityId] = new CTransportClass::CRegisteredProp<CEntityId>;
 	nlassert (PropSheetId < PropUKN); DummyProp[PropSheetId] = new CTransportClass::CRegisteredProp<CSheetId>;
+	nlassert (PropUCString < PropUKN); DummyProp[PropUCString] = new CTransportClass::CRegisteredProp<ucstring>;
 
 	// we have to know when a service comes, so add callback (put the callback before all other one because we have to send this message first)
 	CUnifiedNetwork::getInstance()->setServiceUpCallback("*", cbTCUpService, NULL, false);
diff --git a/code/nel/src/pacs/Makefile.am b/code/nel/src/pacs/Makefile.am
deleted file mode 100644
index 0b05a2ed6..000000000
--- a/code/nel/src/pacs/Makefile.am
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES  = Makefile.in
-
-lib_LTLIBRARIES       = libnelpacs.la
-
-libnelpacs_la_SOURCES = chain.cpp                          \
-                        chain.h                            \
-                        chain_quad.cpp                     \
-                        chain_quad.h                       \
-                        collision_callback.cpp             \
-                        collision_callback.h               \
-                        collision_desc.cpp                 \
-                        collision_desc.h                   \
-                        collision_mesh_build.h             \
-                        collision_ot.cpp                   \
-                        collision_ot.h                     \
-                        collision_surface_temp.cpp         \
-                        collision_surface_temp.h           \
-                        edge_collide.cpp                   \
-                        edge_collide.h                     \
-                        edge_quad.cpp                      \
-                        edge_quad.h                        \
-                        exterior_mesh.cpp                  \
-                        exterior_mesh.h                    \
-                        global_retriever.cpp               \
-                        global_retriever.h                 \
-                        local_retriever.cpp                \
-                        local_retriever.h                  \
-                        move_cell.cpp                      \
-                        move_cell.h                        \
-                        move_container.cpp                 \
-                        move_container.h                   \
-                        move_container_inline.h            \
-                        move_element.cpp                   \
-                        move_element.h                     \
-                        move_element_inline.h              \
-                        move_primitive.cpp                 \
-                        move_primitive.h                   \
-                        primitive_world_image.cpp          \
-                        primitive_world_image.h            \
-                        primitive_block_pacs.cpp           \
-                        primitive_block.h                  \
-                        retrievable_surface.cpp            \
-                        retrievable_surface.h              \
-                        retriever_bank.cpp                 \
-                        retriever_bank.h                   \
-                        retriever_instance.cpp             \
-                        retriever_instance.h               \
-			stdpacs.cpp			   \
-                        surface_quad.cpp                   \
-                        surface_quad.h                     \
-                        vector_2s.cpp                      \
-                        vector_2s.h                        \
-                        build_indoor.cpp                   \
-                        build_indoor.h
-
-AM_CXXFLAGS           = -I$(top_srcdir)/src
-
-noinst_HEADERS	      = stdpacs.h face_grid.h quad_grid.h
-
-libnelpacs_la_LIBADD  = -lc
-
-libnelpacs_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/sound/CMakeLists.txt b/code/nel/src/sound/CMakeLists.txt
index 21c1de1f8..e73d0828e 100644
--- a/code/nel/src/sound/CMakeLists.txt
+++ b/code/nel/src/sound/CMakeLists.txt
@@ -1,8 +1,101 @@
+
 FILE(GLOB SRC *.cpp *.h)
 FILE(GLOB HEADERS ../../include/nel/sound/*.h)
 
+
+FILE(GLOB ANIMATION
+	sound_anim_manager.cpp ../../include/nel/sound/sound_anim_manager.h
+	sound_anim_marker.cpp ../../include/nel/sound/sound_anim_marker.h
+	sound_animation.cpp ../../include/nel/sound/sound_animation.h
+)
+
+FILE(GLOB BACKGROUND_SOUND
+	background_sound.cpp ../../include/nel/sound/background_sound.h
+	background_sound_manager.cpp ../../include/nel/sound/background_sound_manager.h
+	background_source.cpp ../../include/nel/sound/background_source.h
+	clustered_sound.cpp ../../include/nel/sound/clustered_sound.h
+	context_sound.cpp ../../include/nel/sound/context_sound.h
+)
+
+FILE(GLOB BANKS
+	async_file_manager_sound.cpp ../../include/nel/sound/async_file_manager_sound.h
+	sample_bank.cpp ../../include/nel/sound/sample_bank.h
+	sample_bank_manager.cpp ../../include/nel/sound/sample_bank_manager.h
+	sound_bank.cpp ../../include/nel/sound/sound_bank.h
+)
+
+FILE(GLOB MIXER
+	audio_mixer_user.cpp ../../include/nel/sound/audio_mixer_user.h
+	../../include/nel/sound/containers.h
+	group_controller.cpp ../../include/nel/sound/group_controller.h
+	group_controller_root.cpp ../../include/nel/sound/group_controller_root.h
+	listener_user.cpp ../../include/nel/sound/listener_user.h
+	mixing_track.cpp ../../include/nel/sound/mixing_track.h
+)
+
+FILE(GLOB MUSIC
+	music_channel_fader.cpp ../../include/nel/sound/music_channel_fader.h
+	music_sound.cpp ../../include/nel/sound/music_sound.h
+	music_sound_manager.cpp ../../include/nel/sound/music_sound_manager.h
+	music_source.cpp ../../include/nel/sound/music_source.h
+	source_music_channel.cpp ../../include/nel/sound/source_music_channel.h
+)
+
+FILE(GLOB SOUND
+	complex_sound.cpp ../../include/nel/sound/complex_sound.h
+	complex_source.cpp ../../include/nel/sound/complex_source.h
+	simple_sound.cpp ../../include/nel/sound/simple_sound.h
+	simple_source.cpp ../../include/nel/sound/simple_source.h
+	sound.cpp ../../include/nel/sound/sound.h
+	../../include/nel/sound/sound_pattern.h
+	source_common.cpp ../../include/nel/sound/source_common.h
+)
+
+FILE(GLOB STREAM
+	stream_sound.cpp ../../include/nel/sound/stream_sound.h
+	stream_source.cpp ../../include/nel/sound/stream_source.h
+)
+
+FILE(GLOB STREAM_FILE
+	audio_decoder.cpp ../../include/nel/sound/audio_decoder.h
+	audio_decoder_vorbis.cpp ../../include/nel/sound/audio_decoder_vorbis.h
+	stream_file_sound.cpp ../../include/nel/sound/stream_file_sound.h
+	stream_file_source.cpp ../../include/nel/sound/stream_file_source.h
+)
+
+FILE(GLOB USER_CLASSES
+	../../include/nel/sound/u_audio_mixer.h
+	../../include/nel/sound/u_group_controller.h
+	../../include/nel/sound/u_listener.h
+	../../include/nel/sound/u_source.h
+	../../include/nel/sound/u_stream_source.h
+)
+
+SOURCE_GROUP("" FILES ${SRC} ${HEADERS})
+SOURCE_GROUP("animation" FILES ${ANIMATION})
+SOURCE_GROUP("background_sound" FILES ${BACKGROUND_SOUND})
+SOURCE_GROUP("banks" FILES ${BANKS})
+SOURCE_GROUP("mixer" FILES ${MIXER})
+SOURCE_GROUP("music_deprecated" FILES ${MUSIC})
+SOURCE_GROUP("sound" FILES ${SOUND})
+SOURCE_GROUP("stream" FILES ${STREAM})
+SOURCE_GROUP("stream_file" FILES ${STREAM_FILE})
+SOURCE_GROUP("user_classes" FILES ${USER_CLASSES})
+
+
 NL_TARGET_LIB(nelsound ${HEADERS} ${SRC})
 
+
+INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
+
+TARGET_LINK_LIBRARIES(nelsound ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
+
+IF(WITH_STATIC)
+  # Add libogg dependency only if target is static because to libvorbisfile
+  TARGET_LINK_LIBRARIES(nelsound ${OGG_LIBRARY})
+ENDIF(WITH_STATIC)
+
+
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
diff --git a/code/nel/src/sound/Makefile.am b/code/nel/src/sound/Makefile.am
deleted file mode 100644
index b919e10c4..000000000
--- a/code/nel/src/sound/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = driver
-
-lib_LTLIBRARIES      = libnelsnd.la
-
-libnelsnd_la_SOURCES = async_file_manager_sound.cpp \
-	async_file_manager_sound.h \
-	audio_mixer_user.cpp \
-	audio_mixer_user.h \
-	background_sound.cpp \
-	background_sound.h \
-	background_sound_manager.cpp \
-	background_sound_manager.h \
-	background_source.cpp \
-	background_source.h \
-	clustered_sound.cpp \
-	clustered_sound.h \
-	complex_sound.cpp \
-	complex_sound.h \
-	complex_source.cpp \
-	complex_source.h \
-	context_sound.cpp \
-	context_sound.h \
-	listener_user.cpp \
-	listener_user.h \
-	mixing_track.cpp \
-	mixing_track.h \
-	music_channel_fader.h \
-	music_channel_fader.cpp \
-	music_sound.cpp \
-	music_sound.h \
-	music_sound_manager.cpp \
-	music_sound_manager.h \
-	music_source.cpp \
-	music_source.h \
-	sample_bank.cpp \
-	sample_bank.h \
-	sample_bank_manager.cpp \
-	sample_bank_manager.h \
-	simple_sound.cpp \
-	simple_sound.h \
-	simple_source.cpp \
-	simple_source.h \
-	sound_animation.cpp \
-	sound_anim_manager.cpp \
-	sound_anim_marker.cpp \
-	sound_bank.cpp \
-	sound_bank.h \
-	sound.cpp \
-	sound.h \
-	sound_pattern.h \
-	source_common.cpp \
-	source_common.h \
-	stdsound.cpp \
-	stdsound.h \
-	stream_source.cpp \
-	stream_source.h \
-	stream_sound.cpp \
-	stream_sound.h
-
-AM_CXXFLAGS          = -I$(top_srcdir)/src
-
-noinst_HEADERS	     = stdsound.h
-
-libnelsnd_la_LIBADD  = driver/libnelsnd_lowlevel.la
-
-libnelsnd_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/sound/audio_decoder.cpp b/code/nel/src/sound/audio_decoder.cpp
new file mode 100644
index 000000000..eef031417
--- /dev/null
+++ b/code/nel/src/sound/audio_decoder.cpp
@@ -0,0 +1,139 @@
+/**
+ * \file audio_decoder.cpp
+ * \brief IAudioDecoder
+ * \date 2012-04-11 09:34GMT
+ * \author Jan Boon (Kaetemi)
+ * IAudioDecoder
+ */
+
+/* 
+ * Copyright (C) 2008-2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdsound.h"
+#include <nel/sound/audio_decoder.h>
+
+// STL includes
+
+// NeL includes
+#include <nel/misc/debug.h>
+#include <nel/misc/path.h>
+
+// Project includes
+#include <nel/sound/audio_decoder_vorbis.h>
+
+using namespace std;
+using namespace NLMISC;
+
+namespace NLSOUND {
+
+IAudioDecoder::IAudioDecoder() : _InternalStream(NULL)
+{
+	
+}
+
+IAudioDecoder::~IAudioDecoder()
+{
+	if (_InternalStream) { delete _InternalStream; _InternalStream = NULL; }
+}
+
+IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &filepath, bool async, bool loop)
+{
+	std::string lookup = CPath::lookup(filepath, false);
+	if (lookup.empty())
+	{ 
+		nlwarning("Music file %s does not exist!", filepath.c_str());
+		return NULL; 
+	}
+	std::string type = CFile::getExtension(filepath);
+
+	CIFile *ifile = new CIFile();
+	ifile->setCacheFileOnOpen(!async);
+	ifile->allowBNPCacheFileOnOpen(!async);
+	ifile->open(lookup);
+
+	IAudioDecoder *mb = createAudioDecoder(type, ifile, loop);
+
+	if (mb) mb->_InternalStream = ifile;
+	else delete ifile;
+
+	return mb;
+}
+
+IAudioDecoder *IAudioDecoder::createAudioDecoder(const std::string &type, NLMISC::IStream *stream, bool loop)
+{
+	if (!stream)
+	{
+		nlwarning("Stream is NULL");
+		return NULL;
+	}
+	std::string type_lower = toLower(type);
+	if (type_lower == "ogg")
+	{
+		return new CAudioDecoderVorbis(stream, loop);
+	}
+	else
+	{
+		nlwarning("Music file type unknown: '%s'", type_lower.c_str());
+		return NULL;
+	}
+}
+
+bool IAudioDecoder::getInfo(const std::string &filepath, std::string &artist, std::string &title)
+{
+	std::string lookup = CPath::lookup(filepath, false);
+	if (lookup.empty())
+	{ 
+		nlwarning("Music file %s does not exist!", filepath.c_str());
+		return false; 
+	}
+	std::string type = CFile::getExtension(filepath);
+	std::string type_lower = NLMISC::toLower(type);
+
+	if (type_lower == "ogg")
+	{
+		CIFile ifile; 
+		ifile.setCacheFileOnOpen(false); 
+		ifile.allowBNPCacheFileOnOpen(false);
+		ifile.open(lookup);
+		return CAudioDecoderVorbis::getInfo(&ifile, artist, title);
+	}
+	else
+	{
+		nlwarning("Music file type unknown: '%s'", type_lower.c_str());
+		artist.clear(); title.clear();
+		return false;
+	}
+}
+
+/// Get audio/container extensions that are currently supported by the nel sound library.
+void IAudioDecoder::getMusicExtensions(std::vector<std::string> &extensions)
+{
+	extensions.push_back("ogg");
+	// extensions.push_back("wav"); // TODO: Easy.
+}
+
+/// Return if a music extension is supported by the nel sound library.
+bool IAudioDecoder::isMusicExtensionSupported(const std::string &extension)
+{
+	return (extension == "ogg");
+}
+
+} /* namespace NLSOUND */
+
+/* end of file */
diff --git a/code/nel/src/sound/driver/music_buffer_vorbis.cpp b/code/nel/src/sound/audio_decoder_vorbis.cpp
similarity index 53%
rename from code/nel/src/sound/driver/music_buffer_vorbis.cpp
rename to code/nel/src/sound/audio_decoder_vorbis.cpp
index 9d5543c62..e0b950fc4 100644
--- a/code/nel/src/sound/driver/music_buffer_vorbis.cpp
+++ b/code/nel/src/sound/audio_decoder_vorbis.cpp
@@ -1,38 +1,53 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "stdsound_lowlevel.h"
+/**
+ * \file audio_decoder_vorbis.cpp
+ * \brief CAudioDecoderVorbis
+ * \date 2012-04-11 09:35GMT
+ * \author Jan Boon (Kaetemi)
+ * CAudioDecoderVorbis
+ */
+
+/* 
+ * Copyright (C) 2008-2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdsound.h"
+#include <nel/sound/audio_decoder_vorbis.h>
+
+// STL includes
+
+// NeL includes
+#include <nel/misc/debug.h>
 
 // Project includes
-#include "nel/sound/driver/music_buffer_vorbis.h"
 
 using namespace std;
 using namespace NLMISC;
 
-namespace NLSOUND
-{
+namespace NLSOUND {
 
 size_t vorbisReadFunc(void *ptr, size_t size, size_t nmemb, void *datasource)
 {
-	CMusicBufferVorbis *music_buffer_vorbis = (CMusicBufferVorbis *)datasource;
-	NLMISC::IStream *stream = music_buffer_vorbis->getStream();
+	CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
+	NLMISC::IStream *stream = audio_decoder_vorbis->getStream();
 	nlassert(stream->isReading());
 	sint32 length = (sint32)(size * nmemb);
-	if (length > music_buffer_vorbis->getStreamSize() - stream->getPos())
-		length = music_buffer_vorbis->getStreamSize() - stream->getPos();
+	if (length > audio_decoder_vorbis->getStreamSize() - stream->getPos())
+		length = audio_decoder_vorbis->getStreamSize() - stream->getPos();
 	stream->serialBuffer((uint8 *)ptr, length);
 	return length;
 }
@@ -45,7 +60,7 @@ int vorbisSeekFunc(void *datasource, ogg_int64_t offset, int whence)
 		return 0; // ooookkaaaaaayyy
 	}
 
-	CMusicBufferVorbis *music_buffer_vorbis = (CMusicBufferVorbis *)datasource;
+	CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
 
 	NLMISC::IStream::TSeekOrigin origin;
 	switch (whence)
@@ -64,19 +79,19 @@ int vorbisSeekFunc(void *datasource, ogg_int64_t offset, int whence)
 		return -1;
 	}
 
-	if (music_buffer_vorbis->getStream()->seek(SEEK_SET ? music_buffer_vorbis->getStreamOffset() + (sint32)offset : (sint32)offset, origin)) return 0;
+	if (audio_decoder_vorbis->getStream()->seek(SEEK_SET ? audio_decoder_vorbis->getStreamOffset() + (sint32)offset : (sint32)offset, origin)) return 0;
 	else return -1;
 }
 
 //int vorbisCloseFunc(void *datasource)
 //{
-//	//CMusicBufferVorbis *music_buffer_vorbis = (CMusicBufferVorbis *)datasource;
+//	//CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
 //}
 
 long vorbisTellFunc(void *datasource)
 {
-	CMusicBufferVorbis *music_buffer_vorbis = (CMusicBufferVorbis *)datasource;
-	return (long)(music_buffer_vorbis->getStream()->getPos() - music_buffer_vorbis->getStreamOffset());
+	CAudioDecoderVorbis *audio_decoder_vorbis = (CAudioDecoderVorbis *)datasource;
+	return (long)(audio_decoder_vorbis->getStream()->getPos() - audio_decoder_vorbis->getStreamOffset());
 }
 
 static ov_callbacks OV_CALLBACKS_NLMISC_STREAM = {
@@ -86,8 +101,8 @@ static ov_callbacks OV_CALLBACKS_NLMISC_STREAM = {
   (long (*)(void *))							vorbisTellFunc
 };
 
-CMusicBufferVorbis::CMusicBufferVorbis(NLMISC::IStream *stream, bool loop) 
-: _Stream(stream), _Loop(loop), _IsMusicEnded(false)
+CAudioDecoderVorbis::CAudioDecoderVorbis(NLMISC::IStream *stream, bool loop) 
+: _Stream(stream), _Loop(loop), _IsMusicEnded(false), _StreamSize(0)
 {
 	_StreamOffset = stream->getPos();
 	stream->seek(0, NLMISC::IStream::end);
@@ -96,15 +111,15 @@ CMusicBufferVorbis::CMusicBufferVorbis(NLMISC::IStream *stream, bool loop)
 	ov_open_callbacks(this, &_OggVorbisFile, NULL, 0, OV_CALLBACKS_NLMISC_STREAM);
 }
 
-CMusicBufferVorbis::~CMusicBufferVorbis()
+CAudioDecoderVorbis::~CAudioDecoderVorbis()
 {
 	ov_clear(&_OggVorbisFile);
 }
 
 /// Get information on a music file (only artist and title at the moment).
-bool CMusicBufferVorbis::getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title)
+bool CAudioDecoderVorbis::getInfo(NLMISC::IStream *stream, std::string &artist, std::string &title)
 {
-	CMusicBufferVorbis mbv(stream, false); // just opens and closes the oggvorbisfile thing :)
+	CAudioDecoderVorbis mbv(stream, false); // just opens and closes the oggvorbisfile thing :)
 	vorbis_comment *vc = ov_comment(&mbv._OggVorbisFile, -1);
 	char *title_c = vorbis_comment_query(vc, "title", 0);
 	if (title_c) title = title_c; else title.clear();
@@ -113,29 +128,27 @@ bool CMusicBufferVorbis::getInfo(NLMISC::IStream *stream, std::string &artist, s
 	return true;
 }
 
-uint32 CMusicBufferVorbis::getRequiredBytes()
+uint32 CAudioDecoderVorbis::getRequiredBytes()
 {
 	return 0; // no minimum requirement of bytes to buffer out
 }
 
-uint32 CMusicBufferVorbis::getNextBytes(uint8 *buffer, uint32 minimum, uint32 maximum)
+uint32 CAudioDecoderVorbis::getNextBytes(uint8 *buffer, uint32 minimum, uint32 maximum)
 {
 	sint current_section = 0; // ???
 	if (_IsMusicEnded) return 0;
 	nlassert(minimum <= maximum); // can't have this..
 	uint32 bytes_read = 0;
-
 #ifdef NL_BIG_ENDIAN
 	sint endianness = 1;
 #else
 	sint endianness = 0;
 #endif
-	
 	do
 	{
 		// signed 16-bit or unsigned 8-bit little-endian samples
 		sint br = ov_read(&_OggVorbisFile, (char *)&buffer[bytes_read], maximum - bytes_read, 
-			endianness, // Specifies big or little endian byte packing. 0 for little endian, 1 for big endian. Typical value is 0.
+			endianness, // Specifies big or little endian byte packing. 0 for little endian, 1 for b ig endian. Typical value is 0.
 			getBitsPerSample() == 8 ? 1 : 2, 
 			getBitsPerSample() == 8 ? 0 : 1, // Signed or unsigned data. 0 for unsigned, 1 for signed. Typically 1.
 			&current_section);
@@ -162,58 +175,53 @@ uint32 CMusicBufferVorbis::getNextBytes(uint8 *buffer, uint32 minimum, uint32 ma
 			// error
 			switch(br)
 			{
-				case OV_HOLE:
+			case OV_HOLE:
 				nlwarning("ov_read returned OV_HOLE");
 				break;
-
-				case OV_EINVAL:
+			case OV_EINVAL:
 				nlwarning("ov_read returned OV_EINVAL");
 				break;
-
-				case OV_EBADLINK:
+			case OV_EBADLINK:
 				nlwarning("ov_read returned OV_EBADLINK");
 				break;
-
-				default:
+			default:
 				nlwarning("ov_read returned %d", br);
 			}
-
-			return 0;
 		}
 	} while (bytes_read < minimum);
 	return bytes_read;
 }
 
-uint8 CMusicBufferVorbis::getChannels()
+uint8 CAudioDecoderVorbis::getChannels()
 {
 	vorbis_info *vi = ov_info(&_OggVorbisFile, -1);
 	return (uint8)vi->channels;
 }
 
-uint32 CMusicBufferVorbis::getSamplesPerSec()
+uint CAudioDecoderVorbis::getSamplesPerSec()
 {
 	vorbis_info *vi = ov_info(&_OggVorbisFile, -1);
-	return vi->rate;
+	return (uint)vi->rate;
 }
 
-uint8 CMusicBufferVorbis::getBitsPerSample()
+uint8 CAudioDecoderVorbis::getBitsPerSample()
 {
 	return 16;
 }
 
-bool CMusicBufferVorbis::isMusicEnded()
+bool CAudioDecoderVorbis::isMusicEnded()
 {
 	return _IsMusicEnded;
 }
 
-float CMusicBufferVorbis::getLength()
+float CAudioDecoderVorbis::getLength()
 {
 	return (float)ov_time_total(&_OggVorbisFile, -1);
 }
 
-uint CMusicBufferVorbis::getUncompressedSize()
+void CAudioDecoderVorbis::setLooping(bool loop)
 {
-	return (uint)ov_pcm_total(&_OggVorbisFile, -1) * (getBitsPerSample() / 2) * getChannels();
+	 _Loop = loop;
 }
 
 } /* namespace NLSOUND */
diff --git a/code/nel/src/sound/audio_mixer_user.cpp b/code/nel/src/sound/audio_mixer_user.cpp
index 367abd0e1..1a6c2d322 100644
--- a/code/nel/src/sound/audio_mixer_user.cpp
+++ b/code/nel/src/sound/audio_mixer_user.cpp
@@ -45,12 +45,15 @@
 #include "nel/sound/context_sound.h"
 #include "nel/sound/music_source.h"
 #include "nel/sound/stream_source.h"
+#include "nel/sound/stream_file_source.h"
 #include "nel/sound/simple_sound.h"
 #include "nel/sound/music_sound.h"
 #include "nel/sound/stream_sound.h"
 #include "nel/sound/sample_bank_manager.h"
 #include "nel/sound/sample_bank.h"
 #include "nel/sound/sound_bank.h"
+#include "nel/sound/group_controller.h"
+#include "nel/sound/containers.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -218,6 +221,7 @@ void CAudioMixerUser::writeProfile(std::string& out)
 */
 	out += "Sound mixer: \n";
 	out += "\tPlaying sources: " + toString (getPlayingSourcesCount()) + " \n";
+	out += "\tPlaying simple sources: " + toString(countPlayingSimpleSources()) + " / " + toString(countSimpleSources()) + " \n";
 	out += "\tAvailable tracks: " + toString (getAvailableTracksCount()) + " \n";
 	out += "\tUsed tracks: " + toString (getUsedTracksCount()) + " \n";
 //	out << "\tMuted sources: " << nb << " \n";
@@ -248,6 +252,16 @@ void CAudioMixerUser::addSourceWaitingForPlay(CSourceCommon *source)
 	_SourceWaitingForPlay.push_back(source);
 }
 
+// ******************************************************************
+
+void CAudioMixerUser::removeSourceWaitingForPlay(CSourceCommon *source)
+{
+	std::list<CSourceCommon *>::iterator it = find(_SourceWaitingForPlay.begin(), _SourceWaitingForPlay.end(), source);
+	if (it != _SourceWaitingForPlay.end())
+	{
+		_SourceWaitingForPlay.erase(it);
+	}
+}
 
 // ******************************************************************
 
@@ -256,8 +270,9 @@ void CAudioMixerUser::reset()
 	_Leaving = true;
 
 	_SourceWaitingForPlay.clear();
-
-	/* TODO: Stop music channels */
+	
+	for (uint i = 0; i < _NbMusicChannelFaders; ++i)
+		_MusicChannelFaders[i].reset();
 
 	// Stop tracks
 	uint i;
@@ -1638,6 +1653,7 @@ void				CAudioMixerUser::update()
 		_MusicChannelFaders[i].update();
 
 	// Check all playing track and stop any terminated buffer.
+	std::list<CSourceCommon *>::size_type nbWaitingSources = _Sources.size();
 	for (i=0; i<_Tracks.size(); ++i)
 	{
 		if (!_Tracks[i]->isPlaying())
@@ -1649,13 +1665,14 @@ void				CAudioMixerUser::update()
 			}
 
 			// try to play any waiting source.
-			if (!_SourceWaitingForPlay.empty())
+			if (!_SourceWaitingForPlay.empty() && nbWaitingSources)
 			{
 				// check if the source still exist before trying to play it
 				if (_Sources.find(_SourceWaitingForPlay.front()) != _Sources.end())
 					_SourceWaitingForPlay.front()->play();
 //				nldebug("Before POP Sources waiting : %u", _SourceWaitingForPlay.size());
 				_SourceWaitingForPlay.pop_front();
+				--nbWaitingSources;
 //				nldebug("After POP Sources waiting : %u", _SourceWaitingForPlay.size());
 			}
 		}
@@ -1689,7 +1706,7 @@ void				CAudioMixerUser::update()
 //							_Tracks[i]->DrvSource->setPos(source->getPos() * (1-css->PosAlpha) + css->Position*(css->PosAlpha));
 							_Tracks[i]->getPhysicalSource()->setPos(source->getPos() * (1-css->PosAlpha) + vpos*(css->PosAlpha));
 							// update the relative gain
-							_Tracks[i]->getPhysicalSource()->setGain(source->getRelativeGain()*source->getGain()*css->Gain);
+							_Tracks[i]->getPhysicalSource()->setGain(source->getFinalGain() * css->Gain);
 #if EAX_AVAILABLE == 1
 							if (_UseEax)
 							{
@@ -1826,10 +1843,14 @@ bool CAudioMixerUser::tryToLoadSampleBank(const std::string &sampleName)
 	}
 }
 
+UGroupController *CAudioMixerUser::getGroupController(const std::string &path)
+{
+	return static_cast<UGroupController *>(_GroupController.getGroupController(path));
+}
 
 // ******************************************************************
 
-USource				*CAudioMixerUser::createSource( TSoundId id, bool spawn, TSpawnEndCallback cb, void *userParam, NL3D::CCluster *cluster, CSoundContext *context )
+USource				*CAudioMixerUser::createSource( TSoundId id, bool spawn, TSpawnEndCallback cb, void *userParam, NL3D::CCluster *cluster, CSoundContext *context, UGroupController *groupController )
 {
 #if NL_PROFILE_MIXER
 	TTicks start = CTime::getPerformanceTime();
@@ -1915,7 +1936,7 @@ retrySound:
 			}
 
 			// Create source
-			CSimpleSource *source = new CSimpleSource( simpleSound, spawn, cb, userParam, cluster);
+			CSimpleSource *source = new CSimpleSource( simpleSound, spawn, cb, userParam, cluster, static_cast<CGroupController *>(groupController));
 
 	//		nldebug("Mixer : source %p created", source);
 
@@ -1939,28 +1960,35 @@ retrySound:
 		{
 			CStreamSound *streamSound = static_cast<CStreamSound *>(id);
 			// This is a stream thingy.
-			ret = new CStreamSource(streamSound, spawn, cb, userParam, cluster);
+			ret = new CStreamSource(streamSound, spawn, cb, userParam, cluster, static_cast<CGroupController *>(groupController));
+		}
+		break;
+	case CSound::SOUND_STREAM_FILE:
+		{
+			CStreamFileSound *streamFileSound = static_cast<CStreamFileSound *>(id);
+			// This is a stream file thingy.
+			ret = new CStreamFileSource(streamFileSound, spawn, cb, userParam, cluster, static_cast<CGroupController *>(groupController));
 		}
 		break;
 	case CSound::SOUND_COMPLEX:
 		{
 			CComplexSound *complexSound = static_cast<CComplexSound *>(id);
 			// This is a pattern sound.
-			ret = new CComplexSource(complexSound, spawn, cb, userParam, cluster);
+			ret = new CComplexSource(complexSound, spawn, cb, userParam, cluster, static_cast<CGroupController *>(groupController));
 		}
 		break;
 	case CSound::SOUND_BACKGROUND:
 		{
 			// This is a background sound.
 			CBackgroundSound *bgSound = static_cast<CBackgroundSound *>(id);
-			ret = new CBackgroundSource(bgSound, spawn, cb, userParam, cluster);
+			ret = new CBackgroundSource(bgSound, spawn, cb, userParam, cluster, static_cast<CGroupController *>(groupController));
 		}
 		break;
 	case CSound::SOUND_MUSIC:
 		{
 			// This is a background music sound
 			CMusicSound *music_sound= static_cast<CMusicSound *>(id);
-			ret = new CMusicSource(music_sound, spawn, cb, userParam, cluster);
+			ret = new CMusicSource(music_sound, spawn, cb, userParam, cluster, static_cast<CGroupController *>(groupController));
 		}
 		break;
 	case CSound::SOUND_CONTEXT:
@@ -1974,7 +2002,7 @@ retrySound:
 			CSound *sound = ctxSound->getContextSound(*context);
 			if (sound != 0)
 			{
-				ret = createSource(sound, spawn, cb, userParam, cluster);
+				ret = createSource(sound, spawn, cb, userParam, cluster, NULL, static_cast<CGroupController *>(groupController));
 				// Set the volume of the source according to the context volume
 				if (ret != 0)
 				{
@@ -2007,9 +2035,9 @@ retrySound:
 
 // ******************************************************************
 
-USource				*CAudioMixerUser::createSource( const NLMISC::TStringId &name, bool spawn, TSpawnEndCallback cb, void *userParam, NL3D::CCluster *cluster, CSoundContext *context)
+USource				*CAudioMixerUser::createSource( const NLMISC::TStringId &name, bool spawn, TSpawnEndCallback cb, void *userParam, NL3D::CCluster *cluster, CSoundContext *context, UGroupController *groupController)
 {
-	return createSource( getSoundId( name ), spawn, cb, userParam, cluster, context);
+	return createSource( getSoundId( name ), spawn, cb, userParam, cluster, context, groupController);
 }
 
 
@@ -2147,6 +2175,32 @@ uint			CAudioMixerUser::getPlayingSourcesCount() const
 	return _PlayingSources;
 }
 
+
+// ******************************************************************
+
+uint			CAudioMixerUser::countPlayingSimpleSources() const
+{
+	uint count = 0;
+	for (TSourceContainer::const_iterator it(_Sources.begin()), end(_Sources.end()); it != end; ++it)
+	{
+		if ((*it)->getType() == CSourceCommon::SOURCE_SIMPLE && (*it)->isPlaying())
+			++count;
+	}
+	return count;
+}
+
+uint			CAudioMixerUser::countSimpleSources() const
+{
+	uint count = 0;
+	for (TSourceContainer::const_iterator it(_Sources.begin()), end(_Sources.end()); it != end; ++it)
+	{
+		if ((*it)->getType() == CSourceCommon::SOURCE_SIMPLE)
+			++count;
+	}
+	return count;
+}
+
+
 // ******************************************************************
 
 uint			CAudioMixerUser::getAvailableTracksCount() const
diff --git a/code/nel/src/sound/background_source.cpp b/code/nel/src/sound/background_source.cpp
index c2cb5206a..dbb14242a 100644
--- a/code/nel/src/sound/background_source.cpp
+++ b/code/nel/src/sound/background_source.cpp
@@ -26,8 +26,8 @@ namespace NLSOUND
 {
 
 
-CBackgroundSource::CBackgroundSource(CBackgroundSound *backgroundSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster)
-:	CSourceCommon(backgroundSound, spawn, cb, cbUserParam, cluster)
+CBackgroundSource::CBackgroundSource(CBackgroundSound *backgroundSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
+:	CSourceCommon(backgroundSound, spawn, cb, cbUserParam, cluster, groupController)
 {
 	_BackgroundSound = backgroundSound;
 }
@@ -119,7 +119,7 @@ void CBackgroundSource::play()
 	for (; first != last; ++first)
 	{
 		TSubSource subSource;
-		subSource.Source = mixer->createSource(first->SoundName, false, 0, 0, _Cluster, 0);
+		subSource.Source = mixer->createSource(first->SoundName, false, 0, 0, _Cluster, NULL, _GroupController);
 		if (subSource.Source != NULL)
 			subSource.Source->setPriority(_Priority);
 		subSource.Filter = first->Filter;
diff --git a/code/nel/src/sound/complex_source.cpp b/code/nel/src/sound/complex_source.cpp
index cd3d2925d..8fad61a53 100644
--- a/code/nel/src/sound/complex_source.cpp
+++ b/code/nel/src/sound/complex_source.cpp
@@ -25,8 +25,8 @@ using namespace NLMISC;
 namespace NLSOUND
 {
 
-CComplexSource::CComplexSource	(CComplexSound *soundPattern, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster)
-:	CSourceCommon(soundPattern, spawn, cb, cbUserParam, cluster),
+CComplexSource::CComplexSource	(CComplexSound *soundPattern, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
+:	CSourceCommon(soundPattern, spawn, cb, cbUserParam, cluster, groupController),
 	_Source1(NULL),
 	_Source2(NULL)
 {
@@ -117,7 +117,7 @@ void CComplexSource::playStuf()
 				else
 					_FadeLength = 0;
 
-				_Source2 = mixer->createSource(sound, false, 0, 0, _Cluster);
+				_Source2 = mixer->createSource(sound, false, 0, 0, _Cluster, NULL, _GroupController);
 				if (_Source2 == NULL)
 					return;
 				_Source2->setPriority(_Priority);
@@ -155,7 +155,7 @@ void CComplexSource::playStuf()
 				{
 					CSound *sound = mixer->getSoundId(_PatternSound->getSound(soundSeq[_SoundSeqIndex++]));
 
-					_Source1 = mixer->createSource(sound, false, 0, 0, _Cluster);
+					_Source1 = mixer->createSource(sound, false, 0, 0, _Cluster, NULL, _GroupController);
 					if (_Source1 == NULL)
 						return;
 					_Source1->setPriority(_Priority);
@@ -202,7 +202,7 @@ void CComplexSource::playStuf()
 					CSound *sound = mixer->getSoundId(*first);
 					if (sound != NULL)
 					{
-						USource *source = mixer->createSource(sound, false, 0, 0, _Cluster);
+						USource *source = mixer->createSource(sound, false, 0, 0, _Cluster, NULL, _GroupController);
 						if (source != NULL)
 						{
 							source->setPriority(_Priority);
@@ -512,7 +512,7 @@ void CComplexSource::onUpdate()
 
 				// determine the XFade length (if next sound is too short.
 				_FadeLength = minof<uint32>(uint32(_PatternSound->getFadeLength()/_TickPerSecond), (sound2->getDuration()) / 2, (_Source1->getSound()->getDuration())/2);
-				_Source2 = mixer->createSource(sound2, false, 0, 0, _Cluster);
+				_Source2 = mixer->createSource(sound2, false, 0, 0, _Cluster, NULL, _GroupController);
 				if (_Source2)
 				{
 					_Source2->setPriority(_Priority);
@@ -641,7 +641,7 @@ void CComplexSource::onEvent()
 
 				CSound *sound = mixer->getSoundId(_PatternSound->getSound(soundSeq[_SoundSeqIndex++]));
 
-				_Source1 = mixer->createSource(sound, false, 0, 0, _Cluster);
+				_Source1 = mixer->createSource(sound, false, 0, 0, _Cluster, NULL, _GroupController);
 				if (_Source1 == NULL)
 				{
 					stop();
diff --git a/code/nel/src/sound/driver/CMakeLists.txt b/code/nel/src/sound/driver/CMakeLists.txt
index 1a8391c41..90fbbb562 100644
--- a/code/nel/src/sound/driver/CMakeLists.txt
+++ b/code/nel/src/sound/driver/CMakeLists.txt
@@ -3,14 +3,7 @@ FILE(GLOB HEADERS ../../../include/nel/sound/driver/*.h)
 
 NL_TARGET_LIB(nelsnd_lowlevel ${HEADERS} ${SRC})
 
-INCLUDE_DIRECTORIES(${VORBIS_INCLUDE_DIR})
-
-TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBISFILE_LIBRARY} ${VORBIS_LIBRARY})
-
-IF(WITH_STATIC)
-  # Add libogg dependency only if target is static because to libvorbisfile
-  TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${OGG_LIBRARY})
-ENDIF(WITH_STATIC)
+TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc)
 
 SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
diff --git a/code/nel/src/sound/driver/Makefile.am b/code/nel/src/sound/driver/Makefile.am
deleted file mode 100644
index 0e7325b29..000000000
--- a/code/nel/src/sound/driver/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES          = Makefile.in
-
-EXTRA_DIST			= fmod openal dsound
-
-SUBDIRS                       = @SOUND_SUBDIRS@
-
-noinst_LTLIBRARIES            = libnelsnd_lowlevel.la
-
-libnelsnd_lowlevel_la_SOURCES = buffer.cpp                 \
-                                buffer.h                   \
-                                effect.h                   \
-                                effect.cpp                 \
-                                listener.cpp               \
-                                listener.h                 \
-                                sound_driver.cpp           \
-                                sound_driver.h             \
-                                source.cpp                 \
-                                source.h
-
-AM_CXXFLAGS                   = -I$(top_srcdir)/src
-
-# End of Makefile.am
-
diff --git a/code/nel/src/sound/driver/fmod/Makefile.am b/code/nel/src/sound/driver/fmod/Makefile.am
deleted file mode 100644
index 505c77173..000000000
--- a/code/nel/src/sound/driver/fmod/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES         = Makefile.in
-
-lib_LTLIBRARIES              = libnel_drv_fmod.la
-
-libnel_drv_fmod_la_SOURCES =	buffer_fmod.cpp \
-				buffer_fmod.h \
-				listener_fmod.cpp \
-				listener_fmod.h \
-				music_channel_fmod.cpp \
-				music_channel_fmod.h \
-				sound_driver_fmod.cpp \
-				sound_driver_fmod.h \
-				source_fmod.cpp \
-				source_fmod.h \
-				stdfmod.cpp \
-				stdfmod.h
-
-
-AM_CXXFLAGS                  = -I$(top_srcdir)/src @FMOD_CFLAGS@
-
-noinst_HEADERS		     = stdfmod.h
-
-libnel_drv_fmod_la_LIBADD  = @FMOD_LIBS@
-
-libnel_drv_fmod_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp b/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp
index 9c502ea1a..a64dddcfe 100644
--- a/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp
+++ b/code/nel/src/sound/driver/fmod/music_channel_fmod.cpp
@@ -249,6 +249,12 @@ void CMusicChannelFMod::stop()
 	_CallBackEnded = false;
 }
 
+void CMusicChannelFMod::reset()
+{
+	// don't care
+	stop();
+}
+
 /** Pause the music previously loaded and played (the Memory is not freed)
  */
 void CMusicChannelFMod::pause()
diff --git a/code/nel/src/sound/driver/fmod/music_channel_fmod.h b/code/nel/src/sound/driver/fmod/music_channel_fmod.h
index d9a17fd99..e91e38a8b 100644
--- a/code/nel/src/sound/driver/fmod/music_channel_fmod.h
+++ b/code/nel/src/sound/driver/fmod/music_channel_fmod.h
@@ -87,6 +87,9 @@ public:
 	/// Stop the music previously loaded and played (the Memory is also freed)
 	virtual void stop();
 
+	/// Makes sure any resources are freed, but keeps available for next play call
+	virtual void reset();
+
 	/// Pause the music previously loaded and played (the Memory is not freed)
 	virtual void pause();
 	
diff --git a/code/nel/src/sound/driver/fmod/source_fmod.cpp b/code/nel/src/sound/driver/fmod/source_fmod.cpp
index 2ae9a0ea1..4ef2f89d5 100644
--- a/code/nel/src/sound/driver/fmod/source_fmod.cpp
+++ b/code/nel/src/sound/driver/fmod/source_fmod.cpp
@@ -413,6 +413,13 @@ bool CSourceFMod::getSourceRelativeMode() const
 // ******************************************************************
 void CSourceFMod::setMinMaxDistances( float mindist, float maxdist, bool /* deferred */ )
 {
+	static float maxSqrt = sqrt(std::numeric_limits<float>::max());
+	if (maxdist >= maxSqrt)
+	{
+		nlwarning("SOUND_DEV (FMod): Ridiculously high max distance set on source");
+		maxdist = maxSqrt;
+	}
+	
 	_MinDist= mindist;
 	_MaxDist= maxdist;
 	if(_FModChannel!=-1)
diff --git a/code/nel/src/sound/driver/music_buffer.cpp b/code/nel/src/sound/driver/music_buffer.cpp
deleted file mode 100644
index 40088d49e..000000000
--- a/code/nel/src/sound/driver/music_buffer.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "stdsound_lowlevel.h"
-
-#include "nel/sound/driver/music_buffer_vorbis.h"
-#include "nel/sound/driver/music_buffer.h"
-
-using namespace std;
-using namespace NLMISC;
-
-namespace NLSOUND
-{
-
-IMusicBuffer::IMusicBuffer() : _InternalStream(NULL)
-{
-	
-}
-
-IMusicBuffer::~IMusicBuffer()
-{
-	if (_InternalStream) { delete _InternalStream; _InternalStream = NULL; }
-}
-
-IMusicBuffer *IMusicBuffer::createMusicBuffer(const std::string &filepath, bool async, bool loop)
-{
-	string lookup = CPath::lookup(filepath, false);
-	if (lookup.empty())
-	{ 
-		nlwarning("Music file %s does not exist!", filepath.c_str());
-		return NULL; 
-	}
-	string type = CFile::getExtension(filepath);
-
-	CIFile *ifile = new CIFile();
-	ifile->setAsyncLoading(async);
-	ifile->open(lookup);
-
-	IMusicBuffer *mb = createMusicBuffer(type, ifile, loop);
-
-	if (mb) mb->_InternalStream = ifile;
-	else delete ifile;
-
-	return mb;
-}
-
-IMusicBuffer *IMusicBuffer::createMusicBuffer(const std::string &type, NLMISC::IStream *stream, bool loop)
-{
-	if (!stream)
-	{
-		nlwarning("Stream is NULL");
-		return NULL;
-	}
-	string type_lower = toLower(type);
-	if (type_lower == "ogg")
-	{
-		return new CMusicBufferVorbis(stream, loop);
-	}
-	else
-	{
-		nlwarning("Music file type unknown: '%s'", type_lower.c_str());
-		return NULL;
-	}
-}
-
-bool IMusicBuffer::getInfo(const std::string &filepath, std::string &artist, std::string &title)
-{
-	string lookup = CPath::lookup(filepath, false);
-	if (lookup.empty())
-	{
-		nlwarning("Music file %s does not exist!", filepath.c_str());
-		return false;
-	}
-	string type = CFile::getExtension(filepath);
-	string type_lower = toLower(type);
-
-	if (type_lower == "ogg")
-	{
-		CIFile ifile;
-		ifile.setCacheFileOnOpen(false);
-		ifile.allowBNPCacheFileOnOpen(false);
-		ifile.open(lookup);
-		return CMusicBufferVorbis::getInfo(&ifile, artist, title);
-	}
-	else
-	{
-		nlwarning("Music file type unknown: '%s'", type_lower.c_str());
-		artist.clear(); title.clear();
-		return false;
-	}
-}
-
-} /* namespace NLSOUND */
-
-/* end of file */
diff --git a/code/nel/src/sound/driver/openal/Makefile.am b/code/nel/src/sound/driver/openal/Makefile.am
deleted file mode 100644
index 559a26370..000000000
--- a/code/nel/src/sound/driver/openal/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-#
-
-MAINTAINERCLEANFILES         = Makefile.in
-
-EXTRA_DIST			= driver_openal.def driver_openal.dsp driver_openal.vcproj
-
-lib_LTLIBRARIES              = libnel_drv_openal.la
-
-libnel_drv_openal_la_SOURCES = buffer_al.cpp               \
-                               buffer_al.h                 \
-                               listener_al.cpp             \
-                               listener_al.h               \
-                               sound_driver_al.cpp         \
-                               sound_driver_al.h           \
-                               source_al.cpp               \
-                               source_al.h			\
-                               stdopenal.h
-
-AM_CXXFLAGS                  = -I$(top_srcdir)/src @OPENAL_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@
-
-noinst_HEADERS		     = stdopenal.h
-
-libnel_drv_openal_la_LIBADD  = @OPENAL_LIBS@ @OGG_LIBS@ @VORBIS_LIBS@
-
-libnel_drv_openal_la_LDFLAGS = -version-info @LIBTOOL_VERSION@
-
-
-# End of Makefile.am
-
diff --git a/code/nel/src/sound/driver/openal/listener_al.cpp b/code/nel/src/sound/driver/openal/listener_al.cpp
index 67eaf2478..da7e6bc31 100644
--- a/code/nel/src/sound/driver/openal/listener_al.cpp
+++ b/code/nel/src/sound/driver/openal/listener_al.cpp
@@ -145,9 +145,8 @@ void					CListenerAL::getOrientation( NLMISC::CVector& front, NLMISC::CVector& u
  */
 void					CListenerAL::setGain( float gain )
 {
-	CSoundDriverAL::getInstance()->setGain(gain);
-//	alListenerf( AL_GAIN, gain );
-//	alTestError();
+	alListenerf( AL_GAIN, gain );
+	alTestError();
 }
 
 
@@ -156,15 +155,14 @@ void					CListenerAL::setGain( float gain )
  */
 float					CListenerAL::getGain() const
 {
-    return CSoundDriverAL::getInstance()->getGain();
-//	ALfloat gain;
-//#ifdef NL_OS_WINDOWS
-//	alGetListenerf( AL_GAIN, &gain );
-//#else
-//	alGetListenerfv( AL_GAIN, &gain );
-//#endif
-//	alTestError();
-//	return gain;
+	ALfloat gain;
+#ifdef NL_OS_WINDOWS
+	alGetListenerf( AL_GAIN, &gain );
+#else
+	alGetListenerfv( AL_GAIN, &gain );
+#endif
+	alTestError();
+	return gain;
 }
 
 
diff --git a/code/nel/src/sound/driver/openal/music_channel_al.cpp b/code/nel/src/sound/driver/openal/music_channel_al.cpp
deleted file mode 100644
index b1849b33e..000000000
--- a/code/nel/src/sound/driver/openal/music_channel_al.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "stdopenal.h"
-
-// Project includes
-#include "sound_driver_al.h"
-#include "source_al.h"
-#include "buffer_al.h"
-#include "music_channel_al.h"
-
-using namespace std;
-using namespace NLMISC;
-
-namespace NLSOUND
-{
-
-CMusicChannelAL::CMusicChannelAL(CSoundDriverAL *soundDriver) 
-: _SoundDriver(soundDriver), _MusicBuffer(NULL), _Thread(NULL), _Buffer(NULL), _Source(NULL), _Playing(false), _Async(false), _Gain(1.0)
-{
-	// create a default source for music streaming
-	_Source = static_cast<CSourceAL*>(_SoundDriver->createSource());
-	_Source->setType(SourceMusic);
-	_Source->setStreamingBufferSize(32768);
-}
-
-CMusicChannelAL::~CMusicChannelAL()
-{
-	release();
-	if (_SoundDriver) { _SoundDriver->removeMusicChannel(this); _SoundDriver = NULL; }
-}
-
-void CMusicChannelAL::release()
-{
-	// stop thread before deleting it
-	stop();
-
-	// delete thread
-	if (_Thread)
-	{
-		delete _Thread;
-		_Thread = NULL;
-	}
-
-	// delete source
-	if (_Source)
-	{
-		delete _Source;
-		_Source = NULL;
-	}
-}
-
-/// Fill IBuffer with data from IMusicBuffer
-bool CMusicChannelAL::fillBuffer(IBuffer *buffer, uint length)
-{
-	if (!buffer || !length)
-	{
-		nlwarning("AL: No data to stream");
-		return false;
-	}
-
-	// fill buffer with music data
-	uint8 *tmp = buffer->lock(length);
-	if (tmp == NULL)
-	{
-		nlwarning("AL: Can't allocate %u bytes for buffer", length);
-		return false;
-	}
-
-	uint32 size = _MusicBuffer->getNextBytes(tmp, length, length);
-	buffer->unlock(size);
-
-	return size > 0;
-}
-
-/// Use buffer format from IMusicBuffer
-void CMusicChannelAL::setBufferFormat(IBuffer *buffer)
-{
-	if (!buffer)
-	{
-		nlwarning("AL: No buffer specified");
-		return;
-	}
-
-	// use the same format as music for buffers
-	buffer->setFormat(IBuffer::FormatPcm, _MusicBuffer->getChannels(),
-		_MusicBuffer->getBitsPerSample(), _MusicBuffer->getSamplesPerSec());
-}
-
-void CMusicChannelAL::run()
-{
-	bool first = true;
-
-	// use queued buffers
-	do
-	{
-		// buffers to update
-		std::vector<CBufferAL*> buffers;
-
-		if (first)
-		{
-			// get all buffers to queue
-			_Source->getStreamingBuffers(buffers);
-
-			// set format for each buffer
-			for(uint i = 0; i < buffers.size(); ++i)
-				setBufferFormat(buffers[i]);
-		}
-		else
-		{
-			// get unqueued buffers
-			_Source->getProcessedStreamingBuffers(buffers);
-		}
-
-		// fill buffers
-		for(uint i = 0; i < buffers.size(); ++i)
-		{
-			if (!fillBuffer(buffers[i], _Source->getStreamingBufferSize()))
-				break;
-
-			// add buffer to streaming buffers queue
-			_Source->submitStreamingBuffer(buffers[i]);
-		}
-
-		// play the source
-		if (first)
-		{
-			_Source->play();
-			first = false;
-		}
-
-		// wait 100ms before rechecking buffers
-		nlSleep(100);
-	}
-	while(!_MusicBuffer->isMusicEnded() && _Playing);
-
-
-	// music finished without interruption
-	if (_Playing)
-	{
-		// wait until source is not playing
-		while(_Source->isPlaying() && _Playing) nlSleep(1000);
-
-		_Source->stop();
-
-		_Playing = false;
-	}
-}
-
-/// Play sync music
-bool CMusicChannelAL::playSync()
-{
-	// use an unique buffer managed by CMusicChannelAL
-	_Buffer = _SoundDriver->createBuffer();
-
-	// set format
-	setBufferFormat(_Buffer);
-
-	// fill data
-	fillBuffer(_Buffer, _MusicBuffer->getUncompressedSize());
-
-	// we don't need _MusicBuffer anymore because all is loaded into memory
-	if (_MusicBuffer)
-	{
-		delete _MusicBuffer;
-		_MusicBuffer = NULL;
-	}
-
-	// delete previous queued buffers
-	_Source->setStreamingBuffersMax(0);
-
-	// use this buffer as source
-	_Source->setStaticBuffer(_Buffer);
-
-	// play the source
-	return _Source->play();
-}
-
-/** Play some music (.ogg etc...)
- *	NB: if an old music was played, it is first stop with stopMusic()
- *	\param filepath file path, CPath::lookup is done here
- *  \param async stream music from hard disk, preload in memory if false
- *	\param loop must be true to play the music in loop. 
- */
-bool CMusicChannelAL::play(const std::string &filepath, bool async, bool loop)
-{
-	// stop a previous music
-	stop();
-
-	// when not using async, we must load the whole file once
-	_MusicBuffer = IMusicBuffer::createMusicBuffer(filepath, async, async ? loop:false);
-
-	if (_MusicBuffer)
-	{
-		_Async = async;
-		_Playing = true;
-
-		_Source->setSourceRelativeMode(true);
-
-		if (_Async)
-		{
-			// create the thread if it's not yet created
-			if (!_Thread) _Thread = IThread::create(this);
-
-			if (!_Thread)
-			{
-				nlwarning("AL: Can't create a new thread");
-				return false;
-			}
-
-			// use 4 queued buffers
-			_Source->setStreamingBuffersMax(4);
-
-			// we need to loop the source only if not async
-			_Source->setLooping(false);
-
-			// start the thread
-			_Thread->start();
-		}
-		else
-		{
-			// we need to loop the source only if not async
-			_Source->setLooping(loop);
-
-			return playSync();
-		}
-	}
-	else
-	{
-		nlwarning("AL: Can't stream file %s", filepath.c_str());
-		return false;
-	}
-	
-	return true;
-}
-
-/// Stop the music previously loaded and played (the Memory is also freed)
-void CMusicChannelAL::stop()
-{
-	_Playing = false;
-
-	_Source->stop();
-
-	// if not using async streaming, we manage static buffer ourself
-	if (!_Async && _Buffer)
-	{
-		_Source->setStaticBuffer(NULL);
-		delete _Buffer;
-		_Buffer = NULL;
-	}
-
-	// wait until thread is finished
-	if (_Thread)
-		_Thread->wait();
-
-	if (_MusicBuffer)
-	{
-		delete _MusicBuffer;
-		_MusicBuffer = NULL;
-	}
-}
-
-/// Pause the music previously loaded and played (the Memory is not freed)
-void CMusicChannelAL::pause()
-{
-	_Source->pause();
-}
-
-/// Resume the music previously paused
-void CMusicChannelAL::resume()
-{
-	_Source->play();
-}
-
-/// Return true if a song is finished.
-bool CMusicChannelAL::isEnded()
-{
-	return !_Playing;
-}
-
-/// Return true if the song is still loading asynchronously and hasn't started playing yet (false if not async), used to delay fading
-bool CMusicChannelAL::isLoadingAsync()
-{
-	return _Async && _Playing && !_Source->isPlaying();
-}
-
-/// Return the total length (in second) of the music currently played
-float CMusicChannelAL::getLength()
-{
-	if (_MusicBuffer) return _MusicBuffer->getLength();
-	else return .0f;
-}
-
-/** Set the music volume (if any music played). (volume value inside [0 , 1]) (default: 1)
- *	NB: in OpenAL driver, the volume of music IS affected by IListener::setGain()
- */
-void CMusicChannelAL::setVolume(float gain)
-{
-	_Gain = gain;
-	_Source->setGain(gain);
-}
-
-/// Update music
-void CMusicChannelAL::update()
-{
-	// stop sync music once finished playing
-	if (_Playing && !_Async && !_Source->isPlaying())
-	{
-		stop();
-	}
-}
-
-} /* namespace NLSOUND */
-
-/* end of file */
diff --git a/code/nel/src/sound/driver/openal/music_channel_al.h b/code/nel/src/sound/driver/openal/music_channel_al.h
deleted file mode 100644
index 157c18810..000000000
--- a/code/nel/src/sound/driver/openal/music_channel_al.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef NLSOUND_MUSIC_CHANNEL_AL_H
-#define NLSOUND_MUSIC_CHANNEL_AL_H
-
-#include "nel/sound/driver/music_channel.h"
-
-namespace NLSOUND
-{
-	class CSoundDriverAL;
-	class IMusicBuffer;
-
-/**
- * \brief CMusicChannelAL
- * \date 2010-07-27 16:56GMT
- * \author Kervala
- * CMusicChannelAL is an implementation of the IMusicChannel interface to run on OpenAL.
- */
-class CMusicChannelAL : public IMusicChannel, public NLMISC::IRunnable
-{
-protected:
-	// outside pointers
-	CSoundDriverAL*		_SoundDriver;
-	
-	// pointers
-	IMusicBuffer*		_MusicBuffer;
-	NLMISC::IThread*	_Thread;
-
-	IBuffer*			_Buffer;
-	CSourceAL*			_Source;
-	bool				_Playing;
-	bool				_Async;
-
-	float				_Gain;
-
-	/// Fill IBuffer with data from IMusicBuffer
-	bool fillBuffer(IBuffer *buffer, uint length);
-
-	/// Use buffer format from IMusicBuffer
-	void setBufferFormat(IBuffer *buffer);
-
-	/// Declared in NLMISC::IRunnable interface
-	virtual void run();
-
-public:
-	CMusicChannelAL(CSoundDriverAL *soundDriver);
-	virtual ~CMusicChannelAL();
-	void release();
-
-	/** Play some music (.ogg etc...)
-	 *	NB: if an old music was played, it is first stop with stopMusic()
-	 *	\param filepath file path, CPath::lookup is done here
-	 *  \param async stream music from hard disk, preload in memory if false
-	 *	\param loop must be true to play the music in loop. 
-	 */
-	virtual bool play(const std::string &filepath, bool async, bool loop); 
-
-	/// Stop the music previously loaded and played (the Memory is also freed)
-	virtual void stop();
-
-	/// Pause the music previously loaded and played (the Memory is not freed)
-	virtual void pause();
-
-	/// Resume the music previously paused
-	virtual void resume();
-
-	/// Return true if a song is finished.
-	virtual bool isEnded();
-
-	/// Return true if the song is still loading asynchronously and hasn't started playing yet (false if not async), used to delay fading
-	virtual bool isLoadingAsync();
-
-	/// Return the total length (in second) of the music currently played
-	virtual float getLength();
-	
-	/** Set the music volume (if any music played). (volume value inside [0 , 1]) (default: 1)
-	 *	NB: in OpenAL driver, the volume of music IS affected by IListener::setGain()
-	 */
-	virtual void setVolume(float gain);
-
-	/// Play sync music
-	bool playSync();
-
-	/// Update music
-	void update();
-}; /* class CMusicChannelAL */
-
-} /* namespace NLSOUND */
-
-#endif /* #ifndef NLSOUND_MUSIC_CHANNEL_AL_H */
-
-/* end of file */
diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.cpp b/code/nel/src/sound/driver/openal/sound_driver_al.cpp
index e94755c63..e7eaca3f6 100644
--- a/code/nel/src/sound/driver/openal/sound_driver_al.cpp
+++ b/code/nel/src/sound/driver/openal/sound_driver_al.cpp
@@ -16,7 +16,6 @@
 
 #include "stdopenal.h"
 #include "sound_driver_al.h"
-#include "music_channel_al.h"
 #include "buffer_al.h"
 #include "listener_al.h"
 #include "source_al.h"
@@ -174,7 +173,7 @@ uint32 NLSOUND_interfaceVersion ()
  */
 CSoundDriverAL::CSoundDriverAL(ISoundDriver::IStringMapperProvider *stringMapper) 
 : _StringMapper(stringMapper), _AlDevice(NULL), _AlContext(NULL), 
-_NbExpBuffers(0), _NbExpSources(0), _RolloffFactor(1.f), _MasterGain(1.f)
+_NbExpBuffers(0), _NbExpSources(0), _RolloffFactor(1.f)
 {
 	alExtInit();
 }
@@ -184,21 +183,16 @@ _NbExpBuffers(0), _NbExpSources(0), _RolloffFactor(1.f), _MasterGain(1.f)
  */
 CSoundDriverAL::~CSoundDriverAL()
 {
-	// Release internal resources of all remaining IMusicChannel instances
-	if (_MusicChannels.size())
-	{
-		nlwarning("AL: _MusicChannels.size(): '%u'", (uint32)_MusicChannels.size());
-		set<CMusicChannelAL *>::iterator it(_MusicChannels.begin()), end(_MusicChannels.end());
-		for (; it != end; ++it) delete *it;
-		_MusicChannels.clear();
-	}
+	// WARNING: Only internal resources are released here, 
+	// the created instances must still be released by the user!
+	
 	// Remove the allocated (but not exported) source and buffer names-
 	// Release internal resources of all remaining ISource instances
 	if (_Sources.size())
 	{
 		nlwarning("AL: _Sources.size(): '%u'", (uint32)_Sources.size());
 		set<CSourceAL *>::iterator it(_Sources.begin()), end(_Sources.end());
-		for (; it != end; ++it) delete *it;
+		for (; it != end; ++it) (*it)->release(); // CSourceAL will be deleted by user
 		_Sources.clear();
 	}
 	if (!_Buffers.empty()) alDeleteBuffers(compactAliveNames(_Buffers, alIsBuffer), &*_Buffers.begin());	
@@ -207,7 +201,7 @@ CSoundDriverAL::~CSoundDriverAL()
 	{
 		nlwarning("AL: _Effects.size(): '%u'", (uint32)_Effects.size());
 		set<CEffectAL *>::iterator it(_Effects.begin()), end(_Effects.end());
-		for (; it != end; ++it) delete *it;
+		for (; it != end; ++it) (*it)->release(); // CEffectAL will be deleted by user
 		_Effects.clear();
 	}
 
@@ -619,16 +613,9 @@ void CSoundDriverAL::commit3DChanges()
 	// Sync up sources & listener 3d position.
 	if (getOption(OptionManualRolloff))
 	{
-		set<CSourceAL*>::iterator it = _Sources.begin(), iend = _Sources.end();
-		while(it != iend)
-		{
+		for (std::set<CSourceAL *>::iterator it(_Sources.begin()), end(_Sources.end()); it != end; ++it)
 			(*it)->updateManualRolloff();
-			++it;
-		}
 	}
-
-	// update the music (XFade etc...)
-	updateMusic();
 }
 
 /// Write information about the driver to the output stream.
@@ -656,23 +643,6 @@ void CSoundDriverAL::displayBench(NLMISC::CLog *log)
 	NLMISC::CHTimer::display(log, CHTimer::TotalTime);
 }
 
-/** Get music info. Returns false if the song is not found or the function is not implemented.
- *  \param filepath path to file, CPath::lookup done by driver
- *  \param artist returns the song artist (empty if not available)
- *  \param title returns the title (empty if not available)
- */
-bool CSoundDriverAL::getMusicInfo(const std::string &filepath, std::string &artist, std::string &title)
-{
-	// add support for additional non-standard music file types info here
-	return IMusicBuffer::getInfo(filepath, artist, title);
-}
-
-void CSoundDriverAL::updateMusic()
-{
-	set<CMusicChannelAL *>::iterator it(_MusicChannels.begin()), end(_MusicChannels.end());
-	for (; it != end; ++it) (*it)->update();
-}
-
 /// Remove a buffer
 void CSoundDriverAL::removeBuffer(CBufferAL *buffer)
 {
@@ -695,35 +665,6 @@ void CSoundDriverAL::removeEffect(CEffectAL *effect)
 	else nlwarning("AL: removeEffect already called");
 }
 
-/// Create a music channel
-IMusicChannel *CSoundDriverAL::createMusicChannel()
-{
-	CMusicChannelAL *music_channel = new CMusicChannelAL(this);
-	_MusicChannels.insert(music_channel);
-	return static_cast<IMusicChannel *>(music_channel);
-}
-
-/// (Internal) Remove a music channel (should be called by the destructor of the music channel class).
-void CSoundDriverAL::removeMusicChannel(CMusicChannelAL *musicChannel)
-{
-	if (_MusicChannels.find(musicChannel) != _MusicChannels.end()) _MusicChannels.erase(musicChannel);
-	else nlwarning("AL: removeMusicChannel already called");
-}
-
-/// Set the gain
-void CSoundDriverAL::setGain( float gain )
-{
-	clamp(gain, 0.f, 1.f);
-	_MasterGain= gain;
-	// TODO: update all sources in not using manual rollof ?
-}
-
-/// Get the gain
-float CSoundDriverAL::getGain()
-{
-	return _MasterGain;
-}
-
 /// Delete a buffer or a source
 bool CSoundDriverAL::deleteItem( ALuint name, TDeleteFunctionAL aldeletefunc, vector<ALuint>& names )
 {
diff --git a/code/nel/src/sound/driver/openal/sound_driver_al.h b/code/nel/src/sound/driver/openal/sound_driver_al.h
index 50bffa379..154bc6d78 100644
--- a/code/nel/src/sound/driver/openal/sound_driver_al.h
+++ b/code/nel/src/sound/driver/openal/sound_driver_al.h
@@ -19,13 +19,11 @@
 
 #include <nel/sound/driver/sound_driver.h>
 
-namespace NLSOUND
-{
+namespace NLSOUND {
 	class CBufferAL;
 	class CListenerAL;
 	class CSourceAL;
 	class CEffectAL;
-	class CMusicChannelAL;
 
 // alGenBuffers, alGenSources
 //typedef ALAPI ALvoid ALAPIENTRY (*TGenFunctionAL) ( ALsizei, ALuint* );
@@ -82,8 +80,6 @@ private:
 	std::set<CSourceAL *> _Sources;
 	// Allocated effects
 	std::set<CEffectAL *> _Effects;
-	/// Array with the allocated music channels created by client code.
-	std::set<CMusicChannelAL *> _MusicChannels;
 	// Number of exported buffers (including any deleted buffers)
 	uint _NbExpBuffers;
 	// Number of exported sources (including any deleted sources)
@@ -101,6 +97,10 @@ public:
 	/// Destructor
 	virtual ~CSoundDriverAL();
 
+	inline ALCdevice *getAlDevice() { return _AlDevice; }
+	inline ALCcontext *getAlContext() { return _AlContext; }
+	inline float getRolloffFactor() { return _RolloffFactor; }
+
 	/// Return a list of available devices for the user. The value at index 0 is empty, and is used for automatic device selection.
 	virtual void getDevices(std::vector<std::string> &devices);
 	/// Initialize the driver with a user selected device. If device.empty(), the default or most appropriate device is used.
@@ -111,73 +111,46 @@ public:
 	/// Return if an option is enabled (including those that cannot be disabled on this driver).
 	virtual bool getOption(TSoundOptions option);
 
-	/// Commit all the changes made to 3D settings of listener and sources
-	virtual void commit3DChanges();
-
+	/// Create a sound buffer
+	virtual	IBuffer *createBuffer();
 	/// Create the listener instance
 	virtual	IListener *createListener();
-	/// Create a source, destroy with delete
+	/// Create a source
 	virtual	ISource *createSource();
-	/// Create a sound buffer, destroy with delete
-	virtual	IBuffer *createBuffer();
 	/// Create a reverb effect
 	virtual IReverbEffect *createReverbEffect();
 	/// Return the maximum number of sources that can created
 	virtual uint countMaxSources();
 	/// Return the maximum number of effects that can be created
 	virtual uint countMaxEffects();
-
-	/// Write information about the driver to the output stream.
-	virtual void writeProfile(std::string& /* out */);
-
+	
 	virtual void startBench();
 	virtual void endBench();
 	virtual void displayBench(NLMISC::CLog * /* log */);
 
-	/// Create a music channel, destroy with destroyMusicChannel.
-	virtual IMusicChannel *createMusicChannel();
-
-	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
-	 *  \param artist returns the song artist (empty if not available)
-	 *  \param title returns the title (empty if not available)
-	 */
-	virtual bool getMusicInfo(const std::string &filepath, std::string &artist, std::string &title);
-
-	/// Get audio/container extensions that are supported natively by the driver implementation.
-	virtual void getMusicExtensions(std::vector<std::string> & /* extensions */) const { }
-	/// Return if a music extension is supported by the driver's music channel.
-	virtual bool isMusicExtensionSupported(const std::string & /* extension */) const { return false; }
-
-	ALCdevice *getAlDevice() { return _AlDevice; }
-	ALCcontext *getAlContext() { return _AlContext; }
-	float getRolloffFactor() { return _RolloffFactor; }
 
 	/// Change the rolloff factor and apply to all sources
 	void applyRolloffFactor(float f);
 
+	/// Commit all the changes made to 3D settings of listener and sources
+	virtual void commit3DChanges();
+
+	/// Write information about the driver to the output stream.
+	virtual void writeProfile(std::string& /* out */);
+
 	/// Remove a buffer
 	void removeBuffer(CBufferAL *buffer);
 	/// Remove a source
 	void removeSource(CSourceAL *source);
 	/// Remove an effect
 	void removeEffect(CEffectAL *effect);
-	/// (Internal) Remove music channel (should be called by the destructor of the music channel class).
-	void removeMusicChannel(CMusicChannelAL *musicChannel);	
-
-	/** Set the gain (volume value inside [0 , 1]). (default: 1)
-	 * 0.0 -> silence
-	 * 0.5 -> -6dB
-	 * 1.0 -> no attenuation
-	 * values > 1 (amplification) not supported by most drivers
-	 */
-	void setGain( float gain );
 
-	/// Get the gain
-	float getGain();
+	/// Get audio/container extensions that are supported natively by the driver implementation.
+	virtual void getMusicExtensions(std::vector<std::string> & /* extensions */) const { }
+	/// Return if a music extension is supported by the driver's music channel.
+	virtual bool isMusicExtensionSupported(const std::string & /* extension */) const { return false; }
 
 protected:
-	void updateMusic();
 
 	/// Allocate nb new buffers or sources
 	void					allocateNewItems( TGenFunctionAL algenfunc, TTestFunctionAL altestfunc,
@@ -195,9 +168,6 @@ protected:
 
 	/// Delete a buffer or a source
 	bool					deleteItem( ALuint name, TDeleteFunctionAL aldeletefunc, std::vector<ALuint>& names );
-
-	/// Master Volume [0,1]
-	float _MasterGain;
 };
 
 
diff --git a/code/nel/src/sound/driver/openal/source_al.cpp b/code/nel/src/sound/driver/openal/source_al.cpp
index fe2dcb086..dab3123b1 100644
--- a/code/nel/src/sound/driver/openal/source_al.cpp
+++ b/code/nel/src/sound/driver/openal/source_al.cpp
@@ -15,55 +15,38 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "stdopenal.h"
-#include "source_al.h"
 #include "sound_driver_al.h"
 #include "listener_al.h"
 #include "effect_al.h"
 #include "buffer_al.h"
+#include "source_al.h"
 #include "ext_al.h"
 
+// #define NLSOUND_DEBUG_GAIN
+
 using namespace std;
 using namespace NLMISC;
 
-namespace NLSOUND
-{
+namespace NLSOUND {
 
-CSourceAL::CSourceAL(CSoundDriverAL *soundDriver):ISource(), _SoundDriver(NULL), _Source(AL_NONE),
-	_DirectFilter(AL_FILTER_NULL), _EffectFilter(AL_FILTER_NULL)
+CSourceAL::CSourceAL(CSoundDriverAL *soundDriver) :
+_SoundDriver(NULL), _Buffer(NULL), _Source(AL_NONE),
+_DirectFilter(AL_FILTER_NULL), _EffectFilter(AL_FILTER_NULL), 
+_IsPlaying(false), _IsPaused(false), _StartTime(0), _IsStreaming(false), _RelativeMode(false), 
+_Pos(0.0f, 0.0f, 0.0f), _Gain(NLSOUND_DEFAULT_GAIN), _Alpha(1.0), 
+_MinDistance(1.0f), _MaxDistance(sqrt(numeric_limits<float>::max())), 
+_Effect(NULL), _Direct(true), 
+_DirectGain(NLSOUND_DEFAULT_DIRECT_GAIN), _EffectGain(NLSOUND_DEFAULT_EFFECT_GAIN), 
+_DirectFilterType(ISource::FilterLowPass), _EffectFilterType(ISource::FilterLowPass), 
+_DirectFilterEnabled(false), _EffectFilterEnabled(false), 
+_DirectFilterPassGain(NLSOUND_DEFAULT_FILTER_PASS_GAIN), _EffectFilterPassGain(NLSOUND_DEFAULT_FILTER_PASS_GAIN)
 {
-	_IsPlaying = false;
-	_IsPaused = false;
-	_StartTime = 0;
-
-	_Type = SourceSound;
-	_Buffer = NULL;
-	_BuffersMax = 0;
-	_BufferSize = 32768;
-
-	_PosRelative = false;
-	_Gain = NLSOUND_DEFAULT_GAIN;
-	_Alpha = 0.0;
-	_Pos = CVector::Null;
-	_MinDistance = 1.0f;
-	_MaxDistance = numeric_limits<float>::max();
-
-	_Effect = NULL;
-	_Direct = true;
-	_DirectGain = NLSOUND_DEFAULT_DIRECT_GAIN;
-	_EffectGain = NLSOUND_DEFAULT_EFFECT_GAIN;
-	_DirectFilterType = ISource::FilterLowPass;
-	_EffectFilterType = ISource::FilterLowPass;
-	_DirectFilterEnabled = false;
-	_EffectFilterEnabled = false;
-	_DirectFilterPassGain = NLSOUND_DEFAULT_FILTER_PASS_GAIN;
-	_EffectFilterPassGain = NLSOUND_DEFAULT_FILTER_PASS_GAIN;
-
 	// create the al source
 	alGenSources(1, &_Source);
 	alTestError();
-
+	
 	// configure rolloff
-	if (!soundDriver || soundDriver->getOption(ISoundDriver::OptionManualRolloff))
+	if (soundDriver->getOption(ISoundDriver::OptionManualRolloff))
 	{
 		alSourcef(_Source, AL_ROLLOFF_FACTOR, 0);
 		alTestError();
@@ -73,16 +56,15 @@ CSourceAL::CSourceAL(CSoundDriverAL *soundDriver):ISource(), _SoundDriver(NULL),
 		alSourcef(_Source, AL_ROLLOFF_FACTOR, soundDriver->getRolloffFactor());
 		alTestError();
 	}
-
+	
 	// create filters
-	if (soundDriver && soundDriver->getOption(ISoundDriver::OptionEnvironmentEffects))
+	if (soundDriver->getOption(ISoundDriver::OptionEnvironmentEffects))
 	{
 		alGenFilters(1, &_DirectFilter);
 		alFilteri(_DirectFilter, AL_FILTER_TYPE, AL_FILTER_LOWPASS);
 		alFilterf(_DirectFilter, AL_LOWPASS_GAIN, NLSOUND_DEFAULT_DIRECT_GAIN);
 		alFilterf(_DirectFilter, AL_LOWPASS_GAINHF, NLSOUND_DEFAULT_FILTER_PASS_GAIN);
 		alTestError();
-
 		alGenFilters(1, &_EffectFilter);
 		alFilteri(_EffectFilter, AL_FILTER_TYPE, AL_FILTER_LOWPASS);
 		alFilterf(_EffectFilter, AL_LOWPASS_GAIN, NLSOUND_DEFAULT_EFFECT_GAIN);
@@ -103,8 +85,6 @@ CSourceAL::~CSourceAL()
 
 void CSourceAL::release()
 {
-	unqueueBuffers();
-	removeBuffers();
 	if (_Source != AL_NONE) { alDeleteSources(1, &_Source); _Source = AL_NONE; }
 	if (_DirectFilter != AL_FILTER_NULL) { alDeleteFilters(1, &_DirectFilter); _DirectFilter = AL_FILTER_NULL; }
 	if (_EffectFilter != AL_FILTER_NULL) { alDeleteFilters(1, &_EffectFilter); _EffectFilter = AL_FILTER_NULL; }
@@ -114,39 +94,21 @@ void CSourceAL::release()
 /// (Internal) Update the 3d changes.
 void CSourceAL::updateManualRolloff()
 {
-	CVector pos = getPos();
-
-	// make relative to listener (if not already!)
-	if (!_PosRelative)
-		pos -= CListenerAL::getInstance()->getPos();
-
-	float sqrdist = pos.sqrnorm();
-	float rolloff = ISource::computeManualRolloff(_Alpha, sqrdist, _MinDistance, _MaxDistance);
-	float volume = _Gain * rolloff;
-
-	// apply SFX volume
-	if (_SoundDriver && _Type == SourceSound)
-		volume *= _SoundDriver->getGain();
-
-	// set the attenuated volume
-	alSourcef(_Source, AL_GAIN, volume);
+	CVector distanceVector = _RelativeMode ? _Pos : (_Pos - CListenerAL::getInstance()->getPos());
+	float distanceSquare = distanceVector.sqrnorm();
+	float rolloff = ISource::computeManualRolloff(_Alpha, distanceSquare, _MinDistance, _MaxDistance);
+	alSourcef(_Source, AL_GAIN, _Gain * rolloff);
 	alTestError();
-}
-
-/// Set type of the source
-void CSourceAL::setType(TSourceType type)
-{
-	_Type = type;
-}
-
-/// Get type of the source
-TSourceType CSourceAL::getType() const
-{
-	return _Type;
+#ifdef NLSOUND_DEBUG_GAIN
+	ALfloat gain;
+	alGetSourcef(_Source, AL_GAIN, &gain);
+	nlwarning("Called updateManualRolloff(), physical gain is %f, configured gain is %f, distanceSquare is %f, rolloff is %f", gain, _Gain, distanceSquare, rolloff);
+	alTestError();
+#endif
 }
 
 /// Enable or disable streaming mode. Source must be stopped to call this.
-void CSourceAL::setStreaming(bool /* streaming */)
+void CSourceAL::setStreaming(bool streaming)
 {
 	nlassert(isStopped());
 
@@ -154,6 +116,7 @@ void CSourceAL::setStreaming(bool /* streaming */)
 	alSourcei(_Source, AL_BUFFER, AL_NONE);
 	alTestError();
 	_Buffer = NULL;
+	_IsStreaming = streaming;
 }
 
 /* Set the buffer that will be played (no streaming)
@@ -199,11 +162,10 @@ void CSourceAL::submitStreamingBuffer(IBuffer *buffer)
 	CBufferAL *bufferAL = static_cast<CBufferAL *>(buffer);
 	ALuint bufferName = bufferAL->bufferName();
 	nlassert(bufferName);
-
-	// queue the buffer
 	alSourceQueueBuffers(_Source, 1, &bufferName);
 	alTestError();
-
+	_QueuedBuffers.push(bufferAL);
+	
 	// Resume playback if the internal OpenAL source stopped due to buffer underrun.
 	ALint srcstate;
 	alGetSourcei(_Source, AL_SOURCE_STATE, &srcstate);
@@ -218,11 +180,23 @@ void CSourceAL::submitStreamingBuffer(IBuffer *buffer)
 /// Return the amount of buffers in the queue (playing and waiting). 3 buffers is optimal.
 uint CSourceAL::countStreamingBuffers() const
 {
+	// a bit ugly here, but makes a much easier/simpler implementation on both drivers
+	ALint buffersProcessed;
+	alGetSourcei(_Source, AL_BUFFERS_PROCESSED, &buffersProcessed);
+	while (buffersProcessed)
+	{
+		ALuint bufferName = _QueuedBuffers.front()->bufferName();
+		alSourceUnqueueBuffers(_Source, 1, &bufferName);
+		alTestError();
+		const_cast<std::queue<CBufferAL *> &>(_QueuedBuffers).pop();
+		--buffersProcessed;
+	}
 	// return how many are left in the queue
-	ALint buffersQueued;
-	alGetSourcei(_Source, AL_BUFFERS_QUEUED, &buffersQueued);
-	alTestError();
-	return (uint)buffersQueued;
+	//ALint buffersQueued;
+	//alGetSourcei(_SourceName, AL_BUFFERS_QUEUED, &buffersQueued);
+	//alTestError();
+	//return (uint)buffersQueued;
+	return (uint)_QueuedBuffers.size();
 }
 
 /// Set looping on/off for future playbacks (default: off)
@@ -244,28 +218,44 @@ bool CSourceAL::getLooping() const
 /// Play the static buffer (or stream in and play)
 bool CSourceAL::play()
 {
-	if ( _Buffer != NULL )
+#ifdef NLSOUND_DEBUG_GAIN
+	if (_IsStreaming)
+	{
+		nlwarning("Called play on a streaming source");
+	}
+#endif
+
+	// Commit 3D changes before starting play
+	if (_SoundDriver->getOption(ISoundDriver::OptionManualRolloff))
+		updateManualRolloff();
+
+	if (_Buffer)
 	{
 		// Static playing mode
 		_IsPaused = false;
 		alSourcePlay(_Source);
-		_IsPlaying = alGetError() == AL_NO_ERROR;
+		_IsPlaying = (alGetError() == AL_NO_ERROR);
 		if (_IsPlaying)
 			_StartTime = CTime::getLocalTime();
 		return _IsPlaying;
 	}
-	else
+	else if (_IsStreaming)
 	{
-		// TODO: Verify streaming mode?
 		_IsPaused = false;
 		alSourcePlay(_Source);
-		_IsPlaying = true;
-		_StartTime = CTime::getLocalTime();
-		return true;
+		_IsPlaying = (alGetError() == AL_NO_ERROR);
+		if (_IsPlaying)
+			_StartTime = CTime::getLocalTime(); // TODO: Played time should freeze when buffering fails, and be calculated based on the number of buffers played plus passed time. This is necessary for synchronizing animation with sound.
+		return _IsPlaying;
 		// Streaming mode
 		//nlwarning("AL: Cannot play null buffer; streaming not implemented" );
 		//nlstop;
 	}
+	else
+	{
+		nlwarning("Invalid play call, not streaming and no static buffer assigned");
+		return false;
+	}
 }
 
 /// Stop playing
@@ -288,8 +278,14 @@ void CSourceAL::stop()
 		_IsPaused = false;
 		alSourceStop(_Source);
 		alTestError();
-
-		unqueueBuffers();
+		// unqueue buffers
+		while (_QueuedBuffers.size())
+		{
+			ALuint bufferName = _QueuedBuffers.front()->bufferName();
+			alSourceUnqueueBuffers(_Source, 1, &bufferName);
+			_QueuedBuffers.pop();
+			alTestError();
+		}
 		// Streaming mode
 		//nlwarning("AL: Cannot stop null buffer; streaming not implemented" );
 		//nlstop;
@@ -379,8 +375,7 @@ bool CSourceAL::isPaused() const
 uint32 CSourceAL::getTime()
 {
 	if (!_StartTime) return 0;
-
-	return (uint32)(CTime::getLocalTime() - _StartTime);
+ 	 return (uint32)(CTime::getLocalTime() - _StartTime);
 }
 
 /// Set the position vector.
@@ -438,27 +433,28 @@ void CSourceAL::getDirection( NLMISC::CVector& dir ) const
 void CSourceAL::setGain(float gain)
 {
 	_Gain = std::min(std::max(gain, NLSOUND_MIN_GAIN), NLSOUND_MAX_GAIN);
-
-	if ((_SoundDriver == NULL) || !_SoundDriver->getOption(ISoundDriver::OptionManualRolloff))
+	if (!_SoundDriver->getOption(ISoundDriver::OptionManualRolloff))
 	{
-		float gain = _Gain;
-
-		// apply SFX volume
-		if (_SoundDriver && _Type == SourceSound)
-			gain *= _SoundDriver->getGain();
-
-		alSourcef(_Source, AL_GAIN, gain);
+		alSourcef(_Source, AL_GAIN, _Gain);
 		alTestError();
 	}
+#ifdef NLSOUND_DEBUG_GAIN
+	else
+	{
+		nlwarning("Called setGain(), manual rolloff, commit deferred to play or update, physical gain is %f, configured gain is %f", gain, _Gain);
+	}
+#endif
 }
 
 /// Get the gain
 float CSourceAL::getGain() const
 {
-	//ALfloat gain;
-	//alGetSourcef(_Source, AL_GAIN, &gain);
-	//alTestError();
-	//return gain;
+#ifdef NLSOUND_DEBUG_GAIN
+	ALfloat gain;
+	alGetSourcef(_Source, AL_GAIN, &gain);
+	nlwarning("Called getGain(), physical gain is %f, configured gain is %f", gain, _Gain);
+	alTestError();
+#endif
 	return _Gain;
 }
 
@@ -481,7 +477,7 @@ float CSourceAL::getPitch() const
 /// Set the source relative mode. If true, positions are interpreted relative to the listener position.
 void CSourceAL::setSourceRelativeMode( bool mode )
 {
-	_PosRelative = mode;
+	_RelativeMode = mode;
 	alSourcei(_Source, AL_SOURCE_RELATIVE, mode?AL_TRUE:AL_FALSE );
 	alTestError();
 }
@@ -489,21 +485,28 @@ void CSourceAL::setSourceRelativeMode( bool mode )
 /// Get the source relative mode (3D mode only)
 bool CSourceAL::getSourceRelativeMode() const
 {
-	return _PosRelative;
-//	ALint b;
-//	alGetSourcei(_Source, AL_SOURCE_RELATIVE, &b );
-//	alTestError();
-//	return (b==AL_TRUE);
+	//ALint b;
+	//alGetSourcei(_Source, AL_SOURCE_RELATIVE, &b );
+	//alTestError();
+	//return (b==AL_TRUE);
+	return _RelativeMode;
 }
 
 /// Set the min and max distances (3D mode only)
 void CSourceAL::setMinMaxDistances( float mindist, float maxdist, bool /* deferred */)
 {
 	nlassert( (mindist >= 0.0f) && (maxdist >= 0.0f) );
+
+	static float maxSqrt = sqrt(std::numeric_limits<float>::max());
+ 	if (maxdist >= maxSqrt)
+ 	{
+ 	       nlwarning("SOUND_DEV (OpenAL): Ridiculously high max distance set on source");
+ 	       maxdist = maxSqrt;
+ 	}
+
 	_MinDistance = mindist;
 	_MaxDistance = maxdist;
-
-	if (!_SoundDriver || !_SoundDriver->getOption(ISoundDriver::OptionManualRolloff))
+	if (!_SoundDriver->getOption(ISoundDriver::OptionManualRolloff))
 	{
 		alSourcef(_Source, AL_REFERENCE_DISTANCE, mindist);
 		alSourcef(_Source, AL_MAX_DISTANCE, maxdist);
@@ -805,122 +808,4 @@ float CSourceAL::getEffectFilterPassGain() const
 	return _EffectFilterPassGain;
 }
 
-/// Get already processed buffers and unqueue them
-void CSourceAL::getProcessedStreamingBuffers(std::vector<CBufferAL*> &buffers)
-{
-	// get the number of processed buffers
-	ALint buffersProcessed;
-	alGetSourcei(_Source, AL_BUFFERS_PROCESSED, &buffersProcessed);
-	alTestError();
-
-	// exit if more processed buffer than allocated ones
-	if ((uint)buffersProcessed > _BuffersMax) return;
-
-	// unqueue all previously processed buffers and get their name
-	alSourceUnqueueBuffers(_Source, buffersProcessed, &(_BuffersName[0]));
-	alTestError();
-
-	// add each processed buffer to the array
-	for(uint i = 0; i < (uint)buffersProcessed; ++i)
-	{
-		// if buffer is found, return it
-		std::map<uint, CBufferAL*>::const_iterator it = _Buffers.find(_BuffersName[i]);
-		if (it != _Buffers.end())
-			buffers.push_back(it->second);
-	}
-}
-
-/// Get all existing buffers
-void CSourceAL::getStreamingBuffers(std::vector<CBufferAL*> &buffers)
-{
-	std::map<uint, CBufferAL*>::const_iterator it = _Buffers.begin(), iend = _Buffers.end();
-	while(it != iend)
-	{
-		buffers.push_back(it->second);
-		++it;
-	}
-}
-
-/// Unqueue all buffers
-void CSourceAL::unqueueBuffers()
-{
-	// get count of buffers in queue
-	uint count = countStreamingBuffers();
-
-	if (count > 0)
-	{
-		// unqueue all of them
-		alSourceUnqueueBuffers(_Source, count, &(_BuffersName[0]));
-		alTestError();
-	}
-}
-
-/// Delete all allocated buffers
-void CSourceAL::removeBuffers()
-{
-	// delete each buffer
-	std::map<uint, CBufferAL*>::const_iterator it = _Buffers.begin(), iend = _Buffers.end();
-	while(it != iend)
-	{
-		delete it->second;
-		++it;
-	}
-
-	_Buffers.clear();
-}
-
-/// Get available streaming buffers count
-uint CSourceAL::getStreamingBuffersMax() const
-{
-	return _BuffersMax;
-}
-
-/// Set available streaming buffers count and allocate them
-void CSourceAL::setStreamingBuffersMax(uint buffers)
-{
-	// remember previous value
-	uint oldBuffersMax = _BuffersMax;
-
-	_BuffersMax = buffers;
-
-	// resize the temporary buffer names array
-	_BuffersName.resize(buffers);
-
-	// remove all buffers
-	unqueueBuffers();
-	removeBuffers();
-
-	for(uint i = 0; i < _BuffersMax; ++i)
-	{
-		try
-		{
-			// create a new buffer
-			CBufferAL *buffer = static_cast<CBufferAL*>(_SoundDriver->createBuffer());
-			// use StorageSoftware because buffers will be reused
-			// deleting and recreating them is a waste of time
-			buffer->setStorageMode(IBuffer::StorageSoftware);
-			_Buffers[buffer->bufferName()] = buffer;
-		}
-		catch(const ESoundDriverGenBuf &e)
-		{
-			nlwarning("Cannot create %d buffers. openal fails after %d buffers", buffers, i);
-			_BuffersMax = i;
-			_BuffersName.resize(i);
-			break;
-		}
-	}
-}
-
-/// Set the default size for streaming buffers
-void CSourceAL::setStreamingBufferSize(uint size)
-{
-	_BufferSize = size;
-}
-
-/// Get the default size for streaming buffers
-uint CSourceAL::getStreamingBufferSize() const
-{
-	return _BufferSize;
-}
-
 } // NLSOUND
diff --git a/code/nel/src/sound/driver/openal/source_al.h b/code/nel/src/sound/driver/openal/source_al.h
index b5611b997..53c77cb7f 100644
--- a/code/nel/src/sound/driver/openal/source_al.h
+++ b/code/nel/src/sound/driver/openal/source_al.h
@@ -17,17 +17,14 @@
 #ifndef NL_SOURCE_AL_H
 #define NL_SOURCE_AL_H
 
-#include "nel/sound/driver/source.h"
+#include <nel/sound/driver/source.h>
 
-namespace NLSOUND
-{
+namespace NLSOUND {
 	class IBuffer;
 	class CBufferAL;
 	class CSoundDriverAL;
 	class CEffectAL;
 
-	enum TSourceType { SourceSound, SourceMusic };
-
 /**
  * OpenAL sound source
  *
@@ -50,29 +47,22 @@ private:
 	/// Sound driver
 	CSoundDriverAL *_SoundDriver;
 
+	/// Assigned buffer object
+	CBufferAL *_Buffer;
+	std::queue<CBufferAL *> _QueuedBuffers;
+	
 	/// AL Handles
 	ALuint _Source;
 	ALuint _DirectFilter, _EffectFilter;
-
-	/// Assigned buffer object
-	CBufferAL *_Buffer;
-	/// Queued buffers map (uint is buffer name)
-	std::map<uint, CBufferAL *> _Buffers;
-
-	/// Temporary queued buffers array
-	std::vector<ALuint>	_BuffersName;
-	/// Max count of queued buffers allowed
-	uint				_BuffersMax;
-	/// Default size of a buffer
-	uint				_BufferSize;
-
-	/// Position is relative to listener
-	bool				_PosRelative;
-
+	
 	/// Playing status
 	bool _IsPlaying;
 	bool _IsPaused;
-	NLMISC::TTime	_StartTime;
+	NLMISC::TTime _StartTime;
+
+	bool _IsStreaming;
+	bool _RelativeMode;
+
 	NLMISC::CVector _Pos;
 	float _Gain;
 	double _Alpha;
@@ -90,9 +80,6 @@ private:
 	TFilter _DirectFilterType, _EffectFilterType;
 	bool _DirectFilterEnabled, _EffectFilterEnabled;
 	float _DirectFilterPassGain, _EffectFilterPassGain;
-
-	/// Source type can be SourceSound or SourceMusic
-	TSourceType		_Type;
 	
 public:	
 	/// Constructor
@@ -104,13 +91,8 @@ public:
 	void release();
 	
 	/// Return the OpenAL source name
-	ALuint getSource() const { return _Source; }
-
-	/// Set type of the source
-	void setType(TSourceType type);
-	/// Get type of the source
-	TSourceType getType() const;
-
+	inline ALuint getSource() const { return _Source; }
+	
 	/// (Internal) Set the effect send for this source, NULL to disable.
 	void setEffect(CEffectAL *effect);
 	/// (Internal) Setup the direct send filter.
@@ -275,22 +257,6 @@ public:
 	virtual float getEffectFilterPassGain() const;
 	//@}
 	
-	/// Get already processed buffers and unqueue them
-	void getProcessedStreamingBuffers(std::vector<CBufferAL*> &buffers);
-	/// Get all existing buffers
-	void getStreamingBuffers(std::vector<CBufferAL*> &buffers);
-	/// Unqueue all buffers
-	void unqueueBuffers();
-	/// Delete all allocated buffers
-	void removeBuffers();
-	/// Get available streaming buffers count
-	uint getStreamingBuffersMax() const;
-	/// Set available streaming buffers count and allocate them
-	void setStreamingBuffersMax(uint max);
-	/// Set the default size for streaming buffers
-	void setStreamingBufferSize(uint size);
-	/// Get the default size for streaming buffers
-	uint getStreamingBufferSize() const;
 };
 
 } // NLSOUND
diff --git a/code/nel/src/sound/driver/openal/stdopenal.h b/code/nel/src/sound/driver/openal/stdopenal.h
index 12960d57f..1661ef6fe 100644
--- a/code/nel/src/sound/driver/openal/stdopenal.h
+++ b/code/nel/src/sound/driver/openal/stdopenal.h
@@ -58,6 +58,5 @@
 #include "nel/sound/driver/source.h"
 #include "nel/sound/driver/listener.h"
 #include "nel/sound/driver/effect.h"
-#include "nel/sound/driver/music_buffer.h"
 
 /* end of file */
diff --git a/code/nel/src/sound/driver/source.cpp b/code/nel/src/sound/driver/source.cpp
index ace98ff81..2f96d74d8 100644
--- a/code/nel/src/sound/driver/source.cpp
+++ b/code/nel/src/sound/driver/source.cpp
@@ -26,15 +26,12 @@ namespace NLSOUND
 // common method used only with OptionManualRolloff. return the volume in 1/100th DB ( = mB) modified
 sint32 ISource::computeManualRollOff(sint32 volumeMB, sint32 mbMin, sint32 mbMax, double alpha, float sqrdist, float distMin, float distMax)
 {
-	// root square of max float value
-	static float maxSqrt = sqrt(std::numeric_limits<float>::max());
-
 	if (sqrdist < distMin * distMin)
 	{
 		// no attenuation
 		return volumeMB;
 	}
-	else if ((distMax < maxSqrt) && (sqrdist > distMax * distMax))
+	else if (sqrdist > distMax * distMax)
 	{
 		// full attenuation
 		return mbMin;
diff --git a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp
deleted file mode 100644
index 4110ecf41..000000000
--- a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.cpp
+++ /dev/null
@@ -1,248 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#include "stdxaudio2.h"
-
-// Project includes
-#include "sound_driver_xaudio2.h"
-#include "music_channel_xaudio2.h"
-
-using namespace std;
-using namespace NLMISC;
-
-namespace NLSOUND {
-
-CMusicChannelXAudio2::CMusicChannelXAudio2(CSoundDriverXAudio2 *soundDriver) 
-: _MusicBuffer(NULL), _SourceVoice(NULL), _BufferPos(0), _SoundDriver(soundDriver), _Gain(1.0)
-{
-	nlwarning(NLSOUND_XAUDIO2_PREFIX "Initializing CMusicChannelXAudio2");
-	
-	stop();
-}
-
-CMusicChannelXAudio2::~CMusicChannelXAudio2()
-{
-	release();
-	if (_SoundDriver) { _SoundDriver->removeMusicChannel(this); _SoundDriver = NULL; }
-	
-	nlwarning(NLSOUND_XAUDIO2_PREFIX "Destroying CMusicChannelXAudio2");
-}
-
-void CMusicChannelXAudio2::release()
-{
-	nlwarning(NLSOUND_XAUDIO2_PREFIX "Releasing CMusicChannelXAudio2");
-	
-	stop();
-}
-
-/** Play some music (.ogg etc...)
- *	NB: if an old music was played, it is first stop with stopMusic()
- *	\param filepath file path, CPath::lookup is done here
- *  \param async stream music from hard disk, preload in memory if false
- *	\param loop must be true to play the music in loop. 
- */
-bool CMusicChannelXAudio2::play(const std::string &filepath, bool async, bool loop)
-{
-	// nlinfo(NLSOUND_XAUDIO2_PREFIX "play %s %u", filepath.c_str(), (uint32)loop);
-
-	_SoundDriver->performanceIncreaseMusicPlayCounter();
-
-	HRESULT hr;
-
-	stop();
-
-	_MusicBuffer = IMusicBuffer::createMusicBuffer(filepath, async, loop);
-	
-	if (_MusicBuffer)
-	{
-		WAVEFORMATEX wfe;
-		wfe.cbSize = 0;
-		wfe.wFormatTag = WAVE_FORMAT_PCM; // todo: getFormat();
-		wfe.nChannels = _MusicBuffer->getChannels();
-		wfe.wBitsPerSample = _MusicBuffer->getBitsPerSample();
-		wfe.nSamplesPerSec = _MusicBuffer->getSamplesPerSec();
-		wfe.nBlockAlign = wfe.nChannels * wfe.wBitsPerSample / 8;
-		wfe.nAvgBytesPerSec = wfe.nSamplesPerSec * wfe.nBlockAlign;
-
-		XAUDIO2_VOICE_DETAILS voice_details;
-		_SoundDriver->getMasteringVoice()->GetVoiceDetails(&voice_details);
-
-		// nlinfo(NLSOUND_XAUDIO2_PREFIX "Creating music voice with %u channels, %u bits per sample, %u samples per sec, "
-		// 	"on mastering voice with %u channels, %u samples per sec", 
-		// 	(uint32)wfe.nChannels, (uint32)wfe.wBitsPerSample, (uint32)wfe.nSamplesPerSec, 
-		// 	(uint32)voice_details.InputChannels, (uint32)voice_details.InputSampleRate);
-
-		if (FAILED(hr = _SoundDriver->getXAudio2()->CreateSourceVoice(&_SourceVoice, &wfe, XAUDIO2_VOICE_NOPITCH, 1.0f, this, NULL, NULL)))
-		{ 
-			nlwarning(NLSOUND_XAUDIO2_PREFIX "FAILED CreateSourceVoice"); 
-			stop(); return false; 
-		}
-
-		_SourceVoice->SetVolume(_Gain);
-		_SourceVoice->Start(0);
-	}
-	else
-	{
-		nlwarning(NLSOUND_XAUDIO2_PREFIX "no _MusicBuffer");
-		return false;
-	}
-	
-	return true;
-}
-
-/// Stop the music previously loaded and played (the Memory is also freed)
-void CMusicChannelXAudio2::stop()
-{
-	if (_SourceVoice) { _SourceVoice->DestroyVoice(); _SourceVoice = NULL; }
-	if (_MusicBuffer) { delete _MusicBuffer; _MusicBuffer = NULL; }
-	// memset(_Buffer, 0, sizeof(_Buffer));
-	_BufferPos = 0;
-}
-
-/** Pause the music previously loaded and played (the Memory is not freed)
- */
-void CMusicChannelXAudio2::pause()
-{
-	if (_SourceVoice) _SourceVoice->Stop(0);
-}
-
-/// Resume the music previously paused
-void CMusicChannelXAudio2::resume()
-{
-	if (_SourceVoice) _SourceVoice->Start(0);
-}
-
-/// Return true if a song is finished.
-bool CMusicChannelXAudio2::isEnded()
-{
-	if (_MusicBuffer)
-	{
-		if (!_MusicBuffer->isMusicEnded())
-			return false;
-	}
-	if (_SourceVoice)
-	{
-		XAUDIO2_VOICE_STATE voice_state;
-		_SourceVoice->GetState(&voice_state);
-		if (voice_state.BuffersQueued)
-		{
-			// nldebug(NLSOUND_XAUDIO2_PREFIX "isEnded() -> voice_state.BuffersQueued, wait ...");
-			return false;
-		}
-	}
-	// nldebug(NLSOUND_XAUDIO2_PREFIX "isEnded() -> stop()");
-	stop();
-	return true;
-}
-
-/// Return true if the song is still loading asynchronously and hasn't started playing yet (false if not async), used to delay fading
-bool CMusicChannelXAudio2::isLoadingAsync()
-{
-	return false;
-}
-
-/// Return the total length (in second) of the music currently played
-float CMusicChannelXAudio2::getLength()
-{
-	if (_MusicBuffer) return _MusicBuffer->getLength(); 
-	else return .0f;
-}
-
-/** Set the music volume (if any music played). (volume value inside [0 , 1]) (default: 1)
- *	NB: the volume of music is NOT affected by IListener::setGain()
- */
-void CMusicChannelXAudio2::setVolume(float gain)
-{
-	_Gain = gain;
-	if (_SourceVoice) _SourceVoice->SetVolume(gain);
-}
-
-void CMusicChannelXAudio2::OnVoiceProcessingPassStart(UINT32 BytesRequired)
-{	
-	if (BytesRequired > 0)
-	{
-		// nlwarning(NLSOUND_XAUDIO2_PREFIX "Bytes Required: %u", BytesRequired); // byte req to not have disruption
-		
-		if (_MusicBuffer)
-		{
-			uint32 minimum = BytesRequired * 2; // give some more than required :p
-			if (_MusicBuffer->getRequiredBytes() > minimum) minimum = _MusicBuffer->getRequiredBytes();
-			if (minimum > sizeof(_Buffer) - _BufferPos) _BufferPos = 0;
-			uint32 maximum = sizeof(_Buffer) - _BufferPos;
-			uint8 *buffer = &_Buffer[_BufferPos];
-			uint32 length = _MusicBuffer->getNextBytes(buffer, minimum, maximum);
-			_BufferPos += length;
-
-			if (length)
-			{
-				XAUDIO2_BUFFER xbuffer;
-				xbuffer.AudioBytes = length;
-				xbuffer.Flags = 0;
-				xbuffer.LoopBegin = 0;
-				xbuffer.LoopCount = 0;
-				xbuffer.LoopLength = 0;
-				xbuffer.pAudioData = buffer;
-				xbuffer.pContext = NULL; // nothing here for now
-				xbuffer.PlayBegin = 0;
-				xbuffer.PlayLength = 0;
-
-				_SourceVoice->SubmitSourceBuffer(&xbuffer);
-			}
-			else
-			{
-				// nldebug(NLSOUND_XAUDIO2_PREFIX "!length -> delete _MusicBuffer");
-				// set member var to null before deleting it to avoid crashing main thread
-				IMusicBuffer *music_buffer = _MusicBuffer;
-				_MusicBuffer = NULL; delete music_buffer;
-				_SourceVoice->Discontinuity();
-			}
-		}
-	}
-}
-
-void CMusicChannelXAudio2::OnVoiceProcessingPassEnd()
-{ 
-	
-}
-
-void CMusicChannelXAudio2::OnStreamEnd()
-{ 
-	
-}
-
-void CMusicChannelXAudio2::OnBufferStart(void * /* pBufferContext */)
-{	
-	
-}
-
-void CMusicChannelXAudio2::OnBufferEnd(void * /* pBufferContext */)
-{ 
-	
-}
-
-void CMusicChannelXAudio2::OnLoopEnd(void * /* pBufferContext */)
-{	
-	
-}
-
-void CMusicChannelXAudio2::OnVoiceError(void * /* pBufferContext */, HRESULT /*  Error */)
-{ 
-	
-}
-
-} /* namespace NLSOUND */
-
-/* end of file */
diff --git a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h b/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h
deleted file mode 100644
index ade13e25f..000000000
--- a/code/nel/src/sound/driver/xaudio2/music_channel_xaudio2.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// NeL - MMORPG Framework <http://dev.ryzom.com/projects/nel/>
-// Copyright (C) 2010  Winch Gate Property Limited
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef NLSOUND_MUSIC_CHANNEL_XAUDIO2_H
-#define NLSOUND_MUSIC_CHANNEL_XAUDIO2_H
-
-#include <nel/sound/driver/music_channel.h>
-
-namespace NLSOUND {
-	class CSoundDriverXAudio2;
-	class IMusicBuffer;
-
-/**
- * \brief CMusicChannelXAudio2
- * \date 2008-08-30 13:31GMT
- * \author Jan Boon (Kaetemi)
- * CMusicChannelXAudio2 is an implementation of the IMusicChannel interface to run on XAudio2.
- * TODO: Properly decode the audio on a seperate thread.
- * TODO: Change IMusicChannel to IAudioStream, and fix the interface to make more sense.
- */
-class CMusicChannelXAudio2 : public IMusicChannel, IXAudio2VoiceCallback
-{
-protected:
-	// outside pointers
-	CSoundDriverXAudio2 *_SoundDriver;
-	
-	// pointers
-	IMusicBuffer *_MusicBuffer;
-	IXAudio2SourceVoice *_SourceVoice;
-	// todo: thread for async loading of music buffer and source voice
-	// isasyncloading checks if thread exists
-	// isended checks if not async loading too
-	
-	// instances
-	uint8 _Buffer[64 * 1024]; // no specific reason, lol
-	uint32 _BufferPos; // 0
-	float _Gain;
-
-public:
-	CMusicChannelXAudio2(CSoundDriverXAudio2 *soundDriver);
-	virtual ~CMusicChannelXAudio2();
-	void release();
-
-private:
-	// XAudio2 Callbacks
-	// Called just before this voice's processing pass begins.
-	STDMETHOD_(void, OnVoiceProcessingPassStart) (THIS_ UINT32 BytesRequired);
-	// Called just after this voice's processing pass ends.
-	STDMETHOD_(void, OnVoiceProcessingPassEnd) (THIS);
-	// Called when this voice has just finished playing a buffer stream
-	// (as marked with the XAUDIO2_END_OF_STREAM flag on the last buffer).
-	STDMETHOD_(void, OnStreamEnd) (THIS);
-	// Called when this voice is about to start processing a new buffer.
-	STDMETHOD_(void, OnBufferStart) (THIS_ void* pBufferContext);
-	// Called when this voice has just finished processing a buffer.
-	// The buffer can now be reused or destroyed.
-	STDMETHOD_(void, OnBufferEnd) (THIS_ void* pBufferContext);
-	// Called when this voice has just reached the end position of a loop.
-	STDMETHOD_(void, OnLoopEnd) (THIS_ void* pBufferContext);
-	// Called in the event of a critical error during voice processing,
-	// such as a failing XAPO or an error from the hardware XMA decoder.
-	// The voice may have to be destroyed and re-created to recover from
-	// the error.  The callback arguments report which buffer was being
-	// processed when the error occurred, and its HRESULT code.
-	STDMETHOD_(void, OnVoiceError) (THIS_ void* pBufferContext, HRESULT Error);
-
-public:
-	/** Play some music (.ogg etc...)
-	 *	NB: if an old music was played, it is first stop with stopMusic()
-	 *	\param filepath file path, CPath::lookup is done here
-	 *  \param async stream music from hard disk, preload in memory if false
-	 *	\param loop must be true to play the music in loop. 
-	 */
-	virtual bool play(const std::string &filepath, bool async, bool loop); 
-
-	/// Stop the music previously loaded and played (the Memory is also freed)
-	virtual void stop();
-
-	/// Pause the music previously loaded and played (the Memory is not freed)
-	virtual void pause();
-	
-	/// Resume the music previously paused
-	virtual void resume();
-
-	/// Return true if a song is finished.
-	virtual bool isEnded();
-
-	/// Return true if the song is still loading asynchronously and hasn't started playing yet (false if not async), used to delay fading
-	virtual bool isLoadingAsync();
-	
-	/// Return the total length (in second) of the music currently played
-	virtual float getLength();
-	
-	/** Set the music volume (if any music played). (volume value inside [0 , 1]) (default: 1)
-	 *	NB: the volume of music is NOT affected by IListener::setGain()
-	 */
-	virtual void setVolume(float gain);
-}; /* class CMusicChannelXAudio2 */
-
-} /* namespace NLSOUND */
-
-#endif /* #ifndef NLSOUND_MUSIC_CHANNEL_XAUDIO2_H */
-
-/* end of file */
diff --git a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
index 826f9973b..7c4ea9bbf 100644
--- a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
+++ b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.cpp
@@ -19,7 +19,6 @@
 // Project includes
 #include "listener_xaudio2.h"
 #include "source_xaudio2.h"
-#include "music_channel_xaudio2.h"
 #include "effect_xaudio2.h"
 #include "sound_driver_xaudio2.h"
 
@@ -132,8 +131,7 @@ CSoundDriverXAudio2::CSoundDriverXAudio2(ISoundDriver::IStringMapperProvider * /
 	: _XAudio2(NULL), _MasteringVoice(NULL), _Listener(NULL), 
 	_SoundDriverOk(false), _CoInitOk(false), _OperationSetCounter(65536), 
 	_PerformanceCommit3DCounter(0), _PerformanceADPCMBufferSize(0), 
-	_PerformancePCMBufferSize(0), _PerformanceMusicPlayCounter(0), 
-	_PerformanceSourcePlayCounter(0)
+	_PerformancePCMBufferSize(0), _PerformanceSourcePlayCounter(0)
 {
 	nlwarning(NLSOUND_XAUDIO2_PREFIX "Creating CSoundDriverXAudio2");
 
@@ -200,14 +198,6 @@ void CSoundDriverXAudio2::release()
 	// WARNING: Only internal resources are released here, 
 	// the created instances must still be released by the user!
 
-	// Release internal resources of all remaining IMusicChannel instances
-	if (_MusicChannels.size())
-	{
-		nlwarning(NLSOUND_XAUDIO2_PREFIX "_MusicChannels.size(): '%u'", (uint32)_MusicChannels.size());
-		set<CMusicChannelXAudio2 *>::iterator it(_MusicChannels.begin()), end(_MusicChannels.end());
-		for (; it != end; ++it) (*it)->release();
-		_MusicChannels.clear();
-	}
 	// Release internal resources of all remaining ISource instances
 	if (_Sources.size())
 	{
@@ -396,14 +386,6 @@ void CSoundDriverXAudio2::destroySourceVoice(IXAudio2SourceVoice *sourceVoice)
 	if (sourceVoice) sourceVoice->DestroyVoice();
 }
 
-/// Create a music channel
-IMusicChannel *CSoundDriverXAudio2::createMusicChannel()
-{
-	CMusicChannelXAudio2 *music_channel = new CMusicChannelXAudio2(this);
-	_MusicChannels.insert(music_channel);
-	return static_cast<IMusicChannel *>(music_channel);
-}
-
 /// Create the listener instance
 IListener *CSoundDriverXAudio2::createListener()
 {
@@ -481,7 +463,6 @@ void CSoundDriverXAudio2::writeProfile(std::string& out)
 		+ "\n\tPCMBufferSize: " + toString(_PerformancePCMBufferSize)
 		+ "\n\tADPCMBufferSize: " + toString(_PerformanceADPCMBufferSize)
 		+ "\n\tSourcePlayCounter: " + toString(_PerformanceSourcePlayCounter)
-		+ "\n\tMusicPlayCounter: " + toString(_PerformanceMusicPlayCounter)
 		+ "\n\tCommit3DCounter: " + toString(_PerformanceCommit3DCounter)
 		+ "\nXAUDIO2_PERFORMANCE_DATA"
 		+ "\n\tAudioCyclesSinceLastQuery: " + toString(performance.AudioCyclesSinceLastQuery)
@@ -519,17 +500,6 @@ void CSoundDriverXAudio2::displayBench(NLMISC::CLog *log)
 	NLMISC::CHTimer::display(log, CHTimer::TotalTime);
 }
 
-/** Get music info. Returns false if the song is not found or the function is not implemented.
- *  \param filepath path to file, CPath::lookup done by driver
- *  \param artist returns the song artist (empty if not available)
- *  \param title returns the title (empty if not available)
- */
-bool CSoundDriverXAudio2::getMusicInfo(const std::string &filepath, std::string &artist, std::string &title)
-{
-	// add support for additional non-standard music file types info here
-	return IMusicBuffer::getInfo(filepath, artist, title);
-}
-
 /// Remove a buffer (should be called by the friend destructor of the buffer class)
 void CSoundDriverXAudio2::removeBuffer(CBufferXAudio2 *buffer)
 {
@@ -543,13 +513,6 @@ void CSoundDriverXAudio2::removeSource(CSourceXAudio2 *source)
 	if (_Sources.find(source) != _Sources.end()) _Sources.erase(source);
 	else nlwarning("removeSource already called");
 }
-	
-/// (Internal) Remove a source (should be called by the destructor of the source class).
-void CSoundDriverXAudio2::removeMusicChannel(CMusicChannelXAudio2 *musicChannel)
-{
-	if (_MusicChannels.find(musicChannel) != _MusicChannels.end()) _MusicChannels.erase(musicChannel);
-	else nlwarning("removeMusicChannel already called");
-}
 
 /// (Internal) Remove an effect (should be called by the destructor of the effect class)
 void CSoundDriverXAudio2::removeEffect(CEffectXAudio2 *effect)
diff --git a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h
index 681d36254..bcf847a5f 100644
--- a/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h
+++ b/code/nel/src/sound/driver/xaudio2/sound_driver_xaudio2.h
@@ -62,8 +62,6 @@ protected:
 	std::set<CSourceXAudio2 *> _Sources;
 	/// Array with the allocated effects created by client code.
 	std::set<CEffectXAudio2 *> _Effects;
-	/// Array with the allocated music channels created by client code.
-	std::set<CMusicChannelXAudio2 *> _MusicChannels;
 	/// Initialization Handle of X3DAudio.
 	X3DAUDIO_HANDLE _X3DAudioHandle; //I
 	/// Operation set counter
@@ -73,7 +71,6 @@ protected:
 	uint _PerformancePCMBufferSize;
 	uint _PerformanceADPCMBufferSize;
 	uint _PerformanceSourcePlayCounter;
-	uint _PerformanceMusicPlayCounter;
 	uint _PerformanceCommit3DCounter;
 	
 	// user init vars
@@ -108,8 +105,6 @@ public:
 	}
 	/// (Internal) Increase the source play counter by one.
 	inline void performanceIncreaseSourcePlayCounter() { ++_PerformanceSourcePlayCounter; }
-	/// (Internal) Increase the music play counter by one.
-	inline void performanceIncreaseMusicPlayCounter() { ++_PerformanceMusicPlayCounter; }
 	/// (Internal) Increase the commit 3d counter by one.
 	inline void performanceIncreaseCommit3DCounter() { ++_PerformanceCommit3DCounter; }
 	
@@ -172,16 +167,6 @@ public:
 	virtual void startBench();
 	virtual void endBench();
 	virtual void displayBench(NLMISC::CLog *log);
-	
-	/// Create a music channel, destroy with destroyMusicChannel.
-	virtual IMusicChannel *createMusicChannel();
-	
-	/** Get music info. Returns false if the song is not found or the function is not implemented.
-	 *  \param filepath path to file, CPath::lookup done by driver
-	 *  \param artist returns the song artist (empty if not available)
-	 *  \param title returns the title (empty if not available)
-	 */
-	virtual bool getMusicInfo(const std::string &filepath, std::string &artist, std::string &title);
 
 	/// Get audio/container extensions that are supported natively by the driver implementation.
 	virtual void getMusicExtensions(std::vector<std::string> & /* extensions */) const { }
@@ -192,8 +177,6 @@ public:
 	void removeBuffer(CBufferXAudio2 *buffer);	
 	/// (Internal) Remove a source (should be called by the destructor of the source class).
 	void removeSource(CSourceXAudio2 *source);
-	/// (Internal) Remove a source (should be called by the destructor of the music channel class).
-	void removeMusicChannel(CMusicChannelXAudio2 *musicChannel);	
 	/// (Internal) Remove the listener (should be called by the destructor of the listener class)
 	inline void removeListener(CListenerXAudio2 *listener) { nlassert(_Listener == listener); _Listener = NULL; }
 	/// (Internal) Remove an effect (should be called by the destructor of the effect class)
diff --git a/code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp b/code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
index 9c34beaf8..318a65a1a 100644
--- a/code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
+++ b/code/nel/src/sound/driver/xaudio2/source_xaudio2.cpp
@@ -42,7 +42,7 @@ _DirectFilterPassGain(NLSOUND_DEFAULT_FILTER_PASS_GAIN), _EffectFilterPassGain(N
 _DirectFilterLowFrequency(NLSOUND_DEFAULT_FILTER_PASS_LF), _DirectFilterHighFrequency(NLSOUND_DEFAULT_FILTER_PASS_HF), 
 _EffectFilterLowFrequency(NLSOUND_DEFAULT_FILTER_PASS_LF), _EffectFilterHighFrequency(NLSOUND_DEFAULT_FILTER_PASS_HF), 
 _IsPlaying(false), _IsPaused(false), _IsLooping(false), _Pitch(1.0f), 
-_Gain(1.0f), _MinDistance(1.0f), _MaxDistance(numeric_limits<float>::max()),
+_Gain(1.0f), _MinDistance(1.0f), _MaxDistance(sqrt(numeric_limits<float>::max())),
 _AdpcmUtility(NULL), _Channels(0), _BitsPerSample(0), _BufferStreaming(false)
 {
 	// nlwarning(NLSOUND_XAUDIO2_PREFIX "Inititializing CSourceXAudio2");
@@ -121,8 +121,7 @@ void CSourceXAudio2::commit3DChanges()
 {
 	nlassert(_SourceVoice);
 	
-	// Only mono buffers get 3d sound, multi-channel buffers go directly to the speakers (calculate rolloff too!!).
-	// Todo: stereo buffers calculate distance ?
+	// Only mono buffers get 3d sound, multi-channel buffers go directly to the speakers without any distance rolloff.
 	if (_Channels > 1)
 	{
 		// _SoundDriver->getDSPSettings()->DstChannelCount = 1;
@@ -494,8 +493,10 @@ bool CSourceXAudio2::initFormat(IBuffer::TBufferFormat bufferFormat, uint8 chann
 	_SourceVoice->SetVolume(_Gain, _OperationSet);
 	setupVoiceSends();
 	_SoundDriver->getXAudio2()->CommitChanges(_OperationSet);
-
-
+	
+	// Also commit any 3D settings that were already done
+	commit3DChanges();
+	
 	// test
 	//XAUDIO2_VOICE_DETAILS voice_details;
 	//_SourceVoice->GetVoiceDetails(&voice_details);
@@ -535,7 +536,7 @@ bool CSourceXAudio2::preparePlay(IBuffer::TBufferFormat bufferFormat, uint8 chan
 		// destroy adpcm utility (if it exists)
 		delete _AdpcmUtility; _AdpcmUtility = NULL;
 		// reset current stuff
-		_Format = (IBuffer::TBufferFormat)~0;
+		_Format = IBuffer::FormatNotSet;
 		_Channels = 0;
 		_BitsPerSample = 0;
 	}
@@ -582,6 +583,11 @@ bool CSourceXAudio2::play()
 {	
 	// nldebug(NLSOUND_XAUDIO2_PREFIX "play");
 
+	// Commit 3D changes before starting play
+	if (_SourceVoice)
+		commit3DChanges();
+	// else it is commit by the preparePlay > initFormat function
+
 	if (_IsPaused)
 	{
 		if (SUCCEEDED(_SourceVoice->Start(0))) _IsPaused = false;
@@ -793,7 +799,14 @@ bool CSourceXAudio2::getSourceRelativeMode() const
 void CSourceXAudio2::setMinMaxDistances(float mindist, float maxdist, bool /* deferred */)
 {
 	// nldebug(NLSOUND_XAUDIO2_PREFIX "setMinMaxDistances %f, %f", mindist, maxdist);
-
+	
+	static float maxSqrt = sqrt(std::numeric_limits<float>::max());
+	if (maxdist >= maxSqrt)
+	{
+		nlwarning("SOUND_DEV (XAudio2): Ridiculously high max distance set on source");
+		maxdist = maxSqrt;
+	}
+	
 	_Emitter.InnerRadius = mindist;
 	_MinDistance = mindist;
 	_MaxDistance = maxdist;
diff --git a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h
index c043f3949..1a1d766e7 100644
--- a/code/nel/src/sound/driver/xaudio2/stdxaudio2.h
+++ b/code/nel/src/sound/driver/xaudio2/stdxaudio2.h
@@ -57,7 +57,6 @@
 #include "nel/sound/driver/listener.h"
 #include "nel/sound/driver/sound_driver.h"
 #include "nel/sound/driver/source.h"
-#include "nel/sound/driver/music_buffer.h"
 
 // Defines
 #define NLSOUND_XAUDIO2_NAME "NeLSound XAudio2 Driver"
diff --git a/code/nel/src/sound/group_controller.cpp b/code/nel/src/sound/group_controller.cpp
new file mode 100644
index 000000000..d01e29252
--- /dev/null
+++ b/code/nel/src/sound/group_controller.cpp
@@ -0,0 +1,129 @@
+/**
+ * \file group_controller.cpp
+ * \brief CGroupController
+ * \date 2012-04-10 09:29GMT
+ * \author Jan Boon (Kaetemi)
+ * CGroupController
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdsound.h"
+#include <nel/sound/group_controller.h>
+
+// STL includes
+
+// NeL includes
+// #include <nel/misc/debug.h>
+#include <nel/sound/source_common.h>
+
+// Project includes
+
+using namespace std;
+// using namespace NLMISC;
+
+namespace NLSOUND {
+
+CGroupController::CGroupController(CGroupController *parent) : 
+	m_Parent(parent), m_Gain(1.0f), m_NbSourcesInclChild(0)
+{
+	
+}
+
+CGroupController::~CGroupController()
+{
+	// If m_Sources is not empty, a crash is very likely.
+	nlassert(m_Sources.empty());
+
+	for (std::map<std::string, CGroupController *>::iterator it(m_Children.begin()), end(m_Children.end()); it != end; ++it)
+	{
+		delete it->second;
+		it->second = NULL;
+	}
+	m_Parent = NULL;
+}
+
+void CGroupController::addSource(CSourceCommon *source)
+{
+	nlassert(this);
+
+	m_Sources.insert(source);
+	increaseSources();
+}
+
+void CGroupController::removeSource(CSourceCommon *source)
+{
+	decreaseSources();
+	m_Sources.erase(source);
+}
+
+std::string CGroupController::getPath() // overridden by root
+{
+	for (std::map<std::string, CGroupController *>::iterator it(m_Parent->m_Children.begin()), end(m_Parent->m_Children.end()); it != end; ++it)
+	{
+		if (it->second == this)
+		{
+			const std::string &name = it->first;
+			std::string returnPath = m_Parent->getPath() + ":" + name;
+			return returnPath;
+		}
+	}
+	nlerror("Group Controller not child of parent");
+	return "";
+}
+
+void CGroupController::calculateFinalGain() // overridden by root
+{
+	m_FinalGain = calculateTotalGain() * m_Parent->getFinalGain();
+}
+
+void CGroupController::updateSourceGain()
+{
+	// Dont update source gain when this controller is inactive.
+	if (m_NbSourcesInclChild)
+	{
+		calculateFinalGain();
+		for (TSourceContainer::iterator it(m_Sources.begin()), end(m_Sources.end()); it != end; ++it)
+			(*it)->updateFinalGain();
+		for (std::map<std::string, CGroupController *>::iterator it(m_Children.begin()), end(m_Children.end()); it != end; ++it)
+			(*it).second->updateSourceGain();
+	}
+}
+
+void CGroupController::increaseSources() // overridden by root
+{
+	++m_NbSourcesInclChild;
+	m_Parent->increaseSources();
+	
+	// Update source gain when this controller was inactive before but the parent was active before.
+	// Thus, when this controller was the root of inactive controllers.
+	if (m_NbSourcesInclChild == 1 && m_Parent->m_NbSourcesInclChild > 1)
+		updateSourceGain();
+}
+
+void CGroupController::decreaseSources() // overridden by root
+{
+	--m_NbSourcesInclChild;
+	m_Parent->decreaseSources();
+}
+
+} /* namespace NLSOUND */
+
+/* end of file */
diff --git a/code/nel/src/sound/group_controller_root.cpp b/code/nel/src/sound/group_controller_root.cpp
new file mode 100644
index 000000000..0f1c58e63
--- /dev/null
+++ b/code/nel/src/sound/group_controller_root.cpp
@@ -0,0 +1,127 @@
+/**
+ * \file group_controller_root.cpp
+ * \brief CGroupControllerRoot
+ * \date 2012-04-10 09:44GMT
+ * \author Jan Boon (Kaetemi)
+ * CGroupControllerRoot
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdsound.h"
+#include <nel/sound/group_controller_root.h>
+
+// STL includes
+
+// NeL includes
+// #include <nel/misc/debug.h>
+#include <nel/misc/algo.h>
+
+// Project includes
+
+using namespace std;
+// using namespace NLMISC;
+
+#define NLSOUND_GROUP_CONTROLLER_ROOT_PATH "sound"
+
+namespace NLSOUND {
+
+CGroupControllerRoot::CGroupControllerRoot() : CGroupController(NULL)
+{
+	
+}
+
+CGroupControllerRoot::~CGroupControllerRoot()
+{
+	
+}
+
+std::string CGroupControllerRoot::getPath()
+{
+	// The root node is always called sound
+	return NLSOUND_GROUP_CONTROLLER_ROOT_PATH;
+}
+
+void CGroupControllerRoot::calculateFinalGain()
+{
+	m_FinalGain = calculateTotalGain();
+}
+
+void CGroupControllerRoot::increaseSources()
+{
+	++m_NbSourcesInclChild;
+
+	// Update source gain when this controller was inactive before.
+	if (m_NbSourcesInclChild == 1)
+		updateSourceGain();
+}
+
+void CGroupControllerRoot::decreaseSources()
+{
+	--m_NbSourcesInclChild;
+}
+
+bool CGroupControllerRoot::isReservedName(const std::string &nodeName)
+{
+	// These node names are reserved, in case these category controllers can be integrated with CDB.
+	// I do not forsee any functionality for changing environment effect settings for entire categories.
+	// The nodeName parameter is already lowercase, see CGroupControllerRoot::getGroupController.
+	if (nodeName == NLSOUND_GROUP_CONTROLLER_ROOT_PATH) return true; // Root node name can only used by root.
+	if (nodeName == "gain") return true;
+	if (nodeName == "pitch") return true;
+	if (nodeName == "enable" || nodeName == "enabled") return true;
+	return false;
+}
+
+CGroupController *CGroupControllerRoot::getGroupController(const std::string &path)
+{
+	std::vector<std::string> pathNodes;
+	NLMISC::splitString(NLMISC::toLower(path), ":", pathNodes);
+	CGroupController *active = this;
+	if (pathNodes[0] != NLSOUND_GROUP_CONTROLLER_ROOT_PATH)
+	{
+		nlerror("Root node for group controller must always be 'sound', invalid group '%s' requested", path.c_str());
+	}
+	for (std::vector<std::string>::iterator it(pathNodes.begin() + 1), end(pathNodes.end()); it != end; ++it)
+	{
+		if (!(*it).empty())
+		{
+			if (isReservedName(*it))
+			{
+				nlerror("Attempt to use reserved node name '%s' in group controller path '%s'", (*it).c_str(), path.c_str());
+			}
+			std::map<std::string, CGroupController *>::iterator found = active->m_Children.find(*it);
+			if (found == active->m_Children.end())
+			{
+				active = new CGroupController(active);
+				active->m_Parent->m_Children[*it] = active;
+			}
+			else
+			{
+				active = (*found).second;
+			}
+		}
+	}
+	return active;
+}
+
+} /* namespace NLSOUND */
+
+/* end of file */
diff --git a/code/nel/src/sound/music_channel_fader.cpp b/code/nel/src/sound/music_channel_fader.cpp
index ced739093..2fe9fb13c 100644
--- a/code/nel/src/sound/music_channel_fader.cpp
+++ b/code/nel/src/sound/music_channel_fader.cpp
@@ -20,6 +20,7 @@
 // Project includes
 #include "nel/sound/driver/sound_driver.h"
 #include "nel/sound/driver/music_channel.h"
+#include "nel/sound/source_music_channel.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -49,9 +50,16 @@ void CMusicChannelFader::init(ISoundDriver *soundDriver)
 		_MusicFader[i].MusicChannel = _SoundDriver->createMusicChannel();
 		if (!_MusicFader[i].MusicChannel)
 		{
-			release();
-			nlwarning("No music channel available!");
-			return;
+			if (_SoundDriver->getOption(ISoundDriver::OptionHasBufferStreaming))
+			{
+				_MusicFader[i].MusicChannel = new CSourceMusicChannel();
+			}
+			else
+			{
+				release();
+				nlwarning("No music channel available!");
+				return;
+			}
 		}
 	}
 }
@@ -69,6 +77,15 @@ void CMusicChannelFader::release()
 	}
 }
 
+void CMusicChannelFader::reset()
+{
+	for (uint i = 0; i < _MaxMusicFader; ++i) if (_MusicFader[i].MusicChannel) 
+	{
+		if (_MusicFader[i].MusicChannel)
+			_MusicFader[i].MusicChannel->reset();
+	}
+}
+
 void CMusicChannelFader::update()
 {
 	TTime current_time = CTime::getLocalTime();
diff --git a/code/nel/src/sound/music_sound.cpp b/code/nel/src/sound/music_sound.cpp
index 2b192c3c6..803103dd9 100644
--- a/code/nel/src/sound/music_sound.cpp
+++ b/code/nel/src/sound/music_sound.cpp
@@ -20,6 +20,9 @@
 #include "nel/misc/path.h"
 #include "nel/georges/u_form_elm.h"
 
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+#	include "nel/sound/group_controller_root.h"
+#endif
 
 using namespace std;
 using namespace NLMISC;
@@ -72,6 +75,10 @@ void		CMusicSound::importForm(const std::string& filename, NLGEORGES::UFormElm&
 	root.getValueByName(_MinimumPlayTime, ".SoundType.MinimumPlayTime");
 	root.getValueByName(_TimeBeforeCanReplay, ".SoundType.TimeBeforeCanReplay");
 
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_MUSIC_GROUP_CONTROLLER);
+#endif
+
 }
 
 // ***************************************************************************
@@ -97,6 +104,11 @@ void		CMusicSound::serial(NLMISC::IStream &s)
 	CStringMapper::serialString(s, _FileName);
 	s.serial(_FadeInLength, _FadeOutLength);
 	s.serial(_MinimumPlayTime, _TimeBeforeCanReplay);
+	
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+	if (s.isReading()) _GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_MUSIC_GROUP_CONTROLLER);
+#endif
+	
 }
 
 // ***************************************************************************
diff --git a/code/nel/src/sound/music_source.cpp b/code/nel/src/sound/music_source.cpp
index a47914dde..e5595d9f4 100644
--- a/code/nel/src/sound/music_source.cpp
+++ b/code/nel/src/sound/music_source.cpp
@@ -26,8 +26,8 @@ namespace NLSOUND {
 
 
 // ***************************************************************************
-CMusicSource::CMusicSource(CMusicSound *musicSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster)
-	:	CSourceCommon(musicSound, spawn, cb, cbUserParam, cluster)
+CMusicSource::CMusicSource(CMusicSound *musicSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
+	:	CSourceCommon(musicSound, spawn, cb, cbUserParam, cluster, groupController)
 {
 	_MusicSound= musicSound;
 }
diff --git a/code/nel/src/sound/simple_source.cpp b/code/nel/src/sound/simple_source.cpp
index fb0b7bc85..cce62cffd 100644
--- a/code/nel/src/sound/simple_source.cpp
+++ b/code/nel/src/sound/simple_source.cpp
@@ -28,11 +28,12 @@ using namespace NLMISC;
 
 namespace NLSOUND {
 
-CSimpleSource::CSimpleSource(CSimpleSound *simpleSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster)
-	: CSourceCommon(simpleSound, spawn, cb, cbUserParam, cluster), 
+CSimpleSource::CSimpleSource(CSimpleSound *simpleSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
+	: CSourceCommon(simpleSound, spawn, cb, cbUserParam, cluster, groupController), 
 	_SimpleSound(simpleSound),
 	_Track(NULL), 
-	_PlayMuted(false)
+	_PlayMuted(false),
+	_WaitingForPlay(false)
 {
 	nlassert(_SimpleSound != 0);
 
@@ -133,6 +134,7 @@ void CSimpleSource::play()
 		|| (_RelativeMode ? getPos().sqrnorm() : (mixer->getListenPosVector() - getPos()).sqrnorm()) > _SimpleSound->getMaxDistance() * _SimpleSound->getMaxDistance())
 	{
 		// The sample buffer is not available, don't play (we don't know the length)
+		_WaitingForPlay = false;
 		if (_Spawn)
 		{
 			if (_SpawnEndCb != 0)
@@ -166,7 +168,7 @@ void CSimpleSource::play()
 			setDirection(_Direction); // because there is a workaround inside
 			pSource->setVelocity(_Velocity);
 		}
-		pSource->setGain(_Gain);
+		pSource->setGain(getFinalGain());
 		pSource->setSourceRelativeMode(_RelativeMode);
 		pSource->setLooping(_Looping);
 		pSource->setPitch(_Pitch);
@@ -174,7 +176,14 @@ void CSimpleSource::play()
 		
 		// and play the sound
 		bool play = pSource->play();		
+		
+#ifdef NL_DEBUG
 		nlassert(play);
+#else
+		if (!play)
+			nlwarning("Failed to play physical sound source. This is a serious error");
+#endif
+
 		// nldebug("CSimpleSource %p : REAL play done", (CAudioMixerUser::IMixerEvent*)this);
 	}
 	else
@@ -183,6 +192,7 @@ void CSimpleSource::play()
 		{
 			// This sound is not discardable, add it in waiting playlist
 			mixer->addSourceWaitingForPlay(this);
+			_WaitingForPlay = true;
 			return;
 		}
 		// there is no available track, just do a 'muted' play
@@ -193,6 +203,7 @@ void CSimpleSource::play()
 	}
 
 	CSourceCommon::play();
+	_WaitingForPlay = false;
 }
 
 /// Mixer event call when doing muted play
@@ -219,6 +230,13 @@ void CSimpleSource::stop()
 	// nldebug("CSimpleSource %p : stop", (CAudioMixerUser::IMixerEvent*)this);
 	// nlassert(_Playing);
 
+	if (_WaitingForPlay)
+	{
+		nlassert(!_Playing); // cannot already be playing if waiting for play
+		CAudioMixerUser *mixer = CAudioMixerUser::instance();
+		mixer->removeSourceWaitingForPlay(this);
+	}
+
 	if (!_Playing)
 		return;
 
@@ -312,36 +330,13 @@ void CSimpleSource::setDirection(const NLMISC::CVector& dir)
 	}
 }
 
-
-/* Set the gain (volume value inside [0 , 1]). (default: 1)
- * 0.0 -> silence
- * 0.5 -> -6dB
- * 1.0 -> no attenuation
- * values > 1 (amplification) not supported by most drivers
- */
-void CSimpleSource::setGain(float gain)
-{
-	CSourceCommon::setGain(gain);
-
-	// Set the gain
-	if (hasPhysicalSource())
-	{
-		getPhysicalSource()->setGain(gain);
-	}
-}
-
-void CSimpleSource::setRelativeGain(float gain)
+void CSimpleSource::updateFinalGain()
 {
-	CSourceCommon::setRelativeGain(gain);
-
 	// Set the gain
 	if (hasPhysicalSource())
-	{
-		getPhysicalSource()->setGain(_Gain);
-	}
+		getPhysicalSource()->setGain(getFinalGain());
 }
 
-
 /* Shift the frequency. 1.0f equals identity, each reduction of 50% equals a pitch shift
  * of one octave. 0 is not a legal value.
  */
diff --git a/code/nel/src/sound/sound.cpp b/code/nel/src/sound/sound.cpp
index eed318cca..b1b644ed2 100644
--- a/code/nel/src/sound/sound.cpp
+++ b/code/nel/src/sound/sound.cpp
@@ -26,6 +26,10 @@
 #include "nel/sound/context_sound.h"
 #include "nel/sound/music_sound.h"
 #include "nel/sound/stream_sound.h"
+#include "nel/sound/stream_file_sound.h"
+
+#include "nel/sound/group_controller.h"
+#include "nel/sound/group_controller_root.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -81,6 +85,11 @@ CSound *CSound::createSound(const std::string &filename, NLGEORGES::UFormElm& fo
 			ret = new CStreamSound();
 			ret->importForm(filename, formRoot);
 		}
+		else if (dfnName == "stream_file_sound.dfn")
+		{
+			ret = new CStreamFileSound();
+			ret->importForm(filename, formRoot);
+		}
 		else
 		{
 			nlassertex(false, ("SoundType unsuported : %s", dfnName.c_str()));
@@ -106,7 +115,8 @@ CSound::CSound() :
 	_Looping(false),
 	_MinDist(1.0f),
 	_MaxDist(1000000.0f),
-	_UserVarControler(CStringMapper::emptyId())
+	_UserVarControler(CStringMapper::emptyId()),
+	_GroupController(NULL)
 {
 }
 
@@ -134,6 +144,23 @@ void	CSound::serial(NLMISC::IStream &s)
 		std::string name = CStringMapper::unmap(_Name);
 		s.serial(name);
 	}
+	
+	nlassert(CGroupControllerRoot::getInstance()); // not sure
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+	if (s.isReading()) _GroupController = static_cast<CGroupController *>(CAudioMixerUser::instance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER));
+#else
+	if (s.isReading())
+	{
+		std::string groupControllerPath;
+		s.serial(groupControllerPath);
+		_GroupController = static_cast<CGroupController *>(CAudioMixerUser::instance()->getGroupController(groupControllerPath));
+	}
+	else
+	{
+		std::string groupControllerPath = _GroupController->getPath();
+		s.serial(groupControllerPath);
+	}
+#endif
 }
 
 
@@ -225,6 +252,16 @@ void				CSound::importForm(const std::string& filename, NLGEORGES::UFormElm& roo
 	default:
 		_Priority = MidPri;
 	}
+
+	nlassert(CGroupControllerRoot::getInstance()); // not sure
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_GROUP_CONTROLLER);
+#else
+	std::string groupControllerPath;
+	root.getValueByName(groupControllerPath, ".GroupControllerPath");
+	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(groupControllerPath);
+#endif
+
 }
 
 
diff --git a/code/nel/src/sound/sound_bank.cpp b/code/nel/src/sound/sound_bank.cpp
index b4031b571..dd2076a72 100644
--- a/code/nel/src/sound/sound_bank.cpp
+++ b/code/nel/src/sound/sound_bank.cpp
@@ -23,6 +23,7 @@
 #include "nel/sound/background_sound.h"
 #include "nel/sound/music_sound.h"
 #include "nel/sound/stream_sound.h"
+#include "nel/sound/stream_file_sound.h"
 
 #include "nel/georges/u_form_loader.h"
 #include "nel/georges/u_form_elm.h"
@@ -194,6 +195,9 @@ public:
 			case CSound::SOUND_STREAM:
 				Sound = new CStreamSound();
 				break;
+			case CSound::SOUND_STREAM_FILE:
+				Sound = new CStreamFileSound();
+				break;
 			default:
 				Sound = 0;
 			}
diff --git a/code/nel/src/sound/source_common.cpp b/code/nel/src/sound/source_common.cpp
index ce2b7e210..7b27deb03 100644
--- a/code/nel/src/sound/source_common.cpp
+++ b/code/nel/src/sound/source_common.cpp
@@ -25,7 +25,7 @@ using namespace NLMISC;
 namespace NLSOUND
 {
 
-CSourceCommon::CSourceCommon(TSoundId id, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster)
+CSourceCommon::CSourceCommon(TSoundId id, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
 :	_Priority(MidPri),
 	_Playing(false),
 	_Looping(false),
@@ -41,9 +41,11 @@ CSourceCommon::CSourceCommon(TSoundId id, bool spawn, TSpawnEndCallback cb, void
 	_SpawnEndCb(cb),
 	_CbUserParam(cbUserParam),
 	_Cluster(cluster),
-	_UserVarControler(id->getUserVarControler())
+	_UserVarControler(id->getUserVarControler()),
+	_GroupController(groupController ? groupController : id->getGroupController())
 {
 	CAudioMixerUser::instance()->addSource(this);
+	_GroupController->addSource(this);
 
 	// get a local copy of the sound parameter
 	_InitialGain = _Gain = id->getGain();
@@ -51,11 +53,11 @@ CSourceCommon::CSourceCommon(TSoundId id, bool spawn, TSpawnEndCallback cb, void
 	_Looping = id->getLooping();
 	_Priority = id->getPriority();
 	_Direction = id->getDirectionVector();
-
 }
 
 CSourceCommon::~CSourceCommon()
 {
+	_GroupController->removeSource(this);
 	CAudioMixerUser::instance()->removeSource(this);
 }
 
@@ -177,6 +179,7 @@ void					CSourceCommon::setGain( float gain )
 {
 	clamp(gain, 0.0f, 1.0f);
 	_InitialGain = _Gain = gain;
+	updateFinalGain();
 }
 
 /* Set the gain amount (value inside [0, 1]) to map between 0 and the nominal gain
@@ -185,8 +188,8 @@ void					CSourceCommon::setGain( float gain )
 void					CSourceCommon::setRelativeGain( float gain )
 {
 	clamp(gain, 0.0f, 1.0f);
-
 	_Gain = _InitialGain * gain;
+	updateFinalGain();
 }
 
 /*
diff --git a/code/nel/src/sound/source_music_channel.cpp b/code/nel/src/sound/source_music_channel.cpp
new file mode 100644
index 000000000..34735f113
--- /dev/null
+++ b/code/nel/src/sound/source_music_channel.cpp
@@ -0,0 +1,140 @@
+/**
+ * \file source_music_channel.cpp
+ * \brief CSourceMusicChannel
+ * \date 2012-04-11 16:08GMT
+ * \author Jan Boon (Kaetemi)
+ * CSourceMusicChannel
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdsound.h"
+#include <nel/sound/source_music_channel.h>
+
+// STL includes
+
+// NeL includes
+// #include <nel/misc/debug.h>
+#include <nel/sound/stream_file_source.h>
+
+// Project includes
+
+using namespace std;
+// using namespace NLMISC;
+
+namespace NLSOUND {
+
+CSourceMusicChannel::CSourceMusicChannel() : m_Source(NULL), m_Gain(1.0f)
+{
+	
+}
+
+CSourceMusicChannel::~CSourceMusicChannel()
+{
+	nlassert(!m_Source);
+	delete m_Source;
+	m_Source = NULL;
+}
+
+bool CSourceMusicChannel::play(const std::string &filepath, bool async, bool loop)
+{
+	// delete previous source if any
+	// note that this waits for the source's thread to finish if the source was still playing
+	if (m_Source)
+		delete m_Source;
+
+	m_Sound.setMusicFilePath(filepath, async, loop);
+
+	m_Source = new CStreamFileSource(&m_Sound, false, NULL, NULL, NULL, NULL);
+	m_Source->setSourceRelativeMode(true);
+	m_Source->setPos(NLMISC::CVector::Null);
+	m_Source->setRelativeGain(m_Gain);
+
+	m_Source->play();
+
+	return m_Source->isPlaying();
+}
+
+void CSourceMusicChannel::stop()
+{
+	// stop but don't delete the source, deleting source may cause waiting for thread
+	if (m_Source)
+		m_Source->stop();
+}
+
+void CSourceMusicChannel::reset()
+{
+	// forces the source to be deleted, happens when audio mixer is reset
+	delete m_Source;
+	m_Source = NULL;
+}
+
+void CSourceMusicChannel::pause()
+{
+	if (m_Source)
+		m_Source->pause();
+}
+
+void CSourceMusicChannel::resume()
+{
+	if (m_Source)
+		m_Source->resume();
+}
+
+bool CSourceMusicChannel::isEnded()
+{
+	if (m_Source)
+	{
+		if (m_Source->isEnded())
+		{
+			// we can delete the source now without worrying about thread wait
+			delete m_Source;
+			m_Source = NULL;
+			return true;
+		}
+		return false;
+	}
+	return true;
+}
+
+bool CSourceMusicChannel::isLoadingAsync()
+{
+	if (m_Source)
+		return m_Source->isLoadingAsync();
+	return false;
+}
+
+float CSourceMusicChannel::getLength()
+{
+	if (m_Source)
+		return m_Source->getLength();
+	return 0.0f;
+}
+
+void CSourceMusicChannel::setVolume(float gain)
+{
+	m_Gain = gain;
+	if (m_Source)
+		m_Source->setRelativeGain(gain);
+}
+
+} /* namespace NLSOUND */
+
+/* end of file */
diff --git a/code/nel/src/sound/stream_file_sound.cpp b/code/nel/src/sound/stream_file_sound.cpp
new file mode 100644
index 000000000..44da5a31d
--- /dev/null
+++ b/code/nel/src/sound/stream_file_sound.cpp
@@ -0,0 +1,98 @@
+/**
+ * \file stream_file_sound.cpp
+ * \brief CStreamFileSound
+ * \date 2012-04-11 09:57GMT
+ * \author Jan Boon (Kaetemi)
+ * CStreamFileSound
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdsound.h"
+#include <nel/sound/stream_file_sound.h>
+
+// STL includes
+
+// NeL includes
+// #include <nel/misc/debug.h>
+#include <nel/sound/group_controller_root.h>
+
+// Project includes
+
+using namespace std;
+// using namespace NLMISC;
+
+namespace NLSOUND {
+
+CStreamFileSound::CStreamFileSound()
+{
+	
+}
+
+CStreamFileSound::~CStreamFileSound()
+{
+	
+}
+
+void CStreamFileSound::importForm(const std::string &filename, NLGEORGES::UFormElm &root)
+{
+	// Call the base class
+	CStreamSound::importForm(filename, root);
+
+	// Async
+	root.getValueByName(m_Async, ".SoundType.Async");
+
+	// FilePath
+	root.getValueByName(m_FilePath, ".SoundType.FilePath");
+}
+
+void CStreamFileSound::serial(NLMISC::IStream &s)
+{
+	CStreamSound::serial(s);
+
+	s.serial(m_Async);
+	s.serial(m_FilePath);
+}
+
+void CStreamFileSound::setMusicFilePath(const std::string &filePath, bool async, bool loop)
+{
+#if !FINAL_VERSION
+	_Name = NLMISC::CStringMapper::map(std::string("<MusicChannel:") + NLMISC::CFile::getFilenameWithoutExtension(filePath) + ">");
+#else
+	_Name = NLMISC::CStringMapper::map("<MusicChannel>");
+#endif
+	_ConeInnerAngle = NLMISC::Pi * 2;
+	_ConeOuterAngle = NLMISC::Pi * 2;
+	_Looping = loop;
+	_Gain = 1.0f;
+	_ConeOuterGain = 1.0f;
+	_Direction = NLMISC::CVector(0.f, 0.f, 0.f);
+	_Pitch = 1.0f;
+	_Priority = HighestPri;
+	_MaxDist = 9000.0f;
+	_MinDist = 1000.0f;
+	m_Async = async;
+	m_FilePath = filePath;
+	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_MUSIC_GROUP_CONTROLLER);
+}
+
+} /* namespace NLSOUND */
+
+/* end of file */
diff --git a/code/nel/src/sound/stream_file_source.cpp b/code/nel/src/sound/stream_file_source.cpp
new file mode 100644
index 000000000..87164a9cd
--- /dev/null
+++ b/code/nel/src/sound/stream_file_source.cpp
@@ -0,0 +1,384 @@
+/**
+ * \file stream_file_source.cpp
+ * \brief CStreamFileSource
+ * \date 2012-04-11 09:57GMT
+ * \author Jan Boon (Kaetemi)
+ * CStreamFileSource
+ */
+
+/* 
+ * Copyright (C) 2012  by authors
+ * 
+ * This file is part of RYZOM CORE.
+ * RYZOM CORE is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ * 
+ * RYZOM CORE is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public
+ * License along with RYZOM CORE.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include "stdsound.h"
+#include <nel/sound/stream_file_source.h>
+
+// STL includes
+
+// NeL includes
+// #include <nel/misc/debug.h>
+
+// Project includes
+#include <nel/sound/audio_mixer_user.h>
+#include <nel/sound/audio_decoder.h>
+
+using namespace std;
+// using namespace NLMISC;
+
+// #define NLSOUND_STREAM_FILE_DEBUG
+
+namespace NLSOUND {
+
+CStreamFileSource::CStreamFileSource(CStreamFileSound *streamFileSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
+: CStreamSource(streamFileSound, spawn, cb, cbUserParam, cluster, groupController), m_AudioDecoder(NULL), m_Paused(false)
+{
+	m_Thread = NLMISC::IThread::create(this);
+}
+
+CStreamFileSource::~CStreamFileSource()
+{
+	stop();
+	m_Thread->wait(); // thread must have stopped for delete!
+	delete m_Thread;
+	m_Thread = NULL;
+	delete m_AudioDecoder;
+	m_AudioDecoder = NULL;
+}
+
+void CStreamFileSource::play()
+{
+	// note: CStreamSource will assert crash if already physically playing!
+
+
+	if (m_WaitingForPlay)
+	{
+		if (m_Thread->isRunning())
+		{
+			if (m_NextBuffer || !m_FreeBuffers)
+			{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+				nldebug("play waiting, play stream %s", getStreamFileSound()->getFilePath().c_str());
+#endif
+				CStreamSource::play();
+				if (!_Playing && !m_WaitingForPlay)
+				{
+					nldebug("Stream file source playback not possible or necessary for some reason");
+				}
+			}
+			else
+			{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+				nldebug("play waiting, hop onto waiting list %s", getStreamFileSound()->getFilePath().c_str());
+#endif
+				m_WaitingForPlay = true;
+				CAudioMixerUser *mixer = CAudioMixerUser::instance();
+				mixer->addSourceWaitingForPlay(this);
+			}
+		}
+		else
+		{
+			// thread went kaboom while not started playing yet, probably the audiodecoder cannot be started
+			// don't play
+			m_WaitingForPlay = false;
+		}
+	}
+	else if (!_Playing)
+	{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+		nldebug("play go %s", getStreamFileSound()->getFilePath().c_str());
+#endif
+		//if (!m_WaitingForPlay)
+		//{
+			// thread may be stopping from stop call
+			m_Thread->wait();
+		//}
+		//else
+		//{
+		//	nlwarning("Already waiting for play");
+		//}
+		if (!getStreamFileSound()->getAsync())
+		{
+			if (!prepareDecoder())
+			{
+				return;
+			}
+		}
+		// else load audiodecoder in thread
+		m_WaitingForPlay = true;
+		m_Thread->start();
+		m_Thread->setPriority(NLMISC::ThreadPriorityHighest);
+		if (!getStreamFileSound()->getAsync())
+		{
+			// wait until at least one buffer is ready
+			while (!(m_NextBuffer || !m_FreeBuffers) && m_WaitingForPlay && m_Thread->isRunning())
+			{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+				nldebug("wait buffer");
+#endif
+				NLMISC::nlSleep(100);
+			}
+			if (m_WaitingForPlay && m_Thread->isRunning())
+			{
+				CStreamSource::play();
+				if (!_Playing)
+				{
+					nlwarning("Failed to synchronously start playing a file stream source. This happens when all physical tracks are in use. Use a Highest Priority sound");
+				}
+			}
+		}
+		else
+		{
+			CAudioMixerUser *mixer = CAudioMixerUser::instance();
+			mixer->addSourceWaitingForPlay(this);
+		}
+	}
+	else
+	{
+		nlwarning("Already playing");
+	}
+
+	
+	/*if (!m_WaitingForPlay)
+	{
+		m_WaitingForPlay = true;
+
+		m_Thread->wait(); // thread must have stopped to restart it!
+
+		m_Thread->start();
+		m_Thread->setPriority(NLMISC::ThreadPriorityHighest);
+	}
+
+	CStreamSource::play();*/
+}
+
+void CStreamFileSource::stop()
+{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("stop %s", getStreamFileSound()->getFilePath().c_str());
+#endif
+
+	CStreamSource::stopInt();
+
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("stopInt ok");
+#endif
+
+	if (_Spawn)
+	{
+		if (_SpawnEndCb != NULL)
+			_SpawnEndCb(this, _CbUserParam);
+		m_Thread->wait();
+		delete this;
+	}
+
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("stop ok");
+#endif
+
+	// thread will check _Playing to stop
+}
+
+bool CStreamFileSource::isPlaying()
+{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("isPlaying");
+#endif
+
+	return m_Thread->isRunning();
+}
+
+void CStreamFileSource::pause()
+{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("pause");
+#endif
+
+	if (!m_Paused)
+	{
+		// thread checks for this to not delete the audio decoder
+		m_Paused = true;
+		
+		// stop the underlying system
+		CStreamSource::stop();
+
+		// thread will check _Playing to stop
+	}
+	else
+	{
+		nlwarning("Already paused");
+	}
+}
+
+void CStreamFileSource::resume()
+{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("resume");
+#endif
+
+	if (m_Paused)
+	{
+		m_Thread->wait(); // thread must have stopped to restart it!
+		
+		play();
+	}
+	else
+	{
+		nlwarning("Not paused");
+	}
+}
+
+bool CStreamFileSource::isEnded()
+{
+	return (!m_Thread->isRunning() && !_Playing && !m_WaitingForPlay && !m_Paused);
+}
+
+float CStreamFileSource::getLength()
+{
+	return m_AudioDecoder->getLength();
+}
+
+bool CStreamFileSource::isLoadingAsync()
+{
+	return m_WaitingForPlay;
+}
+
+bool CStreamFileSource::prepareDecoder()
+{
+	// creates a new decoder or keeps going with the current decoder if the stream was paused
+
+	if (m_Paused)
+	{
+		// handle paused!
+		m_Paused = false;
+	}
+	else if (m_AudioDecoder) // audio decoder should normally not exist when not paused and starting the thread
+	{
+		nlwarning("CAudioDecoder already exists, possible thread race bug with pause");			
+		delete m_AudioDecoder;
+		m_AudioDecoder = NULL;
+	}
+	if (!m_AudioDecoder)
+	{
+		// load the file
+		m_AudioDecoder = IAudioDecoder::createAudioDecoder(getStreamFileSound()->getFilePath(), getStreamFileSound()->getAsync(), getStreamFileSound()->getLooping());
+		if (!m_AudioDecoder)
+		{
+			nlwarning("Failed to create IAudioDecoder, likely invalid format");
+			return false;
+		}
+		this->setFormat(m_AudioDecoder->getChannels(), m_AudioDecoder->getBitsPerSample(), (uint32)m_AudioDecoder->getSamplesPerSec());
+	}
+	uint samples, bytes;
+	this->getRecommendedBufferSize(samples, bytes);
+	this->preAllocate(bytes * 2);
+
+	return true;
+}
+
+inline bool CStreamFileSource::bufferMore(uint bytes) // buffer from bytes (minimum) to bytes * 2 (maximum)
+{
+	uint8 *buffer = this->lock(bytes * 2);
+	if (buffer)
+	{
+		uint32 result = m_AudioDecoder->getNextBytes(buffer, bytes, bytes * 2);
+		this->unlock(result);
+		return true;
+	}
+	return false;
+}
+
+void CStreamFileSource::run()
+{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("run %s", getStreamFileSound()->getFilePath().c_str());
+	uint dumpI = 0;
+#endif
+
+	bool looping = _Looping;
+	if (getStreamFileSound()->getAsync())
+	{
+		if (!prepareDecoder())
+			return;
+	}
+	uint samples, bytes;
+	this->getRecommendedBufferSize(samples, bytes);
+	uint32 recSleep = 40;
+	uint32 doSleep = 10;
+	while (_Playing || m_WaitingForPlay)
+	{
+		if (!m_AudioDecoder->isMusicEnded())
+		{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+			++dumpI;
+			if (!(dumpI % 100)) 
+			{
+				nldebug("buffer %s %s %s", _Playing ? "PLAYING" : "NP", m_WaitingForPlay ? "WAITING" : "NW", getStreamFileSound()->getFilePath().c_str());
+				nldebug("gain %f", hasPhysicalSource() ? getPhysicalSource()->getGain() : -1.0f);
+			}
+#endif
+
+			bool newLooping = _Looping;
+			if (looping != newLooping)
+			{
+				m_AudioDecoder->setLooping(looping);
+				looping = newLooping;
+			}
+			
+			// reduce sleeping time if nothing was buffered
+			if (bufferMore(bytes)) recSleep = doSleep = this->getRecommendedSleepTime();
+			else doSleep = recSleep >> 2; // /4
+			NLMISC::nlSleep(doSleep);
+		}
+		else
+		{
+			// wait until done playing buffers
+			while (this->hasFilledBuffersAvailable() && (_Playing || m_WaitingForPlay))
+			{
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+				nldebug("music ended, wait until done %s", getStreamFileSound()->getFilePath().c_str());
+#endif
+				NLMISC::nlSleep(40);
+			}
+			// stop the physical source
+			// if (hasPhysicalSource())
+			// 	getPhysicalSource()->stop();
+			// the audio mixer will call stop on the logical source
+			break;
+		}
+	}
+	if (m_Paused)
+	{
+		// don't delete anything
+	}
+	else
+	{
+		delete m_AudioDecoder;
+		m_AudioDecoder = NULL;
+	}
+	// drop buffers
+	m_FreeBuffers = 3;
+	m_NextBuffer = 0;
+
+#ifdef NLSOUND_STREAM_FILE_DEBUG
+	nldebug("run end %s", getStreamFileSound()->getFilePath().c_str());
+#endif
+}
+
+} /* namespace NLSOUND */
+
+/* end of file */
diff --git a/code/nel/src/sound/stream_sound.cpp b/code/nel/src/sound/stream_sound.cpp
index 347fae987..e16158d4d 100644
--- a/code/nel/src/sound/stream_sound.cpp
+++ b/code/nel/src/sound/stream_sound.cpp
@@ -17,6 +17,10 @@
 #include "stdsound.h"
 #include "nel/sound/stream_sound.h"
 
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+#	include "nel/sound/group_controller_root.h"
+#endif
+
 namespace NLSOUND {
 
 CStreamSound::CStreamSound()
@@ -31,14 +35,15 @@ CStreamSound::~CStreamSound()
 
 void CStreamSound::importForm(const std::string &filename, NLGEORGES::UFormElm &root)
 {
-	NLGEORGES::UFormElm *psoundType;
+	// cannot do this debug check because used also by CStreamFileSound
+	/*NLGEORGES::UFormElm *psoundType;
 	std::string dfnName;
 
 	// some basic checking.
 	root.getNodeByName(&psoundType, ".SoundType");
 	nlassert(psoundType != NULL);
 	psoundType->getDfnName(dfnName);
-	nlassert(dfnName == "stream_sound.dfn");
+	nlassert(dfnName == "stream_sound.dfn");*/
 
 	// Call the base class
 	CSound::importForm(filename, root);
@@ -51,6 +56,11 @@ void CStreamSound::importForm(const std::string &filename, NLGEORGES::UFormElm &
 
 	// Alpha
 	root.getValueByName(m_Alpha, ".SoundType.Alpha");
+
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+	_GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_STREAM_GROUP_CONTROLLER);
+#endif
+
 }
 
 void CStreamSound::serial(NLMISC::IStream &s)
@@ -59,6 +69,11 @@ void CStreamSound::serial(NLMISC::IStream &s)
 
 	s.serial(_MinDist);
 	s.serial(m_Alpha);
+
+#if NLSOUND_SHEET_VERSION_BUILT < 2
+	if (s.isReading()) _GroupController = CGroupControllerRoot::getInstance()->getGroupController(NLSOUND_SHEET_V1_DEFAULT_SOUND_STREAM_GROUP_CONTROLLER);
+#endif
+
 }
 
 } /* namespace NLSOUND */
diff --git a/code/nel/src/sound/stream_source.cpp b/code/nel/src/sound/stream_source.cpp
index a5b167c8f..221b0529e 100644
--- a/code/nel/src/sound/stream_source.cpp
+++ b/code/nel/src/sound/stream_source.cpp
@@ -26,29 +26,37 @@
 // using namespace std;
 using namespace NLMISC;
 
+// #define NLSOUND_DEBUG_STREAM
+
 namespace NLSOUND {
 
-CStreamSource::CStreamSource(CStreamSound *streamSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster)
-	: CSourceCommon(streamSound, spawn, cb, cbUserParam, cluster), 
+CStreamSource::CStreamSource(CStreamSound *streamSound, bool spawn, TSpawnEndCallback cb, void *cbUserParam, NL3D::CCluster *cluster, CGroupController *groupController)
+	: CSourceCommon(streamSound, spawn, cb, cbUserParam, cluster, groupController), 
 	m_StreamSound(streamSound), 
 	m_Alpha(0.0f), 
 	m_Track(NULL), 
 	m_FreeBuffers(3),
 	m_NextBuffer(0),
 	m_LastSize(0),
-	m_BytesPerSecond(0)
+	m_BytesPerSecond(0),
+	m_WaitingForPlay(false),
+	m_PitchInv(1.0f)
 {
 	nlassert(m_StreamSound != 0);
 
 	// get a local copy of the stream sound parameter
 	m_Alpha = m_StreamSound->getAlpha();//m_Buffers
+	m_PitchInv = 1.0f / _Pitch;
 	
 	// create the three buffer objects
 	CAudioMixerUser *mixer = CAudioMixerUser::instance();
 	ISoundDriver *driver = mixer->getSoundDriver();
 	m_Buffers[0] = driver->createBuffer();
+	m_Buffers[0]->setStorageMode(IBuffer::StorageSoftware);
 	m_Buffers[1] = driver->createBuffer();
+	m_Buffers[1]->setStorageMode(IBuffer::StorageSoftware);
 	m_Buffers[2] = driver->createBuffer();
+	m_Buffers[2]->setStorageMode(IBuffer::StorageSoftware);
 }
 
 CStreamSource::~CStreamSource()
@@ -107,6 +115,8 @@ bool CStreamSource::isPlaying()
 /// Set looping on/off for future playbacks (default: off)
 void CStreamSource::setLooping(bool l)
 {
+	CSourceCommon::setLooping(l);
+
 	//CAutoMutex<CMutex> autoMutex(m_BufferMutex);
 	//
 	//CSourceCommon::setLooping(l);
@@ -146,13 +156,16 @@ void CStreamSource::play()
 		if ((_RelativeMode ? getPos().sqrnorm() : (mixer->getListenPosVector() - getPos()).sqrnorm()) > m_StreamSound->getMaxDistance() * m_StreamSound->getMaxDistance())
 		{
 			// Source is too far to play
+			m_WaitingForPlay = false;
 			if (_Spawn)
 			{
 				if (_SpawnEndCb != NULL)
 					_SpawnEndCb(this, _CbUserParam);
 				delete this;
 			}
-			// nldebug("CStreamSource %p : play FAILED !", (CAudioMixerUser::IMixerEvent*)this);
+#ifdef NLSOUND_DEBUG_STREAM
+			nldebug("CStreamSource %p : play FAILED, source is too far away !", (CAudioMixerUser::IMixerEvent*)this);
+#endif
 			return;
 		}
 		
@@ -166,24 +179,33 @@ void CStreamSource::play()
 			ISource *pSource = getPhysicalSource();
 			nlassert(pSource != NULL);
 			
-			for (uint i = 0; i < m_NextBuffer; ++i)
+			uint nbS = m_NextBuffer;
+			if (!m_NextBuffer && !m_FreeBuffers) nbS = 3;
+			for (uint i = 0; i < nbS; ++i)
 				pSource->submitStreamingBuffer(m_Buffers[i]);
 			
 			// pSource->setPos( _Position, false);
 			pSource->setPos(getVirtualPos(), false);
+			pSource->setMinMaxDistances(m_StreamSound->getMinDistance(), m_StreamSound->getMaxDistance(), false);
 			if (!m_Buffers[0]->isStereo())
 			{
-				pSource->setMinMaxDistances(m_StreamSound->getMinDistance(), m_StreamSound->getMaxDistance(), false);
 				setDirection(_Direction); // because there is a workaround inside
 				pSource->setVelocity(_Velocity);
 			}
-			pSource->setGain(_Gain);
+			else
+			{
+				pSource->setDirection(NLMISC::CVector::I);
+				pSource->setCone(float(Pi * 2), float(Pi * 2), 1.0f);
+				pSource->setVelocity(NLMISC::CVector::Null);
+			}
+			pSource->setGain(getFinalGain());
 			pSource->setSourceRelativeMode(_RelativeMode);
 			// pSource->setLooping(_Looping);
 			pSource->setPitch(_Pitch);
 			pSource->setAlpha(m_Alpha);
 			
 			// and play the sound
+			nlassert(nbS); // must have buffered already!
 			play = pSource->play();
 			// nldebug("CStreamSource %p : REAL play done", (CAudioMixerUser::IMixerEvent*)this);
 		}
@@ -193,11 +215,13 @@ void CStreamSource::play()
 			{
 				// This sound is not discardable, add it in waiting playlist
 				mixer->addSourceWaitingForPlay(this);
+				m_WaitingForPlay = true;
 				return;
 			}
 			else
 			{
 				// No source available, kill.
+				m_WaitingForPlay = false;
 				if (_Spawn)
 				{
 					if (_SpawnEndCb != NULL)
@@ -209,22 +233,67 @@ void CStreamSource::play()
 		}
 		
 		if (play)
+		{
 			CSourceCommon::play();
+			m_WaitingForPlay = false;
+#ifdef NLSOUND_DEBUG_STREAM
+			// Dump source info
+			nlwarning("--- DUMP SOURCE INFO ---");
+			nlwarning(" * getLooping: %s", getPhysicalSource()->getLooping() ? "YES" : "NO");
+			nlwarning(" * isPlaying: %s", getPhysicalSource()->isPlaying() ? "YES" : "NO");
+			nlwarning(" * isStopped: %s", getPhysicalSource()->isStopped() ? "YES" : "NO");
+			nlwarning(" * isPaused: %s", getPhysicalSource()->isPaused() ? "YES" : "NO");
+			nlwarning(" * getPos: %f, %f, %f", getPhysicalSource()->getPos().x, getPhysicalSource()->getPos().y, getPhysicalSource()->getPos().z);
+			NLMISC::CVector v;
+			getPhysicalSource()->getVelocity(v);
+			nlwarning(" * getVelocity: %f, %f, %f", v.x, v.y, v.z);
+			getPhysicalSource()->getDirection(v);
+			nlwarning(" * getDirection: %f, %f, %f", v.x, v.y, v.z);
+			nlwarning(" * getGain: %f", getPhysicalSource()->getGain());
+			nlwarning(" * getPitch: %f", getPhysicalSource()->getPitch());
+			nlwarning(" * getSourceRelativeMode: %s", getPhysicalSource()->getSourceRelativeMode() ? "YES" : "NO");
+			float a, b, c;
+			getPhysicalSource()->getMinMaxDistances(a, b);
+			nlwarning(" * getMinMaxDistances: %f, %f", a, b);
+			getPhysicalSource()->getCone(a, b, c);
+			nlwarning(" * getCone: %f, %f", a, b, c);
+			nlwarning(" * getDirect: %s", getPhysicalSource()->getDirect() ? "YES" : "NO");
+			nlwarning(" * getDirectGain: %f", getPhysicalSource()->getDirectGain());
+			nlwarning(" * isDirectFilterEnabled: %s", getPhysicalSource()->isDirectFilterEnabled() ? "YES" : "NO");
+			nlwarning(" * getEffect: %s", getPhysicalSource()->getEffect() ? "YES" : "NO");
+			nlwarning(" * getEffectGain: %f", getPhysicalSource()->getEffectGain());
+			nlwarning(" * isEffectFilterEnabled: %s", getPhysicalSource()->isEffectFilterEnabled() ? "YES" : "NO");
+#endif
+		}
 	}
 
+#ifdef NL_DEBUG
 	nlassert(play);
+#else
+	if (!play)
+		nlwarning("Failed to play physical sound source. This is a serious error");
+#endif
 }
 
-/// Stop playing
-void CStreamSource::stop()
+void CStreamSource::stopInt()
 {
 	CAutoMutex<CMutex> autoMutex(m_BufferMutex);
 	
 	// nldebug("CStreamSource %p : stop", (CAudioMixerUser::IMixerEvent*)this);
 	// nlassert(_Playing);
+
+	if (m_WaitingForPlay)
+	{
+		nlassert(!_Playing); // cannot already be playing if waiting for play
+		CAudioMixerUser *mixer = CAudioMixerUser::instance();
+		mixer->removeSourceWaitingForPlay(this);
+	}
 	
 	if (!_Playing)
+	{
+		m_WaitingForPlay = false;
 		return;
+	}
 	
 	if (hasPhysicalSource())
 		releasePhysicalSource();
@@ -234,6 +303,14 @@ void CStreamSource::stop()
 	m_FreeBuffers = 3;
 	m_NextBuffer = 0;
 	
+	m_WaitingForPlay = false;
+}
+
+/// Stop playing
+void CStreamSource::stop()
+{
+	stopInt();
+	
 	if (_Spawn)
 	{
 		if (_SpawnEndCb != NULL)
@@ -294,28 +371,18 @@ void CStreamSource::setDirection(const NLMISC::CVector& dir)
 	}
 }
 
-void CStreamSource::setGain(float gain)
-{
-	CAutoMutex<CMutex> autoMutex(m_BufferMutex);
-
-	CSourceCommon::setGain(gain);
-	if (hasPhysicalSource())
-		getPhysicalSource()->setGain(gain);
-}
-
-void CStreamSource::setRelativeGain(float gain)
+void CStreamSource::updateFinalGain()
 {
 	CAutoMutex<CMutex> autoMutex(m_BufferMutex);
-
-	CSourceCommon::setRelativeGain(gain);
+	
 	if (hasPhysicalSource())
-		getPhysicalSource()->setGain(_Gain);
+		getPhysicalSource()->setGain(getFinalGain());
 }
 
 void CStreamSource::setPitch(float pitch)
 {
 	CAutoMutex<CMutex> autoMutex(m_BufferMutex);
-
+	m_PitchInv = 1.0f / pitch;
 	CSourceCommon::setPitch(pitch);
 	if (hasPhysicalSource())
 		getPhysicalSource()->setPitch(pitch);
@@ -382,7 +449,9 @@ bool CStreamSource::unlock(uint size)
 		++m_NextBuffer; m_NextBuffer %= 3;
 		--m_FreeBuffers;
 		if (hasPhysicalSource())
+		{
 			getPhysicalSource()->submitStreamingBuffer(buffer);
+		}
 		m_LastSize = size;
 	}
 
@@ -406,8 +475,8 @@ void CStreamSource::getRecommendedBufferSize(uint &samples, uint &bytes) const
 uint32 CStreamSource::getRecommendedSleepTime() const
 {
 	if (m_FreeBuffers > 0) return 0;
-	uint32 sleepTime = (uint32)((1000.0f * ((float)m_LastSize) / (float)m_BytesPerSecond) / _Pitch);
-	clamp(sleepTime, (uint32)0, (uint32)1000);
+	uint32 sleepTime = (uint32)((1000.0f * ((float)m_LastSize) / (float)m_BytesPerSecond) * m_PitchInv);
+	clamp(sleepTime, (uint32)0, (uint32)80);
 	return sleepTime;
 }
 
@@ -418,6 +487,19 @@ bool CStreamSource::hasFilledBuffersAvailable() const
 	return m_FreeBuffers < 3;
 }
 
+void CStreamSource::preAllocate(uint capacity)
+{
+	uint8 *b0 = m_Buffers[0]->lock(capacity);
+	memset(b0, 0, capacity);
+	m_Buffers[0]->unlock(capacity);
+	uint8 *b1 = m_Buffers[1]->lock(capacity);
+	memset(b1, 0, capacity);
+	m_Buffers[1]->unlock(capacity);
+	uint8 *b2 = m_Buffers[2]->lock(capacity);
+	memset(b2, 0, capacity);
+	m_Buffers[2]->unlock(capacity);
+}
+
 } /* namespace NLSOUND */
 
 /* end of file */
diff --git a/code/nel/tools/3d/Makefile.am b/code/nel/tools/3d/Makefile.am
deleted file mode 100644
index 7cde91464..000000000
--- a/code/nel/tools/3d/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# $Id: Makefile.am,v 1.2 2002/05/14 13:33:59 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-DIST_SUBDIRS	=	build_coarse_mesh                   \
-			build_far_bank                      \
-			build_smallbank                     \
-			ig_lighter_lib                      \
-			ig_lighter                          \
-			panoply_maker                       \
-			zone_lib                            \
-			zone_dependencies                   \
-			zone_ig_lighter                     \
-			zone_lighter                        \
-			zone_welder
-
-SUBDIRS              = build_coarse_mesh                   \
-                       build_far_bank                      \
-                       build_smallbank                     \
-                       ig_lighter_lib                      \
-                       ig_lighter                          \
-                       zone_lib                            \
-                       zone_dependencies                   \
-                       zone_ig_lighter                     \
-                       zone_lighter                        \
-                       zone_welder
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/build_coarse_mesh/Makefile.am b/code/nel/tools/3d/build_coarse_mesh/Makefile.am
deleted file mode 100644
index b161e1b59..000000000
--- a/code/nel/tools/3d/build_coarse_mesh/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = build.cfg \
-                            build_coarse_mesh.dsp
-
-bin_PROGRAMS              = build_coarse_mesh
-
-build_coarse_mesh_SOURCES = build_coarse_mesh.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-build_coarse_mesh_LDADD   = ../../../src/misc/libnelmisc.la \
-                            ../../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/build_far_bank/Makefile.am b/code/nel/tools/3d/build_far_bank/Makefile.am
deleted file mode 100644
index 9dd0eadec..000000000
--- a/code/nel/tools/3d/build_far_bank/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = build_far_bank.dsp
-
-bin_PROGRAMS              = build_far_bank
-
-build_far_bank_SOURCES    = build_far_bank.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-build_far_bank_LDADD      = ../../../src/misc/libnelmisc.la \
-                            ../../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/build_smallbank/Makefile.am b/code/nel/tools/3d/build_smallbank/Makefile.am
deleted file mode 100644
index f70258cb6..000000000
--- a/code/nel/tools/3d/build_smallbank/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = build_smallbank.dsp
-
-bin_PROGRAMS              = build_smallbank
-
-build_smallbank_SOURCES   = build_smallbank.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-build_smallbank_LDADD     = ../../../src/misc/libnelmisc.la \
-                            ../../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/ig_lighter/Makefile.am b/code/nel/tools/3d/ig_lighter/Makefile.am
deleted file mode 100644
index ccde76fd0..000000000
--- a/code/nel/tools/3d/ig_lighter/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = config.cfg \
-                            ig_lighter.dsp
-
-bin_PROGRAMS              = ig_lighter
-
-ig_lighter_SOURCES        = ig_lighter.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-ig_lighter_LDADD          = ../../../src/misc/libnelmisc.la    \
-                            ../../../src/3d/libnel3d.la        \
-                            ../../../src/pacs/libnelpacs.la    \
-                            ../ig_lighter_lib/libig_lighter.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/ig_lighter_lib/Makefile.am b/code/nel/tools/3d/ig_lighter_lib/Makefile.am
deleted file mode 100644
index e66b9a94b..000000000
--- a/code/nel/tools/3d/ig_lighter_lib/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES         = Makefile.in
-
-EXTRA_DIST                   = ig_lighter_lib.dsp
-
-noinst_LTLIBRARIES           = libig_lighter.la
-
-libig_lighter_la_SOURCES     = ig_lighter_lib.cpp
-
-noinst_HEADERS               = ig_lighter_lib.h
-
-AM_CXXFLAGS                  = -I$(top_srcdir)/src
-
-libig_lighter_la_LIBADD      = ../../../src/misc/libnelmisc.la \
-                               ../../../src/3d/libnel3d.la     \
-                               ../../../src/pacs/libnelpacs.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/ligo/plugin_max/script.cpp b/code/nel/tools/3d/ligo/plugin_max/script.cpp
index 90050304f..b00de5fe4 100644
--- a/code/nel/tools/3d/ligo/plugin_max/script.cpp
+++ b/code/nel/tools/3d/ligo/plugin_max/script.cpp
@@ -29,7 +29,7 @@
 #	include <maxscript/foundation/mxstime.h>
 #	include <maxscript/maxwrapper/mxsobjects.h>
 #	include <maxscript/compiler/parser.h>
-#	include <maxscript/foundation/functions.h>
+#	include <maxscript/macros/define_instantiation_functions.h>
 #else
 #	include <MaxScrpt/MAXScrpt.h>
 #	include <MaxScrpt/3dmath.h>
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt
index 426d3aa61..467b00876 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/CMakeLists.txt
@@ -7,6 +7,7 @@ ADD_SUBDIRECTORY(disp_sheet_id)
 ADD_SUBDIRECTORY(object_viewer)
 ADD_SUBDIRECTORY(georges_editor)
 ADD_SUBDIRECTORY(translation_manager)
+ADD_SUBDIRECTORY(bnp_manager)
 # Note: Temporarily disabled until development continues.
 #ADD_SUBDIRECTORY(zone_painter)
 # Ryzom Specific Plugins
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/CMakeLists.txt b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/CMakeLists.txt
new file mode 100644
index 000000000..7ecfd7396
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/CMakeLists.txt
@@ -0,0 +1,47 @@
+INCLUDE_DIRECTORIES(  ${CMAKE_CURRENT_BINARY_DIR}
+                      ${CMAKE_CURRENT_SOURCE_DIR}
+                      ${LIBXML2_INCLUDE_DIR}
+                      ${QT_INCLUDES})
+
+FILE(GLOB SRC *.cpp *.h)
+SET(OVQT_EXT_SYS_SRC  ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin.h
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_manager.h
+                      ${CMAKE_CURRENT_SOURCE_DIR}/../../extension_system/iplugin_spec.h)
+
+SET(OVQT_PLUG_BNP_MANAGER_HDR  bnp_manager_plugin.h 
+                                  bnp_manager_window.h
+								  bnp_dirtree_dialog.h
+								  bnp_filesystem_model.h
+								  bnp_file.h
+								  bnp_filelist_dialog.h
+								  bnp_proxy_model.h
+                                  )
+SET(OVQT_PLUG_BNP_MANAGER_UIS	bnp_dirtree_form.ui
+								bnp_filelist_dialog.ui
+								)
+
+SET(OVQT_PLUGIN_BNP_MANAGER_RCS bnp_manager.qrc)
+
+SET(QT_USE_QTGUI TRUE)
+
+QT4_ADD_RESOURCES(OVQT_PLUGIN_BNP_MANAGER_RC_SRCS ${OVQT_PLUGIN_BNP_MANAGER_RCS})
+QT4_WRAP_CPP(OVQT_PLUG_BNP_MANAGER_MOC_SRC ${OVQT_PLUG_BNP_MANAGER_HDR})
+QT4_WRAP_UI(OVQT_PLUG_BNP_MANAGER_UI_HDRS ${OVQT_PLUG_BNP_MANAGER_UIS})
+
+SOURCE_GROUP(QtResources FILES ${OVQT_PLUG_BNP_MANAGER_UIS} ${OVQT_PLUGIN_BNP_MANAGER_RCS})
+SOURCE_GROUP(QtGeneratedUiHdr FILES ${OVQT_PLUG_BNP_MANAGER_UI_HDRS})
+SOURCE_GROUP(QtGeneratedMocSrc FILES ${OVQT_PLUG_BNP_MANAGER_MOC_SRC})
+SOURCE_GROUP("BNP Manager Plugin" FILES ${SRC})
+SOURCE_GROUP("OVQT Extension System" FILES ${OVQT_EXT_SYS_SRC})
+
+ADD_LIBRARY(ovqt_plugin_bnp_manager MODULE ${SRC} ${OVQT_PLUG_BNP_MANAGER_MOC_SRC} ${OVQT_EXT_SYS_SRC} ${OVQT_PLUGIN_BNP_MANAGER_RC_SRCS} ${OVQT_PLUG_BNP_MANAGER_UI_HDRS})
+
+TARGET_LINK_LIBRARIES(ovqt_plugin_bnp_manager ovqt_plugin_core nelmisc nelgeorges ${QT_LIBRARIES})
+
+NL_DEFAULT_PROPS(ovqt_plugin_bnp_manager "NeL, Tools, 3D: Object Viewer Qt Plugin: BNP Manager")
+NL_ADD_RUNTIME_FLAGS(ovqt_plugin_bnp_manager)
+NL_ADD_LIB_SUFFIX(ovqt_plugin_bnp_manager)
+
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} -DQT_PLUGIN -DQT_SHARED ${QT_DEFINITIONS})
+
+INSTALL(TARGETS ovqt_plugin_bnp_manager LIBRARY DESTINATION lib RUNTIME DESTINATION bin ARCHIVE DESTINATION lib COMPONENT tools3d)
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
new file mode 100644
index 000000000..a19f4550e
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.cpp
@@ -0,0 +1,93 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_dirtree_dialog.h"
+#include "bnp_filesystem_model.h"
+#include "bnp_proxy_model.h"
+
+// Qt includes
+#include <QtGui/QWidget>
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+namespace BNPManager
+{
+
+CBnpDirTreeDialog::CBnpDirTreeDialog(QString bnpPath, QWidget *parent)
+	:	QDockWidget(parent),
+		m_DataPath(bnpPath)
+{
+	// Setup the dialog
+	m_ui.setupUi(this);
+
+	// Filter settings to only display files with bnp extension.
+	// Could be changed to display all files and react according to the extension:
+	// Bnp file: opened and displayed
+	// all other files: added to the currently opened bnp file
+	QStringList filter;
+    filter << tr("*.bnp");
+
+	// Setup the directory tree model
+	m_dirModel= new BNPFileSystemModel();
+	m_proxyModel = new BNPSortProxyModel();
+	m_ui.dirTree->setSortingEnabled(true);
+	m_dirModel->setRootPath(m_DataPath);
+	m_dirModel->setFilter(QDir::AllDirs | QDir::NoDotAndDotDot | QDir::AllEntries);
+	m_dirModel->setNameFilters(filter);
+    m_dirModel->setNameFilterDisables(0);
+
+	m_proxyModel->setSourceModel(m_dirModel);
+
+	m_ui.dirTree->setModel(m_proxyModel);
+
+	m_ui.dirTree->setRootIndex( m_proxyModel->mapFromSource (m_dirModel->index(m_DataPath) ) );
+
+	// Trigger if one filename is activated
+	// In future drag&drop should be also possible
+	connect(m_ui.dirTree, SIGNAL(activated(QModelIndex)),
+			this, SLOT(fileSelected(QModelIndex)));
+}
+// ***************************************************************************
+CBnpDirTreeDialog::~CBnpDirTreeDialog()
+{
+
+}
+// ***************************************************************************
+void CBnpDirTreeDialog::fileSelected(QModelIndex index)
+{
+	QModelIndex source = m_proxyModel->mapToSource(index);
+	if (source.isValid() && !m_dirModel->isDir(source))
+	{
+		// emit the according signal to BNPManagerWindow class
+		Q_EMIT selectedFile(m_dirModel->fileInfo(source).filePath());
+	}
+}
+// ***************************************************************************
+void CBnpDirTreeDialog::changeFile(QString file)
+{
+
+}
+// ***************************************************************************
+void CBnpDirTreeDialog::BnpPathChanged(QString path)
+{
+
+}
+// ***************************************************************************
+}
+
+
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.h
new file mode 100644
index 000000000..737085185
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_dialog.h
@@ -0,0 +1,83 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_DIRTREE_DIALOG_H
+#define BNP_DIRTREE_DIALOG_H
+
+// Qt includes
+#include <QtGui/QWidget>
+
+// STL includes
+
+// NeL includes
+
+// Project includes
+#include "ui_bnp_dirtree_form.h"
+
+namespace BNPManager
+{
+
+class BNPFileSystemModel;
+class BNPSortProxyModel;
+
+class CBnpDirTreeDialog : public QDockWidget
+{
+	Q_OBJECT
+public:
+
+	/**
+	 * Constructor
+	 * \param path to root directory, which should be displayed
+	 */
+	CBnpDirTreeDialog(QString bnpPath, QWidget *parent = 0);
+
+	/**
+	 * Destructor
+	 */
+	~CBnpDirTreeDialog();
+
+	/**
+	 * Change the root path for the dir tree view
+	 * \param data path to the new directory
+	 */
+	void BnpPathChanged(QString);
+
+private:
+
+	Ui::CBnpDirTreeDialog	m_ui;
+
+	// path ro data root directory
+	QString					m_DataPath;
+
+	BNPFileSystemModel		*m_dirModel;
+
+	BNPSortProxyModel		*m_proxyModel;
+
+Q_SIGNALS:
+	void selectedFile(const QString);
+
+private Q_SLOTS:
+	/**
+	 * Triggered if the user activates (double klick on windows)
+	 * a file name in the dir tree view
+	 * \param selected ModelIndex (filename)
+	 */
+	void fileSelected(QModelIndex index);
+
+	void changeFile(QString file);
+};
+}
+#endif
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_form.ui
new file mode 100644
index 000000000..44b39dc54
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_dirtree_form.ui
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CBnpDirTreeDialog</class>
+ <widget class="QDockWidget" name="CBnpDirTreeDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>200</width>
+    <height>141</height>
+   </size>
+  </property>
+  <property name="features">
+   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+  </property>
+  <property name="windowTitle">
+   <string>BNP Datapath</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <property name="minimumSize">
+    <size>
+     <width>50</width>
+     <height>0</height>
+    </size>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0" colspan="2">
+     <widget class="QTreeView" name="dirTree">
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="sortingEnabled">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../../object_viewer_qt.qrc"/>
+  <include location="../core/core.qrc"/>
+  <include location="bnp_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp
new file mode 100644
index 000000000..e00f777ba
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.cpp
@@ -0,0 +1,324 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_file.h"
+
+// Nel includes
+#include <nel/misc/debug.h>
+#include <nel/misc/file.h>
+#include <nel/misc/path.h>
+#include <nel/misc/algo.h>
+#include <nel/misc/common.h>
+
+// Qt includes
+
+using namespace NLMISC;
+using namespace std;
+
+
+namespace BNPManager
+{
+
+PackedFile::PackedFile()
+{
+	m_size = 0;
+	m_pos = 0;
+}
+
+NLMISC_SAFE_SINGLETON_IMPL(BNPFileHandle);
+
+BNPFileHandle::BNPFileHandle()
+{
+	m_offsetFromBeginning = 0;
+}
+// ***************************************************************************
+BNPFileHandle::~BNPFileHandle()
+{
+	// Erase the list
+	m_packedFiles.clear();
+}
+// ***************************************************************************
+void BNPFileHandle::releaseInstance()
+{
+	if (_Instance)
+	{
+		NLMISC::INelContext::getInstance().releaseSingletonPointer("BNPFileHandle", _Instance);
+		delete _Instance;
+		_Instance = NULL;
+	}
+}
+// ***************************************************************************
+void BNPFileHandle::createFile(string filePath)
+{
+	// Only set the filepath. Header will be created after files have been added
+	m_openedBNPFile = filePath;
+	m_packedFiles.clear();
+
+	nlinfo("Created file %s.", filePath.c_str() );
+}
+// ***************************************************************************
+bool BNPFileHandle::unpack(const string &dirName, const vector<string>& fileList)
+{
+	CIFile bnp;
+	bnp.open(m_openedBNPFile);
+
+	TPackedFilesList::iterator it_files = m_packedFiles.begin();
+
+	for (it_files; it_files != m_packedFiles.end(); it_files++)
+	{
+		// Check if the file should be unpacked or not
+		if (find(fileList.begin(), fileList.end(), it_files->m_name) != fileList.end())
+		{
+			string filename = dirName + "/" + it_files->m_name;
+
+			COFile out;
+			if ( out.open(filename) )
+			{
+				bnp.seek(it_files->m_pos, IStream::begin);
+				uint8 *ptr = new uint8[it_files->m_size];
+				bnp.serialBuffer(ptr,it_files->m_size);
+				out.serialBuffer(ptr,it_files->m_size);
+				delete [] ptr;
+			}
+			out.close();
+		}
+	}
+
+	bnp.close();
+	return true;
+}
+// ***************************************************************************
+// Read the header from a big file
+bool BNPFileHandle::readHeader(const std::string &filePath)
+{
+	m_packedFiles.clear();
+
+	m_openedBNPFile = filePath;
+
+	CIFile bnp;
+	bnp.open (filePath);
+
+	bnp.seek(0, IStream::end);
+	uint32 nFileSize = bnp.getFileSize();
+	bnp.seek(nFileSize-sizeof(uint32), IStream::begin);
+
+	uint32 nOffsetFromBegining;
+
+	bnp.serial(nOffsetFromBegining);
+	
+	if ( !bnp.seek (nOffsetFromBegining, IStream::begin) )
+	{
+		nlwarning("Could not read offset from begining");
+		bnp.close();
+		return false;
+	}
+
+	uint32 nNbFile;
+	bnp.serial(nNbFile);
+
+	for (uint32 i = 0; i < nNbFile; ++i)
+	{
+		uint8 nStringSize;
+		char sName[256];
+
+		bnp.serial(nStringSize);
+		bnp.serialBuffer( (uint8*)sName, nStringSize);
+		sName[nStringSize] = 0;
+
+		PackedFile tmpPackedFile;
+		tmpPackedFile.m_name = sName;
+		tmpPackedFile.m_path = m_openedBNPFile;
+		
+		bnp.serial(tmpPackedFile.m_size);
+		bnp.serial(tmpPackedFile.m_pos);
+
+		m_packedFiles.push_back (tmpPackedFile);
+	}
+
+	bnp.close();
+	return true;
+}
+// ***************************************************************************
+void BNPFileHandle::list(TPackedFilesList& FileList)
+{
+	PackedFile tmpFile;
+	TPackedFilesList::iterator it = m_packedFiles.begin();
+	while (it != m_packedFiles.end() )
+	{
+		tmpFile.m_name = it->m_name;
+		tmpFile.m_pos = it->m_pos;
+		tmpFile.m_size = it->m_size;
+		tmpFile.m_path = it->m_path;
+		FileList.push_back(tmpFile);
+		it++;
+	}
+}
+// ***************************************************************************
+bool BNPFileHandle::writeHeader( const std::string &filePath, uint32 offset )
+{
+	COFile bnp;
+	bnp.open(filePath, true);
+	if ( !bnp.isOpen() )
+		return false;
+
+	uint32 nNbFile = (uint32)m_packedFiles.size();
+	bnp.serial(nNbFile);
+
+	for (uint32 i = 0; i < nNbFile; ++i)
+	{
+		uint8 nStringSize = (uint8)m_packedFiles[i].m_name.size();
+		bnp.serial( nStringSize );
+		bnp.serialBuffer( (uint8*)m_packedFiles[i].m_name.c_str(), nStringSize	 );
+		bnp.serial(m_packedFiles[i].m_size);
+		bnp.serial(m_packedFiles[i].m_pos);
+	}
+
+	bnp.serial(offset);
+
+	bnp.close();
+
+	return true;
+}
+// ***************************************************************************
+void BNPFileHandle::fileNames(std::vector<std::string> &fileNames)
+{
+	TPackedFilesList::iterator it = m_packedFiles.begin();
+	while (it != m_packedFiles.end() )
+	{
+		fileNames.push_back(it->m_name);
+		it++;
+	}
+}
+// ***************************************************************************
+void BNPFileHandle::addFiles( const vector<string> &filePathes)
+{
+	uint32 OffsetFromBegining = 0;
+
+	// create packed files and add them to the private vector
+	vector<string>::const_iterator it_vec = filePathes.begin();
+	while (it_vec != filePathes.end() )
+	{
+		PackedFile tmpFile;
+		tmpFile.m_name = CFile::getFilename (*it_vec);
+		// Leave position to 0 and set the value during the new bnp file is creating
+		// We need the position only for the header at the end
+		tmpFile.m_pos = 0;
+		tmpFile.m_size = CFile::getFileSize(*it_vec);
+		tmpFile.m_path = *it_vec;
+		m_packedFiles.push_back( tmpFile );
+
+		it_vec++;
+	}
+
+	// sort packed files alphabetic
+	std::sort ( m_packedFiles.begin(), m_packedFiles.end(), compare );
+
+	// create a new temporary bnp file with extension *.tmp
+	TPackedFilesList::iterator it_packed = m_packedFiles.begin();
+	while (it_packed != m_packedFiles.end() )
+	{
+		append(m_openedBNPFile + ".tmp", *it_packed);
+		// Set now the new offset for the new header
+		it_packed->m_pos = OffsetFromBegining;
+		OffsetFromBegining += it_packed->m_size;
+
+		it_packed++;
+	}
+
+	writeHeader(m_openedBNPFile + ".tmp", OffsetFromBegining);
+
+	// Delete any previous existing file
+	if (CFile::fileExists( m_openedBNPFile ))
+		CFile::deleteFile( m_openedBNPFile );
+	string src = m_openedBNPFile + ".tmp";
+	CFile::moveFile( m_openedBNPFile.c_str(), src.c_str() );
+}
+// ***************************************************************************
+void BNPFileHandle::deleteFiles( const vector<string>& fileNames)
+{
+	vector<string>::const_iterator it_vec;
+	TPackedFilesList::iterator it_packed;
+	uint32 OffsetFromBegining = 0;
+	string tmpFile = m_openedBNPFile + ".tmp";
+
+	// create a new temporary bnp file with extension *.tmp
+	it_packed = m_packedFiles.begin();
+	while (it_packed != m_packedFiles.end() )
+	{
+		// check each packed file if it should be deleted
+		it_vec = find (fileNames.begin(), fileNames.end(), it_packed->m_name );
+		if ( it_vec != fileNames.end() )
+		{
+			nlinfo("Deleting file %s.", it_packed->m_name.c_str() );
+			it_packed = m_packedFiles.erase(it_packed);
+		}
+		else
+		{
+			append(tmpFile, *it_packed);
+			// Set now the new offset for the new header
+			it_packed->m_pos = OffsetFromBegining;
+			OffsetFromBegining += it_packed->m_size;
+
+			it_packed++;
+		}
+	}
+
+	writeHeader(tmpFile, OffsetFromBegining);
+	
+	CFile::deleteFile( m_openedBNPFile );
+	string src = m_openedBNPFile + ".tmp";
+	CFile::moveFile( m_openedBNPFile.c_str(), src.c_str() );
+}
+// ***************************************************************************
+void BNPFileHandle::append(const string &destination, const PackedFile &source)
+{
+	// check if the file exists and create one if not
+	if ( !CFile::fileExists(destination) )
+		CFile::createEmptyFile( destination );
+
+	COFile bnpfile;
+	CIFile packedfile; 
+	bnpfile.open(destination, true);
+	packedfile.open(source.m_path);
+	if ( !bnpfile.isOpen() ) return;
+
+	
+	uint8 *ptr = new uint8[source.m_size];
+
+	// check if the source is a bnp file.
+	if ( nlstricmp( CFile::getExtension(source.m_path), "bnp" ) == 0 )
+	{
+		// Jump to the file position inside the bnp
+		packedfile.seek(source.m_pos, IStream::begin);
+	}
+	// Read the source
+	packedfile.serialBuffer(ptr, source.m_size);
+
+	// Append the data to the destination
+	bnpfile.serialBuffer(ptr, source.m_size);
+
+	delete [] ptr;
+	
+	packedfile.close();
+	bnpfile.close();
+}
+// ***************************************************************************
+bool BNPFileHandle::compare(const PackedFile &left, const PackedFile &right)
+{
+	return nlstricmp (left.m_name.c_str(), right.m_name.c_str()) < 0;
+}
+} // namespace BNPManager
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h
new file mode 100644
index 000000000..7695ebc2f
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_file.h
@@ -0,0 +1,145 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_FILE_H
+#define BNP_FILE_H
+
+// Project includes
+
+// Nel includes
+#include "nel/misc/types_nl.h"
+#include <nel/misc/singleton.h>
+
+// Qt includes
+#include <QString>
+
+
+namespace BNPManager 
+{
+
+struct PackedFile
+{
+	PackedFile();
+	std::string m_name;
+	uint32 m_size;
+	uint32 m_pos;
+	std::string m_path;
+};
+
+typedef std::vector<PackedFile> TPackedFilesList;
+
+class BNPFileHandle
+{
+	NLMISC_SAFE_SINGLETON_DECL(BNPFileHandle)
+
+	/**
+	 * Private constructor
+	 */
+	BNPFileHandle();
+
+	/**
+	 * Private destructor
+	 */
+	~BNPFileHandle();
+
+public:
+	// release memory
+	static void releaseInstance();
+
+	/*void append (const QString destFilename, const QString origFilename, uint32 sizeToRead);
+	void packRecurse();*/
+
+	/**
+	 * Read the header from the bnp file and create a filelist
+	 * \param filename (consisting the whole path)
+	 */
+	bool readHeader (const std::string &filePath);
+
+	bool writeHeader (const std::string &filePath, uint32 offset);
+
+	/**
+	 * Append the header to a created bnp file
+	 * \param filename (consisting the whole path)
+	 */
+	void appendHeader (const std::string &filename) {}
+
+	/**
+	 * Create a vector of all packed files inside the bnp file
+	 * \param reference to the vector, which has to be filled
+	 */
+	void list (TPackedFilesList& FileList);
+
+	/**
+	 * Create a vector of all file names inside the bnp file
+	 * \param reference to the vector, which has to be filled
+	 */
+	void fileNames( std::vector<std::string>& fileNames );
+
+	/**
+	 * Create a new bnp file
+	 * \param string file path
+	 */
+	void createFile( std::string filePath );
+
+	/**
+	 * Add files to the current aktive bnp file
+	 * \param vector of file pathes to add
+	 */
+	void addFiles( const std::vector<std::string>& filePathes );
+
+	/**
+	 * Delete files from the current aktive bnp file
+	 * \param vector of files names
+	 */
+	void deleteFiles (const std::vector<std::string>& fileNames);
+	
+	/**
+	 * Unpack the selected packed files into user defined dir
+	 * \param directory path, where the files should be unpacked
+	 * \param list of files, which has to be unpacked
+	 */
+	bool unpack (const std::string &dirName, const std::vector<std::string>& fileList);
+
+	/**
+	 * Compares two filenames
+	 * \param left: left packed file
+	 * \param right: right packed file
+	 * \return: TODO
+	 */
+	static bool compare(const PackedFile &left, const PackedFile &right);
+
+private:
+
+	/**
+	 * Append one file to an existing bnp file
+	 * \param destination: the active bnp file to append the file
+	 * \param source: the source file to pack
+	 */
+	void append( const std::string& destination, const PackedFile& source );
+
+	TPackedFilesList		m_packedFiles;
+
+	// currently opened and displayed bnp file
+	std::string				m_openedBNPFile;
+
+	// offset where the header of the bnp file begins
+	uint32					m_offsetFromBeginning;
+
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
new file mode 100644
index 000000000..261175902
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.cpp
@@ -0,0 +1,132 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_filelist_dialog.h"
+#include "bnp_file.h"
+
+// Qt includes
+#include <QtGui/QWidget>
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+using namespace std;
+
+namespace BNPManager
+{
+
+BnpFileListDialog::BnpFileListDialog(QString bnpPath, QWidget *parent)
+	:	QDockWidget(parent),
+		m_DataPath(bnpPath)
+{
+	m_ui.setupUi(this);
+}
+// ***************************************************************************
+BnpFileListDialog::~BnpFileListDialog()
+{
+
+}
+// ***************************************************************************
+void BnpFileListDialog::setupTable(int nbrows)
+{
+	// delete all old entries
+	m_ui.tableWidget->clear();
+
+	// set 2 colums: filename and size
+	m_ui.tableWidget->setColumnCount(2);
+
+	// set number of rows according to the number of files in the bnp file
+	m_ui.tableWidget->setRowCount(nbrows);
+
+	// only entire rows can be selected
+	m_ui.tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
+	
+	// set the horizontal headers
+	QStringList labels;
+	labels << tr("Filename") << tr("Size");
+	m_ui.tableWidget->setHorizontalHeaderLabels(labels);
+
+	m_ui.tableWidget->horizontalHeader()->setResizeMode(0, QHeaderView::Interactive);
+	m_ui.tableWidget->horizontalHeader()->setResizeMode(1, QHeaderView::Stretch );
+	m_ui.tableWidget->verticalHeader()->hide();
+
+	// set vertical size a little bit smaller
+	m_ui.tableWidget->verticalHeader()->setDefaultSectionSize(15);
+	m_ui.tableWidget->setShowGrid(false);
+    m_ui.tableWidget->setObjectName("tablewidget");
+}
+// ***************************************************************************
+bool BnpFileListDialog::loadTable(const QString filePath)
+{
+	// reference to the BNPFileHandle singletone instance
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+	// string vector of all packed files inside a bnp
+	TPackedFilesList filelist;
+	int row = 0;
+
+	// read the header from the bnp file
+	if (!myBNPFileHandle.readHeader( filePath.toStdString()) )
+	{
+		return false;
+	}
+	myBNPFileHandle.list( filelist );
+
+	// create table with number of rows
+	setupTable(filelist.size());
+
+	// fill the table items
+	TPackedFilesList::iterator it = filelist.begin();
+	while (it != filelist.end() )
+	{
+		QTableWidgetItem *nameItem = new QTableWidgetItem (it->m_name.c_str() );
+		QTableWidgetItem *sizeItem = new QTableWidgetItem (tr("%1 KB").arg(it->m_size));
+		m_ui.tableWidget->setItem(row, 0, nameItem);
+		m_ui.tableWidget->setItem(row, 1, sizeItem);
+		it++;
+		row++;
+	}
+
+	// Set the file path as the widgets title
+	setWindowTitle(filePath);
+
+	return true;
+}
+// ***************************************************************************
+void BnpFileListDialog::clearTable()
+{
+	// create emtpy table
+	setupTable(0);
+
+	setWindowTitle("BNP File List");
+}
+// ***************************************************************************
+void BnpFileListDialog::getSelections(TSelectionList& SelectionList)
+{
+	QModelIndex index;
+	QAbstractItemModel *model = m_ui.tableWidget->model();
+	QItemSelectionModel *selection = m_ui.tableWidget->selectionModel();
+	QModelIndexList indexes = selection->selectedRows();
+
+	Q_FOREACH(index, indexes)
+	{
+		QVariant data = model->data(index);
+		QString filename = data.toString();
+		SelectionList.push_back( filename.toStdString() );
+	}
+}
+
+} // namespace BNPManager
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.h
new file mode 100644
index 000000000..dbf007fc2
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.h
@@ -0,0 +1,85 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_FILELIST_DIALOG_H
+#define BNP_FILELIST_DIALOG_H
+
+// Qt includes
+#include <QtGui/QWidget>
+
+// STL includes
+#include <vector>
+#include <string>
+
+// NeL includes
+
+// Project includes
+#include "ui_bnp_filelist_dialog.h"
+
+namespace BNPManager
+{
+
+typedef std::vector<std::string> TSelectionList;
+
+class BnpFileListDialog : public QDockWidget
+{
+	Q_OBJECT
+
+public:
+
+	// Constructor
+	BnpFileListDialog(QString bnpPath, QWidget *parent = 0);
+
+	// Destructor
+	~BnpFileListDialog();
+
+	/**
+	 * Load the bnp file and setup the table view
+	 * \param Filename
+	 * \return true if everything went well
+	 */
+	bool loadTable(const QString filePath);
+
+	/**
+	 * Set the dimension of the table
+	 * \param number of rows
+	 */
+	void setupTable(int nbrows);
+
+	/**
+	 * When BNP files is closed, clear the filelist table
+	 */
+	void clearTable();
+
+	/**
+	 * Fill the files selected in the table view to
+	 * unpack them.
+	 * \param reference to a vector of filenames.
+	 * \return true if everything went well
+	 */
+	void getSelections(TSelectionList& SelectionList);
+
+private:
+	Ui::BnpFileListDialog m_ui;
+
+	// common data path as root folder for the dirtree view
+	QString m_DataPath;
+
+};
+
+}
+
+#endif
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.ui
new file mode 100644
index 000000000..9f62ff7c0
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filelist_dialog.ui
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BnpFileListDialog</class>
+ <widget class="QDockWidget" name="BnpFileListDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>200</width>
+    <height>141</height>
+   </size>
+  </property>
+  <property name="acceptDrops">
+   <bool>true</bool>
+  </property>
+  <property name="features">
+   <set>QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
+  </property>
+  <property name="windowTitle">
+   <string>BNP File List</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <property name="minimumSize">
+    <size>
+     <width>50</width>
+     <height>0</height>
+    </size>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QTableWidget" name="tableWidget">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="editTriggers">
+       <set>QAbstractItemView::NoEditTriggers</set>
+      </property>
+      <property name="selectionBehavior">
+       <enum>QAbstractItemView::SelectRows</enum>
+      </property>
+      <property name="showGrid">
+       <bool>false</bool>
+      </property>
+      <attribute name="horizontalHeaderMinimumSectionSize">
+       <number>15</number>
+      </attribute>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources>
+  <include location="../../object_viewer_qt.qrc"/>
+  <include location="../core/core.qrc"/>
+  <include location="bnp_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.cpp
new file mode 100644
index 000000000..75ef031ff
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.cpp
@@ -0,0 +1,51 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+#include "bnp_filesystem_model.h"
+
+#include <QApplication>
+#include <QStyle>
+
+namespace BNPManager
+{
+
+BNPFileSystemModel::BNPFileSystemModel(QObject *parent)
+	: QFileSystemModel(parent)
+{
+}
+// ***************************************************************************
+BNPFileSystemModel::~BNPFileSystemModel()
+{
+
+}
+// ***************************************************************************
+int BNPFileSystemModel::columnCount(const QModelIndex &) const
+{
+	return 1;
+}
+// ***************************************************************************
+QVariant BNPFileSystemModel::data(const QModelIndex& index, int role) const
+{
+
+	if (role == Qt::DecorationRole)
+	{
+		if (isDir(index))
+			return QApplication::style()->standardIcon(QStyle::SP_DirIcon);
+	}
+	return QFileSystemModel::data(index, role);
+}
+// ***************************************************************************
+} // namespace BNPManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.h
new file mode 100644
index 000000000..2ca086b39
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_filesystem_model.h
@@ -0,0 +1,49 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+#ifndef BNP_FILESYSTEM_MODEL_H
+#define BNP_FILESYSTEM_MODEL_H
+
+#include <QtGui/QFileSystemModel>
+
+namespace BNPManager
+{
+
+class BNPFileSystemModel : public QFileSystemModel
+{
+	Q_OBJECT
+
+public:
+
+	/**
+	 * Constructor
+	 */
+	BNPFileSystemModel(QObject *parent = 0);
+
+	/**
+	 * Destructor
+	 */
+	~BNPFileSystemModel();
+
+	int columnCount(const QModelIndex &) const;
+
+	QVariant data(const QModelIndex& index, int role) const ;
+
+};
+
+}
+
+#endif
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager.qrc b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager.qrc
new file mode 100644
index 000000000..bf32595d6
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager.qrc
@@ -0,0 +1,9 @@
+<RCC>
+  <qresource>
+    <file>images/ic_nel_bnp_make.png</file>
+	<file>images/ic_nel_delete_item.png</file>
+	<file>images/ic_nel_add_item.png</file>
+	<file>images/ic_nel_export.png</file>
+	<file>images/ic_nel_reset_all.png</file>
+  </qresource>
+</RCC>
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_constants.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_constants.h
new file mode 100644
index 000000000..609305b7e
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_constants.h
@@ -0,0 +1,38 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_MANAGER_CONSTANTS_H
+#define BNP_MANAGER_CONSTANTS_H
+
+namespace BNPManager
+{
+namespace Constants
+{
+//settings
+const char * const BNP_MANAGER_SECTION = "BNPManager";
+
+//resources
+const char *const ICON_NEW = ":/images/ic_nel_new.png";
+const char *const ICON_ADD = ":/images/ic_nel_add_item.png";
+const char *const ICON_DELETE = ":/images/ic_nel_delete_item.png";
+const char *const ICON_UNPACK = ":/images/ic_nel_export.png";
+const char *const ICON_CLOSE = ":/images/ic_nel_reset_all.png";
+
+
+} // namespace Constants
+} // namespace Plugin
+
+#endif
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.cpp
new file mode 100644
index 000000000..70015773b
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.cpp
@@ -0,0 +1,89 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_manager_plugin.h"
+#include "bnp_manager_window.h"
+
+#include "../core/icore.h"
+#include "../core/core_constants.h"
+#include "../core/menu_manager.h"
+
+// NeL includes
+#include "nel/misc/debug.h"
+
+// Qt includes
+#include <QtCore/QObject>
+#include <QtGui/QMainWindow>
+
+namespace BNPManager
+{
+
+	BNPManagerPlugin::BNPManagerPlugin()
+	{
+	}
+	
+	BNPManagerPlugin::~BNPManagerPlugin()
+	{
+		Q_FOREACH(QObject *obj, m_autoReleaseObjects)
+		{
+			m_plugMan->removeObject(obj);
+		}
+		qDeleteAll(m_autoReleaseObjects);
+		m_autoReleaseObjects.clear();
+	}
+
+bool BNPManagerPlugin::initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString)
+{
+    Q_UNUSED(errorString);
+    m_plugMan = pluginManager;
+
+    addAutoReleasedObject(new BNPManagerContext(this));
+    return true;
+}
+
+void BNPManagerPlugin::extensionsInitialized()
+{
+}
+
+void BNPManagerPlugin::shutdown()
+{
+
+}
+
+void BNPManagerPlugin::setNelContext(NLMISC::INelContext *nelContext)
+{
+#ifdef NL_OS_WINDOWS
+    // Ensure that a context doesn't exist yet.
+    // This only applies to platforms without PIC, e.g. Windows.
+    nlassert(!NLMISC::INelContext::isContextInitialised());
+#endif // NL_OS_WINDOWS
+    m_libContext = new NLMISC::CLibraryContext(*nelContext);
+}
+
+void BNPManagerPlugin::addAutoReleasedObject(QObject *obj)
+{
+    m_plugMan->addObject(obj);
+    m_autoReleaseObjects.prepend(obj);
+}
+
+/*void BNPManagerContext::open()
+{
+    m_BnpManagerWindow->open();
+}*/
+}
+
+Q_EXPORT_PLUGIN(BNPManager::BNPManagerPlugin)
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.h
new file mode 100644
index 000000000..55e2e8444
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_plugin.h
@@ -0,0 +1,130 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_MANAGER_PLUGIN_H
+#define BNP_MANAGER_PLUGIN_H
+
+// Project includes
+#include "../../extension_system/iplugin.h"
+#include "../core/icontext.h"
+#include "bnp_manager_window.h"
+
+// NeL includes
+#include "nel/misc/app_context.h"
+#include <nel/misc/debug.h>
+
+// Qt includes
+#include <QtCore/QObject>
+#include <QtGui/QIcon>
+
+namespace NLMISC
+{
+class CLibraryContext;
+}
+
+namespace ExtensionSystem
+{
+class IPluginSpec;
+}
+
+namespace BNPManager
+{
+class m_BnpManagerWindow;
+
+class BNPManagerPlugin : public QObject, public ExtensionSystem::IPlugin
+{
+    Q_OBJECT
+    Q_INTERFACES(ExtensionSystem::IPlugin)
+
+public:
+	BNPManagerPlugin();
+    virtual ~BNPManagerPlugin();
+
+    virtual bool initialize(ExtensionSystem::IPluginManager *pluginManager, QString *errorString);
+    virtual void extensionsInitialized();
+    virtual void shutdown();
+    virtual void setNelContext(NLMISC::INelContext *nelContext);
+
+    void addAutoReleasedObject(QObject *obj);
+
+protected:
+
+    NLMISC::CLibraryContext *m_libContext;
+
+private:
+
+    ExtensionSystem::IPluginManager *m_plugMan;
+    QList<QObject *> m_autoReleaseObjects;
+};
+
+/**
+ * Implementation of the IContext interface
+ *
+ * \date 2011
+ */
+
+class BNPManagerContext : public Core::IContext
+{
+    Q_OBJECT
+
+public:
+	// Constructor
+	BNPManagerContext(QObject *parent = 0) : IContext(parent)
+	{
+		// run new manager window app
+		m_BnpManagerWindow = new BNPManagerWindow();
+	}
+
+	// Destructor
+    virtual ~BNPManagerContext() {}
+
+    virtual QString id() const
+    {
+        return QLatin1String("BNPManagerContext");
+    }
+    virtual QString trName() const
+    {
+        return tr("BNP Manager");
+    }
+    virtual QIcon icon() const
+    {
+        return QIcon(":/images/ic_nel_bnp_make.png");
+    }
+
+    virtual void open()
+	{
+		m_BnpManagerWindow->open();
+	}
+
+    virtual QUndoStack *undoStack()
+	{
+		return m_BnpManagerWindow->m_undoStack;
+	}
+
+    virtual QWidget *widget()
+	{
+		return m_BnpManagerWindow;
+	}
+
+    BNPManagerWindow *m_BnpManagerWindow;
+
+};
+
+} // namespace Plugin
+
+
+
+#endif // BNP_MANAGER_PLUGIN_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.cpp
new file mode 100644
index 000000000..3990e70ce
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.cpp
@@ -0,0 +1,444 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+// Project includes
+#include "bnp_manager_window.h"
+#include "bnp_manager_constants.h"
+#include "bnp_dirtree_dialog.h"
+#include "bnp_filelist_dialog.h"
+#include "bnp_file.h"
+
+#include "../core/icore.h"
+#include "../core/menu_manager.h"
+#include "../core/core_constants.h"
+#include "../../extension_system/iplugin_spec.h"
+
+// NeL includes
+#include <nel/misc/debug.h>
+#include <nel/misc/path.h>
+
+// STL includes
+#include <vector>
+#include <string>
+
+// Qt includes
+#include <QDebug>
+#include <QFileDialog>
+#include <QToolBar>
+#include <QTableWidget>
+#include <QMessageBox>
+#include <QSettings>
+#include <QDragEnterEvent>
+#include <QMimeData>
+#include <QUrl>
+#include <QEvent>
+#include <QInputDialog>
+
+using namespace std;
+using namespace NLMISC;
+
+
+namespace BNPManager
+{
+
+BNPManagerWindow::BNPManagerWindow(QWidget *parent)
+    :   QMainWindow(parent)
+{
+    // add new mainwindow for sheet dockwidgets
+	QTableWidget* hideWidget = new QTableWidget(0,0,this);
+	setCentralWidget(hideWidget);
+	hideWidget->hide();
+
+	setAcceptDrops(true);
+
+	// Read the settings
+	readSettings();
+	
+	// create main dialogs and display them
+	createDialogs();
+
+	// create actions like open, close, add etc.
+	createActions();
+
+	// create a toolbar with icons
+	createToolBars();
+	
+	// this SLOT is triggered if the user activates a bnp files in the 
+	// dirtree view
+	connect(m_BnpDirTreeDialog, SIGNAL(selectedFile(const QString)), 
+			this, SLOT(loadFile(const QString)));
+
+	// not used
+    m_undoStack = new QUndoStack(this);
+}
+// ***************************************************************************
+BNPManagerWindow::~BNPManagerWindow()
+{
+	writeSettings();
+}
+// ***************************************************************************
+void BNPManagerWindow::createDialogs()
+{
+	// create dialog to list the contents of the specified
+	// bnp data file directory
+	m_BnpDirTreeDialog = new CBnpDirTreeDialog(tr(m_DataPath.toStdString().c_str()),this);
+	addDockWidget(Qt::LeftDockWidgetArea, m_BnpDirTreeDialog);
+	m_BnpDirTreeDialog->setVisible(true);
+	restoreDockWidget(m_BnpDirTreeDialog);
+
+	// create dialog to list the packed file contents of bnp files on
+	// the right hand side
+	m_BnpFileListDialog = new BnpFileListDialog(m_DataPath,this);
+	addDockWidget(Qt::RightDockWidgetArea, m_BnpFileListDialog);
+	m_BnpFileListDialog->setVisible(true);
+	restoreDockWidget(m_BnpFileListDialog);
+}
+// ***************************************************************************
+void BNPManagerWindow::createActions()
+{
+	// new action
+	m_newAction = new QAction(tr("&New..."), this);
+	m_newAction->setIcon(QIcon(Core::Constants::ICON_NEW));
+    m_newAction->setStatusTip(tr("New file"));
+	connect(m_newAction, SIGNAL(triggered()), this, SLOT( newFile() ));
+
+	// open action
+	m_openAction = new QAction(tr("&Open..."), this);
+	m_openAction->setIcon(QIcon(Core::Constants::ICON_OPEN));
+    m_openAction->setStatusTip(tr("Open file"));
+	connect(m_openAction, SIGNAL(triggered()), this, SLOT( open() ));
+
+	// close action
+    m_closeAction = new QAction(tr("&Close..."), this);
+	m_closeAction->setIcon(QIcon(Constants::ICON_CLOSE));
+    m_closeAction->setStatusTip(tr("Close the BNP File"));
+    connect(m_closeAction, SIGNAL(triggered()), this, SLOT( close() ));
+
+	// add files into the bnp file
+    m_addFilesAction = new QAction(tr("&Add..."), this);
+	m_addFilesAction->setIcon(QIcon(Constants::ICON_ADD));
+    m_addFilesAction->setStatusTip(tr("Add Files to BNP"));
+    connect(m_addFilesAction, SIGNAL(triggered()), this, SLOT( addFiles() ));
+
+	// delete files from the bnp file
+    m_deleteFilesAction = new QAction(tr("&Delete..."), this);
+    m_deleteFilesAction->setIcon(QIcon(Constants::ICON_DELETE));
+    m_deleteFilesAction->setStatusTip(tr("Delete Files"));
+    connect(m_deleteFilesAction, SIGNAL(triggered()), this, SLOT( deleteFiles() ));
+
+	// unpack selected files into user defined dir
+    m_unpackFilesAction = new QAction(tr("&Unpack..."), this);
+	m_unpackFilesAction->setIcon(QIcon(Constants::ICON_UNPACK));
+    m_unpackFilesAction->setStatusTip(tr("Unpack Files"));
+    connect(m_unpackFilesAction, SIGNAL(triggered()), this, SLOT( unpackFiles() ));
+}
+// ***************************************************************************
+void BNPManagerWindow::createToolBars()
+{
+	m_fileToolBar = addToolBar(tr("&File"));
+	m_fileToolBar->addAction(m_newAction);
+	m_fileToolBar->addAction(m_openAction);
+	m_fileToolBar->addAction(m_closeAction);
+
+	m_toolsBar = addToolBar(tr("&Tools"));
+	m_toolsBar->addAction(m_addFilesAction);
+	m_toolsBar->addAction(m_deleteFilesAction);
+	m_toolsBar->addAction(m_unpackFilesAction);
+}
+// ***************************************************************************
+bool BNPManagerWindow::loadFile(const QString fileName)
+{
+	// Store the filename for later use
+	m_openedBNPFile = fileName;
+	m_BnpFileListDialog->loadTable(fileName);
+	return true;
+}
+// ***************************************************************************
+void BNPManagerWindow::newFile()
+{
+	// reference to the BNPFileHandle singletone instance
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+
+	m_openedBNPFile = "";
+	m_BnpFileListDialog->clearTable();
+
+	QString filePath = QFileDialog::getSaveFileName(this, tr("Create File"),QDir::currentPath(),
+                            tr("BNP File (*.bnp)"));
+
+	if (filePath.isEmpty() )
+		return;
+
+	if ( !filePath.endsWith(".bnp", Qt::CaseInsensitive) )
+		filePath.append(".bnp");
+
+	m_openedBNPFile = filePath;
+	m_BnpFileListDialog->setWindowTitle (filePath);
+
+	myBNPFileHandle.createFile ( filePath.toStdString() );
+
+}
+// ***************************************************************************
+void BNPManagerWindow::open()
+{
+	QString fileName;
+	// file dialog to select with file should be opened
+	fileName = QFileDialog::getOpenFileName(this,
+		tr("Open BNP file"), tr(m_DataPath.toStdString().c_str()), tr("BNP Files (*.bnp)"));
+
+	// Check if filename is empty
+	if (fileName.isNull())
+		return;
+
+    loadFile(fileName);
+}
+// ***************************************************************************
+void BNPManagerWindow::close()
+{
+    m_openedBNPFile = "";
+	m_BnpFileListDialog->clearTable();
+}
+// ***************************************************************************
+void BNPManagerWindow::addFiles()
+{
+	// reference to the BNPFileHandle singletone instance
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+
+	// vector of all current packed filenames
+	vector<string> currentFiles;
+
+	// vector of files to add
+	vector<string> addFiles;
+
+    // open a file dialog and to add files
+	QStringList FileList;
+
+	FileList = QFileDialog::getOpenFileNames(this,tr("Add Files..."),
+							QDir::currentPath(), tr("All Files (*.*)") );
+	
+	// get all current filenames from the opened bnp file
+	myBNPFileHandle.fileNames(currentFiles);
+
+	QStringList::iterator it_list = FileList.begin();
+	while (it_list != FileList.end() )
+	{
+		string fileName = CFile::getFilename (it_list->toStdString() );
+		if ( std::find(currentFiles.begin(), currentFiles.end(), fileName ) !=  currentFiles.end() )
+		{
+			// Ask the user if he wants to override the existing file
+			// atm only warn the user and do not override
+			QMessageBox::warning(this, tr("BNP Manager"),
+                                tr("File is already in the list!"),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+		}
+		else
+		{
+			addFiles.push_back( it_list->toStdString() );
+			// log it
+			nlinfo("Add file %s", fileName.c_str() );
+		}
+		it_list++;
+	}
+	
+	if ( !addFiles.empty() )
+	{
+		myBNPFileHandle.addFiles( addFiles );
+	}
+	loadFile(m_openedBNPFile);
+}
+// ***************************************************************************
+void BNPManagerWindow::addFiles( QStringList FileList )
+{
+	// reference to the BNPFileHandle singletone instance
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+
+	// vector of all current packed filenames
+	vector<string> currentFiles;
+
+	// vector of files to add
+	vector<string> addFiles;
+	
+	// get all current filenames from the opened bnp file
+	myBNPFileHandle.fileNames(currentFiles);
+
+	QStringList::iterator it_list = FileList.begin();
+	while (it_list != FileList.end() )
+	{
+		string fileName = CFile::getFilename (it_list->toStdString() );
+		if ( std::find(currentFiles.begin(), currentFiles.end(), fileName ) !=  currentFiles.end() )
+		{
+			// Ask the user if he wants to override the existing file
+			// atm only warn the user and do not override
+			QMessageBox::warning(this, tr("BNP Manager"),
+                                tr("File is already in the list!"),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+		}
+		else
+		{
+			addFiles.push_back( it_list->toStdString() );
+			// log it
+			nlinfo("Add file %s", fileName.c_str() );
+		}
+		it_list++;
+	}
+	
+	if ( !addFiles.empty() )
+	{
+		myBNPFileHandle.addFiles( addFiles );
+	}
+	loadFile(m_openedBNPFile);
+}
+// ***************************************************************************
+void BNPManagerWindow::deleteFiles()
+{
+    QFileDialog filedialog(this);
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+	vector<string> selectedRows;
+
+	m_BnpFileListDialog->getSelections(selectedRows);
+
+	// Check if files were selected. If not, inform the user.
+	if (selectedRows.empty())
+	{
+		QMessageBox::information(this, tr("BNP Manager"),
+                                tr("No files selected!"),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+		return;
+	}
+	
+	myBNPFileHandle.deleteFiles(selectedRows);
+	loadFile(m_openedBNPFile);
+}
+// ***************************************************************************
+void BNPManagerWindow::unpackFiles()
+{
+	QFileDialog filedialog(this);
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+	vector<string> selectedrows;
+
+	m_BnpFileListDialog->getSelections(selectedrows);
+
+	// Check if files were selected. If not, inform the user.
+	// TODO: Ask the user if nothing was selected, if he wants to unpack all
+	// files. This is more like Winzip.
+	if (selectedrows.empty())
+	{
+		QMessageBox::information(this, tr("BNP Manager"),
+                                tr("No files selected!"),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+		return;
+	}
+
+	QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"),
+								tr(m_DataPath.toStdString().c_str()),
+								QFileDialog::ShowDirsOnly
+								| QFileDialog::DontResolveSymlinks);
+
+	// If anything went wrong or the user pressed "cancel"
+	if ( dir.isEmpty() )
+		return;
+	
+	if (myBNPFileHandle.unpack(dir.toStdString(),selectedrows))
+	{
+		QMessageBox::information(this, tr("BNP Manager"),
+                                tr("All files has been exported successfully."),
+                                QMessageBox::Ok,
+								QMessageBox::Ok);
+	}
+}
+// ***************************************************************************
+void BNPManagerWindow::readSettings()
+{
+	QSettings *settings = Core::ICore::instance()->settings();
+
+	settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
+	m_DataPath = settings->value(Core::Constants::ASSETS_PATH, "w:/database").toString();
+	settings->endGroup();
+}
+// ***************************************************************************
+void BNPManagerWindow::writeSettings()
+{
+}
+
+// ***************************************************************************
+void BNPManagerWindow::dragEnterEvent(QDragEnterEvent *event)
+{
+	// Accept only one file
+	// In the future a tabbed FileListDialog would accept more
+	if ( event->mimeData()->hasUrls() )
+		event->acceptProposedAction();
+}
+// ***************************************************************************
+void BNPManagerWindow::dropEvent(QDropEvent *event)
+{
+	// reference to the BNPFileHandle singletone instance
+	BNPFileHandle& myBNPFileHandle = BNPFileHandle::getInstance();
+
+	// Excraft the local file url from the drop object and fill the table
+	const QMimeData *mimeData = event->mimeData();
+	QList<QUrl> urlList = mimeData->urls();
+	QString filePath;
+	QStringList fileList;
+
+	if ( urlList.count() == 1 )
+	{
+		// If it is a bnp file, open it
+		// If it is not a bnp file add it
+
+		filePath = urlList.first().toLocalFile();
+		if ( filePath.endsWith(".bnp", Qt::CaseInsensitive) )
+		{
+			loadFile(filePath);
+		}
+		else
+		{
+			if ( m_openedBNPFile == "")
+				newFile();
+			// Create a QStringList and pass it to addfiles
+			fileList.push_back( filePath );
+			addFiles( fileList );
+			// Reload current bnp
+			loadFile(m_openedBNPFile);
+		}
+	}
+	else if ( urlList.count() > 1 )
+	{
+		// Dont accept any bnp file
+		QList<QUrl>::iterator it = urlList.begin();
+		while ( it != urlList.end() )
+		{
+			filePath = it->toLocalFile();
+			if ( filePath.endsWith(".bnp") )
+			{
+				nlwarning("Could not add a bnp file!", filePath.toStdString().c_str() );
+			}
+			else
+			{
+				fileList.push_back( filePath );
+			}
+			++it;
+		}
+		if ( m_openedBNPFile == "")
+			newFile();
+		addFiles( fileList );
+		// Reload current bnp
+		loadFile(m_openedBNPFile);
+	}
+}
+} // namespace BNPManager
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.h
new file mode 100644
index 000000000..89bd68a16
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.h
@@ -0,0 +1,156 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef BNP_MANAGER_WINDOW_H
+#define BNP_MANAGER_WINDOW_H
+
+// Project includes
+//#include "ui_bnp_manager_window.h"
+
+// Qt includes
+#include <QtGui/QMainWindow>
+#include <QtGui/QLabel>
+#include <QtGui/QUndoStack>
+#include <QtGui/QTableWidget>
+
+
+namespace BNPManager
+{
+
+class CBnpDirTreeDialog;
+class BnpFileListDialog;
+class BNPFileHandle;
+
+/**
+ * Main window class. Derived from QMainWindow and implements 
+ * the basic layout like menue, toolbars and dialogs.
+ *
+ * \date 2011
+ */
+
+class BNPManagerWindow : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+
+	// Constructor
+    BNPManagerWindow(QWidget *parent = 0);
+
+	//Destructor
+    ~BNPManagerWindow();
+
+
+    QUndoStack *m_undoStack;
+
+public Q_SLOTS:
+
+	/**
+	 * Create a new file
+	 * \return Filename string 
+	 */
+	void newFile();
+
+	/**
+	 * Open a file dialog to choose which file should be opened.
+	 */
+    void open();
+
+	/**
+	 * Load a certain bnp file into the manager
+	 * \param Filename
+	 * \return true if everything went well
+	 */
+	bool loadFile(const QString fileName);
+
+	/**
+	 * close an opened bnp file and reset all views
+	 */
+    void close();
+
+	/**
+	 * Add files into an opened bnp file.
+	 * \param Filelist
+	 */
+    void addFiles();
+	void addFiles( QStringList FileList );
+
+	/**
+	 * Unpack the files marked in the filelist dialog into user defined 
+	 * directory.
+	 * \param TBD
+	 * \return true if everything went well
+	 */
+    void unpackFiles();
+
+	/**
+	 * Delete marked files from the bnp file
+	 * \param TBD
+	 */
+    void deleteFiles();
+
+protected:
+	void dragEnterEvent (QDragEnterEvent *event);
+	void dropEvent(QDropEvent *event);
+
+private:
+
+	/**
+	 * Read plugin settings and set the window accordingly
+	 */
+	void readSettings();
+
+	/**
+	 * Write plugin settings
+	 */
+	void writeSettings();
+
+	/**
+	 * Create all plugin dialogs
+	 */
+	void createDialogs();
+
+	/**
+	 * Create all plugin actions
+	 */
+	void createActions();
+
+	/**
+	 * Create the plugin toolbar
+	 */
+	void createToolBars();
+
+	QToolBar *m_fileToolBar;
+	QToolBar *m_toolsBar;
+
+	QAction *m_newAction;
+    QAction *m_openAction;
+    QAction *m_closeAction;
+    QAction *m_addFilesAction;
+    QAction *m_unpackFilesAction;
+    QAction *m_deleteFilesAction;
+
+	CBnpDirTreeDialog *m_BnpDirTreeDialog;
+	BnpFileListDialog *m_BnpFileListDialog;
+
+	QString m_DataPath;
+	QString m_openedBNPFile;
+
+}; /* class BNPManagerWindow */
+
+} /* namespace Plugin */
+
+#endif
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.ui
new file mode 100644
index 000000000..4e695f72c
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_manager_window.ui
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>BNPManagerWindow</class>
+ <widget class="QMainWindow" name="BNPManagerWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>BNP Manager</string>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <property name="styleSheet">
+    <string notr="true">QWidget#centralwidget {
+	image: url(:/images/ic_nel_georges_editor.png);
+ }</string>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="1">
+     <widget class="QTableWidget" name="tableWidget"/>
+    </item>
+    <item row="0" column="0">
+     <widget class="QTreeView" name="treeView"/>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+ </widget>
+ <resources>
+  <include location="bnp_manager.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.cpp
new file mode 100644
index 000000000..d3657d13b
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.cpp
@@ -0,0 +1,56 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+// NeL includes
+#include <nel/misc/debug.h>
+
+// project includes
+#include "bnp_proxy_model.h"
+
+namespace BNPManager 
+{
+
+bool BNPSortProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+{
+	if ( sourceModel()->hasChildren(left) )
+	{
+		if ( !sourceModel()->hasChildren(right) )
+		{
+			return true;
+		}
+		else
+		{
+			QString leftString = sourceModel()->data( left ).toString();
+			QString rightString = sourceModel()->data( right ).toString();
+			return QString::localeAwareCompare(leftString, rightString) < 0;
+		}
+	}
+	else
+	{
+		if ( sourceModel()->hasChildren(right) )
+			return false;
+		else
+		{
+			QString leftString = sourceModel()->data( left ).toString();
+			QString rightString = sourceModel()->data( right ).toString();
+			return QString::localeAwareCompare(leftString, rightString) < 0;
+		}
+	}
+}
+
+} /* namespace Plugin */
+
+/* end of file */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.h
new file mode 100644
index 000000000..ed2da5966
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/bnp_proxy_model.h
@@ -0,0 +1,44 @@
+// Object Viewer Qt - BNP Manager Plugin - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2011  Roland Winklmeier <roland.m.winklmeier@googlemail.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+#ifndef BNP_PROXY_MODEL_H
+#define BNP_PROXY_MODEL_H
+
+// Qt includes
+#include <QSortFilterProxyModel>
+
+namespace BNPManager 
+{
+
+	class BNPSortProxyModel : public QSortFilterProxyModel
+	{
+
+	public:
+		BNPSortProxyModel(QObject *parent = 0): QSortFilterProxyModel(parent)
+		{
+		}
+		~BNPSortProxyModel() 
+		{
+		}
+
+	protected:
+		virtual bool 	lessThan ( const QModelIndex & left, const QModelIndex & right ) const;
+
+	};/* class BNPSortProxyModel */
+
+} // BNPManager
+
+#endif // BNP_PROXY_MODEL_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_add_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_add_item.png
new file mode 100644
index 000000000..bde338f78
Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_add_item.png differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_bnp_make.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_bnp_make.png
new file mode 100644
index 000000000..19b749b1d
Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_bnp_make.png differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_delete_item.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_delete_item.png
new file mode 100644
index 000000000..a5a1787d5
Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_delete_item.png differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_export.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_export.png
new file mode 100644
index 000000000..9fc71c09d
Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_export.png differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_new.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_new.png
new file mode 100644
index 000000000..d45dcb467
Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_new.png differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_reset_all.png b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_reset_all.png
new file mode 100644
index 000000000..c67287408
Binary files /dev/null and b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/images/ic_nel_reset_all.png differ
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml
new file mode 100644
index 000000000..43cea2022
--- /dev/null
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/bnp_manager/ovqt_plugin_bnp_manager.xml
@@ -0,0 +1,10 @@
+<plugin-spec>
+    <library-name>ovqt_plugin_bnp_manager</library-name>
+    <name>BNPManager</name>
+    <version>0.1</version>
+    <vendor>Krolock</vendor>
+    <description>Edit BNP Files</description>
+    <dependencies>
+        <dependency plugin-name="Core" version="0.8"/>
+    </dependencies>
+</plugin-spec>
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp
index 68e28429d..d82cdb63b 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.cpp
@@ -78,6 +78,18 @@ Core::IContext *ContextManager::context(const QString &id) const
 	return 0;
 }
 
+void ContextManager::registerUndoStack(QUndoStack *stack)
+{
+	nlassert(stack);
+	d->m_mainWindow->undoGroup()->addStack(stack);
+}
+
+void ContextManager::unregisterUndoStack(QUndoStack *stack)
+{
+	nlassert(stack);
+	d->m_mainWindow->undoGroup()->removeStack(stack);
+}
+
 void ContextManager::activateContext(const QString &id)
 {
 	const int index = indexOf(id);
@@ -85,6 +97,11 @@ void ContextManager::activateContext(const QString &id)
 		d->m_tabWidget->setCurrentIndex(index);
 }
 
+void ContextManager::updateCurrentContext()
+{
+	d->m_mainWindow->updateContext(currentContext());
+}
+
 void ContextManager::objectAdded(QObject *obj)
 {
 	IContext *context = qobject_cast<IContext *>(obj);
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h
index 7a3658fff..8151648e7 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/context_manager.h
@@ -26,6 +26,7 @@
 
 QT_BEGIN_NAMESPACE
 class QTabWidget;
+class QUndoStack;
 QT_END_NAMESPACE
 
 namespace Core
@@ -45,12 +46,17 @@ public:
 	Core::IContext *currentContext() const;
 	Core::IContext *context(const QString &id) const;
 
+	// temporary solution for multiple undo stacks per context
+	void registerUndoStack(QUndoStack *stack);
+	void unregisterUndoStack(QUndoStack *stack);
+
 Q_SIGNALS:
 	// the default argument '=0' is important for connects without the oldContext argument.
 	void currentContextChanged(Core::IContext *context, Core::IContext *oldContext = 0);
 
 public Q_SLOTS:
 	void activateContext(const QString &id);
+	void updateCurrentContext();
 
 private Q_SLOTS:
 	void objectAdded(QObject *obj);
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h
index 6eb7d41f4..18f3690a0 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/core_constants.h
@@ -92,7 +92,7 @@ const char *const SEARCH_PATHS = "SearchPaths";
 const char *const RECURSIVE_SEARCH_PATHS = "RecursiveSearchPathes";
 const char *const LEVELDESIGN_PATH = "LevelDesignPath";
 const char *const PRIMITIVES_PATH = "PrimitivesPath";
-const char * const ASSETS_PATH = "AssetsPath";
+const char *const ASSETS_PATH = "AssetsPath";
 const char *const LIGOCONFIG_FILE = "LigoConfigFile";
 const char *const REMAP_EXTENSIONS = "RemapExtensions";
 
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp
index f00075b21..6e409e75d 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.cpp
@@ -128,6 +128,11 @@ QSettings *MainWindow::settings() const
 	return m_settings;
 }
 
+QUndoGroup *MainWindow::undoGroup() const
+{
+	return m_undoGroup;
+}
+
 ExtensionSystem::IPluginManager *MainWindow::pluginManager() const
 {
 	return m_pluginManager;
@@ -135,12 +140,16 @@ ExtensionSystem::IPluginManager *MainWindow::pluginManager() const
 
 void MainWindow::addContextObject(IContext *context)
 {
-	m_undoGroup->addStack(context->undoStack());
+	QUndoStack *stack = context->undoStack();
+	if (stack)
+		m_undoGroup->addStack(stack);
 }
 
 void MainWindow::removeContextObject(IContext *context)
 {
-	m_undoGroup->removeStack(context->undoStack());
+	QUndoStack *stack = context->undoStack();
+	if (stack)
+		m_undoGroup->removeStack(stack);
 }
 
 void MainWindow::open()
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
index ae0d0522c..a75126823 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/main_window.h
@@ -52,6 +52,7 @@ public:
 	MenuManager *menuManager() const;
 	ContextManager *contextManager() const;
 	QSettings *settings() const;
+	QUndoGroup *undoGroup() const;
 
 	ExtensionSystem::IPluginManager *pluginManager() const;
 
@@ -62,6 +63,7 @@ public Q_SLOTS:
 	bool showOptionsDialog(const QString &group = QString(),
 						   const QString &page = QString(),
 						   QWidget *parent = 0);
+	void updateContext(Core::IContext *context);
 
 private Q_SLOTS:
 	void open();
@@ -77,7 +79,6 @@ private Q_SLOTS:
 	void gotoPos();
 	void setFullScreen(bool enabled);
 	void about();
-	void updateContext(Core::IContext *context);
 
 protected:
 	virtual void closeEvent(QCloseEvent *event);
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.cpp
index 7ae482824..2967be435 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.cpp
@@ -22,7 +22,7 @@
 #include <QMouseEvent>
 #include <QPainter>
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 	ExpandableHeaderView::ExpandableHeaderView(Qt::Orientation orientation, QWidget * parent) 
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.h
index 596bf5ba1..f7f26eafc 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/expandable_headerview.h
@@ -20,7 +20,7 @@
 // Qt includes
 #include <QHeaderView>
 
-namespace Plugin
+namespace GeorgesQt
 {
 	class ExpandableHeaderView : public QHeaderView
 	{
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.cpp
index 4d04bc6b5..be358d065 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.cpp
@@ -37,7 +37,7 @@
 #include "georgesform_proxy_model.h"
 #include "formitem.h"
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	FormDelegate::FormDelegate(QObject *parent)
@@ -275,4 +275,4 @@ namespace Plugin
 		QRect r = option.rect;
 		editor->setGeometry(r);
 	}
-} /* namespace Plugin */
+} /* namespace GeorgesQt */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.h
index a309da1fc..486308536 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formdelegate.h
@@ -19,7 +19,7 @@
 
 #include <QStyledItemDelegate>
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	class FormDelegate : public QStyledItemDelegate
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.cpp
index 205e18a52..68f29064d 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.cpp
@@ -23,7 +23,7 @@
 #include <nel/georges/u_type.h>
 #include <nel/georges/form.h>
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	CFormItem::CFormItem(NLGEORGES::UFormElm* elm, const QList<QVariant> &data, CFormItem *parent,
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.h
index b85b12275..80efce5d5 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/formitem.h
@@ -24,7 +24,7 @@
 #include <QList>
 #include <QVariant>
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	class CFormItem
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.cpp
index b93f93ec4..50e007d90 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.cpp
@@ -28,7 +28,7 @@
 
 using namespace NLGEORGES;
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	CGeorges::CGeorges(): FormLoader(0) 
@@ -61,4 +61,4 @@ namespace Plugin
 		return type;
 	}
 
-} /* namespace Plugin */
+} /* namespace GeorgesQt */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.h
index eb9a6b7da..6d7455d3b 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges.h
@@ -38,7 +38,7 @@ namespace NLGEORGES
 
 using namespace NLGEORGES;
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	/**
@@ -64,6 +64,6 @@ namespace Plugin
 
 	};/* class CGeorges */
 
-} /* namespace Plugin */
+} /* namespace GeorgesQt */
 
 #endif // GEORGES_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.cpp
index de7a105ab..163ec7877 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.cpp
@@ -23,7 +23,7 @@
 
 // NeL includes
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 CGeorgesDirTreeDialog::CGeorgesDirTreeDialog(QString ldPath, QWidget *parent)
@@ -109,4 +109,4 @@ void CGeorgesDirTreeDialog::ldPathChanged(QString path)
 	}
 }
 
-} /* namespace NLQT */
\ No newline at end of file
+} /* namespace GeorgesQt */
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.h
index fa783bca0..dc717617e 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_dialog.h
@@ -28,7 +28,7 @@
 #include "ui_georges_dirtree_form.h"
 #include "georges_filesystem_model.h"
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 class CGeorgesDirTreeDialog: public QDockWidget
@@ -57,6 +57,6 @@ private Q_SLOTS:
 
 }; /* CGEorgesDirTreeDialog */
 
-} /* namespace NLQT */
+} /* namespace GeorgesQt */
 
 #endif // GEORGES_DIRTREE_DIALOG_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_form.ui
index 4a429af1f..e14857e89 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_form.ui
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_dirtree_form.ui
@@ -44,6 +44,9 @@
         <height>0</height>
        </size>
       </property>
+      <property name="alternatingRowColors">
+       <bool>true</bool>
+      </property>
      </widget>
     </item>
     <item row="0" column="1">
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_constants.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_constants.h
index bb9fe3306..cccede9fc 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_constants.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_constants.h
@@ -17,7 +17,7 @@
 #ifndef GEORGES_EDITOR_CONSTANTS_H
 #define GEORGES_EDITOR_CONSTANTS_H
 
-namespace Plugin
+namespace GeorgesQt
 {
 namespace Constants
 {
@@ -26,6 +26,6 @@ const char * const GEORGES_EDITOR_SECTION = "GeorgesEditor";
 
 
 } // namespace Constants
-} // namespace Plugin
+} // namespace GeorgesQt
 
 #endif // GEORGES_EDITOR_CONSTANTS_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.cpp
index 252d7fd7e..a9666c8db 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.cpp
@@ -33,7 +33,7 @@
 #include <QToolBar>
 #include <QDebug>
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 	GeorgesEditorForm::GeorgesEditorForm(QWidget *parent)
@@ -112,24 +112,9 @@ namespace Plugin
 
 	void GeorgesEditorForm::open()
 	{
-		/*qDebug() << "GeorgesEditorForm::open()";
-		if (!m_dockedWidgets.size())
-		{
-			m_dockedWidgets.append(new CGeorgesTreeViewDialog(m_mainDock));
-			m_mainDock->addDockWidget(Qt::RightDockWidgetArea, m_dockedWidgets.last());
-		}
-		else
-		{
-			m_dockedWidgets.append(new CGeorgesTreeViewDialog(m_mainDock));
-			Q_ASSERT(m_dockedWidgets.size() > 1);
-			m_mainDock->tabifyDockWidget(m_dockedWidgets.at(m_dockedWidgets.size() - 2), m_dockedWidgets.last());
-		}*/
-		
-		// TODO: FileDialog & loadFile();
-		//m_mainDock->addDockWidget(Qt::TopDockWidgetArea, new CGeorgesTreeViewDialog(m_mainDock, true));
-		//m_mainDock->addDockWidget(Qt::LeftDockWidgetArea, new CGeorgesTreeViewDialog(m_mainDock, true));
-		//QString fileName = QFileDialog::getOpenFileName();
-		//loadFile(fileName);
+		QString fileName = QFileDialog::getOpenFileName(this, tr("Open Form"));
+		if(!fileName.isNull())
+			loadFile(fileName);
 	}
 
 	void GeorgesEditorForm::newFile()
@@ -191,6 +176,7 @@ namespace Plugin
 		if (!m_dockedWidgets.size())
 		{
 			CGeorgesTreeViewDialog *dock = new CGeorgesTreeViewDialog(m_mainDock);
+			dock->setUndoStack(m_undoStack);
 			m_lastActiveDock = dock;
 			m_dockedWidgets.append(dock);
 
@@ -212,6 +198,7 @@ namespace Plugin
 				}
 			}
 			CGeorgesTreeViewDialog *dock = new CGeorgesTreeViewDialog(m_mainDock);
+			dock->setUndoStack(m_undoStack);
 			m_dockedWidgets.append(dock);
 
 			connect(m_dockedWidgets.last(), SIGNAL(closing()),
@@ -284,4 +271,4 @@ namespace Plugin
 			}
 		}
 	}
-} /* namespace Plugin */
+} /* namespace GeorgesQt */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.h
index 6b270ca3d..c991f8b9f 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_form.h
@@ -23,7 +23,7 @@
 // Qt includes
 #include <QtGui/QUndoStack>
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 class CGeorgesDirTreeDialog;
@@ -70,6 +70,6 @@ private:
 	CGeorgesTreeViewDialog *m_lastActiveDock;
 }; /* class GeorgesEditorForm */
 
-} /* namespace Plugin */
+} /* namespace GeorgesQt */
 
 #endif // GEORGES_EDITOR_FORM_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.cpp
index 199bc20ca..7dd0be5cd 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.cpp
@@ -27,7 +27,7 @@
 // Qt includes
 #include <QtCore/QObject>
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 GeorgesEditorPlugin::~GeorgesEditorPlugin()
@@ -97,4 +97,4 @@ QWidget *GeorgesEditorContext::widget()
 
 }
 
-Q_EXPORT_PLUGIN(Plugin::GeorgesEditorPlugin)
\ No newline at end of file
+Q_EXPORT_PLUGIN(GeorgesQt::GeorgesEditorPlugin)
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.h
index fabdd600c..e21d8c57a 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_editor_plugin.h
@@ -38,7 +38,7 @@ namespace ExtensionSystem
 class IPluginSpec;
 }
 
-namespace Plugin
+namespace GeorgesQt
 {
 class GeorgesEditorForm;
 class GeorgesEditorPlugin : public QObject, public ExtensionSystem::IPlugin
@@ -93,6 +93,6 @@ public:
 	GeorgesEditorForm *m_georgesEditorForm;
 };
 
-} // namespace Plugin
+} // namespace GeorgesQt
 
 #endif // LANDSCAPE_EDITOR_PLUGIN_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.cpp
index 4e021f681..7f405fb75 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.cpp
@@ -19,7 +19,7 @@
 #include <QApplication>
 #include <QStyle>
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 CGeorgesFileSystemModel::CGeorgesFileSystemModel(QString ldPath, QObject *parent)
@@ -159,6 +159,6 @@ void CGeorgesFileSystemModel::checkLDPath()
 //	}
 //	return QSortFilterProxyModel::data(index, role);
 //}
-} /* namespace NLQT */
+} /* namespace GeorgesQt */
 
 /* end of file */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.h
index 03eb5ecc2..6c7a26055 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_filesystem_model.h
@@ -20,7 +20,7 @@
 #include <QtGui/QFileSystemModel>
 #include <QSortFilterProxyModel>
 
-namespace Plugin
+namespace GeorgesQt
 {
 
 	class CGeorgesFileSystemModel : public QFileSystemModel
@@ -74,6 +74,6 @@ private Q_SLOTS:
 	//	bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
 	//};
 
-} /* namespace NLQT */
+} /* namespace GeorgesQt */
 
 #endif // GEORGES_FILESYSTEM_MODEL_H
\ No newline at end of file
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.cpp
index 13b0dab03..dccb5f07b 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.cpp
@@ -21,12 +21,20 @@
 #include <QSettings>
 #include <QFileDialog>
 #include <QDebug>
+#include <QMenu>
 
 // NeL includes
 #include <nel/misc/path.h>
 #include <nel/misc/file.h>
 #include <nel/misc/o_xml.h>
+#include <nel/georges/u_form_loader.h>
 #include <nel/georges/form.h>
+#include <nel/georges/u_form.h>
+#include <nel/georges/u_type.h>
+
+// OVQT Includes
+#include "../core/icore.h"
+#include "../core/core_constants.h"
 
 // Project includes
 #include "georges.h"
@@ -39,7 +47,7 @@
 using namespace NLMISC;
 using namespace NLGEORGES;
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	CGeorgesTreeViewDialog::CGeorgesTreeViewDialog(QWidget *parent /*= 0*/)
@@ -50,6 +58,11 @@ namespace Plugin
 		m_georges = new CGeorges;
 
 		loadedForm = "";
+		// Set the default sheet dir dir to the level design path.
+		m_lastSheetDir = ".";
+		QSettings *settings = Core::ICore::instance()->settings();
+		m_lastSheetDir = settings->value(Core::Constants::LEVELDESIGN_PATH, "l:/leveldesign").toString();
+		settings->endGroup();
 
 		m_ui.setupUi(this);
 		m_header = new ExpandableHeaderView(Qt::Horizontal, m_ui.treeView);
@@ -65,6 +78,10 @@ namespace Plugin
 		FormDelegate *formdelegate = new FormDelegate(this);
 		m_ui.treeView->setItemDelegateForColumn(1, formdelegate);
 
+		// Set up custom context menu.
+		setContextMenuPolicy(Qt::CustomContextMenu);
+		connect(this, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(showContextMenu(const QPoint&)));
+
 		connect(m_ui.treeView, SIGNAL(doubleClicked (QModelIndex)),
 			this, SLOT(doubleClicked (QModelIndex)));
 		connect(m_ui.checkBoxParent, SIGNAL(toggled(bool)),
@@ -203,9 +220,34 @@ namespace Plugin
 		}
 	}
 
-	void CGeorgesTreeViewDialog::addParentForm(CForm *form) 
+	void CGeorgesTreeViewDialog::addParentForm(QString parentFormNm)
 	{
-		//((CForm*)_form)->insertParent(((CForm*)_form)->getParentCount(), form->getFilename().c_str(), form);
+		// Try to load the form
+		NLGEORGES::UForm *uParentForm = m_georges->loadForm(parentFormNm.toStdString());
+		NLGEORGES::CForm *parentForm = dynamic_cast<NLGEORGES::CForm*>(uParentForm);
+		NLGEORGES::CForm *mainForm = static_cast<NLGEORGES::CForm*>(m_form);
+
+		CGeorgesFormProxyModel * proxyModel = dynamic_cast<CGeorgesFormProxyModel *>(m_ui.treeView->model());
+		CGeorgesFormModel *model = dynamic_cast<CGeorgesFormModel *>(proxyModel->sourceModel());
+
+		if(parentForm)
+		{
+			if (mainForm != parentForm)
+			{
+				// Check it is the same dfn
+				if (parentForm->Elements.FormDfn ==  mainForm->Elements.FormDfn)
+				{
+					// This is the parent form selector
+					if(!mainForm->insertParent(mainForm->getParentCount(),parentFormNm.toStdString().c_str(), parentForm))
+						nlwarning("Failed to add parent form: %s", parentFormNm.toStdString().c_str());
+					else
+					{
+						nlinfo("Successfullyadded parent form: %s", parentFormNm.toStdString().c_str());
+						model->addParentForm(parentFormNm);
+					}
+				}
+			}
+		}
 	}
 
 	void CGeorgesTreeViewDialog::modifiedFile( ) 
@@ -385,4 +427,121 @@ namespace Plugin
 		}
 	}
 
-} /* namespace NLQT */
+	void CGeorgesTreeViewDialog::showContextMenu(const QPoint &pos)
+	{
+		QMenu contextMenu;
+		QMenu *structContext = NULL;
+		QPoint globalPos = this->mapToGlobal(pos);
+		
+		// Fisrt we're going to see if we've right clicked on a new item and select it.
+		QModelIndex &index = this->m_ui.treeView->currentIndex();
+
+		if(!index.isValid())
+			return;
+
+		CGeorgesFormProxyModel * mp = dynamic_cast<CGeorgesFormProxyModel *>(m_ui.treeView->model());
+		CGeorgesFormModel *m = dynamic_cast<CGeorgesFormModel *>(mp->sourceModel());
+		QModelIndex sourceIndex = mp->mapToSource(index);
+
+		if (m) 
+		{
+			
+			CFormItem *item = m->getItem(sourceIndex);
+
+			// Right click on the "parents" item
+			if (item->data(0) == "parents")
+				contextMenu.addAction("Add parent...");
+			// Right click on a parent item
+			else if(item->parent() && item->parent()->data(0) == "parents")
+			{
+				contextMenu.addAction("Add parent...");
+				contextMenu.addAction("Remove parent");
+			}
+			else if(item->getFormElm()->isArray())
+				contextMenu.addAction("Add array entry...");
+			else if(item->getFormElm()->isStruct())
+			{
+				QMenu *structContext = new QMenu("Add struct element...", this);
+				contextMenu.addMenu(structContext);
+
+				NLGEORGES::UFormDfn *defn = item->getFormElm()->getStructDfn();
+				if(defn)
+				{
+					for(uint defnNum=0; defnNum < defn->getNumEntry(); defnNum++)
+					{
+						std::string entryName;
+						std::string dummy;
+						UFormElm::TWhereIsValue *whereV = new UFormElm::TWhereIsValue;
+						bool result = defn->getEntryName(defnNum, entryName);
+						bool result2 = item->getFormElm()->getValueByName(dummy, entryName.c_str(), NLGEORGES::UFormElm::Eval, whereV);
+
+						
+						if(result2 && *whereV != UFormElm::ValueForm)
+						{
+							structContext->addAction(entryName.c_str());
+						}
+						delete whereV;
+					}
+				}
+			}
+			else if(item->getFormElm()->isAtom() && item->valueFrom() == NLGEORGES::UFormElm::ValueForm)
+				contextMenu.addAction("Revert to parent/default...");
+
+			QAction *selectedItem = contextMenu.exec(globalPos);
+			if(selectedItem)
+			{
+				if(selectedItem->text() == "Add parent...")
+				{
+					// Get the file extension of the form so we can build a dialog pattern.
+					QString file = m_form->getFilename().c_str();
+					file = file.remove(0,file.indexOf(".")+1);
+					QString filePattern = "Parent Sheets (*."+file+")";
+					
+					nlinfo("parent defn name '%s'", file.toStdString().c_str());
+					QStringList fileNames = QFileDialog::getOpenFileNames(this, tr("Select parent sheets..."), m_lastSheetDir, filePattern);
+					if(!fileNames.isEmpty())
+					{
+						Q_FOREACH(QString fileToParent, fileNames)
+						{
+							// Get just the filename. Georges doesn't want the path.
+							QFileInfo pathInfo( fileToParent );
+							QString tmpFileName( pathInfo.fileName() );
+
+							nlinfo("requesting to add parent form '%s'", tmpFileName.toStdString().c_str());
+							
+							// Call to add the form and load it into the Georges form.
+							addParentForm(tmpFileName);
+
+							// Save the file lookup path for future dialog boxes.
+							m_lastSheetDir = pathInfo.absolutePath();
+						}						
+					}
+					m_ui.treeView->expandAll();
+				}
+				else if(selectedItem->text() == "Remove parent")
+				{
+					NLGEORGES::CForm *form = static_cast<NLGEORGES::CForm *>(m_form);
+					QString parentFileName = item->data(0).toString();
+
+					for(uint num = 0; num < form->getParentCount(); num++)
+					{
+						QString curParentName = form->getParent(num)->getFilename().c_str();
+						if(parentFileName == curParentName)
+						{
+							form->removeParent(num);
+							m->removeParentForm(parentFileName);
+							break;
+						}
+					}
+
+					m_ui.treeView->expandAll();
+				}
+
+			} // if selected context menu item is valid.
+		} // if 'm' model valid.
+
+		if(structContext)
+			delete structContext;
+	}
+
+} /* namespace GeorgesQt */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.h
index 4992c9b23..a7ff4c375 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_dialog.h
@@ -22,6 +22,9 @@
 
 // Qt includes
 #include <QtGui/QDockWidget>
+#include <QtGui/QUndoCommand>
+#include <QtGui/QUndoStack>
+
 
 // STL includes
 
@@ -37,7 +40,7 @@ namespace NLGEORGES
 
 using namespace NLGEORGES;
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	class CGeorges;
@@ -54,12 +57,16 @@ namespace Plugin
 		void setModified(bool m) {m_modified = m;}
 
 		CForm* getFormByName(const QString);
-		void addParentForm(CForm *form);
+		void addParentForm(QString parentFormNm);
 
 		void write (  );
 
 		QTabWidget* tabWidget() { return m_ui.treeViewTabWidget; }
 
+		void setUndoStack(QUndoStack *stack) {
+			m_undoStack = stack;
+		}
+
 		QString loadedForm;
 
 	protected:
@@ -75,6 +82,7 @@ namespace Plugin
 		void loadFormIntoDialog(CForm *form = 0);
 		void modifiedFile( );
 		void checkVisibility(bool);
+		void showContextMenu(const QPoint &pos);
 
 	private Q_SLOTS:
 		void doubleClicked ( const QModelIndex & index );
@@ -87,10 +95,15 @@ namespace Plugin
 		UForm    *m_form;
 		CGeorges *m_georges;
 
+		QUndoStack *m_undoStack;
+
+		/// Contains a record of the last directory a sheet file dialog was opened for.
+		QString m_lastSheetDir;
+
 		bool m_modified;
 
 	}; /* CGeorgesTreeViewDialog */
 
-} /* namespace NLQT */
+} /* namespace GeorgesQt */
 
 #endif // GEORGES_TREEVIEWER_DIALOG_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_form.ui b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_form.ui
index 183b16118..8d53bfdd6 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_form.ui
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georges_treeview_form.ui
@@ -63,6 +63,9 @@
             <height>0</height>
            </size>
           </property>
+          <property name="alternatingRowColors">
+           <bool>true</bool>
+          </property>
          </widget>
         </item>
         <item row="1" column="0">
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.cpp
index f6b9c441b..ca016e052 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.cpp
@@ -40,16 +40,16 @@
 
 using namespace NLGEORGES;
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	CGeorgesFormModel::CGeorgesFormModel(UFormElm *rootElm, QMap< QString, QStringList> deps,
 		QString comment, QStringList parents, bool *expanded, QObject *parent) : QAbstractItemModel(parent) 
 	{
-		QList<QVariant> rootData;
-		rootData << "Value" << "Data" << "Extra";// << "Type";
+		
+		m_rootData << "Value" << "Data" << "Extra";// << "Type";
 		m_rootElm = rootElm;
-		m_rootItem = new CFormItem(m_rootElm, rootData);
+		m_rootItem = new CFormItem(m_rootElm, m_rootData);
 		m_dependencies = deps;
 		m_comments = comment;
 		m_parents = parents;
@@ -669,6 +669,27 @@ namespace Plugin
 		Q_EMIT layoutAboutToBeChanged();
 		Q_EMIT layoutChanged();
 	}
-} /* namespace Plugin */
+
+	void CGeorgesFormModel::addParentForm(QString parentForm)
+	{
+		beginResetModel();
+		m_parents.push_back(parentForm);
+		delete m_rootItem;
+		m_rootItem = new CFormItem(m_rootElm, m_rootData);
+		setupModelData();
+		endResetModel();
+	}
+
+	void CGeorgesFormModel::removeParentForm(QString parentForm)
+	{
+		beginResetModel();
+		m_parents.removeOne(parentForm);
+
+		delete m_rootItem;
+		m_rootItem = new CFormItem(m_rootElm, m_rootData);
+		setupModelData();
+		endResetModel();
+	}
+} /* namespace GeorgesQt */
 
 /* end of file */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.h
index 0d8ce6e69..05fadc498 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_model.h
@@ -29,7 +29,7 @@ namespace NLGEORGES {
 	class UFormElm;
 }
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	class CFormItem;
@@ -56,6 +56,9 @@ namespace Plugin
 		bool showDefaults() { return m_showDefaults;}
 		void setShowParents( bool show );
 		void setShowDefaults( bool show );
+		void addParentForm(QString parentForm);
+		void removeParentForm(QString parentForm);
+		NLGEORGES::UFormElm *getRootForm() { return m_rootElm; }
 
 	private:
 		void setupModelData();
@@ -64,6 +67,7 @@ namespace Plugin
 
 		CFormItem*                  m_rootItem;
 		NLGEORGES::UFormElm*        m_rootElm;
+		QList<QVariant>				m_rootData;
 		QMap< QString, QStringList> m_dependencies;
 		QString                     m_comments;
 		QStringList                 m_parents;
@@ -71,10 +75,10 @@ namespace Plugin
 
 		bool						m_showParents;
 		bool						m_showDefaults;
-		bool					 *m_expanded;
+		bool						*m_expanded;
 
 	};/* class CGeorgesFormModel */
 
-} /* namespace Plugin */
+} /* namespace GeorgesQt */
 
 #endif // GEORGESFORM_MODEL_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.cpp
index ae3720a57..a99997925 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.cpp
@@ -23,7 +23,7 @@
 #include "georgesform_proxy_model.h"
 #include "georgesform_model.h"
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	bool CGeorgesFormProxyModel::filterAcceptsRow(int sourceRow,
@@ -76,6 +76,6 @@ namespace Plugin
 	{
 		return QSortFilterProxyModel::filterAcceptsColumn(sourceRow, sourceParent);
 	}
-} /* namespace Plugin */
+} /* namespace GeorgesQt */
 
 /* end of file */
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.h
index 570913dab..73c384a99 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.h
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/georges_editor/georgesform_proxy_model.h
@@ -20,7 +20,7 @@
 // Qt includes
 #include <QSortFilterProxyModel>
 
-namespace Plugin 
+namespace GeorgesQt 
 {
 
 	class CGeorgesFormProxyModel : public QSortFilterProxyModel 
@@ -40,6 +40,6 @@ namespace Plugin
 
 	};/* class CGeorgesFormProxyModel */
 
-} /* namespace NLQT */
+} /* namespace GeorgesQt */
 
 #endif // GEORGESFORM_PROXY_MODEL_H
diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
index 416a418f1..df909f31a 100644
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/mission_compiler/mission_compiler_main_window.cpp
@@ -23,7 +23,7 @@
 
 #include <nel/misc/path.h>
 #include <nel/ligo/primitive_utils.h>
-#include <nel/ligo/primitive.h>
+#include <nel/ligo/primitive.h>
 #include <nel/ligo/ligo_config.h>
 
 #include <string.h>
@@ -81,7 +81,7 @@ MissionCompilerMainWindow::MissionCompilerMainWindow(QWidget *parent) :
 	connect(Core::ICore::instance(), SIGNAL(changeSettings()), this, SLOT(handleChangedSettings()));
 
 	// Set the default data dir to the primitives path.
-	QSettings *settings = Core::ICore::instance()->settings();
+	QSettings *settings = Core::ICore::instance()->settings();
 	settings->beginGroup(Core::Constants::DATA_PATH_SECTION);
 	m_lastDir = settings->value(Core::Constants::PRIMITIVES_PATH).toString();
 	ui->dataDirEdit->setText(m_lastDir);
@@ -381,7 +381,7 @@ bool MissionCompilerMainWindow::parsePrimForMissions(NLLIGO::IPrimitive const *p
 {
 	std::string value;
 	// if the node is a mission parse it
-	if (prim->getPropertyByName("class",value) && !stricmp(value.c_str(),"mission") )
+	if (prim->getPropertyByName("class",value) && !NLMISC::stricmp(value.c_str(),"mission") )
 	{
 		std::string name;
 		prim->getPropertyByName("name",name);
@@ -460,20 +460,20 @@ void MissionCompilerMainWindow::loadConfig() {
 }
 
 void MissionCompilerMainWindow::saveConfig() {
-	QSettings *settings = Core::ICore::instance()->settings();
-	settings->beginGroup(MISSION_COMPILER_SECTION);
-
+	QSettings *settings = Core::ICore::instance()->settings();
+	settings->beginGroup(MISSION_COMPILER_SECTION);
+
 	QStringList servers;
 	for(int row = 0; row < ui->publishServersList->count(); row++)
 	{
 		QListWidgetItem *item = ui->publishServersList->item(row);
 		if(item->checkState() == Qt::Checked)
 			servers << item->text();
-	}
-
-	settings->setValue(SETTING_PUBLISH_SERVER_CHECKS, servers);
-
-	settings->endGroup();
+	}
+
+	settings->setValue(SETTING_PUBLISH_SERVER_CHECKS, servers);
+
+	settings->endGroup();
 	settings->sync();
 }
 
diff --git a/code/nel/tools/3d/panoply_maker/Makefile.am b/code/nel/tools/3d/panoply_maker/Makefile.am
deleted file mode 100644
index d821ed109..000000000
--- a/code/nel/tools/3d/panoply_maker/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = panoply.cfg \
-                            panoply_maker.dsp
-
-bin_PROGRAMS              = panoply_maker
-
-panoply_maker_SOURCES = color_modifier.cpp hls_bank_texture_info.cpp \
-	panoply_maker.cpp
-
-noinst_HEADERS            = color_mask.h \
-                            color_modifier.h
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-panoply_maker_LDADD       = ../../../src/misc/libnelmisc.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/plugin_max/nel_export/std_afx.h b/code/nel/tools/3d/plugin_max/nel_export/std_afx.h
index 099f2f882..7d0ef0b2a 100644
--- a/code/nel/tools/3d/plugin_max/nel_export/std_afx.h
+++ b/code/nel/tools/3d/plugin_max/nel_export/std_afx.h
@@ -36,7 +36,7 @@
 #	include <maxscript/foundation/mxstime.h>
 #	include <maxscript/maxwrapper/mxsobjects.h>
 #	include <maxscript/compiler/parser.h>
-#	include <maxscript/foundation/functions.h>
+#   	include <maxscript/macros/define_instantiation_functions.h>
 #else
 #	include <MaxScrpt/maxscrpt.h>
 #	include <MaxScrpt/3dmath.h>
diff --git a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
index 1dfdc97f4..8433e5001 100644
--- a/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
+++ b/code/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp
@@ -33,7 +33,7 @@
 #	include <maxscript/foundation/mxstime.h>
 #	include <maxscript/maxwrapper/mxsobjects.h>
 #	include <maxscript/compiler/parser.h>
-#	include <maxscript/foundation/functions.h>
+#	include <maxscript/macros/define_instantiation_functions.h>
 #else
 #	include <MaxScrpt/maxscrpt.h>
 #	include <MaxScrpt/3dmath.h>
diff --git a/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h b/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h
index b12be6437..4cf6ee1ae 100644
--- a/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h
+++ b/code/nel/tools/3d/tile_edit_qt/tile_listwidgetitem.h
@@ -21,17 +21,17 @@
 #include "ui_tile_widget_qt.h"
 
 class CTile_ListWidgetItem : public QListWidgetItem
- {
- public:
-	 CTile_ListWidgetItem ( QListWidget * parent, int type = Type ):QListWidgetItem(parent,type){};
+{
+public:
+	CTile_ListWidgetItem ( QListWidget * parent, int type = Type ):QListWidgetItem(parent,type){}
 
 	CTile_ListWidgetItem(QWidget *parent = 0);
 	void initWidget(const QPixmap&, const QString&);
 
- private:
-	 Ui::TileWidget ui;
+private:
+	Ui::TileWidget ui;
 	// Qpixmap tilePixmap;
 	// QString tileLabel;
- };
+};
 
 #endif
\ No newline at end of file
diff --git a/code/nel/tools/3d/zone_dependencies/Makefile.am b/code/nel/tools/3d/zone_dependencies/Makefile.am
deleted file mode 100644
index 6563d9011..000000000
--- a/code/nel/tools/3d/zone_dependencies/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = zone_dependencies.dsp
-
-bin_PROGRAMS              = zone_dependencies
-
-zone_dependencies_SOURCES = zone_dependencies.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-zone_dependencies_LDADD   =	../../../src/misc/libnelmisc.la		\
-				../../../src/3d/libnel3d.la		\
-				../../../src/georges/libnelgeorges.la	\
-				../zone_lib/libzone.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/zone_ig_lighter/Makefile.am b/code/nel/tools/3d/zone_ig_lighter/Makefile.am
deleted file mode 100644
index 79d13da15..000000000
--- a/code/nel/tools/3d/zone_ig_lighter/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = zone_ig_lighter.dsp
-
-bin_PROGRAMS              = zone_ig_lighter
-
-zone_ig_lighter_SOURCES   = zone_ig_lighter.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-zone_ig_lighter_LDADD     = ../../../src/misc/libnelmisc.la \
-                            ../../../src/3d/libnel3d.la     \
-                            ../zone_lib/libzone.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/zone_lib/Makefile.am b/code/nel/tools/3d/zone_lib/Makefile.am
deleted file mode 100644
index e3e6927a2..000000000
--- a/code/nel/tools/3d/zone_lib/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES         = Makefile.in
-
-noinst_LTLIBRARIES           = libzone.la
-
-libzone_la_SOURCES           = zone_utility.cpp
-
-noinst_HEADERS               = zone_utility.h
-
-AM_CXXFLAGS                  = -I$(top_srcdir)/src
-
-libzone_la_LIBADD            = ../../../src/misc/libnelmisc.la \
-                               ../../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/zone_lighter/Makefile.am b/code/nel/tools/3d/zone_lighter/Makefile.am
deleted file mode 100644
index 3d70c71b4..000000000
--- a/code/nel/tools/3d/zone_lighter/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = zone_lighter.dsp
-
-bin_PROGRAMS              = zone_lighter
-
-zone_lighter_SOURCES      = zone_lighter.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-zone_lighter_LDADD        =	../../../src/misc/libnelmisc.la		\
-				../../../src/3d/libnel3d.la		\
-				../../../src/georges/libnelgeorges.la	\
-				../zone_lib/libzone.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/3d/zone_welder/Makefile.am b/code/nel/tools/3d/zone_welder/Makefile.am
deleted file mode 100644
index c405a7fa5..000000000
--- a/code/nel/tools/3d/zone_welder/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002/05/13 15:44:58 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = zwelder.cfg \
-                            zone_welder.dsp
-
-bin_PROGRAMS              = zone_welder
-
-zone_welder_SOURCES = internal_weld.cpp zone_welder.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-zone_welder_LDADD         = ../../../src/misc/libnelmisc.la \
-                            ../../../src/3d/libnel3d.la     \
-                            ../zone_lib/libzone.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/Makefile.am b/code/nel/tools/Makefile.am
deleted file mode 100644
index 1dba72e96..000000000
--- a/code/nel/tools/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id: Makefile.am,v 1.2 2002/05/14 13:33:59 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = 3d misc pacs
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/georges/georges2csv/georges2csv.cpp b/code/nel/tools/georges/georges2csv/georges2csv.cpp
index e10d06bf5..da89cc9bc 100644
--- a/code/nel/tools/georges/georges2csv/georges2csv.cpp
+++ b/code/nel/tools/georges/georges2csv/georges2csv.cpp
@@ -289,7 +289,7 @@ void	addQuotesRoundString	(std::string	&valueString)
 	std::string hold=valueString;
 	valueString.erase();
 	valueString='\"';
-	for (unsigned i=0;i<hold.size();i++)
+	for (uint i=0;i<hold.size();i++)
 	{
 		if (hold[i]=='\"')
 			valueString+="\"\"";
@@ -337,7 +337,7 @@ void scanFiles(const CSString &filespec)
 
 	// display the table header line
 	fprintf(Outf,"FILE");
-	for (unsigned i=0;i<fields.size();i++)
+	for (uint i=0;i<fields.size();i++)
 		fprintf(Outf,"%s%s",SEPARATOR, fields[i]._name.c_str());
 	fprintf(Outf,"\n");
 
@@ -379,7 +379,7 @@ void scanFiles(const CSString &filespec)
 			// the form was found so read the true values from George
 //			std::string s;
 			fprintf(Outf,"%s",CFile::getFilenameWithoutExtension(filenames[j]).c_str());
-			for	(unsigned i=0;i<fields.size();i++)
+			for	(uint i=0;i<fields.size();i++)
 			{
 				UFormElm::TWhereIsValue where;
 				UFormElm	*fieldForm=NULL;
@@ -452,7 +452,7 @@ void scanFiles(const CSString &filespec)
 //					std::string hold=s;
 //					s.erase();
 //					s='\"';
-//					for (unsigned i=0;i<hold.size();i++)
+//					for (uint i=0;i<hold.size();i++)
 //					{
 //						if (hold[i]=='\"')
 //							s+="\"\"";
diff --git a/code/nel/tools/misc/Makefile.am b/code/nel/tools/misc/Makefile.am
deleted file mode 100644
index deb976b76..000000000
--- a/code/nel/tools/misc/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $Id: Makefile.am,v 1.2 2002-05-14 13:33:59 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = bnp_make \
-			disp_sheet_id \
-			make_sheet_id \
-			xml_packer
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/misc/bnp_make/Makefile.am b/code/nel/tools/misc/bnp_make/Makefile.am
deleted file mode 100644
index bdd7c4ad0..000000000
--- a/code/nel/tools/misc/bnp_make/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = bnp_make.dsw bnp_make.dsp bnp_make_8.vcproj 
-
-bin_PROGRAMS              = bnp_make
-
-bnp_make_SOURCES = main.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-bnp_make_LDADD   =	../../../src/misc/libnelmisc.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/misc/disp_sheet_id/Makefile.am b/code/nel/tools/misc/disp_sheet_id/Makefile.am
deleted file mode 100644
index 10fa02c10..000000000
--- a/code/nel/tools/misc/disp_sheet_id/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = disp_sheet_id.dsp disp_sheet_id_8.vcproj disp_sheet_id.dsw disp_sheet_id.sln disp_sheet_id.vcproj
-
-bin_PROGRAMS              = disp_sheet_id 
-
-disp_sheet_id_SOURCES = main.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-disp_sheet_id_LDADD   =	../../../src/misc/libnelmisc.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/misc/make_sheet_id/Makefile.am b/code/nel/tools/misc/make_sheet_id/Makefile.am
deleted file mode 100644
index 37e8c7ee7..000000000
--- a/code/nel/tools/misc/make_sheet_id/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = make_sheet_id.dsp make_sheet_id.dsw
-
-bin_PROGRAMS              = make_sheet_id 
-
-make_sheet_id_SOURCES = make_sheet_id.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-make_sheet_id_LDADD   =	../../../src/misc/libnelmisc.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/misc/xml_packer/Makefile.am b/code/nel/tools/misc/xml_packer/Makefile.am
deleted file mode 100644
index 80c40b6ea..000000000
--- a/code/nel/tools/misc/xml_packer/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = xml_packer.dsp
-
-bin_PROGRAMS              = xml_packer
-
-xml_packer_SOURCES = xml_packer.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-xml_packer_LDADD   =	../../../src/misc/libnelmisc.la
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/pacs/Makefile.am b/code/nel/tools/pacs/Makefile.am
deleted file mode 100644
index e987c21e2..000000000
--- a/code/nel/tools/pacs/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-#
-# $Id: Makefile.am,v 1.2 2002-05-14 13:33:59 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = build_ig_boxes build_indoor_rbank build_rbank
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/pacs/build_ig_boxes/Makefile.am b/code/nel/tools/pacs/build_ig_boxes/Makefile.am
deleted file mode 100644
index e10aa1312..000000000
--- a/code/nel/tools/pacs/build_ig_boxes/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = build_ig_boxes.dsp
-
-bin_PROGRAMS              = build_ig_boxes 
-
-build_ig_boxes_SOURCES = main.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-build_ig_boxes_LDADD   =	../../../src/misc/libnelmisc.la	\
-				../../../src/3d/libnel3d.la	\
-				../../../src/pacs/libnelpacs.la
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/pacs/build_indoor_rbank/Makefile.am b/code/nel/tools/pacs/build_indoor_rbank/Makefile.am
deleted file mode 100644
index cc116a336..000000000
--- a/code/nel/tools/pacs/build_indoor_rbank/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = build_indoor_rbank.dsp
-
-bin_PROGRAMS              = build_indoor_rbank 
-
-build_indoor_rbank_SOURCES = build_surfaces.cpp main.cpp mouline.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-build_indoor_rbank_LDADD   =	../../../src/misc/libnelmisc.la	\
-				../../../src/pacs/libnelpacs.la	
-
-
-# End of Makefile.am
-
diff --git a/code/nel/tools/pacs/build_rbank/Makefile.am b/code/nel/tools/pacs/build_rbank/Makefile.am
deleted file mode 100644
index 17b299997..000000000
--- a/code/nel/tools/pacs/build_rbank/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.1 2002-05-13 15:44:57 valignat Exp $
-#
-
-MAINTAINERCLEANFILES      = Makefile.in
-
-EXTRA_DIST                = build_rbank.dsp
-
-bin_PROGRAMS              = build_rbank 
-
-build_rbank_SOURCES = build_rbank.cpp build_surf.cpp main.cpp prim_checker.cpp \
-	surface_splitter.cpp
-
-AM_CXXFLAGS               = -I$(top_srcdir)/src 
-
-build_rbank_LDADD   =	../../../src/misc/libnelmisc.la	\
-			../../../src/pacs/libnelpacs.la	\
-			../../../src/ligo/libnelligo.la	\
-			../../../src/3d/libnel3d.la
-
-
-# End of Makefile.am
-
diff --git a/code/nelns/Makefile.am b/code/nelns/Makefile.am
deleted file mode 100644
index 0bf41acd3..000000000
--- a/code/nelns/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.9 2002/10/21 10:19:03 lecroart Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in configure config.guess missing \
-                       config.sub ltconfig aclocal.m4 config.h.in \
-                       install-sh mkinstalldirs depcomp $(DISTCLEANFILES)
-
-DISTCLEANFILES       = stamp-h.in config.cache config.log config.status 
-
-EXTRA_DIST	     = acconfig.h services.dsw bootstrap doc
-
-SUBDIRS              = login_service          \
-                       naming_service         \
-                       admin_executor_service \
-                       admin_service          \
-                       welcome_service
-
-dist-hook:
-	find $(distdir) -name CVS -print | xargs rm -fr
-	find $(distdir) -name .svn -print | xargs rm -fr
-
-# End of Makefile.am
diff --git a/code/nelns/acinclude.m4 b/code/nelns/acinclude.m4
deleted file mode 100644
index 3c49b8f0b..000000000
--- a/code/nelns/acinclude.m4
+++ /dev/null
@@ -1,1217 +0,0 @@
-# =========================================================================
-#
-# Macros used by Nevrax in configure.in files.
-#
-# $Id: acinclude.m4,v 1.20 2005/04/04 10:07:29 cado Exp $
-# 
-# =========================================================================
-
-# =========================================================================
-# WARNING: The original version of this file is placed in the $CVSROOT/code
-#          directory.
-#          There is links in the $CVSROOT/code sub-directories to that file
-#          (ex: $CVSROOT/code/nel), so be careful of the consequences of
-#          any modification of that file.
-# =========================================================================
-
-# =========================================================================
-# Macros available in that file.
-#
-#
-# AM_NEL_DEBUG
-#
-#    Option:      none.
-#    Description: manage the different debug and the release mode by setting
-#                 correctly the CFLAGS and CXXFLAGS variables.
-#
-#
-# AM_PATH_NEL
-#
-#    Option:      none.
-#    Description: check the instalation of the NeL library and set the
-#                 CXXFLAGS and LIBS variables to use it.
-#
-#
-# AM_PATH_OPENGL
-#
-#    Option:      "yes" if the use of the OpenGL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENGL_CFLAGS and OPENGL_LIBS variables to use it.
-#
-#
-# AM_PATH_FREETYPE
-#
-#    Option:      "yes" if the use of the Freetype library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it.
-#
-#
-# AM_PATH_XF86VIDMODE
-#
-#    Option:      none.
-#    Description: check the instalation of the OpenGL library and set the
-#                 XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it.
-#
-#
-# AM_PATH_OPENAL
-#
-#    Option:      "yes" if the use of the OpenAL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENAL_CFLAGS and OPENAL_LIBS variables to use it.
-#
-#
-# AM_PATH_PYTHON
-#
-#    Option:      "yes" if the use of the Python library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 PYTHON_CFLAGS and PYTHON_LIBS variables to use it.
-#
-# =========================================================================
-
-
-# =========================================================================
-# AM_NEL_DEBUG
-
-AC_DEFUN([AM_NEL_DEBUG],
-[
-
-MAX_C_OPTIMIZE="-O6"
-
-STL_DEBUG="-D__STL_DEBUG"
-
-NL_DEBUG="-DNL_DEBUG"
-NL_RELEASE="-DNL_RELEASE"
-
-AC_ARG_WITH(debug,
-    [  --with-debug[=full|medium|fast]
-                          Build a debug version (huge libraries).
-                          Full mode set only NeL and STL debug flags.
-                          Medium mode set NeL debug flags with inline
-                          optimization (default mode).
-                          Fast mode is like the Medium mode with some basic
-                          optimization.
-  --without-debug         Build without debugging code (default)],
-    [with_debug=$withval],
-    [with_debug=no])
-
-# Build optimized or debug version ?
-# First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
-then
-    DEBUG_CFLAGS="-g"
-    DEBUG_OPTIMIZE_CC="-O"
-    OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
-else
-    DEBUG_CFLAGS="-g"
-    DEBUG_OPTIMIZE_CC=""
-    OPTIMIZE_CFLAGS=""
-fi
-
-if test "$ac_cv_prog_cxx_g" = "yes"
-then
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_OPTIMIZE_CXX="-O"
-    OPTIMIZE_CXXFLAGS="-O3"
-    OPTIMIZE_INLINE_CXXFLAGS="-finline-functions"
-else
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_OPTIMIZE_CXX=""
-    OPTIMIZE_CXXFLAGS=""
-    OPTIMIZE_INLINE_CXXFLAGS=""
-fi
-
-if test "$with_debug" = "yes" -o "$with_debug" = "medium"
-then
-    # Medium debug. Inline optimization
-    CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS"
-    CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-else
-    if test "$with_debug" = "full"
-    then
-        # Full debug. Very slow in some cases
-        CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $STL_DEBUG $CFLAGS"
-        CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $STL_DEBUG $CXXFLAGS"
-    else
-        if test "$with_debug" = "fast"
-        then
-            # Fast debug.
-            CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS"
-            CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-        else
-            # Optimized version. No debug
-            CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE $CFLAGS"
-            CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE $CXXFLAGS"
-        fi
-    fi
-fi
-
-# AC_MSG_RESULT([CFLAGS = $CFLAGS])
-# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS])
-
-])
-
-
-# =========================================================================
-# MY_NEL_HEADER_CHK : NeL header files checking macros
-
-AC_DEFUN([MY_NEL_HEADER_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-header="$2"
-macro="$3"
-is_mandatory="$4"
-
-if test $is_mandatory = "yes"
-then
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $NEL_CFLAGS"
-
-    AC_MSG_CHECKING(for $header)
-
-    AC_EGREP_CPP( yo_header,
-[#include <$header>
-#ifdef $macro
-   yo_header
-#endif],
-  have_header="yes",
-  have_header="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_header" = "yes"
-    then
-        AC_MSG_RESULT(yes)
-    else
-        if test "$is_mandatory" = "yes"
-        then
-            AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).])
-        else
-            AC_MSG_RESULT(no)
-        fi
-    fi
-fi
-
-        
-])
-
-
-# =========================================================================
-# MY_NEL_LIB_CHK : NeL library checking macros
-
-AC_DEFUN([MY_NEL_LIB_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-nel_test_lib="$2"
-is_mandatory="$3"
-
-if test $is_mandatory = "yes"
-then
-
-    AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://www.nevrax.org).])])
-fi
-])
-
-
-# =========================================================================
-# AM_PATH_NEL : NeL checking macros
-AC_DEFUN([AM_PATH_NEL],
-[ AC_REQUIRE_CPP()
-
-AC_ARG_WITH( nel,
-    [  --with-nel=<path>       path to the NeL install files directory.
-                          e.g. /usr/local/nel])
-
-AC_ARG_WITH( nel-include,
-    [  --with-nel-include=<path>
-                          path to the NeL header files directory.
-                          e.g. /usr/local/nel/include])
-
-AC_ARG_WITH( nel-lib,
-    [  --with-nel-lib=<path>
-                          path to the NeL library files directory.
-                          e.g. /usr/local/nel/lib])
-
-
-nelmisc_is_mandatory="$1"
-nelnet_is_mandatory="$2"
-nel3d_is_mandatory="$3"
-nelpacs_is_mandatory="$4"
-nelsound_is_mandatory="$5"
-nelai_is_mandatory="$6"
-nelgeorges_is_mandatory="$7"
-
-# Check for nel-config
-AC_PATH_PROG(NEL_CONFIG, nel-config, no)
-
-# 
-# Configure options (--with-nel*) have precendence 
-# over nel-config only set variables if they are not 
-# specified
-#
-if test "$NEL_CONFIG" != "no"
-then
-    if test -z "$with_nel" -a -z "$with_nel_include"
-    then
-	CXXFLAGS="$CXXFLAGS `nel-config --cflags`"
-    fi
-
-    if test -z "$with_nel" -a -z "$with_nel_lib"
-    then
-	LDFLAGS="`nel-config --ldflags` $LDFLAGS"
-    fi
-fi
-
-#
-# Set nel_libraries and nel_includes according to
-# user specification (--with-nel*) if any. 
-# --with-nel-include and --with-nel-lib have precendence
-# over --with-nel
-#
-if test "$with_nel" = "no"
-then
-    # The user explicitly disabled the use of the NeL
-    AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel])
-else
-    if test "$with_nel" -a "$with_nel" != "yes"
-    then
-	nel_includes="$with_nel/include"
-	nel_libraries="$with_nel/lib"
-    fi
-fi
-
-if test "$with_nel_include"
-then
-    nel_includes="$with_nel_include"
-fi
-
-if test "$with_nel_lib"
-then
-    nel_libraries="$with_nel_lib"
-fi
-
-#
-# Set compilation variables 
-#
-if test "$nel_includes"
-then
-    CXXFLAGS="$CXXFLAGS -I$nel_includes"
-fi
-
-if test "$nel_libraries"
-then
-    LDFLAGS="-L$nel_libraries $LDFLAGS"
-fi
-
-#
-# Collect headers information and bark if missing and
-# mandatory
-#
-
-MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)
-MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory)
-MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory)
-MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory)
-
-#
-# Collect libraries information and bark if missing and
-# mandatory
-#
-
-MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory)
-MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory)
-MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory)
-MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory)
-MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory)
-MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory)
-MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory)
-
-])
-
-# =========================================================================
-# AM_PATH_OPENGL : OpenGL checking macros
-
-AC_DEFUN([AM_PATH_OPENGL],
-[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2)
-
-is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( opengl,
-    [  --with-opengl=<path>    path to the OpenGL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( opengl-include,
-    [  --with-opengl-include=<path>
-                          path to the OpenGL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( opengl-lib,
-    [  --with-opengl-lib=<path>
-                          path to the OpenGL library files directory.
-                          e.g. /usr/local/lib])
-
-opengl_lib="GL"
-
-if test "$with_opengl"
-then
-    opengl_includes="$with_opengl/include"
-    opengl_libraries="$with_opengl/lib"
-fi
-
-if test "$with_opengl_include"
-then
-    opengl_includes="$with_opengl_include"
-fi
-
-if test "$with_opengl_lib"
-then
-    opengl_libraries="$with_opengl_lib"
-fi
-
-# Set OPENGL_CFLAGS
-if test "$opengl_includes"
-then
-    OPENGL_CFLAGS="-I$opengl_includes"
-fi
-
-# Set OPENGL_LIBS
-if test "$opengl_libraries"
-then
-    OPENGL_LIBS="-L$opengl_libraries"
-fi
-OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib"
-
-# Test the headers
-_CPPFLAGS="$CPPFLAGS"
-
-CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS"
-
-AC_EGREP_CPP( yo_opengl,
-[#include <GL/gl.h>       
-#if defined(GL_VERSION_1_2)
-   yo_opengl
-#endif],
-  have_opengl_headers="yes", 
-  have_opengl_headers="no" )
-
-if test "$have_opengl_headers" = "yes"
-then
-    if test "$opengl_includes"
-    then
-        AC_MSG_RESULT([$opengl_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Checking the GLEXT version >= 7
-AC_MSG_CHECKING(for <GL/glext.h> and GLEXT version >= 7)
-
-AC_EGREP_CPP( yo_glext_version,
-[#include <GL/glext.h>
-#ifdef GL_GLEXT_VERSION
-#if GL_GLEXT_VERSION >= 7
-   yo_glext_version
-#endif
-#endif],
-  have_glext="yes",
-  have_glext="no" )
-
-if test "$have_glext" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT([no, <GL/glext.h> can be downloaded from http://oss.sgi.com/projects/ogl-sample/ABI/])
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for OpenGL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENGL_LIBS"
-
-AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_opengl_libraries" = "yes"
-then
-    if test "$opengl_libraries"
-    then
-        AC_MSG_RESULT([$opengl_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-opengl_libraries="$opengl_libraries"
-
-if test "$have_opengl_headers" = "yes" \
-        -a "$have_glext" = "yes" \
-        -a "$have_opengl_libraries" = "yes"
-then
-    have_opengl="yes"
-else
-    have_opengl="no"
-fi
-
-if test "$have_opengl" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)])
-fi
-
-AC_SUBST(OPENGL_CFLAGS)
-AC_SUBST(OPENGL_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_FREETYPE : FreeType checking macros
-
-AC_DEFUN([AM_PATH_FREETYPE],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( freetype,
-    [  --with-freetype=<path>   path to the FreeType install files directory.
-                          e.g. /usr/local/freetype])
-
-AC_ARG_WITH( freetype-include,
-    [  --with-freetype-include=<path>
-                          path to the FreeType header files directory.
-                          e.g. /usr/local/freetype/include])
-
-AC_ARG_WITH( freetype-lib,
-    [  --with-freetype-lib=<path>
-                          path to the FreeType library files directory.
-                          e.g. /usr/local/freetype/lib])
-
-freetype_lib="freetype"
-
-
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-  
-if test "$FREETYPE_CONFIG" = "no"
-then
-    have_freetype_config="no"
-else
-    FREETYPE_CFLAGS=`freetype-config --cflags`
-    FREETYPE_LIBS=`freetype-config --libs`
-    have_freetype_config="yes"
-fi
-
-if test "$with_freetype"
-then
-    freetype_includes="$with_freetype/include"
-    freetype_libraries="$with_freetype/lib"
-fi
-
-if test "$with_freetype_include"
-then
-    freetype_includes="$with_freetype_include"
-fi
-
-if test "$with_freetype_lib"
-then
-    freetype_libraries="$with_freetype_lib"
-fi
-
-if test "$freetype_includes"
-then
-    FREETYPE_CFLAGS="-I$freetype_includes"
-fi
-
-# Checking the FreeType 2 instalation
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
-
-AC_MSG_CHECKING(for FreeType version = 2)
-
-AC_EGREP_CPP( yo_freetype2,
-[#include <freetype/freetype.h>
-#if FREETYPE_MAJOR == 2
-   yo_freetype2
-#endif],
-  have_freetype2="yes",
-  have_freetype2="no")
-
-if test "$have_freetype2" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT(no)
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for FreeType libraries)
-        
-if test $freetype_libraries
-then
-    FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"
-fi
-
-CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS"
-    
-AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_freetype_libraries" = "yes"
-then    
-    if test "$freetype_libraries"
-    then
-        AC_MSG_RESULT([$freetype_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes"
-then
-    have_freetype="yes"
-else
-    have_freetype="no"
-fi
-
-if test "$have_freetype" = "no" && test "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)])
-fi
-
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_XF86VIDMODE : XF86VidMode checking macros
-
-AC_DEFUN([AM_PATH_XF86VIDMODE],
-[ AC_MSG_CHECKING(for XF86VidMode extension)
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( xf86vidmode-lib,
-    [  --with-xf86vidmode-lib=<path>
-                          path to the XF86VidMode library.
-                          e.g. /usr/X11R6/lib] )
-
-xf86vidmode_lib="Xxf86vm"
-
-if test "$with_xf86vidmode_lib" = no
-then
-    # The user explicitly disabled the use of XF86VidMode
-    have_xf86vidmode="disabled"
-    AC_MSG_RESULT(disabled)
-else
-    if test "$with_xf86vidmode_lib"
-    then
-        xf86vidmode_libraries="$with_xf86vidmode_lib"
-    fi
-
-    XF86VIDMODE_CFLAGS="-DXF86VIDMODE"
-fi
-
-if test -z "$have_xf86vidmode"
-# -a "$with_xf86vidmode_lib"
-then
-    if test "$xf86vidmode_libraries"
-    then
-        XF86VIDMODE_LIBS="-L$xf86vidmode_libraries"
-    fi
-
-    XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS"
-
-    AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_xf86vidmode_libraries" = "yes"
-    then
-        have_xf86vidmode="yes"
-        if test "$xf86vidmode_libraries"
-        then
-            AC_MSG_RESULT($xf86vidmode_libraries)
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        have_xf86vidmode="no"
-        AC_MSG_RESULT(no, no fullscreen support available.)
-    fi
-
-    xf86vidmode_libraries="$xf86vidmode_libraries"
-
-fi
-
-AC_SUBST(XF86VIDMODE_CFLAGS)
-AC_SUBST(XF86VIDMODE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_OPENAL : OpenAL checking macros
-
-AC_DEFUN([AM_PATH_OPENAL],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the OpenAL files location
-AC_ARG_WITH( openal,
-    [  --with-openal=<path>   path to the OpenAL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( openal-include,
-    [  --with-openal-include=<path>
-                          path to the OpenAL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( openal-lib,
-    [  --with-openal-lib=<path>
-                          path to the OpenAL library files directory.
-                          e.g. /usr/local/lib])
-
-openal_lib="openal"
-alut_lib="alut"
-
-if test $with_openal
-then
-    openal_includes="$with_openal/include"
-    openal_libraries="$with_openal/lib"
-fi
-
-if test "$with_openal_include"
-then
-    openal_includes="$with_openal_include"
-fi
-
-if test "$with_openal_lib"
-then
-    openal_libraries="$with_openal_lib"
-fi
-
-
-# Set OPENAL_CFLAGS
-if test "$openal_includes"
-then
-    OPENAL_CFLAGS="-I$openal_includes"
-fi
-
-# Set OPENAL_LIBS
-if test "$openal_libraries"
-then
-    OPENAL_LIBS="-L$openal_libraries"
-fi
-OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib -l$alut_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS"
-
-AC_MSG_CHECKING(for OpenAL headers)
-AC_EGREP_CPP( yo_openal,
-[#include <AL/al.h>
-#include <AL/alut.h>
-#ifdef AL_VERSION
-   yo_openal
-#endif],
-  have_openal_headers="yes",
-  have_openal_headers="no" )
-
-if test "$have_openal_headers" = "yes"
-then
-    if test "$openal_includes"
-    then
-        AC_MSG_RESULT([$openal_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for OpenAL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENAL_LIBS"
-
-AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_openal_libraries" = "yes"
-then
-    if test "$openal_libraries"
-    then
-        AC_MSG_RESULT([$openal_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-openal_libraries="$openal_libraries"
-
-if test "$have_openal_headers" = "yes" \
-   && test "$have_openal_libraries" = "yes"
-then
-    have_openal="yes"
-else
-    have_openal="no"
-fi
-
-if test "$have_openal" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).])
-fi
-
-AC_SUBST(OPENAL_CFLAGS)
-AC_SUBST(OPENAL_LIBS)
-AC_SUBST([have_openal])
-
-])
-
-
-# =========================================================================
-# AM_PATH_PYTHON : Python checking macros
-
-AC_DEFUN([AM_PATH_PYTHON],
-[ python_version_required="$1"
-
-is_mandatory="$2"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the Python files location
-AC_ARG_WITH( python,
-    [  --with-python=<path>    path to the Python prefix installation directory.
-                          e.g. /usr/local],
-    [ PYTHON_PREFIX=$with_python ]
-)
-
-AC_ARG_WITH( python-version,
-    [  --with-python-version=<version>
-                          Python version to use, e.g. 1.5],
-    [ PYTHON_VERSION=$with_python_version ]
-)
-
-if test ! "$PYTHON_PREFIX" = ""
-then
-    PATH="$PYTHON_PREFIX/bin:$PATH"
-fi
-
-if test ! "$PYTHON_VERSION" = ""
-then
-    PYTHON_EXEC="python$PYTHON_VERSION"
-else
-    PYTHON_EXEC="python python2.1 python2.0 python1.5"
-fi
-
-AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH)
-
-if test "$PYTHON" != "no"
-then
-    PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'`
-    PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'`
-
-    is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION`
-fi
-
-
-if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1"
-then
-
-    if test "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)])
-    else
-        have_python="no"
-    fi
-
-else
-
-    python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION"
-    python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config"
-    python_lib="python$PYTHON_VERSION"
-
-    PYTHON_CFLAGS="-I$python_includes"
-    PYTHON_LIBS="-L$python_libraries -l$python_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}"
-
-    # Test the headers
-    AC_MSG_CHECKING(for Python headers)
-
-    AC_EGREP_CPP( yo_python,
-    [#include <Python.h>
-   yo_python
-    ],
-      have_python_headers="yes",
-      have_python_headers="no" )
-
-    if test "$have_python_headers" = "yes"
-    then
-        AC_MSG_RESULT([$python_includes])
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    # Test the libraries
-    AC_MSG_CHECKING(for Python libraries)
-
-    CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
-
-    AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_python_libraries" = "yes"
-    then
-        if test "$python_libraries"
-        then
-            AC_MSG_RESULT([$python_libraries])
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    if test "$have_python_headers" = "yes" \
-       && test "$have_python_libraries" = "yes"
-    then
-        have_python="yes"
-    else
-        have_python="no"
-    fi
-
-    if test "$have_python" = "no" -a "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).])
-    fi
-
-    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_LIBS)
-
-fi
-
-])
-
-# =========================================================================
-# AM_PATH_MYSQL : MySQL library
-
-# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
-#
-AC_DEFUN([AM_PATH_MYSQL],
-[# 
-# Get the cflags and libraries from the mysql_config script
-#
-AC_ARG_WITH(mysql-prefix,[  --with-mysql-prefix=PFX   Prefix where MYSQL is installed (optional)],
-            mysql_prefix="$withval", mysql_prefix="")
-AC_ARG_WITH(mysql-exec-prefix,[  --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)],
-            mysql_exec_prefix="$withval", mysql_exec_prefix="")
-AC_ARG_ENABLE(mysqltest, [  --disable-mysqltest       Do not try to compile and run a test MYSQL program],
-		    , enable_mysqltest=yes)
-
-  if test x$mysql_exec_prefix != x ; then
-     mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config
-     fi
-  fi
-  if test x$mysql_prefix != x ; then
-     mysql_args="$mysql_args --prefix=$mysql_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_prefix/bin/mysql_config
-     fi
-  fi
-
-  AC_REQUIRE([AC_CANONICAL_TARGET])
-  AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no)
-  min_mysql_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version)
-  no_mysql=""
-  if test "$MYSQL_CONFIG" = "no" ; then
-    no_mysql=yes
-  else
-    MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"`
-    MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"`
-
-    mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_mysqltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-      LIBS="$LIBS $MYSQL_LIBS"
-#
-# Now check if the installed MYSQL is sufficiently new. (Also sanity
-# checks the results of mysql_config to some extent
-#
-      rm -f conf.mysqltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mysql.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.mysqltest");
-  */
-  { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_mysql_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_mysql_version");
-     exit(1);
-   }
-
-   if (($mysql_major_version > major) ||
-      (($mysql_major_version == major) && ($mysql_minor_version > minor)) ||
-      (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version);
-      printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n");
-      printf("*** to point to the correct copy of mysql_config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_mysql" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$MYSQL_CONFIG" = "no" ; then
-       echo "*** The mysql_config script installed by MYSQL could not be found"
-       echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the MYSQL_CONFIG environment variable to the"
-       echo "*** full path to mysql_config."
-     else
-       if test -f conf.mysqltest ; then
-        :
-       else
-          echo "*** Could not run MYSQL test program, checking why..."
-          CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-          LIBS="$LIBS $MYSQL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <mysql.h>
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding MYSQL or finding the wrong"
-          echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means MYSQL was incorrectly installed"
-          echo "*** or that you have moved MYSQL since it was installed. In the latter case, you"
-          echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     MYSQL_CFLAGS=""
-     MYSQL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(MYSQL_CFLAGS)
-  AC_SUBST(MYSQL_LIBS)
-  rm -f conf.mysqltest
-])
-
-# =========================================================================
-# AM_PATH_FMOD : FMOD checking macros
-
-AC_DEFUN([AM_PATH_FMOD],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the FMOD files location
-AC_ARG_WITH( fmod,
-    [  --with-fmod=<path>   path to the FMOD install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( fmod-include,
-    [  --with-fmod-include=<path>
-                          path to the FMOD header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( fmod-lib,
-    [  --with-fmod-lib=<path>
-                          path to the FMOD library files directory.
-                          e.g. /usr/local/lib])
-
-fmod_lib="fmod"
-
-if test $with_fmod
-then
-    fmod_includes="$with_fmod/include"
-    fmod_libraries="$with_fmod/lib"
-fi
-
-if test "$with_fmod_include"
-then
-    fmod_includes="$with_fmod_include"
-fi
-
-if test "$with_fmod_lib"
-then
-    fmod_libraries="$with_fmod_lib"
-fi
-
-
-# Set FMOD_CFLAGS
-if test "$fmod_includes"
-then
-    FMOD_CFLAGS="-I$fmod_includes"
-fi
-
-# Set FMOD_LIBS
-if test "$fmod_libraries"
-then
-    FMOD_LIBS="-L$fmod_libraries"
-fi
-FMOD_LIBS="$FMOD_LIBS -l$fmod_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS"
-
-AC_MSG_CHECKING(for FMOD headers)
-AC_EGREP_CPP( yo_fmod,
-[#include <fmod.h>
-#ifdef FMOD_VERSION
-   yo_fmod
-#endif],
-  have_fmod_headers="yes",
-  have_fmod_headers="no" )
-
-if test "$have_fmod_headers" = "yes"
-then
-    if test "$fmod_includes"
-    then
-        AC_MSG_RESULT([$fmod_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for FMOD libraries)
-
-CPPFLAGS="$CXXFLAGS $FMOD_LIBS"
-
-AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_fmod_libraries" = "yes"
-then
-    if test "$fmod_libraries"
-    then
-        AC_MSG_RESULT([$fmod_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-fmod_libraries="$fmod_libraries"
-
-if test "$have_fmod_headers" = "yes" \
-   && test "$have_fmod_libraries" = "yes"
-then
-    have_fmod="yes"
-else
-    have_fmod="no"
-fi
-
-if test "$have_fmod" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).])
-fi
-
-AC_SUBST(FMOD_CFLAGS)
-AC_SUBST(FMOD_LIBS)
-AC_SUBST([have_fmod])
-
-])
-
-# =========================================================================
-# End of file
-
diff --git a/code/nelns/admin_executor_service/Makefile.am b/code/nelns/admin_executor_service/Makefile.am
deleted file mode 100644
index aafee52b1..000000000
--- a/code/nelns/admin_executor_service/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-#
-# $Id: Makefile.am,v 1.8 2004/03/02 09:10:50 cado Exp $
-#
-
-MAINTAINERCLEANFILES		= Makefile.in
-
-EXTRA_DIST			= admin_executor_service.cfg \
-				  admin_executor_service.dsp \
-				  admin_executor_service_8.vcproj \
-				  admin_executor_service.vcproj \
-				  log_report.h \
-				  common.cfg
-
-sbin_PROGRAMS			= admin_executor_service
-
-admin_executor_servicedir	= ${pkgsysconfdir}
-admin_executor_service_DATA	= admin_executor_service.cfg common.cfg
-
-AM_CXXFLAGS			= -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\""
-
-admin_executor_service_SOURCES = admin_executor_service.cpp \
-				 log_report.cpp
-
-# End of Makefile.am
-
diff --git a/code/nelns/admin_service/Makefile.am b/code/nelns/admin_service/Makefile.am
deleted file mode 100644
index 0513d968c..000000000
--- a/code/nelns/admin_service/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# $Id: Makefile.am,v 1.7 2002/11/13 16:59:55 coutelas Exp $
-#
-
-MAINTAINERCLEANFILES  = Makefile.in
-
-EXTRA_DIST            =	common.cfg \
-			admin_service.cfg \
-			admin_service.dsp \
-			admin_service_8.vcproj \
-			admin_service.vcproj
-
-sbin_PROGRAMS         = admin_service
-
-admin_servicedir		= ${pkgsysconfdir}
-admin_service_DATA		= admin_service.cfg common.cfg
-admin_service_LDADD		= @MYSQL_LDFLAGS@
-
-AM_CXXFLAGS			= -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\"" @MYSQL_CFLAGS@
-
-admin_service_SOURCES = admin_service.cpp connection_web.cpp
-
-# End of Makefile.am
-
diff --git a/code/nelns/autogen.sh b/code/nelns/autogen.sh
deleted file mode 100755
index 426af8b39..000000000
--- a/code/nelns/autogen.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh -
-
-WANT_AUTOMAKE="1.6"
-
-echo "Creating macros..." && \
-aclocal -I automacros/ && \
-echo "Creating library tools..." && \
-libtoolize --force && \
-echo "Creating header templates..." && \
-autoheader && \
-echo "Creating Makefile templates..." && \
-automake --gnu --add-missing && \
-echo "Creating 'configure'..." && \
-autoconf && \
-echo -e "\nRun: ./configure; make; make install\n"
diff --git a/code/nelns/automacros/mysql.m4 b/code/nelns/automacros/mysql.m4
deleted file mode 100644
index 4d5adf3cd..000000000
--- a/code/nelns/automacros/mysql.m4
+++ /dev/null
@@ -1,101 +0,0 @@
-AC_DEFUN([AX_LIB_MYSQL],
-[
-    AC_ARG_WITH([mysql],
-        AC_HELP_STRING([--with-mysql=@&lt;:@ARG@:&gt;@],
-            [use MySQL client library @&lt;:@default=yes@:&gt;@, optionally specify path to mysql_config]
-        ),
-        [
-        if test "$withval" = "no"; then
-            want_mysql="no"
-        elif test "$withval" = "yes"; then
-            want_mysql="yes"
-        else
-            want_mysql="yes"
-            MYSQL_CONFIG="$withval"
-        fi
-        ],
-        [want_mysql="yes"]
-    )
-
-    MYSQL_CFLAGS=""
-    MYSQL_LDFLAGS=""
-    MYSQL_VERSION=""
-
-    dnl
-    dnl Check MySQL libraries (libpq)
-    dnl
-
-    if test "$want_mysql" = "yes"; then
-
-        if test -z "$MYSQL_CONFIG" -o test; then
-            AC_PATH_PROG([MYSQL_CONFIG], [mysql_config], [no])
-        fi
-
-        if test "$MYSQL_CONFIG" != "no"; then
-            AC_MSG_CHECKING([for MySQL libraries])
-
-            MYSQL_CFLAGS="`$MYSQL_CONFIG --cflags`"
-            MYSQL_LDFLAGS="`$MYSQL_CONFIG --libs`"
-
-            MYSQL_VERSION=`$MYSQL_CONFIG --version`
-
-            AC_DEFINE([HAVE_MYSQL], [1],
-                [Define to 1 if MySQL libraries are available])
-
-            found_mysql="yes"
-            AC_MSG_RESULT([yes])
-        else
-            found_mysql="no"
-            AC_MSG_RESULT([no])
-        fi
-    fi
-
-    dnl
-    dnl Check if required version of MySQL is available
-    dnl
-
-
-    mysql_version_req=ifelse([$1], [], [], [$1])
-
-    if test "$found_mysql" = "yes" -a -n "$mysql_version_req"; then
-
-        AC_MSG_CHECKING([if MySQL version is &gt;= $mysql_version_req])
-
-        dnl Decompose required version string of MySQL
-        dnl and calculate its number representation
-        mysql_version_req_major=`expr $mysql_version_req : '\([[0-9]]*\)'`
-        mysql_version_req_minor=`expr $mysql_version_req : '[[0-9]]*\.\([[0-9]]*\)'`
-        mysql_version_req_micro=`expr $mysql_version_req : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-        if test "x$mysql_version_req_micro" = "x"; then
-            mysql_version_req_micro="0"
-        fi
-
-        mysql_version_req_number=`expr $mysql_version_req_major \* 1000000 \
-                                   \+ $mysql_version_req_minor \* 1000 \
-                                   \+ $mysql_version_req_micro`
-
-        dnl Decompose version string of installed MySQL
-        dnl and calculate its number representation
-        mysql_version_major=`expr $MYSQL_VERSION : '\([[0-9]]*\)'`
-        mysql_version_minor=`expr $MYSQL_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
-        mysql_version_micro=`expr $MYSQL_VERSION : '[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\)'`
-        if test "x$mysql_version_micro" = "x"; then
-            mysql_version_micro="0"
-        fi
-
-        mysql_version_number=`expr $mysql_version_major \* 1000000 \
-                                   \+ $mysql_version_minor \* 1000 \
-                                   \+ $mysql_version_micro`
-
-        mysql_version_check=`expr $mysql_version_number \&gt;\= $mysql_version_req_number`
-        if test "$mysql_version_check" = "1"; then
-            AC_MSG_RESULT([yes])
-        else
-            AC_MSG_RESULT([no])
-        fi
-    fi
-
-    AC_SUBST([MYSQL_VERSION])
-    AC_SUBST([MYSQL_CFLAGS])
-    AC_SUBST([MYSQL_LDFLAGS])
-])
diff --git a/code/nelns/configure.ac b/code/nelns/configure.ac
deleted file mode 100644
index ef7f65029..000000000
--- a/code/nelns/configure.ac
+++ /dev/null
@@ -1,186 +0,0 @@
-# ====================================================================
-# Configuration script for NeLNS
-# ====================================================================
-#
-# $Id: configure.ac,v 1.4 2005/01/07 18:29:56 distrib Exp $
-# 
-
-# ====================================================================
-# Process this file with autoconf to produce a configure script.
-# ====================================================================
-
-# If you want to change the version, must must change AC_INIT
-# *and* AC_SUBST(LIBTOOL_VERSION)
-
-AC_PREREQ(2.57)
-AC_INIT([nelns],[0.5.0],[nel-all@nevrax.org])
-
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE([tar-ustar])
-
-AM_CONFIG_HEADER(config.h)
-
-AC_SUBST(LIBTOOL_VERSION, [0:5:0])
-
-# ====================================================================
-# Checks for programs.
-# ====================================================================
-
-
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL
-AM_SANITY_CHECK
-
-AC_SYS_LARGEFILE
-
-AM_MAINTAINER_MODE
-
-# The following hack should ensure that configure doesn't add optimizing
-# or debugging flags to CFLAGS or CXXFLAGS
-CFLAGS="$CFLAGS "
-CXXFLAGS="$CXXFLAGS "
-
-# Template needed to generate the config.h.in
-#AH_TEMPLATE([NELNS_CONFIG],[Configuration files directory path])
-#AH_TEMPLATE([NELNS_LOGS],[Log files directory path])
-#AH_TEMPLATE([NELNS_STATE],[Local state files directory path])
-AH_TEMPLATE([HAVE_MYSQL],[Define to 1 if mysql was found])
-
-
-AX_LIB_MYSQL([3.23.40])
-#dnl AM_PATH_MYSQL(3.23.40,,AC_MSG_ERROR([MySQL 3.23.40 or higher must be installed]))
-
-AC_DEFINE(HAVE_MYSQL)
-
-CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-CXXFLAGS="$CXXFLAGS $MYSQL_CFLAGS"
-
-# prevent using GLIBC2.4 stuffs
-CFLAGS="$CFLAGS -fno-stack-protector"
-CXXFLAGS="$CXXFLAGS -fno-stack-protector"
-
-LIBS="$LIBS -lrt $MYSQL_LIBS"
-
-
-# ====================================================================
-# Configure Settings
-# ====================================================================
-
-AC_LANG([C++])
-
-
-# ====================================================================
-# Debug/optimized compilation mode
-# ====================================================================
-
-AM_NEL_DEBUG
-
-# Set the gcc specific warning level
-if test "X$CC" = "Xgcc";
-then
-    if test "$with_debug" != "no"
-    then
-	#
-	# When debugging variables are declared for the sole purpose of
-	# inspecting their content with a debugger. They are not used
-	# in the code itself and this is legitimate, hence the -Wno-unused
-	#
-        CXXFLAGS="$CXXFLAGS -Wall -Wno-multichar -Wno-unused"
-    else
-        CXXFLAGS="$CXXFLAGS -Wall -Wno-multichar"
-    fi
-fi
-
-# ====================================================================
-# Checks for typedefs, structures, and compiler characteristics.
-# ====================================================================
-
-# Add the define _REENTRANT for a correct use of the threads
-if test "X$CC" = "Xgcc";
-then
-    CXXFLAGS="$CXXFLAGS -D_REENTRANT"
-fi
-
-
-# ====================================================================
-# Checks for header files.
-# ====================================================================
-
-AC_HEADER_STDC([])
-AC_CHECK_HEADERS(fcntl.h unistd.h)
-
-
-# ====================================================================
-# Checks for libraries.
-# ====================================================================
-
-AC_CHECK_LIB(crypt, crypt)
-
-
-# ====================================================================
-# NeL
-
-#         misc   net    3d    pacs  sound  ai    georges
-AM_PATH_NEL("yes", "yes", "no", "no", "no",  "no", "no")
-
-# ====================================================================
-# Checks for library functions.
-# ====================================================================
-
-# ====================================================================
-# nelns configuration and logs file location
-# ====================================================================
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
-AC_ARG_WITH(sysconfdir,
-    [  --with-sysconfdir[=DIR]
-                          use DIR instead of the default sysconfdir/nelns],
-    [pkgsysconfdir=$withval],
-    [pkgsysconfdir='${sysconfdir}/nelns'])
-AC_SUBST(pkgsysconfdir)
-
-#eval eval NELNS_CONFIG=\"$pkgsysconfdir/\"
-#AC_DEFINE_UNQUOTED(NELNS_CONFIG, "$NELNS_CONFIG")
-
-AC_ARG_WITH(localstatedir,
-    [  --with-localstatedir[=DIR]
-                          use DIR instead of the default localstatedir/game/nelns],
-    [pkglocalstatedir=$withval],
-    [pkglocalstatedir=${localstatedir}/game/nelns])
-AC_SUBST(pkglocalstatedir)
-
-#eval eval NELNS_STATE=\"$pkglocalstatedir/\"
-#AC_DEFINE_UNQUOTED(NELNS_STATE, "$NELNS_STATE")
-
-AC_ARG_WITH(logdir,
-    [  --with-logdir[=DIR]
-                          use DIR instead of the default localstatedir/log/nelns],
-    [logdir=$withval],
-    [logdir='${localstatedir}/log/nelns'])
-AC_SUBST(logdir)
-
-#eval eval NELNS_LOGS=\"$logdir/\"
-#AC_DEFINE_UNQUOTED(NELNS_LOGS, "$NELNS_LOGS")
-
-# ====================================================================
-# Output files to generate.
-# ====================================================================
-
-AC_CONFIG_FILES([Makefile                        \
-           login_service/Makefile          \
-           naming_service/Makefile         \
-           admin_executor_service/Makefile \
-           admin_service/Makefile          \
-           welcome_service/Makefile        \
-])
-AC_OUTPUT
-
-
-# End of configure.ac
diff --git a/code/nelns/login_service/Makefile.am b/code/nelns/login_service/Makefile.am
deleted file mode 100644
index 15a9eae6c..000000000
--- a/code/nelns/login_service/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# $Id: Makefile.am,v 1.8 2002-09-16 14:50:07 lecroart Exp $
-#
-
-MAINTAINERCLEANFILES		= Makefile.in
-
-EXTRA_DIST			= login_service.cfg \
-				  login_service.dsp \
-				  login_service.vcproj \
-				  login_service_8.vcproj \
-				  common.cfg
-
-sbin_PROGRAMS			= login_service
-
-login_servicedir		= ${pkgsysconfdir}
-login_service_DATA		= login_service.cfg common.cfg
-login_service_LDADD		= @MYSQL_LDFLAGS@
-
-AM_CXXFLAGS			= -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\"" @MYSQL_CFLAGS@
-
-login_service_SOURCES = mysql_helper.cpp		\
-			mysql_helper.h			\
-			connection_client.cpp		\
-			connection_client.h		\
-			connection_web.cpp              \
-                        connection_web.h                \
-                        connection_ws.cpp               \
-                        connection_ws.h                 \
-                        login_service.cpp               \
-                        login_service.h
-
-# End of Makefile.am
-
diff --git a/code/nelns/login_service/mysql_helper.h b/code/nelns/login_service/mysql_helper.h
index cc81f4647..7f6893b4a 100644
--- a/code/nelns/login_service/mysql_helper.h
+++ b/code/nelns/login_service/mysql_helper.h
@@ -70,7 +70,7 @@ public:
 
 private:
 	//we don't want user to do a copy
-	CMysqlResult(const CMysqlResult &mysqlResult){};
+	CMysqlResult(const CMysqlResult &mysqlResult){}
 	MYSQL_RES *Result;
 };
 
diff --git a/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h b/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h
index eefb93653..2437ae854 100644
--- a/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h
+++ b/code/nelns/login_system/nel_launcher_windows_ext/BarTabsWnd.h
@@ -14,9 +14,9 @@
 class CTabsObserver
 {
 public:
-	CTabsObserver()	{};
+	CTabsObserver()	{}
 
-	virtual void OnTab(int iTab)	{};
+	virtual void OnTab(int iTab)	{}
 };
 
 class CBarTabsWnd : public CWnd
diff --git a/code/nelns/naming_service/Makefile.am b/code/nelns/naming_service/Makefile.am
deleted file mode 100644
index 95e510f7f..000000000
--- a/code/nelns/naming_service/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# $Id: Makefile.am,v 1.5 2002/06/12 10:22:28 lecroart Exp $
-#
-
-MAINTAINERCLEANFILES   = Makefile.in
-
-EXTRA_DIST		       = naming_service.cfg \
-				 naming_service.dsp \
-				 naming_service.vcproj \
-				 naming_service_8.vcproj \
-				 common.cfg
-
-sbin_PROGRAMS			= naming_service
-
-naming_servicedir		= ${pkgsysconfdir}
-naming_service_DATA		= naming_service.cfg common.cfg
-
-AM_CXXFLAGS			= -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\""
-
-naming_service_SOURCES = naming_service.cpp
-
-# End of Makefile.am
diff --git a/code/nelns/welcome_service/Makefile.am b/code/nelns/welcome_service/Makefile.am
deleted file mode 100644
index 35b7d6eb5..000000000
--- a/code/nelns/welcome_service/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# $Id: Makefile.am,v 1.7 2006/05/31 12:14:16 boucher Exp $
-#
-
-MAINTAINERCLEANFILES		= Makefile.in
-
-EXTRA_DIST			= welcome_service.cfg \
-				  welcome_service.dsp \
-				  welcome_service.vcproj \
-				  welcome_service_8.vcproj \
-				  common.cfg
-
-sbin_PROGRAMS			= welcome_service
-
-welcome_servicedir		= ${pkgsysconfdir}
-welcome_service_DATA		= welcome_service.cfg common.cfg
-
-AM_CXXFLAGS			= -DNELNS_CONFIG="\"${pkgsysconfdir}\"" -DNELNS_STATE="\"${pkglocalstatedir}\"" -DNELNS_LOGS="\"${logdir}\""
-
-welcome_service_SOURCES		= welcome_service.cpp \
-			  	  welcome_service_itf.cpp
-
-# End of Makefile.am
diff --git a/code/revision.h.in b/code/revision.h.in
new file mode 100644
index 000000000..6c5e9b8b1
--- /dev/null
+++ b/code/revision.h.in
@@ -0,0 +1,7 @@
+#ifndef REVISION_H
+#define REVISION_H
+
+#cmakedefine REVISION "${REVISION}"
+#cmakedefine BUILD_DATE "${BUILD_DATE}"
+
+#endif
diff --git a/code/ryzom/CMakeLists.txt b/code/ryzom/CMakeLists.txt
index 4202738c1..eb3d1c642 100644
--- a/code/ryzom/CMakeLists.txt
+++ b/code/ryzom/CMakeLists.txt
@@ -1,18 +1,7 @@
 #-----------------------------------------------------------------------------
 #Platform specifics
 
-IF(WITH_LUA51)
-  FIND_PACKAGE(Lua51 REQUIRED)
-ELSE(WITH_LUA51)
-  FIND_PACKAGE(Lua50 REQUIRED)
-ENDIF(WITH_LUA51)
-FIND_PACKAGE(Luabind REQUIRED)
-FIND_PACKAGE(CURL REQUIRED)
-FIND_PACKAGE(Libwww REQUIRED)
 FIND_PACKAGE(ZLIB)
-IF(NOT WIN32 AND NOT APPLE)
-  FIND_PACKAGE(X11)
-ENDIF(NOT WIN32 AND NOT APPLE)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common/src )
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/common )
@@ -30,6 +19,15 @@ ENDIF(WITH_STATIC)
 ADD_SUBDIRECTORY(common)
 
 IF(WITH_RYZOM_CLIENT)
+  IF(WITH_LUA51)
+    FIND_PACKAGE(Lua51 REQUIRED)
+  ELSE(WITH_LUA51)
+    FIND_PACKAGE(Lua50 REQUIRED)
+  ENDIF(WITH_LUA51)
+  FIND_PACKAGE(Luabind REQUIRED)
+  FIND_PACKAGE(CURL REQUIRED)
+  FIND_PACKAGE(Libwww REQUIRED)
+
   ADD_SUBDIRECTORY(client)
 ENDIF(WITH_RYZOM_CLIENT)
 
diff --git a/code/ryzom/Makefile b/code/ryzom/Makefile
deleted file mode 100644
index 2a1850c35..000000000
--- a/code/ryzom/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-MAKE_NIGHT_ARGS=-j2
-MAKE_ALL_ARGS=-j2
-CXX=g++
-CC=g++
-BIN_DIR=$(RYZOM_PATH)/tools/scripts/linux
-
-night:
-	+make $(MAKE_NIGHT_ARGS) -k -C common night CXX=$(CXX)
-	+make $(MAKE_NIGHT_ARGS) -k -C server night CXX=$(CXX)
-
-all:
-	+make $(MAKE_ALL_ARGS) -C common all
-	+make $(MAKE_ALL_ARGS) -C server all
-
-mono:
-	+make -C common all
-	+make -C server all
-
-clean:
-	+make -C common clean
-	+make -C server clean
-
-distclean:
-	+make -C common distclean
-	+make -C server distclean
-
-cleansheets:
-	+make -C common cleansheets
-	+make -C server cleansheets
-
-update:
-	+make -C common update
-	+make -C server update
-
-touch:
-	+make -C common touch
-	+make -C server touch
diff --git a/code/ryzom/Rules.mk b/code/ryzom/Rules.mk
deleted file mode 100644
index 67bc3bc42..000000000
--- a/code/ryzom/Rules.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#############################################################################
-# A few basic default rules and intrinsic rules
-
-# Load objects dependencies
-ifeq (Dependencies.mk,$(wildcard Dependencies.mk))
-include Dependencies.mk
-check-deps:
-	@echo
-	@echo Dependencies found [OK]
-	@echo
-else
-check-deps:
-	@echo
-	@echo "No dependencies found [ERROR]"
-	@echo "You should try 'make update' first"
-	@echo
-	@exit 1
-endif
-
-# Start off by over-riding the default build rules with our own intrinsics
-.SUFFIXES:
-.SUFFIXES: .cpp .o
-.cpp.o:
-	$(CXX) -c $(CXXFLAGS) $< -o $@
-
-# remove object files and core (if any)
-clean:
-	find . -name "core*" -exec $(RM) {} \;
-	find . -name "*.o" -exec $(RM) {} \;
-	find . -name "*~" -exec $(RM) {} \;
-	find . -name "Dependencies.mk" -exec $(RM) {} \;
-	find . -name "Objects.mk" -exec $(RM) {} \;
-
-cleansheets:
-	find . -name "*.packed_sheets" -exec $(RM) {} \;
-
-# remove object files, core dump, and executable (if any)
-distclean:
-	$(MAKE) clean
-	$(RM) $(TARGETS)
-	$(RM) $(TARGETS)_debug
-
-# make the thing again from scratch
-again:
-	$(MAKE) distclean
-	$(MAKE) $(TARGETS)
-
-#UPDATE_OBJS=`cat $(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g' | sed -e 's/\.cpp /\.o /g'`
-
-#UPDATE_SRCS=`cat $(DSP_TARGET) | grep SOURCE | sed -e 's/\r$$//' | grep "\.cpp$$" | cut -d\\\\ -f3- | tr '\n' ' ' | sed -e 's/=/..\\\\/g' | tr '\n' ' ' | sed -e 's/\\\\/\\//g'`
-
-UPDATE_OBJS=`cat $(DSP_TARGET) | grep RelativePath | sed -e 's/\\"\r$$//' | grep "\.cpp$$"  | cut -d\\\\ -f2- | tr '\n' ' ' | sed -e 's/\\\\/\\//g' | sed -e 's/\.cpp /\.o /g'`
-UPDATE_SRCS=`cat $(DSP_TARGET) | grep RelativePath | sed -e 's/\\"\r$$//' | grep "\.cpp$$"  | cut -d\\\\ -f2- | tr '\n' ' ' | sed -e 's/\\\\/\\//g'`
-
-dep: update
-
-update:
-#	../gen_compile_flags.sh > RyzomCompilerFlags.mk
-	$(RYZOM_PATH)/gen_deps.sh $(CXX) $(CXXFLAGS) -- $(UPDATE_SRCS) > Dependencies.mk
-	echo "OBJS=$(UPDATE_OBJS)" > Objects.mk
-
-touch:
-	$(RM) $(TARGETS)
-	$(RM) $(TARGETS)_debug
diff --git a/code/ryzom/Variables.mk b/code/ryzom/Variables.mk
deleted file mode 100644
index a952922f0..000000000
--- a/code/ryzom/Variables.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-#############################################################################
-# Setting up the global compiler settings...
-
-# The names of the executables
-CXX           = c++
-RM            = rm -f
-MAKE          = make
-
-DBG           = off
-
-ifeq (RyzomCompilerFlags.mk,$(wildcard RyzomCompilerFlags.mk))
-include RyzomCompilerFlags.mk
-endif
-
-FLAGS_CMN     = -g -pipe -fno-stack-protector -fno-strict-aliasing -Wall -D_REENTRANT -D_GNU_SOURCE -DFINAL_VERSION=1
-LD_FLAGS_CMN  = -rdynamic
-
-FLAGS_DBG_on  = -O0 -finline-functions -DNL_DEBUG
-FLAGS_DBG_off = -O3 -funroll-loops -DNL_RELEASE
-DIR_DBG_on    = debug
-DIR_DBG_off   = release
-
-PACK_SHEETS_FLAGS = -A$RYZOM_PATH/server -L$RYZOM_PATH/server -C$RYZOM_PATH//server/sheet_pack_cfg -Q --nons
-
-
-NEL_PATH = $(RYZOM_PATH)/../../code/install/$(DIR_DBG_$(DBG))
-
-NEL_INCLUDE = $(RYZOM_PATH)/../../code/nel/include
-RYZOM_COMMON_SRC = $(RYZOM_PATH)/common/src
-
-ifeq (Objects.mk,$(wildcard Objects.mk))
-include Objects.mk
-endif
diff --git a/code/ryzom/client/Makefile b/code/ryzom/client/Makefile
deleted file mode 100644
index 11e58485a..000000000
--- a/code/ryzom/client/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-
-all:
-	+make $(MAKE_ALL_ARGS) -C src all
-
-mono:
-	+make -C src all
-
-clean:
-	+make -C src clean
-
-cleansheets:
-	+make -C src cleansheets
-
-update:
-	+make -C src update
-
-touch:
-	+make -C src touch
diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index 14885fa01..997699ca8 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -354,8 +354,8 @@ SystemInfoColors =
 
 // NEW System Info Categories
 "SYS",	"255 255 255 255 normal",	// Default system messages
-"BC",	"255 255 255 255 center",	// Broadcast messages
-"TAGBC",	"255 255 255 255 center", // Taged broadcast messages : color should remain white as some word are tagged
+"BC",	"255 255 255 255 centeraround",	// Broadcast messages
+"TAGBC",	"255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
 "XP",	"255 255 64  255 over",		// XP Gain
 "SP",	"255 255 64  255 over",		// SP Gain
 "TTL",	"255 255 64  255 over",		// Title
@@ -443,23 +443,24 @@ R2EDReloadFiles      = {
 XMLInterfaceFiles    = {
 	"config.xml",
 	"widgets.xml",
+	"webig_widgets.xml",
 	"player.xml",
 	"inventory.xml",
 	"interaction.xml",
-	"phrase.xml", 
+	"phrase.xml",
 	"harvest.xml",
 	"macros.xml",
 	"info_player.xml",
 	"outpost.xml",
 	"guild.xml",
 	"taskbar.xml",
-	"game_config.xml", 
+	"game_config.xml",
 	"game_context_menu.xml",
 	"player_trade.xml",
 	"bot_chat_v4.xml",
 	"compass.xml",
 	"map.xml",
-	"hierarchy.xml", 
+	"hierarchy.xml",
 	"reset.xml",
 	"actions.xml",
 	"help.xml",
@@ -559,6 +560,15 @@ HelpPages =
 	"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
 };
 
+WebIgMainDomain      = "atys.ryzom.com";
+
+WebIgTrustedDomains  =
+{
+	"atys.ryzom.com" 
+};
+
+PatchletUrl          = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
+
 SelectedSlot = 0;
 
 BuildName = "RELEASE_HEAD";
diff --git a/code/ryzom/client/client_default.cfg.in b/code/ryzom/client/client_default.cfg.in
index 8ae0117a5..41c3dd1de 100644
--- a/code/ryzom/client/client_default.cfg.in
+++ b/code/ryzom/client/client_default.cfg.in
@@ -80,6 +80,9 @@ XMLOutGameInterfaceFiles = {
 	"out_v2_keys.xml",
 };
 
+TexturesInterface    = "texture_interfaces_v3";
+TexturesInterfaceDXTC = "texture_interfaces_dxtc";
+
 
 // The ligo primitive class file
 LigoPrimitiveClass = "world_editor_classes.xml";
@@ -352,8 +355,8 @@ SystemInfoColors =
 
 // NEW System Info Categories
 "SYS",	"255 255 255 255 normal",	// Default system messages
-"BC",	"255 255 255 255 center",	// Broadcast messages
-"TAGBC",	"255 255 255 255 center", // Taged broadcast messages : color should remain white as some word are tagged
+"BC",	"255 255 255 255 centeraround",	// Broadcast messages
+"TAGBC",	"255 255 255 255 centeraround", // Taged broadcast messages : color should remain white as some word are tagged
 "XP",	"255 255 64  255 over",		// XP Gain
 "SP",	"255 255 64  255 over",		// SP Gain
 "TTL",	"255 255 64  255 over",		// Title
@@ -441,23 +444,24 @@ R2EDReloadFiles      = {
 XMLInterfaceFiles    = {
 	"config.xml",
 	"widgets.xml",
+	"webig_widgets.xml",
 	"player.xml",
 	"inventory.xml",
 	"interaction.xml",
-	"phrase.xml", 
+	"phrase.xml",
 	"harvest.xml",
 	"macros.xml",
 	"info_player.xml",
 	"outpost.xml",
 	"guild.xml",
 	"taskbar.xml",
-	"game_config.xml", 
+	"game_config.xml",
 	"game_context_menu.xml",
 	"player_trade.xml",
 	"bot_chat_v4.xml",
 	"compass.xml",
 	"map.xml",
-	"hierarchy.xml", 
+	"hierarchy.xml",
 	"reset.xml",
 	"actions.xml",
 	"help.xml",
@@ -557,6 +561,15 @@ HelpPages =
 	"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
 };
 
+WebIgMainDomain      = "atys.ryzom.com";
+
+WebIgTrustedDomains  =
+{
+	"atys.ryzom.com" 
+};
+
+PatchletUrl          = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
+
 SelectedSlot = 0;
 
 BuildName = "RELEASE_HEAD";
diff --git a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga
index bbeeab27b..91e87e2e7 100644
Binary files a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga and b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
index ec1afb449..f35989e33 100644
--- a/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
+++ b/code/ryzom/client/data/gamedev/adds/interfaces/new_texture_interfaces_dxtc.txt
@@ -18,305 +18,305 @@ BK_goo.tga 0.156250000000 0.078125000000 0.195312500000 0.117187500000
 bk_guild.tga 0.195312500000 0.078125000000 0.234375000000 0.117187500000
 bk_horde.tga 0.000000000000 0.117187500000 0.039062500000 0.156250000000
 bk_kami.tga 0.039062500000 0.117187500000 0.078125000000 0.156250000000
-bk_karavan.tga 0.078125000000 0.117187500000 0.117187500000 0.156250000000
-BK_matis.tga 0.117187500000 0.117187500000 0.156250000000 0.156250000000
-bk_mission.tga 0.156250000000 0.117187500000 0.195312500000 0.156250000000
-bk_mission2.tga 0.195312500000 0.117187500000 0.234375000000 0.156250000000
-BK_outpost.tga 0.000000000000 0.156250000000 0.039062500000 0.195312500000
-BK_primes.tga 0.039062500000 0.156250000000 0.078125000000 0.195312500000
-bk_service.tga 0.078125000000 0.156250000000 0.117187500000 0.195312500000
-bk_training.tga 0.117187500000 0.156250000000 0.156250000000 0.195312500000
-BK_tryker.tga 0.156250000000 0.156250000000 0.195312500000 0.195312500000
-BK_zorai.tga 0.195312500000 0.156250000000 0.234375000000 0.195312500000
-charge.tga 0.000000000000 0.195312500000 0.039062500000 0.234375000000
-clef.tga 0.039062500000 0.195312500000 0.078125000000 0.234375000000
-conso_branche.tga 0.078125000000 0.195312500000 0.117187500000 0.234375000000
-conso_branche_mask.tga 0.117187500000 0.195312500000 0.156250000000 0.234375000000
-conso_fleur.tga 0.156250000000 0.195312500000 0.195312500000 0.234375000000
-conso_fleur_mask.tga 0.195312500000 0.195312500000 0.234375000000 0.234375000000
-conso_grappe.tga 0.242187500000 0.000000000000 0.281250000000 0.039062500000
-conso_grappe_mask.tga 0.281250000000 0.000000000000 0.320312500000 0.039062500000
-conso_nectar.tga 0.320312500000 0.000000000000 0.359375000000 0.039062500000
-conso_nectar_mask.tga 0.359375000000 0.000000000000 0.398437500000 0.039062500000
-construction.tga 0.398437500000 0.000000000000 0.437500000000 0.039062500000
-cristal_ammo.tga 0.437500000000 0.000000000000 0.476562500000 0.039062500000
-cristal_spell.tga 0.238281250000 0.039062500000 0.277343750000 0.078125000000
-ge_mission_outpost_townhall.tga 0.277343750000 0.039062500000 0.316406250000 0.078125000000
-ico_amande.tga 0.316406250000 0.039062500000 0.355468750000 0.078125000000
-ico_cataliseur_xp.tga 0.355468750000 0.039062500000 0.394531250000 0.078125000000
-ico_consommable_over.tga 0.394531250000 0.039062500000 0.433593750000 0.078125000000
-ico_fleur_carac_1.tga 0.433593750000 0.039062500000 0.472656250000 0.078125000000
-ico_fleur_carac_1_mask.tga 0.234375000000 0.078125000000 0.273437500000 0.117187500000
-ico_fleur_carac_2.tga 0.273437500000 0.078125000000 0.312500000000 0.117187500000
-ico_fleur_carac_2_mask.tga 0.312500000000 0.078125000000 0.351562500000 0.117187500000
-ico_fleur_carac_3.tga 0.351562500000 0.078125000000 0.390625000000 0.117187500000
-ico_fleur_carac_3_mask.tga 0.390625000000 0.078125000000 0.429687500000 0.117187500000
-ico_foreuse.tga 0.429687500000 0.078125000000 0.468750000000 0.117187500000
-ico_haircolor.tga 0.234375000000 0.117187500000 0.273437500000 0.156250000000
-ico_haircut.tga 0.273437500000 0.117187500000 0.312500000000 0.156250000000
-ico_mission_art_fyros.tga 0.312500000000 0.117187500000 0.351562500000 0.156250000000
-ico_mission_art_matis.tga 0.351562500000 0.117187500000 0.390625000000 0.156250000000
-ico_mission_art_tryker.tga 0.390625000000 0.117187500000 0.429687500000 0.156250000000
-ico_mission_art_zorai.tga 0.429687500000 0.117187500000 0.468750000000 0.156250000000
-ico_mission_barrel.tga 0.234375000000 0.156250000000 0.273437500000 0.195312500000
-ico_mission_bottle.tga 0.273437500000 0.156250000000 0.312500000000 0.195312500000
-ico_mission_casket.tga 0.312500000000 0.156250000000 0.351562500000 0.195312500000
-ico_mission_medicine.tga 0.351562500000 0.156250000000 0.390625000000 0.195312500000
-ico_mission_message.tga 0.390625000000 0.156250000000 0.429687500000 0.195312500000
-ico_mission_package.tga 0.429687500000 0.156250000000 0.468750000000 0.195312500000
-ico_mission_pot.tga 0.234375000000 0.195312500000 0.273437500000 0.234375000000
-ico_mission_purse.tga 0.273437500000 0.195312500000 0.312500000000 0.234375000000
-ico_noix.tga 0.312500000000 0.195312500000 0.351562500000 0.234375000000
-ico_racine.tga 0.351562500000 0.195312500000 0.390625000000 0.234375000000
-ico_spores.tga 0.390625000000 0.195312500000 0.429687500000 0.234375000000
-ico_task_craft.tga 0.429687500000 0.195312500000 0.468750000000 0.234375000000
-ico_task_done.tga 0.000000000000 0.234375000000 0.039062500000 0.273437500000
-ico_task_failed.tga 0.039062500000 0.234375000000 0.078125000000 0.273437500000
-ico_task_fight.tga 0.078125000000 0.234375000000 0.117187500000 0.273437500000
-ico_task_forage.tga 0.117187500000 0.234375000000 0.156250000000 0.273437500000
-ico_task_generic.tga 0.156250000000 0.234375000000 0.195312500000 0.273437500000
-ico_task_generic_quart.tga 0.195312500000 0.234375000000 0.234375000000 0.273437500000
-ico_task_guild.tga 0.234375000000 0.234375000000 0.273437500000 0.273437500000
-ico_task_rite.tga 0.273437500000 0.234375000000 0.312500000000 0.273437500000
-ico_task_travel.tga 0.312500000000 0.234375000000 0.351562500000 0.273437500000
-ico_tatoo.tga 0.351562500000 0.234375000000 0.390625000000 0.273437500000
-ico_tourbe.tga 0.390625000000 0.234375000000 0.429687500000 0.273437500000
-improved_tool.tga 0.429687500000 0.234375000000 0.468750000000 0.273437500000
-item_default.tga 0.000000000000 0.273437500000 0.039062500000 0.312500000000
-item_plan_over.tga 0.039062500000 0.273437500000 0.078125000000 0.312500000000
-lucky_flower.tga 0.078125000000 0.273437500000 0.117187500000 0.312500000000
-mektoub_pack.tga 0.117187500000 0.273437500000 0.156250000000 0.312500000000
-mektoub_steed.tga 0.156250000000 0.273437500000 0.195312500000 0.312500000000
-mg_glove.tga 0.195312500000 0.273437500000 0.234375000000 0.312500000000
-mission_icon_0.tga 0.234375000000 0.273437500000 0.273437500000 0.312500000000
-mission_icon_1.tga 0.273437500000 0.273437500000 0.312500000000 0.312500000000
-mission_icon_2.tga 0.312500000000 0.273437500000 0.351562500000 0.312500000000
-mission_icon_3.tga 0.351562500000 0.273437500000 0.390625000000 0.312500000000
-mp_amber.tga 0.390625000000 0.273437500000 0.429687500000 0.312500000000
-mp_bark.tga 0.429687500000 0.273437500000 0.468750000000 0.312500000000
-mp_batiment_brique.tga 0.000000000000 0.312500000000 0.039062500000 0.351562500000
-mp_batiment_colonne.tga 0.039062500000 0.312500000000 0.078125000000 0.351562500000
-mp_batiment_colonne_justice.tga 0.078125000000 0.312500000000 0.117187500000 0.351562500000
-mp_batiment_comble.tga 0.117187500000 0.312500000000 0.156250000000 0.351562500000
-mp_batiment_noyau_maduk.tga 0.156250000000 0.312500000000 0.195312500000 0.351562500000
-mp_batiment_ornement.tga 0.195312500000 0.312500000000 0.234375000000 0.351562500000
-mp_batiment_revetement.tga 0.234375000000 0.312500000000 0.273437500000 0.351562500000
-mp_batiment_socle.tga 0.273437500000 0.312500000000 0.312500000000 0.351562500000
-mp_batiment_statue.tga 0.312500000000 0.312500000000 0.351562500000 0.351562500000
-mp_beak.tga 0.351562500000 0.312500000000 0.390625000000 0.351562500000
-mp_blood.tga 0.390625000000 0.312500000000 0.429687500000 0.351562500000
-mp_bone.tga 0.429687500000 0.312500000000 0.468750000000 0.351562500000
-mp_bud.tga 0.000000000000 0.351562500000 0.039062500000 0.390625000000
-mp_buterfly_blue.tga 0.039062500000 0.351562500000 0.078125000000 0.390625000000
-mp_buterfly_cocoon.tga 0.078125000000 0.351562500000 0.117187500000 0.390625000000
-mp_cereal.tga 0.117187500000 0.351562500000 0.156250000000 0.390625000000
-mp_claw.tga 0.156250000000 0.351562500000 0.195312500000 0.390625000000
-mp_dandelion.tga 0.195312500000 0.351562500000 0.234375000000 0.390625000000
-mp_dust.tga 0.234375000000 0.351562500000 0.273437500000 0.390625000000
-mp_egg.tga 0.273437500000 0.351562500000 0.312500000000 0.390625000000
-mp_eyes.tga 0.312500000000 0.351562500000 0.351562500000 0.390625000000
-mp_fang.tga 0.351562500000 0.351562500000 0.390625000000 0.390625000000
-mp_fiber.tga 0.390625000000 0.351562500000 0.429687500000 0.390625000000
-mp_filament.tga 0.429687500000 0.351562500000 0.468750000000 0.390625000000
-mp_firefly_abdomen.tga 0.000000000000 0.390625000000 0.039062500000 0.429687500000
-mp_fish_scale.tga 0.039062500000 0.390625000000 0.078125000000 0.429687500000
-mp_flowers.tga 0.078125000000 0.390625000000 0.117187500000 0.429687500000
-mp_fresh_loose_soil.tga 0.117187500000 0.390625000000 0.156250000000 0.429687500000
-mp_fruit.tga 0.156250000000 0.390625000000 0.195312500000 0.429687500000
-mp_generic.tga 0.195312500000 0.390625000000 0.234375000000 0.429687500000
-mp_generic_colorize.tga 0.234375000000 0.390625000000 0.273437500000 0.429687500000
-mp_gomme.tga 0.273437500000 0.390625000000 0.312500000000 0.429687500000
-mp_goo_residue.tga 0.312500000000 0.390625000000 0.351562500000 0.429687500000
-mp_hairs.tga 0.351562500000 0.390625000000 0.390625000000 0.429687500000
-mp_hoof.tga 0.390625000000 0.390625000000 0.429687500000 0.429687500000
-mp_horn.tga 0.429687500000 0.390625000000 0.468750000000 0.429687500000
-mp_horney.tga 0.000000000000 0.429687500000 0.039062500000 0.468750000000
-mp_insect_fossil.tga 0.039062500000 0.429687500000 0.078125000000 0.468750000000
-mp_kitinshell.tga 0.078125000000 0.429687500000 0.117187500000 0.468750000000
-mp_kitin_flesh.tga 0.117187500000 0.429687500000 0.156250000000 0.468750000000
-mp_kitin_secretion.tga 0.156250000000 0.429687500000 0.195312500000 0.468750000000
-mp_larva.tga 0.195312500000 0.429687500000 0.234375000000 0.468750000000
-mp_leaf.tga 0.234375000000 0.429687500000 0.273437500000 0.468750000000
-mp_leather.tga 0.273437500000 0.429687500000 0.312500000000 0.468750000000
-mp_liane.tga 0.312500000000 0.429687500000 0.351562500000 0.468750000000
-mp_lichen.tga 0.351562500000 0.429687500000 0.390625000000 0.468750000000
-mp_ligament.tga 0.390625000000 0.429687500000 0.429687500000 0.468750000000
-mp_mandible.tga 0.429687500000 0.429687500000 0.468750000000 0.468750000000
-mp_meat.tga 0.476562500000 0.000000000000 0.515625000000 0.039062500000
-mp_moss.tga 0.515625000000 0.000000000000 0.554687500000 0.039062500000
-mp_mushroom.tga 0.554687500000 0.000000000000 0.593750000000 0.039062500000
-mp_nail.tga 0.593750000000 0.000000000000 0.632812500000 0.039062500000
-mp_oil.tga 0.632812500000 0.000000000000 0.671875000000 0.039062500000
-mp_parasite.tga 0.671875000000 0.000000000000 0.710937500000 0.039062500000
-mp_pearl.tga 0.710937500000 0.000000000000 0.750000000000 0.039062500000
-mp_pelvis.tga 0.750000000000 0.000000000000 0.789062500000 0.039062500000
-mp_pigment.tga 0.789062500000 0.000000000000 0.828125000000 0.039062500000
-mp_pistil.tga 0.828125000000 0.000000000000 0.867187500000 0.039062500000
-mp_plant_fossil.tga 0.867187500000 0.000000000000 0.906250000000 0.039062500000
-mp_pollen.tga 0.906250000000 0.000000000000 0.945312500000 0.039062500000
-mp_resin.tga 0.945312500000 0.000000000000 0.984375000000 0.039062500000
-mp_ronce.tga 0.472656250000 0.039062500000 0.511718750000 0.078125000000
-mp_rostrum.tga 0.511718750000 0.039062500000 0.550781250000 0.078125000000
-mp_sap.tga 0.550781250000 0.039062500000 0.589843750000 0.078125000000
-mp_sawdust.tga 0.589843750000 0.039062500000 0.628906250000 0.078125000000
-mp_seed.tga 0.628906250000 0.039062500000 0.667968750000 0.078125000000
-mp_shell.tga 0.667968750000 0.039062500000 0.707031250000 0.078125000000
-mp_silk_worm.tga 0.707031250000 0.039062500000 0.746093750000 0.078125000000
-mp_skin.tga 0.746093750000 0.039062500000 0.785156250000 0.078125000000
-mp_skull.tga 0.785156250000 0.039062500000 0.824218750000 0.078125000000
-mp_spiders_web.tga 0.824218750000 0.039062500000 0.863281250000 0.078125000000
-mp_spine.tga 0.863281250000 0.039062500000 0.902343750000 0.078125000000
-mp_stem.tga 0.902343750000 0.039062500000 0.941406250000 0.078125000000
-mp_sting.tga 0.941406250000 0.039062500000 0.980468750000 0.078125000000
-mp_straw.tga 0.468750000000 0.078125000000 0.507812500000 0.117187500000
-mp_suc.tga 0.507812500000 0.078125000000 0.546875000000 0.117187500000
-mp_tail.tga 0.546875000000 0.078125000000 0.585937500000 0.117187500000
-mp_tooth.tga 0.585937500000 0.078125000000 0.625000000000 0.117187500000
-mp_trunk.tga 0.625000000000 0.078125000000 0.664062500000 0.117187500000
-mp_whiskers.tga 0.664062500000 0.078125000000 0.703125000000 0.117187500000
-mp_wing.tga 0.703125000000 0.078125000000 0.742187500000 0.117187500000
-mp_wood.tga 0.742187500000 0.078125000000 0.781250000000 0.117187500000
-mp_wood_node.tga 0.781250000000 0.078125000000 0.820312500000 0.117187500000
-MW_2h_axe.tga 0.820312500000 0.078125000000 0.859375000000 0.117187500000
-MW_2h_lance.tga 0.859375000000 0.078125000000 0.898437500000 0.117187500000
-MW_2h_mace.tga 0.898437500000 0.078125000000 0.937500000000 0.117187500000
-MW_2h_sword.tga 0.937500000000 0.078125000000 0.976562500000 0.117187500000
-MW_axe.tga 0.468750000000 0.117187500000 0.507812500000 0.156250000000
-MW_dagger.tga 0.507812500000 0.117187500000 0.546875000000 0.156250000000
-MW_lance.tga 0.546875000000 0.117187500000 0.585937500000 0.156250000000
-MW_mace.tga 0.585937500000 0.117187500000 0.625000000000 0.156250000000
-MW_staff.tga 0.625000000000 0.117187500000 0.664062500000 0.156250000000
-MW_sword.tga 0.664062500000 0.117187500000 0.703125000000 0.156250000000
-PA_anklet.tga 0.703125000000 0.117187500000 0.742187500000 0.156250000000
-PA_bracelet.tga 0.742187500000 0.117187500000 0.781250000000 0.156250000000
-PA_diadem.tga 0.781250000000 0.117187500000 0.820312500000 0.156250000000
-PA_earring.tga 0.820312500000 0.117187500000 0.859375000000 0.156250000000
-PA_pendant.tga 0.859375000000 0.117187500000 0.898437500000 0.156250000000
-PA_ring.tga 0.898437500000 0.117187500000 0.937500000000 0.156250000000
-protect_amber.tga 0.937500000000 0.117187500000 0.976562500000 0.156250000000
-pvp_aura.tga 0.468750000000 0.156250000000 0.507812500000 0.195312500000
-pvp_aura_mask.tga 0.507812500000 0.156250000000 0.546875000000 0.195312500000
-pvp_boost.tga 0.546875000000 0.156250000000 0.585937500000 0.195312500000
-pvp_boost_mask.tga 0.585937500000 0.156250000000 0.625000000000 0.195312500000
-pw_4.tga 0.625000000000 0.156250000000 0.664062500000 0.195312500000
-pw_5.tga 0.664062500000 0.156250000000 0.703125000000 0.195312500000
-pw_6.tga 0.703125000000 0.156250000000 0.742187500000 0.195312500000
-pw_7.tga 0.742187500000 0.156250000000 0.781250000000 0.195312500000
-PW_heavy.tga 0.781250000000 0.156250000000 0.820312500000 0.195312500000
-PW_light.tga 0.820312500000 0.156250000000 0.859375000000 0.195312500000
-PW_medium.tga 0.859375000000 0.156250000000 0.898437500000 0.195312500000
-quest_coeur.tga 0.898437500000 0.156250000000 0.937500000000 0.195312500000
-quest_foie.tga 0.937500000000 0.156250000000 0.976562500000 0.195312500000
-quest_jeton.tga 0.468750000000 0.195312500000 0.507812500000 0.234375000000
-quest_langue.tga 0.507812500000 0.195312500000 0.546875000000 0.234375000000
-quest_louche.tga 0.546875000000 0.195312500000 0.585937500000 0.234375000000
-quest_oreille.tga 0.585937500000 0.195312500000 0.625000000000 0.234375000000
-quest_patte.tga 0.625000000000 0.195312500000 0.664062500000 0.234375000000
-quest_poils.tga 0.664062500000 0.195312500000 0.703125000000 0.234375000000
-quest_queue.tga 0.703125000000 0.195312500000 0.742187500000 0.234375000000
-quest_ticket.tga 0.742187500000 0.195312500000 0.781250000000 0.234375000000
-AM_logo.tga 0.781250000000 0.195312500000 0.820312500000 0.234375000000
-AR_armpad.tga 0.820312500000 0.195312500000 0.859375000000 0.234375000000
-ar_armpad_mask.tga 0.859375000000 0.195312500000 0.898437500000 0.234375000000
-requirement.tga 0.898437500000 0.195312500000 0.937500000000 0.234375000000
-rm_f.tga 0.937500000000 0.195312500000 0.976562500000 0.234375000000
-rm_f_upgrade.tga 0.468750000000 0.234375000000 0.507812500000 0.273437500000
-rm_h.tga 0.507812500000 0.234375000000 0.546875000000 0.273437500000
-rm_h_upgrade.tga 0.546875000000 0.234375000000 0.585937500000 0.273437500000
-rm_m.tga 0.585937500000 0.234375000000 0.625000000000 0.273437500000
-rm_m_upgrade.tga 0.625000000000 0.234375000000 0.664062500000 0.273437500000
-rm_r.tga 0.664062500000 0.234375000000 0.703125000000 0.273437500000
-rm_r_upgrade.tga 0.703125000000 0.234375000000 0.742187500000 0.273437500000
-rpjobitem_200_a.tga 0.742187500000 0.234375000000 0.781250000000 0.273437500000
-rpjobitem_200_b.tga 0.781250000000 0.234375000000 0.820312500000 0.273437500000
-rpjobitem_200_c.tga 0.820312500000 0.234375000000 0.859375000000 0.273437500000
-rpjobitem_201_a.tga 0.859375000000 0.234375000000 0.898437500000 0.273437500000
-rpjobitem_201_b.tga 0.898437500000 0.234375000000 0.937500000000 0.273437500000
-rpjobitem_201_c.tga 0.937500000000 0.234375000000 0.976562500000 0.273437500000
-rpjobitem_202_a.tga 0.468750000000 0.273437500000 0.507812500000 0.312500000000
-rpjobitem_202_b.tga 0.507812500000 0.273437500000 0.546875000000 0.312500000000
-rpjobitem_202_c.tga 0.546875000000 0.273437500000 0.585937500000 0.312500000000
-rpjobitem_203_a.tga 0.585937500000 0.273437500000 0.625000000000 0.312500000000
-rpjobitem_203_b.tga 0.625000000000 0.273437500000 0.664062500000 0.312500000000
-rpjobitem_203_c.tga 0.664062500000 0.273437500000 0.703125000000 0.312500000000
-rpjobitem_204_a.tga 0.703125000000 0.273437500000 0.742187500000 0.312500000000
-rpjobitem_204_b.tga 0.742187500000 0.273437500000 0.781250000000 0.312500000000
-rpjobitem_204_c.tga 0.781250000000 0.273437500000 0.820312500000 0.312500000000
-rpjobitem_205_a.tga 0.820312500000 0.273437500000 0.859375000000 0.312500000000
-rpjobitem_205_b.tga 0.859375000000 0.273437500000 0.898437500000 0.312500000000
-rpjobitem_205_c.tga 0.898437500000 0.273437500000 0.937500000000 0.312500000000
-rpjobitem_206_a.tga 0.937500000000 0.273437500000 0.976562500000 0.312500000000
-rpjobitem_206_b.tga 0.468750000000 0.312500000000 0.507812500000 0.351562500000
-rpjobitem_206_c.tga 0.507812500000 0.312500000000 0.546875000000 0.351562500000
-rpjobitem_207_a.tga 0.546875000000 0.312500000000 0.585937500000 0.351562500000
-rpjobitem_207_b.tga 0.585937500000 0.312500000000 0.625000000000 0.351562500000
-rpjobitem_207_c.tga 0.625000000000 0.312500000000 0.664062500000 0.351562500000
-rpjobitem_certifications.tga 0.664062500000 0.312500000000 0.703125000000 0.351562500000
-rpjob_200.tga 0.703125000000 0.312500000000 0.742187500000 0.351562500000
-rpjob_201.tga 0.742187500000 0.312500000000 0.781250000000 0.351562500000
-rpjob_202.tga 0.781250000000 0.312500000000 0.820312500000 0.351562500000
-rpjob_203.tga 0.820312500000 0.312500000000 0.859375000000 0.351562500000
-rpjob_204.tga 0.859375000000 0.312500000000 0.898437500000 0.351562500000
-rpjob_205.tga 0.898437500000 0.312500000000 0.937500000000 0.351562500000
-rpjob_206.tga 0.937500000000 0.312500000000 0.976562500000 0.351562500000
-rpjob_207.tga 0.468750000000 0.351562500000 0.507812500000 0.390625000000
-rpjob_advanced.tga 0.507812500000 0.351562500000 0.546875000000 0.390625000000
-rpjob_elementary.tga 0.546875000000 0.351562500000 0.585937500000 0.390625000000
-rpjob_roleplay.tga 0.585937500000 0.351562500000 0.625000000000 0.390625000000
-rpjob_task.tga 0.625000000000 0.351562500000 0.664062500000 0.390625000000
-rpjob_task_certificats.tga 0.664062500000 0.351562500000 0.703125000000 0.390625000000
-rpjob_task_convert.tga 0.703125000000 0.351562500000 0.742187500000 0.390625000000
-rpjob_task_elementary.tga 0.742187500000 0.351562500000 0.781250000000 0.390625000000
-rpjob_task_generic.tga 0.781250000000 0.351562500000 0.820312500000 0.390625000000
-rpjob_task_upgrade.tga 0.820312500000 0.351562500000 0.859375000000 0.390625000000
-RW_autolaunch.tga 0.859375000000 0.351562500000 0.898437500000 0.390625000000
-RW_bowgun.tga 0.898437500000 0.351562500000 0.937500000000 0.390625000000
-RW_grenade.tga 0.937500000000 0.351562500000 0.976562500000 0.390625000000
-RW_harpoongun.tga 0.468750000000 0.390625000000 0.507812500000 0.429687500000
-RW_launcher.tga 0.507812500000 0.390625000000 0.546875000000 0.429687500000
-RW_pistol.tga 0.546875000000 0.390625000000 0.585937500000 0.429687500000
-RW_pistolarc.tga 0.585937500000 0.390625000000 0.625000000000 0.429687500000
-RW_rifle.tga 0.625000000000 0.390625000000 0.664062500000 0.429687500000
-SH_buckler.tga 0.664062500000 0.390625000000 0.703125000000 0.429687500000
-SH_large_shield.tga 0.703125000000 0.390625000000 0.742187500000 0.429687500000
-spe_beast.tga 0.742187500000 0.390625000000 0.781250000000 0.429687500000
-spe_com.tga 0.781250000000 0.390625000000 0.820312500000 0.429687500000
-spe_inventory.tga 0.820312500000 0.390625000000 0.859375000000 0.429687500000
-spe_labs.tga 0.859375000000 0.390625000000 0.898437500000 0.429687500000
-spe_memory.tga 0.898437500000 0.390625000000 0.937500000000 0.429687500000
-spe_options.tga 0.937500000000 0.390625000000 0.976562500000 0.429687500000
-spe_status.tga 0.468750000000 0.429687500000 0.507812500000 0.468750000000
-stimulating_water.tga 0.507812500000 0.429687500000 0.546875000000 0.468750000000
-tetekitin.tga 0.546875000000 0.429687500000 0.585937500000 0.468750000000
-to_ammo.tga 0.585937500000 0.429687500000 0.625000000000 0.468750000000
-to_armor.tga 0.625000000000 0.429687500000 0.664062500000 0.468750000000
-to_cooking_pot.tga 0.664062500000 0.429687500000 0.703125000000 0.468750000000
-to_fishing_rod.tga 0.703125000000 0.429687500000 0.742187500000 0.468750000000
-to_forage.tga 0.742187500000 0.429687500000 0.781250000000 0.468750000000
-to_hammer.tga 0.781250000000 0.429687500000 0.820312500000 0.468750000000
-to_jewelry_hammer.tga 0.820312500000 0.429687500000 0.859375000000 0.468750000000
-to_jewels.tga 0.859375000000 0.429687500000 0.898437500000 0.468750000000
-to_leathercutter.tga 0.898437500000 0.429687500000 0.937500000000 0.468750000000
-to_melee.tga 0.937500000000 0.429687500000 0.976562500000 0.468750000000
-to_needle.tga 0.000000000000 0.468750000000 0.039062500000 0.507812500000
-to_pestle.tga 0.039062500000 0.468750000000 0.078125000000 0.507812500000
-to_range.tga 0.078125000000 0.468750000000 0.117187500000 0.507812500000
-to_searake.tga 0.117187500000 0.468750000000 0.156250000000 0.507812500000
-to_spade.tga 0.156250000000 0.468750000000 0.195312500000 0.507812500000
-to_stick.tga 0.195312500000 0.468750000000 0.234375000000 0.507812500000
-to_tunneling_knife.tga 0.234375000000 0.468750000000 0.273437500000 0.507812500000
-to_whip.tga 0.273437500000 0.468750000000 0.312500000000 0.507812500000
-to_wrench.tga 0.312500000000 0.468750000000 0.351562500000 0.507812500000
-TP_caravane.tga 0.351562500000 0.468750000000 0.390625000000 0.507812500000
-TP_kami.tga 0.390625000000 0.468750000000 0.429687500000 0.507812500000
-W_AM_logo.tga 0.429687500000 0.468750000000 0.468750000000 0.507812500000
-w_pa_anklet.tga 0.468750000000 0.468750000000 0.507812500000 0.507812500000
-w_pa_bracelet.tga 0.507812500000 0.468750000000 0.546875000000 0.507812500000
-w_pa_diadem.tga 0.546875000000 0.468750000000 0.585937500000 0.507812500000
-w_pa_earring.tga 0.585937500000 0.468750000000 0.625000000000 0.507812500000
-w_pa_pendant.tga 0.625000000000 0.468750000000 0.664062500000 0.507812500000
-w_pa_ring.tga 0.664062500000 0.468750000000 0.703125000000 0.507812500000
-xp_cat_green.tga 0.703125000000 0.468750000000 0.742187500000 0.507812500000
+BK_matis.tga 0.078125000000 0.117187500000 0.117187500000 0.156250000000
+bk_mission.tga 0.117187500000 0.117187500000 0.156250000000 0.156250000000
+bk_mission2.tga 0.156250000000 0.117187500000 0.195312500000 0.156250000000
+BK_outpost.tga 0.195312500000 0.117187500000 0.234375000000 0.156250000000
+BK_primes.tga 0.000000000000 0.156250000000 0.039062500000 0.195312500000
+bk_service.tga 0.039062500000 0.156250000000 0.078125000000 0.195312500000
+bk_training.tga 0.078125000000 0.156250000000 0.117187500000 0.195312500000
+BK_tryker.tga 0.117187500000 0.156250000000 0.156250000000 0.195312500000
+BK_zorai.tga 0.156250000000 0.156250000000 0.195312500000 0.195312500000
+charge.tga 0.195312500000 0.156250000000 0.234375000000 0.195312500000
+clef.tga 0.000000000000 0.195312500000 0.039062500000 0.234375000000
+conso_branche.tga 0.039062500000 0.195312500000 0.078125000000 0.234375000000
+conso_branche_mask.tga 0.078125000000 0.195312500000 0.117187500000 0.234375000000
+conso_fleur.tga 0.117187500000 0.195312500000 0.156250000000 0.234375000000
+conso_fleur_mask.tga 0.156250000000 0.195312500000 0.195312500000 0.234375000000
+conso_grappe.tga 0.195312500000 0.195312500000 0.234375000000 0.234375000000
+conso_nectar.tga 0.242187500000 0.000000000000 0.281250000000 0.039062500000
+conso_nectar_mask.tga 0.281250000000 0.000000000000 0.320312500000 0.039062500000
+construction.tga 0.320312500000 0.000000000000 0.359375000000 0.039062500000
+cristal_ammo.tga 0.359375000000 0.000000000000 0.398437500000 0.039062500000
+cristal_spell.tga 0.398437500000 0.000000000000 0.437500000000 0.039062500000
+ico_haircolor.tga 0.437500000000 0.000000000000 0.476562500000 0.039062500000
+ico_haircut.tga 0.238281250000 0.039062500000 0.277343750000 0.078125000000
+bk_karavan.tga 0.277343750000 0.039062500000 0.316406250000 0.078125000000
+conso_grappe_mask.tga 0.316406250000 0.039062500000 0.355468750000 0.078125000000
+ico_foreuse.tga 0.355468750000 0.039062500000 0.394531250000 0.078125000000
+ico_noix.tga 0.394531250000 0.039062500000 0.433593750000 0.078125000000
+ico_spores.tga 0.433593750000 0.039062500000 0.472656250000 0.078125000000
+mektoub_pack.tga 0.234375000000 0.078125000000 0.273437500000 0.117187500000
+mp_beak.tga 0.273437500000 0.078125000000 0.312500000000 0.117187500000
+mp_fresh_loose_soil.tga 0.312500000000 0.078125000000 0.351562500000 0.117187500000
+mp_lichen.tga 0.351562500000 0.078125000000 0.390625000000 0.117187500000
+mp_sawdust.tga 0.390625000000 0.078125000000 0.429687500000 0.117187500000
+MW_2h_axe.tga 0.429687500000 0.078125000000 0.468750000000 0.117187500000
+PA_bracelet.tga 0.234375000000 0.117187500000 0.273437500000 0.156250000000
+pvp_aura_mask.tga 0.273437500000 0.117187500000 0.312500000000 0.156250000000
+quest_queue.tga 0.312500000000 0.117187500000 0.351562500000 0.156250000000
+rpjobitem_201_b.tga 0.351562500000 0.117187500000 0.390625000000 0.156250000000
+rpjobitem_207_a.tga 0.390625000000 0.117187500000 0.429687500000 0.156250000000
+rpjob_task_elementary.tga 0.429687500000 0.117187500000 0.468750000000 0.156250000000
+spe_options.tga 0.234375000000 0.156250000000 0.273437500000 0.195312500000
+to_range.tga 0.273437500000 0.156250000000 0.312500000000 0.195312500000
+w_pa_anklet.tga 0.312500000000 0.156250000000 0.351562500000 0.195312500000
+ico_task_craft.tga 0.351562500000 0.156250000000 0.390625000000 0.195312500000
+ico_task_done.tga 0.390625000000 0.156250000000 0.429687500000 0.195312500000
+ico_task_failed.tga 0.429687500000 0.156250000000 0.468750000000 0.195312500000
+ico_task_fight.tga 0.234375000000 0.195312500000 0.273437500000 0.234375000000
+ico_task_forage.tga 0.273437500000 0.195312500000 0.312500000000 0.234375000000
+ico_task_generic.tga 0.312500000000 0.195312500000 0.351562500000 0.234375000000
+ico_task_generic_quart.tga 0.351562500000 0.195312500000 0.390625000000 0.234375000000
+ico_task_guild.tga 0.390625000000 0.195312500000 0.429687500000 0.234375000000
+ico_task_rite.tga 0.429687500000 0.195312500000 0.468750000000 0.234375000000
+ico_task_travel.tga 0.000000000000 0.234375000000 0.039062500000 0.273437500000
+ico_tatoo.tga 0.039062500000 0.234375000000 0.078125000000 0.273437500000
+mektoub_steed.tga 0.078125000000 0.234375000000 0.117187500000 0.273437500000
+mg_glove.tga 0.117187500000 0.234375000000 0.156250000000 0.273437500000
+mission_icon_0.tga 0.156250000000 0.234375000000 0.195312500000 0.273437500000
+mission_icon_1.tga 0.195312500000 0.234375000000 0.234375000000 0.273437500000
+mission_icon_2.tga 0.234375000000 0.234375000000 0.273437500000 0.273437500000
+mission_icon_3.tga 0.273437500000 0.234375000000 0.312500000000 0.273437500000
+mp_amber.tga 0.312500000000 0.234375000000 0.351562500000 0.273437500000
+mp_bark.tga 0.351562500000 0.234375000000 0.390625000000 0.273437500000
+mp_batiment_brique.tga 0.390625000000 0.234375000000 0.429687500000 0.273437500000
+mp_batiment_colonne.tga 0.429687500000 0.234375000000 0.468750000000 0.273437500000
+mp_batiment_colonne_justice.tga 0.000000000000 0.273437500000 0.039062500000 0.312500000000
+mp_batiment_comble.tga 0.039062500000 0.273437500000 0.078125000000 0.312500000000
+mp_batiment_noyau_maduk.tga 0.078125000000 0.273437500000 0.117187500000 0.312500000000
+mp_batiment_ornement.tga 0.117187500000 0.273437500000 0.156250000000 0.312500000000
+mp_batiment_revetement.tga 0.156250000000 0.273437500000 0.195312500000 0.312500000000
+mp_batiment_socle.tga 0.195312500000 0.273437500000 0.234375000000 0.312500000000
+mp_batiment_statue.tga 0.234375000000 0.273437500000 0.273437500000 0.312500000000
+mp_blood.tga 0.273437500000 0.273437500000 0.312500000000 0.312500000000
+mp_bone.tga 0.312500000000 0.273437500000 0.351562500000 0.312500000000
+mp_bud.tga 0.351562500000 0.273437500000 0.390625000000 0.312500000000
+mp_buterfly_blue.tga 0.390625000000 0.273437500000 0.429687500000 0.312500000000
+mp_buterfly_cocoon.tga 0.429687500000 0.273437500000 0.468750000000 0.312500000000
+mp_cereal.tga 0.000000000000 0.312500000000 0.039062500000 0.351562500000
+mp_claw.tga 0.039062500000 0.312500000000 0.078125000000 0.351562500000
+mp_dandelion.tga 0.078125000000 0.312500000000 0.117187500000 0.351562500000
+mp_dust.tga 0.117187500000 0.312500000000 0.156250000000 0.351562500000
+mp_egg.tga 0.156250000000 0.312500000000 0.195312500000 0.351562500000
+mp_eyes.tga 0.195312500000 0.312500000000 0.234375000000 0.351562500000
+mp_fang.tga 0.234375000000 0.312500000000 0.273437500000 0.351562500000
+mp_fiber.tga 0.273437500000 0.312500000000 0.312500000000 0.351562500000
+mp_filament.tga 0.312500000000 0.312500000000 0.351562500000 0.351562500000
+mp_firefly_abdomen.tga 0.351562500000 0.312500000000 0.390625000000 0.351562500000
+mp_fish_scale.tga 0.390625000000 0.312500000000 0.429687500000 0.351562500000
+mp_flowers.tga 0.429687500000 0.312500000000 0.468750000000 0.351562500000
+mp_fruit.tga 0.000000000000 0.351562500000 0.039062500000 0.390625000000
+mp_generic.tga 0.039062500000 0.351562500000 0.078125000000 0.390625000000
+mp_generic_colorize.tga 0.078125000000 0.351562500000 0.117187500000 0.390625000000
+mp_gomme.tga 0.117187500000 0.351562500000 0.156250000000 0.390625000000
+mp_goo_residue.tga 0.156250000000 0.351562500000 0.195312500000 0.390625000000
+mp_hairs.tga 0.195312500000 0.351562500000 0.234375000000 0.390625000000
+mp_hoof.tga 0.234375000000 0.351562500000 0.273437500000 0.390625000000
+mp_horn.tga 0.273437500000 0.351562500000 0.312500000000 0.390625000000
+mp_horney.tga 0.312500000000 0.351562500000 0.351562500000 0.390625000000
+mp_insect_fossil.tga 0.351562500000 0.351562500000 0.390625000000 0.390625000000
+mp_kitinshell.tga 0.390625000000 0.351562500000 0.429687500000 0.390625000000
+mp_kitin_flesh.tga 0.429687500000 0.351562500000 0.468750000000 0.390625000000
+mp_kitin_secretion.tga 0.000000000000 0.390625000000 0.039062500000 0.429687500000
+mp_larva.tga 0.039062500000 0.390625000000 0.078125000000 0.429687500000
+mp_leaf.tga 0.078125000000 0.390625000000 0.117187500000 0.429687500000
+mp_leather.tga 0.117187500000 0.390625000000 0.156250000000 0.429687500000
+mp_liane.tga 0.156250000000 0.390625000000 0.195312500000 0.429687500000
+mp_ligament.tga 0.195312500000 0.390625000000 0.234375000000 0.429687500000
+mp_mandible.tga 0.234375000000 0.390625000000 0.273437500000 0.429687500000
+mp_meat.tga 0.273437500000 0.390625000000 0.312500000000 0.429687500000
+mp_moss.tga 0.312500000000 0.390625000000 0.351562500000 0.429687500000
+mp_mushroom.tga 0.351562500000 0.390625000000 0.390625000000 0.429687500000
+mp_nail.tga 0.390625000000 0.390625000000 0.429687500000 0.429687500000
+mp_oil.tga 0.429687500000 0.390625000000 0.468750000000 0.429687500000
+mp_parasite.tga 0.000000000000 0.429687500000 0.039062500000 0.468750000000
+mp_pearl.tga 0.039062500000 0.429687500000 0.078125000000 0.468750000000
+mp_pelvis.tga 0.078125000000 0.429687500000 0.117187500000 0.468750000000
+mp_pigment.tga 0.117187500000 0.429687500000 0.156250000000 0.468750000000
+mp_pistil.tga 0.156250000000 0.429687500000 0.195312500000 0.468750000000
+mp_plant_fossil.tga 0.195312500000 0.429687500000 0.234375000000 0.468750000000
+mp_pollen.tga 0.234375000000 0.429687500000 0.273437500000 0.468750000000
+mp_resin.tga 0.273437500000 0.429687500000 0.312500000000 0.468750000000
+mp_ronce.tga 0.312500000000 0.429687500000 0.351562500000 0.468750000000
+mp_rostrum.tga 0.351562500000 0.429687500000 0.390625000000 0.468750000000
+mp_sap.tga 0.390625000000 0.429687500000 0.429687500000 0.468750000000
+mp_seed.tga 0.429687500000 0.429687500000 0.468750000000 0.468750000000
+mp_shell.tga 0.476562500000 0.000000000000 0.515625000000 0.039062500000
+mp_silk_worm.tga 0.515625000000 0.000000000000 0.554687500000 0.039062500000
+mp_skin.tga 0.554687500000 0.000000000000 0.593750000000 0.039062500000
+mp_skull.tga 0.593750000000 0.000000000000 0.632812500000 0.039062500000
+mp_spiders_web.tga 0.632812500000 0.000000000000 0.671875000000 0.039062500000
+mp_spine.tga 0.671875000000 0.000000000000 0.710937500000 0.039062500000
+mp_stem.tga 0.710937500000 0.000000000000 0.750000000000 0.039062500000
+mp_sting.tga 0.750000000000 0.000000000000 0.789062500000 0.039062500000
+mp_straw.tga 0.789062500000 0.000000000000 0.828125000000 0.039062500000
+mp_suc.tga 0.828125000000 0.000000000000 0.867187500000 0.039062500000
+mp_tail.tga 0.867187500000 0.000000000000 0.906250000000 0.039062500000
+mp_tooth.tga 0.906250000000 0.000000000000 0.945312500000 0.039062500000
+mp_trunk.tga 0.945312500000 0.000000000000 0.984375000000 0.039062500000
+mp_whiskers.tga 0.472656250000 0.039062500000 0.511718750000 0.078125000000
+mp_wing.tga 0.511718750000 0.039062500000 0.550781250000 0.078125000000
+mp_wood.tga 0.550781250000 0.039062500000 0.589843750000 0.078125000000
+mp_wood_node.tga 0.589843750000 0.039062500000 0.628906250000 0.078125000000
+MW_2h_lance.tga 0.628906250000 0.039062500000 0.667968750000 0.078125000000
+MW_2h_mace.tga 0.667968750000 0.039062500000 0.707031250000 0.078125000000
+MW_2h_sword.tga 0.707031250000 0.039062500000 0.746093750000 0.078125000000
+MW_axe.tga 0.746093750000 0.039062500000 0.785156250000 0.078125000000
+MW_dagger.tga 0.785156250000 0.039062500000 0.824218750000 0.078125000000
+MW_lance.tga 0.824218750000 0.039062500000 0.863281250000 0.078125000000
+MW_mace.tga 0.863281250000 0.039062500000 0.902343750000 0.078125000000
+MW_staff.tga 0.902343750000 0.039062500000 0.941406250000 0.078125000000
+MW_sword.tga 0.941406250000 0.039062500000 0.980468750000 0.078125000000
+PA_anklet.tga 0.468750000000 0.078125000000 0.507812500000 0.117187500000
+pvp_boost.tga 0.507812500000 0.078125000000 0.546875000000 0.117187500000
+pvp_boost_mask.tga 0.546875000000 0.078125000000 0.585937500000 0.117187500000
+pw_4.tga 0.585937500000 0.078125000000 0.625000000000 0.117187500000
+pw_5.tga 0.625000000000 0.078125000000 0.664062500000 0.117187500000
+pw_6.tga 0.664062500000 0.078125000000 0.703125000000 0.117187500000
+pw_7.tga 0.703125000000 0.078125000000 0.742187500000 0.117187500000
+PW_heavy.tga 0.742187500000 0.078125000000 0.781250000000 0.117187500000
+PW_light.tga 0.781250000000 0.078125000000 0.820312500000 0.117187500000
+PW_medium.tga 0.820312500000 0.078125000000 0.859375000000 0.117187500000
+quest_coeur.tga 0.859375000000 0.078125000000 0.898437500000 0.117187500000
+quest_foie.tga 0.898437500000 0.078125000000 0.937500000000 0.117187500000
+quest_jeton.tga 0.937500000000 0.078125000000 0.976562500000 0.117187500000
+quest_langue.tga 0.468750000000 0.117187500000 0.507812500000 0.156250000000
+quest_louche.tga 0.507812500000 0.117187500000 0.546875000000 0.156250000000
+quest_oreille.tga 0.546875000000 0.117187500000 0.585937500000 0.156250000000
+quest_patte.tga 0.585937500000 0.117187500000 0.625000000000 0.156250000000
+quest_poils.tga 0.625000000000 0.117187500000 0.664062500000 0.156250000000
+quest_ticket.tga 0.664062500000 0.117187500000 0.703125000000 0.156250000000
+AM_logo.tga 0.703125000000 0.117187500000 0.742187500000 0.156250000000
+AR_armpad.tga 0.742187500000 0.117187500000 0.781250000000 0.156250000000
+ar_armpad_mask.tga 0.781250000000 0.117187500000 0.820312500000 0.156250000000
+requirement.tga 0.820312500000 0.117187500000 0.859375000000 0.156250000000
+rm_f.tga 0.859375000000 0.117187500000 0.898437500000 0.156250000000
+rm_f_upgrade.tga 0.898437500000 0.117187500000 0.937500000000 0.156250000000
+rm_h.tga 0.937500000000 0.117187500000 0.976562500000 0.156250000000
+rm_h_upgrade.tga 0.468750000000 0.156250000000 0.507812500000 0.195312500000
+rm_m.tga 0.507812500000 0.156250000000 0.546875000000 0.195312500000
+rm_m_upgrade.tga 0.546875000000 0.156250000000 0.585937500000 0.195312500000
+rm_r.tga 0.585937500000 0.156250000000 0.625000000000 0.195312500000
+rm_r_upgrade.tga 0.625000000000 0.156250000000 0.664062500000 0.195312500000
+rpjobitem_200_a.tga 0.664062500000 0.156250000000 0.703125000000 0.195312500000
+rpjobitem_200_b.tga 0.703125000000 0.156250000000 0.742187500000 0.195312500000
+rpjobitem_200_c.tga 0.742187500000 0.156250000000 0.781250000000 0.195312500000
+rpjobitem_201_a.tga 0.781250000000 0.156250000000 0.820312500000 0.195312500000
+rpjobitem_201_c.tga 0.820312500000 0.156250000000 0.859375000000 0.195312500000
+rpjobitem_202_a.tga 0.859375000000 0.156250000000 0.898437500000 0.195312500000
+rpjobitem_202_b.tga 0.898437500000 0.156250000000 0.937500000000 0.195312500000
+rpjobitem_202_c.tga 0.937500000000 0.156250000000 0.976562500000 0.195312500000
+rpjobitem_203_a.tga 0.468750000000 0.195312500000 0.507812500000 0.234375000000
+rpjobitem_203_b.tga 0.507812500000 0.195312500000 0.546875000000 0.234375000000
+rpjobitem_203_c.tga 0.546875000000 0.195312500000 0.585937500000 0.234375000000
+rpjobitem_204_a.tga 0.585937500000 0.195312500000 0.625000000000 0.234375000000
+rpjobitem_204_b.tga 0.625000000000 0.195312500000 0.664062500000 0.234375000000
+rpjobitem_204_c.tga 0.664062500000 0.195312500000 0.703125000000 0.234375000000
+rpjobitem_205_a.tga 0.703125000000 0.195312500000 0.742187500000 0.234375000000
+rpjobitem_205_b.tga 0.742187500000 0.195312500000 0.781250000000 0.234375000000
+rpjobitem_205_c.tga 0.781250000000 0.195312500000 0.820312500000 0.234375000000
+rpjobitem_206_a.tga 0.820312500000 0.195312500000 0.859375000000 0.234375000000
+rpjobitem_206_b.tga 0.859375000000 0.195312500000 0.898437500000 0.234375000000
+rpjobitem_206_c.tga 0.898437500000 0.195312500000 0.937500000000 0.234375000000
+rpjobitem_207_b.tga 0.937500000000 0.195312500000 0.976562500000 0.234375000000
+rpjobitem_207_c.tga 0.468750000000 0.234375000000 0.507812500000 0.273437500000
+rpjobitem_certifications.tga 0.507812500000 0.234375000000 0.546875000000 0.273437500000
+rpjob_200.tga 0.546875000000 0.234375000000 0.585937500000 0.273437500000
+rpjob_201.tga 0.585937500000 0.234375000000 0.625000000000 0.273437500000
+rpjob_202.tga 0.625000000000 0.234375000000 0.664062500000 0.273437500000
+rpjob_203.tga 0.664062500000 0.234375000000 0.703125000000 0.273437500000
+rpjob_204.tga 0.703125000000 0.234375000000 0.742187500000 0.273437500000
+rpjob_205.tga 0.742187500000 0.234375000000 0.781250000000 0.273437500000
+rpjob_206.tga 0.781250000000 0.234375000000 0.820312500000 0.273437500000
+rpjob_207.tga 0.820312500000 0.234375000000 0.859375000000 0.273437500000
+rpjob_advanced.tga 0.859375000000 0.234375000000 0.898437500000 0.273437500000
+rpjob_elementary.tga 0.898437500000 0.234375000000 0.937500000000 0.273437500000
+rpjob_roleplay.tga 0.937500000000 0.234375000000 0.976562500000 0.273437500000
+rpjob_task.tga 0.468750000000 0.273437500000 0.507812500000 0.312500000000
+rpjob_task_certificats.tga 0.507812500000 0.273437500000 0.546875000000 0.312500000000
+rpjob_task_convert.tga 0.546875000000 0.273437500000 0.585937500000 0.312500000000
+rpjob_task_generic.tga 0.585937500000 0.273437500000 0.625000000000 0.312500000000
+rpjob_task_upgrade.tga 0.625000000000 0.273437500000 0.664062500000 0.312500000000
+RW_autolaunch.tga 0.664062500000 0.273437500000 0.703125000000 0.312500000000
+RW_bowgun.tga 0.703125000000 0.273437500000 0.742187500000 0.312500000000
+RW_grenade.tga 0.742187500000 0.273437500000 0.781250000000 0.312500000000
+RW_harpoongun.tga 0.781250000000 0.273437500000 0.820312500000 0.312500000000
+RW_launcher.tga 0.820312500000 0.273437500000 0.859375000000 0.312500000000
+RW_pistol.tga 0.859375000000 0.273437500000 0.898437500000 0.312500000000
+RW_pistolarc.tga 0.898437500000 0.273437500000 0.937500000000 0.312500000000
+RW_rifle.tga 0.937500000000 0.273437500000 0.976562500000 0.312500000000
+SH_buckler.tga 0.468750000000 0.312500000000 0.507812500000 0.351562500000
+SH_large_shield.tga 0.507812500000 0.312500000000 0.546875000000 0.351562500000
+spe_beast.tga 0.546875000000 0.312500000000 0.585937500000 0.351562500000
+spe_com.tga 0.585937500000 0.312500000000 0.625000000000 0.351562500000
+spe_inventory.tga 0.625000000000 0.312500000000 0.664062500000 0.351562500000
+spe_labs.tga 0.664062500000 0.312500000000 0.703125000000 0.351562500000
+spe_memory.tga 0.703125000000 0.312500000000 0.742187500000 0.351562500000
+spe_status.tga 0.742187500000 0.312500000000 0.781250000000 0.351562500000
+stimulating_water.tga 0.781250000000 0.312500000000 0.820312500000 0.351562500000
+ico_cataliseur_xp.tga 0.820312500000 0.312500000000 0.859375000000 0.351562500000
+ico_consommable_over.tga 0.859375000000 0.312500000000 0.898437500000 0.351562500000
+ico_fleur_carac_1.tga 0.898437500000 0.312500000000 0.937500000000 0.351562500000
+ico_fleur_carac_1_mask.tga 0.937500000000 0.312500000000 0.976562500000 0.351562500000
+ico_fleur_carac_2.tga 0.468750000000 0.351562500000 0.507812500000 0.390625000000
+ico_fleur_carac_2_mask.tga 0.507812500000 0.351562500000 0.546875000000 0.390625000000
+ico_fleur_carac_3.tga 0.546875000000 0.351562500000 0.585937500000 0.390625000000
+ico_fleur_carac_3_mask.tga 0.585937500000 0.351562500000 0.625000000000 0.390625000000
+ico_mission_art_fyros.tga 0.625000000000 0.351562500000 0.664062500000 0.390625000000
+ico_mission_art_matis.tga 0.664062500000 0.351562500000 0.703125000000 0.390625000000
+ico_mission_art_tryker.tga 0.703125000000 0.351562500000 0.742187500000 0.390625000000
+ico_mission_art_zorai.tga 0.742187500000 0.351562500000 0.781250000000 0.390625000000
+ico_mission_barrel.tga 0.781250000000 0.351562500000 0.820312500000 0.390625000000
+ico_mission_bottle.tga 0.820312500000 0.351562500000 0.859375000000 0.390625000000
+ico_mission_casket.tga 0.859375000000 0.351562500000 0.898437500000 0.390625000000
+ico_mission_medicine.tga 0.898437500000 0.351562500000 0.937500000000 0.390625000000
+ico_mission_message.tga 0.937500000000 0.351562500000 0.976562500000 0.390625000000
+ico_mission_package.tga 0.468750000000 0.390625000000 0.507812500000 0.429687500000
+ico_mission_pot.tga 0.507812500000 0.390625000000 0.546875000000 0.429687500000
+ico_mission_purse.tga 0.546875000000 0.390625000000 0.585937500000 0.429687500000
+ico_racine.tga 0.585937500000 0.390625000000 0.625000000000 0.429687500000
+ge_mission_outpost_townhall.tga 0.625000000000 0.390625000000 0.664062500000 0.429687500000
+ico_amande.tga 0.664062500000 0.390625000000 0.703125000000 0.429687500000
+to_searake.tga 0.703125000000 0.390625000000 0.742187500000 0.429687500000
+to_spade.tga 0.742187500000 0.390625000000 0.781250000000 0.429687500000
+to_stick.tga 0.781250000000 0.390625000000 0.820312500000 0.429687500000
+to_tunneling_knife.tga 0.820312500000 0.390625000000 0.859375000000 0.429687500000
+to_whip.tga 0.859375000000 0.390625000000 0.898437500000 0.429687500000
+to_wrench.tga 0.898437500000 0.390625000000 0.937500000000 0.429687500000
+TP_caravane.tga 0.937500000000 0.390625000000 0.976562500000 0.429687500000
+TP_kami.tga 0.468750000000 0.429687500000 0.507812500000 0.468750000000
+tetekitin.tga 0.507812500000 0.429687500000 0.546875000000 0.468750000000
+to_ammo.tga 0.546875000000 0.429687500000 0.585937500000 0.468750000000
+to_armor.tga 0.585937500000 0.429687500000 0.625000000000 0.468750000000
+to_cooking_pot.tga 0.625000000000 0.429687500000 0.664062500000 0.468750000000
+to_fishing_rod.tga 0.664062500000 0.429687500000 0.703125000000 0.468750000000
+to_forage.tga 0.703125000000 0.429687500000 0.742187500000 0.468750000000
+to_hammer.tga 0.742187500000 0.429687500000 0.781250000000 0.468750000000
+to_jewelry_hammer.tga 0.781250000000 0.429687500000 0.820312500000 0.468750000000
+to_jewels.tga 0.820312500000 0.429687500000 0.859375000000 0.468750000000
+to_leathercutter.tga 0.859375000000 0.429687500000 0.898437500000 0.468750000000
+to_melee.tga 0.898437500000 0.429687500000 0.937500000000 0.468750000000
+to_needle.tga 0.937500000000 0.429687500000 0.976562500000 0.468750000000
+to_pestle.tga 0.000000000000 0.468750000000 0.039062500000 0.507812500000
+ico_tourbe.tga 0.039062500000 0.468750000000 0.078125000000 0.507812500000
+improved_tool.tga 0.078125000000 0.468750000000 0.117187500000 0.507812500000
+item_default.tga 0.117187500000 0.468750000000 0.156250000000 0.507812500000
+item_plan_over.tga 0.156250000000 0.468750000000 0.195312500000 0.507812500000
+lucky_flower.tga 0.195312500000 0.468750000000 0.234375000000 0.507812500000
+W_AM_logo.tga 0.234375000000 0.468750000000 0.273437500000 0.507812500000
+w_pa_bracelet.tga 0.273437500000 0.468750000000 0.312500000000 0.507812500000
+w_pa_diadem.tga 0.312500000000 0.468750000000 0.351562500000 0.507812500000
+w_pa_earring.tga 0.351562500000 0.468750000000 0.390625000000 0.507812500000
+w_pa_pendant.tga 0.390625000000 0.468750000000 0.429687500000 0.507812500000
+w_pa_ring.tga 0.429687500000 0.468750000000 0.468750000000 0.507812500000
+xp_cat_green.tga 0.468750000000 0.468750000000 0.507812500000 0.507812500000
+PA_diadem.tga 0.507812500000 0.468750000000 0.546875000000 0.507812500000
+PA_earring.tga 0.546875000000 0.468750000000 0.585937500000 0.507812500000
+PA_pendant.tga 0.585937500000 0.468750000000 0.625000000000 0.507812500000
+PA_ring.tga 0.625000000000 0.468750000000 0.664062500000 0.507812500000
+protect_amber.tga 0.664062500000 0.468750000000 0.703125000000 0.507812500000
+pvp_aura.tga 0.703125000000 0.468750000000 0.742187500000 0.507812500000
 asc_exit.tga 0.742187500000 0.468750000000 0.773437500000 0.500000000000
 asc_rolemastercraft.tga 0.773437500000 0.468750000000 0.804687500000 0.500000000000
 asc_rolemasterfight.tga 0.804687500000 0.468750000000 0.835937500000 0.500000000000
@@ -324,340 +324,350 @@ asc_rolemasterharvest.tga 0.835937500000 0.468750000000 0.867187500000 0.5000000
 asc_rolemastermagic.tga 0.867187500000 0.468750000000 0.898437500000 0.500000000000
 asc_unknown.tga 0.898437500000 0.468750000000 0.929687500000 0.500000000000
 mail.tga 0.929687500000 0.468750000000 0.960937500000 0.492187500000
-mp_back_curative.tga 0.976562500000 0.078125000000 1.000000000000 0.101562500000
-mp_back_offensive.tga 0.976562500000 0.101562500000 1.000000000000 0.125000000000
-mp_back_selfonly.tga 0.976562500000 0.125000000000 1.000000000000 0.148437500000
-building_state_24x24.tga 0.976562500000 0.148437500000 1.000000000000 0.171875000000
-ico_ammo_bullet.tga 0.976562500000 0.171875000000 1.000000000000 0.195312500000
-ico_ammo_jacket.tga 0.976562500000 0.195312500000 1.000000000000 0.218750000000
-ico_angle.tga 0.976562500000 0.218750000000 1.000000000000 0.242187500000
-ico_anti_magic_shield.tga 0.976562500000 0.242187500000 1.000000000000 0.265625000000
-ico_armor.tga 0.976562500000 0.265625000000 1.000000000000 0.289062500000
-ico_armor_clip.tga 0.976562500000 0.289062500000 1.000000000000 0.312500000000
-ico_armor_heavy.tga 0.976562500000 0.312500000000 1.000000000000 0.335937500000
-ico_armor_kitin.tga 0.976562500000 0.335937500000 1.000000000000 0.359375000000
-ico_armor_light.tga 0.976562500000 0.359375000000 1.000000000000 0.382812500000
-ico_armor_medium.tga 0.976562500000 0.382812500000 1.000000000000 0.406250000000
-ico_armor_penalty.tga 0.976562500000 0.406250000000 1.000000000000 0.429687500000
-ico_armor_shell.tga 0.976562500000 0.429687500000 1.000000000000 0.453125000000
-ico_atys.tga 0.976562500000 0.453125000000 1.000000000000 0.476562500000
-ico_atysian.tga 0.960937500000 0.476562500000 0.984375000000 0.500000000000
-ico_balance_hp.tga 0.929687500000 0.492187500000 0.953125000000 0.515625000000
-ico_barrel.tga 0.742187500000 0.500000000000 0.765625000000 0.523437500000
-ico_bash.tga 0.765625000000 0.500000000000 0.789062500000 0.523437500000
-ico_berserk.tga 0.789062500000 0.500000000000 0.812500000000 0.523437500000
-ico_blade.tga 0.812500000000 0.500000000000 0.835937500000 0.523437500000
-ico_bleeding.tga 0.835937500000 0.500000000000 0.859375000000 0.523437500000
-ico_blind.tga 0.859375000000 0.500000000000 0.882812500000 0.523437500000
-ico_blunt.tga 0.882812500000 0.500000000000 0.906250000000 0.523437500000
-ico_bomb.tga 0.906250000000 0.500000000000 0.929687500000 0.523437500000
-cb_main_nue.tga 0.953125000000 0.500000000000 0.976562500000 0.523437500000
-ico_celestial.tga 0.976562500000 0.500000000000 1.000000000000 0.523437500000
-ico_circular_attack.tga 0.000000000000 0.507812500000 0.023437500000 0.531250000000
-ico_clothes.tga 0.023437500000 0.507812500000 0.046875000000 0.531250000000
-ico_cold.tga 0.046875000000 0.507812500000 0.070312500000 0.531250000000
-ico_concentration.tga 0.070312500000 0.507812500000 0.093750000000 0.531250000000
-BK_matis_brick.tga 0.093750000000 0.507812500000 0.117187500000 0.531250000000
-ico_constitution.tga 0.117187500000 0.507812500000 0.140625000000 0.531250000000
-ico_counterweight.tga 0.140625000000 0.507812500000 0.164062500000 0.531250000000
-ico_craft_buff.tga 0.164062500000 0.507812500000 0.187500000000 0.531250000000
-ico_create_sapload.tga 0.187500000000 0.507812500000 0.210937500000 0.531250000000
-ico_curse.tga 0.210937500000 0.507812500000 0.234375000000 0.531250000000
-ico_debuff.tga 0.234375000000 0.507812500000 0.257812500000 0.531250000000
-ico_debuff_resist.tga 0.257812500000 0.507812500000 0.281250000000 0.531250000000
-ico_debuff_skill.tga 0.281250000000 0.507812500000 0.304687500000 0.531250000000
-ico_desert.tga 0.304687500000 0.507812500000 0.328125000000 0.531250000000
-ico_dexterity.tga 0.328125000000 0.507812500000 0.351562500000 0.531250000000
-ico_disarm.tga 0.351562500000 0.507812500000 0.375000000000 0.531250000000
-ico_dodge.tga 0.375000000000 0.507812500000 0.398437500000 0.531250000000
-ico_dot.tga 0.398437500000 0.507812500000 0.421875000000 0.531250000000
-ico_durability.tga 0.421875000000 0.507812500000 0.445312500000 0.531250000000
-ico_electric.tga 0.445312500000 0.507812500000 0.468750000000 0.531250000000
-ico_explosif.tga 0.468750000000 0.507812500000 0.492187500000 0.531250000000
-ico_extracting.tga 0.492187500000 0.507812500000 0.515625000000 0.531250000000
-ico_fear.tga 0.515625000000 0.507812500000 0.539062500000 0.531250000000
-ico_feint.tga 0.539062500000 0.507812500000 0.562500000000 0.531250000000
-ico_fire.tga 0.562500000000 0.507812500000 0.585937500000 0.531250000000
-ico_firing_pin.tga 0.585937500000 0.507812500000 0.609375000000 0.531250000000
-ch_back.tga 0.609375000000 0.507812500000 0.632812500000 0.531250000000
-BK_generic_brick.tga 0.632812500000 0.507812500000 0.656250000000 0.531250000000
-mp_over_link.tga 0.656250000000 0.507812500000 0.679687500000 0.531250000000
-bk_aura.tga 0.679687500000 0.507812500000 0.703125000000 0.531250000000
-bk_conso.tga 0.703125000000 0.507812500000 0.726562500000 0.531250000000
-bk_outpost_brick.tga 0.929687500000 0.515625000000 0.953125000000 0.539062500000
-bk_power.tga 0.726562500000 0.523437500000 0.750000000000 0.546875000000
-ico_focus.tga 0.750000000000 0.523437500000 0.773437500000 0.546875000000
-ico_forage_buff.tga 0.773437500000 0.523437500000 0.796875000000 0.546875000000
-ico_forbid_item.tga 0.796875000000 0.523437500000 0.820312500000 0.546875000000
-ico_forest.tga 0.820312500000 0.523437500000 0.843750000000 0.546875000000
-2h_over.tga 0.843750000000 0.523437500000 0.867187500000 0.546875000000
-ico_gardening.tga 0.867187500000 0.523437500000 0.890625000000 0.546875000000
-ico_gentle.tga 0.890625000000 0.523437500000 0.914062500000 0.546875000000
-ico_goo.tga 0.953125000000 0.523437500000 0.976562500000 0.546875000000
-ico_gripp.tga 0.976562500000 0.523437500000 1.000000000000 0.546875000000
-1h_over.tga 0.000000000000 0.531250000000 0.023437500000 0.554687500000
-BK_fyros_brick.tga 0.023437500000 0.531250000000 0.046875000000 0.554687500000
-ico_hammer.tga 0.046875000000 0.531250000000 0.070312500000 0.554687500000
-ico_harmful.tga 0.070312500000 0.531250000000 0.093750000000 0.554687500000
-ico_hatred.tga 0.093750000000 0.531250000000 0.117187500000 0.554687500000
-ico_heal.tga 0.117187500000 0.531250000000 0.140625000000 0.554687500000
-ico_hit_rate.tga 0.140625000000 0.531250000000 0.164062500000 0.554687500000
-ico_incapacity.tga 0.164062500000 0.531250000000 0.187500000000 0.554687500000
-ico_intelligence.tga 0.187500000000 0.531250000000 0.210937500000 0.554687500000
-ico_interrupt.tga 0.210937500000 0.531250000000 0.234375000000 0.554687500000
-ico_invulnerability.tga 0.234375000000 0.531250000000 0.257812500000 0.554687500000
-ico_jewel_stone.tga 0.257812500000 0.531250000000 0.281250000000 0.554687500000
-ico_jewel_stone_support.tga 0.281250000000 0.531250000000 0.304687500000 0.554687500000
-ico_jungle.tga 0.304687500000 0.531250000000 0.328125000000 0.554687500000
-ico_lacustre.tga 0.328125000000 0.531250000000 0.351562500000 0.554687500000
-ico_landmark_bonus.tga 0.351562500000 0.531250000000 0.375000000000 0.554687500000
-ico_level.tga 0.375000000000 0.531250000000 0.398437500000 0.554687500000
-ico_lining.tga 0.398437500000 0.531250000000 0.421875000000 0.554687500000
-ico_location.tga 0.421875000000 0.531250000000 0.445312500000 0.554687500000
-ico_madness.tga 0.445312500000 0.531250000000 0.468750000000 0.554687500000
-ico_magic.tga 0.468750000000 0.531250000000 0.492187500000 0.554687500000
-ico_magic_action_buff.tga 0.492187500000 0.531250000000 0.515625000000 0.554687500000
-ico_magic_focus.tga 0.515625000000 0.531250000000 0.539062500000 0.554687500000
-ico_magic_target_buff.tga 0.539062500000 0.531250000000 0.562500000000 0.554687500000
-ico_melee_action_buff.tga 0.562500000000 0.531250000000 0.585937500000 0.554687500000
-ico_melee_target_buff.tga 0.585937500000 0.531250000000 0.609375000000 0.554687500000
-ico_mental.tga 0.609375000000 0.531250000000 0.632812500000 0.554687500000
-no_action.tga 0.632812500000 0.531250000000 0.656250000000 0.554687500000
-op_back.tga 0.656250000000 0.531250000000 0.679687500000 0.554687500000
-op_over_break.tga 0.679687500000 0.531250000000 0.703125000000 0.554687500000
-op_over_less.tga 0.703125000000 0.531250000000 0.726562500000 0.554687500000
-op_over_more.tga 0.914062500000 0.539062500000 0.937500000000 0.562500000000
-ico_metabolism.tga 0.726562500000 0.546875000000 0.750000000000 0.570312500000
-pa_back.tga 0.750000000000 0.546875000000 0.773437500000 0.570312500000
-ico_mezz.tga 0.773437500000 0.546875000000 0.796875000000 0.570312500000
-ico_misfortune.tga 0.796875000000 0.546875000000 0.820312500000 0.570312500000
-BK_magie_noire_brick.tga 0.820312500000 0.546875000000 0.843750000000 0.570312500000
-pa_over_break.tga 0.843750000000 0.546875000000 0.867187500000 0.570312500000
-pa_over_less.tga 0.867187500000 0.546875000000 0.890625000000 0.570312500000
-pa_over_more.tga 0.890625000000 0.546875000000 0.914062500000 0.570312500000
-BK_tryker_brick.tga 0.937500000000 0.546875000000 0.960937500000 0.570312500000
-cp_back.tga 0.960937500000 0.546875000000 0.984375000000 0.570312500000
-cp_over_break.tga 0.000000000000 0.554687500000 0.023437500000 0.578125000000
-pvp_ally_0.tga 0.023437500000 0.554687500000 0.046875000000 0.578125000000
-pvp_ally_1.tga 0.046875000000 0.554687500000 0.070312500000 0.578125000000
-pvp_ally_2.tga 0.070312500000 0.554687500000 0.093750000000 0.578125000000
-pvp_ally_3.tga 0.093750000000 0.554687500000 0.117187500000 0.578125000000
-pvp_ally_4.tga 0.117187500000 0.554687500000 0.140625000000 0.578125000000
-pvp_ally_6.tga 0.140625000000 0.554687500000 0.164062500000 0.578125000000
-pvp_ally_primas.tga 0.164062500000 0.554687500000 0.187500000000 0.578125000000
-pvp_ally_ranger.tga 0.187500000000 0.554687500000 0.210937500000 0.578125000000
-cp_over_less.tga 0.210937500000 0.554687500000 0.234375000000 0.578125000000
-cp_over_more.tga 0.234375000000 0.554687500000 0.257812500000 0.578125000000
-cp_over_opening.tga 0.257812500000 0.554687500000 0.281250000000 0.578125000000
-cp_over_opening_2.tga 0.281250000000 0.554687500000 0.304687500000 0.578125000000
-pvp_enemy_0.tga 0.304687500000 0.554687500000 0.328125000000 0.578125000000
-pvp_enemy_1.tga 0.328125000000 0.554687500000 0.351562500000 0.578125000000
-pvp_enemy_2.tga 0.351562500000 0.554687500000 0.375000000000 0.578125000000
-pvp_enemy_3.tga 0.375000000000 0.554687500000 0.398437500000 0.578125000000
-pvp_enemy_4.tga 0.398437500000 0.554687500000 0.421875000000 0.578125000000
-pvp_enemy_6.tga 0.421875000000 0.554687500000 0.445312500000 0.578125000000
-pvp_enemy_marauder.tga 0.445312500000 0.554687500000 0.468750000000 0.578125000000
-pvp_enemy_trytonist.tga 0.468750000000 0.554687500000 0.492187500000 0.578125000000
-bg_downloader.tga 0.492187500000 0.554687500000 0.515625000000 0.578125000000
-BK_zorai_brick.tga 0.515625000000 0.554687500000 0.539062500000 0.578125000000
-ef_back.tga 0.539062500000 0.554687500000 0.562500000000 0.578125000000
-ef_over_break.tga 0.562500000000 0.554687500000 0.585937500000 0.578125000000
-ico_move.tga 0.585937500000 0.554687500000 0.609375000000 0.578125000000
-ico_multiple_spots.tga 0.609375000000 0.554687500000 0.632812500000 0.578125000000
-ico_multi_fight.tga 0.632812500000 0.554687500000 0.656250000000 0.578125000000
-ef_over_less.tga 0.656250000000 0.554687500000 0.679687500000 0.578125000000
-ico_opening_hit.tga 0.679687500000 0.554687500000 0.703125000000 0.578125000000
-ico_over_autumn.tga 0.703125000000 0.554687500000 0.726562500000 0.578125000000
-ico_over_degenerated.tga 0.914062500000 0.562500000000 0.937500000000 0.585937500000
-ico_over_fauna.tga 0.726562500000 0.570312500000 0.750000000000 0.593750000000
-ico_over_flora.tga 0.750000000000 0.570312500000 0.773437500000 0.593750000000
-ico_over_hit_arms.tga 0.773437500000 0.570312500000 0.796875000000 0.593750000000
-ico_over_hit_chest.tga 0.796875000000 0.570312500000 0.820312500000 0.593750000000
-ico_over_hit_feet.tga 0.820312500000 0.570312500000 0.843750000000 0.593750000000
-ico_over_hit_feet_hands.tga 0.843750000000 0.570312500000 0.867187500000 0.593750000000
-ico_over_hit_feet_head.tga 0.867187500000 0.570312500000 0.890625000000 0.593750000000
-ico_over_hit_feet_x2.tga 0.890625000000 0.570312500000 0.914062500000 0.593750000000
-ico_over_hit_feint_x3.tga 0.937500000000 0.570312500000 0.960937500000 0.593750000000
-ico_over_hit_hands.tga 0.960937500000 0.570312500000 0.984375000000 0.593750000000
-ico_over_hit_hands_chest.tga 0.000000000000 0.578125000000 0.023437500000 0.601562500000
-ico_over_hit_hands_head.tga 0.023437500000 0.578125000000 0.046875000000 0.601562500000
-ico_over_hit_head.tga 0.046875000000 0.578125000000 0.070312500000 0.601562500000
-ico_over_hit_head_x3.tga 0.070312500000 0.578125000000 0.093750000000 0.601562500000
-ico_over_hit_legs.tga 0.093750000000 0.578125000000 0.117187500000 0.601562500000
-ico_over_homin.tga 0.117187500000 0.578125000000 0.140625000000 0.601562500000
-ico_over_kitin.tga 0.140625000000 0.578125000000 0.164062500000 0.601562500000
-ico_over_magic.tga 0.164062500000 0.578125000000 0.187500000000 0.601562500000
-ico_over_melee.tga 0.187500000000 0.578125000000 0.210937500000 0.601562500000
-ico_over_racial.tga 0.210937500000 0.578125000000 0.234375000000 0.601562500000
-ico_over_range.tga 0.234375000000 0.578125000000 0.257812500000 0.601562500000
-ico_over_special.tga 0.257812500000 0.578125000000 0.281250000000 0.601562500000
-ico_over_spring.tga 0.281250000000 0.578125000000 0.304687500000 0.601562500000
-ico_over_summer.tga 0.304687500000 0.578125000000 0.328125000000 0.601562500000
-ico_over_winter.tga 0.328125000000 0.578125000000 0.351562500000 0.601562500000
-ico_parry.tga 0.351562500000 0.578125000000 0.375000000000 0.601562500000
-ico_piercing.tga 0.375000000000 0.578125000000 0.398437500000 0.601562500000
-ico_pointe.tga 0.398437500000 0.578125000000 0.421875000000 0.601562500000
-ico_poison.tga 0.421875000000 0.578125000000 0.445312500000 0.601562500000
-ico_power.tga 0.445312500000 0.578125000000 0.468750000000 0.601562500000
-ico_preservation.tga 0.468750000000 0.578125000000 0.492187500000 0.601562500000
-ico_primal.tga 0.492187500000 0.578125000000 0.515625000000 0.601562500000
-ico_prime_roots.tga 0.515625000000 0.578125000000 0.539062500000 0.601562500000
-ico_private.tga 0.539062500000 0.578125000000 0.562500000000 0.601562500000
-ico_prospecting.tga 0.562500000000 0.578125000000 0.585937500000 0.601562500000
-ico_quality.tga 0.585937500000 0.578125000000 0.609375000000 0.601562500000
-ef_over_more.tga 0.609375000000 0.578125000000 0.632812500000 0.601562500000
-ico_range.tga 0.632812500000 0.578125000000 0.656250000000 0.601562500000
-ico_range_action_buff.tga 0.656250000000 0.578125000000 0.679687500000 0.601562500000
-ico_range_target_buff.tga 0.679687500000 0.578125000000 0.703125000000 0.601562500000
-ico_ricochet.tga 0.703125000000 0.578125000000 0.726562500000 0.601562500000
-ico_root.tga 0.914062500000 0.585937500000 0.937500000000 0.609375000000
-ico_rot.tga 0.726562500000 0.593750000000 0.750000000000 0.617187500000
-ico_safe.tga 0.750000000000 0.593750000000 0.773437500000 0.617187500000
-ico_sap.tga 0.773437500000 0.593750000000 0.796875000000 0.617187500000
-ico_self_damage.tga 0.796875000000 0.593750000000 0.820312500000 0.617187500000
-ico_shaft.tga 0.820312500000 0.593750000000 0.843750000000 0.617187500000
-ico_shielding.tga 0.843750000000 0.593750000000 0.867187500000 0.617187500000
-ico_shield_buff.tga 0.867187500000 0.593750000000 0.890625000000 0.617187500000
-ico_shield_up.tga 0.890625000000 0.593750000000 0.914062500000 0.617187500000
-ico_shockwave.tga 0.937500000000 0.593750000000 0.960937500000 0.617187500000
-ico_sickness.tga 0.960937500000 0.593750000000 0.984375000000 0.617187500000
-ico_slashing.tga 0.000000000000 0.601562500000 0.023437500000 0.625000000000
-ico_slow.tga 0.023437500000 0.601562500000 0.046875000000 0.625000000000
-ico_soft_spot.tga 0.046875000000 0.601562500000 0.070312500000 0.625000000000
-ico_source_time.tga 0.070312500000 0.601562500000 0.093750000000 0.625000000000
-ico_speed.tga 0.093750000000 0.601562500000 0.117187500000 0.625000000000
-ico_speeding_up.tga 0.117187500000 0.601562500000 0.140625000000 0.625000000000
-ico_spell_break.tga 0.140625000000 0.601562500000 0.164062500000 0.625000000000
-fo_back.tga 0.164062500000 0.601562500000 0.187500000000 0.625000000000
-ico_spray.tga 0.187500000000 0.601562500000 0.210937500000 0.625000000000
-ico_spying.tga 0.210937500000 0.601562500000 0.234375000000 0.625000000000
-ico_stamina.tga 0.234375000000 0.601562500000 0.257812500000 0.625000000000
-ico_strength.tga 0.257812500000 0.601562500000 0.281250000000 0.625000000000
-ico_stuffing.tga 0.281250000000 0.601562500000 0.304687500000 0.625000000000
-ico_stunn.tga 0.304687500000 0.601562500000 0.328125000000 0.625000000000
-fo_over.tga 0.328125000000 0.601562500000 0.351562500000 0.625000000000
-fp_ammo.tga 0.351562500000 0.601562500000 0.375000000000 0.625000000000
-fp_armor.tga 0.375000000000 0.601562500000 0.398437500000 0.625000000000
-fp_building.tga 0.398437500000 0.601562500000 0.421875000000 0.625000000000
-fp_jewel.tga 0.421875000000 0.601562500000 0.445312500000 0.625000000000
-fp_melee.tga 0.445312500000 0.601562500000 0.468750000000 0.625000000000
-fp_over.tga 0.468750000000 0.601562500000 0.492187500000 0.625000000000
-fp_range.tga 0.492187500000 0.601562500000 0.515625000000 0.625000000000
-fp_shield.tga 0.515625000000 0.601562500000 0.539062500000 0.625000000000
-fp_tools.tga 0.539062500000 0.601562500000 0.562500000000 0.625000000000
-brick_default.tga 0.562500000000 0.601562500000 0.585937500000 0.625000000000
-ico_taunt.tga 0.585937500000 0.601562500000 0.609375000000 0.625000000000
-tb_action_attack.tga 0.609375000000 0.601562500000 0.632812500000 0.625000000000
-tb_action_config.tga 0.632812500000 0.601562500000 0.656250000000 0.625000000000
-tb_action_disband.tga 0.656250000000 0.601562500000 0.679687500000 0.625000000000
-tb_action_disengage.tga 0.679687500000 0.601562500000 0.703125000000 0.625000000000
-tb_action_extract.tga 0.703125000000 0.601562500000 0.726562500000 0.625000000000
-tb_action_invite.tga 0.914062500000 0.609375000000 0.937500000000 0.632812500000
-tb_action_kick.tga 0.726562500000 0.617187500000 0.750000000000 0.640625000000
-tb_action_move.tga 0.750000000000 0.617187500000 0.773437500000 0.640625000000
-tb_action_run.tga 0.773437500000 0.617187500000 0.796875000000 0.640625000000
-tb_action_sit.tga 0.796875000000 0.617187500000 0.820312500000 0.640625000000
-tb_action_stand.tga 0.820312500000 0.617187500000 0.843750000000 0.640625000000
-tb_action_stop.tga 0.843750000000 0.617187500000 0.867187500000 0.640625000000
-tb_action_talk.tga 0.867187500000 0.617187500000 0.890625000000 0.640625000000
-tb_action_walk.tga 0.890625000000 0.617187500000 0.914062500000 0.640625000000
-tb_animals.tga 0.937500000000 0.617187500000 0.960937500000 0.640625000000
-tb_config.tga 0.960937500000 0.617187500000 0.984375000000 0.640625000000
-tb_connection.tga 0.000000000000 0.625000000000 0.023437500000 0.648437500000
-tb_contacts.tga 0.023437500000 0.625000000000 0.046875000000 0.648437500000
-tb_desk_1.tga 0.046875000000 0.625000000000 0.070312500000 0.648437500000
-tb_desk_2.tga 0.070312500000 0.625000000000 0.093750000000 0.648437500000
-tb_desk_3.tga 0.093750000000 0.625000000000 0.117187500000 0.648437500000
-tb_desk_4.tga 0.117187500000 0.625000000000 0.140625000000 0.648437500000
-tb_faction.tga 0.140625000000 0.625000000000 0.164062500000 0.648437500000
-tb_forum.tga 0.164062500000 0.625000000000 0.187500000000 0.648437500000
-tb_guild.tga 0.187500000000 0.625000000000 0.210937500000 0.648437500000
-TB_help2.tga 0.210937500000 0.625000000000 0.234375000000 0.648437500000
-tb_keys.tga 0.234375000000 0.625000000000 0.257812500000 0.648437500000
-tb_macros.tga 0.257812500000 0.625000000000 0.281250000000 0.648437500000
-tb_mail.tga 0.281250000000 0.625000000000 0.304687500000 0.648437500000
-tb_mode_dodge.tga 0.304687500000 0.625000000000 0.328125000000 0.648437500000
-tb_mode_parry.tga 0.328125000000 0.625000000000 0.351562500000 0.648437500000
-tb_over.tga 0.351562500000 0.625000000000 0.375000000000 0.648437500000
-tb_support.tga 0.375000000000 0.625000000000 0.398437500000 0.648437500000
-tb_team.tga 0.398437500000 0.625000000000 0.421875000000 0.648437500000
-tb_windows.tga 0.421875000000 0.625000000000 0.445312500000 0.648437500000
-ico_time.tga 0.445312500000 0.625000000000 0.468750000000 0.648437500000
-ico_time_bonus.tga 0.468750000000 0.625000000000 0.492187500000 0.648437500000
-ico_absorb_damage.tga 0.492187500000 0.625000000000 0.515625000000 0.648437500000
-ico_trigger.tga 0.515625000000 0.625000000000 0.539062500000 0.648437500000
-ico_umbrella.tga 0.539062500000 0.625000000000 0.562500000000 0.648437500000
-ico_use_enchantement.tga 0.562500000000 0.625000000000 0.585937500000 0.648437500000
-ico_vampire.tga 0.585937500000 0.625000000000 0.609375000000 0.648437500000
-ico_visibility.tga 0.609375000000 0.625000000000 0.632812500000 0.648437500000
-ico_war_cry.tga 0.632812500000 0.625000000000 0.656250000000 0.648437500000
-ico_weight.tga 0.656250000000 0.625000000000 0.679687500000 0.648437500000
-ico_wellbalanced.tga 0.679687500000 0.625000000000 0.703125000000 0.648437500000
-ico_will.tga 0.703125000000 0.625000000000 0.726562500000 0.648437500000
-ico_windding.tga 0.914062500000 0.632812500000 0.937500000000 0.656250000000
-ico_wisdom.tga 0.726562500000 0.640625000000 0.750000000000 0.664062500000
-ico_accurate.tga 0.750000000000 0.640625000000 0.773437500000 0.664062500000
-ico_acid.tga 0.773437500000 0.640625000000 0.796875000000 0.664062500000
-ico_aim.tga 0.796875000000 0.640625000000 0.820312500000 0.664062500000
-ico_aim_bird_wings.tga 0.820312500000 0.640625000000 0.843750000000 0.664062500000
-ico_aim_flying_kitin_abdomen.tga 0.843750000000 0.640625000000 0.867187500000 0.664062500000
-ico_aim_homin_arms.tga 0.867187500000 0.640625000000 0.890625000000 0.664062500000
-ico_aim_homin_chest.tga 0.890625000000 0.640625000000 0.914062500000 0.664062500000
-mf_back.tga 0.937500000000 0.640625000000 0.960937500000 0.664062500000
-us_back_0.tga 0.960937500000 0.640625000000 0.984375000000 0.664062500000
-us_back_1.tga 0.000000000000 0.648437500000 0.023437500000 0.671875000000
-us_back_2.tga 0.023437500000 0.648437500000 0.046875000000 0.671875000000
-us_back_3.tga 0.046875000000 0.648437500000 0.070312500000 0.671875000000
-us_back_4.tga 0.070312500000 0.648437500000 0.093750000000 0.671875000000
-us_back_5.tga 0.093750000000 0.648437500000 0.117187500000 0.671875000000
-us_back_6.tga 0.117187500000 0.648437500000 0.140625000000 0.671875000000
-us_back_7.tga 0.140625000000 0.648437500000 0.164062500000 0.671875000000
-us_back_8.tga 0.164062500000 0.648437500000 0.187500000000 0.671875000000
-us_back_9.tga 0.187500000000 0.648437500000 0.210937500000 0.671875000000
-us_ico_0.tga 0.210937500000 0.648437500000 0.234375000000 0.671875000000
-us_ico_1.tga 0.234375000000 0.648437500000 0.257812500000 0.671875000000
-us_ico_2.tga 0.257812500000 0.648437500000 0.281250000000 0.671875000000
-us_ico_3.tga 0.281250000000 0.648437500000 0.304687500000 0.671875000000
-us_ico_4.tga 0.304687500000 0.648437500000 0.328125000000 0.671875000000
-us_ico_5.tga 0.328125000000 0.648437500000 0.351562500000 0.671875000000
-us_ico_6.tga 0.351562500000 0.648437500000 0.375000000000 0.671875000000
-us_ico_7.tga 0.375000000000 0.648437500000 0.398437500000 0.671875000000
-us_ico_8.tga 0.398437500000 0.648437500000 0.421875000000 0.671875000000
-us_ico_9.tga 0.421875000000 0.648437500000 0.445312500000 0.671875000000
-us_over_0.tga 0.445312500000 0.648437500000 0.468750000000 0.671875000000
-us_over_1.tga 0.468750000000 0.648437500000 0.492187500000 0.671875000000
-us_over_2.tga 0.492187500000 0.648437500000 0.515625000000 0.671875000000
-us_over_3.tga 0.515625000000 0.648437500000 0.539062500000 0.671875000000
-us_over_4.tga 0.539062500000 0.648437500000 0.562500000000 0.671875000000
-mf_over.tga 0.562500000000 0.648437500000 0.585937500000 0.671875000000
-ico_aim_homin_feet.tga 0.585937500000 0.648437500000 0.609375000000 0.671875000000
-ico_aim_homin_feint.tga 0.609375000000 0.648437500000 0.632812500000 0.671875000000
-ico_aim_homin_hands.tga 0.632812500000 0.648437500000 0.656250000000 0.671875000000
-ico_aim_homin_head.tga 0.656250000000 0.648437500000 0.679687500000 0.671875000000
-ico_aim_homin_legs.tga 0.679687500000 0.648437500000 0.703125000000 0.671875000000
-mp3.tga 0.703125000000 0.648437500000 0.726562500000 0.671875000000
-W_slot_shortcut_id0.tga 0.914062500000 0.656250000000 0.937500000000 0.679687500000
-W_slot_shortcut_id1.tga 0.726562500000 0.664062500000 0.750000000000 0.687500000000
-W_slot_shortcut_id2.tga 0.750000000000 0.664062500000 0.773437500000 0.687500000000
-W_slot_shortcut_id3.tga 0.773437500000 0.664062500000 0.796875000000 0.687500000000
-W_slot_shortcut_id4.tga 0.796875000000 0.664062500000 0.820312500000 0.687500000000
-W_slot_shortcut_id5.tga 0.820312500000 0.664062500000 0.843750000000 0.687500000000
-W_slot_shortcut_id6.tga 0.843750000000 0.664062500000 0.867187500000 0.687500000000
-W_slot_shortcut_id7.tga 0.867187500000 0.664062500000 0.890625000000 0.687500000000
-W_slot_shortcut_id8.tga 0.890625000000 0.664062500000 0.914062500000 0.687500000000
-W_slot_shortcut_id9.tga 0.937500000000 0.664062500000 0.960937500000 0.687500000000
-w_slot_shortcut_shift_id0.tga 0.960937500000 0.664062500000 0.984375000000 0.687500000000
-w_slot_shortcut_shift_id1.tga 0.000000000000 0.671875000000 0.023437500000 0.695312500000
-w_slot_shortcut_shift_id2.tga 0.023437500000 0.671875000000 0.046875000000 0.695312500000
-w_slot_shortcut_shift_id3.tga 0.046875000000 0.671875000000 0.070312500000 0.695312500000
-w_slot_shortcut_shift_id4.tga 0.070312500000 0.671875000000 0.093750000000 0.695312500000
-w_slot_shortcut_shift_id5.tga 0.093750000000 0.671875000000 0.117187500000 0.695312500000
-w_slot_shortcut_shift_id6.tga 0.117187500000 0.671875000000 0.140625000000 0.695312500000
-w_slot_shortcut_shift_id7.tga 0.140625000000 0.671875000000 0.164062500000 0.695312500000
-w_slot_shortcut_shift_id8.tga 0.164062500000 0.671875000000 0.187500000000 0.695312500000
-w_slot_shortcut_shift_id9.tga 0.187500000000 0.671875000000 0.210937500000 0.695312500000
-ico_aim_kitin_head.tga 0.210937500000 0.671875000000 0.234375000000 0.695312500000
-ico_source_knowledge.tga 0.234375000000 0.671875000000 0.255859375000 0.695312500000
+ico_taunt.tga 0.976562500000 0.078125000000 1.000000000000 0.101562500000
+BK_generic_brick.tga 0.976562500000 0.101562500000 1.000000000000 0.125000000000
+bk_aura.tga 0.976562500000 0.125000000000 1.000000000000 0.148437500000
+bk_outpost_brick.tga 0.976562500000 0.148437500000 1.000000000000 0.171875000000
+bk_power.tga 0.976562500000 0.171875000000 1.000000000000 0.195312500000
+no_action.tga 0.976562500000 0.195312500000 1.000000000000 0.218750000000
+no_pvp.tga 0.976562500000 0.218750000000 1.000000000000 0.242187500000
+op_back.tga 0.976562500000 0.242187500000 1.000000000000 0.265625000000
+op_over_break.tga 0.976562500000 0.265625000000 1.000000000000 0.289062500000
+op_over_less.tga 0.976562500000 0.289062500000 1.000000000000 0.312500000000
+op_over_more.tga 0.976562500000 0.312500000000 1.000000000000 0.335937500000
+bk_conso.tga 0.976562500000 0.335937500000 1.000000000000 0.359375000000
+pa_back.tga 0.976562500000 0.359375000000 1.000000000000 0.382812500000
+2h_over.tga 0.976562500000 0.382812500000 1.000000000000 0.406250000000
+1h_over.tga 0.976562500000 0.406250000000 1.000000000000 0.429687500000
+pvp_duel.tga 0.976562500000 0.429687500000 1.000000000000 0.453125000000
+pvp_enemy_0.tga 0.976562500000 0.453125000000 1.000000000000 0.476562500000
+pvp_enemy_1.tga 0.960937500000 0.476562500000 0.984375000000 0.500000000000
+pvp_enemy_2.tga 0.929687500000 0.492187500000 0.953125000000 0.515625000000
+pvp_enemy_3.tga 0.742187500000 0.500000000000 0.765625000000 0.523437500000
+pvp_enemy_4.tga 0.765625000000 0.500000000000 0.789062500000 0.523437500000
+pvp_enemy_6.tga 0.789062500000 0.500000000000 0.812500000000 0.523437500000
+pvp_enemy_flag.tga 0.812500000000 0.500000000000 0.835937500000 0.523437500000
+pvp_enemy_marauder.tga 0.835937500000 0.500000000000 0.859375000000 0.523437500000
+pvp_enemy_tag.tga 0.859375000000 0.500000000000 0.882812500000 0.523437500000
+tb_action_attack.tga 0.882812500000 0.500000000000 0.906250000000 0.523437500000
+tb_action_config.tga 0.906250000000 0.500000000000 0.929687500000 0.523437500000
+tb_action_disband.tga 0.953125000000 0.500000000000 0.976562500000 0.523437500000
+tb_action_disengage.tga 0.976562500000 0.500000000000 1.000000000000 0.523437500000
+tb_action_extract.tga 0.000000000000 0.507812500000 0.023437500000 0.531250000000
+tb_action_invite.tga 0.023437500000 0.507812500000 0.046875000000 0.531250000000
+tb_action_kick.tga 0.046875000000 0.507812500000 0.070312500000 0.531250000000
+tb_action_move.tga 0.070312500000 0.507812500000 0.093750000000 0.531250000000
+tb_action_run.tga 0.093750000000 0.507812500000 0.117187500000 0.531250000000
+tb_action_sit.tga 0.117187500000 0.507812500000 0.140625000000 0.531250000000
+tb_action_stand.tga 0.140625000000 0.507812500000 0.164062500000 0.531250000000
+tb_action_stop.tga 0.164062500000 0.507812500000 0.187500000000 0.531250000000
+tb_action_talk.tga 0.187500000000 0.507812500000 0.210937500000 0.531250000000
+tb_action_walk.tga 0.210937500000 0.507812500000 0.234375000000 0.531250000000
+ico_armor_penalty.tga 0.234375000000 0.507812500000 0.257812500000 0.531250000000
+ico_armor_shell.tga 0.257812500000 0.507812500000 0.281250000000 0.531250000000
+ico_atys.tga 0.281250000000 0.507812500000 0.304687500000 0.531250000000
+ico_atysian.tga 0.304687500000 0.507812500000 0.328125000000 0.531250000000
+ico_balance_hp.tga 0.328125000000 0.507812500000 0.351562500000 0.531250000000
+ico_barrel.tga 0.351562500000 0.507812500000 0.375000000000 0.531250000000
+ico_bash.tga 0.375000000000 0.507812500000 0.398437500000 0.531250000000
+ico_berserk.tga 0.398437500000 0.507812500000 0.421875000000 0.531250000000
+ico_blade.tga 0.421875000000 0.507812500000 0.445312500000 0.531250000000
+ico_bleeding.tga 0.445312500000 0.507812500000 0.468750000000 0.531250000000
+ico_blind.tga 0.468750000000 0.507812500000 0.492187500000 0.531250000000
+ico_blunt.tga 0.492187500000 0.507812500000 0.515625000000 0.531250000000
+ico_bomb.tga 0.515625000000 0.507812500000 0.539062500000 0.531250000000
+pvp_enemy_trytonist.tga 0.539062500000 0.507812500000 0.562500000000 0.531250000000
+ico_celestial.tga 0.562500000000 0.507812500000 0.585937500000 0.531250000000
+ico_circular_attack.tga 0.585937500000 0.507812500000 0.609375000000 0.531250000000
+ico_cold.tga 0.609375000000 0.507812500000 0.632812500000 0.531250000000
+ico_concentration.tga 0.632812500000 0.507812500000 0.656250000000 0.531250000000
+pvp_flag.tga 0.656250000000 0.507812500000 0.679687500000 0.531250000000
+ico_constitution.tga 0.679687500000 0.507812500000 0.703125000000 0.531250000000
+ico_counterweight.tga 0.703125000000 0.507812500000 0.726562500000 0.531250000000
+ico_craft_buff.tga 0.929687500000 0.515625000000 0.953125000000 0.539062500000
+ico_create_sapload.tga 0.726562500000 0.523437500000 0.750000000000 0.546875000000
+ico_curse.tga 0.750000000000 0.523437500000 0.773437500000 0.546875000000
+ico_debuff.tga 0.773437500000 0.523437500000 0.796875000000 0.546875000000
+ico_debuff_resist.tga 0.796875000000 0.523437500000 0.820312500000 0.546875000000
+ico_debuff_skill.tga 0.820312500000 0.523437500000 0.843750000000 0.546875000000
+ico_desert.tga 0.843750000000 0.523437500000 0.867187500000 0.546875000000
+ico_dexterity.tga 0.867187500000 0.523437500000 0.890625000000 0.546875000000
+ico_disarm.tga 0.890625000000 0.523437500000 0.914062500000 0.546875000000
+ico_dodge.tga 0.953125000000 0.523437500000 0.976562500000 0.546875000000
+ico_dot.tga 0.976562500000 0.523437500000 1.000000000000 0.546875000000
+ico_electric.tga 0.000000000000 0.531250000000 0.023437500000 0.554687500000
+ico_explosif.tga 0.023437500000 0.531250000000 0.046875000000 0.554687500000
+ico_extracting.tga 0.046875000000 0.531250000000 0.070312500000 0.554687500000
+ico_fear.tga 0.070312500000 0.531250000000 0.093750000000 0.554687500000
+ico_feint.tga 0.093750000000 0.531250000000 0.117187500000 0.554687500000
+ico_fire.tga 0.117187500000 0.531250000000 0.140625000000 0.554687500000
+ico_firing_pin.tga 0.140625000000 0.531250000000 0.164062500000 0.554687500000
+pvp_neutral.tga 0.164062500000 0.531250000000 0.187500000000 0.554687500000
+pvp_tag.tga 0.187500000000 0.531250000000 0.210937500000 0.554687500000
+BK_magie_noire_brick.tga 0.210937500000 0.531250000000 0.234375000000 0.554687500000
+cp_back.tga 0.234375000000 0.531250000000 0.257812500000 0.554687500000
+cp_over_break.tga 0.257812500000 0.531250000000 0.281250000000 0.554687500000
+cp_over_less.tga 0.281250000000 0.531250000000 0.304687500000 0.554687500000
+ico_focus.tga 0.304687500000 0.531250000000 0.328125000000 0.554687500000
+ico_forage_buff.tga 0.328125000000 0.531250000000 0.351562500000 0.554687500000
+ico_forbid_item.tga 0.351562500000 0.531250000000 0.375000000000 0.554687500000
+ico_forest.tga 0.375000000000 0.531250000000 0.398437500000 0.554687500000
+ico_jungle.tga 0.398437500000 0.531250000000 0.421875000000 0.554687500000
+ico_lacustre.tga 0.421875000000 0.531250000000 0.445312500000 0.554687500000
+ico_landmark_bonus.tga 0.445312500000 0.531250000000 0.468750000000 0.554687500000
+ico_level.tga 0.468750000000 0.531250000000 0.492187500000 0.554687500000
+ico_lining.tga 0.492187500000 0.531250000000 0.515625000000 0.554687500000
+ico_location.tga 0.515625000000 0.531250000000 0.539062500000 0.554687500000
+ico_madness.tga 0.539062500000 0.531250000000 0.562500000000 0.554687500000
+ico_magic.tga 0.562500000000 0.531250000000 0.585937500000 0.554687500000
+ico_magic_action_buff.tga 0.585937500000 0.531250000000 0.609375000000 0.554687500000
+ico_magic_focus.tga 0.609375000000 0.531250000000 0.632812500000 0.554687500000
+ico_magic_target_buff.tga 0.632812500000 0.531250000000 0.656250000000 0.554687500000
+ico_melee_action_buff.tga 0.656250000000 0.531250000000 0.679687500000 0.554687500000
+ico_melee_target_buff.tga 0.679687500000 0.531250000000 0.703125000000 0.554687500000
+ico_mental.tga 0.703125000000 0.531250000000 0.726562500000 0.554687500000
+ico_metabolism.tga 0.914062500000 0.539062500000 0.937500000000 0.562500000000
+ico_mezz.tga 0.726562500000 0.546875000000 0.750000000000 0.570312500000
+cp_over_more.tga 0.750000000000 0.546875000000 0.773437500000 0.570312500000
+cp_over_opening.tga 0.773437500000 0.546875000000 0.796875000000 0.570312500000
+tb_animals.tga 0.796875000000 0.546875000000 0.820312500000 0.570312500000
+cp_over_opening_2.tga 0.820312500000 0.546875000000 0.843750000000 0.570312500000
+us_back_9.tga 0.843750000000 0.546875000000 0.867187500000 0.570312500000
+BK_tryker_brick.tga 0.867187500000 0.546875000000 0.890625000000 0.570312500000
+ico_spray.tga 0.890625000000 0.546875000000 0.914062500000 0.570312500000
+ico_spying.tga 0.937500000000 0.546875000000 0.960937500000 0.570312500000
+ico_stamina.tga 0.960937500000 0.546875000000 0.984375000000 0.570312500000
+ico_strength.tga 0.000000000000 0.554687500000 0.023437500000 0.578125000000
+ico_stuffing.tga 0.023437500000 0.554687500000 0.046875000000 0.578125000000
+ico_stunn.tga 0.046875000000 0.554687500000 0.070312500000 0.578125000000
+ico_move.tga 0.070312500000 0.554687500000 0.093750000000 0.578125000000
+ico_multiple_spots.tga 0.093750000000 0.554687500000 0.117187500000 0.578125000000
+ico_multi_fight.tga 0.117187500000 0.554687500000 0.140625000000 0.578125000000
+ico_opening_hit.tga 0.140625000000 0.554687500000 0.164062500000 0.578125000000
+ico_over_autumn.tga 0.164062500000 0.554687500000 0.187500000000 0.578125000000
+ico_over_degenerated.tga 0.187500000000 0.554687500000 0.210937500000 0.578125000000
+ico_over_fauna.tga 0.210937500000 0.554687500000 0.234375000000 0.578125000000
+ico_over_flora.tga 0.234375000000 0.554687500000 0.257812500000 0.578125000000
+ico_over_hit_arms.tga 0.257812500000 0.554687500000 0.281250000000 0.578125000000
+ico_over_hit_chest.tga 0.281250000000 0.554687500000 0.304687500000 0.578125000000
+ico_over_hit_feet.tga 0.304687500000 0.554687500000 0.328125000000 0.578125000000
+ico_over_hit_feet_hands.tga 0.328125000000 0.554687500000 0.351562500000 0.578125000000
+ico_over_hit_feet_head.tga 0.351562500000 0.554687500000 0.375000000000 0.578125000000
+ico_over_hit_feet_x2.tga 0.375000000000 0.554687500000 0.398437500000 0.578125000000
+ico_over_hit_feint_x3.tga 0.398437500000 0.554687500000 0.421875000000 0.578125000000
+ico_over_hit_hands.tga 0.421875000000 0.554687500000 0.445312500000 0.578125000000
+ico_over_hit_hands_chest.tga 0.445312500000 0.554687500000 0.468750000000 0.578125000000
+ico_over_hit_hands_head.tga 0.468750000000 0.554687500000 0.492187500000 0.578125000000
+ico_over_hit_head.tga 0.492187500000 0.554687500000 0.515625000000 0.578125000000
+ico_over_hit_legs.tga 0.515625000000 0.554687500000 0.539062500000 0.578125000000
+ico_over_homin.tga 0.539062500000 0.554687500000 0.562500000000 0.578125000000
+ico_over_kitin.tga 0.562500000000 0.554687500000 0.585937500000 0.578125000000
+ico_over_magic.tga 0.585937500000 0.554687500000 0.609375000000 0.578125000000
+ico_over_melee.tga 0.609375000000 0.554687500000 0.632812500000 0.578125000000
+ico_over_racial.tga 0.632812500000 0.554687500000 0.656250000000 0.578125000000
+ico_over_range.tga 0.656250000000 0.554687500000 0.679687500000 0.578125000000
+ico_over_special.tga 0.679687500000 0.554687500000 0.703125000000 0.578125000000
+ico_over_spring.tga 0.703125000000 0.554687500000 0.726562500000 0.578125000000
+ico_over_summer.tga 0.914062500000 0.562500000000 0.937500000000 0.585937500000
+ico_over_winter.tga 0.726562500000 0.570312500000 0.750000000000 0.593750000000
+ico_parry.tga 0.750000000000 0.570312500000 0.773437500000 0.593750000000
+ico_piercing.tga 0.773437500000 0.570312500000 0.796875000000 0.593750000000
+ico_pointe.tga 0.796875000000 0.570312500000 0.820312500000 0.593750000000
+ico_poison.tga 0.820312500000 0.570312500000 0.843750000000 0.593750000000
+ico_power.tga 0.843750000000 0.570312500000 0.867187500000 0.593750000000
+ico_preservation.tga 0.867187500000 0.570312500000 0.890625000000 0.593750000000
+ico_prime_roots.tga 0.890625000000 0.570312500000 0.914062500000 0.593750000000
+ico_private.tga 0.937500000000 0.570312500000 0.960937500000 0.593750000000
+ico_prospecting.tga 0.960937500000 0.570312500000 0.984375000000 0.593750000000
+ico_quality.tga 0.000000000000 0.578125000000 0.023437500000 0.601562500000
+BK_fyros_brick.tga 0.023437500000 0.578125000000 0.046875000000 0.601562500000
+ico_range.tga 0.046875000000 0.578125000000 0.070312500000 0.601562500000
+ico_range_action_buff.tga 0.070312500000 0.578125000000 0.093750000000 0.601562500000
+ico_range_target_buff.tga 0.093750000000 0.578125000000 0.117187500000 0.601562500000
+ico_ricochet.tga 0.117187500000 0.578125000000 0.140625000000 0.601562500000
+ico_root.tga 0.140625000000 0.578125000000 0.164062500000 0.601562500000
+ico_rot.tga 0.164062500000 0.578125000000 0.187500000000 0.601562500000
+ico_safe.tga 0.187500000000 0.578125000000 0.210937500000 0.601562500000
+ico_sap.tga 0.210937500000 0.578125000000 0.234375000000 0.601562500000
+ico_self_damage.tga 0.234375000000 0.578125000000 0.257812500000 0.601562500000
+ico_shaft.tga 0.257812500000 0.578125000000 0.281250000000 0.601562500000
+ico_shielding.tga 0.281250000000 0.578125000000 0.304687500000 0.601562500000
+ico_shield_buff.tga 0.304687500000 0.578125000000 0.328125000000 0.601562500000
+ico_shield_up.tga 0.328125000000 0.578125000000 0.351562500000 0.601562500000
+ico_shockwave.tga 0.351562500000 0.578125000000 0.375000000000 0.601562500000
+ico_sickness.tga 0.375000000000 0.578125000000 0.398437500000 0.601562500000
+ico_slashing.tga 0.398437500000 0.578125000000 0.421875000000 0.601562500000
+ico_slow.tga 0.421875000000 0.578125000000 0.445312500000 0.601562500000
+ico_soft_spot.tga 0.445312500000 0.578125000000 0.468750000000 0.601562500000
+ico_source_time.tga 0.468750000000 0.578125000000 0.492187500000 0.601562500000
+ico_speed.tga 0.492187500000 0.578125000000 0.515625000000 0.601562500000
+ico_speeding_up.tga 0.515625000000 0.578125000000 0.539062500000 0.601562500000
+ico_spell_break.tga 0.539062500000 0.578125000000 0.562500000000 0.601562500000
+fp_armor.tga 0.562500000000 0.578125000000 0.585937500000 0.601562500000
+fp_building.tga 0.585937500000 0.578125000000 0.609375000000 0.601562500000
+fp_jewel.tga 0.609375000000 0.578125000000 0.632812500000 0.601562500000
+fp_melee.tga 0.632812500000 0.578125000000 0.656250000000 0.601562500000
+fp_over.tga 0.656250000000 0.578125000000 0.679687500000 0.601562500000
+fp_range.tga 0.679687500000 0.578125000000 0.703125000000 0.601562500000
+fp_shield.tga 0.703125000000 0.578125000000 0.726562500000 0.601562500000
+fp_tools.tga 0.914062500000 0.585937500000 0.937500000000 0.609375000000
+ef_back.tga 0.726562500000 0.593750000000 0.750000000000 0.617187500000
+ico_absorb_damage.tga 0.750000000000 0.593750000000 0.773437500000 0.617187500000
+ico_accurate.tga 0.773437500000 0.593750000000 0.796875000000 0.617187500000
+ico_acid.tga 0.796875000000 0.593750000000 0.820312500000 0.617187500000
+ico_aim.tga 0.820312500000 0.593750000000 0.843750000000 0.617187500000
+ico_aim_bird_wings.tga 0.843750000000 0.593750000000 0.867187500000 0.617187500000
+ico_aim_flying_kitin_abdomen.tga 0.867187500000 0.593750000000 0.890625000000 0.617187500000
+ico_aim_homin_arms.tga 0.890625000000 0.593750000000 0.914062500000 0.617187500000
+ico_aim_homin_chest.tga 0.937500000000 0.593750000000 0.960937500000 0.617187500000
+ico_aim_homin_feet.tga 0.960937500000 0.593750000000 0.984375000000 0.617187500000
+ico_aim_homin_feint.tga 0.000000000000 0.601562500000 0.023437500000 0.625000000000
+ico_aim_homin_hands.tga 0.023437500000 0.601562500000 0.046875000000 0.625000000000
+ico_aim_homin_head.tga 0.046875000000 0.601562500000 0.070312500000 0.625000000000
+ico_aim_homin_legs.tga 0.070312500000 0.601562500000 0.093750000000 0.625000000000
+ico_aim_kitin_head.tga 0.093750000000 0.601562500000 0.117187500000 0.625000000000
+ef_over_break.tga 0.117187500000 0.601562500000 0.140625000000 0.625000000000
+ico_ammo_bullet.tga 0.140625000000 0.601562500000 0.164062500000 0.625000000000
+ico_ammo_jacket.tga 0.164062500000 0.601562500000 0.187500000000 0.625000000000
+ico_angle.tga 0.187500000000 0.601562500000 0.210937500000 0.625000000000
+ico_anti_magic_shield.tga 0.210937500000 0.601562500000 0.234375000000 0.625000000000
+ico_armor.tga 0.234375000000 0.601562500000 0.257812500000 0.625000000000
+ico_armor_clip.tga 0.257812500000 0.601562500000 0.281250000000 0.625000000000
+ico_armor_heavy.tga 0.281250000000 0.601562500000 0.304687500000 0.625000000000
+ico_armor_kitin.tga 0.304687500000 0.601562500000 0.328125000000 0.625000000000
+ico_armor_light.tga 0.328125000000 0.601562500000 0.351562500000 0.625000000000
+ef_over_less.tga 0.351562500000 0.601562500000 0.375000000000 0.625000000000
+ef_over_more.tga 0.375000000000 0.601562500000 0.398437500000 0.625000000000
+fo_back.tga 0.398437500000 0.601562500000 0.421875000000 0.625000000000
+fo_over.tga 0.421875000000 0.601562500000 0.445312500000 0.625000000000
+ico_gardening.tga 0.445312500000 0.601562500000 0.468750000000 0.625000000000
+ico_gentle.tga 0.468750000000 0.601562500000 0.492187500000 0.625000000000
+mp_over_link.tga 0.492187500000 0.601562500000 0.515625000000 0.625000000000
+ico_goo.tga 0.515625000000 0.601562500000 0.539062500000 0.625000000000
+us_back_0.tga 0.539062500000 0.601562500000 0.562500000000 0.625000000000
+us_back_1.tga 0.562500000000 0.601562500000 0.585937500000 0.625000000000
+us_back_2.tga 0.585937500000 0.601562500000 0.609375000000 0.625000000000
+us_back_3.tga 0.609375000000 0.601562500000 0.632812500000 0.625000000000
+us_back_4.tga 0.632812500000 0.601562500000 0.656250000000 0.625000000000
+us_back_5.tga 0.656250000000 0.601562500000 0.679687500000 0.625000000000
+us_back_6.tga 0.679687500000 0.601562500000 0.703125000000 0.625000000000
+us_back_7.tga 0.703125000000 0.601562500000 0.726562500000 0.625000000000
+us_back_8.tga 0.914062500000 0.609375000000 0.937500000000 0.632812500000
+tb_config.tga 0.726562500000 0.617187500000 0.750000000000 0.640625000000
+tb_connection.tga 0.750000000000 0.617187500000 0.773437500000 0.640625000000
+tb_contacts.tga 0.773437500000 0.617187500000 0.796875000000 0.640625000000
+tb_desk_1.tga 0.796875000000 0.617187500000 0.820312500000 0.640625000000
+tb_desk_2.tga 0.820312500000 0.617187500000 0.843750000000 0.640625000000
+tb_desk_3.tga 0.843750000000 0.617187500000 0.867187500000 0.640625000000
+tb_desk_4.tga 0.867187500000 0.617187500000 0.890625000000 0.640625000000
+tb_faction.tga 0.890625000000 0.617187500000 0.914062500000 0.640625000000
+tb_forum.tga 0.937500000000 0.617187500000 0.960937500000 0.640625000000
+tb_guild.tga 0.960937500000 0.617187500000 0.984375000000 0.640625000000
+TB_help2.tga 0.000000000000 0.625000000000 0.023437500000 0.648437500000
+tb_keys.tga 0.023437500000 0.625000000000 0.046875000000 0.648437500000
+tb_macros.tga 0.046875000000 0.625000000000 0.070312500000 0.648437500000
+tb_mail.tga 0.070312500000 0.625000000000 0.093750000000 0.648437500000
+tb_mode_dodge.tga 0.093750000000 0.625000000000 0.117187500000 0.648437500000
+tb_mode_parry.tga 0.117187500000 0.625000000000 0.140625000000 0.648437500000
+tb_over.tga 0.140625000000 0.625000000000 0.164062500000 0.648437500000
+tb_support.tga 0.164062500000 0.625000000000 0.187500000000 0.648437500000
+tb_team.tga 0.187500000000 0.625000000000 0.210937500000 0.648437500000
+tb_windows.tga 0.210937500000 0.625000000000 0.234375000000 0.648437500000
+ico_gripp.tga 0.234375000000 0.625000000000 0.257812500000 0.648437500000
+BK_zorai_brick.tga 0.257812500000 0.625000000000 0.281250000000 0.648437500000
+mf_back.tga 0.281250000000 0.625000000000 0.304687500000 0.648437500000
+mf_over.tga 0.304687500000 0.625000000000 0.328125000000 0.648437500000
+brick_default.tga 0.328125000000 0.625000000000 0.351562500000 0.648437500000
+ico_hammer.tga 0.351562500000 0.625000000000 0.375000000000 0.648437500000
+ico_harmful.tga 0.375000000000 0.625000000000 0.398437500000 0.648437500000
+ico_hatred.tga 0.398437500000 0.625000000000 0.421875000000 0.648437500000
+ico_heal.tga 0.421875000000 0.625000000000 0.445312500000 0.648437500000
+mp3.tga 0.445312500000 0.625000000000 0.468750000000 0.648437500000
+ico_hit_rate.tga 0.468750000000 0.625000000000 0.492187500000 0.648437500000
+mp_back_curative.tga 0.492187500000 0.625000000000 0.515625000000 0.648437500000
+mp_back_offensive.tga 0.515625000000 0.625000000000 0.539062500000 0.648437500000
+ico_time.tga 0.539062500000 0.625000000000 0.562500000000 0.648437500000
+ico_time_bonus.tga 0.562500000000 0.625000000000 0.585937500000 0.648437500000
+mp_back_selfonly.tga 0.585937500000 0.625000000000 0.609375000000 0.648437500000
+ico_trigger.tga 0.609375000000 0.625000000000 0.632812500000 0.648437500000
+ico_umbrella.tga 0.632812500000 0.625000000000 0.656250000000 0.648437500000
+ico_use_enchantement.tga 0.656250000000 0.625000000000 0.679687500000 0.648437500000
+ico_vampire.tga 0.679687500000 0.625000000000 0.703125000000 0.648437500000
+ico_visibility.tga 0.703125000000 0.625000000000 0.726562500000 0.648437500000
+ico_war_cry.tga 0.914062500000 0.632812500000 0.937500000000 0.656250000000
+ico_weight.tga 0.726562500000 0.640625000000 0.750000000000 0.664062500000
+ico_wellbalanced.tga 0.750000000000 0.640625000000 0.773437500000 0.664062500000
+ico_will.tga 0.773437500000 0.640625000000 0.796875000000 0.664062500000
+ico_windding.tga 0.796875000000 0.640625000000 0.820312500000 0.664062500000
+ico_wisdom.tga 0.820312500000 0.640625000000 0.843750000000 0.664062500000
+ico_incapacity.tga 0.843750000000 0.640625000000 0.867187500000 0.664062500000
+ico_intelligence.tga 0.867187500000 0.640625000000 0.890625000000 0.664062500000
+ico_interrupt.tga 0.890625000000 0.640625000000 0.914062500000 0.664062500000
+ico_invulnerability.tga 0.937500000000 0.640625000000 0.960937500000 0.664062500000
+ico_jewel_stone.tga 0.960937500000 0.640625000000 0.984375000000 0.664062500000
+us_ico_0.tga 0.000000000000 0.648437500000 0.023437500000 0.671875000000
+us_ico_1.tga 0.023437500000 0.648437500000 0.046875000000 0.671875000000
+us_ico_2.tga 0.046875000000 0.648437500000 0.070312500000 0.671875000000
+us_ico_3.tga 0.070312500000 0.648437500000 0.093750000000 0.671875000000
+us_ico_4.tga 0.093750000000 0.648437500000 0.117187500000 0.671875000000
+us_ico_5.tga 0.117187500000 0.648437500000 0.140625000000 0.671875000000
+us_ico_6.tga 0.140625000000 0.648437500000 0.164062500000 0.671875000000
+us_ico_7.tga 0.164062500000 0.648437500000 0.187500000000 0.671875000000
+us_ico_8.tga 0.187500000000 0.648437500000 0.210937500000 0.671875000000
+us_ico_9.tga 0.210937500000 0.648437500000 0.234375000000 0.671875000000
+us_over_0.tga 0.234375000000 0.648437500000 0.257812500000 0.671875000000
+us_over_1.tga 0.257812500000 0.648437500000 0.281250000000 0.671875000000
+us_over_2.tga 0.281250000000 0.648437500000 0.304687500000 0.671875000000
+us_over_3.tga 0.304687500000 0.648437500000 0.328125000000 0.671875000000
+us_over_4.tga 0.328125000000 0.648437500000 0.351562500000 0.671875000000
+building_state_24x24.tga 0.351562500000 0.648437500000 0.375000000000 0.671875000000
+cb_main_nue.tga 0.375000000000 0.648437500000 0.398437500000 0.671875000000
+fp_ammo.tga 0.398437500000 0.648437500000 0.421875000000 0.671875000000
+ico_armor_medium.tga 0.421875000000 0.648437500000 0.445312500000 0.671875000000
+ico_clothes.tga 0.445312500000 0.648437500000 0.468750000000 0.671875000000
+ico_durability.tga 0.468750000000 0.648437500000 0.492187500000 0.671875000000
+W_slot_shortcut_id0.tga 0.492187500000 0.648437500000 0.515625000000 0.671875000000
+W_slot_shortcut_id1.tga 0.515625000000 0.648437500000 0.539062500000 0.671875000000
+W_slot_shortcut_id2.tga 0.539062500000 0.648437500000 0.562500000000 0.671875000000
+W_slot_shortcut_id3.tga 0.562500000000 0.648437500000 0.585937500000 0.671875000000
+W_slot_shortcut_id4.tga 0.585937500000 0.648437500000 0.609375000000 0.671875000000
+W_slot_shortcut_id5.tga 0.609375000000 0.648437500000 0.632812500000 0.671875000000
+W_slot_shortcut_id6.tga 0.632812500000 0.648437500000 0.656250000000 0.671875000000
+W_slot_shortcut_id7.tga 0.656250000000 0.648437500000 0.679687500000 0.671875000000
+W_slot_shortcut_id8.tga 0.679687500000 0.648437500000 0.703125000000 0.671875000000
+W_slot_shortcut_id9.tga 0.703125000000 0.648437500000 0.726562500000 0.671875000000
+w_slot_shortcut_shift_id0.tga 0.914062500000 0.656250000000 0.937500000000 0.679687500000
+w_slot_shortcut_shift_id1.tga 0.726562500000 0.664062500000 0.750000000000 0.687500000000
+w_slot_shortcut_shift_id2.tga 0.750000000000 0.664062500000 0.773437500000 0.687500000000
+w_slot_shortcut_shift_id3.tga 0.773437500000 0.664062500000 0.796875000000 0.687500000000
+w_slot_shortcut_shift_id4.tga 0.796875000000 0.664062500000 0.820312500000 0.687500000000
+w_slot_shortcut_shift_id5.tga 0.820312500000 0.664062500000 0.843750000000 0.687500000000
+w_slot_shortcut_shift_id6.tga 0.843750000000 0.664062500000 0.867187500000 0.687500000000
+w_slot_shortcut_shift_id7.tga 0.867187500000 0.664062500000 0.890625000000 0.687500000000
+w_slot_shortcut_shift_id8.tga 0.890625000000 0.664062500000 0.914062500000 0.687500000000
+w_slot_shortcut_shift_id9.tga 0.937500000000 0.664062500000 0.960937500000 0.687500000000
+BK_matis_brick.tga 0.960937500000 0.664062500000 0.984375000000 0.687500000000
+ico_jewel_stone_support.tga 0.000000000000 0.671875000000 0.023437500000 0.695312500000
+ico_misfortune.tga 0.023437500000 0.671875000000 0.046875000000 0.695312500000
+pa_over_break.tga 0.046875000000 0.671875000000 0.070312500000 0.695312500000
+pa_over_less.tga 0.070312500000 0.671875000000 0.093750000000 0.695312500000
+pa_over_more.tga 0.093750000000 0.671875000000 0.117187500000 0.695312500000
+ch_back.tga 0.117187500000 0.671875000000 0.140625000000 0.695312500000
+ico_over_hit_head_x3.tga 0.140625000000 0.671875000000 0.164062500000 0.695312500000
+ico_primal.tga 0.164062500000 0.671875000000 0.187500000000 0.695312500000
+pvp_ally_0.tga 0.187500000000 0.671875000000 0.210937500000 0.695312500000
+pvp_ally_1.tga 0.210937500000 0.671875000000 0.234375000000 0.695312500000
+pvp_ally_2.tga 0.234375000000 0.671875000000 0.257812500000 0.695312500000
+pvp_ally_3.tga 0.257812500000 0.671875000000 0.281250000000 0.695312500000
+pvp_ally_4.tga 0.281250000000 0.671875000000 0.304687500000 0.695312500000
+pvp_ally_6.tga 0.304687500000 0.671875000000 0.328125000000 0.695312500000
+pvp_ally_flag.tga 0.328125000000 0.671875000000 0.351562500000 0.695312500000
+pvp_ally_primas.tga 0.351562500000 0.671875000000 0.375000000000 0.695312500000
+pvp_ally_ranger.tga 0.375000000000 0.671875000000 0.398437500000 0.695312500000
+pvp_ally_tag.tga 0.398437500000 0.671875000000 0.421875000000 0.695312500000
+bg_downloader.tga 0.421875000000 0.671875000000 0.445312500000 0.695312500000
+ico_source_knowledge.tga 0.445312500000 0.671875000000 0.466796875000 0.695312500000
+filter_tp.tga 0.468750000000 0.671875000000 0.492187500000 0.687500000000
 small_task_done.tga 0.984375000000 0.000000000000 1.000000000000 0.015625000000
 small_task_failed.tga 0.984375000000 0.015625000000 1.000000000000 0.031250000000
 small_task_fight.tga 0.984375000000 0.031250000000 1.000000000000 0.046875000000
@@ -669,6 +679,6 @@ small_task_travel.tga 0.914062500000 0.523437500000 0.929687500000 0.53906250000
 small_task_craft.tga 0.984375000000 0.546875000000 1.000000000000 0.562500000000
 num_slash.tga 0.984375000000 0.562500000000 0.996093750000 0.576171875000
 W_leader.tga 0.984375000000 0.578125000000 0.997070312500 0.589843750000
-tb_mode.tga 0.984375000000 0.589843750000 0.996093750000 0.601562500000
-profile.tga 0.984375000000 0.601562500000 0.996093750000 0.613281250000
-w_major.tga 0.984375000000 0.613281250000 0.996093750000 0.625000000000
+w_major.tga 0.984375000000 0.589843750000 0.996093750000 0.601562500000
+tb_mode.tga 0.984375000000 0.601562500000 0.996093750000 0.613281250000
+profile.tga 0.984375000000 0.613281250000 0.996093750000 0.625000000000
diff --git a/code/ryzom/client/data/gamedev/adds/sfx/marauder_teleporter.ps b/code/ryzom/client/data/gamedev/adds/sfx/marauder_teleporter.ps
new file mode 100644
index 000000000..cf6a508a9
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/sfx/marauder_teleporter.ps differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_HOF_caster_pvp_pantabottes.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOF_caster_pvp_pantabottes.shape
new file mode 100644
index 000000000..713018df8
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOF_caster_pvp_pantabottes.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_HOM_caster_pvp_pantabottes.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOM_caster_pvp_pantabottes.shape
new file mode 100644
index 000000000..b3fb8f6ca
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_HOM_caster_pvp_pantabottes.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/GE_pvp_big_shield.shape b/code/ryzom/client/data/gamedev/adds/shapes/GE_pvp_big_shield.shape
new file mode 100644
index 000000000..c72f5304e
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/GE_pvp_big_shield.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/tp_diamand.shape b/code/ryzom/client/data/gamedev/adds/shapes/tp_diamand.shape
new file mode 100644
index 000000000..147ff3abb
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/tp_diamand.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/shapes/tp_socle.shape b/code/ryzom/client/data/gamedev/adds/shapes/tp_socle.shape
new file mode 100644
index 000000000..4a3eea639
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/shapes/tp_socle.shape differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/event_refday_yber.tga b/code/ryzom/client/data/gamedev/adds/textures/event_refday_yber.tga
new file mode 100644
index 000000000..b8e05a831
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/event_refday_yber.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress.tga b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress.tga
new file mode 100644
index 000000000..026711a84
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress_hof.tga b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress_hof.tga
new file mode 100644
index 000000000..83f18a9b3
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/gn_pvp_dress_hof.tga differ
diff --git a/code/ryzom/client/data/gamedev/adds/textures/ul_mission_hall_of_fame.dds b/code/ryzom/client/data/gamedev/adds/textures/ul_mission_hall_of_fame.dds
new file mode 100644
index 000000000..03f9e0442
Binary files /dev/null and b/code/ryzom/client/data/gamedev/adds/textures/ul_mission_hall_of_fame.dds differ
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml b/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
index ca013f242..f0455028a 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/commands.xml
@@ -78,9 +78,18 @@
 	<command name="guildinvite" action="command" params="a guildInvite $" />
 	<command name="invite" action="command" params="a teamInvite $" />
 
-	<command name="channel" action="command" params="a connectUserChannel +" />
+	<command name="channel" action="command" params='a connectUserChannel "$"' />
+	<command name="channel" action="command" params='a connectUserChannel "$" +' />
+
+	<command name="leaguekick" action="command" params="a leagueKick $" />
+	<command name="leaguequit" action="command" params="a setLeague" />
+	<command name="leagueinvite" action="command" params="a leagueInvite $" />
+	<command name="league" action="command" params='a setLeague "$"' />
+
+	<command name="resetname" action="command" params="a resetName"/>
 
 	<!-- WebIG -->
 	<command name="go" action="browse" params="name=ui:interface:webig:content:html|url=home"/>
+	<command name="webdev" action="browse" params="name=ui:interface:webig:content:html|url=http://localhost/index.html"/>
 
 </interface_config>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
index 1d593ef06..9fb0dd958 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/config.xml
@@ -258,6 +258,9 @@
   <variable entry="UI:SAVE:INSCENE:USER:TITLE"
             type="bool"
             value="false" />
+  <variable entry="UI:SAVE:INSCENE:USER:RPTAGS"
+            type="bool"
+            value="false" />
   <variable entry="UI:SAVE:INSCENE:USER:GUILD_NAME"
             type="bool"
             value="false" />
@@ -291,6 +294,9 @@
   <variable entry="UI:SAVE:INSCENE:FRIEND:TITLE"
             type="bool"
             value="true" />
+  <variable entry="UI:SAVE:INSCENE:FRIEND:RPTAGS"
+            type="bool"
+            value="true" />
   <variable entry="UI:SAVE:INSCENE:FRIEND:GUILD_NAME"
             type="bool"
             value="true" />
@@ -327,6 +333,9 @@
   <variable entry="UI:SAVE:INSCENE:ENEMY:TITLE"
             type="bool"
             value="true" />
+  <variable entry="UI:SAVE:INSCENE:ENEMY:RPTAGS"
+            type="bool"
+            value="true" />
   <variable entry="UI:SAVE:INSCENE:ENEMY:GUILD_NAME"
             type="bool"
             value="true" />
@@ -2797,6 +2806,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:GUILD_LIST:SORT_ORDER"
             type="sint32"
             value="0" />
+  <variable entry="UI:SAVE:CHATLOG_STATE"
+            type="sint32"
+            value="0" />
   <!-- Auto Convert ACT_TSTART end TEND from server to smoothServerTick -->
   <link expr="@SERVER:USER:ACT_TSTART"
         action="set"
@@ -2963,7 +2975,28 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:CHAT:COLORS:TELL"
             type="rgba"
             value="170 170 170 255" />
-  <variable entry="UI:SAVE:CHAT:COLORS:DYN"
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:0"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:1"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:2"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:3"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:4"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:5"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:6"
+            type="rgba"
+            value="162 255 173 255" />
+  <variable entry="UI:SAVE:CHAT:COLORS:DYN:7"
             type="rgba"
             value="162 255 173 255" />
   <variable entry="UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
@@ -2975,6 +3008,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
              type="bool"
              value="false" />
+  <variable entry="UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
+             type="bool"
+             value="true" />
   <!-- ***************************** -->
   <!-- *    SYSTEM INFO COLORS     * -->
   <!-- ***************************** -->
@@ -3045,6 +3081,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_BAG:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_BAG:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA0:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3066,6 +3105,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA0:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA0:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA1:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3087,6 +3129,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA1:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA1:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA2:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3108,6 +3153,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA2:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA2:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_PA3:SORT_TYPE"
             type="sint32"
             value="0" />
@@ -3129,6 +3177,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_PA3:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_PA3:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_GUILD:SORT_TYPE"
             type="sint32"
             value="1" />
@@ -3151,6 +3202,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_GUILD:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_GUILD:FILTER_TP"
+            type="sint32"
+            value="1" />
   <variable entry="UI:SAVE:INV_ROOM:SORT_TYPE"
             type="sint32"
             value="1" />
@@ -3173,6 +3227,9 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:SAVE:INV_ROOM:FILTER_MISSMP"
             type="sint32"
             value="1" />
+  <variable entry="UI:SAVE:INV_ROOM:FILTER_TP"
+            type="sint32"
+            value="1" />
   <!-- List Menu 1 -->
   <variable entry="UI:VARIABLES:ISACTIVE:SETS"
             type="sint32"
@@ -3809,4 +3866,10 @@ This MUST follow the Enum MISSION_DESC::TIconId
   <variable entry="UI:TEMP:R2_DRAW_ARRAY"
             type="bool"
             value="0" />
+  <variable entry="UI:TEMP:DEFAULT_WEB_RETRY_TIMEOUT"
+            type="sint32"
+            value="2" />
+  <variable entry="UI:SAVE:WEBIG_RETRY_DELAY"
+            type="sint32"
+            value="2" />
 </interface_config>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml b/code/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml
index b2db7ab26..30f2c34a0 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/encyclopedia.xml
@@ -11,7 +11,7 @@
 <variable entry="UI:VARIABLES:ENCY:REWARDBRICK:SHEET" type="sint32" value="0" />
 <variable entry="UI:VARIABLES:ENCY:ALBUMBRICK:SHEET" type="sint32" value="0" />
 
-<style style="ency_title" type="text" color="255 255 255 255" fontsize="14" shadow="true" case_mode="%case_first_string_letter_up"/>
+<style style="ency_title" type="text" color="255 255 255 255" fontsize="14" shadow="true" case_mode="%case_normal"/>
 <style style="ency_title2" type="text" color="255 255 255 192" fontsize="12" shadow="true" />
 
 
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
index 927dacb28..d5a49ecad 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/game_config.xml
@@ -1615,19 +1615,82 @@
                   x="0"
                   y="-4" />
         <instance template="tgcw_color"
-                  id="cc_dyn"
-                  text="uiDynColor"
-                  title="uiCCDDyn"
-                  tooltip="uittChooseDynColor"
+                  id="cc_dyn0"
+                  text="uiDynColor0"
+                  title="uiCCDDyn0"
+                  tooltip="uittChooseDynColor0"
                   posref="BL TL"
                   posparent="cc_shout"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn1"
+                  text="uiDynColor1"
+                  title="uiCCDDyn1"
+                  tooltip="uittChooseDynColor1"
+                  posref="BL TL"
+                  posparent="cc_dyn0"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn2"
+                  text="uiDynColor2"
+                  title="uiCCDDyn2"
+                  tooltip="uittChooseDynColor2"
+                  posref="BL TL"
+                  posparent="cc_dyn1"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn3"
+                  text="uiDynColor3"
+                  title="uiCCDDyn3"
+                  tooltip="uittChooseDynColor3"
+                  posref="BL TL"
+                  posparent="cc_dyn2"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn4"
+                  text="uiDynColor4"
+                  title="uiCCDDyn4"
+                  tooltip="uittChooseDynColor4"
+                  posref="BL TL"
+                  posparent="cc_dyn3"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn5"
+                  text="uiDynColor5"
+                  title="uiCCDDyn5"
+                  tooltip="uittChooseDynColor5"
+                  posref="BL TL"
+                  posparent="cc_dyn4"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn6"
+                  text="uiDynColor6"
+                  title="uiCCDDyn6"
+                  tooltip="uittChooseDynColor6"
+                  posref="BL TL"
+                  posparent="cc_dyn5"
+                  x="0"
+                  y="-4" />
+        <instance template="tgcw_color"
+                  id="cc_dyn7"
+                  text="uiDynColor7"
+                  title="uiCCDDyn7"
+                  tooltip="uittChooseDynColor7"
+                  posref="BL TL"
+                  posparent="cc_dyn6"
+                  x="0"
+                  y="-4" />
         <instance template="tgcw_checkbox"
                   id="enter_dontquit_cb"
                   text="uiEnterDontQuitCB"
                   tooltip="uittChatEnter"
-                  posparent="cc_dyn"
+                  posparent="cc_dyn7"
                   posref="BL TL"
                   x="0"
                   y="-8" />
@@ -1647,11 +1710,19 @@
                   posref="BL TL"
                   x="0"
                   y="-8" />
-        <instance template="tgcw_scrollbarint"
+        <instance template="tgcw_checkbox"
+                  id="show_online_offline_notifications_cb"
+                  text="uiShowOnlineOfflineNotifications"
+                  tooltip="uittShowOnlineOfflineNotifications"
+                  posparent="show_dyn_channel_name_in_chat_cb"
+                  posref="BL TL"
+                  x="0"
+                  y="-8" />
+		<instance template="tgcw_scrollbarint"
                   id="font_size"
                   text="uiFontSize"
                   posref="BL TL"
-                  posparent="show_dyn_channel_name_in_chat_cb"
+                  posparent="show_online_offline_notifications_cb"
                   x="0"
                   y="-8" />
         <link expr="@UI:SAVE:CHAT:ENTER_DONT_QUIT_CB"
@@ -1660,7 +1731,9 @@
               target="show_times_in_chat_cb:c:pushed" />
         <link expr="@UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
               target="show_dyn_channel_name_in_chat_cb:c:pushed" />
-      </group>
+        <link expr="@UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
+              target="show_online_offline_notifications_cb:c:pushed" />
+	  </group>
       <ctrl style="skin_scroll"
             id="sb_chat_colors"
             align="T"
@@ -1886,12 +1959,20 @@
                   posparent="is_user_name"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_checkbox"
+                  id="is_user_rptags"
+                  text="uiRpTags"
+                  tooltip="uittRpTags"
+                  posref="BL TL"
+                  posparent="is_user_title"
+                  x="0"
+                  y="-4" />
         <instance template="tgcw_checkbox"
                   id="is_user_guild_name"
                   text="uigcGuildName"
                   tooltip="uittGuildName"
                   posref="BL TL"
-                  posparent="is_user_title"
+                  posparent="is_user_rptags"
                   x="0"
                   y="-4" />
         <instance template="tgcw_checkbox"
@@ -1995,12 +2076,20 @@
                   posparent="is_friend_name"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_checkbox"
+                  id="is_friend_rptags"
+                  text="uiRpTags"
+                  tooltip="uittRpTags"
+                  posref="BL TL"
+                  posparent="is_friend_title"
+                  x="0"
+                  y="-4" />                  
         <instance template="tgcw_checkbox"
                   id="is_friend_guild_name"
                   text="uigcGuildName"
                   tooltip="uittGuildName"
                   posref="BL TL"
-                  posparent="is_friend_title"
+                  posparent="is_friend_rptags"
                   x="0"
                   y="-4" />
         <instance template="tgcw_checkbox"
@@ -2112,12 +2201,20 @@
                   posparent="is_enemy_name"
                   x="0"
                   y="-4" />
+        <instance template="tgcw_checkbox"
+                  id="is_enemy_rptags"
+                  text="uiRpTags"
+                  tooltip="uittRpTags"
+                  posref="BL TL"
+                  posparent="is_enemy_title"
+                  x="0"
+                  y="-4" />                    
         <instance template="tgcw_checkbox"
                   id="is_enemy_guild_name"
                   text="uigcGuildName"
                   tooltip="uittGuildName"
                   posref="BL TL"
-                  posparent="is_enemy_title"
+                  posparent="is_enemy_rptags"
                   x="0"
                   y="-4" />
         <instance template="tgcw_checkbox"
@@ -3095,10 +3192,45 @@
                widget="colbut"
                link="UI:SAVE:CHAT:COLORS:SHOUT"
                realtime="true" />
-        <param ui="chat_colors:cc_dyn:c"
+        <param ui="chat_colors:cc_dyn0:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:0"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn1:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:1"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn2:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:2"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn3:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:3"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn4:c"
                type="db"
                widget="colbut"
-               link="UI:SAVE:CHAT:COLORS:DYN"
+               link="UI:SAVE:CHAT:COLORS:DYN:4"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn5:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:5"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn6:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:6"
+               realtime="true" />
+        <param ui="chat_colors:cc_dyn7:c"
+               type="db"
+               widget="colbut"
+               link="UI:SAVE:CHAT:COLORS:DYN:7"
                realtime="true" />
         <!--
                         <param ui="chat_colors:cc_shout:c"              type="db" widget="colbut" link="UI:SAVE:CHAT:COLORS:SHOUT" realtime="true" />
@@ -3120,6 +3252,11 @@
                widget="boolbut"
                link="UI:SAVE:CHAT:SHOW_DYN_CHANNEL_NAME_IN_CHAT_CB"
                realtime="true" />
+        <param ui="chat_colors:show_online_offline_notifications_cb:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB"
+               realtime="true" />
         <param ui="chat_colors:font_size:c"
                type="db"
                widget="sbint"
@@ -3222,6 +3359,11 @@
                widget="boolbut"
                link="UI:SAVE:INSCENE:USER:TITLE"
                realtime="true" />
+        <param ui="in_scene_user:is_user_rptags:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:INSCENE:USER:RPTAGS"
+               realtime="true" />
         <param ui="in_scene_user:is_user_guild_name:c"
                type="db"
                widget="boolbut"
@@ -3272,6 +3414,11 @@
                widget="boolbut"
                link="UI:SAVE:INSCENE:FRIEND:TITLE"
                realtime="true" />
+        <param ui="in_scene_friend:is_friend_rptags:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:INSCENE:FRIEND:RPTAGS"
+               realtime="true" />
         <param ui="in_scene_friend:is_friend_guild_name:c"
                type="db"
                widget="boolbut"
@@ -3327,6 +3474,11 @@
                widget="boolbut"
                link="UI:SAVE:INSCENE:ENEMY:TITLE"
                realtime="true" />
+        <param ui="in_scene_enemy:is_enemy_rptags:c"
+               type="db"
+               widget="boolbut"
+               link="UI:SAVE:INSCENE:ENEMY:RPTAGS"
+               realtime="true" />
         <param ui="in_scene_enemy:is_enemy_guild_name:c"
                type="db"
                widget="boolbut"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml b/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml
index 8bcf456e9..cb4e144ac 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/guild.xml
@@ -463,27 +463,7 @@
   <!-- ***************** -->
   <!-- *  GUILD FORUM  * -->
   <!-- ***************** -->
-  <proc id="guild_forum_proc_active">
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=1" />
-    <action handler="set"
-            cond="not(%is_guild_present)"
-            params="target='ui:interface:guild_forum:active'|value=0" />
-    <action handler="browse"
-            params="name=ui:interface:guild_forum:content:html|url=home|show=0" />
-  </proc>
-  <proc id="guild_forum_proc_deactive">
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:GUILD_FORUM|value=0" />
-  </proc>
-  <group type="menu"
-         id="guild_forum_menu"
-         extends="base_menu_with_color">
-    <action id="home"
-            name="uiHOME"
-            handler="browse"
-            params="name=ui:interface:guild_forum:content:html|url=home" />
-  </group>
+ 
   <group type="container"
          id="guild_forum"
          w="480"
@@ -531,7 +511,7 @@
            w="0"
            h="0"
            posref="TL TL">
-      <group type="forum_html"
+      <group type="html"
              id="html"
              posref="TL TL"
              url="home"
@@ -828,24 +808,7 @@
   <!-- ************** -->
   <!-- *  MAIL BOX  * -->
   <!-- ************** -->
-  <proc id="mailbox_proc_active">
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:MAILBOX|value=1" />
-    <action handler="browse"
-            params="name=ui:interface:mailbox:content:html|url=home|show=0" />
-  </proc>
-  <proc id="mailbox_proc_deactive">
-    <action handler="set"
-            params="dblink=UI:VARIABLES:ISACTIVE:MAILBOX|value=0" />
-  </proc>
-  <group type="menu"
-         id="mailbox_menu"
-         extends="base_menu_with_color">
-    <action id="home"
-            name="uiHOME"
-            handler="browse"
-            params="name=ui:interface:mailbox:content:html|url=home" />
-  </group>
+ 
   <group type="container"
          id="mailbox"
          w="480"
@@ -892,7 +855,7 @@
            w="0"
            h="0"
            posref="TL TL">
-      <group type="mail_html"
+      <group type="html"
              id="html"
              posref="TL TL"
              url="home"
@@ -976,8 +939,6 @@
   <proc id="webig_proc_active">
     <action handler="set"
             params="dblink=UI:VARIABLES:ISACTIVE:WEBIG|value=1" />
-    <action handler="browse"
-            params="name=ui:interface:webig:content:html|url=home" />
   </proc>
   <proc id="webig_proc_deactive">
     <action handler="set"
@@ -1088,7 +1049,7 @@
       <group type="webig_html"
              id="html"
              posref="TL TL"
-             url="http://atys.ryzom.com/start/index.php"
+             url=""
              home="http://atys.ryzom.com/start/index.php"
              sizeref="wh"
              x="0"
@@ -1254,8 +1215,8 @@
       <group type="webig_html"
              id="html"
              posref="TL TL"
-             url="http://atys.ryzom.com/start/app_ig_start.php"
-             home="http://atys.ryzom.com/start/app_ig_start.php"
+             url=""
+             home="http://atys.ryzom.com/start/init_ig.php"
              sizeref="wh"
              x="0"
              y="0"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
index 4c93ebb6f..b71fa6cc1 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.lua
@@ -283,17 +283,14 @@ function game:onDrawNpcWebPage()
 			local utf8Url = ucUrl:toUtf8()
 			local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil			
 			if isRing then
-				-- when in ring mode, add the parameters ourselves. 60 sec timeout because of zope...
-				-- browseNpcWebPage(uiStr, utf8Url .. game.RingAccessPointFilter:getURLParameters(), false, 60)
-				-- Use new window after revamp
-				--RingAccessPoint:getWindow().active = 1
-				--RingAccessPoint:getWindow():center()
-				--RingAccessPoint:getWindow():blink(1)
-				--RingAccessPoint:show()
 				getUI("ui:interface:npc_web_browser").active = false
 				runAH(nil, "context_ring_sessions", "")
 				return
 			else
+				local hideWindow = string.find(utf8Url, "_hideWindow=1") ~= nil			
+				if hideWindow then
+					getUI("ui:interface:npc_web_browser").active = false
+				end
 				self.NpcWebPage.BrowseDone= true;
 				browseNpcWebPage(uiStr, utf8Url, true, 10); -- 'true' is for 'add parameters' here. 10 is standard timeout
 			end
@@ -302,9 +299,9 @@ function game:onDrawNpcWebPage()
 			-- if this is a ring window, then only the refresh button to access to filter will be available
 			local isRing = string.find(utf8Url, "ring_access_point=1") ~= nil
 			local browser = getUI("ui:interface:npc_web_browser")
-			browser:find("browse_redo").active = not isRing
-			browser:find("browse_undo").active = not isRing
-			browser:find("browse_refresh").active = isRing
+			browser:find("browse_redo").active = true
+			browser:find("browse_undo").active = true
+			browser:find("browse_refresh").active = true
 		end
 	end
 end
@@ -978,6 +975,7 @@ function RingPlayerInfo:tooltipRRPs(dbBase, ttFormat)
 	setContextHelpText(fmt);
 end
 
+
 --------------------------------------------------------------------------------------------------------------
 --
 function RingPlayerInfo:tooltipRingRating(level, progress, ttFormat)
@@ -1012,6 +1010,27 @@ function RingPlayerInfo:getLevelRatingAndImprovementRate(val)
 	return level, progress
 end
 
+--------------------------------------------------------------------------------------------------------------
+--
+function game:updateOrganization(path, uiOrgText, uiStatusText, uiPointsText)
+	
+	local org = getDbProp(path.."1:VALUE")
+	getUICaller()[uiOrgText].uc_hardtext =  i18n.get('uiOrganization_' .. org)
+
+	local status = getDbProp(path.."2:VALUE")
+	getUICaller()[uiStatusText].uc_hardtext= status
+
+	local points = getDbProp(path.."3:VALUE")
+	getUICaller()[uiPointsText].uc_hardtext= points
+	
+end
+
+------------------------------------------------------------------------------------------------------------
+function game:organizationTooltip()
+	-- set the tooltip in InterfaceManager
+	setContextHelpText( i18n.get('uittOrganization') );
+end
+
 
 --------------------------------------------------------------------------------------------------------------
 function game:popMissionList()		
@@ -1392,7 +1411,9 @@ end
 -- handler called by C++ to tell that the main loop is about to begin
 function game:onMainLoopBegin()	
 	game.InGameDbInitialized = false			
-	game.PrevSessionMission = getDbProp("UI:VARIABLES:MISSION_SELECTED_PREV_SESSION")	
+	game.PrevSessionMission = getDbProp("UI:VARIABLES:MISSION_SELECTED_PREV_SESSION")
+	
+	debugInfo("onMainLoopBegin()")
 end
 
 
@@ -1408,6 +1429,29 @@ function game:onInGameDbInitialized()
 	if game.PrevSessionMission ~= -1  then
 		self:setCurrentMission(game.PrevSessionMission)		
 	end
+	
+	game:setInfoPlayerCharacterRace()
+end
+
+function game:onWebIgReady()
+	-- Call init webig
+	getUI("ui:interface:web_transactions:content:html"):browse("home")
+	getUI("ui:interface:webig:content:html"):browse("home")
+	
+end
+
+--------------------------------------------------------------------------------------------------------------
+-- handler called by C++ at the start of a far TP (log to char selection or far tp)
+function game:onFarTpStart()
+	debugInfo("game:onFarTpStart()")
+	--game:deinitWebIgApps()
+end
+
+--------------------------------------------------------------------------------------------------------------
+-- handler called by C++ after characer reselection or the end of a far TP
+function game:onFarTpEnd()
+	debugInfo("game:onFarTpEnd()")
+	--game:preInitWebIgApps()
 end
 
 --------------------------------------------------------------------------------------------------------------
@@ -1415,8 +1459,8 @@ end
 function game:onMainLoopEnd()
 	game.InGameDbInitialized = false
 	game:updateMissionJournalFixedEntry()
-end
 
+end
 
 --------------------------------------------------------------------------------------------------------------
 -- ring journal on / off
@@ -1471,6 +1515,11 @@ function game:onNewMissionStepAdded(stepIndex)
 	local missionWnd = getMissionWindow()
 	local missionIndex = getDbProp("UI:SAVE:MISSION_SELECTED")
 	local dbPath
+
+	if missionIndex < 0 then
+		return
+	end
+
 	-- debugInfo("New Step")
 	if missionIndex < 15 then		
 		dbPath = "SERVER:MISSIONS:" .. tostring(missionIndex) .. ":GOALS:" .. tostring(stepIndex) .. ":TEXT"
@@ -1651,3 +1700,64 @@ function game:getRPJobs()
 
 end
 
+--------------------------------------------------------------------------------------------------------------
+function game:setInfoPlayerCharacterRace()
+	getUI("ui:interface:info_player_skills:content:basics_skills:character_race_name").uc_hardtext = i18n.get("io"..getUserRace())
+end
+
+
+-- --------------------------------------------------------------------------------------------------------------
+-- game.preInitTimer = 0
+-- function game:preInitWebIgAppsLoop()
+	-- if game.preInitTimer == nil then game.preInitTimer = 0 end
+
+	-- game.preInitTimer = game.preInitTimer - 1
+	-- if (not game.preWebIgAppsInitialized) and game.preInitTimer < 0 then
+		-- debugInfo("initWebIgAppsLoop(): calling app_ig_preinit.php")
+		-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_preinit.php")
+		-- game.preInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
+	-- end
+
+	-- if game.preWebIgAppsInitialized then
+		-- debugInfo("preInitWebIgAppsLoop(): Calling removeOnDbChange()")
+		-- removeOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
+	-- end
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:preInitWebIgApps()
+	-- debugInfo("game:preInitWebIgApps()")
+	-- addOnDbChange(getUI("ui:interface"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:preInitWebIgAppsLoop()")
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- game.postInitTimer = 0
+-- function game:postInitWebIgAppsLoop()
+	-- if game.postInitTimer == nil then game.postInitTimer = 0 end
+
+	-- game.postInitTimer = game.postInitTimer - 1
+	-- if game.postInitTimer < 0 then
+		-- debugInfo("initWebIgAppsLoop(): calling app_ig_postinit.php")
+		-- getUI("ui:interface:web_transactions:content:html"):browse("http://atys.ryzom.com/start/app_ig_postinit.php")
+		-- game.postInitTimer = getDbProp("UI:SAVE:WEBIG_RETRY_DELAY")
+	-- end
+
+	-- if game.postWebIgAppsInitialized then
+		-- debugInfo("postInitWebIgAppsLoop(): Calling removeOnDbChange()")
+		-- removeOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK")
+	-- end
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:postInitWebIgApps()
+	-- debugInfo("game:postInitWebIgApps()")
+	-- addOnDbChange(getUI("ui:interface:milko_pad"), "@UI:VARIABLES:CURRENT_SERVER_TICK", "game:postInitWebIgAppsLoop()")
+-- end
+
+-- --------------------------------------------------------------------------------------------------------------
+-- function game:deinitWebIgApps()
+	-- debugInfo("game:deinitWebIgApps()")
+	-- game.preWebIgAppsInitialized = nil
+	-- game.postWebIgAppsInitialized = nil
+	-- titleSetted = nil
+-- end
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
index cc76e5f80..33ec46924 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/info_player.xml
@@ -676,54 +676,32 @@
              y="0"
              h="0"
              posref="TL TL">
-        <group id="title"
-               posref="TL TL"
-               sizeref="w"
-               w="-1"
-               h="24"
-               y="-22">
-          <view type="text"
-                id="player_title_txt"
-                posref="TL TL"
-                x="0"
-                y="-4"
-                hardtext="uiPlayerTitle"
-                shadow="true"
-                color="255 255 255 255"
-                global_color="false"
-                fontsize="12" />
-          <group type="combo_box"
-                 id="player_title"
-                 w="300"
-                 h="20"
-                 value="UI:TITLE"
-                 posparent="player_title_txt"
-                 posref="TR TL"
-                 x="4"
-                 y="4"
-                 on_select_start="title_combobox_button">
-            <instance template="combo_box_def1" />
-          </group>
-          <instance template="text_tt"
-                    posparent="player_title"
-                    tooltip="uittIdentityTitle" />
-          <link expr="@UI:TITLE"
-                action="title_combobox_changed" />
-        </group>
-        <ctrl style="text_button_16"
-              id="inf"
-              posref="TR TR"
-              y="-24"
-              wmargin="8"
-              hardtext="uiInfo"
-              tooltip="uittIdentityInfo"
-              onclick_l="open_title_help"
-              params_l="from=user" />
+		<view type="text"
+			  id="character_race_title"
+			  posparent="basics_skills"
+			  posref="TL TL"
+			  x="0"
+			  y="-24"
+			  hardtext="uiRaceBold"
+			  shadow="true"
+			  color="255 255 255 255"
+			  global_color="false"
+			  fontsize="12" />
+		<view type="text"
+			  id="character_race_name"
+			  posparent="character_race_title"
+			  posref="TR TL"
+			  shadow="true"
+			  color="255 200 55 255"
+			  global_color="false"
+			  x="2"
+			  fontsize="12"
+			  hardtext="" />
         <group id="guild"
                posref="TL TL"
                sizeref="w"
                h="14"
-               y="-52">
+               y="-48">
           <view type="text"
                 id="guild_title"
                 posref="TL TL"
@@ -1232,20 +1210,20 @@
                       y="0"
                       val="%player_protect_cold" />
             <instance template="tipc_magic_protect"
-                      id="Fire"
+                      id="Rot"
                       posparent="Cold"
                       posref="BL TL"
                       y="0"
-                      val="%player_protect_fire" />
+                      val="%player_protect_rot" />
             <instance template="tipc_magic_protect"
-                      id="Rot"
-                      posparent="Fire"
+                      id="Fire"
+                      posparent="Rot"
                       posref="BL TL"
                       y="0"
-                      val="%player_protect_rot" />
+                      val="%player_protect_fire" />
             <instance template="tipc_magic_protect"
                       id="Shockwave"
-                      posparent="Rot"
+                      posparent="Fire"
                       posref="BL TL"
                       y="0"
                       val="%player_protect_shockwave" />
@@ -1420,9 +1398,60 @@
               fontsize="12" />
         <instance template="faction_points_widget"
                   id="fp"
-                  posref="TL TL"
+                  posparent="ecosystem_points"
+                  posref="BL TL"
                   x="0"
-                  y="-150" />
+                  y="-10" />
+        <group id="pvp_points"
+			   posparent="fp"
+               posref="BL TL"
+               sizeref="wh"
+               w="-1"
+               h="40"
+               y="-10">
+          <view type="text"
+                id="pvppoints_t"
+                posref="TL TL"
+                x="0"
+                y="0"
+                hardtext="uiPvpPoints"
+                shadow="true"
+                color="255 255 255 255"
+                global_color="false"
+                fontsize="12" />
+          <group id="black"
+                 posref="TL TL"
+                 x="0"
+                 sizeref="w"
+                 y="-14"
+                 w="0"
+                 h="26"
+                 inherit_gc_alpha="true">
+			  <view type="text"
+					id="total"
+					posref="ML ML"
+					x="8"
+					y="0"
+					hardtext="uiPvpTotal"
+					shadow="true"
+					color="255 255 255 255"
+					global_color="true"
+					fontsize="12" />
+			  <view type="text_number"
+					id="val"
+					posref="MR MR"
+					x="-8"
+					y="0"
+					color="255 255 255 255"
+					global_color="true"
+					fontsize="12"
+					value="SERVER:USER:RRPS_LEVELS0:VALUE"
+					shadow="true" />
+          </group>
+          <instance template="inner_thin_border"
+                    posparent="black"
+                    inherit_gc_alpha="true" />
+        </group>
       </group>
 	  <group h="0" id="rpjobs" posref="TL TL" sizeref="wh" w="0" y="0">
 	        <ctrl style="text_button_header"
@@ -1514,11 +1543,57 @@
 			 </group>
 		</group>
 		<group h="0" id="webinfos" posref="TL TL" sizeref="wh" w="0" y="0">
+			<group id="title"
+				   posref="TL TL"
+				   sizeref="w"
+				   active="true"
+				   w="-1"
+				   h="24"
+				   y="-8">
+			  <view type="text"
+					id="player_title_txt"
+					posref="TL TL"
+					x="8"
+					y="-4"
+					hardtext="uiPlayerTitle"
+					shadow="true"
+					color="255 255 255 255"
+					global_color="false"
+					fontsize="12" />
+			  <group type="combo_box"
+					 id="player_title"
+					 w="300"
+					 h="20"
+					 value="UI:TITLE"
+					 posparent="player_title_txt"
+					 posref="TR TL"
+					 x="4"
+					 y="4"
+					 on_select_start="title_combobox_button">
+				<instance template="combo_box_def1" />
+			  </group>
+			  <instance template="text_tt"
+						posparent="player_title"
+						tooltip="uittIdentityTitle" />
+			  <link expr="@UI:TITLE"
+					action="title_combobox_changed" />
+			</group>
+			<ctrl style="text_button_16"
+				  id="inf"
+				  posref="TR TR"
+				  active="true"
+				  y="-9"
+				  wmargin="8"
+				  hardtext="uiInfo"
+				  tooltip="uittIdentityInfo"
+				  onclick_l="open_title_help"
+				  params_l="from=user" />
 	        <ctrl style="text_button_header"
             button_type="push_button"
             id="browse_home"
-            posref="TR TR"
-            x="-1"
+            posref="BR TR"
+			posparent="title"
+            x="0"
             y="-2"
             hardtext="uiBrowseRefresh"
             tooltip="uittBrowseRefresh"
@@ -1533,7 +1608,7 @@
              title_prefix=""
              sizeref="wh"
              x="0"
-             y="-8"
+             y="-42"
              w="0"
              h="0"
              background_color="0 0 0 255"
@@ -1905,7 +1980,7 @@
     <group id="content"
            x="0"
            y="0"
-           h="272"
+           h="300"
            posref="TL TL">
       <group id="you"
              posref="TL TL"
@@ -2004,7 +2079,7 @@
               id="kami"
               posref="TL TL"
               x="4"
-              y="-180"
+              y="-160"
               color="255 255 255 255"
               fontsize="10"
               shadow="true"
@@ -2013,7 +2088,7 @@
               id="karavan"
               posref="TL TL"
               x="4"
-              y="-210"
+              y="-190"
               color="255 255 255 255"
               fontsize="10"
               shadow="true"
@@ -2021,7 +2096,7 @@
         <group id="cult_allegiance_group"
                posref="TL TL"
                x="4"
-               y="-240"
+               y="-220"
                child_resize_h="true"
                child_resize_w="true">
           <view type="text"
@@ -2090,6 +2165,87 @@
                   id="fb5"
                   x="100"
                   path="SERVER:FAME:PLAYER5" />
+       <view type="text"
+                id="organization_text"
+                posref="TL TL"
+                x="0"
+                y="-245"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="true"
+                shadow="true"
+                hardtext="uiOrganization" />
+       <group id="organization"
+               posref="TL TL"
+               x="2"
+               y="-260"
+               h="34"
+               w="-4"
+               sizeref="w" >
+        <view type="text"
+                id="name"
+                posref="TL TL"
+                x="2"
+                y="-5"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="false"
+                shadow="true"
+                hardtext="" /> 
+         <view type="text"
+                id="text_points"
+                posref="BL BL"
+                x="4"
+                y="2"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="true"
+                shadow="true"
+                hardtext="uiPoints" />
+         <view type="text"
+                id="points"
+                posparent="text_points"
+                posref="MR ML"
+                x="4"
+                y="0"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="false"
+                shadow="true"
+                hardtext="0" />
+            <view type="text"
+                id="status"
+                posref="BR BR"
+                x="-4"
+                y="2"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="false"
+                shadow="true"
+                hardtext="0" />
+          <view type="text"
+                id="text_status"
+                posparent="status"
+                posref="ML MR"
+                x="-4"
+                y="0"
+                color="255 255 255 255"
+                fontsize="10"
+                global_color="true"
+                shadow="true"
+                hardtext="uiSkillJobLVL" />
+          <link expr="@SERVER:USER:RRPS_LEVELS1"
+                action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
+          <link expr="@SERVER:USER:RRPS_LEVELS2"
+                action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
+          <link expr="@SERVER:USER:RRPS_LEVELS3"
+                action="lua:game:updateOrganization('SERVER:USER:RRPS_LEVELS', 'name', 'status', 'points')" />
+          <instance template="text_tt"
+                    posparent="parent"
+                    on_tooltip="lua:game:organizationTooltip()" />
+          <instance template="inner_thin_border"
+                    inherit_gc_alpha="true" />
+        </group>
       </group>
       <group id="guild"
              posref="TL TL"
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
index 0788f82ca..3544e6dda 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.xml
@@ -301,7 +301,6 @@
       <view type="bitmap"
             id="tag_1"
             posref="TL TL"
-			posparent="pvp_tags"
             x="2"
             y="0"
             texture="alpha_10.tga"
@@ -2116,7 +2115,14 @@
             name="uimDismiss"
             handler="dismiss_member"
             params="" />
-    <!--            <action id="successor"  name="uimSetSuccesor" handler="set_successor" params=""/>-->
+    <action id="leader"
+            name="uimSetTeamLeader"
+            handler="set_team_leader"
+            params=""/>
+    <action id="successor"
+            name="uimSetSuccesor"
+            handler="set_successor"
+            params=""/>
     <!--            <action id="emote" name="uimEmotes" hanlder="" params="">
                         <action id="emote1"  name="uimEmote1" handler="emote" params="emote_id=0"/>     
                         <action id="emote2"  name="uimEmote2" handler="emote" params="emote_id=1"/>     
@@ -2147,6 +2153,10 @@
   <!-- links to enable leader options -->
   <link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
         target="ui:interface:team_member_menu:dismiss:active" />
+  <link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
+        target="ui:interface:team_member_menu:leader:active" />
+  <link expr="eq(band(@SERVER:GROUP:LEADER_INDEX, 15), 15)"
+        target="ui:interface:team_member_menu:successor:active" />
   <!-- menu on the chat of the team for the leader -->
   <group type="menu"
          id="team_chat_leader_menu"
@@ -2481,21 +2491,13 @@
     <view type="text"
           id="text"
           posref="TM TM"
-          color="233 197 42 255"
+          color="42 197 233 255"
           x="10"
           y="-10"
-          fontsize="14"
+          fontsize="12"
           global_color="false"
           shadow="true"
-          hardtext="uiJoinDuelProposal" />
-    <view type="bitmap"
-          id="warning"
-          posparent="text"
-          posref="ML MR"
-          y="4"
-          x="-4"
-          global_color="false"
-          texture="w_warning.tga" />
+          hardtext="uiJoinLeagueProposal" />
     <group id="content"
            child_resize_h="true"
            child_resize_hmargin="10">
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt b/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt
index 8a0fa217f..a6007a147 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/interface.txt
@@ -206,6 +206,7 @@ SYNTAXE:
 	positive="true"
 	suffix=""
 	prefix=""
+	format="false"			// make the number thousands formatted 
 />
 
 
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
index 363dcd27f..be3faaabb 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_select.xml
@@ -676,8 +676,7 @@
 	<!-- Simple Message Box with just a OK button -->
 	<group type="modal" id="message_box" exit_click_out="true" posparent="char3d" posref="MM MM" w="250" child_resize_h="true" child_resize_hmargin="100" 
 	 on_enter="leave_modal" mouse_pos="false" escapable="false" 
-	 display="false"
-	>
+	 display="false">
 		<instance template="outgame_popup" id="back" posref="TL TL" />
 
 		<view type="text" id="text" posref="TL TL" line_maxw="234" x="8" y="-56" w="0" h="0" color="255 255 255 255" fontsize="12" shadow="true" multi_line="true" multi_line_space="0" case_mode="%case_first_sentence_letter_up"/>
@@ -687,15 +686,9 @@
 						onclick_l="leave_modal" />
 	</group>
 	
-
-
-	
-
-
-	<!-- Web box
-	<group id="webstart" posref="BR BR" w="200" h="200" active="true" >
-		<group id="content" x="0" y="0" w="200" h="200" posref="TL TL" >
-			<group type="html" id="webstart_html" posref="TL TL" 
+	<group id="webstart" posref="MM MM" w="800" h="600" active="true" >
+		<group id="content" x="0" y="0" w="800" h="600" posref="MM MM" >
+			<group id="webstart_html" type="html" posref="MM MM" 
 				url="" 
 				title_prefix="uiQuickhelpTitle"
 				sizeref="wh" x="0" y="0" w="-40" h="-40" 
@@ -739,7 +732,6 @@
 			</group>
 		</group>
 	</group>
-	-->
 
 </group>
 
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_widgets.xml
index b579cc000..097a56fc9 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/out_v2_widgets.xml
@@ -195,4 +195,4 @@
 	>
 </group>
 
-</interface_config>
\ No newline at end of file
+</interface_config>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/player.lua b/code/ryzom/client/data/gamedev/interfaces_v3/player.lua
index 5c0220fa1..52b7537b9 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/player.lua
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/player.lua
@@ -1,5 +1,12 @@
 -- In this file we define functions that serves for player windows
 
+function getDbPropU(dbEntry)
+	value = getDbProp(dbEntry)
+	if (value < 0) then
+		value = 4294967296+value
+	end
+	return value
+end
 
 ------------------------------------------------------------------------------------------------------------
 -- create the game namespace without reseting if already created in an other file.
@@ -109,9 +116,9 @@ end
 ------------------------------------------------------------------------------------------------------------
 -- Update player pvp tag
 function game:pvpTagUpdateDisplay()
-	local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
-	local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
-	local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
+	local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
+	local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
+	local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
 	local uiPlayer= getUI('ui:interface:player:header_opened');
 
 	-- get the current state
@@ -222,9 +229,9 @@ function game:updatePvpTag()
 	setDbProp('UI:TEMP:PVP_FACTION:TAG_PVP', booleanToNumber(pvpServerTag));
 
 	-- launch timer DB if necessary
-	local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
-	local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
-	local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
+	local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
+	local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
+	local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
 
 	if(pvpServerTagTimer > currentServerTick) or (pvpServerFlagTimer > currentServerTick) then
 		local ui = getUI('ui:interface:player');
@@ -252,9 +259,9 @@ function game:updatePvpTimer()
 	self:pvpTagUpdateDisplay();
 
 	-- try to stop
-	local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
-	local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
-	local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
+	local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
+	local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
+	local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
 
 	-- Manage Tag Timer display
 	if(pvpServerTagTimer <= currentServerTick) then
@@ -299,8 +306,8 @@ function game:playerTTPvp()
 
 	-- Flag mode?
 	if(buttonMode==2) then
-		local pvpServerFlagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
-		local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
+		local pvpServerFlagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT');
+		local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
 		local tempsString = game:formatTime( pvpServerFlagTimer - currentServerTick ); 
 		text = i18n.get('uittPvPModeFlag');
 		text = findReplaceAll(text, '%temps', tempsString); 
@@ -320,8 +327,8 @@ function game:playerTTPvp()
 		end
 		-- timer
 		if(buttonTimer) then
-			local pvpServerTagTimer = getDbProp('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
-			local currentServerTick = getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
+			local pvpServerTagTimer = getDbPropU('SERVER:CHARACTER_INFO:PVP_FACTION_TAG:ACTIVATION_TIME');
+			local currentServerTick = getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
 			local tempsString = game:formatTime( pvpServerTagTimer - currentServerTick ); 
 			local timeFmt= i18n.get('uittPvPTagTimer');
 			timeFmt= findReplaceAll(timeFmt, '%temps', tempsString);
@@ -402,7 +409,7 @@ function game:outpostUpdatePVPTimer(textSlot, ui)
 
 	-- Get the timer of interest (priority to player leaving the zone)
 	local	endTimer= 0;
-	local	endOfPvpTimer= getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
+	local	endOfPvpTimer= getDbPropU('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
 	if( endOfPvpTimer>0 ) then
 		endTimer= endOfPvpTimer;
 	else
@@ -415,7 +422,7 @@ function game:outpostUpdatePVPTimer(textSlot, ui)
 	-- Use a text with a timer?
 	if( endTimer>0 ) then
 		-- compute the time that lefts in sec (suppose a smooth server tick is 1 ms)
-		local curTick= getDbProp('UI:VARIABLES:CURRENT_SERVER_TICK');
+		local curTick= getDbPropU('UI:VARIABLES:CURRENT_SERVER_TICK');
 		local timeSec= (endTimer- curTick)/10;
 		-- replace in str
 		local	text= "@{FF6F}" .. runFct('secondsToTimeStringShort', timeSec);
@@ -619,8 +626,8 @@ function game:updatePlayerBonusMalus()
 	local	pvpOutpostEndOfRound= 0;
 	if(pvpOutpostPresent~=0) then
 		local	pvpOutpostLevel= 0;
-		pvpOutpostEndOfPVPFlag= getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
-		pvpOutpostEndOfRound= getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:ROUND_END_DATE');
+		pvpOutpostEndOfPVPFlag= getDbPropU('SERVER:CHARACTER_INFO:PVP_OUTPOST:FLAG_PVP_TIME_END');
+		pvpOutpostEndOfRound= getDbPropU('SERVER:CHARACTER_INFO:PVP_OUTPOST:ROUND_END_DATE');
 		-- set a level only if we have some round, and if the out timer is not set
 		if(pvpOutpostEndOfRound~=0 and pvpOutpostEndOfPVPFlag==0) then
 			pvpOutpostLevel= 1 + getDbProp('SERVER:CHARACTER_INFO:PVP_OUTPOST:ROUND_LVL_CUR');
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/player.xml b/code/ryzom/client/data/gamedev/interfaces_v3/player.xml
index ddd0866b7..b778f8533 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/player.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/player.xml
@@ -417,7 +417,7 @@
           tx_over="W_button_24_over.tga"
           w="24"
           h="24"
-          scale="true"
+          scale="false"
           global_color_normal="false"
           global_color_over="false"
           global_color_pushed="false"
@@ -488,15 +488,15 @@
       <!-- PVP Tag Button -->
       <instance template="t_pvp_tag_button"
                 id="pvp_tag_button_0"
-                tx="pvp_green.tga"
+                tx="no_pvp.tga"
                 mode="0" />
       <instance template="t_pvp_tag_button"
                 id="pvp_tag_button_1"
-                tx="pvp_orange.tga"
+                tx="pvp_tag.tga"
                 mode="1" />
       <instance template="t_pvp_tag_button"
                 id="pvp_tag_button_2"
-                tx="pvp_red.tga"
+                tx="pvp_flag.tga"
                 mode="2" />
       <!-- PVP Tag special overed pushed icon. pushed == over rotated !!. (NB: Ugly to save icon space) -->
       <view type="bitmap"
@@ -1104,7 +1104,9 @@
            global_color_over="true"
            header_color="UI:SAVE:WIN:COLORS:ANI"
            title_delta_max_w="-150"
-           title_over_extend_view_text="true">
+           title_over_extend_view_text="true"
+		   on_tooltip="userpa_name_tooltip"
+		   on_tooltip_params="#index">
       <group id="header_closed"
              h="12"
              posref="TL TL"></group>
@@ -1461,4 +1463,4 @@
     <tree node="userpa3" />
     <tree node="userpa4" />
   </tree>
-</interface_config>
\ No newline at end of file
+</interface_config>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
index 2f24561d7..a0c533c60 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/player_trade.xml
@@ -318,21 +318,53 @@
 
 
 
-<group type="container" id="accept_trade_invitation" w="260" h="512" resizer="false" pop_max_h="512"
- active="false" savable="false" openable="false" opened="true" movable="true"
- on_close_button="proc" on_close_button_params="player_decline_invitation" title_opened="uiTradeInvitation"  >
-
-	<group id="content" child_resize_h="true" child_resize_hmargin="10" >
-		<group id="inside" sizeref="w" posref="TL TL" y="-4" child_resize_h="true" child_resize_hmargin="6">
-			<view type="text_id" id="invite_phrase" posref="MM MM" x="0" y="0" color="255 255 255 255" fontsize="12" shadow="true"
-				multi_line="true" multi_line_space="0" line_maxw="250" />
+<group	type="container"
+		id="accept_trade_invitation" 
+		w="260" 
+		h="512" 
+		resizer="false" 
+		pop_max_h="512"
+		active="false"
+		savable="false"
+		openable="false"
+		opened="true"
+		movable="true"
+		on_close_button="proc"
+		on_close_button_params="player_decline_invitation"
+		title_opened="uiTradeInvitation"  >
+	<group	id="content"
+			child_resize_h="true"
+			child_resize_hmargin="10" >
+		<group	id="inside" 
+				sizeref="w" 
+				posref="TL TL" 
+				y="-4" 
+				child_resize_h="true" 
+				child_resize_hmargin="6">
+			<view	type="text_id" 
+					id="invite_phrase" 
+					posref="MM MM"
+					x="0" 
+					y="0" 
+					color="255 255 255 255" 
+					fontsize="12" 
+					shadow="true"
+					multi_line="true" 
+					multi_line_space="0" 
+					line_maxw="250" />
 		</group>
-		<instance template="button_ok_cancel" posparent="inside" posref="BR TR" x="-4" y="-4"
-					ok_text="uiAccept"	cancel_text="uiDecline"
-					onclick_ok="proc"		onclick_ok_param="player_accept_invitation" 
-					onclick_cancel="proc"	onclick_cancel_param="player_decline_invitation" />
+		<instance template="button_ok_cancel" 
+				posparent="inside"
+				posref="BR TR"
+				x="-4"
+				y="-4"
+				ok_text="uiAccept"
+				cancel_text="uiDecline"
+				onclick_ok="proc"
+				onclick_ok_param="player_accept_invitation" 
+				onclick_cancel="proc"
+				onclick_cancel_param="player_decline_invitation" />
 	</group>
-
 </group>
 
 
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/reset.xml b/code/ryzom/client/data/gamedev/interfaces_v3/reset.xml
index 6c920a76c..8ef848531 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/reset.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/reset.xml
@@ -261,6 +261,7 @@
 	<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_TOOL|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_MP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_MISSMP|value=1" />
+	<action handler="set" params="dblink=UI:SAVE:INV_BAG:FILTER_TP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA0:SORT_TYPE|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA0:ICON_LIST|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA0:FILTER_ARMOR|value=1" />
@@ -275,6 +276,7 @@
 	<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_TOOL|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_MP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_MISSMP|value=1" />
+	<action handler="set" params="dblink=UI:SAVE:INV_PA1:FILTER_TP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA2:SORT_TYPE|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA2:ICON_LIST|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_ARMOR|value=1" />
@@ -282,6 +284,7 @@
 	<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_TOOL|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_MP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_MISSMP|value=1" />
+	<action handler="set" params="dblink=UI:SAVE:INV_PA2:FILTER_TP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA3:SORT_TYPE|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA3:ICON_LIST|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_ARMOR|value=1" />
@@ -289,6 +292,7 @@
 	<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_TOOL|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_MP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_MISSMP|value=1" />
+	<action handler="set" params="dblink=UI:SAVE:INV_PA3:FILTER_TP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_GUILD:SORT_TYPE|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_GUILD:ICON_LIST|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_ARMOR|value=1" />
@@ -296,6 +300,7 @@
 	<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_TOOL|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_MP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_MISSMP|value=1" />
+	<action handler="set" params="dblink=UI:SAVE:INV_GUILD:FILTER_TP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_ROOM:SORT_TYPE|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_ROOM:ICON_LIST|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_ARMOR|value=1" />
@@ -303,6 +308,7 @@
 	<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_TOOL|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_MP|value=1" />
 	<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_MISSMP|value=1" />
+	<action handler="set" params="dblink=UI:SAVE:INV_ROOM:FILTER_TP|value=1" />
 
 	<action handler="set" params="dblink=UI:SAVE:ISDETACHED:MAIN_CHAT|value=0" />
 	<action handler="set" params="dblink=UI:SAVE:ISDETACHED:GUILD_CHAT|value=0" />
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga
index 93f67233d..2b9f1a254 100644
Binary files a/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga and b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.tga differ
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.txt b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.txt
new file mode 100644
index 000000000..11fb51519
--- /dev/null
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/texture_interfaces_v3.txt
@@ -0,0 +1,1145 @@
+r2ed_create_location.tga 0.000000000000 0.000000000000 0.195312500000 0.195312500000
+w_radar.tga 0.195312500000 0.000000000000 0.320312500000 0.125000000000
+skin_blank.tga 0.320312500000 0.000000000000 0.445312500000 0.125000000000
+skin_l1_blank.tga 0.195312500000 0.125000000000 0.320312500000 0.250000000000
+skin_header_m.tga 0.000000000000 0.250000000000 0.250000000000 0.281250000000
+r2ed_spring.tga 0.320312500000 0.125000000000 0.398437500000 0.203125000000
+r2ed_fall.tga 0.398437500000 0.125000000000 0.476562500000 0.203125000000
+r2ed_summer.tga 0.320312500000 0.203125000000 0.398437500000 0.281250000000
+r2ed_winter.tga 0.398437500000 0.203125000000 0.476562500000 0.281250000000
+r2_forest_back.tga 0.250000000000 0.250000000000 0.312500000000 0.312500000000
+r2_lakes_back.tga 0.000000000000 0.281250000000 0.062500000000 0.343750000000
+r2ed_previousLocations.tga 0.062500000000 0.281250000000 0.125000000000 0.343750000000
+r2ed_newLocation.tga 0.125000000000 0.281250000000 0.187500000000 0.343750000000
+r2ed_strictRules.tga 0.187500000000 0.281250000000 0.250000000000 0.343750000000
+r2ed_liberalRules.tga 0.312500000000 0.281250000000 0.375000000000 0.343750000000
+r2_jungle_back.tga 0.375000000000 0.281250000000 0.437500000000 0.343750000000
+r2_roots_back.tga 0.437500000000 0.281250000000 0.500000000000 0.343750000000
+r2_desert_back.tga 0.250000000000 0.312500000000 0.312500000000 0.375000000000
+r2_map_edge_arrow.tga 0.000000000000 0.375000000000 0.500000000000 0.381835937500
+W_slot_jauge_3.tga 0.000000000000 0.195312500000 0.123046875000 0.220703125000
+bulle_ia.tga 0.125000000000 0.195312500000 0.187500000000 0.242187500000
+jauge.tga 0.000000000000 0.343750000000 0.152343750000 0.359375000000
+slot_jauge.tga 0.312500000000 0.343750000000 0.464843750000 0.359375000000
+w_slot_categorie.tga 0.445312500000 0.000000000000 0.492187500000 0.046875000000
+w_slot_icon.tga 0.445312500000 0.046875000000 0.492187500000 0.093750000000
+r2_main_menu_full.tga 0.152343750000 0.343750000000 0.218750000000 0.375000000000
+r2_main_menu_full_over.tga 0.000000000000 0.382812500000 0.066406250000 0.414062500000
+r2_main_menu_full_pushed.tga 0.066406250000 0.382812500000 0.132812500000 0.414062500000
+item_selection.tga 0.132812500000 0.382812500000 0.177734375000 0.427734375000
+skin_m_open.tga 0.476562500000 0.093750000000 0.492187500000 0.218750000000
+jauge_action.tga 0.000000000000 0.222656250000 0.089843750000 0.242187500000
+slot_jauge_action.tga 0.179687500000 0.382812500000 0.269531250000 0.402343750000
+W_slot_item_selected.tga 0.269531250000 0.382812500000 0.310546875000 0.423828125000
+W_slot_item.tga 0.312500000000 0.382812500000 0.353515625000 0.423828125000
+r2ed_tool_draw_road_pushed.tga 0.355468750000 0.382812500000 0.398437500000 0.420898437500
+r2ed_tool_freeze_object.tga 0.398437500000 0.382812500000 0.441406250000 0.420898437500
+r2ed_tool_freeze_object_over.tga 0.441406250000 0.382812500000 0.484375000000 0.420898437500
+r2ed_tool_freeze_object_pushed.tga 0.179687500000 0.402343750000 0.222656250000 0.440429687500
+r2ed_tool_go_test.tga 0.222656250000 0.402343750000 0.265625000000 0.440429687500
+r2ed_tool_go_test_over.tga 0.000000000000 0.414062500000 0.042968750000 0.452148437500
+r2ed_tool_go_test_pushed.tga 0.042968750000 0.414062500000 0.085937500000 0.452148437500
+r2ed_tool_map_window.tga 0.085937500000 0.414062500000 0.128906250000 0.452148437500
+r2ed_tool_map_window_over.tga 0.355468750000 0.421875000000 0.398437500000 0.459960937500
+r2ed_tool_map_window_pushed.tga 0.398437500000 0.421875000000 0.441406250000 0.459960937500
+r2ed_tool_palette_window_over.tga 0.441406250000 0.421875000000 0.484375000000 0.459960937500
+r2ed_tool_palette_window_pushed.tga 0.265625000000 0.425781250000 0.308593750000 0.463867187500
+r2ed_tool_paste.tga 0.308593750000 0.425781250000 0.351562500000 0.463867187500
+r2ed_tool_paste_over.tga 0.128906250000 0.429687500000 0.171875000000 0.467773437500
+r2ed_tool_paste_pushed.tga 0.171875000000 0.441406250000 0.214843750000 0.479492187500
+r2ed_tool_pick.tga 0.214843750000 0.441406250000 0.257812500000 0.479492187500
+r2ed_tool_prim_display_mode.tga 0.000000000000 0.453125000000 0.042968750000 0.491210937500
+r2ed_tool_prim_display_mode_over.tga 0.042968750000 0.453125000000 0.085937500000 0.491210937500
+r2ed_tool_prim_display_mode_pushed.tga 0.085937500000 0.453125000000 0.128906250000 0.491210937500
+r2ed_tool_redo.tga 0.351562500000 0.460937500000 0.394531250000 0.499023437500
+r2ed_tool_redo_disabled.tga 0.394531250000 0.460937500000 0.437500000000 0.499023437500
+r2ed_tool_redo_over.tga 0.437500000000 0.460937500000 0.480468750000 0.499023437500
+r2ed_tool_redo_pushed.tga 0.492187500000 0.000000000000 0.535156250000 0.038085937500
+r2ed_tool_rotate.tga 0.535156250000 0.000000000000 0.578125000000 0.038085937500
+r2ed_tool_rotate_pushed.tga 0.578125000000 0.000000000000 0.621093750000 0.038085937500
+r2ed_tool_rotating.tga 0.621093750000 0.000000000000 0.664062500000 0.038085937500
+r2ed_tool_scenario_window.tga 0.664062500000 0.000000000000 0.707031250000 0.038085937500
+r2ed_tool_scenario_window_over.tga 0.707031250000 0.000000000000 0.750000000000 0.038085937500
+r2ed_tool_scenario_window_pushed.tga 0.750000000000 0.000000000000 0.792968750000 0.038085937500
+r2ed_tool_select.tga 0.792968750000 0.000000000000 0.835937500000 0.038085937500
+r2ed_tool_select_move.tga 0.835937500000 0.000000000000 0.878906250000 0.038085937500
+r2ed_tool_select_move_over.tga 0.878906250000 0.000000000000 0.921875000000 0.038085937500
+r2ed_tool_select_move_pushed.tga 0.921875000000 0.000000000000 0.964843750000 0.038085937500
+r2ed_tool_select_over.tga 0.492187500000 0.039062500000 0.535156250000 0.077148437500
+r2ed_tool_select_pushed.tga 0.535156250000 0.039062500000 0.578125000000 0.077148437500
+r2ed_tool_start.tga 0.578125000000 0.039062500000 0.621093750000 0.077148437500
+r2ed_tool_start_over.tga 0.621093750000 0.039062500000 0.664062500000 0.077148437500
+r2ed_tool_start_pushed.tga 0.664062500000 0.039062500000 0.707031250000 0.077148437500
+r2ed_tool_stop_over.tga 0.707031250000 0.039062500000 0.750000000000 0.077148437500
+r2ed_tool_stop_pushed.tga 0.750000000000 0.039062500000 0.792968750000 0.077148437500
+r2ed_tool_teleport.tga 0.792968750000 0.039062500000 0.835937500000 0.077148437500
+r2ed_tool_teleport_over.tga 0.835937500000 0.039062500000 0.878906250000 0.077148437500
+r2ed_tool_teleport_pushed.tga 0.878906250000 0.039062500000 0.921875000000 0.077148437500
+r2ed_tool_undo.tga 0.921875000000 0.039062500000 0.964843750000 0.077148437500
+r2ed_tool_undo_disabled.tga 0.492187500000 0.078125000000 0.535156250000 0.116210937500
+r2ed_tool_undo_over.tga 0.535156250000 0.078125000000 0.578125000000 0.116210937500
+r2ed_tool_undo_pushed.tga 0.578125000000 0.078125000000 0.621093750000 0.116210937500
+r2ed_tool_unfreeze_object.tga 0.621093750000 0.078125000000 0.664062500000 0.116210937500
+r2ed_tool_unfreeze_object_over.tga 0.664062500000 0.078125000000 0.707031250000 0.116210937500
+r2ed_tool_unfreeze_object_pushed.tga 0.707031250000 0.078125000000 0.750000000000 0.116210937500
+curs_scale.tga 0.750000000000 0.078125000000 0.792968750000 0.116210937500
+curs_stop.tga 0.792968750000 0.078125000000 0.835937500000 0.116210937500
+r2ed_feature_kitins_lair.tga 0.835937500000 0.078125000000 0.878906250000 0.116210937500
+r2ed_feature_kitins_lair_over.tga 0.878906250000 0.078125000000 0.921875000000 0.116210937500
+r2ed_tool_can_pick.tga 0.921875000000 0.078125000000 0.964843750000 0.116210937500
+r2ed_tool_can_rotate.tga 0.492187500000 0.117187500000 0.535156250000 0.155273437500
+r2ed_tool_can_rotate_over.tga 0.535156250000 0.117187500000 0.578125000000 0.155273437500
+r2ed_tool_can_rotate_pushed.tga 0.578125000000 0.117187500000 0.621093750000 0.155273437500
+r2ed_tool_copy.tga 0.621093750000 0.117187500000 0.664062500000 0.155273437500
+r2ed_tool_copy_over.tga 0.664062500000 0.117187500000 0.707031250000 0.155273437500
+r2ed_tool_copy_pushed.tga 0.707031250000 0.117187500000 0.750000000000 0.155273437500
+r2ed_tool_display_mode.tga 0.750000000000 0.117187500000 0.792968750000 0.155273437500
+r2ed_tool_display_mode_over.tga 0.792968750000 0.117187500000 0.835937500000 0.155273437500
+r2ed_tool_display_mode_pushed.tga 0.835937500000 0.117187500000 0.878906250000 0.155273437500
+r2_hand_can_pan.tga 0.878906250000 0.117187500000 0.921875000000 0.155273437500
+r2_hand_pan.tga 0.921875000000 0.117187500000 0.964843750000 0.155273437500
+r2_icon_dm_mode.tga 0.492187500000 0.156250000000 0.535156250000 0.194335937500
+r2_icon_dm_mode_over.tga 0.535156250000 0.156250000000 0.578125000000 0.194335937500
+r2ed_feature_kitins_lair_pushed.tga 0.578125000000 0.156250000000 0.621093750000 0.194335937500
+r2_stop_live_pushed.tga 0.621093750000 0.156250000000 0.664062500000 0.194335937500
+curs_create.tga 0.664062500000 0.156250000000 0.707031250000 0.194335937500
+curs_create_multi.tga 0.707031250000 0.156250000000 0.750000000000 0.194335937500
+curs_create_vertex_invalid.tga 0.750000000000 0.156250000000 0.792968750000 0.194335937500
+curs_default.tga 0.792968750000 0.156250000000 0.835937500000 0.194335937500
+curs_dup.tga 0.835937500000 0.156250000000 0.878906250000 0.194335937500
+curs_pan.tga 0.878906250000 0.156250000000 0.921875000000 0.194335937500
+curs_pan_dup.tga 0.921875000000 0.156250000000 0.964843750000 0.194335937500
+curs_pick.tga 0.492187500000 0.195312500000 0.535156250000 0.233398437500
+curs_pick_dup.tga 0.535156250000 0.195312500000 0.578125000000 0.233398437500
+curs_resize_bl_tr.tga 0.578125000000 0.195312500000 0.621093750000 0.233398437500
+curs_resize_br_tl.tga 0.621093750000 0.195312500000 0.664062500000 0.233398437500
+curs_resize_lr.tga 0.664062500000 0.195312500000 0.707031250000 0.233398437500
+curs_resize_tb.tga 0.707031250000 0.195312500000 0.750000000000 0.233398437500
+r2_player_admin.tga 0.750000000000 0.195312500000 0.792968750000 0.233398437500
+r2_player_admin_over.tga 0.792968750000 0.195312500000 0.835937500000 0.233398437500
+r2_player_admin_pushed.tga 0.835937500000 0.195312500000 0.878906250000 0.233398437500
+r2ed_feature_loot_spawner.tga 0.878906250000 0.195312500000 0.921875000000 0.233398437500
+r2_scenario_admin.tga 0.921875000000 0.195312500000 0.964843750000 0.233398437500
+r2_scenario_admin_over.tga 0.476562500000 0.234375000000 0.519531250000 0.272460937500
+r2_scenario_admin_pushed.tga 0.519531250000 0.234375000000 0.562500000000 0.272460937500
+r2ed_feature_loot_spawner_over.tga 0.562500000000 0.234375000000 0.605468750000 0.272460937500
+r2ed_feature_loot_spawner_pushed.tga 0.605468750000 0.234375000000 0.648437500000 0.272460937500
+r2ed_feature_timer.tga 0.648437500000 0.234375000000 0.691406250000 0.272460937500
+r2ed_feature_timer_over.tga 0.691406250000 0.234375000000 0.734375000000 0.272460937500
+r2ed_feature_timer_pushed.tga 0.734375000000 0.234375000000 0.777343750000 0.272460937500
+r2ed_tool_stop.tga 0.777343750000 0.234375000000 0.820312500000 0.272460937500
+r2ed_feature_fauna_pushed.tga 0.820312500000 0.234375000000 0.863281250000 0.272460937500
+r2ed_feature_fauna_system.tga 0.863281250000 0.234375000000 0.906250000000 0.272460937500
+curs_can_pan.tga 0.906250000000 0.234375000000 0.949218750000 0.272460937500
+r2ed_feature_fauna_system_over.tga 0.949218750000 0.234375000000 0.992187500000 0.272460937500
+r2_icon_dm_mode_pushed.tga 0.500000000000 0.273437500000 0.542968750000 0.311523437500
+curs_can_pan_dup.tga 0.542968750000 0.273437500000 0.585937500000 0.311523437500
+r2_stop_live_over.tga 0.585937500000 0.273437500000 0.628906250000 0.311523437500
+curs_rotate.tga 0.628906250000 0.273437500000 0.671875000000 0.311523437500
+r2ed_feature_fauna_over.tga 0.671875000000 0.273437500000 0.714843750000 0.311523437500
+r2ed_feature_fauna_system_pushed.tga 0.714843750000 0.273437500000 0.757812500000 0.311523437500
+r2ed_feature_bandit_camp.tga 0.757812500000 0.273437500000 0.800781250000 0.311523437500
+r2ed_feature_bandit_camp_over.tga 0.800781250000 0.273437500000 0.843750000000 0.311523437500
+r2ed_feature_bandit_camp_pushed.tga 0.843750000000 0.273437500000 0.886718750000 0.311523437500
+r2ed_feature_fauna.tga 0.886718750000 0.273437500000 0.929687500000 0.311523437500
+r2ed_tool_draw_region.tga 0.929687500000 0.273437500000 0.972656250000 0.311523437500
+r2_stop_live.tga 0.500000000000 0.312500000000 0.542968750000 0.350585937500
+r2ed_create_dialog.tga 0.542968750000 0.312500000000 0.585937500000 0.350585937500
+r2ed_create_dialog_over.tga 0.585937500000 0.312500000000 0.628906250000 0.350585937500
+r2ed_create_dialog_pushed.tga 0.628906250000 0.312500000000 0.671875000000 0.350585937500
+r2ed_tool_palette_window.tga 0.671875000000 0.312500000000 0.714843750000 0.350585937500
+r2ed_tool_rotate_over.tga 0.714843750000 0.312500000000 0.757812500000 0.350585937500
+r2ed_tool_draw_region_over.tga 0.757812500000 0.312500000000 0.800781250000 0.350585937500
+r2ed_tool_draw_region_pushed.tga 0.800781250000 0.312500000000 0.843750000000 0.350585937500
+r2ed_tool_draw_road.tga 0.843750000000 0.312500000000 0.886718750000 0.350585937500
+r2ed_tool_draw_road_over.tga 0.886718750000 0.312500000000 0.929687500000 0.350585937500
+w_ar_gilet.tga 0.929687500000 0.312500000000 0.968750000000 0.351562500000
+w_ar_hand.tga 0.500000000000 0.351562500000 0.539062500000 0.390625000000
+w_ar_helmet.tga 0.539062500000 0.351562500000 0.578125000000 0.390625000000
+hand_left.tga 0.578125000000 0.351562500000 0.617187500000 0.390625000000
+hand_right.tga 0.617187500000 0.351562500000 0.656250000000 0.390625000000
+sapload.tga 0.656250000000 0.351562500000 0.695312500000 0.390625000000
+w_ar_pantabotte.tga 0.695312500000 0.351562500000 0.734375000000 0.390625000000
+w_ar_armpad.tga 0.734375000000 0.351562500000 0.773437500000 0.390625000000
+w_ar_botte.tga 0.773437500000 0.351562500000 0.812500000000 0.390625000000
+skin_l2.tga 0.992187500000 0.000000000000 0.998046875000 0.250000000000
+r2_map_edge_stipple.tga 0.484375000000 0.390625000000 0.984375000000 0.393554687500
+r2_main_bl.tga 0.812500000000 0.351562500000 0.851562500000 0.383789062500
+W_slot_jauge_1.tga 0.851562500000 0.351562500000 0.974609375000 0.361328125000
+w_slot_blason.tga 0.484375000000 0.394531250000 0.517578125000 0.427734375000
+w_slot_blason_over.tga 0.519531250000 0.394531250000 0.552734375000 0.427734375000
+w_header_l.tga 0.851562500000 0.363281250000 0.898437500000 0.386718750000
+bg_source_mid.tga 0.000000000000 0.242187500000 0.148437500000 0.249023437500
+r2_icon_weather_pushed.tga 0.445312500000 0.093750000000 0.476562500000 0.125000000000
+Skin_scroll_H.tga 0.000000000000 0.359375000000 0.125000000000 0.367187500000
+skin_scroll_m.tga 0.964843750000 0.000000000000 0.972656250000 0.125000000000
+r2_toolbar_customize_look.tga 0.968750000000 0.312500000000 1.000000000000 0.343750000000
+r2_toolbar_customize_look_over.tga 0.218750000000 0.343750000000 0.250000000000 0.375000000000
+r2_toolbar_kill.tga 0.464843750000 0.343750000000 0.496093750000 0.375000000000
+r2_toolbar_kill_over.tga 0.554687500000 0.394531250000 0.585937500000 0.425781250000
+r2_toolbar_kill_pushed.tga 0.585937500000 0.394531250000 0.617187500000 0.425781250000
+r2_toolbar_patrol_road.tga 0.617187500000 0.394531250000 0.648437500000 0.425781250000
+r2_toolbar_patrol_road_over.tga 0.648437500000 0.394531250000 0.679687500000 0.425781250000
+r2_toolbar_patrol_road_pushed.tga 0.679687500000 0.394531250000 0.710937500000 0.425781250000
+r2_toolbar_properties.tga 0.710937500000 0.394531250000 0.742187500000 0.425781250000
+r2_toolbar_properties_over.tga 0.742187500000 0.394531250000 0.773437500000 0.425781250000
+r2_toolbar_properties_pushed.tga 0.773437500000 0.394531250000 0.804687500000 0.425781250000
+r2_toolbar_repeat_road.tga 0.804687500000 0.394531250000 0.835937500000 0.425781250000
+r2_toolbar_repeat_road_over.tga 0.835937500000 0.394531250000 0.867187500000 0.425781250000
+r2_toolbar_repeat_road_pushed.tga 0.867187500000 0.394531250000 0.898437500000 0.425781250000
+r2_toolbar_set_as_leader.tga 0.898437500000 0.394531250000 0.929687500000 0.425781250000
+r2_toolbar_set_as_leader_over.tga 0.929687500000 0.394531250000 0.960937500000 0.425781250000
+r2_toolbar_stand_still.tga 0.960937500000 0.394531250000 0.992187500000 0.425781250000
+r2_toolbar_stand_still_over.tga 0.554687500000 0.425781250000 0.585937500000 0.457031250000
+r2_toolbar_stand_still_pushed.tga 0.585937500000 0.425781250000 0.617187500000 0.457031250000
+r2_toolbar_ungroup.tga 0.617187500000 0.425781250000 0.648437500000 0.457031250000
+r2_toolbar_ungroup_over.tga 0.648437500000 0.425781250000 0.679687500000 0.457031250000
+r2_toolbar_ungroup_pushed.tga 0.679687500000 0.425781250000 0.710937500000 0.457031250000
+r2_toolbar_wander_zone.tga 0.710937500000 0.425781250000 0.742187500000 0.457031250000
+r2_toolbar_wander_zone_over.tga 0.742187500000 0.425781250000 0.773437500000 0.457031250000
+r2_toolbar_wander_zone_pushed.tga 0.773437500000 0.425781250000 0.804687500000 0.457031250000
+r2ed_toolbar_hunt_zone.tga 0.804687500000 0.425781250000 0.835937500000 0.457031250000
+r2ed_toolbar_hunt_zone_over.tga 0.835937500000 0.425781250000 0.867187500000 0.457031250000
+r2ed_toolbar_hunt_zone_pushed.tga 0.867187500000 0.425781250000 0.898437500000 0.457031250000
+r2ed_toolbar_lock.tga 0.898437500000 0.425781250000 0.929687500000 0.457031250000
+r2ed_toolbar_lock_over.tga 0.929687500000 0.425781250000 0.960937500000 0.457031250000
+curs_l.tga 0.960937500000 0.425781250000 0.992187500000 0.457031250000
+curs_L_no_mouse.tga 0.484375000000 0.429687500000 0.515625000000 0.460937500000
+r2ed_toolbar_lock_pushed.tga 0.515625000000 0.429687500000 0.546875000000 0.460937500000
+r2ed_toolbar_rest_zone.tga 0.546875000000 0.457031250000 0.578125000000 0.488281250000
+r2ed_toolbar_rest_zone_over.tga 0.578125000000 0.457031250000 0.609375000000 0.488281250000
+r2ed_toolbar_rest_zone_pushed.tga 0.609375000000 0.457031250000 0.640625000000 0.488281250000
+curs_r.tga 0.640625000000 0.457031250000 0.671875000000 0.488281250000
+r2ed_toolbar_show.tga 0.671875000000 0.457031250000 0.703125000000 0.488281250000
+r2ed_toolbar_show_over.tga 0.703125000000 0.457031250000 0.734375000000 0.488281250000
+r2ed_toolbar_show_pushed.tga 0.734375000000 0.457031250000 0.765625000000 0.488281250000
+r2ed_toolbar_unfreeze.tga 0.765625000000 0.457031250000 0.796875000000 0.488281250000
+r2ed_current_act_content_over.tga 0.796875000000 0.457031250000 0.828125000000 0.488281250000
+r2ed_current_act_content_pushed.tga 0.828125000000 0.457031250000 0.859375000000 0.488281250000
+r2ed_edit_dialog.tga 0.859375000000 0.457031250000 0.890625000000 0.488281250000
+r2ed_edit_dialog_over.tga 0.890625000000 0.457031250000 0.921875000000 0.488281250000
+r2ed_edit_dialog_pushed.tga 0.921875000000 0.457031250000 0.953125000000 0.488281250000
+r2_icon_possess.tga 0.953125000000 0.457031250000 0.984375000000 0.488281250000
+r2_icon_possess_over.tga 0.480468750000 0.460937500000 0.511718750000 0.492187500000
+r2_icon_possess_pushed.tga 0.511718750000 0.460937500000 0.542968750000 0.492187500000
+r2_icon_speak_as.tga 0.257812500000 0.464843750000 0.289062500000 0.496093750000
+r2_icon_speak_as_over.tga 0.289062500000 0.464843750000 0.320312500000 0.496093750000
+r2_icon_speak_as_pushed.tga 0.320312500000 0.464843750000 0.351562500000 0.496093750000
+r2ed_toolbar_unfreeze_over.tga 0.128906250000 0.468750000000 0.160156250000 0.500000000000
+r2ed_toolbar_unlock.tga 0.160156250000 0.480468750000 0.191406250000 0.511718750000
+r2ed_toolbar_unlock_over.tga 0.191406250000 0.480468750000 0.222656250000 0.511718750000
+r2ed_toolbar_unlock_pushed.tga 0.222656250000 0.480468750000 0.253906250000 0.511718750000
+r2_scenario.tga 0.542968750000 0.488281250000 0.574218750000 0.519531250000
+r2ed_toolbar_work_zone.tga 0.574218750000 0.488281250000 0.605468750000 0.519531250000
+r2ed_toolbar_work_zone_over.tga 0.605468750000 0.488281250000 0.636718750000 0.519531250000
+r2ed_toolbar_work_zone_pushed.tga 0.636718750000 0.488281250000 0.667968750000 0.519531250000
+r2ed_tool_new_vertex.tga 0.667968750000 0.488281250000 0.699218750000 0.519531250000
+r2ed_tool_new_vertex_over.tga 0.699218750000 0.488281250000 0.730468750000 0.519531250000
+ia_surpris.tga 0.730468750000 0.488281250000 0.761718750000 0.519531250000
+r2ed_tool_new_vertex_pushed.tga 0.761718750000 0.488281250000 0.792968750000 0.519531250000
+r2ed_permanent_content.tga 0.792968750000 0.488281250000 0.824218750000 0.519531250000
+r2ed_permanent_content_over.tga 0.824218750000 0.488281250000 0.855468750000 0.519531250000
+r2ed_toolbar_hide_pushed.tga 0.855468750000 0.488281250000 0.886718750000 0.519531250000
+r2ed_toolbar_unfreeze_pushed.tga 0.886718750000 0.488281250000 0.917968750000 0.519531250000
+r2ed_permanent_content_pushed.tga 0.917968750000 0.488281250000 0.949218750000 0.519531250000
+r2ed_current_act_content.tga 0.949218750000 0.488281250000 0.980468750000 0.519531250000
+skin_l.tga 0.972656250000 0.000000000000 0.980468750000 0.125000000000
+r2_frustum.tga 0.000000000000 0.492187500000 0.031250000000 0.523437500000
+r2ed_toolbar_feed_zone.tga 0.031250000000 0.492187500000 0.062500000000 0.523437500000
+r2ed_toolbar_feed_zone_over.tga 0.062500000000 0.492187500000 0.093750000000 0.523437500000
+r2ed_toolbar_feed_zone_pushed.tga 0.093750000000 0.492187500000 0.125000000000 0.523437500000
+r2ed_toolbar_freeze.tga 0.480468750000 0.492187500000 0.511718750000 0.523437500000
+r2ed_toolbar_freeze_over.tga 0.511718750000 0.492187500000 0.542968750000 0.523437500000
+r2ed_toolbar_freeze_pushed.tga 0.253906250000 0.496093750000 0.285156250000 0.527343750000
+r2ed_toolbar_guard_zone.tga 0.285156250000 0.496093750000 0.316406250000 0.527343750000
+r2ed_toolbar_guard_zone_over.tga 0.316406250000 0.496093750000 0.347656250000 0.527343750000
+r2ed_toolbar_guard_zone_pushed.tga 0.125000000000 0.500000000000 0.156250000000 0.531250000000
+r2ed_toolbar_hide.tga 0.347656250000 0.500000000000 0.378906250000 0.531250000000
+r2ed_toolbar_hide_over.tga 0.378906250000 0.500000000000 0.410156250000 0.531250000000
+r2ed_tool_extend_prim.tga 0.410156250000 0.500000000000 0.441406250000 0.531250000000
+r2ed_tool_extend_prim_over.tga 0.441406250000 0.500000000000 0.472656250000 0.531250000000
+r2_icon_acts.tga 0.156250000000 0.511718750000 0.187500000000 0.542968750000
+r2_icon_animation_triggers.tga 0.187500000000 0.511718750000 0.218750000000 0.542968750000
+r2_icon_acts_over.tga 0.218750000000 0.511718750000 0.250000000000 0.542968750000
+r2_icon_stop_acts.tga 0.542968750000 0.519531250000 0.574218750000 0.550781250000
+r2_icon_acts_pushed.tga 0.574218750000 0.519531250000 0.605468750000 0.550781250000
+r2_icon_add_hp.tga 0.605468750000 0.519531250000 0.636718750000 0.550781250000
+r2_toolbar_customize_look_pushed.tga 0.636718750000 0.519531250000 0.667968750000 0.550781250000
+r2_toolbar_group_pushed.tga 0.667968750000 0.519531250000 0.699218750000 0.550781250000
+r2_toolbar_set_as_leader_pushed.tga 0.699218750000 0.519531250000 0.730468750000 0.550781250000
+r2_icon_add_hp_over.tga 0.730468750000 0.519531250000 0.761718750000 0.550781250000
+r2_icon_add_hp_pushed.tga 0.761718750000 0.519531250000 0.792968750000 0.550781250000
+skin_b.tga 0.312500000000 0.359375000000 0.437500000000 0.367187500000
+r2_icon_animation_give.tga 0.792968750000 0.519531250000 0.824218750000 0.550781250000
+skin_b_open.tga 0.000000000000 0.367187500000 0.125000000000 0.375000000000
+skin_em_open.tga 0.312500000000 0.367187500000 0.437500000000 0.375000000000
+r2ed_edit_events.tga 0.824218750000 0.519531250000 0.855468750000 0.550781250000
+r2ed_edit_events_over.tga 0.855468750000 0.519531250000 0.886718750000 0.550781250000
+r2ed_edit_events_pushed.tga 0.886718750000 0.519531250000 0.917968750000 0.550781250000
+r2_icon_animation_give_over.tga 0.917968750000 0.519531250000 0.949218750000 0.550781250000
+r2_icon_animation_give_pushed.tga 0.949218750000 0.519531250000 0.980468750000 0.550781250000
+r2_icon_animation_target.tga 0.000000000000 0.523437500000 0.031250000000 0.554687500000
+r2_icon_animation_target_over.tga 0.031250000000 0.523437500000 0.062500000000 0.554687500000
+r2_icon_animation_target_pushed.tga 0.062500000000 0.523437500000 0.093750000000 0.554687500000
+r2ed_icon_stop.tga 0.093750000000 0.523437500000 0.125000000000 0.554687500000
+r2_icon_animation_triggers_over.tga 0.472656250000 0.523437500000 0.503906250000 0.554687500000
+r2_icon_animation_triggers_pushed.tga 0.503906250000 0.523437500000 0.535156250000 0.554687500000
+r2_icon_despawn.tga 0.250000000000 0.527343750000 0.281250000000 0.558593750000
+r2_icon_despawn_over.tga 0.281250000000 0.527343750000 0.312500000000 0.558593750000
+r2_icon_despawn_pushed.tga 0.312500000000 0.527343750000 0.343750000000 0.558593750000
+r2ed_tool_extend_prim_pushed.tga 0.125000000000 0.531250000000 0.156250000000 0.562500000000
+r2_toolbar_customize_over.tga 0.343750000000 0.531250000000 0.375000000000 0.562500000000
+r2_toolbar_customize_pushed.tga 0.375000000000 0.531250000000 0.406250000000 0.562500000000
+r2_toolbar_delete.tga 0.406250000000 0.531250000000 0.437500000000 0.562500000000
+r2_toolbar_delete_over.tga 0.437500000000 0.531250000000 0.468750000000 0.562500000000
+r2_toolbar_delete_pushed.tga 0.156250000000 0.542968750000 0.187500000000 0.574218750000
+r2_toolbar_follow_road.tga 0.187500000000 0.542968750000 0.218750000000 0.574218750000
+r2_toolbar_follow_road_over.tga 0.218750000000 0.542968750000 0.250000000000 0.574218750000
+r2_toolbar_follow_road_pushed.tga 0.535156250000 0.550781250000 0.566406250000 0.582031250000
+r2_toolbar_group.tga 0.566406250000 0.550781250000 0.597656250000 0.582031250000
+r2_toolbar_group_over.tga 0.597656250000 0.550781250000 0.628906250000 0.582031250000
+skin_r.tga 0.980468750000 0.000000000000 0.988281250000 0.125000000000
+r2_icon_stop_acts_over.tga 0.628906250000 0.550781250000 0.660156250000 0.582031250000
+r2_icon_stop_acts_pushed.tga 0.660156250000 0.550781250000 0.691406250000 0.582031250000
+r2_icon_stop_possess.tga 0.691406250000 0.550781250000 0.722656250000 0.582031250000
+r2_icon_stop_possess_over.tga 0.722656250000 0.550781250000 0.753906250000 0.582031250000
+r2_icon_stop_possess_pushed.tga 0.753906250000 0.550781250000 0.785156250000 0.582031250000
+r2_icon_stop_speak.tga 0.785156250000 0.550781250000 0.816406250000 0.582031250000
+r2_icon_stop_speak_over.tga 0.816406250000 0.550781250000 0.847656250000 0.582031250000
+building_state1.tga 0.847656250000 0.550781250000 0.878906250000 0.582031250000
+building_state2.tga 0.878906250000 0.550781250000 0.910156250000 0.582031250000
+r2_icon_stop_speak_pushed.tga 0.910156250000 0.550781250000 0.941406250000 0.582031250000
+skin_t.tga 0.000000000000 0.554687500000 0.125000000000 0.562500000000
+r2_icon_test_mode.tga 0.941406250000 0.550781250000 0.972656250000 0.582031250000
+r2_icon_test_mode_over.tga 0.468750000000 0.554687500000 0.500000000000 0.585937500000
+r2_icon_test_mode_pushed.tga 0.500000000000 0.554687500000 0.531250000000 0.585937500000
+r2_icon_weather.tga 0.250000000000 0.558593750000 0.281250000000 0.589843750000
+r2_allow.tga 0.281250000000 0.558593750000 0.312500000000 0.589843750000
+r2_icon_weather_over.tga 0.312500000000 0.558593750000 0.343750000000 0.589843750000
+r2ed_storm.tga 0.898437500000 0.363281250000 0.937500000000 0.386718750000
+r2ed_clouds.tga 0.937500000000 0.363281250000 0.976562500000 0.386718750000
+bg_jauge_mid.tga 0.000000000000 0.562500000000 0.125000000000 0.569335937500
+r2ed_lakes_l.tga 0.964843750000 0.125000000000 0.992187500000 0.156250000000
+r2ed_lakes_pushed_l.tga 0.964843750000 0.156250000000 0.992187500000 0.187500000000
+r2ed_jungle_l.tga 0.964843750000 0.187500000000 0.991210937500 0.218750000000
+r2ed_jungle_pushed_l.tga 0.972656250000 0.273437500000 0.999023437500 0.304687500000
+skin_header_r.tga 0.972656250000 0.550781250000 0.998046875000 0.582031250000
+r2ed_prime_roots_l.tga 0.125000000000 0.562500000000 0.150390625000 0.593750000000
+r2ed_desert_l.tga 0.343750000000 0.562500000000 0.369140625000 0.593750000000
+r2ed_desert_pushed_l.tga 0.371093750000 0.562500000000 0.396484375000 0.593750000000
+r2ed_prime_roots_pushed_l.tga 0.398437500000 0.562500000000 0.423828125000 0.593750000000
+W_trade_not_ready.tga 0.425781250000 0.562500000000 0.464843750000 0.582031250000
+slot_brick.tga 0.000000000000 0.570312500000 0.027343750000 0.597656250000
+disconnect.tga 0.027343750000 0.570312500000 0.054687500000 0.597656250000
+W_button_28_over.tga 0.054687500000 0.570312500000 0.082031250000 0.597656250000
+w_button_mode_over2.tga 0.082031250000 0.570312500000 0.109375000000 0.597656250000
+r2_tab_sequence_pushed_l.tga 0.152343750000 0.574218750000 0.179687500000 0.601562500000
+r2_tab_wide_normal_l.tga 0.179687500000 0.574218750000 0.207031250000 0.601562500000
+r2_tab_wide_pushed_l.tga 0.207031250000 0.574218750000 0.234375000000 0.601562500000
+action_balance_cred.tga 0.425781250000 0.582031250000 0.457031250000 0.605468750000
+bulle_say_l.tga 0.531250000000 0.582031250000 0.562500000000 0.605468750000
+bulle_say_r.tga 0.562500000000 0.582031250000 0.593750000000 0.605468750000
+bulle_say_tl.tga 0.593750000000 0.582031250000 0.625000000000 0.605468750000
+bulle_say_tr.tga 0.625000000000 0.582031250000 0.656250000000 0.605468750000
+bulle_think_l.tga 0.656250000000 0.582031250000 0.687500000000 0.605468750000
+bulle_think_r.tga 0.687500000000 0.582031250000 0.718750000000 0.605468750000
+W_slot_jauge_3_mini.tga 0.718750000000 0.582031250000 0.781250000000 0.593750000000
+action_balance_equal.tga 0.781250000000 0.582031250000 0.812500000000 0.605468750000
+action_balance_cost.tga 0.812500000000 0.582031250000 0.843750000000 0.605468750000
+skill_arbo_x_extend.tga 0.976562500000 0.343750000000 1.000000000000 0.375000000000
+bg_source_bot.tga 0.843750000000 0.582031250000 0.992187500000 0.586914062500
+w_slot_jauge_1_tmin.tga 0.457031250000 0.585937500000 0.515625000000 0.597656250000
+r2_main_menu_normal_l.tga 0.234375000000 0.589843750000 0.255859375000 0.621093750000
+r2_main_menu_normal_r.tga 0.257812500000 0.589843750000 0.279296875000 0.621093750000
+r2_main_menu_over_l.tga 0.281250000000 0.589843750000 0.302734375000 0.621093750000
+r2_main_menu_over_r.tga 0.304687500000 0.589843750000 0.326171875000 0.621093750000
+r2_main_menu_pushed_l.tga 0.843750000000 0.589843750000 0.865234375000 0.621093750000
+r2_main_menu_pushed_r.tga 0.867187500000 0.589843750000 0.888671875000 0.621093750000
+action_next.tga 0.890625000000 0.589843750000 0.916015625000 0.615234375000
+W_slot_spell_selected.tga 0.917968750000 0.589843750000 0.943359375000 0.615234375000
+w_slot_win_menu.tga 0.945312500000 0.589843750000 0.970703125000 0.615234375000
+W_slot_brick_selected.tga 0.972656250000 0.589843750000 0.998046875000 0.615234375000
+W_slot_spell_over.tga 0.109375000000 0.593750000000 0.134765625000 0.619140625000
+W_slot_brick.tga 0.328125000000 0.593750000000 0.353515625000 0.619140625000
+action_cycle.tga 0.355468750000 0.593750000000 0.380859375000 0.619140625000
+W_slot_spell.tga 0.382812500000 0.593750000000 0.408203125000 0.619140625000
+r2ed_forest_pushed_l.tga 0.718750000000 0.593750000000 0.739257812500 0.625000000000
+r2ed_forest_l.tga 0.742187500000 0.593750000000 0.762695312500 0.625000000000
+bg_jauge_bot.tga 0.410156250000 0.605468750000 0.535156250000 0.610351562500
+bg_source_top.tga 0.812500000000 0.386718750000 0.960937500000 0.390625000000
+TB_quit.tga 0.000000000000 0.597656250000 0.023437500000 0.621093750000
+TB_spellbook.tga 0.023437500000 0.597656250000 0.046875000000 0.621093750000
+TB_System.tga 0.046875000000 0.597656250000 0.070312500000 0.621093750000
+teammate_map.tga 0.070312500000 0.597656250000 0.093750000000 0.621093750000
+teammate_map_over.tga 0.136718750000 0.601562500000 0.160156250000 0.625000000000
+r2_palette_act.tga 0.160156250000 0.601562500000 0.183593750000 0.625000000000
+r2_palette_components.tga 0.183593750000 0.601562500000 0.207031250000 0.625000000000
+r2_palette_entities.tga 0.207031250000 0.601562500000 0.230468750000 0.625000000000
+r2_icon_stop_live_small.tga 0.535156250000 0.605468750000 0.558593750000 0.628906250000
+r2ed_down_element.tga 0.558593750000 0.605468750000 0.582031250000 0.628906250000
+r2ed_toolbar_lock_small.tga 0.582031250000 0.605468750000 0.605468750000 0.628906250000
+ency_rite_slot.tga 0.605468750000 0.605468750000 0.628906250000 0.628906250000
+r2ed_edit_dialog_over_small.tga 0.628906250000 0.605468750000 0.652343750000 0.628906250000
+r2_toolbar_repeat_road_small.tga 0.652343750000 0.605468750000 0.675781250000 0.628906250000
+r2ed_edit_dialog_pushed_small.tga 0.675781250000 0.605468750000 0.699218750000 0.628906250000
+r2_icon_new_scenario_small.tga 0.765625000000 0.605468750000 0.789062500000 0.628906250000
+r2_icon_palette_small.tga 0.789062500000 0.605468750000 0.812500000000 0.628906250000
+r2_icon_player_admin_small.tga 0.812500000000 0.605468750000 0.835937500000 0.628906250000
+forage_content.tga 0.410156250000 0.613281250000 0.433593750000 0.636718750000
+r2_icon_map_small.tga 0.433593750000 0.613281250000 0.457031250000 0.636718750000
+forage_danger.tga 0.457031250000 0.613281250000 0.480468750000 0.636718750000
+r2_toolbar_set_as_leader_small.tga 0.480468750000 0.613281250000 0.503906250000 0.636718750000
+r2_palette_objets.tga 0.503906250000 0.613281250000 0.527343750000 0.636718750000
+r2_icon_preferences.tga 0.890625000000 0.617187500000 0.914062500000 0.640625000000
+r2_icon_r2_small.tga 0.914062500000 0.617187500000 0.937500000000 0.640625000000
+r2_icon_resetwindows.tga 0.937500000000 0.617187500000 0.960937500000 0.640625000000
+r2_icon_save_small.tga 0.960937500000 0.617187500000 0.984375000000 0.640625000000
+rap_not_invited_dm.tga 0.000000000000 0.621093750000 0.023437500000 0.644531250000
+r2ed_icon_move.tga 0.023437500000 0.621093750000 0.046875000000 0.644531250000
+r2ed_icon_newactivity.tga 0.046875000000 0.621093750000 0.070312500000 0.644531250000
+r2_icon_scenario_prop.tga 0.070312500000 0.621093750000 0.093750000000 0.644531250000
+r2_icon_scenario_small.tga 0.093750000000 0.621093750000 0.117187500000 0.644531250000
+m_back.tga 0.230468750000 0.621093750000 0.253906250000 0.644531250000
+pvp_green.tga 0.253906250000 0.621093750000 0.277343750000 0.644531250000
+pvp_orange.tga 0.277343750000 0.621093750000 0.300781250000 0.644531250000
+pvp_red.tga 0.300781250000 0.621093750000 0.324218750000 0.644531250000
+r2ed_toolbar_rest_zone_small.tga 0.324218750000 0.621093750000 0.347656250000 0.644531250000
+forage_life.tga 0.347656250000 0.621093750000 0.371093750000 0.644531250000
+r2_icon_stop_test_small.tga 0.371093750000 0.621093750000 0.394531250000 0.644531250000
+lm_target.tga 0.835937500000 0.621093750000 0.859375000000 0.644531250000
+lm_target_over.tga 0.859375000000 0.621093750000 0.882812500000 0.644531250000
+lm_target_pushed.tga 0.117187500000 0.625000000000 0.140625000000 0.648437500000
+lm_user.tga 0.140625000000 0.625000000000 0.164062500000 0.648437500000
+lm_user_pushed.tga 0.164062500000 0.625000000000 0.187500000000 0.648437500000
+mektoub_map.tga 0.187500000000 0.625000000000 0.210937500000 0.648437500000
+r2ed_edit_events_over_small.tga 0.699218750000 0.625000000000 0.722656250000 0.648437500000
+mektoub_map_over.tga 0.722656250000 0.625000000000 0.746093750000 0.648437500000
+r2ed_edit_events_pushed_small.tga 0.527343750000 0.628906250000 0.550781250000 0.652343750000
+r2ed_edit_events_small.tga 0.550781250000 0.628906250000 0.574218750000 0.652343750000
+r2ed_entry_point.tga 0.574218750000 0.628906250000 0.597656250000 0.652343750000
+r2ed_entry_point_over.tga 0.597656250000 0.628906250000 0.621093750000 0.652343750000
+r2ed_entry_point_pushed.tga 0.621093750000 0.628906250000 0.644531250000 0.652343750000
+r2_palette_scenario.tga 0.644531250000 0.628906250000 0.667968750000 0.652343750000
+r2_palette_zones.tga 0.667968750000 0.628906250000 0.691406250000 0.652343750000
+r2_toolbar_stand_still_small.tga 0.746093750000 0.628906250000 0.769531250000 0.652343750000
+r2_icon_support.tga 0.769531250000 0.628906250000 0.792968750000 0.652343750000
+forage_spawn.tga 0.792968750000 0.628906250000 0.816406250000 0.652343750000
+r2ed_icon_rotate.tga 0.394531250000 0.636718750000 0.417968750000 0.660156250000
+r2ed_tool_extend_prim_small.tga 0.417968750000 0.636718750000 0.441406250000 0.660156250000
+r2ed_invalid_event_small.tga 0.441406250000 0.636718750000 0.464843750000 0.660156250000
+r2_toolbar_ungroup_small.tga 0.464843750000 0.636718750000 0.488281250000 0.660156250000
+r2ed_toolbar_show_small.tga 0.488281250000 0.636718750000 0.511718750000 0.660156250000
+r2ed_kicked_char.tga 0.882812500000 0.640625000000 0.906250000000 0.664062500000
+r2ed_edit_dialog_small.tga 0.906250000000 0.640625000000 0.929687500000 0.664062500000
+arbo_level_24.tga 0.929687500000 0.640625000000 0.953125000000 0.664062500000
+r2ed_left_sequence.tga 0.953125000000 0.640625000000 0.976562500000 0.664062500000
+r2_scenario_small.tga 0.976562500000 0.640625000000 1.000000000000 0.664062500000
+r2_toolbar_wander_zone_small.tga 0.000000000000 0.644531250000 0.023437500000 0.667968750000
+rap_invited_dm.tga 0.023437500000 0.644531250000 0.046875000000 0.667968750000
+r2ed_connected_char.tga 0.046875000000 0.644531250000 0.070312500000 0.667968750000
+rap_invited_no_dm.tga 0.070312500000 0.644531250000 0.093750000000 0.667968750000
+r2ed_toolbar_unfreeze_small.tga 0.093750000000 0.644531250000 0.117187500000 0.667968750000
+r2ed_tool_new_vertex_small.tga 0.210937500000 0.644531250000 0.234375000000 0.667968750000
+r2ed_not_current_act.tga 0.234375000000 0.644531250000 0.257812500000 0.667968750000
+r2_toolbar_customize_look_small.tga 0.257812500000 0.644531250000 0.281250000000 0.667968750000
+lm_continent.tga 0.281250000000 0.644531250000 0.304687500000 0.667968750000
+lm_continent_pushed.tga 0.304687500000 0.644531250000 0.328125000000 0.667968750000
+lm_home.tga 0.328125000000 0.644531250000 0.351562500000 0.667968750000
+lm_home_over.tga 0.351562500000 0.644531250000 0.375000000000 0.667968750000
+lm_home_pushed.tga 0.816406250000 0.644531250000 0.839843750000 0.667968750000
+r2_toolbar_delete_small.tga 0.839843750000 0.644531250000 0.863281250000 0.667968750000
+lm_mission.tga 0.117187500000 0.648437500000 0.140625000000 0.671875000000
+lm_mission_pushed.tga 0.140625000000 0.648437500000 0.164062500000 0.671875000000
+lm_over.tga 0.164062500000 0.648437500000 0.187500000000 0.671875000000
+r2_toolbar_follow_road_small.tga 0.187500000000 0.648437500000 0.210937500000 0.671875000000
+lm_respawn.tga 0.691406250000 0.648437500000 0.714843750000 0.671875000000
+lm_respawn_over.tga 0.714843750000 0.648437500000 0.738281250000 0.671875000000
+r2ed_tool_select_move_small.tga 0.511718750000 0.652343750000 0.535156250000 0.675781250000
+r2_icon_go_test_small.tga 0.535156250000 0.652343750000 0.558593750000 0.675781250000
+r2_icon_keys_small.tga 0.558593750000 0.652343750000 0.582031250000 0.675781250000
+r2_icon_light_off_small.tga 0.582031250000 0.652343750000 0.605468750000 0.675781250000
+r2_icon_light_on_small.tga 0.605468750000 0.652343750000 0.628906250000 0.675781250000
+r2_icon_load_small.tga 0.628906250000 0.652343750000 0.652343750000 0.675781250000
+r2_icon_mail_box_small.tga 0.652343750000 0.652343750000 0.675781250000 0.675781250000
+r2ed_toolbar_unlock_small.tga 0.738281250000 0.652343750000 0.761718750000 0.675781250000
+r2ed_right_sequence.tga 0.761718750000 0.652343750000 0.785156250000 0.675781250000
+r2ed_sun.tga 0.785156250000 0.652343750000 0.808593750000 0.675781250000
+r2ed_toolbar_hide_small.tga 0.375000000000 0.660156250000 0.398437500000 0.683593750000
+r2_toolbar_group_small.tga 0.398437500000 0.660156250000 0.421875000000 0.683593750000
+r2ed_toolbar_work_zone_small.tga 0.421875000000 0.660156250000 0.445312500000 0.683593750000
+r2_icon_chat_small.tga 0.445312500000 0.660156250000 0.468750000000 0.683593750000
+r2ed_permanent_content_small.tga 0.468750000000 0.660156250000 0.492187500000 0.683593750000
+W_slot_brick_disabled.tga 0.863281250000 0.664062500000 0.886718750000 0.687500000000
+r2_toolbar_kill_small.tga 0.886718750000 0.664062500000 0.910156250000 0.687500000000
+r2ed_tool_rotate_small.tga 0.910156250000 0.664062500000 0.933593750000 0.687500000000
+forage_time.tga 0.933593750000 0.664062500000 0.957031250000 0.687500000000
+r2ed_toolbar_feed_zone_small.tga 0.957031250000 0.664062500000 0.980468750000 0.687500000000
+r2ed_toolbar_hunt_zone_small.tga 0.000000000000 0.667968750000 0.023437500000 0.691406250000
+W_button_24_over.tga 0.023437500000 0.667968750000 0.046875000000 0.691406250000
+r2_toolbar_patrol_road_small.tga 0.046875000000 0.667968750000 0.070312500000 0.691406250000
+r2ed_toolbar_freeze_small.tga 0.070312500000 0.667968750000 0.093750000000 0.691406250000
+lm_respawn_pushed.tga 0.093750000000 0.667968750000 0.117187500000 0.691406250000
+arbo_close_just_one_24.tga 0.210937500000 0.667968750000 0.234375000000 0.691406250000
+ency_rite_done.tga 0.234375000000 0.667968750000 0.257812500000 0.691406250000
+r2ed_toolbar_guard_zone_small.tga 0.257812500000 0.667968750000 0.281250000000 0.691406250000
+TB_Forum_ring.tga 0.281250000000 0.667968750000 0.304687500000 0.691406250000
+TB_help.tga 0.304687500000 0.667968750000 0.328125000000 0.691406250000
+TB_identity.tga 0.328125000000 0.667968750000 0.351562500000 0.691406250000
+r2ed_current_act_content_small.tga 0.351562500000 0.667968750000 0.375000000000 0.691406250000
+r2_toolbar_properties_small.tga 0.808593750000 0.667968750000 0.832031250000 0.691406250000
+TB_interaction.tga 0.832031250000 0.667968750000 0.855468750000 0.691406250000
+r2ed_up_element.tga 0.117187500000 0.671875000000 0.140625000000 0.695312500000
+TB_inventory.tga 0.140625000000 0.671875000000 0.164062500000 0.695312500000
+TB_map.tga 0.164062500000 0.671875000000 0.187500000000 0.695312500000
+r2_allow_small.tga 0.187500000000 0.671875000000 0.210937500000 0.695312500000
+TB_missions.tga 0.675781250000 0.671875000000 0.699218750000 0.695312500000
+fame_blank.tga 0.699218750000 0.671875000000 0.738281250000 0.685546875000
+fame_arrow_down.tga 0.492187500000 0.675781250000 0.531250000000 0.689453125000
+fame_arrow_up.tga 0.531250000000 0.675781250000 0.570312500000 0.689453125000
+fame_arrow_updown.tga 0.570312500000 0.675781250000 0.609375000000 0.689453125000
+bg_jauge_top.tga 0.855468750000 0.687500000000 0.980468750000 0.691406250000
+w_slot_consider.tga 0.089843750000 0.222656250000 0.121093750000 0.238281250000
+r2_gradient.tga 0.210937500000 0.691406250000 0.335937500000 0.695312500000
+consider_1.tga 0.609375000000 0.675781250000 0.640625000000 0.691406250000
+consider_2.tga 0.640625000000 0.675781250000 0.671875000000 0.691406250000
+consider_3.tga 0.738281250000 0.675781250000 0.769531250000 0.691406250000
+consider_4.tga 0.769531250000 0.675781250000 0.800781250000 0.691406250000
+consider_5.tga 0.375000000000 0.683593750000 0.406250000000 0.699218750000
+consider_6.tga 0.406250000000 0.683593750000 0.437500000000 0.699218750000
+consider_7.tga 0.437500000000 0.683593750000 0.468750000000 0.699218750000
+w_button_32_over.tga 0.699218750000 0.687500000000 0.730468750000 0.703125000000
+r2ed_triggers_select.tga 0.468750000000 0.683593750000 0.490234375000 0.706054687500
+r2_select_menu_over_l.tga 0.984375000000 0.457031250000 0.998046875000 0.488281250000
+r2_select_menu_pushed_l.tga 0.980468750000 0.488281250000 0.994140625000 0.519531250000
+skill_arbo_son_without_son.tga 0.980468750000 0.519531250000 0.994140625000 0.550781250000
+skill_arbo_close_just_one.tga 0.980468750000 0.664062500000 0.994140625000 0.695312500000
+skill_arbo_level.tga 0.000000000000 0.691406250000 0.013671875000 0.722656250000
+skill_arbo_open_first.tga 0.015625000000 0.691406250000 0.029296875000 0.722656250000
+skill_arbo_son.tga 0.031250000000 0.691406250000 0.044921875000 0.722656250000
+skill_arbo_son_last.tga 0.046875000000 0.691406250000 0.060546875000 0.722656250000
+r2_select_menu_l.tga 0.062500000000 0.691406250000 0.076171875000 0.722656250000
+r2_icon_dialog_mini_over.tga 0.699218750000 0.605468750000 0.718750000000 0.625000000000
+r2_icon_dialog_mini_pushed.tga 0.210937500000 0.625000000000 0.230468750000 0.644531250000
+r2_icon_action_mini_over.tga 0.863281250000 0.644531250000 0.882812500000 0.664062500000
+r2_icon_reaction_mini.tga 0.078125000000 0.691406250000 0.097656250000 0.710937500000
+r2_icon_reaction_mini_over.tga 0.097656250000 0.691406250000 0.117187500000 0.710937500000
+r2_icon_reaction_mini_pushed.tga 0.335937500000 0.691406250000 0.355468750000 0.710937500000
+r2_icon_action_mini_pushed.tga 0.355468750000 0.691406250000 0.375000000000 0.710937500000
+r2ed_open_activities.tga 0.492187500000 0.691406250000 0.511718750000 0.710937500000
+r2_icon_action_mini.tga 0.511718750000 0.691406250000 0.531250000000 0.710937500000
+r2_icon_event_trigger_mini.tga 0.531250000000 0.691406250000 0.550781250000 0.710937500000
+r2_icon_event_trigger_mini_over.tga 0.550781250000 0.691406250000 0.570312500000 0.710937500000
+r2_icon_event_trigger_mini_pushed.tga 0.570312500000 0.691406250000 0.589843750000 0.710937500000
+r2_icon_dialog_mini.tga 0.589843750000 0.691406250000 0.609375000000 0.710937500000
+mp3_button_slot.tga 0.609375000000 0.691406250000 0.630859375000 0.708984375000
+w_button_mode_over.tga 0.632812500000 0.691406250000 0.646484375000 0.718750000000
+w_mode_choice.tga 0.648437500000 0.691406250000 0.662109375000 0.718750000000
+details_on.tga 0.964843750000 0.218750000000 0.988281250000 0.234375000000
+qh_on_l.tga 0.109375000000 0.570312500000 0.125000000000 0.593750000000
+qh_on_r.tga 0.093750000000 0.597656250000 0.109375000000 0.621093750000
+r2_select_bar_start_normal_l.tga 0.664062500000 0.691406250000 0.675781250000 0.722656250000
+r2_select_bar_start_normal_r.tga 0.730468750000 0.691406250000 0.742187500000 0.722656250000
+qh_off_r.tga 0.984375000000 0.617187500000 1.000000000000 0.640625000000
+mp3_vol_jauge.tga 0.148437500000 0.242187500000 0.195312500000 0.250000000000
+details_off.tga 0.125000000000 0.359375000000 0.148437500000 0.375000000000
+skin_header_l.tga 0.742187500000 0.691406250000 0.753906250000 0.722656250000
+w_button_filter_off.tga 0.437500000000 0.359375000000 0.460937500000 0.375000000000
+w_button_filter_on.tga 0.976562500000 0.375000000000 1.000000000000 0.390625000000
+qh_off_l.tga 0.753906250000 0.691406250000 0.769531250000 0.714843750000
+filter_armor.tga 0.769531250000 0.691406250000 0.792968750000 0.707031250000
+r2_select_bar_start_over_l.tga 0.792968750000 0.691406250000 0.804687500000 0.722656250000
+filter_mission.tga 0.804687500000 0.691406250000 0.828125000000 0.707031250000
+filter_mps.tga 0.828125000000 0.691406250000 0.851562500000 0.707031250000
+r2_select_bar_start_over_r.tga 0.851562500000 0.691406250000 0.863281250000 0.722656250000
+r2_select_bar_start_pushed_l.tga 0.863281250000 0.691406250000 0.875000000000 0.722656250000
+r2_select_bar_start_pushed_r.tga 0.875000000000 0.691406250000 0.886718750000 0.722656250000
+w_l0_tl_title.tga 0.886718750000 0.691406250000 0.902343750000 0.714843750000
+filter_tools.tga 0.902343750000 0.691406250000 0.925781250000 0.707031250000
+W_slot_jauge_1_mini.tga 0.457031250000 0.597656250000 0.519531250000 0.603515625000
+filter_weapon.tga 0.925781250000 0.691406250000 0.949218750000 0.707031250000
+w_button_18_over.tga 0.949218750000 0.691406250000 0.966796875000 0.708984375000
+mp3_button_pause.tga 0.816406250000 0.628906250000 0.835937500000 0.644531250000
+mp3_button_play.tga 0.375000000000 0.644531250000 0.394531250000 0.660156250000
+mp3_button_previous.tga 0.492187500000 0.660156250000 0.511718750000 0.675781250000
+Switch_Ratio.tga 0.117187500000 0.695312500000 0.136718750000 0.710937500000
+Switch_Text_Icon.tga 0.136718750000 0.695312500000 0.156250000000 0.710937500000
+mp3_button_list.tga 0.156250000000 0.695312500000 0.175781250000 0.710937500000
+mp3_button_next.tga 0.175781250000 0.695312500000 0.195312500000 0.710937500000
+mp3_button_open.tga 0.195312500000 0.695312500000 0.214843750000 0.710937500000
+mp3_button_over.tga 0.214843750000 0.695312500000 0.234375000000 0.710937500000
+w_tab_down_pushed_r.tga 0.968750000000 0.691406250000 0.980468750000 0.714843750000
+W_warning.tga 0.234375000000 0.695312500000 0.251953125000 0.710937500000
+w_expand_off.tga 0.253906250000 0.695312500000 0.265625000000 0.718750000000
+w_expand_on.tga 0.265625000000 0.695312500000 0.277343750000 0.718750000000
+w_tab_down_normal_r.tga 0.277343750000 0.695312500000 0.289062500000 0.718750000000
+w_tab_up_normal_r.tga 0.289062500000 0.695312500000 0.300781250000 0.718750000000
+w_tab_up_pushed_r.tga 0.300781250000 0.695312500000 0.312500000000 0.718750000000
+ency_step_slot.tga 0.476562500000 0.218750000000 0.492187500000 0.234375000000
+W_slot_number.tga 0.234375000000 0.574218750000 0.250000000000 0.589843750000
+W_slot_number_selected.tga 0.394531250000 0.621093750000 0.410156250000 0.636718750000
+W_slot_number_unselected.tga 0.511718750000 0.636718750000 0.527343750000 0.652343750000
+r2_icon_select.tga 0.675781250000 0.652343750000 0.691406250000 0.667968750000
+r2_glow_star.tga 0.312500000000 0.695312500000 0.328125000000 0.710937500000
+W_user_info.tga 0.675781250000 0.695312500000 0.691406250000 0.710937500000
+r2_suspension.tga 0.980468750000 0.695312500000 0.996093750000 0.710937500000
+w_zoom_in.tga 0.375000000000 0.699218750000 0.390625000000 0.714843750000
+w_zoom_out.tga 0.390625000000 0.699218750000 0.406250000000 0.714843750000
+r2ed_ring_rating_1.tga 0.406250000000 0.699218750000 0.421875000000 0.714843750000
+r2_icon_speak_as_small.tga 0.421875000000 0.699218750000 0.437500000000 0.714843750000
+r2_icon_speak_as_small_over.tga 0.437500000000 0.699218750000 0.453125000000 0.714843750000
+r2_icon_speak_as_small_pushed.tga 0.453125000000 0.699218750000 0.468750000000 0.714843750000
+w_center_map.tga 0.691406250000 0.703125000000 0.707031250000 0.718750000000
+W_close_0.tga 0.707031250000 0.703125000000 0.722656250000 0.718750000000
+r2ed_ring_rating_10.tga 0.468750000000 0.707031250000 0.484375000000 0.722656250000
+bulle_next.tga 0.769531250000 0.707031250000 0.785156250000 0.722656250000
+r2ed_ring_rating_2.tga 0.804687500000 0.707031250000 0.820312500000 0.722656250000
+r2_icon_map_invalid.tga 0.820312500000 0.707031250000 0.835937500000 0.722656250000
+w_arrow_left_0.tga 0.835937500000 0.707031250000 0.851562500000 0.722656250000
+W_arrow_right_0.tga 0.902343750000 0.707031250000 0.917968750000 0.722656250000
+W_arrow_up_0.tga 0.917968750000 0.707031250000 0.933593750000 0.722656250000
+w_back_map.tga 0.933593750000 0.707031250000 0.949218750000 0.722656250000
+W_button_16_over.tga 0.078125000000 0.710937500000 0.093750000000 0.726562500000
+r2ed_ring_rating_3.tga 0.093750000000 0.710937500000 0.109375000000 0.726562500000
+r2ed_ring_rating_4.tga 0.109375000000 0.710937500000 0.125000000000 0.726562500000
+money_seve.tga 0.125000000000 0.710937500000 0.140625000000 0.726562500000
+w_add.tga 0.140625000000 0.710937500000 0.156250000000 0.726562500000
+W_answer_16_cancel.tga 0.156250000000 0.710937500000 0.171875000000 0.726562500000
+W_answer_16_valid.tga 0.171875000000 0.710937500000 0.187500000000 0.726562500000
+W_arrow_down_0.tga 0.187500000000 0.710937500000 0.203125000000 0.726562500000
+r2ed_ring_rating_5.tga 0.203125000000 0.710937500000 0.218750000000 0.726562500000
+r2_mini_activity_chat.tga 0.218750000000 0.710937500000 0.234375000000 0.726562500000
+r2ed_ring_rating_6.tga 0.234375000000 0.710937500000 0.250000000000 0.726562500000
+W_button_default.tga 0.312500000000 0.710937500000 0.328125000000 0.726562500000
+W_button_edit.tga 0.328125000000 0.710937500000 0.343750000000 0.726562500000
+bgd_pause.tga 0.343750000000 0.710937500000 0.359375000000 0.726562500000
+r2_icon_possess_small.tga 0.359375000000 0.710937500000 0.375000000000 0.726562500000
+r2_icon_possess_small_over.tga 0.484375000000 0.710937500000 0.500000000000 0.726562500000
+r2_icon_possess_small_pushed.tga 0.500000000000 0.710937500000 0.515625000000 0.726562500000
+r2ed_ring_rating_7.tga 0.515625000000 0.710937500000 0.531250000000 0.726562500000
+r2ed_ring_rating_8.tga 0.531250000000 0.710937500000 0.546875000000 0.726562500000
+r2_mini_activity_empty_chat.tga 0.546875000000 0.710937500000 0.562500000000 0.726562500000
+r2_mini_activity_feed_zone.tga 0.562500000000 0.710937500000 0.578125000000 0.726562500000
+r2_mini_activity_follow_road.tga 0.578125000000 0.710937500000 0.593750000000 0.726562500000
+r2_mini_activity_guard_zone.tga 0.593750000000 0.710937500000 0.609375000000 0.726562500000
+r2_mini_activity_hunt_zone.tga 0.609375000000 0.710937500000 0.625000000000 0.726562500000
+r2_mini_activity_inactive.tga 0.675781250000 0.710937500000 0.691406250000 0.726562500000
+pin_off.tga 0.949218750000 0.710937500000 0.964843750000 0.726562500000
+pin_on.tga 0.980468750000 0.710937500000 0.996093750000 0.726562500000
+r2_mini_activity_patrol_road.tga 0.375000000000 0.714843750000 0.390625000000 0.730468750000
+r2_mini_activity_repeat_road.tga 0.390625000000 0.714843750000 0.406250000000 0.730468750000
+target_mission.tga 0.406250000000 0.714843750000 0.421875000000 0.730468750000
+r2_mini_activity_rest_zone.tga 0.421875000000 0.714843750000 0.437500000000 0.730468750000
+r2_mini_activity_stand_still.tga 0.437500000000 0.714843750000 0.453125000000 0.730468750000
+r2_mini_activity_wander_zone.tga 0.453125000000 0.714843750000 0.468750000000 0.730468750000
+W_rename_16.tga 0.753906250000 0.714843750000 0.769531250000 0.730468750000
+w_restore.tga 0.886718750000 0.714843750000 0.902343750000 0.730468750000
+r2_mini_activity_work_zone.tga 0.964843750000 0.714843750000 0.980468750000 0.730468750000
+r2ed_ring_rating_9.tga 0.250000000000 0.718750000000 0.265625000000 0.734375000000
+r2ed_triggers_more.tga 0.265625000000 0.718750000000 0.281250000000 0.734375000000
+r2_map_edge_test.tga 0.281250000000 0.718750000000 0.296875000000 0.734375000000
+r2ed_triggers_trash.tga 0.296875000000 0.718750000000 0.312500000000 0.734375000000
+w_button_radar_plus.tga 0.625000000000 0.718750000000 0.640625000000 0.734375000000
+bulle_quit.tga 0.640625000000 0.718750000000 0.656250000000 0.734375000000
+W_button_reset.tga 0.691406250000 0.718750000000 0.707031250000 0.734375000000
+r2_map_foot_steps.tga 0.000000000000 0.722656250000 0.031250000000 0.730468750000
+ency_step_done.tga 0.707031250000 0.718750000000 0.722656250000 0.734375000000
+w_button_10x24_over.tga 0.031250000000 0.722656250000 0.041015625000 0.746093750000
+w_button_spellock_over.tga 0.042968750000 0.722656250000 0.066406250000 0.731445312500
+w_button_spellock_on.tga 0.722656250000 0.722656250000 0.746093750000 0.731445312500
+w_button_spellock_off.tga 0.769531250000 0.722656250000 0.792968750000 0.731445312500
+r2ed_icon_permanent_group.tga 0.468750000000 0.722656250000 0.482421875000 0.736328125000
+r2ed_icon_permanent_group_creatures.tga 0.656250000000 0.722656250000 0.669921875000 0.736328125000
+r2ed_icon_permanent_macro_components.tga 0.792968750000 0.722656250000 0.806640625000 0.736328125000
+w_affected.tga 0.808593750000 0.722656250000 0.822265625000 0.736328125000
+r2ed_icon_region.tga 0.824218750000 0.722656250000 0.837890625000 0.736328125000
+W_slot_mood.tga 0.839843750000 0.722656250000 0.853515625000 0.736328125000
+r2ed_permanent_pins.tga 0.855468750000 0.722656250000 0.869140625000 0.736328125000
+w_sound_off.tga 0.871093750000 0.722656250000 0.884765625000 0.736328125000
+w_sound_on.tga 0.902343750000 0.722656250000 0.916015625000 0.736328125000
+w_button_radar_moins.tga 0.917968750000 0.722656250000 0.931640625000 0.736328125000
+w_button_14_over.tga 0.933593750000 0.722656250000 0.947265625000 0.736328125000
+w_slot_on.tga 0.066406250000 0.726562500000 0.080078125000 0.740234375000
+arbo_son_last.tga 0.082031250000 0.726562500000 0.095703125000 0.740234375000
+arbo_son_without_son.tga 0.097656250000 0.726562500000 0.111328125000 0.740234375000
+r2_icon_components_tasks.tga 0.113281250000 0.726562500000 0.126953125000 0.740234375000
+r2_icon_components_trigger.tga 0.128906250000 0.726562500000 0.142578125000 0.740234375000
+r2_icon_create.tga 0.144531250000 0.726562500000 0.158203125000 0.740234375000
+arbo_son.tga 0.160156250000 0.726562500000 0.173828125000 0.740234375000
+arbo_close_just_one.tga 0.175781250000 0.726562500000 0.189453125000 0.740234375000
+contact_chat.tga 0.191406250000 0.726562500000 0.205078125000 0.740234375000
+W_offline.tga 0.207031250000 0.726562500000 0.220703125000 0.740234375000
+w_on.tga 0.222656250000 0.726562500000 0.236328125000 0.740234375000
+W_online.tga 0.312500000000 0.726562500000 0.326171875000 0.740234375000
+w_win_close.tga 0.328125000000 0.726562500000 0.341796875000 0.740234375000
+w_win_lock.tga 0.343750000000 0.726562500000 0.357421875000 0.740234375000
+w_win_popin.tga 0.359375000000 0.726562500000 0.373046875000 0.740234375000
+w_win_popup.tga 0.484375000000 0.726562500000 0.498046875000 0.740234375000
+w_online_abroad.tga 0.500000000000 0.726562500000 0.513671875000 0.740234375000
+w_opacity_on.tga 0.515625000000 0.726562500000 0.529296875000 0.740234375000
+w_help_1.tga 0.531250000000 0.726562500000 0.544921875000 0.740234375000
+w_pad_close.tga 0.546875000000 0.726562500000 0.560546875000 0.740234375000
+arbo_open_first.tga 0.562500000000 0.726562500000 0.576171875000 0.740234375000
+animal_inventory.tga 0.578125000000 0.726562500000 0.591796875000 0.740234375000
+r2_icon_far.tga 0.593750000000 0.726562500000 0.607421875000 0.740234375000
+arbo_level.tga 0.609375000000 0.726562500000 0.623046875000 0.740234375000
+r2ed_icon_road.tga 0.671875000000 0.726562500000 0.685546875000 0.740234375000
+r2ed_icon_act.tga 0.949218750000 0.726562500000 0.962890625000 0.740234375000
+r2ed_icon_botobject.tga 0.980468750000 0.726562500000 0.994140625000 0.740234375000
+r2ed_icon_creatures.tga 0.000000000000 0.730468750000 0.013671875000 0.744140625000
+r2ed_icon_default_feature.tga 0.015625000000 0.730468750000 0.029296875000 0.744140625000
+r2ed_icon_group.tga 0.375000000000 0.730468750000 0.388671875000 0.744140625000
+r2ed_icon_group_creatures.tga 0.390625000000 0.730468750000 0.404296875000 0.744140625000
+r2ed_icon_macro_components.tga 0.406250000000 0.730468750000 0.419921875000 0.744140625000
+r2ed_permanent_node.tga 0.421875000000 0.730468750000 0.435546875000 0.744140625000
+r2_icon_properties.tga 0.437500000000 0.730468750000 0.451171875000 0.744140625000
+r2ed_icon_npc.tga 0.453125000000 0.730468750000 0.466796875000 0.744140625000
+r2ed_icon_permanent_creatures.tga 0.746093750000 0.730468750000 0.759765625000 0.744140625000
+quit_button_normal_r.tga 0.187500000000 0.195312500000 0.195312500000 0.218750000000
+quit_button_over_l.tga 0.187500000000 0.218750000000 0.195312500000 0.242187500000
+quit_button_over_r.tga 0.312500000000 0.250000000000 0.320312500000 0.273437500000
+quit_button_pushed_l.tga 0.992187500000 0.250000000000 1.000000000000 0.273437500000
+quit_button_pushed_r.tga 0.992187500000 0.390625000000 1.000000000000 0.414062500000
+r2_select_menu_r.tga 0.992187500000 0.414062500000 0.998046875000 0.445312500000
+r2_select_menu_over_r.tga 0.238281250000 0.726562500000 0.244140625000 0.757812500000
+w_slot_jauge_1_umin.tga 0.246093750000 0.734375000000 0.277343750000 0.740234375000
+r2_select_menu_pushed_r.tga 0.761718750000 0.730468750000 0.767578125000 0.761718750000
+quit_button_normal_l.tga 0.546875000000 0.429687500000 0.554687500000 0.453125000000
+target.tga 0.042968750000 0.734375000000 0.059570312500 0.745117187500
+flag-en.tga 0.515625000000 0.585937500000 0.530273437500 0.597656250000
+flag-fr.tga 0.410156250000 0.593750000000 0.424804687500 0.605468750000
+flag-de.tga 0.765625000000 0.593750000000 0.780273437500 0.605468750000
+w_trade_player_ready.tga 0.886718750000 0.730468750000 0.898437500000 0.744140625000
+num_6.tga 0.964843750000 0.730468750000 0.976562500000 0.744140625000
+num_7.tga 0.277343750000 0.734375000000 0.289062500000 0.748046875000
+W_warning_2.tga 0.289062500000 0.734375000000 0.302734375000 0.746093750000
+num_8.tga 0.625000000000 0.734375000000 0.636718750000 0.748046875000
+num_9.tga 0.636718750000 0.734375000000 0.648437500000 0.748046875000
+w_defense_normal_m.tga 0.988281250000 0.000000000000 0.992187500000 0.041015625000
+w_defense_normal_r.tga 0.988281250000 0.042968750000 0.992187500000 0.083984375000
+w_defense_r.tga 0.996093750000 0.488281250000 1.000000000000 0.529296875000
+w_defense_l.tga 0.996093750000 0.664062500000 1.000000000000 0.705078125000
+w_defense_m.tga 0.996093750000 0.707031250000 1.000000000000 0.748046875000
+w_defense_normal_l.tga 0.687500000000 0.726562500000 0.691406250000 0.767578125000
+num_0.tga 0.691406250000 0.734375000000 0.703125000000 0.748046875000
+num_1.tga 0.703125000000 0.734375000000 0.714843750000 0.748046875000
+num_2.tga 0.714843750000 0.734375000000 0.726562500000 0.748046875000
+num_3.tga 0.726562500000 0.734375000000 0.738281250000 0.748046875000
+num_4.tga 0.769531250000 0.734375000000 0.781250000000 0.748046875000
+num_5.tga 0.781250000000 0.734375000000 0.792968750000 0.748046875000
+w_trade_other_ready.tga 0.468750000000 0.738281250000 0.480468750000 0.751953125000
+W_button_12_over.tga 0.160156250000 0.468750000000 0.171875000000 0.480468750000
+W_arrow_down_1.tga 0.648437500000 0.738281250000 0.660156250000 0.750000000000
+W_mood_pow1.tga 0.660156250000 0.738281250000 0.671875000000 0.750000000000
+W_weight.tga 0.792968750000 0.738281250000 0.804687500000 0.750000000000
+W_mood_pow0.tga 0.804687500000 0.738281250000 0.816406250000 0.750000000000
+W_mood_pow2.tga 0.816406250000 0.738281250000 0.828125000000 0.750000000000
+W_mood_pow3.tga 0.828125000000 0.738281250000 0.839843750000 0.750000000000
+r2ed_triggers_little_chat.tga 0.839843750000 0.738281250000 0.851562500000 0.750000000000
+r2ed_triggers_little_less.tga 0.851562500000 0.738281250000 0.863281250000 0.750000000000
+r2ed_triggers_little_more.tga 0.863281250000 0.738281250000 0.875000000000 0.750000000000
+r2ed_triggers_little_trash.tga 0.875000000000 0.738281250000 0.886718750000 0.750000000000
+r2ed_triggers_maximize.tga 0.898437500000 0.738281250000 0.910156250000 0.750000000000
+r2ed_triggers_minimize.tga 0.910156250000 0.738281250000 0.921875000000 0.750000000000
+W_arrow_right_1.tga 0.921875000000 0.738281250000 0.933593750000 0.750000000000
+W_mood_pow5.tga 0.933593750000 0.738281250000 0.945312500000 0.750000000000
+W_scale_more_1.tga 0.062500000000 0.742187500000 0.074218750000 0.753906250000
+target_info.tga 0.074218750000 0.742187500000 0.085937500000 0.753906250000
+W_arrow_up_1.tga 0.085937500000 0.742187500000 0.097656250000 0.753906250000
+W_close_1.tga 0.097656250000 0.742187500000 0.109375000000 0.753906250000
+w_copy.tga 0.109375000000 0.742187500000 0.121093750000 0.753906250000
+W_scale_less_1.tga 0.121093750000 0.742187500000 0.132812500000 0.753906250000
+rollout_opened.tga 0.132812500000 0.742187500000 0.143554687500 0.753906250000
+rollout_closed.tga 0.144531250000 0.742187500000 0.155273437500 0.753906250000
+W_magic_sep1.tga 0.535156250000 0.523437500000 0.540039062500 0.548828125000
+W_magic_sep2.tga 0.304687500000 0.734375000000 0.309570312500 0.759765625000
+w_death.tga 0.156250000000 0.742187500000 0.168945312500 0.751953125000
+r2ed_desert_m.tga 0.988281250000 0.085937500000 0.992187500000 0.117187500000
+r2ed_prime_roots_m.tga 0.496093750000 0.343750000000 0.500000000000 0.375000000000
+r2_select_menu_pushed_m.tga 0.351562500000 0.425781250000 0.355468750000 0.457031250000
+r2ed_desert_pushed_m.tga 0.976562500000 0.730468750000 0.980468750000 0.761718750000
+r2ed_desert_pushed_r.tga 0.738281250000 0.734375000000 0.742187500000 0.765625000000
+skin_bl_open.tga 0.476562500000 0.273437500000 0.492187500000 0.281250000000
+r2ed_desert_r.tga 0.742187500000 0.734375000000 0.746093750000 0.765625000000
+skin_el_open.tga 0.972656250000 0.304687500000 0.988281250000 0.312500000000
+r2ed_forest_pushed_m.tga 0.480468750000 0.738281250000 0.484375000000 0.769531250000
+r2ed_jungle_m.tga 0.945312500000 0.738281250000 0.949218750000 0.769531250000
+r2ed_forest_pushed_r.tga 0.171875000000 0.742187500000 0.175781250000 0.773437500000
+r2ed_jungle_pushed_m.tga 0.175781250000 0.742187500000 0.179687500000 0.773437500000
+r2ed_jungle_pushed_r.tga 0.179687500000 0.742187500000 0.183593750000 0.773437500000
+r2ed_jungle_r.tga 0.183593750000 0.742187500000 0.187500000000 0.773437500000
+r2ed_forest_r.tga 0.187500000000 0.742187500000 0.191406250000 0.773437500000
+r2_main_menu_normal_m.tga 0.191406250000 0.742187500000 0.195312500000 0.773437500000
+r2ed_lakes_m.tga 0.195312500000 0.742187500000 0.199218750000 0.773437500000
+r2ed_prime_roots_pushed_m.tga 0.199218750000 0.742187500000 0.203125000000 0.773437500000
+r2ed_lakes_pushed_m.tga 0.203125000000 0.742187500000 0.207031250000 0.773437500000
+r2ed_lakes_pushed_r.tga 0.207031250000 0.742187500000 0.210937500000 0.773437500000
+r2ed_lakes_r.tga 0.210937500000 0.742187500000 0.214843750000 0.773437500000
+curs_m.tga 0.214843750000 0.742187500000 0.218750000000 0.773437500000
+r2ed_prime_roots_pushed_r.tga 0.218750000000 0.742187500000 0.222656250000 0.773437500000
+r2_select_bar_start_over_m.tga 0.222656250000 0.742187500000 0.226562500000 0.773437500000
+r2ed_prime_roots_r.tga 0.226562500000 0.742187500000 0.230468750000 0.773437500000
+r2ed_forest_m.tga 0.230468750000 0.742187500000 0.234375000000 0.773437500000
+r2_select_bar_start_pushed_m.tga 0.234375000000 0.742187500000 0.238281250000 0.773437500000
+r2_main_menu_over_m.tga 0.246093750000 0.742187500000 0.250000000000 0.773437500000
+r2_main_menu_pushed_m.tga 0.250000000000 0.742187500000 0.253906250000 0.773437500000
+r2_select_menu_m.tga 0.253906250000 0.742187500000 0.257812500000 0.773437500000
+r2_select_bar_start_normal_m.tga 0.257812500000 0.742187500000 0.261718750000 0.773437500000
+r2_select_menu_over_m.tga 0.261718750000 0.742187500000 0.265625000000 0.773437500000
+W_L0_EL_open.tga 0.484375000000 0.382812500000 0.500000000000 0.390625000000
+r2_tab_sequence_pushed_r.tga 0.542968750000 0.460937500000 0.546875000000 0.488281250000
+r2_tab_wide_pushed_m.tga 0.531250000000 0.554687500000 0.535156250000 0.582031250000
+r2_tab_wide_pushed_r.tga 0.265625000000 0.742187500000 0.269531250000 0.769531250000
+r2_tab_sequence_pushed_m.tga 0.269531250000 0.742187500000 0.273437500000 0.769531250000
+r2_tab_wide_normal_m.tga 0.273437500000 0.742187500000 0.277343750000 0.769531250000
+r2_tab_wide_normal_r.tga 0.312500000000 0.742187500000 0.316406250000 0.769531250000
+W_arrow_down_2.tga 0.316406250000 0.742187500000 0.326171875000 0.751953125000
+W_close_2.tga 0.328125000000 0.742187500000 0.337890625000 0.751953125000
+W_scale_more_2.tga 0.339843750000 0.742187500000 0.349609375000 0.751953125000
+W_arrow_up_2.tga 0.351562500000 0.742187500000 0.361328125000 0.751953125000
+W_scale_less_2.tga 0.363281250000 0.742187500000 0.373046875000 0.751953125000
+W_button_10_over.tga 0.484375000000 0.742187500000 0.494140625000 0.751953125000
+W_arrow_right_2.tga 0.496093750000 0.742187500000 0.505859375000 0.751953125000
+r2_icon_map_entity_orient.tga 0.507812500000 0.742187500000 0.516601562500 0.752929687500
+quit_button_over_m.tga 0.265625000000 0.402343750000 0.269531250000 0.425781250000
+w_header_r.tga 0.257812500000 0.441406250000 0.261718750000 0.464843750000
+w_tab_pushed_m.tga 0.261718750000 0.441406250000 0.265625000000 0.464843750000
+w_tab_pushed_r.tga 0.472656250000 0.500000000000 0.476562500000 0.523437500000
+quit_button_pushed_m.tga 0.476562500000 0.500000000000 0.480468750000 0.523437500000
+w_header_m.tga 0.468750000000 0.531250000000 0.472656250000 0.554687500000
+r2_tab_wide_over_l.tga 0.464843750000 0.562500000000 0.468750000000 0.585937500000
+w_tab_up_normal_m.tga 0.519531250000 0.742187500000 0.523437500000 0.765625000000
+w_tab_down_normal_l.tga 0.523437500000 0.742187500000 0.527343750000 0.765625000000
+w_tab_up_normal_l.tga 0.527343750000 0.742187500000 0.531250000000 0.765625000000
+w_tab_down_normal_m.tga 0.531250000000 0.742187500000 0.535156250000 0.765625000000
+qh_off_m.tga 0.535156250000 0.742187500000 0.539062500000 0.765625000000
+r2_tab_wide_over_m.tga 0.539062500000 0.742187500000 0.542968750000 0.765625000000
+r2_tab_wide_over_r.tga 0.542968750000 0.742187500000 0.546875000000 0.765625000000
+w_tab_normal_l.tga 0.546875000000 0.742187500000 0.550781250000 0.765625000000
+w_tab_normal_m.tga 0.550781250000 0.742187500000 0.554687500000 0.765625000000
+w_tab_normal_r.tga 0.554687500000 0.742187500000 0.558593750000 0.765625000000
+qh_on_m.tga 0.558593750000 0.742187500000 0.562500000000 0.765625000000
+w_tab_over_l.tga 0.562500000000 0.742187500000 0.566406250000 0.765625000000
+w_tab_over_m.tga 0.566406250000 0.742187500000 0.570312500000 0.765625000000
+quit_button_normal_m.tga 0.570312500000 0.742187500000 0.574218750000 0.765625000000
+w_l0_tr_title.tga 0.574218750000 0.742187500000 0.578125000000 0.765625000000
+w_l0_t_title.tga 0.578125000000 0.742187500000 0.582031250000 0.765625000000
+w_tab_over_r.tga 0.582031250000 0.742187500000 0.585937500000 0.765625000000
+w_tab_pushed_l.tga 0.585937500000 0.742187500000 0.589843750000 0.765625000000
+W_ico_affected_fill.tga 0.171875000000 0.429687500000 0.177734375000 0.441406250000
+W_ico_affected.tga 0.992187500000 0.445312500000 0.998046875000 0.457031250000
+w_text_button_over_l.tga 0.988281250000 0.218750000000 0.992187500000 0.234375000000
+w_text_button_over_m.tga 0.121093750000 0.222656250000 0.125000000000 0.238281250000
+w_text_button_over_r.tga 0.148437500000 0.359375000000 0.152343750000 0.375000000000
+w_text_button_pushed_l.tga 0.460937500000 0.359375000000 0.464843750000 0.375000000000
+W_scale_more_3.tga 0.312500000000 0.273437500000 0.320312500000 0.281250000000
+w_text_button_pushed_m.tga 0.128906250000 0.414062500000 0.132812500000 0.429687500000
+w_text_button_pushed_r.tga 0.253906250000 0.480468750000 0.257812500000 0.496093750000
+r2ed_triggers_corner.tga 0.492187500000 0.273437500000 0.500000000000 0.281250000000
+r2ed_tool_border.tga 0.988281250000 0.304687500000 0.996093750000 0.312500000000
+W_L0_M_open.tga 0.089843750000 0.238281250000 0.105468750000 0.242187500000
+r2ed_tool_corner.tga 0.968750000000 0.343750000000 0.976562500000 0.351562500000
+r2ed_tool_corner_select.tga 0.992187500000 0.582031250000 1.000000000000 0.589843750000
+r2ed_tool_corner_select_g.tga 0.136718750000 0.593750000000 0.144531250000 0.601562500000
+W_L1_BL.tga 0.105468750000 0.238281250000 0.121093750000 0.242187500000
+W_L1_BL_open.tga 0.960937500000 0.386718750000 0.976562500000 0.390625000000
+W_L1_E_open.tga 0.328125000000 0.589843750000 0.343750000000 0.593750000000
+W_L2_BL.tga 0.117187500000 0.621093750000 0.132812500000 0.625000000000
+W_L2_BL_open.tga 0.746093750000 0.625000000000 0.761718750000 0.628906250000
+W_L2_E_open.tga 0.675781250000 0.667968750000 0.691406250000 0.671875000000
+W_L2_M_open.tga 0.589843750000 0.742187500000 0.605468750000 0.746093750000
+r2ed_tool_border_select.tga 0.144531250000 0.593750000000 0.152343750000 0.601562500000
+r2ed_tool_border_select_g.tga 0.519531250000 0.597656250000 0.527343750000 0.605468750000
+skin_l1_bl_open.tga 0.605468750000 0.742187500000 0.621093750000 0.746093750000
+W_point.tga 0.835937500000 0.605468750000 0.843750000000 0.613281250000
+W_button_08_over.tga 0.527343750000 0.613281250000 0.535156250000 0.621093750000
+skin_l1_e_open.tga 0.671875000000 0.742187500000 0.687500000000 0.746093750000
+W_close_3.tga 0.835937500000 0.613281250000 0.843750000000 0.621093750000
+cm_b.tga 0.527343750000 0.621093750000 0.535156250000 0.628906250000
+cm_bl.tga 0.882812500000 0.621093750000 0.890625000000 0.628906250000
+r2ed_island_border.tga 0.691406250000 0.628906250000 0.699218750000 0.636718750000
+W_hl_b.tga 0.882812500000 0.628906250000 0.890625000000 0.636718750000
+W_hl_bl.tga 0.691406250000 0.636718750000 0.699218750000 0.644531250000
+skin_sep_l.tga 0.808593750000 0.652343750000 0.816406250000 0.660156250000
+skin_sep_r.tga 0.808593750000 0.660156250000 0.816406250000 0.667968750000
+W_hl_br.tga 0.855468750000 0.667968750000 0.863281250000 0.675781250000
+skin_tl.tga 0.800781250000 0.675781250000 0.808593750000 0.683593750000
+skin_tr.tga 0.855468750000 0.675781250000 0.863281250000 0.683593750000
+W_hl_l.tga 0.800781250000 0.683593750000 0.808593750000 0.691406250000
+W_hl_r.tga 0.328125000000 0.695312500000 0.335937500000 0.703125000000
+W_hl_t.tga 0.691406250000 0.695312500000 0.699218750000 0.703125000000
+W_hl_tl.tga 0.328125000000 0.703125000000 0.335937500000 0.710937500000
+W_hl_tr.tga 0.722656250000 0.703125000000 0.730468750000 0.710937500000
+r2ed_island_corner.tga 0.785156250000 0.707031250000 0.792968750000 0.714843750000
+cm_br.tga 0.625000000000 0.710937500000 0.632812500000 0.718750000000
+cm_l.tga 0.722656250000 0.710937500000 0.730468750000 0.718750000000
+cm_link_hor.tga 0.785156250000 0.714843750000 0.792968750000 0.722656250000
+cm_link_vert.tga 0.746093750000 0.722656250000 0.753906250000 0.730468750000
+cm_m.tga 0.949218750000 0.742187500000 0.957031250000 0.750000000000
+cm_r.tga 0.957031250000 0.742187500000 0.964843750000 0.750000000000
+cm_t.tga 0.980468750000 0.742187500000 0.988281250000 0.750000000000
+cm_tl.tga 0.988281250000 0.742187500000 0.996093750000 0.750000000000
+cm_tr.tga 0.000000000000 0.746093750000 0.007812500000 0.753906250000
+compas_l.tga 0.250000000000 0.511718750000 0.253906250000 0.527343750000
+r2_icon_map_entity_small.tga 0.007812500000 0.746093750000 0.015625000000 0.753906250000
+r2_icon_map_entity_small_highlight.tga 0.015625000000 0.746093750000 0.023437500000 0.753906250000
+w_l0_lock.tga 0.023437500000 0.746093750000 0.031250000000 0.753906250000
+W_L1_M_open.tga 0.031250000000 0.746093750000 0.046875000000 0.750000000000
+compas_m.tga 0.996093750000 0.531250000000 1.000000000000 0.546875000000
+W_scale_less_3.tga 0.046875000000 0.746093750000 0.054687500000 0.753906250000
+r2_icon_map_invalid_small.tga 0.054687500000 0.746093750000 0.062500000000 0.753906250000
+skin_bl.tga 0.289062500000 0.746093750000 0.296875000000 0.753906250000
+W_arrow_down_3.tga 0.296875000000 0.746093750000 0.304687500000 0.753906250000
+compas_r.tga 0.230468750000 0.601562500000 0.234375000000 0.617187500000
+W_button_10_choice.tga 0.375000000000 0.746093750000 0.382812500000 0.753906250000
+skin_br.tga 0.382812500000 0.746093750000 0.390625000000 0.753906250000
+skin_br_open.tga 0.390625000000 0.746093750000 0.398437500000 0.753906250000
+W_arrow_right_3.tga 0.398437500000 0.746093750000 0.406250000000 0.753906250000
+skin_l1_m_open.tga 0.406250000000 0.746093750000 0.421875000000 0.750000000000
+r2ed_triggers_border.tga 0.421875000000 0.746093750000 0.429687500000 0.753906250000
+skin_l1_bl.tga 0.429687500000 0.746093750000 0.445312500000 0.750000000000
+W_arrow_up_3.tga 0.445312500000 0.746093750000 0.453125000000 0.753906250000
+skin_er_open.tga 0.453125000000 0.746093750000 0.460937500000 0.753906250000
+w_special_bl.tga 0.460937500000 0.746093750000 0.468750000000 0.753906250000
+w_special_blank.tga 0.589843750000 0.746093750000 0.597656250000 0.753906250000
+w_special_br.tga 0.597656250000 0.746093750000 0.605468750000 0.753906250000
+w_special_tr.tga 0.605468750000 0.746093750000 0.613281250000 0.753906250000
+w_text_button_normal_l.tga 0.671875000000 0.675781250000 0.675781250000 0.691406250000
+w_text_button_normal_m.tga 0.621093750000 0.742187500000 0.625000000000 0.757812500000
+W_L0_BL.tga 0.671875000000 0.746093750000 0.687500000000 0.750000000000
+W_L0_BL_open.tga 0.746093750000 0.746093750000 0.761718750000 0.750000000000
+w_text_button_normal_r.tga 0.613281250000 0.746093750000 0.617187500000 0.761718750000
+W_quantity.tga 0.886718750000 0.746093750000 0.892578125000 0.753906250000
+Numbers_sep.tga 0.964843750000 0.746093750000 0.969726562500 0.753906250000
+Numbers_0.tga 0.031250000000 0.750000000000 0.036132812500 0.757812500000
+Numbers_1.tga 0.039062500000 0.750000000000 0.043945312500 0.757812500000
+Numbers_2.tga 0.277343750000 0.750000000000 0.282226562500 0.757812500000
+Numbers_3.tga 0.406250000000 0.750000000000 0.411132812500 0.757812500000
+Numbers_4.tga 0.414062500000 0.750000000000 0.418945312500 0.757812500000
+Numbers_5.tga 0.429687500000 0.750000000000 0.434570312500 0.757812500000
+Numbers_6.tga 0.437500000000 0.750000000000 0.442382812500 0.757812500000
+Numbers_7.tga 0.625000000000 0.750000000000 0.629882812500 0.757812500000
+Numbers_8.tga 0.632812500000 0.750000000000 0.637695312500 0.757812500000
+Numbers_9.tga 0.640625000000 0.750000000000 0.645507812500 0.757812500000
+r2ed_island_corner_select.tga 0.648437500000 0.750000000000 0.654296875000 0.755859375000
+r2ed_island_border_select.tga 0.656250000000 0.750000000000 0.662109375000 0.755859375000
+typo_m.tga 0.664062500000 0.750000000000 0.669921875000 0.755859375000
+typo_q.tga 0.671875000000 0.750000000000 0.677734375000 0.755859375000
+typo_v.tga 0.679687500000 0.750000000000 0.685546875000 0.755859375000
+typo_w.tga 0.691406250000 0.750000000000 0.697265625000 0.755859375000
+typo_y.tga 0.699218750000 0.750000000000 0.705078125000 0.755859375000
+W_scroll_L123_M.tga 0.984375000000 0.390625000000 0.992187500000 0.394531250000
+skin_scroll_t.tga 0.546875000000 0.453125000000 0.554687500000 0.457031250000
+W_scroll_L123_T.tga 0.457031250000 0.582031250000 0.464843750000 0.585937500000
+skin_sep_m.tga 0.882812500000 0.636718750000 0.890625000000 0.640625000000
+Skin_scroll_R.tga 0.988281250000 0.117187500000 0.992187500000 0.125000000000
+w_scroll_m.tga 0.996093750000 0.304687500000 1.000000000000 0.312500000000
+w_scroll_r.tga 0.125000000000 0.492187500000 0.128906250000 0.500000000000
+w_special_b.tga 0.156250000000 0.500000000000 0.160156250000 0.507812500000
+w_special_l.tga 0.691406250000 0.644531250000 0.699218750000 0.648437500000
+w_special_r.tga 0.738281250000 0.648437500000 0.746093750000 0.652343750000
+w_special_t.tga 0.152343750000 0.562500000000 0.156250000000 0.570312500000
+Skin_scroll_L.tga 0.527343750000 0.597656250000 0.531250000000 0.605468750000
+skin_scroll_b.tga 0.855468750000 0.683593750000 0.863281250000 0.687500000000
+w_scroll_l.tga 0.250000000000 0.710937500000 0.253906250000 0.718750000000
+W_scroll_L0_B.tga 0.730468750000 0.687500000000 0.738281250000 0.691406250000
+W_scroll_L0_M.tga 0.484375000000 0.707031250000 0.492187500000 0.710937500000
+W_scroll_L0_T.tga 0.656250000000 0.718750000000 0.664062500000 0.722656250000
+W_scroll_L123_B.tga 0.722656250000 0.718750000000 0.730468750000 0.722656250000
+W_L0_EM_open.tga 0.246093750000 0.726562500000 0.250000000000 0.734375000000
+W_L0_ER_open.tga 0.898437500000 0.730468750000 0.902343750000 0.738281250000
+typo_6.tga 0.707031250000 0.750000000000 0.711914062500 0.755859375000
+typo_question.tga 0.714843750000 0.750000000000 0.719726562500 0.755859375000
+typo_r.tga 0.722656250000 0.750000000000 0.727539062500 0.755859375000
+typo_u.tga 0.730468750000 0.750000000000 0.735351562500 0.755859375000
+typo_7.tga 0.746093750000 0.750000000000 0.750976562500 0.755859375000
+typo_8.tga 0.753906250000 0.750000000000 0.758789062500 0.755859375000
+typo_x.tga 0.769531250000 0.750000000000 0.774414062500 0.755859375000
+typo_9.tga 0.777343750000 0.750000000000 0.782226562500 0.755859375000
+typo_a.tga 0.785156250000 0.750000000000 0.790039062500 0.755859375000
+typo_0.tga 0.792968750000 0.750000000000 0.797851562500 0.755859375000
+typo_2.tga 0.800781250000 0.750000000000 0.805664062500 0.755859375000
+typo_b.tga 0.808593750000 0.750000000000 0.813476562500 0.755859375000
+typo_3.tga 0.816406250000 0.750000000000 0.821289062500 0.755859375000
+typo_4.tga 0.824218750000 0.750000000000 0.829101562500 0.755859375000
+typo_d.tga 0.832031250000 0.750000000000 0.836914062500 0.755859375000
+typo_g.tga 0.839843750000 0.750000000000 0.844726562500 0.755859375000
+typo_h.tga 0.847656250000 0.750000000000 0.852539062500 0.755859375000
+typo_k.tga 0.855468750000 0.750000000000 0.860351562500 0.755859375000
+typo_5.tga 0.863281250000 0.750000000000 0.868164062500 0.755859375000
+typo_n.tga 0.871093750000 0.750000000000 0.875976562500 0.755859375000
+typo_o.tga 0.878906250000 0.750000000000 0.883789062500 0.755859375000
+typo_p.tga 0.894531250000 0.750000000000 0.899414062500 0.755859375000
+infos_top.tga 0.066406250000 0.722656250000 0.073242187500 0.726562500000
+infos_bot.tga 0.648437500000 0.734375000000 0.655273437500 0.738281250000
+infos_mid.tga 0.902343750000 0.750000000000 0.909179687500 0.753906250000
+w_radar_point.tga 0.910156250000 0.750000000000 0.915039062500 0.754882812500
+bulle_tr.tga 0.917968750000 0.750000000000 0.922851562500 0.754882812500
+bulle_bl.tga 0.925781250000 0.750000000000 0.930664062500 0.754882812500
+bulle_br.tga 0.933593750000 0.750000000000 0.938476562500 0.754882812500
+bulle_tl.tga 0.949218750000 0.750000000000 0.954101562500 0.754882812500
+typo_l.tga 0.062500000000 0.734375000000 0.066406250000 0.740234375000
+typo_s.tga 0.617187500000 0.746093750000 0.621093750000 0.751953125000
+typo_t.tga 0.972656250000 0.746093750000 0.976562500000 0.751953125000
+typo_f.tga 0.285156250000 0.750000000000 0.289062500000 0.755859375000
+typo_c.tga 0.941406250000 0.750000000000 0.945312500000 0.755859375000
+typo_1.tga 0.957031250000 0.750000000000 0.960937500000 0.755859375000
+typo_i.tga 0.960937500000 0.750000000000 0.964843750000 0.755859375000
+typo_j.tga 0.980468750000 0.750000000000 0.984375000000 0.755859375000
+typo_z.tga 0.984375000000 0.750000000000 0.988281250000 0.755859375000
+typo_e.tga 0.988281250000 0.750000000000 0.992187500000 0.755859375000
+W_L1_L.tga 0.121093750000 0.238281250000 0.125000000000 0.242187500000
+W_L1_R.tga 0.351562500000 0.457031250000 0.355468750000 0.460937500000
+W_L1_T.tga 0.347656250000 0.496093750000 0.351562500000 0.500000000000
+W_L1_TL.tga 0.156250000000 0.507812500000 0.160156250000 0.511718750000
+W_L1_TR.tga 0.343750000000 0.527343750000 0.347656250000 0.531250000000
+W_L2_B.tga 0.996093750000 0.546875000000 1.000000000000 0.550781250000
+W_box_bot.tga 0.152343750000 0.570312500000 0.156250000000 0.574218750000
+w_l2_blank.tga 0.230468750000 0.617187500000 0.234375000000 0.621093750000
+W_box_bot_left.tga 0.132812500000 0.621093750000 0.136718750000 0.625000000000
+W_L2_BR.tga 0.761718750000 0.625000000000 0.765625000000 0.628906250000
+W_L2_BR_open.tga 0.964843750000 0.710937500000 0.968750000000 0.714843750000
+W_L2_B_open.tga 0.074218750000 0.722656250000 0.078125000000 0.726562500000
+r2ed_dismatch_filter.tga 0.671875000000 0.722656250000 0.675781250000 0.726562500000
+W_L2_L.tga 0.894531250000 0.746093750000 0.898437500000 0.750000000000
+W_box_bot_right.tga 0.992187500000 0.750000000000 0.996093750000 0.753906250000
+W_L2_R.tga 0.996093750000 0.750000000000 1.000000000000 0.753906250000
+W_L2_T.tga 0.000000000000 0.753906250000 0.003906250000 0.757812500000
+W_L2_TL.tga 0.003906250000 0.753906250000 0.007812500000 0.757812500000
+W_L2_TR.tga 0.007812500000 0.753906250000 0.011718750000 0.757812500000
+W_box_left.tga 0.011718750000 0.753906250000 0.015625000000 0.757812500000
+W_box_right.tga 0.015625000000 0.753906250000 0.019531250000 0.757812500000
+W_box_top.tga 0.019531250000 0.753906250000 0.023437500000 0.757812500000
+W_box_top_left.tga 0.023437500000 0.753906250000 0.027343750000 0.757812500000
+W_box_top_right.tga 0.027343750000 0.753906250000 0.031250000000 0.757812500000
+alpha_50.tga 0.046875000000 0.753906250000 0.050781250000 0.757812500000
+skin_l1_l.tga 0.050781250000 0.753906250000 0.054687500000 0.757812500000
+fame_bar_3d.tga 0.054687500000 0.753906250000 0.055664062500 0.769531250000
+skin_l1_r.tga 0.058593750000 0.753906250000 0.062500000000 0.757812500000
+blank.tga 0.062500000000 0.753906250000 0.066406250000 0.757812500000
+blank2.tga 0.066406250000 0.753906250000 0.070312500000 0.757812500000
+skin_l1_t.tga 0.070312500000 0.753906250000 0.074218750000 0.757812500000
+skin_l1_tl.tga 0.074218750000 0.753906250000 0.078125000000 0.757812500000
+alpha_60.tga 0.078125000000 0.753906250000 0.082031250000 0.757812500000
+skin_l2_r.tga 0.082031250000 0.753906250000 0.085937500000 0.757812500000
+skin_l3_r.tga 0.085937500000 0.753906250000 0.089843750000 0.757812500000
+skin_modal_b.tga 0.089843750000 0.753906250000 0.093750000000 0.757812500000
+w_hl_bl_l123.tga 0.093750000000 0.753906250000 0.097656250000 0.757812500000
+skin_modal_bl.tga 0.097656250000 0.753906250000 0.101562500000 0.757812500000
+w_hl_br_l123.tga 0.101562500000 0.753906250000 0.105468750000 0.757812500000
+w_hl_b_l123.tga 0.105468750000 0.753906250000 0.109375000000 0.757812500000
+skin_modal_br.tga 0.109375000000 0.753906250000 0.113281250000 0.757812500000
+w_hl_l_l123.tga 0.113281250000 0.753906250000 0.117187500000 0.757812500000
+skin_modal_l.tga 0.117187500000 0.753906250000 0.121093750000 0.757812500000
+w_hl_r_l123.tga 0.121093750000 0.753906250000 0.125000000000 0.757812500000
+skin_modal_r.tga 0.125000000000 0.753906250000 0.128906250000 0.757812500000
+skin_modal_t.tga 0.128906250000 0.753906250000 0.132812500000 0.757812500000
+w_hl_tl_l123.tga 0.132812500000 0.753906250000 0.136718750000 0.757812500000
+skin_modal_tl.tga 0.136718750000 0.753906250000 0.140625000000 0.757812500000
+w_hl_tr_l123.tga 0.140625000000 0.753906250000 0.144531250000 0.757812500000
+skin_modal_tr.tga 0.144531250000 0.753906250000 0.148437500000 0.757812500000
+alpha_70.tga 0.148437500000 0.753906250000 0.152343750000 0.757812500000
+alpha_80.tga 0.152343750000 0.753906250000 0.156250000000 0.757812500000
+W_L3_BL.tga 0.156250000000 0.753906250000 0.160156250000 0.757812500000
+w_l3_blank.tga 0.160156250000 0.753906250000 0.164062500000 0.757812500000
+W_L3_BR.tga 0.164062500000 0.753906250000 0.167968750000 0.757812500000
+W_L3_L.tga 0.167968750000 0.753906250000 0.171875000000 0.757812500000
+W_L3_R.tga 0.289062500000 0.753906250000 0.292968750000 0.757812500000
+W_L3_T.tga 0.292968750000 0.753906250000 0.296875000000 0.757812500000
+W_L3_TL.tga 0.296875000000 0.753906250000 0.300781250000 0.757812500000
+W_L3_TR.tga 0.300781250000 0.753906250000 0.304687500000 0.757812500000
+grey_0.tga 0.316406250000 0.753906250000 0.320312500000 0.757812500000
+r2ed_triggers_gray.tga 0.320312500000 0.753906250000 0.324218750000 0.757812500000
+W_modal_B.tga 0.324218750000 0.753906250000 0.328125000000 0.757812500000
+W_modal_BL.tga 0.328125000000 0.753906250000 0.332031250000 0.757812500000
+W_modal_blank.tga 0.332031250000 0.753906250000 0.335937500000 0.757812500000
+W_modal_BR.tga 0.335937500000 0.753906250000 0.339843750000 0.757812500000
+W_modal_L.tga 0.339843750000 0.753906250000 0.343750000000 0.757812500000
+W_modal_R.tga 0.343750000000 0.753906250000 0.347656250000 0.757812500000
+W_modal_T.tga 0.347656250000 0.753906250000 0.351562500000 0.757812500000
+W_modal_TL.tga 0.351562500000 0.753906250000 0.355468750000 0.757812500000
+W_modal_TR.tga 0.355468750000 0.753906250000 0.359375000000 0.757812500000
+grey_10.tga 0.359375000000 0.753906250000 0.363281250000 0.757812500000
+grey_100.tga 0.363281250000 0.753906250000 0.367187500000 0.757812500000
+grey_20.tga 0.367187500000 0.753906250000 0.371093750000 0.757812500000
+grey_30.tga 0.371093750000 0.753906250000 0.375000000000 0.757812500000
+grey_40.tga 0.375000000000 0.753906250000 0.378906250000 0.757812500000
+grey_50.tga 0.378906250000 0.753906250000 0.382812500000 0.757812500000
+grey_60.tga 0.382812500000 0.753906250000 0.386718750000 0.757812500000
+grey_70.tga 0.386718750000 0.753906250000 0.390625000000 0.757812500000
+w_hl_t_l123.tga 0.390625000000 0.753906250000 0.394531250000 0.757812500000
+grey_80.tga 0.394531250000 0.753906250000 0.398437500000 0.757812500000
+grey_90.tga 0.398437500000 0.753906250000 0.402343750000 0.757812500000
+W_L3_B.tga 0.402343750000 0.753906250000 0.406250000000 0.757812500000
+r2ed_triggers_blank.tga 0.421875000000 0.753906250000 0.425781250000 0.757812500000
+alpha_10.tga 0.425781250000 0.753906250000 0.429687500000 0.757812500000
+skin_l1_b.tga 0.445312500000 0.753906250000 0.449218750000 0.757812500000
+alpha_20.tga 0.449218750000 0.753906250000 0.453125000000 0.757812500000
+w_l0_l_over.tga 0.453125000000 0.753906250000 0.457031250000 0.757812500000
+r2ed_triggers_little_border.tga 0.457031250000 0.753906250000 0.460937500000 0.757812500000
+r2ed_little_island_border_select.tga 0.460937500000 0.753906250000 0.464843750000 0.757812500000
+r2ed_triggers_little_corner.tga 0.464843750000 0.753906250000 0.468750000000 0.757812500000
+W_L0_R.tga 0.468750000000 0.753906250000 0.472656250000 0.757812500000
+w_l0_r_over.tga 0.472656250000 0.753906250000 0.476562500000 0.757812500000
+W_L0_T.tga 0.476562500000 0.753906250000 0.480468750000 0.757812500000
+W_L0_TL.tga 0.484375000000 0.753906250000 0.488281250000 0.757812500000
+w_l0_tl_over.tga 0.488281250000 0.753906250000 0.492187500000 0.757812500000
+r2ed_little_island_corner_select.tga 0.492187500000 0.753906250000 0.496093750000 0.757812500000
+W_L0_TR.tga 0.496093750000 0.753906250000 0.500000000000 0.757812500000
+w_l0_tr_over.tga 0.500000000000 0.753906250000 0.503906250000 0.757812500000
+alpha_30.tga 0.503906250000 0.753906250000 0.507812500000 0.757812500000
+w_l0_t_over.tga 0.507812500000 0.753906250000 0.511718750000 0.757812500000
+alpha_40.tga 0.511718750000 0.753906250000 0.515625000000 0.757812500000
+W_L123_blank.tga 0.515625000000 0.753906250000 0.519531250000 0.757812500000
+W_L1_B.tga 0.589843750000 0.753906250000 0.593750000000 0.757812500000
+r2ed_tool_bg.tga 0.593750000000 0.753906250000 0.597656250000 0.757812500000
+w_l1_blank.tga 0.597656250000 0.753906250000 0.601562500000 0.757812500000
+W_L0_B.tga 0.601562500000 0.753906250000 0.605468750000 0.757812500000
+skin_l1_b_open.tga 0.605468750000 0.753906250000 0.609375000000 0.757812500000
+W_L0_blank.tga 0.609375000000 0.753906250000 0.613281250000 0.757812500000
+W_L1_BR.tga 0.617187500000 0.753906250000 0.621093750000 0.757812500000
+w_l0_bl_over.tga 0.886718750000 0.753906250000 0.890625000000 0.757812500000
+W_L0_BR.tga 0.890625000000 0.753906250000 0.894531250000 0.757812500000
+W_L0_BR_open.tga 0.902343750000 0.753906250000 0.906250000000 0.757812500000
+w_l0_br_over.tga 0.906250000000 0.753906250000 0.910156250000 0.757812500000
+W_L0_B_open.tga 0.964843750000 0.753906250000 0.968750000000 0.757812500000
+w_l0_b_over.tga 0.968750000000 0.753906250000 0.972656250000 0.757812500000
+W_L1_BR_open.tga 0.972656250000 0.753906250000 0.976562500000 0.757812500000
+W_L1_B_open.tga 0.992187500000 0.753906250000 0.996093750000 0.757812500000
+W_box_blank.tga 0.996093750000 0.753906250000 1.000000000000 0.757812500000
+W_L0_L.tga 0.000000000000 0.757812500000 0.003906250000 0.761718750000
+w_jauge_fill_tmin.tga 0.003906250000 0.757812500000 0.004882812500 0.767578125000
+bulle_l.tga 0.007812500000 0.757812500000 0.012695312500 0.759765625000
+bulle_t.tga 0.015625000000 0.757812500000 0.017578125000 0.762695312500
+bulle_r.tga 0.019531250000 0.757812500000 0.024414062500 0.759765625000
+bulle_b.tga 0.027343750000 0.757812500000 0.029296875000 0.762695312500
+w_line_hor3.tga 0.031250000000 0.757812500000 0.033203125000 0.761718750000
+r2_map_zone_edge.tga 0.035156250000 0.757812500000 0.037109375000 0.760742187500
+w_l1_r_spe.tga 0.039062500000 0.757812500000 0.042968750000 0.758789062500
+bulle_m.tga 0.042968750000 0.757812500000 0.044921875000 0.759765625000
+w_l1_spe_blank.tga 0.046875000000 0.757812500000 0.050781250000 0.758789062500
+skin_l1_spe_blank.tga 0.050781250000 0.757812500000 0.054687500000 0.758789062500
+text_cursor.tga 0.058593750000 0.757812500000 0.060546875000 0.759765625000
+jauge_fill.tga 0.062500000000 0.757812500000 0.063476562500 0.761718750000
+W_jauge_fill.tga 0.066406250000 0.757812500000 0.067382812500 0.761718750000
+W_line_hor.tga 0.070312500000 0.757812500000 0.072265625000 0.759765625000
+w_line_hor2.tga 0.074218750000 0.757812500000 0.076171875000 0.759765625000
+skin_l1_r_spe.tga 0.078125000000 0.757812500000 0.082031250000 0.758789062500
+W_line_ver.tga 0.082031250000 0.757812500000 0.083984375000 0.759765625000
+W_jauge_fill_mini.tga 0.085937500000 0.757812500000 0.086914062500 0.759765625000
+w_jauge_fill_umin.tga 0.089843750000 0.757812500000 0.090820312500 0.759765625000
+no_bord.tga 0.093750000000 0.757812500000 0.094726562500 0.758789062500
+r2ed_tool_draw_road_base.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_icon_components_chest.tga 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_instance_link.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+instance_link.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_region.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_road_over.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_region_vertex.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_road_flag.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_entity_count_too_high.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2_entity_place_holder.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_road.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_draw_region_over.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+r2ed_tool_split_road_over.psd 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+road_flag.max 0.000000000000 0.000000000000 0.000000000000 0.000000000000
+road_flag.shape 0.000000000000 0.000000000000 0.000000000000 0.000000000000
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua b/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua
new file mode 100644
index 000000000..9b88c02f7
--- /dev/null
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/webig.lua
@@ -0,0 +1,190 @@
+
+-- create the webig namespace without reseting if already created in an other file.
+if (webig==nil) then
+	webig= {}
+end
+
+if (webig.sheetLists==nil) then
+	webig.sheetLists = {}
+end
+
+
+function webig:addSheet(dst, sheet, quality, quantity, worned, user_color, rm_class_type, rm_faber_stat_type)
+	if quality == nil then quality=0 end
+	if quantity == nil then quantity=0 end
+	if worned == nil then worned=0 end
+	if user_color == nil then user_color=0 end
+	if rm_class_type == nil then rm_class_type=0 end
+	if rm_faber_stat_type == nil then rm_faber_stat_type=0 end
+	addDbProp(dst..":SHEET", sheet)
+	addDbProp(dst..":WORNED", worned)
+	addDbProp(dst..":QUALITY", quality)
+	addDbProp(dst..":QUANTITY", quantity)
+	addDbProp(dst..":USER_COLOR", user_color)
+	addDbProp(dst..":RM_CLASS_TYPE", rm_class_type)
+	addDbProp(dst..":RM_FABER_STAT_TYPE", rm_faber_stat_type)
+end
+
+function webig:cleanSheets(db)
+	delDbProp(db)
+end
+
+function webig:addSheetList(name, ctrl, db, size)
+	webig.sheetLists[name] = {}
+	webig.sheetLists[name].ctrl = ctrl
+	webig.sheetLists[name].db = db
+	webig.sheetLists[name].selection = ""
+	webig.sheetLists[name].size = size
+end
+
+function webig:copyItems(src, dst)
+	addDbProp(dst..":SHEET", getDbProp(src..":SHEET"))
+	addDbProp(dst..":WORNED", getDbProp(src..":WORNED"))
+	addDbProp(dst..":QUALITY", getDbProp(src..":QUALITY"))
+	addDbProp(dst..":QUANTITY", getDbProp(src..":QUANTITY"))
+	addDbProp(dst..":USER_COLOR", getDbProp(src..":USER_COLOR"))
+	addDbProp(dst..":RM_CLASS_TYPE", getDbProp(src..":RM_CLASS_TYPE"))
+	addDbProp(dst..":RM_FABER_STAT_TYPE", getDbProp(src..":RM_FABER_STAT_TYPE"))
+end
+
+function webig:swapItems(src, dst)
+	local sheet = getDbProp(dst..":SHEET")
+	local worned = getDbProp(dst..":WORNED")
+	local quality = getDbProp(dst..":QUALITY")
+	local quantity = getDbProp(dst..":QUANTITY")
+	local user_color = getDbProp(dst..":USER_COLOR")
+	local rm_class_type = getDbProp(dst..":RM_CLASS_TYPE")
+	local rm_faber_stat_type = getDbProp(dst..":RM_FABER_STAT_TYPE")
+
+	addDbProp(dst..":SHEET", getDbProp(src..":SHEET"))
+	addDbProp(dst..":WORNED", getDbProp(src..":WORNED"))	
+	addDbProp(dst..":QUALITY", getDbProp(src..":QUALITY"))
+	addDbProp(dst..":QUANTITY", getDbProp(src..":QUANTITY"))
+	addDbProp(dst..":USER_COLOR", getDbProp(src..":USER_COLOR"))
+	addDbProp(dst..":RM_CLASS_TYPE", getDbProp(src..":RM_CLASS_TYPE"))
+	addDbProp(dst..":RM_FABER_STAT_TYPE", getDbProp(src..":RM_FABER_STAT_TYPE"))
+	
+	addDbProp(src..":SHEET", sheet)
+	addDbProp(src..":WORNED", worned)
+	addDbProp(src..":QUALITY", quality)
+	addDbProp(src..":QUANTITY", quantity)
+	addDbProp(src..":USER_COLOR", user_color)
+	addDbProp(src..":RM_CLASS_TYPE", rm_class_type)
+	addDbProp(src..":RM_FABER_STAT_TYPE", rm_faber_stat_type)
+end
+
+function webig:deleteItem(src)
+	addDbProp(src..":SHEET", 0)
+	addDbProp(src..":WORNED", 0)
+	addDbProp(src..":QUALITY", 0)
+	addDbProp(src..":QUANTITY", 0)
+	addDbProp(src..":USER_COLOR", 0)
+	addDbProp(src..":RM_CLASS_TYPE", 0)
+	addDbProp(src..":RM_FABER_STAT_TYPE", 0)
+end
+
+function webig:paramDbSheetSlot(sheet_list, ctrl)
+	local ctrlSheet = webig.sheetLists[sheet_list].ctrl:find("list:"..ctrl)
+	if ctrlSheet ~= nil then
+		ctrlSheet.left_click="lua"
+		ctrlSheet.left_click_params="webig:addOrRemoveDbSheet(\'"..sheet_list.."\', \'"..ctrl.."\')"
+		ctrlSheet.dragable=true
+		ctrlSheet.can_drop=true
+		ctrlSheet.on_drop="lua"
+		ctrlSheet.on_drop_params="webig:dropDbSheet(\'"..sheet_list.."\', \'"..ctrl.."\', \'%src\')"
+		ctrlSheet.on_can_drop="lua"
+		ctrlSheet.on_can_drop_params="webig:canDropDbSheet(\'"..sheet_list.."\', \'"..ctrl.."\', \'%src\')"
+	end
+end
+
+function webig:paramDbSheetSelect(sheet_list, ctrl, lua_function)
+	local ctrlSheet = webig.sheetLists[sheet_list].ctrl:find("list:"..ctrl)
+	if ctrlSheet ~= nil then
+		ctrlSheet.left_click="lua"
+		ctrlSheet.left_click_params=lua_function.."(\'"..sheet_list.."\', \'"..ctrl.."\')"
+		ctrlSheet.dragable=false
+		ctrlSheet.can_drop=false
+	end
+end
+
+function webig:canDropDbSheet(sheet_list, ctrl, src)
+	webig.sheetLists[sheet_list].ctrl:find("list:"..ctrl).can_drop=true
+end
+
+function webig:dropDbSheet(sheet_list, ctrl, src)
+ 	local db = webig.sheetLists[sheet_list].db
+ 	local sl_id = webig.sheetLists[sheet_list].ctrl.id
+ 	if (string.sub(src, 1, string.len(sl_id)) == sl_id) then -- copy from same list sheet
+		local pos=nil
+		for i=1, string.len(src) do
+			if string.sub(src, i, i) == ":" then
+				pos = i+1
+			end
+		end
+		id = string.sub(src, pos, string.len(src))
+		webig:swapItems(db..":"..id, db..":"..ctrl)
+ 	else
+		slot = getUI(src)
+		if slot ~= nil then
+			id = findReplaceAll(src, slot.parent.id..":", "")
+			webig:copyItems("LOCAL:INVENTORY:BAG:"..id, db..":"..ctrl)
+		end
+	end
+end
+
+
+function webig:addOrRemoveDbSheet(sheet_list, ctrl)
+ 	local db = webig.sheetLists[sheet_list].db
+	if getDbProp(db..":"..ctrl..":SHEET") == 0 then -- Add item
+		webig:AddDbSheet(sheet_list, ctrl)
+	else
+		webig:removeDbSheetQuantity(sheet_list, ctrl)
+	end
+end
+
+function webig:AddDbSheet(sheet_list, ctrl)
+	runAH(nil, "enter_modal", "group=ui:interface:webig_html_modal")
+	local whm = getUI("ui:interface:webig_html_modal")
+	whm.child_resize_h=false
+	whm.h = 44*webig.sheetLists[sheet_list].size
+	whm.w = 224
+	whm = getUI("ui:interface:webig_html_modal:html")
+	if whm ~= nil then
+		whm:refresh() -- url need be setted before
+	end
+	webig.sheetLists[sheet_list].selection = ctrl
+end
+
+function webig:removeDbSheetQuantity(sheet_list, ctrl)
+ 	local db = webig.sheetLists[sheet_list].db
+ 	webig:copyItems(db..":"..ctrl, "UI:DROP_DESTROY_ITEM:ITEM")
+	runAH(nil, "set_keyboard_focus", "select_all=true|target=ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb")
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:ok_cancel:ok").onclick_l="lua"
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:ok_cancel:ok").params_l="webig:doRemoveDbSheetQuantity(\'"..sheet_list.."\', \'"..ctrl.."\')"
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").on_enter="lua"
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").on_enter_params="webig:doRemoveDbSheetQuantity(\'"..sheet_list.."\', \'"..ctrl.."\')"
+	runAH(nil, "enter_modal", "group=ui:interface:webig_drop_destroy_item_quantity_modal")
+	setDbProp("UI:DROP_DESTROY_ITEM:ITEM:QUANTITY", getDbProp(db..":"..ctrl..":QUANTITY"))
+	getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").input_string=tostring(getDbProp(db..":"..ctrl..":QUANTITY"))
+end
+
+function webig:doRemoveDbSheetQuantity(sheet_list, ctrl)
+	local db = webig.sheetLists[sheet_list].db
+	runAH(nil, "leave_modal", "group=ui:interface:webig_drop_destroy_item_quantity_modal")
+	local new_quantity = tonumber(getUI("ui:interface:webig_drop_destroy_item_quantity_modal:edit:eb").input_string)
+	local current_quantity = getDbProp(db..":"..ctrl..":QUANTITY")
+	if new_quantity >= current_quantity then
+		webig:deleteItem(db..":"..ctrl)
+	else
+		addDbProp(db..":"..ctrl..":QUANTITY", current_quantity-new_quantity)
+	end
+end
+
+--assert(nil, "RELOADABLE SCRIPT");
+
+
+
+
+
+
+
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
new file mode 100644
index 000000000..3c1470485
--- /dev/null
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/webig_widgets.xml
@@ -0,0 +1,120 @@
+<!-- ****************************************** -->
+<!-- *            WEBIG WIDGETS               * -->
+<!-- ****************************************** -->
+<interface_config>
+	<root id="interface" x="0" y="0" w="800" h="600" active="true" />
+	<lua file="webig.lua" />
+
+<!-- //////////// STYLE : webigchat_desc /////////// -->
+	<style style="webigchat_desc" type="text" fontsize="12" justification="dont_clip_word" color="0 0 0 255" global_color="false" multi_line="true" multi_line_space="0" line_maxw="320" multi_line_maxw_only="true" />
+<!-- //////////// STYLE : webigchat_option /////////// -->
+	<style style="webigchat_option" type="text" format_taged="true" fontsize="10" justification="dont_clip_word" color="0 0 64 255" underlined="true" global_color="false" multi_line="true" multi_line_space="0" line_maxw="320" multi_line_maxw_only="true" />
+<!-- //////////// STYLE : webigchat_option_but /////////// -->
+	<style style="webigchat_option_but" type="button_link" posref="TL TL" x="0" y="0" sizeref="wh" w="0" h="0" onclick_l="proc" params_l="proc_browse_faq" />
+	
+<!-- //////////// TEMPLATE : webig_3dbulle_L /////////// -->
+	<template name="webig_3dbulle_L" id="" keep="true">
+		<group id="#id" type="in_scene_bubble" header_active="false" options="no_bordure" openable="false" savable="false" resizer="true" movable="false" right_button="false" opened="true" child_resize_w="true" w="0" max_w="512" min_w="48" child_resize_h="true" in_scene_offset_x="-95" win_priority="%win_priority_world_space" posref="BL BR" use_cursor="true">
+			<group id="header_opened" x="0" y="0" child_resize_w="true" w="0" child_resize_h="true" h="0" max_w="512" min_w="48" max_h="256" min_h="48" posref="TL TL">
+				<group id="window" x="0" y="0" child_resize_w="true" child_resize_wmargin="10" child_resize_h="true" child_resize_hmargin="10" posref="TL TL">
+					<group id="back" x="0" y="0" w="0" h="0" sizeref="wh" posref="TL TL">
+						<view type="bitmap" id="win_M" posref="MM MM" scale="true" sizeref="wh" w="-10" h="-10" texture="Bulle_M.tga" global_color="false" />
+						<view type="bitmap" id="win_T" posparent="win_M" posref="TL BL" scale="true" sizeref="w" w="0" h="5" texture="Bulle_T.tga" global_color="false" />
+						<view type="bitmap" id="win_B" posparent="win_M" posref="BL TL" scale="true" sizeref="w" w="0" h="5" texture="Bulle_B.tga" global_color="false" />
+						<view type="bitmap" id="win_L" posparent="win_M" posref="TL TR" scale="true" sizeref="h" w="5" h="0" texture="Bulle_L.tga" global_color="false" />
+						<view type="bitmap" id="win_R" posparent="win_M" posref="TR TL" scale="true" sizeref="h" w="5" h="0" texture="Bulle_R.tga" global_color="false" />
+						<view type="bitmap" id="win_TL" posref="TL TL" texture="Bulle_TL.tga" global_color="false" />
+						<view type="bitmap" id="win_TR" posref="TR TR" texture="Bulle_TR.tga" global_color="false" />
+						<view type="bitmap" id="win_BL" posref="BL BL" texture="Bulle_BL.tga" global_color="false" />
+						<view type="bitmap" id="win_BR" posref="BR BR" texture="Bulle_BR.tga" global_color="false" />
+					</group>
+					<view style="webigchat_desc" id="text" posref="TL TL" x="5" y="-24" />
+					<ctrl type="button" button_type="push_button" tx_normal="Bulle_next.tga" tx_pushed="Bulle_next.tga" tx_over="Bulle_next.tga" color="255 255 255 255" col_over="255 255 255 0" col_pushed="255 255 255 255" global_color_normal="false" global_color_over="false" global_color_pushed="false" tooltip="uiNext" id="but_next" posref="TR TR" x="-5" y="-5" onclick_l="bubble_next" active="false" />
+					<ctrl type="button" button_type="push_button" tx_normal="Bulle_quit.tga" tx_pushed="Bulle_quit.tga" tx_over="Bulle_quit.tga" color="255 255 255 255" col_over="255 255 255 0" col_pushed="255 255 255 255" global_color_normal="false" global_color_over="false" global_color_pushed="false" tooltip="uiSkip" id="but_skip" posref="TL TR" posparent="but_next" x="-4" y="0" onclick_l="bubble_skip" active="false" />
+					<!-- Yoyo: Fake to have minimum bubble size -->
+					<group id="min_w" posparent="text" posref="TL TL" x="0" y="0" w="48" h="14" />
+					<view style="webigchat_option" id="opt0" posparent="text" posref="BL TL" x="16" y="-4" />
+					<view style="webigchat_option" id="opt1" posparent="opt0" posref="BL TL" x="0" y="-4" /> 
+					<view style="webigchat_option" id="opt2" posparent="opt1" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt3" posparent="opt2" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt4" posparent="opt3" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt5" posparent="opt4" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt6" posparent="opt5" posref="BL TL" x="0" y="-5" />
+					<view style="webigchat_option" id="opt7" posparent="opt6" posref="BL TL" x="0" y="-5" />
+					<ctrl style="webigchat_option_but" id="optb0" posparent="opt0" params_l="0" />
+					<ctrl style="webigchat_option_but" id="optb1" posparent="opt1" params_l="1" />
+					<ctrl style="webigchat_option_but" id="optb2" posparent="opt2" params_l="2" />
+					<ctrl style="webigchat_option_but" id="optb3" posparent="opt3" params_l="3" />
+					<ctrl style="webigchat_option_but" id="optb4" posparent="opt4" params_l="4" />
+					<ctrl style="webigchat_option_but" id="optb5" posparent="opt5" params_l="5" />
+					<ctrl style="webigchat_option_but" id="optb6" posparent="opt6" params_l="6" />
+					<ctrl style="webigchat_option_but" id="optb7" posparent="opt7" params_l="7" />
+				</group>				
+				<view type="bitmap" id="win_talk" posref="BR TR" x="-24" y="2" posparent="window" texture="Bulle_Say_L.tga" global_color="false" />
+			</group>
+		</group>
+	</template>
+	
+<!-- //////////// TEMPLATE : webig_modal /////////// -->
+	<group type="modal" id="webig_html_modal" w="360" posref="TL TL"  child_resize_hmargin="8" child_resize_h="true" x="0" y="0" active="false" options="skin_modal" escapable="true" global_color="true">
+		<group id="html" type="html" posref="MM MM" url="" title_prefix="uiQuickhelpTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="patch_off.tga" checkbox_bitmap_pushed="patch_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline" >
+			<group id="black" posref="BR BR" sizeref="hw" w="-16" h="-12" inherit_gc_alpha="true"/>
+			<view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false"/>
+			<group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000"/>
+			<ctrl style="skin_scroll" id="scroll_bar" />
+		</group>
+	</group>
+  
+<!-- //////////// MODAL : webig_exchange_choose_in_bag /////////// -->
+	<group type="modal" id="webig_exchange_choose_in_bag" w="360" child_resize_hmargin="8" child_resize_h="true" x="0" y="0" active="false" options="skin_modal" escapable="true" global_color="true">
+		<view type="text" id="title" posref="TL TL" x="6" y="-8" color="255 255 255 255" global_color="false" fontsize="10" shadow="true" hardtext="uiBCTitleMPItemType"/>
+		<group type="list_sheet" id="list" nature="item" posref="TL TL" x="4" y="-20" value="UI:VARIABLES:BOTCHAT:FILTER_ITEM_TYPE_SELECTED" force_item_background_generic="true" wspace="2" hspace="2" array="false" w="350" lmargin="0" rmargin="0" tmargin="2" bmargin="2" child_resize_h="true" onclick_l="confirm_change_botchat_buy_filter_item_type" on_tooltip="botchat_tt_item_type" use_quantity="false" use_quality="false" display_empty_slot="true"/>
+		<view type="text" id="no_filter" posparent="ctrl" posref="TL MM" x="24" y="-46" fontsize="12" shadow="true" case_mode="%case_upper" global_color="false" hardtext="uiBCNoItemTypeFilter"/>
+	</group>
+	
+<!-- //////////// MODAL : webig_drop_destroy_item_quantity_modal /////////// -->	
+	<group type="modal" id="webig_drop_destroy_item_quantity_modal" exit_click_out="true" posref="TL TL" w="180" h="80" x="-8" y="8" options="skin_modal">
+		<ctrl type="sheet" id="sheet" value="UI:DROP_DESTROY_ITEM:ITEM" posparent="parent" posref="MM MM" x="-26" y="0"/>
+		<view type="text" id="x" posparent="sheet" posref="MR MM" x="8" y="0" color="255 255 255 255" fontsize="12" shadow="true" hardtext="X"/>
+		<instance template="edit_box_widget" entry_type="positive_integer" id="edit" text_ref="TR TR" text_y="-1" fontsize="12" posparent="sheet" posref="MR ML" x="16" text_x="-2" w="32" prompt="" enter_loose_focus="false" multi_line="false" max_num_chars="3" onchange="editbox_number" onchange_params="value=UI:DROP_DESTROY_ITEM:ITEM:QUANTITY|update_text=false" onenter="proc" params="webig_drop_destroy_item_quantity_modal_ok" max_historic="0"/>
+		<instance template="button_ok_cancel" posref="BR BR" x="-4" y="4" onclick_ok="" onclick_ok_param="" onclick_cancel="leave_modal" onclick_cancel_param=""/>
+		<link expr="eq(@UI:DROP_DESTROY_ITEM:DROP_MODE,1)" target="drop_text:active"/>
+		<link expr="ne(@UI:DROP_DESTROY_ITEM:DROP_MODE,1)" target="destroy_text:active"/>
+	</group>
+
+<!-- //////////// TEMPLATE : webig_list_sheet /////////// -->	
+	<template name="webig_list_sheet" keep="true" db="" w="200" y="-10" x="10">
+		<group id="list_group" w="#w" y="#y" x="#x" posref="TL TL" child_resize_h="true" >
+			<group type="list_sheet" nature="item" id="list" posref="TL TL" x="0" y="0" child_resize_h="true" wspace="8" hspace="8" value="#db" array="true" auto_grayed="true" onclick_r="open_item_help" tooltip="uittSelectMp" />
+		</group>
+	</template>
+ 
+ <!-- //////////// TEMPLATE : webig_frame_borderless /////////// -->	
+	<template name="webig_frame_borderless" keep="true" w="200" h="200" x="0" y="0" movable="true">
+		<group id="content" w="#w" h="#h" x="#x" y="#y" posref="MM MM" >
+			<group id="html" type="html" posref="TL TL" url="" title_prefix="uiQuickhelpTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="patch_off.tga" checkbox_bitmap_pushed="patch_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline" >
+				<group id="black" posref="BR BR" sizeref="hw" w="-16" h="-12" inherit_gc_alpha="true"/>
+				<view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false"/>
+				<group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000"/>
+				<ctrl style="skin_scroll" id="scroll_bar" />
+			</group>
+		</group>
+	</template>
+	
+<!-- //////////// TEMPLATE : webig_frame_skin_modal /////////// -->	
+	<template name="webig_frame_skin_modal" keep="true"  w="200" h="200" x="0" y="0">
+		<group id="group" type="container" active="true" w="#w" h="#h" x="#x" y="#y" posref="MM MM" options="skin_modal"  opened="true" openable="true" movable="true" header_color="UI:SAVE:WIN:COLORS:COM">
+			<group id="header_closed" x="0" y="0" w="#w" h="16" posref="TL TL"></group>
+			<group id="header_opened" x="0" y="0" w="#w" h="16" posref="TL TL"></group>
+			<group id="content" x="0" y="0" w="0" h="0" posref="TL TL ">
+				<group id="html" type="html" posref="MM MM" url="" title_prefix="uiQuickhelpTitle" sizeref="wh" x="0" y="0" w="0" h="0" background_color="0 0 0 0" error_color="255 240 48 255" link_color="240 155 100 255" text_color="210 210 210 255" h1_color="255 255 255 255" h2_color="255 255 255 255" h3_color="255 255 255 255" h4_color="255 255 255 255" h5_color="255 255 255 255" h6_color="255 255 255 255" text_font_size="10" h1_font_size="16" h2_font_size="14" h3_font_size="13" h4_font_size="12" h5_font_size="11" h6_font_size="11" paragraph_begin_space="12" multi_line_space_factor="0.25" td_begin_space="0" li_begin_space="4" ul_begin_space="12" li_indent="-10" ul_indent="30" checkbox_bitmap_normal="patch_off.tga" checkbox_bitmap_pushed="patch_on.tga" checkbox_bitmap_over="" background_bitmap_view="" home="" browse_next_time="false" timeout="0" form_text_area_group="edit_box_widget_multiline" >
+					<group id="black" posref="BR BR" sizeref="hw" w="-16" h="-12" inherit_gc_alpha="true"/>
+					<view type="bitmap" id="black2" posparent="black" posref="MM MM" sizeref="wh" w="-2" h="-2" inherit_gc_alpha="true" scale="true" texture="blank.tga" global_color="false"/>
+					<group type="list" id="text_list" fontsize="9" posref="TL TL" posparent="black" x="2" y="-2" space="0" sizeref="hw" w="-4" h="-4" maxelements="2000"/>
+					<ctrl style="skin_scroll" id="scroll_bar" />
+				</group>
+			</group>
+		</group>
+	</template>
+ 
+</interface_config>
diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
index 3ba062282..a94df1195 100644
--- a/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
+++ b/code/ryzom/client/data/gamedev/interfaces_v3/widgets.xml
@@ -243,7 +243,7 @@
         <view type="bitmap"
               id="win_top"
               posref="TL TL"
-              y="-10"
+              y="-15"
               texture="Infos_top.tga"
               global_color="true" />
         <view type="bitmap"
@@ -265,7 +265,7 @@
               id="win_jauge_mid"
               posref="TL ML"
               x="0"
-              y="1"
+              y="-2"
               posparent="win_bot"
               scale="true"
               w="128"
@@ -288,7 +288,7 @@
               id="info0"
               posref="TL TL"
               x="0"
-              y="-3"
+              y="-10"
               fontsize="14"
               shadow="true"
               hardtext=""
@@ -298,7 +298,7 @@
               id="info1"
               posref="TL TL"
               x="0"
-              y="-17"
+              y="-28"
               fontsize="12"
               shadow="true"
               hardtext=""
@@ -308,7 +308,7 @@
               id="info2"
               posref="TL TL"
               x="0"
-              y="-32"
+              y="-40"
               fontsize="10"
               shadow="true"
               hardtext=""
@@ -350,7 +350,59 @@
               y=""
               texture="target_mission.tga"
               global_color="false" />
-        <view type="bitmap"
+       <view type="bitmap"
+            id="rp_logo_1"
+            posref="BR BL"
+            x="4"
+            y="0"
+            slot="false"
+            posparent="info0"
+            color="255 255 255 255"
+            render_layer="1"
+            texture=""
+			w="24"
+            h="24"
+            global_color="false" />
+      <view type="bitmap"
+            id="rp_logo_2"
+            posref="BR BL"
+            x="32"
+            y="0"
+            slot="false"
+            posparent="info0"
+            color="255 255 255 255"
+            render_layer="1"
+            texture=""
+			w="24"
+            h="24"
+            global_color="false" />
+      <view type="bitmap"
+            id="rp_logo_3"
+            posref="TR TL"
+            x="60"
+            y="0"
+            slot="false"
+            posparent="info0"
+            color="255 255 255 255"
+            render_layer="1"
+            texture=""
+			w="24"
+            h="24"
+            global_color="false" />
+      <view type="bitmap"
+            id="rp_logo_4"
+            posref="TR TL"
+            x="88"
+            y="0"
+            slot="false"
+            posparent="info0"
+            color="255 255 255 255"
+            render_layer="1"
+            texture=""
+			w="24"
+            h="24"
+            global_color="false" />
+      <view type="bitmap"
               id="bar0"
               posref="TL TL"
               posparent="win_jauge_top"
@@ -415,14 +467,14 @@
       <ctrl type="sheet"
             id="guild_logo"
             posref="ML MR"
-            x="-8"
+            x="-4"
             slot="false"
             posparent="right"
             nature="guild_flag"
             value="UI:TEMP:GUILD_SHEET"
             dragable="false"
             color="255 255 255 255" />
-      <view type="bitmap"
+	  <view type="bitmap"
             id="npc_mission_logo"
             posref="TL TR"
             x="-8"
@@ -459,7 +511,7 @@
                  child_resize_h="true"
                  child_resize_wmargin="4" >
             <view type="bitmap"
-                  id="pvp_faction_civ_logo"
+                  id="pvp_faction_logo"
                   posref="TL TL"
                   texture="mp_pearl.tga"
                   x="2"
@@ -467,9 +519,10 @@
                   h="24"
                   global_color="false" />
             <view type="bitmap"
-                  id="pvp_faction_cult_logo"
+                  id="pvp_safe_logo"
+                  active="false"
                   posref="TR TL"
-                  posparent="pvp_faction_civ_logo"
+                  posparent="pvp_faction_logo"
                   texture="mp_pearl.tga"
                   x="2"
                   w="24"
@@ -499,7 +552,7 @@
                   x="2"
                   w="24"
                   h="24"
-                  texture="ICO_Multi_Fight.tga"
+                  texture="pvp_duel.tga"
                   global_color="false" />
           </group>
         </group>
@@ -1736,7 +1789,11 @@
     <action id="xp_catalyser_use"
             name="uimXpCatalyserUse"
             handler="xp_catalyser_use" />
-    <separator />
+    <action id="item_text_display"
+            name="uiOpen"
+            handler="item_text_display"
+            params="ui:interface:edit_custom" />
+   <separator />
     <!-- Move to an Animal -->
     <action id="move"
             name="uimMoveTo">
@@ -1781,14 +1838,13 @@
     <action id="infos"
             name="uimBoldInfo"
             handler="open_item_help" />
+    <action id="lockunlock"
+            name="uimLockItem"
+            handler="lock_inv_item" />
     <action id="item_text_edition"
             name="uimItemTextEdit"
             handler="item_text_edition"
             params="ui:interface:edit_custom" />
-    <action id="item_text_display"
-            name="uimItemTextDisplay"
-            handler="item_text_display"
-            params="ui:interface:edit_custom" />
   </group>
   <!-- MAX_INVENTORY_ANIMAL -->
   <link expr="switch(@%pa_beast0:TYPE, 'uimMtPaMount0', 'uimMtPaMount0', 'uimMtPaPacker0', 'uimMtPaDemon0')"
@@ -1802,7 +1858,8 @@
   <!-- item menu when we are in self -->
   <group type="menu"
          id="item_menu_in_self"
-         extends="base_menu">
+         extends="base_menu"
+         on_active="item_menu_base_check" >
     <!--<action id="drop"    name="uimDrop"     handler="proc" params="drop_item_proc"/>-->
     <action id="destroy"
             name="uimDestroy"
@@ -1812,11 +1869,15 @@
             name="uimBoldInfo"
             handler="open_item_help"
             params="" />
+    <action id="lockunlock"
+            name="uimLockItem"
+            handler="lock_inv_item" />
   </group>
   <!-- item menu default -->
   <group type="menu"
          id="item_menu"
-         extends="base_menu">
+         extends="base_menu"
+         on_active="item_menu_base_check" >
     <!--<action id="drop"    name="uimDrop"     handler="proc" params="drop_item_proc"/>-->
     <action id="destroy"
             name="uimDestroy"
@@ -1830,6 +1891,9 @@
             name="uimBoldInfo"
             handler="open_item_help"
             params="" />
+    <action id="lockunlock"
+            name="uimLockItem"
+            handler="lock_inv_item" />
   </group>
   <define id="item_modal_menu"
           value="ui:interface:item_menu" />
@@ -1959,7 +2023,8 @@
             fontsize="10"
             value="#value"
             global_color="false"
-            positive="true" />
+            positive="true"
+            format="true" />
       <view type="text"
             id="bad_price"
             posparent="box1"
@@ -2070,6 +2135,7 @@
             global_color="false" />
     </group>
   </template>
+
   <!-- ********************* -->
   <!-- *   FACTION POINTS  * -->
   <!-- ********************* -->
@@ -6245,6 +6311,8 @@
   <!-- onClickR on a filter -->
   <proc id="pinv_item_filter">
     <!-- Reset all filter first -->
+    <action handler="set"
+            params="dblink=UI:SAVE:@0:FILTER_TP|value=0" />
     <action handler="set"
             params="dblink=UI:SAVE:@0:FILTER_MISSMP|value=0" />
     <action handler="set"
@@ -6370,6 +6438,7 @@
              filter_tool="UI:SAVE:#inv_type:FILTER_TOOL"
              filter_mp="UI:SAVE:#inv_type:FILTER_MP"
              filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP"
+             filter_tp="UI:SAVE:#inv_type:FILTER_TP"
              wspace="2"
              hspace="2"
              startitem="0"
@@ -6426,6 +6495,7 @@
              filter_tool="UI:SAVE:#inv_type:FILTER_TOOL"
              filter_mp="UI:SAVE:#inv_type:FILTER_MP"
              filter_missmp="UI:SAVE:#inv_type:FILTER_MISSMP"
+             filter_tp="UI:SAVE:#inv_type:FILTER_TP"
              hspace="2"
              xitem="2"
              yitem="-2"
@@ -6480,17 +6550,26 @@
       <link expr="eq(@UI:SAVE:#inv_type:ICON_LIST, 0)"
             target="bag_list:active,sep2:active" />
       <instance template="tinv_item_list_filter"
-                id="filter_missmp"
+                id="filter_tp"
                 x="-35"
                 y="1"
                 posref="BR BR"
                 inv_type="#inv_type"
+                dblink="UI:SAVE:#inv_type:FILTER_TP"
+                texture="filter_tp.tga"
+                tooltip="uittFilterTP" />
+      <instance template="tinv_item_list_filter"
+                id="filter_missmp"
+                x="-60"
+                y="1"
+                posref="BR BR"
+                inv_type="#inv_type"
                 dblink="UI:SAVE:#inv_type:FILTER_MISSMP"
                 texture="filter_mission.tga"
                 tooltip="uittFilterMissMP" />
       <instance template="tinv_item_list_filter"
                 id="filter_mp"
-                x="-60"
+                x="-85"
                 y="1"
                 posref="BR BR"
                 inv_type="#inv_type"
@@ -6499,7 +6578,7 @@
                 tooltip="uittFilterMP" />
       <instance template="tinv_item_list_filter"
                 id="filter_tool"
-                x="-85"
+                x="-110"
                 y="1"
                 posref="BR BR"
                 inv_type="#inv_type"
@@ -6508,7 +6587,7 @@
                 tooltip="uittFilterTool" />
       <instance template="tinv_item_list_filter"
                 id="filter_weapon"
-                x="-110"
+                x="-135"
                 y="1"
                 posref="BR BR"
                 inv_type="#inv_type"
@@ -6517,7 +6596,7 @@
                 tooltip="uittFilterWeapon" />
       <instance template="tinv_item_list_filter"
                 id="filter_armor"
-                x="-135"
+                x="-160"
                 y="1"
                 posref="BR BR"
                 inv_type="#inv_type"
diff --git a/code/ryzom/client/src/Makefile b/code/ryzom/client/src/Makefile
deleted file mode 100644
index bac8ed4a1..000000000
--- a/code/ryzom/client/src/Makefile
+++ /dev/null
@@ -1,79 +0,0 @@
-#############################################################################
-# Simple make file for compiling Ryzom client
-
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../Variables.mk
-
-WWWFLAGS = $(shell libwww-config --cflags)
-WWWLDFLAGS = $(shell libwww-config --libs)
-LUAFLAGS = $(shell pkg-config lua5.1 --cflags)
-LUALDFLAGS = $(shell pkg-config lua5.1 --libs)
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(WWWFLAGS) $(LUAFLAGS) \
-		$(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(RYZOM_PATH)/../../code/luabind \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_PATH)/common/src \
-		-I$(RYZOM_PATH)/client/src/seven_zip \
-		-I.. \
-		-I.
-
-LDFLAGS      = 	$(WWWLDFLAGS) $(LUALDFLAGS) $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_PATH)/common/src/game_share \
-		-L$(RYZOM_PATH)/client/src/client_sheets \
-		-L$(RYZOM_PATH)/client/src/seven_zip \
-		-lclient_sheets \
-		-lseven_zip \
-		-lgame_share \
-		-Wl,--start-group -lnel_drv_opengl -lnel3d -Wl,--end-group \
-		-Wl,--start-group -lnel_drv_openal -lnelsnd -Wl,--end-group \
-		-lnelpacs \
-		-lnelligo \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lfreetype \
-		-lxml2 \
-		-ljpeg \
-		-lpng \
-		-lrt \
-		-ldl \
-		-lluabind \
-		-lopenal \
-		-lcurl \
-		-lGL \
-		-lX11
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= client
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: client_sheets seven_zip exe
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS)
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-client_sheets:
-	make $(MAKE_ALL_ARGS) -C client_sheets all
-
-seven_zip:
-	make $(MAKE_ALL_ARGS) -C seven_zip all
-
-#############################################################################
-# Rules
-
-include ../../Rules.mk
diff --git a/code/ryzom/client/src/bg_downloader_access.cpp b/code/ryzom/client/src/bg_downloader_access.cpp
index 699f01f3a..84fb0af5a 100644
--- a/code/ryzom/client/src/bg_downloader_access.cpp
+++ b/code/ryzom/client/src/bg_downloader_access.cpp
@@ -764,7 +764,7 @@ bool CBGDownloaderAccess::CDownloadCoTask::defaultMessageHandling(BGDownloader::
 	{
 		case BGD_Priority:
 		{
-			TThreadPriority tp;
+			BGDownloader::TThreadPriority tp;
 			msg.serialEnum(tp);
 			if (tp != Parent->_DownloadThreadPriority)
 			{
diff --git a/code/ryzom/client/src/cdb_synchronised.cpp b/code/ryzom/client/src/cdb_synchronised.cpp
index 21b1f1748..2a161d295 100644
--- a/code/ryzom/client/src/cdb_synchronised.cpp
+++ b/code/ryzom/client/src/cdb_synchronised.cpp
@@ -16,8 +16,6 @@
 
 
 
-#include "stdpch.h"
-
 //#define TRACE_READ_DELTA
 //#define TRACE_WRITE_DELTA
 //#define TRACE_SET_VALUE
@@ -42,6 +40,8 @@
 
 #include <string>
 
+#include "../../common/src/game_share/ryzom_database_banks.h"
+
 
 ////////////////
 // Namespaces //
@@ -50,7 +50,7 @@ using namespace NLMISC;
 using namespace std;
 
 
-bool VerboseDatabase = false;
+bool NLMISC::VerboseDatabase = false;
 uint32 NbDatabaseChanges = 0;
 
 
@@ -58,11 +58,11 @@ uint32 NbDatabaseChanges = 0;
 //	CCDBSynchronised
 //
 //-----------------------------------------------
-CCDBSynchronised::CCDBSynchronised() : _Database(0), _InitInProgress(true), _InitDeltaReceived(0)
+CCDBSynchronised::CCDBSynchronised() : _InitInProgress(true), _InitDeltaReceived(0), CCDBManager( "SERVER", NB_CDB_BANKS )
 {
 }
 
-
+extern const char *CDBBankNames[INVALID_CDB_BANK+1];
 
 //-----------------------------------------------
 //	init
@@ -80,9 +80,11 @@ void CCDBSynchronised::init( const string &fileName, NLMISC::IProgressCallback &
 			read.init (file);
 
 			//Parse the parser output!!!
-			CCDBNodeBranch::resetNodeBankMapping(); // in case the game is restarted from start
-			_Database = new CCDBNodeBranch("SERVER");
-			_Database->init( read.getRootNode (), progressCallBack, true );
+			bankHandler.resetNodeBankMapping(); // in case the game is restarted from start
+			bankHandler.fillBankNames( CDBBankNames, INVALID_CDB_BANK + 1 );
+			if( _Database == NULL )
+				_Database = new CCDBNodeBranch( "SERVER" );
+			_Database->init( read.getRootNode (), progressCallBack, true, &bankHandler );
 		}
 	}
 	catch (const Exception &e)
@@ -175,7 +177,7 @@ void CCDBSynchronised::write( const string &fileName )
 //	readDelta
 //
 //-----------------------------------------------
-void CCDBSynchronised::readDelta( NLMISC::TGameCycle gc, CBitMemStream& s, TCDBBank bank )
+void CCDBSynchronised::readDelta( NLMISC::TGameCycle gc, CBitMemStream& s, uint bank )
 {
 	nldebug("Update DB");
 
@@ -195,7 +197,7 @@ void CCDBSynchronised::readDelta( NLMISC::TGameCycle gc, CBitMemStream& s, TCDBB
 
 	for( uint i=0; i!=propertyCount; ++i )
 	{
-		_Database->readAndMapDelta( gc, s, bank );
+		_Database->readAndMapDelta( gc, s, bank, &bankHandler );
 	}
 
 	/*// Read "client only" property changes
@@ -304,11 +306,12 @@ void CCDBSynchronised::clear()
 	{
 		_Database->clear();
 		delete _Database;
-		_Database = 0;
+		_Database = NULL;
 	}
 
 	// clear CCDBNodeBranch static data
-	CCDBNodeBranch::reset();
+	branchObservingHandler.reset();
+	bankHandler.reset();
 }
 
 
@@ -322,7 +325,6 @@ void CCDBSynchronised::writeInitInProgressIntoUIDB()
 }
 
 
-
 #ifdef TRACE_READ_DELTA
 #undef TRACE_READ_DELTA
 #endif
diff --git a/code/ryzom/client/src/cdb_synchronised.h b/code/ryzom/client/src/cdb_synchronised.h
index a405b39a0..cc151cbcb 100644
--- a/code/ryzom/client/src/cdb_synchronised.h
+++ b/code/ryzom/client/src/cdb_synchronised.h
@@ -20,8 +20,9 @@
 #define CDB_SYNCHRONISED_H
 
 
-#include "cdb.h"
-#include "cdb_branch.h"
+#include "nel/misc/cdb.h"
+#include "nel/misc/cdb_branch.h"
+#include "nel/misc/cdb_manager.h"
 
 /**
  * Class to manage a database of properties
@@ -29,11 +30,8 @@
  * \author Nevrax France
  * \date 2002
  */
-class CCDBSynchronised
+class CCDBSynchronised : public NLMISC::CCDBManager
 {
-	/// database
-	NLMISC::CRefPtr<CCDBNodeBranch> _Database;
-
 	/// string associations
 	std::map<uint32,std::string> _Strings;
 
@@ -60,7 +58,7 @@ public:
 	 * Return a ptr on the node
 	 * \return ptr on the node
 	 */
-	CCDBNodeBranch * getNodePtr() { return _Database; }
+	NLMISC::CCDBNodeBranch * getNodePtr() { return _Database; }
 
 	/**
 	 *	Build the structure of the database from a file
@@ -84,7 +82,7 @@ public:
 	 * Update the database from a stream coming from the FE
 	 * \param f the stream
 	 */
-	void readDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, TCDBBank bank );
+	void readDelta( NLMISC::TGameCycle gc, NLMISC::CBitMemStream& s, uint bank );
 
 	/**
 	 * Return the value of a property (the update flag is set to false)
diff --git a/code/ryzom/client/src/character_cl.cpp b/code/ryzom/client/src/character_cl.cpp
index 1d7c87c2a..259461b6e 100644
--- a/code/ryzom/client/src/character_cl.cpp
+++ b/code/ryzom/client/src/character_cl.cpp
@@ -76,7 +76,7 @@
 #include "user_entity.h"
 #include "projectile_manager.h"
 #include "init_main_loop.h"
-#include "cdb_branch.h"
+#include "nel/misc/cdb_branch.h"
 #include "animation_fx_misc.h"
 #include "attack_list.h"
 #include "animation_fx_id_array.h"
@@ -358,17 +358,8 @@ CCharacterCL::CCharacterCL()
 
 	_EventFactionId = 0;
 	_PvpMode = PVP_MODE::None;
-	_PvpClan = PVP_CLAN::None;
-
-	for (uint8 i = 0; i < PVP_CLAN::NbClans; i++)
-	{
-		_PvpAllies[i] = false;
-		_PvpEnemies[i] = false;
-	}
-
-	_ClanCivMaxFame  = PVP_CLAN::None;
-	_ClanCultMaxFame = PVP_CLAN::None;
 
+	_LeagueId = 0;
 	_OutpostId = 0;
 	_OutpostSide = OUTPOSTENUMS::UnknownPVPSide;
 
@@ -1842,9 +1833,30 @@ void CCharacterCL::updateVisualPropertyGuildNameID(const NLMISC::TGameCycle &/*
 //-----------------------------------------------
 void CCharacterCL::updateVisualPropertyEventFactionID(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop)
 {
-	_EventFactionId = uint32(prop);
+	// ODD Hack by Ulukyn
+	//_EventFactionId = uint32(prop);
+	_PvpMode = uint32(prop);
+
 	buildInSceneInterface();
 
+	if (isUser())
+	{
+		uint i;
+		uint numEntity = (uint)EntitiesMngr.entities().size();
+		for (i=0; i<numEntity; i++)
+		{
+			CEntityCL *entity = EntitiesMngr.entity(i);
+			if (entity)
+			{
+				CCharacterCL *character = dynamic_cast<CCharacterCL*>(entity);
+				if (character)
+				{
+					if( character->getPvpMode() != 0 && !character->isUser())
+						character->buildInSceneInterface ();
+				}
+			}
+		}
+	}
 } // updateVisualPropertyEventFactionID //
 
 //-----------------------------------------------
@@ -1853,8 +1865,8 @@ void CCharacterCL::updateVisualPropertyEventFactionID(const NLMISC::TGameCycle &
 //-----------------------------------------------
 void CCharacterCL::updateVisualPropertyPvpMode(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop)
 {
-	_PvpMode = (uint8)prop;
-	buildInSceneInterface();
+	//_PvpMode = uint32(prop);
+	//buildInSceneInterface();
 
 } // updateVisualPropertyPvpMode //
 
@@ -1864,18 +1876,28 @@ void CCharacterCL::updateVisualPropertyPvpMode(const NLMISC::TGameCycle &/* game
 //-----------------------------------------------
 void CCharacterCL::updateVisualPropertyPvpClan(const NLMISC::TGameCycle &/* gameCycle */, const sint64 &prop)
 {
-	// get fames signs from prop
-	for (uint8 fameIdx = 0; fameIdx < 7; fameIdx++)
-	{
-		_PvpAllies[fameIdx] = (prop & (SINT64_CONSTANT(1) << (2*fameIdx))) != 0;
-		_PvpEnemies[fameIdx] = (prop & (SINT64_CONSTANT(1) << (2*fameIdx+1))) != 0;
-	}
-
-	_ClanCivMaxFame = PVP_CLAN::TPVPClan((prop & (0x03 << 2*7)) >> 2*7);
-	_ClanCultMaxFame = PVP_CLAN::TPVPClan(4 + ((prop & (0x03 << 2*8)) >> 2*8));
+	_LeagueId = uint32(prop);
 
 	buildInSceneInterface();
 
+	if (isUser())
+	{
+		uint i;
+		uint numEntity = (uint)EntitiesMngr.entities().size();
+		for (i=0; i<numEntity; i++)
+		{
+			CEntityCL *entity = EntitiesMngr.entity(i);
+			if (entity)
+			{
+				CCharacterCL *character = dynamic_cast<CCharacterCL*>(entity);
+				if (character)
+				{
+					if( character->getPvpMode() != 0 && !character->isUser())
+						character->buildInSceneInterface ();
+				}
+			}
+		}
+	}
 } // updateVisualPropertyPvpClan //
 
 //-----------------------------------------------
@@ -4522,10 +4544,6 @@ void CCharacterCL::applyBehaviourFlyingHPs(const CBehaviourContext &bc, const MB
 							else
 								deltaHPColor = ClientCfg.SystemInfoParams["dg"].Color;
 						}
-						else
-						{
-							deltaHPColor = CRGBA(127,127,127);
-						}
 					}
 					else
 					{
@@ -10252,7 +10270,7 @@ NLMISC_COMMAND(pvpMode, "modify pvp mode", "[<pvp mode> <state>]")
 
 	if( args.size() == 0 )
 	{
-		uint8 pvpMode = playerTarget->getPvpMode();
+		uint16 pvpMode = playerTarget->getPvpMode();
 		string str;
 		if( pvpMode&PVP_MODE::PvpDuel )
 			str+="duel ";
@@ -10270,6 +10288,10 @@ NLMISC_COMMAND(pvpMode, "modify pvp mode", "[<pvp mode> <state>]")
 			str+="faction ";
 		if( pvpMode&PVP_MODE::PvpFactionFlagged)
 			str+="faction_flagged ";
+		if( pvpMode&PVP_MODE::PvpZoneSafe)
+			str+="in_safe_zone ";
+		if( pvpMode&PVP_MODE::PvpSafe)
+			str+="safe ";
 		IM->displaySystemInfo(ucstring(str));
 		nlinfo("<pvpMode> %s",str.c_str());
 	}
@@ -10280,14 +10302,14 @@ NLMISC_COMMAND(pvpMode, "modify pvp mode", "[<pvp mode> <state>]")
 		fromString(args[1], state);
 		if( state )
 		{
-			uint8 currentPVPMode = playerTarget->getPvpMode();
+			uint16 currentPVPMode = playerTarget->getPvpMode();
 			currentPVPMode |= pvpMode;
 			playerTarget->setPvpMode(currentPVPMode);
 			IM->displaySystemInfo(toString("<pvpMode> adding pvp mode %s",args[0].c_str()));
 		}
 		else
 		{
-			uint8 currentPVPMode = playerTarget->getPvpMode();
+			uint16 currentPVPMode = playerTarget->getPvpMode();
 			currentPVPMode &= ~pvpMode;
 			playerTarget->setPvpMode(currentPVPMode);
 			IM->displaySystemInfo(toString("<pvpMode> removing pvp mode %s",args[0].c_str()));
@@ -10297,7 +10319,7 @@ NLMISC_COMMAND(pvpMode, "modify pvp mode", "[<pvp mode> <state>]")
 	return true;
 }
 
-
+/*
 NLMISC_COMMAND(pvpClan, "modify pvp clan", "<pvp clan>")
 {
 	if (args.size() != 1) return false;
@@ -10319,13 +10341,13 @@ NLMISC_COMMAND(pvpClan, "modify pvp clan", "<pvp clan>")
 	if (!playerTarget)
 		return false;
 
-	PVP_CLAN::TPVPClan clan = PVP_CLAN::fromString(args[0]);
-	playerTarget->setPvpClan(clan);
+//	PVP_CLAN::TPVPClan clan = PVP_CLAN::fromString(args[0]);
+//	playerTarget->setPvpClan(clan);
 	playerTarget->buildInSceneInterface();
 
 	return true;
 }
-
+*/
 #endif // !FINAL_VERSION
 
 #include "r2/editor.h"
diff --git a/code/ryzom/client/src/character_cl.h b/code/ryzom/client/src/character_cl.h
index a5d7ba880..6c87692d3 100644
--- a/code/ryzom/client/src/character_cl.h
+++ b/code/ryzom/client/src/character_cl.h
@@ -84,7 +84,7 @@ public:
 	enum { MaxNumAura = 2 };
 	enum	TAtkHeight
 	{
-		AtkUnknownHeight = 0,
+		AtkUnkownHeight = 0,
 		AtkLow,
 		AtkMiddle,
 		AtkHigh
@@ -368,48 +368,10 @@ public:
 	virtual uint64 getGuildSymbol () const { return _GuildSymbol; }
 
 	virtual uint32 getEventFactionID() const { return _EventFactionId; }
-	virtual uint8 getPvpMode() const { return _PvpMode; }
-	void setPvpMode(uint8 mode) { _PvpMode=mode; }
-	virtual PVP_CLAN::TPVPClan getPvpClan() const { return _PvpClan; }
-	void setPvpClan(PVP_CLAN::TPVPClan clan) { _PvpClan=clan; }
-	
-	virtual PVP_CLAN::TPVPClan getClanCivMaxFame() const { return _ClanCivMaxFame; }
-	void setClanCivMaxFame(PVP_CLAN::TPVPClan clan) { _ClanCivMaxFame=clan; }
-	virtual PVP_CLAN::TPVPClan getClanCultMaxFame() const { return _ClanCultMaxFame; }
-	void setClanCultMaxFame(PVP_CLAN::TPVPClan clan) { _ClanCultMaxFame=clan; }
-
-	virtual bool isPvpAlly(uint8 faction) const { if (faction < PVP_CLAN::NbClans) return _PvpAllies[faction]; else return false; }
-	virtual bool isPvpEnnemy(uint8 faction) const { if (faction < PVP_CLAN::NbClans) return _PvpEnemies[faction]; else return false; }
-
-	virtual bool isPvpMarauder() const
-	{
-		for (uint8 i = 0; i < 4; i++)
-			if (!_PvpEnemies[i])
-				return false;
-		return true;
-	}
-
-	virtual bool isPvpTrytonist() const
-	{
-		if (_PvpEnemies[4] && _PvpEnemies[6])
-			return true;
-		return false;
-	}
-
-	virtual bool isPvpPrimas() const
-	{
-		if (_PvpAllies[4] && _PvpAllies[6])
-			return true;
-		return false;	
-	}
-	
-	virtual bool isPvpRanger() const
-	{
-		for (uint8 i = 0; i < 4; i++)
-			if (!_PvpAllies[i])
-				return false;
-		return true;	
-	}
+	virtual uint16 getPvpMode() const { return _PvpMode; }
+	void setPvpMode(uint16 mode) { _PvpMode=mode; }
+	virtual uint32 getLeagueID() const { return _LeagueId; }
+	void setLeagueID(uint32 league) { _LeagueId=league; }
 
 	virtual uint16 getOutpostId() const { return _OutpostId; }
 	virtual OUTPOSTENUMS::TPVPSide getOutpostSide() const { return _OutpostSide; }
@@ -727,12 +689,9 @@ protected:
 	uint32										_GuildNameId;
 	uint64										_GuildSymbol;
 	uint32										_EventFactionId;
-	uint8										_PvpMode;
+	uint16										_PvpMode;
 	PVP_CLAN::TPVPClan							_PvpClan;
-	PVP_CLAN::TPVPClan							_ClanCivMaxFame;
-	PVP_CLAN::TPVPClan							_ClanCultMaxFame;
-	bool										_PvpAllies[PVP_CLAN::NbClans];
-	bool										_PvpEnemies[PVP_CLAN::NbClans];
+	uint32										_LeagueId;
 	uint16										_OutpostId;
 	OUTPOSTENUMS::TPVPSide						_OutpostSide;
 
diff --git a/code/ryzom/client/src/client.cpp b/code/ryzom/client/src/client.cpp
index 72fe1c0b1..49cc6e328 100644
--- a/code/ryzom/client/src/client.cpp
+++ b/code/ryzom/client/src/client.cpp
@@ -422,15 +422,12 @@ int main(int argc, char **argv)
 
 	string sCmdLine = cmdline;
 #if FINAL_VERSION
-	if (sCmdLine.find("/multi") == string::npos) // If '/multi' not found
-	{
-		HANDLE mutex = CreateMutex (NULL, false, "RyzomClient");
-		if (mutex && GetLastError() == ERROR_ALREADY_EXISTS)
-		{
-			delete appContext;
-			return 0;
-		}
-	}
+	//if (sCmdLine.find("/multi") == string::npos) // If '/multi' not found
+	//{
+	//	HANDLE mutex = CreateMutex (NULL, false, "RyzomClient");
+	//	if (mutex && GetLastError() == ERROR_ALREADY_EXISTS)
+	//		exit (0);
+	//}
 
 	initCrashReport ();
 #endif // FINAL_VERSION
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index ff270ad1a..e0ed33abe 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -424,6 +424,7 @@ CClientConfig::CClientConfig()
 	PatchWanted = false;
 #endif
 	PatchUrl = "";
+	PatchletUrl = "";
 	PatchVersion = "";
 	PatchServer = "";
 
@@ -433,6 +434,7 @@ CClientConfig::CClientConfig()
 	RingReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes_ring/index.php";
 	ReleaseNotePath = "http://"+WebIgMainDomain+"/releasenotes/index.php";
 
+
 	///////////////
 	// ANIMATION //
 	// With a bigger angle, rotation is animated.
@@ -1044,9 +1046,13 @@ void CClientConfig::setValues()
 	READ_STRING_DEV(ReleaseNotePath)
 	READ_STRING_FV(PatchServer)
 
+	/////////////////////////
+	// NEW PATCHLET SYSTEM //	
+	READ_STRING_FV(PatchletUrl)
+
 	////////////////////////
 	// WEBIG //
-	READ_STRING_DEV(WebIgMainDomain);
+	READ_STRING_FV(WebIgMainDomain);
 	READ_STRINGVECTOR_FV(WebIgTrustedDomains);
 
 	///////////////
@@ -1341,6 +1347,7 @@ void CClientConfig::setValues()
 				if (stricmp(mode, "over") == 0)	p.Mode = SSysInfoParam::Over;
 				else if (stricmp(mode, "overonly") == 0) p.Mode = SSysInfoParam::OverOnly;
 				else if (stricmp(mode, "center") == 0)	p.Mode = SSysInfoParam::Center;
+				else if (stricmp(mode, "centeraround") == 0)	p.Mode = SSysInfoParam::CenterAround;
 				else if (stricmp(mode, "around") == 0)	p.Mode = SSysInfoParam::Around;
 
 				ClientCfg.SystemInfoParams[toLower(sic->asString(2 * k))] = p;
diff --git a/code/ryzom/client/src/client_cfg.h b/code/ryzom/client/src/client_cfg.h
index 667606814..3925aaf2d 100644
--- a/code/ryzom/client/src/client_cfg.h
+++ b/code/ryzom/client/src/client_cfg.h
@@ -286,17 +286,17 @@ struct CClientConfig
 	// NEW PATCHING SYSTEM //
 	bool			PatchWanted;
 	std::string		PatchUrl;
+	std::string		PatchletUrl;
 	std::string		PatchVersion;
 	std::string		PatchServer;
 
 	std::string		RingReleaseNotePath;
 	std::string		ReleaseNotePath;
 
-	////////////////////////
-	// WEBIG //
 	std::string		WebIgMainDomain;
 	std::vector<string>	WebIgTrustedDomains;
 
+
 	///////////////
 	// ANIMATION //
 	// With a bigger angle, rotation is animated.
@@ -635,12 +635,15 @@ struct CClientConfig
 	// Mode is the display settings :
 	// Normal	: just display in the system info window
 	// Over		: must be displayed at bottom of the screen and in system info window
+	// OverOnly		: must be displayed at bottom of the screen
 	// Center	; must be displayed at the center of the screen and in system info window
+	// Around	; must be displayed in the around chat window
+	// CenterAround	; must be displayed at the center of the screen and in around chat window
 	struct SSysInfoParam
 	{
 		CRGBA Color;
 		std::string SysInfoFxName;
-		enum TMode { Normal, Over, OverOnly, Center, Around };
+		enum TMode { Normal, Over, OverOnly, Center, Around, CenterAround };
 		TMode Mode;
 		SSysInfoParam()
 		{
diff --git a/code/ryzom/client/src/client_chat_manager.cpp b/code/ryzom/client/src/client_chat_manager.cpp
index fa4159b1f..59b72cedb 100644
--- a/code/ryzom/client/src/client_chat_manager.cpp
+++ b/code/ryzom/client/src/client_chat_manager.cpp
@@ -963,16 +963,10 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
 		else
 		{
 			// Does the char have a CSR title?
-			if (CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender))) csr = ucstring("(CSR) ");
+			csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? ucstring("(CSR) ") : ucstring("");
 		}
 
-		ucstring cur_time;
-		CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
-		if (pNL && pNL->getValueBool())
-		{
-			cur_time = CInterfaceManager::getTimestampHuman();
-		}
-		result = cur_time + csr + name + ucstring(" ") + CI18N::get("tellsYou") + ucstring(": ") + msg;
+		result = csr + name + ucstring(" ") + CI18N::get("tellsYou") + ucstring(": ") + msg;
 	}
 }
 
@@ -1002,23 +996,18 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 	if (!catStr.empty())
 		cat = string("&")+catStr+"&";
 
-	// Format the sentence with the provided sender name
-	ucstring senderName = CEntityCL::removeTitleAndShardFromName(sender);
-
-	// Add time if not a &bbl&
-	ucstring cur_time;
-	if (cat.toString() != "&bbl&")
+	if ( ! cat.empty())
 	{
-		CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
-		if (pNL && pNL->getValueBool())
-		{
-			cur_time = CInterfaceManager::getTimestampHuman();
-		}
+		result = msg;
+		return;
 	}
 
+	// Format the sentence with the provided sender name
+	ucstring senderName = CEntityCL::removeTitleAndShardFromName(sender);
+
 	ucstring csr;
 	// Does the char have a CSR title?
-	if (CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender))) csr = ucstring("(CSR) ");
+	csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? ucstring("(CSR) ") : ucstring("");
 
 	if (UserEntity && senderName == UserEntity->getDisplayName())
 	{
@@ -1026,10 +1015,10 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 		switch(type)
 		{
 			case CChatGroup::shout:
-				result = cat + cur_time + csr + CI18N::get("youShout") + ucstring(": ") + finalMsg;
+				result = cat + csr + CI18N::get("youShout") + ucstring(": ") + finalMsg;
 			break;
 			default:
-				result = cat + cur_time + csr + CI18N::get("youSay") + ucstring(": ") + finalMsg;
+				result = cat + csr + CI18N::get("youSay") + ucstring(": ") + finalMsg;
 			break;
 		}
 	}
@@ -1048,10 +1037,10 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
 		switch(type)
 		{
 			case CChatGroup::shout:
-				result = cat + cur_time + csr + senderName + ucstring(" ") + CI18N::get("heShout") + ucstring(": ") + finalMsg;
+				result = cat + csr + senderName + ucstring(" ") + CI18N::get("heShout") + ucstring(": ") + finalMsg;
 			break;
 			default:
-				result = cat + cur_time + csr + senderName + ucstring(" ") + CI18N::get("heSays") + ucstring(": ") + finalMsg;
+				result = cat + csr + senderName + ucstring(" ") + CI18N::get("heSays") + ucstring(": ") + finalMsg;
 			break;
 		}
 	}
@@ -1185,21 +1174,15 @@ class CHandlerTell : public IActionHandler
 		ucstring finalMsg;
 		CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, false);
 
-		ucstring cur_time;
-		CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
-		if (pNL && pNL->getValueBool())
-			cur_time = CInterfaceManager::getTimestampHuman();
-
-		ucstring csr;
-		if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
-		finalMsg += cur_time + csr + CI18N::get("youTell") + ": ";
+		ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
+		finalMsg += csr + CI18N::get("youTell") + ": ";
 		prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 		CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, true);
 		finalMsg += message;
 		// display msg with good color
 //		TDataSetIndex dsi; // not used ....
 		PeopleInterraction.ChatInput.Tell.displayTellMessage(/*dsi, */finalMsg, receiver, prop.getRGBA());
-		
+
 		ucstring s = CI18N::get("youTellPlayer");
 		strFindReplace(s, "%name", receiver);
 		strFindReplace(finalMsg, CI18N::get("youTell"), s);
@@ -1351,8 +1334,18 @@ class CHandlerTalk : public IActionHandler
 			{
 				string str = text.toUtf8();
 				string cmdWithArgs = str.substr(1);
-				/* In the chat context, only ' ' is a possible separator */
+
+				// Get the command name from the string, can contain spaces
 				string cmd = cmdWithArgs.substr(0, cmdWithArgs.find(' '));
+				if (cmdWithArgs.find('"') == 0)
+				{
+					string::size_type pos = cmdWithArgs.find('"', 1);
+					if (string::npos != pos)
+					{
+						cmd = cmdWithArgs.substr(1, pos - 1);
+					}
+				}
+
 				if ( NLMISC::ICommand::exists( cmd ) )
 				{
 					NLMISC::ICommand::execute( cmdWithArgs, g_log );
diff --git a/code/ryzom/client/src/client_chat_manager.h b/code/ryzom/client/src/client_chat_manager.h
index 8a591a27d..d48ad9be1 100644
--- a/code/ryzom/client/src/client_chat_manager.h
+++ b/code/ryzom/client/src/client_chat_manager.h
@@ -32,6 +32,10 @@
 #include <map>
 #include <string>
 
+namespace NLMISC{
+class CCDBNodeLeaf;
+}
+
 
 //#define OLD_STRING_SYSTEM
 
@@ -338,8 +342,8 @@ private :
 	/// \name Dynamic Chat channel mgt
 	// @{
 	TChanID				_ChatDynamicChannelId;
-	class CCDBNodeLeaf	*_DynamicChannelNameLeaf[CChatGroup::MaxDynChanPerPlayer];
-	class CCDBNodeLeaf	*_DynamicChannelIdLeaf[CChatGroup::MaxDynChanPerPlayer];
+	NLMISC::CCDBNodeLeaf	*_DynamicChannelNameLeaf[CChatGroup::MaxDynChanPerPlayer];
+	NLMISC::CCDBNodeLeaf	*_DynamicChannelIdLeaf[CChatGroup::MaxDynChanPerPlayer];
 	// Id cached. If different from precedent, then the channel must be flushed
 	enum	{DynamicChannelEmptyId=-1};
 	uint32				_DynamicChannelIdCache[CChatGroup::MaxDynChanPerPlayer];
diff --git a/code/ryzom/client/src/client_sheets/Makefile b/code/ryzom/client/src/client_sheets/Makefile
deleted file mode 100644
index 1976cb190..000000000
--- a/code/ryzom/client/src/client_sheets/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#############################################################################
-# Simple make file for compiling CLIENT SHEETS
-
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I$(NEL_PATH)/include \
-		-I$(RYZOM_PATH)/common/src \
-		-I.. \
-		-I.
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libclient_sheets.a
-DSP_TARGET	= client_sheets.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-
-#libclient_sheets.so: $(OBJS)
-#	$(CXX) -o $@ $(OBJS) -shared $(LDFLAGS)
-
-libclient_sheets.a: $(OBJS)
-	ar r libclient_sheets.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/client/src/commands.cpp b/code/ryzom/client/src/commands.cpp
index 877f80429..efdee9bc9 100644
--- a/code/ryzom/client/src/commands.cpp
+++ b/code/ryzom/client/src/commands.cpp
@@ -74,7 +74,7 @@
 #include "commands.h"
 #include "entities.h"
 #include "teleport.h"
-#include "cdb_leaf.h"
+#include "nel/misc/cdb_leaf.h"
 #include "view.h"
 #include "misc.h"
 #include "demo.h"
@@ -192,7 +192,7 @@ NLMISC_COMMAND(where, "Ask information on the position", "")
 	return false;
 }
 
-NLMISC_COMMAND(who, "Display all players currently in game","[<options (GM)>]")
+NLMISC_COMMAND(who, "Display all players currently in region","[<options (GM, channel name)>]")
 {
 	// Check parameters.
 	if(args.size() > 1)
@@ -1177,7 +1177,7 @@ NLMISC_COMMAND(db, "Modify Database","<Property> <Value>")
 		if(node)
 			node->setValue64(value);
 		else
-			pIM->displaySystemInfo(toString("DB %s don't exist.", args[0].c_str()));
+			pIM->displaySystemInfo(toString("DB '%s' does not exist.", args[0].c_str()));
 #else
 		pIM->displaySystemInfo(ucstring("Can't write to DB when in Final Version."));
 #endif
@@ -1193,7 +1193,7 @@ NLMISC_COMMAND(db, "Modify Database","<Property> <Value>")
 			nlinfo("%s", str.c_str());
 		}
 		else
-			pIM->displaySystemInfo(toString("DB %s don't exist.", args[0].c_str()));
+			pIM->displaySystemInfo(toString("DB '%s' does not exist.", args[0].c_str()));
 		return true;
 	}
 	else
@@ -1295,6 +1295,24 @@ NLMISC_COMMAND(setItemName, "set name of items, sbrick, etc..","<sheet_id> <name
 }
 
 
+NLMISC_COMMAND(setMissingDynstringText, "set text of missing dynamic string"," <name> <text>")
+{
+	if (args.size() < 2) return false;
+	ucstring name;
+	name.fromUtf8(args[0]);
+	ucstring text;
+	text.fromUtf8(args[1]);
+
+	STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
+	if (pSMC)
+		pSMC->replaceDynString(name, text);
+	else
+		return false;
+	return true;
+}
+
+
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
@@ -5243,7 +5261,7 @@ bool CUserCommand::execute(const std::string &/* rawCommandString */, const std:
 			{
 				if ((uint)index >= args.size())
 				{
-					// Not enough argument
+					// Not enough arguments
 					pIM->displaySystemInfo (ucstring(CommandName+" : ")+CI18N::get ("uiCommandWrongArgumentCount"));
 					return false;
 				}
@@ -5253,11 +5271,18 @@ bool CUserCommand::execute(const std::string &/* rawCommandString */, const std:
 						finalArgs += /*ucstring(*/args[index++]/*).toUtf8()*/;
 					else
 					{
-						finalArgs += /*ucstring(*/args[index++]/*).toUtf8()*/;
 						while (index<args.size())
 						{
-							finalArgs += " ";
-							finalArgs += /*ucstring(*/args[index++]/*).toUtf8()*/;
+							finalArgs += (index > 0) ? " " : "";
+							// If arg contains spaces then put it in quotes
+							if (string::npos != args[index].find(" "))
+							{
+								finalArgs += "\"" + args[index++] + "\"";
+							}
+							else 
+							{
+								finalArgs += args[index++];
+							}
 						}
 					}
 				}
diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp
index 1750d253b..b7f3c1c97 100644
--- a/code/ryzom/client/src/connection.cpp
+++ b/code/ryzom/client/src/connection.cpp
@@ -244,20 +244,20 @@ class CAHOnReloadTestPage: public IActionHandler
 REGISTER_ACTION_HANDLER (CAHOnReloadTestPage, "on_reload_test_page");
 
 
-//void initWebBrowser()
-//{
-//	CInterfaceManager *pIM = CInterfaceManager::getInstance();
-//	pIM->getDbProp("UI:VARIABLES:SCREEN")->setValue32(UI_VARIABLES_SCREEN_WEBSTART);
-//
-//	// start the browser
-//	CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(pIM->getElementFromId(GROUP_BROWSER));
-//
-//	if (pGH)
-//	{
-//		pGH->setActive(true);
-//		pGH->browse(MainPageURL.c_str());
-//	}
-//}
+void initWebBrowser()
+{
+	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	//pIM->getDbProp("UI:VARIABLES:SCREEN")->setValue32(UI_VARIABLES_SCREEN_WEBSTART);
+
+	// start the browser
+	CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(pIM->getElementFromId(GROUP_BROWSER));
+
+	if (pGH)
+	{
+		pGH->setActive(true);
+		pGH->browse(ClientCfg.PatchletUrl.c_str());
+	}
+}
 
 
 // ------------------------------------------------------------------------------------------------
@@ -390,10 +390,8 @@ bool connection (const string &cookie, const string &fsaddr)
 
 	pIM->activateMasterGroup ("ui:outgame", true);
 	pIM->getDbProp ("UI:CURRENT_SCREEN")->setValue32(ClientCfg.Local ? 6 : -1); // TMP TMP
-	CCDBNodeBranch::flushObserversCalls();
-
-	// Init web box
-	//initWebBrowser();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	// Active inputs
 	Actions.enable(true);
@@ -422,6 +420,10 @@ bool connection (const string &cookie, const string &fsaddr)
 
 	nlinfo ("PROFILE: %d seconds for connection", (uint32)(ryzomGetLocalTime ()-connStart)/1000);
 
+	// Init web box
+	nlinfo("ok");
+	initWebBrowser();
+
 	// TMP TMP
 	if (ClientCfg.Local)
 	{
@@ -552,7 +554,8 @@ bool reconnection()
 
 	pIM->activateMasterGroup ("ui:outgame", true);
 	pIM->getDbProp ("UI:CURRENT_SCREEN")->setValue32(-1);
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	// Active inputs
 	Actions.enable(true);
@@ -991,7 +994,8 @@ TInterfaceState globalMenu()
 				pIM->initOutGame();
 				pIM->activateMasterGroup ("ui:outgame", true);
 				pIM->getDbProp ("UI:CURRENT_SCREEN")->setValue32(2); // TMP TMP
-				CCDBNodeBranch::flushObserversCalls();
+				IngameDbMngr.flushObserverCalls();
+				CInterfaceManager::getInstance()->flushObserverCalls();
 				pIM->getElementFromId("ui:outgame:charsel")->setActive(false);
 				pIM->getElementFromId("ui:outgame:charsel")->setActive(true);
 				// Active inputs
@@ -1029,7 +1033,8 @@ TInterfaceState globalMenu()
 			}
 
 		}
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// check if we can send another dated block
 		if (NetMngr.getCurrentServerTick() != serverTick)
@@ -1055,7 +1060,8 @@ TInterfaceState globalMenu()
 		// Interface handling & displaying (processes clicks...)
 		pIM->updateFrameEvents();
 		pIM->updateFrameViews(NULL);
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// Movie shooter
 		globalMenuMovieShooter();
@@ -1120,9 +1126,11 @@ TInterfaceState globalMenu()
 						if (pNL != NULL)
 						{
 							pNL->setValue64 (1); // Send impulse to interface observers
-							CCDBNodeBranch::flushObserversCalls();
+							IngameDbMngr.flushObserverCalls();
+							CInterfaceManager::getInstance()->flushObserverCalls();
 							pNL->setValue64 (0);
-							CCDBNodeBranch::flushObserversCalls();
+							IngameDbMngr.flushObserverCalls();
+							CInterfaceManager::getInstance()->flushObserverCalls();
 						}
 					}
 					else
@@ -1183,9 +1191,11 @@ TInterfaceState globalMenu()
 					if (pNL != NULL)
 					{
 						pNL->setValue64 (1); // Send impulse to interface observers
-						CCDBNodeBranch::flushObserversCalls();
+						IngameDbMngr.flushObserverCalls();
+						CInterfaceManager::getInstance()->flushObserverCalls();
 						pNL->setValue64 (0);
-						CCDBNodeBranch::flushObserversCalls();
+						IngameDbMngr.flushObserverCalls();
+						CInterfaceManager::getInstance()->flushObserverCalls();
 					}
 				}
 			}
diff --git a/code/ryzom/client/src/cursor_functions.cpp b/code/ryzom/client/src/cursor_functions.cpp
index c212dbb0d..2ced655c9 100644
--- a/code/ryzom/client/src/cursor_functions.cpp
+++ b/code/ryzom/client/src/cursor_functions.cpp
@@ -484,6 +484,9 @@ void checkUnderCursor()
 							if(ContextCur.context("ATTACK"))
 								return;
 						}
+
+						if(testMissionOption(0))
+							return;
 					}
 					// Dead
 					else
diff --git a/code/ryzom/client/src/entity_cl.cpp b/code/ryzom/client/src/entity_cl.cpp
index fbbe0c041..7cefa69d7 100644
--- a/code/ryzom/client/src/entity_cl.cpp
+++ b/code/ryzom/client/src/entity_cl.cpp
@@ -115,7 +115,7 @@ NLMISC::CRGBA	CEntityCL::_UserPackAnimalColor;
 NLMISC::CRGBA	CEntityCL::_PvpEnemyColor;
 NLMISC::CRGBA	CEntityCL::_PvpNeutralColor;
 NLMISC::CRGBA	CEntityCL::_PvpAllyInTeamColor;
-NLMISC::CRGBA	CEntityCL::_PvpAllyInGuildColor;
+NLMISC::CRGBA	CEntityCL::_PvpAllyInLeagueColor;
 NLMISC::CRGBA	CEntityCL::_PvpAllyColor;
 NLMISC::CRGBA	CEntityCL::_GMTitleColor[CHARACTER_TITLE::EndGmTitle - CHARACTER_TITLE::BeginGmTitle + 1];
 uint8 CEntityCL::_InvalidGMTitleCode = 0xFF;
@@ -2295,6 +2295,7 @@ void CEntityCL::onStringAvailable(uint /* stringId */, const ucstring &value)
 					womenTitle = true;
 			}
 			const ucstring replacement(STRING_MANAGER::CStringManagerClient::getTitleLocalizedName(_TitleRaw,womenTitle));
+			_Tags = STRING_MANAGER::CStringManagerClient::getTitleInfos(_TitleRaw,womenTitle);
 			if (!replacement.empty() || !ClientCfg.DebugStringManager)
 			{
 				// build the final name
@@ -2436,7 +2437,6 @@ public:
 		CEntityCL::_PvpEnemyColor = pIM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPENEMY")->getValueRGBA();
 		CEntityCL::_PvpAllyColor = pIM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPALLY")->getValueRGBA();
 		CEntityCL::_PvpAllyInTeamColor = pIM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPALLYINTEAM")->getValueRGBA();
-		CEntityCL::_PvpAllyInGuildColor = pIM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPALLYINGUILD")->getValueRGBA();
 		CEntityCL::_PvpNeutralColor = pIM->getDbProp("UI:SAVE:ENTITY:COLORS:PVPNEUTRAL")->getValueRGBA();
 
 		// don't save these colors in .icfg because players can't change them
@@ -2463,7 +2463,7 @@ bool CEntityCL::isTarget () const
 
 //-----------------------------------------------
 
-bool CEntityCL::isInGuild () const
+bool CEntityCL::isInSameGuild () const
 {
 	if (Type != Player && Type != User)
 		return false;
@@ -2477,6 +2477,33 @@ bool CEntityCL::isInGuild () const
 
 //-----------------------------------------------
 
+bool CEntityCL::oneInLeague () const
+{
+	if (Type != Player && Type != User)
+		return false;
+
+	const uint32 leagueID = getLeagueID();
+	if ((UserEntity && (UserEntity->getLeagueID() != 0)) || leagueID != 0)
+		return true;
+
+	return false;
+}
+
+//-----------------------------------------------
+
+bool CEntityCL::isInSameLeague () const
+{
+	if (Type != Player && Type != User)
+		return false;
+
+	const uint32 leagueID = getLeagueID();
+	if ((leagueID != 0) && UserEntity && (leagueID == UserEntity->getLeagueID()))
+		return true;
+
+	return false;
+}
+//-----------------------------------------------
+
 NLMISC::CRGBA	CEntityCL::getColor () const
 {
 	// target
@@ -2511,46 +2538,43 @@ NLMISC::CRGBA	CEntityCL::getColor () const
 		{
 			if (isEnemy())
 			{
-				if (getPvpMode()&PVP_MODE::PvpFactionFlagged || getPvpMode()&PVP_MODE::PvpChallenge)
-					return _PvpEnemyColor;
-				else
+				if (getPvpMode()&PVP_MODE::PvpFaction)
 					return CRGBA(min(255, _PvpEnemyColor.R+150), min(255, _PvpEnemyColor.G+150), min(255, _PvpEnemyColor.B+150),_PvpEnemyColor.A);
+				else
+					return _PvpEnemyColor;
 			}
 		}
-		// neutral pvp
-		if (isNeutralPVP())
-		{
-			if (isInTeam())
-				return _PvpAllyInTeamColor;
-			if (isInGuild())
-				return _PvpAllyInGuildColor;
 
-			return _PvpNeutralColor;
-		}
 		// ally
 		if (isAlly())
 		{
 			if (getPvpMode() & PVP_MODE::PvpFactionFlagged)
 			{
-				if (isInTeam())
-					return _PvpAllyInTeamColor;
-				if(isInGuild())
-					return _PvpAllyInGuildColor;
-				return _PvpAllyColor;
+				if(isInSameLeague())
+					return CRGBA(max(0, _PvpAllyColor.R-100), max(0, _PvpAllyColor.G-100), max(0, _PvpAllyColor.B-100),_PvpAllyColor.A);
+				return CRGBA(max(0, _PvpAllyInTeamColor.R-100), max(0, _PvpAllyInTeamColor.G-100), max(0, _PvpAllyInTeamColor.B-100),_PvpAllyInTeamColor.A);
 			}
 			else
 			{
-				if (isInTeam())
-					return CRGBA(min(255, _PvpAllyInTeamColor.R+150), min(255, _PvpAllyInTeamColor.G+150), min(255, _PvpAllyInTeamColor.B+150),_PvpAllyInTeamColor.A);
-				if(isInGuild())
-					return CRGBA(min(255, _PvpAllyInGuildColor.R+150), min(255, _PvpAllyInGuildColor.G+150), min(255, _PvpAllyInGuildColor.B+150),_PvpAllyInGuildColor.A);
-				return CRGBA(min(255, _PvpAllyColor.R+150), min(255, _PvpAllyColor.G+150), min(255, _PvpAllyColor.B+150),_PvpAllyColor.A);
+				if(isInSameLeague())
+					return _PvpAllyColor;
+				return _PvpAllyInTeamColor;
 			}
 		}
+
+		// neutral pvp
+		if (isNeutralPVP())
+			return _PvpNeutralColor;
+
 		// neutral
 		if (isInTeam())
 			return _GroupColor;
-		if (isInGuild())
+
+		// neutral
+		if (isInSameLeague())
+			return CRGBA(min(255, _GroupColor.R+50), min(255, _GroupColor.G+50), min(255, _GroupColor.B+50),_GroupColor.A);
+
+		if (isInSameGuild())
 			return _GuildColor;
 	}
 	return _EntitiesColor[Type];
diff --git a/code/ryzom/client/src/entity_cl.h b/code/ryzom/client/src/entity_cl.h
index 1c79161ea..e2d6cf6e6 100644
--- a/code/ryzom/client/src/entity_cl.h
+++ b/code/ryzom/client/src/entity_cl.h
@@ -91,7 +91,10 @@ class CItemSheet;
 
 class CPhysicalDamage;
 
+namespace NLMISC{
 class CCDBNodeLeaf;
+class CCDBNodeBranch;
+}
 
 extern CLFECOMMON::TCLEntityId	SlotUnderCursor;
 
@@ -686,7 +689,7 @@ public:
 	virtual bool isNeutralPVP() const { return false; }
 
 	/// Return true if this player has the viewing properties of a friend (inscene bars...)
-	virtual bool isViewedAsFriend() const { return isNeutral() || isFriend() || isInTeam() || isInGuild(); }
+	virtual bool isViewedAsFriend() const { return isNeutral() || isFriend() || isInTeam() || isInSameGuild() || isInSameLeague(); }
 
 	/// Return the People for the entity (unknown by default)
 	virtual EGSPD::CPeople::TPeople people() const;
@@ -733,7 +736,13 @@ public:
 	bool isInTeam () const { return _IsInTeam; }
 
 	// Return true if this entity is in the user guild
-	bool isInGuild () const;
+	bool isInSameGuild () const;
+
+	// Return true if this entity is in the user league
+	bool isInSameLeague () const;
+
+	// Return true if this entity or the user is in a league
+	bool oneInLeague () const;
 
 	// Return true if this entity is a Mount owned by the User
 	bool isUserMount () const {return _IsUserMount;}
@@ -746,8 +755,9 @@ public:
 	virtual uint64 getGuildSymbol () const { return 0; }
 
 	virtual uint32 getEventFactionID() const { return 0; }
-	virtual uint8 getPvpMode() const { return PVP_MODE::None; }
+	virtual uint16 getPvpMode() const { return PVP_MODE::None; }
 	virtual PVP_CLAN::TPVPClan getPvpClan() const { return PVP_CLAN::None; }
+	virtual uint32 getLeagueID() const { return 0; }
 
 	virtual uint16					getOutpostId() const { return 0; }
 	virtual OUTPOSTENUMS::TPVPSide	getOutpostSide() const { return OUTPOSTENUMS::UnknownPVPSide; }
@@ -760,6 +770,16 @@ public:
 		return _Title;
 	}
 
+	/// Return the entity tags
+	const ucstring &getTag(uint8 id) const
+	{
+		if (_Tags.size() > id) {
+			return _Tags[id];
+		}
+		static ucstring empty;
+		return empty;
+	}
+
 	/// Return the raw unparsed entity title
 	const ucstring getTitleRaw() const
 	{
@@ -792,7 +812,7 @@ public:
 	virtual void setDiffuse(bool onOff, NLMISC::CRGBA diffuse);
 
 
-	static CCDBNodeLeaf *getOpacityDBNode();
+	static NLMISC::CCDBNodeLeaf *getOpacityDBNode();
 	static uint32 getOpacityMin();
 	static void setOpacityMin(uint32 value);
 
@@ -867,7 +887,7 @@ protected:
 	// Persistent NPC Alias of the entity
 	uint32							_NPCAlias;
 	// Local DB Branch for this entity
-	class CCDBNodeBranch			*_DBEntry;
+	class NLMISC::CCDBNodeBranch			*_DBEntry;
 	// Playlist
 	NL3D::UPlayList					*_PlayList;
 	NL3D::UPlayList					*_FacePlayList;
@@ -910,6 +930,8 @@ protected:
 	ucstring						_EntityName;
 	// Current entity title
 	ucstring						_Title;
+	// Current entity tags
+	std::vector<ucstring>			_Tags;
 	// Current entity title string id
 	std::string						_TitleRaw;
 	// Current permanent content symbol for the entity
@@ -1006,7 +1028,7 @@ protected:
 	static NLMISC::CRGBA		_PvpEnemyColor;
 	static NLMISC::CRGBA		_PvpNeutralColor;
 	static NLMISC::CRGBA		_PvpAllyInTeamColor;
-	static NLMISC::CRGBA		_PvpAllyInGuildColor;
+	static NLMISC::CRGBA		_PvpAllyInLeagueColor;
 	static NLMISC::CRGBA		_PvpAllyColor;
 	// colors for GM players
 	static NLMISC::CRGBA		_GMTitleColor[CHARACTER_TITLE::EndGmTitle - CHARACTER_TITLE::BeginGmTitle + 1];
@@ -1089,7 +1111,7 @@ protected:
 	// for localSelectBox() computing
 	sint64										_LastLocalSelectBoxComputeTime;
 
-	static NLMISC::CRefPtr<CCDBNodeLeaf>		_OpacityMinNodeLeaf;
+	static NLMISC::CRefPtr<NLMISC::CCDBNodeLeaf>		_OpacityMinNodeLeaf;
 
 protected:
 	/**
diff --git a/code/ryzom/client/src/far_tp.cpp b/code/ryzom/client/src/far_tp.cpp
index fb23b5810..caa31a305 100644
--- a/code/ryzom/client/src/far_tp.cpp
+++ b/code/ryzom/client/src/far_tp.cpp
@@ -1267,7 +1267,8 @@ void CFarTP::sendReady()
 			CInputHandlerManager::getInstance()->pumpEventsNoIM();
 			// Update Network.
 			NetMngr.update();
-			CCDBNodeBranch::flushObserversCalls();
+			IngameDbMngr.flushObserverCalls();
+			CInterfaceManager::getInstance()->flushObserverCalls();
 			// Be nice to the system
 			nlSleep(100);
 		}
@@ -1405,7 +1406,8 @@ void CFarTP::farTPmainLoop()
 
 		// Update Network.
 		NetMngr.update();
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// TODO: resend in case the last datagram sent was lost?
 //		// check if we can send another dated block
diff --git a/code/ryzom/client/src/game_context_menu.h b/code/ryzom/client/src/game_context_menu.h
index de628c2c6..e1a854507 100644
--- a/code/ryzom/client/src/game_context_menu.h
+++ b/code/ryzom/client/src/game_context_menu.h
@@ -30,7 +30,9 @@
 // ***************************************************************************
 class CGroupMenu;
 class CViewTextMenu;
+namespace NLMISC{
 class CCDBNodeLeaf;
+}
 
 // ***************************************************************************
 /**
@@ -77,21 +79,21 @@ private:
 
 	// MilkoPad
 	CInterfaceGroupPtr _GroupMilkoPad;
-	CCDBNodeLeaf	*_MilkoAttackDisengage;
+	NLMISC::CCDBNodeLeaf	*_MilkoAttackDisengage;
 	CCtrlTextButtonPtr	_MilkoAttDisBut1;
 	CCtrlTextButtonPtr	_MilkoAttDisBut2;
 
 	CGroupMenu		*_GroupMenu;
-	CCDBNodeLeaf	*_ContextVal;
-	CCDBNodeLeaf	*_AvailablePrograms;
-	CCDBNodeLeaf	*_ServerTeamPresent;
-	CCDBNodeLeaf	*_MissionOption[NUM_MISSION_OPTIONS];
-	CCDBNodeLeaf	*_ServerInDuel;
-	CCDBNodeLeaf	*_ServerInPvpChallenge;
-	CCDBNodeLeaf	*_WebPageTitle;
-	CCDBNodeLeaf	*_OutpostSheet;
-	CCDBNodeLeaf	*_OutpostRightToBannish;
-	CCDBNodeLeaf	*_MissionRing[BOTCHATTYPE::MaxR2MissionEntryDatabase];
+	NLMISC::CCDBNodeLeaf	*_ContextVal;
+	NLMISC::CCDBNodeLeaf	*_AvailablePrograms;
+	NLMISC::CCDBNodeLeaf	*_ServerTeamPresent;
+	NLMISC::CCDBNodeLeaf	*_MissionOption[NUM_MISSION_OPTIONS];
+	NLMISC::CCDBNodeLeaf	*_ServerInDuel;
+	NLMISC::CCDBNodeLeaf	*_ServerInPvpChallenge;
+	NLMISC::CCDBNodeLeaf	*_WebPageTitle;
+	NLMISC::CCDBNodeLeaf	*_OutpostSheet;
+	NLMISC::CCDBNodeLeaf	*_OutpostRightToBannish;
+	NLMISC::CCDBNodeLeaf	*_MissionRing[BOTCHATTYPE::MaxR2MissionEntryDatabase];
 
 
 	CViewTextMenuPtr _TextLootAction;
diff --git a/code/ryzom/client/src/ground_fx_manager.cpp b/code/ryzom/client/src/ground_fx_manager.cpp
index 92267dd2a..2d3ce3810 100644
--- a/code/ryzom/client/src/ground_fx_manager.cpp
+++ b/code/ryzom/client/src/ground_fx_manager.cpp
@@ -64,7 +64,7 @@ CGroundFXManager::CGroundFXManager() :
 					   _MinSpeed(1.5f),
 					   _MaxSpeed(6.f),
 					   _SpeedWaterWalkFast(3.f),
-					   _SpeedWaterSwimFast(3.f),
+					   _SpeedWaterSwimFast(2.f),
 					   _MaxDist(50.f),
 					   _MaxNumFX(10),
 					   _NumFX(0),
@@ -495,7 +495,7 @@ void CGroundFXManager::update(const NLMISC::CVectorD &camPos)
 			break;
 			case CInstance::Swim:
 				if (speed == 0.f) fxName = "StepSwimIdle.ps";
-				else if (speed > _SpeedWaterWalkFast)
+				else if (speed > _SpeedWaterSwimFast)
 				{
 					fxName = "StepSwimSpeed.ps";
 					fxNameUnderWater = "StepSwimSpeedUnderWater.ps";
diff --git a/code/ryzom/client/src/ingame_database_manager.h b/code/ryzom/client/src/ingame_database_manager.h
index 634544f61..5186cf0b7 100644
--- a/code/ryzom/client/src/ingame_database_manager.h
+++ b/code/ryzom/client/src/ingame_database_manager.h
@@ -27,9 +27,10 @@
 // Misc.
 #include "nel/misc/types_nl.h"
 // Game share.
-#include "cdb.h"
-#include "cdb_leaf.h"
-#include "cdb_branch.h"
+#include "nel/misc/cdb.h"
+#include "nel/misc/cdb_leaf.h"
+#include "nel/misc/cdb_branch.h"
+#include "nel/misc/cdb_branch_observing_handler.h"
 #include "cdb_synchronised.h"
 
 
diff --git a/code/ryzom/client/src/init_main_loop.cpp b/code/ryzom/client/src/init_main_loop.cpp
index 2610b5882..45fa7b59e 100644
--- a/code/ryzom/client/src/init_main_loop.cpp
+++ b/code/ryzom/client/src/init_main_loop.cpp
@@ -315,7 +315,8 @@ inline void	waitForNetworkMessage(bool &var)
 		CInputHandlerManager::getInstance()->pumpEventsNoIM();
 		// Update network.
 		NetMngr.update();
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 		// Send dummy info
 		NetMngr.send();
 		// Do not take all the CPU.
@@ -1216,7 +1217,8 @@ void initMainLoop()
 				CInputHandlerManager::getInstance()->pumpEventsNoIM();
 				// Update Network.
 				NetMngr.update();
-				CCDBNodeBranch::flushObserversCalls();
+				IngameDbMngr.flushObserverCalls();
+				CInterfaceManager::getInstance()->flushObserverCalls();
 			}
 
 			// Set the LastGameCycle
diff --git a/code/ryzom/client/src/interface_v3/action_handler_game.cpp b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
index ec0931b73..49c6f613b 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_game.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_game.cpp
@@ -2571,7 +2571,9 @@ class CAHAddShape : public IActionHandler
 						skel.setPos(CVector((float)x, (float)y, (float)z));
 						skel.setRotQuat(dir.getRot());
 					}
-				} else {
+				}
+				else
+				{
 					instance.setScale(instance.getScale()*s);
 					instance.setPos(CVector((float)x, (float)y, (float)z));
 					instance.setRotQuat(dir.getRot());
@@ -3168,7 +3170,6 @@ class CHandlerGameConfigFullscreen : public IActionHandler
 			// hide frequencies combo
 			pCB= dynamic_cast<CDBGroupComboBox*>(pIM->getElementFromId( GAME_CONFIG_VIDEO_FREQS_COMBO ));
 			if (pCB) pCB->setActive(false);
-
 		}
 
 		// **** dirt the apply button of the DDX
diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.cpp b/code/ryzom/client/src/interface_v3/action_handler_help.cpp
index b36e063d7..0d2ec32a6 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_help.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_help.cpp
@@ -57,6 +57,9 @@
 #include "sbrick_manager.h"
 #include "sphrase_manager.h"
 #include "action_handler_help.h"
+#include "nel/misc/i18n.h"
+#include "nel/misc/algo.h"
+#include "nel/net/email.h"
 #include "game_share/mission_desc.h"
 #include "game_share/inventories.h"
 #include "game_share/visual_slot_manager.h"
@@ -241,6 +244,7 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 			i++;
 	}
 
+	bool showSlotAndCreator = false;
 	// If an active window get the same object, abort, but make it top.
 	for(i=0;i<_ActiveWindows.size();i++)
 	{
@@ -258,6 +262,8 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 				// for items, must also test if they have the same itemSlotId, cause relies also on "ItemInfo system"
 				if(elt->getType() == CCtrlSheetInfo::SheetType_Item)
 				{
+					showSlotAndCreator = true;
+
 					CDBCtrlSheet		*realCtrlDst= _InfoWindows[_ActiveWindows[i]].CtrlSheet;
 					if(!realCtrlDst)
 						ok= false;
@@ -341,6 +347,13 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 	CInterfaceGroup	*group= _InfoWindows[newIndexWindow].Window;
 	nlassert(group);
 
+	CInterfaceElement *ctrl = group->getElement(group->getId()+":content:ctrl_slot");
+	if (ctrl) ctrl->setActive(showSlotAndCreator);
+	ctrl = group->getElement(group->getId()+":content:creator");
+	if (ctrl) ctrl->setActive(showSlotAndCreator);
+	ctrl = group->getElement(group->getId()+":content:creator_header");
+	if (ctrl) ctrl->setActive(showSlotAndCreator);
+
 	// activate it, set top, copy item watched
 	group->setActive(true);
 	pIM->setTopWindow(group);
@@ -378,7 +391,7 @@ CInterfaceGroup	*CInterfaceHelp::activateNextWindow(CDBCtrlSheet *elt, sint forc
 	setup.setupDefaultIDs();
 	setup.SrcSheet = elt;
 	setup.HelpWindow = group;
-	setupCreatorName(setup);
+	//setupCreatorName(setup);
 
 	// Hide elements by defaults
 	resetSheetHelp(setup);
@@ -1214,6 +1227,7 @@ static void setupSkillToTradeHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	ucstring	skillText;
@@ -2064,6 +2078,12 @@ void getItemText (CDBCtrlSheet *item, ucstring &itemText, const CItemSheet*pIS)
 			strFindReplace(itemText, "%r2_comment_text", toString(itemInfo.R2ItemComment));
 		}
 		break;
+	case ITEMFAMILY::PET_ANIMAL_TICKET:
+		{
+			string nr = (itemInfo.PetNumber > 0) ? toString(itemInfo.PetNumber) : "(slot)" + toString(item->getIndexInDB());
+			strFindReplace(itemText, "%petnumber", nr);
+		}
+		break;
 	default:
 		{
 			strFindReplace(itemText, "%no_rent", pIS->IsItemNoRent ? CI18N::get("uihelpItemNoRent") : string(""));
@@ -2269,6 +2289,7 @@ static void setupItemHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	// NB: for raw materials only, must do each once only, must not do it at refresh, cause combo reseted
@@ -2557,6 +2578,7 @@ static void setupPactHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 
@@ -2594,6 +2616,7 @@ static void setupMissionHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	// get detail text id from db
@@ -2745,8 +2768,15 @@ void setupCreatorName(CSheetHelpSetup &setup)
 	CViewText	*vthd = dynamic_cast<CViewText*>(setup.HelpWindow->getView("creator_header"));
 	if (vtid != NULL)
 	{
-		// if not an item, disable the view
-		if(!setup.SrcSheet || setup.SrcSheet->getType()!=CCtrlSheetInfo::SheetType_Item	)
+		bool bIsRM = false;
+		if (setup.SrcSheet)
+		{
+			const CItemSheet *pIS= dynamic_cast<const CItemSheet*>(SheetMngr.get(CSheetId(setup.SrcSheet->getSheetId())));
+			bIsRM = (pIS && pIS->Family == ITEMFAMILY::RAW_MATERIAL);
+		}
+
+		// if a RM or not an item, disable the view
+		if(!setup.SrcSheet || bIsRM || setup.SrcSheet->getType()!=CCtrlSheetInfo::SheetType_Item	)
 		{
 			// important else a brick could display a creator name....
 			vtid->setActive(false);
@@ -2824,6 +2854,7 @@ void setupOutpostBuildingHelp(CSheetHelpSetup &setup)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	const COutpostBuildingSheet *pOBS = setup.SrcSheet->asOutpostBuildingSheet();
@@ -3148,6 +3179,7 @@ void setupSabrinaPhraseHelp(CSheetHelpSetup &setup, const CSPhraseCom &phrase, u
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 	// **** setup the phrase Text info
@@ -3217,6 +3249,7 @@ static void setupSabrinaBrickHelp(CSheetHelpSetup &setup, bool auraDisabled)
 	if(setup.DestSheet)
 	{
 		setup.SrcSheet->copyAspect(setup.DestSheet);
+		setup.DestSheet->setActive(true);
 	}
 
 
@@ -3569,6 +3602,31 @@ public:
 };
 REGISTER_ACTION_HANDLER( CHandlerAuraModifierTooltip, "aura_modifier_tooltip");
 
+// ***************************************************************************
+class CHandlerUserPaToolTip : public IActionHandler
+{
+public:
+	virtual void execute(CCtrlBase *pCaller, const string &Params)
+	{
+		CInterfaceManager	*pIM= CInterfaceManager::getInstance();
+
+		uint8 index;
+		fromString(Params, index);
+		--index; // Param is 1-based so subtract 1
+		if (index < 0 || index >= MAX_INVENTORY_ANIMAL)
+		{
+			return;
+		}
+
+		ucstring txt;
+		CCDBNodeLeaf *node = pIM->getDbProp(toString("SERVER:PACK_ANIMAL:BEAST%d:NAME", index));
+		if (node && CStringManagerClient::instance()->getDynString(node->getValue32(), txt))
+		{
+			pIM->setContextHelpText(CEntityCL::removeTitleFromName(txt));
+		}
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerUserPaToolTip, "userpa_name_tooltip");
 
 // ***************************************************************************
 class CHandlerAnimalDeadPopupTooltip : public IActionHandler
@@ -3923,7 +3981,7 @@ public:
 			NL3D::UDriver *Driver = CInterfaceManager::getInstance()->getViewRenderer().getDriver();
 			if (Driver)
 			{
-				HWND wnd = Driver->getDisplay();
+				HWND wnd = (HWND) Driver->getDisplay();
 				ShowWindow(wnd, SW_MINIMIZE);
 			}
 		#endif
diff --git a/code/ryzom/client/src/interface_v3/action_handler_help.h b/code/ryzom/client/src/interface_v3/action_handler_help.h
index 7430ee8cf..59a218a27 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_help.h
+++ b/code/ryzom/client/src/interface_v3/action_handler_help.h
@@ -64,6 +64,15 @@ void refreshItemHelp(CSheetHelpSetup &setup);
 // refresh help for a mission
 void refreshMissionHelp(CSheetHelpSetup &setup, const CPrerequisitInfos &infos);
 
+class CPetAnimalItemInfoWaiter : public IItemInfoWaiter
+{
+	void infoReceived()
+	{
+		//ItemSheet
+		//ItemSlotId
+		CClientItemInfo info = getInventory().getItemInfo(ItemSlotId);
+	}
+};
 
 
 // ***************************************************************************
@@ -132,10 +141,10 @@ private:
 	};
 
 	// update the brick help window when weight of hands has changed
-	class CFittedWeaponWeightObserver : public ICDBNode::IPropertyObserver
+	class CFittedWeaponWeightObserver : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
 
 
diff --git a/code/ryzom/client/src/interface_v3/action_handler_item.cpp b/code/ryzom/client/src/interface_v3/action_handler_item.cpp
index 819b8c0d4..ce5e49307 100644
--- a/code/ryzom/client/src/interface_v3/action_handler_item.cpp
+++ b/code/ryzom/client/src/interface_v3/action_handler_item.cpp
@@ -31,9 +31,11 @@
 #include "../net_manager.h"
 #include "group_menu.h"
 #include "../global.h"
+#include "group_html.h"
 
 //
 #include "game_share/inventories.h"
+#include "game_share/bot_chat_types.h"
 
 #include "macrocmd_manager.h"
 #include "inventory_manager.h"
@@ -43,6 +45,7 @@
 #include "view_bitmap.h"
 
 extern CSheetManager SheetMngr;
+extern NLMISC::CLog	g_log;
 
 using namespace std;
 using namespace NLMISC;
@@ -80,8 +83,6 @@ void CInterfaceItemEdition::setCurrWindow(CDBCtrlSheet* ctrlSheet, const std::st
 		_CurrWindow.IsInEditionMode = isInEditionMode;
 		_CurrWindow.begin();
 	}
-
-	
 }
 
 // ********************************************************************************************
@@ -153,13 +154,26 @@ void CInterfaceItemEdition::CItemEditionWindow::infoReceived()
 					if (itemInfo.CustomText.empty())
 						display->setTextFormatTaged(ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id)));
 					else
-						display->setTextFormatTaged(itemInfo.CustomText);		
+					{
+						ucstring text = itemInfo.CustomText;
+						string::size_type delimiter = text.find(' ');
+						if(text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
+						{
+							CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(pIM->getElementFromId("ui:interface:web_transactions:content:html"));
+							if (pGH)
+								pGH->browse(ucstring(text.substr(4, delimiter-4)).toString().c_str());
+							if (delimiter == string::npos)
+								group->setActive(false);
+							else
+								text = text.substr(delimiter, text.size()-delimiter);
+						}
+						
+						display->setTextFormatTaged(text);		
+					}
 				}
-
 			}
 		}
 	}
-
 }
 
 
@@ -278,7 +292,21 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 						if (itemInfo.CustomText.empty())
 							display->setTextFormatTaged(ucstring(STRING_MANAGER::CStringManagerClient::getItemLocalizedDescription(pIS->Id)));
 						else
-							display->setTextFormatTaged(itemInfo.CustomText);
+						{
+							ucstring text = itemInfo.CustomText;
+							string::size_type delimiter = text.find(' ');
+							if(text.size() > 3 && text[0]=='@' && text[1]=='W' && text[2]=='E' && text[3]=='B')
+							{
+								CGroupHTML *pGH = dynamic_cast<CGroupHTML*>(pIM->getElementFromId("ui:interface:web_transactions:content:html"));
+								if (pGH)
+									pGH->browse(ucstring(text.substr(4, delimiter-4)).toString().c_str());
+								if (delimiter == string::npos)
+									group->setActive(false);
+								else
+									text = text.substr(delimiter, text.size()-delimiter);
+							}
+							display->setTextFormatTaged(text);
+						}
 					}
 					else
 					{
@@ -287,7 +315,6 @@ void CInterfaceItemEdition::CItemEditionWindow::begin()
 					}
 				}
 			}
-
 		}
 	}
 }
@@ -366,7 +393,6 @@ void CInterfaceItemEdition::CItemEditionWindow::validate()
 				text = editBoxLarge->getInputString();
 			}
 			 
-
 			if (textValid)
 			{
 				CBitMemStream out;
@@ -972,6 +998,12 @@ bool checkCanExchangeItem(CDBCtrlSheet *pCSSrc)
 		bDropOrSell = pIS->canExchangeOrGive(PlayerTrade.BotChatGiftContext);
 	}
 
+	// Locked by owner; cannot trade
+	if (pCSSrc->getLockedByOwner())
+	{
+		return false;
+	}
+
 	// Special case if this is an animal ticket
 	if ((pIS != NULL) && (pIS->Family == ITEMFAMILY::PET_ANIMAL_TICKET))
 	{
@@ -1209,6 +1241,13 @@ class CHandlerDestroyItem : public IActionHandler
 			nlwarning("<CHandlerDestroyItem::execute> no caller sheet found");
 			return;
 		}
+
+		// Don't destroy locked items
+		if (item->getLockedByOwner())
+		{
+			return;
+		}
+
 		// if the item is currently selected, removes the selection
 		if (item == CDBCtrlSheet::getCurrSelection())
 		{
@@ -1712,11 +1751,15 @@ class CHandlerItemMenuCheck : public IActionHandler
 		CViewTextMenu	*pXpCatalyserUse = dynamic_cast<CViewTextMenu*>(pMenu->getView("xp_catalyser_use"));
 		CViewTextMenu	*pDrop = dynamic_cast<CViewTextMenu*>(pMenu->getView("drop"));
 		CViewTextMenu	*pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy"));
+		CViewTextMenu	*pLockUnlock = dynamic_cast<CViewTextMenu*>(pMenu->getView("lockunlock"));
 		CViewTextMenu	*pMoveSubMenu = dynamic_cast<CViewTextMenu*>(pMenu->getView("move"));
 		CViewTextMenu	*pMoveToBag = dynamic_cast<CViewTextMenu*>(pMenu->getView("bag"));
 		CViewTextMenu	*pMoveToGuild = dynamic_cast<CViewTextMenu*>(pMenu->getView("guild"));
 		CViewTextMenu	*pMoveToRoom = dynamic_cast<CViewTextMenu*>(pMenu->getView("room"));
 		CViewTextMenu	*pMoveToPa[MAX_INVENTORY_ANIMAL];
+
+		bool bIsLockedByOwner = pCS->getLockedByOwner();
+
 		for(i=0;i<MAX_INVENTORY_ANIMAL;i++)
 		{
 			pMoveToPa[i]= dynamic_cast<CViewTextMenu*>(pMenu->getView(toString("pa%d", i)));
@@ -1735,24 +1778,27 @@ class CHandlerItemMenuCheck : public IActionHandler
 		if(pXpCatalyserUse) pXpCatalyserUse->setActive(false);
 		if(pItemTextDisplay) pItemTextDisplay->setActive(false);
 		if(pItemTextEdition) pItemTextEdition->setActive(false);
+
+		if(pLockUnlock) pLockUnlock->setActive(true);
+
 		const CItemSheet *pIS = pCS->asItemSheet();
 		if (invId != INVENTORIES::guild)
 		if (pIS != NULL)
 		{
-			if (pCrisEnchant && pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL)
+			if (pCrisEnchant && pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL && !bIsLockedByOwner)
 				pCrisEnchant->setActive(true);
-			if (pCrisReload && pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE)
+			if (pCrisReload && pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE && !bIsLockedByOwner)
 				pCrisReload->setActive(true);
 			// teleport can be used only from bag (NB: should not exist in mektoub....)
-			if (pTeleportUse && pIS->Family == ITEMFAMILY::TELEPORT && pCS->getInventoryIndex()==INVENTORIES::bag)
+			if (pTeleportUse && pIS->Family == ITEMFAMILY::TELEPORT && pCS->getInventoryIndex()==INVENTORIES::bag && !bIsLockedByOwner)
 			{
 				pTeleportUse->setActive(true);
 			}
-			if (pItemConsume && pIS->IsConsumable == true && pCS->getInventoryIndex()==INVENTORIES::bag)
+			if (pItemConsume && pIS->IsConsumable == true && pCS->getInventoryIndex()==INVENTORIES::bag && !bIsLockedByOwner)
 			{
 				pItemConsume->setActive(true);
 			}
-			if (pXpCatalyserUse && pIS->Family == ITEMFAMILY::XP_CATALYSER && pCS->getInventoryIndex()==INVENTORIES::bag)
+			if (pXpCatalyserUse && pIS->Family == ITEMFAMILY::XP_CATALYSER && pCS->getInventoryIndex()==INVENTORIES::bag && !bIsLockedByOwner)
 			{
 				pXpCatalyserUse->setActive(true);
 			}
@@ -1815,9 +1861,10 @@ class CHandlerItemMenuCheck : public IActionHandler
 			for(i=0;i<MAX_INVENTORY_ANIMAL;i++)
 				if(pMoveToPa[i]) pMoveToPa[i]->setActive(false);
 
-			// additionnaly, cannot drop/destroy an animal item.
+			// additionnaly, cannot drop/destroy/lock an animal item.
 			if(pDrop)			pDrop->setActive(false);
 			if(pDestroy)		pDestroy->setActive(false);
+			if(pLockUnlock)		pLockUnlock->setActive(false);
 		}
 		else
 		{
@@ -1845,6 +1892,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			// std case: can drop / destroy
 			if(pDrop)		pDrop->setActive(invId!=INVENTORIES::guild);
 			if(pDestroy)	pDestroy->setActive(invId!=INVENTORIES::guild);
+			if(pLockUnlock)	pLockUnlock->setActive(invId!=INVENTORIES::guild);
 		}
 
 		// hide the move entry completely?
@@ -1899,6 +1947,29 @@ class CHandlerItemMenuCheck : public IActionHandler
 			pItemTextDisplay->setGrayed(pIM->getDbProp("UI:VARIABLES:ISACTIVE:PHRASE_EDIT_CUSTOM")->getValueBool());
 		}
 
+		if (pCS->getGrayed())
+		{
+			if (pEquip) pEquip->setActive(false);
+			if (pDestroy) pDestroy->setActive(false);
+			if (pLockUnlock) pLockUnlock->setActive(false);
+			if (pMoveSubMenu) pMoveSubMenu->setActive(false);
+		}
+
+		if (bIsLockedByOwner) 
+		{
+			if (pLockUnlock) pLockUnlock->setHardText("uimUnlockItem");
+			// Cannot drop/destroy if locked by owner
+			if (pDrop)    pDrop->setActive(false);
+			if (pDestroy) pDestroy->setActive(false);
+		}
+		else
+		{
+			if (pLockUnlock) pLockUnlock->setHardText("uimLockItem");
+		}
+
+		// Only show lock menu item if inventory contains the info
+		if (pLockUnlock) pLockUnlock->setActive(pCS->canOwnerLock());
+
 
 		// **** Gray Entries
 		// If ourselves are not available, then gray all
@@ -1911,6 +1982,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			if(pXpCatalyserUse)	pXpCatalyserUse->setGrayed(true);
 			if(pDrop)			pDrop->setGrayed(true);
 			if(pDestroy)		pDestroy->setGrayed(true);
+			if(pLockUnlock)		pLockUnlock->setGrayed(true);
 			if(pMoveSubMenu)	pMoveSubMenu->setGrayed(true);
 			if(pMoveToBag)		pMoveToBag->setGrayed(true);
 			for(i=0;i<MAX_INVENTORY_ANIMAL;i++)
@@ -1929,6 +2001,7 @@ class CHandlerItemMenuCheck : public IActionHandler
 			if(pXpCatalyserUse)	pXpCatalyserUse->setGrayed(false);
 			if(pDrop)			pDrop->setGrayed(false);
 			if(pDestroy)		pDestroy->setGrayed(false);
+			if(pLockUnlock)		pLockUnlock->setGrayed(false);
 			if(pMoveSubMenu)	pMoveSubMenu->setGrayed(false);
 
 			// check each inventory dest if available
@@ -1956,6 +2029,45 @@ class CHandlerItemMenuDeactivate : public IActionHandler
 };
 REGISTER_ACTION_HANDLER( CHandlerItemMenuDeactivate, "item_menu_deactivate" );
 
+
+// ***************************************************************************
+
+class CHandlerItemMenuBaseCheck : public IActionHandler
+{
+	void execute (CCtrlBase *pCaller, const std::string &/* sParams */)
+	{
+		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+
+		// Get the ctrl sheet that launched this menu
+		CDBCtrlSheet *pCS = dynamic_cast<CDBCtrlSheet*>(pIM->getCtrlLaunchingModal());
+		if (pCS == NULL) return;
+		INVENTORIES::TInventory		invId= (INVENTORIES::TInventory)pCS->getInventoryIndex();
+
+		// Get the menu launched
+		CInterfaceGroup	  *pMenu= dynamic_cast<CInterfaceGroup*>(pCaller);
+		if(!pMenu)	return;
+
+		// Get all needed text entries
+		CViewTextMenu	*pDestroy = dynamic_cast<CViewTextMenu*>(pMenu->getView("destroy"));
+		CViewTextMenu	*pLockUnlock = dynamic_cast<CViewTextMenu*>(pMenu->getView("lockunlock"));
+
+		if (pCS->getLockedByOwner()) 
+		{
+			pLockUnlock->setHardText("uimUnlockItem");
+			// Cannot destroy if locked by owner
+			if (pDestroy) pDestroy->setActive(false);
+		}
+		else
+		{
+			pLockUnlock->setHardText("uimLockItem");
+			if (pDestroy) pDestroy->setActive(true);
+		}
+
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerItemMenuBaseCheck, "item_menu_base_check" );
+
+
 // ***************************************************************************
 static void sendMsgUseItem(uint16 slot)
 {
diff --git a/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp b/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp
index 53a1258bc..4cb128f89 100644
--- a/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp
+++ b/code/ryzom/client/src/interface_v3/action_phrase_faber.cpp
@@ -33,7 +33,7 @@
 #include "group_editbox.h"
 #include "dbview_bar.h"
 #include "skill_manager.h"
-
+#include "game_share/bot_chat_types.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -69,7 +69,9 @@ const std::string	FaberPhraseItemResultGroup= FaberPhraseWindow + ":header_opene
 // ***************************************************************************
 CActionPhraseFaber::CActionPhraseFaber()
 {
-	_InventoryMirror.resize(INVENTORIES::NUM_INVENTORY * MAX_PLAYER_INV_ENTRIES);
+	uint size = MAX_PLAYER_INV_ENTRIES + (MAX_ANIMALINV_ENTRIES * MAX_INVENTORY_ANIMAL) +
+		MAX_GUILDINV_ENTRIES + MAX_ROOMINV_ENTRIES;
+	_InventoryMirror.resize(size);
 	_InventoryObsSetup= false;
 	_ExecuteFromItemPlanBrick= NULL;
 }
@@ -184,16 +186,16 @@ void		CActionPhraseFaber::launchFaberCastWindow(sint32 memoryLine, uint memoryIn
 	// ensure remove (if setuped before), then add
 	CCDBNodeBranch	*branch;
 	branch= pIM->getDbBranch("LOCAL:INVENTORY:BAG");
-	if(branch) branch->removeBranchObserver(&_DBInventoryObs);
-	if(branch) branch->addBranchObserver(&_DBInventoryObs);
+	if(branch) pIM->removeBranchObserver( "LOCAL:INVENTORY:BAG",&_DBInventoryObs);
+	if(branch) pIM->addBranchObserver( "LOCAL:INVENTORY:BAG",&_DBInventoryObs);
 
 	// and for all pack animals
 	uint	i;
 	for(i=0;i<MAX_INVENTORY_ANIMAL;i++)
 	{
 		branch= pIM->getDbBranch(toString("LOCAL:INVENTORY:PACK_ANIMAL%d", i));
-		if(branch) branch->removeBranchObserver(&_DBInventoryObs);
-		if(branch) branch->addBranchObserver(&_DBInventoryObs);
+		if(branch) pIM->removeBranchObserver( toString("LOCAL:INVENTORY:PACK_ANIMAL%d", i).c_str(), &_DBInventoryObs);
+		if(branch) pIM->addBranchObserver( toString("LOCAL:INVENTORY:PACK_ANIMAL%d", i).c_str(), &_DBInventoryObs);
 	}
 
 	// Add observers on animal status, cause inventory may become unavailabe during the process
@@ -275,25 +277,64 @@ void			CActionPhraseFaber::fillFaberPlanSelection(const std::string &brickDB, ui
 }
 
 // ***************************************************************************
-CItemImage		*CActionPhraseFaber::getInvMirrorItemImage(uint slotIndex)
+CItemImage		*CActionPhraseFaber::getInvMirrorItemImage(uint slotIndex, uint& invId, uint& indexInInv)
 {
-	uint		invId= slotIndex/MAX_PLAYER_INV_ENTRIES;
-	uint		indexInInv= slotIndex%MAX_PLAYER_INV_ENTRIES;
+	if (slotIndex < MAX_PLAYER_INV_ENTRIES)
+	{
+		invId = INVENTORIES::bag;
+		indexInInv = slotIndex;
+		return &getInventory().getBagItem(slotIndex);
+	}
+	slotIndex -= MAX_PLAYER_INV_ENTRIES;
+
+	if (slotIndex < (MAX_ANIMALINV_ENTRIES * MAX_INVENTORY_ANIMAL))
+	{
+		uint animal = slotIndex / MAX_ANIMALINV_ENTRIES;
+		uint index = slotIndex % MAX_ANIMALINV_ENTRIES;
+		invId = INVENTORIES::pet_animal + animal;
+		indexInInv = index;
+		return &getInventory().getPAItem(animal, index);
+	}
+	slotIndex -= (MAX_ANIMALINV_ENTRIES * MAX_INVENTORY_ANIMAL);
+
+	if (slotIndex < MAX_GUILDINV_ENTRIES)
+	{
+		if (getInventory().isInventoryAvailable(INVENTORIES::guild))
+		{
+			CInterfaceManager *im = CInterfaceManager::getInstance();
+			CCDBNodeBranch *itemBranch = im->getDbBranch(SERVER_INVENTORY ":GUILD:" + toString(slotIndex));
+			static CItemImage image;
+			image.build(itemBranch);
+			invId = INVENTORIES::guild;
+			indexInInv = slotIndex;
+			return &image;
+		}
+		return NULL;
+	}
+	slotIndex -= MAX_GUILDINV_ENTRIES;
 
-	// get the item image from bag, steed, pack animal...
-	if(invId==INVENTORIES::bag && indexInInv<MAX_BAGINV_ENTRIES)
-		return &getInventory().getBagItem(indexInInv);
-	else if(invId>=INVENTORIES::pet_animal && invId<INVENTORIES::pet_animal+MAX_INVENTORY_ANIMAL && indexInInv<MAX_ANIMALINV_ENTRIES)
-		return &getInventory().getPAItem(invId-INVENTORIES::pet_animal, indexInInv);
+	if (slotIndex < MAX_ROOMINV_ENTRIES)
+	{
+		if (getInventory().isInventoryAvailable(INVENTORIES::player_room))
+		{
+			CInterfaceManager *im = CInterfaceManager::getInstance();
+			CCDBNodeBranch *itemBranch = im->getDbBranch(SERVER_INVENTORY ":ROOM:" + toString(slotIndex));
+			static CItemImage image;
+			image.build(itemBranch);
+			invId = INVENTORIES::player_room;
+			indexInInv = slotIndex;
+			return &image;
+		}
+		return NULL;
+	}
 
 	return NULL;
 }
 
 
 // ***************************************************************************
-bool			CActionPhraseFaber::isMpAvailable(CItemSheet *mpSheet, uint slotIndex) const
+bool			CActionPhraseFaber::isMpAvailable(CItemSheet *mpSheet, uint invId, uint slotIndex) const
 {
-	uint	invId= slotIndex / MAX_PLAYER_INV_ENTRIES;
 	return mpSheet && mpSheet->Family==ITEMFAMILY::RAW_MATERIAL && getInventory().isInventoryAvailable((INVENTORIES::TInventory)invId);
 }
 
@@ -396,14 +437,14 @@ void		CActionPhraseFaber::validateFaberPlanSelection(CSBrickSheet *itemPlanBrick
 		_InventoryMirror[i].reset();
 	}
 
+	uint		invId = 0;
+	uint		indexInInv = 0;
 	// Run all the inventories.
 	for(i=0;i<_InventoryMirror.size();i++)
 	{
-		uint		invId= i/MAX_PLAYER_INV_ENTRIES;
-		uint		indexInInv= i%MAX_PLAYER_INV_ENTRIES;
-		CItemImage	*itemImage= getInvMirrorItemImage(i);
-
-		// item found?
+		CItemImage	*itemImage= getInvMirrorItemImage(i, invId, indexInInv);
+		bool bLockedByOwner = itemImage && itemImage->getLockedByOwner();
+		// item found and not locked?
 		if(itemImage)
 		{
 			// setup the origin
@@ -413,7 +454,7 @@ void		CActionPhraseFaber::validateFaberPlanSelection(CSBrickSheet *itemPlanBrick
 			// The item must be a mp
 			CSheetId	sheetId= CSheetId(itemImage->getSheetID());
 			CItemSheet	*mpSheet= dynamic_cast<CItemSheet*>(SheetMngr.get(sheetId));
-			if( isMpAvailable(mpSheet, i) )
+			if( isMpAvailable(mpSheet, invId, i) && !bLockedByOwner)
 			{
 				_InventoryMirror[i].Sheet= sheetId;
 				_InventoryMirror[i].Quality= itemImage->getQuality();
@@ -422,6 +463,7 @@ void		CActionPhraseFaber::validateFaberPlanSelection(CSBrickSheet *itemPlanBrick
 				_InventoryMirror[i].Weight= itemImage->getWeight();
 				// Bkup original quantity from inventory
 				_InventoryMirror[i].OriginalQuantity= _InventoryMirror[i].Quantity;
+				_InventoryMirror[i].LockedByOwner= bLockedByOwner;
 			}
 		}
 	}
@@ -1311,17 +1353,22 @@ void		CActionPhraseFaber::onInventoryChange()
 		return;
 
 	// Run all the Bag
+	uint invId = 0;
+	uint indexInInv = 0;
 	for(i=0;i<_InventoryMirror.size();i++)
 	{
-		CItemImage	*itemImage= getInvMirrorItemImage(i);
+		CItemImage	*itemImage= getInvMirrorItemImage(i, invId, indexInInv);
+
 		if(itemImage)
 		{
 			CSheetId	sheetId= CSheetId(itemImage->getSheetID());
 			CItemSheet	*mpSheet= dynamic_cast<CItemSheet*>(SheetMngr.get(sheetId));
 			CItem		newInvItem;
 
-			// The item must be a mp, and the item must be available
-			if( isMpAvailable(mpSheet, i) )
+			bool bLockedByOwner = itemImage->getLockedByOwner();
+
+			// The item must be a mp, and the item must be available and unlocked
+			if( isMpAvailable(mpSheet, invId, i) && !bLockedByOwner)
 			{
 				newInvItem.Sheet= sheetId;
 				newInvItem.Quality= itemImage->getQuality();
@@ -1329,12 +1376,13 @@ void		CActionPhraseFaber::onInventoryChange()
 				newInvItem.UserColor= itemImage->getUserColor();
 				newInvItem.Weight= itemImage->getWeight();
 				newInvItem.OriginalQuantity= newInvItem.Quantity;
+				newInvItem.LockedByOwner = bLockedByOwner;
 			}
 
-			/* There is 4 cases:
+			/* There is 5 cases:
 				- no changes => no op.
-				- new Mp on a empty or non Mp slot. Easy, just add.
-				- old Mp removed (not same sheetId/quality/userColor)
+				- new/unlocked Mp on a empty or non Mp slot. Easy, just add.
+				- old Mp removed (not same sheetId/quality/userColor/locked)
 				- old Mp with quantity changed to be greater
 				- old Mp with quantity changed to be smaller
 			*/
@@ -1348,8 +1396,8 @@ void		CActionPhraseFaber::onInventoryChange()
 			// If the item was not a mp
 			if(_InventoryMirror[i].Sheet==CSheetId::Unknown)
 			{
-				// if now it is, easy, just add
-				if(newInvItem.Sheet!=CSheetId::Unknown)
+				// if now it is, easy, just add if not locked
+				if(newInvItem.Sheet!=CSheetId::Unknown && !newInvItem.LockedByOwner)
 					curInvItem= newInvItem;
 			}
 			// else must test change or remove
@@ -1358,7 +1406,8 @@ void		CActionPhraseFaber::onInventoryChange()
 				bool	sameMp;
 				sameMp=	curInvItem.Sheet == newInvItem.Sheet &&
 						curInvItem.Quality == newInvItem.Quality &&
-						curInvItem.UserColor == newInvItem.UserColor ;
+						curInvItem.UserColor == newInvItem.UserColor &&
+						curInvItem.LockedByOwner == newInvItem.LockedByOwner;
 
 				// if the Mp was deleted from this slot, delete it from all faber execution
 				if(!sameMp)
diff --git a/code/ryzom/client/src/interface_v3/action_phrase_faber.h b/code/ryzom/client/src/interface_v3/action_phrase_faber.h
index 8b792089b..18b772baa 100644
--- a/code/ryzom/client/src/interface_v3/action_phrase_faber.h
+++ b/code/ryzom/client/src/interface_v3/action_phrase_faber.h
@@ -92,6 +92,7 @@ private:
 		uint					Selected;
 		// This is the original quantity in inventory
 		sint32					OriginalQuantity;
+		bool                    LockedByOwner;
 
 		CItem() : Sheet(0)
 		{
@@ -142,18 +143,18 @@ private:
 	// The Inventory manipulated.
 	std::vector<CItem>		_InventoryMirror;
 	bool					_InventoryObsSetup;
-	class CDBInventoryObs : public ICDBNode::IPropertyObserver
+	class CDBInventoryObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
 	CDBInventoryObs			_DBInventoryObs;
 	friend class			CDBInventoryObs;
 	// The animals Status
-	class CDBAnimalObs : public ICDBNode::IPropertyObserver
+	class CDBAnimalObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
 	CDBAnimalObs			_DBAnimalObs;
 	friend class			CDBAnimalObs;
@@ -233,8 +234,8 @@ private:
 	void			removeMpSlotThatUseInvSlot(uint invSlot, uint quantityToRemove);
 
 	// from an index in _InventoryMirror, get the ItemImage
-	CItemImage		*getInvMirrorItemImage(uint slotIndex);
-	bool			isMpAvailable(CItemSheet *mpSheet, uint slotIndex) const;
+	CItemImage		*getInvMirrorItemImage(uint slotIndex, uint& invId, uint& indexInInv);
+	bool			isMpAvailable(CItemSheet *mpSheet, uint invId, uint slotIndex) const;
 
 	void			updateItemResult();
 };
diff --git a/code/ryzom/client/src/interface_v3/animal_position_state.cpp b/code/ryzom/client/src/interface_v3/animal_position_state.cpp
index a3dc479f0..910230ce0 100644
--- a/code/ryzom/client/src/interface_v3/animal_position_state.cpp
+++ b/code/ryzom/client/src/interface_v3/animal_position_state.cpp
@@ -24,6 +24,8 @@
 #include "group_compas.h"
 #include "game_share/animal_status.h"
 
+using NLMISC::CCDBNodeLeaf;
+
 // ***************************************************************************
 // CPositionState
 // ***************************************************************************
diff --git a/code/ryzom/client/src/interface_v3/animal_position_state.h b/code/ryzom/client/src/interface_v3/animal_position_state.h
index 17bb2021d..f53f476e5 100644
--- a/code/ryzom/client/src/interface_v3/animal_position_state.h
+++ b/code/ryzom/client/src/interface_v3/animal_position_state.h
@@ -26,7 +26,9 @@
 
 
 // ***************************************************************************
+namespace NLMISC{
 class CCDBNodeLeaf;
+}
 
 // ***************************************************************************
 /**
@@ -58,7 +60,7 @@ protected:
 	virtual bool		 getDbPos(sint32 &px, sint32 &py) = 0;
 
 	// helper to serial a CDBNodeLeaf, based on itsname
-	void serialNodeLeaf(NLMISC::IStream &f, CCDBNodeLeaf *&dbNode);
+	void serialNodeLeaf(NLMISC::IStream &f, NLMISC::CCDBNodeLeaf *&dbNode);
 
 };
 
@@ -82,8 +84,8 @@ public:
 	virtual			void serial(NLMISC::IStream &f);
 protected:
 	// Database infos
-	CCDBNodeLeaf				*_DBPos;
-	CCDBNodeLeaf				*_Uid;
+	NLMISC::CCDBNodeLeaf				*_DBPos;
+	NLMISC::CCDBNodeLeaf				*_Uid;
 	// The slot of the entity that may be used to get more precise position
 	CLFECOMMON::TCLEntityId		_EntitySlot;
 	virtual CEntityCL	*getEntity();
@@ -103,18 +105,18 @@ class CNamedEntityPositionState : public CPositionState
 public:
 	NLMISC_DECLARE_CLASS(CNamedEntityPositionState)
 	virtual bool	dbOk() {return _Name && _X && _Y;}
-	void			build(CCDBNodeLeaf *name, CCDBNodeLeaf *x, CCDBNodeLeaf *y);
-	CCDBNodeLeaf	*getNameNode() const { return _Name; }
-	CCDBNodeLeaf	*getXNode() const { return _X; }
-	CCDBNodeLeaf	*getYNode() const { return _X; }
+	void			build(NLMISC::CCDBNodeLeaf *name, NLMISC::CCDBNodeLeaf *x, NLMISC::CCDBNodeLeaf *y);
+	NLMISC::CCDBNodeLeaf	*getNameNode() const { return _Name; }
+	NLMISC::CCDBNodeLeaf	*getXNode() const { return _X; }
+	NLMISC::CCDBNodeLeaf	*getYNode() const { return _X; }
 	//
 	virtual bool	canSave() const { return true; }
 	virtual	void	serial(NLMISC::IStream &f);
 protected:
 	// Database infos
-	CCDBNodeLeaf				*_Name;
-	CCDBNodeLeaf				*_X;
-	CCDBNodeLeaf				*_Y;
+	NLMISC::CCDBNodeLeaf				*_Name;
+	NLMISC::CCDBNodeLeaf				*_X;
+	NLMISC::CCDBNodeLeaf				*_Y;
 	virtual CEntityCL	*getEntity();
 	virtual bool		 getDbPos(sint32 &px, sint32 &py);
 };
@@ -148,7 +150,7 @@ public:
 	virtual	void	serial(NLMISC::IStream &/* f */) { nlassert(0); /* notsavable */ }
 protected:
 	// Database infos
-	CCDBNodeLeaf				*_Present;
+	NLMISC::CCDBNodeLeaf				*_Present;
 	// DB ok.
 	bool						dbOk() {return _DBPos && _Present && _Uid;}
 
@@ -182,7 +184,7 @@ public:
 
 private:
 	// Animal Database infos
-	CCDBNodeLeaf				*_Status;
+	NLMISC::CCDBNodeLeaf				*_Status;
 	// DB ok.
 	bool						dbOk() {return _DBPos && _Status && _Uid;}
 
diff --git a/code/ryzom/client/src/interface_v3/bar_manager.h b/code/ryzom/client/src/interface_v3/bar_manager.h
index 54e8770d3..901a6ebb0 100644
--- a/code/ryzom/client/src/interface_v3/bar_manager.h
+++ b/code/ryzom/client/src/interface_v3/bar_manager.h
@@ -23,6 +23,10 @@
 #include "game_share/inventories.h"
 #include "game_share/scores.h"
 
+namespace NLMISC{
+	class CCDBNodeLeaf;
+}
+
 
 // ***************************************************************************
 /**
@@ -214,12 +218,12 @@ private:
 		CBarInfo	BarInfo;
 
 		// Connection input (used only for TargetType, TeamMemberType and AnimalType)
-		class CCDBNodeLeaf	*UIDIn;
-		class CCDBNodeLeaf	*PresentIn;		// if not NULL, this is an additional test: if(PresentIn->getValue()==0) => not present
-		class CCDBNodeLeaf	*ScoreIn[SCORES::NUM_SCORES];
+		NLMISC::CCDBNodeLeaf	*UIDIn;
+		NLMISC::CCDBNodeLeaf	*PresentIn;		// if not NULL, this is an additional test: if(PresentIn->getValue()==0) => not present
+		NLMISC::CCDBNodeLeaf	*ScoreIn[SCORES::NUM_SCORES];
 
 		// Connection output
-		class CCDBNodeLeaf	*ScoreOut[SCORES::NUM_SCORES];
+		NLMISC::CCDBNodeLeaf	*ScoreOut[SCORES::NUM_SCORES];
 
 	public:
 		CBarDataEntry();
@@ -258,11 +262,11 @@ private:
 		// last score get from impulse USER:BARS
 		sint32	Score;
 		// input DB value, to get the current MAX
-		class CCDBNodeLeaf	*DBInMax;
+		NLMISC::CCDBNodeLeaf	*DBInMax;
 		// output DB to store the real value, but clamped to 0
-		class CCDBNodeLeaf	*DBOutVal;
+		NLMISC::CCDBNodeLeaf	*DBOutVal;
 		// output DB to store the ratio -1024,1024 value
-		class CCDBNodeLeaf	*DBOutRatio;
+		NLMISC::CCDBNodeLeaf	*DBOutRatio;
 		CUserScore()
 		{
 			Score= 0;
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
index fff35b70a..aa8e1cab4 100644
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
+++ b/code/ryzom/client/src/interface_v3/bot_chat_page_mission.cpp
@@ -50,7 +50,7 @@ void CBotChatPageMission::init()
 {
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	if (im->getDbBranch("SERVER:CHOOSE_MISSIONS"))
-		im->getDbBranch("SERVER:CHOOSE_MISSIONS")->addBranchObserver(&_MissionPagesObs);
+		im->addBranchObserver("SERVER:CHOOSE_MISSIONS", &_MissionPagesObs);
 }
 
 
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp
index 1c16a68cc..2e54f41f9 100644
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp
+++ b/code/ryzom/client/src/interface_v3/bot_chat_page_player_gift.cpp
@@ -29,6 +29,8 @@
 
 static const char *WIN_BOT_CHAT_PAGE_PLAYER_GIFT = "ui:interface:bot_chat_player_gift";
 
+using NLMISC::CCDBNodeLeaf;
+
 // *************************************************************************************
 void CBotChatPagePlayerGift::begin()
 {
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
index dcebe792d..509dfcd62 100644
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
+++ b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.cpp
@@ -48,6 +48,7 @@
 #include "../sheet_manager.h"
 #include "../user_entity.h"
 #include "view_bitmap.h"
+#include "nel/misc/common.h"
 
 using namespace std::rel_ops;
 
@@ -160,7 +161,7 @@ void CBotChatPageTrade::init()
 	CInterfaceManager *im = CInterfaceManager::getInstance();
 	if (im->getDbBranch("SERVER:TRADING"))
 	{
-		im->getDbBranch("SERVER:TRADING")->addBranchObserver(&_TradePagesObs);
+		im->addBranchObserver( "SERVER:TRADING", &_TradePagesObs);
 	}
 
 	_FamePriceFactorLeaf = im->getDbProp("SERVER:TRADING:FAME_PRICE_FACTOR");
@@ -996,7 +997,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
 	CCtrlTextButton *confirmButton =  dynamic_cast<CCtrlTextButton*>(ig->getCtrl("ok"));
 	if (confirmButton)
 	{
-		confirmButton->setActive( true );
+		confirmButton->setActive( !sheet->getLockedByOwner() );
 		confirmButton->setText(CI18N::get("uiSellImmediately"));
 		confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton"));
 	}
@@ -1538,10 +1539,12 @@ void	CBotChatPageTrade::setupResellGroup(bool sellMode, uint defaultQuantity, CI
 			CViewText *vt= dynamic_cast<CViewText*>(cantResellGroup->getView("reason"));
 			if(vt)
 			{
-				if(resaleFlag==BOTCHATTYPE::ResaleKOBroken)
+				if(resaleFlag == BOTCHATTYPE::ResaleKOBroken)
 					vt->setHardText("uiCantResaleCauseDamaged");
-				else
+				else if (resaleFlag == BOTCHATTYPE::ResaleKONoTimeLeft)
 					vt->setHardText("uiCantResaleCauseTooLate");
+				else
+					vt->setHardText("uiCantResaleLockedByOwner");
 			}
 		}
 		// else setup "can_resell:choose_resell group"
@@ -2575,9 +2578,9 @@ static DECLARE_INTERFACE_USER_FCT(getPriceWithFame)
 	if(value==-1)
 		result.setUCString(CI18N::get("uiBadPrice"));
 	else if(value==valueFame)
-		result.setUCString(toString(value));
+		result.setUCString(NLMISC::formatThousands(toString(value)));
 	else
-		result.setUCString(toString("%d (%d)", valueFame, value));
+		result.setUCString(NLMISC::formatThousands(toString(valueFame)) + " (" + NLMISC::formatThousands(toString(value)) + ")");
 
 	return true;
 }
@@ -2592,8 +2595,8 @@ static DECLARE_INTERFACE_USER_FCT(getBonusOnResale)
 
 	sint	valueHigh= (sint)args[0].getInteger();
 	sint	valueLow= (sint)args[1].getInteger();
-	sint diff = valueHigh - valueLow;
-	result.setUCString(toString("+%d", diff));
+	sint	diff = valueHigh - valueLow;
+	result.setUCString("+" + NLMISC::formatThousands(toString(diff)));
 
 	return true;
 }
@@ -2987,7 +2990,8 @@ NLMISC_COMMAND( testResaleItems, "Temp : test resale", "" )
 	//
 
 	// Force for next page
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	return true;
 }
diff --git a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.h b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.h
index 1d3880c02..8c5038fb7 100644
--- a/code/ryzom/client/src/interface_v3/bot_chat_page_trade.h
+++ b/code/ryzom/client/src/interface_v3/bot_chat_page_trade.h
@@ -142,7 +142,7 @@ private:
 	uint32						_FilterBuyDlgMaxValue;
 
 	// keep pointer on leaf for fame price factor
-	CCDBNodeLeaf *				_FamePriceFactorLeaf;
+	NLMISC::CCDBNodeLeaf *				_FamePriceFactorLeaf;
 	bool						_DownloadComplete;
 
 private:
diff --git a/code/ryzom/client/src/interface_v3/chat_filter.cpp b/code/ryzom/client/src/interface_v3/chat_filter.cpp
index fc2e6c9c3..9609fc1af 100644
--- a/code/ryzom/client/src/interface_v3/chat_filter.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_filter.cpp
@@ -378,7 +378,7 @@ void CChatTargetFilter::setTargetGroup(CChatGroup::TGroupType groupType, uint32
 		const bool guildActive = pIM->getDbProp("SERVER:GUILD:NAME")->getValueBool();
 		switch(groupType)
 		{
-			case CChatGroup::dyn_chat: entry+="DYN"; break;
+			case CChatGroup::dyn_chat: entry+="DYN:" + NLMISC::toString(dynamicChannelDbIndex); break;
 			case CChatGroup::say:	entry+="SAY";	break;
 			case CChatGroup::shout:	entry+="SHOUT";	break;
 			case CChatGroup::team:	if(!teamActive) return; entry+="GROUP";	break;
diff --git a/code/ryzom/client/src/interface_v3/chat_filter.h b/code/ryzom/client/src/interface_v3/chat_filter.h
index 7524d6c7f..d717d9fb5 100644
--- a/code/ryzom/client/src/interface_v3/chat_filter.h
+++ b/code/ryzom/client/src/interface_v3/chat_filter.h
@@ -37,7 +37,7 @@ class CChatInputFilter : public NLMISC::CRefCount, public CChatWindow::IObserver
 {
 public:
 	CChatInputFilter() {FilterType= CChatGroup::say; DynamicChatDbIndex= 0;}
-	~CChatInputFilter();
+	virtual ~CChatInputFilter();
 	/** Display a msg in the chat. The msg will be forwarded to all the listening windows
 	  * Listening windows will blick only if there isnt a single visible listening window, so that the player can know if there's a message
 	  * \param windowVisible is not NULL, points a bool that will be filled with true if one of the window on the which the msg was displayed is visible.
diff --git a/code/ryzom/client/src/interface_v3/chat_text_manager.cpp b/code/ryzom/client/src/interface_v3/chat_text_manager.cpp
index 391898563..9b5113a55 100644
--- a/code/ryzom/client/src/interface_v3/chat_text_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_text_manager.cpp
@@ -148,18 +148,43 @@ CViewBase *CChatTextManager::createMsgText(const ucstring &cstMsg, NLMISC::CRGBA
 	vt->setMultiLineSpace(getTextMultiLineSpace());
 	vt->setModulateGlobalColor(false);
 
+	ucstring cur_time;
+	static CCDBNodeLeaf* node = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
+	if (node)
+	{
+		if (node->getValueBool())
+		{
+			cur_time = CInterfaceManager::getTimestampHuman();
+		}
+	}
+
 	// if text contain any color code, set the text formated and white,
 	// otherwise, set text normal and apply global color
-	if (msg.find(ucstring("@{")) != ucstring::npos)
+	size_t codePos = msg.find(ucstring("@{"));
+	if (codePos != ucstring::npos)
 	{
+		// Prepend the current time (do it after the color if the color at first position.
+		if (codePos == 0)
+		{
+			codePos = msg.find(ucstring("}"));
+			msg = msg.substr(0, codePos + 1) + cur_time + msg.substr(codePos + 1, msg.length() - codePos);
+		}
+		else
+		{
+			msg = cur_time + msg;
+		}
+		
+
 		vt->setTextFormatTaged(msg);
 		vt->setColor(NLMISC::CRGBA::White);
 	}
 	else
 	{
+		msg = cur_time + msg;
 		vt->setText(msg);
 		vt->setColor(col);
 	}
+
 	if (!commandGroup)
 	{
 		return vt;
diff --git a/code/ryzom/client/src/interface_v3/chat_text_manager.h b/code/ryzom/client/src/interface_v3/chat_text_manager.h
index db4cce447..1c9d6d0cf 100644
--- a/code/ryzom/client/src/interface_v3/chat_text_manager.h
+++ b/code/ryzom/client/src/interface_v3/chat_text_manager.h
@@ -23,6 +23,9 @@
 
 class CViewBase;
 class ucstring;
+namespace NLMISC{
+	class CCDBNodeLeaf;
+}
 
 /** Class to get chat text parameters, and to build new text lines
   * \author Nicolas Vizerie
@@ -56,9 +59,9 @@ public:
 private:
 	static CChatTextManager *_Instance;
 
-	mutable class CCDBNodeLeaf    *_TextFontSize;
-	mutable CCDBNodeLeaf    *_TextMultilineSpace;
-	mutable CCDBNodeLeaf    *_TextShadowed;
+	mutable NLMISC::CCDBNodeLeaf    *_TextFontSize;
+	mutable NLMISC::CCDBNodeLeaf    *_TextMultilineSpace;
+	mutable NLMISC::CCDBNodeLeaf    *_TextShadowed;
 
 	// ctor, private because of singleton
 	CChatTextManager();
diff --git a/code/ryzom/client/src/interface_v3/chat_window.cpp b/code/ryzom/client/src/interface_v3/chat_window.cpp
index 6f13b1bed..18be552e9 100644
--- a/code/ryzom/client/src/interface_v3/chat_window.cpp
+++ b/code/ryzom/client/src/interface_v3/chat_window.cpp
@@ -472,15 +472,9 @@ void CChatWindow::displayLocalPlayerTell(const ucstring &receiver, const ucstrin
 	CInterfaceProperty prop;
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
 	encodeColorTag(prop.getRGBA(), finalMsg, false);
-	ucstring cur_time;
-	CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
-	if (pNL && pNL->getValueBool())
-	{
-		cur_time = CInterfaceManager::getTimestampHuman();
-	}
-	ucstring csr;
-	if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
-	finalMsg += cur_time + csr + CI18N::get("youTell") + ": ";
+
+	ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
+	finalMsg += csr + CI18N::get("youTell") + ": ";
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 	encodeColorTag(prop.getRGBA(), finalMsg, true);
 	finalMsg += msg;
@@ -1294,8 +1288,18 @@ public:
 			CChatWindow::_ChatWindowLaunchingCommand = chat;
 			string str = text.toUtf8();
 			string cmdWithArgs = str.substr(1);
-			/* In the chat context, only ' ' is a possible separator */
+
+			// Get the command name from the string, can contain spaces
 			string cmd = cmdWithArgs.substr(0, cmdWithArgs.find(' '));
+			if (cmdWithArgs.find('"') == 0)
+			{
+				string::size_type pos = cmdWithArgs.find('"', 1);
+				if (string::npos != pos)
+				{
+					cmd = cmdWithArgs.substr(1, pos - 1);
+				}
+			}
+
 			if ( NLMISC::ICommand::exists( cmd ) )
 			{
 				NLMISC::ICommand::execute( cmdWithArgs, g_log );
@@ -1314,7 +1318,7 @@ public:
 			}
 		}
 		// Clear input string
-		pEB->setInputString (string(""));
+		pEB->setInputString (ucstring(""));
 		CGroupContainer *gc = pEB->getEnclosingContainer();
 		if (gc)
 		{
diff --git a/code/ryzom/client/src/interface_v3/ctrl_base_button.h b/code/ryzom/client/src/interface_v3/ctrl_base_button.h
index 06a27b276..c33f0c63e 100644
--- a/code/ryzom/client/src/interface_v3/ctrl_base_button.h
+++ b/code/ryzom/client/src/interface_v3/ctrl_base_button.h
@@ -115,6 +115,7 @@ public:
 	// @{
 	// Event part
 	void setActionOnLeftClick (const std::string &actionHandlerName) { _AHOnLeftClickString = actionHandlerName; _AHOnLeftClick = getAH(actionHandlerName, _AHLeftClickParams); }
+	void setActionOnLeftClickParams(const std::string &params) { _AHOnLeftClickStringParams = params; }
 	void setActionOnRightClick (const std::string &actionHandlerName) { _AHOnRightClick = getAH(actionHandlerName, _AHRightClickParams); }
 	void setActionOnClockTick (const std::string &ahName) { _AHOnClockTick = getAH(ahName, _AHClockTickParams); }
 	void setParamsOnLeftClick (const std::string &paramsHandlerName) { _AHLeftClickParams = paramsHandlerName; }
@@ -204,6 +205,7 @@ protected:
 	IActionHandler *_AHOnOver;
 	CStringShared	_AHOverParams;
 	std::string		_AHOnLeftClickString;
+	std::string		_AHOnLeftClickStringParams;
 	IActionHandler *_AHOnLeftClick;
 	CStringShared	_AHLeftClickParams;
 	IActionHandler *_AHOnLeftDblClick;
diff --git a/code/ryzom/client/src/interface_v3/ctrl_button.cpp b/code/ryzom/client/src/interface_v3/ctrl_button.cpp
index b977c1c29..112759519 100644
--- a/code/ryzom/client/src/interface_v3/ctrl_button.cpp
+++ b/code/ryzom/client/src/interface_v3/ctrl_button.cpp
@@ -338,7 +338,14 @@ bool CCtrlButton::getMouseOverShape(string &texName, uint8 &rot, CRGBA &col)
 {
 	if (_AHOnLeftClickString == "browse")
 	{
-		texName = "curs_pick.tga";
+		if (!_AHOnLeftClickStringParams.empty())
+		{
+			texName = "@curs_pick.tga@"+_AHOnLeftClickStringParams;
+		}
+		else
+		{
+			texName = "curs_pick.tga";
+		}
 		rot= 0;
 		col = CRGBA::White;
 		return true;
diff --git a/code/ryzom/client/src/interface_v3/ctrl_scroll.h b/code/ryzom/client/src/interface_v3/ctrl_scroll.h
index 5f80598a8..f86d0047d 100644
--- a/code/ryzom/client/src/interface_v3/ctrl_scroll.h
+++ b/code/ryzom/client/src/interface_v3/ctrl_scroll.h
@@ -28,7 +28,7 @@
  * \author Nevrax France
  * \date 2002
  */
-class CCtrlScroll : public CCtrlBase, public ICDBNode::IPropertyObserver
+class CCtrlScroll : public CCtrlBase, public NLMISC::ICDBNode::IPropertyObserver
 {
 
 public:
@@ -183,7 +183,7 @@ protected:
 	void	computeTargetOfsFromPos();
 
 	// from IPropertyObserver
-	virtual void update(ICDBNode *node);
+	virtual void update(NLMISC::ICDBNode *node);
 
 	// step the value, and clamp it
 	void	normalizeValue(sint32 &value);
diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
index f0aa58dd2..9c3b59c3f 100644
--- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
+++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp
@@ -45,6 +45,7 @@
 #include "../client_sheets/sphrase_sheet.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "lua_ihm.h"
+#include "game_share/bot_chat_types.h"
 
 #include "../r2/editor.h"
 
@@ -123,6 +124,14 @@ ucstring CControlSheetTooltipInfoWaiter::infoValidated(CDBCtrlSheet* ctrlSheet,
 
 	return help;
 }
+
+// ***************************************************************************
+int CDBCtrlSheet::luaGetDraggedSheet(CLuaState &ls)
+{
+	CLuaIHM::pushUIOnStack(ls, dynamic_cast<CInterfaceElement *>(_LastDraggedSheet));
+	return 1;
+}
+
 // ***************************************************************************
 int CDBCtrlSheet::luaGetHpBuff(CLuaState &ls)
 {
@@ -179,6 +188,62 @@ int CDBCtrlSheet::luaGetName(CLuaState &ls)
 	return 1;
 }
 
+// **********************************************************************************************************
+class LuaInfoWaiter : public IItemInfoWaiter
+{
+public:
+	volatile bool done;
+
+public:
+	virtual void infoReceived();
+};
+
+
+void LuaInfoWaiter::infoReceived()
+{
+	getInventory().removeItemInfoWaiter(this);
+	this->done = true;
+}
+
+static LuaInfoWaiter luaInfoWaiter;
+
+// ***************************************************************************
+int CDBCtrlSheet::luaGetCreatorName(CLuaState &ls)
+{
+	uint32	itemSlotId = getInventory().getItemSlotId(this);
+	CClientItemInfo itemInfo = getInventory().getItemInfo(itemSlotId);
+	ucstring creatorName;
+	STRING_MANAGER::CStringManagerClient::instance()->getString(itemInfo.CreatorName, creatorName);
+	CLuaIHM::push(ls, creatorName);
+	
+	return 1;
+}
+
+// ***************************************************************************
+int CDBCtrlSheet::luaWaitInfo(CLuaState &ls)
+{
+	static bool sent = false;
+	CDBCtrlSheet *ctrlSheet = const_cast<CDBCtrlSheet*>(this);
+	uint32	itemSlotId= getInventory().getItemSlotId(ctrlSheet);
+	CClientItemInfo itemInfo = getInventory().getItemInfo(itemSlotId);
+
+	if (sent || itemInfo.versionInfo != 0)
+	{
+		ls.push((bool)(luaInfoWaiter.done));
+		if (luaInfoWaiter.done)
+			sent = false;
+		return luaInfoWaiter.done ? 1 : 0;
+	}
+	else
+	{
+		luaInfoWaiter.ItemSlotId = itemSlotId;
+		luaInfoWaiter.ItemSheet = this->getSheetId();
+		luaInfoWaiter.done = false;
+		getInventory().addItemInfoWaiter(&luaInfoWaiter);
+		sent = true;
+	}
+	return 0;
+}
 
 // ***************************************************************************
 int CDBCtrlSheet::luaBuildCrystallizedSpellListBrick(CLuaState &ls)
@@ -1802,8 +1867,16 @@ void CDBCtrlSheet::draw()
 				string params = string("src=") + pCSSrc->getId();
 				if (!_AHCanDropParams.empty())
 				{
-					string sTmp = _AHCanDropParams;
-					params = sTmp + "|" + params;
+					if (getAHName(_AHOnCanDrop) == "lua")
+					{
+						params = _AHCanDropParams;
+						strFindReplace(params, "%src", pCSSrc->getId());
+					}
+					else
+					{
+						string sTmp = _AHCanDropParams;
+						params = sTmp + "|" + params;
+					}
 				}
 				pIM->runActionHandler (_AHOnCanDrop, this, params);
 			}
@@ -2143,6 +2216,12 @@ void CDBCtrlSheet::drawSheet (sint32 x, sint32 y, bool draging, bool showSelecti
 
 				// if a raw material for example, must add special icon text.
 				displayCharBitmaps(_RenderLayer+2, x, y, curSheetColor);
+
+				// Add the lock overlay if needed
+				if (getLockedByOwner())
+				{
+					rVR.draw11RotFlipBitmap (_RenderLayer+1, x - 2, y + 8, 0, false, rVR.getSystemTextureId(CViewRenderer::ItemLockedByOwnerTexture), curSheetColor);
+				}
 			}
 			break;
 		// Action
@@ -2605,8 +2684,16 @@ bool CDBCtrlSheet::handleEvent (const CEventDescriptor &event)
 							string params = string("src=") + _Id;
 							if (!pCSdest->_AHCanDropParams.empty())
 							{
-								string sTmp = pCSdest->_AHCanDropParams;
-								params = sTmp + "|" + params;
+								if (getAHName(pCSdest->_AHOnCanDrop) == "lua")
+								{
+									params = pCSdest->_AHCanDropParams;
+									strFindReplace(params, "%src", _Id);
+								}
+								else
+								{
+									string sTmp = pCSdest->_AHCanDropParams;
+									params = sTmp + "|" + params;
+								}
 							}
 							pIM->runActionHandler (pCSdest->_AHOnCanDrop, pCSdest, params);
 
@@ -2617,8 +2704,16 @@ bool CDBCtrlSheet::handleEvent (const CEventDescriptor &event)
 								string params = string("src=") + _Id;
 								if (!pCSdest->_AHDropParams.empty())
 								{
-									string sTmp = pCSdest->_AHDropParams;
-									params = sTmp + "|" + params; // must copy 'drop' params at start because it could be the name of a procedure
+									if (getAHName(pCSdest->_AHOnDrop) == "lua")
+									{
+										params = pCSdest->_AHDropParams;
+										strFindReplace(params, "%src", _Id);
+									}
+									else
+									{
+										string sTmp = pCSdest->_AHDropParams;
+										params = sTmp + "|" + params;// must copy 'drop' params at start because it could be the name of a procedure
+									}
 								}
 								// call action
 								pIM->runActionHandler (pCSdest->_AHOnDrop, pCSdest, params);
@@ -2654,8 +2749,16 @@ bool CDBCtrlSheet::handleEvent (const CEventDescriptor &event)
 								string params = string("src=") + _Id;
 								if (!pList->getCtrlSheetInfo()._AHCanDropParams.empty())
 								{
-									string sTmp = pList->getCtrlSheetInfo()._AHCanDropParams;
-									params = sTmp + "|" + params;
+									if (getAHName(pList->getCtrlSheetInfo()._AHOnCanDrop) == "lua")
+									{
+										params = pList->getCtrlSheetInfo()._AHCanDropParams;
+										strFindReplace(params, "%src", _Id);
+									}
+									else
+									{
+										string sTmp = pList->getCtrlSheetInfo()._AHCanDropParams;
+										params = sTmp + "|" + params;
+									}
 								}
 								pIM->runActionHandler (pList->getCtrlSheetInfo()._AHOnCanDrop, pList, params);
 
@@ -2666,8 +2769,16 @@ bool CDBCtrlSheet::handleEvent (const CEventDescriptor &event)
 									string params = string("src=") + _Id;
 									if (!pList->getCtrlSheetInfo()._AHDropParams.empty())
 									{
-										string sTmp = pList->getCtrlSheetInfo()._AHDropParams;
-										params = sTmp + "|" + params; // must copy 'drop' params at start because it could be the name of a procedure
+										if (getAHName(pList->getCtrlSheetInfo()._AHOnDrop) == "lua")
+										{
+											params = pList->getCtrlSheetInfo()._AHDropParams;
+											strFindReplace(params, "%src", _Id);
+										}
+										else
+										{
+											string sTmp = pList->getCtrlSheetInfo()._AHDropParams;
+											params = sTmp + "|" + params; // must copy 'drop' params at start because it could be the name of a procedure
+										}
 									}
 									// call action
 									pIM->runActionHandler (pList->getCtrlSheetInfo()._AHOnDrop, pList, params);
@@ -2980,9 +3091,32 @@ void	CDBCtrlSheet::getContextHelp(ucstring &help) const
 	}
 	else if(getType() == CCtrlSheetInfo::SheetType_Item)
 	{
-		const CItemSheet *item = asItemSheet();
-		if (item)
-			help = getItemActualName();
+		const CItemSheet	*item= asItemSheet();
+		if(item)
+		{
+			if (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL || item->Family == ITEMFAMILY::JEWELRY || item->Family == ITEMFAMILY::ARMOR)
+			{
+				string luaMethodName = ( (item->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) ? "updateCrystallizedSpellTooltip" : "updateBuffItemTooltip");
+				CDBCtrlSheet *ctrlSheet = const_cast<CDBCtrlSheet*>(this);
+				if ( ! getInventory().isItemInfoUpToDate(getInventory().getItemSlotId(ctrlSheet)))
+				{
+					// Prepare the waiter
+					ControlSheetTooltipUpdater.ItemSheet= ctrlSheet->getSheetId();
+					ControlSheetTooltipUpdater.LuaMethodName = luaMethodName;
+					ControlSheetTooltipUpdater.ItemSlotId= getInventory().getItemSlotId(ctrlSheet);
+					ControlSheetTooltipUpdater.CtrlSheet = ctrlSheet;
+
+					// Add the waiter
+					getInventory().addItemInfoWaiter(&ControlSheetTooltipUpdater);
+				}
+
+				help = ControlSheetTooltipUpdater.infoValidated(ctrlSheet, luaMethodName);
+
+			}
+			else
+				help= getItemActualName();
+
+		}
 		else
 			help= _ContextHelp;
 	}
@@ -3941,6 +4075,17 @@ void CDBCtrlSheet::setItemResaleFlag(sint32 rf)
 	node->setValue32(rf);
 }
 
+// ***************************************************************************
+bool CDBCtrlSheet::getLockedByOwner() const
+{
+	return (getItemResaleFlag() == BOTCHATTYPE::ResaleKOLockedByOwner);
+}
+
+// ***************************************************************************
+bool CDBCtrlSheet::canOwnerLock() const
+{
+	return (NULL != getItemResaleFlagPtr());
+}
 
 // ***************************************************************************
 sint32 CDBCtrlSheet::getItemSellerType() const
diff --git a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h
index 2cf34e722..95bd7278c 100644
--- a/code/ryzom/client/src/interface_v3/dbctrl_sheet.h
+++ b/code/ryzom/client/src/interface_v3/dbctrl_sheet.h
@@ -194,16 +194,20 @@ public:
 	void setActionOnLeftClick (const std::string &ActionHandlerName) { _AHOnLeftClick = getAH(ActionHandlerName, _AHLeftClickParams); }
 	void setActionOnRightClick (const std::string &ActionHandlerName) { _AHOnRightClick = getAH(ActionHandlerName, _AHRightClickParams); }
 	void setActionOnDrop (const std::string &ActionHandlerName) { _AHOnDrop = getAH(ActionHandlerName, _AHDropParams); }
+	void setActionOnCanDrop (const std::string &ActionHandlerName) { _AHOnCanDrop = getAH(ActionHandlerName, _AHCanDropParams); }
 	void setParamsOnLeftClick (const std::string &ParamsHandlerName) { _AHLeftClickParams = ParamsHandlerName; }
 	void setParamsOnRightClick (const std::string &ParamsHandlerName) { _AHRightClickParams = ParamsHandlerName; }
 	void setParamsOnDrop (const std::string &ParamsHandlerName) { _AHDropParams = ParamsHandlerName; }
+	void setParamsOnCanDrop (const std::string &ParamsHandlerName) { _AHCanDropParams = ParamsHandlerName; }
 
 	const std::string &getActionOnLeftClick () const { return getAHName(_AHOnLeftClick); }
 	const std::string &getActionOnRightClick () const { return getAHName(_AHOnRightClick); }
 	const std::string &getActionOnDrop () const { return getAHName(_AHOnDrop); }
+	const std::string &getActionOnCanDrop () const { return getAHName(_AHOnCanDrop); }
 	const std::string &getParamsOnLeftClick () const { return _AHLeftClickParams; }
 	const std::string &getParamsOnRightClick () const { return _AHRightClickParams; }
 	const std::string &getParamsOnDrop () const { return _AHDropParams; }
+	const std::string &getParamsOnCanDrop () const { return _AHCanDropParams; }
 
 	void setListMenuLeft (const std::string &cm) { CCtrlSheetInfo::setListMenuLeft(cm); }
 	void setListMenuRight (const std::string &cm) { CCtrlSheetInfo::setListMenuRight(cm); }
@@ -215,6 +219,7 @@ public:
 	void	setCanDrop (bool cd) { _CanDrop = cd; }
 	bool	getCanDrop () const { return _CanDrop; }
 	bool	isDragable() { return _Dragable; }
+	void	setDragable(bool dragable) {  _Dragable = dragable; }
 	bool	isDraging() { return _Draging; }
 	sint32	getDeltaDragX() {return _DeltaDragX;}
 	sint32	getDeltaDragY() {return _DeltaDragY;}
@@ -265,19 +270,35 @@ public:
 		REFLECT_SINT32("back", getGuildBack, setGuildBack);
 		REFLECT_SINT32("symbol", getGuildSymbol, setGuildSymbol);
 		REFLECT_BOOL("invert_symbol", getInvertGuildSymbol, setInvertGuildSymbol);
+		REFLECT_BOOL("dragable", isDragable, setDragable);
+		REFLECT_BOOL("can_drop", getCanDrop, setCanDrop);
+		REFLECT_STRING ("left_click", getActionOnLeftClick, setActionOnLeftClick);
+		REFLECT_STRING ("right_click", getActionOnRightClick, setActionOnRightClick);
+		REFLECT_STRING ("left_click_params", getParamsOnLeftClick, setParamsOnLeftClick);
+		REFLECT_STRING ("right_click_params", getParamsOnRightClick, setParamsOnRightClick);
+		REFLECT_STRING ("on_drop", getActionOnDrop, setActionOnDrop);
+		REFLECT_STRING ("on_drop_params", getParamsOnDrop, setParamsOnDrop);
+		REFLECT_STRING ("on_can_drop", getActionOnCanDrop, setActionOnCanDrop);
+		REFLECT_STRING ("on_can_drop_params", getParamsOnCanDrop, setParamsOnCanDrop);
+		REFLECT_LUA_METHOD("getDraggedSheet",	luaGetDraggedSheet)
 		REFLECT_LUA_METHOD("getHpBuff",	luaGetHpBuff)
 		REFLECT_LUA_METHOD("getSapBuff",	luaGetSapBuff)
 		REFLECT_LUA_METHOD("getFocusBuff",	luaGetFocusBuff)
 		REFLECT_LUA_METHOD("getStaBuff",	luaGetStaBuff)
 		REFLECT_LUA_METHOD("getName",		luaGetName)
+		REFLECT_LUA_METHOD("getCreatorName", luaGetCreatorName)
+		REFLECT_LUA_METHOD("waitInfo", luaWaitInfo)
 		REFLECT_LUA_METHOD("buildCrystallizedSpellListBrick",		luaBuildCrystallizedSpellListBrick)
 	REFLECT_EXPORT_END
 
+	int luaGetDraggedSheet(CLuaState &ls);
 	int luaGetHpBuff(CLuaState &ls);
 	int luaGetSapBuff(CLuaState &ls);
 	int luaGetFocusBuff(CLuaState &ls);
 	int luaGetStaBuff(CLuaState &ls);
 	int luaGetName(CLuaState &ls);
+	int luaGetCreatorName(CLuaState &ls);
+	int luaWaitInfo(CLuaState &ls);
 	int luaBuildCrystallizedSpellListBrick(CLuaState &ls);
 
 	// hardcode creation. User must setup other CtrlBase value (parent etc...)
@@ -297,7 +318,7 @@ public:
 	static	void		   setCurrSelection(CDBCtrlSheet *selected);
 
 	// get the root branch containing the properties for that sheet
-	CCDBNodeBranch        *getRootBranch() const;
+	NLMISC::CCDBNodeBranch        *getRootBranch() const;
 
 	/** If the branch in setSheet(branch) is of the form ...:# (where # is a number), return this number.
 	 *	The value is hence modified by setSheet(). return 0 if not of this form.
@@ -355,9 +376,9 @@ public:
 	/// Special ContextHelp for ctrl sheet.
 	virtual void			getContextHelp(ucstring &help) const;
 
-	/// Special ContextHelp for ctrl sheet.
 	virtual void			getContextHelpToolTip(ucstring &help) const;
 
+
 	/** true if an item of another ctrlSheet can be dropped on this slot.
 	 *	also return true if src is 0, or if _ItemSlot==UNDEFINED
 	 */
@@ -422,7 +443,7 @@ public:
 	sint							getIndexInParent() const;
 
 	// get the 'LOCKED' field in the db
-	CCDBNodeLeaf		*getLockValuePtr() { return _GrayedLink; }
+	NLMISC::CCDBNodeLeaf		*getLockValuePtr() { return _GrayedLink; }
 
 	/// \name Macro
 	// @{
@@ -462,59 +483,65 @@ public:
 	void initSheetSize();
 	// @}
 
-	CCDBNodeLeaf *getSlotType() const { return _TradeSlotType.getNodePtr(); }
+	NLMISC::CCDBNodeLeaf *getSlotType() const { return _TradeSlotType.getNodePtr(); }
 
 	// get item weight
 	uint16 getItemWeight() const;
-	CCDBNodeLeaf *getItemWeightPtr() const;
+	NLMISC::CCDBNodeLeaf *getItemWeightPtr() const;
 	// set item weight
 	void setItemWeight(uint16 weight);
 
 	// get item info version
 	uint8 getItemInfoVersion() const;
-	CCDBNodeLeaf *getItemInfoVersionPtr() const;
+	NLMISC::CCDBNodeLeaf *getItemInfoVersionPtr() const;
 	// set item info version
 	void setItemInfoVersion(uint8 infoVersion);
 
 	// get item Locked state
 	uint16 getItemLocked() const;
-	CCDBNodeLeaf *getItemLockedPtr() const;
+	NLMISC::CCDBNodeLeaf *getItemLockedPtr() const;
 	// set item locked state
 	void setItemLocked(uint16 lock);
 
 	// get item PRICE. 0 if no DB
 	sint32 getItemPrice() const;
-	CCDBNodeLeaf *getItemPricePtr() const;
+	NLMISC::CCDBNodeLeaf *getItemPricePtr() const;
 	// set item PRICE
 	void setItemPrice(sint32 price);
 
 	// get item RESALE_FLAG. 0 if no DB
 	sint32 getItemResaleFlag() const;
-	CCDBNodeLeaf *getItemResaleFlagPtr() const;
+	NLMISC::CCDBNodeLeaf *getItemResaleFlagPtr() const;
 	// set item RESALE_FLAG
 	void setItemResaleFlag(sint32 rf);
 
+	// get item locked by owner
+	bool getLockedByOwner() const;
+
+	// true if the inventory supports owner locking
+	bool canOwnerLock() const;
+
 	// get item SELLER_TYPE. 0 if no DB
 	sint32 getItemSellerType() const;
-	CCDBNodeLeaf *getItemSellerTypePtr() const;
+	NLMISC::CCDBNodeLeaf *getItemSellerTypePtr() const;
 	// set item SELLER_TYPE
 	void setItemSellerType(sint32 rf);
 
 	// get item FABER_QUALITY. 0 if no DB
 	RM_CLASS_TYPE::TRMClassType getItemRMClassType() const;
-	CCDBNodeLeaf *getItemRMClassTypePtr() const {return _ItemRMClassType;}
+	NLMISC::CCDBNodeLeaf *getItemRMClassTypePtr() const {return _ItemRMClassType;}
 	// set item FABER_QUALITY
 	void setItemRMClassType(sint32 fq);
 
 	// get item FABER_STAT_TYPE. 0 if no DB
 	RM_FABER_STAT_TYPE::TRMStatType getItemRMFaberStatType() const;
-	CCDBNodeLeaf *getItemRMFaberStatTypePtr() const {return _ItemRMFaberStatType;}
+	NLMISC::CCDBNodeLeaf *getItemRMFaberStatTypePtr() const {return _ItemRMFaberStatType;}
 	// set item FABER_STAT_TYPE
 	void setItemRMFaberStatType(sint32 fss);
 
 	// get item PREREQUISIT_VALID. true of no DB
 	bool getItemPrerequisitValid() const;
-	CCDBNodeLeaf *getItemPrerequisitValidPtr() const;
+	NLMISC::CCDBNodeLeaf *getItemPrerequisitValidPtr() const;
 	// set item PREREQUISIT_VALID
 	void setItemPrerequisitValid(bool prv);
 
@@ -583,8 +610,8 @@ protected:
 	CInterfaceProperty	_Worned; // if true means that item is worned (red cross, no longer usable unless it's a tool)
 
 	// As node leaf for backward compatibilities
-	CCDBNodeLeaf		*_ItemRMClassType;
-	CCDBNodeLeaf		*_ItemRMFaberStatType;
+	NLMISC::CCDBNodeLeaf		*_ItemRMClassType;
+	NLMISC::CCDBNodeLeaf		*_ItemRMFaberStatType;
 
 	mutable sint32		_LastSheetId;
 
@@ -676,7 +703,7 @@ protected:
 	// This String is optional and usage dependent for Item, Macro, or Sentence
 	std::string			_OptString;
 
-	CCDBNodeLeaf		*_GrayedLink;
+	NLMISC::CCDBNodeLeaf		*_GrayedLink;
 
 	// Macro or sentence String compiled as texture Ids and positions, from the _OptString.
 	struct	CCharBitmap
@@ -707,7 +734,7 @@ protected:
 	sint32								_ItemCaracReqValue;
 
 	// Special for Armour
-	CCDBNodeLeaf		*_UserColor;
+	NLMISC::CCDBNodeLeaf		*_UserColor;
 
 	// keep pointer on item sheet
 	const CItemSheet	*_ItemSheet;
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
index 58cb0bae7..93d525558 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.cpp
@@ -123,7 +123,7 @@ bool CDBGroupListSheet::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 		_DbBranch= branch;
 		_DbBranchName= (const char*)prop;
 		// add observer
-		_DbBranch->addBranchObserver(&_DbBranchObs);
+		pIM->addBranchObserver(branch, &_DbBranchObs);
 	}
 
 	// parse the common ctrl info
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
index d0edc49d9..a1005f3b6 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet.h
@@ -141,14 +141,14 @@ protected:
 
 
 	// branch of the DB
-	CCDBNodeBranch				*_DbBranch;
+	NLMISC::CCDBNodeBranch				*_DbBranch;
 	std::string					_DbBranchName;
 	// Branch observer
-	class CDBObs : public ICDBNode::IPropertyObserver
+	class CDBObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
 		CDBGroupListSheet		*Owner;
-		virtual void update(ICDBNode* /* node */)	{Owner->_BranchModified= true;}
+		virtual void update(NLMISC::ICDBNode* /* node */)	{Owner->_BranchModified= true;}
 	};
 	friend class CDBObs;
 	CDBObs						_DbBranchObs;
@@ -192,7 +192,7 @@ protected:
 	}
 
 	// For animals only
-	CCDBNodeLeaf				*_AnimalStatus;
+	NLMISC::CCDBNodeLeaf				*_AnimalStatus;
 	sint32						_CacheAnimalStatus;
 
 	// For sectionnable purpose
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
index 5daa683da..f1764181d 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_bonus_malus.h
@@ -44,7 +44,7 @@ public:
 private:
 	sint32							_TextId;
 
-	std::vector<CCDBNodeLeaf*>		_DisableStates;
+	std::vector<NLMISC::CCDBNodeLeaf*>		_DisableStates;
 };
 
 
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h
index 5e3af2734..2748ad097 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_icon_phrase.h
@@ -45,7 +45,7 @@ public:
 		virtual bool isInvalidated(CDBGroupListSheet *pFather);
 		virtual void update(CDBGroupListSheet *pFather);
 		virtual sint getSectionId() const;
-		CCDBNodeLeaf	*LevelDB;
+		NLMISC::CCDBNodeLeaf	*LevelDB;
 		uint			LevelCache;
 	};
 
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
index fb8db2b74..80bfe50c7 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_mission.cpp
@@ -20,7 +20,7 @@
 
 #include "dbgroup_list_sheet_mission.h"
 #include "view_text_id_formated.h"
-#include "../cdb_leaf.h"
+#include "nel/misc/cdb_leaf.h"
 #include "interface_manager.h"
 
 using namespace std;
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
index 8990abf42..557ede4e3 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.cpp
@@ -107,7 +107,7 @@ bool CDBGroupListSheetText::parse (xmlNodePtr cur, CInterfaceGroup *parentGroup)
 		_DbBranch= branch;
 		_DbBranchName= (const char*)prop;
 		// add observer
-		_DbBranch->addBranchObserver(&_DbBranchObs);
+		pIM->addBranchObserver( branch, &_DbBranchObs );
 	}
 
 	// parse the common ctrl info
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
index 7f4f274a1..38d538df3 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text.h
@@ -203,14 +203,14 @@ protected:
 
 
 	// branch of the DB
-	CCDBNodeBranch				*_DbBranch;
+	NLMISC::CCDBNodeBranch				*_DbBranch;
 	std::string					_DbBranchName;
 	// Branch observer
-	class CDBObs : public ICDBNode::IPropertyObserver
+	class CDBObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
 		CDBGroupListSheetText	*Owner;
-		virtual void update(ICDBNode* /* node */)	{Owner->_BranchModified= true;}
+		virtual void update(NLMISC::ICDBNode* /* node */)	{Owner->_BranchModified= true;}
 	};
 	friend class CDBObs;
 	CDBObs						_DbBranchObs;
@@ -269,7 +269,7 @@ protected:
 	sint		getIndexOf(const CCtrlButton *button) const;
 
 	// For animals only
-	CCDBNodeLeaf				*_AnimalStatus;
+	NLMISC::CCDBNodeLeaf				*_AnimalStatus;
 	sint32						_CacheAnimalStatus;
 
 	// For items only (requirement color)
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h
index 4b857501e..e36b7c3d5 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_text_phrase.h
@@ -46,7 +46,7 @@ public:
 		virtual void update(CDBGroupListSheetText *pFather);
 		virtual void updateViewText(CDBGroupListSheetText *pFather);
 		virtual sint getSectionId() const;
-		CCDBNodeLeaf	*LevelDB;
+		NLMISC::CCDBNodeLeaf	*LevelDB;
 		uint			LevelCache;
 	};
 
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
index 24235085e..bc8476c23 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.cpp
@@ -30,6 +30,7 @@
 #include "game_share/pvp_clan.h"
 #include "../string_manager_client.h"
 #include "../entity_cl.h"
+#include "nel/misc/common.h"
 
 
 using namespace NLMISC;
@@ -264,7 +265,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 		{
 			STRING_MANAGER::CStringManagerClient *pSMC = STRING_MANAGER::CStringManagerClient::instance();
 			text += string("\n") + pSMC->getOutpostBuildingLocalizedDescription(CSheetId(Ctrl->getSheetId()));
-			text += "\n" + CI18N::get("uiBotChatPrice") + toString(pOBS->CostDapper);
+			text += "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(pOBS->CostDapper));
 			text += CI18N::get("uiBotChatTime") + toString(pOBS->CostTime/60) + CI18N::get("uiBotChatTimeMinute");
 			if ((pOBS->CostTime % 60) != 0)
 				text += toString(pOBS->CostTime%60) + CI18N::get("uiBotChatTimeSecond");
@@ -341,7 +342,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 				if (pIS && pIS->Family == ITEMFAMILY::GUILD_OPTION)
 				{
 					text+= "\n" + CI18N::get("uiBotChatSkillPointCost") + toString(pIS->GuildOption.XPCost);
-					text+= "\n" + CI18N::get("uiBotChatPrice") + toString(pIS->GuildOption.MoneyCost);
+					text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(pIS->GuildOption.MoneyCost));
 					guildOption= true;
 				}
 			}
@@ -376,10 +377,10 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 					if (LastPrice > 0)
 					{
 						if(displayMulPrice)
-							text+= "\n" + CI18N::get("uiBotChatPrice") + toString(sint32(LastPrice * priceFactor)) + " ("
-								+ toString( sint32(factor) * sint32(LastPrice * priceFactor) ) + ")";
+							text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString(sint32(LastPrice * priceFactor))) + " ("
+								+ NLMISC::formatThousands(toString( sint32(factor) * sint32(LastPrice * priceFactor) )) + ")";
 						else
-							text+= "\n" + CI18N::get("uiBotChatPrice") + toString( sint32(factor * LastPrice * priceFactor) );
+							text+= "\n" + CI18N::get("uiBotChatPrice") + NLMISC::formatThousands(toString( sint32(factor * LastPrice * priceFactor) ));
 					}
 
 					if ((LastFactionPointPrice != 0) && (LastFactionType >= PVP_CLAN::BeginClans) && (LastFactionType <= PVP_CLAN::EndClans))
@@ -390,7 +391,7 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 							text+= "\n";
 
 						text+= CI18N::get("uiBotChatFactionType") + PVP_CLAN::toString((PVP_CLAN::TPVPClan)LastFactionType)
-							+  CI18N::get("uiBotChatFactionPointPrice") + toString(LastFactionPointPrice);
+							+  CI18N::get("uiBotChatFactionPointPrice") + NLMISC::formatThousands(toString(LastFactionPointPrice));
 					}
 
 					// some additional info for resale
@@ -402,10 +403,10 @@ void CDBGroupListSheetTrade::CSheetChildTrade::updateViewText(CDBGroupListSheetT
 						{
 							// append price
 							if(pIS && pIS->Stackable>1 && zeFather->getMultiplyPriceByQuantityFlag())
-								text+= CI18N::get("uiBotChatRetirePrice") + toString(LastPriceRetire) + " ("
-									+ toString(factor * LastPriceRetire) + ")";
+								text+= CI18N::get("uiBotChatRetirePrice") + NLMISC::formatThousands(toString(LastPriceRetire)) + " ("
+									+ NLMISC::formatThousands(toString(factor * LastPriceRetire)) + ")";
 							else
-								text+= CI18N::get("uiBotChatRetirePrice") + toString(factor * LastPriceRetire);
+								text+= CI18N::get("uiBotChatRetirePrice") + NLMISC::formatThousands(toString(factor * LastPriceRetire));
 							// set resale time left
 							ucstring	fmt= CI18N::get("uiBotChatResaleTimeLeft");
 							strFindReplace(fmt, "%d", toString(LastResaleTimeLeft/RYZOM_DAY_IN_HOUR));
@@ -482,6 +483,12 @@ bool CDBGroupListSheetTrade::CSheetChildTrade::isSheetValid(CDBGroupListSheetTex
 			return false;
 	}
 
+	// Locked by owner; cannot trade
+	if (Ctrl->getLockedByOwner())
+	{
+		return false;
+	}
+
 	// Check seller type?
 	TSellerTypeFilter		stf= father->getSellerTypeFilter();
 	if( stf != None)
diff --git a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
index 7d5fd4922..54b7dba75 100644
--- a/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
+++ b/code/ryzom/client/src/interface_v3/dbgroup_list_sheet_trade.h
@@ -140,7 +140,7 @@ protected:
 	bool	_ApplyFamePriceFactor;
 
 	// keep pointer on leaf for fame price factor
-	CCDBNodeLeaf *	_FamePriceFactorLeaf;
+	NLMISC::CCDBNodeLeaf *	_FamePriceFactorLeaf;
 	sint16			_LastFamePriceFactor;
 
 	TSellerTypeFilter		_SellerTypeFilter;
diff --git a/code/ryzom/client/src/interface_v3/dbview_number.cpp b/code/ryzom/client/src/interface_v3/dbview_number.cpp
index 1463fcc3f..4b1ebc5ef 100644
--- a/code/ryzom/client/src/interface_v3/dbview_number.cpp
+++ b/code/ryzom/client/src/interface_v3/dbview_number.cpp
@@ -21,6 +21,7 @@
 #include "dbview_number.h"
 #include "interface_manager.h"
 #include "nel/misc/xml_auto_ptr.h"
+#include "nel/misc/common.h"
 
 using namespace std;
 using namespace NL3D;
@@ -102,30 +103,6 @@ bool CDBViewNumber::parse (xmlNodePtr cur, CInterfaceGroup * parentGroup)
 	return true;
 }
 
-// ***************************************************************************
-// Helper function
-ucstring formatThousands(const ucstring& s, const ucstring& separator)
-{
-	int j;
-	int k;
-	int topI = s.length() - 1;
-
-	if (topI < 4) return s;
-
-	ucstring ns;
-    do
-    {
-        for (j = topI, k = 0; j >= 0 && k < 3; --j, ++k )
-        {
-            ns = s[j] + ns; // new char is added to front of ns
-            if( j > 0 && k == 2) ns = separator + ns; // j > 0 means still more digits
-        }
-        topI -= 3;
-       
-    } while(topI >= 0);
-	return ns;
-}
-
 // ***************************************************************************
 void CDBViewNumber::checkCoords()
 {
@@ -134,8 +111,7 @@ void CDBViewNumber::checkCoords()
 	if (_Cache != val)
 	{
 		_Cache= val;
-		static ucstring separator = NLMISC::CI18N::get("uiThousandsSeparator");
-		ucstring value = _Format ? formatThousands(toString(val), separator) : toString(val);
+		ucstring value = _Format ? NLMISC::formatThousands(toString(val)) : toString(val);
 		if (_Positive) setText(val >= 0 ? ( ucstring(_Prefix) + value + ucstring(_Suffix) ) : ucstring("?"));
 		else setText( ucstring(_Prefix) + value + ucstring(_Suffix) );
 	}
diff --git a/code/ryzom/client/src/interface_v3/group_compas.cpp b/code/ryzom/client/src/interface_v3/group_compas.cpp
index c2589310b..fa9d62d5a 100644
--- a/code/ryzom/client/src/interface_v3/group_compas.cpp
+++ b/code/ryzom/client/src/interface_v3/group_compas.cpp
@@ -587,6 +587,12 @@ bool CGroupCompasMenu::parse(xmlNodePtr cur, CInterfaceGroup *parent /*=NULL*/)
 	return true;
 }
 
+// Helper for sorting landmarks
+static inline bool UserLandMarksSortPredicate(const CUserLandMark& lm1, const CUserLandMark& lm2)
+{
+	return toLower(lm1.Title) < toLower(lm2.Title);
+}
+
 // ***************************************************************************
 // Called when we activate the compass menu
 void CGroupCompasMenu::setActive (bool state)
@@ -803,6 +809,10 @@ void CGroupCompasMenu::setActive (bool state)
 				}
 				// User landmarks
 				uint nbUserLandMarks = std::min( uint(currCont->UserLandMarks.size()), CContinent::getMaxNbUserLandMarks() );
+
+				// Sort the landmarks
+				std::sort(currCont->UserLandMarks.begin(), currCont->UserLandMarks.end(), UserLandMarksSortPredicate);
+
 				for(k = 0; k < nbUserLandMarks; ++k)
 				{
 					if (currCont->UserLandMarks[k].Type < CUserLandMark::UserLandMarkTypeCount)
diff --git a/code/ryzom/client/src/interface_v3/group_compas.h b/code/ryzom/client/src/interface_v3/group_compas.h
index ecef51114..112b6ae68 100644
--- a/code/ryzom/client/src/interface_v3/group_compas.h
+++ b/code/ryzom/client/src/interface_v3/group_compas.h
@@ -110,7 +110,7 @@ private:
 	CCompassTarget					_SavedTarget;
 	bool							_SavedTargetValid;
 
-	CCDBNodeLeaf					*_DynamicTargetPos;
+	NLMISC::CCDBNodeLeaf					*_DynamicTargetPos;
 	uint32							_LastDynamicTargetPos;
 
 	// Color for each type of target
diff --git a/code/ryzom/client/src/interface_v3/group_html.cpp b/code/ryzom/client/src/interface_v3/group_html.cpp
index 8ce18fb77..e17426a79 100644
--- a/code/ryzom/client/src/interface_v3/group_html.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html.cpp
@@ -34,6 +34,7 @@ extern "C"
 #include "view_link.h"
 #include "ctrl_scroll.h"
 #include "ctrl_button.h"
+#include "dbctrl_sheet.h"
 #include "ctrl_text_button.h"
 #include "action_handler.h"
 #include "group_paragraph.h"
@@ -63,13 +64,55 @@ using namespace NLMISC;
 CGroupHTML *CGroupHTML::_ConnectingLock = NULL;
 extern CActionsContext ActionsContext;
 
-// Check if domain is on TrustedDomain	
-bool CGroupHTML::isTrustedDomain(const string &domain) {
+// Check if domain is on TrustedDomain
+bool CGroupHTML::isTrustedDomain(const string &domain)
+{
 	vector<string>::iterator it;
 	it = find (ClientCfg.WebIgTrustedDomains.begin(), ClientCfg.WebIgTrustedDomains.end(), domain);
 	return it != ClientCfg.WebIgTrustedDomains.end();
 }
 
+void CGroupHTML::setImage(CViewBase * view, const string &file)
+{
+	CCtrlButton *btn = dynamic_cast<CCtrlButton*>(view);
+	if(btn)
+	{
+		btn->setTexture (file);
+		btn->setTexturePushed(file);
+		btn->invalidateCoords();
+		btn->invalidateContent();
+		btn->resetInvalidCoords();
+		btn->updateCoords();
+		paragraphChange();
+	}
+	else
+	{
+		CViewBitmap *btm = dynamic_cast<CViewBitmap*>(view);
+		if(btm)
+		{
+			btm->setTexture (file);
+			btm->invalidateCoords();
+			btm->invalidateContent();
+			btm->resetInvalidCoords();
+			btm->updateCoords();
+			paragraphChange();
+		}
+		else
+		{
+			CGroupCell *btgc = dynamic_cast<CGroupCell*>(view);
+			if(btgc)
+			{
+				btgc->setTexture (file);
+				btgc->invalidateCoords();
+				btgc->invalidateContent();
+				btgc->resetInvalidCoords();
+				btgc->updateCoords();
+				paragraphChange();
+			}
+		}
+	}
+}
+
 // Get an url and return the local filename with the path where the url image should be
 string CGroupHTML::localImageName(const string &url)
 {
@@ -99,30 +142,38 @@ void CGroupHTML::addImageDownload(const string &url, CViewBase *img)
 	curl_easy_setopt(curl, CURLOPT_NOPROGRESS, true);
 	curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
 
-	string dest = localImageName(url)+".tmp";
+	string dest = localImageName(url);
+	string tmpdest = localImageName(url)+".tmp";
 #ifdef LOG_DL
 	nlwarning("add to download '%s' dest '%s' img %p", url.c_str(), dest.c_str(), img);
 #endif
-	// create the local file
-	if (NLMISC::CFile::fileExists(dest))
+
+		// erase the tmp file if exists
+	if (NLMISC::CFile::fileExists(tmpdest))
+		NLMISC::CFile::deleteFile(tmpdest);
+
+	if (!NLMISC::CFile::fileExists(dest))
 	{
-		CFile::setRWAccess(dest);
-		NLMISC::CFile::deleteFile(dest);
+
+		FILE *fp = fopen (tmpdest.c_str(), "wb");
+		if (fp == NULL)
+		{
+			nlwarning("Can't open file '%s' for writing: code=%d '%s'", tmpdest.c_str (), errno, strerror(errno));
+			return;
+		}
+		curl_easy_setopt(curl, CURLOPT_FILE, fp);
+
+		curl_multi_add_handle(MultiCurl, curl);
+		Curls.push_back(CDataDownload(curl, url, fp, ImgType, img, "", ""));
+	#ifdef LOG_DL
+		nlwarning("adding handle %x, %d curls", curl, Curls.size());
+	#endif
+		RunningCurls++;
 	}
-	FILE *fp = fopen (dest.c_str(), "wb");
-	if (fp == NULL)
+	else
 	{
-		nlwarning("Can't open file '%s' for writing: code=%d '%s'", dest.c_str (), errno, strerror(errno));
-		return;
+		setImage(img, dest);
 	}
-	curl_easy_setopt(curl, CURLOPT_FILE, fp);
-
-	curl_multi_add_handle(MultiCurl, curl);
-	Curls.push_back(CDataDownload(curl, url, fp, ImgType, img, "", ""));
-#ifdef LOG_DL
-	nlwarning("adding handle %x, %d curls", curl, Curls.size());
-#endif
-	RunningCurls++;
 }
 
 void CGroupHTML::initImageDownload()
@@ -187,7 +238,7 @@ bool CGroupHTML::addBnpDownload(const string &url, const string &action, const s
 		}
 		else
 		{
-			return true;	
+			return true;
 		}
 	}
 	if (action != "delete")
@@ -297,41 +348,11 @@ void CGroupHTML::checkDownloads()
 									for(uint i = 0; i < it->imgs.size(); i++)
 									{
 										// don't display image that are not power of 2
-										uint32 w, h;
-										CBitmap::loadSize (file, w, h);
-										if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
-											file.clear();
-
-										CCtrlButton *btn = dynamic_cast<CCtrlButton*>(it->imgs[i]);
-										if(btn)
-										{
-	#ifdef LOG_DL
-											nlwarning("refresh new downloading image %d button %p", i, it->imgs[i]);
-	#endif
-											btn->setTexture (file);
-											btn->setTexturePushed(file);
-											btn->invalidateCoords();
-											btn->invalidateContent();
-											btn->resetInvalidCoords();
-											btn->updateCoords();
-											paragraphChange();
-										}
-										else
-										{
-											CViewBitmap *btm = dynamic_cast<CViewBitmap*>(it->imgs[i]);
-											if(btm)
-											{
-	#ifdef LOG_DL
-												nlwarning("refresh new downloading image %d image %p", i, it->imgs[i]);
-	#endif
-												btm->setTexture (file);
-												btm->invalidateCoords();
-												btm->invalidateContent();
-												btm->resetInvalidCoords();
-												btm->updateCoords();
-												paragraphChange();
-											}
-										}
+										//uint32 w, h;
+										//CBitmap::loadSize (file, w, h);
+										//if (w == 0 || h == 0 || ((!NLMISC::isPowerOf2(w) || !NLMISC::isPowerOf2(h)) && !NL3D::CTextureFile::supportNonPowerOfTwoTextures()))
+										//	file.clear();
+										setImage(it->imgs[i], file);
 									}
 								}
 							}
@@ -340,7 +361,6 @@ void CGroupHTML::checkDownloads()
 								CFile::moveFile(file.c_str(), (file+".tmp").c_str());
 								if (lookupLocalFile (finalUrl, file.c_str(), false))
 								{
-									
 									CInterfaceManager *pIM = CInterfaceManager::getInstance();
 									pIM->executeLuaScript(it->luaScript, true);
 								}
@@ -446,6 +466,28 @@ void CGroupHTML::beginBuild ()
 }
 
 
+TStyle CGroupHTML::parseStyle (const string &str_styles)
+{
+	TStyle	styles;
+	vector<string> elements;
+	NLMISC::splitString(str_styles, ";", elements);
+
+	for(uint i = 0; i < elements.size(); ++i)
+	{
+		vector<string> style;
+		NLMISC::splitString(elements[i], ":", style);
+		if (style.size() >= 2)
+		{
+			string fullstyle = style[1];
+			for (uint j=2; j < style.size(); j++)
+				fullstyle += ":"+style[j];
+			styles[trim(style[0])] = fullstyle;
+		}
+	}
+
+	return styles;
+}
+
 // ***************************************************************************
 
 void CGroupHTML::addText (const char * buf, int len)
@@ -541,7 +583,7 @@ void CGroupHTML::addLink (uint element_number, uint /* attribute_number */, HTCh
 				else if (_TrustedDomain && suri[0] == '#')
 				{
 					// Direct url (hack for lua beginElement)
-					_Link.push_back (suri.substr(1));	
+					_Link.push_back (suri.substr(1));
 				}
 				else
 				{
@@ -556,9 +598,31 @@ void CGroupHTML::addLink (uint element_number, uint /* attribute_number */, HTCh
 						_Link.push_back("");
 					}
 				}
+
+				for(uint8 i = MY_HTML_A_ACCESSKEY; i < MY_HTML_A_Z_ACTION_SHORTCUT; i++)
+				{
+					if (present[i] && value[i])
+					{
+						string title = value[i];
+					//	nlinfo("key %d = %s", i, title.c_str());
+					}
+				}
+				//nlinfo("key of TITLE is : %d", MY_HTML_A_Z_ACTION_PARAMS);
+				if (present[MY_HTML_A_Z_ACTION_PARAMS] && value[MY_HTML_A_Z_ACTION_PARAMS])
+				{
+					string title = value[MY_HTML_A_Z_ACTION_PARAMS];
+					_LinkTitle.push_back(title);
+				}
+				else
+					_LinkTitle.push_back("");
 			}
 			else
+			{
 				_Link.push_back("");
+				_LinkTitle.push_back("");
+			}
+
+			
 		}
 	}
 }
@@ -626,7 +690,6 @@ static const char *scanColorComponent(const char *src, uint8 &intensity)
 	return src;
 }
 
-
 class CNameToCol
 {
 public:
@@ -831,6 +894,11 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 			_GlobalColor.push_back(LinkColorGlobalColor);
 			_A.push_back(true);
 
+			if (present[MY_HTML_A_TITLE] && value[MY_HTML_A_TITLE])
+				_LinkTitle.push_back(value[MY_HTML_A_TITLE]);
+			if (present[MY_HTML_A_CLASS] && value[MY_HTML_A_CLASS])
+				_LinkClass.push_back(value[MY_HTML_A_CLASS]);
+
 			// Quick help
 			if (_TrustedDomain && present[MY_HTML_A_Z_ACTION_SHORTCUT] && value[MY_HTML_A_Z_ACTION_SHORTCUT])
 			{
@@ -856,15 +924,87 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 					}
 				}
 			}
+
 			break;
 		case HTML_DIV:
 		{
 			if (present[MY_HTML_DIV_NAME] && value[MY_HTML_DIV_NAME])
-			{
 				_DivName = value[MY_HTML_DIV_NAME];
+
+			string instClass;
+			if (present[MY_HTML_DIV_CLASS] && value[MY_HTML_DIV_CLASS])
+				instClass = value[MY_HTML_DIV_CLASS];
+
+			// use generic template system
+			if (_TrustedDomain && !instClass.empty() && instClass == "ryzom-ui-grouptemplate")
+			{
+				string id;
+				if (present[MY_HTML_DIV_ID] && value[MY_HTML_DIV_ID])
+					id = value[MY_HTML_DIV_ID];
+
+				string style;
+				if (present[MY_HTML_DIV_STYLE] && value[MY_HTML_DIV_STYLE])
+					style = value[MY_HTML_DIV_STYLE];
+
+				typedef pair<string, string> TTmplParam;
+				vector<TTmplParam> tmplParams;
+				
+				string templateName;
+				if (!style.empty())
+				{
+					TStyle styles = parseStyle(style);
+					TStyle::iterator	it;
+					for (it=styles.begin(); it != styles.end(); it++)
+					{
+						if ((*it).first == "template")
+							templateName = (*it).second;
+						else
+							tmplParams.push_back(TTmplParam((*it).first, (*it).second));
+					}
+				}
+
+				if (!templateName.empty())
+				{
+					string parentId;
+					bool haveParentDiv = getDiv() != NULL;
+					if (haveParentDiv)
+						parentId = getDiv()->getId();
+					else
+						parentId = _Paragraph->getId();
+
+					CInterfaceManager *im = CInterfaceManager::getInstance();
+					CInterfaceGroup *inst = im->createGroupInstance(templateName, parentId+":"+id, tmplParams);
+					if (inst)
+					{
+						inst->setId(parentId+":"+id);
+						inst->updateCoords();
+						if (haveParentDiv)
+						{
+								inst->setParent(getDiv());
+								inst->setParentSize(getDiv());
+								inst->setParentPos(getDiv());
+								inst->setPosRef(Hotspot_TL);
+								inst->setParentPosRef(Hotspot_TL);
+								getDiv()->addGroup(inst);
+						}
+						else
+						{
+							if (!_Paragraph)
+							{
+								newParagraph (0);
+								paragraphChange ();
+							}
+
+							getParagraph()->addChild(inst);
+							paragraphChange();
+						}
+						_Divs.push_back(inst);
+					}
+				}
 			}
 		}
 			break;
+
 		case HTML_FONT:
 		{
 			bool found = false;
@@ -898,11 +1038,42 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 			addString(ucstring ("\n"));
 			break;
 		case HTML_BODY:
-			if (present[HTML_BODY_BGCOLOR] && value[HTML_BODY_BGCOLOR])
 			{
-				// Get the color
-				CRGBA bgColor = getColor (value[HTML_BODY_BGCOLOR]);
-				setBackgroundColor (bgColor);
+				if (present[HTML_BODY_BGCOLOR] && value[HTML_BODY_BGCOLOR])
+				{
+					CRGBA bgColor = getColor (value[HTML_BODY_BGCOLOR]);
+					setBackgroundColor (bgColor);
+				}
+				
+				string style;
+				if (present[HTML_BODY_STYLE] && value[HTML_BODY_STYLE])
+					style = value[HTML_BODY_STYLE];
+				
+				
+				if (!style.empty())
+				{
+					TStyle styles = parseStyle(style);
+					TStyle::iterator	it;
+
+					it = styles.find("background-repeat");
+					bool repeat = (it != styles.end() && it->second == "1");
+					
+					// Webig only
+					it = styles.find("background-scale");
+					bool scale = (it != styles.end() && it->second == "1");
+
+					it = styles.find("background-image");
+					if (it != styles.end())
+					{
+						string image = it->second;
+						string::size_type texExt = strlwr(image).find("url(");
+						// Url image
+						if (texExt != string::npos)
+							// Remove url()
+							image = image.substr(4, image.size()-5);
+						setBackground (image, scale, repeat);
+					}
+				}
 			}
 			break;
 		case HTML_FORM:
@@ -1000,7 +1171,24 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 					}
 					else
 					{
-						addImage (value[MY_HTML_IMG_SRC], globalColor);
+						// Get the option to reload (class==reload)
+						bool reloadImg = false;
+
+						string style;
+						if (present[MY_HTML_IMG_STYLE] && value[MY_HTML_IMG_STYLE])
+							style = value[MY_HTML_IMG_STYLE];
+
+						if (!style.empty())
+						{
+							TStyle styles = parseStyle(style);
+							TStyle::iterator	it;
+
+							it = styles.find("reload");
+							if (it != styles.end() && (*it).second == "1")
+								reloadImg = true;
+						}
+						
+						addImage (value[MY_HTML_IMG_SRC], globalColor, reloadImg);
 					}
 				}
 			}
@@ -1312,8 +1500,43 @@ void CGroupHTML::beginElement (uint element_number, const BOOL *present, const c
 					if (!_Cells.empty())
 					{
 						_Cells.back() = new CGroupCell(CViewBase::TCtorParam());
+						string style;
+						if (present[MY_HTML_TD_STYLE] && value[MY_HTML_TD_STYLE])
+							style = value[MY_HTML_TD_STYLE];
 
 						// Set the cell parameters
+						if (!style.empty())
+						{
+							TStyle styles = parseStyle(style);
+							TStyle::iterator	it;
+
+							it = styles.find("background-repeat");
+							_Cells.back()->setTextureTile(it != styles.end());
+
+							// Webig only
+							it = styles.find("background-scale");
+							_Cells.back()->setTextureScale(it != styles.end());
+
+							it = styles.find("background-image");
+							if (it != styles.end())
+							{
+								nlinfo("found background-image %s", it->second.c_str());
+								string image = (*it).second;
+								string::size_type texExt = strlwr(image).find("url(");
+								// Url image
+								if (texExt != string::npos)
+								{
+									// Remove url()
+									image = image.substr(4, image.size()-5);
+									addImageDownload(image, _Cells.back());
+								// Image in BNP
+								}
+								else
+								{
+									_Cells.back()->setTexture(image);
+								}
+							}
+						}
 						_Cells.back()->BgColor = _CellParams.back().BgColor;
 						_Cells.back()->Align = _CellParams.back().Align;
 						_Cells.back()->VAlign = _CellParams.back().VAlign;
@@ -1435,6 +1658,8 @@ void CGroupHTML::endElement (uint element_number)
 			popIfNotEmpty (_GlobalColor);
 			popIfNotEmpty (_A);
 			popIfNotEmpty (_Link);
+			popIfNotEmpty (_LinkTitle);
+			popIfNotEmpty (_LinkClass);
 			break;
 		case HTML_H1:
 		case HTML_H2:
@@ -1452,6 +1677,7 @@ void CGroupHTML::endElement (uint element_number)
 			break;
 		case HTML_DIV:
 			_DivName = "";
+			popIfNotEmpty (_Divs);
 			break;
 
 		case HTML_TABLE:
@@ -1551,7 +1777,7 @@ void CGroupHTML::endElement (uint element_number)
 						if (addBnpDownload(_ObjectData, _ObjectAction, _ObjectScript, _ObjectMD5Sum))
 						{
 							CInterfaceManager *pIM = CInterfaceManager::getInstance();
-							pIM->executeLuaScript(_ObjectScript, true);
+							pIM->executeLuaScript("\nlocal __ALLREADYDL__=true\n"+_ObjectScript, true);
 						}
 						_ObjectScript = "";
 					}
@@ -1586,6 +1812,7 @@ void CGroupHTML::endUnparsedElement(const char *buffer, int length)
 			_ParsingLua = false;
 			// execute the embeded lua script
 			CInterfaceManager *pIM = CInterfaceManager::getInstance();
+			_LuaScript = "\nlocal __CURRENT_WINDOW__=\""+this->_Id+"\" \n"+_LuaScript;
 			pIM->executeLuaScript(_LuaScript, true);
 		}
 	}
@@ -1607,7 +1834,7 @@ CGroupHTML::CGroupHTML(const TCtorParam &param)
 	_TimeoutValue(DEFAULT_RYZOM_CONNECTION_TIMEOUT)
 {
 	// add it to map of group html created
-	_GroupHtmlUID= ++_GroupHtmlUIDPool;		// valid assigned Id begin to 1!
+	_GroupHtmlUID= ++_GroupHtmlUIDPool; // valid assigned Id begin to 1!
 	_GroupHtmlByUID[_GroupHtmlUID]= this;
 
 	// init
@@ -2211,40 +2438,77 @@ void CGroupHTML::addString(const ucstring &str)
 		// Not added ?
 		if (!added)
 		{
-			CViewLink *newLink = new CViewLink(CViewBase::TCtorParam());
-			if (getA())
+			if (getA() && string(getLinkClass()) == "ryzom-ui-button")
 			{
-				newLink->Link = getLink();
-				if (!newLink->Link.empty())
+				string buttonTemplate = DefaultButtonGroup;
+				// Action handler parameters : "name=group_html_id|form=id_of_the_form|submit_button=button_name"
+				string param = "name=" + this->_Id + "|url=" + getLink();
+
+				CInterfaceManager *im = CInterfaceManager::getInstance();
+				typedef pair<string, string> TTmplParam;
+				vector<TTmplParam> tmplParams;
+				tmplParams.push_back(TTmplParam("id", ""));
+				tmplParams.push_back(TTmplParam("onclick", "browse"));
+				tmplParams.push_back(TTmplParam("onclick_param", param));
+				tmplParams.push_back(TTmplParam("active", "true"));
+				CInterfaceGroup *buttonGroup = im->createGroupInstance(buttonTemplate, _Paragraph->getId(), tmplParams);
+				if (buttonGroup)
 				{
-					newLink->setHTMLView (this);
-					newLink->setUnderlined (true);
+
+					// Add the ctrl button
+					CCtrlTextButton *ctrlButton = dynamic_cast<CCtrlTextButton*>(buttonGroup->getCtrl("button"));
+					if (!ctrlButton) ctrlButton = dynamic_cast<CCtrlTextButton*>(buttonGroup->getCtrl("b"));
+					if (ctrlButton)
+					{
+						ctrlButton->setModulateGlobalColorAll (false);
+
+						// Translate the tooltip
+						ctrlButton->setDefaultContextHelp(ucstring::makeFromUtf8(getLinkTitle()));
+						ctrlButton->setText(tmpStr);
+					}
+					getParagraph()->addChild (buttonGroup);
+					paragraphChange ();
 				}
-			}
-			newLink->setText(tmpStr);
-			newLink->setColor(getTextColor());
-			newLink->setFontSize(getFontSize());
-			newLink->setMultiLineSpace((uint)((float)getFontSize()*LineSpaceFontFactor));
-			newLink->setMultiLine(true);
-			newLink->setModulateGlobalColor(getGlobalColor());
-			// newLink->setLineAtBottom (true);
-
-			if (getA() && !newLink->Link.empty())
-			{
-				getParagraph()->addChildLink(newLink);
+	
 			}
 			else
 			{
-				getParagraph()->addChild(newLink);
+				CViewLink *newLink = new CViewLink(CViewBase::TCtorParam());
+				if (getA())
+				{
+					newLink->Link = getLink();
+					newLink->LinkTitle = getLinkTitle();
+					if (!newLink->Link.empty())
+					{
+						newLink->setHTMLView (this);
+						newLink->setUnderlined (true);
+					}
+				}
+				newLink->setText(tmpStr);
+				newLink->setColor(getTextColor());
+				newLink->setFontSize(getFontSize());
+				newLink->setMultiLineSpace((uint)((float)getFontSize()*LineSpaceFontFactor));
+				newLink->setMultiLine(true);
+				newLink->setModulateGlobalColor(getGlobalColor());
+				// newLink->setLineAtBottom (true);
+
+				if (getA() && !newLink->Link.empty())
+				{
+					getParagraph()->addChildLink(newLink);
+				}
+				else
+				{
+					getParagraph()->addChild(newLink);
+				}
+				paragraphChange ();
 			}
-			paragraphChange ();
 		}
 	}
 }
 
 // ***************************************************************************
 
-void CGroupHTML::addImage(const char *img, bool globalColor)
+void CGroupHTML::addImage(const char *img, bool globalColor, bool reloadImg)
 {
 	// In a paragraph ?
 	if (_Paragraph)
@@ -2268,6 +2532,7 @@ void CGroupHTML::addImage(const char *img, bool globalColor)
 				newImage->Link = getLink();
 				newImage->setHTMLView (this);
 			}*/
+			newImage->setRenderLayer(getRenderLayer()+1);
 			newImage->setTexture (finalUrl);
 			newImage->setModulateGlobalColor(globalColor);
 
@@ -2284,7 +2549,7 @@ void CGroupHTML::addImage(const char *img, bool globalColor)
 			// 2/ if it doesn't work, try to load the image in cache
 			//
 			image = localImageName(img);
-			if (lookupLocalFile (finalUrl, image.c_str(), false))
+			if (!reloadImg && lookupLocalFile (finalUrl, image.c_str(), false))
 			{
 				// No more text in this text view
 				_CurrentViewLink = NULL;
@@ -2314,7 +2579,9 @@ void CGroupHTML::addImage(const char *img, bool globalColor)
 				else*/
 				getParagraph()->addChild(newImage);
 				paragraphChange ();
-			} else {
+			}
+			else
+			{
 
 				//
 				// 3/ if it doesn't work, display a placeholder and ask to dl the image into the cache
@@ -2527,6 +2794,9 @@ CCtrlButton *CGroupHTML::addButton(CCtrlButton::EType type, const std::string &/
 
 		ctrlButton->setInstantContextHelp(true);
 		ctrlButton->setToolTipParent(TTMouse);
+		ctrlButton->setToolTipParentPosRef(Hotspot_TTAuto);
+		ctrlButton->setToolTipPosRef(Hotspot_TTAuto);
+		ctrlButton->setActionOnLeftClickParams(tooltip);
 	}
 
 	getParagraph()->addChild (ctrlButton);
@@ -2556,6 +2826,7 @@ void CGroupHTML::clearContext()
 	_UL.clear();
 	_A.clear();
 	_Link.clear();
+	_LinkTitle.clear();
 	_Tables.clear();
 	_Cells.clear();
 	_TR.clear();
@@ -2632,6 +2903,9 @@ CInterfaceGroup *CGroupHTML::getCurrentGroup()
 
 void CGroupHTML::addGroup (CInterfaceGroup *group, uint beginSpace)
 {
+	if (!group)
+		return;
+
 	// Remove previous paragraph if empty
 	if (_Paragraph && (_Paragraph->getNumChildren() == 0))
 	{
@@ -2796,7 +3070,30 @@ void CGroupHTML::setBackgroundColor (const CRGBA &bgcolor)
 		{
 			// Change the background color
 			bitmap->setColor (bgcolor);
-			bitmap->setModulateGlobalColor(true);
+			bitmap->setModulateGlobalColor(false);
+		}
+	}
+}
+
+// ***************************************************************************
+
+void CGroupHTML::setBackground (const string &bgtex, bool scale, bool tile)
+{
+	// Should have a child named bg
+	CViewBase *view = getView (DefaultBackgroundBitmapView);
+	if (view)
+	{
+		CViewBitmap *bitmap = dynamic_cast<CViewBitmap*> (view);
+		if (bitmap)
+		{
+			bitmap->setParentPosRef(Hotspot_TL);
+			bitmap->setPosRef(Hotspot_TL);
+			bitmap->setX(0);
+			bitmap->setY(0);
+			bitmap->setRenderLayer(-2);
+			bitmap->setScale(scale);
+			bitmap->setTile(tile);
+			addImageDownload(bgtex, view);
 		}
 	}
 }
@@ -2816,7 +3113,7 @@ struct CButtonFreezer : public CInterfaceElementVisitor
 
 static int timer_called = 0;
 
-static int 
+static int
 timer_callback(HTTimer *   const timer     ,
                void *      const user_data ,
                HTEventType const event     )
@@ -2827,7 +3124,7 @@ timer_callback(HTTimer *   const timer     ,
     nlassert(event == HTEvent_TIMEOUT);
     timer_called = 1;
     HTEventList_stopLoop();
-    
+
     /* XXX - The meaning of this return value is undocumented, but close
     ** inspection of libwww's source suggests that we want to return HT_OK. */
     return HT_OK;
@@ -2897,9 +3194,6 @@ void CGroupHTML::handle ()
 				_Browsing = true;
 				updateRefreshButton();
 
-				// Add custom get params
-				addHTTPGetParams (finalUrl);
-
 				// Save new url
 				_URL = finalUrl;
 
@@ -2910,6 +3204,10 @@ void CGroupHTML::handle ()
 				initLibWWW();
 				_TrustedDomain = isTrustedDomain(setCurrentDomain(finalUrl));
 
+				// Add custom get params
+				addHTTPGetParams (finalUrl, _TrustedDomain);
+
+
 				// Get the final URL
 				C3WSmartPtr uri = HTParse(finalUrl.c_str(), NULL, PARSE_ALL);
 
@@ -3030,7 +3328,7 @@ void CGroupHTML::handle ()
 				HTParseFormInput(formfields, (_PostFormSubmitButton + "_y=0").c_str());
 
 				// Add custom params
-				addHTTPPostParams (formfields);
+				addHTTPPostParams(formfields, _TrustedDomain);
 
 				// Reset the title
 				if(_TitlePrefix.empty())
@@ -3146,13 +3444,13 @@ void CGroupHTML::endBuild ()
 
 // ***************************************************************************
 
-void CGroupHTML::addHTTPGetParams (string &/* url */)
+void CGroupHTML::addHTTPGetParams (string &/* url */, bool /*trustedDomain*/)
 {
 }
 
 // ***************************************************************************
 
-void CGroupHTML::addHTTPPostParams (HTAssocList * /* formfields */)
+void CGroupHTML::addHTTPPostParams (HTAssocList * /* formfields */, bool /*trustedDomain*/)
 {
 }
 
@@ -3401,7 +3699,7 @@ int CGroupHTML::luaRefresh(CLuaState &ls)
 // ***************************************************************************
 int CGroupHTML::luaRemoveContent(CLuaState &ls)
 {
-	const char *funcName = "refresh";
+	const char *funcName = "removeContent";
 	CLuaIHM::checkArgCount(ls, funcName, 0);
 	removeContent();
 	return 0;
diff --git a/code/ryzom/client/src/interface_v3/group_html.h b/code/ryzom/client/src/interface_v3/group_html.h
index d155c6d3f..098fbb4ff 100644
--- a/code/ryzom/client/src/interface_v3/group_html.h
+++ b/code/ryzom/client/src/interface_v3/group_html.h
@@ -30,6 +30,8 @@
 #include "ctrl_button.h"
 #include "group_table.h"
 
+typedef std::map<std::string, std::string>	TStyle;
+
 extern "C"
 {
 #include "WWWInit.h"
@@ -147,6 +149,7 @@ public:
 	std::string		DefaultCheckBoxBitmapPushed;
 	std::string		DefaultCheckBoxBitmapOver;
 	std::string		DefaultBackgroundBitmapView;
+	std::string		CurrentLinkTitle;
 
 	// Browser home
 	std::string		Home;
@@ -216,10 +219,10 @@ protected :
 	virtual void endUnparsedElement(const char *buffer, int length);
 
 	// Add GET params to the url
-	virtual void addHTTPGetParams (std::string &url);
+	virtual void addHTTPGetParams (std::string &url, bool trustedDomain);
 
 	// Add POST params to the libwww list
-	virtual void addHTTPPostParams (HTAssocList *formfields);
+	virtual void addHTTPPostParams (HTAssocList *formfields, bool trustedDomain);
 
 	// the current request is terminated
 	virtual void requestTerminated(HTRequest *request);
@@ -227,6 +230,9 @@ protected :
 	// Get Home URL
 	virtual std::string	home();
 
+	// Parse style html tag
+	TStyle parseStyle(const std::string &str_styles);
+
 	// Handle some work at each pass
 	virtual void handle ();
 
@@ -251,7 +257,7 @@ protected :
 	void addString(const ucstring &str);
 
 	// Add an image in the current paragraph
-	void addImage(const char *image, bool globalColor);
+	void addImage(const char *image, bool globalColor, bool reloadImg=false);
 
 	// Add a text area in the current paragraph
 	CInterfaceGroup *addTextArea (const std::string &templateName, const char *name, uint rows, uint cols, bool multiLine, const ucstring &content);
@@ -266,6 +272,9 @@ protected :
 	// Set the background color
 	void setBackgroundColor (const NLMISC::CRGBA &bgcolor);
 
+	// Set the background
+	void setBackground (const std::string &bgtex, bool scale, bool tile);
+
 	// Force the current string to be in a single string
 	void flushString();
 
@@ -281,7 +290,7 @@ protected :
 	// Current URL
 	std::string		_URL;
 
-	// Current DOMAIN
+	// Current DOMAIN
 	bool			_TrustedDomain;
 
 	// Title prefix
@@ -397,6 +406,30 @@ protected :
 		return _Link.back().c_str();
 	}
 
+	std::vector<std::string>	_LinkTitle;
+	inline const char *getLinkTitle() const
+	{
+		if (_LinkTitle.empty())
+			return "";
+		return _LinkTitle.back().c_str();
+	}
+	std::vector<std::string>		_LinkClass;
+	inline const char *getLinkClass() const
+	{
+		if (_LinkClass.empty())
+			return "";
+		return _LinkClass.back().c_str();
+	}
+	
+	// Divs (i.e. interface group)
+	std::vector<class CInterfaceGroup*>	_Divs;
+	inline CInterfaceGroup *getDiv() const
+	{
+		if (_Divs.empty())
+			return NULL;
+		return _Divs.back();
+	}
+
 	// Tables
 	std::vector<class CGroupTable*>	_Tables;
 	inline CGroupTable *getTable() const
@@ -475,6 +508,7 @@ protected :
 			NoWrap = false;
 		}
 		NLMISC::CRGBA	BgColor;
+		std::string		Style;
 		CGroupCell::TAlign	Align;
 		CGroupCell::TVAlign	VAlign;
 		sint32	LeftMargin;
@@ -582,9 +616,9 @@ private:
 	void checkImageDownload();
 	void addImageDownload(const std::string &url, CViewBase *img);
 	std::string localImageName(const std::string &url);
-	bool isTrustedDomain(const std::string &domain);
-
 
+	bool isTrustedDomain(const std::string &domain);
+	void setImage(CViewBase *view, const std::string &file);
 
 	// BnpDownload system
 	void initBnpDownload();
diff --git a/code/ryzom/client/src/interface_v3/group_html_cs.cpp b/code/ryzom/client/src/interface_v3/group_html_cs.cpp
index a02231132..063a9bbe9 100644
--- a/code/ryzom/client/src/interface_v3/group_html_cs.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html_cs.cpp
@@ -24,6 +24,7 @@
 #include "group_html_cs.h"
 #include "nel/misc/xml_auto_ptr.h"
 #include "../client_cfg.h"
+#include "interface_manager.h"
 
 // used for login cookie to be sent to the web server
 #include "../net_manager.h"
@@ -49,7 +50,7 @@ CGroupHTMLCS::~CGroupHTMLCS()
 
 // ***************************************************************************
 
-void CGroupHTMLCS::addHTTPGetParams (string &url)
+void CGroupHTMLCS::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 {
 	url += ((url.find('?') != string::npos) ? "&" : "?");
 
@@ -69,7 +70,7 @@ void CGroupHTMLCS::addHTTPGetParams (string &url)
 
 // ***************************************************************************
 
-void CGroupHTMLCS::addHTTPPostParams (HTAssocList *formfields)
+void CGroupHTMLCS::addHTTPPostParams (HTAssocList *formfields, bool /*trustedDomain*/)
 {
 	std::vector<CParameter> parameters;
 	getParameters (parameters, false);
@@ -120,6 +121,15 @@ void CGroupHTMLCS::getParameters (std::vector<CParameter> &parameters, bool enco
 	string s = getDebugInformation();
 	s += getSystemInformation();
 
+	static bool webIgReady = false;
+
+	if (!webIgReady) // Webig is ready when getParameters of CGroupHTMLCS is called
+	{
+		webIgReady = true;
+		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+		pIM->executeLuaScript("game:onWebIgReady()");
+	}
+
 	// For each line
 	string::size_type startOfLine = 0;
 	string::size_type endOfLine;
diff --git a/code/ryzom/client/src/interface_v3/group_html_cs.h b/code/ryzom/client/src/interface_v3/group_html_cs.h
index a37b2b50c..e3c8a765e 100644
--- a/code/ryzom/client/src/interface_v3/group_html_cs.h
+++ b/code/ryzom/client/src/interface_v3/group_html_cs.h
@@ -39,8 +39,8 @@ public:
 	~CGroupHTMLCS();
 
 	// From CGroupHTML
-	virtual void addHTTPGetParams (std::string &url);
-	virtual void addHTTPPostParams (HTAssocList *formfields);
+	virtual void addHTTPGetParams (std::string &url, bool trustedDomain);
+	virtual void addHTTPPostParams (HTAssocList *formfields, bool trustedDomain);
 	virtual std::string	home();
 
 private:
diff --git a/code/ryzom/client/src/interface_v3/group_html_forum.cpp b/code/ryzom/client/src/interface_v3/group_html_forum.cpp
index 96e711500..405b91645 100644
--- a/code/ryzom/client/src/interface_v3/group_html_forum.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html_forum.cpp
@@ -51,9 +51,9 @@ CGroupHTMLForum::~CGroupHTMLForum()
 
 // ***************************************************************************
 
-void CGroupHTMLForum::addHTTPGetParams (string &url)
+void CGroupHTMLForum::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 {
- 	ucstring user_name = UserEntity->getDisplayName ();
+ 	ucstring user_name = UserEntity->getLoginName ();
 	const SGuild &guild = CGuildManager::getInstance()->getGuild();
 	string	gname = guild.Name.toUtf8();
 
@@ -83,9 +83,9 @@ void CGroupHTMLForum::addHTTPGetParams (string &url)
 
 // ***************************************************************************
 
-void CGroupHTMLForum::addHTTPPostParams (HTAssocList *formfields)
+void CGroupHTMLForum::addHTTPPostParams (HTAssocList *formfields, bool /*trustedDomain*/)
 {
-	ucstring user_name = UserEntity->getDisplayName ();
+	ucstring user_name = UserEntity->getLoginName ();
 	const SGuild &guild = CGuildManager::getInstance()->getGuild();
 	string	gname = guild.Name.toUtf8();
 
@@ -115,12 +115,13 @@ string	CGroupHTMLForum::home ()
 
 void CGroupHTMLForum::handle ()
 {
-	// Do nothing if WebServer is not initialized
+/*	// Do nothing if WebServer is not initialized
 	if (!WebServer.empty())
 	{
 		Home = WebServer+"forum.php";
 		CGroupHTML::handle ();
 	}
+*/
 }
 
 // ***************************************************************************
diff --git a/code/ryzom/client/src/interface_v3/group_html_forum.h b/code/ryzom/client/src/interface_v3/group_html_forum.h
index 8458609c6..fe233fecc 100644
--- a/code/ryzom/client/src/interface_v3/group_html_forum.h
+++ b/code/ryzom/client/src/interface_v3/group_html_forum.h
@@ -39,8 +39,8 @@ public:
 	~CGroupHTMLForum();
 
 	// From CGroupHTML
-	virtual void addHTTPGetParams (std::string &url);
-	virtual void addHTTPPostParams (HTAssocList *formfields);
+	virtual void addHTTPGetParams (std::string &url, bool trustedDomain);
+	virtual void addHTTPPostParams (HTAssocList *formfields, bool trustedDomain);
 	virtual std::string	home();
 	virtual void handle ();
 
diff --git a/code/ryzom/client/src/interface_v3/group_html_mail.cpp b/code/ryzom/client/src/interface_v3/group_html_mail.cpp
index ecc62367b..d527f0879 100644
--- a/code/ryzom/client/src/interface_v3/group_html_mail.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html_mail.cpp
@@ -50,9 +50,9 @@ CGroupHTMLMail::~CGroupHTMLMail()
 
 // ***************************************************************************
 
-void CGroupHTMLMail::addHTTPGetParams (string &url)
+void CGroupHTMLMail::addHTTPGetParams (string &url, bool /*trustedDomain*/)
 {
-	ucstring user_name = UserEntity->getDisplayName ();
+	ucstring user_name = UserEntity->getLoginName ();
 	url += ((url.find('?') != string::npos) ? "&" : "?") +
 		string("shard=") + toString(CharacterHomeSessionId) +
 		string("&user_login=") + user_name.toString() +
@@ -62,9 +62,9 @@ void CGroupHTMLMail::addHTTPGetParams (string &url)
 
 // ***************************************************************************
 
-void CGroupHTMLMail::addHTTPPostParams (HTAssocList *formfields)
+void CGroupHTMLMail::addHTTPPostParams (HTAssocList *formfields, bool /*trustedDomain*/)
 {
-	ucstring user_name = UserEntity->getDisplayName ();
+	ucstring user_name = UserEntity->getLoginName ();
 	HTParseFormInput(formfields, ("shard="+toString(CharacterHomeSessionId)).c_str());
 	HTParseFormInput(formfields, ("user_login="+user_name.toString()).c_str());
 	HTParseFormInput(formfields, ("session_cookie="+NetMngr.getLoginCookie().toString()).c_str());
@@ -85,11 +85,12 @@ string	CGroupHTMLMail::home ()
 void CGroupHTMLMail::handle ()
 {
 	// Do nothing if WebServer is not initialized
-	if (!WebServer.empty())
+/*	if (!WebServer.empty())
 	{
 		Home = WebServer+"mailbox.php";
 		CGroupHTML::handle ();
 	}
+*/
 }
 
 // ***************************************************************************
diff --git a/code/ryzom/client/src/interface_v3/group_html_mail.h b/code/ryzom/client/src/interface_v3/group_html_mail.h
index bb72a3b78..51f363c3c 100644
--- a/code/ryzom/client/src/interface_v3/group_html_mail.h
+++ b/code/ryzom/client/src/interface_v3/group_html_mail.h
@@ -39,8 +39,8 @@ public:
 	~CGroupHTMLMail();
 
 	// From CGroupHTML
-	virtual void addHTTPGetParams (std::string &url);
-	virtual void addHTTPPostParams (HTAssocList *formfields);
+	virtual void addHTTPGetParams (std::string &url, bool trustedDomain);
+	virtual void addHTTPPostParams (HTAssocList *formfields, bool trustedDomain);
 	virtual std::string	home();
 	virtual void handle ();
 
diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.cpp b/code/ryzom/client/src/interface_v3/group_html_webig.cpp
index 5c9a423f3..38b92a8e2 100644
--- a/code/ryzom/client/src/interface_v3/group_html_webig.cpp
+++ b/code/ryzom/client/src/interface_v3/group_html_webig.cpp
@@ -20,6 +20,7 @@
 #include "nel/misc/xml_auto_ptr.h"
 #include "../client_cfg.h"
 #include "../user_entity.h"
+#include "../entities.h"
 #include "interface_manager.h"
 
 // used for login cookie to be sent to the web server
@@ -55,7 +56,7 @@ static string getWebAuthKey()
 	// authkey = <sharid><name><cid><cookie>
 	uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
 	string rawKey = toString(CharacterHomeSessionId) +
-		UserEntity->getDisplayName().toString() +
+		UserEntity->getLoginName().toString() +
 		toString(cid) +
 		NetMngr.getLoginCookie().toString();
 	string key = getMD5((const uint8*)rawKey.c_str(), (uint32)rawKey.size()).toString();
@@ -64,18 +65,72 @@ static string getWebAuthKey()
 	return key;
 }
 
-void addWebIGParams (string &url)
+void addWebIGParams (string &url, bool trustedDomain)
 {
 	if(!UserEntity || !NetMngr.getLoginCookie().isValid()) return;
 
 	uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
 	url += ((url.find('?') != string::npos) ? "&" : "?") +
 		string("shardid=") + toString(CharacterHomeSessionId) +
-		string("&name=") + UserEntity->getDisplayName().toUtf8() +
-		string("&cid=") + toString(cid) + 
-		string("&authkey=") + getWebAuthKey() +
-		string("&ig=1") +
-		string("&lang=") + CI18N::getCurrentLanguageCode();
+		string("&name=") + UserEntity->getLoginName().toUtf8() +
+		string("&lang=") + CI18N::getCurrentLanguageCode() +
+		string("&datasetid=") + toString(UserEntity->dataSetId()) +
+		string("&ig=1");
+	if (trustedDomain)
+	{
+		url += string("&cid=") + toString(cid) +
+		string("&authkey=") + getWebAuthKey();
+		
+		if (url.find('$') != string::npos)
+		{
+			strFindReplace(url, "$gender$", GSGENDER::toString(UserEntity->getGender()));
+			strFindReplace(url, "$displayName$", UserEntity->getDisplayName().toString());
+			strFindReplace(url, "$posx$", toString(UserEntity->pos().x));
+			strFindReplace(url, "$posy$", toString(UserEntity->pos().y));
+			strFindReplace(url, "$posz$", toString(UserEntity->pos().z));
+			strFindReplace(url, "$post$", toString(atan2(UserEntity->front().y, UserEntity->front().x)));
+			
+			// Target fields
+			const char *dbPath = "UI:VARIABLES:TARGET:SLOT";
+			CInterfaceManager *im = CInterfaceManager::getInstance();
+			CCDBNodeLeaf *node = im->getDbProp(dbPath, false);
+			if (node && (uint8)node->getValue32() != (uint8) CLFECOMMON::INVALID_SLOT)
+			{
+				CEntityCL *target = EntitiesMngr.entity((uint) node->getValue32());
+				if (target)
+				{
+					strFindReplace(url, "$tdatasetid$", toString(target->dataSetId()));
+					strFindReplace(url, "$tdisplayName$", target->getDisplayName().toString());
+					strFindReplace(url, "$tposx$", toString(target->pos().x));
+					strFindReplace(url, "$tposy$", toString(target->pos().y));
+					strFindReplace(url, "$tposz$", toString(target->pos().z));
+					strFindReplace(url, "$tpost$", toString(atan2(target->front().y, target->front().x)));
+					strFindReplace(url, "$tsheet$", target->sheetId().toString());
+					string type;
+					if (target->isFauna())
+						type = "fauna";
+					else if (target->isNPC())
+						type = "npc";
+					else if (target->isPlayer())
+						type = "player";
+					else if (target->isUser())
+						type = "user";
+					strFindReplace(url, "$ttype$", target->sheetId().toString());
+				}
+				else
+				{
+					strFindReplace(url, "$tdatasetid$", "");
+					strFindReplace(url, "$tdisplayName$", "");
+					strFindReplace(url, "$tposx$", "");
+					strFindReplace(url, "$tposy$", "");
+					strFindReplace(url, "$tposz$", "");
+					strFindReplace(url, "$tpost$", "");
+					strFindReplace(url, "$tsheet$", "");
+					strFindReplace(url, "$ttype$", "");
+				}
+			}
+		}
+	}
 }
 
 // ***************************************************************************
@@ -204,7 +259,7 @@ struct CWebigNotificationThread : public NLMISC::IRunnable
 		while (true)
 		{
 			string url = "http://"+ClientCfg.WebIgMainDomain+"/start/index.php?app=notif&rnd="+randomString();
-			addWebIGParams(url);
+			addWebIGParams(url, true);
 			get(url);
 			nlSleep(10*60*1000);
 		}
@@ -231,53 +286,100 @@ void startWebigNotificationThread()
 
 
 // ***************************************************************************
-NLMISC_REGISTER_OBJECT(CViewBase, CGroupHTMLWebIG, std::string, "webig_html");
+NLMISC_REGISTER_OBJECT(CViewBase, CGroupHTMLAuth, std::string, "auth_html");
 
-CGroupHTMLWebIG::CGroupHTMLWebIG(const TCtorParam &param)
+CGroupHTMLAuth::CGroupHTMLAuth(const TCtorParam &param)
 : CGroupHTML(param)
 {
-	startWebigNotificationThread();
 }
 
 // ***************************************************************************
 
-CGroupHTMLWebIG::~CGroupHTMLWebIG()
+CGroupHTMLAuth::~CGroupHTMLAuth()
 {
 }
 
-void CGroupHTMLWebIG::addHTTPGetParams (string &url)
+void CGroupHTMLAuth::addHTTPGetParams (string &url, bool trustedDomain)
 {
-	addWebIGParams(url);
+	addWebIGParams(url, trustedDomain);
 }
 
 // ***************************************************************************
 
-void CGroupHTMLWebIG::addHTTPPostParams (HTAssocList *formfields)
+void CGroupHTMLAuth::addHTTPPostParams (HTAssocList *formfields, bool trustedDomain)
 {
 	if(!UserEntity) return;
 
 	uint32 cid = NetMngr.getLoginCookie().getUserId() * 16 + PlayerSelectedSlot;
 	HTParseFormInput(formfields, ("shardid="+toString(CharacterHomeSessionId)).c_str());
-	HTParseFormInput(formfields, ("name="+UserEntity->getDisplayName().toUtf8()).c_str());
-	HTParseFormInput(formfields, ("cid="+toString(cid)).c_str());
-	HTParseFormInput(formfields, ("authkey="+getWebAuthKey()).c_str());
-	HTParseFormInput(formfields, "ig=1");
+	HTParseFormInput(formfields, ("name="+UserEntity->getLoginName().toUtf8()).c_str());
 	HTParseFormInput(formfields, ("lang="+CI18N::getCurrentLanguageCode()).c_str());
+	HTParseFormInput(formfields, "ig=1");
+	if (trustedDomain)
+	{
+		HTParseFormInput(formfields, ("cid="+toString(cid)).c_str());
+		HTParseFormInput(formfields, ("authkey="+getWebAuthKey()).c_str());
+	}
 }
 
 // ***************************************************************************
 
-string CGroupHTMLWebIG::home ()
+string CGroupHTMLAuth::home ()
 {
 	return Home;
 }
 
 // ***************************************************************************
 
-void CGroupHTMLWebIG::handle ()
+void CGroupHTMLAuth::handle ()
 {
-//	Home = "http://atys.ryzom.com/start/index.php";
 	CGroupHTML::handle ();
 }
 
 // ***************************************************************************
+// ***************************************************************************
+
+
+// ***************************************************************************
+NLMISC_REGISTER_OBJECT(CViewBase, CGroupHTMLWebIG, std::string, "webig_html");
+
+CGroupHTMLWebIG::CGroupHTMLWebIG(const TCtorParam &param)
+: CGroupHTMLAuth(param)
+{
+	startWebigNotificationThread();
+}
+
+// ***************************************************************************
+
+CGroupHTMLWebIG::~CGroupHTMLWebIG()
+{
+}
+
+// ***************************************************************************
+
+void CGroupHTMLWebIG::addHTTPGetParams (string &url, bool trustedDomain)
+{
+	CGroupHTMLAuth::addHTTPGetParams(url, trustedDomain);
+}
+
+// ***************************************************************************
+
+void CGroupHTMLWebIG::addHTTPPostParams (HTAssocList *formfields, bool trustedDomain)
+{
+	CGroupHTMLAuth::addHTTPPostParams(formfields, trustedDomain);
+}
+
+// ***************************************************************************
+
+string CGroupHTMLWebIG::home ()
+{
+	return Home;
+}
+
+// ***************************************************************************
+
+void CGroupHTMLWebIG::handle ()
+{
+	CGroupHTMLAuth::handle ();
+}
+
diff --git a/code/ryzom/client/src/interface_v3/group_html_webig.h b/code/ryzom/client/src/interface_v3/group_html_webig.h
index 15485d7dc..5967f671d 100644
--- a/code/ryzom/client/src/interface_v3/group_html_webig.h
+++ b/code/ryzom/client/src/interface_v3/group_html_webig.h
@@ -20,10 +20,32 @@
 #include "nel/misc/types_nl.h"
 #include "group_html.h"
 
+/**
+* Auth HTML group
+*/
+class CGroupHTMLAuth : public CGroupHTML
+{
+public:
+
+	// Constructor
+	CGroupHTMLAuth(const TCtorParam &param);
+	~CGroupHTMLAuth();
+
+	// From CGroupHTML
+	virtual void addHTTPGetParams (std::string &url, bool trustedDomain);
+	virtual void addHTTPPostParams (HTAssocList *formfields, bool trustedDomain);
+	virtual std::string	home();
+	virtual void handle ();
+
+private:
+
+};
+
+
 /**
 * WebIG HTML group
 */
-class CGroupHTMLWebIG : public CGroupHTML
+class CGroupHTMLWebIG : public CGroupHTMLAuth
 {
 public:
 
@@ -31,9 +53,9 @@ public:
 	CGroupHTMLWebIG(const TCtorParam &param);
 	~CGroupHTMLWebIG();
 
-	// From CGroupHTML
-	virtual void addHTTPGetParams (std::string &url);
-	virtual void addHTTPPostParams (HTAssocList *formfields);
+	/// From CGroupHTMLAuth
+	virtual void addHTTPGetParams (std::string &url, bool trustedDomain);
+	virtual void addHTTPPostParams (HTAssocList *formfields, bool trustedDomain);
 	virtual std::string	home();
 	virtual void handle ();
 
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
index 957fa5b0f..cf5abc872 100644
--- a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
+++ b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.cpp
@@ -974,6 +974,132 @@ void CGroupInSceneBubbleManager::dynChatOpen (uint32 nBotUID, uint32 nBotName, c
 	UserEntity->interlocutor( pChar->slot() );
 }
 
+// ***************************************************************************
+
+void CGroupInSceneBubbleManager::webIgChatOpen (uint32 nBotUID, string text, const vector<string> &strs, const vector<string> &links)
+{
+	CInterfaceManager *pIM = CInterfaceManager::getInstance();
+	// If the character doesn't exist in view field -> do not display the bubble
+
+	CEntityCL *pEntity = EntitiesMngr.getEntityByCompressedIndex(nBotUID);
+	CCharacterCL *pChar = dynamic_cast<CCharacterCL*>(pEntity);
+	if (pChar == NULL)
+	{
+		nlwarning("character probably too far");
+		return;
+	}
+
+	// Look if we get a bubble with this nBotUID ?
+	uint32 pos, j;
+	for (pos = 0; pos < _DynBubbles.size(); ++pos)
+	{
+		if (_DynBubbles[pos].BotUID == nBotUID)
+			break;
+	}
+
+	// If the bubble doesn't exist -> create
+	CGroupInSceneBubble *bubble = NULL;
+	string id;
+	if (pos == _DynBubbles.size())
+	{
+		uint32 i = 0;
+		while (getDynBubble(i) != NULL) i++;
+		id = "in_scene_webig_bubble_" + toString(i);
+		// Create the instance
+		std::vector<std::pair<std::string,std::string> > templateParams;
+		templateParams.push_back (std::pair<std::string,std::string>("id", id));
+
+		CInterfaceGroup *group = pIM->createGroupInstance ("webig_3dbulle_L", "ui:interface", templateParams);
+		if (group == NULL)
+		{
+			nlwarning("cannot create webig_3dbulle_L");
+			return;
+		}
+		// Link to the interface
+		pIM->addWindowToMasterGroup("ui:interface", group);
+		CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(pIM->getElementFromId("ui:interface"));
+		group->setParent(pRoot);
+		if (pRoot)
+			pRoot->addGroup (group);
+		group->setActive(false);
+
+		bubble = dynamic_cast<CGroupInSceneBubble*>(group);
+		if (bubble == NULL)
+		{
+			nlwarning("cannot cast to CGroupInSceneBubble");
+			return;
+		}
+		CDynBubble dynBubble;
+		dynBubble.BotName = 0;
+		dynBubble.BotUID = nBotUID;
+		dynBubble.Bubble = bubble;
+		_DynBubbles.push_back(dynBubble);
+	}
+	else
+	{
+		bubble = _DynBubbles[pos].Bubble;
+		// Remove from group to delete if in the same frame
+		for (j=0; j<_GroupToDelete.size(); j++)
+		if (_GroupToDelete[j] == bubble)
+		{
+			_GroupToDelete.erase(_GroupToDelete.begin()+j);
+			break;
+		}
+	}
+
+	// Update the bubble's texts
+
+	ucstring ucText;
+	ucText.fromUtf8(text);
+	bubble->setText(ucText);
+	id = bubble->getId() + ":header_opened:window:";
+	CViewText *pVT;
+	CCtrlLink *pCL;
+
+	_DynBubbles[pos].DescWaiting = 0;
+
+	for (j = 0; j < 8; ++j)
+	{
+		pVT = dynamic_cast<CViewText*>(bubble->getElement(id+"opt"+toString(j)));
+		if (pVT != NULL)
+		{
+			pVT->setActive(false);
+			pVT->setText(ucstring(""));
+		}
+		pCL = dynamic_cast<CCtrlLink*>(bubble->getElement(id+"optb"+toString(j)));
+		if (pCL != NULL) pCL->setActive(false);
+	}
+
+	for (j = 0; j < strs.size(); ++j)
+	{
+		string fullid = id+"opt"+toString(j);
+		pVT = dynamic_cast<CViewText*>(bubble->getElement(id+"opt"+toString(j)));
+		if (pVT != NULL)
+		{
+			pVT->setActive(true);
+			ucstring optionText;
+			optionText.fromUtf8(strs[j]);
+			pVT->setText(optionText);
+			pCL = dynamic_cast<CCtrlLink*>(bubble->getElement(id+"optb"+toString(j)));
+			if (pCL != NULL)
+			{
+				pCL->setActionOnLeftClick("browse");
+				pCL->setParamsOnLeftClick("name=ui:interface:web_transactions:content:html|show=0|url="+links[j]);
+				//pCL->setActionOnLeftClickParams("name=ui:interface:web_transactions:content:html|url="+links[j]);
+				pCL->setActive(true);
+
+			}
+		}
+	}
+
+	// Link bubble to the character
+	pChar->setBubble(bubble);
+
+	// Make the npc face the character
+	UserEntity->interlocutor( pChar->slot() );
+}
+
+
 uint32 CGroupInSceneBubbleManager::CDynBubble::getOptionStringId(uint option)
 {
 	if (!Bubble) return 0;
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.h b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.h
index 5e7cd4546..635e8c47e 100644
--- a/code/ryzom/client/src/interface_v3/group_in_scene_bubble.h
+++ b/code/ryzom/client/src/interface_v3/group_in_scene_bubble.h
@@ -64,6 +64,9 @@ public:
 	// Open a Dynamic Chat
 	void dynChatOpen (uint32 nBotUID, uint32 nBotName, const std::vector<uint32> &DynStrs);
 
+	// Open a Dynamic Chat from webig
+	void webIgChatOpen (uint32 nBotUID, std::string sBotName, const std::vector<std::string> &strs, const std::vector<std::string> &links);
+
 	// Close a Dynamic Chat
 	void dynChatClose (uint32 nBotUID);
 
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
index dcc3895f7..d9fa10707 100644
--- a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
+++ b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.cpp
@@ -97,7 +97,7 @@ CRGBA CGroupInSceneUserInfo::BarColorHPNegative = CRGBA(127, 32, 0);
 #define nlfsinfo2 if ( _Entity->isForageSource() ) nlinfo
 
 
-CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
+CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (CEntityCL *entity)
 {
 	// Get the interface manager
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
@@ -129,6 +129,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
 	bool forageSourceBarDisplayed= false;
 	bool needPvPLogo= false;
 	bool permanentContent = false;
+	bool rpTags = false;
 	bool displayMissionIcons = pIM->getDbProp("UI:SAVE:INSCENE:FRIEND:MISSION_ICON")->getValueBool();
 
 	// Names
@@ -136,6 +137,12 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
 	ucstring theTribeName;
 	ucstring entityName = entity->getDisplayName();
 	ucstring entityTitle = entity->getTitle();
+
+	ucstring entityTag1 = entity->getTag(1);
+	ucstring entityTag2 = entity->getTag(2);
+	ucstring entityTag3 = entity->getTag(3);
+	ucstring entityTag4 = entity->getTag(4);
+
 	string entityPermanentContent = entity->getPermanentStatutIcon();
 
 	// Active fields and bars
@@ -160,6 +167,8 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
 	}
 	else if(npcFriendAndNeutral)
 	{
+		string dbEntry;
+		getBarSettings( pIM, user, entity->isPlayer(), _friend, dbEntry, bars );
 		// For RoleMasters, merchants etc... must display name and function, and nothing else
 		for(uint i=0;i<NumBars;i++)
 			bars[i]= false;
@@ -168,6 +177,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
 		title= true;
 		guildName= false;
 		templateName = "in_scene_user_info";
+		rpTags = (!entityTag1.empty()  ||  !entityTag2.empty()  || !entityTag3.empty()  || !entityTag4.empty() ) && pIM->getDbProp(dbEntry+"RPTAGS")->getValueBool();
 	}
 	else
 	{
@@ -176,6 +186,7 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
 		getBarSettings( pIM, user, entity->isPlayer(), _friend, dbEntry, bars );
 		name = !entityName.empty() && pIM->getDbProp(dbEntry+"NAME")->getValueBool();
 		title = !entityTitle.empty() && pIM->getDbProp(dbEntry+"TITLE")->getValueBool();
+		rpTags = (!entityTag1.empty()  ||  !entityTag2.empty()  || !entityTag3.empty()  || !entityTag4.empty() ) && pIM->getDbProp(dbEntry+"RPTAGS")->getValueBool();
 		// if name is empty but not title, title is displayed as name
 		if (!title && entityName.empty() && !entityTitle.empty() && pIM->getDbProp(dbEntry+"NAME")->getValueBool())
 			title = true;
@@ -369,6 +380,26 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
 			else
 				stringSpace += textH;
 
+			if (rpTags)
+			{
+				CPlayerCL * pPlayer = dynamic_cast<CPlayerCL*>(entity);
+				CViewBitmap *bitmap;
+				if (pPlayer == NULL || (pPlayer != NULL && pPlayer->getPvpMode() & PVP_MODE::PvpFaction))
+				{
+					bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_1"));
+					if (bitmap)
+						bitmap->setTexture(entityTag1.toString());
+					bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_2"));
+					if (bitmap)
+						bitmap->setTexture(entityTag2.toString());
+				}
+				bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_3"));
+				if (bitmap)
+					bitmap->setTexture(entityTag3.toString());
+				bitmap = dynamic_cast<CViewBitmap*>(leftGroup->getView ("rp_logo_4"));
+				if (bitmap)
+					bitmap->setTexture(entityTag4.toString());
+			}
 
 			// Get the permanent content bitmap
 			if(permanentContent)
@@ -539,162 +570,96 @@ CGroupInSceneUserInfo *CGroupInSceneUserInfo::build (class CEntityCL *entity)
 						info->_MissionTarget = bitmap;
 				}
 
-				CViewBase * pvpCivLogo = info->getView ("pvp_faction_civ_logo");
-				CViewBase * pvpCultLogo = info->getView ("pvp_faction_cult_logo");
+				CViewBase * pvpFactionLogo = info->getView ("pvp_faction_logo");
+				CViewBase * pvpOutpostLogo = info->getView ("pvp_outpost_logo");
+				CViewBase * pvpDuelLogo = info->getView ("pvp_duel_logo");
 
 				CPlayerCL * pPlayer = dynamic_cast<CPlayerCL*>(entity);
 				if (pPlayer == NULL)
 					needPvPLogo = false;
 
-				// set or inactive pvp logos
-				bool needCivPvpLogo = needPvPLogo;
-				bool needCultPvpLogo = needPvPLogo;
 
-				if (pPlayer != NULL && needPvPLogo && pvpCivLogo && pvpCultLogo)
+				if (pPlayer != NULL && needPvPLogo)
 				{
-					uint8 civToDisplay = (uint8)(pPlayer->getClanCivMaxFame() & 0xFF);
-					uint8 cultToDisplay = (uint8)(pPlayer->getClanCultMaxFame() & 0xFF);
-
-					if (!entity->isUser())
+					if (pvpFactionLogo) 
 					{
-						bool civEnnemies = false;
-						for (uint8 i = 0; i < 4; i++)
+						pvpFactionLogo->setActive(true);
+						CViewBitmap * pvpFactionBitmap = dynamic_cast<CViewBitmap *>(pvpFactionLogo);
+						if( pvpFactionBitmap )
 						{
-							if ( (pPlayer->isPvpAlly(i) && UserEntity->isPvpEnnemy(i)) ||
-								 (pPlayer->isPvpEnnemy(i) && UserEntity->isPvpAlly(i)) )
+							if (user)
 							{
-								civEnnemies = true;
-								if ( civToDisplay == i)
-									break;
-								else
-									 civToDisplay = i;
-							}
-							
-							if (!civEnnemies)
-							{
-								if ( (pPlayer->isPvpAlly(i) && UserEntity->isPvpAlly(i)) ||
-									 (pPlayer->isPvpEnnemy(i) && UserEntity->isPvpEnnemy(i)) )
+								if (pPlayer->getPvpMode() & PVP_MODE::PvpChallenge)
 								{
-									if ( civToDisplay == i)
-										break;
+									pvpFactionBitmap->setTexture("ico_curse.tga");
+								}
+								else if (pPlayer->getPvpMode() & PVP_MODE::PvpFaction)
+								{
+									if (pPlayer->getPvpMode() & PVP_MODE::PvpZoneSafe)
+										pvpFactionBitmap->setTexture("pvp_neutral.tga");
 									else
-										 civToDisplay = i;
+										pvpFactionBitmap->setTexture("pvp_enemy_tag.tga");
+								}
+								else if (pPlayer->getPvpMode() & PVP_MODE::PvpFactionFlagged)
+								{
+									if (pPlayer->getPvpMode() & PVP_MODE::PvpSafe)
+										pvpFactionBitmap->setTexture("pvp_neutral.tga");
+									else
+										pvpFactionBitmap->setTexture("pvp_enemy_flag.tga");
 								}
-							}
-						}
-
-
-						for (uint8 i = 4; i < 7; i++)
-						{
-							if ( (pPlayer->isPvpAlly(i) && UserEntity->isPvpEnnemy(i)) ||
-								 (pPlayer->isPvpEnnemy(i) && UserEntity->isPvpAlly(i)) )
-							{
-								if ( cultToDisplay == i)
-									break;
-								else
-									 cultToDisplay = i;
-							}
-
-							if ( (pPlayer->isPvpAlly(i) && UserEntity->isPvpAlly(i)) ||
-								 (pPlayer->isPvpEnnemy(i) && UserEntity->isPvpEnnemy(i)) )
-							{
-								if ( cultToDisplay == i)
-									break;
-								else
-									 cultToDisplay = i;
-							}
-						}
-					}
-
-					if ((pPlayer->getPvpMode() & PVP_MODE::PvpFaction) || (pPlayer->getPvpMode() & PVP_MODE::PvpFactionFlagged))
-					{
-						CViewBitmap * pvpCivLogoBmp = dynamic_cast<CViewBitmap *>(pvpCivLogo);
-						if( pvpCivLogoBmp )
-						{
-							if (pPlayer->isPvpAlly(civToDisplay))
-							{
-								if (pPlayer->isPvpRanger())
-									pvpCivLogoBmp->setTexture("pvp_ally_ranger.tga");
-								else
-									pvpCivLogoBmp->setTexture("pvp_ally_"+toString(civToDisplay)+".tga");
-							}
-							else if (pPlayer->isPvpEnnemy(civToDisplay))
-							{
-								if (pPlayer->isPvpMarauder())
-									pvpCivLogoBmp->setTexture("pvp_enemy_marauder.tga");
 								else
-									pvpCivLogoBmp->setTexture("pvp_enemy_"+toString(civToDisplay)+".tga");
+									pvpFactionLogo->setActive(false);
 							}
 							else
 							{
-								needCivPvpLogo = false;
-							}
-						}
-
-						CViewBitmap * pvpCultLogoBmp = dynamic_cast<CViewBitmap *>(pvpCultLogo);
-						if( pvpCultLogoBmp )
-						{
-							if (pPlayer->isPvpAlly(cultToDisplay))
-							{
-								if (pPlayer->isPvpPrimas())
-									pvpCultLogoBmp->setTexture("pvp_ally_primas.tga");
+								if (pPlayer->getPvpMode() & PVP_MODE::PvpChallenge)
+									pvpFactionBitmap->setTexture("ico_curse.tga");
+								else if (pPlayer->isNeutralPVP())
+									pvpFactionBitmap->setTexture("pvp_neutral.tga");
+								else if (pPlayer->isAlly() && (pPlayer->getPvpMode() & PVP_MODE::PvpFactionFlagged))
+									pvpFactionBitmap->setTexture("pvp_ally_flag.tga");
+								else if (pPlayer->isAlly() && (pPlayer->getPvpMode() & PVP_MODE::PvpFaction))
+									pvpFactionBitmap->setTexture("pvp_ally_tag.tga");
+								else if (pPlayer->isEnemy() && (pPlayer->getPvpMode() & PVP_MODE::PvpFactionFlagged))
+									pvpFactionBitmap->setTexture("pvp_enemy_flag.tga");
+								else if (pPlayer->isEnemy() && (pPlayer->getPvpMode() & PVP_MODE::PvpFaction))
+									pvpFactionBitmap->setTexture("pvp_enemy_tag.tga");
+								else if (pPlayer->getPvpMode() & PVP_MODE::PvpFactionFlagged)
+									pvpFactionBitmap->setTexture("pvp_enemy_flag.tga");
+								else if (pPlayer->getPvpMode() & PVP_MODE::PvpFaction)
+									pvpFactionBitmap->setTexture("pvp_enemy_tag.tga");
 								else
-									pvpCultLogoBmp->setTexture("pvp_ally_"+toString(cultToDisplay)+".tga");
-							}
-							else if (pPlayer->isPvpEnnemy(cultToDisplay))
-							{
-								if (pPlayer->isPvpTrytonist())
-									pvpCultLogoBmp->setTexture("pvp_enemy_trytonist.tga");
-								else
-									pvpCultLogoBmp->setTexture("pvp_enemy_"+toString(cultToDisplay)+".tga");
-							}
-							else
-							{
-								needCultPvpLogo = false;
+									pvpFactionLogo->setActive(false);
 							}
 						}
 					}
-					else 
-					{
-						needCivPvpLogo = false;
-						needCultPvpLogo = false;
-					}
-				
-					CViewBase * pvpOutpostLogo = info->getView ("pvp_outpost_logo");
+									
 					if (pvpOutpostLogo)
 					{
-						if( pPlayer->getOutpostId() == 0 )
-						{
+						if( pPlayer->getOutpostId() != 0 )
+							pvpOutpostLogo->setActive(true);
+						else
 							pvpOutpostLogo->setActive(false);
-						}
 					}
-
-					CViewBase * pvpDuelLogo = info->getView ("pvp_duel_logo");
+	
 					if (pvpDuelLogo)
 					{
-						if( !(pPlayer->getPvpMode()&PVP_MODE::PvpDuel || pPlayer->getPvpMode()&PVP_MODE::PvpChallenge) )
-						{
+						if( pPlayer->getPvpMode()&PVP_MODE::PvpDuel )
+							pvpDuelLogo->setActive(true);
+						else
 							pvpDuelLogo->setActive(false);
-						}
 					}
+
 				}
 				else
 				{
-					CViewBase * pvpOutpostLogo = info->getView ("pvp_outpost_logo");
+					if (pvpFactionLogo)
+						pvpFactionLogo->setActive(false);
 					if (pvpOutpostLogo)
 						pvpOutpostLogo->setActive(false);
-
-					CViewBase * pvpDuelLogo = info->getView ("pvp_duel_logo");
 					if (pvpDuelLogo)
-					pvpDuelLogo->setActive(false);
+						pvpDuelLogo->setActive(false);
 				}
-
-				if (pvpCivLogo)
-					pvpCivLogo->setActive(needCivPvpLogo);
-
-				if (pvpCultLogo)
-					pvpCultLogo->setActive(needCultPvpLogo);
-
 			}
 
 			// No bar and no string ?
diff --git a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.h b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.h
index 8622e38d2..69cd13847 100644
--- a/code/ryzom/client/src/interface_v3/group_in_scene_user_info.h
+++ b/code/ryzom/client/src/interface_v3/group_in_scene_user_info.h
@@ -93,9 +93,9 @@ protected:
 	static NLMISC::CRGBA BarColorHPNegative;
 
 	// Node user leaf
-	static CCDBNodeLeaf	*_Value;
-	static CCDBNodeLeaf	*_ValueBegin;
-	static CCDBNodeLeaf	*_ValueEnd;
+	static NLMISC::CCDBNodeLeaf	*_Value;
+	static NLMISC::CCDBNodeLeaf	*_ValueBegin;
+	static NLMISC::CCDBNodeLeaf	*_ValueEnd;
 
 	// Special guild
 	bool		_NeedGuildNameId;
diff --git a/code/ryzom/client/src/interface_v3/group_map.h b/code/ryzom/client/src/interface_v3/group_map.h
index 09974152d..b192b0c2f 100644
--- a/code/ryzom/client/src/interface_v3/group_map.h
+++ b/code/ryzom/client/src/interface_v3/group_map.h
@@ -35,7 +35,9 @@
 
 
 class CContinent;
+namespace NLMISC{
 class CCDBNodeLeaf;
+}
 class CWorldSheet;
 class CCtrlQuad;
 struct SMap;
@@ -425,8 +427,8 @@ private:
 		// have the texts been received for mission targets ?
 		std::vector<bool>	_MissionTargetTextReceived;
 		// ptr on db leaf for coordinates of special landmarks
-		CCDBNodeLeaf		*_TargetPos;
-		CCDBNodeLeaf		*_HomePos;
+		NLMISC::CCDBNodeLeaf		*_TargetPos;
+		NLMISC::CCDBNodeLeaf		*_HomePos;
 		// Animals State for landMarks
 		std::vector<NLMISC::CSmartPtr<CAnimalPositionState> >	_AnimalPosStates;
 		// Teammate State for landMarks
diff --git a/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.h b/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.h
index 0e5735088..26099f8e3 100644
--- a/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.h
+++ b/code/ryzom/client/src/interface_v3/group_phrase_skill_filter.h
@@ -53,12 +53,12 @@ private:
 private:
 
 	// observer to know that brick family are modified
-	struct CBrickFamilyObs : public ICDBNode::IPropertyObserver
+	struct CBrickFamilyObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 		CGroupPhraseSkillFilter			*Owner;
 		BRICK_FAMILIES::TBrickFamily	BrickFamily;
 
-		virtual void update (ICDBNode *node);
+		virtual void update (NLMISC::ICDBNode *node);
 	};
 	friend struct CBrickFamilyObs;
 	CBrickFamilyObs		_BrickFamilyObs[BRICK_FAMILIES::NbFamilies];
diff --git a/code/ryzom/client/src/interface_v3/group_skills.h b/code/ryzom/client/src/interface_v3/group_skills.h
index 3fa9cb25f..e486ae098 100644
--- a/code/ryzom/client/src/interface_v3/group_skills.h
+++ b/code/ryzom/client/src/interface_v3/group_skills.h
@@ -51,10 +51,10 @@ private:
 private:
 
 	// observer to know that skills are modified
-	struct CSkillsObs : public ICDBNode::IPropertyObserver
+	struct CSkillsObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 		CGroupSkills *Owner;
-		virtual void update (ICDBNode *node);
+		virtual void update (NLMISC::ICDBNode *node);
 	} _SkillsObs;
 	friend struct CSkillsObs;
 
diff --git a/code/ryzom/client/src/interface_v3/group_table.cpp b/code/ryzom/client/src/interface_v3/group_table.cpp
index f31d5c6ac..378c33be5 100644
--- a/code/ryzom/client/src/interface_v3/group_table.cpp
+++ b/code/ryzom/client/src/interface_v3/group_table.cpp
@@ -55,6 +55,9 @@ CGroupCell::CGroupCell(const TCtorParam &param)
 	IgnoreMaxWidth = false;
 	IgnoreMinWidth = false;
 	AddChildW = false;
+	_UserTexture = false;
+	_TextureTiled = false;
+	_TextureScaled = false;
 	setEnclosedGroupDefaultParams();
 	addGroup (Group);
 }
@@ -200,20 +203,62 @@ void CGroupCell::draw ()
 	}
 
 	// Draw the background
-	if (BgColor.A != 0)
+	if (_UserTexture || BgColor.A != 0)
 	{
 		CViewRenderer &rVR = pIM->getViewRenderer();
-		CRGBA finalColor;
-		finalColor.modulateFromColor (BgColor, pIM->getGlobalColor());
-
-		// Get the parent table
-		if (getParent ())
+		if (_UserTexture)
 		{
-			CGroupTable *table = static_cast<CGroupTable*> (getParent ());
-			finalColor.A = (uint8) (((uint16) table->CurrentAlpha * (uint16) finalColor.A) >> 8);
+			CRGBA col;
+			if (BgColor.A == 0 )
+				col = CRGBA(255,255,255,255);
+			else
+				col = BgColor;
+				
+			
+			if (_TextureScaled && !_TextureTiled)
+			{
+				rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal,
+										_WReal, _HReal,
+										0, false,
+										_TextureId,
+										col );
+			}
+			else
+			{
+				if (!_TextureTiled)
+				{
+					rVR.draw11RotFlipBitmap (_RenderLayer, _XReal, _YReal,
+											0, false,
+											_TextureId,
+											col);
+				}
+				else
+				{
+					rVR.drawRotFlipBitmapTiled(_RenderLayer, _XReal, _YReal,
+											   _WReal, _HReal,
+												0, false,
+											   _TextureId,
+											   0,
+											   col);
+				}
+			}
+			
 		}
+		else
+		{
+			CRGBA finalColor;
+			finalColor.modulateFromColor (BgColor, pIM->getGlobalColor());
 
-		rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, _HReal, 0, false, rVR.getBlankTextureId(), finalColor);
+			// Get the parent table
+			if (getParent ())
+			{
+				CGroupTable *table = static_cast<CGroupTable*> (getParent ());
+				finalColor.A = (uint8) (((uint16) table->CurrentAlpha * (uint16) finalColor.A) >> 8);
+			}
+			
+			//nlinfo("Blank Texture");
+			rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, _HReal, 0, false, rVR.getBlankTextureId(), finalColor);
+		}
 	}
 
 	CInterfaceGroup::draw ();
@@ -231,6 +276,40 @@ sint32 CGroupCell::getMinUsedW() const
 	return Group->getMinUsedW();
 }
 
+
+// ----------------------------------------------------------------------------
+void CGroupCell::setTexture(const std::string & TxName)
+{
+	if (TxName.empty() || TxName == "none")
+	{
+		_UserTexture = false;
+		nlinfo("Set no texture");
+	}
+	else
+	{
+		nlinfo("Set texture to cell : %s", TxName.c_str());
+		_UserTexture = true;
+		_TextureId.setTexture (TxName.c_str (), 0, 0, -1, -1, false);
+	}
+}
+
+// ----------------------------------------------------------------------------
+void CGroupCell::setTextureTile(bool tiled)
+{
+	if (tiled)
+		nlinfo("Set texture is Tiled");
+	_TextureTiled = tiled;
+}
+
+// ----------------------------------------------------------------------------
+void CGroupCell::setTextureScale(bool scaled)
+{
+	if (scaled)
+		nlinfo("Set texture is Scaled : %s");
+	_TextureScaled = scaled;
+}
+
+
 // ----------------------------------------------------------------------------
 NLMISC_REGISTER_OBJECT(CViewBase, CGroupTable, std::string, "table");
 
diff --git a/code/ryzom/client/src/interface_v3/group_table.h b/code/ryzom/client/src/interface_v3/group_table.h
index 08cdad11e..888d6dbe3 100644
--- a/code/ryzom/client/src/interface_v3/group_table.h
+++ b/code/ryzom/client/src/interface_v3/group_table.h
@@ -80,6 +80,12 @@ public:
 	// The cell color
 	NLMISC::CRGBA	BgColor;
 
+	// Texture
+	CViewRenderer::CTextureId	_TextureId;	/// Accelerator
+	bool _UserTexture;
+	bool _TextureTiled;
+	bool _TextureScaled;
+
 	// Alignment
 	TAlign	Align;
 	TVAlign	VAlign;
@@ -90,6 +96,11 @@ public:
 
 	// The cell is nowrap
 	bool	NoWrap;
+
+	void setTexture(const std::string & TxName);
+	void setTextureTile(bool tiled);
+	void setTextureScale(bool scaled);
+
 private:
 	void setEnclosedGroupDefaultParams();
 };
diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp
index c9bb4ec01..44e3cd6fc 100644
--- a/code/ryzom/client/src/interface_v3/guild_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp
@@ -358,15 +358,60 @@ void CGuildManager::update()
 		// If all is valid no more need update and if guild is opened update the interface
 		if (bAllValid)
 		{
+			CCDBNodeLeaf* node = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB", false);
+			if (node && node->getValueBool())
+			{
+				// See if we need to show any online/offline messages
+				static vector<SGuildMember> CachedGuildMembers;
+				ucstring onlineMessage = CI18N::get("uiPlayerOnline");
+				ucstring offlineMessage = CI18N::get("uiPlayerOffline");
+
+				for (uint i = 0; i < _GuildMembers.size(); ++i)
+				{
+					for (uint j = 0; j < CachedGuildMembers.size(); ++j)
+					{
+						// Status change is from offline to online/abroad online or vice versa. 
+						TCharConnectionState prevState = CachedGuildMembers[j].Online;
+						TCharConnectionState curState = _GuildMembers[i].Online;
+						bool showMsg = (prevState != curState) && 
+									   (CachedGuildMembers[j].Name == _GuildMembers[i].Name) &&
+									   (prevState == ccs_offline || curState == ccs_offline);
+
+						if (showMsg)
+						{
+							ucstring msg = (_GuildMembers[i].Online != ccs_offline) ? onlineMessage : offlineMessage;
+							strFindReplace(msg, "%s", _GuildMembers[i].Name);
+							string cat = getStringCategory(msg, msg);
+							map<string, CClientConfig::SSysInfoParam>::const_iterator it;
+							NLMISC::CRGBA col = CRGBA::Yellow;
+							it = ClientCfg.SystemInfoParams.find(toLower(cat));
+							if (it != ClientCfg.SystemInfoParams.end())
+							{
+								col = it->second.Color;
+							}
+							bool dummy;
+							PeopleInterraction.ChatInput.Guild.displayMessage(msg, col, 2, &dummy);
+							break;
+						}
+					}
+				}
+
+				CachedGuildMembers.clear();
+				for (uint i = 0; i < _GuildMembers.size(); ++i)
+				{
+					CachedGuildMembers.push_back(_GuildMembers[i]);
+				}
+			}
+
 			// Search for UserEntity to find our own grade
 			if ((UserEntity != NULL) && (_GuildMembers.size() > 0))
 			{
 				uint i;
 				_Grade = EGSPD::CGuildGrade::Member;
-				string sUserName = strlwr(UserEntity->getEntityName().toString());
+				ucstring sUserName = toLower(UserEntity->getEntityName());
 				for (i = 0; i < _GuildMembers.size(); ++i)
 				{
-					if (strlwr(_GuildMembers[i].Name.toString()) == sUserName)
+					if (toLower(_GuildMembers[i].Name) == sUserName)
 					{
 						_Grade = _GuildMembers[i].Grade;
 						break;
@@ -627,20 +672,14 @@ void CGuildManager::initDBObservers()
 	CInterfaceManager *pIM = CInterfaceManager::getInstance();
 
 	// add an observer on the whole guild
-	CCDBNodeBranch *pGuild = pIM->getDbBranch("SERVER:GUILD");
-	if (pGuild != NULL)
-		pGuild->addBranchObserver(&_DBObs);
+	pIM->addBranchObserver( "SERVER:GUILD", &_DBObs );
 
 	// add an observer on members only => need to update all
-	CCDBNodeBranch *pGuildMembers = pIM->getDbBranch("SERVER:GUILD:MEMBERS");
-	if (pGuildMembers != NULL)
-		pGuildMembers->addBranchObserver(&_DBObsMembers);
+	pIM->addBranchObserver("SERVER:GUILD:MEMBERS", &_DBObsMembers);
 
 	// observer on ascencors
 	Ascensors.setListType(CHugeListObs::Ascensor);
-	CCDBNodeBranch *pAscensor = pIM->getDbBranch("SERVER:ASCENSOR");
-	if (pAscensor != NULL)
-		pAscensor->addBranchObserver(&Ascensors);
+	pIM->addBranchObserver("SERVER:ASCENSOR", &Ascensors);
 }
 
 // ***************************************************************************
@@ -1048,10 +1087,26 @@ class CAHGuildSheetSetLeader : public IActionHandler
 {
 	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
 	{
-		sendMsgSetGrade(EGSPD::CGuildGrade::Leader);
+		CInterfaceManager *pIM = CInterfaceManager::getInstance();
+
+		// Ask if they are sure
+		pIM->validMessageBox(CInterfaceManager::QuestionIconMsg, CI18N::get("uiQSetLeader"), "guild_member_do_change_leader");
 	}
 };
 REGISTER_ACTION_HANDLER (CAHGuildSheetSetLeader, "guild_member_chg_to_leader");
+		
+// ***************************************************************************
+class CAHGuildSheetSetLeaderConfirm : public IActionHandler
+{
+	virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
+	{
+		// Leadership change confirmed
+		sendMsgSetGrade(EGSPD::CGuildGrade::Leader);
+	}
+};
+REGISTER_ACTION_HANDLER (CAHGuildSheetSetLeaderConfirm, "guild_member_do_change_leader");
+
+
 
 // ***************************************************************************
 class CAHGuildSheetSetHighOfficer : public IActionHandler
diff --git a/code/ryzom/client/src/interface_v3/guild_manager.h b/code/ryzom/client/src/interface_v3/guild_manager.h
index 17b21c74c..20f51ca70 100644
--- a/code/ryzom/client/src/interface_v3/guild_manager.h
+++ b/code/ryzom/client/src/interface_v3/guild_manager.h
@@ -22,7 +22,7 @@
 #include "nel/misc/types_nl.h"
 #include "obs_huge_list.h"
 #include "dbgroup_list_sheet_text.h"
-#include "../cdb.h"
+#include "nel/misc/cdb.h"
 #include "game_share/guild_grade.h"
 #include "game_share/misc_const.h"
 
@@ -209,15 +209,15 @@ private:
 
 
 	// Database management stuff
-	class CDBObs : public ICDBNode::IPropertyObserver
+	class CDBObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
-	class CDBObsMembers : public ICDBNode::IPropertyObserver
+	class CDBObsMembers : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
 
 	CDBObs			_DBObs;
diff --git a/code/ryzom/client/src/interface_v3/interface_config.h b/code/ryzom/client/src/interface_v3/interface_config.h
index 6dfeb603f..9e3becba6 100644
--- a/code/ryzom/client/src/interface_v3/interface_config.h
+++ b/code/ryzom/client/src/interface_v3/interface_config.h
@@ -22,7 +22,9 @@
 #include "nel/misc/stream.h"
 
 class CGroupContainer;
+namespace NLMISC{
 class CCDBNodeLeaf;
+}
 
 /**
  * interface config
@@ -111,8 +113,8 @@ public:
 		// ------------------------------
 		void serial (NLMISC::IStream &f);
 		// ------------------------------
-		void setFrom (CCDBNodeLeaf *pNL);
-		void setTo (CCDBNodeLeaf *pNL);
+		void setFrom (NLMISC::CCDBNodeLeaf *pNL);
+		void setTo (NLMISC::CCDBNodeLeaf *pNL);
 	};
 
 	void dataBaseToStream (NLMISC::IStream &f);
diff --git a/code/ryzom/client/src/interface_v3/interface_ddx.cpp b/code/ryzom/client/src/interface_v3/interface_ddx.cpp
index 3e363225c..ff70ab120 100644
--- a/code/ryzom/client/src/interface_v3/interface_ddx.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_ddx.cpp
@@ -790,7 +790,8 @@ void CInterfaceDDX::updateRealtime(CCtrlBase *pSB, bool updateOnScrollEnd)
 		ClientCfg.IsInvalidated = true;
 	}
 
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	for (i = 0; i < _Parameters.size(); ++i)
 	{
diff --git a/code/ryzom/client/src/interface_v3/interface_ddx.h b/code/ryzom/client/src/interface_v3/interface_ddx.h
index 72d3f20c0..fbf05920e 100644
--- a/code/ryzom/client/src/interface_v3/interface_ddx.h
+++ b/code/ryzom/client/src/interface_v3/interface_ddx.h
@@ -52,7 +52,7 @@ public:
 	void updateRealtime(CCtrlBase *pSB, bool updateOnScrollEnd);
 
 	// Update all parameters to obey their preset (no op if no preset or if preset is Custom)
-	void updateParamPreset(CCDBNodeLeaf *presetChanged);
+	void updateParamPreset(NLMISC::CCDBNodeLeaf *presetChanged);
 
 	// set apply button can be pushed
 	void validateApplyButton();
@@ -90,7 +90,7 @@ private:
 		sint32	RTBackupValue;	// When canceling
 
 		// For ConfigFile widget only
-		CCDBNodeLeaf		*PresetDB;
+		NLMISC::CCDBNodeLeaf		*PresetDB;
 
 		// -----------------------
 		CParam()
@@ -128,16 +128,16 @@ private:
 	std::vector<CParam> _Parameters;
 
 	// For preset change
-	class CPresetObs : public ICDBNode::IPropertyObserver
+	class CPresetObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 		CInterfaceDDX		*Owner;
 
 		CPresetObs() : Owner(NULL) {}
 	};
 	CPresetObs					_PresetObs;
-	std::set<CCDBNodeLeaf*>		_PresetNodes;
+	std::set<NLMISC::CCDBNodeLeaf*>		_PresetNodes;
 
 	// reset the preset values according to parameters values
 	void	resetPreSet();
diff --git a/code/ryzom/client/src/interface_v3/interface_element.h b/code/ryzom/client/src/interface_v3/interface_element.h
index 24982cad2..0202618ba 100644
--- a/code/ryzom/client/src/interface_v3/interface_element.h
+++ b/code/ryzom/client/src/interface_v3/interface_element.h
@@ -361,7 +361,7 @@ public:
 	  */
 	virtual void forceOpen() { setActive(true); }
 
-	virtual void enableBlink(int /* numBlinks */ = 0) {}
+	virtual void enableBlink(uint /* numBlinks */ = 0) {}
 	virtual void disableBlink() {}
 	virtual bool getBlink() const { return false; }
 
diff --git a/code/ryzom/client/src/interface_v3/interface_expr.h b/code/ryzom/client/src/interface_v3/interface_expr.h
index 2ba26415e..33c6b70af 100644
--- a/code/ryzom/client/src/interface_v3/interface_expr.h
+++ b/code/ryzom/client/src/interface_v3/interface_expr.h
@@ -26,8 +26,11 @@
 #include "nel/misc/ucstring.h"
 #include "nel/misc/rgba.h"
 
-
+namespace NLMISC{
 class ICDBNode;
+class CCDBNodeLeaf;
+class CCDBNodeBranch;
+}
 
 
 struct CInterfaceExprUserType;
@@ -166,7 +169,7 @@ public:
 	  *              Node will only be inserted once, so we end up with a set of node (not ordered)
 	  * \param noFctCalls when set to true, the terminal function calls will not be made, so the evaluation is only used to see which database entries the expression depends on.
 	  */
-	static bool eval(const std::string &expr, CInterfaceExprValue &result, std::vector<ICDBNode *> *nodes = NULL, bool noFctCalls = false);
+	static bool eval(const std::string &expr, CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> *nodes = NULL, bool noFctCalls = false);
 
 	/** Build a tree from the given expression so that it can be evaluated quickly.
 	  * This is useful for a fixed expression that must be evaluated often
@@ -193,11 +196,11 @@ private:
 	/** eval the value of a single expression
 	  * \return position to the next valid character
 	  */
-	static const char *evalExpr(const char *expr, CInterfaceExprValue &result, std::vector<ICDBNode *> *nodes, bool noFctCalls);
-	static const char *evalFct(const char *expr,CInterfaceExprValue &result,std::vector<ICDBNode *> *nodes, bool noFctCalls);
-	static const char *evalDBEntry(const char *expr,CInterfaceExprValue &result,std::vector<ICDBNode *> *nodes);
+	static const char *evalExpr(const char *expr, CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> *nodes, bool noFctCalls);
+	static const char *evalFct(const char *expr,CInterfaceExprValue &result,std::vector<NLMISC::ICDBNode *> *nodes, bool noFctCalls);
+	static const char *evalDBEntry(const char *expr,CInterfaceExprValue &result,std::vector<NLMISC::ICDBNode *> *nodes);
 public:
-	static const char *unpackDBentry(const char *expr, std::vector<ICDBNode *> *nodes, std::string &dest, bool *hasIndirections = NULL);
+	static const char *unpackDBentry(const char *expr, std::vector<NLMISC::ICDBNode *> *nodes, std::string &dest, bool *hasIndirections = NULL);
 
 	/** Build tree of a single expression
 	  * \return position to the next valid character
diff --git a/code/ryzom/client/src/interface_v3/interface_expr_node.cpp b/code/ryzom/client/src/interface_v3/interface_expr_node.cpp
index 319c3fc9f..0d999f407 100644
--- a/code/ryzom/client/src/interface_v3/interface_expr_node.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_expr_node.cpp
@@ -18,8 +18,12 @@
 
 #include "stdpch.h"
 #include "interface_expr_node.h"
-#include "../cdb_leaf.h"
-#include "../cdb_branch.h"
+#include "nel/misc/cdb_leaf.h"
+#include "nel/misc/cdb_branch.h"
+
+using NLMISC::ICDBNode;
+using NLMISC::CCDBNodeBranch;
+using NLMISC::CCDBNodeLeaf;
 
 // *******************************************************************************************************
 void CInterfaceExprNodeValue::eval(CInterfaceExprValue &result)
diff --git a/code/ryzom/client/src/interface_v3/interface_expr_node.h b/code/ryzom/client/src/interface_v3/interface_expr_node.h
index 7327c4ada..6dc30f8b8 100644
--- a/code/ryzom/client/src/interface_v3/interface_expr_node.h
+++ b/code/ryzom/client/src/interface_v3/interface_expr_node.h
@@ -33,9 +33,9 @@ public:
 	// eval result of expression, and eventually get the nodes the epression depends on
 	virtual void eval(CInterfaceExprValue &result) = 0;
 	// The same, but get db nodes the expression depends on (appended to vector)
-	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<ICDBNode *> &nodes) = 0;
+	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> &nodes) = 0;
 	// Get dependencies of the node (appended to vector)
-	virtual void getDepends(std::vector<ICDBNode *> &nodes) = 0;
+	virtual void getDepends(std::vector<NLMISC::ICDBNode *> &nodes) = 0;
 };
 
 
@@ -48,8 +48,8 @@ public:
 	CInterfaceExprValue Value;
 public:
 	virtual void eval(CInterfaceExprValue &result);
-	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<ICDBNode *> &nodes);
-	virtual void getDepends(std::vector<ICDBNode *> &nodes);
+	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> &nodes);
+	virtual void getDepends(std::vector<NLMISC::ICDBNode *> &nodes);
 };
 
 // *******************************************************************************************************
@@ -63,8 +63,8 @@ public:
 	std::vector<CInterfaceExprNode *> Params;
 public:
 	virtual void eval(CInterfaceExprValue &result);
-	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<ICDBNode *> &nodes);
-	virtual void getDepends(std::vector<ICDBNode *> &nodes);
+	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> &nodes);
+	virtual void getDepends(std::vector<NLMISC::ICDBNode *> &nodes);
 	virtual ~CInterfaceExprNodeValueFnCall();
 };
 
@@ -74,11 +74,11 @@ public:
 class CInterfaceExprNodeDBLeaf : public CInterfaceExprNode
 {
 public:
-	class CCDBNodeLeaf *Leaf;
+	class NLMISC::CCDBNodeLeaf *Leaf;
 public:
 	virtual void eval(CInterfaceExprValue &result);
-	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<ICDBNode *> &nodes);
-	virtual void getDepends(std::vector<ICDBNode *> &nodes);
+	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> &nodes);
+	virtual void getDepends(std::vector<NLMISC::ICDBNode *> &nodes);
 };
 
 // *******************************************************************************************************
@@ -87,11 +87,11 @@ public:
 class CInterfaceExprNodeDBBranch : public CInterfaceExprNode
 {
 public:
-	class CCDBNodeBranch *Branch;
+	class NLMISC::CCDBNodeBranch *Branch;
 public:
 	virtual void eval(CInterfaceExprValue &result);
-	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<ICDBNode *> &nodes);
-	virtual void getDepends(std::vector<ICDBNode *> &nodes);
+	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> &nodes);
+	virtual void getDepends(std::vector<NLMISC::ICDBNode *> &nodes);
 };
 
 // *******************************************************************************************************
@@ -104,8 +104,8 @@ public:
 	std::string Expr;
 public:
 	virtual void eval(CInterfaceExprValue &result);
-	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<ICDBNode *> &nodes);
-	virtual void getDepends(std::vector<ICDBNode *> &nodes);
+	virtual void evalWithDepends(CInterfaceExprValue &result, std::vector<NLMISC::ICDBNode *> &nodes);
+	virtual void getDepends(std::vector<NLMISC::ICDBNode *> &nodes);
 };
 
 
diff --git a/code/ryzom/client/src/interface_v3/interface_group.h b/code/ryzom/client/src/interface_v3/interface_group.h
index 5079c1899..432176704 100644
--- a/code/ryzom/client/src/interface_v3/interface_group.h
+++ b/code/ryzom/client/src/interface_v3/interface_group.h
@@ -176,13 +176,17 @@ public:
 	void	setRightClickHandlerParams(const std::string &params) { _AHOnRightClickParams = params; }
 	void	setOnActiveHandler(const std::string &h) { _AHOnActive = getAH(h,_AHOnActiveParams); }
 	void	setOnActiveParams(const std::string &p) { _AHOnActiveParams = p; }
-	std::string getOnActiveParams() const { return _AHOnActiveParams; }
 	void	setOnDeactiveHandler(const std::string &h) { _AHOnDeactive = getAH(h,_AHOnDeactiveParams); }
 	void	setOnDeactiveParams(const std::string &p) { _AHOnDeactiveParams = p; }
-	std::string	getOnDeactiveParams() const { return _AHOnDeactiveParams; }
 
 	const std::string &getLeftClickHandler() const { return getAHName(_AHOnLeftClick); }
 	const std::string &getLeftClickHandlerParams() const { return _AHOnLeftClickParams; }
+	const std::string &getRightClickHandler() const { return getAHName(_AHOnRightClick); }
+	const std::string &getRightClickHandlerParams() const { return _AHOnRightClickParams; }
+	const std::string &getOnActiveHandler() const { return getAHName(_AHOnActive); }
+	const std::string &getOnActiveParams() const { return _AHOnActiveParams; }
+	const std::string &getOnDeactiveHandler() const { return getAHName(_AHOnDeactive); }
+	const std::string &getOnDeactiveParams() const { return _AHOnDeactiveParams; }
 
 	// find a sub view/ctrl/group in this group from its id
 	int luaFind(CLuaState &ls);
@@ -205,8 +209,18 @@ public:
 		REFLECT_LUA_METHOD("delGroup", luaDelGroup);
 		REFLECT_LUA_METHOD("getNumGroups", luaGetNumGroups);
 		REFLECT_LUA_METHOD("getGroup", luaGetGroup);
+		REFLECT_STRING ("left_click", getLeftClickHandler, setLeftClickHandler);
+		REFLECT_STRING ("right_click", getRightClickHandler, setRightClickHandler);
+		REFLECT_STRING ("left_click_params", getLeftClickHandlerParams, setLeftClickHandlerParams);
+		REFLECT_STRING ("right_click_params", getRightClickHandlerParams, setRightClickHandlerParams);
+		REFLECT_STRING ("on_active", getOnActiveHandler, setOnActiveHandler);
 		REFLECT_STRING ("on_active_params", getOnActiveParams, setOnActiveParams);
+		REFLECT_STRING ("on_deactive", getOnDeactiveHandler, setOnDeactiveHandler);
 		REFLECT_STRING ("on_deactive_params", getOnDeactiveParams, setOnDeactiveParams);
+		REFLECT_STRING ("on_enter", getAHOnEnter, setAHOnEnter);
+		REFLECT_STRING ("on_enter_params", getAHOnEnterParams, setAHOnEnterParams);
+		REFLECT_STRING ("on_escape", getAHOnEscape, setAHOnEscape);
+		REFLECT_STRING ("on_escape_params", getAHOnEscapeParams, setAHOnEscapeParams);
 		REFLECT_SINT32 ("ofsx", getOfsX, setOfsX);
 		REFLECT_SINT32 ("ofsy", getOfsY, setOfsY);
 		REFLECT_BOOL("child_resize_w", getResizeFromChildW, setResizeFromChildW);
diff --git a/code/ryzom/client/src/interface_v3/interface_link.cpp b/code/ryzom/client/src/interface_v3/interface_link.cpp
index e8f583bea..7ab34ac8c 100644
--- a/code/ryzom/client/src/interface_v3/interface_link.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_link.cpp
@@ -24,7 +24,7 @@
 #include "interface_manager.h"
 #include "interface_expr_node.h"
 #include "reflect.h"
-#include "../cdb_branch.h"
+#include "nel/misc/cdb_branch.h"
 
 using namespace std;
 using namespace NLMISC;
@@ -130,7 +130,20 @@ static bool affect(const CInterfaceExprValue &value, CInterfaceElement &destElem
 	return true;
 }
 
+CInterfaceLink::CInterfaceLinkUpdater::CInterfaceLinkUpdater()
+{
+	CInterfaceManager::getInstance()->addFlushObserver( this );
+}
 
+CInterfaceLink::CInterfaceLinkUpdater::~CInterfaceLinkUpdater()
+{
+	CInterfaceManager::getInstance()->removeFlushObserver( this );
+}
+
+void CInterfaceLink::CInterfaceLinkUpdater::onObserverCallFlush()
+{
+	CInterfaceLink::updateTrigeredLinks();
+}
 
 /////////////
 // MEMBERS //
@@ -263,7 +276,7 @@ void CInterfaceLink::createObservers(const TNodeVect &nodes)
 		else
 		{
 			CCDBNodeBranch *br = static_cast<CCDBNodeBranch *>(*it);
-			br->addBranchObserver(this);
+			CInterfaceManager::getInstance()->addBranchObserver( br, this );
 		}
 	}
 }
@@ -281,7 +294,7 @@ void CInterfaceLink::removeObservers(const TNodeVect &nodes)
 		else
 		{
 			CCDBNodeBranch *br = static_cast<CCDBNodeBranch *>(*it);
-			br->removeBranchObserver(this);
+			CInterfaceManager::getInstance()->removeBranchObserver( br, this );
 		}
 	}
 }
diff --git a/code/ryzom/client/src/interface_v3/interface_link.h b/code/ryzom/client/src/interface_v3/interface_link.h
index 5b7e6d9fb..c83ef5034 100644
--- a/code/ryzom/client/src/interface_v3/interface_link.h
+++ b/code/ryzom/client/src/interface_v3/interface_link.h
@@ -19,12 +19,10 @@
 #ifndef CL_INTERFACE_LINK_H
 #define CL_INTERFACE_LINK_H
 
-#include "../cdb.h"
-#include "nel/misc/smart_ptr.h"
+#include "nel/misc/cdb_branch.h"
+#include "nel/misc/cdb_branch_observing_handler.h"
 
 class CInterfaceElement;
-class ICDBNode;
-class CCDBNodeLeaf;
 class CReflectedProperty;
 class CInterfaceExprValue;
 class CInterfaceGroup;
@@ -48,7 +46,7 @@ class CInterfaceExprNode;
   * \author Nevrax France
   * \date 2002
   */
-class CInterfaceLink : public ICDBNode::IPropertyObserver
+class CInterfaceLink : public NLMISC::ICDBNode::IPropertyObserver
 {
 public:
 	#ifdef NL_DEBUG
@@ -66,6 +64,17 @@ public:
 		  */
 		bool affect(const CInterfaceExprValue &value);
 	};
+
+
+	/// Updates triggered interface links when triggered by the observed branch
+	class CInterfaceLinkUpdater : public NLMISC::CCDBBranchObservingHandler::IBranchObserverCallFlushObserver
+	{
+	public:
+		CInterfaceLinkUpdater();
+		~CInterfaceLinkUpdater();
+		void onObserverCallFlush();
+	};
+
 public:
 	CInterfaceLink();
 	~CInterfaceLink(); // this object should only be destroyed by a CInterfaceElement
@@ -111,7 +120,7 @@ private:
 	typedef std::list<CInterfaceLink *> TLinkList;
 	typedef NLMISC::CSmartPtr<CInterfaceLink> TLinkSmartPtr;
 	typedef std::vector<TLinkSmartPtr> TLinkVect;
-	typedef std::vector<ICDBNode *> TNodeVect;
+	typedef std::vector<NLMISC::ICDBNode *> TNodeVect;
 private:
 	std::vector<CTarget>         _Targets;
 	TNodeVect					 _ObservedNodes;
@@ -153,7 +162,7 @@ private:
 	  * This doesn't update the node directly, but mark it as 'triggered'
 	  * The node is really updated during the call to 'updateTrigeredLinks()'
 	  */
-	virtual void update(ICDBNode *node);
+	virtual void update(NLMISC::ICDBNode *node);
 	void    createObservers(const TNodeVect &nodes);
 	void    removeObservers(const TNodeVect &nodes);
 	// debug : check that there are as many targets as reference to a link
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.cpp b/code/ryzom/client/src/interface_v3/interface_manager.cpp
index b002e019f..12f08577e 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_manager.cpp
@@ -101,6 +101,8 @@
 #include "../client_chat_manager.h"		// for emotes
 #include "../entities.h"
 
+#include "../../common/src/game_share/ryzom_database_banks.h"
+
 #include "chat_text_manager.h"
 #include "../npc_icon.h"
 
@@ -251,12 +253,13 @@ int CInterfaceManager::DebugTrackGroupsGetId( CInterfaceGroup *pIG )
 
 // ------------------------------------------------------------------------------------------------
 CInterfaceManager::CInterfaceManager( NL3D::UDriver *driver, NL3D::UTextContext *textcontext ) :
-_ViewRenderer( driver, textcontext )
+_ViewRenderer( driver, textcontext ),
+NLMISC::CCDBManager( "ROOT", NB_CDB_BANKS )
 {
 	this->driver = driver;
 	this->textcontext = textcontext;
 	_Instance = this;
-	_DbRootNode = new CCDBNodeBranch("ROOT");
+	interfaceLinkUpdater = new CInterfaceLink::CInterfaceLinkUpdater();
 	_ScreenW = _ScreenH = 0;
 	_LastInGameScreenW = _LastInGameScreenH = 0;
 	_Pointer = NULL;
@@ -354,10 +357,11 @@ CInterfaceManager::~CInterfaceManager()
 	_Templates.clear();
 	_Instance = NULL;
 
-	if (_DbRootNode)
+	if (_Database)
 	{
-		delete _DbRootNode;
-		_DbRootNode = NULL;
+		_Database->clear();
+		delete _Database;
+		_Database = NULL;
 	}
 
 	// release the local string mapper
@@ -366,6 +370,8 @@ CInterfaceManager::~CInterfaceManager()
 
 	// release the database observers
 	releaseServerToLocalAutoCopyObservers();
+	delete interfaceLinkUpdater;
+	interfaceLinkUpdater = NULL;
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -501,7 +507,7 @@ void CInterfaceManager::uninitLogin()
 	CInterfaceLink::removeAllLinks();
 
 	ICDBNode::CTextId textId("UI");
-	_DbRootNode->removeNode(textId);
+	_Database->removeNode(textId);
 
 	{
 		uninitActions();
@@ -596,7 +602,7 @@ void CInterfaceManager::uninitOutGame()
 
 	disableModalWindow();
 
-	//_DbRootNode->display("");
+	//_Database->display("");
 	CBotChatManager::getInstance()->setCurrPage(NULL);
 
 	CInterfaceItemEdition::getInstance()->setCurrWindow(NULL);
@@ -626,7 +632,7 @@ void CInterfaceManager::uninitOutGame()
 	//nlinfo ("%d seconds for removeAllLinks", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
 	initStart = ryzomGetLocalTime ();
 	ICDBNode::CTextId textId("UI");
-	_DbRootNode->removeNode(textId);
+	_Database->removeNode(textId);
 	//nlinfo ("%d seconds for removeNode", (uint32)(ryzomGetLocalTime ()-initStart)/1000);
 
 	// Init the action manager
@@ -827,6 +833,21 @@ void CInterfaceManager::initInGame()
 	{
 		gc->setTarget(gc->getSavedTarget());
 	}
+
+	CCDBNodeLeaf *node = getDbProp("UI:SAVE:CHATLOG_STATE", false);
+	if (node)
+	{
+		_LogState = (node->getValue32() != 0);
+	}
+
+	if (_LogState)
+	{
+		displaySystemInfo(CI18N::get("uiLogTurnedOn"));
+	}
+	else
+	{
+		displaySystemInfo(CI18N::get("uiLogTurnedOff"));
+	}
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -1145,7 +1166,7 @@ void CInterfaceManager::uninitInGame1 ()
 
 	// remove DB entry
 	ICDBNode::CTextId textId("UI");
-	_DbRootNode->removeNode(textId);
+	_Database->removeNode(textId);
 
 	// Uninit the action manager
 	{
@@ -1221,7 +1242,8 @@ void CInterfaceManager::updateFrameEvents()
 		CInterfaceAnim *pIA = vTmp[i];
 		pIA->update();
 	}
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::flushObserverCalls();
 	//
 	// Next : Test if we have to remove anims
 	for (i = 0; i < (sint)_ActiveAnims.size(); ++i)
@@ -1234,7 +1256,8 @@ void CInterfaceManager::updateFrameEvents()
 		}
 	}
 	//
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	// Handle waiting texts from server
 	processServerIDString();
@@ -1326,7 +1349,8 @@ void CInterfaceManager::updateFrameEvents()
 	{
 		(*it)->handleEvent(clockTick);
 	}
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
  	// Update SPhrase manager
  	CSPhraseManager	*pPM= CSPhraseManager::getInstance();
@@ -1971,8 +1995,9 @@ void CInterfaceManager::drawViews(NL3D::UCamera camera)
 		H_AUTO ( RZ_Interface_DrawViews_Setup )
 
 		_ViewRenderer.activateWorldSpaceMatrix (false);
-
-		CCDBNodeBranch::flushObserversCalls();
+		
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// If an element has captured the keyboard, make sure it is alway visible (all parent windows active)
 		if (_CaptureKeyboard != NULL)
@@ -2044,7 +2069,8 @@ void CInterfaceManager::drawViews(NL3D::UCamera camera)
 			To minimize texture swapping, we first sort per Window, then we sort per layer, then we render per Global Texture.
 			Computed String are rendered in on big drawQuads at last part of each layer
 		*/
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 		//
 		for (uint32 nMasterGroup = 0; nMasterGroup < _MasterGroups.size(); nMasterGroup++)
 		{
@@ -2094,8 +2120,9 @@ void CInterfaceManager::drawViews(NL3D::UCamera camera)
 
 	{
 		H_AUTO ( RZ_Interface_DrawViews_After )
-
-		CCDBNodeBranch::flushObserversCalls();
+		
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// draw the special over extend text
 		drawOverExtendViewText();
@@ -2143,7 +2170,8 @@ void CInterfaceManager::drawViews(NL3D::UCamera camera)
 		driver->setMatrixMode2D11();
 
 		// flush obs
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 	}
 }
 
@@ -2376,7 +2404,8 @@ void CInterfaceManager::drawContextHelp ()
 			if(newCtrl)
 			{
 				// get the text
-				newCtrl->getContextHelpToolTip(_ContextHelpText);
+				//newCtrl->getContextHelpToolTip(_ContextHelpText);
+				newCtrl->getContextHelp(_ContextHelpText);
 				// UserDefined context help
 				if( !newCtrl->getContextHelpActionHandler().empty() )
 				{
@@ -2710,7 +2739,8 @@ bool CInterfaceManager::handleEvent (const CEventDescriptor& event)
 				if(_CaptureKeyboard && _CaptureKeyboard->getRootWindow()==tw)
 				{
 					bool result = _CaptureKeyboard->handleEvent(event);
-					CCDBNodeBranch::flushObserversCalls();
+					IngameDbMngr.flushObserverCalls();
+					CInterfaceManager::getInstance()->flushObserverCalls();
 					return result;
 				}
 				else
@@ -2767,7 +2797,8 @@ bool CInterfaceManager::handleEvent (const CEventDescriptor& event)
 		if (_CaptureKeyboard != NULL && !handled)
 		{
 			bool result = _CaptureKeyboard->handleEvent(event);
-			CCDBNodeBranch::flushObserversCalls();
+			IngameDbMngr.flushObserverCalls();
+			CInterfaceManager::getInstance()->flushObserverCalls();
 			return result;
 		}
 	}
@@ -3027,7 +3058,8 @@ bool CInterfaceManager::handleEvent (const CEventDescriptor& event)
 		handled|= _MouseOverWindow;
 	}
 
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 	// event handled?
 	return handled;
 }
@@ -3302,13 +3334,13 @@ void CInterfaceManager::updateAllLocalisedElements()
 // ------------------------------------------------------------------------------------------------
 bool CInterfaceManager::addDBObserver (ICDBNode::IPropertyObserver* observer, ICDBNode::CTextId   id)
 {
-	return _DbRootNode->addObserver(observer, id);
+	return _Database->addObserver(observer, id);
 }
 
 // ------------------------------------------------------------------------------------------------
 bool CInterfaceManager::removeDBObserver (ICDBNode::IPropertyObserver* observer, ICDBNode::CTextId  id)
 {
-	return _DbRootNode->removeObserver(observer, id);
+	return _Database->removeObserver(observer, id);
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -3406,19 +3438,13 @@ sint32		CInterfaceManager::getDbValue32 (const std::string & name)
 // ------------------------------------------------------------------------------------------------
 CCDBNodeLeaf* CInterfaceManager::getDbProp(const std::string & name, bool bCreate)
 {
-	if (name.empty()) return NULL;
-	CCDBNodeLeaf *pDBNL = NULL;
-	pDBNL = dynamic_cast<CCDBNodeLeaf*>(_DbRootNode->getNode( ICDBNode::CTextId(name), bCreate ));
-	return pDBNL;
+	return getDbLeaf( name, bCreate );
 }
 
 // ------------------------------------------------------------------------------------------------
-CCDBNodeBranch *CInterfaceManager::getDbBranch(const std::string &name)
+void CInterfaceManager::delDbProp(const std::string & name)
 {
-	if (name.empty()) return NULL;
-	CCDBNodeBranch	*nodeBranch;
-	nodeBranch = dynamic_cast<CCDBNodeBranch*>(_DbRootNode->getNode( ICDBNode::CTextId(name), false ));
-	return nodeBranch;
+	delDbNode( name );
 }
 
 // ------------------------------------------------------------------------------------------------
@@ -4385,12 +4411,14 @@ void CInterfaceManager::displaySystemInfo(const ucstring &str, const string &cat
 		}
 	}
 
+	if (mode == CClientConfig::SSysInfoParam::Center || mode == CClientConfig::SSysInfoParam::CenterAround)
+		InSceneBubbleManager.addMessagePopupCenter(str, color);
+
 	// If over popup a string at the bottom of the screen
 	if ((mode == CClientConfig::SSysInfoParam::Over) || (mode == CClientConfig::SSysInfoParam::OverOnly))
 		InSceneBubbleManager.addMessagePopup(str, color);
-	else if (mode == CClientConfig::SSysInfoParam::Center)
-		InSceneBubbleManager.addMessagePopupCenter(str, color);
-	else if (mode == CClientConfig::SSysInfoParam::Around && PeopleInterraction.AroundMe.Window)
+	else if ( (mode == CClientConfig::SSysInfoParam::Around || mode == CClientConfig::SSysInfoParam::CenterAround) 
+		&& PeopleInterraction.AroundMe.Window)
 		PeopleInterraction.ChatInput.AroundMe.displayMessage(str, color, 2);
 }
 
@@ -5643,7 +5671,7 @@ bool	CInterfaceManager::executeLuaScript(const std::string &luaScript, bool smal
 		std::string msg = e.luaWhat();
 		char filename[MAX_PATH];
 		char exceptionName[MAX_PATH];
-		int line;
+		uint32 line;
 		// Hamster: quick fix on AJM code but sscanf is still awfull
 		if (sscanf(msg.c_str(), "%s: %s.lua:%d:",exceptionName, filename, &line) == 3) // NB: test not exact here, but should work in 99,9 % of cases
 		{
@@ -5654,6 +5682,20 @@ bool	CInterfaceManager::executeLuaScript(const std::string &luaScript, bool smal
 		else	// AJM: handle the other 0.1% of cases
 		{
 			// Yoyo: seems that previous test doesn't work.... btw, must still print the message please...
+			std::vector<string> error;
+			splitString(msg.c_str(), ":", error);
+			if (error.size() > 3)
+			{
+				std::vector<string> contextList;
+				explode(luaScript, string("\n"), contextList);
+				fromString(error[2], line);
+				if (line >= 3 && contextList.size() >= line)
+					msg = error[0]+": \n>>> "+contextList[line-3]+"\n>>> "+contextList[line-2]+"\n>>> "+contextList[line-1]+"\nError:"+error[2]+": "+error[3];
+				else if (line >= 2 && contextList.size() >= line)
+					msg = error[0]+": \n>>>"+contextList[line-2]+"\n>>>"+contextList[line-1]+"\nError:"+error[2]+": "+error[3];
+				else if (line >= 1 && contextList.size() >= line)
+					msg = error[0]+": \n>>>"+contextList[line-1]+"\nError:"+error[2]+": "+error[3];
+			}
 			nlwarning(formatLuaErrorNlWarn(msg).c_str());
 			displaySystemInfo(formatLuaErrorSysInfo(msg));
 		}
@@ -5945,7 +5987,7 @@ void CInterfaceManager::createLocalBranch(const std::string &fileName, NLMISC::I
 			//Parse the parser output!!!
 			CCDBNodeBranch *localNode = new CCDBNodeBranch("LOCAL");
 			localNode->init( read.getRootNode (), progressCallBack );
-			_DbRootNode->attachChild(localNode,"LOCAL");
+			_Database->attachChild(localNode,"LOCAL");
 
 			// Create the observers for auto-copy SERVER->LOCAL of inventory
 			ServerToLocalAutoCopyInventory.init("INVENTORY");
@@ -6258,7 +6300,7 @@ bool CInterfaceManager::parseTokens(ucstring& ucstr)
 		// Get everything between the two "$"
 		size_t token_start_pos = start_pos + start_token.length();
 		size_t token_end_pos   = end_pos - end_token.length();
-		if (token_start_pos < token_end_pos)
+		if (token_start_pos > token_end_pos)
 		{
 			// Wrong formatting; give up on this one.
 			start_pos = end_pos;
@@ -6488,4 +6530,6 @@ void CInterfaceManager::setTextContext( NL3D::UTextContext *textcontext )
 {
 	this->textcontext = textcontext;
 	_ViewRenderer.setTextContext( textcontext );
-}
\ No newline at end of file
+}
+
+
diff --git a/code/ryzom/client/src/interface_v3/interface_manager.h b/code/ryzom/client/src/interface_v3/interface_manager.h
index 1400750b1..577edbda7 100644
--- a/code/ryzom/client/src/interface_v3/interface_manager.h
+++ b/code/ryzom/client/src/interface_v3/interface_manager.h
@@ -20,6 +20,7 @@
 #define NL_INTERFACE_MANAGER_H
 
 #include "nel/misc/types_nl.h"
+#include "nel/misc/cdb_manager.h"
 #include "nel/3d/u_texture.h"
 #include "nel/3d/u_text_context.h"
 #include "interface_group.h"
@@ -74,7 +75,7 @@ class CGroupMenu;
  * \author Nevrax France
  * \date 2002
  */
-class CInterfaceManager : public CInterfaceParser
+class CInterfaceManager : public CInterfaceParser, public NLMISC::CCDBManager
 {
 public:
 
@@ -228,11 +229,10 @@ public:
 
 
 	/// Get the root of the database
-	CCDBNodeBranch *getDB() const { return _DbRootNode; }
+	NLMISC::CCDBNodeBranch *getDB() const { return _Database; }
 	// yoyo: should avoid to try creating DbPropr with this system... very dangerous
-	CCDBNodeLeaf* getDbProp (const std::string & name, bool bCreate=true);
-	// get a Db Branch by its name. NULL if don't exist or not a branch (never try to create it)
-	CCDBNodeBranch *getDbBranch(const std::string &name);
+	NLMISC::CCDBNodeLeaf* getDbProp (const std::string & name, bool bCreate=true);
+	void delDbProp(const std::string & name);
 	// return the DB as an int32. return 0 if the DB does not exist (never create)
 	sint32			getDbValue32 (const std::string & name);
 
@@ -446,7 +446,7 @@ public:
 	 * \param id :  the text id of the element to observe
 	 * \return true if success
 	 */
-	bool addDBObserver (ICDBNode::IPropertyObserver* observer, ICDBNode::CTextId  id);
+	bool addDBObserver (NLMISC::ICDBNode::IPropertyObserver* observer, NLMISC::ICDBNode::CTextId  id);
 
 	/**
 	 * add an observer to a database entry
@@ -454,17 +454,17 @@ public:
 	 * \param id :  the text id of the element to observe
 	 * \return true if success
 	 */
-	bool addDBObserver (ICDBNode::IPropertyObserver* observer, const std::string& id)
+	bool addDBObserver (NLMISC::ICDBNode::IPropertyObserver* observer, const std::string& id)
 	{
-		return addDBObserver(observer, ICDBNode::CTextId(id));
+		return addDBObserver(observer, NLMISC::ICDBNode::CTextId(id));
 	}
 
 	/** remove the observer from the dataBase
 	 */
-	bool removeDBObserver (ICDBNode::IPropertyObserver* observer, ICDBNode::CTextId  id);
-	bool removeDBObserver (ICDBNode::IPropertyObserver* observer, const std::string& id)
+	bool removeDBObserver (NLMISC::ICDBNode::IPropertyObserver* observer, NLMISC::ICDBNode::CTextId  id);
+	bool removeDBObserver (NLMISC::ICDBNode::IPropertyObserver* observer, const std::string& id)
 	{
-		return removeDBObserver(observer, ICDBNode::CTextId(id));
+		return removeDBObserver(observer, NLMISC::ICDBNode::CTextId(id));
 	}
 
 	/// \name Global Interface Options
@@ -656,7 +656,7 @@ public:
 	uint8			getLocalSyncActionCounter() const {return _LocalSyncActionCounter;}
 	uint8			getLocalSyncActionCounterMask() const {return _LocalSyncActionCounterMask;}
 
-	bool			localActionCounterSynchronizedWith(CCDBNodeLeaf *leaf)
+	bool			localActionCounterSynchronizedWith(NLMISC::CCDBNodeLeaf *leaf)
 	{
 		if (!leaf) return false;
 		uint	srvVal= leaf->getValue32();
@@ -741,31 +741,31 @@ private:
 		void	release();
 
 		// When something in the SERVER DB changes
-		void	onServerChange(ICDBNode *serverNode);
+		void	onServerChange(NLMISC::ICDBNode *serverNode);
 		// When something in the LOCAL DB changes
-		void	onLocalChange(ICDBNode *localNode);
+		void	onLocalChange(NLMISC::ICDBNode *localNode);
 
 	private:
-		class CLocalDBObserver : public ICDBNode::IPropertyObserver
+		class CLocalDBObserver : public NLMISC::ICDBNode::IPropertyObserver
 		{
 		public:
 			CServerToLocalAutoCopy	&_Owner;
 			CLocalDBObserver(CServerToLocalAutoCopy	&owner) : _Owner(owner) {}
-			virtual void	update(ICDBNode *node)	{_Owner.onLocalChange(node);}
+			virtual void	update(NLMISC::ICDBNode *node)	{_Owner.onLocalChange(node);}
 		};
-		class CServerDBObserver : public ICDBNode::IPropertyObserver
+		class CServerDBObserver : public NLMISC::ICDBNode::IPropertyObserver
 		{
 		public:
 			CServerToLocalAutoCopy	&_Owner;
 			CServerDBObserver(CServerToLocalAutoCopy	&owner) : _Owner(owner) {}
-			virtual void	update(ICDBNode *node)	{_Owner.onServerChange(node);}
+			virtual void	update(NLMISC::ICDBNode *node)	{_Owner.onServerChange(node);}
 		};
 
 		// A node here is a pair Server<->Local
 		struct CNode
 		{
-			CCDBNodeLeaf	*ServerNode;
-			CCDBNodeLeaf	*LocalNode;
+			NLMISC::CCDBNodeLeaf	*ServerNode;
+			NLMISC::CCDBNodeLeaf	*LocalNode;
 			bool			InsertedInUpdateList;
 			CNode()
 			{
@@ -790,7 +790,7 @@ private:
 
 	private:
 		// Counter Node
-		CCDBNodeLeaf			*_ServerCounter;
+		NLMISC::CCDBNodeLeaf			*_ServerCounter;
 		// updaters
 		CLocalDBObserver		_LocalObserver;
 		CServerDBObserver		_ServerObserver;
@@ -806,7 +806,7 @@ private:
 		// List of nodes to update until next synchonized client-server counter
 		std::vector<CNode*>			_UpdateList;
 
-		void	buildRecursLocalLeaves(CCDBNodeBranch *branch, std::vector<CCDBNodeLeaf*> &leaves);
+		void	buildRecursLocalLeaves(NLMISC::CCDBNodeBranch *branch, std::vector<NLMISC::CCDBNodeLeaf*> &leaves);
 	};
 
 	// Infos about a modal window.
@@ -837,10 +837,10 @@ private:
 
 
 	// Database management stuff
-	class CDBLandmarkObs : public ICDBNode::IPropertyObserver
+	class CDBLandmarkObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode *node);
+		virtual void update(NLMISC::ICDBNode *node);
 	};
 
 	// EMOTES
@@ -862,22 +862,22 @@ private:
 // ------------------------------------------------------------------------------------------------
 public:
 	// cache and expose some commonly used db nodes
-	CCDBNodeBranch *_DBB_UI_DUMMY;
-	CCDBNodeLeaf *_DB_UI_DUMMY_QUANTITY;
-	CCDBNodeLeaf *_DB_UI_DUMMY_QUALITY;
-	CCDBNodeLeaf *_DB_UI_DUMMY_SHEET;
-	CCDBNodeLeaf *_DB_UI_DUMMY_NAMEID;
-	CCDBNodeLeaf *_DB_UI_DUMMY_ENCHANT;
-	CCDBNodeLeaf *_DB_UI_DUMMY_SLOT_TYPE;
-	CCDBNodeLeaf *_DB_UI_DUMMY_PHRASE;
-	CCDBNodeLeaf *_DB_UI_DUMMY_WORNED;
-	CCDBNodeLeaf *_DB_UI_DUMMY_PREREQUISIT_VALID;
-	CCDBNodeLeaf *_DB_UI_DUMMY_FACTION_TYPE;
+	NLMISC::CCDBNodeBranch *_DBB_UI_DUMMY;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_QUANTITY;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_QUALITY;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_SHEET;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_NAMEID;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_ENCHANT;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_SLOT_TYPE;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_PHRASE;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_WORNED;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_PREREQUISIT_VALID;
+	NLMISC::CCDBNodeLeaf *_DB_UI_DUMMY_FACTION_TYPE;
 
 private:
 
-	CCDBNodeLeaf *_CheckMailNode;
-	CCDBNodeLeaf *_CheckForumNode;
+	NLMISC::CCDBNodeLeaf *_CheckMailNode;
+	NLMISC::CCDBNodeLeaf *_CheckForumNode;
 	sint64 _UpdateWeatherTime;
 
 	// @}
@@ -912,7 +912,7 @@ private:
 	///the singleton's instance
 	static CInterfaceManager* _Instance;
 
-	CCDBNodeLeaf	   *_DescTextTarget;
+	NLMISC::CCDBNodeLeaf	   *_DescTextTarget;
 
 	// Capture
 	NLMISC::CRefPtr<CCtrlBase>	_CaptureKeyboard;
@@ -963,9 +963,6 @@ private:
 	NLMISC::CRGBA	_GlobalColor;
 	sint32			_LastInGameScreenW, _LastInGameScreenH; // Resolution used for last InGame interface
 
-	// root node for interfaces properties in the databases
-	CCDBNodeBranch *_DbRootNode;
-
 	// List of active Anims
 	std::vector<CInterfaceAnim*> _ActiveAnims;
 
@@ -1002,14 +999,14 @@ private:
 	void    restoreAllContainersBackupPosition();
 
 	// Some Node leaf
-	CCDBNodeLeaf *_NeutralColor;
-	CCDBNodeLeaf *_WarningColor;
-	CCDBNodeLeaf *_ErrorColor;
-	CCDBNodeLeaf *_RProp;
-	CCDBNodeLeaf *_GProp;
-	CCDBNodeLeaf *_BProp;
-	CCDBNodeLeaf *_AProp;
-	CCDBNodeLeaf *_AlphaRolloverSpeedDB;
+	NLMISC::CCDBNodeLeaf *_NeutralColor;
+	NLMISC::CCDBNodeLeaf *_WarningColor;
+	NLMISC::CCDBNodeLeaf *_ErrorColor;
+	NLMISC::CCDBNodeLeaf *_RProp;
+	NLMISC::CCDBNodeLeaf *_GProp;
+	NLMISC::CCDBNodeLeaf *_BProp;
+	NLMISC::CCDBNodeLeaf *_AProp;
+	NLMISC::CCDBNodeLeaf *_AlphaRolloverSpeedDB;
 
 	// The next ViewText to draw for Over
 	NLMISC::CRefPtr<CInterfaceElement>	_OverExtendViewText;
@@ -1070,6 +1067,8 @@ private:
 
 	NL3D::UDriver *driver;
 	NL3D::UTextContext *textcontext;
+	CInterfaceLink::CInterfaceLinkUpdater *interfaceLinkUpdater;
+
 };
 
 #endif // NL_INTERFACE_MANAGER_H
diff --git a/code/ryzom/client/src/interface_v3/interface_observer.h b/code/ryzom/client/src/interface_v3/interface_observer.h
index b90c84f6b..da508aeb7 100644
--- a/code/ryzom/client/src/interface_v3/interface_observer.h
+++ b/code/ryzom/client/src/interface_v3/interface_observer.h
@@ -30,7 +30,7 @@
  * \author Nevrax France
  * \date 2002
  */
-class IInterfaceObserver : public ICDBNode::IPropertyObserver
+class IInterfaceObserver : public NLMISC::ICDBNode::IPropertyObserver
 {
 public:
 
@@ -45,7 +45,7 @@ public:
 	/**
 	 * observer update
 	 */
-	virtual void update (CCDBNodeLeaf* leaf)=0;
+	virtual void update (NLMISC::CCDBNodeLeaf* leaf)=0;
 
 
 };
@@ -160,7 +160,7 @@ public:
 					return NULL;
 				}
 			}
-			if ( ! iMngr->addDBObserver(obs,ICDBNode::CTextId (data) ) )
+			if ( ! iMngr->addDBObserver(obs,NLMISC::ICDBNode::CTextId (data) ) )
 			{
 				return NULL;
 			}
diff --git a/code/ryzom/client/src/interface_v3/interface_parser.cpp b/code/ryzom/client/src/interface_v3/interface_parser.cpp
index c7c873196..6e93779ab 100644
--- a/code/ryzom/client/src/interface_v3/interface_parser.cpp
+++ b/code/ryzom/client/src/interface_v3/interface_parser.cpp
@@ -518,7 +518,7 @@ bool CInterfaceParser::parseInterface (const std::vector<std::string> & strings,
 {
 	bool	ok;
 
-	bool needCheck = checkInData;
+	bool needCheck = false;
 
 #if !FINAL_VERSION
 	needCheck = false;
@@ -555,10 +555,12 @@ bool CInterfaceParser::parseInterface (const std::vector<std::string> & strings,
 			string::size_type pos = filename.find ("@");
 			if (pos != string::npos)
 			{
-				std::string bigFilename = CBigFile::getInstance().getBigFileName(filename.substr(0, pos));
-				std::string path = "data/"+filename.substr(0, pos);
-
-				isInData = bigFilename.find(path) != std::string::npos;
+				vector<string> bigFilePaths;
+				CBigFile::getInstance().getBigFilePaths(bigFilePaths);
+				if (CBigFile::getInstance().getBigFileName(filename.substr(0, pos)) != "data/"+filename.substr(0, pos))
+					isInData = false;
+				else
+					isInData = true;
 			}
 
 			if ((needCheck && !isInData) || !file.open (CPath::lookup(firstFileName)))
@@ -4686,7 +4688,7 @@ bool	CInterfaceParser::loadLUA(const std::string &fileName, std::string &error)
 {
 	// get file
 
-	bool needCheck = true;
+	bool needCheck = false;
 
 	#if !FINAL_VERSION
 		needCheck = false;
@@ -4703,10 +4705,10 @@ bool	CInterfaceParser::loadLUA(const std::string &fileName, std::string &error)
 	std::string::size_type pos = pathName.find("@");
 	if (pos != string::npos)
 	{
-		std::string bigFilename = CBigFile::getInstance().getBigFileName(pathName.substr(0, pos));
-		std::string path = "data/"+pathName.substr(0, pos);
-
-		isInData = bigFilename.find(path) != std::string::npos;
+		if (CBigFile::getInstance().getBigFileName(pathName.substr(0, pos)) != "data/"+pathName.substr(0, pos))
+			isInData = false;
+		else
+			isInData = true;
 	}
 
 	if (needCheck && !isInData)
diff --git a/code/ryzom/client/src/interface_v3/interface_property.h b/code/ryzom/client/src/interface_v3/interface_property.h
index cec2c2815..06355f17a 100644
--- a/code/ryzom/client/src/interface_v3/interface_property.h
+++ b/code/ryzom/client/src/interface_v3/interface_property.h
@@ -22,9 +22,9 @@
 #include "nel/misc/types_nl.h"
 #include "nel/misc/rgba.h"
 
-#include "../cdb.h"
-#include "../cdb_leaf.h"
-#include "../cdb_branch.h"
+#include "nel/misc/cdb.h"
+#include "nel/misc/cdb_leaf.h"
+#include "nel/misc/cdb_branch.h"
 #include "../cdb_synchronised.h"
 
 
@@ -50,20 +50,20 @@ public:
 		_VolatileValue = NULL;
 	}
 
-	CCDBNodeLeaf* getNodePtr() const
+	NLMISC::CCDBNodeLeaf* getNodePtr() const
 	{
 		return _VolatileValue;
 	}
 
-	void setNodePtr(CCDBNodeLeaf *ptr)
+	void setNodePtr(NLMISC::CCDBNodeLeaf *ptr)
 	{
 		_VolatileValue = ptr;
 	}
 
 
 	bool link (const char *DBProp);
-	bool link( CCDBNodeLeaf *dbNode );
-	bool link( CCDBNodeBranch *dbNode, const std::string &leafId, CCDBNodeLeaf *defaultLeaf = NULL  );
+	bool link( NLMISC::CCDBNodeLeaf *dbNode );
+	bool link( NLMISC::CCDBNodeBranch *dbNode, const std::string &leafId, NLMISC::CCDBNodeLeaf *defaultLeaf = NULL  );
 
 	/// float operations
 	void setDouble (double value) {setSInt64((sint64&) value);}
@@ -99,7 +99,7 @@ public:
 
 private:
 	/// volatile value of the property (pointer to a leaf of the database)
-	CCDBNodeLeaf* _VolatileValue;
+	NLMISC::CCDBNodeLeaf* _VolatileValue;
 };
 
 #endif // NL_INTERFACE_PROPERTY_H
diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.cpp b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
index 9d20c0661..bb050520e 100644
--- a/code/ryzom/client/src/interface_v3/inventory_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/inventory_manager.cpp
@@ -17,16 +17,16 @@
 
 
 #include "stdpch.h"
-#include "../cdb_leaf.h"
-#include "../cdb_branch.h"
+#include "nel/misc/cdb_leaf.h"
+#include "nel/misc/cdb_branch.h"
 #include "inventory_manager.h"
 #include "interface_manager.h"
 #include "bot_chat_page_trade.h"
 #include "bot_chat_page_all.h"
 #include "group_container.h"
 #include "group_menu.h"
-#include "../cdb_leaf.h"
-#include "../cdb_branch.h"
+#include "nel/misc/cdb_leaf.h"
+#include "nel/misc/cdb_branch.h"
 #include "list_sheet_base.h"
 #include "../net_manager.h"
 #include "../user_entity.h"
@@ -44,12 +44,14 @@
 #include "../sheet_manager.h"
 #include "game_share/slot_equipment.h"
 #include "game_share/animal_status.h"
+#include "game_share/bot_chat_types.h"
 
 #include "../client_cfg.h"
 
 using namespace std;
 using namespace NLMISC;
 
+extern NLMISC::CLog g_log;
 // Context help
 extern void contextHelp (const std::string &help);
 
@@ -131,6 +133,7 @@ void CItemImage::build(CCDBNodeBranch *branch)
 	Weight = dynamic_cast<CCDBNodeLeaf *>(branch->getNode(ICDBNode::CTextId("WEIGHT"), false));
 	NameId = dynamic_cast<CCDBNodeLeaf *>(branch->getNode(ICDBNode::CTextId("NAMEID"), false));
 	InfoVersion= dynamic_cast<CCDBNodeLeaf *>(branch->getNode(ICDBNode::CTextId("INFO_VERSION"), false));
+	ResaleFlag = dynamic_cast<CCDBNodeLeaf *>(branch->getNode(ICDBNode::CTextId("RESALE_FLAG"), false));
 
 	// Should always have at least those one:(ie all but Price)
 	nlassert(Sheet && Quality && Quantity && UserColor && Weight && NameId && InfoVersion);
@@ -1861,7 +1864,8 @@ void CTempInvManager::open(TEMP_INV_MODE::TInventoryMode m)
 	}
 	pIM->getDbProp("LOCAL:INVENTORY:TEMP:TYPE")->setValue8((uint8)_Mode);
 
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	if (pGC != NULL)
 	{
@@ -1998,6 +2002,9 @@ bool SBagOptions::parse(xmlNodePtr cur, CInterfaceGroup * /* parentGroup */)
 	prop = xmlGetProp (cur, (xmlChar*)"filter_missmp");
 	if (prop) DbFilterMissMP = pIM->getDbProp(prop);
 
+	prop = xmlGetProp (cur, (xmlChar*)"filter_tp");
+	if (prop) DbFilterTP = pIM->getDbProp(prop);
+
 	return true;
 }
 
@@ -2041,6 +2048,13 @@ bool SBagOptions::isSomethingChanged()
 			LastDbFilterMissMP = (DbFilterMissMP->getValue8() != 0);
 		}
 
+	if (DbFilterTP != NULL)
+		if ((DbFilterTP->getValue8() != 0) != LastDbFilterTP)
+		{
+			bRet = true;
+			LastDbFilterTP = (DbFilterTP->getValue8() != 0);
+		}
+
 	return bRet;
 }
 
@@ -2054,25 +2068,33 @@ bool SBagOptions::canDisplay(CDBCtrlSheet *pCS) const
 	bool bFilterTool = getFilterTool();
 	bool bFilterMP = getFilterMP();
 	bool bFilterMissMP = getFilterMissMP();
+	bool bFilterTP = getFilterTP();
 
 	const CItemSheet *pIS = pCS->asItemSheet();
 	if (pIS != NULL)
 	{
 		// Armor
-		if ((pIS->Family == ITEMFAMILY::ARMOR) || (pIS->Family == ITEMFAMILY::JEWELRY))
+		if ((pIS->Family == ITEMFAMILY::ARMOR) || 
+			(pIS->Family == ITEMFAMILY::JEWELRY))
 			if (!bFilterArmor) bDisplay = false;
 
 		// Weapon
-		if ((pIS->Family == ITEMFAMILY::SHIELD) || (pIS->Family == ITEMFAMILY::MELEE_WEAPON) ||
-			(pIS->Family == ITEMFAMILY::RANGE_WEAPON) || (pIS->Family == ITEMFAMILY::AMMO) ||
-			(pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) || (pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE) ||
+		if ((pIS->Family == ITEMFAMILY::SHIELD) || 
+			(pIS->Family == ITEMFAMILY::MELEE_WEAPON) ||
+			(pIS->Family == ITEMFAMILY::RANGE_WEAPON) || 
+			(pIS->Family == ITEMFAMILY::AMMO) ||
+			(pIS->Family == ITEMFAMILY::CRYSTALLIZED_SPELL) || 
+			(pIS->Family == ITEMFAMILY::ITEM_SAP_RECHARGE) ||
 			(pIS->Family == ITEMFAMILY::BRICK) )
 			if (!bFilterWeapon) bDisplay = false;
 
 		// Tool
-		if ((pIS->Family == ITEMFAMILY::CRAFTING_TOOL) || (pIS->Family == ITEMFAMILY::HARVEST_TOOL) ||
-			(pIS->Family == ITEMFAMILY::TAMING_TOOL) || (pIS->Family == ITEMFAMILY::TRAINING_TOOL) ||
-			(pIS->Family == ITEMFAMILY::BAG) || (pIS->Family == ITEMFAMILY::PET_ANIMAL_TICKET) )
+		if ((pIS->Family == ITEMFAMILY::CRAFTING_TOOL) || 
+			(pIS->Family == ITEMFAMILY::HARVEST_TOOL) ||
+			(pIS->Family == ITEMFAMILY::TAMING_TOOL) || 
+			(pIS->Family == ITEMFAMILY::TRAINING_TOOL) ||
+			(pIS->Family == ITEMFAMILY::BAG) || 
+			(pIS->Family == ITEMFAMILY::PET_ANIMAL_TICKET) )
 			if (!bFilterTool) bDisplay = false;
 
 		// MP
@@ -2081,9 +2103,15 @@ bool SBagOptions::canDisplay(CDBCtrlSheet *pCS) const
 
 		// Mission MP
 		if ((pIS->Family == ITEMFAMILY::MISSION_ITEM) ||
+			(pIS->Family == ITEMFAMILY::XP_CATALYSER) ||
+			(pIS->Family == ITEMFAMILY::CONSUMABLE) ||
 			((pIS->Family == ITEMFAMILY::RAW_MATERIAL) && !pIS->canBuildSomeItemPart()))
 			if (!bFilterMissMP) bDisplay = false;
-		
+
+		// Teleporter Pacts
+		if ((pIS->Family == ITEMFAMILY::TELEPORT))
+			if (!bFilterTP) bDisplay = false;
+
 		// Jobs Items
 		if (pIS->Id.toString().substr(0, 6) == "rpjob_")
 			bDisplay = false;
@@ -2776,6 +2804,37 @@ public:
 REGISTER_ACTION_HANDLER( CHandlerInvAutoEquip, "inv_auto_equip" );
 
 
+// **********************************************************************************************************
+class CHandlerLockInvItem : public IActionHandler
+{
+	void execute (CCtrlBase *pCaller, const std::string &sParams)
+	{
+		// get the calling item
+		CDBCtrlSheet *item = CDBCtrlSheet::getCurrSelSheet();
+		if ( ! item)
+		{
+			nlwarning("<CHandlerDestroyItem::execute> no caller sheet found");
+			return;
+		}
+
+		string lock = "1";
+		if (item->getLockedByOwner())
+		{
+			lock = "0";
+		}
+
+		uint32 slot = item->getIndexInDB();
+		uint32 inv = item->getInventoryIndex();
+		INVENTORIES::TInventory inventory = INVENTORIES::UNDEFINED;
+		inventory = (INVENTORIES::TInventory)(inv);
+		if (inventory == INVENTORIES::UNDEFINED)
+		{
+			return;
+		}
+		NLMISC::ICommand::execute("a lockItem " + INVENTORIES::toString(inventory) + " " + toString(slot) + " " + lock, g_log);
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerLockInvItem, "lock_inv_item" );
 
 // ***************************************************************************
 // Inventory Temporary
@@ -2844,11 +2903,11 @@ class CHandlerInvTempAll : public IActionHandler
 
 		nlctassert(MAX_INVENTORY_ANIMAL==4);
 		if (pInv->isInventoryAvailable(INVENTORIES::pet_animal1))
-			BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(2), pInv->getMaxBagBulk(2)));
+			BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(1), pInv->getMaxBagBulk(1)));
 		if (pInv->isInventoryAvailable(INVENTORIES::pet_animal2))
-			BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(3), pInv->getMaxBagBulk(3)));
+			BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(2), pInv->getMaxBagBulk(2)));
 		if (pInv->isInventoryAvailable(INVENTORIES::pet_animal3))
-			BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
+			BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(3), pInv->getMaxBagBulk(3)));
 		if (pInv->isInventoryAvailable(INVENTORIES::pet_animal4))
 			BagsBulk.push_back(pair <double, double>(pInv->getBagBulk(4), pInv->getMaxBagBulk(4)));
 
diff --git a/code/ryzom/client/src/interface_v3/inventory_manager.h b/code/ryzom/client/src/interface_v3/inventory_manager.h
index a5c332ba7..faacb8708 100644
--- a/code/ryzom/client/src/interface_v3/inventory_manager.h
+++ b/code/ryzom/client/src/interface_v3/inventory_manager.h
@@ -19,14 +19,17 @@
 #ifndef RY_INVENTORY_MANAGER_H
 #define RY_INVENTORY_MANAGER_H
 
-#include "../cdb_leaf.h"
+#include "nel/misc/cdb_leaf.h"
 #include "dbgroup_list_sheet_text.h"
 #include "dbgroup_list_sheet.h"
 #include "game_share/item_infos.h"
 #include "game_share/temp_inventory_mode.h"
 #include "game_share/inventories.h"
+#include "game_share/bot_chat_types.h"
 
+namespace NLMISC{
 class CCDBNodeBranch;
+}
 class CDBCtrlSheet;
 
 
@@ -54,20 +57,21 @@ const uint MAX_PLAYER_INV_ENTRIES = std::max(MAX_BAGINV_ENTRIES, MAX_ANIMALINV_E
 class CItemImage
 {
 public:
-	CCDBNodeLeaf *Sheet;
-	CCDBNodeLeaf *Quality;
-	CCDBNodeLeaf *Quantity;
-	CCDBNodeLeaf *UserColor;
-	CCDBNodeLeaf *Price;
-	CCDBNodeLeaf *Weight;
-	CCDBNodeLeaf *NameId;
-	CCDBNodeLeaf *InfoVersion;
+	NLMISC::CCDBNodeLeaf *Sheet;
+	NLMISC::CCDBNodeLeaf *Quality;
+	NLMISC::CCDBNodeLeaf *Quantity;
+	NLMISC::CCDBNodeLeaf *UserColor;
+	NLMISC::CCDBNodeLeaf *Price;
+	NLMISC::CCDBNodeLeaf *Weight;
+	NLMISC::CCDBNodeLeaf *NameId;
+	NLMISC::CCDBNodeLeaf *InfoVersion;
+	NLMISC::CCDBNodeLeaf *ResaleFlag;
 
 public:
 	// ctor
 	CItemImage();
 	// build from a branch
-	void build(CCDBNodeBranch *branch);
+	void build(NLMISC::CCDBNodeBranch *branch);
 	// shortcuts to avoid NULL pointer tests
 	uint32 getSheetID() const						{ return (uint32)			(Sheet ? Sheet->getValue32() : 0); }
 	uint16 getQuality() const						{ return (uint16)			(Quality ? Quality->getValue16() : 0); }
@@ -77,6 +81,8 @@ public:
 	uint32 getWeight() const						{ return (uint32)			(Weight ? Weight->getValue32() : 0); }
 	uint32 getNameId() const						{ return (uint32)			(NameId ? NameId->getValue32() : 0); }
 	uint8  getInfoVersion() const					{ return (uint8)			(InfoVersion ? (uint8) InfoVersion->getValue8() : 0); }
+	uint8  getResaleFlag() const					{ return (uint8)			(ResaleFlag ? (uint8) ResaleFlag->getValue8() : 0); }
+	bool   getLockedByOwner() const                 { return (bool)             (ResaleFlag ? (ResaleFlag->getValue8() == BOTCHATTYPE::ResaleKOLockedByOwner) : false); }
 	//
 	void   setSheetID(uint32 si)					{ if (Sheet) Sheet->setValue32((sint32) si); }
 	void   setQuality(uint16 quality)				{ if (Quality) Quality->setValue16((sint16) quality); }
@@ -86,6 +92,7 @@ public:
 	void   setWeight(uint32 wgt)					{ if (Weight) Weight->setValue32((sint32) wgt); }
 	void   setNameId(uint32 nid)					{ if (NameId) NameId->setValue32((sint32) nid); }
 	void   setInfoVersion(uint8 iv)					{ if (InfoVersion) InfoVersion->setValue8((sint8) iv); }
+	void   setResaleFlag(uint8 resale)				{ if (ResaleFlag) ResaleFlag->setValue8(resale); }
 };
 
 
@@ -297,14 +304,14 @@ private:
 		sint32 Equip[MAX_EQUIPINV_ENTRIES];
 		CDBCtrlSheet *UIEquip[MAX_EQUIPINV_ENTRIES];
 		CDBCtrlSheet *UIEquip2[MAX_EQUIPINV_ENTRIES];
-		CCDBNodeLeaf *Money;
+		NLMISC::CCDBNodeLeaf *Money;
 		CItemImage PAInv[MAX_INVENTORY_ANIMAL][MAX_ANIMALINV_ENTRIES];
 	// SERVER INVENTORY
 		CItemImage ServerBag[MAX_BAGINV_ENTRIES];
 		CItemImage ServerTempInv[MAX_TEMPINV_ENTRIES];
 		sint32 ServerHands[MAX_HANDINV_ENTRIES];
 		sint32 ServerEquip[MAX_EQUIPINV_ENTRIES];
-		CCDBNodeLeaf *ServerMoney;
+		NLMISC::CCDBNodeLeaf *ServerMoney;
 		CItemImage ServerPAInv[MAX_INVENTORY_ANIMAL][MAX_ANIMALINV_ENTRIES];
 	// Drag'n'Drop
 		TFrom			DNDFrom;
@@ -338,24 +345,24 @@ private:
 
 	// ItemExtraInfo management.
 		void			onTradeChangeSession();
-		void			onReceiveItemSheet(ICDBNode* node);
-		void			onReceiveItemInfoSlotVersion(ICDBNode* node);
+		void			onReceiveItemSheet(NLMISC::ICDBNode* node);
+		void			onReceiveItemInfoSlotVersion(NLMISC::ICDBNode* node);
 		void			updateItemInfoQueue();
 		void			updateItemInfoWaiters(uint slotId);
-		class	CItemInfoSlotVersionObs : public ICDBNode::IPropertyObserver
+		class	CItemInfoSlotVersionObs : public NLMISC::ICDBNode::IPropertyObserver
 		{
 		public:
-			virtual void update(ICDBNode* node);
+			virtual void update(NLMISC::ICDBNode* node);
 		};
-		class	CItemSheetObs : public ICDBNode::IPropertyObserver
+		class	CItemSheetObs : public NLMISC::ICDBNode::IPropertyObserver
 		{
 		public:
-			virtual void update(ICDBNode* node);
+			virtual void update(NLMISC::ICDBNode* node);
 		};
-		class	CItemInfoTradeObs : public ICDBNode::IPropertyObserver
+		class	CItemInfoTradeObs : public NLMISC::ICDBNode::IPropertyObserver
 		{
 		public:
-			virtual void update(ICDBNode* node);
+			virtual void update(NLMISC::ICDBNode* node);
 		};
 		CItemInfoTradeObs			_DBTradeInfoObs;
 		CItemInfoSlotVersionObs		_DBInfoSlotVersionObs;
@@ -365,19 +372,19 @@ private:
 		friend class CItemSheetObs;
 
 	// Equipment observer
-		class CDBEquipObs : public ICDBNode::IPropertyObserver
+		class CDBEquipObs : public NLMISC::ICDBNode::IPropertyObserver
 		{
 		public:
-			virtual void update(ICDBNode* node);
+			virtual void update(NLMISC::ICDBNode* node);
 		};
 		CDBEquipObs _DBEquipObs;
 		friend class CDBEquipObs;
 
 	// Bag observer for auto equipment (put only on the sheet leaf)
-		class CDBBagObs : public ICDBNode::IPropertyObserver
+		class CDBBagObs : public NLMISC::ICDBNode::IPropertyObserver
 		{
 		public:
-			virtual void update(ICDBNode* node);
+			virtual void update(NLMISC::ICDBNode* node);
 		};
 		CDBBagObs _DBBagObs;
 };
@@ -436,24 +443,24 @@ private:
 	CTempInvManager();
 
 	// Database management stuff
-	class CDBObs : public ICDBNode::IPropertyObserver
+	class CDBObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
 
-	class CDBObsType : public ICDBNode::IPropertyObserver
+	class CDBObsType : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
 
 	// Database management stuff, specialized for forage progress
-	class CDBForageQQObs : public ICDBNode::IPropertyObserver
+	class CDBForageQQObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
-		CDBForageQQObs() : ICDBNode::IPropertyObserver(), WhichOne(~0), FullValue(0.0f) {}
-		virtual void update(ICDBNode *node);
+		CDBForageQQObs() : NLMISC::ICDBNode::IPropertyObserver(), WhichOne(~0), FullValue(0.0f) {}
+		virtual void update(NLMISC::ICDBNode *node);
 		uint	WhichOne;
 		float	FullValue;
 	};
@@ -499,23 +506,25 @@ struct SBagOptions
 {
 	CInventoryManager::TInvType		InvType;
 
-	CCDBNodeLeaf *DbFilterArmor;
-	CCDBNodeLeaf *DbFilterWeapon;
-	CCDBNodeLeaf *DbFilterTool;
-	CCDBNodeLeaf *DbFilterMP;
-	CCDBNodeLeaf *DbFilterMissMP;
+	NLMISC::CCDBNodeLeaf *DbFilterArmor;
+	NLMISC::CCDBNodeLeaf *DbFilterWeapon;
+	NLMISC::CCDBNodeLeaf *DbFilterTool;
+	NLMISC::CCDBNodeLeaf *DbFilterMP;
+	NLMISC::CCDBNodeLeaf *DbFilterMissMP;
+	NLMISC::CCDBNodeLeaf *DbFilterTP;
 
 	bool LastDbFilterArmor;
 	bool LastDbFilterWeapon;
 	bool LastDbFilterTool;
 	bool LastDbFilterMP;
 	bool LastDbFilterMissMP;
+	bool LastDbFilterTP;
 	// -----------------------
 	SBagOptions()
 	{
 		InvType = CInventoryManager::InvUnknown;
-		DbFilterArmor = DbFilterWeapon = DbFilterTool = DbFilterMP = DbFilterMissMP = NULL;
-		LastDbFilterArmor = LastDbFilterWeapon = LastDbFilterTool = LastDbFilterMP = LastDbFilterMissMP = false;
+		DbFilterArmor = DbFilterWeapon = DbFilterTool = DbFilterMP = DbFilterMissMP = DbFilterTP = NULL;
+		LastDbFilterArmor = LastDbFilterWeapon = LastDbFilterTool = LastDbFilterMP = LastDbFilterMissMP = LastDbFilterTP = false;
 	}
 
 	bool parse (xmlNodePtr cur, CInterfaceGroup *parentGroup);
@@ -552,6 +561,12 @@ struct SBagOptions
 		return (DbFilterMissMP->getValue8()!=0);
 	}
 
+	bool getFilterTP() const
+	{
+		if (DbFilterTP == NULL) return true;
+		return (DbFilterTP->getValue8() != 0);
+	}
+
 	// Return true if the sheet can be displayed due to filters
 	bool canDisplay(CDBCtrlSheet *pCS) const;
 };
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.cpp b/code/ryzom/client/src/interface_v3/lua_ihm.cpp
index 15dd9872a..08b128b66 100644
--- a/code/ryzom/client/src/interface_v3/lua_ihm.cpp
+++ b/code/ryzom/client/src/interface_v3/lua_ihm.cpp
@@ -143,7 +143,7 @@ extern NLMISC::CLog	g_log;
 extern CContinentManager ContinentMngr;
 extern uint8 PlayerSelectedSlot;
 extern CClientChatManager		ChatMngr;
-extern void addWebIGParams (string &url);
+extern void addWebIGParams (string &url, bool trustedDomain);
 
 // declare ostream << operator for ucstring -> registration of ucstring iin luabind will build a 'tostring' function from it
 std::ostream &operator<<(std::ostream &str, const ucstring &value)
@@ -1323,6 +1323,7 @@ void	CLuaIHM::registerIHM(CLuaState &ls)
 	ls.registerFunc("getIndexInDB", getIndexInDB);
 	ls.registerFunc("getUIId",    getUIId);
 	ls.registerFunc("createGroupInstance", createGroupInstance);
+	ls.registerFunc("createRootGroupInstance", createRootGroupInstance);
 	ls.registerFunc("createUIElement", createUIElement);
 	ls.registerFunc("launchContextMenuInGame",    launchContextMenuInGame);
 	ls.registerFunc("parseInterfaceFromString",    parseInterfaceFromString);
@@ -1356,6 +1357,19 @@ void	CLuaIHM::registerIHM(CLuaState &ls)
 	ls.registerFunc("enableModalWindow", enableModalWindow);
 	ls.registerFunc("disableModalWindow", disableModalWindow);
 	ls.registerFunc("getPlayerPos", getPlayerPos);
+	ls.registerFunc("getPlayerFront", getPlayerFront);
+	ls.registerFunc("getPlayerDirection", getPlayerDirection);
+	ls.registerFunc("getPlayerGender", getPlayerGender);
+	ls.registerFunc("getPlayerName", getPlayerName);
+	ls.registerFunc("getPlayerTitleRaw", getPlayerTitleRaw);
+	ls.registerFunc("getPlayerTitle", getPlayerTitle);
+	ls.registerFunc("getTargetPos", getTargetPos);
+	ls.registerFunc("getTargetFront", getTargetFront);
+	ls.registerFunc("getTargetDirection", getTargetDirection);
+	ls.registerFunc("getTargetGender", getTargetGender);
+	ls.registerFunc("getTargetName", getTargetName);
+	ls.registerFunc("getTargetTitleRaw", getTargetTitleRaw);
+	ls.registerFunc("getTargetTitle", getTargetTitle);
 	ls.registerFunc("addSearchPathUser", addSearchPathUser);
 	ls.registerFunc("displaySystemInfo", displaySystemInfo);
 	ls.registerFunc("disableContextHelpForControl", disableContextHelpForControl);
@@ -1363,6 +1377,7 @@ void	CLuaIHM::registerIHM(CLuaState &ls)
 	ls.registerFunc("setWeatherValue", setWeatherValue);
 	ls.registerFunc("getWeatherValue", getWeatherValue);
 	ls.registerFunc("getCompleteIslands", getCompleteIslands);
+	ls.registerFunc("displayBubble", displayBubble);
 	ls.registerFunc("getIslandId", getIslandId);
 	ls.registerFunc("getClientCfgVar", getClientCfgVar);
 	ls.registerFunc("isPlayerFreeTrial", isPlayerFreeTrial);
@@ -1370,14 +1385,18 @@ void	CLuaIHM::registerIHM(CLuaState &ls)
 	ls.registerFunc("isInRingMode", isInRingMode);
 	ls.registerFunc("getUserRace",  getUserRace);
 	ls.registerFunc("getSheet2idx",  getSheet2idx);
+	ls.registerFunc("getTargetSlot",  getTargetSlot);
+	ls.registerFunc("getSlotDataSetId",  getSlotDataSetId);
 	
 	// Through LUABind API
 	lua_State	*L= ls.getStatePointer();
 
 	luabind::module(L)
 	[
+		LUABIND_FUNC(addDbProp),
 		LUABIND_FUNC(getDbProp),
 		LUABIND_FUNC(setDbProp),
+		LUABIND_FUNC(delDbProp),
 		LUABIND_FUNC(debugInfo),
 		LUABIND_FUNC(rawDebugInfo),
 		LUABIND_FUNC(dumpCallStack),
@@ -1456,9 +1475,16 @@ void	CLuaIHM::registerIHM(CLuaState &ls)
 		luabind::def("shellExecute",  CMiscFunctions::shellExecute),
 
 		LUABIND_FUNC(getPlayerLevel),
+		LUABIND_FUNC(getPlayerVpa),
+		LUABIND_FUNC(getPlayerVpb),
+		LUABIND_FUNC(getPlayerVpc),
 		LUABIND_FUNC(getTargetLevel),
 		LUABIND_FUNC(getTargetForceRegion),
 		LUABIND_FUNC(getTargetLevelForce),
+		LUABIND_FUNC(getTargetSheet),
+		LUABIND_FUNC(getTargetVpa),
+		LUABIND_FUNC(getTargetVpb),
+		LUABIND_FUNC(getTargetVpc),
 		LUABIND_FUNC(isTargetNPC),
 		LUABIND_FUNC(isTargetPlayer), // return 'true' if the target is an npc
 		LUABIND_FUNC(isTargetUser),
@@ -1686,12 +1712,60 @@ void	CLuaIHM::setDbProp(const std::string &dbProp,    sint32 value)
 	// Write to the DB if found
 	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
 	CCDBNodeLeaf	*node= pIM->getDbProp(dbProp,    false);
+
 	if(node)
 		node->setValue32(value);
 	else
 		debugInfo(toString("setDbProp(): '%s' dbProp Not found",    dbProp.c_str()));
 }
 
+void	CLuaIHM::delDbProp(const string &dbProp)
+{
+	//H_AUTO(Lua_CLuaIHM_setDbProp)
+	// Do not allow Write on SERVER: or LOCAL:
+	static const string	dbServer= "SERVER:";
+	static const string	dbLocal= "LOCAL:";
+	static const string	dbLocalR2= "LOCAL:R2";
+	if( (0==dbProp.compare(0,    dbServer.size(),    dbServer)) ||
+		(0==dbProp.compare(0,    dbLocal.size(),    dbLocal))
+		)
+	{
+		if (0!=dbProp.compare(0,    dbLocalR2.size(),    dbLocalR2))
+		{
+			nlstop;
+			throw ELuaIHMException("setDbProp(): You are not allowed to write on 'SERVER:...' or 'LOCAL:...' database");
+		}
+	}
+
+	// Write to the DB if found
+	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
+	pIM->delDbProp(dbProp);
+}
+
+void	CLuaIHM::addDbProp(const std::string &dbProp,    sint32 value)
+{
+	//H_AUTO(Lua_CLuaIHM_setDbProp)
+	// Do not allow Write on SERVER: or LOCAL:
+	static const std::string	dbServer= "SERVER:";
+	static const std::string	dbLocal= "LOCAL:";
+	static const std::string	dbLocalR2= "LOCAL:R2";
+	if( (0==dbProp.compare(0,    dbServer.size(),    dbServer)) ||
+		(0==dbProp.compare(0,    dbLocal.size(),    dbLocal))
+		)
+	{
+		if (0!=dbProp.compare(0,    dbLocalR2.size(),    dbLocalR2))
+		{
+			nlstop;
+			throw ELuaIHMException("setDbProp(): You are not allowed to write on 'SERVER:...' or 'LOCAL:...' database");
+		}
+	}
+
+	// Write to the DB if found
+	CInterfaceManager	*pIM= CInterfaceManager::getInstance();
+	CCDBNodeLeaf	*node= pIM->getDbProp(dbProp, true);
+	if(node)
+		node->setValue32(value);
+}
 
 // ***************************************************************************
 void		CLuaIHM::debugInfo(const std::string &cstDbg)
@@ -1865,7 +1939,21 @@ std::string	CLuaIHM::getDefine(const std::string &def)
 
 
 // ***************************************************************************
-static CEntityCL *getTargetSlot()
+static sint32 getTargetSlotNr()
+{
+	const char *dbPath = "UI:VARIABLES:TARGET:SLOT";
+	CInterfaceManager *im = CInterfaceManager::getInstance();
+	CCDBNodeLeaf *node = im->getDbProp(dbPath, false);
+	if (!node) return 0;
+	if ((uint8) node->getValue32() == (uint8) CLFECOMMON::INVALID_SLOT)
+	{
+		return 0;
+	}
+	return node->getValue32();
+}
+
+// ***************************************************************************
+static CEntityCL *getTargetEntity()
 {
 	const char *dbPath = "UI:VARIABLES:TARGET:SLOT";
 	CInterfaceManager *im = CInterfaceManager::getInstance();
@@ -1875,7 +1963,13 @@ static CEntityCL *getTargetSlot()
 	{
 		return NULL;
 	}
-	return EntitiesMngr.entity((uint) node->getValue32());		
+	return EntitiesMngr.entity((uint) node->getValue32());
+}
+
+// ***************************************************************************
+static CEntityCL *getSlotEntity(uint slot)
+{
+	return EntitiesMngr.entity(slot);
 }
 
 // ***************************************************************************
@@ -1890,10 +1984,31 @@ sint32 CLuaIHM::getPlayerLevel()
 	return sint32(maxskill);
 }
 
+// ***************************************************************************
+sint64 CLuaIHM::getPlayerVpa()
+{
+	sint64 prop = CInterfaceManager::getInstance()->getDbProp("SERVER:Entities:E0:P"+toString("%d", CLFECOMMON::PROPERTY_VPA))->getValue64();
+	return prop;
+}
+
+// ***************************************************************************
+sint64 CLuaIHM::getPlayerVpb()
+{
+	sint64 prop = CInterfaceManager::getInstance()->getDbProp("SERVER:Entities:E0:P"+toString("%d", CLFECOMMON::PROPERTY_VPB))->getValue64();
+	return prop;
+}
+
+// ***************************************************************************
+sint64 CLuaIHM::getPlayerVpc()
+{
+	sint64 prop = CInterfaceManager::getInstance()->getDbProp("SERVER:Entities:E0:P"+toString("%d", CLFECOMMON::PROPERTY_VPB))->getValue64();
+	return prop;
+}
+
 // ***************************************************************************
 sint32 CLuaIHM::getTargetLevel()
 {
-	CEntityCL *target = getTargetSlot();
+	CEntityCL *target = getTargetEntity();
 	if (!target) return -1;
 	if ( target->isPlayer() )
 	{
@@ -1913,10 +2028,52 @@ sint32 CLuaIHM::getTargetLevel()
 	return -1;
 }
 
+// ***************************************************************************
+ucstring CLuaIHM::getTargetSheet()
+{
+	CEntityCL *target = getTargetEntity();
+	if (!target) return ucstring();
+
+	return target->sheetId().toString();
+}
+
+// ***************************************************************************
+sint64 CLuaIHM::getTargetVpa()
+{
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+
+	sint64 prop = CInterfaceManager::getInstance()->getDbProp("SERVER:Entities:E"+toString("%d", getTargetSlotNr())+":P"+toString("%d", CLFECOMMON::PROPERTY_VPA))->getValue64();
+
+	return prop;
+}
+
+// ***************************************************************************
+sint64 CLuaIHM::getTargetVpb()
+{
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+
+	sint64 prop = CInterfaceManager::getInstance()->getDbProp("SERVER:Entities:E"+toString("%d", getTargetSlotNr())+":P"+toString("%d", CLFECOMMON::PROPERTY_VPB))->getValue64();
+
+	return prop;
+}
+
+// ***************************************************************************
+sint64 CLuaIHM::getTargetVpc()
+{
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+
+	sint64 prop = CInterfaceManager::getInstance()->getDbProp("SERVER:Entities:E"+toString("%d", getTargetSlotNr())+":P"+toString("%d", CLFECOMMON::PROPERTY_VPB))->getValue64();
+
+	return prop;
+}
+
 // ***************************************************************************
 sint32 CLuaIHM::getTargetForceRegion()
 {	
-	CEntityCL *target = getTargetSlot();
+	CEntityCL *target = getTargetEntity();
 	if (!target) return -1;
 	if ( target->isPlayer() )
 	{			
@@ -1944,7 +2101,7 @@ sint32 CLuaIHM::getTargetForceRegion()
 // ***************************************************************************
 sint32 CLuaIHM::getTargetLevelForce()
 {
-	CEntityCL *target = getTargetSlot();
+	CEntityCL *target = getTargetEntity();
 	if (!target) return -1;
 	if ( target->isPlayer() )
 	{
@@ -1972,7 +2129,7 @@ sint32 CLuaIHM::getTargetLevelForce()
 // ***************************************************************************
 bool CLuaIHM::isTargetNPC()
 {
-	CEntityCL *target = getTargetSlot();
+	CEntityCL *target = getTargetEntity();
 	if (!target) return false;
 	return target->isNPC();
 }
@@ -1980,7 +2137,7 @@ bool CLuaIHM::isTargetNPC()
 // ***************************************************************************
 bool CLuaIHM::isTargetPlayer()
 {
-	CEntityCL *target = getTargetSlot();
+	CEntityCL *target = getTargetEntity();
 	if (!target) return false;
 	return target->isPlayer();
 }
@@ -1989,7 +2146,7 @@ bool CLuaIHM::isTargetPlayer()
 // ***************************************************************************
 bool CLuaIHM::isTargetUser()
 {
-	CEntityCL *target = getTargetSlot();
+	CEntityCL *target = getTargetEntity();
 	if (!target) return false;
 	return target->isUser();
 }
@@ -1998,15 +2155,15 @@ bool CLuaIHM::isTargetUser()
 bool CLuaIHM::isPlayerInPVPMode()
 {
 	if (!UserEntity) return false;
-	return (UserEntity->getPvpMode() & PVP_MODE::PvpFaction || UserEntity->getPvpMode() & PVP_MODE::PvpFactionFlagged || UserEntity->getPvpMode() & PVP_MODE::PvpZoneFaction);
+	return (UserEntity->getPvpMode() & PVP_MODE::PvpFaction || UserEntity->getPvpMode() & PVP_MODE::PvpFactionFlagged || UserEntity->getPvpMode() & PVP_MODE::PvpZoneFaction)  != 0;
 }
 
 // ***************************************************************************
 bool CLuaIHM::isTargetInPVPMode()
 {
-	CEntityCL *target = getTargetSlot();
+	CEntityCL *target = getTargetEntity();
 	if (!target) return false;
-	return (target->getPvpMode() & PVP_MODE::PvpFaction || target->getPvpMode() & PVP_MODE::PvpFactionFlagged || target->getPvpMode() & PVP_MODE::PvpZoneFaction);
+	return (target->getPvpMode() & PVP_MODE::PvpFaction || target->getPvpMode() & PVP_MODE::PvpFactionFlagged || target->getPvpMode() & PVP_MODE::PvpZoneFaction)  != 0;
 }
 
 // ***************************************************************************
@@ -2368,6 +2525,53 @@ int CLuaIHM::createGroupInstance(CLuaState &ls)
 	return 1;
 }
 
+// ***************************************************************************
+int CLuaIHM::createRootGroupInstance(CLuaState &ls)
+{
+	//H_AUTO(Lua_CLuaIHM_createGroupInstance)
+	const char *funcName = "createRootGroupInstance";
+	CLuaIHM::checkArgCount(ls, funcName, 3);
+	CLuaIHM::checkArgType(ls, funcName, 1, LUA_TSTRING);
+	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+	CLuaIHM::checkArgType(ls, funcName, 3, LUA_TTABLE);
+	std::vector<std::pair<std::string, std::string> > templateParams;
+	CLuaObject params;
+	params.pop(ls);
+	ENUM_LUA_TABLE(params, it)
+	{
+		if (!it.nextKey().isString())
+		{
+			nlwarning("%s : bad key encountered with type %s, string expected.", funcName, it.nextKey().getTypename());
+			continue;
+		}
+		if (!it.nextValue().isString())
+		{
+			nlwarning("%s : bad value encountered with type %s for key %s, string expected.", funcName, it.nextValue().getTypename(), it.nextKey().toString().c_str());
+			continue;
+		}
+		templateParams.push_back(std::pair<std::string, std::string>(it.nextKey().toString(), it.nextValue().toString())); // strange compilation bug here when I use std::make_pair ... :(
+	}
+	CInterfaceManager *im = CInterfaceManager::getInstance();
+	CInterfaceGroup *result = im->createGroupInstance(ls.toString(1), "ui:interface:"+string(ls.toString(2)), templateParams);
+	if (!result)
+	{
+		ls.pushNil();
+	}
+	else
+	{
+		result->setId("ui:interface:"+string(ls.toString(2)));
+		result->updateCoords();
+		im->addWindowToMasterGroup("ui:interface", result);
+		CInterfaceGroup *pRoot = dynamic_cast<CInterfaceGroup*>(im->getElementFromId("ui:interface"));
+		result->setParent(pRoot);
+		if (pRoot)
+			pRoot->addGroup(result);
+		result->setActive(true);
+		CLuaIHM::pushUIOnStack(ls, result);
+	}
+	return 1;
+}
+
 // ***************************************************************************
 int CLuaIHM::createUIElement(CLuaState &ls)
 {
@@ -2407,6 +2611,42 @@ int CLuaIHM::createUIElement(CLuaState &ls)
 	return 1;
 }
 
+
+// ***************************************************************************
+int CLuaIHM::displayBubble(CLuaState &ls)
+{
+	//H_AUTO(Lua_CLuaIHM_createUIElement)
+	const char *funcName = "displayBubble";
+	CLuaIHM::checkArgCount(ls, funcName, 3);
+	CLuaIHM::checkArgType(ls, funcName, 1, LUA_TNUMBER);
+	CLuaIHM::checkArgType(ls, funcName, 2, LUA_TSTRING);
+	CLuaIHM::checkArgType(ls, funcName, 3, LUA_TTABLE);
+	std::vector<std::string> strs;
+	std::vector<std::string> links;
+	CLuaObject params;
+	params.pop(ls);
+	ENUM_LUA_TABLE(params, it)
+	{
+		if (!it.nextKey().isString())
+		{
+			nlwarning("%s : bad key encountered with type %s, string expected.", funcName, it.nextKey().getTypename());
+			continue;
+		}
+		if (!it.nextValue().isString())
+		{
+			nlwarning("%s : bad value encountered with type %s for key %s, string expected.", funcName, it.nextValue().getTypename(), it.nextKey().toString().c_str());
+			continue;
+		}
+		links.push_back(it.nextValue().toString());
+		strs.push_back(it.nextKey().toString());
+	}
+	
+	InSceneBubbleManager.webIgChatOpen((uint32)ls.toNumber(1), ls.toString(2), strs, links);
+	
+	return 1;
+}
+
+
 // ***************************************************************************
 int CLuaIHM::getCompleteIslands(CLuaState &ls)
 {
@@ -3523,7 +3763,7 @@ void	CLuaIHM::browseNpcWebPage(const std::string &htmlId, const std::string &url
 					string("&lang=") + ClientCfg.getHtmlLanguageCode() +
 					string("&guild_name=") + guildName;
 		}
-/*
+/* Already added by GroupHtml
 		if(webig)
 		{
 			// append special webig auth params
@@ -4242,6 +4482,126 @@ int CLuaIHM::getPlayerPos(CLuaState &ls)
 	return 3;
 }
 
+// ***************************************************************************
+int CLuaIHM::getPlayerFront(CLuaState &ls)
+{
+	checkArgCount(ls, "getPlayerFront", 0);
+	ls.push(atan2(UserEntity->front().y, UserEntity->front().x));
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getPlayerDirection(CLuaState &ls)
+{
+	checkArgCount(ls, "getPlayerDirection", 0);
+	ls.push(atan2(UserEntity->dir().y, UserEntity->dir().x));
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getPlayerGender(CLuaState &ls)
+{
+	checkArgCount(ls, "getPlayerGender", 0);
+	ls.push((lua_Number)(UserEntity->getGender()));
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getPlayerName(CLuaState &ls)
+{
+	checkArgCount(ls, "getPlayerName", 0);
+	ls.push(UserEntity->getEntityName().toUtf8());
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getPlayerTitleRaw(CLuaState &ls)
+{
+	checkArgCount(ls, "getPlayerTitleRaw", 0);
+	ls.push(UserEntity->getTitleRaw().toUtf8());
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getPlayerTitle(CLuaState &ls)
+{
+	checkArgCount(ls, "getPlayerTitle", 0);
+	ls.push(UserEntity->getTitle().toUtf8());
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getTargetPos(CLuaState &ls)
+{
+	checkArgCount(ls, "getTargetPos", 0);
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+	ls.push(target->pos().x);
+	ls.push(target->pos().y);
+	ls.push(target->pos().z);
+	return 3;
+}
+
+// ***************************************************************************
+int CLuaIHM::getTargetFront(CLuaState &ls)
+{
+	checkArgCount(ls, "getTargetFront", 0);
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+	ls.push(atan2(target->front().y, target->front().x));
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getTargetDirection(CLuaState &ls)
+{
+	checkArgCount(ls, "getTargetDirection", 0);
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+	ls.push(atan2(target->dir().y, target->dir().x));
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getTargetGender(CLuaState &ls)
+{
+	checkArgCount(ls, "getTargetGender", 0);
+	CCharacterCL* target = (CCharacterCL*)getTargetEntity();
+	if (!target) return (int)GSGENDER::unknown;
+	ls.push((lua_Number)(target->getGender()));
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getTargetName(CLuaState &ls)
+{
+	checkArgCount(ls, "getTargetName", 0);
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+	ls.push(target->getEntityName().toUtf8());
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getTargetTitleRaw(CLuaState &ls)
+{
+	checkArgCount(ls, "getTargetTitleRaw", 0);
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+	ls.push(target->getTitleRaw().toUtf8());
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getTargetTitle(CLuaState &ls)
+{
+	checkArgCount(ls, "getTargetTitle", 0);
+	CEntityCL *target = getTargetEntity();
+	if (!target) return 0;
+	ls.push(target->getTitle().toUtf8());
+	return 1;
+}
+
 // ***************************************************************************
 int CLuaIHM::addSearchPathUser(CLuaState &ls)
 {
@@ -4437,3 +4797,23 @@ int CLuaIHM::getSheet2idx(CLuaState &ls)
 	return 1;
 }
 
+// ***************************************************************************
+int CLuaIHM::getTargetSlot(CLuaState &ls)
+{
+	uint32 slot = (uint32)getTargetSlotNr();
+	ls.push((lua_Number)slot);
+	return 1;
+}
+
+// ***************************************************************************
+int CLuaIHM::getSlotDataSetId(CLuaState &ls)
+{
+	CLuaIHM::checkArgCount(ls, "getSlotDataSetId", 1);
+	CLuaIHM::checkArgType(ls, "getSlotDataSetId", 1, LUA_TNUMBER);
+
+	uint32 slot = (uint32)ls.toNumber(1);
+	CEntityCL *e = getSlotEntity(slot);
+	string id = toString(e->dataSetId());
+	ls.push(id);
+	return 1;
+}
diff --git a/code/ryzom/client/src/interface_v3/lua_ihm.h b/code/ryzom/client/src/interface_v3/lua_ihm.h
index 6a11a5c91..12d8b5459 100644
--- a/code/ryzom/client/src/interface_v3/lua_ihm.h
+++ b/code/ryzom/client/src/interface_v3/lua_ihm.h
@@ -185,9 +185,16 @@ private:
 
 	// LUA exported Functions with luabind
 	static sint32		getPlayerLevel();		// get max level among player skills (magi, combat, crafting ,foraging)
+	static sint64		getPlayerVpa();
+	static sint64		getPlayerVpb();
+	static sint64		getPlayerVpc();
 	static sint32		getTargetLevel();		// get current, precise level of the selected target, or -1 if there's no such selected target
 	static sint32		getTargetForceRegion(); // get 'force region' for current target, or -1 if there's no selected target
-	static sint32		getTargetLevelForce();  // get 'level force' for current target, or -1 if there's no selected target
+	static sint32		getTargetLevelForce();	// get 'level force' for current target, or -1 if there's no selected target
+	static ucstring		getTargetSheet();		// get the name of the target sheet (like 'zoha2old.creature')
+	static sint64		getTargetVpa();
+	static sint64		getTargetVpb();
+	static sint64		getTargetVpc();
 	static bool			isTargetNPC(); // return 'true' if the target is an npc
 	static bool			isTargetPlayer(); // return 'true' if the target is a player
 	static bool			isTargetUser(); // return 'true' if the target is the user
@@ -202,10 +209,12 @@ private:
 	static bool			isInGame();
 	static uint32		getPlayerSelectedSlot();
 	static bool			isPlayerSlotNewbieLand(uint32 slot);  // test if one of the player slot is a newbieland one, if not so, client must be patched in order to continue
-	static uint32       getLocalTime();
+	static uint32		getLocalTime();
 	static double		getPreciseLocalTime();
 	static sint32		getDbProp(const std::string &dbProp);					// return 0 if not found.
 	static void			setDbProp(const std::string &dbProp, sint32 value);		// Nb: the db prop is not created if not present.
+	static void			addDbProp(const std::string &dbProp, sint32 value);		// Nb: the db prop is created if not present.
+	static void			delDbProp(const std::string &dbProp);
 	static std::string	getDefine(const std::string &def);
 	static void			messageBox(const ucstring &text);
 	static void			messageBox(const ucstring &text, const std::string &masterGroup);
@@ -286,17 +295,24 @@ private:
 	static int	getUICaller(CLuaState &ls);		// params: none. return: CInterfaceElement*  (nil if error)
 	static int	getCurrentWindowUnder(CLuaState &ls);		// params: none. return: CInterfaceElement*  (nil if none)
 	static int	getUI(CLuaState &ls);			// params: "ui:interface:...". return: CInterfaceElement*  (nil if error), an additionnal boolean parameter
-	                                            //         can specify verbose display when the element is note found (default is true)
+												//		   can specify verbose display when the element is note found (default is true)
 	static int  createGroupInstance(CLuaState &ls); // params : param 1 = template name,
-	                                                // param 2 = id of parent where the instance will be inserted
-	                                                // param 3 = table with ("template_param", "template_param_value") key/value pairs
+													// param 2 = id of parent where the instance will be inserted
+													// param 3 = table with ("template_param", "template_param_value") key/value pairs
 													// such as { id="foo", x="10" } etc. -> returns a new instance of the template, or nil on fail
+	static int  createRootGroupInstance(CLuaState &ls); // params : param 1 = template name,
+														// param 2 = id of parent where the instance will be inserted
+														// param 3 = table with ("template_param", "template_param_value") key/value pairs
+														// such as { id="foo", x="10" } etc. -> returns a new instance of the template, or nil on fail
 	static int  createUIElement(CLuaState &ls); // params : param 1 = template name,
-	                                            // param 2 = id of parent where the instance will be inserted
-	                                            // param 3 = table with ("template_param", "template_param_value") key/value pairs
+												// param 2 = id of parent where the instance will be inserted
+												// param 3 = table with ("template_param", "template_param_value") key/value pairs
 											    // such as { id="foo", x="10" } etc. -> returns a new instance of the template, or nil on fail
 
-
+	static int	displayBubble(CLuaState &ls);	// params : param 1 = bot id
+												// param 2 = text
+												// param 3 = table with all strings and urls
+												// {"main text"="http:///", "text option 1"="http:///", "text option 2"="http:///") etc...
 	static int	getIndexInDB(CLuaState &ls);	// params: CDBCtrlSheet*.... return: index, or 0 if error
 	static int	getUIId(CLuaState &ls);			// params: CInterfaceElement*. return: ui id (empty if error)
 	static int	runAH(CLuaState &ls);			// params: CInterfaceElement *, "ah", "params". return: none
@@ -334,9 +350,9 @@ private:
 	static int  getServerSeason(CLuaState &ls); // get the last season sent by the server
 												// 0->auto, computed locally from the current day (or not received from server yet)
 												// 1->server force spring
-												// 2->' '        ' summer
-												// 3->' '        ' autumn
-												// 4->' '        ' winter
+												// 2->' '		 ' summer
+												// 3->' '		 ' autumn
+												// 4->' '		 ' winter
 	static int	computeCurrSeason(CLuaState &ls); // compute current displayed season (1->spring, etc .)
 	static int	getAutoSeason(CLuaState &ls); // compute automatic season that would be at this time (1->spring, etc .)
 
@@ -345,6 +361,19 @@ private:
 	static int	enableModalWindow(CLuaState &ls);
 	static int	disableModalWindow(CLuaState &ls);
 	static int	getPlayerPos(CLuaState &ls);
+	static int	getPlayerFront(CLuaState &ls);
+	static int	getPlayerDirection(CLuaState &ls);
+	static int	getPlayerGender(CLuaState &ls);
+	static int	getPlayerName(CLuaState &ls);
+	static int	getPlayerTitleRaw(CLuaState &ls);
+	static int	getPlayerTitle(CLuaState &ls);
+	static int	getTargetPos(CLuaState &ls);
+	static int	getTargetFront(CLuaState &ls);
+	static int	getTargetDirection(CLuaState &ls);
+	static int	getTargetGender(CLuaState &ls);
+	static int	getTargetName(CLuaState &ls);
+	static int	getTargetTitleRaw(CLuaState &ls);
+	static int	getTargetTitle(CLuaState &ls);
 	static int  addSearchPathUser(CLuaState &ls);
 	static int  getClientCfgVar(CLuaState &ls);
 	static int	isPlayerFreeTrial(CLuaState &ls);
@@ -352,6 +381,8 @@ private:
 	static int  isInRingMode(CLuaState &ls);
 	static int  getUserRace(CLuaState &ls);
 	static int  getSheet2idx(CLuaState &ls);
+	static int	getTargetSlot(CLuaState &ls);
+	static int  getSlotDataSetId(CLuaState &ls);
 
 
 	// LUA functions exported for Dev only (debug)
diff --git a/code/ryzom/client/src/interface_v3/macrocmd_key.cpp b/code/ryzom/client/src/interface_v3/macrocmd_key.cpp
index 6ebc3ccd6..2c4fbc24c 100644
--- a/code/ryzom/client/src/interface_v3/macrocmd_key.cpp
+++ b/code/ryzom/client/src/interface_v3/macrocmd_key.cpp
@@ -582,12 +582,14 @@ void CModalContainerEditCmd::activateFrom (const std::string &cmdName, const std
 	pCB = dynamic_cast<CDBGroupComboBox*>(pIM->getElementFromId(WinName+WIN_EDITCMD_COMBO_CATEGORY));
 	pCB->setSelection(catCBIndex);
 	onChangeCategory();
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 	//pIM->runActionHandler("editcmd_change_category",NULL);
 	pCB = dynamic_cast<CDBGroupComboBox*>(pIM->getElementFromId(WinName+WIN_EDITCMD_COMBO_ACTION));
 	pCB->setSelection(actCBIndex);
 	onChangeAction();
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 	//pIM->runActionHandler("editcmd_change_action",NULL);
 
 	// Count number of displayed param
diff --git a/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp b/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp
index 352d0ca0d..e4555d092 100644
--- a/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/macrocmd_manager.cpp
@@ -488,7 +488,8 @@ void CMacroCmdManager::updateMacroExecution ()
 			pIM->runActionHandler(rC.Name, NULL, rC.Params);
 
 			// Flush interface links (else bug with Macro "Select ShortCutBar/Run Shortcut"
-			CCDBNodeBranch::flushObserversCalls();
+			IngameDbMngr.flushObserverCalls();
+			CInterfaceManager::getInstance()->flushObserverCalls();
 
 			if (bWaitForServer)
 			{
diff --git a/code/ryzom/client/src/interface_v3/obs_huge_list.h b/code/ryzom/client/src/interface_v3/obs_huge_list.h
index 04ab62ad7..477eaf998 100644
--- a/code/ryzom/client/src/interface_v3/obs_huge_list.h
+++ b/code/ryzom/client/src/interface_v3/obs_huge_list.h
@@ -76,7 +76,7 @@
  * \author Nevrax France
  * \date August 2003
  */
-class CHugeListObs : public ICDBNode::IPropertyObserver
+class CHugeListObs : public NLMISC::ICDBNode::IPropertyObserver
 {
 public:
 
@@ -119,39 +119,39 @@ private:
 	class CItemDBLeaves
 	{
 	public:
-		CCDBNodeLeaf *GuildIcon;	// valid only for ascensor
-		CCDBNodeLeaf *GuildName;	// valid only for ascensor
+		NLMISC::CCDBNodeLeaf *GuildIcon;	// valid only for ascensor
+		NLMISC::CCDBNodeLeaf *GuildName;	// valid only for ascensor
 		//
-		CCDBNodeLeaf *SlotType;
-		CCDBNodeLeaf *Quality;
-		CCDBNodeLeaf *SheetIDOrSkill;
+		NLMISC::CCDBNodeLeaf *SlotType;
+		NLMISC::CCDBNodeLeaf *Quality;
+		NLMISC::CCDBNodeLeaf *SheetIDOrSkill;
 		//
-		CCDBNodeLeaf *LogicTextID;	// valid if the item is to be obtained for a mission
-		CCDBNodeLeaf *DescTextID;	// valid if the item is to be obtained for a mission
+		NLMISC::CCDBNodeLeaf *LogicTextID;	// valid if the item is to be obtained for a mission
+		NLMISC::CCDBNodeLeaf *DescTextID;	// valid if the item is to be obtained for a mission
 		//
-		CCDBNodeLeaf *Price;		// valid if the item is to be obtained with money
+		NLMISC::CCDBNodeLeaf *Price;		// valid if the item is to be obtained with money
 		//
-		CCDBNodeLeaf *MissionText;
-		CCDBNodeLeaf *MissionDetailText;
-		CCDBNodeLeaf *MissionIcon;
-		CCDBNodeLeaf *MissionPreReqState;
+		NLMISC::CCDBNodeLeaf *MissionText;
+		NLMISC::CCDBNodeLeaf *MissionDetailText;
+		NLMISC::CCDBNodeLeaf *MissionIcon;
+		NLMISC::CCDBNodeLeaf *MissionPreReqState;
 		//	items only
-		CCDBNodeLeaf *Weight;
-		CCDBNodeLeaf *NameId;
-		CCDBNodeLeaf *InfoVersion;
-		CCDBNodeLeaf *UserColor;
-		CCDBNodeLeaf *Enchant;
-		CCDBNodeLeaf *RMClassType;
-		CCDBNodeLeaf *RMFaberStatType;
-		CCDBNodeLeaf *PrerequisitValid;
+		NLMISC::CCDBNodeLeaf *Weight;
+		NLMISC::CCDBNodeLeaf *NameId;
+		NLMISC::CCDBNodeLeaf *InfoVersion;
+		NLMISC::CCDBNodeLeaf *UserColor;
+		NLMISC::CCDBNodeLeaf *Enchant;
+		NLMISC::CCDBNodeLeaf *RMClassType;
+		NLMISC::CCDBNodeLeaf *RMFaberStatType;
+		NLMISC::CCDBNodeLeaf *PrerequisitValid;
 		// items Resale only
-		CCDBNodeLeaf *Quantity;
-		CCDBNodeLeaf *PriceRetire;
-		CCDBNodeLeaf *ResaleTimeLeft;
-		CCDBNodeLeaf *VendorNameId;
-		CCDBNodeLeaf *FactionType;
-		CCDBNodeLeaf *FactionPointPrice;
-		CCDBNodeLeaf *SellerType;
+		NLMISC::CCDBNodeLeaf *Quantity;
+		NLMISC::CCDBNodeLeaf *PriceRetire;
+		NLMISC::CCDBNodeLeaf *ResaleTimeLeft;
+		NLMISC::CCDBNodeLeaf *VendorNameId;
+		NLMISC::CCDBNodeLeaf *FactionType;
+		NLMISC::CCDBNodeLeaf *FactionPointPrice;
+		NLMISC::CCDBNodeLeaf *SellerType;
 	public:
 		CItemDBLeaves() :	GuildIcon(NULL),
 							GuildName(NULL),
@@ -182,7 +182,7 @@ private:
 		{}
 	};
 	//
-	virtual void update(ICDBNode *node);
+	virtual void update(NLMISC::ICDBNode *node);
 
 	void updateUIItemPage(uint index);
 
@@ -199,9 +199,9 @@ private:
 	bool			_Init;
 	CItemDBLeaves	_Items[TRADE_PAGE_NUM_ITEMS];
 	sint16			_CurrentSessionNb;
-	CCDBNodeLeaf	*_Session;
-	CCDBNodeLeaf	*_PageID;
-	CCDBNodeLeaf	*_HasNext;
+	NLMISC::CCDBNodeLeaf	*_Session;
+	NLMISC::CCDBNodeLeaf	*_PageID;
+	NLMISC::CCDBNodeLeaf	*_HasNext;
 
 	bool			 _DownloadComplete;
 
@@ -272,8 +272,8 @@ private:
 	uint32							_PhraseClientFillFlags;
 	uint32							_PhraseClientFillRace;
 	uint32							_PhraseClientFillNumPhrase;
-	CCDBNodeLeaf					*_RoleMasterFlagDB;
-	CCDBNodeLeaf					*_RoleMasterRaceDB;
+	NLMISC::CCDBNodeLeaf					*_RoleMasterFlagDB;
+	NLMISC::CCDBNodeLeaf					*_RoleMasterRaceDB;
 };
 
 #endif
diff --git a/code/ryzom/client/src/interface_v3/people_interraction.cpp b/code/ryzom/client/src/interface_v3/people_interraction.cpp
index e98013f9a..ba67661bf 100644
--- a/code/ryzom/client/src/interface_v3/people_interraction.cpp
+++ b/code/ryzom/client/src/interface_v3/people_interraction.cpp
@@ -40,6 +40,7 @@
 #include "../net_manager.h"
 #include "../connection.h"
 #include "group_tab.h"
+#include "guild_manager.h"
 // Game share
 #include "game_share/entity_types.h"
 // NeL
@@ -1418,7 +1419,50 @@ void CPeopleInterraction::updateContactInList(uint32 contactId, TCharConnectionS
 	{
 		sint index = FriendList.getIndexFromContactId(contactId);
 		if (index != -1)
-			FriendList.setOnline(index, online);
+		{
+			// Only do work if online status has changed
+			if (FriendList.getOnline(index) != online)
+			{
+				CCDBNodeLeaf* node = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_ONLINE_OFFLINE_NOTIFICATIONS_CB", false);
+				if (node && node->getValueBool())
+				{
+					// Only show the message if this player is not in my guild (because then the guild manager will show a message)
+					std::vector<SGuildMember> GuildMembers = CGuildManager::getInstance()->getGuildMembers();
+					bool bOnlyFriend = true;
+					ucstring name = toLower(FriendList.getName(index));
+					for (uint i = 0; i < GuildMembers.size(); ++i)
+					{
+						if (toLower(GuildMembers[i].Name) == name)
+						{
+							bOnlyFriend = false;
+							break;
+						}
+					}
+					
+					TCharConnectionState prevState = FriendList.getOnline(index);
+					bool showMsg = bOnlyFriend && (prevState == ccs_offline || online == ccs_offline);
+
+					// Player is not in my guild, and the status change is from offline to online/abroad online or vice versa. 
+					if (showMsg)
+					{
+						ucstring msg = (online != ccs_offline) ? CI18N::get("uiPlayerOnline") : CI18N::get("uiPlayerOffline");
+						strFindReplace(msg, "%s", FriendList.getName(index));
+						string cat = getStringCategory(msg, msg);
+						map<string, CClientConfig::SSysInfoParam>::const_iterator it;
+						NLMISC::CRGBA col = CRGBA::Yellow;
+						it = ClientCfg.SystemInfoParams.find(toLower(cat));
+						if (it != ClientCfg.SystemInfoParams.end())
+						{
+							col = it->second.Color;
+						}
+						bool dummy;
+						PeopleInterraction.ChatInput.AroundMe.displayMessage(msg, col, 2, &dummy);
+					}
+				}
+
+				FriendList.setOnline(index, online);
+			}
+		}
 	}
 	else
 	{
@@ -1988,6 +2032,39 @@ public:
 };
 REGISTER_ACTION_HANDLER( CHandlerDismissMember, "dismiss_member");
 
+//=================================================================================================================
+// Set the leader of the team
+class CHandlerSetTeamLeader : public IActionHandler
+{
+public:
+	void execute (CCtrlBase * /* pCaller */, const std::string &/* sParams */)
+	{
+		// retrieve the index of the people
+		CPeopleList *list;
+		uint peopleIndex;
+		if (PeopleInterraction.getPeopleFromCurrentMenu(list, peopleIndex))
+		{
+			if (list == &PeopleInterraction.TeamList) // check for good list
+			{
+				/*
+				const string msgName = "TEAM:SET_LEADER";
+				CBitMemStream out;
+				if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
+				{
+					uint8 teamMember = (uint8)(peopleIndex);
+					out.serial(teamMember);
+					NetMngr.push(out);
+					//nlinfo("impulseCallBack : %s %d sent", msgName.c_str(), teamMember);
+				}
+				else
+					nlwarning("command 'set_leader': unknown message named '%s'.", msgName.c_str());
+				*/
+				NLMISC::ICommand::execute("a setTeamLeader " + toString(peopleIndex), g_log);
+			}
+		}
+	}
+};
+REGISTER_ACTION_HANDLER( CHandlerSetTeamLeader, "set_team_leader");
 
 //=================================================================================================================
 // Set a successor for the team
@@ -2014,7 +2091,7 @@ public:
 					if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
 					{
 						uint8 teamMember = (uint8) peopleIndex;
-						out.serialEnum(teamMember);
+						out.serial(teamMember);
 						NetMngr.push(out);
 						//nlinfo("impulseCallBack : %s %d sent", msgName.c_str(), teamMember);
 					}
@@ -3236,6 +3313,12 @@ NLMISC_COMMAND(chatLog, "", "")
 	if (pIM->getLogState())
 		pIM->displaySystemInfo(CI18N::get("uiLogTurnedOn"));
 
+	CCDBNodeLeaf *node = pIM->getDbProp("UI:SAVE:CHATLOG_STATE", false);
+	if (node)
+	{
+		node->setValue32(pIM->getLogState() ? 1 : 0);
+	}
+
 	return true;
 };
 
diff --git a/code/ryzom/client/src/interface_v3/people_list.cpp b/code/ryzom/client/src/interface_v3/people_list.cpp
index ac4764e15..395935aab 100644
--- a/code/ryzom/client/src/interface_v3/people_list.cpp
+++ b/code/ryzom/client/src/interface_v3/people_list.cpp
@@ -211,7 +211,8 @@ bool CPeopleList::sortExByOnline(const CPeople& a, const CPeople& b)
 	{
 		return (name_a < name_b);
 	}
-	else {
+	else
+	{
 		// Compare online status
 		switch (a.Online)
 		{
@@ -467,18 +468,12 @@ void CPeopleList::displayLocalPlayerTell(const ucstring &receiver, uint index, c
 		return;
 	}
 
-	ucstring cur_time;
-	CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
-	if (pNL && pNL->getValueBool())
-		cur_time = CInterfaceManager::getTimestampHuman();
-
- 	ucstring csr;
-	if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
-	ucstring finalMsg = cur_time + csr + CI18N::get("youTell") + ": " + msg;
+ 	ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
+	ucstring finalMsg = csr + CI18N::get("youTell") + ": " + msg;
 	// display msg with good color
 	CInterfaceProperty prop;
 	prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
-	
+
 	ucstring s = CI18N::get("youTellPlayer");
 	strFindReplace(s, "%name", receiver);
 	strFindReplace(finalMsg, CI18N::get("youTell"), s);
@@ -783,10 +778,6 @@ void CPeopleList::setOnline(uint index, TCharConnectionState online)
 
 	_Peoples[index].Online = online;
 
-	// If the people goes offline remove eventually opened chat
-	if (online == ccs_offline)
-		openCloseChat(index, false);
-
 	updatePeopleMenu(index);
 }
 
@@ -944,14 +935,8 @@ class CHandlerContactEntry : public IActionHandler
 				ucstring final;
 				CChatWindow::encodeColorTag(prop.getRGBA(), final, false);
 
-				ucstring cur_time;
-				CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
-				if (pNL && pNL->getValueBool())
-					cur_time = CInterfaceManager::getTimestampHuman();
-
-				ucstring csr;
-				if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
-				final += cur_time + csr + CI18N::get("youTell")+": ";
+				ucstring csr(CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "");
+				final += csr + CI18N::get("youTell")+": ";
 				prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
 				CChatWindow::encodeColorTag(prop.getRGBA(), final, true);
 				final += text;
@@ -962,7 +947,6 @@ class CHandlerContactEntry : public IActionHandler
 				strFindReplace(final, CI18N::get("youTell"), s);
 				CInterfaceManager::getInstance()->log(final);
 			}
-
 		}
 	}
 };
diff --git a/code/ryzom/client/src/interface_v3/player_trade.cpp b/code/ryzom/client/src/interface_v3/player_trade.cpp
index 7307110d9..ebc618ec7 100644
--- a/code/ryzom/client/src/interface_v3/player_trade.cpp
+++ b/code/ryzom/client/src/interface_v3/player_trade.cpp
@@ -139,6 +139,7 @@ void CPlayerTrade::restoreItem(CDBCtrlSheet *exchangeSlot)
 		im.getBagItem(emptySlot).setWeight((uint32) exchangeSlot->getItemWeight());
 		im.getBagItem(emptySlot).setNameId(exchangeSlot->getItemNameId());
 		im.getBagItem(emptySlot).setInfoVersion(exchangeSlot->getItemInfoVersion());
+		im.getBagItem(emptySlot).setResaleFlag(exchangeSlot->getItemResaleFlag());
 	}
 
 
diff --git a/code/ryzom/client/src/interface_v3/sbrick_manager.cpp b/code/ryzom/client/src/interface_v3/sbrick_manager.cpp
index 64c651b46..ec29be009 100644
--- a/code/ryzom/client/src/interface_v3/sbrick_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/sbrick_manager.cpp
@@ -132,7 +132,7 @@ void CSBrickManager::initInGame()
 	}
 
 	// Add a branch observer on brick family
-	pIM->getDbBranch("SERVER:BRICK_FAMILY")->addBranchObserver(&_BrickFamilyObs);
+	pIM->addBranchObserver( "SERVER:BRICK_FAMILY", &_BrickFamilyObs);
 }
 
 // ***************************************************************************
diff --git a/code/ryzom/client/src/interface_v3/sbrick_manager.h b/code/ryzom/client/src/interface_v3/sbrick_manager.h
index 7d9d5943c..3ef3c3293 100644
--- a/code/ryzom/client/src/interface_v3/sbrick_manager.h
+++ b/code/ryzom/client/src/interface_v3/sbrick_manager.h
@@ -23,7 +23,7 @@
 #include "../client_sheets/sbrick_sheet.h"
 #include "game_share/sabrina_com.h"
 #include "game_share/skills.h"
-#include "../cdb.h"
+#include "nel/misc/cdb.h"
 #include "brick_learned_callback.h"
 
 
@@ -83,7 +83,7 @@ public:
 	/**
 	 * \return the DB pointing on the BitField for this family.
 	 */
-	class CCDBNodeLeaf*	getKnownBrickBitFieldDB(uint family) const;
+	class NLMISC::CCDBNodeLeaf*	getKnownBrickBitFieldDB(uint family) const;
 
 	/**
 	 * \return true if the brick is learn by the player.
@@ -159,7 +159,7 @@ protected:
 	std::vector <std::vector<NLMISC::CSheetId> > _SheetsByFamilies;
 
 	///vector of bit fields describing the known bricks of each family
-	std::vector<CCDBNodeLeaf*>		_FamiliesBits;
+	std::vector<NLMISC::CCDBNodeLeaf*>		_FamiliesBits;
 
 	/// list of roots only
 	std::vector <NLMISC::CSheetId>	_Roots;
@@ -195,11 +195,11 @@ protected:
 	NLMISC::CSheetId	_InterfaceRemoveBrick;
 
 	// Observer when a brick is learned
-	struct CBrickFamilyObs : public ICDBNode::IPropertyObserver
+	struct CBrickFamilyObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
 		CSBrickManager		*Owner;
 
-		virtual void update (ICDBNode *node);
+		virtual void update (NLMISC::ICDBNode *node);
 	};
 	friend struct CBrickFamilyObs;
 	CBrickFamilyObs			_BrickFamilyObs;
diff --git a/code/ryzom/client/src/interface_v3/skill_manager.cpp b/code/ryzom/client/src/interface_v3/skill_manager.cpp
index 677084e5e..d335f0c33 100644
--- a/code/ryzom/client/src/interface_v3/skill_manager.cpp
+++ b/code/ryzom/client/src/interface_v3/skill_manager.cpp
@@ -24,7 +24,7 @@
 #include "game_share/character_title.h"
 #include "game_share/fame.h"
 #include "../sheet_manager.h"
-#include "../cdb_leaf.h"
+#include "nel/misc/cdb_leaf.h"
 #include "action_handler.h"
 #include "sbrick_manager.h"
 #include "dbgroup_combo_box.h"
@@ -158,7 +158,7 @@ void CSkillManager::initInGame()
 	// Get a node used to inform interface that a skill has changed
 	_TrackSkillChange= pIM->getDbProp("UI:VARIABLES:TRACK_SKILL_CHANGE", true);
 	// Add a branch observer on skill value change
-	pIM->getDbBranch("SERVER:CHARACTER_INFO:SKILLS")->addBranchObserver(&_SkillChangeObs);
+	pIM->addBranchObserver( "SERVER:CHARACTER_INFO:SKILLS", &_SkillChangeObs );
 
 }
 
@@ -1042,7 +1042,7 @@ void CSkillManager::setPlayerTitle(const std::string &name)
 // ***************************************************************************
 // ***************************************************************************
 
-#define GROUP_TITLE_COMBO "ui:interface:info_player_skills:content:basics_skills:title:player_title"
+#define GROUP_TITLE_COMBO "ui:interface:info_player_skills:content:webinfos:title:player_title"
 
 // ***************************************************************************
 class CHandlerTitleInit: public IActionHandler
diff --git a/code/ryzom/client/src/interface_v3/skill_manager.h b/code/ryzom/client/src/interface_v3/skill_manager.h
index 7c710a391..60a144603 100644
--- a/code/ryzom/client/src/interface_v3/skill_manager.h
+++ b/code/ryzom/client/src/interface_v3/skill_manager.h
@@ -23,7 +23,7 @@
 #include "game_share/skills.h"
 //#include "game_share/jobs.h"
 #include "game_share/roles.h"
-#include "../cdb.h"
+#include "nel/misc/cdb.h"
 #include "brick_learned_callback.h"
 #include "skill_change_callback.h"
 
@@ -189,16 +189,16 @@ private:
 	uint32					_MinSkillValue[SKILLS::NUM_SKILLS];
 
 	/// Nodes on skill values and base values
-	CCDBNodeLeaf			*_SkillValues[SKILLS::NUM_SKILLS];
-	CCDBNodeLeaf			*_SkillBaseValues[SKILLS::NUM_SKILLS];
+	NLMISC::CCDBNodeLeaf			*_SkillValues[SKILLS::NUM_SKILLS];
+	NLMISC::CCDBNodeLeaf			*_SkillBaseValues[SKILLS::NUM_SKILLS];
 
 	// Max child baseskill value (used when checking requirements)
 	uint32					_MaxChildBaseSkillValue[SKILLS::NUM_SKILLS];
 
 	// CallBack set for skill changes
-	struct CSkillChangeObs : public ICDBNode::IPropertyObserver
+	struct CSkillChangeObs : public NLMISC::ICDBNode::IPropertyObserver
 	{
-		virtual void update (ICDBNode * /* node */)
+		virtual void update (NLMISC::ICDBNode * /* node */)
 		{
 			CSkillManager	*pSM= CSkillManager::getInstance();
 			pSM->onSkillChange();
@@ -214,7 +214,7 @@ private:
 	sint32					_CacheSkillBaseValues[SKILLS::NUM_SKILLS];
 
 	// A node incremented at each change of skill (the number is not relevant)
-	CCDBNodeLeaf			*_TrackSkillChange;
+	NLMISC::CCDBNodeLeaf			*_TrackSkillChange;
 
 	// "Title of the player" Management
 	// -----------------------------------------------------------------------------
diff --git a/code/ryzom/client/src/interface_v3/sphrase_manager.h b/code/ryzom/client/src/interface_v3/sphrase_manager.h
index bf40dcc35..f14dfcf0d 100644
--- a/code/ryzom/client/src/interface_v3/sphrase_manager.h
+++ b/code/ryzom/client/src/interface_v3/sphrase_manager.h
@@ -54,7 +54,9 @@ const	std::string		PHRASE_DB_COUNTER_CYCLE="SERVER:EXECUTE_PHRASE:CYCLE_COUNTER"
 // TODO_OPTIM: too big test for the list_sheet* each frame with 512 entries!!!
 
 class	CSuccessTableSheet;
+namespace NLMISC{
 class	CCDBNodeLeaf;
+}
 
 
 /** Special helper class for lua export : enclose a phrase into an object accessible to lua
@@ -457,11 +459,11 @@ private:
 	CTickRange								_BrickRegenRange[64];
 
 	// Shortcut To Phrases Leaves
-	std::vector<CCDBNodeLeaf*>				_BookDbLeaves;
-	std::vector<CCDBNodeLeaf*>				_MemoryDbLeaves;
-	std::vector<CCDBNodeLeaf*>				_MemoryAltDbLeaves;
-	CCDBNodeLeaf							*_NextExecuteLeaf;
-	CCDBNodeLeaf							*_NextExecuteIsCyclicLeaf;
+	std::vector<NLMISC::CCDBNodeLeaf*>				_BookDbLeaves;
+	std::vector<NLMISC::CCDBNodeLeaf*>				_MemoryDbLeaves;
+	std::vector<NLMISC::CCDBNodeLeaf*>				_MemoryAltDbLeaves;
+	NLMISC::CCDBNodeLeaf							*_NextExecuteLeaf;
+	NLMISC::CCDBNodeLeaf							*_NextExecuteIsCyclicLeaf;
 
 	// extra client data
 	struct	CPhraseClient
@@ -582,8 +584,8 @@ private:
 	void	updateMemoryCtrlState(uint memorySlot);
 
 	// Shortcut To PhraseSheets Leaves in BotChat
-	std::vector<CCDBNodeLeaf*>				_BotChatPhraseSheetLeaves;
-	std::vector<CCDBNodeLeaf*>				_BotChatPhrasePriceLeaves;
+	std::vector<NLMISC::CCDBNodeLeaf*>				_BotChatPhraseSheetLeaves;
+	std::vector<NLMISC::CCDBNodeLeaf*>				_BotChatPhrasePriceLeaves;
 
 	// For phrase compatibility with enchant weapon special power
 	NLMISC::CSheetId						_EnchantWeaponMainBrick;
@@ -597,9 +599,9 @@ private:
 
 		NumProgressType
 	};
-	std::vector<CCDBNodeLeaf*>				_ProgressionDbSheets[NumProgressType];
-	std::vector<CCDBNodeLeaf*>				_ProgressionDbLevels[NumProgressType];
-	std::vector<CCDBNodeLeaf*>				_ProgressionDbLocks[NumProgressType];
+	std::vector<NLMISC::CCDBNodeLeaf*>				_ProgressionDbSheets[NumProgressType];
+	std::vector<NLMISC::CCDBNodeLeaf*>				_ProgressionDbLevels[NumProgressType];
+	std::vector<NLMISC::CCDBNodeLeaf*>				_ProgressionDbLocks[NumProgressType];
 
 	// For each skill, which phrase are learned when the skill is gained
 	class CPhraseProgressInfo
@@ -704,7 +706,7 @@ private:
 
 	CTickRange getRegenTickRange(const CSPhraseCom &phrase) const;
 
-	CCDBNodeLeaf	*getRegenTickRangeDbLeaf(uint powerIndex) const;
+	NLMISC::CCDBNodeLeaf	*getRegenTickRangeDbLeaf(uint powerIndex) const;
 	// get regen tick range for a specific power, from the database
 	CTickRange getRegenTickRange(uint powerIndex) const;
 public:
diff --git a/code/ryzom/client/src/interface_v3/view_base.h b/code/ryzom/client/src/interface_v3/view_base.h
index b568014a6..f4faaa204 100644
--- a/code/ryzom/client/src/interface_v3/view_base.h
+++ b/code/ryzom/client/src/interface_v3/view_base.h
@@ -70,6 +70,10 @@ public:
 
 	// from CInterfaceElement
 	virtual void visit(CInterfaceElementVisitor *visitor);
+
+	// special for mouse over : return true and fill the name of the cursor to display
+	virtual bool getMouseOverShape(std::string &/* texName */, uint8 &/* rot */, NLMISC::CRGBA &/* col */) { return false; }
+
 };
 
 
diff --git a/code/ryzom/client/src/interface_v3/view_bitmap.h b/code/ryzom/client/src/interface_v3/view_bitmap.h
index 9cfd9de09..670c6fdf7 100644
--- a/code/ryzom/client/src/interface_v3/view_bitmap.h
+++ b/code/ryzom/client/src/interface_v3/view_bitmap.h
@@ -72,6 +72,8 @@ public:
 
 	bool  getScale() const { return _Scale; }
 	void setScale (bool s) { _Scale = s; }
+	bool  getTile() const { return _Tile; }
+	void setTile (bool s) { _Tile = s; }
 	void setColor (const NLMISC::CRGBA &r) { _Color = r; }
 
 	// Reflected
diff --git a/code/ryzom/client/src/interface_v3/view_bitmap_combo.h b/code/ryzom/client/src/interface_v3/view_bitmap_combo.h
index 5a478ef1d..767499c95 100644
--- a/code/ryzom/client/src/interface_v3/view_bitmap_combo.h
+++ b/code/ryzom/client/src/interface_v3/view_bitmap_combo.h
@@ -20,7 +20,7 @@
 #ifndef NL_VIEW_BITMAP_COMBO_H
 #define NL_VIEW_BITMAP_COMBO_H
 
-#include "../cdb.h"
+#include "nel/misc/cdb.h"
 #include "view_base.h"
 #include "nel/3d/u_texture.h"
 #include <string>
@@ -67,7 +67,7 @@
 struct CComboBoxDesc
 {
 	bool	parse(xmlNodePtr cur, CInterfaceElement *owner);
-	void	addObserver(ICDBNode::IPropertyObserver *obs);
+	void	addObserver(NLMISC::ICDBNode::IPropertyObserver *obs);
 	void	getGridSize(uint &numRow,uint &numCol) const;
 	void    getDimensions(uint &width, uint &height) const;
 	CInterfaceProperty      NumRow;
@@ -94,7 +94,7 @@ struct CComboBoxDesc
  * \author Nevrax France
  * \date 2002
  */
-class CViewBitmapCombo : public CViewBase, public ICDBNode::IPropertyObserver
+class CViewBitmapCombo : public CViewBase, public NLMISC::ICDBNode::IPropertyObserver
 {
 public:
 	typedef std::vector<sint32> TIdArray;
@@ -160,7 +160,7 @@ private:
 	void	setupSize();
 	void	getDimensions(uint &numRow, uint &numCol);
 	// From ICDBNode::IPropertyObserver
-	void update(ICDBNode *leaf);
+	void update(NLMISC::ICDBNode *leaf);
 	// Return a color from the array, or white if it is empty
 	static NLMISC::CRGBA getCol(const TColorArray &array, uint index);
 	static const std::string   *getTex(const TStringArray &array, uint index);
diff --git a/code/ryzom/client/src/interface_v3/view_link.cpp b/code/ryzom/client/src/interface_v3/view_link.cpp
index 4b0426006..61421133e 100644
--- a/code/ryzom/client/src/interface_v3/view_link.cpp
+++ b/code/ryzom/client/src/interface_v3/view_link.cpp
@@ -42,5 +42,23 @@ void CViewLink::setHTMLView(CGroupHTML *html)
 	HTML = html;
 }
 
+// ***************************************************************************
+bool CViewLink::getMouseOverShape(string &texName, uint8 &rot, CRGBA &col)
+{
+	if (HTML != NULL)
+	{
+		if (!LinkTitle.empty())
+		{
+			texName = LinkTitle;
+			rot= 0;
+			col = CRGBA::White;
+			return true;
+		}
+	}
+	
+	return false;
+}
+
+
 // ***************************************************************************
 
diff --git a/code/ryzom/client/src/interface_v3/view_link.h b/code/ryzom/client/src/interface_v3/view_link.h
index 7a77f2b81..ba30fafd2 100644
--- a/code/ryzom/client/src/interface_v3/view_link.h
+++ b/code/ryzom/client/src/interface_v3/view_link.h
@@ -38,8 +38,11 @@ public:
 	// The URI
 	std::string		Link;
 
+	std::string		LinkTitle;
+
 	// Set the main group
 	void	setHTMLView(class CGroupHTML *html);
+	bool	getMouseOverShape(std::string &texName, uint8 &rot, NLMISC::CRGBA &col);
 
 protected:
 
diff --git a/code/ryzom/client/src/interface_v3/view_pointer.cpp b/code/ryzom/client/src/interface_v3/view_pointer.cpp
index 459ba3786..195977a6b 100644
--- a/code/ryzom/client/src/interface_v3/view_pointer.cpp
+++ b/code/ryzom/client/src/interface_v3/view_pointer.cpp
@@ -70,6 +70,7 @@ CViewPointer::CViewPointer (const TCtorParam &param)
 	_Color = CRGBA(255,255,255,255);
 	_LastHightLight = NULL;
 	_StringMode = false;
+	_ForceStringMode = false;
 	_StringCursor = NULL;
 }
 
@@ -255,6 +256,41 @@ void CViewPointer::draw ()
 		return;
 	}
 
+	const vector<CViewBase *> &vUP = pIM->getViewsUnderPointer ();
+
+	for(uint i=0;i<vUP.size();i++)
+	{
+		CViewLink *vLink = dynamic_cast<CViewLink*>(vUP[i]);
+		if (vLink != NULL)
+		{
+			string tooltip;
+			uint8 rot;
+
+			if (vLink->getMouseOverShape(tooltip, rot, col))
+			{
+				setString(ucstring(tooltip));
+				sint32 texId = rVR.getTextureIdFromName ("curs_pick.tga");
+
+				CInterfaceGroup *stringCursor = IsMouseCursorHardware() ? _StringCursorHardware : _StringCursor;
+				if (stringCursor)
+				{
+					stringCursor->setX(_PointerX);
+					stringCursor->setY(_PointerY);
+					stringCursor->updateCoords();
+					stringCursor->draw();
+					// if in hardware mode, force to draw the default cursor no matter what..
+					if (IsMouseCursorHardware())
+						drawCursor(texId, col, 0);
+				}
+				else
+				{
+					drawCursor(texId, col, 0);
+				}
+				return;
+			}
+		}
+	}
+
 	// Draw if capture right
 	pCB = pIM->getCapturePointerRight();
 	if (pCB != NULL)
@@ -521,16 +557,50 @@ bool CViewPointer::drawPan(CCtrlBase* pCB, NLMISC::CRGBA col)
 // --------------------------------------------------------------------------------------------------------------------
 bool CViewPointer::drawCustom(CCtrlBase* pCB)
 {
-	std::string texName;
+	string texName;
 	uint8 rot;
 	NLMISC::CRGBA col;
 	if (pCB->getMouseOverShape(texName, rot, col))
 	{
-		CInterfaceManager *pIM = CInterfaceManager::getInstance();
-		CViewRenderer &rVR = pIM->getViewRenderer();
-		sint32 texId = rVR.getTextureIdFromName (texName);
-		drawCursor(texId, col, 0);
-		return true;
+		if (texName[0] == '@')
+		{
+			const string &tooltipInfos = texName.substr(1);
+			string tooltip;
+			vector<string> tooltipInfosList;
+			splitString(tooltipInfos, "@", tooltipInfosList);
+			texName = tooltipInfosList[0];
+			tooltip = tooltipInfosList[1];
+			nlinfo(tooltip.c_str());
+			setString(ucstring(tooltip));
+			CInterfaceManager *pIM = CInterfaceManager::getInstance();
+			CViewRenderer &rVR = pIM->getViewRenderer();
+			sint32 texId = rVR.getTextureIdFromName (texName);
+
+			CInterfaceGroup *stringCursor = IsMouseCursorHardware() ? _StringCursorHardware : _StringCursor;
+			if (stringCursor)
+			{
+				stringCursor->setX(_PointerX);
+				stringCursor->setY(_PointerY);
+				stringCursor->updateCoords();
+				stringCursor->draw();
+				// if in hardware mode, force to draw the default cursor no matter what..
+				if (IsMouseCursorHardware())
+					drawCursor(texId, col, 0);
+			}
+			else
+			{
+				drawCursor(texId, col, 0);
+			}
+			return true;
+		}
+		else
+		{
+			CInterfaceManager *pIM = CInterfaceManager::getInstance();
+			CViewRenderer &rVR = pIM->getViewRenderer();
+			sint32 texId = rVR.getTextureIdFromName (texName);
+			drawCursor(texId, col, 0);
+			return true;
+		}
 	}
 	return false;
 }
diff --git a/code/ryzom/client/src/interface_v3/view_pointer.h b/code/ryzom/client/src/interface_v3/view_pointer.h
index 0ade8b2c7..42a20b0a0 100644
--- a/code/ryzom/client/src/interface_v3/view_pointer.h
+++ b/code/ryzom/client/src/interface_v3/view_pointer.h
@@ -153,6 +153,7 @@ private:
 
 	// Cursor mode
 	bool				_StringMode;
+	bool				_ForceStringMode;
 	CInterfaceGroup		*_StringCursor;
 	CInterfaceGroup		*_StringCursorHardware;
 	ucstring			_ContextString;
diff --git a/code/ryzom/client/src/interface_v3/view_renderer.cpp b/code/ryzom/client/src/interface_v3/view_renderer.cpp
index 833e9b47b..395b719af 100644
--- a/code/ryzom/client/src/interface_v3/view_renderer.cpp
+++ b/code/ryzom/client/src/interface_v3/view_renderer.cpp
@@ -749,8 +749,8 @@ void CViewRenderer::loadTextures (const std::string &textureFileName, const std:
 		image.UVMin.V = uvMinV;
 		image.UVMax.U = uvMaxU;
 		image.UVMax.V = uvMaxV;
-		sTGAname = tgaName;
-		sTGAname = toLower(sTGAname);
+		sTGAname = toLower(string(tgaName));
+
 		string::size_type stripPng = sTGAname.find(".png");
 		if (stripPng != string::npos)
 		{
@@ -758,6 +758,7 @@ void CViewRenderer::loadTextures (const std::string &textureFileName, const std:
 			sTGAname[stripPng + 2] = 'g';
 			sTGAname[stripPng + 3] = 'a';
 		}
+
 		image.Name = sTGAname;
 		image.GlobalTexturePtr = &(_GlobalTextures.back());
 		if (getTextureIdFromName(sTGAname) != -1)
@@ -1035,6 +1036,7 @@ sint32 CViewRenderer::getTextureIdFromName (const string &sName) const
 
 	// convert to lowCase
 	string nameLwr = toLower(sName);
+
 	string::size_type stripPng = nameLwr.find(".png");
 	if (stripPng != string::npos)
 	{
@@ -1042,7 +1044,7 @@ sint32 CViewRenderer::getTextureIdFromName (const string &sName) const
 		nameLwr[stripPng + 2] = 'g';
 		nameLwr[stripPng + 3] = 'a';
 	}
-	
+
 	// Search in map
 	TTextureMap::const_iterator		it= _TextureMap.find(nameLwr);
 	if( it==_TextureMap.end() )
@@ -1537,6 +1539,7 @@ void	CViewRenderer::initSystemTextures()
 	addSystemTexture(RegenTexture, "regen.tga");
 	addSystemTexture(RegenBackTexture, "regen_back.tga");
 	addSystemTexture(GlowStarTexture, "glow_star_24.tga");
+	addSystemTexture(ItemLockedByOwnerTexture, "r2ed_toolbar_lock_small.tga");
 }
 
 
diff --git a/code/ryzom/client/src/interface_v3/view_renderer.h b/code/ryzom/client/src/interface_v3/view_renderer.h
index eed178795..f5e46c5ae 100644
--- a/code/ryzom/client/src/interface_v3/view_renderer.h
+++ b/code/ryzom/client/src/interface_v3/view_renderer.h
@@ -65,6 +65,7 @@ public:
 		RegenTexture,
 		RegenBackTexture,
 		GlowStarTexture,
+		ItemLockedByOwnerTexture,
 		NumSystemTextures,		
 	};
 
diff --git a/code/ryzom/client/src/interface_v3/view_text_id.cpp b/code/ryzom/client/src/interface_v3/view_text_id.cpp
index 326f67362..533ccf194 100644
--- a/code/ryzom/client/src/interface_v3/view_text_id.cpp
+++ b/code/ryzom/client/src/interface_v3/view_text_id.cpp
@@ -28,6 +28,7 @@
 
 using namespace std;
 using namespace STRING_MANAGER;
+using NLMISC::CCDBNodeLeaf;
 
 NLMISC_REGISTER_OBJECT(CViewBase, CViewTextID, std::string, "text_id");
 
diff --git a/code/ryzom/client/src/interface_v3/view_text_id.h b/code/ryzom/client/src/interface_v3/view_text_id.h
index 836e55d58..91d6b5f6e 100644
--- a/code/ryzom/client/src/interface_v3/view_text_id.h
+++ b/code/ryzom/client/src/interface_v3/view_text_id.h
@@ -22,8 +22,9 @@
 #include "nel/misc/types_nl.h"
 #include "view_text.h"
 
-
+namespace NLMISC{
 class CCDBNodeLeaf;
+}
 
 // ***************************************************************************
 class IOnReceiveTextId
@@ -91,7 +92,7 @@ public:
 	  */
 	bool setDBTextID(const std::string &dbPath);
 	// set a text from a db leaf
-	void setDBLeaf(CCDBNodeLeaf *leaf);
+	void setDBLeaf(NLMISC::CCDBNodeLeaf *leaf);
 
 	std::string getTextIdDbLink() const;
 	void setTextIdDbLink(const std::string &link);
diff --git a/code/ryzom/client/src/interfaces_manager/scroll_bar.h b/code/ryzom/client/src/interfaces_manager/scroll_bar.h
index f9e42473a..5b2e248df 100644
--- a/code/ryzom/client/src/interfaces_manager/scroll_bar.h
+++ b/code/ryzom/client/src/interfaces_manager/scroll_bar.h
@@ -44,7 +44,7 @@ public:
 	CScrollBar(uint id, float x, float y, float x_pixel, float y_pixel, float w, float h, float w_pixel, float h_pixel, bool vertical = true,CScrollableControl *ctrl = NULL);
 
 	/// destructor
-	virtual ~CScrollBar() {};
+	virtual ~CScrollBar() {}
 
 	/// Display the control
 	virtual void display();
diff --git a/code/ryzom/client/src/libwww.cpp b/code/ryzom/client/src/libwww.cpp
index 966aeffa6..a1c0ce826 100644
--- a/code/ryzom/client/src/libwww.cpp
+++ b/code/ryzom/client/src/libwww.cpp
@@ -225,7 +225,10 @@ HTAttr p_attr[] =
 
 HTAttr div_attr[] =
 {
-	HTML_ATTR(DIV,NAME),
+	HTML_ATTR(DIV,CLASS),
+		HTML_ATTR(DIV,ID),
+		HTML_ATTR(DIV,NAME),
+		HTML_ATTR(DIV,STYLE),
 	{ 0 }
 };
 
@@ -535,6 +538,7 @@ const std::string &setCurrentDomain(const std::string &url)
 	return HTTPCurrentDomain;
 }
 
+
 void initLibWWW()
 {
 	static bool initialized = false;
diff --git a/code/ryzom/client/src/libwww.h b/code/ryzom/client/src/libwww.h
index 41db90a6c..2c6ed2ae0 100644
--- a/code/ryzom/client/src/libwww.h
+++ b/code/ryzom/client/src/libwww.h
@@ -206,7 +206,10 @@ enum
 
 enum
 {
-	HTML_ATTR(DIV,NAME) = 0,
+	HTML_ATTR(DIV,CLASS) = 0,
+	HTML_ATTR(DIV,ID),
+	HTML_ATTR(DIV,NAME),
+	HTML_ATTR(DIV,STYLE),
 };
 
 
diff --git a/code/ryzom/client/src/login.cpp b/code/ryzom/client/src/login.cpp
index d1dee738d..d8cfa7878 100644
--- a/code/ryzom/client/src/login.cpp
+++ b/code/ryzom/client/src/login.cpp
@@ -360,7 +360,8 @@ void loginMainLoop()
 			&& LoginSM.getCurrentState() != CLoginStateMachine::st_ingame)
 //	while (loginFinished == false)
 	{
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// Update the DT T0 and T1 global variables
 		updateClientTime();
@@ -378,7 +379,8 @@ void loginMainLoop()
 		// Interface handling & displaying
 		pIM->updateFrameEvents();
 		pIM->updateFrameViews(NULL);
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 
 
@@ -738,8 +740,10 @@ void initLoginScreen()
 	if(!l.empty())
 	{
 		CGroupEditBox *pGEB = dynamic_cast<CGroupEditBox*>(pIM->getElementFromId(CTRL_EDITBOX_LOGIN));
-		if (pGEB != NULL)
+		if (pGEB != NULL && (pGEB->getInputString().empty()))
+		{
 			pGEB->setInputString(l);
+		}
 		pIM->runActionHandler("set_keyboard_focus", NULL, "target=" CTRL_EDITBOX_PASSWORD "|select_all=false");
 	}
 	else
@@ -808,7 +812,8 @@ bool login()
 		loginIntro();
 
 	pIM->initLogin();
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	bool tmpDI = ClientCfg.DisableDirectInput;
 	ClientCfg.DisableDirectInput = true;
@@ -1922,21 +1927,21 @@ class CAHInitResLod : public IActionHandler
 		// first indicates the preset-able cfg-variable
 		// second indicates if its a double variable (else it's an int)
 		CfgPresetList.clear();
-		CfgPresetList.push_back(pair<string,bool>("LandscapeTileNear",	true));
-		CfgPresetList.push_back(pair<string,bool>("LandscapeThreshold",	true));
-		CfgPresetList.push_back(pair<string,bool>("Vision",				true));
-		CfgPresetList.push_back(pair<string,bool>("MicroVeget",			false));
-		CfgPresetList.push_back(pair<string,bool>("MicroVegetDensity",	true));
+		CfgPresetList.push_back(pair<string,bool>("LandscapeTileNear",		true));
+		CfgPresetList.push_back(pair<string,bool>("LandscapeThreshold",		true));
+		CfgPresetList.push_back(pair<string,bool>("Vision",					true));
+		CfgPresetList.push_back(pair<string,bool>("MicroVeget",				false));
+		CfgPresetList.push_back(pair<string,bool>("MicroVegetDensity",		true));
 		CfgPresetList.push_back(pair<string,bool>("FxNbMaxPoly",			false));
-		CfgPresetList.push_back(pair<string,bool>("Cloud",				false));
+		CfgPresetList.push_back(pair<string,bool>("Cloud",					false));
 		CfgPresetList.push_back(pair<string,bool>("CloudQuality",			true));
 		CfgPresetList.push_back(pair<string,bool>("CloudUpdate",			false));
 		CfgPresetList.push_back(pair<string,bool>("Shadows",				false));
-		CfgPresetList.push_back(pair<string,bool>("SkinNbMaxPoly",		false));
+		CfgPresetList.push_back(pair<string,bool>("SkinNbMaxPoly",			false));
 		CfgPresetList.push_back(pair<string,bool>("NbMaxSkeletonNotCLod",	false));
 		CfgPresetList.push_back(pair<string,bool>("CharacterFarClip",		true));
 
-		CfgPresetList.push_back(pair<string,bool>("Bloom",				false));
+		CfgPresetList.push_back(pair<string,bool>("Bloom",					false));
 		CfgPresetList.push_back(pair<string,bool>("SquareBloom",			false));
 		CfgPresetList.push_back(pair<string,bool>("DensityBloom",			true));
 
@@ -3029,8 +3034,8 @@ void loginIntro()
 
 			const ucstring nmsg("");
 			ProgressBar.newMessage (nmsg);
-
-			CCDBNodeBranch::flushObserversCalls();
+			IngameDbMngr.flushObserverCalls();
+			CInterfaceManager::getInstance()->flushObserverCalls();
 		}
 	}
 	beginLoading(StartBackground);
diff --git a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h b/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h
index 5a07d109a..8a8d25ff0 100644
--- a/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h
+++ b/code/ryzom/client/src/lua_ide_dll_nevrax/include/scintilla/Platform.h
@@ -277,8 +277,8 @@ private:
 	Surface(const Surface &) {}
 	Surface &operator=(const Surface &) { return *this; }
 public:
-	Surface() {};
-	virtual ~Surface() {};
+	Surface() {}
+	virtual ~Surface() {}
 	static Surface *Allocate();
 
 	virtual void Init()=0;
diff --git a/code/ryzom/client/src/main_loop.cpp b/code/ryzom/client/src/main_loop.cpp
index 81a63ae60..635e2476a 100644
--- a/code/ryzom/client/src/main_loop.cpp
+++ b/code/ryzom/client/src/main_loop.cpp
@@ -1638,7 +1638,8 @@ bool mainLoop()
 
 
 			// flush observers
-			CCDBNodeBranch::flushObserversCalls();
+			IngameDbMngr.flushObserverCalls();
+			CInterfaceManager::getInstance()->flushObserverCalls();
 		}
 
 
@@ -1655,7 +1656,8 @@ bool mainLoop()
 
 			// NetWork Update.
 			NetMngr.update();
-			CCDBNodeBranch::flushObserversCalls();
+			IngameDbMngr.flushObserverCalls();
+			CInterfaceManager::getInstance()->flushObserverCalls();
 			// lets some CPU.
 			NetMngr.send();
 			nlSleep(100);
@@ -1764,7 +1766,8 @@ bool mainLoop()
 		{
 
 			NetMngr.update();
-			CCDBNodeBranch::flushObserversCalls();
+			IngameDbMngr.flushObserverCalls();
+			CInterfaceManager::getInstance()->flushObserverCalls();
 			bool prevDatabaseInitStatus = IngameDbMngr.initInProgress();
 			IngameDbMngr.setChangesProcessed();
 			bool newDatabaseInitStatus = IngameDbMngr.initInProgress();
@@ -1834,7 +1837,8 @@ bool mainLoop()
 
 		// update bot chat
 		CBotChatManager::getInstance()->update();
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// updateItemEdition
 		CInterfaceItemEdition::getInstance()->update();
@@ -2889,6 +2893,7 @@ bool mainLoop()
 		// This code must remain at the very end of the main loop.
 		if(LoginSM.getCurrentState() == CLoginStateMachine::st_enter_far_tp_main_loop)
 		{
+			CInterfaceManager::getInstance()->executeLuaScript("game:onFarTpStart()");
 			// Will loop the network until the end of the relogging process
 			FarTP.farTPmainLoop();
 
@@ -2965,6 +2970,8 @@ bool mainLoop()
 			// Get the Connection State (must be done after any Far TP to prevent the uiDisconnected box to be displayed)
 			lastConnectionState = CNetworkConnection::Connected;
 			connectionState = NetMngr.getConnectionState();
+
+			CInterfaceManager::getInstance()->executeLuaScript("game:onFarTpEnd()");
 		}
 
 	} // end of main loop
diff --git a/code/ryzom/client/src/net_manager.cpp b/code/ryzom/client/src/net_manager.cpp
index 568081c81..8116ccaea 100644
--- a/code/ryzom/client/src/net_manager.cpp
+++ b/code/ryzom/client/src/net_manager.cpp
@@ -269,7 +269,7 @@ void impulseDatabaseResetBank(NLMISC::CBitMemStream &impulse)
 		impulse.serial( bank, nbits );
 
 		// reset the bank
-		IngameDbMngr.getNodePtr()->resetBank( serverTick, (TCDBBank)bank );
+		IngameDbMngr.resetBank( serverTick, bank );
 		nldebug( "CDB: DB_GROUP:RESET_BANK %s", CDBBankNames[bank] );
 	}
 	catch (const Exception &e)
@@ -664,10 +664,12 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		}
 
 		// select DB
+		sint32	dbIndex = ChatMngr.getDynamicChannelDbIndexFromId(dynChatId);
+		clamp(dbIndex, (sint32)0 , (sint32)CChatGroup::MaxDynChanPerPlayer);
 		string entry="UI:SAVE:CHAT:COLORS:";
 		switch(mode)
 		{
-		case CChatGroup::dyn_chat:	entry+="DYN";	break;
+		case CChatGroup::dyn_chat:	entry+="DYN:" + NLMISC::toString(dbIndex);	break;
 		case CChatGroup::say:	entry+="SAY";	break;
 		case CChatGroup::shout:	entry+="SHOUT";	break;
 		case CChatGroup::team:	entry+="GROUP";	break;
@@ -697,6 +699,11 @@ void CInterfaceChatDisplayer::displayChat(TDataSetIndex compressedSenderIndex, c
 		}
 	}
 
+	if (stringCategory == "emt")
+	{
+		bubbleWanted = false;
+	}
+
 	if (mode != CChatGroup::system)
 	{
 		// find the sender/text separator to put color tags
@@ -3206,7 +3213,7 @@ void impulseOutpostDeclareWarAck(NLMISC::CBitMemStream &impulse)
 		node->setValue32(timeStartAttack);
 }
 
-extern void addWebIGParams (string &url);
+extern void addWebIGParams(string &url, bool trustedDomain);
 
 //-----------------------------------------------
 //-----------------------------------------------
@@ -3290,7 +3297,6 @@ private:
 			string group = titleStr.toString();
 			// <missing:XXX>
 			group = group.substr(9, group.size()-10);
-			nlinfo("group = %s", group.c_str());
 			groupHtml = dynamic_cast<CGroupHTML*>(pIM->getElementFromId("ui:interface:"+group+":content:html"));
 			if (!groupHtml)
 			{
@@ -3312,7 +3318,7 @@ private:
 						if (group == "webig")
 							pGC->setActive(true);
 						string url = contentStr.toString();
-						addWebIGParams(url);
+						addWebIGParams(url, true);
 						groupHtml->browse(url.c_str());
 						pIM->setTopWindow(pGC);
 					}
diff --git a/code/ryzom/client/src/net_manager.h b/code/ryzom/client/src/net_manager.h
index e51bdc22a..1d7852a76 100644
--- a/code/ryzom/client/src/net_manager.h
+++ b/code/ryzom/client/src/net_manager.h
@@ -244,7 +244,7 @@ public:
 	//void								clearChanges() { ALL_MANAGERS->clearChanges(); }
 
 	void				setImpulseCallback(CNetworkConnection::TImpulseCallback callback, void *argument = NULL) { FIRST_MANAGER->setImpulseCallback( callback, argument ); }
-	void				setDataBase(CCDBNodeBranch *database) { ALL_MANAGERS->setDataBase( database ); }
+	void				setDataBase(NLMISC::CCDBNodeBranch *database) { ALL_MANAGERS->setDataBase( database ); }
 	bool				connect(std::string &result) { bool res = false; std::vector<CNetManager*>::iterator inm; for( inm=_NetManagers.begin(); inm!=_NetManagers.end(); ++inm ) if ( (*inm)->connect( result ) ) res = true; return res; }
 	CNetworkConnection::TConnectionState	getConnectionState() const { return FIRST_MANAGER->getConnectionState(); }
 
diff --git a/code/ryzom/client/src/network_connection.cpp b/code/ryzom/client/src/network_connection.cpp
index f633126e5..9f20a7a3d 100644
--- a/code/ryzom/client/src/network_connection.cpp
+++ b/code/ryzom/client/src/network_connection.cpp
@@ -41,9 +41,9 @@
 
 #include "game_share/simlag.h"
 
-#include "cdb.h"
-#include "cdb_leaf.h"
-#include "cdb_branch.h"
+#include "nel/misc/cdb.h"
+#include "nel/misc/cdb_leaf.h"
+#include "nel/misc/cdb_branch.h"
 #include "cdb_synchronised.h"
 
 #include "nel/misc/variable.h"
diff --git a/code/ryzom/client/src/network_connection.h b/code/ryzom/client/src/network_connection.h
index 755994275..1c1581664 100644
--- a/code/ryzom/client/src/network_connection.h
+++ b/code/ryzom/client/src/network_connection.h
@@ -60,7 +60,9 @@ const uint		PropertiesPerEntity = 16;
 const uint		EntitiesPerClient = 256;
 */
 
+namespace NLMISC{
 class CCDBNodeBranch;
+}
 
 namespace CLFECOMMON
 {
@@ -364,7 +366,7 @@ public:
 	/**
 	 * Set database entry point
 	 */
-	void			setDataBase(CCDBNodeBranch *database);
+	void			setDataBase(NLMISC::CCDBNodeBranch *database);
 
 	//@}
 
@@ -669,7 +671,7 @@ protected:
 	CPropertyDecoder			_PropertyDecoder;
 
 	/// The database entry
-	CCDBNodeBranch				*_DataBase;
+	NLMISC::CCDBNodeBranch				*_DataBase;
 
 
 	/// @name Header message decoding
diff --git a/code/ryzom/client/src/npc_icon.cpp b/code/ryzom/client/src/npc_icon.cpp
index 7d03ede01..a1935b6ad 100644
--- a/code/ryzom/client/src/npc_icon.cpp
+++ b/code/ryzom/client/src/npc_icon.cpp
@@ -150,24 +150,24 @@ void		CNPCIconCache::addObservers()
 
 	// Mission Journal
 	static const char *missionStartStopLeavesToMonitor [2] = {"TITLE", "FINISHED"};
-	IngameDbMngr.getNodePtr()->addBranchObserver("MISSIONS", MissionStartStopObserver, missionStartStopLeavesToMonitor, getArraySize(missionStartStopLeavesToMonitor));
+	IngameDbMngr.addBranchObserver( IngameDbMngr.getNodePtr(), "MISSIONS", MissionStartStopObserver, missionStartStopLeavesToMonitor, getArraySize(missionStartStopLeavesToMonitor));
 	static const char *missionNpcAliasLeavesToMonitor [1] = {"NPC_ALIAS"};
-	IngameDbMngr.getNodePtr()->addBranchObserver("MISSIONS", MissionNpcAliasObserver, missionNpcAliasLeavesToMonitor, getArraySize(missionNpcAliasLeavesToMonitor));
+	IngameDbMngr.addBranchObserver( IngameDbMngr.getNodePtr(), "MISSIONS", MissionNpcAliasObserver, missionNpcAliasLeavesToMonitor, getArraySize(missionNpcAliasLeavesToMonitor));
 
 	// Skills
 	static const char *skillLeavesToMonitor [2] = {"SKILL", "BaseSKILL"};
-	IngameDbMngr.getNodePtr()->addBranchObserver("CHARACTER_INFO:SKILLS", MissionPrerequisitEventObserver, skillLeavesToMonitor, getArraySize(skillLeavesToMonitor));
+	IngameDbMngr.addBranchObserver( IngameDbMngr.getNodePtr(), "CHARACTER_INFO:SKILLS", MissionPrerequisitEventObserver, skillLeavesToMonitor, getArraySize(skillLeavesToMonitor));
 
 	// Owned Items
 	static const char *bagLeavesToMonitor [1] = {"SHEET"}; // just saves 2000 bytes or so (500 * observer pointer entry in vector) compared to one observer per bag slot
-	IngameDbMngr.getNodePtr()->addBranchObserver("INVENTORY:BAG", MissionPrerequisitEventObserver, bagLeavesToMonitor, getArraySize(bagLeavesToMonitor));
+	IngameDbMngr.addBranchObserver( IngameDbMngr.getNodePtr(), "INVENTORY:BAG", MissionPrerequisitEventObserver, bagLeavesToMonitor, getArraySize(bagLeavesToMonitor));
 
 	// Worn Items
-	IngameDbMngr.getNodePtr()->addBranchObserver("INVENTORY:HAND", MissionPrerequisitEventObserver);
-	IngameDbMngr.getNodePtr()->addBranchObserver("INVENTORY:EQUIP", MissionPrerequisitEventObserver);
+	IngameDbMngr.addBranchObserver( "INVENTORY:HAND", &MissionPrerequisitEventObserver);
+	IngameDbMngr.addBranchObserver( "INVENTORY:EQUIP", &MissionPrerequisitEventObserver);
 
 	// Known Bricks
-	IngameDbMngr.getNodePtr()->addBranchObserver("BRICK_FAMILY", MissionPrerequisitEventObserver);
+	IngameDbMngr.addBranchObserver( "BRICK_FAMILY", &MissionPrerequisitEventObserver);
 
 	// For other events, search for calls of onEventForMissionAvailabilityForThisChar()
 }
diff --git a/code/ryzom/client/src/npc_icon.h b/code/ryzom/client/src/npc_icon.h
index 07a5ec4eb..dbd0a35bf 100644
--- a/code/ryzom/client/src/npc_icon.h
+++ b/code/ryzom/client/src/npc_icon.h
@@ -21,7 +21,7 @@
 #include "nel/misc/types_nl.h"
 #include "game_share/entity_types.h"
 #include "game_share/msg_client_server.h"
-#include "cdb.h"
+#include "nel/misc/cdb.h"
 #include "entity_cl.h"
 #include "interface_v3/view_radar.h"
 #include <string>
@@ -51,6 +51,7 @@ namespace NPC_ICON
 	};
 };
 
+using NLMISC::ICDBNode;
 
 /**
  * Description of a mission giver NPC.
diff --git a/code/ryzom/client/src/player_cl.cpp b/code/ryzom/client/src/player_cl.cpp
index 9dfe6e12f..d74cf6ae1 100644
--- a/code/ryzom/client/src/player_cl.cpp
+++ b/code/ryzom/client/src/player_cl.cpp
@@ -164,7 +164,7 @@ bool CPlayerCL::isNeutral() const
 //-----------------------------------------------
 bool CPlayerCL::isFriend () const
 {
-	return isNeutral() || isNeutralPVP() || isAlly();
+	return isNeutral() || isAlly();
 }
 
 
@@ -174,32 +174,57 @@ bool CPlayerCL::isFriend () const
 //-----------------------------------------------
 bool CPlayerCL::isEnemy () const
 {
+	// Challenge i.e. SOLO FULL PVP
+	if( getPvpMode()&PVP_MODE::PvpChallenge  ||
+		UserEntity->getPvpMode()&PVP_MODE::PvpChallenge )
+	{
+		return true;
+	}
+
+
 	// if one of 2 players is not in pvp they can't be enemies
 	if( UserEntity->getPvpMode() == PVP_MODE::None ||
 		getPvpMode() == PVP_MODE::None )
 	{
 		return false;
 	}
+	
+	// if one of 2 players is safe they can't be enemies
+	if( UserEntity->getPvpMode()&PVP_MODE::PvpSafe ||
+		getPvpMode()&PVP_MODE::PvpSafe )
+	{
+		return false;
+	}
 
-	// Outpost
-	if ( isAnOutpostEnemy() )
+	// if one of 2 players are in safe zone and not flagged they can't be enemies
+	if ((UserEntity->getPvpMode()&PVP_MODE::PvpZoneSafe &&
+		((UserEntity->getPvpMode()&PVP_MODE::PvpFactionFlagged) == 0))
+		||
+		(getPvpMode()&PVP_MODE::PvpZoneSafe &&
+		((getPvpMode()&PVP_MODE::PvpFactionFlagged) == 0)))
 	{
-		return true;
+		return false;
 	}
 
-	// Challenge
-	if( getPvpMode()&PVP_MODE::PvpChallenge &&
-		UserEntity->getPvpMode()&PVP_MODE::PvpChallenge )
+	// Duel
+	if( getPvpMode()&PVP_MODE::PvpDuel &&
+		UserEntity->getPvpMode()&PVP_MODE::PvpDuel )
 	{
-		if( !isInTeam() )
-			return true;
+		return true; // TODO
+	}
+
+	// Outpost
+	if ( isAnOutpostEnemy() )
+	{
+		return true;
 	}
 
 	// Zone Free
 	if( getPvpMode()&PVP_MODE::PvpZoneFree &&
 		UserEntity->getPvpMode()&PVP_MODE::PvpZoneFree )
 	{
-		if( !isInTeam() && !isInGuild() )
+		// If not in same Team and not in same League => ennemy
+		if( !isInTeam() && !isInSameLeague() )
 			return true;
 	}
 
@@ -207,7 +232,11 @@ bool CPlayerCL::isEnemy () const
 	if( getPvpMode()&PVP_MODE::PvpZoneGuild &&
 		UserEntity->getPvpMode()&PVP_MODE::PvpZoneGuild )
 	{
-		if( !isInTeam() && !isInGuild() )
+		// If in same Guild but different Leagues => ennemy
+		if ( isInSameGuild() && oneInLeague() && !isInSameLeague() )
+			return true;
+
+		if( !isInTeam() && !isInSameLeague() )
 			return true;
 	}
 
@@ -219,29 +248,18 @@ bool CPlayerCL::isEnemy () const
 			return true;
 	}
 
-	// Duel
-	if( getPvpMode()&PVP_MODE::PvpDuel &&
-		UserEntity->getPvpMode()&PVP_MODE::PvpDuel )
-	{
-		return true; // TODO
-	}
-
-	// Faction
+	// Free PVP : Ennemis are not in team AND not in league
 	if ((getPvpMode()&PVP_MODE::PvpFaction || getPvpMode()&PVP_MODE::PvpFactionFlagged) &&
 		(UserEntity->getPvpMode()&PVP_MODE::PvpFaction || UserEntity->getPvpMode()&PVP_MODE::PvpFactionFlagged))
 	{
-		// Check if is not ally
-		if (!isInTeam() && !isInGuild())
-		{
-			// Check for each Clan if is in opposition
-			for (uint8 i = 0; i < PVP_CLAN::NbClans; i++)
-			{
-				if ((isPvpEnnemy(i) && UserEntity->isPvpAlly(i)) || (isPvpAlly(i) && UserEntity->isPvpEnnemy(i)))
-					return true;
-			}
-		}
-			
+		// If in same Guild but different Leagues => ennemy
+		if ( isInSameGuild() && oneInLeague() && !isInSameLeague() )
+			return true;
+
+		if (!isInTeam() && !isInSameLeague())
+			return true;
 	}
+
 	return false;
 
 } // isEnemy //
@@ -253,32 +271,38 @@ bool CPlayerCL::isEnemy () const
 //-----------------------------------------------
 bool CPlayerCL::isAlly() const
 {
-	// if one of 2 players is not in pvp they can't be enemies
+
+	// Challenge i.e. SOLO FULL PVP
+	if( getPvpMode()&PVP_MODE::PvpChallenge  ||
+		UserEntity->getPvpMode()&PVP_MODE::PvpChallenge )
+	{
+		return false;
+	}
+
+	// if one of 2 players is not in pvp they can't be allies
 	if( UserEntity->getPvpMode() == PVP_MODE::None ||
 		getPvpMode() == PVP_MODE::None )
 	{
 		return false;
 	}
 
-	// Outpost
-	if ( isAnOutpostAlly() )
+	// if one of 2 players is in safe zone and not other they can't be allies
+	if ((UserEntity->getPvpMode()&PVP_MODE::PvpSafe) != (getPvpMode()&PVP_MODE::PvpSafe))
 	{
-		return true;
+		return false;
 	}
 
-	// Challenge
-	if( getPvpMode()&PVP_MODE::PvpChallenge &&
-		UserEntity->getPvpMode()&PVP_MODE::PvpChallenge )
+	// Outpost
+	if ( isAnOutpostAlly() )
 	{
-		if( isInTeam() )
-			return true;
+		return true;
 	}
 
 	// Zone Free
 	if( getPvpMode()&PVP_MODE::PvpZoneFree &&
 		UserEntity->getPvpMode()&PVP_MODE::PvpZoneFree )
 	{
-		if( isInTeam() || isInGuild() )
+		if( isInTeam() || isInSameLeague() )
 			return true;
 	}
 
@@ -286,8 +310,12 @@ bool CPlayerCL::isAlly() const
 	if( getPvpMode()&PVP_MODE::PvpZoneGuild &&
 		UserEntity->getPvpMode()&PVP_MODE::PvpZoneGuild )
 	{
-		if( isInTeam() || isInGuild() )
+		if( isInTeam() || isInSameLeague() )
 			return true;
+
+		if ( isInSameGuild() && !oneInLeague() )
+			return true;
+
 	}
 
 	// Zone Faction
@@ -298,26 +326,15 @@ bool CPlayerCL::isAlly() const
 			return true;
 	}
 
-	// Faction
+	// Free PVP : Allies are in team OR in league
 	if ((getPvpMode()&PVP_MODE::PvpFaction || getPvpMode()&PVP_MODE::PvpFactionFlagged) &&
 		(UserEntity->getPvpMode()&PVP_MODE::PvpFaction || UserEntity->getPvpMode()&PVP_MODE::PvpFactionFlagged))
 	{
-		if (isInTeam() && isInGuild())
+		if (isInTeam() || isInSameLeague())
 			return true;
-	
-		// Check for each Clan if is in opposition
-		for (uint8 i = 0; i < PVP_CLAN::NbClans; i++)
-		{
-			if ((isPvpEnnemy(i) && UserEntity->isPvpAlly(i)) || (isPvpAlly(i) && UserEntity->isPvpEnnemy(i)))
-				return false;
-		}
 
-		// Check for each Clan if is in same clan
-		for (uint8 i = 0; i < PVP_CLAN::NbClans; i++)
-		{
-			if ((isPvpEnnemy(i) && UserEntity->isPvpEnnemy(i)) || (isPvpAlly(i) && UserEntity->isPvpAlly(i)))
-				return true;
-		}
+		if ( isInSameGuild() && !oneInLeague() )
+			return true;
 	}
 
 	return false;
@@ -336,66 +353,12 @@ bool CPlayerCL::isNeutralPVP() const
 		return false;
 	}
 
-	// Outpost
-	if ( getOutpostId() != 0 )
-	{
-		if( UserEntity->getOutpostId() != getOutpostId() )
-		{
-			return true;
-		}
-	}
-
-	// Challenge
-	if( getPvpMode()&PVP_MODE::PvpChallenge &&
-		!(UserEntity->getPvpMode()&PVP_MODE::PvpChallenge) )
-	{
-		return true;
-	}
-
-	// Zone Free
-	if( getPvpMode()&PVP_MODE::PvpZoneFree &&
-		!(UserEntity->getPvpMode()&PVP_MODE::PvpZoneFree) )
+	if( UserEntity->getPvpMode() == PVP_MODE::None )
 	{
-		return true;
-	}
-
-	// Zone Guild
-	if( getPvpMode()&PVP_MODE::PvpZoneGuild &&
-		!(UserEntity->getPvpMode()&PVP_MODE::PvpZoneGuild) )
-	{
-		return true;
-	}
-
-	// Zone Faction
-	if( getPvpMode()&PVP_MODE::PvpZoneFaction &&
-		!(UserEntity->getPvpMode()&PVP_MODE::PvpZoneFaction) )
-	{
-		return true;
-	}
-
-	// Duel
-	if( getPvpMode()&PVP_MODE::PvpDuel &&
-		!(UserEntity->getPvpMode()&PVP_MODE::PvpDuel) )
-	{
-		return true;
-	}
-
-	if ((getPvpMode()&PVP_MODE::PvpFaction || getPvpMode()&PVP_MODE::PvpFactionFlagged) &&
-		(UserEntity->getPvpMode()&PVP_MODE::PvpFaction || UserEntity->getPvpMode()&PVP_MODE::PvpFactionFlagged))
-	{
-		// Check for each Clan if is in opposition or same
-		for (uint8 i = 0; i < PVP_CLAN::NbClans; i++)
-		{
-			if ((isPvpEnnemy(i) && UserEntity->isPvpAlly(i)) ||
-				(isPvpAlly(i) && UserEntity->isPvpEnnemy(i)) ||
-				(isPvpEnnemy(i) && UserEntity->isPvpEnnemy(i)) ||
-				(isPvpAlly(i) && UserEntity->isPvpAlly(i)))
-				return false;
-		}
-		return true;
+		return false;
 	}
 
-	return false;
+	return (!isEnemy() && !isAlly());
 }
 
 
diff --git a/code/ryzom/client/src/progress.cpp b/code/ryzom/client/src/progress.cpp
index be3363072..6bce2a735 100644
--- a/code/ryzom/client/src/progress.cpp
+++ b/code/ryzom/client/src/progress.cpp
@@ -27,6 +27,7 @@
 #include "weather.h"
 #include "weather_manager_client.h"
 #include "interface_v3/input_handler_manager.h"
+#include "interface_v3/interface_manager.h"
 #include "release.h"
 #include "net_manager.h"
 #include "client_cfg.h"
@@ -393,7 +394,8 @@ void CProgress::internalProgress (float value)
 
 	// \todo GUIGUI : Remove this when possible.
 	NetMngr.update();
-	CCDBNodeBranch::flushObserversCalls();
+	IngameDbMngr.flushObserverCalls();
+	CInterfaceManager::getInstance()->flushObserverCalls();
 
 	// update system dependent progress bar
 	static uint previousValue = 0;
diff --git a/code/ryzom/client/src/r2/config_var.h b/code/ryzom/client/src/r2/config_var.h
index 84c9f3891..674c38816 100644
--- a/code/ryzom/client/src/r2/config_var.h
+++ b/code/ryzom/client/src/r2/config_var.h
@@ -66,6 +66,22 @@ private:
 	const   T     _Default;
 };
 
+// forward declarations for specialisations
+std::string getConfigVarTypename(const float &dummy);
+bool getConfigVarValue(CLuaObject &luaValue, float &dest);
+
+std::string getConfigVarTypename(const double &dummy);
+bool getConfigVarValue(CLuaObject &luaValue, double &dest);
+
+std::string getConfigVarTypename(const sint32 &dummy);
+bool getConfigVarValue(CLuaObject &luaValue, sint32 &dest);
+
+std::string getConfigVarTypename(const std::string &dummy);
+bool getConfigVarValue(CLuaObject &luaValue, std::string &dest);
+
+std::string getConfigVarTypename(const NLMISC::CRGBA &dummy);
+bool getConfigVarValue(CLuaObject &luaValue, NLMISC::CRGBA &dest);
+
 template <class T> const T &CConfigVar<T>::get() const
 {
 	// Relies on R2 'getConfigVarValue' and 'getConfigVarTypename' functions specialization to retrieve the value (see below)
diff --git a/code/ryzom/client/src/r2/displayer_visual_entity.cpp b/code/ryzom/client/src/r2/displayer_visual_entity.cpp
index 20f84c90f..7a27f1c11 100644
--- a/code/ryzom/client/src/r2/displayer_visual_entity.cpp
+++ b/code/ryzom/client/src/r2/displayer_visual_entity.cpp
@@ -27,7 +27,7 @@
 #include "../misc.h"
 #include "../entities.h"
 #include "../pacs_client.h"
-#include "../cdb_leaf.h"
+#include "nel/misc/cdb_leaf.h"
 #include "../interface_v3/interface_manager.h"
 #include "entity_sorter.h"
 //
diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp
index 0de8bc626..1c355ca8a 100644
--- a/code/ryzom/client/src/r2/editor.cpp
+++ b/code/ryzom/client/src/r2/editor.cpp
@@ -1724,7 +1724,8 @@ void CEditor::waitScenarioScreen()
 			}
 
 		}
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// check if we can send another dated block
 		if (NetMngr.getCurrentServerTick() != serverTick)
@@ -1769,7 +1770,8 @@ void CEditor::waitScenarioScreen()
 		if (sysInfo) sysInfo->setActive(false);
 
 		getUI().updateFrameViews(NULL);
-		CCDBNodeBranch::flushObserversCalls();
+		IngameDbMngr.flushObserverCalls();
+		CInterfaceManager::getInstance()->flushObserverCalls();
 
 		// Movie shooter
 		globalMenuMovieShooter();
@@ -4392,7 +4394,7 @@ bool CEditor::doLuaScript(const char *filename, const char *fileDescText)
 		return false;
 	}
 
-	if( 0 && FINAL_VERSION == 1) // deactivated for the moment because there are lua file that must be loaded from example
+	if( 0 && FINAL_VERSION == 1) // disabled for the moment because there are lua file that must be loaded from example
 	{
 		const static std::string path = "data_common.bnp@";
 		const static std::string::size_type len= path.size();
diff --git a/code/ryzom/client/src/r2/editor.h b/code/ryzom/client/src/r2/editor.h
index d909a9980..89b470db0 100644
--- a/code/ryzom/client/src/r2/editor.h
+++ b/code/ryzom/client/src/r2/editor.h
@@ -887,7 +887,7 @@ private:
 
 public:
 	static uint		   getMaxNumPlotItems();
-	static CCDBNodeLeaf	   *getPlotItemSheetDBLeaf(uint index);
+	static NLMISC::CCDBNodeLeaf	   *getPlotItemSheetDBLeaf(uint index);
 	static bool				getIsStartingScenario() { return _IsStartingScenario; }
 	bool				isClearingContent() const { return _ClearingContent; }
 
@@ -897,7 +897,7 @@ private:
 	static void		   initDummyPlotItems();
 	void				resetPlotItems();
 	static void		   setReferencePlotItemSheet(uint index, uint32 sheetId);
-	static CCDBNodeLeaf	   *getRefPlotItemSheetDBLeaf(uint index);
+	static NLMISC::CCDBNodeLeaf	   *getRefPlotItemSheetDBLeaf(uint index);
 
 	//////////
 	// MISC //
diff --git a/code/ryzom/client/src/r2/tool_create_entity.cpp b/code/ryzom/client/src/r2/tool_create_entity.cpp
index 9633d242e..73b55a0d7 100644
--- a/code/ryzom/client/src/r2/tool_create_entity.cpp
+++ b/code/ryzom/client/src/r2/tool_create_entity.cpp
@@ -28,7 +28,7 @@
 #include "../player_r2_cl.h"
 #include "../sheet_manager.h"
 #include "../interface_v3/lua_ihm.h"
-#include "../cdb_leaf.h"
+#include "nel/misc/cdb_leaf.h"
 #include "../interface_v3/interface_manager.h"
 #include "dmc/palette.h"
 #include "displayer_visual.h"
diff --git a/code/ryzom/client/src/seven_zip/Makefile b/code/ryzom/client/src/seven_zip/Makefile
deleted file mode 100644
index ed87286ae..000000000
--- a/code/ryzom/client/src/seven_zip/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#############################################################################
-# Simple make file for compiling SEVEN ZIP
-
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-D_SZ_ONE_DIRECTORY \
-		-I$(NEL_PATH)/include \
-		-I$(RYZOM_PATH)/common/src \
-		-I.. \
-		-I.
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libseven_zip.a
-DSP_TARGET	= seven_zip.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-
-#libseven_zip.so: $(OBJS)
-#	$(CXX) -o $@ $(OBJS) -shared $(LDFLAGS)
-
-libseven_zip.a: $(OBJS)
-	ar r libseven_zip.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/client/src/sound_manager.cpp b/code/ryzom/client/src/sound_manager.cpp
index fb4b3708f..4d8827875 100644
--- a/code/ryzom/client/src/sound_manager.cpp
+++ b/code/ryzom/client/src/sound_manager.cpp
@@ -106,8 +106,11 @@ enum TFilterMapping
 // constructor
 //-----------------------------------------------
 CSoundManager::CSoundManager(IProgressCallback * /* progressCallBack */)
-:	_AudioMixer(NULL),
-	_EnvSoundRoot(NULL),
+:	_AudioMixer(NULL), 
+	_GroupControllerEffects(NULL),
+	_GroupControllerEffectsGame(NULL),  
+	_EnvSoundRoot(NULL), 
+	_Sources(NULL), 
 	_UserEntitySoundLevel(1.0f)
 {
 	_EnableBackgroundMusicAtTime= 0;
@@ -137,9 +140,12 @@ CSoundManager::~CSoundManager()
 	// detach the sound from the particule system
 	NL3D::UParticleSystemSound::setPSSound(NULL);
 
+	_GroupControllerEffects = NULL;
+	_GroupControllerEffectsGame = NULL;
+
 	// free the audio mixer (and delete all sources)
-	if (_AudioMixer)
-		delete _AudioMixer;
+	delete _AudioMixer;
+	_AudioMixer = NULL;
 
 	// release sound anim properly
 	releaseSoundAnim();
@@ -403,6 +409,9 @@ void CSoundManager::reset ()
 
 	NL3D::UParticleSystemSound::setPSSound(NULL);
 
+	_GroupControllerEffects = NULL;
+	_GroupControllerEffectsGame = NULL;
+
 	delete _AudioMixer;
 	_AudioMixer = NULL;
 
@@ -421,7 +430,6 @@ void CSoundManager::reset ()
 //---------------------------------------------------
 void CSoundManager::init(IProgressCallback *progressCallBack)
 {
-	_NextId = 1;
 	_EnvSoundRoot = NULL;
 	_PlaySound = true;
 
@@ -477,6 +485,10 @@ void CSoundManager::init(IProgressCallback *progressCallBack)
 		 */
 		new CSoundAnimManager(_AudioMixer);
 
+		// get the controller group for effects
+		_GroupControllerEffects = _AudioMixer->getGroupController("sound:effects");
+		_GroupControllerEffectsGame = _AudioMixer->getGroupController("sound:effects:game");
+
 		// restore the volume
 		SoundMngr->setSFXVolume(ClientCfg.SoundSFXVolume);
 		SoundMngr->setGameMusicVolume(ClientCfg.SoundGameMusicVolume);
@@ -612,7 +624,7 @@ void CSoundManager::init(IProgressCallback *progressCallBack)
 // add a new source to the world, attached to the specified entity
 // return 0 if creation failed, sound id if creation was successful
 //-----------------------------------------------
-uint32 CSoundManager::addSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play, bool loop,  const CEntityId &id)
+CSoundManager::TSourceId CSoundManager::addSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play, bool loop,  const CEntityId &id)
 {
 	uint32	retValue = 0;
 
@@ -642,22 +654,16 @@ uint32 CSoundManager::addSource( const NLMISC::TStringId &soundName, const NLMIS
 		pSource->play();
 	}
 
+	TSourceId sourceId = _Sources.insert(pSource);
+
 	// attach the source to the entity, if specified
 	if (id != CEntityId::Unknown )
 	{
-		_AttachedSources.insert( TMultiMapEntityToSource::value_type( id, pSource ) );
+		_AttachedSources.insert( TMultiMapEntityToSource::value_type( id, sourceId ) );
 	}
 
-	// set source id
-	retValue = _NextId;
-
-	// add the new source
-	_Sources.insert( TMapIdToSource::value_type( _NextId, pSource ) );
-
-	++_NextId;
-
 	// return the id of the source
-	return retValue;
+	return sourceId;
 
 } // addSource //
 
@@ -726,26 +732,22 @@ bool CSoundManager::spawnSource(const NLMISC::TStringId &soundName, const NLMISC
 // removeSource:
 // remove a source
 //---------------------------------------------------
-void CSoundManager::removeSource( uint32 sourceId )
+void CSoundManager::removeSource(CSoundManager::TSourceId sourceId)
 {
 nldebug("remove the source : %d", sourceId);
 
 /// \todo Malkav : optimize speed
 nldebug("nb sources = %d", _Sources.size() );
-	TMapIdToSource::iterator itS = _Sources.find( sourceId );
-	if (itS != _Sources.end() )
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource)
 	{
-		USource *pSource = (*itS).second;
-		if ( pSource == NULL )
-			return;
-
 		TMultiMapEntityToSource::iterator it = _AttachedSources.begin();//, itOld;
 
 		for ( ; it != _AttachedSources.end() ; ++it)
 		{
-			if ( (*it).second == pSource )
+			if ( (*it).second == sourceId )
 			{
-				(*it).second = NULL;
+				(*it).second = 0;
 //				itOld = it;
 //				++it;
 
@@ -759,8 +761,9 @@ nldebug("nb sources = %d", _Sources.size() );
 		}
 
 		// delete the source
-//		_AudioMixer->removeSource (pSource);
 		delete pSource;
+		// i think there was something going on here
+		_Sources.erase(sourceId);
 	}
 } // removeSource //
 
@@ -789,7 +792,7 @@ void CSoundManager::updateEntityPos( const CEntityId &id, const NLMISC::CVector
 
 	for ( it = range.first; it != range.second ; ++it)
 	{
-		(*it).second->setPos( pos );
+		_Sources.get((*it).second)->setPos( pos );
 	}
 } // updateEntityPos //
 
@@ -805,7 +808,7 @@ void CSoundManager::updateEntityVelocity( const CEntityId &id, const NLMISC::CVe
 
 	for ( it = range.first; it != range.second ; ++it)
 	{
-		(*it).second->setVelocity( velocity );
+		_Sources.get((*it).second)->setVelocity( velocity );
 	}
 
 } // updateEntityVelocity //
@@ -822,7 +825,7 @@ void CSoundManager::updateEntityDirection( const CEntityId &id, const NLMISC::CV
 
 	for ( it = range.first; it != range.second ; ++it)
 	{
-		(*it).second->setDirection( dir );
+		_Sources.get((*it).second)->setDirection( dir );
 	}
 } // updateEntityOrientation //
 
@@ -837,26 +840,15 @@ void CSoundManager::removeEntity( const CEntityId &id)
 
 	TMultiMapEntityToSource::iterator it;
 	const std::pair<TMultiMapEntityToSource::iterator, TMultiMapEntityToSource::iterator> range = _AttachedSources.equal_range( id );
-
-	USource *pSource;
+	
 	for ( it = range.first; it != range.second ; ++it)
 	{
-		pSource = (*it).second;
-		if ( pSource != NULL)
+		TSourceId sourceId = (*it).second;
+		if (sourceId)
 		{
-			TMapIdToSource::iterator itS = _Sources.begin();//, itOld;
-
-			for ( ; itS != _Sources.end() ; ++itS)
-			{
-				if ( (*itS).second == pSource )
-				{
-					(*itS).second = NULL;
-					_Sources.erase( itS );
-					break;
-				}
-			}
-			// delete the source
-			delete (*it).second;
+			USource *pSource = _Sources.get(sourceId);
+			delete pSource;
+			_Sources.erase(sourceId);
 		}
 	}
 
@@ -869,34 +861,24 @@ void CSoundManager::removeEntity( const CEntityId &id)
 //---------------------------------------------------
 // setSoundPosition :
 //---------------------------------------------------
-void CSoundManager::setSoundPosition( uint32 soundId, const NLMISC::CVector &position)
+void CSoundManager::setSoundPosition(TSourceId sourceId, const NLMISC::CVector &position)
 {
 	if (!_PlaySound) return;
 
-	TMapIdToSource::iterator it = _Sources.find( soundId );
-	if (it != _Sources.end() )
-	{
-		nlassert( (*it).second );
-
-		(*it).second->setPos( position );
-	}
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource) pSource->setPos(position);
 } // setSoundPosition //
 
 
 //---------------------------------------------------
 // loopSound :
 //---------------------------------------------------
-void CSoundManager::loopSound( uint32 soundId, bool loop)
+void CSoundManager::loopSound(TSourceId sourceId, bool loop)
 {
 	if (!_PlaySound) return;
 
-	TMapIdToSource::iterator it = _Sources.find( soundId );
-	if (it != _Sources.end() )
-	{
-		nlassert( (*it).second );
-
-		(*it).second->setLooping( loop );
-	}
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource) pSource->setLooping(loop);
 } // loopSound //
 
 
@@ -904,19 +886,17 @@ void CSoundManager::loopSound( uint32 soundId, bool loop)
 // playSound :
 // start or stop playing sound
 //---------------------------------------------------
-void CSoundManager::playSound( uint32 soundId, bool play)
+void CSoundManager::playSound(TSourceId sourceId, bool play)
 {
 	if (!_PlaySound) return;
 
-	TMapIdToSource::iterator it = _Sources.find( soundId );
-	if (it != _Sources.end() )
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource)
 	{
-		nlassert( (*it).second );
-
 		if (play)
-			(*it).second->play();
+			pSource->play();
 		else
-			(*it).second->stop();
+			pSource->stop();
 	}
 } // loopSound //
 
@@ -926,16 +906,10 @@ void CSoundManager::playSound( uint32 soundId, bool play)
 // isPlaying :
 // return true if the source is playing
 //---------------------------------------------------
-bool CSoundManager::isPlaying( uint32 sourceId )
+bool CSoundManager::isPlaying(TSourceId sourceId)
 {
-	TMapIdToSource::iterator it = _Sources.find( sourceId );
-	if (it != _Sources.end() )
-	{
-		nlassert( (*it).second );
-
-		return ( (*it).second->isPlaying() );
-	}
-
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource) return pSource->isPlaying();
 	return false;
 } // isPlaying //
 
@@ -999,16 +973,10 @@ bool CSoundManager::setSoundForSource( uint32 sourceId, TSound sound, const CVec
 // setSourceGain :
 // set the gain of the specified source
 //---------------------------------------------------
-void CSoundManager::setSourceGain(  uint32 sourceId, float gain)
+void CSoundManager::setSourceGain(TSourceId sourceId, float gain)
 {
-	TMapIdToSource::const_iterator it = _Sources.find( sourceId );
-	if (it != _Sources.end() )
-	{
-		USource *pSource = (*it).second;
-		nlassert( pSource );
-
-		pSource->setGain( gain );
-	}
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource) pSource->setGain( gain );
 } // setSourceGain //
 
 
@@ -1016,17 +984,10 @@ void CSoundManager::setSourceGain(  uint32 sourceId, float gain)
 // getSourceGain :
 // get the gain of the specified source (-1 if source not found)
 //---------------------------------------------------
-float CSoundManager::getSourceGain(  uint32 sourceId )
+float CSoundManager::getSourceGain(TSourceId sourceId)
 {
-	TMapIdToSource::const_iterator it = _Sources.find( sourceId );
-	if (it != _Sources.end() )
-	{
-		USource *pSource = (*it).second;
-		nlassert( pSource );
-
-		return ( pSource->getGain() );
-	}
-
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource) return pSource->getGain();
 	return -1;
 } // getSourceGain //
 
@@ -1035,16 +996,10 @@ float CSoundManager::getSourceGain(  uint32 sourceId )
 // setSourcePitch :
 // set the Pitch of the specified source
 //---------------------------------------------------
-void CSoundManager::setSourcePitch(  uint32 sourceId, float Pitch)
+void CSoundManager::setSourcePitch(TSourceId sourceId, float Pitch)
 {
-	TMapIdToSource::const_iterator it = _Sources.find( sourceId );
-	if (it != _Sources.end() )
-	{
-		USource *pSource = (*it).second;
-		nlassert( pSource );
-
-		pSource->setPitch( Pitch );
-	}
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource) pSource->setPitch(Pitch);
 } // setSourcePitch //
 
 
@@ -1052,17 +1007,10 @@ void CSoundManager::setSourcePitch(  uint32 sourceId, float Pitch)
 // getSourcePitch :
 // get the Pitch of the specified source (-1 if source not found)
 //---------------------------------------------------
-float CSoundManager::getSourcePitch(  uint32 sourceId )
+float CSoundManager::getSourcePitch(TSourceId sourceId)
 {
-	TMapIdToSource::const_iterator it = _Sources.find( sourceId );
-	if (it != _Sources.end() )
-	{
-		USource *pSource = (*it).second;
-		nlassert( pSource );
-
-		return ( pSource->getPitch() );
-	}
-
+	USource *pSource = _Sources.get(sourceId);
+	if (pSource) return pSource->getPitch();
 	return -1;
 } // getSourcePitch //
 
@@ -1204,23 +1152,26 @@ void CSoundManager::playPositionedSounds( const CVector& /* pos */ )
 	list<uint32>::iterator itPSnd;
 	for( itPSnd = _PositionedSounds.begin(); itPSnd != _PositionedSounds.end(); ++itPSnd )
 	{
-		TMapIdToSource::const_iterator itSrc = _Sources.find( *itPSnd );
-		if( itSrc == _Sources.end() )
+		USource *pSource = _Sources.get(*itPSnd);
+		if (!pSource)
 		{
 			nlwarning("<CSoundManager::playPositionedSounds>  :  The source %d is unknown",*itPSnd);
 		}
-		/*
-		if( (pos - (*itSrc).second.getPos()).norm() < ...)
+		else 
 		{
-			if( (*itSrc).second.pSource->isPlaying() == false )
+			/*
+			if( (pos - (*itSrc).second.getPos()).norm() < ...)
 			{
-				(*itSrc).second.pSource->play();
+				if( (*itSrc).second.pSource->isPlaying() == false )
+				{
+					(*itSrc).second.pSource->play();
+				}
+			}
+			*/
+			if (!pSource->isPlaying())
+			{
+				pSource->play();
 			}
-		}
-		*/
-		if( (*itSrc).second->isPlaying() == false )
-		{
-			(*itSrc).second->play();
 		}
 	}
 
@@ -1597,7 +1548,8 @@ void		CSoundManager::updateVolume()
 		_AudioMixer->setEventMusicVolume(_GameMusicVolume);
 
 		// update sfx volume
-		_AudioMixer->getListener()->setGain(_SFXVolume*_FadeSFXVolume);
+		_GroupControllerEffects->setGain(_SFXVolume);
+		_GroupControllerEffectsGame->setGain(_FadeSFXVolume);
 	}
 }
 
diff --git a/code/ryzom/client/src/sound_manager.h b/code/ryzom/client/src/sound_manager.h
index 629d9a957..80401ea57 100644
--- a/code/ryzom/client/src/sound_manager.h
+++ b/code/ryzom/client/src/sound_manager.h
@@ -26,6 +26,7 @@
 #include "nel/misc/types_nl.h"
 #include "nel/misc/vector.h"
 #include "nel/misc/config_file.h"
+#include "nel/misc/fast_id_map.h"
 // game_share
 #include "nel/misc/entity_id.h"
 // sound
@@ -45,8 +46,6 @@ namespace NLMISC
 	class IProgressCallback;
 }
 
-
-
 /**
  * class managing all the sounds for the client
  * \author David Fleury
@@ -55,9 +54,12 @@ namespace NLMISC
  */
 class CSoundManager
 {
+public:
+	typedef uint32 TSourceId;
 
-	typedef CHashMultiMap<NLMISC::CEntityId , NLSOUND::USource*, NLMISC::CEntityIdHashMapTraits > TMultiMapEntityToSource;
-	typedef std::map<uint32, NLSOUND::USource*>	TMapIdToSource;
+private:
+	typedef CHashMultiMap<NLMISC::CEntityId, TSourceId, NLMISC::CEntityIdHashMapTraits> TMultiMapEntityToSource;
+	typedef NLMISC::CFastIdMap<TSourceId, NLSOUND::USource *> TMapIdToSource;
 
 	/// Load the properties for this sound and aplly them.
 	void loadProperties(const string &soundName, USource *source);
@@ -86,7 +88,7 @@ public:
 	/// Return the audio mixer instance pointer.
 	NLSOUND::UAudioMixer *getMixer();
 
-	uint32	addSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play = true , bool loop = false,  const NLMISC::CEntityId &id = NLMISC::CEntityId::Unknown );
+	TSourceId	addSource( const NLMISC::TStringId &soundName, const NLMISC::CVector &position, bool play = true , bool loop = false,  const NLMISC::CEntityId &id = NLMISC::CEntityId::Unknown );
 
 	/// spawn a new source to the world but sound manager don't keep any link and the sound will be automatically deleted when finnished
 	bool	spawnSource (const NLMISC::TStringId &soundName, NLSOUND::CSoundContext &context);
@@ -98,7 +100,7 @@ public:
 	 * remove a source
 	 * \param uint32 source id
 	 */
-	void removeSource( uint32 sourceId );
+	void removeSource( TSourceId sourceId );
 
 
 	/**
@@ -190,28 +192,28 @@ public:
 	 * \param uint32 source id
 	 * \param CVector& new position
 	 */
-	void setSoundPosition( uint32 sourceId, const NLMISC::CVector &position);
+	void setSoundPosition( TSourceId sourceId, const NLMISC::CVector &position);
 
 	/**
 	 * loop a sound (or stop looping)
 	 * \param uint32 source id
 	 * \param bool loop (true = loop)
 	 */
-	void loopSound( uint32 sourceId, bool loop);
+	void loopSound( TSourceId sourceId, bool loop);
 
 	/**
 	 * play or stop a sound
 	 * \param uint32 source id
 	 * \param bool play (true = play, false = stop)
 	 */
-	void playSound( uint32 sourceId, bool play);
+	void playSound( TSourceId sourceId, bool play);
 
 	/**
 	 * test whether the sepcified source is playing or not
 	 * \param uint32 source id
 	 * \return bool true if the source is playing
 	 */
-	bool isPlaying( uint32 sourceId );
+	bool isPlaying( TSourceId sourceId );
 
 	/**
 	 * select the env effect corresponding to tag
@@ -236,14 +238,14 @@ public:
 	 * \param uint32 sourceId
 	 * \param float new gain (0-1)
 	 */
-	void setSourceGain(  uint32 sourceId, float gain);
+	void setSourceGain(  TSourceId sourceId, float gain);
 
 	/**
 	 * get source Gain
 	 * \param uint32 sourceId
 	 * \return float new gain (0-1) (-1 if source not found)
 	 */
-	float getSourceGain( uint32 sourceId );
+	float getSourceGain( TSourceId sourceId );
 
 	/**
 	 * set source Pitch
@@ -251,14 +253,14 @@ public:
 	 * \param uint32 sourceId
 	 * \param float new Pitch (0-1)
 	 */
-	void setSourcePitch(  uint32 sourceId, float gain);
+	void setSourcePitch(  TSourceId sourceId, float gain);
 
 	/**
 	 * get source Pitch
 	 * \param uint32 sourceId
 	 * \return float new Pitch (0-1) (>0) (-1 if source not found)
 	 */
-	float getSourcePitch( uint32 sourceId );
+	float getSourcePitch( TSourceId sourceId );
 
 	/**
 	 * Play all the positioned sounds which are near the given position
@@ -330,6 +332,12 @@ private:
 	/// Pointer on the audio mixer object
 	NLSOUND::UAudioMixer		*_AudioMixer;
 
+	/// The root effects group controller for effects volume settings by the user
+	NLSOUND::UGroupController	*_GroupControllerEffects;
+
+	/// The root effects group controller for effects fading by the game
+	NLSOUND::UGroupController	*_GroupControllerEffectsGame;
+
 	/// Pointer on the root of the environmental sounds tree (if any)
 	NLSOUND::UEnvSound			*_EnvSoundRoot;
 
@@ -346,10 +354,7 @@ private:
 	//CStepSounds					_StepSounds;
 
 	/// list of positioned sounds
-	std::list<uint32>			_PositionedSounds;
-
-	/// the next value that will be used as id for the next sound to be created
-	uint32						_NextId;
+	std::list<TSourceId>		_PositionedSounds;
 
 	/// Gain value for user entity sound.
 	float						_UserEntitySoundLevel;
diff --git a/code/ryzom/client/src/string_manager_client.cpp b/code/ryzom/client/src/string_manager_client.cpp
index 40886d518..5dfead832 100644
--- a/code/ryzom/client/src/string_manager_client.cpp
+++ b/code/ryzom/client/src/string_manager_client.cpp
@@ -34,6 +34,8 @@ namespace STRING_MANAGER
 
 	// ***************************************************************************
 	map<string, CStringManagerClient::CItem> CStringManagerClient::_SpecItem_TempMap;
+	map<ucstring, ucstring> CStringManagerClient::_DynStrings;
+	vector<ucstring> CStringManagerClient::_TitleWords;
 	bool CStringManagerClient::_SpecItem_MemoryCompressed = false;
 	char *CStringManagerClient::_SpecItem_Labels = NULL;
 	ucchar *CStringManagerClient::_SpecItem_NameDesc = NULL;
@@ -381,7 +383,15 @@ restartLoop4:
 				result = ucstring(tmp) + it->second;
 			}
 			else
+			{
 				result = it->second;
+				if (result.size() > 9 && result.substr(0, 9) == ucstring("<missing:")) 
+				{
+					map<ucstring, ucstring>::iterator itds = _DynStrings.find(result.substr(9, result.size()-10));
+					if (itds != _DynStrings.end())
+						result = itds->second;
+				}
+			}
 		}
 
 		return true;
@@ -1595,7 +1605,36 @@ const ucchar *CStringManagerClient::getSPhraseLocalizedDescription(NLMISC::CShee
 // ***************************************************************************
 const ucchar *CStringManagerClient::getTitleLocalizedName(const std::string &titleId, bool women)
 {
-	return getSpecialWord(titleId,women);
+	vector<ucstring> listInfos = getTitleInfos(titleId, women);
+
+	if (listInfos.size() > 0)
+	{
+		_TitleWords.push_back(listInfos[0]);
+		return _TitleWords.back().c_str();
+	}
+	
+	ucstring ucId;
+	ucId.fromUtf8(titleId);
+	return ucId.c_str();
+}
+
+// ***************************************************************************
+vector<ucstring> CStringManagerClient::getTitleInfos(const std::string &titleId, bool women)
+{
+	ucstring infosUC;
+	infosUC.fromUtf8(titleId);
+	vector<ucstring> listInfos;
+	splitUCString(infosUC, ucstring("#"), listInfos);
+
+	if (listInfos.size() > 0)
+	{
+		if (titleId[0] != '#')
+		{
+			listInfos[0] = getSpecialWord(listInfos[0].toUtf8(), women);
+		}
+	}
+
+	return listInfos;
 }
 
 // ***************************************************************************
@@ -1641,7 +1680,14 @@ const ucchar *CStringManagerClient::getSquadLocalizedDescription(NLMISC::CSheetI
 }
 
 // ***************************************************************************
-void		CStringManagerClient::replaceSBrickName(NLMISC::CSheetId id, const ucstring &name, const ucstring &desc, const ucstring &desc2)
+void CStringManagerClient::replaceDynString(const ucstring &name, const ucstring &text)
+{
+	_DynStrings[name] = text;
+}
+
+
+// ***************************************************************************
+void CStringManagerClient::replaceSBrickName(NLMISC::CSheetId id, const ucstring &name, const ucstring &desc, const ucstring &desc2)
 {
 	std::string	label= id.toString();
 	if (label.empty())
diff --git a/code/ryzom/client/src/string_manager_client.h b/code/ryzom/client/src/string_manager_client.h
index 511986407..0f34e24ac 100644
--- a/code/ryzom/client/src/string_manager_client.h
+++ b/code/ryzom/client/src/string_manager_client.h
@@ -77,6 +77,7 @@ public:
 	static void				specialWordsMemoryCompress();
 	// Yoyo: Replace the Brick Name with Filled stats (CSBrickManager work). No-Op if not found
 	static void				replaceSBrickName(NLMISC::CSheetId id, const ucstring &name, const ucstring &desc, const ucstring &desc2);
+	static void				replaceDynString(const ucstring &name, const ucstring &text);
 
 	// Get the Localized Name of the Places.
 	static const ucchar *getPlaceLocalizedName(const std::string &placeNameID);
@@ -106,6 +107,8 @@ public:
 
 	// Get the Localized Title name
 	static const ucchar *getTitleLocalizedName(const std::string &titleId, bool women);
+	static std::vector<ucstring> getTitleInfos(const std::string &titleId, bool women);
+
 	// Get the Localized name of a classification type
 	static const ucchar *getClassificationTypeLocalizedName(EGSPD::CClassificationType::TClassificationType type);
 
@@ -215,8 +218,6 @@ private:
 	// Callback for dyn string value from the server
 	TStringCallbacksContainer	_DynStringsCallbacks;
 
-
-
 	// Return value for waiting string..
 	static ucstring			_WaitString;
 
@@ -273,6 +274,9 @@ private:
 	static bool _SpecItem_MemoryCompressed;
 
 	static	std::map<std::string, CItem> _SpecItem_TempMap;
+	static std::vector<ucstring> _TitleWords;
+	static std::map<ucstring, ucstring> _DynStrings;
+
 
 	static char *_SpecItem_Labels;
 	static ucchar *_SpecItem_NameDesc;
diff --git a/code/ryzom/client/src/user_entity.cpp b/code/ryzom/client/src/user_entity.cpp
index 64a493d2e..f1e4aeff2 100644
--- a/code/ryzom/client/src/user_entity.cpp
+++ b/code/ryzom/client/src/user_entity.cpp
@@ -507,7 +507,7 @@ void CUserEntity::updateVisualPropertyName(const NLMISC::TGameCycle &gameCycle,
 	CPlayerCL::updateVisualPropertyName(gameCycle, prop);
 
 	// Name changed ?
-	if (oldNameId != _NameId)
+/*	if (oldNameId != _NameId)
 	{
 		CInterfaceManager *pIM = CInterfaceManager::getInstance();
 		CInterfaceElement *element = pIM->getElementFromId("ui:interface:mailbox:content:html");
@@ -518,7 +518,7 @@ void CUserEntity::updateVisualPropertyName(const NLMISC::TGameCycle &gameCycle,
 				html->browse("home");
 		}
 	}
-
+*/	
 }// updateVisualPropertyName //
 
 //-----------------------------------------------
@@ -2657,36 +2657,39 @@ void CUserEntity::selection(const CLFECOMMON::TCLEntityId &slot)	// virtual
 			playerGiftNeeded->setValue32(0);
 		}
 	}
+/* TODO ULU : Add RP tags */
 
 	// update pvp tags
-	CViewBase * tagView = dynamic_cast<CViewBase*>(pIM->getElementFromId("ui:interface:target:pvp_tags"));
-	CViewBase * contentView = dynamic_cast<CViewBase*>(pIM->getElementFromId("ui:interface:target:content"));
-
 	if ((tgtSlot!=CLFECOMMON::INVALID_SLOT) && entity)
 	{
 		CPlayerCL *pPlayer = dynamic_cast<CPlayerCL*>(entity);
 
 		if (pPlayer)
 		{
-			for (uint8 i = 0; i < 7; i++)
+			/*// Pvp Mode
+			CViewBitmap * tagMode = dynamic_cast<CViewBitmap*>(pIM->getElementFromId("ui:interface:target:pvp_tags:mode"));
+			if (tagMode)
 			{
-				CViewBitmap * tag = dynamic_cast<CViewBitmap*>(pIM->getElementFromId("ui:interface:target:pvp_tags:tag_"+toString(i)));
-				if (tag)
-				{
-					if ((pPlayer->getPvpMode()&PVP_MODE::PvpFaction || pPlayer->getPvpMode()&PVP_MODE::PvpFactionFlagged) && pPlayer->isPvpAlly(i))
-					{
-						tag->setTexture("pvp_ally_"+toString(i)+".tga");
-					}
-					else if ((pPlayer->getPvpMode()&PVP_MODE::PvpFaction || pPlayer->getPvpMode()&PVP_MODE::PvpFactionFlagged) && pPlayer->isPvpEnnemy(i))
-					{
-						tag->setTexture("pvp_enemy_"+toString(i)+".tga");
-					}
-					else
-					{
-						tag->setTexture("alpha_10.tga");
-					}
-				}
+				if (pPlayer->getPvpMode()&PVP_MODE::PvpFaction)
+					tagMode->setTexture("pvp_orange.tga");
+				else if (pPlayer->getPvpMode()&PVP_MODE::PvpFactionFlagged)
+					tagMode->setTexture("pvp_red.tga");
+				else
+					tagMode->setTexture("alpha_10.tga");
 			}
+*/
+			/*// Pvp available actions (attack, heal, both)
+			CViewBitmap * tagMode = dynamic_cast<CViewBitmap*>(pIM->getElementFromId("ui:interface:target:pvp_tags:actions"));
+			if (tagMode)
+			{
+				if (pPlayer->getPvpMode()&PVP_MODE::PvpFaction)
+					tag->setTexture("pvp_orange.tga");
+				else if (pPlayer->getPvpMode()&PVP_MODE::PvpFactionFlagged)
+					tag->setTexture("pvp_red.tga");
+				else
+					tag->setTexture("alpha_10.tga");
+			}*/
+
 		}
 	}
 
diff --git a/code/ryzom/client/src/user_entity.h b/code/ryzom/client/src/user_entity.h
index 0d39f2967..6dd039c23 100644
--- a/code/ryzom/client/src/user_entity.h
+++ b/code/ryzom/client/src/user_entity.h
@@ -29,7 +29,7 @@
 // 3D Interface.
 #include "nel/3d/u_visual_collision_entity.h"
 // Client DB
-#include "cdb.h"
+#include "nel/misc/cdb.h"
 // Client
 #include "player_cl.h"
 #include "client_cfg.h"
@@ -163,7 +163,7 @@ public:
 	CEntityCL* getMountEntity();
 
 	/// Return the DB entry for the specified user's animal (NULL if not found)
-	CCDBNodeBranch *getBeastDBEntry( CLFECOMMON::TClientDataSetIndex uid );
+	NLMISC::CCDBNodeBranch *getBeastDBEntry( CLFECOMMON::TClientDataSetIndex uid );
 
 	/** To Inform about an entity removed (to remove from selection for example).
 	 * This will remove the entity from the target.
@@ -477,8 +477,16 @@ public:
 	/// true if current behaviour allows to change front
 	bool canChangeFront();
 
+	ucstring getLoginName()
+	{
+		if (_LoginName == ucstring(""))
+			_LoginName = getDisplayName();
+
+		return _LoginName;
+	}
+
 protected:
-	class CSpeedFactor : public ICDBNode::IPropertyObserver
+	class CSpeedFactor : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
 		/// Initialize
@@ -490,7 +498,7 @@ protected:
 		virtual void serial(class NLMISC::IStream &f) throw(NLMISC::EStream) {f.serial(_Value);}
 	protected:
 		/// Method called when the ping message is back.
-		virtual void update(ICDBNode* leaf);
+		virtual void update(NLMISC::ICDBNode* leaf);
 	private:
 		float _Value;
 	};
@@ -507,7 +515,7 @@ protected:
 		virtual void serial(class NLMISC::IStream &/* f */) throw(NLMISC::EStream) {}
 	};
 
-	class CMountSpeeds : public ICDBNode::IPropertyObserver
+	class CMountSpeeds : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public:
 		/// Initialize
@@ -520,7 +528,7 @@ protected:
 		float getRunSpeed() const { return _RunSpeed; }
 	protected:
 		/// Method called when the value is changed
-		virtual void update(ICDBNode* leaf);
+		virtual void update(NLMISC::ICDBNode* leaf);
 	private:
 		float _WalkSpeed;
 		float _RunSpeed;
@@ -579,31 +587,31 @@ protected:
 
 
 	/// CSkill points observer
-	class CSkillPointsObserver : public ICDBNode::IPropertyObserver
+	class CSkillPointsObserver : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public :
 		uint	SpType;
 
 		/// From ICDBNode::IPropertyObserver
-		virtual void update(ICDBNode* node );
+		virtual void update(NLMISC::ICDBNode* node );
 	};
 	CSkillPointsObserver		_SkillPointObs[EGSPD::CSPType::EndSPType];
 
-	class CInvisibleObserver : public ICDBNode::IPropertyObserver
+	class CInvisibleObserver : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public :
-		virtual void update(ICDBNode* node);
+		virtual void update(NLMISC::ICDBNode* node);
 	};
 	CInvisibleObserver			_InvisibleObs;
 
 	/// Fame observer
-	class CFameObserver : public ICDBNode::IPropertyObserver
+	class CFameObserver : public NLMISC::ICDBNode::IPropertyObserver
 	{
 	public :
 		uint32	FactionIndex;
 
 		/// From ICDBNode::IPropertyObserver
-		virtual void update(ICDBNode* node );
+		virtual void update(NLMISC::ICDBNode* node );
 	};
 	std::vector<CFameObserver *>		_FamesObs;
 
@@ -741,6 +749,8 @@ private:
 	/// previous items in hand before they have been changed by an auto-equip due to an action (ex: forage)
 	CItemSnapshot			_PreviousRightHandItem;
 	CItemSnapshot			_PreviousLeftHandItem;
+
+	ucstring _LoginName;
 };
 
 /// Out game received position
diff --git a/code/ryzom/client/src/village.h b/code/ryzom/client/src/village.h
index 20251ccfc..216551f8e 100644
--- a/code/ryzom/client/src/village.h
+++ b/code/ryzom/client/src/village.h
@@ -25,7 +25,7 @@
 
 #include "nel/misc/types_nl.h"
 #include "streamable_ig.h"
-#include "cdb.h"
+#include "nel/misc/cdb.h"
 #include "client_sheets/continent_sheet.h"
 #include "game_share/misc_const.h"
 #include <vector>
diff --git a/code/ryzom/common/Makefile b/code/ryzom/common/Makefile
deleted file mode 100644
index f76559463..000000000
--- a/code/ryzom/common/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-MAKE_NIGHT_ARGS=-j2
-MAKE_ALL_ARGS=-j2
-CXX=g++
-CC=g++
-BIN_DIR=$(RYZOM_PATH)/tools/scripts/linux
-
-night:
-	+make $(MAKE_NIGHT_ARGS) -k -C src night CXX=$(CXX)
-
-all:
-	+make $(MAKE_ALL_ARGS) -C src all
-
-mono:
-	+make -C src all
-
-clean:
-	+make -C src clean
-
-distclean:
-	+make -C src distclean
-
-cleansheets:
-	+make -C src cleansheets
-
-update:
-	+make -C src update
-
-touch:
-	+make -C src touch
diff --git a/code/ryzom/common/src/Makefile b/code/ryzom/common/src/Makefile
deleted file mode 100644
index ef0bb500b..000000000
--- a/code/ryzom/common/src/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-
-BUILD_DIRS = game_share
-
-night: all
-
-all: $(foreach dir,$(BUILD_DIRS),$(dir)-all)
-
-%-all:
-	+make -k -C $* all
-
-clean: $(foreach dir,$(BUILD_DIRS),$(dir)-clean)
-
-%-clean:
-	+make -C $* clean
-
-distclean: $(foreach dir,$(BUILD_DIRS),$(dir)-distclean)
-
-%-distclean:
-	+make -C $* distclean
-
-cleansheets: $(foreach dir,$(BUILD_DIRS),$(dir)-cleansheets)
-
-%-cleansheets:
-	+make -C $* cleansheets
-
-update: $(foreach dir,$(BUILD_DIRS),$(dir)-update)
-
-%-update:
-	+make -C $* update
-
-touch: $(foreach dir,$(BUILD_DIRS),$(dir)-touch)
-
-%-touch:
-	+make -C $* touch
-
-.NOTPARALLEL: night all clean cleansheets update touch
diff --git a/code/ryzom/common/src/game_share/CMakeLists.txt b/code/ryzom/common/src/game_share/CMakeLists.txt
index 6342f468d..61292431c 100644
--- a/code/ryzom/common/src/game_share/CMakeLists.txt
+++ b/code/ryzom/common/src/game_share/CMakeLists.txt
@@ -1,13 +1,32 @@
 FILE(GLOB SRC *.cpp time_weather_season/*.cpp)
 FILE(GLOB PRIV_H *.h time_weather_season/*.h)
 
-SOURCE_GROUP(headers FILES ${PRIV_H})
+FILE(GLOB R2 
+	dms.h dms.cpp
+	scenario.h scenario.cpp
+	user_connection_mgr.h user_connection_mgr.cpp
+	object.h object.cpp
+	server_animation_module.h server_animation_module.cpp
+	server_admin_module.h server_admin_module.cpp
+	server_edition_module.h server_edition_module.cpp
+	string_mgr_module.h string_mgr_module.cpp
+	scenario_entry_points.h scenario_entry_points.cpp
+	small_string_manager.h small_string_manager.cpp
+	ai_wrapper.h ai_wrapper.cpp
+	r2_*.h r2_*.cpp
+	ring_*.h ring_*.cpp)
+
+LIST(REMOVE_ITEM SRC R2)
+LIST(REMOVE_ITEM PRIV_H R2)
+
+SOURCE_GROUP("" FILES ${SRC} ${PRIV_H})
+SOURCE_GROUP("R2" FILES ${R2})
 
 # Filter out the source files not actually compiled.
 LIST(REMOVE_ITEM SRC ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.cpp)
 LIST(REMOVE_ITEM PRIV_H ${CMAKE_CURRENT_SOURCE_DIR}/enum_template.h)
 
-NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC})
+NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC} ${R2})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
 
diff --git a/code/ryzom/common/src/game_share/Makefile b/code/ryzom/common/src/game_share/Makefile
deleted file mode 100644
index ac78fd835..000000000
--- a/code/ryzom/common/src/game_share/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# Simple make file for compiling GAME SHARE
-
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I/usr/include/mysql \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_PATH)/common/src \
-		-I./ \
-		-I./character_structure \
-		-I./egs_sheets \
-		-I./entity_structure \
-		-I./game_item_manager
-
-# The flags for the linker
-LDFLAGS      = 	$(LD_FLAGS_CMN) -L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \
-		-llibmysqlclient \
-		-lnelnet \
-		-lnelgeorges \
-		-lnelpacs \
-		-L/usr/lib \
-		-L/usr/X11R6/lib \
-		-lnelmisc \
-		-lxml2 \
-		-lstlport \
-		-lpthread \
-		-lld
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libgame_share.a
-DSP_TARGET	= game_share.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-
-#libgame_share.so: $(OBJS)
-#	$(CXX) -o $@ $(OBJS) -shared $(LDFLAGS)
-
-libgame_share.a: $(OBJS)
-	ar r libgame_share.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/common/src/game_share/bot_chat_types.h b/code/ryzom/common/src/game_share/bot_chat_types.h
index 779bc8ba3..19982f106 100644
--- a/code/ryzom/common/src/game_share/bot_chat_types.h
+++ b/code/ryzom/common/src/game_share/bot_chat_types.h
@@ -82,6 +82,8 @@ namespace BOTCHATTYPE
 		ResaleKOBroken,
 		// this item can't be sold because its Resold time has expired
 		ResaleKONoTimeLeft,
+		// this item can't be sold because the owner has locked it (temporary hack to get around modifying database.xml)
+		ResaleKOLockedByOwner,
 
 		NumBotChatResaleFlag
 	};
diff --git a/code/ryzom/common/src/game_share/character_sync_itf.h b/code/ryzom/common/src/game_share/character_sync_itf.h
index 459659732..5481045ed 100644
--- a/code/ryzom/common/src/game_share/character_sync_itf.h
+++ b/code/ryzom/common/src/game_share/character_sync_itf.h
@@ -1108,9 +1108,7 @@ namespace CHARSYNC
 
 		void setResult(TCharacterNameResult value)
 		{
-
 				_Result = value;
-
 		}
 			//
 		uint32 getUserId() const
@@ -1120,9 +1118,7 @@ namespace CHARSYNC
 
 		void setUserId(uint32 value)
 		{
-
 				_UserId = value;
-
 		}
 			//
 		uint8 getCharIndex() const
@@ -1132,9 +1128,7 @@ namespace CHARSYNC
 
 		void setCharIndex(uint8 value)
 		{
-
 				_CharIndex = value;
-
 		}
 			//
 		const ucstring& getFullName() const
@@ -1144,9 +1138,7 @@ namespace CHARSYNC
 
 		void setFullName(const ucstring &value)
 		{
-
 				_FullName = value;
-
 		}
 
 		bool operator == (const CValidateNameResult &other) const
@@ -1161,7 +1153,6 @@ namespace CHARSYNC
 		// constructor
 		CValidateNameResult()
 		{
-
 		}
 
 		void serial(NLMISC::IStream &s)
@@ -1170,7 +1161,6 @@ namespace CHARSYNC
 			s.serial(_UserId);
 			s.serial(_CharIndex);
 			s.serial(_FullName);
-
 		}
 
 
diff --git a/code/ryzom/common/src/game_share/data_set_base.h b/code/ryzom/common/src/game_share/data_set_base.h
index 0db688aa5..54bd790ab 100644
--- a/code/ryzom/common/src/game_share/data_set_base.h
+++ b/code/ryzom/common/src/game_share/data_set_base.h
@@ -437,7 +437,7 @@ public:
     // PUBLIC because template friend classes are not supported
 	/// Return the pointer to the property value
 	template <class T>
-	void						getPropPointerForList( TSharedListRow **ppt, TPropertyIndex propIndex, const TDataSetRow& entityIndex, T* typeHint ) const
+	void						getPropPointerForList( TSharedListRow **ppt, TPropertyIndex propIndex, const TDataSetRow& entityIndex, T* /* typeHint */ ) const
 	{
 #ifndef FAST_MIRROR
 		nlassert( (propIndex != INVALID_PROPERTY_INDEX) && (propIndex < (TPropertyIndex)_PropertyContainer.PropertyValueArrays.size()) ); // Wrong property
diff --git a/code/ryzom/common/src/game_share/deployment_configuration.cpp b/code/ryzom/common/src/game_share/deployment_configuration.cpp
new file mode 100644
index 000000000..625600331
--- /dev/null
+++ b/code/ryzom/common/src/game_share/deployment_configuration.cpp
@@ -0,0 +1,1519 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+//-----------------------------------------------------------------------------
+// include
+//-----------------------------------------------------------------------------
+
+// pre compiled headers
+#include "stdpch.h"
+
+// nel
+#include "nel/misc/types_nl.h"
+#include "nel/misc/common.h"
+#include "nel/misc/time_nl.h"
+#include "nel/misc/smart_ptr.h"
+#include "nel/misc/singleton.h"
+#include "nel/misc/command.h"
+#include "nel/misc/file.h"
+
+// game share
+#include "utils.h"
+#include "deployment_configuration.h"
+
+
+//-----------------------------------------------------------------------------
+// namespaces
+//-----------------------------------------------------------------------------
+
+using namespace std;
+using namespace NLMISC;
+
+
+//-----------------------------------------------------------------------------
+// namespace DEPCFG
+//-----------------------------------------------------------------------------
+
+namespace DEPCFG
+{
+	//-----------------------------------------------------------------------------
+	// forward class declarations
+	//-----------------------------------------------------------------------------
+
+	struct SExeRecord;
+	class CInfoBlock;
+	class CInfoContainer;
+	class CDeploymentConfigurationImplementation;
+
+
+	//-----------------------------------------------------------------------------
+	// struct SExeRecord
+	//-----------------------------------------------------------------------------
+
+	struct SExeRecord
+	{
+		typedef std::set<NLMISC::CSString>		TDataEntries;
+		typedef std::vector<NLMISC::CSString>	TCfgEntries;
+
+		NLMISC::CSString	FullName;
+
+		NLMISC::CSString	DomainName;
+		NLMISC::CSString	ShardName;
+		NLMISC::CSString	UniqueName;
+		NLMISC::CSString	CmdLine;
+		NLMISC::CSString	Host;
+		NLMISC::CSString	StartOrder;
+		TDataEntries		DataEntries;
+		TCfgEntries			CfgEntries;
+		TCfgEntries			CfgEntriesPost;
+
+		// serial method
+		void serial(NLMISC::IStream& stream)
+		{
+			stream.serial(FullName);
+			stream.serial(DomainName);
+			stream.serial(ShardName);
+			stream.serial(UniqueName);
+			stream.serial(CmdLine);
+			stream.serial(Host);
+			stream.serialCont(DataEntries);
+			stream.serialCont(CfgEntries);
+			stream.serialCont(CfgEntriesPost);
+		}
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// class CInfoBlock
+	//-----------------------------------------------------------------------------
+
+	class CInfoBlock: public NLMISC::CRefCount
+	{
+	public:
+		// ctors
+		CInfoBlock(const NLMISC::CSString& name="");
+
+		// write accessors
+		void setDomainName(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+		void setShardName(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+		void setUniqueName(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+		void setCmdLine(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+		void setHost(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+		void setStartOrder(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+
+		void addUseEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+		void addDataEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+
+		void addCfgEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+		void addCfgEntryPost(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors);
+
+		void addCfgFile(const NLMISC::CSString& fileName,const NLMISC::CSString& context,uint32& errors);
+		void addCfgFilePost(const NLMISC::CSString& fileName,const NLMISC::CSString& context,uint32& errors);
+
+		// direct read accessors
+		uint32 getNumParents() const;
+		const NLMISC::CSString& getName() const;
+		const NLMISC::CSString& getDomainName() const;
+
+		// indirect read accessors
+		bool isDomain() const;
+		bool isShard() const;
+
+		// setup the _Children vector from the _UseEntries vector
+		void setupChildren(CInfoContainer* container,uint32& errors);
+
+		// traverse the tree of children, cumulating data on exes, and instantiating the exe records in 'container'
+		void buildExeSet(CInfoContainer* container,uint32& errors,const SExeRecord& parentExeRecord=SExeRecord());
+
+		// serial
+		void serial(NLMISC::IStream& stream);
+
+		// display the contents of the container
+		void dump(NLMISC::CLog& log) const;
+
+	private:
+		// data types
+		typedef std::set<NLMISC::CSString>				TUseEntries;
+		typedef std::set<NLMISC::CSString>				TDataEntries;
+		typedef std::vector<NLMISC::CSString>			TCfgEntries;
+
+		typedef std::vector<CInfoBlock*>				TChildren;
+
+		// private methods
+		bool _haveCircularRef(CInfoBlock* other) const;
+
+		// data (basics)
+		NLMISC::CSString	_Name;
+		uint32				_NumParents;
+		TChildren			_Children;
+
+		// data extracted from input file
+		NLMISC::CSString	_DomainName;
+		NLMISC::CSString	_ShardName;
+		NLMISC::CSString	_UniqueName;
+		NLMISC::CSString	_CmdLine;
+		NLMISC::CSString	_Host;
+		NLMISC::CSString	_StartOrder;
+		TUseEntries			_UseEntries;
+		TDataEntries		_DataEntries;
+		TCfgEntries			_CfgEntries;
+		TCfgEntries			_CfgEntriesPost;
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// class CInfoContainer
+	//-----------------------------------------------------------------------------
+
+	class CInfoContainer
+	{
+	public:
+		// public interface
+		void clear();
+		bool empty() const;
+
+		bool read(const NLMISC::CSString& fileName);
+		void serial(NLMISC::IStream& stream);
+
+		void getHostNames(THostNames& result) const;
+		void getDomainNames(TDomainNames& result) const;
+		void getShardNames(const TDomainName& domainName,TShardNames& result) const;
+		void getAppNames(const THostName& hostName,const TDomainName& domainName,TAppNames& result) const;
+		void getAppNames(const THostName& hostName,const TDomainName& domainName,const TShardName& shardName,TAppNames& result) const;
+
+		void getHost(const THostName& hostName,SHostDescription& result) const;
+		void getDomain(const TDomainName& domainName, SDomainDescription& result) const;
+		void getShard(const TDomainName& domainName,const TShardName& shardName,SShardDescription& result) const;
+		void getApp(const TDomainName& domainName,const TAppName& appName,SAppDescription& result) const;
+
+		void dumpInfoBlocks(NLMISC::CLog& log) const;
+		void dumpDomains(NLMISC::CLog& log) const;
+
+		// interface used by CInfoBlock methods
+		CInfoBlock* getInfoBlock(const NLMISC::CSString& name);
+		void addExe(const SExeRecord& exeRecord,uint32& errors);
+
+	private:
+		// data types
+		typedef NLMISC::CSmartPtr<CInfoBlock>				TInfoBlockPtr;
+		typedef std::map< NLMISC::CSString,TInfoBlockPtr >	TInfoBlocks;
+		typedef std::set< NLMISC::CSString >				TFileNameSet;
+		typedef std::vector< SExeRecord >					TExeRecords;
+		typedef std::vector<uint32>							TExeIdx;
+		typedef std::map<NLMISC::CSString,TExeIdx>			TShardExes;
+		typedef std::map<NLMISC::CSString,TShardExes>		TDomainExes;
+
+		// private methods
+		void _readFile(const NLMISC::CSString& fileName,uint32& errors,TFileNameSet& fileNameStack);
+		void _buildDomainTree(uint32& errors);
+		void _buildExeSet(uint32& errors);
+
+		// data
+		TInfoBlockPtr	_CurrentInfoBlock;
+		TInfoBlocks		_InfoBlocks;
+		TExeRecords		_ExeRecords;
+		TDomainExes		_DomainExes;
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// class CDeploymentConfigurationImplementation
+	//-----------------------------------------------------------------------------
+
+	class CDeploymentConfigurationImplementation: public CSingleton<CDeploymentConfigurationImplementation>, public CDeploymentConfiguration
+	{
+	public:
+		bool read(const NLMISC::CSString& fileName);
+		void write(const NLMISC::CSString& fileName);
+		void serial(NLMISC::IStream& stream);
+
+		void getHostNames(THostNames& result) const;
+		void getDomainNames(TDomainNames& result) const;
+		void getShardNames(const TDomainName& domainName,TShardNames& result) const;
+		void getAppNames(const THostName& hostName,const TDomainName& domainName,TAppNames& result) const;
+		void getAppNames(const THostName& hostName,const TDomainName& domainName,const TShardName& shardName,TAppNames& result) const;
+
+		void getHost(const THostName& hostName,SHostDescription& result) const;
+		void getDomain(const TDomainName& domainName, SDomainDescription& result) const;
+		void getShard(const TDomainName& domainName,const TShardName& shardName,SShardDescription& result) const;
+		void getApp(const TDomainName& domainName,const TAppName& appName,SAppDescription& result) const;
+
+		void dumpInfoBlocks(NLMISC::CLog& log) const;
+		void dumpDomains(NLMISC::CLog& log) const;
+
+	private:
+		CInfoContainer _InfoContainer;
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// methods CInfoBlock
+	//-----------------------------------------------------------------------------
+
+	CInfoBlock::CInfoBlock(const NLMISC::CSString& name)
+	{
+		_Name= name;
+		_NumParents= 0;
+	}
+
+	void CInfoBlock::setDomainName(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(!_DomainName.empty(),context+"Attempting to set a domain name more than once for the same info block",++errors; return);
+		DROP_IF(entry.empty(),context+"Attempting to set an empty domain name",++errors; return);
+		_DomainName=entry;
+	}
+
+	void CInfoBlock::setShardName(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(!_ShardName.empty(),context+"Attempting to set a shard name more than once for the same info block",++errors; return);
+		DROP_IF(entry.empty(),context+"Attempting to set an empty shard name",++errors; return);
+		_ShardName=entry;
+	}
+
+	void CInfoBlock::setUniqueName(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(!_UniqueName.empty(),context+"Attempting to set a name more than once for the same info block",++errors; return);
+		DROP_IF(entry.empty(),context+"Attempting to set an empty name",++errors; return);
+		_UniqueName=entry;
+	}
+
+	void CInfoBlock::setCmdLine(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(!_CmdLine.empty(),context+"Attempting to set a cmdLine more than once for the same info block",++errors; return);
+		DROP_IF(entry.empty(),context+"Attempting to set an empty cmdLine",++errors; return);
+		_CmdLine=entry;
+	}
+
+	void CInfoBlock::setHost(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(!_Host.empty(),context+"Attempting to set a host more than once for the same info block",++errors; return);
+		DROP_IF(entry.empty(),context+"Attempting to set an empty host",++errors; return);
+		_Host=entry;
+	}
+
+	void CInfoBlock::setStartOrder(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(!_StartOrder.empty(),context+"Attempting to set a startOrder more than once for the same info block",++errors; return);
+		DROP_IF(entry.empty(),context+"Attempting to set an empty startOrder",++errors; return);
+		_StartOrder=entry;
+	}
+
+	void CInfoBlock::addUseEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(_UseEntries.find(entry)!=_UseEntries.end(),context+"Ignoring duplicate refference to 'use' clause: "+entry,return);
+		_UseEntries.insert(entry);
+	}
+
+	void CInfoBlock::addDataEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		DROP_IF(_DataEntries.find(entry)!=_DataEntries.end(),context+"Ignoring duplicate refference to 'data' clause: "+entry,return);
+		_DataEntries.insert(entry);
+	}
+
+	void CInfoBlock::addCfgEntry(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		_CfgEntries.push_back(entry);
+	}
+
+	void CInfoBlock::addCfgEntryPost(const NLMISC::CSString& entry,const NLMISC::CSString& context,uint32& errors)
+	{
+		_CfgEntriesPost.push_back(entry);
+	}
+
+	void CInfoBlock::addCfgFile(const NLMISC::CSString& fileName,const NLMISC::CSString& context,uint32& errors)
+	{
+		// make sure a file name is supplied
+		DROP_IF(fileName.empty(),context+"No file name found following 'cfgFile'", ++errors;return);
+
+		// read in the src file
+		NLMISC::CSString fileContents;
+		fileContents.readFromFile(fileName);
+		DROP_IF(fileContents.empty(),"File not found: "+fileName, ++errors;return);
+
+		// split the file contents into lines
+		NLMISC::CVectorSString lines;
+		fileContents.splitLines(lines);
+
+		// append the lines to the '_CfgEntries' container
+		_CfgEntries.insert(_CfgEntries.end(),lines.begin(),lines.end());
+	}
+
+	void CInfoBlock::addCfgFilePost(const NLMISC::CSString& fileName,const NLMISC::CSString& context,uint32& errors)
+	{
+		// make sure a file name is supplied
+		DROP_IF(fileName.empty(),context+"No file name found following 'cfgFilePost'", ++errors;return);
+
+		// read in the src file
+		NLMISC::CSString fileContents;
+		fileContents.readFromFile(fileName);
+		DROP_IF(fileContents.empty(),"File not found: "+fileName, ++errors;return);
+
+		// split the file contents into lines
+		NLMISC::CVectorSString lines;
+		fileContents.splitLines(lines);
+
+		// prepend the lines to the '_CfgEntriesPost' container
+		_CfgEntriesPost.insert(_CfgEntriesPost.begin(),lines.begin(),lines.end());
+	}
+
+	uint32 CInfoBlock::getNumParents() const
+	{
+		return _NumParents;
+	}
+
+	const NLMISC::CSString& CInfoBlock::getName() const
+	{
+		return _Name;
+	}
+
+	const NLMISC::CSString& CInfoBlock::getDomainName() const
+	{
+		return _DomainName;
+	}
+
+	bool CInfoBlock::isDomain() const
+	{
+		return !_DomainName.empty();
+	}
+
+	bool CInfoBlock::isShard() const
+	{
+		return !_ShardName.empty();
+	}
+
+	void CInfoBlock::setupChildren(CInfoContainer* container,uint32& errors)
+	{
+		// start by clearing out the child vector that we're going to fill
+		_Children.clear();
+
+		// iterate over the the 'use' clauses
+		for (TUseEntries::iterator it= _UseEntries.begin(); it!= _UseEntries.end(); ++it)
+		{
+			const NLMISC::CSString& theEntry= *it;
+			
+			// try to get a pointer to the refferenced info block...
+			CInfoBlock* infoBlockPtr= container->getInfoBlock(theEntry);
+			DROP_IF(infoBlockPtr==NULL,"Failed to find block named '"+theEntry+"' while fixing up children of block: "+_Name, ++errors;continue);
+
+			// make sure that this block doesn't figure amongst the children of the refferenced info block (to avoid circular refs)
+			DROP_IF(_haveCircularRef(infoBlockPtr),"Circular dependency found between definitions of '"+_Name+"' and '"+theEntry+"'", ++errors;continue);
+
+			// add the info block to our children
+			_Children.push_back(infoBlockPtr);
+			++(infoBlockPtr->_NumParents);
+		}
+	}
+
+	void CInfoBlock::buildExeSet(CInfoContainer* container,uint32& errors,const SExeRecord& parentExeRecord)
+	{
+		// setup a record to accumulate data into as we traverse the tree, starting
+		// with a copy of the data passed in from parents
+		SExeRecord theExe= parentExeRecord;
+
+		// add a chunk to the exe record's 'FullName' property
+		theExe.FullName+= (theExe.FullName.empty()?"":".")+ _Name;
+
+		// make sure we don't have any field duplication...
+		DROP_IF(!_DomainName.empty() && !theExe.DomainName.empty(),	"more than one domain found in: "+theExe.FullName,	++errors );
+		DROP_IF(!_ShardName.empty() && !theExe.ShardName.empty(),	"more than one shard found in: "+theExe.FullName,	++errors );
+		DROP_IF(!_CmdLine.empty() && !theExe.CmdLine.empty(),		"more than one cmdLine found in: "+theExe.FullName,		++errors );
+		DROP_IF(!_Host.empty() && !theExe.Host.empty(),				"more than one host found in: "+theExe.FullName,	++errors );
+		WARN_IF(!_UniqueName.empty() && !theExe.UniqueName.empty(),	"replacing name '"+theExe.UniqueName+"' with '"+_UniqueName+"' in: "+theExe.FullName);
+
+		// fill our own data into the exe record
+		if (!_DomainName.empty())	theExe.DomainName =	_DomainName;
+		if (!_ShardName.empty())	theExe.ShardName =	_ShardName;
+		if (!_UniqueName.empty())	theExe.UniqueName =	_UniqueName;
+		if (!_CmdLine.empty())		theExe.CmdLine =	_CmdLine;
+		if (!_Host.empty())			theExe.Host =		_Host;
+		if (!_StartOrder.empty())	theExe.StartOrder =	_StartOrder;
+		// merge contents of 2 sets
+		theExe.DataEntries.insert(	_DataEntries.begin(),	_DataEntries.end()	);
+		// append or pre-pend contents of one vector to another
+		theExe.CfgEntries.insert( theExe.CfgEntries.end(), _CfgEntries.begin(), _CfgEntries.end() );
+		theExe.CfgEntriesPost.insert( theExe.CfgEntriesPost.begin(), _CfgEntriesPost.begin(), _CfgEntriesPost.end() );
+
+		// if this is the node with the cmdLine then think about updating the unique name...
+		if (!_CmdLine.empty() && theExe.UniqueName.empty())
+		{
+			theExe.UniqueName= _Name;
+		}
+
+		// do something with the exe record depending on whetherwe're a tree branch or leaf
+		if (_Children.empty())
+		{
+			// merge the cfg entries together to make a single block
+			theExe.CfgEntries.insert(theExe.CfgEntries.end(),theExe.CfgEntriesPost.begin(),theExe.CfgEntriesPost.end());
+			theExe.CfgEntriesPost.clear();
+
+			// this is a leaf node (it has no children) so it must describe an executable
+			container->addExe(theExe,errors);
+		}
+		else
+		{
+			// this is a branch node so recurse into children
+			for (TChildren::iterator it=_Children.begin();it!=_Children.end();++it)
+			{
+				(*it)->buildExeSet(container,errors,theExe);
+			}
+		}
+	}
+
+	void CInfoBlock::serial(NLMISC::IStream& stream)
+	{
+		if (stream.isReading())
+		{
+			// if we're reading then we clear out the children vector - it'll be rebuilt at the end of the serial
+			_Children.clear();
+		}
+
+		stream.serial(_Name);
+		stream.serial(_NumParents);
+		stream.serial(_DomainName);
+		stream.serial(_ShardName);
+		stream.serial(_UniqueName);
+		stream.serial(_CmdLine);
+		stream.serial(_Host);
+
+		stream.serialCont(_UseEntries);
+		stream.serialCont(_DataEntries);
+		stream.serialCont(_CfgEntries);
+		stream.serialCont(_CfgEntriesPost);
+	}
+
+	void CInfoBlock::dump(NLMISC::CLog& log) const
+	{
+		//*****************************
+		// NOTE:
+		// This method is called to
+		// create a text save of the
+		// data that we contain - it
+		// must output ALL data that
+		// read() requires and in a 
+		// read()-compatible format
+		//*****************************
+
+		log.displayNL("define %s // refferenced by %u other defines",_Name.c_str(),_NumParents);
+
+		if (!_DomainName.empty())
+		{
+			log.displayNL("\tdomain\t%s",_DomainName.c_str());
+		}
+
+		if (!_ShardName.empty())
+		{
+			log.displayNL("\tshard\t%s",_ShardName.c_str());
+		}
+
+		if (!_UniqueName.empty())
+		{
+			log.displayNL("\tname\t%s",_UniqueName.c_str());
+		}
+
+		if (!_CmdLine.empty())
+		{
+			log.displayNL("\tcmdLine\t%s",_CmdLine.c_str());
+		}
+
+		if (!_Host.empty())
+		{
+			log.displayNL("\thost\t%s",_Host.c_str());
+		}
+
+		for (TUseEntries::const_iterator it=_UseEntries.begin(); it!=_UseEntries.end(); ++it)
+		{	
+			log.displayNL("\tuse\t%s",it->c_str());
+		}
+
+		for (TDataEntries::const_iterator it=_DataEntries.begin(); it!=_DataEntries.end(); ++it)
+		{
+			log.displayNL("\tdata\t%s",it->c_str());
+		}
+
+		for (TCfgEntries::const_iterator it=_CfgEntries.begin(); it!=_CfgEntries.end(); ++it)
+		{
+			log.displayNL("\tcfg\t%s",it->c_str());
+		}
+
+		for (TCfgEntries::const_iterator it=_CfgEntriesPost.begin(); it!=_CfgEntriesPost.end(); ++it)
+		{
+			log.displayNL("\tcfgAfter\t%s",it->c_str());
+		}
+
+		log.displayNL("");
+	}
+
+	bool CInfoBlock::_haveCircularRef(CInfoBlock* other) const
+	{
+		// in the case of a circular refference we end up with the 'other'=='this'
+		if (this==other)
+			return true;
+
+		// recurse into children looking for a deep circular ref
+		for (TChildren::const_iterator it= other->_Children.begin();it!=other->_Children.end();++it)
+		{
+			CInfoBlock* child= *it;
+			if (_haveCircularRef(child))
+				return true;
+		}
+
+		// no circular ref found so return false
+		return false;
+	}
+
+	//-----------------------------------------------------------------------------
+	// methods CInfoContainer
+	//-----------------------------------------------------------------------------
+
+	void CInfoContainer::clear()
+	{
+		_InfoBlocks.clear();
+		_CurrentInfoBlock= NULL;
+		_ExeRecords.clear();
+		_DomainExes.clear();
+	}
+
+	bool CInfoContainer::empty() const
+	{
+		return _InfoBlocks.empty();
+	}
+
+	bool CInfoContainer::read(const NLMISC::CSString& fileName)
+	{
+		// start by clearing out our contents...
+		clear();
+
+		// setup some basics
+		uint32 errors= 0;
+		TFileNameSet fileNameSet;
+
+		// read in the src file
+		_readFile(fileName,errors,fileNameSet);
+
+		// build the blocks into a tree
+		_buildDomainTree(errors);
+
+		// build the set of executables from the tree
+		_buildExeSet(errors);
+
+		// make sure that no errors were encountered...
+		DROP_IF(errors!=0,NLMISC::toString("%s: Parse Failed: %u errors found",fileName.c_str(),errors),clear(); return false);
+
+		return true;
+	}
+
+	void CInfoContainer::_readFile(const NLMISC::CSString& fileName,uint32& errors,TFileNameSet& fileNameSet)
+	{
+		// read in the src file
+		NLMISC::CSString fileContents;
+		fileContents.readFromFile(fileName);
+		DROP_IF(fileContents.empty(),"File not found: "+fileName, ++errors;return);
+
+		// split the file into lines
+		NLMISC::CVectorSString lines;
+		fileContents.splitLines(lines);
+
+		// process the lines one by one
+		for (uint32 i=0;i<lines.size();++i)
+		{
+			// setup a context string to pre-pend to error messages
+			NLMISC::CSString context= NLMISC::toString("%s:%u: ",fileName.c_str(),i);
+
+			// remove comments and encapsulating blanks
+			NLMISC::CSString line= lines[i].splitToLineComment().strip();
+			if (line.empty()) continue;
+
+			// split the line into keyword and args
+			NLMISC::CSString args= line;
+			NLMISC::CSString keyword= args.strtok(" \t");
+			NLMISC::CSString rawArgs= lines[i].strip();
+			rawArgs.strtok(" \t");
+
+			// try to treat the keyword
+			if (keyword=="include")
+			{
+				DROP_IF(args.empty(),context+"No file name found following 'include': "+line, ++errors;continue);
+				DROP_IF(fileNameSet.find(args)!=fileNameSet.end(),context+"Warning: Duplicate 'include' block ignored: "+line, continue);
+				fileNameSet.insert(args);
+				_readFile(args.unquoteIfQuoted(),errors,fileNameSet);
+			}
+			else if (keyword=="define")
+			{
+				DROP_IF(args.empty(),context+"No block name found following 'define': "+line, ++errors;continue);
+				DROP_IF(_InfoBlocks.find(args)!=_InfoBlocks.end(),context+"Duplicate 'define' block found: "+line, ++errors;continue);
+				// create a new info block and push it into our infoblock set
+				_CurrentInfoBlock= new CInfoBlock(args);
+				_InfoBlocks[args]= _CurrentInfoBlock;
+			}
+			else
+			{
+				DROP_IF(_CurrentInfoBlock==NULL,context+"Expecting 'define <block_name>' but found: "+line, ++errors;continue);
+
+				if		(keyword=="domain")			{ _CurrentInfoBlock->setDomainName(args,context,errors); }
+				else if	(keyword=="shard")			{ _CurrentInfoBlock->setShardName(args,context,errors); }
+				else if (keyword=="name")			{ _CurrentInfoBlock->setUniqueName(args,context,errors); }
+				else if (keyword=="cmdLine")		{ _CurrentInfoBlock->setCmdLine(args,context,errors); }
+				else if (keyword=="host")			{ _CurrentInfoBlock->setHost(args,context,errors); }
+				else if (keyword=="startOrder")		{ _CurrentInfoBlock->setStartOrder(args,context,errors); }
+				else if (keyword=="use")			{ _CurrentInfoBlock->addUseEntry(args,context,errors); }
+				else if (keyword=="data")			{ _CurrentInfoBlock->addDataEntry(args,context,errors); }
+				else if	(keyword=="cfg")			{ _CurrentInfoBlock->addCfgEntry(rawArgs,context,errors); }
+				else if	(keyword=="cfgAfter")		{ _CurrentInfoBlock->addCfgEntryPost(rawArgs,context,errors); }
+				else if	(keyword=="cfgFile")		{ _CurrentInfoBlock->addCfgFile(args,context,errors); }
+				else if	(keyword=="cfgFileAfter")	{ _CurrentInfoBlock->addCfgFilePost(args,context,errors); }
+				else								{ DROP(context+"Unrecognised keyword: "+line, ++errors;continue); }
+			}
+		}
+	}
+
+	void CInfoContainer::_buildDomainTree(uint32& errors)
+	{
+		// iterate over the info block container, setting up 'child' vectors
+		for (TInfoBlocks::iterator it= _InfoBlocks.begin(); it!= _InfoBlocks.end(); ++it)
+		{
+			CInfoBlock& theInfoBlock= *it->second;
+			theInfoBlock.setupChildren(this,errors);
+		}
+
+		// display the list of orphans
+		for (TInfoBlocks::iterator it= _InfoBlocks.begin(); it!= _InfoBlocks.end(); ++it)
+		{
+			CInfoBlock& theInfoBlock= *it->second;
+			WARN_IF(!theInfoBlock.isDomain() && theInfoBlock.getNumParents()==0,"Found unrefferenced info block: "+theInfoBlock.getName());
+		}
+	}
+
+	void CInfoContainer::_buildExeSet(uint32& errors)
+	{
+		// iterate over the info block container, looking for domains
+		for (TInfoBlocks::iterator it= _InfoBlocks.begin(); it!= _InfoBlocks.end(); ++it)
+		{
+			CInfoBlock& theInfoBlock= *it->second;
+			if (theInfoBlock.isDomain())
+			{
+				const NLMISC::CSString& domainName= theInfoBlock.getDomainName();
+				DROP_IF(_DomainExes.find(domainName)!=_DomainExes.end(),"Duplicate domain name found: "+domainName,++errors;continue);
+				nldebug("Building executable set for domain: %s",domainName.c_str());
+				theInfoBlock.buildExeSet(this,errors);
+			}
+
+			// fixup the names in the domain to make them unique
+
+			// run through the exes a first time to determine which unique names are unique and which are not
+			std::map<NLMISC::CSString, uint32> nameCounts;
+			for (TExeRecords::iterator it2= _ExeRecords.begin(); it2!=_ExeRecords.end(); ++it2)
+			{
+				// skip anything that's not from our domain
+				if (it2->DomainName!=theInfoBlock.getDomainName())
+					continue;
+
+				// get hold of the name
+				NLMISC::CSString& name= it2->UniqueName;
+				// yell if the name already looks like a 'fixed up' name
+				DROP_IF(name.right(3).left(1)=="_" && (name.right(2)=="00" || name.right(2).atoui()!=0),"Appending '_' to name ending in '_00' style format as this can clash with auto renumbering => "+name+'_',name+='_')
+				// compose a second version of the name with the shard name added
+				NLMISC::CSString name_with_shard= name+'_'+it2->ShardName;
+				// insert both versions of the name into the unique name counter
+				++nameCounts[name];
+				++nameCounts[name_with_shard];
+			}
+
+			// run through the exes a second time to fix names that are not unique
+			std::map<NLMISC::CSString, uint32> nameIdx;
+			for (TExeRecords::iterator it2= _ExeRecords.begin(); it2!=_ExeRecords.end(); ++it2)
+			{
+				// skip anything that's not from our domain
+				if (it2->DomainName!=theInfoBlock.getDomainName())
+					continue;
+
+				// get hold of the name
+				NLMISC::CSString& name= it2->UniqueName;
+				// if the name is unique then continue
+				if (nameCounts[name]==1)
+					continue;
+
+				// compose a second version of the name with the shard name added
+				name+='_';
+				name+=it2->ShardName;
+				// if the name is unique within the shard then continue
+				if (nameCounts[name]==1)
+					continue;
+
+				// make the name name unique by appending a number to it
+				uint32 idx= ++nameIdx[name];
+				name+=NLMISC::toString("_%02u",idx);
+			}
+		}
+	}
+
+	void CInfoContainer::serial(NLMISC::IStream& stream)
+	{
+		if (stream.isReading())
+		{
+			// start by clearing out our contents...
+			clear();
+
+			// get the number of info blocks from the stream
+			uint32 count;
+			stream.serial(count);
+
+			// get the info blocks from the stream one by one
+			for (uint32 i=0;i<count;++i)
+			{
+				_CurrentInfoBlock= new CInfoBlock;
+				stream.serial(*_CurrentInfoBlock);
+				_InfoBlocks[_CurrentInfoBlock->getName()]= _CurrentInfoBlock;
+			}
+
+			// setup an error accumulator
+			uint32 errors= 0;
+
+			// build the blocks into a tree
+			_buildDomainTree(errors);
+
+			// build the set of executables from the tree
+			_buildExeSet(errors);
+
+			// make sure that no errors were encountered...
+			DROP_IF(errors!=0,NLMISC::toString("Serial Failed: %u errors found",errors), clear();return);
+
+			// note - on exit, _CurrentInfoBlock refferences the last info block read
+		}
+		else
+		{
+			// put the number of info blocks to the stream
+			uint32 count= (uint32)_InfoBlocks.size();
+			stream.serial(count);
+			// put the info blocks to the stream one by one
+			for (TInfoBlocks::iterator it= _InfoBlocks.begin(); it!=_InfoBlocks.end(); ++it)
+			{
+				stream.serial(*(it->second));
+			}
+		}
+	}
+
+	void CInfoContainer::getHostNames(THostNames& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+
+		// use a little set to avoid adding host names more than once
+		std::set<NLMISC::CSString> namesFound;
+
+		// fill the result in from our internal data
+		bool found= false;
+		for (TExeRecords::const_iterator it= _ExeRecords.begin(); it!=_ExeRecords.end(); ++it)
+		{
+			const SExeRecord& theApp= *it;
+
+			// ignore exes that are on hosts that we've already dealt with
+			if (namesFound.find(theApp.Host)!=namesFound.end()) continue;
+
+			// we've found a new host so add it to our result container
+			result.push_back(theApp.Host);
+			namesFound.insert(theApp.Host);
+
+			found=true;
+		}
+
+		if (!found)
+		{
+			// as a note - if we get here it is because the request has failed - no hosts were identified with the given domain
+			// this is not an error case so we just add a debug for info
+			nldebug("getHostNames failed - no hosts found");
+		}
+	}
+
+	void CInfoContainer::getDomainNames(TDomainNames& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+
+		// fill the result in from our internal data
+		for (TDomainExes::const_iterator dit= _DomainExes.begin(); dit!=_DomainExes.end(); ++dit)
+		{
+			const NLMISC::CSString& domainName= dit->first;
+			result.push_back(domainName);
+		}
+
+		if (result.empty())
+		{
+			// as a note - if we get here it is because the request has failed - no domains were found
+			// this is not an error case so we just add a debug for info
+			nldebug("getDomainNames failed - no domains found");
+		}
+	}
+
+	void CInfoContainer::getShardNames(const TDomainName& domainName,TShardNames& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+
+		// fill the result in from our internal data
+		bool found= false;
+		for (TDomainExes::const_iterator dit= _DomainExes.begin(); dit!=_DomainExes.end(); ++dit)
+		{
+			// ignore shards that aren't in the requested domain
+			const NLMISC::CSString& domName= dit->first;
+			if (domName!=domainName) continue;
+
+			// run throught he shards for our chosen domain...
+			const TShardExes& shards= dit->second;
+			for (TShardExes::const_iterator sit= shards.begin(); sit!=shards.end(); ++sit)
+			{
+				const NLMISC::CSString shardName= sit->first;
+				result.push_back(shardName);
+			}
+
+			found=true;
+		}
+
+		if (!found)
+		{
+			// as a note - if we get here it is because the request has failed - no shards were identified with the given domain
+			// this is not an error case so we just add a debug for info
+			nldebug("getShardNames failed for domainName('%s')",domainName.c_str());
+		}
+	}
+
+	void CInfoContainer::getAppNames(const THostName& hostName,const TDomainName& domainName,TAppNames& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+
+		// fill the result in from our internal data
+		bool found= false;
+		for (TExeRecords::const_iterator it= _ExeRecords.begin(); it!=_ExeRecords.end(); ++it)
+		{
+			const SExeRecord& theApp= *it;
+
+			// ignore exes that aren't in the requested domain
+			if (theApp.DomainName!=domainName) continue;
+
+			// ignore exes that are on the wrong host
+			if (theApp.Host!=hostName) continue;
+
+			// we've found a new host so add it to our result container
+			result.push_back(theApp.UniqueName);
+
+			found=true;
+		}
+
+		if (!found)
+		{
+			// as a note - if we get here it is because the request has failed - no apps were identified with the given host and domain
+			// this is not an error case so we just add a debug for info
+			nldebug("getAppNames failed for hostName('%s'), domainName('%s')",hostName.c_str(),domainName.c_str());
+		}
+	}
+
+	void CInfoContainer::getAppNames(const THostName& hostName,const TDomainName& domainName,const TShardName& shardName,TAppNames& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+
+		// fill the result in from our internal data
+		bool found= false;
+		for (TExeRecords::const_iterator it= _ExeRecords.begin(); it!=_ExeRecords.end(); ++it)
+		{
+			const SExeRecord& theApp= *it;
+
+			// ignore exes that aren't in the requested domain
+			if (theApp.DomainName!=domainName) continue;
+
+			// ignore exes that are on the wrong host
+			if (theApp.Host!=hostName) continue;
+
+			// ignore exes that are on the shard host
+			if (theApp.ShardName!=shardName) continue;
+
+			// we've found a new host so add it to our result container
+			result.push_back(theApp.UniqueName);
+
+			found=true;
+		}
+
+		if (!found)
+		{
+			// as a note - if we get here it is because the request has failed - no apps were identified with the given host, shard and domain
+			// this is not an error case so we just add a debug for info
+			nldebug("getAppNames failed for hostName('%s'), domainName('%s'), shardName('%s')",hostName.c_str(),domainName.c_str(),shardName.c_str());
+		}
+	}
+
+	void CInfoContainer::getHost(const THostName& hostName,SHostDescription& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+		result.HostName= hostName;
+
+		// use a set to buildup lists of unique host names
+		typedef std::set<NLMISC::CSString> TNameSet;
+		TNameSet domainNames;
+
+		// fill the result in from our internal data
+		bool found= false;
+		for (TExeRecords::const_iterator it= _ExeRecords.begin(); it!=_ExeRecords.end(); ++it)
+		{
+			const SExeRecord& theApp= *it;
+
+			// ignore exes that aren't on the requested host
+			if (theApp.Host!=hostName) continue;
+
+			// add this exe's domain to the domains set
+			domainNames.insert(theApp.DomainName);
+
+			found=true;
+		}
+
+		// copy the hosts set to the result record
+		for (TNameSet::const_iterator it= domainNames.begin(); it!=domainNames.end(); ++it)
+		{
+			result.Domains.push_back(*it);
+		}
+
+		if (!found)
+		{
+			// as a note - if we get here it is because the request has failed - no host was identified with the given name
+			// this is not an error case so we just add a debug for info
+			nldebug("getHost failed for hostName('%s')",hostName.c_str());
+		}
+	}
+
+	void CInfoContainer::getDomain(const TDomainName& domainName, SDomainDescription& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+		result.DomainName= domainName;
+
+		// use a couple of sets to buildup lists of unique host and shard names
+		typedef std::set<NLMISC::CSString> TNameSet;
+		TNameSet hostNames;
+		TNameSet shardNames;
+
+		// fill the result in from our internal data
+		bool found= false;
+		for (TExeRecords::const_iterator it= _ExeRecords.begin(); it!=_ExeRecords.end(); ++it)
+		{
+			const SExeRecord& theApp= *it;
+
+			// ignore exes that aren't in the requested domain
+			if (theApp.DomainName!=domainName) continue;
+
+			// add this exe's shard to the shards set
+			shardNames.insert(theApp.ShardName);
+
+			// add this exe's host to the hosts set
+			hostNames.insert(theApp.Host);
+
+			// add this exe's unique name to the result apps record
+			result.Apps.push_back(theApp.UniqueName);
+
+			found=true;
+		}
+
+		// copy the hosts set to the result record
+		for (TNameSet::const_iterator it= hostNames.begin(); it!=hostNames.end(); ++it)
+		{
+			result.Hosts.push_back(*it);
+		}
+
+		// copy the shards set to the result record
+		for (TNameSet::const_iterator it= shardNames.begin(); it!=shardNames.end(); ++it)
+		{
+			result.Shards.push_back(*it);
+		}
+
+		if (!found)
+		{
+			// as a note - if we get here it is because the request has failed - no domain was identified with the given name
+			// this is not an error case so we just add a debug for info
+			nldebug("getDomain failed for domainName('%s')",domainName.c_str());
+		}
+	}
+
+	void CInfoContainer::getShard(const TDomainName& domainName,const TShardName& shardName,SShardDescription& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+		result.DomainName= domainName;
+		result.ShardName= shardName;
+
+		// use a set to buildup lists of unique host names
+		typedef std::set<NLMISC::CSString> TNameSet;
+		TNameSet hostNames;
+
+		// fill the result in from our internal data
+		bool found= false;
+		for (TExeRecords::const_iterator it= _ExeRecords.begin(); it!=_ExeRecords.end(); ++it)
+		{
+			const SExeRecord& theApp= *it;
+
+			// ignore exes that aren't in the requested domain
+			if (theApp.DomainName!=domainName) continue;
+
+			// ignore exes that aren't in the requested shard
+			if (theApp.ShardName!=shardName) continue;
+
+			// add this exe's host to the hosts set
+			hostNames.insert(theApp.Host);
+
+			// add this exe's unique name to the result apps record
+			result.Apps.push_back(theApp.UniqueName);
+
+			found=true;
+		}
+
+		// copy the hosts set to the result record
+		for (TNameSet::const_iterator it= hostNames.begin(); it!=hostNames.end(); ++it)
+		{
+			result.Hosts.push_back(*it);
+		}
+
+		if (!found)
+		{
+			// as a note - if we get here it is because the request has failed - no shard was identified with the given name and domain
+			// this is not an error case so we just add a debug for info
+			nldebug("getShard failed for domainName('%s'), shardName('%s')",domainName.c_str(),shardName.c_str());
+		}
+	}
+
+	void CInfoContainer::getApp(const TDomainName& domainName,const TAppName& appName,SAppDescription& result) const
+	{
+		// clear out the result before we begin work...
+		result.clear();
+		result.DomainName= domainName;
+		result.AppName= appName;
+
+		// use a set to buildup lists of unique host names
+		typedef std::set<NLMISC::CSString> TNameSet;
+		TNameSet domainNames;
+
+		// fill the result in from our internal data
+		for (TExeRecords::const_iterator it= _ExeRecords.begin(); it!=_ExeRecords.end(); ++it)
+		{
+			const SExeRecord& theApp= *it;
+
+			// skip exes that aren't in the requested domain
+			if (theApp.DomainName!=domainName) continue;
+
+			// skip exes that don't have the correct name
+			if (theApp.UniqueName!=appName) continue;
+
+			// we've found the exe so fill in the result record...
+			result.ShardName= theApp.ShardName;
+			result.HostName=  theApp.Host;
+			result.StartOrder= theApp.StartOrder;
+			result.CmdLine=	  theApp.CmdLine;
+
+			// setup the config file to start initialised with the app name for this app
+			result.CfgFile= 
+				"// Auto generated config file\n"
+				"// Use with commandline: "+theApp.CmdLine+"\n"
+				"AESAliasName= \""+appName+"\";\n"
+				"\n";
+
+			// copy the cfg set to the result record (the cfgAfter set should have been merged in already)
+			for (SExeRecord::TCfgEntries::const_iterator cit= theApp.CfgEntries.begin(); cit!=theApp.CfgEntries.end(); ++cit)
+			{
+				result.CfgFile+=*cit;
+				result.CfgFile+='\n';
+			}
+
+			// copy the dataEntries set to the result record
+			for (SExeRecord::TDataEntries::const_iterator dit= theApp.DataEntries.begin(); dit!=theApp.DataEntries.end(); ++dit)
+			{
+				result.DataPacks.push_back(*dit);
+			}
+
+			// we're all done so we can return merrily
+			return;
+		}
+
+		// as a note - if we get here it is because the request has failed - no app was identified with the given name and domain
+		// this is not an error case so we just add a debug for info
+		nldebug("getApp failed for domainName('%s'), appName('%s')",domainName.c_str(),appName.c_str());
+	}
+
+	void CInfoContainer::dumpDomains(NLMISC::CLog& log) const
+	{
+		for (TDomainExes::const_iterator dit= _DomainExes.begin(); dit!=_DomainExes.end(); ++dit)
+		{
+			const NLMISC::CSString& domainName= dit->first;
+			const TShardExes& shards= dit->second;
+			log.displayNL("-- domain: %s",domainName.c_str());
+
+			for (TShardExes::const_iterator sit= shards.begin(); sit!=shards.end(); ++sit)
+			{
+				const NLMISC::CSString& shardName= sit->first;
+				const TExeIdx& exeIdx= sit->second;
+				log.displayNL("   -- shard: %s",shardName.c_str());
+
+				for (TExeIdx::const_iterator eit= exeIdx.begin(); eit!=exeIdx.end(); ++eit)
+				{
+					uint32 idx= *eit;
+					nlassert(idx<_ExeRecords.size());
+					const SExeRecord& theExe= _ExeRecords[idx];
+					log.displayNL("      -- %s:%s (%s)",theExe.Host.c_str(),theExe.CmdLine.c_str(),theExe.UniqueName.c_str());
+				}
+			}
+		}
+	}
+
+	void CInfoContainer::dumpInfoBlocks(NLMISC::CLog& log) const
+	{
+		log.displayNL("//------------------------------------------------------------------------------");
+		log.displayNL("// Dump of cfg database file contents");
+		log.displayNL("//------------------------------------------------------------------------------");
+		for (TInfoBlocks::const_iterator it=_InfoBlocks.begin(); it!=_InfoBlocks.end(); ++it)
+		{
+			it->second->dump(log);
+		}
+		log.displayNL("//------------------------------------------------------------------------------");
+	}
+
+	CInfoBlock* CInfoContainer::getInfoBlock(const NLMISC::CSString& name)
+	{
+		TInfoBlocks::iterator it= _InfoBlocks.find(name);
+		return (it==_InfoBlocks.end())? NULL: it->second;
+	}
+
+	void CInfoContainer::addExe(const SExeRecord& exeRecord,uint32& errors)
+	{
+	//	nldebug("Adding CmdLine: %s",exeRecord.FullName.c_str());
+
+		// note: if we hit errors then we continue anyway to make sure we display a complete set of error messages
+		DROP_IF(exeRecord.DomainName.empty(),	"No 'domain' property found in: "+exeRecord.FullName,	++errors );
+		DROP_IF(exeRecord.ShardName.empty(),	"No 'shard' property found in: "+exeRecord.FullName,	++errors );
+		DROP_IF(exeRecord.CmdLine.empty(),		"No 'cmdLine' property found in: "+exeRecord.FullName,	++errors );
+		DROP_IF(exeRecord.Host.empty(),			"No 'host' property found in: "+exeRecord.FullName,		++errors );
+		DROP_IF(exeRecord.CfgEntries.empty(),	"No 'cfg' entriesfound in: "+exeRecord.FullName,		++errors );
+
+		// add a refference from the domains' shard map to the exe...
+		_DomainExes[exeRecord.DomainName][exeRecord.ShardName].push_back((uint32)_ExeRecords.size());
+
+		// we may have hit errors but we go ahead anyway as in the case of errors the whole thing will be cleared out anyway
+		_ExeRecords.push_back(exeRecord);
+	}
+
+	//-----------------------------------------------------------------------------
+	// methods CDeploymentConfigurationImplementation
+	//-----------------------------------------------------------------------------
+
+	bool CDeploymentConfigurationImplementation::read(const NLMISC::CSString& fileName)
+	{
+		// setup a temp container to hold the version of the file that we're reading
+		CInfoContainer container;
+
+		// do the reading and make sure we catch any possible execeptions (like for read in progress)
+		try
+		{
+			container.read(fileName);
+		}
+		catch(...)
+		{
+			container.clear();
+		}
+
+		// if the read failed for whatever reason then giveup
+		DROP_IF(container.empty(),"Failed to update deployment configuration from file: "+fileName,return false);
+
+		// copy the temp container into our internal object
+		_InfoContainer= container;
+
+		// display a funky victory message
+		nlinfo("Deployment configuration successfully updated from file: %s",fileName.c_str());
+
+		return true;
+	}
+
+	void CDeploymentConfigurationImplementation::write(const NLMISC::CSString& fileName)
+	{
+		// create a displayer to gather the output of the command
+		class CStringDisplayer: public IDisplayer
+		{
+		public:
+			NLMISC::CSString Data;
+			void doDisplay( const CLog::TDisplayInfo& args, const char *message)
+			{
+				Data += message;
+			}
+		};
+
+		// instantiate the displayer and a log object and assign one to the other
+		CStringDisplayer stringDisplayer;
+		NLMISC::CLog myLog;
+		myLog.addDisplayer(&stringDisplayer);
+
+		// dump the info blocks to our log object (accumulating the result as a string)
+		dumpInfoBlocks(myLog);
+
+		// write the text accumulated in the log object to a text file
+		stringDisplayer.Data.writeToFile(fileName);
+	}
+
+	void CDeploymentConfigurationImplementation::serial(NLMISC::IStream& stream)
+	{
+		// setup a temp container to hold the version of the file that we're reading (if we're reading)
+		// and fill the container in with our internal object just in case we're writing
+		CInfoContainer container= _InfoContainer;
+
+		// do the serial and make sure we catch any possible execeptions (like for read in progress)
+		try
+		{
+			stream.serial(container);
+		}
+		catch(...)
+		{
+			container.clear();
+		}
+
+		// if the serial failed for whatever reason then giveup
+		DROP_IF(container.empty(),"Failed to serial deployment configuration: ",return);
+
+		// copy the temp container into our internal object (incase this was a read operation)
+		_InfoContainer= container;
+
+		// display a funky victory message
+		nlinfo("Deployment configuration successfully serialised");
+	}
+
+	void CDeploymentConfigurationImplementation::getDomainNames(TDomainNames& result) const
+	{
+		_InfoContainer.getDomainNames(result);
+	}
+
+	void CDeploymentConfigurationImplementation::getShardNames(const TDomainName& domainName,TShardNames& result) const
+	{
+		_InfoContainer.getShardNames(domainName,result);
+	}
+
+	void CDeploymentConfigurationImplementation::getHostNames(THostNames& result) const
+	{
+		_InfoContainer.getHostNames(result);
+	}
+
+	void CDeploymentConfigurationImplementation::getAppNames(const THostName& hostName,const TDomainName& domainName,TAppNames& result) const
+	{
+		_InfoContainer.getAppNames(hostName,domainName,result);
+	}
+
+	void CDeploymentConfigurationImplementation::getAppNames(const THostName& hostName,const TDomainName& domainName,const TShardName& shardName,TAppNames& result) const
+	{
+		_InfoContainer.getAppNames(hostName,domainName,shardName,result);
+	}
+
+	void CDeploymentConfigurationImplementation::getHost(const THostName& hostName,SHostDescription& result) const
+	{
+		_InfoContainer.getHost(hostName,result);
+	}
+
+	void CDeploymentConfigurationImplementation::getDomain(const TDomainName& domainName, SDomainDescription& result) const
+	{
+		_InfoContainer.getDomain(domainName,result);
+	}
+
+	void CDeploymentConfigurationImplementation::getShard(const TDomainName& domainName,const TShardName& shardName,SShardDescription& result) const
+	{
+		_InfoContainer.getShard(domainName,shardName,result);
+	}
+
+	void CDeploymentConfigurationImplementation::getApp(const TDomainName& domainName,const TAppName& appName,SAppDescription& result) const
+	{
+		_InfoContainer.getApp(domainName,appName,result);
+	}
+
+	void CDeploymentConfigurationImplementation::dumpInfoBlocks(NLMISC::CLog& log) const
+	{
+		_InfoContainer.dumpInfoBlocks(log);
+	}
+
+	void CDeploymentConfigurationImplementation::dumpDomains(NLMISC::CLog& log) const
+	{
+		_InfoContainer.dumpDomains(log);
+	}
+
+
+	//-----------------------------------------------------------------------------
+	// methods CDeploymentConfiguration
+	//-----------------------------------------------------------------------------
+
+	CDeploymentConfiguration& CDeploymentConfiguration::getInstance()
+	{
+		return CSingleton<CDeploymentConfigurationImplementation>::getInstance();
+	}
+
+} // end of namespace
+
+//NLMISC_CATEGORISED_COMMAND(depcfg,readDepCfgFile,"(re)read the deployment cfg file","[<file name>=\"server_park_database.txt\"]")
+//{
+//	NLMISC::CSString fileName= defaultDeploymentConfigurationFileName;
+//
+//	switch (args.size())
+//	{
+//	case 1:
+//		fileName=args[0];
+//		break;
+//
+//	case 0:
+//		break;
+//
+//	default:
+//		return false;
+//	}
+//
+//	DEPCFG::CDeploymentConfiguration::getInstance().read(fileName);
+//
+//	return true;
+//}
+//
+//NLMISC_CATEGORISED_COMMAND(depcfg,writeDepCfgFile,"write the deployment cfg file","[<file name>=\"saved_server_park_database.txt\"]")
+//{
+//	NLMISC::CSString fileName= CSString("saved_") + defaultDeploymentConfigurationFileName;
+//
+//	switch (args.size())
+//	{
+//	case 1:
+//		fileName=args[0];
+//		break;
+//
+//	case 0:
+//		break;
+//
+//	default:
+//		return false;
+//	}
+//
+//	DEPCFG::CDeploymentConfiguration::getInstance().read(fileName);
+//
+//	return true;
+//}
+//
+//NLMISC_CATEGORISED_COMMAND(depcfg,saveDepCfgBinary,"write a binary version of the deployment file to disk","<file name>")
+//{
+//	if (args.size()!=1)
+//		return false;
+//
+//	NLMISC::COFile outf(args[0]);
+//	outf.serial(DEPCFG::CDeploymentConfiguration::getInstance());
+//
+//	return true;
+//}
+//
+//NLMISC_CATEGORISED_COMMAND(depcfg,loadDepCfgBinary,"read a binary version of the deployment file from disk","<file name>")
+//{
+//	if (args.size()!=1)
+//		return false;
+//
+//	NLMISC::CIFile inf(args[0]);
+//	inf.serial(DEPCFG::CDeploymentConfiguration::getInstance());
+//
+//	return true;
+//}
+
+NLMISC_CATEGORISED_COMMAND(depcfg,dumpDepCfgInfoBlocks,"dump the raw info blocks for the deployment config singleton","")
+{
+	if (args.size()!=0)
+		return false;
+
+	DEPCFG::CDeploymentConfiguration::getInstance().dumpInfoBlocks(log);
+
+	return true;
+}
+
+NLMISC_CATEGORISED_COMMAND(depcfg,dumpDepCfgDomains,"dump the domain set for the deployment config singleton","")
+{
+	if (args.size()!=0)
+		return false;
+
+	DEPCFG::CDeploymentConfiguration::getInstance().dumpDomains(log);
+
+	return true;
+}
+
+NLMISC_CATEGORISED_COMMAND(depcfg,dumpDepCfgHosts,"dump the host set for the deployment config singleton","")
+{
+	if (args.size()!=0)
+		return false;
+
+	log.displayNL("--------------------------------------------");
+	log.displayNL("Hosts");
+	log.displayNL("--------------------------------------------");
+
+	DEPCFG::THostNames hostNames;
+	DEPCFG::CDeploymentConfiguration::getInstance().getHostNames(hostNames);
+	sort(hostNames.begin(),hostNames.end());
+	for (DEPCFG::THostNames::iterator hit= hostNames.begin(); hit!=hostNames.end(); ++hit)
+	{
+		DEPCFG::SHostDescription host;
+		DEPCFG::CDeploymentConfiguration::getInstance().getHost(*hit,host);
+		log.displayNL("Host %s (%d domains)",host.HostName.c_str(),host.Domains.size());
+
+		for (DEPCFG::TDomainNames::iterator dit= host.Domains.begin(); dit!=host.Domains.end(); ++dit)
+		{
+			log.displayNL("-- Domain %s",dit->c_str());
+		}
+	}
+
+	return true;
+}
+
+NLMISC_CATEGORISED_COMMAND(depcfg,dumpDepCfgShards,"dump the shard set for the deployment config singleton","")
+{
+	if (args.size()!=0)
+		return false;
+
+	log.displayNL("--------------------------------------------");
+	log.displayNL("Shards");
+	log.displayNL("--------------------------------------------");
+
+	DEPCFG::TDomainNames domainNames;
+	DEPCFG::CDeploymentConfiguration::getInstance().getDomainNames(domainNames);
+	sort(domainNames.begin(),domainNames.end());
+	for (DEPCFG::TDomainNames::iterator dit= domainNames.begin(); dit!=domainNames.end(); ++dit)
+	{
+		DEPCFG::SDomainDescription domain;
+		DEPCFG::CDeploymentConfiguration::getInstance().getDomain(*dit,domain);
+		log.displayNL("Domain %s (%d shards with %d apps on %d hosts)",domain.DomainName.c_str(),domain.Shards.size(),domain.Apps.size(),domain.Hosts.size());
+
+		DEPCFG::TShardNames shardNames;
+		DEPCFG::CDeploymentConfiguration::getInstance().getShardNames(*dit,shardNames);
+		nlassert(shardNames==domain.Shards);
+		for (DEPCFG::TShardNames::iterator sit= shardNames.begin(); sit!=shardNames.end(); ++sit)
+		{
+			DEPCFG::SShardDescription shard;
+			DEPCFG::CDeploymentConfiguration::getInstance().getShard(*dit,*sit,shard);
+			log.displayNL("-- Shard %s/%s (%d apps on %d hosts)",shard.DomainName.c_str(),shard.ShardName.c_str(),shard.Apps.size(),shard.Hosts.size());
+
+			for (DEPCFG::THostNames::iterator hit= shard.Hosts.begin(); hit!=shard.Hosts.end(); ++hit)
+			{
+				log.displayNL("   -- Host %s",hit->c_str());
+				DEPCFG::TAppNames appNames;
+				DEPCFG::CDeploymentConfiguration::getInstance().getAppNames(*hit,*dit,*sit,appNames);
+				for (DEPCFG::TAppNames::iterator ait= appNames.begin(); ait!=appNames.end(); ++ait)
+				{
+					DEPCFG::SAppDescription app;
+					DEPCFG::CDeploymentConfiguration::getInstance().getApp(*dit,*ait,app);
+					uint32 cfgFileLines=app.CfgFile.countLines();
+					uint32 numDataPacks= (uint32)app.DataPacks.size();
+					log.displayNL("      -- App: %-20s: %s (cfg file length: %d lines, data packs used: %d)",app.AppName.c_str(),app.CmdLine.c_str(),cfgFileLines,numDataPacks);
+				}
+			}
+		}
+	}
+
+	return true;
+}
diff --git a/code/ryzom/common/src/game_share/deployment_configuration.h b/code/ryzom/common/src/game_share/deployment_configuration.h
new file mode 100644
index 000000000..457d6ee0b
--- /dev/null
+++ b/code/ryzom/common/src/game_share/deployment_configuration.h
@@ -0,0 +1,265 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#ifndef DEPLOYMENT_CONFIGURATION_H
+#define DEPLOYMENT_CONFIGURATION_H
+
+//-----------------------------------------------------------------------------
+// include
+//-----------------------------------------------------------------------------
+
+// nel
+#include "nel/misc/types_nl.h"
+#include "nel/misc/common.h"
+#include "nel/misc/sstring.h"
+
+
+//-----------------------------------------------------------------------------
+// namespace DEPCFG
+//-----------------------------------------------------------------------------
+
+namespace DEPCFG
+{
+	//-----------------------------------------------------------------------------
+	// some handy constants
+	//-----------------------------------------------------------------------------
+
+	#define defaultDeploymentConfigurationFileName "server_park_database.txt"
+
+
+	//-----------------------------------------------------------------------------
+	// some handy typedefs for identifiers, map keys, etc
+	//-----------------------------------------------------------------------------
+
+	typedef NLMISC::CSString TDomainName;
+	typedef NLMISC::CSString TShardName;
+	typedef NLMISC::CSString THostName;
+	typedef NLMISC::CSString TAppName;
+
+	typedef NLMISC::CVectorSString TDomainNames;
+	typedef NLMISC::CVectorSString TShardNames;
+	typedef NLMISC::CVectorSString THostNames;
+	typedef NLMISC::CVectorSString TAppNames;
+
+	typedef NLMISC::CSString TCmdLine;
+	typedef NLMISC::CSString TCfgFile;
+	typedef NLMISC::CVectorSString TDataPacks;
+
+
+	//-----------------------------------------------------------------------------
+	// struct SDomainDescription
+	//-----------------------------------------------------------------------------
+
+	struct SDomainDescription
+	{
+		//-------------------------------------------------------------------------
+		// identifying the domain
+		TDomainName		DomainName;
+		//-------------------------------------------------------------------------
+		// the set of shards and apps belonging to this domain and their hosts
+		TShardNames		Shards;
+		THostNames		Hosts;
+		TAppNames		Apps;
+
+		//-------------------------------------------------------------------------
+		// a handy 'clear()' method
+		void clear()
+		{
+			DomainName.clear();
+			Shards.clear();
+			Hosts.clear();
+			Apps.clear();
+		}
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// struct SShardDescription
+	//-----------------------------------------------------------------------------
+
+	struct SShardDescription
+	{
+		//-------------------------------------------------------------------------
+		// identifying the shard by name and domain
+		TDomainName		DomainName;
+		TShardName		ShardName;
+		//-------------------------------------------------------------------------
+		// the set of hosts and apps used by this shard
+		THostNames		Hosts;
+		TAppNames		Apps;
+
+		//-------------------------------------------------------------------------
+		// a handy 'clear()' method
+		void clear()
+		{
+			DomainName.clear();
+			ShardName.clear();
+			Hosts.clear();
+			Apps.clear();
+		}
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// struct SHostDescription
+	//-----------------------------------------------------------------------------
+
+	struct SHostDescription
+	{
+		//-------------------------------------------------------------------------
+		// identifying the host (machine's network name)
+		THostName		HostName;
+		//-------------------------------------------------------------------------
+		// the set of domains that refference this host
+		TDomainNames	Domains;
+
+		//-------------------------------------------------------------------------
+		// a handy 'clear()' method
+		void clear()
+		{
+			HostName.clear();
+			Domains.clear();
+		}
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// struct SAppDescription
+	//-----------------------------------------------------------------------------
+
+	struct SAppDescription
+	{
+		//-------------------------------------------------------------------------
+		// identifying the app, the shard it belongs to, machine it runs on, etc
+		TDomainName		DomainName;
+		TShardName		ShardName;
+		THostName		HostName;
+		TAppName		AppName;
+		NLMISC::CSString		StartOrder;
+
+		//-------------------------------------------------------------------------
+		// some real data
+		TCmdLine		CmdLine;	// the command line to execute the app
+		TCfgFile		CfgFile;	// the cfg file contents for the app
+		TDataPacks		DataPacks;	// the set of data packs for the app
+
+		//-------------------------------------------------------------------------
+		// a handy 'clear()' method
+		void clear()
+		{
+			DomainName.clear();
+			ShardName.clear();
+			HostName.clear();
+			AppName.clear();
+			StartOrder.clear();
+			CmdLine.clear();
+			CfgFile.clear();
+			DataPacks.clear();
+		}
+	};
+
+
+	//-----------------------------------------------------------------------------
+	// class CDeploymentConfiguration
+	//-----------------------------------------------------------------------------
+
+	class CDeploymentConfiguration
+	{
+	public :
+		//-------------------------------------------------------------------------
+		// this is a singleton so we have a getInstance() method
+		// remaining methods are pure virtuals...
+
+		// get hold of the instance of the singleton that derives from CDeploymentConfiguration
+		static CDeploymentConfiguration& getInstance();
+
+
+		//-------------------------------------------------------------------------
+		// methods for reading / serialising deployment configuration
+
+		// read the deployment configuration from a specified file
+		//
+		// file format is line base with the following format:
+		// '//'... comment to end of line
+		// 'define' <block_name>		// define a new block
+		//		'domain' <domain_name>	// flag this block as a domain and give it a name
+		//		'shard' <domain_name>	// flag this block as a shard and give it a name
+		//		'use' <block_name>		// add a child block to this block
+		//		'name' <block_name>		// set the unique name to use for the executables derived from this block
+		//		'cmdLine' <cmd_line>	// setup the command line to use for exes derived from this block
+		//		'host' <host_name>		// assign the exes derived from this block to a given host
+		//		'cfg' <cfg_line>		// add a line to be included in the cfg file of executables derived from this block
+		//		'cfgAfter' <cfg_line>	// as above but cfg lines appended at end of cfg file (not at start)
+		//		'data' <data_name>		// add dependency on a given data block to exes derived from this block
+		//
+		virtual bool read(const NLMISC::CSString& fileName) =0;
+
+		// write the info blocks out to a file (in no particular order)
+		// the output file can be re-read via the 'read()' method
+		virtual void write(const NLMISC::CSString& fileName) =0;
+
+		// serialise the deployment configuration, for dispatch to / reception from other apps
+		virtual void serial(NLMISC::IStream& stream) =0;
+
+
+		//-------------------------------------------------------------------------
+		// read accessors - getting sets of names
+
+		// get the complete set of hosts (machines on which we have apps running)
+		virtual void getHostNames(THostNames& result) const =0;
+		
+		// get the complete set of domains
+		virtual void getDomainNames(TDomainNames& result) const =0;
+
+		// get the shards for a given domain
+		virtual void getShardNames(const TDomainName& domainName,TShardNames& result) const =0;
+		
+		// get the apps for a given host and domain
+		virtual void getAppNames(const THostName& hostName,const TDomainName& domainName,TAppNames& result) const =0;
+
+		// get the apps for a given host, domain and shard
+		virtual void getAppNames(const THostName& hostName,const TDomainName& domainName,const TShardName& shardName,TAppNames& result) const =0;
+
+		
+		//-------------------------------------------------------------------------
+		// read accessors - getting info structure for a named object
+
+		// get a named host
+		virtual void getHost(const THostName& hostName,SHostDescription& result) const =0;
+		
+		// get a named domains
+		virtual void getDomain(const TDomainName& domainName, SDomainDescription& result) const =0;
+
+		// get a named shard for a given domain
+		virtual void getShard(const TDomainName& domainName,const TShardName& shardName,SShardDescription& result) const =0;
+		
+		// get a named app for a given domain
+		virtual void getApp(const TDomainName& domainName,const TAppName& appName,SAppDescription& result) const =0;
+
+
+		//-------------------------------------------------------------------------
+		// methods for dumping info to a given log
+
+		// dump raw information (organised by info block, not by domain or host)
+		virtual void dumpInfoBlocks(NLMISC::CLog& log) const =0;
+		
+		// dump info organised by domain
+		virtual void dumpDomains(NLMISC::CLog& log) const =0;
+	};
+
+}	// end of namespace
+
+//-----------------------------------------------------------------------------
+#endif
diff --git a/code/ryzom/common/src/game_share/entity_types.h b/code/ryzom/common/src/game_share/entity_types.h
index 3841f9a17..68b42e954 100644
--- a/code/ryzom/common/src/game_share/entity_types.h
+++ b/code/ryzom/common/src/game_share/entity_types.h
@@ -130,7 +130,7 @@ const TCoord		THRESHOLD_BEHAVIOUR			= 60000;
 
 // Name
 const TPropIndex	PROPERTY_NAME_STRING_ID		= 6;
-const TCoord		THRESHOLD_NAME_STRING_ID	= 25000;
+const TCoord		THRESHOLD_NAME_STRING_ID	= 100000;
 
 // Main target
 const TPropIndex	PROPERTY_TARGET_ID			= 7;
diff --git a/code/ryzom/common/src/game_share/game_share.vcproj b/code/ryzom/common/src/game_share/game_share.vcproj
deleted file mode 100644
index a8a8e2d4b..000000000
--- a/code/ryzom/common/src/game_share/game_share.vcproj
+++ /dev/null
@@ -1,1720 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="game_share"
-	ProjectGUID="{4B320F68-0B9B-4065-A2ED-AF5D4B163006}"
-	RootNamespace="game_share"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;LIBXML_STATIC"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\..\lib\$(ProjectName)_d.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;_DEBUG;LIBXML_STATIC"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\..\lib64\$(ProjectName)_d.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\..\..\obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;NDEBUG;LIBXML_STATIC"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\..\lib\$(ProjectName)_r.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			IntermediateDirectory="..\..\..\obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="2"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				AdditionalIncludeDirectories=".."
-				PreprocessorDefinitions="WIN32;NDEBUG;LIBXML_STATIC"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="2"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\..\lib64\$(ProjectName)_r.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\_backup_service_interface_implementation.h"
-			>
-		</File>
-		<File
-			RelativePath=".\_backup_service_interface_non_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\_backup_service_interface_singleton.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\_backup_service_interface_singleton.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_association.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_block.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_block.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_disconnection.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_dummy.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_generic.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_generic.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_generic_multi_part.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_login.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_nature.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_nature.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_position.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_position.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_sint64.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_sint64.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_sync.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_sync.h"
-			>
-		</File>
-		<File
-			RelativePath=".\action_target_slot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\animal_status.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\animal_status.h"
-			>
-		</File>
-		<File
-			RelativePath=".\animal_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\animals_orders.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\animals_orders.h"
-			>
-		</File>
-		<File
-			RelativePath=".\armor_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\armor_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\base_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\bg_downloader_msg.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\bg_downloader_msg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\bnp_patch.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\bnp_patch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\body.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\body.h"
-			>
-		</File>
-		<File
-			RelativePath=".\bot_chat_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\bot_chat_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\brick_families.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\brick_families.h"
-			>
-		</File>
-		<File
-			RelativePath=".\brick_flags.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\brick_flags.h"
-			>
-		</File>
-		<File
-			RelativePath=".\brick_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\brick_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\callback_adaptor.h"
-			>
-		</File>
-		<File
-			RelativePath=".\change_tracker_base.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\change_tracker_base.h"
-			>
-		</File>
-		<File
-			RelativePath=".\change_tracker_client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\change_tracker_client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\characs_build.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\characs_build.h"
-			>
-		</File>
-		<File
-			RelativePath=".\character_summary.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\character_summary.h"
-			>
-		</File>
-		<File
-			RelativePath=".\character_sync_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\character_sync_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\character_title.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\character_title.h"
-			>
-		</File>
-		<File
-			RelativePath=".\characteristics.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\characteristics.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_group.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_group.h"
-			>
-		</File>
-		<File
-			RelativePath=".\client_action_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client_action_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\combat_flying_text.h"
-			>
-		</File>
-		<File
-			RelativePath=".\constants.h"
-			>
-		</File>
-		<File
-			RelativePath=".\continent.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\continent.h"
-			>
-		</File>
-		<File
-			RelativePath=".\continuous_action.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\continuous_action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\crafting_tool_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\crafting_tool_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\crypt.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\crypt.h"
-			>
-		</File>
-		<File
-			RelativePath=".\cst_loader.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cst_loader.h"
-			>
-		</File>
-		<File
-			RelativePath=".\damage_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\damage_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\data_set_base.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\data_set_base.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dir_light_setup.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\dir_light_setup.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dms.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\dms.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_chat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_chat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ecosystem.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ecosystem.h"
-			>
-		</File>
-		<File
-			RelativePath=".\effect_families.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\effect_families.h"
-			>
-		</File>
-		<File
-			RelativePath=".\emote_list_parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\emote_list_parser.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fame.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fame.h"
-			>
-		</File>
-		<File
-			RelativePath=".\far_position.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\far_position.h"
-			>
-		</File>
-		<File
-			RelativePath=".\file_description_container.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\file_description_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fog_map_build.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fog_map_build.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fog_of_war.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fog_of_war.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fog_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gender.h"
-			>
-		</File>
-		<File
-			RelativePath=".\generic_xml_msg_mngr.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\generic_xml_msg_mngr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\georges_helper.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\georges_helper.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_grade.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_grade.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_grade_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\hit_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\intensity_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\intensity_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\interface_flags.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\interface_flags.h"
-			>
-		</File>
-		<File
-			RelativePath=".\inventories.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\inventories.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ios_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\item_family.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\item_family.h"
-			>
-		</File>
-		<File
-			RelativePath=".\item_infos.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\item_infos.h"
-			>
-		</File>
-		<File
-			RelativePath=".\item_origin.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\item_origin.h"
-			>
-		</File>
-		<File
-			RelativePath=".\item_special_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\item_special_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\item_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\item_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\lift_icons.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\lift_icons.h"
-			>
-		</File>
-		<File
-			RelativePath=".\light_cycle.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\light_cycle.h"
-			>
-		</File>
-		<File
-			RelativePath=".\login_registry.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\login_registry.h"
-			>
-		</File>
-		<File
-			RelativePath=".\loot_harvest_state.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\loot_harvest_state.h"
-			>
-		</File>
-		<File
-			RelativePath=".\magic_fx.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\magic_fx.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mainland_summary.h"
-			>
-		</File>
-		<File
-			RelativePath=".\memorization_set_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\memorization_set_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_misc_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_prop_value.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_prop_value.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_prop_value_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrored_data_set.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrored_data_set.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrored_data_set_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrored_data_set_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\misc_const.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_desc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_desc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mode_and_behaviour.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mode_and_behaviour.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_security.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mount_people.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mount_people.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mp_category.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mp_category.h"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_ais_egs_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_client_server.h"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_encyclopedia.h"
-			>
-		</File>
-		<File
-			RelativePath=".\multi_target.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\multi_target.h"
-			>
-		</File>
-		<File
-			RelativePath=".\news_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\object.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\object.h"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pact.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pact.h"
-			>
-		</File>
-		<File
-			RelativePath=".\people.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\people.h"
-			>
-		</File>
-		<File
-			RelativePath=".\people_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\people_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\people_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\permanent_ban_magic_number.h"
-			>
-		</File>
-		<File
-			RelativePath=".\persistent_data.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\persistent_data.h"
-			>
-		</File>
-		<File
-			RelativePath=".\persistent_data_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\persistent_data_template.h"
-			>
-		</File>
-		<File
-			RelativePath=".\persistent_data_tree.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\persistent_data_tree.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_vision_delta.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_visual_properties.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_visual_properties.h"
-			>
-		</File>
-		<File
-			RelativePath=".\power_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\power_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\prerequisit_infos.h"
-			>
-		</File>
-		<File
-			RelativePath=".\properties.h"
-			>
-		</File>
-		<File
-			RelativePath=".\property_allocator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\property_allocator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\property_allocator_client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\property_allocator_client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\protection_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\protection_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_clan.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_clan.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_mode.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_mode.h"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_ligo_config.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_ligo_config.h"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_modules_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_modules_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_modules_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_share_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_share_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_share_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\range_weapon_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\range_weapon_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\resistance_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\resistance_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ring_access.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ring_access.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ring_session_manager_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ring_session_manager_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\rm_family.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\rm_family.h"
-			>
-		</File>
-		<File
-			RelativePath=".\rolemaster_flags.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\rolemaster_flags.h"
-			>
-		</File>
-		<File
-			RelativePath=".\roles.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\roles.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_database_banks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_database_banks.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_entity_id.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_entity_id.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_mirror_properties.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_mirror_properties.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_version.h"
-			>
-		</File>
-		<File
-			RelativePath=".\sabrina_com.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\sabrina_com.h"
-			>
-		</File>
-		<File
-			RelativePath=".\sadge_tests.h"
-			>
-		</File>
-		<File
-			RelativePath=".\scenario.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\scenario.h"
-			>
-		</File>
-		<File
-			RelativePath=".\scenario_entry_points.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\scenario_entry_points.h"
-			>
-		</File>
-		<File
-			RelativePath=".\scores.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\scores.h"
-			>
-		</File>
-		<File
-			RelativePath=".\season.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\season.h"
-			>
-		</File>
-		<File
-			RelativePath=".\season_file_ext.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\season_file_ext.h"
-			>
-		</File>
-		<File
-			RelativePath=".\season_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\security_check.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\security_check.h"
-			>
-		</File>
-		<File
-			RelativePath=".\seeds.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\seeds.h"
-			>
-		</File>
-		<File
-			RelativePath=".\send_chat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\sentence_appraisal.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\sentence_appraisal.h"
-			>
-		</File>
-		<File
-			RelativePath=".\server_admin_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\server_admin_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\server_animation_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\server_animation_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\server_edition_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\server_edition_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shard_names.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shard_names.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shield_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shield_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\simlag.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\simlag.h"
-			>
-		</File>
-		<File
-			RelativePath=".\singleton_registry.h"
-			>
-		</File>
-		<File
-			RelativePath=".\skills.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\skills.h"
-			>
-		</File>
-		<File
-			RelativePath=".\skills_build.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\skills_build.h"
-			>
-		</File>
-		<File
-			RelativePath=".\slot_equipment.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\slot_equipment.h"
-			>
-		</File>
-		<File
-			RelativePath=".\slot_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\slot_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\small_string_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\small_string_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\sp_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\sp_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\sp_type_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\sphrase_com.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\sphrase_com.h"
-			>
-		</File>
-		<File
-			RelativePath=".\starting_point.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\starting_point.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\static_light_cycle.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\static_light_cycle.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\string_manager_sender.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\string_manager_sender.h"
-			>
-		</File>
-		<File
-			RelativePath=".\string_mgr_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\string_mgr_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\synchronised_message.h"
-			>
-		</File>
-		<File
-			RelativePath=".\system_message.h"
-			>
-		</File>
-		<File
-			RelativePath=".\task_list.h"
-			>
-		</File>
-		<File
-			RelativePath=".\teleport_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\teleport_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\temp_inventory_mode.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\temp_inventory_mode.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tick_event_handler.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\tick_event_handler.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tick_proxy_time_measure.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\time_and_season.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\time_and_season.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\time_date_season_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\time_date_season_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\timer.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\timer.h"
-			>
-		</File>
-		<File
-			RelativePath=".\trade_slot_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\type_skill_mod.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\type_skill_mod.h"
-			>
-		</File>
-		<File
-			RelativePath=".\user_connection_mgr.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\user_connection_mgr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\utils.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\utils.h"
-			>
-		</File>
-		<File
-			RelativePath=".\visual_fx.h"
-			>
-		</File>
-		<File
-			RelativePath=".\visual_slot_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\visual_slot_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\weapon_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\weapon_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_function.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_function.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_function_params_sheet_base.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_function_params_sheet_base.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_function_sheet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_function_sheet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_predict.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_predict.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_setup.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_setup.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_setup_sheet_base.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_weather_season\weather_setup_sheet_base.h"
-			>
-		</File>
-		<File
-			RelativePath=".\welcome_service_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\welcome_service_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\xml_auto_ptr.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\xml_auto_ptr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\zc_shard_common.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\zc_shard_common.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/common/src/game_share/inventories.h b/code/ryzom/common/src/game_share/inventories.h
index 1fd1cab48..2dfbb85bf 100644
--- a/code/ryzom/common/src/game_share/inventories.h
+++ b/code/ryzom/common/src/game_share/inventories.h
@@ -349,7 +349,7 @@ namespace INVENTORIES
 
 		/// Serial from/to bit stream
 		template <class CInventoryCategoryTemplate>
-			void	serialAll( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate *templ=0 )
+			void	serialAll( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate * /* templ */ =0 )
 		{
 			bms.serial( _SlotIndex, CInventoryCategoryTemplate::SlotBitSize );
 
@@ -385,7 +385,7 @@ namespace INVENTORIES
 
 		/// Serial from/to bit stream
 		template <class CInventoryCategoryTemplate>
-			void	serialOneProp( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate *templ=0 )
+			void	serialOneProp( NLMISC::CBitMemStream& bms, const CInventoryCategoryTemplate * /* templ */ =0 )
 		{
 			bms.serial( _SlotIndex, CInventoryCategoryTemplate::SlotBitSize );
 			bms.serial( _OneProp );
diff --git a/code/ryzom/common/src/game_share/item_infos.cpp b/code/ryzom/common/src/game_share/item_infos.cpp
index a968ff8a4..af84c5d6c 100644
--- a/code/ryzom/common/src/game_share/item_infos.cpp
+++ b/code/ryzom/common/src/game_share/item_infos.cpp
@@ -73,6 +73,7 @@ CItemInfos::CItemInfos()
 	LacustreMagicResistance = 0;
 	JungleMagicResistance = 0;
 	PrimaryRootMagicResistance = 0;
+	PetNumber = 0; // 1 based!
 }
 
 void CItemInfos::serial(NLMISC::IStream & s)
@@ -130,5 +131,6 @@ void CItemInfos::serial(NLMISC::IStream & s)
 	s.serial( CustomText );
 	s.serial( R2ItemDescription );
 	s.serial( R2ItemComment );
+	s.serial( PetNumber );
 }
 
diff --git a/code/ryzom/common/src/game_share/item_infos.h b/code/ryzom/common/src/game_share/item_infos.h
index ff34bfddc..3fd94444e 100644
--- a/code/ryzom/common/src/game_share/item_infos.h
+++ b/code/ryzom/common/src/game_share/item_infos.h
@@ -139,6 +139,7 @@ public:
 	ucstring	CustomText;
 	ucstring	R2ItemDescription;
 	ucstring	R2ItemComment;
+	uint8		PetNumber; // 1 based pet index
 	//@}
 };
 
diff --git a/code/ryzom/common/src/game_share/mirror_prop_value.h b/code/ryzom/common/src/game_share/mirror_prop_value.h
index 08e96761d..1bb4c7571 100644
--- a/code/ryzom/common/src/game_share/mirror_prop_value.h
+++ b/code/ryzom/common/src/game_share/mirror_prop_value.h
@@ -22,7 +22,7 @@
 #include "nel/misc/types_nl.h"
 #include "nel/misc/stream.h"
 #include "mirrored_data_set.h"
-
+#include <stddef.h>
 
 /**
  * Read-only handler of a value of a property.
@@ -1318,4 +1318,4 @@ protected:
 
 #endif // NL_MIRROR_PROP_VALUE_H
 
-/* End of mirror_prop_value.h */
\ No newline at end of file
+/* End of mirror_prop_value.h */
diff --git a/code/ryzom/common/src/game_share/mirror_prop_value_inline.h b/code/ryzom/common/src/game_share/mirror_prop_value_inline.h
index cd4c71f4a..2824977f3 100644
--- a/code/ryzom/common/src/game_share/mirror_prop_value_inline.h
+++ b/code/ryzom/common/src/game_share/mirror_prop_value_inline.h
@@ -25,6 +25,7 @@
 #include "nel/misc/common.h"
 //#endif
 
+#include <limits>
 
 /*
  * Activate this define if you want to set a value into the mirror only if it is different from the previous value
@@ -937,7 +938,7 @@ CMirrorPropValueAlice<T,CPropLocationClass>&	CMirrorPropValueAlice<T,CPropLocati
 	}
 	else
 	{
-		tempReassign( srcValue );
+		this->tempReassign( srcValue );
 	}
 	return *this;
 }
@@ -1005,7 +1006,7 @@ NLNET::TServiceId8					CMirrorPropValueAlice<T,CPropLocationClass>::getWriterSer
 	if ( _InMirror )
 		return CMirrorPropValue<T,CPropLocationClass>::getWriterServiceId();
 	else
-		return ~0;
+		return NLNET::TServiceId8(std::numeric_limits<uint8>::max());
 }
 #endif
 
diff --git a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h
index d7bfc39e7..e08716a4d 100644
--- a/code/ryzom/common/src/game_share/msg_ais_egs_gen.h
+++ b/code/ryzom/common/src/game_share/msg_ais_egs_gen.h
@@ -884,6 +884,7 @@ namespace RYMSG
 		std::vector< NLMISC::CSheetId >	_LootList;
 		//
 		NLMISC::CSheetId	_Outpost;
+		uint32				_Organization;
 		//
 		float	_MaxHitRangeForPC;
 		//
@@ -1336,6 +1337,21 @@ namespace RYMSG
 				_Outpost = value;
 
 
+		}
+
+		//
+		uint32 getOrganization() const 
+		{
+			return _Organization;
+		}
+
+		void setOrganization(uint32 value)
+		{
+			
+			
+				_Organization = value;
+			
+	
 		}
 			//
 		float getMaxHitRangeForPC() const
@@ -1431,6 +1447,7 @@ namespace RYMSG
 				&& _ContextOptions == other._ContextOptions
 				&& _LootList == other._LootList
 				&& _Outpost == other._Outpost
+				&& _Organization == other._Organization
 				&& _MaxHitRangeForPC == other._MaxHitRangeForPC
 				&& _UserModelId == other._UserModelId
 				&& _CustomLootTableId == other._CustomLootTableId
@@ -1489,6 +1506,7 @@ namespace RYMSG
 			s.serialCont(_ContextOptions);
 			s.serialCont(_LootList);
 			s.serial(_Outpost);
+			s.serial(_Organization);
 			s.serial(_MaxHitRangeForPC);
 			s.serial(_UserModelId);
 			s.serial(_CustomLootTableId);
diff --git a/code/ryzom/common/src/game_share/persistent_data_inline.h b/code/ryzom/common/src/game_share/persistent_data_inline.h
index 2500c524d..9a682afdb 100644
--- a/code/ryzom/common/src/game_share/persistent_data_inline.h
+++ b/code/ryzom/common/src/game_share/persistent_data_inline.h
@@ -420,7 +420,9 @@ inline const CPersistentDataRecord::CArg& CPersistentDataRecord::popNextArg(TTok
 inline void CPersistentDataRecord::popNextArg(TToken token,CPersistentDataRecord::CArg& result)
 {
 	#ifdef NL_DEBUG
-	BOMB_IF(peekNextToken()!=token,"Error on read code - token requested doesn't match token found",return);
+		BOMB_IF(peekNextToken()!=token,"Error on read code - token requested doesn't match token found",return);
+	#else
+		nlunreferenced(token);
 	#endif
 
 	peekNextArg(result);
@@ -445,7 +447,6 @@ inline void CPersistentDataRecord::popNextArg(TToken token,CPersistentDataRecord
 		++_ArgOffset;
 		++_TokenOffset;
 	}
-	return;
 }
 
 //inline CPersistentDataRecord::CArg CPersistentDataRecord::popNextArg(TToken token)
diff --git a/code/ryzom/common/src/game_share/persistent_data_template.h b/code/ryzom/common/src/game_share/persistent_data_template.h
index ef76101cd..21cb2588d 100644
--- a/code/ryzom/common/src/game_share/persistent_data_template.h
+++ b/code/ryzom/common/src/game_share/persistent_data_template.h
@@ -175,18 +175,58 @@
 #include "nel/misc/hierarchical_timer.h"
 inline uint32 saveGameCycleToSecond(NLMISC::TGameCycle tick)
 {
+    // Evaluate the UTC of this event (with the current date of save). Suppose that 1 second==10 tick
+    // NB: result should be positive since no event should have been launched before 1970!
+    if (tick < CTickEventHandler::getGameCycle())
+    {
+        NLMISC::TGameCycle tick_dt = CTickEventHandler::getGameCycle() - tick;
+        uint32 s_dt = tick_dt / 10;
+        return NLMISC::CTime::getSecondsSince1970() - s_dt;
+    }
+    else
+    {
+        NLMISC::TGameCycle tick_dt = tick - CTickEventHandler::getGameCycle();
+        uint32 s_dt = tick_dt / 10;
+        return NLMISC::CTime::getSecondsSince1970() + s_dt;
+    }
+}
+inline NLMISC::TGameCycle loadSecondToGameCycle(uint32 second)
+{
+    if (second < NLMISC::CTime::getSecondsSince1970())
+    {
+        uint32 s_dt = NLMISC::CTime::getSecondsSince1970() - second;
+        NLMISC::TGameCycle tick_dt = s_dt * 10;
+        return CTickEventHandler::getGameCycle() - tick_dt;
+    }
+    else
+    {
+        uint32 s_dt = second - NLMISC::CTime::getSecondsSince1970();
+        NLMISC::TGameCycle tick_dt = s_dt * 10;
+        return CTickEventHandler::getGameCycle() + tick_dt;
+    }
+}
+
+/*inline uint32 saveGameCycleToSecond(NLMISC::TGameCycle tick)
+{
+	sint32 dt = CTickEventHandler::getGameCycle() - tick;
+
+
 	// Evaluate the UTC of this event (with the current date of save). Suppose that 1 second==10 tick
-	return  sint32(NLMISC::CTime::getSecondsSince1970()) + (sint32(tick) - sint32(CTickEventHandler::getGameCycle()))/10;
+	if (tick < CTickEventHandler::getGameCycle())
+		return NLMISC::CTime::getSecondsSince1970();
+	else
+		return  NLMISC::CTime::getSecondsSince1970() + (tick - CTickEventHandler::getGameCycle())/10;
 	// NB: result should be positive since no event should have been launched before 1970!
 }
 
 inline NLMISC::TGameCycle loadSecondToGameCycle(uint32 second)
 {
+	if (second < NLMISC::CTime::getSecondsSince1970())
+		return 0;
+	
 	// Convert UTC of the event to game cycle. Suppose that 1 second==10 tick
-	sint32	newTick= CTickEventHandler::getGameCycle() + (sint32(second) - sint32(NLMISC::CTime::getSecondsSince1970()))*10;
-	// If game cycle is loaded on a server where current game cycle is too young, we can have here negative values => avoid them
-	return std::max(newTick, sint32(0));
-}
+	return CTickEventHandler::getGameCycle() + (second - NLMISC::CTime::getSecondsSince1970())*10;
+}*/
 #endif
 
 // GameCycle property (saved as a UTC of the current game cycle, support server migration)
diff --git a/code/ryzom/common/src/game_share/pvp_mode.cpp b/code/ryzom/common/src/game_share/pvp_mode.cpp
index aa3ac1496..3e13fd428 100644
--- a/code/ryzom/common/src/game_share/pvp_mode.cpp
+++ b/code/ryzom/common/src/game_share/pvp_mode.cpp
@@ -35,6 +35,8 @@ namespace PVP_MODE
 		NL_STRING_CONVERSION_TABLE_ENTRY(PvpZoneOutpost)
 		NL_STRING_CONVERSION_TABLE_ENTRY(PvpFaction)
 		NL_STRING_CONVERSION_TABLE_ENTRY(PvpFactionFlagged)
+		NL_STRING_CONVERSION_TABLE_ENTRY(PvpZoneSafe)
+		NL_STRING_CONVERSION_TABLE_ENTRY(PvpSafe)
 	NL_END_STRING_CONVERSION_TABLE(TPVPMode, PVPModeConversion, Unknown)
 
 	TPVPMode fromString(const std::string & str)
diff --git a/code/ryzom/common/src/game_share/pvp_mode.h b/code/ryzom/common/src/game_share/pvp_mode.h
index dd52f1fd6..0e654752f 100644
--- a/code/ryzom/common/src/game_share/pvp_mode.h
+++ b/code/ryzom/common/src/game_share/pvp_mode.h
@@ -32,10 +32,12 @@ namespace PVP_MODE
 		PvpZoneOutpost		= 32,
 		PvpFaction			= 64,
 		PvpFactionFlagged	= 128,
+		PvpZoneSafe			= 256,
+		PvpSafe				= 512,
 
 		Unknown,
 		NbModes = Unknown,
-		NbBits = 8 // number of bits needed to store all valid values
+		NbBits = 10 // number of bits needed to store all valid values
 	};
 
 
diff --git a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
index 0aab0b870..afd0ac892 100644
--- a/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
+++ b/code/ryzom/common/src/game_share/ryzom_mirror_properties.h
@@ -138,7 +138,7 @@ void	initRyzomVisualPropertyIndices( CMirroredDataSet& dataset );
 #define TYPE_BOT_TRADE_SELECTOR2 uint64
 
 #define TYPE_EVENT_FACTION_ID uint32
-#define TYPE_PVP_MODE uint8
+#define TYPE_PVP_MODE uint32
 #define TYPE_PVP_CLAN uint32
 
 #define TYPE_FUEL bool
diff --git a/code/ryzom/common/src/game_share/send_chat.h b/code/ryzom/common/src/game_share/send_chat.h
index cefb8bba0..1efa7acee 100644
--- a/code/ryzom/common/src/game_share/send_chat.h
+++ b/code/ryzom/common/src/game_share/send_chat.h
@@ -115,7 +115,7 @@ inline void npcChatToChannelEx(const TDataSetRow &senderId, CChatGroup::TGroupTy
  *	Chat group can be constructed from CChatGroup class.
  *	sentence is the sentence to be sent.
  */
-inline void npcChatToChannelSentence(const TDataSetRow &senderId, CChatGroup::TGroupType groupType, std::string& sentence)
+inline void npcChatToChannelSentence(const TDataSetRow &senderId, CChatGroup::TGroupType groupType, ucstring& sentence)
 {
 	NLNET::CMessage	msgout("NPC_CHAT_SENTENCE");
 	msgout.serial(const_cast<TDataSetRow&>(senderId));
diff --git a/code/ryzom/common/src/game_share/singleton_registry.h b/code/ryzom/common/src/game_share/singleton_registry.h
index 516417c32..7a9cc0253 100644
--- a/code/ryzom/common/src/game_share/singleton_registry.h
+++ b/code/ryzom/common/src/game_share/singleton_registry.h
@@ -58,6 +58,7 @@ protected:
 	// protect from untrolled instantiation
 	// this method registers the singleton with the singleton registry
 	IServiceSingleton();
+	virtual ~IServiceSingleton() {}
 
 private:
 	// prohibit copy
diff --git a/code/ryzom/common/src/game_share/sp_type.cpp b/code/ryzom/common/src/game_share/sp_type.cpp
index 1ab59ed04..a05a8b554 100644
--- a/code/ryzom/common/src/game_share/sp_type.cpp
+++ b/code/ryzom/common/src/game_share/sp_type.cpp
@@ -51,4 +51,4 @@ std::map<std::string, CSPType::TSPType>	CSPType::_ValueMap;
 // End of static implementation of CSPType
 
 
-} // End of EGSPD
\ No newline at end of file
+} // End of EGSPD
diff --git a/code/ryzom/common/src/game_share/txt_command.h b/code/ryzom/common/src/game_share/txt_command.h
new file mode 100644
index 000000000..054f1bc93
--- /dev/null
+++ b/code/ryzom/common/src/game_share/txt_command.h
@@ -0,0 +1,174 @@
+// Ryzom - MMORPG Framework <http://dev.ryzom.com/projects/ryzom/>
+// Copyright (C) 2010  Winch Gate Property Limited
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#ifndef TXT_COMMAND_H
+#define TXT_COMMAND_H
+
+
+//-------------------------------------------------------------------------------------------------
+// includes
+//-------------------------------------------------------------------------------------------------
+
+#include "nel/misc/types_nl.h"
+#include "nel/misc/common.h"
+#include "nel/misc/debug.h"
+#include "nel/misc/sstring.h"
+
+
+//-------------------------------------------------------------------------------------------------
+// MACRO TXT_COMMAND_SET
+//-------------------------------------------------------------------------------------------------
+
+#define TXT_COMMAND_SET(setName,CONTEXT_CLASS)\
+class __CTxtCommandSet_##setName: public ITxtCommandSet<CONTEXT_CLASS>\
+{\
+public:\
+	static __CTxtCommandSet_##setName* getInstance()\
+	{\
+		static __CTxtCommandSet_##setName *p=NULL;\
+		if (p==NULL) p= new __CTxtCommandSet_##setName;\
+		return p;\
+	}\
+};\
+static CTxtCommandSetPtr<__CTxtCommandSet_##setName> setName;
+
+
+//-------------------------------------------------------------------------------------------------
+// MACRO TXT_COMMAND
+//-------------------------------------------------------------------------------------------------
+
+#define TXT_COMMAND(cmdName,setName,CONTEXT_CLASS)\
+struct __CTxtCommand_##cmdName##CONTEXT_CLASS: public ITxtCommand<CONTEXT_CLASS>\
+{\
+	static __CTxtCommand_##cmdName##CONTEXT_CLASS* getInstance()\
+	{\
+		static __CTxtCommand_##cmdName##CONTEXT_CLASS *p=NULL;\
+		if (p==NULL) p= new __CTxtCommand_##cmdName##CONTEXT_CLASS;\
+		return p;\
+	}\
+	virtual const char* getName() const {return #cmdName;}\
+	virtual CTxtCommandResult execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine);\
+private:\
+	__CTxtCommand_##cmdName##CONTEXT_CLASS() {}\
+};\
+static ITxtCommandRegisterer<__CTxtCommand_##cmdName##CONTEXT_CLASS,__CTxtCommandSet_##setName> __CTxtCommand_##cmdName##CONTEXT_CLASS##_Registerer;\
+CTxtCommandResult __CTxtCommand_##cmdName##CONTEXT_CLASS::execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine)
+
+
+//-------------------------------------------------------------------------------------------------
+// class CTxtCommandResult
+//-------------------------------------------------------------------------------------------------
+
+class CTxtCommandResult
+{
+public:
+	enum TType
+	{ 
+		SUCCESS,			// command execution was successful
+		SYNTAX_ERROR,		// there was a syntax error in the command line
+		BAD_PERMISSION,		// the user doesn't have the right to run the given command
+		UNKNOWN_COMMAND,	// behave as if the command was not recognised
+		EXECUTION_ERROR		// there was an error during execution of the command
+	};
+	CTxtCommandResult(const bool& success): _Type(success?SUCCESS:SYNTAX_ERROR) {}
+	CTxtCommandResult(const TType& type): _Type(type) {}
+	CTxtCommandResult(const TType& type,const NLMISC::CSString& reason): _Type(type), _Reason(reason) {}
+	TType getType() const { return _Type; }
+	const NLMISC::CSString& getReason() const { return _Reason; }
+private:
+	TType _Type;
+	NLMISC::CSString _Reason;
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommand
+//-------------------------------------------------------------------------------------------------
+
+template <class CONTEXT_CLASS> class ITxtCommand
+{
+public:
+	virtual const char* getName() const =0;
+	virtual CTxtCommandResult execute(CONTEXT_CLASS& context,const NLMISC::CVectorSString& args,const NLMISC::CSString& rawArgs,const NLMISC::CSString& fullCmdLine) =0;
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommandRegisterer
+//-------------------------------------------------------------------------------------------------
+
+template <class CMD,class SET> struct ITxtCommandRegisterer
+{
+	ITxtCommandRegisterer()
+	{
+		SET::getInstance()->registerTxtCommand(CMD::getInstance());
+	}
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommandSet
+//-------------------------------------------------------------------------------------------------
+
+template <class CONTEXT_CLASS> class ITxtCommandSet
+{
+public:
+	void registerTxtCommand(ITxtCommand<CONTEXT_CLASS>* txtCommand)
+	{
+		nlassert(_TxtCommands.find(txtCommand->getName())==_TxtCommands.end());
+		_TxtCommands[txtCommand->getName()]= txtCommand;
+	}
+	CTxtCommandResult execute(CONTEXT_CLASS& context,const NLMISC::CSString& cmdLine)
+	{
+		NLMISC::CSString cmdTail=cmdLine;
+		NLMISC::CSString keyword=cmdTail.firstWord(true);
+		typename TTxtCommands::iterator it= _TxtCommands.find(keyword);
+		if (it==_TxtCommands.end()) return CTxtCommandResult::UNKNOWN_COMMAND;
+		NLMISC::CVectorSString args;
+		cmdTail.splitWords(args);
+		return it->second->execute(context,args,cmdTail,cmdLine);
+	}
+private:
+	typedef ITxtCommand<CONTEXT_CLASS> TTxtCommand;
+	typedef std::map<NLMISC::CSString,TTxtCommand*> TTxtCommands;
+	TTxtCommands _TxtCommands;
+};
+
+
+//-------------------------------------------------------------------------------------------------
+// class ITxtCommandRegisterer
+//-------------------------------------------------------------------------------------------------
+
+template <class SET> struct CTxtCommandSetPtr
+{
+	CTxtCommandSetPtr()
+	{
+		SET::getInstance();
+	}
+
+	SET& operator*()
+	{
+		return *SET::getInstance();
+	}
+
+	SET* operator->()
+	{
+		return SET::getInstance();
+	}
+};
+
+
+//-------------------------------------------------------------------------------------------------
+#endif
diff --git a/code/ryzom/gen_deps.sh b/code/ryzom/gen_deps.sh
deleted file mode 100755
index a6a286289..000000000
--- a/code/ryzom/gen_deps.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-command=''
-sources=''
-phase=0
-for arg in $*
-do
-    if [ "$phase" == 0 ] && [ "$arg" == '--' ]
-    then
-        phase=1
-    elif [ "$phase" == 0 ]
-    then
-        command="$command $arg"
-    elif [ "$phase" == 1 ]
-    then
-        sources="$sources $arg"
-    fi
-done
-
-for src in $sources
-do
-    obj=`echo $src | sed -e 's/.cpp$/.o/'`
-    $command -MT $obj -M $src
-done
diff --git a/code/ryzom/server/Makefile b/code/ryzom/server/Makefile
deleted file mode 100644
index f76559463..000000000
--- a/code/ryzom/server/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-MAKE_NIGHT_ARGS=-j2
-MAKE_ALL_ARGS=-j2
-CXX=g++
-CC=g++
-BIN_DIR=$(RYZOM_PATH)/tools/scripts/linux
-
-night:
-	+make $(MAKE_NIGHT_ARGS) -k -C src night CXX=$(CXX)
-
-all:
-	+make $(MAKE_ALL_ARGS) -C src all
-
-mono:
-	+make -C src all
-
-clean:
-	+make -C src clean
-
-distclean:
-	+make -C src distclean
-
-cleansheets:
-	+make -C src cleansheets
-
-update:
-	+make -C src update
-
-touch:
-	+make -C src touch
diff --git a/code/ryzom/server/data_shard/client_commands_privileges.txt b/code/ryzom/server/data_shard/client_commands_privileges.txt
index c61537dfa..9b0e115d4 100644
--- a/code/ryzom/server/data_shard/client_commands_privileges.txt
+++ b/code/ryzom/server/data_shard/client_commands_privileges.txt
@@ -40,6 +40,9 @@ forceTargetToDie			:DEV:SGM:GM:EM:		// Force entity target to die
 getEventFaction				:DEV:SGM:GM:EM:		// Get the event faction of player: <player name>
 giveRespawnPoint			:DEV:SGM:GM:		// Give a respawn point to a player: <respawn point name>
 guildInvite							// Send a guild invite to a player character without distance constrainte
+setLeague							// Create a League 
+leagueInvite							// Send a League invite to a Team Leader character without distance constrainte
+leagueKick							// Kick a player or team from league
 roomInvite							// Send a room invite
 roomKick							// Remove a room invite
 guildMOTD							// Set the guild message of the day, command effective only for officer and more graded guild members
@@ -72,8 +75,6 @@ renameGuild					:DEV:SGM:GM:EM:		// Rename a guild: <guild name> <new guild name
 renamePlayer		[SU]	:DEV:SGM:GM:EM:		// Rename a player: <player name> <new playerName>
 renamePlayerForEvent		:DEV:SGM:GM:EM:EG:		// Rename a player temporarily for an event: <player name> <new playerName>
 resetPowerFlags				:DEV:SGM:GM:EM:		// Reset the ineffective aura and the power flags for given character
-respawnAfterDeath						// Respawn after death at re-spawn point name, it must be valid (validated by PC and usable): <Respawn idx>
-resurrected							// Another PC resurrect PC by giving some energy: <Hp> <Sta> <Sap> <Focus>
 root						:DEV:SGM:GM:EM:VG:SG:		// Root a player: <player name> <time in seconds>
 saveToPDR					:DEV:SGM:		// Save a character to a binary PDR file: <file name>
 saveToXML					:DEV:SGM:		// Save a character to an XML file: <file name>
@@ -87,6 +88,8 @@ setGuildMessage							// Set the guild message of the day: <message>
 setItemSapLoad				:DEV:SGM:GM:EM:		// Set an item sap load: <slot index in bag (starts at 0)> <float value>
 setPosFlag					:DEV:SGM:GM:EM		// Set a position flag: <flag name>
 setPvPTag									// Set player character PvP tag to true or false
+setFamePlayer				:DEV:SGM:GM:EM:		// Set the fame value of a player in the given faction: <faction> <fame>
+resetPVPTimers				:DEV:SGM:GM:EM:		// Reset the pvp timers of a player: <player name>
 setSkillsToMaxValue			:DEV:SGM:GM:EM:		// Set player skills to max value
 showCSR						:DEV:SGM:GM:VG:SG:G:EM:EG:	// Show CSR title if the player is a CSR
 showFBT						:DEV:SGM:GM:EM:		// Show Focus Beta Tester title if the player is a FBT
@@ -100,6 +103,7 @@ connectUserChannel								// Connect to User Channel Chat
 webExecCommand									// Execute web command (need HMAC signature)
 webDelCommandsIds								// Delete web transactions for web_app
 webAddCommandsIds								// Add web command transactions for web_app
+updateTarget									// Update current target
 teleport					:DEV:SGM:GM:VG:SG:G:OBSERVER:EM:EG:	// Teleport the CSR in front of a player: <player name>
 tpPosFlag					:DEV:SGM:GM:VG:SG:G:EM:EG:	// Teleport a player to a position flag: <flag name>
 universe					:DEV:SGM:GM:EM:		// Chat in universe mode: <boolean>
@@ -107,7 +111,6 @@ unmute						:DEV:SGM:GM:EM:VG:SG:		// Unmute a user: <player name>
 unmuteUniverse				:DEV:SGM:GM:EM:VG:SG:		// Unmute the universe channel
 unroot						:DEV:SGM:GM:EM:VG:SG:		// Stop rooting a player: <player name>
 updateGuildMembersList		:DEV:SGM:GM:		// update guild members list on members clients: <guild name>
-validateRespawnPoint						// Validate re-spawn point: <Re-spawn point idx>
 //setPvpClan				:DEV:			// choose a clan for pvp
 summonPet							// player can summon it's pet one time only
 allowSummonPet				:DEV:SGM:GM:		// autorize player to summon it's pet one time per pet
@@ -121,6 +124,14 @@ farTPReturn					:DEV:SGM:GM:VG:SG:EM:	// used to tp back to your previous sessio
 characterMissionDump			:DEV:SGM:GM:		//Dump mission list for a character
 removeMission				:DEV:SGM:GM:		//Remove a mission of a character
 addMission				:DEV:SGM:GM:		//add a mission to a character
+characterInventoryDump		:DEV:SGM:GM:EM:		// Dump character inventory info: <inventory> <from slot> <to slot>
+deleteInventoryItem			:DEV:SGM:GM:EM:		// Delete an item from a characters inventory: <inventory> <slot> <sheetname> <quality> <quantity>
+lockItem										// Lock/unlock item for trading, selling, destruction.
+setTeamLeader									// Set the team leader
+setPetAnimalSatiety			:DEV:SGM:GM:EM:		// Set the satiety of pet animal (petIndex in 0..3): <petIndex> full|<value> [<nameForAnswer>]
+getPetAnimalSatiety			:DEV:SGM:GM:EM:		// Get the satiety of pet animal (petIndex in 0..3): <petIndex> [<nameForAnswer>]
+setPetAnimalName			:DEV:SGM:GM:EM:EG:	// Set the name of a pet animal (petIndex in 0..3): <petIndex> <name>
+setSimplePhrase				:DEV:SGM:GM:EM:		// Set an IOS phrase: <id> <phrase> [<language code>]
 
 // Variables
 //
@@ -138,6 +149,7 @@ Name					:DEV:SGM:GM:EM:		// Name of a player
 Position				:DEV:SGM:GM:VG:PR:OBSERVER:EM:EG:		// Position of a player (in meters) <posx>,<posy>[,<posz>]] | <bot name> | <player name> | home
 Priv					:DEV:			// User privilege
 PriviledgePVP			:DEV:SGM:GM:EM:EG:			// Turns PVP on/off on character (blame coder for typo)
+FullPVP			:DEV:SGM:GM:EM:EG:			// Turns Full PVP on/off on character (blame coder for typo)
 RyzomDate				:DEV:SGM:GM:EM:		// Current ryzom date
 RyzomTime				:DEV:SGM:GM:EM:		// Current ryzom time
 
@@ -160,3 +172,8 @@ eventSetBotFameByKill			:DEV:SGM:GM:EM:		// Changes the amount of fame earned fo
 eventSetBotURL					:DEV:SGM:GM:EM:     // Set the url of a bot
 eventSetBotURLName				:DEV:SGM:GM:EM:     // Set the url name of a bot
 eventSpawnToxic				:DEV:SGM:GM:EM:		// Add toxic cloud
+eventNpcSay					:DEV:SGM:GM:EM:		// Have an NPC say a text
+eventSetBotFacing			:DEV:SGM:GM:EM:		// Set the direction in which a bot faces
+eventGiveControl			:DEV:SGM:GM:EM:		// Give control of entity A to entity B : <master eid> <slave eid>
+eventLeaveControl			:DEV:SGM:GM:EM:		// Leave control of entity : <master eid>
+resetName										// Reset player's name; undo a temporary rename
diff --git a/code/ryzom/server/src/CMakeLists.txt b/code/ryzom/server/src/CMakeLists.txt
index d0c789328..13cee545a 100644
--- a/code/ryzom/server/src/CMakeLists.txt
+++ b/code/ryzom/server/src/CMakeLists.txt
@@ -27,13 +27,14 @@ ADD_SUBDIRECTORY(persistant_data_service)
 ADD_SUBDIRECTORY(session_browser_server)
 ADD_SUBDIRECTORY(shard_unifier_service)
 ADD_SUBDIRECTORY(tick_service)
+ADD_SUBDIRECTORY(patchman_service)
+
 
 # Deprecated, no longer used.
 #ADD_SUBDIRECTORY(ags_test)
 #ADD_SUBDIRECTORY(ai_data_service)
 #ADD_SUBDIRECTORY(entity_view_service)
-#ADD_SUBDIRECTORY(general_utilities_service)
-#ADD_SUBDIRECTORY(patchman_service)
+ADD_SUBDIRECTORY(general_utilities_service)
 
 # Not sure, no longer used maybe?
 #sabrina
diff --git a/code/ryzom/server/src/Makefile b/code/ryzom/server/src/Makefile
deleted file mode 100644
index 04f20e3a5..000000000
--- a/code/ryzom/server/src/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-
-BUILD_DIRS = \
-server_share \
-ai_share \
-admin_modules \
-ryzom_admin_service \
-ryzom_naming_service \
-mirror_service \
-ryzom_welcome_service \
-tick_service \
-frontend_service \
-gpm_service \
-pd_lib \
-input_output_service \
-gameplay_module_lib \
-entities_game_service \
-ai_service \
-backup_service \
-dynamic_scenario_service \
-shard_unifier_service \
-session_browser_server \
-pd_support_service \
-monitor_service \
-log_analyser_service \
-mail_forum_service \
-logger_service
-
-# removed service
-#pd_reference_builder \
-
-night: all
-
-all: $(foreach dir,$(BUILD_DIRS),$(dir)-all)
-
-%-all:
-	+make -k -C $* all
-
-clean: $(foreach dir,$(BUILD_DIRS),$(dir)-clean)
-
-%-clean:
-	+make -C $* clean
-
-distclean: $(foreach dir,$(BUILD_DIRS),$(dir)-distclean)
-
-%-distclean:
-	+make -C $* distclean
-
-cleansheets: $(foreach dir,$(BUILD_DIRS),$(dir)-cleansheets)
-
-%-cleansheets:
-	+make -C $* cleansheets
-
-update: $(foreach dir,$(BUILD_DIRS),$(dir)-update)
-
-%-update:
-	+make -C $* update
-
-touch: $(foreach dir,$(BUILD_DIRS),$(dir)-touch)
-
-%-touch:
-	+make -C $* touch
-
-packed_sheets: $(foreach dir,$(BUILD_DIRS),$(dir)-packed_sheets)
-
-%-packed_sheets:
-	-make -C $* packed_sheets
-
-exe: $(foreach dir,$(BUILD_DIRS),$(dir)-exe)
-
-%-exe:
-	-make -C $* exe
-
-.NOTPARALLEL: night all clean cleansheets update touch
diff --git a/code/ryzom/server/src/admin_modules/Makefile b/code/ryzom/server/src/admin_modules/Makefile
deleted file mode 100644
index a58626197..000000000
--- a/code/ryzom/server/src/admin_modules/Makefile
+++ /dev/null
@@ -1,38 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-# The flags for the linker
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-lnelnet \
-		-lnelmisc \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libadmin_modules.a
-DSP_TARGET	= admin_modules.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-libadmin_modules.a: $(OBJS)
-	ar r libadmin_modules.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/admin_modules/admin_modules.vcproj b/code/ryzom/server/src/admin_modules/admin_modules.vcproj
deleted file mode 100644
index 9ff52e2df..000000000
--- a/code/ryzom/server/src/admin_modules/admin_modules.vcproj
+++ /dev/null
@@ -1,321 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="admin_modules"
-	ProjectGUID="{90E800AB-07B7-4317-B3D4-7D7DECB858D1}"
-	RootNamespace="admin_modules"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\admin_modules.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\admin_modules_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\admin_modules_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\aes_client_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\aes_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\as_module.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/admin_modules/admin_modules_itf.h b/code/ryzom/server/src/admin_modules/admin_modules_itf.h
index 3f430ed43..248ba6834 100644
--- a/code/ryzom/server/src/admin_modules/admin_modules_itf.h
+++ b/code/ryzom/server/src/admin_modules/admin_modules_itf.h
@@ -1829,9 +1829,9 @@ namespace ADMIN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -1969,9 +1969,9 @@ namespace ADMIN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -2202,9 +2202,9 @@ namespace ADMIN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/ags_test/Makefile b/code/ryzom/server/src/ags_test/Makefile
deleted file mode 100644
index 290c6e153..000000000
--- a/code/ryzom/server/src/ags_test/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-# The flags for the linker
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-lgame_share \
-		-lnelnet \
-		-lnelgeorges \
-		-lnelligo \
-		-lnelpacs \
-		-lnelmisc \
-		-lxml2
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= ags_test
-DSP_TARGET  = $(TARGETS).vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-ags_test: $(OBJS)
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/ai_service/Makefile b/code/ryzom/server/src/ai_service/Makefile
deleted file mode 100644
index 81edd826c..000000000
--- a/code/ryzom/server/src/ai_service/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I.. \
-		-I../ai_share
-
-# The flags for the linker
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-        -L../server_share \
-		-L../admin_modules \
-		-L../ai_share \
-		-ladmin_modules \
-		-lai_share \
-        -lserver_share \
-		-lgame_share \
-		-lnelnet \
-		-lnelgeorges \
-		-lnelligo \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= ai_service
-DSP_TARGET	= $(TARGETS).vcproj
-PACKED_SHEETS = \
-	ais.packed_sheets \
-	ais_action.packed_sheets \
-	ais_fight_config.packed_sheets \
-	ais_race_stats.packed_sheets
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a \
-		../server_share/libserver_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets: $(TARGETS)
-	/bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/ai_service/ai.cpp b/code/ryzom/server/src/ai_service/ai.cpp
index b51f1279c..ed8926f5b 100644
--- a/code/ryzom/server/src/ai_service/ai.cpp
+++ b/code/ryzom/server/src/ai_service/ai.cpp
@@ -423,6 +423,15 @@ void	CAIS::update()
 			_CreatureChangeHPList.Entities.clear();
 			_CreatureChangeHPList.DeltaHp.clear();
 		}
+		if (!_CreatureChangeMaxHPList.Entities.empty())
+		{
+			nlassert(_CreatureChangeMaxHPList.Entities.size()==_CreatureChangeMaxHPList.MaxHp.size());
+			nlassert(_CreatureChangeMaxHPList.Entities.size()==_CreatureChangeMaxHPList.SetFull.size());
+			_CreatureChangeMaxHPList.send("EGS");
+			_CreatureChangeMaxHPList.Entities.clear();
+			_CreatureChangeMaxHPList.MaxHp.clear();
+			_CreatureChangeMaxHPList.SetFull.clear();
+		}
 	}
 
 	//
diff --git a/code/ryzom/server/src/ai_service/ai.h b/code/ryzom/server/src/ai_service/ai.h
index f06271c17..aed47f262 100644
--- a/code/ryzom/server/src/ai_service/ai.h
+++ b/code/ryzom/server/src/ai_service/ai.h
@@ -221,6 +221,11 @@ public:
 	{
 		return _CreatureChangeHPList;
 	}
+
+	CChangeCreatureMaxHPMsg &getCreatureChangeMaxHP()
+	{
+		return _CreatureChangeMaxHPList;
+	}
 	
 	enum	TSearchType
 	{
@@ -288,6 +293,7 @@ private:
 	// Faunas descriptions to be sent each frame 
 	CFaunaBotDescription	_FaunaDescriptionList;
 	CChangeCreatureHPMsg	_CreatureChangeHPList;
+	CChangeCreatureMaxHPMsg	_CreatureChangeMaxHPList;
 
 	/// The emot identifiers
 	std::map<std::string, uint32>	_EmotNames;
diff --git a/code/ryzom/server/src/ai_service/ai_bot.cpp b/code/ryzom/server/src/ai_service/ai_bot.cpp
index 31ce2fce0..03e2a68db 100644
--- a/code/ryzom/server/src/ai_service/ai_bot.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot.cpp
@@ -61,7 +61,7 @@ CAIInstance* CSpawnBot::getAIInstance() const
 void CSpawnBot::setVisualPropertiesName()
 {
 	CBot& botRef = CSpawnBot::getPersistent();
-	std::string name = botRef.getName();
+	ucstring name = botRef.getName();
 	
 	if (CVisualPropertiesInterface::UseIdForName)
 	{
@@ -85,7 +85,7 @@ void CSpawnBot::setVisualPropertiesName()
 	if (! botRef.getFaunaBotUseBotName()) //false by default
 	{
 		if (botRef.getSheet()->ForceDisplayCreatureName())
-		return;
+			return;
 		// the npc name is displayed as a fauna
 	}
 
@@ -403,8 +403,8 @@ std::vector<std::string> CBot::getMultiLineInfoString() const
 	pushTitle(container, "CBot");
 	pushEntry(container, "id=" + getIndexString());
 	container.back() += " eid=" + getEntityIdString();
-	container.back() += " alias=" + getAliasTreeOwner()->getAliasString();
-	container.back() += " name=" + getName();
+	container.back() += " alias=" + getAliasTreeOwner()->getAliasString() + " raw alias=" + NLMISC::toString(getAliasTreeOwner()->getAlias());
+	pushEntry(container, " name=" + getName());
 	if (isSheetValid())
 		container.back() += " sheet=" + NLMISC::CFile::getFilenameWithoutExtension(getSheet()->SheetId().toString());
 	pushEntry(container, "fullname=" + getFullName());
diff --git a/code/ryzom/server/src/ai_service/ai_bot.h b/code/ryzom/server/src/ai_service/ai_bot.h
index d74442b83..3156edb82 100644
--- a/code/ryzom/server/src/ai_service/ai_bot.h
+++ b/code/ryzom/server/src/ai_service/ai_bot.h
@@ -95,7 +95,7 @@ public:
 	virtual float getAggroPropagationRadius() const;
 	//@}
 	
-	void setVisualPropertiesName();
+	virtual void setVisualPropertiesName();
 	
 	// as there not a lot of prop (1 or 2, maybe 3) stores in this comportment, we don't need hash.
 	bool getProp(size_t Id, uint32& value) const;
@@ -241,8 +241,8 @@ public:
 	
 	NLMISC::CEntityId createEntityId() const;
 	
-	const std::string& getCustomName() const { return _CustomName; }
-	void setCustomName(const std::string &name) { _CustomName = name; }
+	const ucstring& getCustomName() const { return _CustomName; }
+	void setCustomName(const ucstring &name) { _CustomName = name; }
 
 	virtual void setClientSheet(const std::string & clientSheetName);  
 
@@ -272,7 +272,7 @@ private:
 	bool _IgnoreOffensiveActions;
 	bool _Healer;
 	bool _BuildingBot;
-	std::string _CustomName;
+	ucstring _CustomName;
 	CTimer					_SetSheetTimer;
 	struct CSetSheetData
 	{
diff --git a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
index f56a745db..a8175cc9a 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot_npc.cpp
@@ -274,9 +274,12 @@ std::vector<std::string> CSpawnBotNpc::getMultiLineInfoString() const
 	else
 	{
 		vector<uint32> const& missions = _CurrentChatProfile.getMissions();
-		pushEntry(container, "missions: " + NLMISC::toString("%u", missions[0]));
-		for (size_t i=1; i<missions.size(); ++i)
-			container.back() += ", " + NLMISC::toString("%u", missions[i]);
+		pushEntry(container, "missions:");
+		for (size_t i=0; i<missions.size(); ++i)
+		{
+			string name = getAIInstance()->findMissionName(missions[i]);
+			pushEntry(container, NLMISC::toString("          %u (%s)", missions[i], name.c_str()));
+		}
 	}
 	pushFooter(container);
 	
diff --git a/code/ryzom/server/src/ai_service/ai_bot_pet.cpp b/code/ryzom/server/src/ai_service/ai_bot_pet.cpp
index e6177fda1..6e0747933 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_pet.cpp
+++ b/code/ryzom/server/src/ai_service/ai_bot_pet.cpp
@@ -16,6 +16,7 @@
 
 #include "stdpch.h"
 #include "ai_bot_pet.h"
+#include "visual_properties_interface.h"
 
 #include "nel/misc/random.h"
 #include "ai_grp_pet.h"
@@ -92,3 +93,28 @@ CSpawnGroupPet& CSpawnBotPet::spawnGrp()
 {
 	return static_cast<CSpawnGroupPet&>(CSpawnBot::spawnGrp());
 }
+
+void CSpawnBotPet::setVisualPropertiesName()
+{
+	CBotPet& botRef = CSpawnBotPet::getPersistent();
+	ucstring name = botRef.getName();
+	
+	if (CVisualPropertiesInterface::UseIdForName)
+	{
+		name = NLMISC::toString("AI:%s", botRef.getIndexString().c_str());
+	}
+	
+	if (name.empty() && CVisualPropertiesInterface::ForceNames)
+	{
+		name = NLMISC::CFile::getFilenameWithoutExtension(botRef.getSheet()->SheetId().toString().c_str());
+	}
+	
+	if (!botRef.getCustomName().empty())
+		name = botRef.getCustomName();
+
+	//	no name the bot will appear without name on the client.
+	if (name.empty())
+		return;
+		
+	CVisualPropertiesInterface::setName(dataSetRow(), name);
+}
diff --git a/code/ryzom/server/src/ai_service/ai_bot_pet.h b/code/ryzom/server/src/ai_service/ai_bot_pet.h
index 34eacd039..67a448ee0 100644
--- a/code/ryzom/server/src/ai_service/ai_bot_pet.h
+++ b/code/ryzom/server/src/ai_service/ai_bot_pet.h
@@ -65,6 +65,8 @@ public:
 	CPathPosition& pathPos() { return _PathPos; }
 	
 	uint32 _DeathTime;
+
+	void setVisualPropertiesName();
 	
 private:
 
diff --git a/code/ryzom/server/src/ai_service/ai_instance.cpp b/code/ryzom/server/src/ai_service/ai_instance.cpp
index 5fd8e878a..240af6da3 100644
--- a/code/ryzom/server/src/ai_service/ai_instance.cpp
+++ b/code/ryzom/server/src/ai_service/ai_instance.cpp
@@ -653,7 +653,7 @@ static float randomAngle()
 	return val;
 }
 
-CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName)
+CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName, const std::string &look)
 {
 	if (!_EventNpcManager)
 		return NULL;
@@ -689,10 +689,13 @@ CGroupNpc* CAIInstance::eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const&
 			CBotNpc* const bot = NLMISC::safe_cast<CBotNpc*>(grp->bots()[i]);
 
 			bot->setSheet(sheet);
+			if (!look.empty())
+				bot->setClientSheet(look);
 			bot->equipmentInit();
 			bot->initEnergy(/*groupEnergyCoef()*/0);
 			CAIVector rpos(pos);
-			if (i!=0)
+			// Spawn all randomly except if only 1 bot
+			if (nbBots > 1)
 			{
 				RYAI_MAP_CRUNCH::CWorldMap const& worldMap = CWorldContainer::getWorldMap();
 				RYAI_MAP_CRUNCH::CWorldPosition	wp;
@@ -857,6 +860,7 @@ void cbEventCreateNpcGroup( NLNET::CMessage& msgin, const std::string &serviceNa
 	double dispersionRadius;
 	bool spawnBots;
 	std::string botsName;
+	std::string look;
 	msgin.serial(messageVersion);
 	nlassert(messageVersion==1);
 	msgin.serial(instanceNumber);
@@ -869,10 +873,11 @@ void cbEventCreateNpcGroup( NLNET::CMessage& msgin, const std::string &serviceNa
 	msgin.serial(dispersionRadius);
 	msgin.serial(spawnBots);
 	msgin.serial(botsName);
+	msgin.serial(look);
 	CAIInstance* instance = CAIS::instance().getAIInstance(instanceNumber);
 	if (instance)
 	{
-		CGroupNpc* npcGroup = instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots, (double)orientation/1000., botsName);
+		CGroupNpc* npcGroup = instance->eventCreateNpcGroup(nbBots, sheetId, CAIVector((double)x/1000., (double)y/1000.), dispersionRadius, spawnBots, (double)orientation/1000., botsName, look);
 		if (npcGroup != NULL)
 		{
 			_PlayersLastCreatedNpcGroup[playerId] = npcGroup->getName();
diff --git a/code/ryzom/server/src/ai_service/ai_instance.h b/code/ryzom/server/src/ai_service/ai_instance.h
index ce53d0559..6540620d9 100644
--- a/code/ryzom/server/src/ai_service/ai_instance.h
+++ b/code/ryzom/server/src/ai_service/ai_instance.h
@@ -207,7 +207,7 @@ public:
 			return NULL;
 	}
 
-	CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName);
+	CGroupNpc* eventCreateNpcGroup(uint nbBots, NLMISC::CSheetId const& sheetId, CAIVector const& pos, double dispersionRadius, bool spawnBots, double orientation, const std::string &botsName, const std::string &look);
 
 	/// create a new easter egg
 	CBotEasterEgg* createEasterEgg(uint32 easterEggId, NLMISC::CSheetId const& sheetId, std::string const& botName, double x, double y, double z, double heading, const std::string& look);
diff --git a/code/ryzom/server/src/ai_service/ai_logic_action.h b/code/ryzom/server/src/ai_service/ai_logic_action.h
index 631f9f620..452087b18 100644
--- a/code/ryzom/server/src/ai_service/ai_logic_action.h
+++ b/code/ryzom/server/src/ai_service/ai_logic_action.h
@@ -46,7 +46,7 @@ public:
 
 	// note that actions are NOT responsible for deleting child actions
 	virtual	~IAILogicAction()
-	{};
+	{}
 
 	// this is the execute 'callback' for the action type.
 	// NOTE: This code should be fast and compact as it may be called very large numbers of times
diff --git a/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp b/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp
index e72a88abc..31e01d143 100644
--- a/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp
+++ b/code/ryzom/server/src/ai_service/ai_mgr_pet.cpp
@@ -290,6 +290,11 @@ void CPetSpawnMsgImp::callback(std::string const& name, NLNET::TServiceId id)
 			}
 			
 			botPet->setSheet(sheet);
+
+			if (!CustomName.empty())
+			{
+				botPet->setCustomName(CustomName);
+			}
 			
 			if (!botPet->spawn())
 			{
@@ -314,7 +319,7 @@ void CPetSpawnMsgImp::callback(std::string const& name, NLNET::TServiceId id)
 #endif
 				return;
 			}
-			
+
 			botPet->getSpawn()->setAIProfile(new CAIPetProfileStand(botPet->getSpawn()));
 			
 			confirmMsg.PetMirrorRow = botPet->getSpawn()->dataSetRow();
diff --git a/code/ryzom/server/src/ai_service/ai_outpost.cpp b/code/ryzom/server/src/ai_service/ai_outpost.cpp
index 0ef71b2ee..ed2c62b77 100644
--- a/code/ryzom/server/src/ai_service/ai_outpost.cpp
+++ b/code/ryzom/server/src/ai_service/ai_outpost.cpp
@@ -873,14 +873,20 @@ void COutpost::createSquad(CGroupDesc<COutpostSquadFamily> const* groupDesc, COu
 	// Attack only the declared ennemies of the outpost
 	if (side==OUTPOSTENUMS::OutpostOwner)
 	{
-	//	grp->faction      ().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str()));
-	//	grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str()));
+		// Bots factions
+		grp->faction      ().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str()));
+		grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str()));
+		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str()));
+		// Players faction
 		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str()));
 	}
 	if (side==OUTPOSTENUMS::OutpostAttacker)
 	{
-	//	grp->faction      ().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str()));
-	//	grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:attacker", getAliasString().c_str()));
+		// Bots factions
+		grp->faction      ().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str()));
+		grp->friendFaction().addProperty(NLMISC::toString("outpost:%s:bot_attacker", getAliasString().c_str()));
+		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:bot_defender", getAliasString().c_str()));
+		// Players faction
 		grp->ennemyFaction().addProperty(NLMISC::toString("outpost:%s:defender", getAliasString().c_str()));
 	}
 	grp->_AggroRange = 25;
diff --git a/code/ryzom/server/src/ai_service/ai_profile_npc.cpp b/code/ryzom/server/src/ai_service/ai_profile_npc.cpp
index a97beb24f..e47003cb6 100644
--- a/code/ryzom/server/src/ai_service/ai_profile_npc.cpp
+++ b/code/ryzom/server/src/ai_service/ai_profile_npc.cpp
@@ -1562,7 +1562,7 @@ void CGrpProfileGoToPoint::updateProfile(uint ticksSinceLastUpdate)
 			dx+=dir.x;
 			dy+=dir.y;
 			
-			// 4 rangées.
+			// 4 rows
 			CAIVector	idealPos=groupPosition;
 			if (botIndex>=_NbBotInNormalShape)
 			{
@@ -2054,7 +2054,7 @@ void CGrpProfileFollowRoute::updateProfile(uint ticksSinceLastUpdate)
 			dx+=dir.x;
 			dy+=dir.y;
 			
-			// 4 rangées.
+			// 4 rows
 			CAIVector	idealPos=groupPosition;
 			if (botIndex>=_NbBotInNormalShape)
 			{
@@ -2299,6 +2299,94 @@ void CGrpProfileStandOnVertices::updateProfile(uint ticksSinceLastUpdate)
 	}
 }
 	
+//////////////////////////////////////////////////////////////////////////////
+// CGrpProfileFollowPlayer                                                //
+//////////////////////////////////////////////////////////////////////////////
+CGrpProfileFollowPlayer::CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius)
+: CMoveProfile(owner)
+, _PlayerRow(playerRow)
+, _DispersionRadius(dispersionRadius)
+, _PathPos(CAngle(0))
+, _PathCont(NLMISC::safe_cast<CSpawnBotNpc*>(owner)->getAStarFlag())
+{
+	PROFILE_LOG("group", "follow player", "ctor", "");
+	_Status = CFollowPath::FOLLOWING;
+}
+
+bool CGrpProfileFollowPlayer::destinationReach()	const
+{
+	return	_Status == CFollowPath::FOLLOW_ARRIVED
+		||	_Status==CFollowPath::FOLLOW_NO_PATH;
+}
+
+void CGrpProfileFollowPlayer::beginProfile()
+{
+	_Status = CFollowPath::FOLLOWING;
+}
+
+// TODO: this doesn't work very well at all...
+void CGrpProfileFollowPlayer::updateProfile(uint ticksSinceLastUpdate)
+{
+	H_AUTO(CGrpProfileFollowPlayerUpdate);
+	CFollowPathContext fpcGrpFollowPlayerUpdate("CGrpProfileFollowPlayerUpdate");
+
+	// check all bot to see if there need to move 
+	CSpawnGroupNpc* grp = static_cast<CSpawnGroupNpc*>(static_cast<CSpawnGroup*>(_Grp));
+	CGroupNpc &pgrp = grp->getPersistent();
+	
+	CBotPlayer*	plrPtr	=	dynamic_cast<CBotPlayer*>(CAIS::instance().getEntityPhysical(_PlayerRow));
+
+	if ( ! plrPtr) {
+		nlwarning("CGrpProfileFollowPlayer: No valid player position to follow");
+		return;
+	}
+
+	_PathCont.setDestination(plrPtr->wpos());
+	_PathPos._Angle = plrPtr->theta();
+
+	for (uint i = 0; i < pgrp.bots().size(); ++i)
+	{
+		CBotNpc* bot = static_cast<CBotNpc*>(pgrp.bots()[i]);
+		if (!bot)
+			continue;
+
+		// check current bot state
+		CSpawnBotNpc *sbot = bot->getSpawn();
+		if (!sbot)
+			continue;
+
+		// Need to wait for a correct position before moving?
+		CAIVector const& dest = _PathCont.getDestination();
+		if (dest.x()==0 || dest.y()==0)
+			return;
+		
+		static const std::string runParameter("running");
+		float	dist;
+		if (sbot->getPersistent().getOwner()->getSpawnObj()->checkProfileParameter(runParameter))
+			dist = sbot->runSpeed()*ticksSinceLastUpdate;		
+		else
+			dist = sbot->walkSpeed()*ticksSinceLastUpdate;
+
+		// Move
+		CFollowPath::TFollowStatus const status = CFollowPath::getInstance()->followPath(
+			sbot,
+			_PathPos,
+			_PathCont,
+			dist,
+			0.f,
+			0.5f);
+
+		if (status==CFollowPath::FOLLOW_NO_PATH)
+		{
+			nlwarning("Problem with following player");
+		}
+
+		
+	}	
+}
+
+
+
 //////////////////////////////////////////////////////////////////////////////
 // CGrpProfileIdle                                                     //
 //////////////////////////////////////////////////////////////////////////////
@@ -3687,10 +3775,14 @@ bool CGrpProfileFaction::entityHavePartOfFactions(CAIEntityPhysical const* entit
 			std::set<TStringId>::const_iterator it, end = factionsSet.end();
 			for (it=factionsSet.begin(); it!=end; ++it)
 			{
-				std::string fameFaction = scriptFactionToFameFaction(CStringMapper::unmap(*it));
+				string factionInfos = CStringMapper::unmap(*it);
+				string fameFaction = scriptFactionToFameFaction(factionInfos);
 			//	sint32 fame = CFameInterface::getInstance().getFameOrCivilisationFame(entity->getEntityId(), CStringMapper::map(fameFaction));
 				sint32 const fame = entity->getFame(fameFaction);
-				if (fame!=NO_FAME && fame>0)
+				sint32 const value = scriptFactionToFameFactionValue(factionInfos);
+				bool gt = scriptFactionToFameFactionGreaterThan(factionInfos);
+				if ((fame != NO_FAME && gt && fame > value) ||
+					(fame != NO_FAME && !gt && fame < value))
 				{
 					//	nldebug("Entity has faction %s", CStringMapper::unmap(*it).c_str());
 					return true;
@@ -3731,12 +3823,41 @@ std::string CGrpProfileFaction::scriptFactionToFameFaction(std::string name)
 			ret += "_";
 			ret += name[i]-'A'+'a';
 		}
+		else if  (name[i] == '>' || name[i] == '<')
+		{
+			return ret;
+		}
 		else
+		{
 			ret += name[i];
+		}
 	}
 	return ret;
 }
 
+bool CGrpProfileFaction::scriptFactionToFameFactionGreaterThan(string name)
+{	
+	if (name.find("<") != string::npos)
+		return false;
+		
+	return true;
+}
+
+sint32 CGrpProfileFaction::scriptFactionToFameFactionValue(string name)
+{
+	size_t start = name.find(">");
+	if (start == string::npos)
+	{
+		start = name.find("<");
+		if (start == string::npos)
+			return 0;
+	}
+
+	sint32 value;
+	NLMISC::fromString(name.substr(start+1), value);
+	return value*6000;
+}
+
 std::string CGrpProfileFaction::fameFactionToScriptFaction(std::string name)
 {
 	std::string ret = "Famous";
@@ -3772,9 +3893,9 @@ void CGrpProfileFaction::checkTargetsAround()
 	CPropertySetWithExtraList<TAllianceId> const& thisEnnemyFactions = thisGrpNpc.ennemyFaction();
 
 	// We don't assist or attack players if our friends/ennemies are not in factions
-	bool const assistPlayers = thisFriendFactions.containsPartOfStrict(_FameFactions);
+	bool const assistPlayers = (thisFriendFactions.containsPartOfStrictFilter("Famous*") || thisFriendFactions.have(AITYPES::CPropertyId("Player")));
 	bool const assistBots    = !thisFriendFactions.empty() && !bNoAssist;
-	bool const attackPlayers = (!thisEnnemyFactions.extraSetEmpty()) || thisEnnemyFactions.containsPartOfStrict(_FameFactions) || thisEnnemyFactions.containsPartOfStrictFilter("outpost:*");
+	bool const attackPlayers = (!thisEnnemyFactions.extraSetEmpty()) || thisEnnemyFactions.containsPartOfStrictFilter("Famous*") || thisEnnemyFactions.have(AITYPES::CPropertyId("Player")) || thisEnnemyFactions.containsPartOfStrictFilter("outpost:*");
 	bool const attackBots    = !thisEnnemyFactions.empty();
 	
 	CAIVision<CPersistentOfPhysical>	Vision;
diff --git a/code/ryzom/server/src/ai_service/ai_profile_npc.h b/code/ryzom/server/src/ai_service/ai_profile_npc.h
index e46f1b4be..f8ec911f4 100644
--- a/code/ryzom/server/src/ai_service/ai_profile_npc.h
+++ b/code/ryzom/server/src/ai_service/ai_profile_npc.h
@@ -628,6 +628,49 @@ private:
 	CAITimer _Timer;
 };
 
+class CGrpProfileFollowPlayer : 
+public CMoveProfile
+{
+public:
+	CGrpProfileFollowPlayer(CProfileOwner* owner, TDataSetRow const& playerRow, uint32 dispersionRadius);
+	virtual ~CGrpProfileFollowPlayer() {}
+
+	void setBotStandProfile(AITYPES::TProfiles	botStandProfileType, IAIProfileFactory* botStandProfileFactory);
+
+	/// @name IAIProfile implementation
+	//@{
+	virtual void beginProfile();
+	virtual void updateProfile(uint ticksSinceLastUpdate);
+	virtual void endProfile() {}
+	virtual	AITYPES::TProfiles getAIProfileType() const { return AITYPES::BOT_FOLLOW_POS; }
+	virtual std::string getOneLineInfoString() const { return std::string("follow_player group profile"); }
+	//@}
+
+	void	stateChangeProfile() {}
+	bool	destinationReach() const;
+
+	void		addBot			(CBot*	bot) {}
+	void		removeBot		(CBot*	bot) {}
+	CPathCont*	getPathCont		(CBot const*	bot) { return NULL; };
+
+
+protected:
+private:
+	/// the profile type to apply to bot standing between two deplacement
+	AITYPES::TProfiles _BotStandProfileType;
+	/// the profile factory to apply to bot standing between two deplacement
+	IAIProfileFactory*_BotStandProfileFactory;
+
+	CFollowPath::TFollowStatus	_Status;
+	CPathPosition	_PathPos;
+	CPathCont		_PathCont;
+	CAIVector		_LastPos;
+
+	TDataSetRow	_PlayerRow;
+	uint32      _DispersionRadius;
+};
+
+
 //////////////////////////////////////////////////////////////////////////////
 // CGrpProfileIdle                                                          //
 //////////////////////////////////////////////////////////////////////////////
@@ -792,6 +835,10 @@ public:
 	static std::string scriptFactionToFameFaction(std::string name);
 	static std::string fameFactionToScriptFaction(std::string name);
 
+	static bool scriptFactionToFameFactionGreaterThan(std::string name);
+	static sint32 scriptFactionToFameFactionValue(std::string name);
+
+
 private:
 	CAITimer	_checkTargetTimer;
 	bool		bNoAssist;
diff --git a/code/ryzom/server/src/ai_service/ai_service.vcproj b/code/ryzom/server/src/ai_service/ai_service.vcproj
deleted file mode 100644
index add97a81e..000000000
--- a/code/ryzom/server/src/ai_service/ai_service.vcproj
+++ /dev/null
@@ -1,1260 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ai_service"
-	ProjectGUID="{4D1D9148-EA23-41C8-8D81-78ED8D2FBD63}"
-	RootNamespace="ai_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\admin.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_aggro.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_aggro.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_easter_egg.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_easter_egg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_fauna.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_fauna.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_npc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_pet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_bot_pet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_continent.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_control_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_control_npc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_entity.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_entity_matrix.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_entity_physical.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_entity_physical.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_entity_physical_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_generic_fight.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_generic_fight.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_generic_fight_helpers.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp_fauna.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp_fauna.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp_npc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp_pet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_grp_pet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_instance.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_instance.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_instance_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_keywords.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_keywords.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_logic_action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_map.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr_fauna.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr_fauna.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr_npc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr_pet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_mgr_pet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_outpost.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_outpost.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_outpost_actions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_place.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_place.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_place_patat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_place_xyr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_player.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_player.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_pos.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_pos_mirror.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_pos_mirror_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_profile_fauna.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_profile_fauna.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_profile_fauna_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_profile_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_profile_npc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_profile_pet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_profile_pet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_route.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_route_beeline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_script_comp.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_script_comp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_script_data_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_script_data_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_spire.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_spire.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_state_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_variables.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_variables.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_vector_mirror.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_vision.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_vision.h"
-			>
-		</File>
-		<File
-			RelativePath=".\aids_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\aids_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_actions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_actions.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_actions_fauna.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_actions_global.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_actions_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_control.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_control.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_spawn_ctrl.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_user_models.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_user_models.h"
-			>
-		</File>
-		<File
-			RelativePath=".\alias_tree_owner.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\alias_tree_owner.h"
-			>
-		</File>
-		<File
-			RelativePath=".\alias_tree_root.h"
-			>
-		</File>
-		<File
-			RelativePath=".\bot_chat_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\bot_chat_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\child_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\client_message.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client_message.h"
-			>
-		</File>
-		<File
-			RelativePath=".\combat_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\combat_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\commands.h"
-			>
-		</File>
-		<File
-			RelativePath=".\continent.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\continent.h"
-			>
-		</File>
-		<File
-			RelativePath=".\continent_actions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\continent_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\debug_history.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_grp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_grp_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_mission.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_mission.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\event_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\event_reaction.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\event_reaction.h"
-			>
-		</File>
-		<File
-			RelativePath=".\event_reaction_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\event_reaction_include.h"
-			>
-		</File>
-		<File
-			RelativePath=".\family_behavior.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\family_behavior.h"
-			>
-		</File>
-		<File
-			RelativePath=".\family_profile.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\family_profile.h"
-			>
-		</File>
-		<File
-			RelativePath=".\family_profile_tribe.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\family_profile_tribe.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fx_entity.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fx_entity.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fx_entity_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fx_entity_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\generic_logic_action.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\group_profile.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\group_profile.h"
-			>
-		</File>
-		<File
-			RelativePath=".\keyword.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\keyword.h"
-			>
-		</File>
-		<File
-			RelativePath=".\keyword_owner.h"
-			>
-		</File>
-		<File
-			RelativePath=".\knapsack_solver.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\knapsack_solver.h"
-			>
-		</File>
-		<File
-			RelativePath=".\list_link.h"
-			>
-		</File>
-		<File
-			RelativePath=".\listener_emitter.h"
-			>
-		</File>
-		<File
-			RelativePath=".\manager_parent.h"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrors.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrors.h"
-			>
-		</File>
-		<File
-			RelativePath=".\named_entity.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\named_entity.h"
-			>
-		</File>
-		<File
-			RelativePath=".\named_entity_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\named_entity_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\nf_grp.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\nf_grp_npc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\nf_helpers.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\nf_helpers.h"
-			>
-		</File>
-		<File
-			RelativePath=".\nf_state_instance.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\nf_static.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\npc_description_msg.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\npc_description_msg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\owners.h"
-			>
-		</File>
-		<File
-			RelativePath=".\path_behaviors.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\path_behaviors.h"
-			>
-		</File>
-		<File
-			RelativePath=".\persistent_spawnable.h"
-			>
-		</File>
-		<File
-			RelativePath=".\profile.h"
-			>
-		</File>
-		<File
-			RelativePath=".\profile_in_state.h"
-			>
-		</File>
-		<File
-			RelativePath=".\script_compiler.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\script_compiler.h"
-			>
-		</File>
-		<File
-			RelativePath=".\script_compiler_native_func.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\script_parser.lex"
-			>
-		</File>
-		<File
-			RelativePath=".\script_parser.yacc"
-			>
-		</File>
-		<File
-			RelativePath=".\script_parser_lex.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\script_parser_yacc.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="0"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\script_parser_yacc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\script_vm.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\script_vm.h"
-			>
-		</File>
-		<File
-			RelativePath=".\service_dependencies.h"
-			>
-		</File>
-		<File
-			RelativePath=".\service_main.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\sheets.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\sheets.h"
-			>
-		</File>
-		<File
-			RelativePath=".\state_chat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\state_chat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\state_instance.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\state_instance.h"
-			>
-		</File>
-		<File
-			RelativePath=".\state_profil.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\state_profil.h"
-			>
-		</File>
-		<File
-			RelativePath=".\states.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\states.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\time_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\time_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\timer.h"
-			>
-		</File>
-		<File
-			RelativePath=".\vector_2i.h"
-			>
-		</File>
-		<File
-			RelativePath=".\visual_properties_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\visual_properties_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\world_container.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\world_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\world_map_link.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/ai_service/child_container.h b/code/ryzom/server/src/ai_service/child_container.h
index 79ffa832c..ce2eb1d27 100644
--- a/code/ryzom/server/src/ai_service/child_container.h
+++ b/code/ryzom/server/src/ai_service/child_container.h
@@ -546,13 +546,13 @@ CAliasTreeOwner* CAliasCont<TChld>::getAliasChildByAlias(uint32 alias) const
 template <class TChld>
 CAliasTreeOwner* CAliasCont<TChld>::addAliasChild(CAliasTreeOwner* child)
 {
-	return NLMISC::type_cast<CAliasTreeOwner*>(addChild(static_cast<TChld*>(child)));
+	return NLMISC::type_cast<CAliasTreeOwner*>(this->addChild(static_cast<TChld*>(child)));
 }
 
 template <class TChld>
 CAliasTreeOwner* CAliasCont<TChld>::addAliasChild(CAliasTreeOwner* child, uint32 index)
 {
-	return NLMISC::type_cast<CAliasTreeOwner*>(addChild(static_cast<TChld*>(child), index));
+	return NLMISC::type_cast<CAliasTreeOwner*>(this->addChild(static_cast<TChld*>(child), index));
 }
 
 template <class TChld>
diff --git a/code/ryzom/server/src/ai_service/commands.cpp b/code/ryzom/server/src/ai_service/commands.cpp
index 3803462cd..98063d7e3 100644
--- a/code/ryzom/server/src/ai_service/commands.cpp
+++ b/code/ryzom/server/src/ai_service/commands.cpp
@@ -259,7 +259,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<aiInstanceId>
 	std::string botsName;
 	if (args.size()>8) botsName = args[8];
 
-	aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots, orientation, botsName);
+	aiInstance->eventCreateNpcGroup(nbBots, sheetId, CAIVector(x, y), dispersionRadius, spawnBots, orientation, botsName, "");
 	
 	return true;
 }
@@ -844,7 +844,7 @@ public:
 	}
 protected:	
 private:
-	size_t	_index;
+	uint32	_index;
 	float	_value;
 	bool	_detailled;
 	mutable	CLogStringWriter	_stringWriter;
diff --git a/code/ryzom/server/src/ai_service/continent.h b/code/ryzom/server/src/ai_service/continent.h
index a9a265e7d..8b92cf6b9 100644
--- a/code/ryzom/server/src/ai_service/continent.h
+++ b/code/ryzom/server/src/ai_service/continent.h
@@ -529,6 +529,7 @@ class CLazyProcess
 : public NLMISC::CRefCount
 {
 public:
+	virtual ~CLazyProcess() {}
 	/// Used to update some dependencies for instance road connections when the first next update of CContinent is called.
 	virtual void update() const = 0;
 	/// Used to check if there's no need to add another lazyprocess.
@@ -1052,6 +1053,7 @@ class IGroupDesc
 : public NLMISC::CRefCount
 {
 public:
+	virtual ~IGroupDesc() {}
 	virtual uint32 groupEnergyValue() const = 0;
 	virtual float groupEnergyCoef() const = 0;
 	virtual bool getCountMultiplierFlag() const = 0;
diff --git a/code/ryzom/server/src/ai_service/doc/doxycfg/Makefile b/code/ryzom/server/src/ai_service/doc/doxycfg/Makefile
deleted file mode 100644
index f403a35b7..000000000
--- a/code/ryzom/server/src/ai_service/doc/doxycfg/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-PROJECT=ryzom-ais
-DOX_DIR=../source
-CPP_DIR=../..
-OUTPUT_DIR=../doxydoc
-CFG_FILE=ryzom-ais.cfg
-
-DOX_FILES=index.dox fight.dox aggro.dox dynamic_bots.dox path_finding.dox primitive_parsing.dox positions.dox
-CPP_FILES=script_compiler_native_func.cpp \
-	nf_helpers.cpp nf_static.cpp nf_state_instance.cpp nf_grp.cpp nf_grp_npc.cpp \
-	ai.h ai.cpp \
-	ai_instance.h ai_instance.cpp \
-	ai_mgr.h ai_mgr.cpp \
-	ai_mgr_npc.h ai_mgr_npc.cpp \
-	ai_mgr_fauna.h ai_mgr_fauna.cpp \
-	ai_grp.h ai_grp.cpp \
-	ai_grp_npc.h ai_grp_npc.cpp \
-	ai_grp_fauna.h ai_grp_fauna.cpp \
-	event_reaction_container.h \
-	ai_pos.h ai_pos_mirror.h ai_pos_mirror_inline.h \
-	ai_vector_mirror.h \
-	../ai_share/ai_coord.h \
-	../ai_share/ai_vector.h \
-	../ai_share/world_map.h
-
-SOURCE_FILES=$(patsubst %,$(DOX_DIR)/%,$(DOX_FILES)) $(patsubst %,$(CPP_DIR)/%,$(CPP_FILES))
-
-DOXYGEN_TAG=$(OUTPUT_DIR)/$(PROJECT)/$(PROJECT).tag
-
-all:$(DOXYGEN_TAG)
-
-$(DOXYGEN_TAG):$(SOURCE_FILES) $(CFG_FILE)
-	doxygen ryzom-ais.cfg 2>>doxygen.warnings
-
-$(CFG_FILE):Makefile $(CFG_FILE).tmpl $(SOURCE_FILES)
-	cat $(CFG_FILE).tmpl > $@
-	echo "INPUT = $(SOURCE_FILES)" >> $@
diff --git a/code/ryzom/server/src/ai_service/family_profile.cpp b/code/ryzom/server/src/ai_service/family_profile.cpp
index c01faf37f..f95f142c9 100644
--- a/code/ryzom/server/src/ai_service/family_profile.cpp
+++ b/code/ryzom/server/src/ai_service/family_profile.cpp
@@ -172,6 +172,7 @@ IAiFactory<IFamilyProfile>	*_ProfileNpc=&_singleProfileNpc;
 
 extern	IAiFactory<IFamilyProfile>	*_ProfileTribe;	//	in another cpp.
 
+NL_ISO_TEMPLATE_SPEC CAiFactoryContainer<IFamilyProfile, TStringId> *CAiFactoryContainer<IFamilyProfile, TStringId>::_Instance = NULL;
 
 CFamilyProfileFactory::CFamilyProfileFactory()
 {
@@ -217,10 +218,6 @@ IFamilyProfile*	CFamilyProfileFactory::createFamilyProfile(const	TStringId	&keyW
 	return	NULL;
 }	
 
-
-NL_ISO_TEMPLATE_SPEC CAiFactoryContainer<IFamilyProfile, TStringId>	*CAiFactoryContainer<IFamilyProfile, TStringId>::_Instance = NULL;
-
-
 IFamilyProfile*	IFamilyProfile::createFamilyProfile(const	TStringId	&profileName, const	IFamilyProfile::CtorParam&	ctorParam)
 {
 	return	CFamilyProfileFactory::createFamilyProfile(profileName, ctorParam);
diff --git a/code/ryzom/server/src/ai_service/family_profile.h b/code/ryzom/server/src/ai_service/family_profile.h
index a07acab8a..b4df92d92 100644
--- a/code/ryzom/server/src/ai_service/family_profile.h
+++ b/code/ryzom/server/src/ai_service/family_profile.h
@@ -87,15 +87,15 @@ public:
 	virtual void update() =0;
 
 	/// Fill a vector of outpost id name assigned to tribe
-	virtual void fillOutpostNames(std::vector<NLMISC::TStringId> outpostNames)	{};
+	virtual void fillOutpostNames(std::vector<NLMISC::TStringId> outpostNames)	{}
 	/// Add an outpost for the tribe (nb : the family must be a tribe)
-	virtual void outpostAdd(NLMISC::TStringId outpostName) {};
+	virtual void outpostAdd(NLMISC::TStringId outpostName) {}
 	/// Remove an from the tribe
-	virtual void outpostRemove(NLMISC::TStringId outpostName) {};
+	virtual void outpostRemove(NLMISC::TStringId outpostName) {}
 
-	virtual	void outpostEvent(NLMISC::TStringId outpostName, ZCSTATE::TZcState	state)	{};
+	virtual	void outpostEvent(NLMISC::TStringId outpostName, ZCSTATE::TZcState	state)	{}
 
-	virtual	void spawnBoss(NLMISC::TStringId outpostName)	{};
+	virtual	void spawnBoss(NLMISC::TStringId outpostName)	{}
 
 	CGroupNpc	*createNpcGroup(const	CNpcZone	*const	zone, const	CGroupDesc<CGroupFamily>	*const	groupDesc);
 
diff --git a/code/ryzom/server/src/ai_service/fx_entity.h b/code/ryzom/server/src/ai_service/fx_entity.h
index 3fbf66b92..78f4bb37b 100644
--- a/code/ryzom/server/src/ai_service/fx_entity.h
+++ b/code/ryzom/server/src/ai_service/fx_entity.h
@@ -28,7 +28,7 @@ class CFxEntity
 {
 public:
 	CFxEntity(CAIPos const& pos, NLMISC::CSheetId const& sheet);
-	~CFxEntity();
+	virtual ~CFxEntity();
 	NLMISC::CEntityId const& id() const;
 	bool spawn();
 	void despawn();
diff --git a/code/ryzom/server/src/ai_service/generic_logic_action.cpp b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
index 5bcb13fca..64c620cb6 100644
--- a/code/ryzom/server/src/ai_service/generic_logic_action.cpp
+++ b/code/ryzom/server/src/ai_service/generic_logic_action.cpp
@@ -3013,7 +3013,10 @@ public:
 		}	
 
 		if(!_Id)
-			npcChatToChannelSentence(bot->dataSetRow(),CChatGroup::say,_Sentence);
+		{
+			ucstring ucstr = _Sentence;
+			npcChatToChannelSentence(bot->dataSetRow(),CChatGroup::say, ucstr);
+		}
 		else
 		{
 			if(!_Arg)
diff --git a/code/ryzom/server/src/ai_service/messages.cpp b/code/ryzom/server/src/ai_service/messages.cpp
index 64730a1b7..092ab39f8 100644
--- a/code/ryzom/server/src/ai_service/messages.cpp
+++ b/code/ryzom/server/src/ai_service/messages.cpp
@@ -697,7 +697,8 @@ void CMessages::init()
 	TRANSPORT_CLASS_REGISTER (CReportStaticAIInstanceMsg);
 	TRANSPORT_CLASS_REGISTER (CReportAIInstanceDespawnMsg);
 	TRANSPORT_CLASS_REGISTER (CWarnBadInstanceMsgImp);
-
+	TRANSPORT_CLASS_REGISTER (CCreatureSetUrlMsg);
+	TRANSPORT_CLASS_REGISTER (CChangeCreatureMaxHPMsg)
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureHPMsg);
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureModeMsgImp);
 	TRANSPORT_CLASS_REGISTER (CQueryEgs);
@@ -770,10 +771,10 @@ void	CAIAskForInfosOnEntityImp::callback (const std::string &name, NLNET::TServi
 			}
 			break;
 		default:
+			std::vector<std::string> strings = phys->getMultiLineInfoString();
+			msg.Infos.insert(msg.Infos.end(), strings.begin(), strings.end());
 			break;
 		}
-		std::vector<std::string> strings = phys->getMultiLineInfoString();
-		msg.Infos.insert(msg.Infos.end(), strings.begin(), strings.end());
 	}
 	else
 	{
diff --git a/code/ryzom/server/src/ai_service/nf_grp.cpp b/code/ryzom/server/src/ai_service/nf_grp.cpp
index 572a589cb..eabe61fd4 100644
--- a/code/ryzom/server/src/ai_service/nf_grp.cpp
+++ b/code/ryzom/server/src/ai_service/nf_grp.cpp
@@ -1497,6 +1497,41 @@ void setAutoSpawn_f_(CStateInstance* entity, CScriptStack& stack)
 // HP related methods
 /** @page code
 
+@subsection setMaxHP_ff_
+Sets the Max HP level of each bot of the group.
+
+Arguments: f(MaxHp) f(SetFull) ->
+@param[in] MaxHP is the new maximum HP for each bot
+@param[in] SetFull if not 0, will set the HP to the new maximum
+
+@code
+()setMaxHP(50000,1);
+@endcode
+
+*/
+// CGroup
+void setMaxHP_ff_(CStateInstance* entity, CScriptStack& stack)
+{
+	bool  setFull = ((float)stack.top() != 0.f); stack.pop();
+	float maxHp = ((float)stack.top()); stack.pop();
+	
+	CChangeCreatureMaxHPMsg& msgList = CAIS::instance().getCreatureChangeMaxHP();
+	
+	FOREACH(bot, CCont<CBot>, entity->getGroup()->bots())
+	{
+		if (!bot->isSpawned())
+			continue;
+		
+		CSpawnBot* const sbot = bot->getSpawnObj();
+		
+		msgList.Entities.push_back(sbot->dataSetRow());
+		msgList.MaxHp.push_back((uint32)(maxHp));
+		msgList.SetFull.push_back((uint8)(setFull?1:0));
+	}
+}
+
+/** @page code
+
 @subsection setHPLevel_f_
 Sets the current HP level of each bot of the group.
 
@@ -1573,10 +1608,42 @@ void setHPScale_f_(CStateInstance* entity, CScriptStack& stack)
 	}
 }
 
+//----------------------------------------------------------------------------
+// Url related method
+/** @page code
 
+@subsection setUrl_ss_
+Sets the name and url of right-click action
 
+Arguments: s(actionName),s(url) ->
+@param[in] actionName of action when player mouse over
+@param[in] url of action when player mouse over
 
+@code
+()setUrl("Click on Me", "http://www.domain.com/script.php");
+@endcode
 
+*/
+// CGroup
+void setUrl_ss_(CStateInstance* entity, CScriptStack& stack)
+{
+	std::string url = (std::string)stack.top();stack.pop();	
+	std::string actionName = (std::string)stack.top();stack.pop();	
+	
+	CCreatureSetUrlMsg msg;
+	FOREACH(botIt, CCont<CBot>,	entity->getGroup()->bots())
+	{
+		CSpawnBot* pbot = botIt->getSpawnObj();
+		if (pbot!=NULL)
+		{		
+			msg.Entities.push_back(pbot->dataSetRow());
+		}
+	}
+	
+	msg.ActionName = actionName;
+	msg.Url = url;
+	msg.send(egsString);
+}
 
 
 
@@ -1870,7 +1937,7 @@ Arguments: s(parameterName) ->
 @param[in] parameterName is a the id of the parameter to add
 
 @code
-()addProfileParameter("running"); // équivalent à un parameter "running" dans la primitive du groupe
+()addProfileParameter("running"); // equivalent to "running" parameter in group primitive
 @endcode
 
 */
@@ -1898,7 +1965,7 @@ Arguments: s(parameterName),s(parameterContent) ->
 @param[in] parameterContent is the value of the parameter
 
 @code
-()addProfileParameter("foo", "bar"); // équivalent à un parameter "foo:bar" dans la primitive du groupe
+()addProfileParameter("foo", "bar"); // equivalent to "foo:bar" parameter in group primitive
 @endcode
 
 */
@@ -1927,7 +1994,7 @@ Arguments: s(parameterName),f(parameterContent) ->
 @param[in] parameterContent is the value of the parameter
 
 @code
-()addProfileParameter("foo", 0.5); // équivalent à un parameter "foo:0.5" dans la primitive du groupe
+()addProfileParameter("foo", 0.5); // equivalent to "foo:0.5" parameter in group primitive
 @endcode
 
 */
@@ -4456,6 +4523,37 @@ void setSheet_s_(CStateInstance* entity, CScriptStack& stack)
 	}
 }
 
+//----------------------------------------------------------------------------
+/** @page code
+
+@subsection setClientSheet_s_
+Change the client sheet of a creature
+
+Arguments: -> s(sheetName)
+
+@code
+()setClientSheet('ccdeb2');
+
+@endcode
+
+*/
+void setClientSheet_s_(CStateInstance* entity, CScriptStack& stack)
+{
+	string sheetname = stack.top();
+	stack.pop();
+	
+	if (sheetname.find(".creature") == string::npos)
+		sheetname += ".creature";
+
+	FOREACH(itBot, CCont<CBot>, entity->getGroup()->bots())
+	{
+		CBot* bot = *itBot;
+		if (bot)
+		{
+			bot->setClientSheet(sheetname);
+		}
+	}
+}
 
 /****************************************************************************/
 
@@ -4581,6 +4679,62 @@ void setConditionSuccess_f_(CStateInstance* entity, CScriptStack& stack)
 	CAILogicDynamicIfHelper::setConditionSuccess(conditionState);
 }
 
+inline
+static float randomAngle()
+{
+	uint32 const maxLimit = CAngle::PI*2;
+	float val = (float)CAIS::rand32(maxLimit);
+	return val;
+}
+
+//----------------------------------------------------------------------------
+/** @page code
+
+@subsection facing_f_
+
+The npc will face the given direction
+
+
+Arguments: f(direction)
+@param[in] direction is the new angle of the bot in radians
+
+@code
+()facing(3.14);
+@endcode
+
+*/
+
+// CStateInstance
+void facing_f_(CStateInstance* entity, CScriptStack& stack)
+{
+	float const theta = (float)stack.top(); stack.pop();
+	CGroup* group = entity->getGroup();
+
+	bool bRandomAngle = false;
+	if (theta > (NLMISC::Pi * 2.0) || theta < (-NLMISC::Pi * 2.0))
+		bRandomAngle = true;
+
+	if (group->isSpawned())
+	{
+		FOREACH(itBot, CCont<CBot>, group->bots())
+		{
+			CBot* bot = *itBot;
+			if (bot)
+			{
+				if (bot->isSpawned())
+				{
+					CSpawnBot *spawnBot = bot->getSpawnObj();
+
+					if (bRandomAngle)
+						spawnBot->setTheta(randomAngle());
+					else
+						spawnBot->setTheta(theta);
+					
+				}
+			}
+		}
+	}
+}
 
 std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 {
@@ -4628,6 +4782,7 @@ std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, clearAggroList__);
 	REGISTER_NATIVE_FUNC(functions, setMode_s_);
 	REGISTER_NATIVE_FUNC(functions, setAutoSpawn_f_);
+	REGISTER_NATIVE_FUNC(functions, setMaxHP_ff_);
 	REGISTER_NATIVE_FUNC(functions, setHPLevel_f_);
 	REGISTER_NATIVE_FUNC(functions, setHPScale_f_);
 	REGISTER_NATIVE_FUNC(functions, scaleHP_f_);
@@ -4651,10 +4806,11 @@ std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, getEventParam_f_f);
 	REGISTER_NATIVE_FUNC(functions, getEventParam_f_s);
 	REGISTER_NATIVE_FUNC(functions, setSheet_s_);
+	REGISTER_NATIVE_FUNC(functions, setClientSheet_s_);
 	REGISTER_NATIVE_FUNC(functions, setHealer_f_);
 	REGISTER_NATIVE_FUNC(functions, setConditionSuccess_f_);
-
-
+	REGISTER_NATIVE_FUNC(functions, facing_f_);
+	REGISTER_NATIVE_FUNC(functions, setUrl_ss_);
 
 	// Boss functions (custom text)
 	REGISTER_NATIVE_FUNC(functions, phraseBegin__);
@@ -4699,10 +4855,7 @@ std::map<std::string, FScrptNativeFunc> nfGetGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, teleportPlayer_sffff_);
 	REGISTER_NATIVE_FUNC(functions, summonPlayer_fs_);
 
-	
 
-	
-	
 #undef REGISTER_NATIVE_FUNC
 	
 	return functions;
diff --git a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp
index d8ae543a5..2ea93b625 100644
--- a/code/ryzom/server/src/ai_service/nf_grp_npc.cpp
+++ b/code/ryzom/server/src/ai_service/nf_grp_npc.cpp
@@ -462,7 +462,7 @@ Arguments: f(Radius) ->
 @param[in] Radius dispersion of wander activity
 
 @code
-()startWander(100); // Gives a wander activity to the group with dispersion of 100
+()startMoving(100,-100,10); // Moves the group to 100,-100 with radius of 10
 @endcode
 
 */
@@ -501,6 +501,56 @@ void startMoving_fff_(CStateInstance* entity, CScriptStack& stack)
 	return;
 }
 
+//----------------------------------------------------------------------------
+/** @page code
+
+@subsection followPlayer_sf_
+Set activity to follow the given player
+
+Arguments: s(PlayerEid) f(Radius) ->
+@param[in] PlayerEid id of player to follow
+@param[in] Radius dispersion of wander activity
+
+@code
+()followPlayer("(0x0002015bb4:01:88:88)",10);
+@endcode
+
+*/
+// Spawned CGroupNpc not in a family behaviour
+void followPlayer_sf_(CStateInstance* entity, CScriptStack& stack)
+{
+	uint32 dispersionRadius = (uint32)(float&)stack.top(); stack.pop();
+	NLMISC::CEntityId playerId = NLMISC::CEntityId((std::string)stack.top());
+	
+	IManagerParent* const managerParent = entity->getGroup()->getOwner()->getOwner();
+	CAIInstance* const aiInstance = dynamic_cast<CAIInstance*>(managerParent);
+	if (!aiInstance)
+		return;
+	
+	if (!entity) { nlwarning("followPlayer failed!"); return; }
+	
+	CGroupNpc* group = dynamic_cast<CGroupNpc*>(entity->getGroup());
+	if (!group)
+	{	nlwarning("followPlayer failed: no NPC group");
+		return;
+	}
+	CSpawnGroupNpc* spawnGroup = group->getSpawnObj();
+	if (!spawnGroup)
+	{	nlwarning("followPlayer failed: no spawned group");
+		return;
+	}
+
+	if (playerId == CEntityId::Unknown)
+	{
+		nlwarning("followPlayer failed: unknown player");
+		DEBUG_STOP;
+		return;
+	}
+
+	spawnGroup->movingProfile().setAIProfile(new CGrpProfileFollowPlayer(spawnGroup, TheDataset.getDataSetRow(playerId), dispersionRadius));
+
+	return;
+}
 
 
 //----------------------------------------------------------------------------
@@ -2179,14 +2229,11 @@ void facing_cscs_(CStateInstance* entity, CScriptStack& stack)
 	//	bot1->setTheta(bot1->pos().angleTo(bot2->pos()));
 }
 
-
 //----------------------------------------------------------------------------
 /** @page code
 
 @subsection npcSay_css_
 
-A new entry of the npc contextual menu will propose to the targeter player to talk to the npc.
-
 Make a npc say a text
 
 There are 3 type of text
@@ -2201,9 +2248,9 @@ Arguments: c(group), s(botname), s(text),  ->
 
 @code
 (@group)group_name.context();
-()emote(@group, "bob", "DSS_1601 RtEntryText_6") ;// Send To dss
-()emote(@group, "bob", "RAW Ca farte?"); // phrase direcly send to IOS as raw (for debug)
-()emote(@group, "bob", "answer_group_no_m"); //phrase id
+()npcSay(@group, "bob", "DSS_1601 RtEntryText_6") ;// Send To dss
+()npcSay(@group, "bob", "RAW Ca farte?"); // phrase direcly send to IOS as raw (for debug)
+()npcSay(@group, "bob", "answer_group_no_m"); //phrase id
 
 @endcode
 
@@ -2214,6 +2261,34 @@ Arguments: c(group), s(botname), s(text),  ->
 #include "game_share/chat_group.h"
 #include "game_share/send_chat.h"
 
+void execSayHelper(CSpawnBot *spawnBot, NLMISC::CSString text, CChatGroup::TGroupType mode = CChatGroup::say)
+{
+	if (spawnBot)
+	{
+		NLMISC::CSString prefix = text.left(4);
+		if (prefix=="DSS_")
+		{
+			
+			NLMISC::CSString phrase = text.right(text.length() - 4);
+			NLMISC::CSString idStr = phrase.strtok(" ",false,false,false,false);
+			uint32 scenarioId = atoi(idStr.c_str());
+			forwardToDss(spawnBot->dataSetRow(), mode, phrase, scenarioId);
+			return;
+		}
+		
+		if (prefix=="RAW ")
+		{
+			std::string phrase = text.right(text.length()-4);
+			ucstring ucstr = phrase;
+			npcChatToChannelSentence(spawnBot->dataSetRow(), mode, ucstr);
+			return;
+		}
+
+		//Classic phrase ID
+		npcChatToChannel(spawnBot->dataSetRow(), mode, text);
+	}
+}
+
 void npcSay_css_(CStateInstance* entity, CScriptStack& stack)
 {
 	string text = (string)stack.top(); stack.pop();	
@@ -2224,29 +2299,58 @@ void npcSay_css_(CStateInstance* entity, CScriptStack& stack)
 
 	if (!spawnBot) { return; }
 
+	execSayHelper(spawnBot, text);
+}
 
-	std::string prefix =NLMISC::CSString (text).left(4);
-	if(prefix=="DSS_")
-	{
-		
-		NLMISC::CSString phrase = NLMISC::CSString (text).right((uint)text.length()-4);
-		NLMISC::CSString idStr = phrase.strtok(" ",false,false,false,false);
-		uint32 scenarioId;
-		NLMISC::fromString(idStr, scenarioId);
-		forwardToDss(spawnBot->dataSetRow(), CChatGroup::say, phrase, scenarioId);
-		return;
-	}
-	
-	if (prefix=="RAW ")
+//----------------------------------------------------------------------------
+/** @page code
+
+@subsection npcSay_ss_
+
+Make a npc say a text
+
+Arguments: s(text), s(mode) ->
+@param[in] text is the text to say. prefix with ID: to use an id
+@param[in] mode is the mode to use (say, shout)
+
+@code
+()npcSay("Hello!","say"); // phrase direcly send to IOS as raw
+()npcSay("ID:answer_group_no_m","shout"); // phrase id
+@endcode
+
+*/
+
+void npcSay_ss_(CStateInstance* entity, CScriptStack& stack)
+{
+	std::string sMode = (std::string)stack.top(); stack.pop();
+	std::string text = (std::string)stack.top(); stack.pop();
+
+	CChatGroup::TGroupType mode = CChatGroup::say;
+	mode = CChatGroup::stringToGroupType(sMode);
+	CGroup* group = entity->getGroup();
+
+	if (group->isSpawned())
 	{
-		NLMISC::CSString phrase = NLMISC::CSString (text).right((uint)text.length()-4);
-		npcChatToChannelSentence(spawnBot->dataSetRow(),CChatGroup::say, phrase);
-		return;
+		FOREACH(itBot, CCont<CBot>, group->bots())
+		{
+			CBot* bot = *itBot;
+			if (bot)
+			{
+				if (bot->isSpawned())
+				{
+					CSpawnBot *spawnBot = bot->getSpawnObj();
+					std::string prefix = NLMISC::CSString(text).left(3);
+					if (NLMISC::nlstricmp(prefix.c_str(), "id:") == 0) {
+						text = NLMISC::CSString(text).right(text.length()-3);
+						execSayHelper(spawnBot, text, mode);
+					}
+					else {
+						execSayHelper(spawnBot, "RAW " + text, mode);
+					}
+				}
+			}
+		}
 	}
-
-	//Classic phrase ID
-	npcChatToChannel(spawnBot->dataSetRow(), CChatGroup::say, text);
-	return;
 }
 
 
@@ -2514,6 +2618,7 @@ void rename_s_(CStateInstance* entity, CScriptStack& stack)
 						msgout.serial(row);
 						msgout.serial(name);
 						sendMessageViaMirror("IOS", msgout);
+						bot->setCustomName(name);
 					}
 				}
 			}
@@ -2650,6 +2755,7 @@ std::map<std::string, FScrptNativeFunc> nfGetNpcGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, startMoving_fff_);
 	REGISTER_NATIVE_FUNC(functions, waitInZone_s_);
 	REGISTER_NATIVE_FUNC(functions, stopMoving__);
+	REGISTER_NATIVE_FUNC(functions, followPlayer_sf_);
 	REGISTER_NATIVE_FUNC(functions, wander__);
 	REGISTER_NATIVE_FUNC(functions, setAttackable_f_);
 	REGISTER_NATIVE_FUNC(functions, setPlayerAttackable_f_);
@@ -2687,6 +2793,7 @@ std::map<std::string, FScrptNativeFunc> nfGetNpcGroupNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, rename_s_);
 	REGISTER_NATIVE_FUNC(functions, vpx_s_);
 	REGISTER_NATIVE_FUNC(functions, npcSay_css_);
+	REGISTER_NATIVE_FUNC(functions, npcSay_ss_);
 	REGISTER_NATIVE_FUNC(functions, dssMessage_fsss_);
 	REGISTER_NATIVE_FUNC(functions, despawnBotByAlias_s_);	
 	REGISTER_NATIVE_FUNC(functions, giveReward_ssssc_);
diff --git a/code/ryzom/server/src/ai_service/nf_static.cpp b/code/ryzom/server/src/ai_service/nf_static.cpp
index fa1699b4b..4523d3e1d 100644
--- a/code/ryzom/server/src/ai_service/nf_static.cpp
+++ b/code/ryzom/server/src/ai_service/nf_static.cpp
@@ -1000,8 +1000,8 @@ void setSimplePhrase_ss_(CStateInstance* entity, CScriptStack& stack)
 	phraseContent2 += "]}";
 
 	ucstring ucPhraseContent;
-//	ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version
-	ucPhraseContent = phraseContent2; // iso-8859-1 version
+	ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version
+	//ucPhraseContent = phraseContent2; // iso-8859-1 version
 	
 	NLNET::CMessage	msgout("SET_PHRASE");
 	msgout.serial(phraseName);
@@ -1009,6 +1009,33 @@ void setSimplePhrase_ss_(CStateInstance* entity, CScriptStack& stack)
 	sendMessageViaMirror("IOS", msgout);
 }
 
+void setSimplePhrase_sss_(CStateInstance* entity, CScriptStack& stack)
+{
+	std::string lang = (std::string)stack.top();
+	stack.pop();
+	std::string phraseContent = (std::string)stack.top();
+	stack.pop();
+	std::string phraseName = (std::string)stack.top();
+	stack.pop();
+	
+	std::string phraseContent2;
+	phraseContent2 += phraseName;
+	phraseContent2 += "(){[";
+	phraseContent2 += phraseContent;
+	phraseContent2 += "]}";
+
+	ucstring ucPhraseContent;
+	ucPhraseContent.fromUtf8(phraseContent2); // utf-8 version
+	//ucPhraseContent = phraseContent2; // iso-8859-1 version
+	
+	NLNET::CMessage	msgout("SET_PHRASE_LANG");
+	msgout.serial(phraseName);
+	msgout.serial(ucPhraseContent);
+	msgout.serial(lang);
+	sendMessageViaMirror("IOS", msgout);
+}
+
+
 //----------------------------------------------------------------------------
 /** @page code
 
@@ -1330,6 +1357,7 @@ std::map<std::string, FScrptNativeFunc> nfGetStaticNativeFunctions()
 	REGISTER_NATIVE_FUNC(functions, getNamedEntityProp_ss_s);
 	REGISTER_NATIVE_FUNC(functions, destroyNamedEntity_s_);
 	REGISTER_NATIVE_FUNC(functions, setSimplePhrase_ss_);
+	REGISTER_NATIVE_FUNC(functions, setSimplePhrase_sss_);
 	REGISTER_NATIVE_FUNC(functions, dataGetVar_s_s);
 	REGISTER_NATIVE_FUNC(functions, dataGetVar_s_f);
 	REGISTER_NATIVE_FUNC(functions, dataSetVar_ss_);
diff --git a/code/ryzom/server/src/ai_service/npc_description_msg.cpp b/code/ryzom/server/src/ai_service/npc_description_msg.cpp
index 70989be8d..ebe7701a7 100644
--- a/code/ryzom/server/src/ai_service/npc_description_msg.cpp
+++ b/code/ryzom/server/src/ai_service/npc_description_msg.cpp
@@ -788,6 +788,13 @@ bool	CNpcChatProfileImp::parseChatArgs(CAIInstance	*aiInstance, const std::strin
 		return	true;
 	}
 	
+	// organization entry
+	if (NLMISC::nlstricmp(keyword, "organization") == 0)
+	{
+		NLMISC::fromString(tail, _Organization);
+		return	true;
+	}
+
 	// if no match found throw an error
 	return false;
 }
@@ -830,4 +837,5 @@ void	TGenNpcDescMsgImp::setChat(const CNpcChatProfileImp& chatProfile)
 	_OptionalProperties		= chatProfile.getOptionalProperties();
 
 	_Outpost					=	chatProfile.getOutpost();
+	_Organization					=	chatProfile.getOrganization();
 }
diff --git a/code/ryzom/server/src/ai_service/npc_description_msg.h b/code/ryzom/server/src/ai_service/npc_description_msg.h
index e29bdfd13..14c94e9b1 100644
--- a/code/ryzom/server/src/ai_service/npc_description_msg.h
+++ b/code/ryzom/server/src/ai_service/npc_description_msg.h
@@ -36,7 +36,7 @@ public:
 	CNpcChatProfileImp(const CNpcChatProfileImp &other0,const CNpcChatProfileImp &other1);
 
 	// interface for setting up chat info 
-	void clear()					{ clearShopInfo(); clearMissions(); clearCellZones(); clearContextOption(); _OptionalProperties.clear(); }
+	void clear()					{ clearShopInfo(); clearMissions(); clearCellZones(); clearContextOption(); clearWeb(); _OptionalProperties.clear(); }
 	void clearShopInfo()			
 	{ 
 		_ShopTypes.clear(); 
@@ -56,6 +56,11 @@ public:
 	}
 	void clearCellZones()			{ _CellZones.clear(); }
 	void clearMissions()			{ _Missions.clear(); }
+	void clearWeb()
+	{
+		_WebPage.clear();
+		_WebPageName.clear();
+	}
 	bool add(CAIInstance	*aiInstance, const std::string &chatArgs)	{ return parseChatArgs(aiInstance, chatArgs); }
 	void addMission(uint32 mission)	{ _Missions.push_back(mission); }
 	void clearContextOption()		{ _ContextOptions.clear();  }
diff --git a/code/ryzom/server/src/ai_service/script_compiler.cpp b/code/ryzom/server/src/ai_service/script_compiler.cpp
index aabe5889c..a9982ef48 100644
--- a/code/ryzom/server/src/ai_service/script_compiler.cpp
+++ b/code/ryzom/server/src/ai_service/script_compiler.cpp
@@ -1083,25 +1083,33 @@ CSmartPtr<const AIVM::CByteCode> CCompiler::compileCode (const std::vector<std::
 	FOREACHC(itArg, TList, sourceCodeLines)
 	{
 		const string &str=*itArg;
-		size_t firstIndex=str.find_first_of("/",0);
-		while (firstIndex!=string::npos)
-		{
-			firstIndex++;
-			if (firstIndex>=str.size())
+		size_t index = str.find("//",0);
+		if (index == string::npos)
+			code += str;
+		else {
+			// We have a potential comment. Now check if it is quoted or not
+			bool inQuote = false;
+			uint i = 0;
+			for (;;)
 			{
-				firstIndex=string::npos;
-				break;
-			}
+				if ('"' == str[i])
+					inQuote = !inQuote;
 
-			if (str.at(firstIndex)=='/')
-			{
-				code+=str.substr(0, firstIndex-1);
-				break;
+				if ( !inQuote && ('/' == str[i]) )
+				{
+					++i;
+					if ('/' == str[i])
+						break;
+
+					code += '/';
+				}
+				code += str[i];
+				++i;
+				if (str.size() == i)
+					break;
 			}
-			firstIndex=str.find_first_of("/",firstIndex);
 		}
-		if (firstIndex==string::npos)
-			code+=str;
+
 		code+="\n "; // additional ..
 	}
 	code+="}";
@@ -1925,7 +1933,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 				case CScriptVM::JUMP:
 					byteCode.push_back(op); // + Jump offset.
 
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					jumpTable.add(CJumpRememberer(index));
 					byteCode.push_back(0); // Invalid
@@ -1942,7 +1950,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 			{
 				if (str.find("Atof")!=string::npos)
 				{
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					--index;
 					string &strRef=_childTracers[index]->_TextValue;
@@ -1954,7 +1962,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 				
 				if (str.find("String")!=string::npos)
 				{
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					--index;
 					string &strRef=_childTracers[index]->_TextValue;
@@ -2013,7 +2021,7 @@ void CSubRuleTracer::generateCode(CSmartPtr<AIVM::CByteCode> &cByteCode) const
 				
 				if (str.find("Code")!=string::npos)
 				{
-					size_t index;
+					uint32 index;
 					NLMISC::fromString(param, index);
 					--index;
 					if (byteCode.size()==0)
diff --git a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp
index 17bc605c4..dc6b36861 100644
--- a/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp
+++ b/code/ryzom/server/src/ai_service/script_compiler_native_func.cpp
@@ -221,10 +221,12 @@ arguments.
 - @ref moveToZone_ss_
 - @ref waitInZone_s_
 - @ref stopMoving__
+- @ref followPlayer_sf_
 - @ref wander__
 - @ref downScaleHP_f_
 - @ref upScaleHP_f_
 - @ref scaleHP_f_
+- @ref setMaxHP_ff_
 - @ref setHPLevel_f_
 - @ref addHP_f_
 - @ref aiAction_s_
diff --git a/code/ryzom/server/src/ai_service/sheets.h b/code/ryzom/server/src/ai_service/sheets.h
index 7526218c0..0473af4a9 100644
--- a/code/ryzom/server/src/ai_service/sheets.h
+++ b/code/ryzom/server/src/ai_service/sheets.h
@@ -644,6 +644,7 @@ class IRaceStats
 : public NLMISC::CRefCount
 {
 public:
+	virtual ~IRaceStats() {}
 	virtual NLMISC::CSheetId SheetId() const = 0;
 	virtual std::string Race() const = 0;
 };
diff --git a/code/ryzom/server/src/ai_service/visual_properties_interface.cpp b/code/ryzom/server/src/ai_service/visual_properties_interface.cpp
index e495319f4..20d79f038 100644
--- a/code/ryzom/server/src/ai_service/visual_properties_interface.cpp
+++ b/code/ryzom/server/src/ai_service/visual_properties_interface.cpp
@@ -69,7 +69,7 @@ void	CVisualPropertiesInterface::release()
 }
 
 //	set different visual properties for a bot.
-void	CVisualPropertiesInterface::setName(const TDataSetRow&	dataSetRow,std::string name)
+void	CVisualPropertiesInterface::setName(const TDataSetRow&	dataSetRow, ucstring name)
 {
 	if (!IOSHasMirrorReady)
 		return;
@@ -77,8 +77,6 @@ void	CVisualPropertiesInterface::setName(const TDataSetRow&	dataSetRow,std::stri
 	NLNET::CMessage	msgout("CHARACTER_NAME");
 	CEntityId		eid=CMirrors::DataSet->getEntityId(dataSetRow);
 	msgout.serial	(const_cast<TDataSetRow&>(dataSetRow));
-	ucstring uname;
-	uname.fromUtf8(name);	
-	msgout.serial	(uname);	// Daniel: TODO update all name dependencies to ucstring in your service.	
+	msgout.serial	(name);
 	sendMessageViaMirror("IOS",msgout);
 }
diff --git a/code/ryzom/server/src/ai_service/visual_properties_interface.h b/code/ryzom/server/src/ai_service/visual_properties_interface.h
index 75d5c5a6d..d814e91da 100644
--- a/code/ryzom/server/src/ai_service/visual_properties_interface.h
+++ b/code/ryzom/server/src/ai_service/visual_properties_interface.h
@@ -39,7 +39,7 @@ public:
 	static void release();
 
 	// set different visual properties for an entity
-	static	void setName(const TDataSetRow&	dataSetRow,std::string name);
+	static	void setName(const TDataSetRow&	dataSetRow, ucstring name);
 	
 //	static void setMode(CAIEntityId id,MBEHAV::EMode mode);
 //	static void setBehaviour(CAIEntityId id,MBEHAV::EBehaviour behaviour);
diff --git a/code/ryzom/server/src/ai_share/Makefile b/code/ryzom/server/src/ai_share/Makefile
deleted file mode 100644
index 87271914d..000000000
--- a/code/ryzom/server/src/ai_share/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-lgame_share \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2
-
-# The flags for the linker
-LDFLAGS2      = 	-L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \
-		-lnelnet \
-		-lnelgeorges \
-		-lnelpacs \
-		-L/usr/lib \
-		-L/usr/X11R6/lib \
-		-lnelmisc \
-		-lxml2 \
-		-lstlport \
-		-lpthread
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libai_share.a
-DSP_TARGET	= ai_share.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-#libgame_share.so: $(OBJS)
-#	$(CXX) -o $@ $(OBJS) -shared $(LDFLAGS)
-
-libai_share.a: $(OBJS)
-	ar r libai_share.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/ai_share/ai_share.vcproj b/code/ryzom/server/src/ai_share/ai_share.vcproj
deleted file mode 100644
index 9473179ca..000000000
--- a/code/ryzom/server/src/ai_share/ai_share.vcproj
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ai_share"
-	ProjectGUID="{E5AB1E62-031D-4C9C-99CC-AD1A24D20E52}"
-	RootNamespace="ai_share"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\16x16_layer.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\16x16_layer.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_action_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_actions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_actions.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_actions_dr.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_actions_dr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_aiming_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_aiming_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_alias_description_node.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_alias_description_node.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_coord.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_entity_physical_list_link.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_event.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_event.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_event_description.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_event_report.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_event_report.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_primitive_parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_primitive_parser.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_share.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_spawn_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_spawn_commands.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_vector.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ai_wrapper_server.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\aids_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ais_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\angle.h"
-			>
-		</File>
-		<File
-			RelativePath=".\primitive_parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\static_vector.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\world_map.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\world_map.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/backup_service/Makefile b/code/ryzom/server/src/backup_service/Makefile
deleted file mode 100644
index 7a0a62582..000000000
--- a/code/ryzom/server/src/backup_service/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-        -L../server_share \
-		-L../admin_modules \
-        -lserver_share \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= backup_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/backup_service/backup_service.vcproj b/code/ryzom/server/src/backup_service/backup_service.vcproj
deleted file mode 100644
index 9b5d08d2c..000000000
--- a/code/ryzom/server/src/backup_service/backup_service.vcproj
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="backup_service"
-	ProjectGUID="{93A9402D-ADCA-4644-925E-E9E38315D06B}"
-	RootNamespace="backup_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\backup_file_access.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_file_access.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service_mod.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\web_connection.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\web_connection.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/dynamic_scenario_service/Makefile b/code/ryzom/server/src/dynamic_scenario_service/Makefile
deleted file mode 100644
index 7c3c44fb0..000000000
--- a/code/ryzom/server/src/dynamic_scenario_service/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I.. \
-		-I../ai_share
-
-# The flags for the linker
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-        -L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-        -L../server_share \
-		-L../ai_share \
-		-lai_share \
-        -lserver_share \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelnet \
-		-lnelgeorges \
-		-lnelligo \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl\
-		-lz
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= dynamic_scenario_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a \
-        ../server_share/libserver_share.a \
-		../ai_share/libai_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.vcproj b/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.vcproj
deleted file mode 100644
index 31c4ab657..000000000
--- a/code/ryzom/server/src/dynamic_scenario_service/dynamic_scenario_service.vcproj
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="dynamic_scenario_service"
-	ProjectGUID="{3BE571C3-9E89-4C46-9D44-8D317FAB599C}"
-	RootNamespace="dynamic_scenario_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\dynamic_scenario_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\dynamic_scenario_service.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/entities_game_service/Makefile b/code/ryzom/server/src/entities_game_service/Makefile
deleted file mode 100644
index dba693dd2..000000000
--- a/code/ryzom/server/src/entities_game_service/Makefile
+++ /dev/null
@@ -1,92 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I.. \
-		-I.
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L../admin_modules \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-        -L../ai_share \
-        -L../server_share \
-		-L../pd_lib \
-		-L../gameplay_module_lib \
-		-ladmin_modules \
-		-lpd_lib \
-		-lai_share \
-        -lserver_share \
-		-lgame_share \
-		-lnelligo \
-		-lnelgeorges \
-		-lgameplay_module_lib \
-		-lnelnet \
-		-lnelmisc \
-		-lpd_lib \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= entities_game_service
-DSP_TARGET	= $(TARGETS).vcproj
-PACKED_SHEETS = \
-	egs_action_xp_factor.packed_sheets \
-	egs_aiactions.packed_sheets \
-	egs_continents.packed_sheets \
-	egs_creatures.packed_sheets \
-	egs_death_impact.packed_sheets \
-	egs_emot.packed_sheets \
-	egs_encyclo_album.packed_sheets \
-	egs_encyclo_thema.packed_sheets \
-	egs_items.packed_sheets \
-	egs_loot_set.packed_sheets \
-	egs_loot_table.packed_sheets \
-	egs_outpost_building.packed_sheets \
-	egs_outpost_squads.packed_sheets \
-	egs_outposts.packed_sheets \
-	egs_race_stats.packed_sheets \
-	egs_sbricks.packed_sheets \
-	egs_skill_tree.packed_sheets \
-	egs_sphrases.packed_sheets \
-	egs_starting_role.packed_sheets \
-	egs_success_chance_tables.packed_sheets \
-	egs_text_emotes.packed_sheets \
-	egs_weather_function_params.packed_sheets \
-	egs_weather_setup.packed_sheets \
-	egs_world.packed_sheets \
-	egs_xptables.packed_sheets
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a \
-		../server_share/libserver_share.a \
-		../pd_lib/libpd_lib.a \
-		../gameplay_module_lib/libgameplay_module_lib.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets: $(TARGETS)
-	/bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/entities_game_service/admin.cpp b/code/ryzom/server/src/entities_game_service/admin.cpp
index 502128805..44a48d3be 100644
--- a/code/ryzom/server/src/entities_game_service/admin.cpp
+++ b/code/ryzom/server/src/entities_game_service/admin.cpp
@@ -15,7 +15,6 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-
 //
 // User Privilege set in the mysql database must be like that ":GM:" or "" or ":GM:ADMIN:" ....
 //
@@ -52,8 +51,6 @@
 #include "game_share/shard_names.h"
 #include "server_share/log_command_gen.h"
 #include "server_share/r2_vision.h"
-#include "server_share/log_item_gen.h"
-#include "server_share/log_character_gen.h"
 
 #include "egs_sheets/egs_sheets.h"
 #include "egs_sheets/egs_static_rolemaster_phrase.h"
@@ -75,6 +72,8 @@
 #include "team_manager/team_manager.h"
 #include "world_instances.h"
 #include "egs_variables.h"
+#include "building_manager/building_manager.h"
+#include "building_manager/building_physical.h"
 #include "player_manager/gm_tp_pending_command.h"
 #include "guild_manager/guild_manager.h"
 #include "guild_manager/guild.h"
@@ -104,6 +103,10 @@
 #include "modules/shard_unifier_client.h"
 #include "modules/client_command_forwarder.h"
 #include "modules/guild_unifier.h"
+#include "server_share/log_command_gen.h"
+#include "server_share/log_item_gen.h"
+#include "server_share/log_character_gen.h"
+#include "server_share/used_continent.h"
 
 //
 // Externs
@@ -162,6 +165,9 @@ AdminCommandsInit[] =
 {
 		// player character accessible commands
 		"teamInvite",						true,
+		"setLeague",						true,
+		"leagueInvite",						true,
+		"leagueKick",						true,
 		"guildInvite",						true,
 		"roomInvite",						true,
 		"roomKick",							true,
@@ -174,6 +180,8 @@ AdminCommandsInit[] =
 		"validateRespawnPoint",				true,
 		"summonPet",						true,
 		"connectUserChannel",				true,
+		"updateTarget",                     true,
+		"resetName",						true,
 
 		// Web commands managment
 		"webExecCommand",					true,
@@ -216,6 +224,7 @@ AdminCommandsInit[] =
 		"allowSummonPet",					true,
 		"setPetAnimalSatiety",				true,
 		"getPetAnimalSatiety",				true,
+		"setPetAnimalName",					true,
 		"taskPass",							true,
 		"setFamePlayer",					true,
 		"guildMOTD",						true,
@@ -230,7 +239,7 @@ AdminCommandsInit[] =
 		"renamePlayerForEvent",				true,
 		"renamePlayer",						true,
 		"renameGuild",						true,
-		"setGuildDescription",				true,
+		"setGuildDescription",				false,
 		"setGuildIcon",						false,
 		"killMob",							true,
 		"changeVar",						true,
@@ -295,12 +304,15 @@ AdminCommandsInit[] =
 		"Position",							true,
 		"Priv",								true,
 		"PriviledgePVP",					true,
+		"FullPVP",							true,
 		"FBT",								true,
 		"RyzomDate",						false,
 		"RyzomTime",						false,
 		"addGuildXp",						false,
 		"setGuildChargePoint",				false,
-
+		"characterInventoryDump",			true,
+		"deleteInventoryItem",				true,
+		"setSimplePhrase",                  false,
 
 		// PUT HERE THE VARIABLE / COMMAND THAT ARE TEMPORARY
 		// remove when message of the day interface is ready
@@ -311,6 +323,8 @@ AdminCommandsInit[] =
 		"EntitiesNoActionFailure",			false,
 		"EntitiesNoCastBreak",				false,
 		"EntitiesNoResist",					false,
+		"lockItem",                         true,
+		"setTeamLeader",                    true,
 		// aggroable state
 		"Aggro",							true,
 
@@ -373,6 +387,15 @@ AdminCommandsInit[] =
 		"eventSetBotURL",					true,
 		"eventSetBotURLName",				true,
 		"eventSpawnToxic",					true,
+		"eventNpcSay",						true,
+		"eventSetBotFacing",                true,
+		"eventGiveControl",					true,
+		"eventLeaveControl",				true,
+
+		"setOrganization",					true,
+		"setOrganizationStatus", 			true,
+
+		"addGuildBuilding",					true,
 };
 
 static vector<CAdminCommand>	AdminCommands;
@@ -387,6 +410,22 @@ static void loadCommandsPrivileges(const string & fileName, bool init);
 void cbRemoteClientCallback (uint32 rid, const std::string &cmd, const std::string &entityNames);
 //
 
+// get AI instance and remove it form the group name
+bool getAIInstanceFromGroupName(string& groupName, uint32& instanceNumber)
+{
+	if (groupName.find("@") != string::npos)
+	{
+		string continent = groupName.substr(0, groupName.find('@'));
+		uint32 nr = CUsedContinent::instance().getInstanceForContinent(continent);
+		if (nr == ~0)
+		{
+			return false;
+		}
+		instanceNumber = nr;
+		groupName = groupName.substr(groupName.find('@'), groupName.size());
+	}
+	return true;
+}
 
 CAdminCommand * findAdminCommand(const string & name)
 {
@@ -432,6 +471,7 @@ void initCommandsPrivileges(const std::string & fileName)
 {
 	H_AUTO(initCommandsPrivileges);
 
+	initSalt();
 	loadCommandsPrivileges(fileName, true);
 }
 
@@ -553,43 +593,46 @@ void initPositionFlags(const std::string & fileName)
 	PositionFlagsFileName = fileName;
 }
 
-string getSalt()
+struct SaltFileLoadCallback: public IBackupFileReceiveCallback
 {
-	if (Salt.empty())
+	std::string FileName;
+
+	SaltFileLoadCallback(const std::string& fileName): FileName(fileName)  {}
+
+	virtual void callback(const CFileDescription& fileDescription, NLMISC::IStream& dataStream)
 	{
-		string fileNameAndPath = Bsi.getLocalPath() + "salt.txt";
-		if (CFile::fileExists(fileNameAndPath))
-		{
-			FILE* f;
-			string fileName;
+		// if the file isn't found then just give up
+		DROP_IF(fileDescription.FileName.empty(),"<SaltFileLoadCallback> file not found: "<< FileName, return);
+		
+		dataStream.serial(Salt);
+		nlinfo("Salt loaded : %s", Salt.c_str());
+	}
+};
 
-			// open the file
-			f=fopen(fileNameAndPath.c_str(),"rb");
-			if (f == NULL)
-			{
-				nlinfo("Failed to open file for reading: %s", fileName.c_str() );
-				return false;
-			}
+void initSalt()
+{
+	H_AUTO(initSalt);
 
-			CSString input;
-			// read the file content into a buffer
-			uint32 size=NLMISC::CFile::getFileSize(f);
-			input.resize(size);
-			uint32 readSize= (uint32)fread(&input[0],1,size,f);
-			fclose(f);
-			Salt = input;
-			return Salt;
-		}
-		return "";
+	string fileNameAndPath = Bsi.getLocalPath() + "salt_egs.txt";
+	if (CFile::fileExists(fileNameAndPath))
+	{
+		nlinfo("Salt loading : salt_egs.txt");
+		Bsi.syncLoadFile("salt_egs.txt", new SaltFileLoadCallback("salt_egs.txt"));
 	}
+}
+
+const string &getSalt()
+{
+	if (Salt.empty()) Salt = "abcdefghijklmnopqrstuvwxyz0123456";
+
 	return Salt;
 }
 
 void saveSalt(const string salt)
 {
 	Salt = salt;
-	CBackupMsgSaveFile msg("salt.txt", CBackupMsgSaveFile::SaveFile, Bsi );
-	msg.DataMsg.serialBuffer((uint8*)Salt.c_str(), (uint)Salt.size());
+	CBackupMsgSaveFile msg("salt_egs.txt", CBackupMsgSaveFile::SaveFile, Bsi );
+	msg.DataMsg.serial(Salt);
 	Bsi.sendFile(msg);
 }
 
@@ -1087,11 +1130,16 @@ ENTITY_VARIABLE(Position, "Position of a player (in meter) <eid> <posx>,<posy>[,
 			explode (value, string(","), res);
 			if (res.size() >= 2)
 			{
-				x = atoi (res[0].c_str()) * 1000;
-				y = atoi (res[1].c_str()) * 1000;
+				fromString(res[0], x);
+				x *= 1000;
+				fromString(res[1], y);
+				y *= 1000;
 			}
 			if (res.size() >= 3)
-				z = atoi (res[2].c_str()) * 1000;
+			{
+				fromString(res[2], z);
+				z *= 1000;
+			}
 		}
 		else
 		{
@@ -2222,13 +2270,19 @@ NLMISC_COMMAND(addPetAnimal,"Add pet animal to character","<eid> <PetTicket>")
 		{
 			CGameItemPtr item = c->createItemInInventoryFreeSlot(INVENTORIES::bag, 1, 1, ticket);
 			if( item != 0 )
-				c->addCharacterAnimal( ticket, 0, item );
-			return true;
-		}
-		else
-		{
-			log.displayNL("<addPetAnimal> command, unknown pet ticket '%s'", args[1].c_str() );
+			{
+				if ( ! c->addCharacterAnimal( ticket, 0, item ))
+				{
+					item.deleteItem();
+					return false;
+				}
+				return true;
+			}
+
+			log.displayNL("<addPetAnimal> command, cannot create item in bag '%s'", args[1].c_str() );
 		}
+
+		log.displayNL("<addPetAnimal> command, unknown pet ticket '%s'", args[1].c_str() );
 	}
 
 	return false;
@@ -2271,7 +2325,9 @@ NLMISC_COMMAND(setPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 			if ( addressee )
 			{
 				CHECK_RIGHT( addressee, c );
-				CCharacter::sendDynamicSystemMessage( addressee->getId(), result );
+				SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+				params[0].Literal = trim(result);
+				CCharacter::sendDynamicSystemMessage(addressee->getId(), "LITERAL", params);
 			}
 			else
 				result += " nameForAnswer not found";
@@ -2283,7 +2339,7 @@ NLMISC_COMMAND(setPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 	return true;
 }
 
-NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0..3)","<eid> <petIndex> [<nameForAnswer>]")
+NLMISC_COMMAND(getPetAnimalSatiety,"Get the satiety of pet animal (petIndex in 0..3)","<eid> <petIndex> [<nameForAnswer>]")
 {
 	if (args.size () < 2) return false;
 	GET_CHARACTER
@@ -2307,7 +2363,9 @@ NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 			if ( addressee )
 			{
 				CHECK_RIGHT( addressee, c );
-				CCharacter::sendDynamicSystemMessage( addressee->getId(), result );
+				SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+				params[0].Literal = trim(result);
+				CCharacter::sendDynamicSystemMessage(addressee->getId(), "LITERAL", params);
 			}
 			else
 				result += " nameForAnswer not found";
@@ -2318,6 +2376,22 @@ NLMISC_COMMAND(getPetAnimalSatiety,"Set the satiety of pet animal (petIndex in 0
 	return true;
 }
 
+NLMISC_COMMAND(setPetAnimalName, "Set the name of a pet animal (petIndex in 0..3)","<eid> <petIndex> <name>")
+{
+	if (args.size () < 3) return false;
+	GET_CHARACTER
+
+	if ( c )
+	{
+		uint petIndex;
+		fromString(args[1], petIndex);
+		ucstring customName = args[2];
+		c->setAnimalName(petIndex, customName);
+	}
+
+	return true;
+}
+
 NLMISC_COMMAND (addSkillPoints, "add skill points of given type (Fight = 0,	Magic = 1,Craft = 2, Harvest = 3)", "<eid> <SP type [0..3]> <nb SP>")
 {
 	if (args.size () < 3) return false;
@@ -2330,7 +2404,8 @@ NLMISC_COMMAND (addSkillPoints, "add skill points of given type (Fight = 0,	Magi
 		return false;
 	}
 
-	uint32 nbSP = atoi (args[2].c_str());
+	uint32 nbSP;
+	fromString(args[2], nbSP);
 
 	c->addSP( nbSP, type );
 
@@ -3723,7 +3798,7 @@ NLMISC_COMMAND( failMission, "force mission failure", "<CSR id><mission idx>" )
 //----------------------------------------------------------------------------
 NLMISC_COMMAND( progressMission, "force mission progression", "<CSR id><mission idx>[repeat]")
 {
-	if ( args.size() != 2  || args.size() != 3 )
+	if ( args.size() != 2  && args.size() != 3 )
 		return false;
 	GET_CHARACTER;
 
@@ -3964,15 +4039,15 @@ NLMISC_COMMAND (targetInfos, "give infos on the target", "")
 //----------------------------------------------------------------------------
 NLMISC_COMMAND (infos, "give info on character (GodMode, Invisible...)", "")
 {
-	CSString str("GM STATUS: ");
+	CSString str("INFO: ");
 	GET_CHARACTER
 	if( c->invulnerableMode() )
 	{
-		str << "INVULNERABLE MODE ";
+		str << "INVULNERABLE_MODE ";
 	}
 	if( c->godMode() )
 	{
-		str << "GOD MODE ";
+		str << "GOD_MODE ";
 	}
 	else
 	{
@@ -3988,31 +4063,29 @@ NLMISC_COMMAND (infos, "give info on character (GodMode, Invisible...)", "")
 	{
 		if (IsRingShard)
 		{
-			str << "INVISIBLE(" <<R2_VISION::extractInvisibilityLevel(c->getWhoSeesMe()) << ")";
+			str << "INVISIBLE(" <<R2_VISION::extractInvisibilityLevel(c->getWhoSeesMe()) << ") ";
 		}
 		else
 		{
-			str << "INVISIBLE";
+			str << "INVISIBLE ";
 		}
 	}
 
 	if ( IsRingShard && R2_VISION::extractVisionLevel(c->getWhoSeesMe())!=R2_VISION::VISIBLE )
 	{
-		str << "SEEINVIS(" << R2_VISION::extractVisionLevel(c->getWhoSeesMe()) << ")";
+		str << "SEEINVIS(" << R2_VISION::extractVisionLevel(c->getWhoSeesMe()) << ") ";
 	}
 
 	if (c->getAggroableSave())
 	{
-		str << " AGGROABLE";
+		str << "AGGROABLE ";
 	}
 	else
 	{
-		str << " NOT_AGGROABLE";
+		str << "NOT_AGGROABLE ";
 	}
 
-	SM_STATIC_PARAMS_1(params,STRING_MANAGER::literal);
-	params[0].Literal = str;
-	CCharacter::sendDynamicSystemMessage( eid,"LITERAL", params );
+	log.displayNL(str.c_str());
 	return true;
 }
 
@@ -4156,7 +4229,7 @@ ENTITY_VARIABLE(Invisible, "Invisibility of a player")
 }
 
 //----------------------------------------------------------------------------
-NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [every=<delay in secondes>] message","<message>")
+NLMISC_COMMAND(broadcast, "Broadcast a text", "[repeat=<num repeat> or during=<time in seconds>] [every=<delay in seconds>] <message>")
 {
 	if( args.size() < 1 )
 	{
@@ -4231,7 +4304,7 @@ NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [eve
 
 	if( message.size() == 0 )
 	{
-		log.displayNL("You must enter a not empty message");
+		log.displayNL("You must enter a message");
 		return false;
 	}
 
@@ -4243,7 +4316,7 @@ NLMISC_COMMAND(broadcast,"[repeat=<num repeat> or during=<time in seconds>] [eve
 
 	if( ( ( repeat > 1 || during > 0 ) && every == 0 ) || ( ( every > during ) && during > 0 ) )
 	{
-		log.displayNL("Can't execute broadcast command, check you'r repeat/during/every parameters");
+		log.displayNL("Can't execute broadcast command, check your repeat/during/every parameters");
 		return false;
 	}
 
@@ -4368,15 +4441,29 @@ NLMISC_COMMAND (connectUserChannel, "Connect to user channels", "<user id> <chan
 			inst->removeFactionChannelForCharacter(channel, c, true);
 		}
 		else
-			log.displayNL("You don't have rights to connect to channel %s", name.c_str());
+		{
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = name;
+			CCharacter::sendDynamicSystemMessage( eid, "EGS_CHANNEL_NO_RIGHTS", params );
+		}
 
 		return true;
 	}
 
+	SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+	params[0].Literal = name;
+	CCharacter::sendDynamicSystemMessage( eid, "EGS_CHANNEL_INVALID_NAME", params );
 	return false;
 
 }
 
+NLMISC_COMMAND (updateTarget, "Update current target", "<user id>")
+{
+	GET_CHARACTER
+	c->updateTarget();
+	return true;
+}
+
 NLMISC_COMMAND (setSalt, "Set Salt", "<dev_eid> <salt>")
 {
 	if (args.size() != 2)
@@ -4392,6 +4479,7 @@ NLMISC_COMMAND (setSalt, "Set Salt", "<dev_eid> <salt>")
 	return true;
 }
 
+// !!! Deprecated !!!
 NLMISC_COMMAND (webAddCommandsIds, "Add ids of commands will be run from webig", "<user id> <bot_name> <web_app_url> <indexes>")
 {
 	if (args.size() != 4)
@@ -4413,6 +4501,7 @@ NLMISC_COMMAND (webAddCommandsIds, "Add ids of commands will be run from webig",
 	return true;
 }
 
+// !!! Deprecated !!!
 NLMISC_COMMAND (webDelCommandsIds, "Del ids of commands", "<user id> <web_app_url>")
 {
 	if (args.size() != 2)
@@ -4435,7 +4524,7 @@ NLMISC_COMMAND (webDelCommandsIds, "Del ids of commands", "<user id> <web_app_ur
 
 CInventoryPtr getInv(CCharacter *c, const string &inv)
 {
-	INVENTORIES::TInventory inventory = INVENTORIES::bag;
+	CInventoryPtr inventoryPtr = NULL;
 	if (!inv.empty())
 	{
 		INVENTORIES::TInventory selectedInv = INVENTORIES::toInventory(inv);
@@ -4450,51 +4539,102 @@ CInventoryPtr getInv(CCharacter *c, const string &inv)
 			case INVENTORIES::pet_animal4:
 			case INVENTORIES::guild:
 			case INVENTORIES::player_room:
-				inventory = selectedInv;
+				inventoryPtr = c->getInventory(selectedInv);
 				break;
 
 			default:
-				inventory = INVENTORIES::bag;
+				// No-op
+				break;
 		}
 	}
-	return c->getInventory(inventory);
+	return inventoryPtr;
 }
 
-NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url> <index> <command> <hmac>")
+NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url> <index> <command> <hmac> [<new_check=0|1>] [<next_step=0|1>] [<send_url=0|1>]")
 {
 
-	if (args.size() != 5)
+	if (args.size() < 5)
 		return false;
 
 	GET_CHARACTER
 
+	bool new_check = false;
+	if (args.size() >= 6 && args[5] == "1")
+		new_check = true;
+
+	bool next_step = false;
+	if (args.size() >= 7 && args[6] == "1")
+		next_step = true;
+
+	bool send_url = false;
+	if (args.size() >= 8 && args[7] == "1")
+		send_url = true;
+
+ 	c->setAfkState(false);
+
 	string web_app_url = args[1];
 	string index = args[2];
+	uint32 iindex;
+	NLMISC::fromString(index, iindex);
 	string command = args[3];
 	string hmac = args[4];
 
-	CInventoryPtr check_inv = c->getInventory(INVENTORIES::bag);
 	vector<string> infos;
 	CGameItemPtr item;
 
-	if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+	if (new_check)
 	{
-		uint item_idx = c->checkWebCommand(web_app_url, index+command, hmac, getSalt());
-		if (item_idx == INVENTORIES::NbBagSlots)
+		uint32 saved_index = c->getWebCommandIndex();
+		if (iindex <= saved_index)
+		{
+			// Index of command must be higher than last used index to prevent re-use of commands
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_index", getSalt());
+			return false;
+		}
+		if (next_step && (iindex != saved_index+1))
+		{
+			// Next step commands wants an index who follow the last used index.
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_next_index", getSalt());
+			return false;
+		}
+
+		string salt = getSalt();
+		string checksumEid = web_app_url + toString(c->getLastConnectedDate()) + index + command + c->getId().toString();
+		string checksumRowId = web_app_url + toString(c->getLastConnectedDate()) + index + command + toString(c->getEntityRowId().getIndex());
+		string realhmacEid = getHMacSHA1((uint8*)&checksumEid[0], checksumEid.size(), (uint8*)&salt[0], salt.size()).toString();
+		string realhmacRowId = getHMacSHA1((uint8*)&checksumRowId[0], checksumRowId.size(), (uint8*)&salt[0], salt.size()).toString();
+		if (realhmacEid != hmac && realhmacRowId != hmac)
 		{
-			nlwarning("Bad web command check");
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_auth", getSalt());
 			return false;
 		}
+	}
+	else
+	{
+		// !!! DEPRECATED !!!
+		CInventoryPtr check_inv = c->getInventory(INVENTORIES::bag);
+		if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+		{
+			uint item_idx = c->checkWebCommand(web_app_url, index+command, hmac, getSalt());
+			if (item_idx == INVENTORIES::NbBagSlots)
+			{
+				nlwarning("Bad web command check");
+				return false;
+			}
 
-		item = check_inv->getItem(item_idx);
-		string cText = item->getCustomText().toString();
-		NLMISC::splitString(cText, "\n", infos);
+			item = check_inv->getItem(item_idx);
+			string cText = item->getCustomText().toString();
+			NLMISC::splitString(cText, "\n", infos);
 
-		vector<string> indexes;
-		NLMISC::splitString(infos[1], ",", indexes);
+			vector<string> indexes;
+			NLMISC::splitString(infos[1], ",", indexes);
 
-		if (index != indexes[0])
-			return false;
+			if (index != indexes[0])
+				return false;
+		}
 	}
 
 	std::vector<std::string> command_args;
@@ -4514,10 +4654,12 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		const CSheetId sheetId(command_args[1]);
 		if (sheetId == CSheetId::Unknown)
 			return false;
-		const uint32 quality = (uint32)atoi(command_args[2].c_str());
+		uint32 quality;
+		fromString(command_args[2], quality);
 		if (quality == 0)
 			return false;
-		const uint32 quantity = (uint32)atoi(command_args[3].c_str());
+		uint32 quantity;
+		fromString(command_args[3], quantity);
 		if (quantity == 0)
 			return false;
 
@@ -4526,13 +4668,20 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			selected_inv = command_args[4];
 		CInventoryPtr inventory = getInv(c, selected_inv);
 
+		if (inventory == NULL)
+		{
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_inventory", getSalt());
+			return false;
+		}
+
 		uint32 numberItem = 0;
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
 			if( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() >= quality) )
+				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem += itemPtr->getStackSize();
 				}
@@ -4541,7 +4690,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		if (numberItem < quantity)
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
 			return false;
 		}
 
@@ -4551,7 +4701,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			const CGameItemPtr itemPtr = inventory->getItem(i);
 			if( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() >= quality) )
+				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
 					numberItem -= inventory->deleteStackItem(i, quantity);
 					if(numberItem == 0)
@@ -4570,13 +4720,12 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		if (command_args.size() < 4)
 			return false;
 
-		const CSheetId sheetId(command_args[1]);
-		if (sheetId == CSheetId::Unknown)
-			return false;
-		const uint32 quality = (uint32)atoi(command_args[2].c_str());
+		uint32 quality;
+		fromString(command_args[2], quality);
 		if (quality == 0)
 			return false;
-		const uint32 quantity = (uint32)atoi(command_args[3].c_str());
+		uint32 quantity;
+		fromString(command_args[3], quantity);
 		if (quantity == 0)
 			return false;
 
@@ -4603,14 +4752,44 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			}
 		}
 
-		CGameItemPtr new_item = c->createItem(quality, quantity, sheetId);
+		CGameItemPtr new_item;
+		string sheet = command_args[1];
+
+		if ( sheet.find(".sitem") == string::npos ) // try named item
+		{
+			new_item = CNamedItems::getInstance().createNamedItem(command_args[1], quantity);
+			if (new_item == NULL)
+				return true;
+		}
+		else
+		{
+			const CSheetId sheetId(sheet);
+			if (sheetId == CSheetId::Unknown)
+				return true;
+			new_item = c->createItem(quality, quantity, sheetId);
+		}
 
 		if (!c->addItemToInventory(inventory, new_item))
 		{
 			new_item.deleteItem();
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=cant_add_item", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=cant_add_item", getSalt());
 			return false;
 		}
+
+		ucstring customValue;
+
+		if (command_args.size() == 6 && command_args[5] != "*")
+		{
+			customValue.fromUtf8(command_args[5]);
+			new_item->setCustomName(customValue);
+		}
+
+		if (command_args.size() == 7 && command_args[6] != "*")
+		{
+			customValue.fromUtf8(command_args[6]);
+			new_item->setCustomText(customValue);
+		}
 	}
 	//*************************************************
 	//***************** check_position
@@ -4638,7 +4817,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		nlinfo("max_x = %d, max_y = %d", max_x, max_y);
 		if ((x < min_x || y < min_y || x > max_x || y > max_y))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_position", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_position", getSalt());
 			return false;
 		}
 	}
@@ -4650,8 +4830,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 	{
 		if (command_args.size () != 4) return false;
 
-
-		uint32 factionIndex	= PVP_CLAN::getFactionIndex(PVP_CLAN::fromString(command_args[1]));
+		uint32 factionIndex	= CStaticFames::getInstance().getFactionIndex(command_args[1]);
+		if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;
 		sint32 fame = CFameInterface::getInstance().getFameIndexed(c->getId(), factionIndex);
 
 		sint32 value;
@@ -4665,12 +4846,46 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		if ((command_args[2] == "below" && fame > value) || (command_args[2] == "above" && fame < value))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_fame", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_fame", getSalt());
 			return false;
 		}
 
 	}
 	
+	//*************************************************
+	//***************** set_fame (need x6000 to change 1 point)
+	//*************************************************
+	else if (command_args[0] == "change_fame")
+	{
+		if (command_args.size () != 4) return false;
+
+		uint32 factionIndex	= CStaticFames::getInstance().getFactionIndex(command_args[1]);
+		if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;
+		sint32 fame = CFameInterface::getInstance().getFameIndexed(c->getId(), factionIndex);
+
+		sint32 value;
+		NLMISC::fromString(command_args[3], value);
+
+		if (command_args[2] == "add")
+		{
+			CFameManager::getInstance().setEntityFame(c->getId(), factionIndex, fame+value, false);
+			nlinfo("fame : %d => %d", fame, fame+value);
+		}
+		else if (command_args[2] == "del")
+		{
+			CFameManager::getInstance().setEntityFame(c->getId(), factionIndex, fame-value, false);
+			nlinfo("fame : %d => %d", fame, fame-value);			
+		}
+		else if (command_args[2] == "set")
+		{
+			CFameManager::getInstance().setEntityFame(c->getId(), factionIndex, value, false);
+			nlinfo("fame : %d => %d", fame, value);
+		}
+
+	}
+
 	//*************************************************
 	//***************** check_target	
 	//*************************************************
@@ -4681,7 +4896,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		const CEntityId &target = c->getTarget();
 		if (target == CEntityId::Unknown)
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_target", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_target", getSalt());
 			return false;
 		}
 
@@ -4689,14 +4905,16 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		{
 			if (target.getType() == RYZOMID::player)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
 				return false;
 			}
 			CSheetId creatureSheetId(command_args[2]);
 			CCreature *creature = CreatureManager.getCreature(target);
 			if (creature == NULL ||  creatureSheetId == CSheetId::Unknown || creatureSheetId != creature->getType())
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_sheet", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_sheet", getSalt());
 				return false;
 			}
 		}
@@ -4704,7 +4922,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		{
 			if (target.getType() == RYZOMID::player)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
 				return false;
 			}
 			vector<TAIAlias> aliases;
@@ -4721,7 +4940,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			}
 			if (!found)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_bot", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_bot", getSalt());
 				return false;
 			}
 		}
@@ -4729,13 +4949,15 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		{
 			if (target.getType() != RYZOMID::player)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_type", getSalt());
 				return false;
 			}
 			CEntityBase *entityBase = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[2]));
 			if (entityBase == NULL)
 			{
-				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_player", getSalt());
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_player", getSalt());
 				return false;
 			}
 		} else
@@ -4751,7 +4973,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		if (!c->haveBrick(CSheetId(command_args[1])))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_brick", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_brick", getSalt());
 			return false;
 		}
 	}
@@ -4773,7 +4996,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		}
 		else
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_action", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_brick_action", getSalt());
 			return false;
 		}
 	}
@@ -4781,7 +5005,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 	//*************************************************
 	//***************** check_item
 	//*************************************************
-	else if (command_args[0] == "check_item")
+	else if (command_args[0] == "check_item") // sheetid ! quality ! quantity ! iscrafted
 	{
 		if (command_args.size() < 4)
 			return false;
@@ -4796,27 +5020,40 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		if (quantity == 0)
 			return false;
 
+		bool crafted = false;
+		if (command_args.size() == 5)
+			crafted = (command_args[4] == "1");
+
 		string selected_inv;
 		if (command_args.size() == 5)
 			selected_inv = command_args[4];
 		CInventoryPtr inventory = getInv(c, selected_inv);
 
+		if (inventory == NULL)
+		{
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=bad_inventory", getSalt());
+			return false;
+		}
+
 		uint32 numberItem = 0;
 		for( uint32 i = 0; i < inventory->getSlotCount(); ++ i)
 		{
 			const CGameItemPtr itemPtr = inventory->getItem(i);
 			if( itemPtr != NULL )
 			{
-				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() >= quality) )
+				if( (itemPtr->getSheetId() == sheetId) && (itemPtr->quality() == quality) )
 				{
-					numberItem += itemPtr->getStackSize();
+					if (!crafted || itemPtr->getCreator() == c->getId())
+						numberItem += itemPtr->getStackSize();
 				}
 			}
 		}
 
 		if (numberItem < quantity)
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_items", getSalt());
 			return false;
 		}
 	}
@@ -4852,7 +5089,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 			(command_args[2] == "attack" && outpost->getState() != OUTPOSTENUMS::AttackRound) ||
 			(command_args[2] == "defend" && outpost->getState() != OUTPOSTENUMS::DefenseRound))
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc="+command_args[2], getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc="+command_args[2], getSalt());
 			return false;
 		}
 	}
@@ -4869,11 +5107,12 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		sint32 y = c->getY();
 		sint32 orientation = 6666; // used to specify a random orientation
 
-		uint32 nbBots = NLMISC::atoui(command_args[1].c_str());
+		uint32 nbBots;
+		fromString(command_args[1], nbBots);
 		if (nbBots<=0)
 		{
 			log.displayNL("invalid bot count");
-			return true;
+			return false;
 		}
 
 		NLMISC::CSheetId sheetId(command_args[2]);
@@ -4885,7 +5124,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		double dispersionRadius = 10.;
 		if (command_args.size()>3)
 		{
-			dispersionRadius = atof(command_args[3].c_str());
+			fromString(command_args[3], dispersionRadius);
 			if (dispersionRadius < 0.)
 				return true;
 		}
@@ -4910,15 +5149,34 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		if (botsName == "*")
 			botsName.clear();
 
-		if (command_args.size()>6)
+		if (command_args.size() > 7)
+		{
+			
+			if (command_args[6] != "*") {
+				float userX;
+				NLMISC::fromString(command_args[6], userX);
+				x = (sint32)(userX * 1000);
+			}
+
+			if (command_args[7] != "*") {
+				float userY;
+				NLMISC::fromString(command_args[7], userY);
+				y = (sint32)(userY * 1000);
+			}
+		}
+
+		std::string look;
+		if (command_args.size() > 8)
 		{
-			NLMISC::fromString(command_args[6], x);
-			x = x * 1000;
+			look = command_args[8];
+			if (look.find(".creature") == string::npos)
+				look += ".creature";
 		}
-		if (command_args.size()>7)
+
+		// See if another AI instance has been specified
+		if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
 		{
-			NLMISC::fromString(command_args[7], y);
-			y = y * 1000;
+			return false;
 		}
 
 		CEntityId playerId = c->getId();
@@ -4936,6 +5194,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		msgout.serial(dispersionRadius);
 		msgout.serial(spawnBots);
 		msgout.serial(botsName);
+		msgout.serial(look);
 		CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
 	}
 
@@ -4950,6 +5209,13 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		uint32 instanceNumber = c->getInstanceNumber(); 
 		uint32 nbString = (uint32)command_args.size();
 	 
+		// See if it needs another AI instance
+		string botsName = command_args[1];
+		if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
+		{
+			return false;
+		}
+
 		CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
 		uint32 messageVersion = 1;
 		msgout.serial(messageVersion);
@@ -4957,8 +5223,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 
 		string command = command_args[0];
 		msgout.serial(command);
-		string botEid = command_args[1];
-		msgout.serial(botEid);
+		msgout.serial(botsName);
 		for (uint32 i=2; i<nbString; ++i)
 		{
 			string arg = command_args[i]+";";
@@ -4967,6 +5232,53 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
 	}
 
+	//*************************************************
+	//***************** change_hair
+	//*************************************************
+
+	else if (command_args[0] == "change_hair")
+	{
+		if (command_args.size () != 3) return false;
+
+		CCharacter *target = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[1]));
+
+		CSheetId sheetId(command_args[2]);
+
+		const CStaticItem * form = CSheets::getForm(sheetId);
+		if (form == NULL)
+		{
+			nlwarning("unknown item : '%s'", sheetId.toString().c_str());
+			return true;
+		}
+
+		if (form->Type != ITEM_TYPE::HAIR_MALE && form->Type != ITEM_TYPE::HAIR_FEMALE)
+		{
+			nlwarning("'%s' is not a haircut item", sheetId.toString().c_str());
+			return true;
+		}
+
+		uint32 hairValue = CVisualSlotManager::getInstance()->sheet2Index(form->SheetId, SLOTTYPE::HEAD_SLOT);
+		if (target->setHair(hairValue))
+		{
+			target->resetHairCutDiscount();
+		}
+	}
+
+	//*************************************************
+	//***************** change_hair_color
+	//*************************************************
+
+	else if (command_args[0] == "change_hair_color") {
+		if (command_args.size () != 3) return false;
+
+		CCharacter *target = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[1]));
+
+		uint32 value;
+		fromString(command_args[2], value);
+
+		target->setHairColor(value);
+	}
+
 	//*************************************************
 	//***************** change_vpx
 	//*************************************************
@@ -4978,7 +5290,9 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		CCharacter *target = PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), command_args[1]));
 
 		string name = command_args[2];
-		uint32 value = (uint32)atoi(command_args[3].c_str());
+		
+		uint32 value;
+		fromString(command_args[3], value);
 
 		if(target && target->getEnterFlag())
 		{
@@ -5105,7 +5419,8 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		}
 		else
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed", getSalt());
+			if (send_url)
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_vpx_def", getSalt());
 		}
 	}
 	//*************************************************
@@ -5122,71 +5437,555 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
 		msgout.serial(name);
 		sendMessageViaMirror("IOS", msgout);
 	}
-	else
-		return false;
 
+	//*************************************************
+	//***************** teleport
+	//*************************************************
 
-	if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+	else if (command_args[0] == "teleport")
 	{
-		string::size_type pos = infos[1].find(",");
-		if (pos!=string::npos && pos!=(infos[1].length()-1))
+		// args: x y z [t]
+		if (command_args.size () < 4 ||
+			command_args.size () > 5 ) return false;
+
+		sint32 x;
+		sint32 y;
+		sint32 z;
+		float  t;
+		fromString(command_args[1], x);
+		fromString(command_args[2], y);
+		fromString(command_args[3], z);
+		if (command_args.size() > 4)
 		{
-			item->setCustomText(ucstring(infos[0]+"\n"+infos[1].substr(pos+1)));
+			fromString(command_args[4], t);
 		}
 		else
 		{
-			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=finished", getSalt());
+			t = c->getState().Heading;
 		}
-	}
-	else
-	{
-		nlinfo("OK");
-	}
 
-	return true;
-}
-
-//----------------------------------------------------------------------------
-ENTITY_VARIABLE (PriviledgePVP, "Priviledge Pvp Mode")
-{
-	ENTITY_GET_CHARACTER
+		NLNET::CMessage msgout( "TELEPORT_PLAYER" );
+		msgout.serial( const_cast<CEntityId &>(c->getId()) );
+		msgout.serial( const_cast<sint32 &>(x) );
+		msgout.serial( const_cast<sint32 &>(y) );		
+		msgout.serial( const_cast<sint32 &>(z) );		
+		msgout.serial( const_cast<float &>(t) );		
+		sendMessageViaMirror( "EGS", msgout );	
+	}
 
-	if (get)
+	//*************************************************
+	//***************** rename_animal
+	//*************************************************
+	else if (command_args[0] == "rename_animal")
 	{
-		value = c->priviledgePVP()?"1":"0";
+		if (command_args.size () < 3) return false;
+
+		uint petIndex = atoi( command_args[1].c_str() );
+		ucstring customName = ucstring(command_args[2]);
+		c->setAnimalName(petIndex, customName);
 	}
-	else
+	
+	//*************************************************
+	//***************** organization
+	//*************************************************
+	else if (command_args[0] == "organization")
 	{
-		if (value=="1" || value=="on" || strlwr(value)=="pvp" || strlwr(value)=="true" )
-			c->setPriviledgePVP(true);
-		else if (value=="0" || value=="off" || strlwr(value)=="false" )
-			c->setPriviledgePVP(false);
-//		c->setPVPRecentActionFlag();
-		CPVPManager2::getInstance()->setPVPModeInMirror(c);
-		nlinfo ("%s %s now in pvp mode", entity.toString().c_str(), c->priviledgePVP()?"is":"isn't");
-	}
-}
-
-
-//----------------------------------------------------------------------------
-NLMISC_COMMAND(addPosFlag, "add a new position flag", "<csr_eid> <flag_name>")
-{
-	if (args.size() != 2)
-		return false;
-	GET_CHARACTER
+		if (command_args.size () < 3) return false;
 
-	const string & flagName = args[1];
-	if (CPositionFlagManager::getInstance().flagExists(flagName))
-	{
-		CCharacter::sendDynamicSystemMessage(eid, "CSR_POS_FLAG_EXISTS");
-		return false;
+		string action = command_args[1]; // change, add_points, set_status, add_status
+		sint32 value;
+		fromString(command_args[2], value);
+		
+		if (action == "change" && value >= 0)
+			c->setOrganization((uint32)value);
+		else if (action == "add_points")
+			c->changeOrganizationPoints(value);
+		else if (action == "set_status" && value >= 0)
+			c->setOrganizationStatus(value);
+		else if (action == "add_status")
+			c->changeOrganizationStatus(value);
 	}
+		
+	//*************************************************
+	//***************** buildings
+	//*************************************************
+	else if (command_args[0] == "building")
+	{
+		if (command_args.size() < 2) return false;
 
-	CFlagPosition flagPos( c->getState().X()/1000, c->getState().Y()/1000, c->getState().Z()/1000 );
-	CPositionFlagManager::getInstance().setFlag(flagName, flagPos);
-	CPositionFlagManager::getInstance().saveToFile(PositionFlagsFileName);
-
-	return true;
+		string action = command_args[1]; // trigger_in, trigger_out, add_guild_room, add_player_room
+		
+		if (action == "trigger_in" && command_args.size () == 3)
+		{
+			uint32 liftId = atoi(command_args[2].c_str());		
+			CBuildingManager::getInstance()->addTriggerRequest(c->getEntityRowId(), liftId);
+		}
+		else if (action == "trigger_out")
+		{
+			CBuildingManager::getInstance()->removeTriggerRequest(c->getEntityRowId());
+			
+		}
+		else if (action == "add_guild_room" && command_args.size () == 3)
+		{
+			CBuildingPhysicalGuild * building = dynamic_cast<CBuildingPhysicalGuild *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				building->addGuild(c->getGuildId());
+			}
+		}
+		else if (action == "add_player_room"  && command_args.size () == 3)
+		{
+			CBuildingPhysicalPlayer * building = dynamic_cast<CBuildingPhysicalPlayer *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				building->addPlayer(c->getId());
+			}
+		}
+		else if (action == "buy_guild_room"  && command_args.size () == 3)
+		{
+			CBuildingPhysicalGuild * building = dynamic_cast<CBuildingPhysicalGuild *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				CGuild * guild = CGuildManager::getInstance()->getGuildFromId(c->getGuildId());
+				if (guild != NULL)
+				{
+					guild->setBuilding(building->getAlias());
+				}
+			}
+		}
+		else if (action == "buy_player_room"  && command_args.size () == 3)
+		{
+			CBuildingPhysicalPlayer * building = dynamic_cast<CBuildingPhysicalPlayer *>(CBuildingManager::getInstance()->getBuildingPhysicalsByName(command_args[2]));
+			if ( building )
+			{
+				CBuildingManager::getInstance()->buyBuilding(c->getId(), building->getAlias());
+			}
+		}
+	}	
+	
+	//*************************************************
+	//***************** Skill
+	//*************************************************
+	
+	else if (command_args[0] == "skill")
+	{
+		if (command_args.size() < 4) return false;
+		
+		string action = command_args[1]; // check, best, add_xp
+		
+		if (action == "check")
+		{
+			SKILLS::ESkills skillEnum = SKILLS::toSkill( command_args[2] );
+			uint32 wantedValue;
+			fromString(command_args[3], wantedValue);
+			
+			if (c->getSkillValue(skillEnum) < wantedValue) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_skill", getSalt());
+				return true;
+			}
+		}
+		else if (action == "best")
+		{
+			SKILLS::ESkills skillEnum = SKILLS::toSkill( command_args[2] );
+			uint32 wantedValue;
+			fromString(command_args[3], wantedValue);
+			
+			if (c->getBestChildSkillValue(skillEnum) < wantedValue) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_best_skill", getSalt());
+				return true;
+			}
+		}
+		else if (action == "add_xp")
+		{
+			double xp;
+			fromString(command_args[3], xp);
+			c->addXpToSkill(xp, command_args[2]);
+		}
+	}
+	
+	//*************************************************
+	//***************** Money
+	//*************************************************
+	
+	else if (command_args[0] == "money")
+	{
+		if (command_args.size() < 3) return false;
+		
+		string action = command_args[1]; // check, give, spend
+		
+		if (action == "check")
+		{
+			uint64 wantedMoney;
+			fromString(command_args[2], wantedMoney);
+			if (c->getMoney() < wantedMoney) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_money", getSalt());
+				return true;
+			}
+		}
+		else if (action == "give")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			c->giveMoney(money);
+		}
+		else if (action == "spend")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			c->spendMoney(money);
+		}
+	}
+
+	//*************************************************
+	//***************** Guild
+	//*************************************************
+
+	else if (command_args[0] == "guild")
+	{
+		if (command_args.size() < 3) return false;
+		
+		CGuild * guild = CGuildManager::getInstance()->getGuildFromId(c->getGuildId());
+		if (guild == NULL)
+		{
+			if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_guild", getSalt());
+			return true;
+		}
+		
+		string action = command_args[1]; // check, give, spend
+		
+		if (action == "check_money")
+		{
+			uint64 wantedMoney;
+			fromString(command_args[2], wantedMoney);
+			if (guild->getMoney() < wantedMoney) {
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_money", getSalt());
+				return true;
+			}
+		}
+		else if (action == "money_give")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			guild->addMoney(money);
+		}
+		else if (action == "money_spend")
+		{
+			uint64 money;
+			fromString(command_args[2], money);
+			guild->spendMoney(money);
+		}
+		else if (action == "check_rank")
+		{
+			CGuildMember * member = guild->getMemberFromEId(c->getId());
+			if ( member == NULL )
+			{
+				return false;
+			}
+
+			EGSPD::CGuildGrade::TGuildGrade wanted_grade = EGSPD::CGuildGrade::fromString(command_args[2]);
+			if (wanted_grade == EGSPD::CGuildGrade::Unknown)
+				return false;
+
+			EGSPD::CGuildGrade::TGuildGrade memberGrade = member->getGrade();
+			if( memberGrade > wanted_grade)
+			{
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_rank", getSalt());
+				return true;
+			}
+		}
+		
+	}
+
+	//*************************************************
+	//***************** Resets
+	//*************************************************
+
+	else if (command_args[0] == "reset")
+	{
+		if (command_args.size() < 2) return false;
+		
+		string action = command_args[1]; // pvp, powers
+		
+		if (action == "pvp")
+		{
+			c->resetPVPTimers();
+		}
+		else if (action == "powers")
+		{
+			c->resetPowerFlags();
+		}
+	}
+
+	//*************************************************
+	//***************** Faction Points
+	//*************************************************
+
+	else if (command_args[0] == "faction_points")
+	{
+		if (command_args.size() < 4) return false;
+		
+		string action = command_args[1]; // check, set, add, remove
+		
+		
+		PVP_CLAN::TPVPClan clan = PVP_CLAN::fromString(command_args[2]);
+		if ((clan < PVP_CLAN::BeginClans) || (clan > PVP_CLAN::EndClans))
+		{
+			return false;
+		}
+
+		uint32 value;
+		fromString(command_args[3], value);
+		
+		if (action=="check")
+		{
+			if (c->getFactionPoint(clan) < value)
+			{
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_faction_points", getSalt());
+			}
+		}
+		else if (action=="set")
+		{
+			c->setFactionPoint(clan, value, true);
+		}
+		else if (action=="add")
+		{
+			c->setFactionPoint(clan, c->getFactionPoint(clan)+value, true);
+		}
+		else if (action=="remove")
+		{
+			if (c->getFactionPoint(clan) < value)
+				c->setFactionPoint(clan, 0, true);
+			else
+				c->setFactionPoint(clan, c->getFactionPoint(clan)-value, true);
+		} 
+	}
+
+	//*************************************************
+	//***************** Pvp Points
+	//*************************************************
+
+	else if (command_args[0] == "pvp_points")
+	{
+		if (command_args.size() < 3) return false;
+
+		string action = command_args[1]; // check, set, add, remove
+
+		uint32 value;
+		fromString(command_args[2], value);
+
+		if (action=="check")
+		{
+			if (c->getPvpPoint() < value)
+			{
+				if (send_url)
+					c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=failed&desc=no_enough_pvp_points", getSalt());
+			}
+		}
+		else if (action=="set")
+		{
+			c->setPvpPoint(value);
+		}
+		else if (action=="add")
+		{
+			c->setPvpPoint(c->getPvpPoint()+value);
+		}
+		else if (action=="remove")
+		{
+			c->setPvpPoint(c->getPvpPoint()-value);
+		}
+	}
+
+	//*************************************************
+	//***************** missions
+	//*************************************************
+
+	else if (command_args[0] == "mission") // Please set params before spawn mission
+	{
+		if (command_args.size() < 3)
+			return false;
+
+		string action = command_args[1]; // spawn, set_params, add_param
+
+		if (action == "spawn" && command_args.size() == 4)
+		{
+			// try to find the bot name
+			vector<TAIAlias> aliases;
+			CAIAliasTranslator::getInstance()->getNPCAliasesFromName(command_args[2], aliases);
+			if (aliases.empty())
+			{
+				nldebug ("<spawn_mission> No NPC found matching name '%s'", command_args[2].c_str());
+				return false;
+			}
+
+			TAIAlias giverAlias = aliases[0];
+
+			TAIAlias missionAlias = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName(command_args[3]);
+
+			if (missionAlias == CAIAliasTranslator::Invalid)
+			{
+				nldebug ("<addMissionByName> No Mission found matching name '%s'", command_args[3].c_str());
+				return false;
+			}
+
+			c->endBotChat();
+
+			std::list< CMissionEvent* > eventList;
+			CMissionManager::getInstance()->instanciateMission(c, missionAlias,	giverAlias, eventList);
+			c->processMissionEventList(eventList,true, CAIAliasTranslator::Invalid);
+		}
+		else if (action == "remove")
+		{
+			TAIAlias missionAlias = CAIAliasTranslator::getInstance()->getMissionUniqueIdFromName(command_args[2]);
+			c->removeMission(missionAlias, 0);
+			c->removeMissionFromHistories(missionAlias);
+		}
+		else if (action == "add_compass" && command_args.size() == 4)
+		{
+			TVectorParamCheck params(1);
+			sint32 x = 0;
+			sint32 y = 0;
+			string msg;
+			if (command_args[2] == "bot")
+			{
+				vector<TAIAlias> aliases;
+				CAIAliasTranslator::getInstance()->getNPCAliasesFromName(command_args[3], aliases);
+				if (aliases.empty())
+					return false;
+				CCreature * bot = CreatureManager.getCreature(CAIAliasTranslator::getInstance()->getEntityId(aliases[0]));
+				if (bot)
+				{
+					x = bot->getState().X();
+					y = bot->getState().Y();
+					params[0].Type = STRING_MANAGER::bot;
+					params[0].setEIdAIAlias( bot->getId(), aliases[0] );
+					msg = "COMPASS_BOT";
+					uint32 txt = STRING_MANAGER::sendStringToClient(c->getEntityRowId(), msg, params);
+					PlayerManager.sendImpulseToClient(c->getId(), "JOURNAL:ADD_COMPASS_BOT", x, y, txt, bot->getEntityRowId().getCompressedIndex());
+				}
+			}
+			else if (command_args[2] == "place")
+			{
+				CPlace * place = CZoneManager::getInstance().getPlaceFromName(command_args[3]);
+				if (place)
+				{
+					x = place->getCenterX();
+					y = place->getCenterY();
+
+					params[0].Identifier = place->getName();
+					params[0].Type = STRING_MANAGER::place;
+					msg = "COMPASS_PLACE";
+					uint32 txt = STRING_MANAGER::sendStringToClient(c->getEntityRowId(), msg, params);
+					PlayerManager.sendImpulseToClient(c->getId(), "JOURNAL:ADD_COMPASS", x, y, txt);
+				}
+			}
+		}
+		else if (action == "set_params" && command_args.size() == 4)
+		{
+			c->setCustomMissionParams(command_args[2], web_app_url+","+command_args[3]);
+		}
+		else if (action == "add_params" && command_args.size() == 4)
+		{
+			c->addCustomMissionParam(command_args[2], command_args[3]);
+		}
+	}
+	else
+	{
+		return false;
+	}
+
+	if (!new_check)
+	{
+		if (!c->havePriv(":DEV:") || (web_app_url != "debug"))
+		{
+			string::size_type pos = infos[1].find(",");
+			if (pos!=string::npos && pos!=(infos[1].length()-1))
+			{
+				item->setCustomText(ucstring(infos[0]+"\n"+infos[1].substr(pos+1)));
+			}
+			else
+			{
+				c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=finished", getSalt());
+			}
+		}
+	}
+	else
+	{
+		c->setWebCommandIndex(iindex);
+		if (send_url)
+			c->sendUrl(web_app_url+"&player_eid="+c->getId().toString()+"&event=finished", getSalt());
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+ENTITY_VARIABLE (PriviledgePVP, "Priviledge Pvp Mode")
+{
+	ENTITY_GET_CHARACTER
+
+	if (get)
+	{
+		value = c->priviledgePVP()?"1":"0";
+	}
+	else
+	{
+		if (value=="1" || value=="on" || strlwr(value)=="pvp" || strlwr(value)=="true" )
+			c->setPriviledgePVP(true);
+		else if (value=="0" || value=="off" || strlwr(value)=="false" )
+			c->setPriviledgePVP(false);
+//		c->setPVPRecentActionFlag();
+		CPVPManager2::getInstance()->setPVPModeInMirror(c);
+		nlinfo ("%s %s now in pvp mode", entity.toString().c_str(), c->priviledgePVP()?"is":"isn't");
+	}
+}
+
+//----------------------------------------------------------------------------
+ENTITY_VARIABLE (FullPVP, "Full Pvp Mode")
+{
+	ENTITY_GET_CHARACTER
+
+	if (get)
+	{
+		value = c->getFullPVP()?"1":"0";
+	}
+	else
+	{
+		if (value=="1" || value=="on" || toLower(value)=="pvp" || toLower(value)=="true" )
+			c->setFullPVP(true);
+		else if (value=="0" || value=="off" || toLower(value)=="false" )
+			c->setFullPVP(false);
+//		c->setPVPRecentActionFlag();
+		CPVPManager2::getInstance()->setPVPModeInMirror(c);
+		nlinfo ("%s %s now in pvp mode", entity.toString().c_str(), c->getFullPVP()?"is":"isn't");
+	}
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(addPosFlag, "add a new position flag", "<csr_eid> <flag_name>")
+{
+	if (args.size() != 2)
+		return false;
+	GET_CHARACTER
+
+	const string & flagName = args[1];
+	if (CPositionFlagManager::getInstance().flagExists(flagName))
+	{
+		CCharacter::sendDynamicSystemMessage(eid, "CSR_POS_FLAG_EXISTS");
+		return false;
+	}
+
+	CFlagPosition flagPos( c->getState().X()/1000, c->getState().Y()/1000, c->getState().Z()/1000 );
+	CPositionFlagManager::getInstance().setFlag(flagName, flagPos);
+	CPositionFlagManager::getInstance().saveToFile(PositionFlagsFileName);
+
+	return true;
 }
 
 //----------------------------------------------------------------------------
@@ -6279,8 +7078,10 @@ NLMISC_COMMAND(setFamePlayer, "set the fame value of a player in the given facti
 
 	GET_CHARACTER
 
-	string faction = args[1];
-	uint32 factionIndex	= PVP_CLAN::getFactionIndex( PVP_CLAN::fromString(faction) );
+	uint32 factionIndex	=CStaticFames::getInstance().getFactionIndex(args[1]);
+	if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;	
+
 	sint32 fame;
 	NLMISC::fromString(args[2], fame);
 
@@ -6290,7 +7091,73 @@ NLMISC_COMMAND(setFamePlayer, "set the fame value of a player in the given facti
 
 }
 
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(addGuildBuilding, "sadd a building to guild", "<player eid> <building name>")
+{
+	if (args.size () != 2)
+		return false;
+
+	GET_CHARACTER
+
+	IBuildingPhysical *building = CBuildingManager::getInstance()->getBuildingPhysicalsByName(args[1]);
+
+	if (building == NULL)
+		return true;
+
+	if (c->getGuildId() == 0)
+		return true;
+
+	CBuildingManager::getInstance()->registerGuild( c->getGuildId(), building->getAlias() );
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(setOrganization, "set the organization of a player to the given faction", "<player eid> <faction>")
+{
+	if (args.size () != 2)
+		return false;
+
+	GET_CHARACTER
+
+	uint32 factionIndex	= CStaticFames::getInstance().getFactionIndex(args[1]);
+	if (factionIndex == CStaticFames::INVALID_FACTION_INDEX)
+			return false;	
+
+	c->setOrganization(factionIndex);
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(setOrganizationStatus, "set the organization status of a player", "<player eid> <status>")
+{
+	if (args.size () != 2)
+		return false;
+
+	GET_CHARACTER
+
+	sint32 status;
+
+	if (args[1][0] == '+')
+	{
+		NLMISC::fromString(args[1].substr(1), status);
+	}
+	else if (args[1][0] == '-')
+	{
+		NLMISC::fromString(args[1], status);
+	}
+	else
+	{
+		NLMISC::fromString(args[1], status);
+		c->setOrganizationStatus(status);
+		return true;
+	}
+
+	c->changeOrganizationStatus(status);
 
+	return true;
+}
 
 //----------------------------------------------------------------------------
 NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <nbBots> <sheet> [<dispersionRadius=10m> [<spawnBots=true> [<orientation=random|self|-360..360> [<name> [<x> [<y>]]]]]]")
@@ -6303,7 +7170,8 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	sint32 y = c->getY();
 	sint32 orientation = 6666; // used to specify a random orientation
 
-	uint32 nbBots = NLMISC::atoui(args[1].c_str());
+	uint32 nbBots;
+	fromString(args[1], nbBots);
 	if (nbBots<=0)
 	{
 		log.displayNL("invalid bot count");
@@ -6311,9 +7179,9 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	}
 
 	NLMISC::CSheetId sheetId(args[2]);
-	if (sheetId==NLMISC::CSheetId::Unknown)
+	if (sheetId==CSheetId::Unknown)
 		sheetId = args[2] + ".creature";
-	if (sheetId==NLMISC::CSheetId::Unknown)
+	if (sheetId==CSheetId::Unknown)
 	{
 		log.displayNL("invalid sheet id");
 		return true;
@@ -6322,8 +7190,8 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	double dispersionRadius = 10.;
 	if (args.size()>3)
 	{
-		dispersionRadius = atof(args[3].c_str());
-		if (dispersionRadius<0.)
+		fromString(args[3], dispersionRadius);
+		if (dispersionRadius < 0.)
 		{
 			log.displayNL("invalid dispersion radius");
 			return true;
@@ -6332,9 +7200,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 
 	bool spawnBots = true;
 	if (args.size()>4)
-	{
-		NLMISC::fromString(args[4], spawnBots);
-	}
+		fromString(args[4], spawnBots);
 
 	if (args.size()>5)
 	{
@@ -6344,22 +7210,43 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 		}
 		else if (args[5] != "random")
 		{
-			NLMISC::fromString(args[5], orientation);
+			fromString(args[5], orientation);
 			orientation = (sint32)((double)orientation / 360.0 * (NLMISC::Pi * 2.0) * 1000.0);
 		}
 	}
 
 	std::string botsName;
 	if (args.size()>6) botsName = args[6];
-	if (args.size()>7)
+	if (botsName == "*")
+			botsName.clear();
+
+	if (args.size() > 8)
 	{
-		NLMISC::fromString(args[7], x);
-		x = x * 1000;
+		if (args[7] != "*") {
+			float userX;
+			NLMISC::fromString(args[7], userX);
+			x = (sint32)(userX * 1000);
+		}
+
+		if (args[8] != "*") {
+			float userY;
+			NLMISC::fromString(args[8], userY);
+			y = (sint32)(userY * 1000);
+		}
 	}
-	if (args.size()>8)
+
+	std::string look;
+	if (args.size() > 9)
 	{
-		NLMISC::fromString(args[8], y);
-		y = y * 1000;
+		look = args[9];
+		if (look.find(".creature") == string::npos)
+			look += ".creature";
+	}
+
+	// See if another AI instance has been specified
+	if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
+	{
+		return true;
 	}
 
 	CEntityId playerId = c->getId();
@@ -6377,6 +7264,7 @@ NLMISC_COMMAND(eventCreateNpcGroup, "create an event npc group", "<player eid> <
 	msgout.serial(dispersionRadius);
 	msgout.serial(spawnBots);
 	msgout.serial(botsName);
+	msgout.serial(look);
 	CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
 
 	return true;
@@ -6407,15 +7295,21 @@ NLMISC_COMMAND(eventNpcGroupScript, "executes a script on an event npc group", "
 }
 
 //----------------------------------------------------------------------------
-NLMISC_COMMAND(eScript, "executes a script on an event npc group", "<player eid> <botname> <script>")
+NLMISC_COMMAND(eScript, "executes a script on an event npc group", "<player eid> <groupname> <script>")
 {
 	if (args.size () < 3) return false;
 	GET_CHARACTER
 
-	uint32 instanceNumber = c->getInstanceNumber(); 
+	uint32 instanceNumber = c->getInstanceNumber();
 
 	uint32 nbString = (uint32)args.size();
  
+	string botsName = args[1];
+	if ( ! getAIInstanceFromGroupName(botsName, instanceNumber))
+	{
+		return false;
+	}
+
 	CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
 	uint32 messageVersion = 1;
 	msgout.serial(messageVersion);
@@ -6423,11 +7317,30 @@ NLMISC_COMMAND(eScript, "executes a script on an event npc group", "<player eid>
 
 	string playerEid = args[0];
 	msgout.serial(playerEid);
-	string botEid = args[1];
-	msgout.serial(botEid);
+	msgout.serial(botsName);
 	for (uint32 i=2; i<nbString; ++i)
 	{
 		string arg = args[i]+";";
+
+		// Replace "(eid:<player name>)" with player Entity ID string
+		size_t pos = arg.find("(eid:");
+		while (pos != string::npos)
+		{
+			string s = arg.substr(pos, arg.find(")\"", pos) - pos + 1);
+			if (s.length() > 6)
+			{
+				string name = s.substr(5, s.length() - 6);
+				CCharacter * player = PlayerManager.getCharacterByName( CShardNames::getInstance().makeFullNameFromRelative(c->getHomeMainlandSessionId(), name) );
+				CEntityId id = CEntityId::Unknown;
+				if (player != NULL)
+				{
+					id = player->getId();
+				}
+				strFindReplace(arg, s, id.toString());
+			}
+			pos = arg.find("(eid:");
+		}
+
 		msgout.serial(arg);
 	}
 	CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
@@ -6988,34 +7901,118 @@ NLMISC_COMMAND(farTPSubst, "Substitute a position in the stack (no immediate far
 		return true;
 	}
 
-	// Modify
-	CFarPosition newFarPos = c->PositionStack[index];
-	uint32 sessionId;
-	NLMISC::fromString(args[2], sessionId);
-	newFarPos.SessionId = TSessionId(sessionId);
-	if ( args.size() > 3 )
-	{
-		NLMISC::fromString(args[3], newFarPos.PosState.X);
-		newFarPos.PosState.X *= 1000;
-		NLMISC::fromString(args[4], newFarPos.PosState.Y);
-		newFarPos.PosState.Y *= 1000;
-		if ( args.size() > 5 )
-		{
-			NLMISC::fromString(args[5], newFarPos.PosState.Z);
-			newFarPos.PosState.Z *= 1000;
-			if ( args.size() > 6 )
-			{
-				newFarPos.PosState.Heading = (float)atof(args[6].c_str());
-			}
-		}
-	}
-	c->PositionStack.substFarPosition( index, newFarPos );
+	// Modify
+	CFarPosition newFarPos = c->PositionStack[index];
+	uint32 sessionId;
+	NLMISC::fromString(args[2], sessionId);
+	newFarPos.SessionId = TSessionId(sessionId);
+	if ( args.size() > 3 )
+	{
+		NLMISC::fromString(args[3], newFarPos.PosState.X);
+		newFarPos.PosState.X *= 1000;
+		NLMISC::fromString(args[4], newFarPos.PosState.Y);
+		newFarPos.PosState.Y *= 1000;
+		if ( args.size() > 5 )
+		{
+			NLMISC::fromString(args[5], newFarPos.PosState.Z);
+			newFarPos.PosState.Z *= 1000;
+			if ( args.size() > 6 )
+			{
+				newFarPos.PosState.Heading = (float)atof(args[6].c_str());
+			}
+		}
+	}
+	c->PositionStack.substFarPosition( index, newFarPos );
+	return true;
+}
+
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(teamInvite, "send a team invite to a player character", "<eid> <member name>")
+{
+	if(args.size() != 2 )
+		return false;
+
+	CEntityId eId;
+	eId.fromString(args[0].c_str());
+
+	// check user
+	CCharacter * user = PlayerManager.getChar( eId );
+	if (!user)
+	{
+		log.displayNL("<TEAMINVITE>'%s' is not a valid char. Cant process command",eId.toString().c_str());
+		return true;
+	}
+	if (!user->getEnterFlag())
+	{
+		log.displayNL("'%s' is not entered", eId.toString().c_str());
+		return true;
+	}
+	if (!TheDataset.isAccessible(user->getEntityRowId()))
+	{
+		log.displayNL("'%s' is not valid in mirror", eId.toString().c_str());
+		return true;
+	}
+
+	// Get target
+	CCharacter	*invitedCharacter= PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(user->getHomeMainlandSessionId(), args[1]));
+	if(invitedCharacter == 0 || invitedCharacter->getEnterFlag() == false )
+	{
+		CCharacter::sendDynamicSystemMessage( user->getId(),"TEAM_INVITED_CHARACTER_MUST_BE_ONLINE" );
+		return true;
+	}
+
+	// Join
+	user->setAfkState(false);
+	TeamManager.joinProposal( user, invitedCharacter->getId() );
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(leagueInvite, "send a League invite to a player character", "<eid> <player name>")
+{
+	if(args.size() != 2 )
+		return false;
+
+	CEntityId eId;
+	eId.fromString(args[0].c_str());
+
+	// check user
+	CCharacter * user = PlayerManager.getChar( eId );
+	if (!user)
+	{
+		log.displayNL("<LEAGUE_INVITE>'%s' is not a valid char. Cant process command",eId.toString().c_str());
+		return true;
+	}
+	if (!user->getEnterFlag())
+	{
+		log.displayNL("'%s' is not entered", eId.toString().c_str());
+		return true;
+	}
+	if (!TheDataset.isAccessible(user->getEntityRowId()))
+	{
+		log.displayNL("'%s' is not valid in mirror", eId.toString().c_str());
+		return true;
+	}
+
+	// Get target
+	CCharacter	*invitedCharacter= PlayerManager.getCharacterByName(CShardNames::getInstance().makeFullNameFromRelative(user->getHomeMainlandSessionId(), args[1]));
+	if(invitedCharacter == 0 || invitedCharacter->getEnterFlag() == false )
+	{
+		CCharacter::sendDynamicSystemMessage( user->getId(),"TEAM_INVITED_CHARACTER_MUST_BE_ONLINE" );
+		return true;
+	}
+
+	// Join
+	user->setAfkState(false);
+	TeamManager.joinLeagueProposal( user, invitedCharacter->getId() );
+
 	return true;
 }
 
-
 //----------------------------------------------------------------------------
-NLMISC_COMMAND(teamInvite, "send a team invite to a player character", "<eid> <member name>")
+NLMISC_COMMAND(leagueKick, "kick a player character from league", "<eid> <member name>")
 {
 	if(args.size() != 2 )
 		return false;
@@ -7027,7 +8024,7 @@ NLMISC_COMMAND(teamInvite, "send a team invite to a player character", "<eid> <m
 	CCharacter * user = PlayerManager.getChar( eId );
 	if (!user)
 	{
-		log.displayNL("<TEAMINVITE>'%s' is not a valid char. Cant process command",eId.toString().c_str());
+		log.displayNL("<LEAGUE_INVITE>'%s' is not a valid char. Cant process command",eId.toString().c_str());
 		return true;
 	}
 	if (!user->getEnterFlag())
@@ -7049,18 +8046,36 @@ NLMISC_COMMAND(teamInvite, "send a team invite to a player character", "<eid> <m
 		return true;
 	}
 
-	// Join
+	// Kick
 	user->setAfkState(false);
-	TeamManager.joinProposal( user, invitedCharacter->getId() );
-
+	
+	CTeam * team = TeamManager.getTeam( user->getTeamId() );
+	if (!team)
+		return true;
+	
+	if (team->getLeader() != eId )
+		return true;
+	
+	if (user->getLeagueId() != invitedCharacter->getLeagueId())
+		return true;
+	
+	team = TeamManager.getTeam( invitedCharacter->getTeamId() );
+	if (!team) {
+		invitedCharacter->setLeagueId(DYN_CHAT_INVALID_CHAN);
+	} else {
+		team->setLeagueId(DYN_CHAT_INVALID_CHAN);
+		team->updateLeague();
+	}
+	
 	return true;
 }
 
 
+
 //----------------------------------------------------------------------------
-NLMISC_COMMAND(resetPVPTimers, "reset the pvp timers of a player", "<CSR eId><player name>")
+NLMISC_COMMAND(resetPVPTimers, "Reset the pvp timers of a player", "<CSR eId><player name>")
 {
-	if ( args.size() < 1 )
+	if ( args.size() < 2 )
 		return false;
 
 	GET_CHARACTER
@@ -7194,3 +8209,388 @@ NLMISC_COMMAND(eventSetBotURLName, "changes the url name of a bot", "<bot eid> <
 
 	return true;
 }
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventNpcSay, "have a bot say a text", "<bot eid> <text to say> <optional mode ('say', 'shout'...)> ")
+{
+	if (args.size() < 2 || args.size() > 3) return false;
+	GET_ENTITY
+
+	string text(args[1]);
+
+	CChatGroup::TGroupType mode = CChatGroup::say;
+	if (args.size() == 3)
+	{
+		mode = CChatGroup::stringToGroupType(args[2]);
+	}
+
+	std::string prefix = NLMISC::CSString(text).left(3);
+	if (NLMISC::nlstricmp(prefix.c_str(), "ID:") == 0)
+	{
+		NLMISC::CSString phrase = NLMISC::CSString(text).right(text.length()-3);
+		npcChatToChannel(e->getEntityRowId(), mode, phrase);
+	}
+	else
+	{
+		ucstring ucstr = text;
+		npcChatToChannelSentence(e->getEntityRowId(), mode, ucstr);
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventSetBotFacing, "Set the direction in which a bot faces", "<bot eid> <angle 0-360|random> [<whole group (0,1)>]")
+{
+	if (args.size () < 2) return false;
+	GET_ENTITY
+
+	float orientation = 0;
+	std::string param = args[1];
+	if (param == "random")
+	{
+		orientation = 6666; // used to specify a random orientation
+	}
+	else
+	{
+		NLMISC::fromString(args[1], orientation);
+		orientation = (orientation / 360.0 * (NLMISC::Pi * 2.0));
+	}
+
+
+	std::vector<std::string> args2;
+
+	if (args.size() == 3 && args[3] != "0")
+	{
+		// Do the whole group
+		args2.push_back(args[0]);
+		args2.push_back(NLMISC::toString("()facing(%f);", orientation));
+	}
+	else
+	{
+		// This bot only
+		TAIAlias alias = CAIAliasTranslator::getInstance()->getAIAlias(eid);
+		args2.push_back(args[0]);
+		args2.push_back(NLMISC::toString("()facing(\"%s\",%f);", NLMISC::toString(alias).c_str(), orientation));
+	}
+
+	uint32 instanceNumber = e->getInstanceNumber();
+	uint32 nbString = args2.size();
+
+	CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
+	uint32 messageVersion = 1;
+	msgout.serial(messageVersion);
+	msgout.serial(nbString);
+	for (uint32 i=0; i<nbString; ++i)
+	{
+		string arg = args2[i];
+		msgout.serial(arg);
+	}
+	CWorldInstances::instance().msgToAIInstance2(instanceNumber, msgout);
+
+	return true;
+}
+
+
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(characterInventoryDump, "Dump character inventory info", "<eid> <inventory> [<from slot> <to slot>]")
+{
+	if (args.size () < 2)
+	{
+		log.displayNL("Invalid number of parameters. Parameters: <inventory> [<from slot> <to slot>]");
+		return false;
+	}
+	GET_CHARACTER
+
+	string selected_inv = args[1];
+
+	CInventoryPtr inventory = getInv(c, selected_inv);
+
+	if (inventory == NULL)
+	{
+		log.displayNL("Invalid inventory '%s'.", selected_inv.c_str());
+		return false;
+	}
+
+	uint32 start_slot = 0;
+	uint32 end_slot = inventory->getSlotCount();
+
+	if (args.size() == 4)
+	{
+		fromString(args[2], start_slot);
+		fromString(args[3], end_slot);
+		start_slot = std::max(uint32(0), start_slot);
+		end_slot = std::min(end_slot, inventory->getSlotCount());
+	}
+
+	uint32 j = 0;
+	string msg;
+	for (uint32 i = start_slot; i < end_slot; ++i)
+	{
+		CGameItemPtr itemPtr = inventory->getItem(i);
+		if (itemPtr != NULL)
+		{
+			string sheet = itemPtr->getSheetId().toString();
+			uint32 quality = itemPtr->quality();
+			uint32 stacksize = itemPtr->getStackSize();
+			
+			msg += NLMISC::toString("- Slot %3d: SHEETID: %s    QUALITY: %d   QUANTITY: %d\n", 
+				i,
+				sheet.c_str(),
+				quality,
+				stacksize);
+
+			++j;
+			if ( ! (j % 3)) {
+				log.displayNL(msg.c_str());	
+				msg = "";
+				j = 0;
+			}
+		}
+	}
+
+	log.displayNL("Showing slot %d - %d for inventory '%s':", start_slot, end_slot, selected_inv.c_str());
+	if (msg.length() > 0)
+	{
+		log.displayNL(msg.c_str());
+	}
+	else {
+		log.displayNL("Nothing to display.");
+	}
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(deleteInventoryItem, "Delete an item from a characters inventory", "<eid> <inventory> <slot> <sheetname> <quality> <quantity>")
+{
+	if (args.size () < 6)
+	{
+		log.displayNL("Invalid number of parameters. Parameters: <inventory> <slot> <sheetname> <quality> <quantity>");
+		return false;
+	}
+
+	GET_CHARACTER
+
+	string selected_inv = args[1];
+
+	sint32 slot = -1;
+	fromString(args[2], slot);
+
+	string sheet_name = args[3];
+
+	uint32 quality = 0;
+	fromString(args[4], quality);
+
+	uint32 quantity = 0;
+	fromString(args[5], quantity);
+
+	if (sheet_name.find(".") == string::npos)
+		sheet_name += ".sitem";
+
+	CInventoryPtr inventory = getInv(c, selected_inv);
+
+	if (inventory == NULL)
+	{
+		log.displayNL("Invalid inventory '%s'.", selected_inv.c_str());
+		return false;
+	}
+
+	if (slot < 0 || quality == 0 || quantity == 0)
+	{
+		log.displayNL("Invalid slot or quantity.");
+		return false;
+	}
+
+	const CGameItemPtr itemPtr = inventory->getItem(slot);
+	if (itemPtr != NULL)
+	{
+		if (itemPtr->getSheetId().toString() == sheet_name &&
+			itemPtr->quality() == quality &&
+			itemPtr->getStackSize() >= quantity)
+		{
+			log.displayNL("Deleted item '%s' in slot %d of inventory '%s'", 
+				itemPtr->getSheetId().toString().c_str(),
+				slot,
+				INVENTORIES::toString(inventory->getInventoryId()).c_str()
+			);
+			inventory->deleteStackItem(slot, quantity);
+			return true;
+		}
+		log.displayNL("Incorrect sheetid, quality, or quantity.");
+		return false;
+	}
+
+	log.displayNL("Invalid slot or item.");
+	return false;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (resetName, "Reset your name; undo a temporary rename", "<user id>")
+{
+	GET_CHARACTER
+	c->registerName();
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (lockItem, "Lock/unlock item in inventory", "<user id> <inventory> <slot> <lock=0,1>")
+{
+	if (args.size () < 4) return false;
+	GET_CHARACTER;
+
+	string selected_inv = args[1];
+	bool lock = (args[3] != "0");
+	sint32 slot = -1;
+	fromString(args[2], slot);
+
+	CInventoryPtr inventory = getInv(c, selected_inv);
+
+	if (inventory == NULL) return false;
+
+	if (slot < 0 || slot >= INVENTORIES::NbBagSlots) return false;
+
+	const CGameItemPtr itemPtr = inventory->getItem(slot);
+	if (itemPtr != NULL)
+	{
+		// If some of the stack is locked for trading, cannot owner-lock.
+		if (itemPtr->getNonLockedStackSize() < itemPtr->getStackSize())
+		{
+			// TODO: send error message to client?
+			return false;
+		}
+		itemPtr->setLockedByOwner(lock);
+	}
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (setTeamLeader, "Set the leader of the team", "<user id> <member>")
+{
+	if (args.size () < 2) return false;
+	GET_CHARACTER;
+
+	uint8 idx = 0;
+	fromString(args[1], idx);
+
+	CTeam *team = TeamManager.getTeam(c->getTeamId());
+
+	if ( ! team)
+	{
+		nlwarning("<TEAM> Invalid team for user %s",c->getId().toString().c_str() );
+		return false;
+	}
+	if (team->getLeader() != c->getId())
+	{
+		nlwarning("<TEAM> user %s is not leader: cant set leader",c->getId().toString().c_str() );
+		return false;
+	}
+
+	// increment the target index as the leader is not in his own team list
+	++idx;
+	team->setLeader(idx);
+	team->updateMembersDb();
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND (setLeague, "Set the League of the team", "<user id> [<name>]")
+{
+	GET_CHARACTER;
+
+	CTeam *team = TeamManager.getTeam(c->getTeamId());
+
+	if (!team)
+	{
+		if (args.size () != 2)
+			c->setLeagueId(DYN_CHAT_INVALID_CHAN);
+		else
+			CCharacter::sendDynamicSystemMessage( c->getId(),"LEAGUE_INVITOR_NOT_LEADER" );
+		return true;
+	}
+	
+	if (team->getLeader() != c->getId())
+	{
+		CCharacter::sendDynamicSystemMessage( c->getId(),"LEAGUE_INVITOR_NOT_LEADER" );
+		return false;
+	}
+
+	if (args.size () == 2)
+		team->setLeague(args[1]);
+	else
+		team->setLeague("");
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventGiveControl, "Give control of entity A to entity B", "<eid> <master eid> <slave eid>")
+{
+	if (args.size() != 3) return false;
+ 
+	CEntityId masterEid(args[1]);
+	CEntityId slaveEid(args[2]);
+	
+	nlinfo("%s takes control of %s", args[1].c_str(), args[2].c_str());
+
+	CMessage msgout("ACQUIRE_CONTROL");
+	msgout.serial( slaveEid );
+	msgout.serial( masterEid );
+	sint32 local = 0;
+	msgout.serial( local );
+	msgout.serial( local );
+	msgout.serial( local );
+	sendMessageViaMirror( "GPMS", msgout );
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(eventLeaveControl, "Leave control of entity", "<eid> <master eid>")
+{
+	if (args.size() != 2) return false;
+ 
+	CEntityId masterEid(args[1]);
+	
+	nlinfo("%s leaves control", args[1].c_str());
+
+	CMessage msgout("LEAVE_CONTROL");
+	msgout.serial( masterEid );
+	sendMessageViaMirror( "GPMS", msgout );
+
+	return true;
+}
+
+//----------------------------------------------------------------------------
+NLMISC_COMMAND(setSimplePhrase, "Set an IOS phrase", "<id> <phrase> [<language code>]")
+{
+	if (args.size() < 2)
+		return false;
+
+	string phraseName = args[0];
+	ucstring phraseContent = phraseName;
+	phraseContent += "(){[";
+	phraseContent += args[1];
+	phraseContent += "]}";
+
+	string msgname = "SET_PHRASE";
+	bool withLang = false;
+	string lang = "";
+	if (args.size() == 3) 
+	{
+		lang = args[2];
+		if (lang != "all")
+		{
+			withLang = true;
+			msgname = "SET_PHRASE_LANG";
+		}
+	}
+
+	NLNET::CMessage	msgout(msgname);
+	msgout.serial(phraseName);
+	msgout.serial(phraseContent);
+	if (withLang)
+		msgout.serial(lang);
+	sendMessageViaMirror("IOS", msgout);
+	return true;
+}
\ No newline at end of file
diff --git a/code/ryzom/server/src/entities_game_service/admin.h b/code/ryzom/server/src/entities_game_service/admin.h
index 59b155451..73b06dbd3 100644
--- a/code/ryzom/server/src/entities_game_service/admin.h
+++ b/code/ryzom/server/src/entities_game_service/admin.h
@@ -43,6 +43,8 @@ struct CAdminCommand
 void initAdmin ();
 void initCommandsPrivileges(const std::string & fileName);
 void initPositionFlags(const std::string & fileName);
+void initSalt();
+const std::string &getSalt();
 
 CAdminCommand * findAdminCommand(const std::string & name);
 
diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp
index c47246b2e..eacce2cbd 100644
--- a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.cpp
@@ -268,6 +268,7 @@ bool CBuildingManager::parsePhysicalBuildings( const NLLIGO::IPrimitive* prim, C
 			else
 			{
 				_BuildingPhysicals.insert( make_pair( alias, building ) );
+				_BuildingPhysicalsName.insert( make_pair( building->getName(), building));
 				return true;
 			}
 		}
@@ -853,18 +854,18 @@ IBuildingPhysical * CBuildingManager::getBuildingPhysicalsByAlias( TAIAlias alia
 //----------------------------------------------------------------------------
 IBuildingPhysical* CBuildingManager::getBuildingPhysicalsByName( const std::string & name )
 {
-	for ( std::map<TAIAlias,IBuildingPhysical*>::iterator it =  _BuildingPhysicals.begin(); it != _BuildingPhysicals.end(); ++it )
+	std::map<std::string,IBuildingPhysical*>::iterator it =  _BuildingPhysicalsName.find( name );
+	if ( it != _BuildingPhysicalsName.end() )
 	{
 		if( (*it).second == NULL )
 		{
 			nlwarning("<BUILDING> NULL building in building maps. Checks should be done at init time");
 			return NULL;
 		}
-		if ( (*it).second->getName() == name )
-			return (*it).second;
+		return (*it).second;
 	}
-	return NULL;
 
+	return NULL;
 }
 
 //----------------------------------------------------------------------------
@@ -1134,3 +1135,9 @@ void CBuildingManager::buyBuildingOption(const NLMISC::CEntityId & userId, uint8
 	}
 }
 
+//----------------------------------------------------------------------------
+void CBuildingManager::buyBuilding(const NLMISC::CEntityId & userId, TAIAlias alias)
+{
+	CCharacter * user = PlayerManager.getChar(userId);
+	user->getRoomInterface().init( user, dynamic_cast<CBuildingPhysicalPlayer*>(getBuildingPhysicalsByAlias(alias)) );
+}
diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h
index 82189c9fe..c30fbb93e 100644
--- a/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h
+++ b/code/ryzom/server/src/entities_game_service/building_manager/building_manager.h
@@ -86,7 +86,7 @@ public:
 	void registerPlayer( CCharacter * user );
 	/// get a building destination from its alias.
 	IBuildingPhysical* getBuildingPhysicalsByAlias( TAIAlias Alias );
-	/// get a building destination from its name. WARNING : slow
+	/// get a building destination from its name.
 	IBuildingPhysical* getBuildingPhysicalsByName( const std::string & name );
 	/// remove a player from a room
 	void removePlayerFromRoom( CCharacter * user );
@@ -122,6 +122,7 @@ public:
 	void buildBuildingTradeList(const NLMISC::CEntityId & userId, uint16 session);
 	/// buy a player flat option
 	void buyBuildingOption(const NLMISC::CEntityId & userId, uint8 idx);
+	void buyBuilding(const NLMISC::CEntityId & userId, TAIAlias alias);
 	//@}
 
 private:
@@ -201,9 +202,12 @@ private:
 	typedef CHashMap< TDataSetRow , CTriggerRequest , TDataSetRow::CHashCode > TTriggerRequestCont;
 	TTriggerRequestCont		_TriggerRequests;
 
-	/// physical buildings by name
+	/// physical buildings by Alias
 	std::map<TAIAlias,IBuildingPhysical*> _BuildingPhysicals;
 
+	/// physical buildings by name
+	std::map<std::string,IBuildingPhysical*> _BuildingPhysicalsName;
+
 	/// room instances
 	struct CRoomInstanceEntry
 	{
diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h b/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h
index d37966aeb..d635ecd71 100644
--- a/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h
+++ b/code/ryzom/server/src/entities_game_service/building_manager/building_physical.h
@@ -73,9 +73,9 @@ public:
 	/// fill the icon param, send the description text to the user and store the resulting text id in the textId param. 
 	virtual void getClientDescription(uint16 roomIdx, uint16 ownerIndex, CCharacter * user, uint64 & icon, uint32 & textId )const = 0;
 	/// callback called when all the appartments of a user must be removed
-	virtual void onPlayerDeletion( const NLMISC::CEntityId & userId ){};
+	virtual void onPlayerDeletion( const NLMISC::CEntityId & userId ){}
 	/// callback called when all the appartments of a guild must be removed
-	virtual void onGuildDeletion( uint32 guild ){};
+	virtual void onGuildDeletion( uint32 guild ){}
 	/// return true if the user is allowed to go in the building
 	virtual bool isUserAllowed(CCharacter * user, uint16 ownerIdx, uint16 roomIdx) = 0;
 	///return the number of owner in this building ( return 1 for common buildings )
diff --git a/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h b/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h
index 744848d8b..26f020bc9 100644
--- a/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h
+++ b/code/ryzom/server/src/entities_game_service/building_manager/building_physical_inline.h
@@ -109,7 +109,6 @@ void CBuildingPhysicalGuild::addGuild( uint32 guildId )
 {
 	if ( std::find(_Guilds.begin(), _Guilds.end(), guildId) != _Guilds.end() )
 	{
-		nlwarning("<BUILDING> trying to add a guild that is already present in the building, guild id = %u", guildId);
 		return;
 	}
 
diff --git a/code/ryzom/server/src/entities_game_service/client_messages.cpp b/code/ryzom/server/src/entities_game_service/client_messages.cpp
index f654b4a2a..dab42cb18 100644
--- a/code/ryzom/server/src/entities_game_service/client_messages.cpp
+++ b/code/ryzom/server/src/entities_game_service/client_messages.cpp
@@ -815,6 +815,34 @@ void cbClientCombatDodge( NLNET::CMessage& msgin, const std::string &serviceName
 	}
 }
 
+
+
+
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+//		CLIENT:LEAGUE
+///////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+//
+void cbClientLeagueJoin( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	cbJoinLeague(msgin, serviceName, serviceId);
+}
+
+//
+void cbClientLeagueJoinProposal( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	cbJoinLeagueProposal(msgin, serviceName, serviceId);
+}
+
+//
+void cbClientLeagueJoinProposalDecline( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	cbJoinLeagueDecline(msgin, serviceName, serviceId);
+}
+
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 //		CLIENT:TEAM
@@ -857,7 +885,8 @@ void cbClientTeamSetSuccessor( NLNET::CMessage& msgin, const std::string &servic
 
 	CEntityId id;
 	uint8 idx;
-	msgin.serial( id,idx );
+	msgin.serial(id);
+	msgin.serial(idx);
 	CCharacter* user = PlayerManager.getChar( id );
 	if ( !user )
 	{
@@ -872,9 +901,17 @@ void cbClientTeamSetSuccessor( NLNET::CMessage& msgin, const std::string &servic
 	}
 	if ( team->getLeader() != id )
 	{
-		nlwarning("<TEAM> user %s is not leader : cant set successor",id.toString().c_str() );
+		nlwarning("<TEAM> user %s is not leader: cant set successor",id.toString().c_str() );
+		return;
+	}
+	if (team->getSuccessor() == id)
+	{
+		nlwarning("<TEAM> user %s already is successor", id.toString().c_str() );
 		return;
 	}
+
+	// increment the target index as the leader is not in its team list
+	++idx;
 	team->setSuccessor( idx );
 
 }
@@ -2370,7 +2407,6 @@ void cbClientWhere( NLNET::CMessage& msgin, const std::string &serviceName, NLNE
 	}\
 }
 
-
 // Send list of connected character name / account to client
 void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId )
 {
@@ -2381,6 +2417,11 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 	msgin.serial( id,opt );
 	const std::vector<CEntityId> * gms = NULL;
 
+	// Make sure opt is not like "A(c)" for "é"
+	ucstring ucopt;
+	ucopt.fromUtf8(opt);
+	opt = ucopt.toString();
+
 	uint nbAnswers = 0;
 
 	// standard who
@@ -2420,7 +2461,7 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 						&& user->getInstanceNumber() == ch->getInstanceNumber())
 					{
 						params[0].setEId( (*it) );
-						CCharacter::sendDynamicSystemMessage( id,"WHO_REGION_LIST",params );
+						CCharacter::sendDynamicSystemMessage( id,"WHO_REGION_LIST", params );
 						nbAnswers++;
 					}
 				}
@@ -2429,7 +2470,7 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 
 	}
 	// GM who
-	else if ( NLMISC::nlstricmp( opt.c_str() , "GM" ) == 0)
+	else if ( NLMISC::nlstricmp( opt.c_str(), "GM" ) == 0)
 	{
 		TVectorParamCheck params(1);
 		params[0].Type = STRING_MANAGER::player;
@@ -2476,6 +2517,75 @@ void cbClientWho( NLNET::CMessage& msgin, const std::string &serviceName, NLNET:
 			}
 		}
 	}
+	else
+	{
+		TChanID chanID;
+
+		CCharacter * user = PlayerManager.getChar( id );
+		if ( !user )
+		{
+			nlwarning("<WHO>'%s' is invalid", id.toString().c_str() );
+			return;
+		}
+		CPlayer *p = PlayerManager.getPlayer(PlayerManager.getPlayerId(user->getId()));
+		
+		if (NLMISC::nlstricmp( opt.c_str(), "league" ) == 0)
+		{
+			chanID = user->getLeagueId();
+		}
+		else
+		{
+			chanID = DynChatEGS.getChanIDFromName(opt);
+		}
+
+		if (chanID == DYN_CHAT_INVALID_CHAN)
+		{
+			CCharacter::sendDynamicSystemMessage( id, "WHO_CHANNEL_NOT_FOUND" );
+			return;
+		}
+
+		bool havePriv = p->havePriv(":DEV:SGM:GM:");
+		bool hasChannel = false;
+		nbAnswers = 0;
+
+		vector<NLMISC::CEntityId> players;
+		DynChatEGS.getPlayersInChan(chanID, players);
+		ucstring playerNames("");
+		uint32 shardId = CEntityIdTranslator::getInstance()->getEntityShardId(id);
+
+		for (uint i = 0; i < players.size(); i++)
+		{
+			if (players[i] == id)
+				hasChannel = true;
+
+			ucstring name = CEntityIdTranslator::getInstance()->getByEntity(players[i]);
+			if (shardId == CEntityIdTranslator::getInstance()->getEntityShardId(players[i]))
+			{
+				// Same shard, remove shard from name
+				CEntityIdTranslator::removeShardFromName(name);
+			}
+			playerNames += ((i > 0) ? "\n" : "") + name ;
+		}
+
+		if (!hasChannel && !havePriv)
+		{
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = opt;
+			CCharacter::sendDynamicSystemMessage( id, "WHO_CHANNEL_NOT_CONNECTED", params );
+
+			return;
+		}
+
+		if (!playerNames.empty())
+		{
+			CCharacter::sendDynamicSystemMessage( id, "WHO_CHANNEL_INTRO" );
+			//playerNames = "Players in channel \"" + opt + "\":" + playerNames;
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = playerNames;
+			CCharacter::sendDynamicSystemMessage( id, "LITERAL", params );
+			return;
+		}
+	}
 
 	if ( nbAnswers == 0 )
 	{
@@ -3508,9 +3618,9 @@ TUnifiedCallbackItem CbClientArray[]=
 	{ "CLIENT:DUEL:REFUSE",						cbClientDuelRefuse },
 	{ "CLIENT:DUEL:ABANDON",					cbClientDuelAbandon },
 
-	{ "CLIENT:PVP_CHALLENGE:ASK",				cbClientPVPChallengeAsked },
-	{ "CLIENT:PVP_CHALLENGE:ACCEPT",			cbClientPVPChallengeAccept },
-	{ "CLIENT:PVP_CHALLENGE:REFUSE",			cbClientPVPChallengeRefuse },
+	{ "CLIENT:PVP_CHALLENGE:ASK",				cbClientLeagueJoinProposal },
+	{ "CLIENT:PVP_CHALLENGE:ACCEPT",			cbClientLeagueJoin },
+	{ "CLIENT:PVP_CHALLENGE:REFUSE",			cbClientLeagueJoinProposalDecline },
 	{ "CLIENT:PVP_CHALLENGE:ABANDON",			cbClientPVPChallengeAbandon },
 
 //	{ "CLIENT:PVP_VERSUS:CLAN",					cbClientPvpChooseClan },
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp b/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp
index 87378dc13..361bc188e 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature.cpp
@@ -145,6 +145,7 @@ CCreature::CCreature() : CEntityBase(true)
 	_TicketFameRestrictionValue = 0;
 	_MaxHitRangeForPC = -1.f;
 
+	_Organization = 0;
 //	_MissionIconFlags.IsMissionStepIconDisplayable = true;
 //	_MissionIconFlags.IsMissionGiverIconDisplayable = true;
 }
@@ -941,6 +942,8 @@ void CCreature::setBotDescription( const CGenNpcDescMsgImp& description )
 
 	_BotChatOutpost = description.getOutpost();
 	
+	_Organization = description.getOrganization();
+
 	bool cosmeticCategory = false;
 	bool tradeCategory = false;
 	bool tpCategory = false;
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature.h b/code/ryzom/server/src/entities_game_service/creature_manager/creature.h
index 3239c734a..a1ea67812 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature.h
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature.h
@@ -496,6 +496,8 @@ public:
 	const std::string &getWebPage() const {return _WebPage;}
 	const std::string &getWebPageName() const {return _WebPageName;}
 
+	const uint32 getOrganization() const { return _Organization; }
+
 	const NLMISC::CSheetId &getBotChatOutpost() const {return _BotChatOutpost;}
 
 	const std::vector<NLMISC::CSheetId> &getExplicitActionTradeList() const {return _ExplicitActionTradeList;}
@@ -590,6 +592,7 @@ private:
 	NLMISC::CSmartPtr<CMerchant> 	_Merchant;					// smart pointer on CMerchant class of creature
 
 	uint32							_BotChatProgram;			// Program enabled for bot chat
+	uint32							_Organization;				// Organization for bot
 
 	TDataSetRow						_CharacterLeaderIndex;		// The data set row of the beast's leader character if it's in a pack/train
 	std::string						_WelcomePhrase;				// welcome message id of the bot
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp
index ebeb904a5..a7a5e8d88 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.cpp
@@ -195,6 +195,28 @@ void CCreatureCompleteHealImp::callback(const string &, NLNET::TServiceId sid)
 	}
 }
 
+//--------------------------------------------------------------
+//				CChangeCreatureMaxHPImp ::callback()  
+//--------------------------------------------------------------
+void CChangeCreatureMaxHPImp::callback(const string &, NLNET::TServiceId sid)
+{
+	H_AUTO(CChangeCreatureMaxHPImp);
+	
+	// for each creature, restore full HP
+	for ( uint i = 0; i < Entities.size(); ++i )
+	{
+		CCreature * c = CreatureManager.getCreature( Entities[i] );
+		if ( c )
+		{
+			c->getScores()._PhysicalScores[SCORES::hit_points].Max = MaxHp[i];
+			if (SetFull[i] != 0)
+				c->changeCurrentHp( c->maxHp() - c->currentHp() );
+		}
+	}
+}
+
+
+
 //--------------------------------------------------------------
 //				CChangeCreatureHPImp ::callback()  
 //--------------------------------------------------------------
@@ -229,6 +251,50 @@ void CChangeCreatureHPImp::callback(const string &, NLNET::TServiceId sid)
 	}
 }
 
+
+//--------------------------------------------------------------
+//				CChangeCreatureMaxHPImp ::callback()  
+//--------------------------------------------------------------
+void CCreatureSetUrlImp::callback(const string &, NLNET::TServiceId sid)
+{
+	H_AUTO(CCreatureSetUrlImp);
+
+	// for each creature set url
+	for ( uint i = 0; i < Entities.size(); ++i )
+	{
+		CCreature * c = CreatureManager.getCreature( Entities[i] );
+		if ( c )
+		{
+			uint32 program = c->getBotChatProgram();
+			if(!(program & (1<<BOTCHATTYPE::WebPageFlag)))
+			{
+				if(program != 0)
+				{
+					return;
+				}
+				program |= 1 << BOTCHATTYPE::WebPageFlag;
+				c->setBotChatProgram(program);
+			}
+			
+			const string &wp = c->getWebPage();
+			if(Url == "*") {
+				(string &)wp = "";
+				program &= ~(1 << BOTCHATTYPE::WebPageFlag);
+				c->setBotChatProgram(program);
+				return;
+			}
+			else
+				(string &)wp = Url;
+
+			const string &wpn = c->getWebPageName();
+			(string &)wpn = ActionName;
+
+			return;
+		}
+	}
+}
+
+
 //---------------------------------------------------
 // Constructor
 //
diff --git a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h
index e4e96b3ad..388c9f3b4 100644
--- a/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h
+++ b/code/ryzom/server/src/entities_game_service/creature_manager/creature_manager.h
@@ -71,6 +71,15 @@ public:
 	virtual void callback (const std::string &name, NLNET::TServiceId id);
 };
 
+/**
+ * Implementation of the set Max HP message for creatures
+ */
+class CChangeCreatureMaxHPImp : public CChangeCreatureMaxHPMsg
+{
+public:
+	virtual void callback (const std::string &name, NLNET::TServiceId id);
+};
+
 /**
  * Implementation of the change HP message for creatures
  */
@@ -81,6 +90,16 @@ public:
 };
 
 
+/**
+ * Implementation of the change setUrl message for creatures
+ */
+class CCreatureSetUrlImp : public CCreatureSetUrlMsg
+{
+public:
+	virtual void callback (const std::string &name, NLNET::TServiceId id);
+};
+
+
 typedef CHashMap< NLMISC::CEntityId, CCreature *, NLMISC::CEntityIdHashMapTraits> TMapCreatures;
 
 /**
@@ -102,14 +121,14 @@ public:
 	/// exception thrown when creature is unknown
 	struct ECreature : public NLMISC::Exception
 	{
-		ECreature( const NLMISC::CEntityId& id ) : Exception ("The creature "+id.toString()+" doesn't exist") {};
+		ECreature( const NLMISC::CEntityId& id ) : Exception ("The creature "+id.toString()+" doesn't exist") {}
 	};
 
 	/// structure describing an unaffected fauna group ( because the description is received before mirror update )
 	struct SUnaffectedFaunaGroup
 	{
 		SUnaffectedFaunaGroup(const TDataSetRow& entityIndex,TAIAlias	groupAlias)
-			:EntityIndex( entityIndex ),GroupAlias( groupAlias ){};
+			:EntityIndex( entityIndex ),GroupAlias( groupAlias ){}
 		TDataSetRow EntityIndex;
 		TAIAlias	GroupAlias;
 	};
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.cpp b/code/ryzom/server/src/entities_game_service/database_plr.cpp
index 42876cf60..d51e35479 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.cpp
+++ b/code/ryzom/server/src/entities_game_service/database_plr.cpp
@@ -3139,7 +3139,10 @@ void CBankAccessor_PLR::TPACK_ANIMAL::TBEAST::init(ICDBStructNode *parent, uint
 	node  = parent->getNode( ICDBStructNode::CTextId("DESPAWN"), false );
 	nlassert(node != NULL);
 	_DESPAWN = node;
-	
+
+	node  = parent->getNode( ICDBStructNode::CTextId("NAME"), true );
+	nlassert(node != NULL);
+	_NAME = node;
 
 	// branch init
 	
diff --git a/code/ryzom/server/src/entities_game_service/database_plr.h b/code/ryzom/server/src/entities_game_service/database_plr.h
index 4df8c37a4..b1747cc9c 100644
--- a/code/ryzom/server/src/entities_game_service/database_plr.h
+++ b/code/ryzom/server/src/entities_game_service/database_plr.h
@@ -8855,7 +8855,7 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		ICDBStructNode	*_POS;
 		ICDBStructNode	*_HUNGER;
 		ICDBStructNode	*_DESPAWN;
-		
+		ICDBStructNode	*_NAME;		
 
 	public:
 		void init(ICDBStructNode *parent, uint index);
@@ -9044,7 +9044,24 @@ inline void _getProp(const CCDBSynchronised &db, ICDBStructNode *node, NLMISC::C
 		{
 			return _DESPAWN;
 		}
-	
+
+		void setNAME(CCDBSynchronised &dbGroup, uint32 value, bool forceSending = false)
+		{
+			_setProp(dbGroup, _NAME, value, forceSending);
+		}
+
+		uint32 getNAME(const CCDBSynchronised &dbGroup)
+		{
+			uint32 value;
+			_getProp(dbGroup, _NAME, value);
+
+			return value;
+		}
+
+		ICDBStructNode *getNAMECDBNode()
+		{
+			return _NAME;
+		}
 	};
 		
 
diff --git a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
index 884c5da98..3c67bfb6f 100644
--- a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
+++ b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.cpp
@@ -248,6 +248,23 @@ bool CDynChatEGS::removeSession(TChanID chan,const TDataSetRow &client)
 	return true;
 }
 
+//============================================================================================================
+bool CDynChatEGS::getPlayersInChan(TChanID chanID, std::vector<NLMISC::CEntityId> &players)
+{
+	CDynChatChan *chan = _DynChat.getChan(chanID);
+	if (!chan) return false;	
+		
+	CDynChatSession *currSession = chan->getFirstSession();
+	bool havePlayers = false;
+	while (currSession)
+	{
+		players.push_back(TheDataset.getEntityId(currSession->getClient()->getID()));
+		havePlayers = true;
+		currSession = currSession->getNextChannelSession();
+	}
+	return havePlayers;
+}
+
 
 //============================================================================================================
 void CDynChatEGS::iosSetHistoricSize(TChanID chan, uint32 size)
diff --git a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h
index bfa0a376f..ec5239729 100644
--- a/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h
+++ b/code/ryzom/server/src/entities_game_service/dyn_chat_egs.h
@@ -76,6 +76,9 @@ public:
 	bool				setWriteRight(TChanID chan, const TDataSetRow &client, bool writeRight);
 	// Set size of historic for a given channel
 	void				setHistoricSize(TChanID chan, uint32 size);
+	// Get list of players in channel
+	bool 				getPlayersInChan(TChanID chanID, std::vector<NLMISC::CEntityId> &players);
+
 	// Resend all channel / sessions to the IOS
 	void				iosConnection();	
 	// Get all channel names (for read only)
@@ -83,6 +86,7 @@ public:
 	const TChanIDToName	&getChanIDToNameMap() const { return _ChanNames.getAToBMap(); }
 	// Get pointer on all channels
 	void				getChans(std::vector<CDynChatChan *> &channels) { _DynChat.getChans(channels); }
+	const TChanID				getNextChanID() const { return _NextChanID; }
 
 	/// Message from a service that need to create a new dynamic channel
 	static void			cbServiceAddChan(NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
diff --git a/code/ryzom/server/src/entities_game_service/egs_progress_callback.h b/code/ryzom/server/src/entities_game_service/egs_progress_callback.h
index bb1fc9de6..78cbc356e 100644
--- a/code/ryzom/server/src/entities_game_service/egs_progress_callback.h
+++ b/code/ryzom/server/src/entities_game_service/egs_progress_callback.h
@@ -31,7 +31,7 @@ class CEGSProgressCallback : public NLMISC::IProgressCallback
 {
 public:
 	CEGSProgressCallback():IProgressCallback() {}
-	virtual void progress (float progressValue) {};
+	virtual void progress (float progressValue) {}
 	virtual ~CEGSProgressCallback() {}
 
 };
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h
index 41c1bcec4..a1619f5f4 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_sheets.h
@@ -74,7 +74,7 @@ public :
 	/// exception thrown when a sheet is unknown
 	struct ESheet : public NLMISC::Exception
 	{
-		ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {};
+		ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {}
 	};
 
 public:
diff --git a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
index 0ef0e0335..0840d01d1 100644
--- a/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
+++ b/code/ryzom/server/src/entities_game_service/egs_sheets/egs_static_game_item.h
@@ -429,7 +429,7 @@ struct SShield : public SArmor
 	NL_INSTANCE_COUNTER_DECL(SShield);
 public:
 
-	inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){};
+	inline SShield() : SArmor(),ShieldType(SHIELDTYPE::NONE),Unbreakable(false){}
 	
 	virtual void serial(class NLMISC::IStream &f)
 	{
diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp
index 8139713ef..b075cca34 100644
--- a/code/ryzom/server/src/entities_game_service/entities_game_service.cpp
+++ b/code/ryzom/server/src/entities_game_service/entities_game_service.cpp
@@ -1382,7 +1382,9 @@ void CPlayerService::init()
 	TRANSPORT_CLASS_REGISTER (CReportAIInstanceDespawnMsgImp);
 	TRANSPORT_CLASS_REGISTER (CWarnBadInstanceMsg);
 	TRANSPORT_CLASS_REGISTER (CCreatureCompleteHealImp);
+	TRANSPORT_CLASS_REGISTER (CChangeCreatureMaxHPImp);
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureHPImp);
+	TRANSPORT_CLASS_REGISTER (CCreatureSetUrlImp);
 	TRANSPORT_CLASS_REGISTER (CChangeCreatureModeMsg);
 	TRANSPORT_CLASS_REGISTER (CGiveItemRequestMsgImp);
 	TRANSPORT_CLASS_REGISTER (CReceiveItemRequestMsgImp);
diff --git a/code/ryzom/server/src/entities_game_service/entities_game_service.vcproj b/code/ryzom/server/src/entities_game_service/entities_game_service.vcproj
deleted file mode 100644
index c75454117..000000000
--- a/code/ryzom/server/src/entities_game_service/entities_game_service.vcproj
+++ /dev/null
@@ -1,2976 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="entities_game_service"
-	ProjectGUID="{739A60A6-232B-4334-B597-57C61FB93760}"
-	RootNamespace="entities_game_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm1000"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm1000"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm1000"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="-Zm1000"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\player_manager\action_distance_checker.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\action_distance_checker.h"
-			>
-		</File>
-		<File
-			RelativePath=".\admin.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\admin.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\admin_properties.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\admin_properties.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\ai_alias_translator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\ai_alias_translator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\animation_session_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\animation_session_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\area_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\area_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\area_geometry.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\area_geometry.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\aura_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\aura_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\aura_regen_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\aura_regen_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\available_phrases.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\available_phrases.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\bleed_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\bleed_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\bounce_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\bounce_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_enums.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_enums.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_physical.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_physical.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_physical_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_template.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_template.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_unit_test.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\building_unit_test.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\bypass_check_flags.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\bypass_check_flags.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_branch.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_branch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_check_sum.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_check_sum.h"
-			>
-		</File>
-		<File
-			RelativePath=".\cdb_data_instance_container.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cdb_data_instance_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\cdb_group.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cdb_group.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_leaf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_leaf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\cdb_struct_banks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cdb_struct_banks.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_synchronised.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\cdb_synchronised.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\change_move_speed_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\change_move_speed_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\char_name_mapper_client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\char_name_mapper_client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\charac_modifier_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\charac_modifier_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\character_control.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\character_control.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_encyclopedia.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_encyclopedia.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_game_event.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_game_event.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_inlines.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_inventory_manipulation.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_name_extraction.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_name_extraction.h"
-			>
-		</File>
-		<File
-			RelativePath=".\character_structure\character_persistant_data.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_respawn_points.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_respawn_points.h"
-			>
-		</File>
-		<File
-			RelativePath=".\character_structure\character_sentence.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\character_shopping_list.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\character_shopping_list.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_statistics_recorder.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_statistics_recorder.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_tick_update_timer_event.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_tick_update_timer_event.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_version_adapter.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\character_version_adapter.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_groups_ids.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\chg_charac_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\chg_charac_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\client_command_forwarder.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\client_command_forwarder.h"
-			>
-		</File>
-		<File
-			RelativePath=".\client_messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_ai_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_ai_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_bleed.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_bleed.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_disarm.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_disarm.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_dot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_dot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_regen_modifier.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_regen_modifier.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_simple_dynamic_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_simple_dynamic_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_simple_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_simple_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_slow_move.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_slow_move.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_special_damage.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_special_damage.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_stun.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_action_stun.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_attacker.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_attacker.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_defender.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_defender.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\combat_tables.h"
-			>
-		</File>
-		<File
-			RelativePath=".\common_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\common_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\common_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\common_shard_callbacks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\common_shard_callbacks.h"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\creature.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\creature.h"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\creature_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\creature_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\creature_tick_update_timer_event.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\creature_tick_update_timer_event.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\damage_aura_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\damage_aura_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\damage_shield_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\damage_shield_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\database_guild.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\database_guild.h"
-			>
-		</File>
-		<File
-			RelativePath=".\database_outpost.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\database_outpost.h"
-			>
-		</File>
-		<File
-			RelativePath=".\database_plr.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\database_plr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\db_string_updater.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\db_string_updater.h"
-			>
-		</File>
-		<File
-			RelativePath=".\death_penalties.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\death_penalties.h"
-			>
-		</File>
-		<File
-			RelativePath=".\deposit.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\deposit.h"
-			>
-		</File>
-		<File
-			RelativePath=".\deposit_raw_material.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\destination.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\destination.h"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_chat_egs.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\dyn_chat_egs.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\dynamic_items.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\dynamic_items.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\easter_egg.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\easter_egg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\effect_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\effect_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_dynamic_sheet_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_dynamic_sheet_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_globals.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_globals.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_log_filter.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_mirror.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_mirror.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_progress_callback.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_sheets.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_sheets.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_ai_action.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_ai_action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_brick.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_brick.cpp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_brick.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_deposit.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_deposit.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_emot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_emot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_encyclo.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_encyclo.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_game_item.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_game_item.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_game_sheet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_game_sheet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_guild_option.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_guild_option.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_harvestable.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_harvestable.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_outpost.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_outpost.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_raw_material.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_rolemaster_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_rolemaster_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_success_table.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_success_table.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_text_emotes.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_text_emotes.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_world.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_world.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_xp_factor_table.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_sheets\egs_static_xp_factor_table.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_utils.h"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_variables.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\egs_variables.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\enchant_weapon_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\enchant_weapon_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entities_game_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entities_game_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\entity_base.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\entity_base.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\entity_callbacks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\entity_callbacks.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_list_link.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\entity_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_manager\entity_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_matrix.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_matrix.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\entity_persistant_data.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\entity_persistant_data.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\environmental_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\environmental_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\faber_action.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\faber_action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\faber_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\faber_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\fame_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\fame_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fame_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fame_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fame_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\far_position_stack.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\far_position_stack.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\fg_extraction_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\fg_extraction_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\fg_prospection_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\fg_prospection_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\forage_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\forage_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\forage_progress.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\forage_progress.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_event_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_event_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\game_item.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\game_item.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\game_item_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\game_item_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\game_item_ptr.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\gear_latency.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\gear_latency.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\gm_tp_pending_command.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\gm_tp_pending_command.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_char_proxy.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_char_proxy.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_charge.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_charge.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_client_callbacks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_container_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_container_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_container_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_high_officer_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_high_officer_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\guild_inv.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\guild_inv.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_invitation.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_invitation_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_invitation_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_leader_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_leader_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_manager_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_member.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_member_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_member_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_member_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_member_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_member_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_officer_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_officer_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\guild_unifier.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\guild_unifier.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_unifier_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_unifier_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_unifier_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_version_adapter.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\guild_manager\guild_version_adapter.h"
-			>
-		</File>
-		<File
-			RelativePath=".\harvest_info.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\harvest_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\harvest_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\harvest_source.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\harvest_source.h"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\harvestable.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\harvestable.h"
-			>
-		</File>
-		<File
-			RelativePath=".\inter_shard_exchange_validator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\inter_shard_exchange_validator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\inventory_updater.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\inventory_updater.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\item_for_sale.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\item_for_sale.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\item_service_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\item_service_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\item_worn_state.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\item_worn_state.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\items_for_sale.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\items_for_sale.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\known_and_memorized_phrases.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\known_and_memorized_phrases.h"
-			>
-		</File>
-		<File
-			RelativePath=".\character_structure\known_brick_info.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_affect_stat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_damage_aura.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_damage_aura.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_dot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_dot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_hot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_hot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_mass_dispel.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_mass_dispel.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_toxic_cloud.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_ai_toxic_cloud.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_attack.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_attack.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_disarm.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_disarm.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_dot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_heal.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_item_charge.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_action_negative_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_focus_item.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_focus_item.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\magic_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\merchant.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\merchant.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_action.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_action.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_base_behaviour.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_base_behaviour.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_client_callbacks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_event.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_event.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_guild.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_guild.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_item.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_item.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_log.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_log.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_parser.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_pd_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_queue.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_queue.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_queue_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_queue_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_solo.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_solo.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_ai.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_ai.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_guild.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_item.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_kill.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_misc.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_misc.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_queue.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_queue.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_talk.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_template.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_step_template.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_team.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_team.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_template.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_template.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\mission_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_manager\missions_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_craft_success_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_craft_success_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_defense_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_defense_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_forage_success_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_forage_success_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_magic_protection_effet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_magic_protection_effet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_magic_success_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_magic_success_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_melee_success_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_melee_success_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_range_success_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\mod_range_success_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\modifiers_in_db.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\modifiers_in_db.h"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\mp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\named_items.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\named_items.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\nolink_dot_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\nolink_dot_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\nolink_hot_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\nolink_hot_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\offline_character_command.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\offline_character_command.h"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost.h"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_building.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_building.h"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_client_callbacks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_guild_db_updater.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_guild_db_updater.h"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_squad.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_squad.h"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_state_machine.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_version_adapter.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\outpost_manager\outpost_version_adapter.h"
-			>
-		</File>
-		<File
-			RelativePath=".\character_structure\pact_class.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\persistent_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\persistent_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\persistent_player_data.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\phrase_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\phrase_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\phrase_manager_callbacks.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\phrase_manager_callbacks.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\phrase_utilities_functions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\phrase_utilities_functions.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backward_compatibility\places_back_compat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\backward_compatibility\places_back_compat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\player.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\player.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_auto_resize.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_auto_resize.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_bag.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_bag.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_equip.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_equip.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_hand.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_hand.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_pet.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_pet.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_room.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_room.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_temp.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_temp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_xchg.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inv_xchg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inventory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\player_inventory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\player_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\player_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\player_manager_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\player_room.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\player_room.h"
-			>
-		</File>
-		<File
-			RelativePath=".\position_flag_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\position_flag_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\power_shielding_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\power_shielding_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\powers_and_auras.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\powers_and_auras.h"
-			>
-		</File>
-		<File
-			RelativePath=".\primitives_parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\primitives_parser.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\proc_item_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\proc_item_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\progression\progression_common.h"
-			>
-		</File>
-		<File
-			RelativePath=".\progression\progression_pve.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\progression\progression_pve.h"
-			>
-		</File>
-		<File
-			RelativePath=".\progression\progression_pvp.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\progression\progression_pvp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\projectile_stats.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\projectile_stats.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backward_compatibility\protection_type_back_compat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\backward_compatibility\protection_type_back_compat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_base.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_base.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_challenge.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_challenge.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_duel.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_duel.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_hof.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_hof.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_reward_manager\pvp_faction_reward_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_reward_manager\pvp_faction_reward_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_manager_2.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_manager_2.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_safe_zone.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_safe_zone.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_zone.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_zone.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\r2_give_item.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\r2_give_item.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\r2_mission_item.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\r2_mission_item.h"
-			>
-		</File>
-		<File
-			RelativePath=".\range_selector.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\range_selector.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\redirect_attacks_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\redirect_attacks_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\regen_modifier_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\regen_modifier_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\resists.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\resists.h"
-			>
-		</File>
-		<File
-			RelativePath=".\team_manager\reward_sharing.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\team_manager\reward_sharing.h"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\ring_reward_points.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\player_manager\ring_reward_points.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\role_persistant_data.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\role_persistant_data.h"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\room_instance.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\building_manager\room_instance.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect_debuff_stat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect_debuff_stat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect_dot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect_dot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect_hot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_link_effect_hot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_phrase_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\s_phrase_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\sabrina_area_debug.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\sabrina_area_debug.h"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\shard_unifier_client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\modules\shard_unifier_client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\shoot_again_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\shoot_again_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\shop_store.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\shop_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\shop_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\shop_type_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\shop_type_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\shop_unit.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\shop_unit.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\simple_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\simple_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\simple_entity_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backward_compatibility\spawn_zones_back_compat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\backward_compatibility\spawn_zones_back_compat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\special_modifier.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\special_modifier.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_balance.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_balance.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_basic.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_basic.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_basic_aura.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_basic_aura.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_chg_charac.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_chg_charac.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_dot.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_dot.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_enchant_weapon.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_enchant_weapon.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_heal.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_heal.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_craft_success.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_craft_success.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_defense.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_defense.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_forage_success.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_forage_success.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_magic_protection.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_magic_protection.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_magic_success.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_magic_success.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_melee_success.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_melee_success.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_range_success.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_mod_range_success.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_shielding.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_shielding.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_speeding_up.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_speeding_up.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_taunt.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\special_power_taunt.h"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\special_trade_list.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_manager\special_trade_list.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\spell_target.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\spell_target.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stables\stable.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stables\stable.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db.h"
-			>
-		</File>
-		<File
-			RelativePath=".\static_action_types.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\static_action_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\static_items.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shop_type\static_items.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\statistic.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_structure\statistic.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\stun_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\stun_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\team_manager\team.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\team_manager\team.h"
-			>
-		</File>
-		<File
-			RelativePath=".\team_manager\team_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\team_manager\team_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\teleport_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\teleport_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\timed_action_phrase.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\timed_action_phrase.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\timed_actions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\timed_actions.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_reward_manager\totem_base.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_reward_manager\totem_base.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_reward_manager\totem_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_manager\pvp_faction_reward_manager\totem_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\toxic_cloud.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\phrase_manager\toxic_cloud.h"
-			>
-		</File>
-		<File
-			RelativePath=".\trade_structures.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\trade_structures.h"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\weapon_craft_parameters.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\game_item_manager\weapon_craft_parameters.h"
-			>
-		</File>
-		<File
-			RelativePath=".\weapon_damage_table.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\weapon_damage_table.h"
-			>
-		</File>
-		<File
-			RelativePath=".\weather_everywhere.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\weather_everywhere.h"
-			>
-		</File>
-		<File
-			RelativePath=".\world_instances.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\world_instances.h"
-			>
-		</File>
-		<File
-			RelativePath=".\zone_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\zone_manager.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h
index 81e5b6cd8..fc3cd5903 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_base.h
@@ -140,7 +140,7 @@ public:
 			_ExceptionString = std::string("<CEntityBase> : Invalid stat name ") + var;
 			return _ExceptionString.c_str();
 		}
-		virtual ~EInvalidStat() throw() {};
+		virtual ~EInvalidStat() throw() {}
 	private:
 		mutable std::string _ExceptionString;
 	};
@@ -820,7 +820,7 @@ public:
 	/// Return the damage using current armor, done by an explosion (e.g. forage source explosion)
 	virtual float getActualDamageFromExplosionWithArmor( float dmg ) const =0;
 
-	inline virtual void clearCurrentAction() {};
+	inline virtual void clearCurrentAction() {}
 
 	inline virtual void setCurrentAction(CLIENT_ACTION_TYPE::TClientActionType,NLMISC::TGameCycle) {}
 
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
index 1ea9e4a1f..a0c2026f6 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
@@ -446,6 +446,8 @@ void cbClientReady( CMessage& msgin, const std::string &serviceName, NLNET::TSer
 	c->initAnimalHungerDb();
 
 	c->initFactionPointDb();
+	c->initPvpPointDb();
+	c->initOrganizationInfos();
 
 	c->updateOutpostAdminFlagInDB();
 
@@ -516,17 +518,6 @@ void cbClientReady( CMessage& msgin, const std::string &serviceName, NLNET::TSer
 	// ask backup for offline commands file
 	COfflineCharacterCommand::getInstance()->characterOnline( characterId );
 
-	if( CGameEventManager::getInstance().getChannelEventId() != TChanID::Unknown )
-	{
-		if( c->haveAnyPrivilege() )
-		{
-			DynChatEGS.addSession(CGameEventManager::getInstance().getChannelEventId(), entityIndex, true);
-		}
-		else
-		{
-			DynChatEGS.addSession(CGameEventManager::getInstance().getChannelEventId(), entityIndex, false);
-		}
-	}
 	c->onConnection();
 } // cbClientReady //
 
@@ -680,6 +671,9 @@ void finalizeClientReady( uint32 userId, uint32 index )
 	CPVPManager2::getInstance()->setPVPModeInMirror( c );
 	c->updatePVPClanVP();
 
+	// Add character to event channel if event is active
+	CGameEventManager::getInstance().addCharacterToChannelEvent( c );
+
 	// for GM player, trigger a 'infos' command to remember their persistent state
 	if (!PlayerManager.getPlayer(uint32(c->getId().getShortId())>>4)->getUserPriv().empty())
 		CCommandRegistry::getInstance().execute(toString("infos %s", c->getId().toString().c_str()).c_str(), InfoLog(), true);
@@ -1596,6 +1590,53 @@ void cbJoinTeamProposal( NLNET::CMessage& msgin, const std::string &serviceName,
 } // cbJoinTeamProposal //
 
 
+//---------------------------------------------------
+// cbJoinLeague: join specified League
+//---------------------------------------------------
+void cbJoinLeague( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	H_AUTO(cbJoinLeague);
+	
+	CEntityId charId;
+	msgin.serial( charId );
+	TeamManager.joinLeagueAccept( charId );
+} // cbJoinLeague //
+
+//---------------------------------------------------
+// cbJoinLeagueDecline: player decline the proposition
+//---------------------------------------------------
+void cbJoinLeagueDecline( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	H_AUTO(cbJoinLeagueDecline);
+	
+	CEntityId charId;
+	msgin.serial( charId );
+	TeamManager.joinLeagueDecline( charId );
+} // cbJoinLeagueDecline //
+
+
+//---------------------------------------------------
+// cbJoinLeagueProposal: propose a player (current target) to enter the League
+//---------------------------------------------------
+void cbJoinLeagueProposal( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId)
+{
+	H_AUTO(cbJoinLeagueProposal);
+	
+	CEntityId charId;
+	msgin.serial( charId );
+
+	CCharacter *character = PlayerManager.getChar( charId );
+	if (character == NULL || !character->getEnterFlag())
+	{
+		nlwarning("<cbJoinLeagueProposal> Invalid player Id %s", charId.toString().c_str() );
+		return;
+	}
+	character->setAfkState(false);
+	TeamManager.joinLeagueProposal( character, character->getTarget() );
+} // cbJoinLeagueProposal //
+
+
+
 //---------------------------------------------------
 // cbKickTeammate: kick your target from your team
 //---------------------------------------------------
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h
index 767d99a99..e284b9ff6 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.h
@@ -82,6 +82,15 @@ void cbJoinTeamProposal( NLNET::CMessage& msgin, const std::string &serviceName,
 // kick your target from your team
 void cbKickTeammate( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
 
+
+/// callback for JOIN_LEAGUE message
+void cbJoinLeague( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
+/// callback for JOIN_LEAGUE_DECLINE message
+void cbJoinLeagueDecline( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
+/// callback for JOIN_LEAGUE_PROPOSAL message
+void cbJoinLeagueProposal( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
+
+
 // toogle god mode on / off for testing
 //void cbGodMode( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::TServiceId serviceId);
 
diff --git a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h
index 88f893c91..cf5422f1a 100644
--- a/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h
+++ b/code/ryzom/server/src/entities_game_service/entity_manager/entity_manager.h
@@ -59,7 +59,7 @@ public:
 	/// exception thrown when entity is unknown
 	struct EEntity : public NLMISC::Exception
 	{
-		EEntity( const NLMISC::CEntityId& id ) : Exception ("The entity "+id.toString()+" doesn't exist") {};
+		EEntity( const NLMISC::CEntityId& id ) : Exception ("The entity "+id.toString()+" doesn't exist") {}
 	};
 
 /*	// Success table for calculation of success probability and associate xp-gains
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
index 725aa7493..c4c43534b 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
@@ -791,6 +791,7 @@ void CGameItem::ctor( const CSheetId& sheetId, uint32 recommended, bool destroya
 //	SlotCount = slotCount;
 	_Recommended = recommended;
 	_TotalSaleCycle = 0;
+	_PetIndex = MAX_INVENTORY_ANIMAL;
 
 	_Form = CSheets::getForm( sheetId );
 	if (_Form)
@@ -1146,6 +1147,14 @@ uint32	CGameItem::getNonLockedStackSize()
 		return _StackSize - _LockCount;
 }
 
+void CGameItem::setLockedByOwner(bool value)
+{
+	if (value != _LockedByOwner)
+	{
+		_LockedByOwner = value;
+		callItemChanged(INVENTORIES::TItemChangeFlags(INVENTORIES::itc_lock_state));
+	}
+}
 
 //-----------------------------------------------
 // getCopy :
@@ -1362,6 +1371,8 @@ void CGameItem::clear()
 	_RequiredCharacLevel = 0;
 	_HasPrerequisit= false;
 
+	_LockedByOwner = false;
+
 	_TypeSkillMods.clear();
 	_PhraseId.clear();
 	_CustomText.clear();
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
index a8ab8e197..946e5e041 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item.h
@@ -679,6 +679,9 @@ public :
 	/// set required skill level
 	inline void setRequiredSkillLevel2( uint16 l ) { _RequiredSkillLevel2 = l; }
 
+	bool getLockedByOwner() const { return _LockedByOwner; }
+	void setLockedByOwner(bool value);
+
 	/// get required stat
 	inline CHARACTERISTICS::TCharacteristics getRequiredCharac() const { return _RequiredCharac; }
 	/// set required stat
@@ -706,6 +709,13 @@ public :
 	/// set custom string (for scroll-like items)
 	void setCustomText(const ucstring &val);
 
+	uint8 getPetIndex() const { return _PetIndex; }
+	void setPetIndex(uint8 val) { _PetIndex = val; }
+
+	ucstring getCustomName() const { return _CustomName; }
+	void setCustomName(ucstring val) { _CustomName = val; }
+
+
 protected:
 	friend class CFaberPhrase;
 	// set Default Color (for craft only)
@@ -947,6 +957,9 @@ private:
 	std::vector<CTypeSkillMod>	_TypeSkillMods;
 
 	ucstring			_CustomText;
+	bool                _LockedByOwner;
+	uint8               _PetIndex;
+	ucstring            _CustomName;
 };
 
 /**
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h
index a0aee63fc..8bd4e6b90 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/game_item_manager.h
@@ -61,7 +61,7 @@ public :
 	/// exception thrown when a sheet is unknown
 	struct ESheet : public NLMISC::Exception
 	{
-		ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {};
+		ESheet( const NLMISC::CSheetId& sheetId ) : Exception ("The sheet "+sheetId.toString()+" is unknown") {}
 	};
 
 public:
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp
index aa47b5207..2addffbf1 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inv_xchg.cpp
@@ -84,6 +84,10 @@ bool CExchangeView::putItemInExchange(uint32 bagSlot, uint32 exchangeSlot, uint3
 	if (_InterlocutorView != NULL && (!form->DropOrSell && form->Family != ITEMFAMILY::PET_ANIMAL_TICKET))
 		return false;
 
+	// Can't trade items locked by owner
+	if (item->getLockedByOwner())
+		return false;
+
 	if( getCharacter()->isAnActiveXpCatalyser(item) )
 		return false;
 
diff --git a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp
index 5b2dd3eaf..d42fcc703 100644
--- a/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp
+++ b/code/ryzom/server/src/entities_game_service/game_item_manager/player_inventory.cpp
@@ -1066,6 +1066,12 @@ void CCharacterInvView::updateClientSlot(uint32 slot, const CGameItemPtr item)
 		getCharacter()->queryItemPrice( item, price );
 		itemBestStat = item->getCraftParameters() == 0 ? RM_FABER_STAT_TYPE::Unknown : item->getCraftParameters()->getBestItemStat();
 
+		BOTCHATTYPE::TBotChatResaleFlag resaleFlag = (item->durability() == item->maxDurability() ? BOTCHATTYPE::ResaleOk : BOTCHATTYPE::ResaleKOBroken);
+		if (item->getLockedByOwner())
+		{
+			resaleFlag = BOTCHATTYPE::ResaleKOLockedByOwner;
+		}
+
 		INVENTORIES::CItemSlot itemSlot( slot );
 		itemSlot.setItemProp( INVENTORIES::Sheet, item->getSheetId().asInt() );
 		itemSlot.setItemProp( INVENTORIES::Quality, item->quality() );
@@ -1076,7 +1082,7 @@ void CCharacterInvView::updateClientSlot(uint32 slot, const CGameItemPtr item)
 		itemSlot.setItemProp( INVENTORIES::NameId, item->sendNameId(getCharacter()) );
 		itemSlot.setItemProp( INVENTORIES::Enchant, item->getClientEnchantValue() );
 		itemSlot.setItemProp( INVENTORIES::Price, price );
-		itemSlot.setItemProp( INVENTORIES::ResaleFlag, item->durability() == item->maxDurability() ? BOTCHATTYPE::ResaleOk : BOTCHATTYPE::ResaleKOBroken );
+		itemSlot.setItemProp( INVENTORIES::ResaleFlag, resaleFlag );
 		itemSlot.setItemProp( INVENTORIES::ItemClass, item->getItemClass() );
 		itemSlot.setItemProp( INVENTORIES::ItemBestStat, itemBestStat );
 		itemSlot.setItemProp( INVENTORIES::PrerequisitValid, getCharacter()->checkPreRequired( item ) );
diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp
index a93bdaeb1..715a6ffb6 100644
--- a/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp
+++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild.cpp
@@ -217,7 +217,7 @@ void CGuild::setBuilding(TAIAlias buildingAlias)
 	if (getBuilding() != CAIAliasTranslator::Invalid)
 	{
 		CBuildingManager::getInstance()->removeGuildBuilding( getId() );
-		_Inventory->clearInventory();
+		//_Inventory->clearInventory();
 	}
 
 	// set the new guild building
@@ -1298,23 +1298,34 @@ uint16 CGuild::getMaxGradeCount(EGSPD::CGuildGrade::TGuildGrade grade)const
 	for ( uint i = 0; i < size; ++i )
 		count+=_GradeCounts[i];
 	
-	if ( grade == EGSPD::CGuildGrade::Leader )
-		return 1;
-	if ( grade == EGSPD::CGuildGrade::HighOfficer )
-	{
-		count *= 5;
-		if ( count %100 == 0 )
-			return count/100;
-		else
-			return count/100 + 1;
-	}
-	if ( grade == EGSPD::CGuildGrade::Officer )
+	switch (grade)
 	{
-		count *= 10;
-		if ( count %100 == 0 )
-			return count/100;
-		else
-			return count/100 + 1;
+		case EGSPD::CGuildGrade::Leader:
+			return 1;
+			break;
+		case EGSPD::CGuildGrade::HighOfficer:
+		{
+			return GuildMaxMemberCount;
+			/*
+			count *= 5;
+			if ( count %100 == 0 )
+				return count/100;
+			else
+				return count/100 + 1;
+			*/
+		}
+		break;
+		case EGSPD::CGuildGrade::Officer:
+		{
+			return GuildMaxMemberCount;
+			/*
+			count *= 10;
+			if ( count %100 == 0 )
+				return count/100;
+			else
+				return count/100 + 1;
+			*/
+		}
 	}
 	return 0xFFFF;
 }
@@ -2238,7 +2249,7 @@ void	IGuild::updateMembersStringIds()
 //-----------------------------------------------------------------------------
 /**
  * This class is used to load old guild inventory, DO NOT BREAK IT!
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp b/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp
index 3c3e6bed3..4bf404ccf 100644
--- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp
+++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_leader_module.cpp
@@ -100,7 +100,7 @@ void CGuildLeaderModule::quitGuild()
 		CGuildMember * member = EGS_PD_CAST<CGuildMember*>( (*it).second );
 		EGS_PD_AST( member );
 		// ignore current leader
-		if ( member->getGrade() == EGSPD::CGuildGrade::Leader )
+		if ( _GuildMemberCore->getId() == member->getId() )
 			continue;
 
 		// check if the current member is the successor
diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h b/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h
index 1280fe6c2..98a4f9229 100644
--- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h
+++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_unifier_itf.h
@@ -490,9 +490,9 @@ namespace GU
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h b/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h
index 2bb3464de..8b59b2a97 100644
--- a/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h
+++ b/code/ryzom/server/src/entities_game_service/guild_manager/guild_version_adapter.h
@@ -50,7 +50,7 @@ private:
 	void adaptToVersion4(CGuild &guild) const;
 
 private:
-	CGuildVersionAdapter(){};
+	CGuildVersionAdapter(){}
 	/// unique instance
 	static CGuildVersionAdapter*			_Instance;
 };
diff --git a/code/ryzom/server/src/entities_game_service/harvest_source.cpp b/code/ryzom/server/src/entities_game_service/harvest_source.cpp
index c655e2ebc..186615e45 100644
--- a/code/ryzom/server/src/entities_game_service/harvest_source.cpp
+++ b/code/ryzom/server/src/entities_game_service/harvest_source.cpp
@@ -90,6 +90,14 @@ sint8 ExplosionResetPeriod = 50; // 5 s
 
 CHarvestSource AutoSpawnSourceIniProperties;
 
+/*
+ * Access to singleton
+ */
+CHarvestSourceManager *CHarvestSourceManager::getInstance()
+{
+	return (CHarvestSourceManager*)_Instance;
+}
+
 /*
  * Initialization of source manager
  */
@@ -103,7 +111,10 @@ void CHarvestSourceManager::init( TDataSetIndex baseRowIndex, TDataSetIndex size
 	//AutoSpawnSourceIniProperties.setDistVis( 100 );
 }
 
-
+void CHarvestSourceManager::release()
+{
+	delete (CHarvestSourceManager*)_Instance;
+}
 
 /*
  * HarvestSource constructor
diff --git a/code/ryzom/server/src/entities_game_service/harvest_source.h b/code/ryzom/server/src/entities_game_service/harvest_source.h
index 59556115e..edd9c546a 100644
--- a/code/ryzom/server/src/entities_game_service/harvest_source.h
+++ b/code/ryzom/server/src/entities_game_service/harvest_source.h
@@ -391,13 +391,13 @@ class CHarvestSourceManager : public CSimpleEntityManager<CHarvestSource>
 public:
 
 	/// Singleton access
-	static CHarvestSourceManager *getInstance() { return (CHarvestSourceManager*)_Instance; }
+	static CHarvestSourceManager *getInstance();
 
 	/// Initialization
 	void		init( TDataSetIndex baseRowIndex, TDataSetIndex size );
 
 	/// Release
-	static void	release() { delete (CHarvestSourceManager*)_Instance; }
+	static void	release();
 };
 
 
diff --git a/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp b/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
index 52fd214f9..7c4cb0d7c 100644
--- a/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_client_callbacks.cpp
@@ -230,7 +230,6 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 	if (index < MaxGroupMissionCount)
 	{
 		// Team
-
 		CTeam * team = TeamManager.getRealTeam( user->getTeamId() );
 		if ( !team )
 		{
@@ -249,11 +248,10 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 							userId.toString().c_str(), index, team->getMissions().size());
 			return;
 		}
-		
 
 		CMissionTeam* mission = team->getMissions()[index];
 		nlassert(mission);
-		
+
 		if ( mission->getFinished() == false )
 		{
 			CMissionTemplate * templ = CMissionManager::getInstance()->getTemplate( mission->getTemplateId() );
@@ -271,7 +269,7 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 			}
 			set<CEntityId> excluded;
 			excluded.insert( userId );
-			
+
 			team->sendDynamicMessageToMembers( "ABANDON_GROUP_MISSION",TVectorParamCheck(), excluded );
 		}
 		team->removeMission( index, mr_abandon );
@@ -301,7 +299,6 @@ void cbClientGroupAbandonMission( NLNET::CMessage& msgin, const std::string &ser
 			return;
 		}
 
-
 		CMissionGuild* mission = guild->getMissions()[index];
 		nlassert(mission);
 
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
index 31cf1ff0f..2d3a24cf9 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_action.cpp
@@ -1961,7 +1961,6 @@ class CMissionActionRecvMoney : public IMissionAction
 					PHRASE_UTILITIES::sendDynamicSystemMessage(user->getEntityRowId(),"MIS_GUILD_RECV_MONEY",params);
 				}
 			}
-
 		}
 	};
 	uint _Amount;
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h
index 34ff36600..b5bb0fccd 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_event.h
@@ -94,7 +94,7 @@ public:
 	static bool simMissionEvent(const std::vector< std::string > & script, NLMISC::CLog & log );
 	
 protected:
-	CMissionEvent(){};
+	CMissionEvent(){}
 	/// build an event from a script
 	virtual bool buildFromScript( const std::vector< std::string > & script,NLMISC::CLog& log ) = 0;
 	
@@ -114,7 +114,7 @@ public:
 	uint32 Mission;
 protected:
 	friend class CMissionEvent;
-	CMissionEventMissionDone(){};
+	CMissionEventMissionDone(){}
 	bool buildFromScript( const std::vector< std::string > & script  ,NLMISC::CLog& log);
 };
 
@@ -130,7 +130,7 @@ public:
 	std::string ScenarioTag;
 protected:
 	friend class CMissionEvent;
-	CMissionEventTaggedRingScenarioDone(){};
+	CMissionEventTaggedRingScenarioDone(){}
 	bool buildFromScript( const std::vector< std::string > & script  ,NLMISC::CLog& log);
 };
 
@@ -158,7 +158,7 @@ public:
 	uint32 Amount;
 protected:
 	friend class CMissionEvent;
-	CMissionEventGiveMoney(){};
+	CMissionEventGiveMoney(){}
 	bool buildFromScript( const std::vector< std::string > & script  ,NLMISC::CLog& log);
 };
 
@@ -171,7 +171,7 @@ public:
 	uint32 PlaceId;
 protected:
 	friend class CMissionEvent;
-	CMissionEventVisitPlace(){};
+	CMissionEventVisitPlace(){}
 	bool buildFromScript( const std::vector< std::string > & script  ,NLMISC::CLog& log);
 };
 
@@ -184,7 +184,7 @@ public:
 	std::vector<NLMISC::CSheetId> Bricks;
 protected:
 	friend class CMissionEvent;
-	CMissionEventCast(){};
+	CMissionEventCast(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -196,7 +196,7 @@ public:
 		:CMissionEvent(Kill, targetEntity, restriction){}
 protected:
 	friend class CMissionEvent;
-	CMissionEventKill(){};
+	CMissionEventKill(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 	
 };
@@ -209,7 +209,7 @@ public:
 		:CMissionEvent(KillPlayer, victimId){}
 protected:
 	friend class CMissionEvent;
-	CMissionEventKillPlayer(){};
+	CMissionEventKillPlayer(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -225,7 +225,7 @@ public:
 	uint16				Quality;
 protected:
 	friend class CMissionEvent;
-	CMissionEventBuyItem(){};
+	CMissionEventBuyItem(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -241,7 +241,7 @@ public:
 	uint16				Quality;
 protected:
 	friend class CMissionEvent;
-	CMissionEventSellItem(){};
+	CMissionEventSellItem(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -257,7 +257,7 @@ public:
 	uint16				Quality;
 protected:
 	friend class CMissionEvent;
-	CMissionEventForage(){};
+	CMissionEventForage(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -283,7 +283,7 @@ public:
 	uint			Level;
 protected:
 	friend class CMissionEvent;
-	CMissionEventSkillProgress(){};
+	CMissionEventSkillProgress(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -295,7 +295,7 @@ public:
 		:CMissionEvent(Target,targetEntity ){}
 protected:
 	friend class CMissionEvent;
-	CMissionEventTarget(){};
+	CMissionEventTarget(){}
 	bool buildFromScript( const std::vector< std::string > & script,NLMISC::CLog& log );
 };
 
@@ -311,7 +311,7 @@ public:
 	uint16				Quality;
 protected:
 	friend class CMissionEvent;
-	CMissionEventCraft(){};
+	CMissionEventCraft(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -351,7 +351,7 @@ public:
 	uint16				Quality;
 protected:
 	friend class CMissionEvent;
-	CMissionEventLootItem(){};
+	CMissionEventLootItem(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -366,7 +366,7 @@ public:
 	uint16				Quality;
 protected:
 	friend class CMissionEvent;
-	CMissionEventLootRm(){};
+	CMissionEventLootRm(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -379,7 +379,7 @@ public:
 	TAIAlias Alias;
 protected:
 	friend class CMissionEvent;
-	CMissionEventKillGroup(){};
+	CMissionEventKillGroup(){}
 	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log);
 };
 
@@ -390,7 +390,7 @@ public:
 		:CMissionEvent(EndDynChat,TDataSetRow()){}
 protected:
 	friend class CMissionEvent;
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;};
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 class CMissionEventDebug : public CMissionEvent
@@ -400,7 +400,7 @@ public:
 		:CMissionEvent(Debug,TDataSetRow()){}
 protected:
 	friend class CMissionEvent;
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;};
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 
@@ -412,7 +412,7 @@ public:
 	uint32 Points;
 protected:
 	friend class CMissionEvent;
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;};
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 class CMissionEventOutpostGain : public CMissionEvent
@@ -422,7 +422,7 @@ public:
 		:CMissionEvent(OutpostGain,TDataSetRow()){}
 protected:
 	friend class CMissionEvent;
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;};
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 
@@ -437,7 +437,7 @@ public:
 	bool Guild;
 protected:
 	friend class CMissionEvent;
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log){return false;}
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 class CMissionEventQueueEntryOk: public CMissionEvent
@@ -447,7 +447,7 @@ public:
 		:CMissionEvent(QueueEntryOk, TDataSetRow()) {}
 protected:
 	friend class CMissionEvent;
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; }
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 
@@ -458,7 +458,7 @@ public:
 		:CMissionEvent(QueueExit, TDataSetRow()) {}
 protected:
 	friend class CMissionEvent;
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; }
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 class CMissionEventGroupSpawned : public CMissionEvent
@@ -470,8 +470,8 @@ public:
 	TAIAlias Alias;
 protected:
 	friend class CMissionEvent;
-	CMissionEventGroupSpawned(){};
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; }
+	CMissionEventGroupSpawned(){}
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 class CMissionEventGroupDespawned : public CMissionEvent
@@ -483,8 +483,8 @@ public:
 	TAIAlias Alias;
 protected:
 	friend class CMissionEvent;
-	CMissionEventGroupDespawned(){};
-	bool buildFromScript( const std::vector< std::string > & script ,NLMISC::CLog& log) { return false; }
+	CMissionEventGroupDespawned(){}
+	bool buildFromScript( const std::vector< std::string > & /* script */, NLMISC::CLog& /* log */){return false;}
 };
 
 #endif // RY_MISSION_EVENT_H
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp
index 4e5023b1a..8fa18d518 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_kill.cpp
@@ -48,6 +48,7 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 {
 	struct CSubStep
 	{
+		string		Dynamic;
 		CSheetId	Sheet;
 		uint16		Quantity;
 	};
@@ -56,7 +57,7 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 		_SourceLine = line;
 		_Place = 0xFFFF;
 		bool ret = true;
-		if ( script.size() < 2 || script.size() > 3)
+		if (script.size() < 2 || script.size() > 3)
 		{
 			MISLOGSYNTAXERROR("<creature> <quantity> *[; <creature> <quantity>] [: <place>]");
 			return false;
@@ -68,22 +69,36 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 			_SubSteps.reserve( subs.size() );
 			for ( uint i = 0; i < subs.size(); i++ )
 			{
+				CSubStep subStep;
+
 				std::vector< std::string > args;
 				CMissionParser::tokenizeString( subs[i]," \t", args );
-				if ( args.size() != 2 )
+
+				//// Dynamic Mission Args : #dynamic# <quantity>
+				if ((args.size() == 2) && (args[0] == "#dynamic#"))
 				{
-					MISLOGSYNTAXERROR("<creature> <quantity> *[; <creature> <quantity>] [: <place>]");
-					return false;
+					subStep.Dynamic = missionData.Name;
+					subStep.Quantity = atoi(args[1].c_str());
 				}
-				missionData.ChatParams.push_back( make_pair(args[0],STRING_MANAGER::creature_model) );
-				CSubStep subStep;
-				subStep.Sheet = CSheetId( args[0] + ".creature");
-				if ( subStep.Sheet == CSheetId::Unknown )
+				////
+				else
 				{
-					ret = false;
-					MISLOGERROR1("invalid sheet '%s'", args[0].c_str());
+					if ( args.size() != 2 )
+					{
+						MISLOGSYNTAXERROR("<creature> <quantity> *[; <creature> <quantity>] [: <place>]");
+						return false;
+					}
+					missionData.ChatParams.push_back( make_pair(args[0],STRING_MANAGER::creature_model) );
+				
+					subStep.Dynamic = "";
+					subStep.Sheet = CSheetId( args[0] + ".creature");
+					if ( subStep.Sheet == CSheetId::Unknown )
+					{
+						ret = false;
+						MISLOGERROR1("invalid sheet '%s'", args[0].c_str());
+					}
+					NLMISC::fromString(args[1], subStep.Quantity);
 				}
-				NLMISC::fromString(args[1], subStep.Quantity);
 				_SubSteps.push_back(subStep);
 			}
 			if ( script.size() == 3 )
@@ -104,15 +119,54 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 	}
 	uint processEvent( const TDataSetRow & userRow, const CMissionEvent & event,uint subStepIndex,const TDataSetRow & giverRow )
 	{
+		nlinfo("Process Event");
+		string webAppUrl;
+		bool ret = true;
+		_User = PlayerManager.getChar(getEntityIdFromRow(userRow));
+
 		if ( event.Type == CMissionEvent::Kill )
 		{
 			CMissionEventKill & eventSpe = (CMissionEventKill&)event;
 			CCreature * c = CreatureManager.getCreature( event.TargetEntity );
+			CSheetId faunaSheet;
+
+			//// Dynamic Mission Args
+			if (_SubSteps[subStepIndex].Dynamic.empty()) {
+				faunaSheet = _SubSteps[subStepIndex].Sheet;
+			}
+			else
+			{
+				vector<string> params = _User->getCustomMissionParams(_SubSteps[subStepIndex].Dynamic);
+				if (params.size() < 2)
+				{
+					LOGMISSIONSTEPERROR("kill_fauna : invalid dynamic creature");
+					return 0;
+				}
+				else
+				{
+					webAppUrl = params[0];
+					faunaSheet = CSheetId(params[1]);
+					
+					if (params.size() > 2) {
+						string placeStr = CMissionParser::getNoBlankString( params[2] );
+						CPlace * place = CZoneManager::getInstance().getPlaceFromName( placeStr );
+						if ( !place )
+						{
+							ret = false;
+							LOGMISSIONSTEPERROR("kill_fauna : invalid place "+params[2]);
+						}
+						else
+							_Place = place->getId();
+					}
+				}
+				////
+			}
+
 			if ( !c )
 			{
 				LOGMISSIONSTEPERROR("kill_fauna : invalid creature " + toString(event.TargetEntity.getIndex()));
 			}
-			else if ( _SubSteps[subStepIndex].Sheet == c->getType() )
+			else if ( faunaSheet == c->getType() )
 			{
 				if ( _Place != 0xFFFF )
 				{
@@ -126,6 +180,8 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 
 					if ( region && region->getId() == _Place )
 					{
+						if (!webAppUrl.empty())
+							_User->validateDynamicMissionStep(webAppUrl);
 						LOGMISSIONSTEPSUCCESS("kill_fauna");
 						return 1;
 					}
@@ -134,6 +190,8 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 					{
 						if ( places[i] && places[i]->getId() == _Place )
 						{
+							if (!webAppUrl.empty())
+								_User->validateDynamicMissionStep(webAppUrl);
 							LOGMISSIONSTEPSUCCESS("kill_fauna");
 							return 1;
 						}
@@ -142,11 +200,14 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 				}
 				else
 				{
+					if (!webAppUrl.empty())
+						_User->validateDynamicMissionStep(webAppUrl);
 					LOGMISSIONSTEPSUCCESS("kill_fauna");
 					return 1;
 				}
 			}
 		}
+
 		return 0;
 	}
 
@@ -162,41 +223,82 @@ class CMissionStepKillFauna : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps,const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		static const std::string stepTextReact = "MIS_NEED_REACTIVATION";
 		static const std::string stepText = "MIS_KILL_FAUNA_";
 		static const std::string stepTextLoc = "MIS_KILL_FAUNA_LOC_";
 		nlassert( _SubSteps.size() == subStepStates.size() );
+		CSheetId faunaSheet;
 		for ( uint i  = 0; i < subStepStates.size(); i++ )
 		{
 			if( subStepStates[i] != 0 )
 			{
-				nbSubSteps++;
-				retParams.push_back(STRING_MANAGER::TParam());
-				retParams.back().Type = STRING_MANAGER::creature_model;
-				retParams.back().SheetId = _SubSteps[i].Sheet;
+				if (_SubSteps[i].Dynamic.empty())
+				{
+					faunaSheet = _SubSteps[i].Sheet;
+				}
+				else
+				{
+					//// Dynamic Mission Args
+					vector<string> params = _User->getCustomMissionParams(_SubSteps[i].Dynamic);
+					if (params.size() < 2)
+					{
+						faunaSheet = CSheetId::Unknown;
+					}
+					else
+					{
+						faunaSheet = CSheetId(params[1]);
+					}
+
+					if ((_Place == 0xFFFF) && (params.size() > 2))
+					{
+						string placeStr = CMissionParser::getNoBlankString( params[2] );
+						CPlace * place = CZoneManager::getInstance().getPlaceFromName( placeStr );
+						if ( !place )
+						{
+							MISLOG("sline:%u ERROR : kill_fauna : Invalid place %u", _SourceLine, _Place);
+						}
+						else
+							_Place = place->getId();
+					}
+					////
+				}
 				
-				retParams.push_back(STRING_MANAGER::TParam());
-				retParams.back().Type = STRING_MANAGER::integer;
-				retParams.back().Int = subStepStates[i];
+				nbSubSteps++;
+				if (faunaSheet != CSheetId::Unknown)
+				{
+					retParams.push_back(STRING_MANAGER::TParam());
+					retParams.back().Type = STRING_MANAGER::creature_model;
+					retParams.back().SheetId = faunaSheet;
+					
+					retParams.push_back(STRING_MANAGER::TParam());
+					retParams.back().Type = STRING_MANAGER::integer;
+					retParams.back().Int = subStepStates[i];
+				}
 			}
 		}
-		if ( _Place != 0xFFFF )
+		if (faunaSheet != CSheetId::Unknown)
 		{
-			STRING_MANAGER::TParam param;
-			param.Type = STRING_MANAGER::place;
-			CPlace * place = CZoneManager::getInstance().getPlaceFromId(_Place);
-			if ( !place )
+			if ( _Place != 0xFFFF )
 			{
-				MISLOG("sline:%u ERROR : kill_fauna : Invalid place %u", _SourceLine, _Place);
+				STRING_MANAGER::TParam param;
+				param.Type = STRING_MANAGER::place;
+				CPlace * place = CZoneManager::getInstance().getPlaceFromId(_Place);
+				if ( !place )
+				{
+					MISLOG("sline:%u ERROR : kill_fauna : Invalid place %u", _SourceLine, _Place);
+				}
+				else
+				{
+					param.Identifier = place->getName();
+					retParams.push_back(param);
+				}
+				textPtr = &stepTextLoc;
 			}
 			else
-			{
-				param.Identifier = place->getName();
-				retParams.push_back(param);
-			}
-			textPtr = &stepTextLoc;
+				textPtr = &stepText;
 		}
 		else
-			textPtr = &stepText;
+			textPtr = &stepTextReact;
 	}
 
 	std::vector< CSubStep > _SubSteps;
@@ -329,6 +431,7 @@ class CMissionStepKillRace : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps, const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		static const std::string stepTextReact = "MIS_NEED_REACTIVATION";
 		static const std::string stepText = "MIS_KILL_RACE_";
 		static const std::string stepTextLoc = "MIS_KILL_RACE_LOC_";
 
@@ -380,6 +483,7 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 {
 	struct CSubStep
 	{
+		string		Dynamic;
 		TAIAlias	Alias;
 //		NLMISC::TStringId	NpcName;
 	};
@@ -400,9 +504,17 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 			for ( uint i = 0; i < subs.size(); i++ )
 			{
 				CSubStep subStep;
-				subStep.Alias = CAIAliasTranslator::Invalid;
-				if ( !CMissionParser::parseBotName(subs[i],subStep.Alias,missionData) )
-					ret = false;
+				//// Dynamic Mission Args : #dynamic#
+				if (trim(subs[i]) == "#dynamic#") {
+					subStep.Dynamic = missionData.Name;
+				} 
+				////
+				else 
+				{
+					subStep.Alias = CAIAliasTranslator::Invalid;
+					if ( !CMissionParser::parseBotName(subs[i],subStep.Alias,missionData) )
+						ret = false;
+				}
 				_SubSteps.push_back( subStep );
 			}
 			return ret;
@@ -410,6 +522,9 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 	}
 	uint processEvent( const TDataSetRow & userRow, const CMissionEvent & event,uint subStepIndex,const TDataSetRow & giverRow )
 	{
+		string webAppUrl;
+		CCharacter * user = PlayerManager.getChar(getEntityIdFromRow(userRow));
+
 		if ( event.Type == CMissionEvent::Kill )
 		{
 			CMissionEventKill & eventSpe = (CMissionEventKill&)event;
@@ -420,18 +535,44 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 			}
 			else
 			{
-				if ( _SubSteps[subStepIndex].Alias != CAIAliasTranslator::Invalid )
+				if (_SubSteps[subStepIndex].Dynamic.empty())
 				{
-					if ( _SubSteps[subStepIndex].Alias == c->getAlias() )
+					if ( _SubSteps[subStepIndex].Alias != CAIAliasTranslator::Invalid )
+					{
+						if ( _SubSteps[subStepIndex].Alias == c->getAlias() )
+						{
+							LOGMISSIONSTEPSUCCESS("kill_npc");
+							return 1;
+						}
+					}
+					else if (  event.TargetEntity == giverRow )
 					{
 						LOGMISSIONSTEPSUCCESS("kill_npc");
 						return 1;
 					}
 				}
-				else if (  event.TargetEntity == giverRow )
+				else
 				{
-					LOGMISSIONSTEPSUCCESS("kill_npc");
-					return 1;
+					//// Dynamic Mission Args								
+					vector<string> params = user->getCustomMissionParams(_SubSteps[subStepIndex].Dynamic);
+					if (params.size() < 2) {
+						LOGMISSIONSTEPERROR("kill_npc : invalid dynamic npc");
+						return 0;
+					}
+					else
+					{
+						webAppUrl = params[0];
+						string name;
+						
+						CAIAliasTranslator::getInstance()->getNPCNameFromAlias(c->getAlias(), name);
+						if ( name == params[1] )
+						{
+							user->validateDynamicMissionStep(webAppUrl);
+							LOGMISSIONSTEPSUCCESS("kill_npc");
+							return 1;
+						}
+					}
+					////
 				}
 			}
 		}
@@ -450,6 +591,7 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps, const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		static const std::string stepTextReact = "MIS_NEED_REACTIVATION";
 		static const std::string stepText = "MIS_KILL_NPC_";
 		textPtr = &stepText;
 		nlassert( _SubSteps.size() == subStepStates.size() );
@@ -460,10 +602,34 @@ class CMissionStepKillNpc : public IMissionStepTemplate
 				nbSubSteps++;
 				retParams.push_back(STRING_MANAGER::TParam());
 				retParams.back().Type = STRING_MANAGER::bot;
-				if ( _SubSteps[i].Alias != CAIAliasTranslator::Invalid )
-					retParams.back().Int = _SubSteps[i].Alias;
+				if (_SubSteps[i].Dynamic.empty())
+				{
+					if ( _SubSteps[i].Alias != CAIAliasTranslator::Invalid )
+						retParams.back().Int = _SubSteps[i].Alias;
+					else
+						retParams.back().Identifier = "giver";
+				}
 				else
-					retParams.back().Identifier = "giver";
+				{
+					vector<string> params = _User->getCustomMissionParams(_SubSteps[i].Dynamic);
+					if (params.size() < 2)
+					{
+						nlinfo("kill_npc : invalid dynamic npc");
+						textPtr = &stepTextReact;
+						return;
+					}
+					else
+					{
+						vector<TAIAlias> aliases;
+						CAIAliasTranslator::getInstance()->getNPCAliasesFromName( params[1] , aliases );
+						if ( aliases.empty() )
+						{
+							retParams.back().Int = CAIAliasTranslator::Invalid;
+							return;
+						}
+						retParams.back().Int = aliases[0];
+					}
+				}
 			}
 		}
 	}
@@ -891,10 +1057,6 @@ class CMissionStepKillByName : public IMissionStepTemplate
 MISSION_REGISTER_STEP(CMissionStepKillByName,"kill_npc_by_name");
 
 
-
-
-
-
 // ----------------------------------------------------------------------------
 class CMissionStepKillPlayer : public IMissionStepTemplate
 {
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
index 41a4e98b0..c1495b128 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_talk.cpp
@@ -22,6 +22,7 @@
 #include "mission_manager/mission_parser.h"
 #include "mission_manager/ai_alias_translator.h"
 #include "player_manager/character.h"
+#include "player_manager/player_manager.h"
 #include "creature_manager/creature_manager.h"
 #include "mission_manager/mission_manager.h"
 #include "game_item_manager/player_inv_xchg.h"
@@ -49,43 +50,55 @@ class CMissionStepTalk : public IMissionStepTemplate
 	bool	buildStep( uint32 line, const std::vector< std::string > & script, CMissionGlobalParsingData & globalData, CMissionSpecificParsingData & missionData )
 	{
 		_SourceLine = line;
-		if ( script.size() < 3 )
+		if ( script.size() < 2 )
 		{
 			MISLOGSYNTAXERROR("<npc_name> [: <phrase_id>*[;<param>]]");
 			return false;
 		}
 		bool ret = true;
-		// parse bot
-		if ( !CMissionParser::parseBotName(script[1], _Bot, missionData) )
+		//// Dynamic Mission Args : #dynamic#
+		if (trim(script[1]) == "#dynamic#")
 		{
-			MISLOGERROR1("invalid npc '%s'", script[1].c_str());
-			return false;
+			_Dynamic = missionData.Name;
+			_PhraseId = _Dynamic+"_ACTION";
+			_IsDynamic = true;
 		}
-		// parse phrase and params
-		if (script.size() > 2)
+		else
 		{
-			// parse a specific phrase
-			if (!CMissionParser::parseParamText(line, script[2], _PhraseId, _Params ))
+			_IsDynamic = false;
+			// parse bot
+			if ( !CMissionParser::parseBotName(script[1], _Bot, missionData) )
 			{
-				MISLOGERROR1("invalid text '%s'", script[2].c_str());
+				MISLOGERROR1("invalid npc '%s'", script[1].c_str());
 				return false;
 			}
-		}
-		else
-		{
-			// use the default phrase
-			_PhraseId = "MIS_TALK_TO_MENU";
-		}
 
-		// add a first default param (the name of the bot we talk to)
-		_Params.insert(_Params.begin(), STRING_MANAGER::TParam());
-		_Params[0].Identifier = CMissionParser::getNoBlankString(script[1]);
+			// parse phrase and params
+			if (script.size() > 2)
+			{
+				// parse a specific phrase
+				if (!CMissionParser::parseParamText(line, script[2], _PhraseId, _Params ))
+				{
+					MISLOGERROR1("invalid text '%s'", script[2].c_str());
+					return false;
+				}
+			}
+			else
+			{
+				// use the default phrase
+				_PhraseId = "MIS_TALK_TO_MENU";
+			}
 
+			// add a first default param (the name of the bot we talk to)
+			_Params.insert(_Params.begin(), STRING_MANAGER::TParam());
+			_Params[0].Identifier = CMissionParser::getNoBlankString(script[1]);
+		}
 		return true;
 	}
 
 	uint processEvent( const TDataSetRow & userRow, const CMissionEvent & event,uint subStepIndex,const TDataSetRow & giverRow )
 	{
+		_User = PlayerManager.getChar(getEntityIdFromRow(userRow));
 		// not check here : they are done befor. If a talk event comes here, the step is complete
 		if( event.Type == CMissionEvent::Talk )		
 		{
@@ -102,9 +115,50 @@ class CMissionStepTalk : public IMissionStepTemplate
 		ret[0] = 1;
 	}
 
+	bool getDynamicBot(TAIAlias & aliasRet)
+	{
+		if (_User != NULL)
+		{
+			vector<string> params = _User->getCustomMissionParams(_Dynamic);
+			if (params.size() < 2)
+			{
+				MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+				return false;
+			}
+			else
+			{
+				vector<TAIAlias> aliases;
+				CAIAliasTranslator::getInstance()->getNPCAliasesFromName(params[1], aliases);
+				if ( aliases.empty() )
+				{
+					MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+					return false;
+				}
+
+				aliasRet = aliases[0];
+				return true;
+			}
+		}
+		return false;
+	}
+
 	virtual uint32 sendContextText(const TDataSetRow& user, const TDataSetRow& interlocutor, CMission * instance, bool & gift, const NLMISC::CEntityId & giver )
 	{
+
+		if (_IsDynamic)
+		{
+			if (!getDynamicBot(_Bot) || _User == NULL)
+			{
+				MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+				return 0;
+			}
+
+			TVectorParamCheck params;
+			return STRING_MANAGER::sendStringToClient( user, _PhraseId, params );
+		}
+
 		CCreature * bot = CreatureManager.getCreature( interlocutor );
+
 		if ( bot )
 		{
 			if ( ( _Bot != CAIAliasTranslator::Invalid && _Bot == bot->getAlias() ) ||
@@ -124,6 +178,12 @@ class CMissionStepTalk : public IMissionStepTemplate
 	
 	virtual bool hasBotChatOption(const TDataSetRow & interlocutor, CMission * instance, bool & gift)
 	{
+		if (_IsDynamic && !getDynamicBot(_Bot))
+		{
+			MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+			return 0;	
+		}
+
 		CCreature * bot = CreatureManager.getCreature( interlocutor );
 		if ( bot )
 		{
@@ -140,6 +200,27 @@ class CMissionStepTalk : public IMissionStepTemplate
 
 	virtual void getTextParams( uint & nbSubSteps,const std::string* & textPtr,TVectorParamCheck& retParams, const std::vector<uint32>& subStepStates)
 	{
+		if (_IsDynamic && !getDynamicBot(_Bot))
+		{
+			MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+			static const std::string stepText = "DEBUG_CRASH_P_SMG_CRASH2";
+			textPtr = &stepText;
+			return;	
+		}
+
+		if (_IsDynamic &&  _User != NULL)
+		{
+
+			vector<string> params = _User->getCustomMissionParams(_Dynamic);
+			if (params.size() < 2)
+			{
+				MISLOG("sline:%u ERROR : talk_to (sendContextText) : invalid bot", _SourceLine);
+				return;
+			}
+			_Params.insert(_Params.begin(), STRING_MANAGER::TParam());
+			_Params[0].Identifier = params[1];
+		}
+
 		nbSubSteps = 1;
 		static const std::string stepText = "MIS_TALK_TO";
 		textPtr = &stepText;
@@ -151,16 +232,23 @@ class CMissionStepTalk : public IMissionStepTemplate
 		else
 			retParams[0].Identifier = "giver";		
 	}
+
 	bool solveTextsParams( CMissionSpecificParsingData & missionData,CMissionTemplate * templ  )
 	{
-		bool ret = IMissionStepTemplate::solveTextsParams(missionData,templ);
-		if ( !CMissionParser::solveTextsParams(_SourceLine, _Params,missionData ) )
-			ret = false;
-		return ret;
+		if (!_IsDynamic)
+		{
+			bool ret = IMissionStepTemplate::solveTextsParams(missionData,templ);
+			if ( !CMissionParser::solveTextsParams(_SourceLine, _Params,missionData ) )
+				ret = false;
+			return ret;
+		}
+		return true;
 	}
 
 	virtual TAIAlias getInvolvedBot(bool& invalidIsGiver) const { invalidIsGiver=true; return _Bot; }
 
+	bool _IsDynamic;
+	std::string	_Dynamic;
 	std::string _PhraseId;
 	TVectorParamCheck _Params;
 	TAIAlias	_Bot;
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
index d18525bb6..4df10e243 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.cpp
@@ -102,6 +102,8 @@ uint32 IMissionStepTemplate::sendRpStepText(CCharacter * user,const std::vector<
 	uint nbSteps = 0;
 	const std::string* textPtr = NULL;
 
+	_User = user;
+
 	if ( !_RoleplayText.empty() )
 	{
 		// build the param list
@@ -143,6 +145,8 @@ uint32 IMissionStepTemplate::sendStepText(CCharacter * user,const std::vector<ui
 	uint nbSteps = 0;
 	const std::string* textPtr = NULL;
 
+	_User = user;
+
 	// build the param list
 	getTextParams(nbSteps,(const std::string *&)textPtr,params,stepStates);
 	
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h
index 4adaddb97..6e92fb23f 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_step_template.h
@@ -41,7 +41,7 @@ public:
 	//@{
 	/// ctor
 	inline IMissionStepTemplate()
-		:_OOOStepIndex(0xFFFFFFFF),_Any(false),_Displayed(true),_IconDisplayedOnStepNPC(true),_IsInOverridenOOO(false) {}	
+		:_OOOStepIndex(0xFFFFFFFF),_Any(false),_Displayed(true),_IconDisplayedOnStepNPC(true),_IsInOverridenOOO(false),_User(NULL) {}	
 
 	//BRIANCODE my appologies, need access to this data from CMissionStepGiveItem	
 	struct CSubStep
@@ -102,7 +102,7 @@ public:
 	///\name accessors
 	//@{
 	/// return the step actions
-	inline const std::vector< IMissionAction* > &	getActions(){ return _Actions; };
+	inline const std::vector< IMissionAction* > &	getActions(){ return _Actions; }
 	/// set the out of order index of the step ( it is the index of the OOO/ANY bloc embedding the step ) 0xFF is invalid
 	inline	void									setOOOStepIndex(uint32 idx){ _OOOStepIndex = idx; }
 	///\return the OOO index ( see previous line )
@@ -120,9 +120,9 @@ public:
 	///\set displayed value
 	void											setIconDisplayedOnStepNPC(bool displayed){ _IconDisplayedOnStepNPC = displayed;}
 	/// return true if the step is in an OOO block which text wad overriden
-	bool isInOverridenOOO() { return _IsInOverridenOOO; };
+	bool isInOverridenOOO() { return _IsInOverridenOOO; }
 	/// set the isInOverridenOOO flag ( see previous method )
-	void setAsInOverridenOOO() { _IsInOverridenOOO = true; };
+	void setAsInOverridenOOO() { _IsInOverridenOOO = true; }
 	/// return true if there is a roleplay text in this step
 	bool isThereRoleplayText() { return !_RoleplayText.empty(); }
 	/// check if the current player gift is ok
@@ -130,7 +130,7 @@ public:
 
 
 	/// retrieve the escort groups
-	virtual void getEscortGroups( std::vector< TAIAlias > & groups ){};
+	virtual void getEscortGroups( std::vector< TAIAlias > & groups ){}
 	virtual bool checkEscortFailure( bool groupWiped ){return false;}
 
 	/// check the consistency of a text step
@@ -164,7 +164,8 @@ protected:
 	bool								_AddDefaultParams;
 	/// flag set to true if the step is in an OOO block which text wad overriden
 	bool								_IsInOverridenOOO;
-
+	/// Player running the mission
+	CCharacter * 						_User;
 };
 
 
diff --git a/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp b/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp
index af0686f1e..fec609384 100644
--- a/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp
+++ b/code/ryzom/server/src/entities_game_service/mission_manager/mission_template.cpp
@@ -1357,7 +1357,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				returnValue = MISSION_DESC::PreReqFail;
 				logOnFail = false;*/
 			}
-
 		}
 		// check non replayable missions
 		if( !Tags.Replayable )
@@ -1387,7 +1386,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				logOnFail = false;*/
 			}
 		}
-		
 	}
 	else
 	{
@@ -1474,7 +1472,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 					}
 					if (guild->isMissionSuccessfull(templ->Alias))
 						break;
-						
 				}
 				else if ( templ->Type == MISSION_DESC::Solo )
 				{
@@ -1534,7 +1531,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 						break;
 					/*if (!guild || !guild->isMissionSuccessfull(templ->Alias))
 						break;*/
-						
 				}
 				else if ( templ->Type == MISSION_DESC::Solo )
 				{
@@ -1590,7 +1586,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 			{
 
 				/// todo guild mission
-				
 				CGuild* guild = CGuildManager::getInstance()->getGuildFromId( user->getGuildId() );
 				if ( !guild )
 				{
@@ -1606,7 +1601,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				}
 				if (k != guild->getMissions().size())
 					break;
-
 			}
 			else if ( templ->Type == MISSION_DESC::Solo )
 			{
@@ -1702,9 +1696,7 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 
 			if ( templ->Type == MISSION_DESC::Guild )
 			{
-
 				/// todo guild mission
-				
 				CGuild* guild = CGuildManager::getInstance()->getGuildFromId( user->getGuildId() );
 				if(!guild)
 					break;
@@ -1717,7 +1709,6 @@ uint32 CMissionTemplate::testPrerequisits( CCharacter * user, CPrerequisitInfos
 				}
 				if (k == guild->getMissions().size())
 					break;
-
 			}
 			else if ( templ->Type == MISSION_DESC::Solo )
 			{
diff --git a/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h b/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h
index 9e56b8aea..a5d46c766 100644
--- a/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h
+++ b/code/ryzom/server/src/entities_game_service/modules/r2_give_item.h
@@ -81,7 +81,7 @@ public:
 	typedef std::map< TCreatureRowId, TCreatureItemRequest > TPendingRequest;
 
 	// constructor
-	CR2GiveItem() {};
+	CR2GiveItem() {}
 	// destructor
 	~CR2GiveItem() {}
 
diff --git a/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp b/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp
index d64c097ea..e347597d2 100644
--- a/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp
+++ b/code/ryzom/server/src/entities_game_service/modules/shard_unifier_client.cpp
@@ -1096,10 +1096,22 @@ public:
 					// this is a special user, store it in the appropriate container
 					_OnlineSpecialEntities[cci.getPrivilege()].insert(charEid);
 				}
+
+				// Update LastPlayedDate
+				ICharacter *character = ICharacter::getInterface(IPlayerManager::getInstance().getActiveChar(uint32(charEid.getShortId()>>4)), true);
+				if (character)
+					character->setLastConnectionDate(cci.getlastConnectionDate());
+
 			}
 			else
 			{
 				nldebug("  Char %s has disconnected", charEid.toString().c_str());
+
+				// Update LastPlayedDate
+				ICharacter *character = ICharacter::getInterface(IPlayerManager::getInstance().getActiveChar(uint32(charEid.getShortId()>>4)), true);
+				if (character)
+					character->setLastConnectionDate(0);
+
 				// this character disconnected
 				_OnlineEntities.erase(charEid);
 
diff --git a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp
index 07b098793..2f72d37c4 100644
--- a/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp
+++ b/code/ryzom/server/src/entities_game_service/outpost_manager/outpost.cpp
@@ -84,7 +84,7 @@ CVariable<bool> UseProxyMoneyForOutpostCosts("egs", "UseProxyMoneyForOutpostCost
 CVariable<uint32> OutpostStateTimeOverride("egs", "OutpostStateTimeOverride", "Each state can be set to a shorter time in seconds, 0 means default computed value", true, 0, true );
 CVariable<uint32> OutpostJoinPvpTimer("egs", "OutpostJoinPvpTimer", "Max time the player has to answer the JoinPvp Window, in seconds", 10, 0, true );
 CVariable<uint32> NumberDayFactorGuildNeedForChallengeOutpost("egs","NumberDayFactorGuildNeedForChallengeOutpost","Nombre de 'level outpost / factor' jours d'existance que la guilde doit avoir pour pouvoir challenger un outpost",10,0,true);
-CVariable<sint32> NumberDaysMinusOutpostLevelForChallenge("egs","NumberDaysMinusOutpostLevelForChallenge", "Nombre à enlever au level du oupost pour avoir l'ancieneté requise pour challenger un outpost",50,0,true);
+CVariable<sint32> NumberDaysMinusOutpostLevelForChallenge("egs","NumberDaysMinusOutpostLevelForChallenge", "Number to substract from outpost level to get oldness required to challenge an outpost",50,0,true);
 
 extern CPlayerManager PlayerManager;
 
@@ -1463,50 +1463,55 @@ PVP_RELATION::TPVPRelation COutpost::getPVPRelation( CCharacter * user, CEntityB
 	if( IsRingShard )
 		return PVP_RELATION::Neutral;
 
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+
 	if( target->getOutpostAlias() == 0 )
 	{
 		return PVP_RELATION::Neutral;
 	}
-	else
+	
+	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
+	if (pTarget == 0)
+		return PVP_RELATION::Unknown;
+
+	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
 	{
-		CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
-		if(pTarget)
-		{
-			if( CPVPManager2::getInstance()->inSafeZone( pTarget->getPosition() ) )
-			{
-				if( pTarget->getSafeInPvPSafeZone() )
-				{
-					return PVP_RELATION::NeutralPVP;
-				}
-			}
-		}
-		if( CPVPManager2::getInstance()->inSafeZone( user->getPosition() ) )
-		{
-			if( user->getSafeInPvPSafeZone() )
-			{
-				return PVP_RELATION::NeutralPVP;
-			}
-		}
+		if (pTarget->getSafeInPvPSafeZone())
+			targetSafe = true;
+	}
 
-		if( user->getOutpostAlias() != target->getOutpostAlias() )
-		{
-			return PVP_RELATION::NeutralPVP;		
-		}
-		else
+	if( CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+	{
+		if( user->getSafeInPvPSafeZone())
+			actorSafe = true;
+	}
+
+	// One is safe but not other => NeutralPVP
+	if ((targetSafe && !actorSafe) || (actorSafe && !targetSafe)) {
+		return PVP_RELATION::NeutralPVP;
+	}
+
+	if( user->getOutpostAlias() == target->getOutpostAlias() )
+	{
+		if( user->getOutpostSide() != target->getOutpostSide() )
 		{
-			if( user->getOutpostSide() != target->getOutpostSide() )
+			if (!targetSafe && !actorSafe)
 			{
 				CPVPManager2::getInstance()->setPVPOutpostEnemyReminder( true );
 				return PVP_RELATION::Ennemy;
 			}
-			else
-			{
-				CPVPManager2::getInstance()->setPVPOutpostAllyReminder( true );
-				return PVP_RELATION::Ally;
-			}
+		}
+		else
+		{
+			CPVPManager2::getInstance()->setPVPOutpostAllyReminder( true );
+			return PVP_RELATION::Ally;
 		}
 	}
 
+	return PVP_RELATION::NeutralPVP;
+
 } // getPVPRelation //
 
 //----------------------------------------------------------------------------
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp
index 984003b20..fabb37350 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.cpp
@@ -67,3 +67,15 @@ NLMISC_DYNVARIABLE( uint, NbEnvironmentalEffects, "Number of environmental effec
 	if ( get )
 		*pointer = CEnvironmentalEffectManager::getInstance()->nbEntities();
 }
+
+/// Singleton access
+CEnvironmentalEffectManager *CEnvironmentalEffectManager::getInstance()
+{
+	return (CEnvironmentalEffectManager*)_Instance;
+}
+
+/// Release
+void CEnvironmentalEffectManager::release()
+{
+	delete (CEnvironmentalEffectManager*)_Instance;
+}
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h
index 0c81370a9..e53049cca 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/environmental_effect.h
@@ -89,10 +89,10 @@ class CEnvironmentalEffectManager : public CSimpleEntityManager<CEnvironmentalEf
 public:
 
 	/// Singleton access
-	static CEnvironmentalEffectManager *getInstance() { return (CEnvironmentalEffectManager*)_Instance; }
+	static CEnvironmentalEffectManager *getInstance();
 
 	/// Release
-	static void	release() { delete (CEnvironmentalEffectManager*)_Instance; }
+	static void release();
 };
 
 
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h
index 80a2cf5fb..9458a540d 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/faber_phrase.h
@@ -75,10 +75,10 @@ public:
 
 	///\unused basic methods from CSPhrase
 	//@{
-	virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
-	virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
-	virtual void addConsumableItem( CGameItemPtr itemPtr ){};
-	virtual void setPrimaryTarget( const TDataSetRow& ) {};
+	virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
+	virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
+	virtual void addConsumableItem( CGameItemPtr itemPtr ){}
+	virtual void setPrimaryTarget( const TDataSetRow& ) {}
 	//@}
 
 	// Craft methodes
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h
index 250481562..e8941a6ac 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_extraction_phrase.h
@@ -60,7 +60,7 @@ public:
 	/**
 	 * set the actor
 	 */
-	virtual void setActor( const TDataSetRow &entityRowId ){};
+	virtual void setActor( const TDataSetRow &entityRowId ){}
 	
 	/**
 	 * called at the end of the latency time
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h
index 48e27234f..1f202910c 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/fg_prospection_phrase.h
@@ -86,7 +86,7 @@ public:
 	/**
 	 * set the actor
 	 */
-	virtual void setActor( const TDataSetRow &entityRowId ){};
+	virtual void setActor( const TDataSetRow &entityRowId ){}
 	
 	//@}
 
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h
index c5cc5afaf..fc011a623 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/harvest_phrase.h
@@ -62,10 +62,10 @@ public:
 
 	///\unused basic methods from CSPhrase
 	//@{
-	virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
-	virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
-	virtual void addConsumableItem( CGameItemPtr itemPtr ){};
-	virtual void setPrimaryTarget( const TDataSetRow& ) {};
+	virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
+	virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
+	virtual void addConsumableItem( CGameItemPtr itemPtr ){}
+	virtual void setPrimaryTarget( const TDataSetRow& ) {}
 	//@}
 
 	//@}
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp b/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp
index 7e32b3060..4c8af6b6c 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/phrase_utilities_functions.cpp
@@ -1528,21 +1528,21 @@ bool testOffensiveActionAllowed( const NLMISC::CEntityId &actorId, const NLMISC:
 		return false;
 	}
 
-	// test target isn't invulnerable
-	if (target->getContextualProperty().directAccessForStructMembers().invulnerable())
+	// AI 
+	if (actorId.getType() != RYZOMID::player)
 	{
-		// check target Faction attackable flags
-		CCreature *creature = dynamic_cast<CCreature *> (target);
-		if (!creature || !creature->checkFactionAttackable(actorId))
+		// test target isn't invulnerable
+		if (target->getContextualProperty().directAccessForStructMembers().invulnerable())
 		{
-			errorCode = "BS_TARGET_NOT_ATTACKABLE";
-			return false;
+			// check target Faction attackable flags
+			CCreature *creature = dynamic_cast<CCreature *> (target);
+			if (!creature || !creature->checkFactionAttackable(actorId))
+			{
+				errorCode = "BS_TARGET_NOT_ATTACKABLE";
+				return false;
+			}
 		}
-	}
 
-	// AI 
-	if (actorId.getType() != RYZOMID::player)
-	{
 		if (mainTarget == true)
 			return true;
 		else
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h b/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h
index 7062a0dfd..9a73a3a07 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/s_effect.h
@@ -149,7 +149,7 @@ public:
 	}
 
 	// callback called when the effect is actually removed. Does nothing by default
-	virtual void removed(){};
+	virtual void removed(){}
 
 	///\name read accessors
 	//@{
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h b/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h
index 0b5ca1862..9d6ecd5f1 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/s_phrase.h
@@ -113,7 +113,7 @@ public:
 	 * set the primary target
 	 * \param entityId id of the primary target
 	 */
-	virtual void setPrimaryTarget( const TDataSetRow &entityRowId ) {};
+	virtual void setPrimaryTarget( const TDataSetRow &/* entityRowId */ ) {}
 
 	/**
 	 * evaluate phrase
@@ -188,9 +188,9 @@ public:
 	/** Return true if the phrase if grammatically valid (otherwise, send a msg to the player actorRowId)
 	 * TODO: anti-hacking
 	 */
-	static bool	validateSabrinaGrammar( const std::vector< const CStaticBrick* >& bricks, TDataSetRow actorRowId ) { return true; }
+	static bool	validateSabrinaGrammar( const std::vector< const CStaticBrick* >& /* bricks */, TDataSetRow /* actorRowId */ ) { return true; }
 
-	virtual void setBrickSheets( const std::vector<NLMISC::CSheetId> & bricks){}
+	virtual void setBrickSheets( const std::vector<NLMISC::CSheetId> & /* bricks */){}
 	virtual void setEnchantMode(bool){}
 
 	inline void cyclic(bool b) { _CyclicPhrase = b; }
diff --git a/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h b/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h
index f0bcb46c5..d1cd98246 100644
--- a/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h
+++ b/code/ryzom/server/src/entities_game_service/phrase_manager/toxic_cloud.h
@@ -36,7 +36,7 @@ class CToxicCloud : public CEnvironmentalEffect
 	NL_INSTANCE_COUNTER_DECL(CToxicCloud);
 public:
 
-	CToxicCloud() {};
+	CToxicCloud() {}
 
 	/// Init
 	inline void		init( const NLMISC::CVector& pos, float radius, sint32 dmgPerHit, NLMISC::TGameCycle updateFrequency, NLMISC::TGameCycle lifetime=ToxicCloudDefaultLifetime) 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h
index fccaff859..a2af677f7 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb.h
@@ -216,7 +216,7 @@ public :
 	/**
 	 * Inform a node of its parenthood
 	 */
-	virtual void setParent(CCDBStructNodeBranch *parent) { nlassertex(0,("setParent() not overloaded for given node type!")); }
+	virtual void setParent(CCDBStructNodeBranch * /* parent */) { nlassertex(0,("setParent() not overloaded for given node type!")); }
 
 	/**
 	 * get the parent of a node
@@ -248,7 +248,7 @@ public :
 	 * Browse the tree, and for each atom branch encountered, call the callback passing the argument
 	 * provided and the index of the atom branch.
 	 */
-	virtual void			foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const {};
+	virtual void			foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const {}
 
 	/**
 	 * Browse the tree, building the text id, and for each leaf encountered, call the callback
@@ -288,10 +288,10 @@ public :
 	TCDBDataIndex	getDataIndex() const { return _DataIndex; }
 
 	/// Set the atomic branch flag (when all the modified nodes of a branch should be tranmitted at the same time)
-	void			setAtomic( bool atomicBranch ) { _Atomic = atomicBranch; }
+	void			setAtomic( bool atomicBranch ) { _AtomicFlag = atomicBranch; }
 
 	/// Return true if the branch has the atomic flag
-	bool			isAtomic() const { return _Atomic; }
+	bool			isAtomic() const { return _AtomicFlag; }
 
 	/** Attach callback. Allow to attach a callback function that some code could call
 	 *	when an instance of this node is changed.
@@ -307,7 +307,7 @@ protected:
 	ICDBStructNode() 
 		: _BankLabels(NULL), 
 		  _DataIndex(CDB_INVALID_DATA_INDEX), 
-		  _Atomic(false),
+		  _AtomicFlag(false),
 		  _ChangeCallback(NULL)
 	{}
 
@@ -325,7 +325,7 @@ protected:
 	TCDBDataIndex			_DataIndex;
 
 	/// Atomic flag: is the branch an atomic group, or is the leaf a member of an atomic group
-	bool					_Atomic;
+	bool					_AtomicFlag;
 
 	/// Optional callback pointer.
 	TNodeChangeCallback		_ChangeCallback;
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp
index c622310e5..3748fe29a 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_branch.cpp
@@ -186,7 +186,7 @@ void	ICDBStructNode::setLabel( const std::string& bankName )
  */
 void	CCDBStructNodeBranch::initDataIndex( TCDBDataIndex& index )
 {
-	if ( _Atomic )
+	if ( _AtomicFlag )
 	{
 		_DataIndex = index;
 		checkIfNotMaxIndex();
@@ -207,7 +207,7 @@ void	CCDBStructNodeBranch::initDataIndex( TCDBDataIndex& index )
  */
 void	CCDBStructNodeBranch::initIdAndCallForEachIndex( CBinId& id, void (*callback)(ICDBStructNode*, void*), void *arg )
 {
-	if ( _Atomic )
+	if ( _AtomicFlag )
 	{
 		callback( this, arg );
 	}
@@ -537,7 +537,7 @@ TCDBDataIndex	CCDBStructNodeBranch::findDataIndex( ICDBStructNode::CTextId& id )
  */
 void			CCDBStructNodeBranch::foreachAtomBranchCall( void (*callback)(void*,TCDBDataIndex), void *arg ) const
 {
-	if ( _Atomic )
+	if ( _AtomicFlag )
 	{
 		callback( arg, _DataIndex );
 	}
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h
index 3968515d2..8e09617ad 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/cdb_synchronised.h
@@ -50,12 +50,12 @@ public:
 	/// exception thrown when database is not initialized
 	struct EDBNotInit : public NLMISC::Exception
 	{
-		EDBNotInit() : Exception("CDB: Property Database not initialized") {};
+		EDBNotInit() : Exception("CDB: Property Database not initialized") {}
 	};
 
 	struct ECDBNotFound : public NLMISC::Exception
 	{
-		ECDBNotFound() : Exception("CDB: Property not found") {};
+		ECDBNotFound() : Exception("CDB: Property not found") {}
 	};
 
 	/*struct CPropForClientOnly
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
index 70c8238ac..383d835a7 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.cpp
@@ -210,7 +210,7 @@ CVariable<uint32>			SpawnedDeadMektoubDelay("egs","SpawnedDeadMektoubDelay", "nb
 CVariable<bool>				ForceQuarteringRight("egs","ForceQuarteringRight", "Allow anyone to quarter a dead creature", false, 0, true );
 CVariable<bool>				AllowAnimalInventoryAccessFromAnyStable("egs", "AllowAnimalInventoryAccessFromAnyStable", "If true a player can access to his animal inventory (if the animal is inside a stable) from any stable over the world", true, 0, true );
 CVariable<uint32>			FreeTrialSkillLimit("egs", "FreeTrialSkillLimit", "Level limit for characters belonging to free trial accounts", 125,0,true);
-CVariable<uint32>			CraftFailureProbaMpLost("egs", "CraftFailureProbaMpLost", "Probabilité de destruction de chaque MP en cas d'echec du craft", 50,0,true);
+CVariable<uint32>			CraftFailureProbaMpLost("egs", "CraftFailureProbaMpLost", "Probability de destruction de chaque MP en cas d'echec du craft", 50,0,true);
 
 
 // Number of login stats kept for a character
@@ -411,6 +411,8 @@ CCharacter::CCharacter():	CEntityBase(false),
 
 	// pvp for player with privilege inactive
 	_PriviledgePvp = false;
+	// full pvp
+	_FullPvp = false;
 	// aggroable undefined
 	_Aggroable = true;
 	_AggroableOverride = -1;
@@ -421,12 +423,17 @@ CCharacter::CCharacter():	CEntityBase(false),
 	for (uint i = 0 ; i < (PVP_CLAN::EndClans-PVP_CLAN::BeginClans+1); ++i)
 		_FactionPoint[i] = 0;
 
+	_PvpPoint = 0;
 	_PVPFlagLastTimeChange = 0;
 	_PVPFlagTimeSettedOn = 0;
 	_PvPDatabaseCounter = 0;
 	_PVPFlag = false;
 	_PVPRecentActionTime = 0;
 
+	_Organization = 0;
+	_OrganizationStatus = 0;
+	_OrganizationPoints = 0;
+
 	// do not start berserk
 	_IsBerserk = false;
 
@@ -493,6 +500,9 @@ CCharacter::CCharacter():	CEntityBase(false),
 	///init teamId
 	_TeamId= CTEAM::InvalidTeamId;
 
+	///init LeagueId
+	_LeagueId = TChanID::Unknown;
+
 	// init combat flags
 	_CombatEventFlagTicks.resize(32);
 	for( uint i=0; i<32; ++i )
@@ -641,6 +651,10 @@ CCharacter::CCharacter():	CEntityBase(false),
 	_CurrentSessionId = _SessionId;
 	_PvPSafeZoneActive = false;
 
+	_PVPSafeLastTimeChange = CTickEventHandler::getGameCycle();
+	_PVPSafeLastTime = false;
+	_PVPInSafeZoneLastTime = false;
+
 	// For client/server contact list communication
 	_ContactIdPool= 0;
 
@@ -653,6 +667,10 @@ CCharacter::CCharacter():	CEntityBase(false),
 
 	_LastTickNpcControlUpdated = CTickEventHandler::getGameCycle();
 
+	_LastWebCommandIndex = 0;
+
+	_CustomMissionsParams.clear();
+
 	initDatabase();
 } // CCharacter  //
 
@@ -773,55 +791,20 @@ void	CCharacter::initPDStructs()
 void CCharacter::updatePVPClanVP() const
 {
 	TYPE_PVP_CLAN propPvpClanTemp = 0;
-	uint32 maxFameCiv = 0;
-	uint8 civOfMaxFame = 255;
-	uint32 maxFameCult = 0;
-	uint8 cultOfMaxFame = 255;
+	
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
+		propPvpClanTemp = 1+(uint32)(_LeagueId.getShortId());
+	else
+		propPvpClanTemp = 0;
 
-	for (uint8 fameIdx = 0; fameIdx < 7; fameIdx++)
+	CMirrorPropValue<TYPE_PVP_CLAN> propPvpClan( TheDataset, TheDataset.getDataSetRow(_Id), DSPropertyPVP_CLAN );
+	if (propPvpClan.getValue() != propPvpClanTemp)
 	{
-		sint32 fame = CFameInterface::getInstance().getFameIndexed(_Id, fameIdx);
-		if (fameIdx < 4)
-		{
-			if ((uint32)abs(fame) >= maxFameCiv)
-			{
-				civOfMaxFame = fameIdx;
-				maxFameCiv = abs(fame);
-			}
-		}
-		else
-		{ 
-			if ((uint32)abs(fame) >= maxFameCult)
-			{
-				cultOfMaxFame = fameIdx - 4;
-				maxFameCult = abs(fame);
-			}
-		}
-
-		if (fame >= PVPFameRequired*6000)
-		{
-			propPvpClanTemp |= (TYPE_PVP_CLAN(1) << (2*TYPE_PVP_CLAN(fameIdx)));
-		}
-		else if (fame <= -PVPFameRequired*6000)
-		{
-			propPvpClanTemp |= (TYPE_PVP_CLAN(1) << ((2*TYPE_PVP_CLAN(fameIdx))+1));
-		}
-		if (getPvPRecentActionFlag())
-		{
-			uint8 flagAlly = (_PVPFlagAlly & (1 << TYPE_PVP_CLAN(fameIdx))) >> TYPE_PVP_CLAN(fameIdx);
-			uint8 flagEnemy = (_PVPFlagEnemy & (1 << TYPE_PVP_CLAN(fameIdx))) >> TYPE_PVP_CLAN(fameIdx);
-			propPvpClanTemp |= flagAlly << (2*TYPE_PVP_CLAN(fameIdx));
-			propPvpClanTemp |= flagEnemy << ((2*TYPE_PVP_CLAN(fameIdx))+1);
-		}
-
+		propPvpClan = propPvpClanTemp;
+		propPvpClan.setChanged();
 	}
-	propPvpClanTemp |= TYPE_PVP_CLAN(civOfMaxFame) << (2*TYPE_PVP_CLAN(7));
-	propPvpClanTemp |= TYPE_PVP_CLAN(cultOfMaxFame) << (2*TYPE_PVP_CLAN(8));
-	CMirrorPropValue<TYPE_PVP_CLAN> propPvpClan( TheDataset, TheDataset.getDataSetRow(_Id), DSPropertyPVP_CLAN );
-
-	propPvpClan = (uint32)propPvpClanTemp;
 }
-
+/*
 TYPE_PVP_CLAN CCharacter::getPVPFamesAllies()
 {
 	TYPE_PVP_CLAN propPvpClanTemp = 0;
@@ -843,7 +826,7 @@ TYPE_PVP_CLAN CCharacter::getPVPFamesEnemies()
 		return propPvpClanTemp | _PVPFlagEnemy;
 	return propPvpClanTemp;
 }
-
+*/
 
 //-----------------------------------------------
 // addPropertiesToMirror :
@@ -1464,6 +1447,29 @@ uint32 CCharacter::tickUpdate()
 	{
 		H_AUTO(CharacterUpdatePVPMode);
 
+		if (_PVPSafeLastTimeChange + 20 < CTickEventHandler::getGameCycle())
+		{
+			bool update = false;
+			_PVPSafeLastTimeChange = CTickEventHandler::getGameCycle();
+
+			if (_PVPSafeLastTime != getSafeInPvPSafeZone())
+			{
+				_PVPSafeLastTime = !_PVPSafeLastTime;
+				update = true;
+			}
+
+			if (_PVPInSafeZoneLastTime != CPVPManager2::getInstance()->inSafeZone(getPosition()))
+			{
+				_PVPInSafeZoneLastTime = !_PVPInSafeZoneLastTime;
+				update = true;
+			}
+			
+			if (update) {
+				CPVPManager2::getInstance()->setPVPModeInMirror(this);
+				updatePVPClanVP();
+			}
+		}
+
 		if( _HaveToUpdatePVPMode )
 		{
 			const TGameCycle waitTime = _PVPFlag ? TimeForSetPVPFlag.get() : TimeForPVPFlagOff.get();
@@ -2865,7 +2871,9 @@ void CCharacter::postLoadTreatment()
 			{
 				_PlayerPets[ i ].Slot = INVENTORIES::INVALID_INVENTORY_SLOT;
 			}
-			uint32 slot = _PlayerPets[ i ].initLinkAnimalToTicket( this );
+
+			sendPetCustomNameToClient(i);
+			uint32 slot = _PlayerPets[ i ].initLinkAnimalToTicket( this, i );
 			if( slot < INVENTORIES::NbPackerSlots )
 			{
 				tickets[ slot ] =  true;
@@ -3625,7 +3633,7 @@ void CCharacter::setTargetBotchatProgramm( CEntityBase * target, const CEntityId
 //				_PropertyDatabase.setProp( toString("TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%u:PLAYER_GIFT_NEEDED",i) , 0 );
 				CBankAccessor_PLR::getTARGET().getCONTEXT_MENU().getMISSIONS_OPTIONS().getArray(i).setPLAYER_GIFT_NEEDED(_PropertyDatabase, 0 );
 //				_PropertyDatabase.setProp( toString("TARGET:CONTEXT_MENU:MISSIONS_OPTIONS:%u:PRIORITY",i), 0  );
-				CBankAccessor_PLR::getTARGET().getCONTEXT_MENU().getMISSIONS_OPTIONS().getArray(i).setPRIORITY(_PropertyDatabase, 0 );
+				CBankAccessor_PLR::getTARGET().getCONTEXT_MENU().getMISSIONS_OPTIONS().getArray(i).setPRIORITY(_PropertyDatabase, 2 );
 				i++;
 			}
 		}
@@ -4563,13 +4571,31 @@ bool CCharacter::fillFaberMaterialArray( vector<CFaberMsgItem>& materialsSelecte
 	lowerMaterialQuality = USHRT_MAX;
 	for( uint s = 0; s < materialsSelectedForFaber.size(); ++s )
 	{
+		bool bOk = false;
+		CInventoryPtr pInv = NULL;
 		if( materialsSelectedForFaber[ s ].getInvId() >= INVENTORIES::NUM_INVENTORY )
 		{
-			nlwarning("<CCharacter::fillFaberMaterialArray> CFaberMsgItem[%d] sended by client contains an invalid inventory index %d", s, materialsSelectedForFaber[ s ].getInvId() );
-			return false;
+			// Also allow crafting from player's room
+			if (materialsSelectedForFaber[ s ].getInvId() == INVENTORIES::player_room)
+			{
+				if (getRoomInterface().isValid() && getRoomInterface().canUseInventory(this, this))
+				{
+					pInv = getRoomInterface().getInventory();
+					bOk = true;
+				}
+			}
+
+			if ( ! bOk) 
+			{
+				nlwarning("<CCharacter::fillFaberMaterialArray> CFaberMsgItem[%d] sended by client contains an invalid inventory index %d", s, materialsSelectedForFaber[ s ].getInvId() );
+				return false;
+			}
+		}
+		else
+		{
+			pInv = _Inventory[ materialsSelectedForFaber[ s ].getInvId() ];
 		}
 
-		CInventoryPtr pInv = _Inventory[ materialsSelectedForFaber[ s ].getInvId() ];
 		if( materialsSelectedForFaber[ s ].IndexInInv >= pInv->getSlotCount() )
 		{
 			nlwarning("<CCharacter::fillFaberMaterialArray> CFaberMsgItem[%d] sended by client contains an invalid index %d for inventory %d", s, materialsSelectedForFaber[ s ].IndexInInv, materialsSelectedForFaber[ s ].getInvId() );
@@ -5170,6 +5196,9 @@ bool CCharacter::addCharacterAnimal( const CSheetId& PetTicket, uint32 Price, CG
 		{
 			_PlayerPets[ i ] = pet;
 
+			pet.ItemPtr->setPetIndex(i);
+			pet.Slot = ptr->getInventorySlot();
+
 			// init pet inventory
 			const uint32 petMaxWeight = 0xFFFFFFFF; // no weight limit
 			const uint32 petMaxBulk = _PlayerPets[ i ].getAnimalMaxBulk();
@@ -5433,6 +5462,7 @@ bool CCharacter::spawnWaitingCharacterAnimalNear( uint index, const SGameCoordin
 	msg.CharacterMirrorRow = _EntityRowId;
 	msg.PetSheetId = _PlayerPets[ index ].PetSheetId;
 	msg.PetIdx = index;
+	msg.CustomName = _PlayerPets[ index ].CustomName;
 	msg.AIInstanceId = (uint16)destAIInstance;
 	CWorldInstances::instance().msgToAIInstance( msg.AIInstanceId, msg);
 	// The row will be received in AnimalSpawned()
@@ -5544,6 +5574,7 @@ bool CCharacter::spawnCharacterAnimal(uint index )
 			msg.CharacterMirrorRow = _EntityRowId;
 			msg.PetSheetId = _PlayerPets[ index ].PetSheetId;
 			msg.PetIdx = index;
+			msg.CustomName = _PlayerPets[ index ].CustomName;
 
 			CVector pos;
 			pos.x = msg.Coordinate_X * 0.001f;
@@ -6723,6 +6754,38 @@ void CCharacter::sendAnimalCommand( uint8 petIndexCode, uint8 command )
 	}
 }
 
+void CCharacter::setAnimalName( uint8 petIndex, ucstring customName )
+{
+	if (petIndex < 0 || petIndex >= MAX_INVENTORY_ANIMAL)
+	{
+		nlwarning("<CCharacter::setAnimalName> Incorect animal index '%d'.", petIndex);
+		return;
+	}
+	CPetAnimal& animal = _PlayerPets[petIndex];
+
+	animal.setCustomName(customName);
+	sendPetCustomNameToClient(petIndex);
+	
+	TDataSetRow row = animal.SpawnedPets;
+	NLNET::CMessage	msgout("CHARACTER_NAME");
+	msgout.serial(row);
+	msgout.serial(customName);
+	sendMessageViaMirror("IOS", msgout);
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::sendPetCustomNameToClient(uint8 petIndex)
+{
+	uint32 textId = 0;
+	if (_PlayerPets[petIndex].CustomName.length() > 0)
+	{
+		SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+		params[0].Literal= _PlayerPets[petIndex].CustomName;
+		uint32 userId = PlayerManager.getPlayerId(_Id);
+		textId = STRING_MANAGER::sendStringToUser(userId, "LITERAL", params);
+	}
+	CBankAccessor_PLR::getPACK_ANIMAL().getBEAST(petIndex).setNAME(_PropertyDatabase, textId);
+}
 
 
 //-----------------------------------------------
@@ -6842,6 +6905,7 @@ double CCharacter::addXpToSkillInternal( double XpGain, const std::string& ContS
 	}
 
 	// check whether this character is on a free trial account
+	bool bFreeTrialLimitReached = false;
 	CPlayer * p = PlayerManager.getPlayer(PlayerManager.getPlayerId( getId() ));
 	BOMB_IF(p == NULL,"Failed to find player record for character: "<<getId().toString(),return 0.0);
 	if (p->isTrialPlayer())
@@ -6853,7 +6917,7 @@ double CCharacter::addXpToSkillInternal( double XpGain, const std::string& ContS
 			SM_STATIC_PARAMS_1(params, STRING_MANAGER::skill);
 			params[0].Enum = skillEnum;
 			PHRASE_UTILITIES::sendDynamicSystemMessage(getEntityRowId(), "PROGRESS_FREE_TRIAL_LIMIT", params);
-			return 0.0;
+			bFreeTrialLimitReached = true;
 		}
 	}
 
@@ -6893,6 +6957,11 @@ double CCharacter::addXpToSkillInternal( double XpGain, const std::string& ContS
 	// update death penalty
 	_DeathPenalties->addXP( *this, skillEnum, XpGain);
 
+	if (bFreeTrialLimitReached)
+	{
+		return 0.0;
+	}
+
 	// if no remaining XPGain, return
 	if (XpGain == 0.0f)
 		return 0.0;
@@ -8800,7 +8869,7 @@ void CCharacter::setDatabase()
 	_IneffectiveAuras.activate();
 	_ConsumableOverdoseEndDates.activate();
 	// init the RRPs
-	RingRewardPoints.initDb();
+	//RingRewarsdPoints.initDb();
 
 }// setDatabase //
 
@@ -8862,7 +8931,7 @@ void CCharacter::startTradeItemSession( uint16 session )
 		nlwarning("fame %u is INVALID",(uint)bot->getRace() );
 		fame = MinFameToTrade;
 	}
-	else if ( fame < MinFameToTrade )
+	else if ( fame < MinFameToTrade && bot->getOrganization() != getOrganization() )
 	{
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::bot);
 		params[0].setEIdAIAlias( _CurrentInterlocutor, CAIAliasTranslator::getInstance()->getAIAlias(_CurrentInterlocutor) );
@@ -8961,14 +9030,13 @@ void CCharacter::startTradePhrases(uint16 session)
 		return;
 	}
 
-
 	// *** Check the player has sufficient fame to Trade with Bot.
 	sint32 fame = CFameInterface::getInstance().getFameIndexed( _Id, bot->getForm()->getFaction() );
 	if ( fame == NO_FAME )
 	{
 		nlwarning("fame %u is INVALID",(uint)bot->getRace() );
 	}
-	if ( fame < MinFameToTrade )
+	if ( fame < MinFameToTrade && bot->getOrganization() != getOrganization() )
 	{
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::bot);
 		params[0].setEIdAIAlias( _CurrentInterlocutor, CAIAliasTranslator::getInstance()->getAIAlias(_CurrentInterlocutor) );
@@ -9738,7 +9806,7 @@ void CCharacter::sellItem( INVENTORIES::TInventory inv, uint32 slot, uint32 quan
 		nlwarning("fame %u is INVALID",(uint)bot->getRace() );
 		fame = MinFameToTrade;
 	}
-	else if ( fame < MinFameToTrade )
+	else if ( fame < MinFameToTrade && bot->getOrganization() != getOrganization() )
 	{
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::bot);
 		params[0].setEIdAIAlias( _CurrentInterlocutor, CAIAliasTranslator::getInstance()->getAIAlias(_CurrentInterlocutor) );
@@ -10087,6 +10155,84 @@ void CCharacter::initFactionPointDb()
 	}
 }
 
+
+//-----------------------------------------------
+// setPvpPoint : set the number of pvp point
+//
+//-----------------------------------------------
+void CCharacter::setPvpPoint(uint32 nbPt)
+{
+	_PvpPoint = nbPt;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(0).setVALUE(_PropertyDatabase, nbPt );
+
+}
+
+//-----------------------------------------------
+// getPvpPoint : get the number of pvp point
+//
+//-----------------------------------------------
+uint32 CCharacter::getPvpPoint()
+{
+	return _PvpPoint;
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::initPvpPointDb()
+{
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(0).setVALUE(_PropertyDatabase, _PvpPoint );
+}
+
+
+//-----------------------------------------------------------------------------
+void CCharacter::setOrganization(uint32 org)
+{
+	if (org == _Organization)
+		return;
+	_Organization = org;
+	_OrganizationStatus = 0;
+	_OrganizationPoints = 0;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(1).setVALUE(_PropertyDatabase, _Organization );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(3).setVALUE(_PropertyDatabase, _OrganizationPoints );
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::setOrganizationStatus(uint32 status)
+{
+	_OrganizationStatus = status;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::changeOrganizationStatus(sint32 status)
+{
+	if (status < 0 && abs(status) > _OrganizationStatus)
+		_OrganizationStatus = 0;
+	else
+		_OrganizationStatus += status;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+}
+
+//-----------------------------------------------------------------------------
+void CCharacter::changeOrganizationPoints(sint32 points)
+{
+	if (points < 0 && abs(points) > _OrganizationPoints)
+		_OrganizationPoints = 0;
+	else
+		_OrganizationPoints += points;
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(3).setVALUE(_PropertyDatabase, _OrganizationPoints );
+}
+
+
+//-----------------------------------------------------------------------------
+void CCharacter::initOrganizationInfos()
+{
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(1).setVALUE(_PropertyDatabase, _Organization );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(2).setVALUE(_PropertyDatabase, _OrganizationStatus );
+	CBankAccessor_PLR::getUSER().getRRPS_LEVELS(3).setVALUE(_PropertyDatabase, _OrganizationPoints );
+}
+
+
 //-----------------------------------------------------------------------------
 void CCharacter::sendFactionPointGainMessage(PVP_CLAN::TPVPClan clan, uint32 fpGain)
 {
@@ -10176,6 +10322,16 @@ void CCharacter::exchangeProposal()
 			return;
 		}
 
+		// If not a privileged player and in ignorelist, don't trade
+		if ( !haveAnyPrivilege() && c->hasInIgnoreList( getId() ) )
+		{
+			params.resize(1);
+			params[0].Type = STRING_MANAGER::player;
+			params[0].setEIdAIAlias( c->getId(), CAIAliasTranslator::getInstance()->getAIAlias(c->getId()) );
+			CCharacter::sendDynamicSystemMessage(_EntityRowId, "EXCHANGE_DECLINE", params);
+			return;
+		}
+
 		//set the target's exchange asker, and inform the target
 		c->_ExchangeAsker = _Id;
 
@@ -11267,7 +11423,7 @@ void CCharacter::setBerserkFlag(bool isBerserk)
 				}
 				else
 				{
-					sint8 percentTmp = sint8( (100.0 * ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
+					sint8 percentTmp = sint8( (127.0 * ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( target->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
 					if( percentTmp < 0 )
 						percent = 0;
 					else
@@ -11666,7 +11822,7 @@ bool CCharacter::processMissionEventList( std::list< CMissionEvent* > & eventLis
 
 			// If the mission is not for guild members we just instanciate it
 			if (!missionForGuild)
-				CMissionManager::getInstance()->instanciateMission(this, mission, giver ,eventList, mainMission);
+				CMissionManager::getInstance()->instanciateMission(this, mission, giver, eventList, mainMission);
 			else
 			{
 				// We find the guild and each guild members and we instanciate the mission for them
@@ -11681,7 +11837,7 @@ bool CCharacter::processMissionEventList( std::list< CMissionEvent* > & eventLis
 							nlwarning( "<MISSIONS>cant find user %s", it->first.toString().c_str() );
 							continue;
 						}
-						CMissionManager::getInstance()->instanciateMission(guildUser, mission, giver ,eventList, mainMission);
+						CMissionManager::getInstance()->instanciateMission(guildUser, mission, giver, eventList, mainMission);
 					}
 				}
 			}
@@ -13430,7 +13586,45 @@ void CCharacter::sendUrl(const string &url, const string &salt)
 	PlayerManager.sendImpulseToClient(getId(), "USER:POPUP", titleId, textId);
 }
 
+void CCharacter::validateDynamicMissionStep(const string &url)
+{
+	sendUrl(url+"&player_eid="+getId().toString()+"&event=mission_step_finished", getSalt());
+}
+
+/// set custom mission param
+void CCharacter::setCustomMissionParams(const string &missionName, const string &params)
+{
+	_CustomMissionsParams[missionName] = params;
+}
+
+/// add custom mission param
+void CCharacter::addCustomMissionParam(const string &missionName, const string &param)
+{
+	if (!_CustomMissionsParams.empty() && _CustomMissionsParams.find(missionName) != _CustomMissionsParams.end())
+		_CustomMissionsParams[missionName] += ","+param;
+	else
+		_CustomMissionsParams[missionName] = param;
+}
+
+/// get custom mission params 
+vector<string> CCharacter::getCustomMissionParams(const string &missionName)
+{
+	vector<string> params;
+	if (_CustomMissionsParams.empty()) 
+	{
+		return params;
+	}
+	
+	if (!_CustomMissionsParams.empty() && _CustomMissionsParams.find(missionName) != _CustomMissionsParams.end())
+	{
+		if (!_CustomMissionsParams[missionName].empty())
+			NLMISC::splitString(_CustomMissionsParams[missionName], ",", params);
+	}
+	return params;
+}
+
 
+// !!! Deprecated !!!
 void CCharacter::addWebCommandCheck(const string &url, const string &data, const string &salt)
 {
 	uint webCommand = getWebCommandCheck(url);
@@ -13494,6 +13688,7 @@ void CCharacter::addWebCommandCheck(const string &url, const string &data, const
 	}
 }
 
+// !!! Deprecated !!!
 uint CCharacter::getWebCommandCheck(const string &url)
 {
 	CInventoryPtr inv = getInventory(INVENTORIES::bag);
@@ -13528,6 +13723,7 @@ uint CCharacter::getWebCommandCheck(const string &url)
 	return INVENTORIES::NbBagSlots;
 }
 
+// !!! Deprecated !!!
 uint CCharacter::checkWebCommand(const string &url, const string &data, const string &hmac, const string &salt)
 {
 	if (salt.empty())
@@ -14651,14 +14847,10 @@ void CCharacter::addRoomAccessToPlayer(const NLMISC::CEntityId &id)
 void CCharacter::addPlayerToFriendList(const NLMISC::CEntityId &id)
 {
 	// if player not found
-	if (id == CEntityId::Unknown || PlayerManager.getChar(id)==NULL)
+	if (id == CEntityId::Unknown)
 	{
-		if ( ! (IShardUnifierEvent::getInstance() && IShardUnifierEvent::getInstance()->isCharacterOnlineAbroad(id)))
-		{
-			// player not found => message
-			PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "OPERATION_OFFLINE");
-			return;
-		}
+		PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "OPERATION_OFFLINE");
+		return;
 	}
 
 	// check not already in list
@@ -14721,6 +14913,78 @@ void CCharacter::addPlayerToFriendList(const NLMISC::CEntityId &id)
 }
 
 
+//--------------------------------------------------------------
+//	CCharacter::addPlayerToLeagueList() // unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::addPlayerToLeagueList(const NLMISC::CEntityId &id)
+{
+	// if player not found
+	if (id == CEntityId::Unknown)
+	{
+		PHRASE_UTILITIES::sendDynamicSystemMessage( _EntityRowId, "OPERATION_OFFLINE");
+		return;
+	}
+
+	// check not already in list
+	const uint size = _LeagueList.size();
+	for ( uint i =0 ; i < size ; ++i)
+	{
+		if ( _LeagueList[i].EntityId.getShortId() == id.getShortId())
+		{
+			return;
+		}
+	}
+
+	if(haveAnyPrivilege() == false && PlayerManager.haveAnyPriv(id))
+		return; // a character without privilege can't add one with privilege.
+
+	uint32 playerId = PlayerManager.getPlayerId(id);
+
+	// check the two char aren't from the same account
+	if (playerId == PlayerManager.getPlayerId(_Id))
+	{
+		egs_chinfo("Char %s tried to add %s in his friend list but they are from the same account->return", _Id.toString().c_str(), id.toString().c_str());
+		return;
+	}
+
+	// reference count
+	contactListRefChange( id, AddedAsLeague);
+
+	// add the char to friends
+	CContactId	contactId;
+	contactId.EntityId= id;
+	contactId.ContactId= _ContactIdPool++;	// create a new Id for client/server communication
+	_LeagueList.push_back(contactId);
+
+
+	// send create message to client
+	CMessage msgout( "IMPULSION_ID" );
+	msgout.serial( _Id );
+	CBitMemStream bms;
+
+	if ( ! GenericMsgManager.pushNameToStream( "TEAM:CONTACT_CREATE", bms) )
+	{
+		nlwarning("<CEntityBase::addPlayerToLeagueList> Msg name TEAM:CONTACT_CREATE not found");
+		return;
+	}
+	
+	TCharConnectionState onlineStatus = ccs_online;
+
+	uint32	nameId = CEntityIdTranslator::getInstance()->getEntityNameStringId(id);
+	uint8	listIndex = 2;
+
+	bms.serial(contactId.ContactId);
+	bms.serial(nameId);
+	bms.serialShortEnum(onlineStatus);
+	bms.serial(listIndex);
+
+	msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
+	CUnifiedNetwork::getInstance()->send( NLNET::TServiceId(_Id.getDynamicId()), msgout );
+
+}
+
+
+
 //--------------------------------------------------------------
 //	CCharacter::addPlayerToIgnoreList()
 //--------------------------------------------------------------
@@ -14822,6 +15086,23 @@ void CCharacter::removePlayerFromFriendListByIndex(uint16 index)
 	contactListRefChange( id, RemovedFromFriends);
 }
 
+//--------------------------------------------------------------
+//	CCharacter::removePlayerFromFriendListByIndex() // unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::removePlayerFromLeagueListByIndex(uint16 index)
+{
+	if (index >= _LeagueList.size())
+		return;
+
+	const	CEntityId id = _LeagueList[index].EntityId;
+	uint32	contactId= _LeagueList[index].ContactId;
+
+	// remove entry
+	_LeagueList.erase(_LeagueList.begin() + index);
+	sendRemoveContactMessage(contactId, 2);
+	contactListRefChange( id, RemovedFromLeague);
+}
+
 //--------------------------------------------------------------
 //	CCharacter::removePlayerFromIgnoreListByIndex()
 //--------------------------------------------------------------
@@ -14901,6 +15182,25 @@ void CCharacter::removePlayerFromFriendListByEntityId(const NLMISC::CEntityId &i
 	}
 }
 
+//--------------------------------------------------------------
+//	CCharacter::removePlayerFromLeagueListByEntityId() // unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::removePlayerFromLeagueListByEntityId(const NLMISC::CEntityId &id)
+{
+	if (id == NLMISC::CEntityId::Unknown)
+		return;
+
+	for ( uint i = 0 ; i < _LeagueList.size() ; ++i)
+	{
+		if ( _LeagueList[i].EntityId.getShortId() == id.getShortId() )
+		{
+			removePlayerFromLeagueListByIndex(i);
+			break;
+		}
+	}
+}
+
+
 //--------------------------------------------------------------
 //	CCharacter::removePlayerFromIgnoreListByEntityId()
 //--------------------------------------------------------------
@@ -14934,6 +15234,22 @@ void CCharacter::removePlayerFromFriendListByContactId(uint32 contactId)
 	}
 }
 
+//--------------------------------------------------------------
+//	CCharacter::removePlayerFromFriendListByContactId() unused, need more tests
+//--------------------------------------------------------------
+void CCharacter::removePlayerFromLeagueListByContactId(uint32 contactId)
+{
+	for ( uint i = 0 ; i < _LeagueList.size() ; ++i)
+	{
+		if ( _LeagueList[i].ContactId == contactId )
+		{
+			removePlayerFromLeagueListByIndex(i);
+			break;
+		}
+	}
+}
+
+
 //--------------------------------------------------------------
 //	CCharacter::removePlayerFromIgnoreListByContactId()
 //--------------------------------------------------------------
@@ -15329,6 +15645,15 @@ void CCharacter::sendRemoveContactMessage(uint32 contactId, uint8 listNumber)
 	CUnifiedNetwork::getInstance()->send( NLNET::TServiceId(_Id.getDynamicId()), msgout );
 } // sendRemoveContactMessage //
 
+//--------------------------------------------------------------
+//	CCharacter::setLastConnectionDate()
+//--------------------------------------------------------------
+void CCharacter::setLastConnectionDate(uint32 date)
+{
+	_LastConnectedDate = date;	
+}
+
+
 //--------------------------------------------------------------
 //	CCharacter::destroyCharacter()
 //--------------------------------------------------------------
@@ -15476,8 +15801,6 @@ void CCharacter::onConnection()
 {
 	// Add all handledAIGroups for all missions of the player
 	spawnAllHandledAIGroup();
-	// add character to event channel if event occurs
-	CGameEventManager::getInstance().addCharacterToChannelEvent( this );
 
 	// update for the unified entity locator
 	if (IShardUnifierEvent::getInstance() != NULL)
@@ -15874,6 +16197,7 @@ void CCharacter::sendEmote( const NLMISC::CEntityId& id, MBEHAV::EBehaviour beha
 			uint32 txtId = STRING_MANAGER::sendStringToClient( targetRow, phraseCont->TargetTarget, params );
 			// send emote message to IOS
 			NLNET::CMessage	msgout("EMOTE_PLAYER");
+			msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) );
 			msgout.serial( targetRow );
 			msgout.serial(txtId);
 			sendMessageViaMirror("IOS", msgout);
@@ -15884,7 +16208,8 @@ void CCharacter::sendEmote( const NLMISC::CEntityId& id, MBEHAV::EBehaviour beha
 	uint32 txtId = STRING_MANAGER::sendStringToClient(getEntityRowId(), *self, params );
 	// send emote message to IOS
 	NLNET::CMessage	msgout("EMOTE_PLAYER");
-	msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) );
+	msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) ); // sender
+	msgout.serial( const_cast<TDataSetRow&>( getEntityRowId() ) ); // receiver
 	msgout.serial(txtId);
 	sendMessageViaMirror("IOS", msgout);
 
@@ -16226,7 +16551,14 @@ NLMISC::TGameCycle CCharacter::getMissionLastSuccess(const CMissionTemplate & te
 {
 	std::map< TAIAlias, TMissionHistory >::iterator it(_MissionHistories.find(templ.Alias));
 	if (it != _MissionHistories.end())
+	{
+		TGameCycle lastSuccessDate =  it->second.LastSuccessDate;
+
+		if (lastSuccessDate > CTickEventHandler::getGameCycle())
+			return 0;
+
 		return it->second.LastSuccessDate;
+	}
 	return 0;
 
 }
@@ -17049,6 +17381,9 @@ void CCharacter::setPVPFlag( bool pvpFlag )
 		//  set the new pvp flag and time last change for apply timer delay before this change become effective
 		if( pvpFlag == false )
 		{
+			if (_PVPFlagTimeSettedOn > CTickEventHandler::getGameCycle())
+				_PVPFlagTimeSettedOn = CTickEventHandler::getGameCycle() - TimeForResetPVPFlag;
+
 			if( _PVPFlagTimeSettedOn + TimeForResetPVPFlag > CTickEventHandler::getGameCycle() )
 			{
 				// we need wait a minimal of time before reset your pvp tag
@@ -17146,13 +17481,6 @@ void CCharacter::setPVPRecentActionFlag(CCharacter *target)
 
 	_PVPRecentActionTime = CTickEventHandler::getGameCycle();
 
-	if (target != NULL)
-	{
-		_PVPFlagAlly |= target->getPVPFamesAllies();
-		_PVPFlagEnemy |= target->getPVPFamesEnemies();
-		updatePVPClanVP();
-	}
-
 //	_PropertyDatabase.setProp("CHARACTER_INFO:PVP_FACTION_TAG:FLAG_PVP_TIME_LEFT", _PVPRecentActionTime + PVPActionTimer );
 	CBankAccessor_PLR::getCHARACTER_INFO().getPVP_FACTION_TAG().setFLAG_PVP_TIME_LEFT(_PropertyDatabase, _PVPRecentActionTime + PVPActionTimer );
 
@@ -17880,7 +18208,7 @@ void CPetAnimal::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
 }
 
 //-----------------------------------------------------------------------------
-uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
+uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c, uint8 index )
 {
 	if( c )
 	{
@@ -17888,6 +18216,8 @@ uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
 		if( ( ItemPtr != 0 ) && ( ItemPtr->getStaticForm() != NULL ) && ( ItemPtr->getStaticForm()->Family == ITEMFAMILY::PET_ANIMAL_TICKET ) )
 		{
 //			Slot = ItemPtr->getLocSlot();
+			ItemPtr->setPetIndex(index);
+			ItemPtr->setCustomName(CustomName);
 			Slot = ItemPtr->getInventorySlot();
 			return Slot;
 		}
@@ -17900,6 +18230,8 @@ uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
 			{
 //				Slot = ItemPtr->getLocSlot();
 				Slot = ItemPtr->getInventorySlot();
+				ItemPtr->setPetIndex(index);
+				ItemPtr->setCustomName(CustomName);
 				return Slot;
 			}
 			else
@@ -17916,7 +18248,6 @@ uint32 CPetAnimal::initLinkAnimalToTicket( CCharacter * c )
 	return INVENTORIES::INVALID_INVENTORY_SLOT;
 }
 
-
 //-----------------------------------------------
 // getAnimalMaxBulk
 //-----------------------------------------------
@@ -18697,8 +19028,42 @@ void CCharacter::teleportCharacter( sint32 x, sint32 y)
 void CCharacter::setTeamId(uint16 id)
 {
 	_TeamId = id;
+	updatePVPClanVP();
 }
 
+void CCharacter::setLeagueId(TChanID id, bool removeIfEmpty)
+{
+
+	ucstring name = CEntityIdTranslator::getInstance()->getByEntity(getId());
+	CEntityIdTranslator::removeShardFromName(name);
+
+	// Remove old dynamic channel
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
+	{
+		CPVPManager2::getInstance()->broadcastMessage(_LeagueId, string("<INFO>"), name+" -->[]");
+		PHRASE_UTILITIES::sendDynamicSystemMessage(getEntityRowId(), "TEAM_QUIT_LEAGUE");
+		DynChatEGS.removeSession(_LeagueId, getEntityRowId());		
+		
+		vector<CEntityId> players;
+		bool isEmpty = DynChatEGS.getPlayersInChan(_LeagueId, players);
+				
+		if (isEmpty)
+		{
+			if (removeIfEmpty)
+				DynChatEGS.removeChan(_LeagueId);
+		}
+	}
+
+	if (id != DYN_CHAT_INVALID_CHAN)
+	{
+		PHRASE_UTILITIES::sendDynamicSystemMessage(getEntityRowId(), "TEAM_JOIN_LEAGUE");
+		DynChatEGS.addSession(id, getEntityRowId(), true);
+		CPVPManager2::getInstance()->broadcastMessage(id, string("<INFO>"), "<-- "+name);
+	}
+
+	_LeagueId = id;
+	updatePVPClanVP();
+}
 
 //------------------------------------------------------------------------------
 
@@ -18707,6 +19072,12 @@ void CCharacter::setTeamInvitor(const NLMISC::CEntityId & invitorId)
 	_TeamInvitor = invitorId;
 }
 
+//------------------------------------------------------------------------------
+
+void CCharacter::setLeagueInvitor(const NLMISC::CEntityId & invitorId)
+{
+	_LeagueInvitor = invitorId;
+}
 
 //------------------------------------------------------------------------------
 
@@ -19871,6 +20242,13 @@ void CCharacter::setPriviledgePVP( bool b )
 	_PriviledgePvp = b;
 }
 
+//------------------------------------------------------------------------------
+
+void CCharacter::setFullPVP( bool b )
+{
+	_FullPvp = b;
+}
+
 
 //------------------------------------------------------------------------------
 
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character.h b/code/ryzom/server/src/entities_game_service/player_manager/character.h
index c9482fdd0..b0d30b202 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character.h
@@ -21,6 +21,7 @@
 // Game Share
 #include "game_share/bot_chat_types.h"
 #include "game_share/brick_flags.h"
+#include "server_share/pet_interface_msg.h"
 #include "game_share/power_types.h"
 #include "game_share/roles.h"
 #include "game_share/temp_inventory_mode.h"
@@ -297,6 +298,7 @@ struct CPetAnimal
 	bool				IsMounted;
 	bool				IsTpAllowed;
 	bool				spawnFlag;
+	ucstring			CustomName;
 	
 	// ctor
 	CPetAnimal();
@@ -305,10 +307,12 @@ struct CPetAnimal
 	void serial(NLMISC::IStream &f) throw(NLMISC::EStream);
 
 	// init found ticket item pointer with slot
-	uint32 initLinkAnimalToTicket( CCharacter * c );
+	uint32 initLinkAnimalToTicket( CCharacter * c, uint8 index);
 
 	// get the max bulk of the animal inventory
 	uint32 getAnimalMaxBulk();
+
+	void setCustomName(const ucstring& customName) { CustomName = customName; }
 };
 
 /**
@@ -416,6 +420,10 @@ private:
 		RemoveFriend,
 		RemoveIgnored,
 		
+		AddedAsLeague,
+		RemovedFromLeague,
+		RemoveLeague,
+
 		NB_CONTACT_LIST_ACTIONS,
 		UnknownContactListAction= NB_CONTACT_LIST_ACTIONS,
 	};
@@ -737,6 +745,9 @@ public:
 
 	// return the season in which is the current character
 	uint8 getRingSeason() const { return _RingSeason;}
+
+	/// get the League id
+	TChanID getLeagueId() const { return _LeagueId;}
 	
 	
 		
@@ -746,10 +757,16 @@ public:
 	uint16 getTeamId() const;
 	/// set the team Id of this player
 	void setTeamId(uint16 id);
+	/// set the League id
+	void setLeagueId(TChanID id, bool removeIfEmpty=false);
 	/// get team invitor
 	const NLMISC::CEntityId & getTeamInvitor() const;
 	/// set team invitor
 	void setTeamInvitor(const NLMISC::CEntityId & invitorId);
+	/// get League invitor
+	const NLMISC::CEntityId & getLeagueInvitor() const;
+	/// set League invitor
+	void setLeagueInvitor(const NLMISC::CEntityId & invitorId);
 	//@}
 
 	/// Set fighting target
@@ -975,6 +992,11 @@ public:
 	// return the index of a player pet, or -1 if not found
 	sint32 getPlayerPet( const TDataSetRow& petRowId ) const;
 
+	// Set the name of the animal
+	void setAnimalName( uint8 petIndex, ucstring customName );
+
+	void sendPetCustomNameToClient(uint8 petIndex);
+
 	// near character's pets are TP with player (continent tp)
 	void allowNearPetTp();
 	bool isNearPetTpIsAllowed() const;
@@ -1151,6 +1173,12 @@ public:
 	/// get the number of faction point given a faction
 	uint32	getFactionPoint(PVP_CLAN::TPVPClan clan);
 
+	/// set the number of pvp point
+	void	setPvpPoint(uint32 nbPt);
+
+	/// get the number of pvp point given a faction
+	uint32	getPvpPoint();
+
 	/// set the SDB path where player wins HoF points in PvP (if not empty)
 	void	setSDBPvPPath(const std::string & sdbPvPPath);
 
@@ -1160,6 +1188,15 @@ public:
 	/// init faction point in client database
 	void	initFactionPointDb();
 
+	/// init pvp point in client database
+	void	initPvpPointDb();
+
+	void initOrganizationInfos();
+	void setOrganization(uint32 org);
+	void setOrganizationStatus(uint32 status);
+	void changeOrganizationStatus(sint32 status);
+	void changeOrganizationPoints(sint32 points);
+
 	/// send faction point gain phrase to the client
 	void	sendFactionPointGainMessage(PVP_CLAN::TPVPClan clan, uint32 fpGain);
 	/// send faction point gain kill phrase to the client
@@ -1614,6 +1651,18 @@ public:
 	/// send custom url
 	void sendUrl(const std::string &url, const std::string &salt);
 
+	/// set custom mission param
+ 	void setCustomMissionParams(const std::string &missionName, const std::string &params);
+
+ 	/// add custom mission param
+ 	void addCustomMissionParam(const std::string &missionName, const std::string &param);
+
+ 	/// get custom mission params
+ 	std::vector<std::string> getCustomMissionParams(const std::string &missionName);
+
+ 	/// validate dynamic mission step sending url
+ 	void validateDynamicMissionStep(const std::string &url);
+
 	/// add web command validation check
 	void addWebCommandCheck(const std::string &url, const std::string &data, const std::string &salt);
 
@@ -1856,15 +1905,18 @@ public:
 		/// add a player to friend list by name
 		void addPlayerToFriendList(const ucstring &name);
 
-		/// add a player to friend list by id
-		void addPlayerToFriendList(const NLMISC::CEntityId &id);
-
 		/// add a player to ignore list by name
 		void addPlayerToIgnoreList(const ucstring &name);
 
 		/// add a player to ignore list by Id
 		void addPlayerToIgnoreList(const NLMISC::CEntityId &id);
 		
+		/// add a player to league list by id
+		void addPlayerToLeagueList(const NLMISC::CEntityId &id);
+
+		/// add a player to friend list by id
+		void addPlayerToFriendList(const NLMISC::CEntityId &id);
+
 		/// get a player from friend or ignore list, by contact id
 		const NLMISC::CEntityId	&getFriendByContactId(uint32 contactId);
 		const NLMISC::CEntityId	&getIgnoreByContactId(uint32 contactId);
@@ -1885,6 +1937,9 @@ public:
 		/// remove room acces to player
 		void removeRoomAccesToPlayer(const NLMISC::CEntityId &id, bool kick);
 
+		/// remove player from league list
+		void removePlayerFromLeagueListByContactId(uint32 contactId);
+		void removePlayerFromLeagueListByEntityId(const NLMISC::CEntityId &id);
 
 		/// remove player from ignore list
 		void removePlayerFromIgnoreListByContactId(uint32 contactId);
@@ -1923,6 +1978,9 @@ public:
 		/// player is going online or offline
 		void online(bool onlineStatus);
 
+		/// player last connection date (from SU, exactly like on mysql db)
+		void setLastConnectionDate(uint32 date);
+
 		/// player is permanently erased, unreferenced it from all contact lists
 		void destroyCharacter();
 
@@ -2230,6 +2288,8 @@ public:
 	// priviledge PVP mode
 	void setPriviledgePVP( bool b );
 	bool priviledgePVP();
+	// full PVP mode
+	void setFullPVP( bool b );
 	/// set the current PVP zone where the player is
 	void setCurrentPVPZone(TAIAlias alias);
 	/// get the current PVP zone where the player is
@@ -2246,6 +2306,8 @@ public:
 	void openPVPVersusDialog() const;
 	/// get priviledgePvp
 	bool getPriviledgePVP() const {return _PriviledgePvp;};
+	/// get fullPvp
+	bool getFullPVP() const {return _FullPvp;};
 	/// get character pvp flag
 	bool getPVPFlag( bool updatePVPModeInMirror = true ) const;
 	/// change pvp flag
@@ -2274,7 +2336,7 @@ public:
 	/// Set an allegiance to neutral from indetermined status, used for process message from client want set it's allegiance to neutral when it's idetermined, over case are managed by missions. 
 	void setAllegianceFromIndeterminedStatus(PVP_CLAN::TPVPClan allegiance);
 	/// true if pvp safe zone active for character
-	bool getSafeInPvPSafeZone();
+	bool getSafeInPvPSafeZone() const;
 	/// set pvp safe zone to true
 	void setPvPSafeZoneActive();
 	/// clear pvp zone safe flag
@@ -2316,7 +2378,9 @@ public:
 	/// character log stats accessors
 	uint32 getFirstConnectedTime() const;
 	uint32 getLastConnectedTime() const;
+	uint32 getLastConnectedDate() const;
 	uint32 getPlayedTime() const;
+	uint32 getOrganization() const;
 	const std::list<TCharacterLogTime>& getLastLogStats() const;
 	void updateConnexionStat();
 	void setDisconnexionTime();		
@@ -2327,9 +2391,9 @@ public:
 	void haveToUpdateItemsPrerequisit( bool b );
 
 	void channelAdded( bool b );
-	bool isChannelAdded();
+	bool isChannelAdded() const;
 
-	uint8 getNbUserChannels() { return _NbUserChannels; };
+	uint8 getNbUserChannels() const { return _NbUserChannels; };
 	void addUserChannel() { _NbUserChannels++; };
 	void removeUserChannel() { _NbUserChannels--; };
 
@@ -2635,6 +2699,8 @@ private:
 
 	/// remove player from friend list
 	void removePlayerFromFriendListByIndex(uint16 index);
+	/// remove player from league list
+	void removePlayerFromLeagueListByIndex(uint16 index);
 	/// remove player from ignore list
 	void removePlayerFromIgnoreListByIndex(uint16 index);
 	
@@ -2934,6 +3000,12 @@ private:
 
 	uint32								_FactionPoint[PVP_CLAN::EndClans-PVP_CLAN::BeginClans+1];
 
+	uint32								_PvpPoint;
+
+	uint32								_Organization;
+	uint32								_OrganizationStatus;
+	uint32								_OrganizationPoints;
+
 	/// SDB path where player wins HoF points in PvP (if not empty)
 	std::string							_SDBPvPPath;
 	
@@ -2944,9 +3016,14 @@ private:
 	/// if this player has an invitation for another team, keep the team here
 	NLMISC::CEntityId 					_TeamInvitor;
 
+	/// if this player has an invitation for League, keep the invitor here
+	NLMISC::CEntityId 					_LeagueInvitor;
+
 	// id of the current team
 	CMirrorPropValueAlice< uint16, CPropLocationPacked<2> >	_TeamId;
 	
+	TChanID								_LeagueId;
+
 	/// temp values used to test if team bars need an update or not
 	mutable uint8						_OldHpBarSentToTeam;
 	mutable uint8						_OldSapBarSentToTeam;
@@ -3178,6 +3255,11 @@ private:
 	/// nb of users channels
 	uint8						_NbUserChannels;
 
+	/// last webcommand index
+	uint32						_LastWebCommandIndex;
+
+ 	std::map<std::string, std::string>	_CustomMissionsParams;
+
 	// for a power/combat event, stores start and end ticks
 	struct CFlagTickRange {
 
@@ -3243,6 +3325,8 @@ private:
 
 	// friends list
 	std::vector<CContactId>	_FriendsList;
+	// league list
+	std::vector<CContactId>	_LeagueList;
 	// ignore list
 	std::vector<CContactId>	_IgnoreList;
 	// list of players for whom this player is in the friendlist (to update online status and to remove from players list if this char is permanently deleted)
@@ -3380,8 +3464,14 @@ private:
 	CPVPInterface					*_PVPInterface;
 	// set pvp mode for priviledge player
 	bool							_PriviledgePvp;
+	// set full pvp mode for player
+	bool							_FullPvp;
 	// flag PVP, true for player involved in Faction PVP and other PVP
 	bool							_PVPFlag;
+	// time of last change in pvp safe
+	NLMISC::TGameCycle				_PVPSafeLastTimeChange;
+	bool							_PVPSafeLastTime;
+	bool							_PVPInSafeZoneLastTime;
 	// time of last change in pvp flag (for prevent change PVP flag exploits)
 	NLMISC::TGameCycle				_PVPFlagLastTimeChange;
 	// time of pvp flag are setted to on (for prevent change PVP flag exploits)
@@ -3571,7 +3661,8 @@ private:
 	std::set<NLMISC::CEntityId>		_EntitiesToSaveWithMe;
 
 	uint32 _FirstConnectedTime;						//first connected time in second since midnight (00:00:00), January 1, 1970
-	uint32 _LastConnectedTime;						//last connected time in second since midnight (00:00:00), January 1, 1970
+	uint32 _LastConnectedTime;						//last connected time in second since midnight (00:00:00), January 1, 1970 (change each tick update)
+	uint32 _LastConnectedDate;						//last connected time in second since midnight (00:00:00), January 1, 1970 (never change after login, exactly like in mysql db)
 	uint32 _PlayedTime;								//cumulated played time in second
 	mutable std::list<TCharacterLogTime> _LastLogStats;		//keep n login/duration/logoff time
 
@@ -3625,6 +3716,11 @@ private:
 	/// General god flag for persistence
 	bool			_GodModeSave;
 public:
+
+	void			setWebCommandIndex(uint32 index) { _LastWebCommandIndex = index;}
+	uint32			getWebCommandIndex() const { return _LastWebCommandIndex;}
+
+
 	bool			getInvisibility() const	{ return _Invisibility;}
 	/// Set the invisibility flag, NB : just for persistence, do not change nothing.
 	void			setInvisibility(bool invisible)
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h
index 4d9f51fdb..f50e57386 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inlines.h
@@ -131,6 +131,13 @@ inline const NLMISC::CEntityId & CCharacter::getTeamInvitor() const
 
 //------------------------------------------------------------------------------
 
+inline const NLMISC::CEntityId & CCharacter::getLeagueInvitor() const
+{
+	return _LeagueInvitor; 
+}
+
+//------------------------------------------------------------------------------
+
 inline const NLMISC::CEntityId &CCharacter::harvestedEntity() const
 {
 	return _MpSourceId; 
@@ -847,7 +854,7 @@ inline uint16 CCharacter::getKilledPvPRegion()
 
 //------------------------------------------------------------------------------
 
-inline bool CCharacter::getSafeInPvPSafeZone()
+inline bool CCharacter::getSafeInPvPSafeZone() const
 {
 	return _PvPSafeZoneActive; 
 }
@@ -875,11 +882,26 @@ inline uint32 CCharacter::getLastConnectedTime() const
 
 //------------------------------------------------------------------------------
 
+inline uint32 CCharacter::getLastConnectedDate() const
+{
+	return _LastConnectedDate; 
+}
+
+//------------------------------------------------------------------------------
+
 inline uint32 CCharacter::getPlayedTime() const
 {
 	return _PlayedTime; 
 }
 
+//------------------------------------------------------------------------------
+
+inline uint32 CCharacter::getOrganization() const
+{
+	return _Organization; 
+}
+
+
 //------------------------------------------------------------------------------
 
 inline const std::list<TCharacterLogTime>& CCharacter::getLastLogStats() const
@@ -889,7 +911,7 @@ inline const std::list<TCharacterLogTime>& CCharacter::getLastLogStats() const
 
 //------------------------------------------------------------------------------
 
-inline bool CCharacter::isChannelAdded()
+inline bool CCharacter::isChannelAdded() const
 {
 	return _ChannelAdded; 
 }
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h b/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h
index 05958655c..ffa525556 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_interface.h
@@ -126,6 +126,9 @@ public:
 
 	virtual void setContactOnlineStatus(const NLMISC::CEntityId &charEid, bool connection) =0;
 
+	virtual void setLastConnectionDate(uint32 date) =0;
+
+
 	virtual void syncContactListWithCharNameChanges(const std::vector<NLMISC::CEntityId> &charNameChanges)=0;
 
 	virtual void updateTargetingChars()=0;
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
index 6818a8b73..db7d0c22b 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
@@ -2443,7 +2443,7 @@ void CCharacter::sendItemInfos( uint16 slotId )
 		infos.TypeSkillMods = item->getTypeSkillMods();
 		
 		// Special case of web missions items
-		if (item->getStaticForm()->Name == "Web Transaction" || item->getStaticForm()->Family == ITEMFAMILY::SCROLL)
+		if (item->getStaticForm()->Name == "Web Transaction")
 		{
 			string cText = item->getCustomText().toString();
 			string::size_type sPos = cText.find(" ");
@@ -2453,11 +2453,16 @@ void CCharacter::sendItemInfos( uint16 slotId )
 				string cUrl = cText.substr(sPos, ePos-sPos);
 				infos.CustomText = ucstring("@WEBIG "+cUrl);
 			}
-			else
-				infos.CustomText = "";
 		}
 		else
+		{
 			infos.CustomText = item->getCustomText();
+		}
+		
+		if (item->getPetIndex() < MAX_INVENTORY_ANIMAL)
+		{
+			infos.PetNumber = item->getPetIndex() + 1;
+		}
 
 		CMessage msgout( "IMPULSION_ID" );
 		CBitMemStream bms;
@@ -2912,7 +2917,8 @@ void CCharacter::useItem(uint32 slot)
 	{
 		pair<PVP_CLAN::TPVPClan, PVP_CLAN::TPVPClan> allegeance = getAllegiance();
 		if ((form->TpType == TELEPORT_TYPES::KAMI) && (allegeance.first == PVP_CLAN::Karavan)
-			|| (form->TpType == TELEPORT_TYPES::KARAVAN) && (allegeance.first == PVP_CLAN::Kami))
+			|| (form->TpType == TELEPORT_TYPES::KARAVAN) && (allegeance.first == PVP_CLAN::Kami)
+			|| getOrganization() == 5 ) //marauder
 		{
 			CCharacter::sendDynamicSystemMessage(_Id, "ALTAR_RESTRICTION");
 			return;
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h
index 646913107..f7fd1d851 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/known_and_memorized_phrases.h
@@ -126,7 +126,7 @@ private:
 
 private:
 	// prevent copy constructor
-	CMemorizationSet(const CMemorizationSet &other) {};
+	CMemorizationSet(const CMemorizationSet &other) {}
 	// prevent copy operator
 	CMemorizationSet &operator =(const CMemorizationSet&other) { return *this;}
 };
@@ -183,7 +183,7 @@ private:
 
 private:
 	// prevent copy constructor
-	CPlayerPhraseMemory(const CMemorizationSet &other) {};
+	CPlayerPhraseMemory(const CMemorizationSet &other) {}
 	// prevent copy operator
 	CPlayerPhraseMemory &operator =(const CMemorizationSet&other) { return *this;}
 };
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp b/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp
index 542135aa9..1ffbc9c81 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/persistent_player_data.cpp
@@ -414,6 +414,10 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
 	_FactionPoint[i],\
 	PVP_CLAN::TPVPClan k=PVP_CLAN::fromString(key); if ((k>=PVP_CLAN::BeginClans) && (k<=PVP_CLAN::EndClans)) _FactionPoint[k-PVP_CLAN::BeginClans]=val)\
 \
+	PROP(uint32,_PvpPoint)\
+	PROP(uint32,_Organization)\
+	PROP(uint32,_OrganizationStatus)\
+	PROP(uint32,_OrganizationPoints)\
 	PROP2(DeclaredCult,string,PVP_CLAN::toString(_DeclaredCult),_DeclaredCult=PVP_CLAN::fromString(val))\
 	PROP2(DeclaredCiv,string,PVP_CLAN::toString(_DeclaredCiv),_DeclaredCiv=PVP_CLAN::fromString(val))\
 \
@@ -688,6 +692,7 @@ static void prepareCharacterPositionForStore ( COfflineEntityState & state, cons
 	LPROP(bool,IsMounted,if(IsMounted))\
 	PROP(bool,IsTpAllowed)\
 	PROP(TSatiety,Satiety)\
+	PROP2(CustomName, ucstring, CustomName, CustomName = val)\
 
 //#pragma message( PERSISTENT_GENERATION_MESSAGE )
 #include "game_share/persistent_data_template.h"
@@ -1183,7 +1188,7 @@ static void displayWarning(const std::string& s)
 //-----------------------------------------------------------------------------
 /**
  * This class is used to load old player room inventory, DO NOT BREAK IT!
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -1345,6 +1350,7 @@ private:
 	STRUCT_VECT(_TypeSkillMods)\
 	LPROP_VECT(CSheetId, _Enchantment, VECT_LOGIC(_Enchantment) if (_Enchantment[i]!=CSheetId::Unknown))\
 	PROP2(_CustomText,					ucstring,	_CustomText,				_CustomText=val)\
+	PROP(bool, _LockedByOwner)\
 	
 //#pragma message( PERSISTENT_GENERATION_MESSAGE )
 #include "game_share/persistent_data_template.h"
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp
index 36d2022e4..ef77550c1 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.cpp
@@ -2357,7 +2357,7 @@ void CPlayerManager::broadcastMessageUpdate()
 		msg= msg.replace("$seconds$",secondsStr.c_str());
 		msg= msg.replace("$minutes$",minutesStr.c_str());
 		msg= msg.replace("$hours$",hoursStr.c_str());
-		nlinfo("braodcasting message: %s",msg.c_str());
+		nlinfo("broadcasting message: %s",msg.c_str());
 
 		SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
 		params[0].Literal.fromUtf8(msg);
diff --git a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
index ecacee896..33e4a8ac9 100644
--- a/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
+++ b/code/ryzom/server/src/entities_game_service/player_manager/player_manager.h
@@ -166,13 +166,13 @@ public :
 	/// exception thrown when player is unknown
 	struct EPlayer : public NLMISC::Exception
 	{
-		EPlayer( uint32 userId ) : Exception ("Player "+NLMISC::toString(userId)+" not found") {};
+		EPlayer( uint32 userId ) : Exception ("Player "+NLMISC::toString(userId)+" not found") {}
 	};
 
 	/// exception thrown when player's char is unknown
 	struct EChar : public NLMISC::Exception
 	{
-		EChar( const NLMISC::CEntityId& id ) : Exception ("The char "+id.toString()+" doesn't exist") {};
+		EChar( const NLMISC::CEntityId& id ) : Exception ("The char "+id.toString()+" doesn't exist") {}
 	};
 
 	///init the manager
diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
index 4526c67f6..54cd5f0f2 100644
--- a/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
+++ b/code/ryzom/server/src/entities_game_service/progression/progression_pve.h
@@ -64,7 +64,7 @@ public:
 	};
 
 	/// ctor
-	CSkillProgress() {};
+	CSkillProgress() {}
 
 	/// dtor
 	virtual ~CSkillProgress() { _SkillsProgress.clear(); }
@@ -97,7 +97,7 @@ public:
 	typedef std::map< TDataSetRow, CSkillProgress * > TSkillProgressPerOpponentContainer;
 	
 	/// ctor
-	CCharacterActions() {};
+	CCharacterActions() {}
 
 	/// dtor+
 	virtual ~CCharacterActions();
diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp
index 94b230ca0..bce6d46c6 100644
--- a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp
+++ b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.cpp
@@ -1095,14 +1095,14 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 
 	nlassert(victimChar != NULL);
 
-	PVP_CLAN::TPVPClan victimFaction;
-	bool victimLosesFactionPoints;
-	if (!playerInFactionPvP(victimChar, &victimFaction, &victimLosesFactionPoints))
-		return;
+//	PVP_CLAN::TPVPClan victimFaction;
+	bool victimLosesFactionPoints = false;
+//	if (!playerInFactionPvP(victimChar, &victimFaction, &victimLosesFactionPoints))
+//		return;
 
-	PVP_CLAN::TPVPClan finalBlowerFaction;
-	if (!playerInFactionPvP(finalBlower, &finalBlowerFaction))
-		return;
+//	PVP_CLAN::TPVPClan finalBlowerFaction;
+//	if (!playerInFactionPvP(finalBlower, &finalBlowerFaction))
+//		return;
 
 	// check if victim and final blower are in PvP Faction (by tag or by a pvp versus zone)
 	/* if(!CPVPManager2::getInstance()->factionWarOccurs(victimFaction, finalBlowerFaction))
@@ -1204,9 +1204,13 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 			BOMB_IF(winnerChar == NULL, "invalid winner!", continue);
 
 			PVP_CLAN::TPVPClan winnerFaction;
-			bool winnerGainFactionPoints;
-			if(!playerInFactionPvP(winnerChar, &winnerFaction, &winnerGainFactionPoints))
-				continue; // can be in Duel or in other pvp mode.
+			bool winnerGainFactionPoints = true;
+
+			if (!canPlayerWinPoints(winnerChar, victimChar))
+				continue;
+
+			//if(!playerInFactionPvP(winnerChar, &winnerFaction, &winnerGainFactionPoints))
+			//	continue; // can be in Duel or in other pvp mode.
 
 			CRewardedKills::CRewardedKiller * noPointPlayer = getRewardedKiller(winnerChar->getId(), noPointPlayers);
 			if (noPointPlayer != NULL)
@@ -1227,9 +1231,27 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 
 			if (winnerGainFactionPoints)
 			{
+				// Compute Fames delta
+				sint32 fameFactor = 0;
+				for (uint8 fameIdx = 0; fameIdx < 7; fameIdx++)
+				{
+					sint32 victimFame = CFameInterface::getInstance().getFameIndexed(victimChar->getId(), fameIdx);
+					sint32 winnerFame = CFameInterface::getInstance().getFameIndexed(winnerChar->getId(), fameIdx);
+
+					if ( (victimFame >= 25*6000 && winnerFame <= -25*6000) || 
+						 (winnerFame >= 25*6000 && victimFame <= -25*6000) )
+						fameFactor++;
+
+					if ( (victimFame >= 25*6000 && winnerFame >= 25*6000) || 
+						 (victimFame <= -25*6000 && winnerFame <= -25*6000) )
+						fameFactor--;						
+				}
+				clamp(fameFactor, 0, 3);
+				nlinfo("points = %d * %d", fpPerPlayer, fameFactor);
+
 				// player gains faction points
-				changePlayerFactionPoints(winnerChar, winnerFaction, sint32(fpPerPlayer));
-				winnerChar->sendFactionPointGainKillMessage(winnerFaction, fpPerPlayer, victimChar->getId());
+				changePlayerPvpPoints(winnerChar, sint32(fpPerPlayer) * fameFactor);
+				winnerChar->sendFactionPointGainKillMessage(winnerFaction, fpPerPlayer * fameFactor, victimChar->getId());
 			}
 
 			// player gains HoF points
@@ -1237,13 +1259,14 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 			// and a way for known if an episode occurs (and specs for known if other episode pemrti to win HoF point...)
 			//changePlayerHoFPoints(winnerChar, sint32(hofpPerPlayer));
 
+			/*
 			// PvP faction winner HOF reward
 			CPVPManager2::getInstance()->characterKillerInPvPFaction( winnerChar, winnerFaction, (sint32)fpPerPlayer );
 			if( finalBlower == winnerChar )
 			{
 				CPVPManager2::getInstance()->finalBlowerKillerInPvPFaction( winnerChar, winnerFaction, victimChar );
 			}
-
+			*/
 			rewardedKillers.push_back(winnerChar->getId());
 			nbRewardedMembers++;
 		}
@@ -1273,7 +1296,7 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 	hofpLoss = uint32(double(hofpLoss) * PVPHoFPointLossFactor.get() + 0.5);
 
 	// keep the point loss to apply if the victim respawn
-	CPointLoss pointLoss;
+	/*CPointLoss pointLoss;
 	pointLoss.PlayerLosesFactionPoints	= victimLosesFactionPoints;
 	pointLoss.PlayerFaction				= victimFaction;
 	pointLoss.FactionPointLoss			= fpLoss;
@@ -1282,8 +1305,8 @@ void CDamageScoreManager::playerDeath(CCharacter * victimChar, const CCharacter
 	_PointLossByPlayer[victimChar->getId()] = pointLoss;
 
 	// PvP faction looser lost
-	CPVPManager2::getInstance()->characterKilledInPvPFaction( victimChar, victimFaction, -(sint32) fpLoss );
-
+	//CPVPManager2::getInstance()->characterKilledInPvPFaction( victimChar, victimFaction, -(sint32) fpLoss );
+*/
 	// delete the score table of the victim
 	removeDamageScoreTable(victimChar->getEntityRowId());
 }
@@ -1429,6 +1452,7 @@ void CDamageScoreManager::playerRespawn(CCharacter * victimChar)
 
 	const CPointLoss & pointLoss = (*it).second;
 
+	/*
 	if (pointLoss.PlayerLosesFactionPoints)
 	{
 		// victim loses faction points
@@ -1438,6 +1462,7 @@ void CDamageScoreManager::playerRespawn(CCharacter * victimChar)
 
 	// victim loses HoF points
 	changePlayerHoFPoints(victimChar, -sint32(pointLoss.HoFPointLoss));
+	*/
 
 	// remove the applied entry
 	_PointLossByPlayer.erase(it);
@@ -1684,9 +1709,9 @@ bool CDamageScoreManager::playerInFactionPvP(const CCharacter * playerChar, PVP_
 			return true;
 		}
 	}
-	else if( playerChar->getPVPFlag() )
+	else if( playerChar->getPVPFlag(false) )
 	{ 
-		pair<PVP_CLAN::TPVPClan, PVP_CLAN::TPVPClan> allegiance = playerChar->getAllegiance();
+		/*pair<PVP_CLAN::TPVPClan, PVP_CLAN::TPVPClan> allegiance = playerChar->getAllegiance();
 		if( (allegiance.first != PVP_CLAN::Neutral) && (allegiance.first != PVP_CLAN::None) )
 		{
 			if (faction)
@@ -1695,7 +1720,7 @@ bool CDamageScoreManager::playerInFactionPvP(const CCharacter * playerChar, PVP_
 				*withFactionPoints = true;
 			return true;
 		}
-		/*if ( allegiance.second != PVP_CLAN::Neutral)
+		if ( allegiance.second != PVP_CLAN::Neutral)
 		{
 			if (faction)
 				*faction = allegiance.second;
@@ -1703,7 +1728,42 @@ bool CDamageScoreManager::playerInFactionPvP(const CCharacter * playerChar, PVP_
 				*withFactionPoints = true;
 			return true;
 		}*/
+		return true;
+	}
+	return false;
+}
+
+bool CDamageScoreManager::canPlayerWinPoints(const CCharacter * winnerChar,  CCharacter * victimeChar) const
+{
+	// Don't win points if in duel
+	if ( winnerChar->getDuelOpponent() && (winnerChar->getDuelOpponent()->getId() == victimeChar->getId()) )
+		return false;
+
+	if (victimeChar->getPVPRecentActionFlag())
+		nlinfo("PVP recent flag");
+	// Only win points if victime is Flag
+	if( winnerChar->getPVPFlag(false))
+	{
+		 if ( true/*victimeChar->getPVPRecentActionFlag()*/ )
+		 {
+			nlinfo("Teams : %d, %d", winnerChar->getTeamId(), victimeChar->getTeamId());
+			// Don't win points if in same Team
+			if ( winnerChar->getTeamId() != CTEAM::InvalidTeamId && victimeChar->getTeamId() != CTEAM::InvalidTeamId && (winnerChar->getTeamId() == victimeChar->getTeamId()) )
+				return false;
+
+			// Don't win points if in same Guild
+			nlinfo("Guild : %d, %d", winnerChar->getGuildId(), victimeChar->getGuildId());
+			if ( winnerChar->getGuildId() != 0 && victimeChar->getGuildId() != 0 && (winnerChar->getGuildId() == victimeChar->getGuildId()) )
+				return false;
+
+			// Don't win points if in same League
+			if ( winnerChar->getLeagueId() != DYN_CHAT_INVALID_CHAN && victimeChar->getLeagueId() != DYN_CHAT_INVALID_CHAN && (winnerChar->getLeagueId() == victimeChar->getLeagueId()) )
+				return false;
+
+			return true;
+		 }
 	}
+
 	return false;
 }
 
@@ -1795,6 +1855,28 @@ sint32 CDamageScoreManager::changePlayerFactionPoints(CCharacter * playerChar, P
 	return fpDelta;
 }
 
+//-----------------------------------------------------------------------------
+sint32 CDamageScoreManager::changePlayerPvpPoints(CCharacter * playerChar, sint32 fpDelta)
+{
+	nlassert(playerChar != NULL);
+
+	if (fpDelta == 0)
+		return 0;
+
+	uint32 points = playerChar->getPvpPoint();
+
+	// player cannot have negative pvp points
+	fpDelta = max(fpDelta, -sint32(points));
+
+	points += fpDelta;
+
+	// set the new pvp points
+	playerChar->setPvpPoint(points);
+
+	return fpDelta;
+}
+
+
 //-----------------------------------------------------------------------------
 void CDamageScoreManager::changePlayerHoFPoints(CCharacter * playerChar, sint32 hofpDelta)
 {
diff --git a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h
index 30866991f..e2ed4b28f 100644
--- a/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h
+++ b/code/ryzom/server/src/entities_game_service/progression/progression_pvp.h
@@ -42,7 +42,7 @@ typedef uint16 TTeamId;
 /**
  * A damage score table keeps all damages done by a player/team/creature on a player
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -193,7 +193,7 @@ private:
  * It permits to find all players wounded by an entity (player/team/creature)
  * ie to find all players on which the entity has a damage score.
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -229,7 +229,7 @@ private:
 /**
  * It keeps kills that have been rewarded and which cannot be rewarded again for a lapse of time.
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -273,7 +273,7 @@ private:
  * and keeps their damage scores on each attacked player.
  * It also gives faction and HoF points to players.
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
@@ -342,6 +342,8 @@ private:
 	/// return true if the given action is curative
 	bool isCurativeAction(const TReportAction & action) const;
 
+	bool canPlayerWinPoints(const CCharacter * winnerChar, CCharacter * victimeChar) const;
+
 	/// return true if the given player is in 'faction PvP' (in a faction PvP zone)
 	/// \param faction : if not NULL return the faction of the player in the PvP zone where he is
 	/// \param gainFactionPoints : if not NULL return true if the zone gives faction points or not
@@ -357,6 +359,10 @@ private:
 	/// \return the applied delta (a negative delta may have been modified up to zero to keep faction points positive)
 	sint32 changePlayerFactionPoints(CCharacter * playerChar, PVP_CLAN::TPVPClan faction, sint32 fpDelta);
 
+	/// add/remove pvp points to a player
+	/// \return the applied delta (a negative delta may have been modified up to zero to keep pvp points positive)
+	sint32 changePlayerPvpPoints(CCharacter * playerChar, sint32 fpDelta);
+
 	/// add/remove HoF points to a player and his guild if his SDB PvP path is defined
 	void changePlayerHoFPoints(CCharacter * playerChar, sint32 hofpDelta);
 
@@ -388,7 +394,7 @@ private:
 /**
  * This is the interface for the character progression in PvP
  *
- * \author Sébastien 'kxu' Guignot
+ * \author Sebastien 'kxu' Guignot
  * \author Nevrax France
  * \date 2005
  */
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h
index c26b9f8bc..d48dcdb96 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_base.h
@@ -56,6 +56,8 @@ public:
 		QuitTeam,
 	};
 
+	virtual ~IPVP() {}
+	
 	/// get PVP mode to send to the client
 	virtual PVP_MODE::TPVPMode getPVPMode() const = 0;
 
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp
index 95bdf73a4..e108d68e7 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_faction.cpp
@@ -39,6 +39,13 @@ PVP_RELATION::TPVPRelation CPVPFaction::getPVPRelation( CCharacter * actor, CEnt
 	CPVPManager2::getInstance()->setPVPFactionAllyReminder( false );
 	CPVPManager2::getInstance()->setPVPFactionEnemyReminder( false );
 
+	bool isAlly = false;
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+	bool targetInSafeZone = false;
+	bool actorInSafeZone = false;
+
 	// Check actor and target validity
 	if (actor == 0 || target == 0)
 	{
@@ -50,70 +57,85 @@ PVP_RELATION::TPVPRelation CPVPFaction::getPVPRelation( CCharacter * actor, CEnt
 	if (pTarget == 0)
 		return PVP_RELATION::Unknown;
 
-	// if target is not tagged then he's neutral
-	if (!pTarget->getPVPFlag() && !pTarget->getPvPRecentActionFlag())
-		return PVP_RELATION::Neutral;
-
-	// Check safe zones
 	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
 	{
+		targetInSafeZone = true;
 		if (pTarget->getSafeInPvPSafeZone())
-			return PVP_RELATION::NeutralPVP;
+			targetSafe = true;
 	}
 
 	if( CPVPManager2::getInstance()->inSafeZone(actor->getPosition()))
 	{
+		actorInSafeZone = true;
 		if( actor->getSafeInPvPSafeZone())
+			actorSafe = true;
+	}
+	
+	// Target is not tagged => Neutral
+	if (!pTarget->getPVPFlag() && !pTarget->getPvPRecentActionFlag())
+		return PVP_RELATION::Neutral;
+
+	// Actor is not tagged => Check target
+	if (!actor->getPVPFlag() && !actor->getPvPRecentActionFlag())
+	{
+		// Target flag => NeutralPVP
+		if (pTarget->getPvPRecentActionFlag())
 			return PVP_RELATION::NeutralPVP;
+		else
+			return PVP_RELATION::Neutral;
 	}
 
-	// Check fames
-	if( actor->getPVPFlag() || actor->getPvPRecentActionFlag() )
+
+	// In same Team => Ally
+	if ((pTarget->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() == pTarget->getTeamId()))
 	{
-		// In same Team
-		if ((pTarget->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() == pTarget->getTeamId()))
-		{
-			CPVPManager2::getInstance()->setPVPFactionAllyReminder( true );
-			return PVP_RELATION::Ally;
-		}
+		isAlly = true;
+	}
 
-		// In same Guild
-		if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() == pTarget->getGuildId()))
-		{
-			CPVPManager2::getInstance()->setPVPFactionAllyReminder( true );
-			return PVP_RELATION::Ally;
-		}
+	// In Same League => Ally
+	if ((pTarget->getLeagueId() != DYN_CHAT_INVALID_CHAN) && (actor->getLeagueId() != DYN_CHAT_INVALID_CHAN) && (actor->getLeagueId() == pTarget->getLeagueId()))
+	{
+		isAlly = true;
+	}
+
+	// In same Guild and not Leagued => Ally
+	if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() == pTarget->getGuildId()) && (pTarget->getLeagueId() == DYN_CHAT_INVALID_CHAN) && (actor->getLeagueId() == DYN_CHAT_INVALID_CHAN))
+	{
+		isAlly = true;
+	}
 
-		// check if he's an ennemy
-		if ((actor->getPVPFamesAllies() & pTarget->getPVPFamesEnemies()) || (actor->getPVPFamesEnemies() & pTarget->getPVPFamesAllies()))
+	if (isAlly)
+	{
+		// One is in safe zone but not other => NeutralPVP
+		if ((targetInSafeZone && !actorInSafeZone) || (actorInSafeZone && !targetInSafeZone))
 		{
-			// Actor can heal an ennemi if not PvPRecentActionFlaged
-			if (curative && !pTarget->getPvPRecentActionFlag())
-			{
-				return PVP_RELATION::Neutral;
-			}
-			else
-			{
-				CPVPManager2::getInstance()->setPVPFactionEnemyReminder(true);
-				return PVP_RELATION::Ennemy;
-			}
+			return PVP_RELATION::NeutralPVP;
 		}
-		// check if he's an ally
-		else if ((actor->getPVPFamesAllies() & pTarget->getPVPFamesAllies()) || (actor->getPVPFamesEnemies() & pTarget->getPVPFamesEnemies()))
+		
+		// One is safe but not other => NeutralPVP
+		if (targetSafe != actorSafe)
 		{
-			CPVPManager2::getInstance()->setPVPFactionAllyReminder(true);
-			return PVP_RELATION::Ally;
+			return PVP_RELATION::NeutralPVP;
 		}
+
+		CPVPManager2::getInstance()->setPVPFactionAllyReminder(true);
+		return PVP_RELATION::Ally;
 	}
-	else
+	
+	// If one is safe => NeutralPVP
+	if (targetSafe || actorSafe)
 	{
-		// Check if actor is not PvPFlag and try to heal a PvPRecentActionFlag
-		if (curative && pTarget->getPvPRecentActionFlag())
-			return PVP_RELATION::NeutralPVP;
+		return PVP_RELATION::NeutralPVP;
+	}
+	
+	// 
+	if ((targetInSafeZone && !pTarget->getPvPRecentActionFlag()) || (actorInSafeZone && !actor->getPvPRecentActionFlag()))
+	{
+		return PVP_RELATION::NeutralPVP;
 	}
 
-	// default is neutral
-	return PVP_RELATION::Neutral;
+	CPVPManager2::getInstance()->setPVPFactionEnemyReminder(true);
+	return PVP_RELATION::Ennemy;
 }
 
 
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_interface.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_interface.h
index 8524320df..dd5c92b68 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_interface.h
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_interface.h
@@ -38,6 +38,7 @@ class CGameItemPtr;
 class IPVPInterface : public NLMISC::CRefCount
 {
 public:
+	virtual ~IPVPInterface() {}
 	///\name PVP MODE FEATURES DEPENDANTS
 	//@{
 	/// return pvp relation between the two players
@@ -61,8 +62,6 @@ public:
 	/// killed character in PvP faction
 	virtual void characterKilledInPvPFaction( CCharacter * character, PVP_CLAN::TPVPClan looserFaction, sint32 factionPoint ) const = 0;
 	//@}
-
-private:
 };
 
 #endif // RY_PVP_INTERFACE_H
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
index 11ad5092b..5dcec508d 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.cpp
@@ -26,6 +26,7 @@
 #include "game_share/utils.h"
 #include "game_share/msg_client_server.h"
 #include "game_share/fame.h"
+#include "game_share/send_chat.h"
 
 #include "pvp_manager/pvp_manager_2.h"
 #include "pvp_manager/pvp_manager.h"
@@ -176,6 +177,21 @@ TChanID CPVPManager2::getUserDynChannel( const std::string& channelName)
 		return DYN_CHAT_INVALID_CHAN;
 }
 
+std::string CPVPManager2::getUserDynChannel(const TChanID& channelId)
+{
+	TMAPExtraFactionChannel::iterator it;
+	for (it = _UserChannel.begin(); it != _UserChannel.end(); ++it)
+	{
+		if ((*it).second == channelId)
+		{
+			return (*it).first;
+		}
+	}
+	// should not get here
+	nlassert(false);
+	return "";
+}
+
 const std::string & CPVPManager2::getPassUserChannel( TChanID channelId)
 {
 	// Search in user channels
@@ -353,7 +369,7 @@ void CPVPManager2::broadcastMessage(TChanID channel, const ucstring& speakerName
 	sendMessageViaMirror("IOS", msgout);
 }
 
-void CPVPManager2::sendChannelUsers(TChanID channel, CCharacter * user)
+void CPVPManager2::sendChannelUsers(TChanID channel, CCharacter * user, bool outputToSys)
 {
 	std::vector<NLMISC::CEntityId> lst;
 
@@ -361,21 +377,40 @@ void CPVPManager2::sendChannelUsers(TChanID channel, CCharacter * user)
 	if(it != _UserChannelCharacters.end())
 	{
 		lst = (*it).second;
-		string players = "";
+		ucstring players;
+		uint32 shardId = CEntityIdTranslator::getInstance()->getEntityShardId(user->getId());
 		for (uint i = 0; i < lst.size(); i++)
 		{
-			players += "\n"+CEntityIdTranslator::getInstance()->getByEntity(lst[i]).toString();
+			ucstring name = CEntityIdTranslator::getInstance()->getByEntity(lst[i]);
+			if (shardId == CEntityIdTranslator::getInstance()->getEntityShardId(lst[i]))
+			{
+				// Same shard, remove shard from name
+				CEntityIdTranslator::removeShardFromName(name);
+			}
+			players += "\n" + name ;
 		}
 
-		CMessage msgout("DYN_CHAT:SERVICE_TELL");
-		msgout.serial(channel);
-		ucstring users = ucstring("<USERS>");
-		msgout.serial(const_cast<ucstring&>(users));	
 		TDataSetRow senderRow = TheDataset.getDataSetRow(user->getId());
-		msgout.serial(senderRow);
-		ucstring txt = ucstring(players);
-		msgout.serial(const_cast<ucstring&>(txt));
-		sendMessageViaMirror( "IOS", msgout);
+		if (outputToSys)
+		{
+			CCharacter::sendDynamicSystemMessage( user->getId(), "WHO_CHANNEL_INTRO" );
+			//players = "Players in channel \"" + getUserDynChannel(channel) + "\": " + players;
+			SM_STATIC_PARAMS_1(params, STRING_MANAGER::literal);
+			params[0].Literal = players;
+			CCharacter::sendDynamicSystemMessage( user->getId(), "LITERAL", params );
+		}
+		else
+		{
+			CMessage msgout("DYN_CHAT:SERVICE_TELL");
+			msgout.serial(channel);
+			ucstring users = ucstring("<USERS>");
+			msgout.serial(const_cast<ucstring&>(users));	
+			msgout.serial(senderRow);
+			ucstring txt = ucstring(players);
+			msgout.serial(const_cast<ucstring&>(txt));
+
+			sendMessageViaMirror("IOS", msgout);
+		}
 	}
 }
 
@@ -559,10 +594,10 @@ void CPVPManager2::playerTeleports(CCharacter * user)
 void CPVPManager2::setPVPModeInMirror( const CCharacter * user ) const
 {
 	nlassert(user);
-	uint8 pvpMode = 0;
+	TYPE_PVP_MODE pvpMode = 0;
 	
 	// Full pvp
-	if ( user->getPriviledgePVP() )
+	if ( user->getFullPVP() )
 	{
 		pvpMode |= PVP_MODE::PvpChallenge;
 	}
@@ -588,6 +623,16 @@ void CPVPManager2::setPVPModeInMirror( const CCharacter * user ) const
 			pvpMode |= PVP_MODE::PvpDuel;
 		}
 	}
+	// in Safe zone
+	{
+		if (CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+		{
+			pvpMode |= PVP_MODE::PvpZoneSafe;
+			if (user->getSafeInPvPSafeZone())
+				pvpMode |= PVP_MODE::PvpSafe;
+		}
+	}
+
 	// pvp session (i.e everything else)
 	{
 		if ( user->getPVPInterface().isValid() )
@@ -596,9 +641,15 @@ void CPVPManager2::setPVPModeInMirror( const CCharacter * user ) const
 			pvpMode |= interf.getPVPSession()->getPVPMode();
 		}
 	}
-	
+
 	CMirrorPropValue<TYPE_PVP_MODE> propPvpMode( TheDataset, user->getEntityRowId(), DSPropertyPVP_MODE );
-	propPvpMode = pvpMode;
+	CMirrorPropValue<TYPE_EVENT_FACTION_ID> propPvpMode2( TheDataset, user->getEntityRowId(), DSPropertyEVENT_FACTION_ID );
+	if (propPvpMode.getValue() != pvpMode)
+	{
+		nlinfo("New pvp Mode : %d", pvpMode);
+		propPvpMode = pvpMode;
+		propPvpMode2 = pvpMode;
+	}
 }
 
 //----------------------------------------------------------------------------
@@ -648,22 +699,16 @@ PVP_RELATION::TPVPRelation CPVPManager2::getPVPRelation( CCharacter * actor, CEn
 	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
 	if( pTarget )
 	{
-		// priviledgePVP is Full PVP, only ally of teammates anf guildmates
-		if (pTarget->priviledgePVP() || actor->priviledgePVP())
+		// Full PVP is ennemy of everybody
+		if (pTarget->getFullPVP() || actor->getFullPVP())
 		{
-			if ((pTarget->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() != CTEAM::InvalidTeamId) && (actor->getTeamId() == pTarget->getTeamId()))
-				return PVP_RELATION::Ally;
-		
-			if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() == pTarget->getGuildId()))
-				return PVP_RELATION::Ally;
-
 			return PVP_RELATION::Ennemy;
 		}
 
 		if( IsRingShard )
 			return relation; // disable PVP on Ring shards (only if target is a CCharacter, because we must let attack NPCs)
 
-		// //////////////////////////////////////////////////////
+		////////////////////////////////////////////////////////
 		// temp : until new manager is finished we have to check the char pvp session too
 		IPVP * pvpSession = pTarget->getPVPInterface().getPVPSession();
 		if( pvpSession )
@@ -713,8 +758,8 @@ PVP_RELATION::TPVPRelation CPVPManager2::getPVPRelation( CCharacter * actor, CEn
 		if( relationTmp == PVP_RELATION::NeutralPVP )
 			relation = PVP_RELATION::NeutralPVP;
 
-		// Check if ally (neutralpvp has priority over ally)
-		if( relationTmp == PVP_RELATION::Ally && relation != PVP_RELATION::NeutralPVP )
+		// Check if ally (neutralpvp and active has priority over ally)
+		if (relationTmp == PVP_RELATION::Ally && relation != PVP_RELATION::NeutralPVP)
 			relation = PVP_RELATION::Ally;
 	}
 
@@ -730,6 +775,7 @@ bool CPVPManager2::isCurativeActionValid( CCharacter * actor, CEntityBase * targ
 
 	PVP_RELATION::TPVPRelation pvpRelation = getPVPRelation( actor, target, true );
 	bool actionValid;
+	nlinfo("Pvp relation = %d", pvpRelation);
 	switch( pvpRelation )
 	{
 		case PVP_RELATION::Ally :
@@ -757,11 +803,12 @@ bool CPVPManager2::isCurativeActionValid( CCharacter * actor, CEntityBase * targ
 	if( actionValid && !checkMode )
 	{
 		CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
-		if(pTarget)
-			actor->clearSafeInPvPSafeZone();
+	
+		//if(pTarget)
+		//	actor->clearSafeInPvPSafeZone();
 
 		// propagate faction pvp flag
-		if( pvpRelation == PVP_RELATION::Ally )
+		if( pvpRelation == PVP_RELATION::Ally)
 		{
 			if( _PVPFactionAllyReminder )
 			{
@@ -782,10 +829,6 @@ bool CPVPManager2::isCurativeActionValid( CCharacter * actor, CEntityBase * targ
 			{
 				actor->refreshOutpostLeavingTimer();
 			}
-		
-			// propagate full pvp
-			if( pTarget->priviledgePVP() )
-				actor->setPriviledgePVP(true);
 		}
 	}
 	return actionValid;
@@ -832,7 +875,13 @@ bool CPVPManager2::isOffensiveActionValid( CCharacter * actor, CEntityBase * tar
 	{
 		CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
 		if(pTarget)
-			actor->clearSafeInPvPSafeZone();
+		{
+			if (actor->getDuelOpponent() == pTarget) // No _PVPFactionEnemyReminder when in duel
+				CPVPManager2::getInstance()->setPVPFactionAllyReminder(false);
+			else
+				actor->clearSafeInPvPSafeZone();
+		}
+
 		if( _PVPFactionEnemyReminder )
 		{
 			actor->setPVPRecentActionFlag();
@@ -886,10 +935,20 @@ bool CPVPManager2::canApplyAreaEffect(CCharacter* actor, CEntityBase * areaTarge
 	
 	if( actionValid )
 	{
+		/*	if ((pTarget->getGuildId() != 0) && (actor->getGuildId() != 0) && (actor->getGuildId() != pTarget->getGuildId()))
+				return false;
+		*/
+
 		if( areaTarget->getId().getType() == RYZOMID::player )
 		{
 			CCharacter * pTarget = dynamic_cast<CCharacter*>(areaTarget);
-			if(pTarget)
+			if (!offensive)
+			{
+				if (actor->getTeamId() != pTarget->getTeamId() && actor->getLeagueId() != pTarget->getLeagueId() )
+					return false;
+			}
+
+			if(pTarget && offensive)
 				actor->clearSafeInPvPSafeZone();
 			// set faction flag
 			if( offensive && _PVPFactionEnemyReminder )
@@ -1096,6 +1155,11 @@ void CPVPManager2::createExtraFactionChannel(const std::string & channelName)
 
 TChanID CPVPManager2::createUserChannel(const std::string & channelName, const std::string & pass)
 {
+	// Don't allow channels called "GM" (to not clash with the /who gm command)
+	if (NLMISC::nlstricmp( channelName.c_str() , "GM" ) == 0)
+	{
+		return DYN_CHAT_INVALID_CHAN;
+	}
 
 	TMAPExtraFactionChannel::iterator it = _UserChannel.find(channelName);
 	if( it == _UserChannel.end() )
@@ -1244,6 +1308,14 @@ void CPVPManager2::askForDuel( const NLMISC::CEntityId & userId )
 		return;
 	}
 
+	// If not a privileged player and in ignorelist, cannot duel
+	if ( !user->haveAnyPrivilege() && target->hasInIgnoreList( user->getId() ) )
+	{
+		params[0].setEIdAIAlias( target->getId(), CAIAliasTranslator::getInstance()->getAIAlias(target->getId()) );
+		CCharacter::sendDynamicSystemMessage(userId, "DUEL_REFUSE_INVITATION", params);
+		return;
+	}
+
 	// remove previous invitation, and check that user is not invited
 	bool problem = false;
 
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h
index a5f33ade8..aed6861b1 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_manager_2.h
@@ -76,10 +76,12 @@ public:
 	void onIOSMirrorUp();
 	/// callback called at each tick
 	void tickUpdate();
-	/// return dynamic channel TChanID attribued to a faction
+	/// return dynamic channel TChanID attributed to a faction
 	TChanID getFactionDynChannel( const std::string& channelName );
-	/// return dynamic channel TChanID attribued to an user
+	/// return user dynamic channel TChanID
 	TChanID getUserDynChannel( const std::string& channelName);
+	/// return user dynamic channel name
+	std::string getUserDynChannel(const TChanID& channelId);
 	/// return dynamic channel TChanID attribued to a faction
 	const std::string &getPassUserChannel( TChanID channelId);
 	/// return dynamic channel TChanID character must have, DYN_CHAT_INVALID_CHAN if he must don't have faction channel
@@ -91,7 +93,7 @@ public:
 	// brodcast message to channel
 	void broadcastMessage(TChanID channel, const ucstring& speakerName ,const ucstring& txt);
 	// send list of users to player
-	void sendChannelUsers(TChanID channel, CCharacter * user);
+	void sendChannelUsers(TChanID channel, CCharacter * user, bool outputToSys = false);
 	// add faction channel to character if needed
 	void addFactionChannelToCharacter(TChanID channel, CCharacter * user, bool writeRight = true, bool userChannel = false);
 	// remove faction channel for character
diff --git a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp
index 7badb3347..97bbbfe92 100644
--- a/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp
+++ b/code/ryzom/server/src/entities_game_service/pvp_manager/pvp_zone.cpp
@@ -63,6 +63,15 @@ namespace PVP_ZONE_TYPE
 } // namespace PVP_ZONE_TYPE
 
 
+//----------------------------------------------------------------------------
+static inline bool inSameLeague(CCharacter * c1, CCharacter * c2)
+{
+	if (c1 == NULL || c2 == NULL)
+		return false;
+
+	return ( c1 == c2 ) || ( c1->getLeagueId() != DYN_CHAT_INVALID_CHAN && c1->getLeagueId() == c2->getLeagueId() );
+}
+
 //----------------------------------------------------------------------------
 static inline bool inSameTeam(CCharacter * c1, CCharacter * c2)
 {
@@ -372,35 +381,47 @@ PVP_RELATION::TPVPRelation CPVPFreeZone::getPVPRelation( CCharacter * user, CEnt
 	nlassert(user);
 	nlassert(target);
 
-	if( target->getId().getType() != RYZOMID::player )
+	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+
+	if (target->getId().getType() != RYZOMID::player)
 	{
 		return PVP_RELATION::Unknown;
 	}
 
-	// if target is in same zone then he's an ennemy or ally 
-	if ( _Users.find( target->getEntityRowId() ) != _Users.end() )
+	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
 	{
-		if( inSameTeam( user, (CCharacter *)target ) )
-		{
-			return PVP_RELATION::Ally;
-		}
-		else
-		{
-			return PVP_RELATION::Ennemy;
-		}
+		if (pTarget->getSafeInPvPSafeZone())
+			targetSafe = true;
 	}
 
-	// if target is in free pvp then he's neutral pvp
-	const CCharacter * targetChar = static_cast<const CCharacter*>(target);
-	if( targetChar->getPVPInterface().isValid() )
+	if (CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+	{
+		if( user->getSafeInPvPSafeZone())
+			actorSafe = true;
+	}
+
+	if ((targetSafe && !actorSafe) || (actorSafe && !targetSafe)) {
+		return PVP_RELATION::NeutralPVP;
+	}
+
+	// In same Zone
+	if (_Users.find( target->getEntityRowId() ) != _Users.end())
 	{
-		if( targetChar->getPVPInterface().getPVPSession()->getPVPMode() == PVP_MODE::PvpZoneFree );
+		// In Same Team or League => Ally
+		if (inSameTeam( user, pTarget ) || inSameLeague( user, pTarget ))
 		{
-			return PVP_RELATION::NeutralPVP;
+			return PVP_RELATION::Ally;
 		}
+
+		// If both not in safe zone => Ennemy
+		if (!targetSafe && !actorSafe)
+			return PVP_RELATION::Ennemy;
 	}
-	
-	return PVP_RELATION::Neutral;
+
+	return PVP_RELATION::NeutralPVP;
 }
 
 //----------------------------------------------------------------------------
@@ -1135,36 +1156,53 @@ PVP_RELATION::TPVPRelation CPVPGuildZone::getPVPRelation( CCharacter * user, CEn
 	nlassert(user);
 	nlassert(target);
 
-	// target has to be a char
-	CCharacter *targetChar = dynamic_cast<CCharacter*>(target);
-	if ( !targetChar )
+	CCharacter * pTarget = dynamic_cast<CCharacter*>(target);
+
+	bool targetSafe = false;
+	bool actorSafe = false;
+
+	if( target->getId().getType() != RYZOMID::player )
 	{
 		return PVP_RELATION::Unknown;
 	}
-	
-	// check that target is in the same zone than user (discards bots)
+
+	if (CPVPManager2::getInstance()->inSafeZone(pTarget->getPosition()))
+	{
+		if (pTarget->getSafeInPvPSafeZone())
+			targetSafe = true;
+	}
+
+	if( CPVPManager2::getInstance()->inSafeZone(user->getPosition()))
+	{
+		if( user->getSafeInPvPSafeZone())
+			actorSafe = true;
+	}
+
+	if ((targetSafe && !actorSafe) || (actorSafe && !targetSafe)) {
+		return PVP_RELATION::NeutralPVP;
+	}
+
+	// if target is in same zone then he's an ennemy or ally 
 	if ( _Users.find( target->getEntityRowId() ) != _Users.end() )
 	{
-		if ( inSameGuild(targetChar,user) || inSameTeam( targetChar, user) )
+		// In Same Team or League => Ally
+		if (inSameTeam( user, pTarget ) || inSameLeague( user, pTarget ))
 		{
 			return PVP_RELATION::Ally;
 		}
-		else
-		{
-			return PVP_RELATION::Ennemy;
-		}			
-	}
-	
-	// if target is in guild pvp then he's neutral pvp
-	if( targetChar->getPVPInterface().isValid() )
-	{
-		if( targetChar->getPVPInterface().getPVPSession()->getPVPMode() == PVP_MODE::PvpZoneGuild )
+		
+		// in same Guild and not in Leagues => Ally 
+		if (inSameGuild( user, pTarget ) && user->getLeagueId() == DYN_CHAT_INVALID_CHAN && pTarget->getLeagueId() == DYN_CHAT_INVALID_CHAN)
 		{
-			return PVP_RELATION::NeutralPVP;		
+			return PVP_RELATION::Ally;
 		}
+
+		// If both not in safe zone => Ennemy
+		if (!targetSafe && !actorSafe)
+			return PVP_RELATION::Ennemy;
 	}
-	
-	return PVP_RELATION::Neutral;
+
+	return PVP_RELATION::NeutralPVP;
 }
 	
 /*
diff --git a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp
index f44e8dd84..76c05a7b3 100644
--- a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp
+++ b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.cpp
@@ -155,6 +155,12 @@ void CTradeBase::copy( IItemTrade * itt )
 	else _ItemPtr = 0;
 }
 
+TGameCycle CItemForSale::getGameCycleLeft() const
+{
+	TGameCycle dt = CTickEventHandler::getGameCycle() - _StartSaleCycle;
+	return (TGameCycle) ( (sint32) std::max( (sint32)0, (sint32)( ((sint32) MaxGameCycleSaleStore) - (sint32)( dt + _ItemPtr->getTotalSaleCycle() ) ) ) );
+}
+
 //-----------------------------------------------------------------------------
 //uint32 CTradeBase::getFactionPointPrice() const
 //{
diff --git a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h
index f473b356a..b01bfaa9b 100644
--- a/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h
+++ b/code/ryzom/server/src/entities_game_service/shop_type/item_for_sale.h
@@ -33,7 +33,7 @@ class IItemTrade : public NLMISC::CRefCount
 public:
 
 	// virtual destructor
-	virtual ~IItemTrade() {};
+	virtual ~IItemTrade() {}
 
 	// sheet id
 	virtual NLMISC::CSheetId getSheetId() const = 0;
@@ -202,7 +202,8 @@ public:
 	void setAvailable( bool a );
 
 	// return game cycle left for item in store 
-	NLMISC::TGameCycle getGameCycleLeft() const {	return (NLMISC::TGameCycle) ( (sint32) std::max( (sint32)0, (sint32)( ((sint32) MaxGameCycleSaleStore) - ( ( CTickEventHandler::getGameCycle() - _StartSaleCycle ) + _ItemPtr->getTotalSaleCycle() ) ) ) ); }
+//	NLMISC::TGameCycle getGameCycleLeft() const {	return (NLMISC::TGameCycle) ( (sint32) std::max( (sint32)0, (sint32)( ((sint32) MaxGameCycleSaleStore) - ( ( CTickEventHandler::getGameCycle() - _StartSaleCycle ) + _ItemPtr->getTotalSaleCycle() ) ) ) ); }
+	NLMISC::TGameCycle getGameCycleLeft() const;
 	
 	// get quantity
 	uint32 getQuantity() const { return _Quantity; }
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team.cpp b/code/ryzom/server/src/entities_game_service/team_manager/team.cpp
index 904cb7327..a18f81d67 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team.cpp
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team.cpp
@@ -57,6 +57,7 @@ void CTeam::init( CCharacter*  leader, uint16 teamId )
 	_ValidityFlags.Fake = false;
 	_NbMembers = 1;
 	_TeamId  = teamId;
+	_LeagueId = leader->getLeagueId();
 	_LeaderId = leader->getId();
 	_TeamMembers.push_back(_LeaderId);
 	// init the team chat group
@@ -120,6 +121,12 @@ void CTeam::release()
 	PROGRESSIONPVE::CCharacterProgressionPVE::getInstance()->disbandTeam(_TeamId, _TeamMembers);
 	PROGRESSIONPVP::CCharacterProgressionPVP::getInstance()->disbandTeam(_TeamId, _TeamMembers);
 
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
+	{
+		DynChatEGS.removeChan(_LeagueId);
+	}
+
+	_LeagueId = DYN_CHAT_INVALID_CHAN;
 	_TeamId = CTEAM::InvalidTeamId;
 	_TeamMembers.clear();
 	_NbMembers = 0;
@@ -167,7 +174,8 @@ void CTeam::addCharacter(CCharacter *newCharacter)
 	else
 	{
 //		newCharacter->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", 1  );
-		CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(newCharacter->_PropertyDatabase, 1);
+		uint8 index = getSuccessorIndex();
+		CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(newCharacter->_PropertyDatabase, index);
 	}
 	
 	// update all member's DB
@@ -283,6 +291,9 @@ void CTeam::addCharacter(CCharacter *newCharacter)
 	// set the character team
 	newCharacter->setTeamId(_TeamId);
 
+	// set the character alliance
+	newCharacter->setLeagueId(_LeagueId);
+
 	// Add character to chat group
 	TGroupId idGroupe = CHAT_GROUPS_IDS::getTeamChatGroupId(_TeamId);
 	CMessage msgout("ADD_TO_GROUP");
@@ -383,6 +394,7 @@ void CTeam::removeCharacter( CCharacter * player )
 
 	///\todo give him a player team Id
 	player->setTeamId( CTEAM::InvalidTeamId );
+	player->setLeagueId(DYN_CHAT_INVALID_CHAN);
 	player->updateTargetingChars();
 
 	// tell progression system this player has been removed from his team
@@ -410,13 +422,19 @@ void CTeam::removeCharacter( CCharacter * player )
 		clearPlayerTeamDB( *_TeamMembers.begin() );
 		CCharacter * lastPlayer = PlayerManager.getOnlineChar( *_TeamMembers.begin() );
 		if ( lastPlayer )
+		{
 			lastPlayer->setTeamId( CTEAM::InvalidTeamId );
+			lastPlayer->setLeagueId(DYN_CHAT_INVALID_CHAN);
+		}
 		else
 		{
 			nlwarning("<CTeam removeCharacter> charId %s not found in the team", (*_TeamMembers.begin()).toString().c_str() );
 			return;
 		}
 
+		// remove league
+		setLeague("");
+
 		// remove the team chat group
 		TGroupId idGroupe = CHAT_GROUPS_IDS::getTeamChatGroupId(_TeamId);
 		CMessage msgRemoveGroup("REMOVE_GROUP");
@@ -437,80 +455,26 @@ void CTeam::removeCharacter( CCharacter * player )
 	// if that was the leader, get another one
 	else if ( _LeaderId == charId )
 	{
-		_LeaderId = _SuccessorId;
-		_SuccessorId = CEntityId::Unknown;
-		for (list<CEntityId>::const_iterator it = _TeamMembers.begin(); it != _TeamMembers.end(); ++it)
-		{
-			if ( (*it) != _LeaderId )
-			{
-				_SuccessorId = (*it );
-				break;
-			}
-		}
-
-
-		// switch dyn chat speaker
-		CMissionManager::getInstance()->switchDynChatSpeaker(player,_LeaderId);
-
-		// inform the new leader
-		SM_STATIC_PARAMS_1(params1, STRING_MANAGER::player);		
-		params1[0].setEId( charId );
-		PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(_LeaderId), "TEAM_YOU_NEW_LEADER", params1);
-
-		// inform the group 
-		SM_STATIC_PARAMS_2(params, STRING_MANAGER::player, STRING_MANAGER::player);		
-		params[0].setEId( charId );
-		params[1].setEId( _LeaderId );
-
-		set<CEntityId> exclude;
-		exclude.insert( _LeaderId );
-		exclude.insert( charId );
-		sendDynamicMessageToMembers("TEAM_NEW_LEADER", params, exclude);
-
-		// update leader DB
-		CCharacter *leader = PlayerManager.getOnlineChar( _LeaderId );
-		if (leader)
-		{
-//			leader->_PropertyDatabase.setProp( "GROUP:LEADER_INDEX", -1 );
-			CBankAccessor_PLR::getGROUP().setLEADER_INDEX(leader->_PropertyDatabase, 0xf);
-//			leader->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", 0 );
-			CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(leader->_PropertyDatabase, 0);
-		}
-		else
-			nlwarning("<CTeam removeCharacter> invalid new leader %s", _LeaderId.toString().c_str() );
+		setLeader(_SuccessorId);
 	}
-	// if that was the successor, inform the new one
-/*	else if ( formerPos == 1 && _NbMembers > 2)
+	else if ( _SuccessorId == charId )
 	{
-		list<CEntityId>::iterator itTmp = _TeamMembers.begin();
-		++itTmp;
-		const CEntityId & successorId = *(itTmp);
-		CCharacter *successor = PlayerManager.getOnlineChar( successorId );
-		if (successor)
-		{
-			successor->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", -1 );
-		}
-		else
-			nlwarning("<CTeam removeCharacter> invalid new successor %s", successorId.toString().c_str() );
-
+		// The current successor dropped from team; set it to the next in line after leader
+		setSuccessor(1);
 	}
-*/
-	else if ( _SuccessorId == charId )
+	else
 	{
-		for (list<CEntityId>::const_iterator it = _TeamMembers.begin(); it != _TeamMembers.end(); ++it)
+		// A random member dropped from team; make sure the current successor is shown currectly
+		// in all team lists.
+		uint8 index = 0;
+		for (std::list<NLMISC::CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
 		{
-			if ( (*it) != _LeaderId )
-			{
-				_SuccessorId = (*it );
-				CCharacter *successor = PlayerManager.getOnlineChar( _SuccessorId );
-				if (successor)
-				{
-//					successor->_PropertyDatabase.setProp( "GROUP:SUCCESSOR_INDEX", -1 );
-					CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(successor->_PropertyDatabase, 0xf);
-				}
+			if (_SuccessorId == (*it))
 				break;
-			}
+			++index;
 		}
+		// Don't show a message because the successor hasn't actually changed.
+		setSuccessor(index, false);
 	}
 
 	for (std::list<NLMISC::CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
@@ -607,114 +571,171 @@ void CTeam::removeCharacter( CCharacter * player )
 
 }// CTeam removeCharacter
 
-void CTeam::setSuccessor( uint8 memberIdx )
+void CTeam::setLeague(const string &leagueName)
 {
-	/*
-	list<CEntityId>::const_iterator it = _TeamMembers.begin();
-	uint8 i = 0;
-	for (; it != _TeamMembers.end(); ++it)
+	TChanID chanId = _LeagueId;
+	if (_LeagueId != DYN_CHAT_INVALID_CHAN)
 	{
-		if ( i == memberIdx )
-			break;
-		++i;
+		// Remove players from previous channel
+		_LeagueId = DYN_CHAT_INVALID_CHAN;
+		updateLeague();
+		// Remove channel if empty
+		vector<CEntityId> players;
+		if (!DynChatEGS.getPlayersInChan(chanId, players))
+			DynChatEGS.removeChan(chanId);
 	}
-	if ( it == _TeamMembers.end() )
+
+	if (!leagueName.empty())
 	{
-		nlwarning("invalid team member %u : count is %u", memberIdx,_TeamMembers.size() );
-		return;
+		_LeagueId = DynChatEGS.addChan("league_"+toString(DynChatEGS.getNextChanID()), leagueName);
+		if (_LeagueId == DYN_CHAT_INVALID_CHAN)
+		{
+			nlinfo("Error channel creation !!!");
+			return;
+		}
+		// set historic size of the newly created channel
+		DynChatEGS.setHistoricSize(_LeagueId, 100);
 	}
-	_SuccessorId = (*it);
-	SM_STATIC_PARAMS_1( params,STRING_MANAGER::player );
-	params[0].EId = (*it );
-	sendDynamicMessageToMembers("TEAM_NEW_SUCCESSOR",params);
+	
+	updateLeague();
+}
 
-	for (std::list<CEntityId>::const_iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
+void CTeam::updateLeague()
+{
+	for (list<CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
 	{
-		uint8 hp, sap, stamina;
-		uint32 nameId;
-		CCharacter* character = PlayerManager.getOnlineChar( (*it) );
-		if (character != NULL)
+		CCharacter * ch = PlayerManager.getOnlineChar((*it));
+		if (ch != NULL && ch->getLeagueId() != _LeagueId)
 		{
-			// update the current character team slot
-///\todo: can be done outside the loop
-			if ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max != 0)
-				hp = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
-			else
-				hp = 0;
-
-			if ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::sap ].Max != 0)
-				sap = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::sap ].Current ) ) / ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::sap ].Max ) );
-			else
-				sap = 0;
-
-			if ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max != 0)
-				stamina = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::stamina ].Current ) ) / ( newCharacter->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max ) );
-			else
-				stamina = 0;
-
-			CMirrorPropValueRO<uint32> nameIndexValue1( TheDataset, newCharacter->getId(), "NameIndex" );
-			nameId = nameIndexValue1();
-				
-			sprintf(buffer, "GROUP:%d:HP",position );
-			character->_PropertyDatabase.setProp( buffer, hp );
-
-			sprintf(buffer, "GROUP:%d:SAP",position );
-			character->_PropertyDatabase.setProp( buffer, sap );
+			ch->setLeagueId(_LeagueId);
+		}
+	}
+}
 
-			sprintf(buffer, "GROUP:%d:STA",position );
-			character->_PropertyDatabase.setProp( buffer, stamina );
+uint8 CTeam::getSuccessorIndex()
+{
+	list<CEntityId>::const_iterator it = _TeamMembers.begin();
+	uint8 i = 0;
+	for (; it != _TeamMembers.end(); ++it)
+	{
+		if ( (*it) == _SuccessorId )
+			break;
+		++i;
+	}
+	return i;
+}
 
-			sprintf(buffer, "GROUP:%d:NAME",position );
-			character->_PropertyDatabase.setProp( buffer, nameId );
+void CTeam::setLeader(CEntityId id, bool bMessage)
+{
+	_LeaderId = id;
 
-			sprintf(buffer, "GROUP:%d:UID",position );
-			character->_PropertyDatabase.setProp( buffer, newCharacter->getEntityRowId().getCompressedIndex() );
+	// Move new leader to top of list
+	_TeamMembers.remove(_LeaderId);
+	_TeamMembers.insert(_TeamMembers.begin(), _LeaderId);
 
-			sprintf(buffer, "GROUP:%d:PRESENT",position );
-			character->_PropertyDatabase.setProp( buffer, (uint8)1 );
+	// inform the new leader
+	SM_STATIC_PARAMS_1(params1, STRING_MANAGER::player);		
+	params1[0].setEId( id );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(_LeaderId), "TEAM_YOU_NEW_LEADER", params1);
 
-			// update the new character team slot corresponding to character
-			if ( character->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max != 0)
-				hp = (uint8)  ( ( float(TeamMembersStatusMaxValue) * ( character->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( character->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
-			else
-				hp = 0;
-				
-			if ( character->getPhysScores()._PhysicalScores[ SCORES::sap ].Max != 0)
-				sap = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( character->getPhysScores()._PhysicalScores[ SCORES::sap ].Current ) ) / ( character->getPhysScores()._PhysicalScores[ SCORES::sap ].Max ) );
-			else
-				sap = 0;
+	// inform the group 
+	SM_STATIC_PARAMS_2(params, STRING_MANAGER::player, STRING_MANAGER::player);		
+	params[0].setEId( id );
+	params[1].setEId( _LeaderId );
 
-			if ( character->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max != 0)
-				stamina = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( character->getPhysScores()._PhysicalScores[ SCORES::stamina ].Current ) ) / ( character->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max ) );
-			else
-				stamina = 0;
+	set<CEntityId> exclude;
+	exclude.insert( _LeaderId );
+	exclude.insert( id );
+	sendDynamicMessageToMembers("TEAM_NEW_LEADER", params, exclude);
 
-			CMirrorPropValueRO<uint32> nameIndexValue2( TheDataset, character->getId(), "NameIndex" );
-			nameId = nameIndexValue2();
+	// New leader was successor, choose a new successor
+	if (id == _SuccessorId)
+	{
+		_SuccessorId = CEntityId::Unknown;
+		// Set the new successor to next in line
+		setSuccessor(1);
+	}
 
-			sprintf(buffer, "GROUP:%d:HP",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, hp );
-				
-			sprintf(buffer, "GROUP:%d:SAP",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, sap );
+	// update leader DB
+	CCharacter *leader = PlayerManager.getOnlineChar( _LeaderId );
+	if (leader)
+	{
+		// switch dyn chat speaker
+		CMissionManager::getInstance()->switchDynChatSpeaker(leader, _LeaderId);
 
-			sprintf(buffer, "GROUP:%d:STA",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, stamina );
+		CBankAccessor_PLR::getGROUP().setLEADER_INDEX(leader->_PropertyDatabase, 0xf);
+	}
+	else
+		nlwarning("<CTeam setLeader> invalid new leader %s", _LeaderId.toString().c_str() );
+}
 
-			sprintf(buffer, "GROUP:%d:NAME",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, nameId );
+void CTeam::setLeader(uint8 memberIdx, bool bMessage)
+{
+	list<CEntityId>::const_iterator it = _TeamMembers.begin();
+	uint8 i = 0;
+	for (; it != _TeamMembers.end(); ++it)
+	{
+		if ( i == memberIdx )
+			break;
+		++i;
+	}
+	if ( it == _TeamMembers.end() )
+	{
+		nlwarning("invalid team member %u : count is %u", memberIdx,_TeamMembers.size() );
+		return;
+	}
+	CEntityId newLeaderId = (*it);
+	setLeader(newLeaderId, bMessage);
+}
 
-			sprintf(buffer, "GROUP:%d:UID",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, character->getEntityRowId().getCompressedIndex() );
+void CTeam::setSuccessor( uint8 memberIdx, bool bMessage)
+{
+	list<CEntityId>::const_iterator it = _TeamMembers.begin();
+	uint8 i = 0;
+	for (; it != _TeamMembers.end(); ++it)
+	{
+		if ( i == memberIdx )
+			break;
+		++i;
+	}
+	if ( it == _TeamMembers.end() )
+	{
+		nlwarning("invalid team member %u : count is %u", memberIdx,_TeamMembers.size() );
+		return;
+	}
 
-			sprintf(buffer, "GROUP:%d:PRESENT",i );
-			newCharacter->_PropertyDatabase.setProp( buffer, (uint8)1 );
+	_SuccessorId = (*it);
+	i = 0;
+	for (it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
+	{
+		CCharacter * ch = PlayerManager.getOnlineChar( (*it) );
+		if (ch)
+		{
+			// If this char is the successor, don't show
+			if (i == memberIdx)
+			{
+				CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(ch->_PropertyDatabase, 0xf);
+			}
+			else if (i < memberIdx)
+			{
+				// If the successor comes after this player in the list,
+				// bump it up one.
+				CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(ch->_PropertyDatabase, memberIdx - 1);
+			}
+			else
+			{
+				CBankAccessor_PLR::getGROUP().setSUCCESSOR_INDEX(ch->_PropertyDatabase, memberIdx);
+			}
 		}
-		else
-			nlwarning("<CTeam::addCharacter> Unknown character %s", (*it).toString().c_str() );
 		++i;
 	}
-	*/
+
+	if (bMessage)
+	{
+		SM_STATIC_PARAMS_1( params,STRING_MANAGER::player );
+		params[0].setEIdAIAlias(_SuccessorId, CAIAliasTranslator::getInstance()->getAIAlias(_SuccessorId));
+		sendDynamicMessageToMembers("TEAM_NEW_SUCCESSOR", params);
+	}
 }
 
 //---------------------------------------------------
@@ -1130,22 +1151,65 @@ CMissionTeam* CTeam::getMissionByAlias( TAIAlias missionAlias )
 	return NULL;
 }
 
+void CTeam::updateMembersDb()
+{
+	for (std::list<NLMISC::CEntityId>::iterator it = _TeamMembers.begin() ; it != _TeamMembers.end() ; ++it)
+	{
+		uint8 hp, sap, stamina;
+		uint32 nameId;
+		uint pos = 0;
 
+		CCharacter * ch1 = PlayerManager.getOnlineChar( (*it) );
 
+		if (ch1->getId() == _LeaderId)
+		{
+			CBankAccessor_PLR::getGROUP().setLEADER_INDEX(ch1->_PropertyDatabase, 0xf);
+		}
+		else 
+		{
+			CBankAccessor_PLR::getGROUP().setLEADER_INDEX(ch1->_PropertyDatabase, 0);
+		}
+		///\todo log if nothing
+		if (ch1)
+		{
+			for (std::list<NLMISC::CEntityId>::iterator it2 = _TeamMembers.begin() ; it2 != _TeamMembers.end() ; ++it2)
+			{
+				if ( (*it) == (*it2) )
+					continue;	
 
+				CBankAccessor_PLR::TGROUP::TArray &groupItem = CBankAccessor_PLR::getGROUP().getArray(pos);
 
-
-
-
-
-
-
-
-
-
-
-
-
-
+				CCharacter * ch2 = PlayerManager.getOnlineChar( (*it2) );	
+				if (ch2 != NULL)
+				{
+					// update new char for old char
+					if ( ch2->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max != 0)
+						hp = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( ch2->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Current ) ) / ( ch2->getPhysScores()._PhysicalScores[ SCORES::hit_points ].Max ) );
+					else
+						hp = 0;
+					if ( ch2->getPhysScores()._PhysicalScores[ SCORES::sap ].Max != 0)
+						sap = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( ch2->getPhysScores()._PhysicalScores[ SCORES::sap ].Current ) ) / ( ch2->getPhysScores()._PhysicalScores[ SCORES::sap ].Max ) );
+					else
+						sap = 0;
+					if ( ch2->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max != 0)
+						stamina = (uint8) ( ( float(TeamMembersStatusMaxValue) * ( ch2->getPhysScores()._PhysicalScores[ SCORES::stamina ].Current ) ) / ( ch2->getPhysScores()._PhysicalScores[ SCORES::stamina ].Max ) );
+					else
+						stamina = 0;
+					
+					CMirrorPropValueRO<uint32> nameIndexValue( TheDataset, ch2->getId(), "NameIndex" );
+					nameId = nameIndexValue();
+									
+					groupItem.setHP(ch1->_PropertyDatabase, hp);
+					groupItem.setSAP(ch1->_PropertyDatabase, sap);
+					groupItem.setSTA(ch1->_PropertyDatabase, stamina);
+					groupItem.setNAME(ch1->_PropertyDatabase, nameId);
+					groupItem.setUID(ch1->_PropertyDatabase, ch2->getEntityRowId().getCompressedIndex());
+					groupItem.setPRESENT(ch1->_PropertyDatabase, true);
+				}
+				pos++;
+			}
+		}
+	}
+}
 
 
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team.h b/code/ryzom/server/src/entities_game_service/team_manager/team.h
index f4a9cdb20..6ab59f6ce 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team.h
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team.h
@@ -23,6 +23,7 @@
 #include "game_share/misc_const.h"
 #include "game_share/string_manager_sender.h"
 #include "game_share/scores.h"
+#include "game_share/dyn_chat.h"
 #include "mission_manager/mission_event.h"
 #include "mission_manager/ai_alias_translator.h"
 #include "team_manager/reward_sharing.h"
@@ -73,17 +74,54 @@ public:
 	void removeCharacter( CCharacter * newChar );
 
 	/**
-	 * set the successor of the team leader
-	 * \param memberIdx is the index of the member in hte team
+	 * return the index of team leader successor
+	 * 
+	 */
+	uint8 getSuccessorIndex(void);
+
+	/**
+	 * set the League
+	 * \param leagueName is the name of League
+	 */
+	void setLeague(const std::string &leagueName);
+	/**
+	 * update the League (set LeagueId to all teammates)
 	 */
-	void setSuccessor( uint8 memberIdx );
+	void updateLeague();
 	
+	/**
+	 * set the team leader
+	 * \param id is the Entity ID of the member in the team
+	 * \param bMessage whether to show the message
+	 */
+	void setLeader(NLMISC::CEntityId id, bool bMessage = true);
+	
+	/**
+	 * set the team leader
+	 * \param memberIdx is the index of the member in the team
+	 * \param bMessage whether to show the message
+	 */
+	void setLeader(uint8 memberIdx, bool bMessage = true);
+
+	/**
+	 * set the successor of the team leader
+	 * \param memberIdx is the index of the member in the team
+	 * \param bMessage whether to show the message
+	 */
+	void setSuccessor( uint8 memberIdx, bool bMessage = true );
+
 	/**
 	 * get the leader of the team
 	 * \return team leader Id
 	 */
 	inline const NLMISC::CEntityId & getLeader() const { return _LeaderId; }
 
+	/**
+	 * get the successor of the team
+	 * \return successor Id
+	 */
+	inline const NLMISC::CEntityId & getSuccessor() const { return _SuccessorId; }
+
 	///\return number of team members
 	inline uint8 getTeamSize() const { return _NbMembers; }
 
@@ -108,6 +146,12 @@ public:
 	///\return the team id
 	inline uint16 getTeamId() const { return _TeamId; }
 
+	///\return the League id
+	inline TChanID getLeagueId() const { return _LeagueId; }
+
+	///\return the League id
+	inline void setLeagueId(TChanID id) { _LeagueId = id; }
+
 	/// send a message to the team
 	void sendDynamicMessageToMembers(const std::string &msgName, const TVectorParamCheck &params, const std::set<NLMISC::CEntityId> &excluded) const;
 	inline void sendDynamicMessageToMembers(const std::string &msgName, const TVectorParamCheck &params) const
@@ -171,7 +215,8 @@ public:
 
 	CMissionTeam* getMissionByAlias( TAIAlias missionAlias );
 	
-		/*
+	void updateMembersDb();
+/*
 	bool processMissionStepEvent(std::list< const CMissionEvent* > & eventList, uint missionIndex, uint32 stepIndex );
 	bool processMissionEvent( std::list< const CMissionEvent* > & eventList, uint missionIndex, uint32 stepIndex );
 */
@@ -204,6 +249,9 @@ private:
 	///\id of the team
 	uint16								_TeamId;
 	
+	///\id of the League (it's id of channel)
+	TChanID							_LeagueId;
+
 	/// Team Members. The index of an entity in the container is its position
 	std::list<NLMISC::CEntityId>		_TeamMembers;
 
@@ -212,6 +260,7 @@ private:
 
 	/// id of the team leader
 	NLMISC::CEntityId					_LeaderId;
+
 	/// successor id
 	NLMISC::CEntityId					_SuccessorId;
 
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp
index 9f7aef68e..dad058400 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.cpp
@@ -71,6 +71,195 @@ void CTeamManager::addAllTeamsToChatGroup()
 	}
 } // addAllTeamsToChatGroup //
 
+//---------------------------------------------------
+// leagueJoinProposal :
+//---------------------------------------------------
+void CTeamManager::joinLeagueProposal( CCharacter * leader, const CEntityId &targetId)
+{
+	//check already done
+	nlassert(leader);
+
+	const NLMISC::CEntityId &leaderId = leader->getId();
+	if (targetId == leaderId )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_LEAGUE_TARGET" );
+		return;
+	}
+
+	// get targeted player
+	CCharacter *invitedPlayer = PlayerManager.getOnlineChar( targetId );
+	if ( invitedPlayer == NULL )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_LEAGUE_TARGET" );
+		return;
+	}
+	
+	// god player are forbidden to team
+	if (leader->godMode() || invitedPlayer->godMode())
+	{
+		nlwarning("<CTeamManager joinLeagueProposal> Player %s invited %s, but at least on of them is god, forbidden", 
+			leaderId.toString().c_str(),
+			targetId.toString().c_str());
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"TEAM_GOD_FORBIDDEN" );
+		return;
+	}
+
+	TInviteRetCode code = isLeagueInvitableBy(invitedPlayer,leader);
+	if ( code == AlreadyInvited )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"LEAGUE_ALREADY_INVITED" );
+		return;
+	}
+	else if ( code == AlreadyInLeague )
+	{
+		CTeam * team = getRealTeam( invitedPlayer->getTeamId() );
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"LEAGUE_ALREADY_IN_LEAGUE" );
+		return;
+	}
+	else if ( code == NotLeader )
+	{
+		CTeam * team = getRealTeam( invitedPlayer->getTeamId() );
+		joinLeagueProposal(leader, team->getLeader());
+		return;
+	}
+	else if ( code == CantInvite )
+	{
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"LEAGUE_INVITOR_NOT_LEADER" );
+		return;
+	}
+
+	/// the invitor must not be in the ignore list of the target
+	if(invitedPlayer->hasInIgnoreList(leaderId))
+	{
+		SM_STATIC_PARAMS_1( params1, STRING_MANAGER::player );
+		params1[0].setEIdAIAlias( targetId, CAIAliasTranslator::getInstance()->getAIAlias( targetId) );
+		// Use the standard "player declines your offer". Don't use specific message because
+		// maybe not a good idea to inform a player that someone ignores him
+		CCharacter::sendDynamicSystemMessage( leaderId, "TEAM_DECLINE", params1 );
+		return;
+	}
+
+	//set the target's invitor
+	invitedPlayer->setLeagueInvitor(leaderId);
+
+	CEntityId msgTargetEId = targetId;
+	
+	//send the appropriate string to the client
+	SM_STATIC_PARAMS_1(params, STRING_MANAGER::player);
+	params[0].setEIdAIAlias( leaderId, CAIAliasTranslator::getInstance()->getAIAlias(leaderId) );
+	uint32 txt = STRING_MANAGER::sendStringToClient(TheDataset.getDataSetRow(targetId), "LEAGUE_PROPOSAL", params );
+	
+	CMessage msgout( "IMPULSION_ID" );
+	msgout.serial( const_cast<CEntityId&>(msgTargetEId) );
+	CBitMemStream bms;
+	nlverify ( GenericMsgManager.pushNameToStream( "PVP_CHALLENGE:INVITATION", bms) );
+	bms.serial( txt );
+	msgout.serialBufferWithSize((uint8*)bms.buffer(), bms.length());
+	sendMessageViaMirror( NLNET::TServiceId(msgTargetEId.getDynamicId()), msgout );
+
+	params[0].setEIdAIAlias( targetId, CAIAliasTranslator::getInstance()->getAIAlias( targetId ) );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(leader->getEntityRowId(), "LEAGUE_INVITE", params);
+	
+	leader->updateTarget();	
+}
+
+//---------------------------------------------------
+// joinLeagueDecline :
+//---------------------------------------------------
+void CTeamManager::joinLeagueDecline( const NLMISC::CEntityId &charId)
+{
+	CCharacter * invited = PlayerManager.getOnlineChar(charId);
+	if ( invited == NULL )
+	{
+		nlwarning("<CTeamManager joinLeagueDecline>Invalid char %s",charId.toString().c_str());
+		return;
+	}
+	invited->setAfkState(false);
+	if ( invited->getLeagueInvitor() == CEntityId::Unknown )
+	{
+		nlwarning("<CTeamManager joinLeagueDecline>character %s has an Invalid invitor",charId.toString().c_str());
+		return;
+	}
+
+	//inform both players
+	SM_STATIC_PARAMS_1(params, STRING_MANAGER::player);	
+	params[0].setEIdAIAlias( charId, CAIAliasTranslator::getInstance()->getAIAlias( charId) );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(invited->getTeamInvitor()), "LEAGUE_DECLINE", params);
+	
+	params[0].setEIdAIAlias( invited->getTeamInvitor(), CAIAliasTranslator::getInstance()->getAIAlias( invited->getTeamInvitor() ) );
+	PHRASE_UTILITIES::sendDynamicSystemMessage(invited->getEntityRowId(), "LEAGUE_YOU_DECLINE", params);
+
+	//cancel the proposal
+	invited->setLeagueInvitor( CEntityId::Unknown );
+} // joinLeagueDecline //
+
+//---------------------------------------------------
+// joinLeagueAccept :
+//---------------------------------------------------
+void CTeamManager::joinLeagueAccept( const NLMISC::CEntityId &charId)
+{
+	// get the invited char
+	CCharacter * invited = PlayerManager.getOnlineChar(charId);
+	if ( invited == NULL )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>Invalid char %s",charId.toString().c_str());
+		return;
+	}
+
+	// get the invitor id
+	const NLMISC::CEntityId & invitorId = invited->getLeagueInvitor();
+
+	if ( invitorId == CEntityId::Unknown )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>character %s has an Invalid invitor",charId.toString().c_str());
+		return;
+	}
+	//get the invitor char
+	CCharacter * invitor = PlayerManager.getOnlineChar(invitorId);
+	if ( invitor == NULL  )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>character %s, Invalid invitor id %s",charId.toString().c_str(),invitorId.toString().c_str());
+		invited->setLeagueInvitor( CEntityId::Unknown );
+		return;
+	}
+	invitor->setAfkState(false);
+	
+	//cancel the proposal
+	invited->setLeagueInvitor( CEntityId::Unknown );
+
+	CTeam *teamInvitor;
+	CTeam *teamInvited;
+	//if the invited player had a fake team, remove it
+	teamInvited = getRealTeam(invited->getTeamId());
+	teamInvitor = getRealTeam(invitor->getTeamId());
+	
+	if ( !teamInvitor )
+	{
+		nlwarning("<CTeamManager joinLeagueAccept>character %s, invitor id %s, the invited or invitor player is not in a valid team. ",charId.toString().c_str(),invitor->getId().toString().c_str() );
+		return;
+	}
+	
+	
+	// check that the invitor team have league else create them
+	if (teamInvitor->getLeagueId() == DYN_CHAT_INVALID_CHAN )
+	{
+		teamInvitor->setLeague("League");
+	}
+	
+	if (teamInvited) {
+		const string playerName = CEntityIdTranslator::getInstance()->getByEntity(invited->getId()).toString();
+		CPVPManager2::getInstance()->broadcastMessage(teamInvitor->getLeagueId(), string("<TEAM>"), "<-- "+playerName);
+		teamInvited->setLeagueId(teamInvitor->getLeagueId());
+		teamInvited->updateLeague();
+	} else {
+		const string playerName = CEntityIdTranslator::getInstance()->getByEntity(invited->getId()).toString();
+		CPVPManager2::getInstance()->broadcastMessage(teamInvitor->getLeagueId(), string("<PLAYER>"), "<-- "+playerName);
+		invited->setLeagueId(teamInvitor->getLeagueId(), true);
+	}
+	
+} // joinLeagueAccept //
+
+
 //---------------------------------------------------
 // joinProposal :
 //---------------------------------------------------
@@ -90,7 +279,7 @@ void CTeamManager::joinProposal( CCharacter * leader, const CEntityId &targetId)
 	CCharacter *invitedPlayer = PlayerManager.getOnlineChar( targetId );
 	if ( invitedPlayer == NULL )
 	{
-		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_TEAM_TARGET" );
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"INVALID_LEAGUE_TARGET" );
 		return;
 	}
 	
@@ -117,7 +306,7 @@ void CTeamManager::joinProposal( CCharacter * leader, const CEntityId &targetId)
 	}
 	else if ( code == CantInviteEnemy )
 	{
-		CCharacter::sendDynamicSystemMessage( leader->getId(),"TEAM_CANT_INVITE_ENEMIE" );
+		CCharacter::sendDynamicSystemMessage( leader->getId(),"TEAM_CANT_INVITE_ENEMY" );
 		return;
 	}
 	else if ( code == CantInvite )
@@ -423,7 +612,7 @@ void CTeamManager::removeCharacter( const CEntityId &charId )
 		{
 			const list<CEntityId> &members = team->getTeamMembers();
 			
-			CEntityId eId(*(++members.begin()));
+			CEntityId eId(team->getSuccessor());
 			params[0].setEIdAIAlias( eId, CAIAliasTranslator::getInstance()->getAIAlias(eId) );
 			PHRASE_UTILITIES::sendDynamicSystemMessage(TheDataset.getDataSetRow(charId), "TEAM_YOU_LEAVE_LEADER", params);
 		}
@@ -505,6 +694,48 @@ void CTeamManager::removeFakeTeam(CCharacter * player)
 		nlwarning("<CTeamManager removeFakeTeam> char %s the team id %d is out of bounds (nb teams = %d)",player->getId().toString().c_str(),player->getTeamId(),_Teams.size());
 }// removeFakeTeam
 
+//---------------------------------------------------
+// isLeagueInvitableBy :
+//---------------------------------------------------
+CTeamManager::TInviteRetCode CTeamManager::isLeagueInvitableBy(CCharacter * invited, CCharacter * invitor )
+{
+	// check must be done before
+	nlassert( invited );
+	nlassert( invitor );
+
+	if ( !TheDataset.isAccessible(invited->getEntityRowId()) || !TheDataset.isAccessible(invitor->getEntityRowId()))
+		return CantInvite;
+	
+	// check that the invitor is in team
+	CTeam * team = getRealTeam( invitor->getTeamId() );
+	if (!team)
+		return CantInvite;
+	
+	// check that the invitor is the leader
+	if (team->getLeader() != invitor->getId() )
+		return CantInvite;
+		
+	// check that the invited don't have league
+	if (invited->getLeagueId() !=  DYN_CHAT_INVALID_CHAN)
+		return AlreadyInLeague;
+	  
+	// check if target is not already invited
+	if( invited->getLeagueInvitor() != CEntityId::Unknown )
+		return AlreadyInvited;	
+
+	// get the target team
+	team = getRealTeam( invited->getTeamId() );
+	if (!team)
+		return NotInTeam;
+
+	// check that the invited is the leader
+	if (team->getLeader() != invited->getId() )
+		return NotLeader;
+
+	return Ok;
+}
+
+
 //---------------------------------------------------
 // processMissionTeamEvent :
 //---------------------------------------------------
@@ -519,6 +750,7 @@ CTeamManager::TInviteRetCode CTeamManager::isInvitableBy(CCharacter * invited, C
 	{
 		return AlreadyInvited;
 	}
+
 	// get the target team, which must be fake
 	CTeam * team = getRealTeam( invited->getTeamId() );
 	if( team )
@@ -528,7 +760,8 @@ CTeamManager::TInviteRetCode CTeamManager::isInvitableBy(CCharacter * invited, C
 	
 	// check that the invitor is alone or a group leader
 	team = getRealTeam( invitor->getTeamId() );
-	if ( team && team->getLeader()!= invitor->getId() )
+	
+	if (team && team->getLeader()!= invitor->getId())
 	{
 		return CantInvite;
 	}
@@ -538,9 +771,9 @@ CTeamManager::TInviteRetCode CTeamManager::isInvitableBy(CCharacter * invited, C
 		return CantInvite;
 
 	// cannot invite enemy in faction PvP zones
-	if( CPVPManager2::getInstance()->isOffensiveActionValid( invited, invitor, true ) )
+/*	if( CPVPManager2::getInstance()->isOffensiveActionValid( invited, invitor, true ) )
 		if( invited->getPvPRecentActionFlag() || invitor->getPvPRecentActionFlag() )
-			return CantInviteEnemy;
+			return CantInviteEnemy;*/
 	return Ok;
 }
 
diff --git a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h
index af9a464f8..81a8a63d5 100644
--- a/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h
+++ b/code/ryzom/server/src/entities_game_service/team_manager/team_manager.h
@@ -31,7 +31,7 @@ class CCharacter;
 
 ///\todo: avoid team reallocation problems?
 ///\todo: check if we have to remove team from IOS if crash/shutdown
-///\todo successor index sert à rien???
+///\todo successor index is useful ?
 
 /**
  * CTeamManager
@@ -47,9 +47,12 @@ public:
 	{
 		AlreadyInvited,
 		AlreadyInTeam,
+		AlreadyInLeague,
 		CantInviteEnemy,
 		CantInvite,
 		Ok,
+		NotInTeam,
+		NotLeader,
 	};
 	/// default constructor
 	CTeamManager()
@@ -58,6 +61,13 @@ public:
 	/// add all created to chat groups
 	void addAllTeamsToChatGroup();
 
+	/// player leaderId invites player targetId to join his League. Only leaders can invite other leaders
+	void joinLeagueProposal( CCharacter * leader, const NLMISC::CEntityId &targetId );
+	/// player charId declines an invitation
+	void joinLeagueDecline( const NLMISC::CEntityId &charId );
+	/// player charId accepts an invitation
+	void joinLeagueAccept( const NLMISC::CEntityId &charId );
+
 	/// player leaderId invites plyer targetId to join his team. Only leaders can invite
 	void joinProposal( CCharacter * leader, const NLMISC::CEntityId &targetId );
 
@@ -104,6 +114,13 @@ public:
 	 */
 	TInviteRetCode isInvitableBy(CCharacter * invited, CCharacter * invitor );
 
+	/**
+	 * \param invited: character being invited
+	 * \param invitor: character inviting the other one
+	 * \return true if the invited is invitable by the invitor
+	 */
+	TInviteRetCode isLeagueInvitableBy(CCharacter * invited, CCharacter * invitor );
+
 	/**
 	 * PvP attack occurs in a team
 	 * \param actor is the attacker character
diff --git a/code/ryzom/server/src/entities_game_service/world_instances.h b/code/ryzom/server/src/entities_game_service/world_instances.h
index eb8c2728c..63a70204d 100644
--- a/code/ryzom/server/src/entities_game_service/world_instances.h
+++ b/code/ryzom/server/src/entities_game_service/world_instances.h
@@ -56,7 +56,7 @@ public:
 	struct IAIInstanceReady
 	{
 		virtual void onAiInstanceReady(const CReportStaticAIInstanceMsg &msg) = 0;
-		virtual void onAiInstanceDown(const CReportStaticAIInstanceMsg &msg) {}; // not mandatory
+		virtual void onAiInstanceDown(const CReportStaticAIInstanceMsg &msg) {} // not mandatory
 	};
 
 	/// Singleton access
diff --git a/code/ryzom/server/src/entities_game_service/zone_manager.h b/code/ryzom/server/src/entities_game_service/zone_manager.h
index 5aeb2a4a0..065e4548f 100644
--- a/code/ryzom/server/src/entities_game_service/zone_manager.h
+++ b/code/ryzom/server/src/entities_game_service/zone_manager.h
@@ -318,7 +318,7 @@ public:
 	};
 
 	// default constructor
-	CZoneManager() 	: DepositSearchTime(50) {};
+	CZoneManager() 	: DepositSearchTime(50) {}
 
 	~CZoneManager();
 
diff --git a/code/ryzom/server/src/frontend_service/Makefile b/code/ryzom/server/src/frontend_service/Makefile
deleted file mode 100644
index 0264234f3..000000000
--- a/code/ryzom/server/src/frontend_service/Makefile
+++ /dev/null
@@ -1,72 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = -DFAST_MIRROR $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-# The flags for the linker
-LDFLAGS2      = 	-L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \
-		-lnelnet \
-		-lxml2 \
-		-L/usr/lib \
-		-L/usr/X11R6/lib \
-		-lc \
-		-lgame_share \
-		-lnelgeorges \
-		-lnelmisc \
-		-lxml2 \
-		-lz \
-		-lm \
-		-lpthread \
-		-lcrypt
-
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= frontend_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/frontend_service/frontend_service.vcproj b/code/ryzom/server/src/frontend_service/frontend_service.vcproj
deleted file mode 100644
index 482945c51..000000000
--- a/code/ryzom/server/src/frontend_service/frontend_service.vcproj
+++ /dev/null
@@ -1,600 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="frontend_service"
-	ProjectGUID="{A231B214-BFBA-4CDC-A8E9-C2AD1526DCEB}"
-	RootNamespace="frontend_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\client_entity_id_translator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client_entity_id_translator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\client_host.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client_host.h"
-			>
-		</File>
-		<File
-			RelativePath=".\client_id_lookup.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client_id_lookup.h"
-			>
-		</File>
-		<File
-			RelativePath=".\distance_prioritizer.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\distance_prioritizer.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_container.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_net_stat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_net_stat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_receive_sub.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_receive_sub.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_receive_task.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_receive_task.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_send_sub.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_send_sub.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_stat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_stat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fe_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\frontend_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\frontend_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gateway_fes_transport.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\history.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\history.h"
-			>
-		</File>
-		<File
-			RelativePath=".\id_impulsions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\id_impulsions.h"
-			>
-		</File>
-		<File
-			RelativePath=".\impulse_encoder.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\impulse_encoder.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\module_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\packet_history.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\packet_history.h"
-			>
-		</File>
-		<File
-			RelativePath=".\prio_sub.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\prio_sub.h"
-			>
-		</File>
-		<File
-			RelativePath=".\processing_spreader.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\processing_spreader.h"
-			>
-		</File>
-		<File
-			RelativePath=".\property_history.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\property_history.h"
-			>
-		</File>
-		<File
-			RelativePath=".\property_id_translator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\selection_generator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\selection_generator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\uid_impulsions.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\uid_impulsions.h"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_array.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_array.h"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_provider.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_provider.h"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_receiver.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_receiver.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/frontend_service/selection_generator.h b/code/ryzom/server/src/frontend_service/selection_generator.h
index 6f94e2e68..048e391a4 100644
--- a/code/ryzom/server/src/frontend_service/selection_generator.h
+++ b/code/ryzom/server/src/frontend_service/selection_generator.h
@@ -42,10 +42,10 @@ public:
 	typedef TSelectionLevel result_type;
 
 	/// Initialization of a selection cycle
-	virtual void					init( TSelectionLevel nblevels ) {};
+	virtual void					init( TSelectionLevel nblevels ) {}
 
 	/// Change the number of levels without restarting the cycle
-	virtual void					changeNbLevels( TSelectionLevel nblevels ) {};
+	virtual void					changeNbLevels( TSelectionLevel nblevels ) {}
 
 	/// Return the next level to select
 	virtual TSelectionLevel			getNext() = 0;
diff --git a/code/ryzom/server/src/gameplay_module_lib/Makefile b/code/ryzom/server/src/gameplay_module_lib/Makefile
deleted file mode 100644
index 34c8fbcd0..000000000
--- a/code/ryzom/server/src/gameplay_module_lib/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I.. \
-		-I.
-
-# The flags for the linker
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-		-lnelnet \
-		-L/usr/lib \
-		-L/usr/X11R6/lib \
-		-lnelmisc \
-		-lxml2 \
-		-lpthread
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libgameplay_module_lib.a
-DSP_TARGET	= gameplay_module_lib.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-
-#libgame_share.so: $(OBJS)
-#	$(CXX) -o $@ $(OBJS) -shared $(LDFLAGS)
-
-libgameplay_module_lib.a: $(OBJS)
-	ar r libgameplay_module_lib.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/gameplay_module_lib/gameplay_module_lib.vcproj b/code/ryzom/server/src/gameplay_module_lib/gameplay_module_lib.vcproj
deleted file mode 100644
index e2687987b..000000000
--- a/code/ryzom/server/src/gameplay_module_lib/gameplay_module_lib.vcproj
+++ /dev/null
@@ -1,349 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gameplay_module_lib"
-	ProjectGUID="{F2E0E163-9ABA-42D0-9355-7F2D522EE7D5}"
-	RootNamespace="gameplay_module_lib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\gameplay_module_lib.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_core.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\module_core.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_core_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_parent.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\module_parent.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_parent_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_proxy.h"
-			>
-		</File>
-		<File
-			RelativePath=".\module_utils.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/gen_compile_flags.sh b/code/ryzom/server/src/gen_compile_flags.sh
deleted file mode 100644
index 4cff3d457..000000000
--- a/code/ryzom/server/src/gen_compile_flags.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-FILENAME=../RyzomCompilerFlags.mk.$(hostname -s)
-
-if [ -e $FILENAME ]
-    then
-    echo RYZOM_VERSION_COMPILER_FLAGS=$(cat $FILENAME)
-else
-    echo ERROR: File not found $FILENAME
-    exit 1
-fi
diff --git a/code/ryzom/server/src/gen_deps.sh b/code/ryzom/server/src/gen_deps.sh
deleted file mode 100755
index 45f41e17f..000000000
--- a/code/ryzom/server/src/gen_deps.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-command=''
-sources=''
-phase=0
-for arg in $*
-do
-    if [ "$phase" == 0 ] && [ "$arg" == '--' ]
-    then
-        phase=1
-    elif [ "$phase" == 0 ]
-    then
-        command="$command $arg"
-    elif [ "$phase" == 1 ]
-    then
-        sources="$sources $arg"
-    fi
-done
-
-for src in $sources
-do
-    obj=`echo $src | sed -e 's/.cpp$/.o/'`
-    $command -MT $obj -M $src
-done
-
diff --git a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
index 8dc1216d0..a50f7e67c 100644
--- a/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
+++ b/code/ryzom/server/src/general_utilities_service/CMakeLists.txt
@@ -11,9 +11,120 @@ LIST(REMOVE_ITEM SRC
 			${CMAKE_CURRENT_SOURCE_DIR}/re_repository_emitter.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h
-			${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp)
+			${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/mfc/*)
 
-ADD_EXECUTABLE(ryzom_general_utilities_service ${SRC})
+
+
+SOURCE_GROUP("Documentation" FILES	ss_notes.txt 
+									ce_notes.txt 
+									ec_notes.txt 
+									ee_notes.txt 
+									em_notes.txt 
+									merge_notes.txt 
+									gus_module_notes.txt 
+									gus_net_notes.txt 
+									saves_notes.txt 
+									rs_notes.txt 
+									rsaves_notes.txt 
+									stats_notes.txt
+									server control module notes.txt)
+
+SOURCE_GROUP("GUS Modules\\Contest Control (CC)" FILES cc_commands.cpp  cc_contest_ctrl_script.cpp cc_contest_ctrl_script.h cc_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Contest Executor (CE)" FILES ce_commands.cpp ce_contest_executor.cpp ce_module_messages.h ce_contest_executor.h)
+
+SOURCE_GROUP("GUS Modules\\Contest Logger (CL)" FILES cl_contest_logger.cpp cl_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Event Chat (EC)" FILES	ec_channel.cpp 
+													ec_channel.h 
+													ec_ctrl_channel.cpp 
+													ec_ctrl_channel.h 
+													ec_event_chat.cpp 
+													ec_event_chat_module.cpp 
+													ec_event_chat_module.h 
+													ec_faction_channel.cpp 
+													ec_faction_channel.h
+													ec_party_channel.cpp
+													ec_party_channel.h
+													ec_types.h)
+
+SOURCE_GROUP("GUS Modules\\Event Executor (EE)" FILES	ee_event_executor.cpp ee_event_executor.h ee_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Event Executor (EE)" FILES	em_commands.cpp em_event_manager.cpp em_event_manager.h em_module_messages.h)
+                             
+SOURCE_GROUP("GUS Modules\\Shard Merge (MERGE)" FILES	merge_commands.cpp merge_shard_merger.cpp)
+
+SOURCE_GROUP("GUS Modules\\Remote Saves (RSAVES)" FILES	remote_saves_interface.cpp remote_saves_interface.h rs_remote_saves.cpp rs_remote_saves.h rs_module_messages.h)
+
+SOURCE_GROUP("GUS Modules\\Shard Saves (SAVES)" FILES	saves_module_messages.h saves_shard_saves.cpp saves_unit.cpp saves_unit.h)
+
+SOURCE_GROUP("GUS Modules\\Shard Script (SS)" FILES	ss_command_executor.cpp 
+													ss_command_executor.h 
+													ss_script_manager.cpp 
+													ss_commands.cpp 
+													ss_script_manager.h 
+													ss_service_comms_manager.cpp 
+													ss_service_comms_manager.h 
+													ss_state_manager.cpp 
+													ss_state_manager.h)
+                   
+				   
+SOURCE_GROUP("GUS Modules\\Stats Scan (STATS)" FILES	stats_guild_commands.cpp 
+														stats_guild_scan_job.cpp 
+														stats_guild_scan_job.h 
+														stat_character.cpp
+														stat_character.h
+														stat_character_scan_job.cpp 
+														stat_character_scan_job.h
+														stat_char_commands.cpp
+														stat_char_filter_factory.cpp
+														stat_char_filter_factory.h 
+														stat_char_info_extractor_factory.cpp
+														stat_char_info_extractor_factory.h 
+														stat_char_scan_script.cpp
+														stat_char_scan_script.h
+														stat_file_list_builder_factory.cpp 
+														stat_file_list_builder_factory.h 
+														stat_globals.cpp stat_globals.h 
+														stat_guild_container.cp 
+														stat_guild_container.h 
+														stat_job_manager.cpp 
+														stat_job_manager.h 
+														stat_user_char_filters.cpp 
+														stat_user_char_info_extractors.cpp 
+														stat_user_file_list_builders.cpp)
+
+SOURCE_GROUP("GUS Modules\\GUS Networking" FILES	gus_net.cpp 
+													gus_net.h 
+													gus_net_commands.cpp 
+													gus_net_connection.cpp 
+													gus_net_connection.h 
+													gus_net_hub.cpp 
+													gus_net_hub.h 
+													gus_net_implementation.cpp 
+													gus_net_implementation.h 
+													gus_net_messages.cpp 
+													gus_net_messages.h 
+													gus_net_remote_module.cpp 
+													gus_net_remote_module.h 
+													gus_net_types.h)
+
+SOURCE_GROUP("GUS Modules" FILES gus_module.cpp gus_module.h gus_module_commands.cpp gus_module_factory.cpp gus_module_factory.h gus_module_manager.cpp gus_module_manager.h)
+														
+SOURCE_GROUP("GUS Core" FILES	gus_chat.cpp 
+								gus_chat.h 
+								gus_client_manager.cpp 
+								gus_client_manager.h 
+								gus_mirror.cpp 
+								gus_mirror.h 
+								gus_text.cpp 
+								gus_text.h 
+								gus_utils.cpp 
+								gus_utils.h 
+								gus_util_commands.cpp)
+
+ADD_EXECUTABLE(ryzom_general_utilities_service WIN32 ${SRC})
 
 INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 
@@ -26,7 +137,7 @@ TARGET_LINK_LIBRARIES(ryzom_general_utilities_service
 						${ZLIB_LIBRARIES} 
 						nelmisc
 						nelnet 
-						nelgeorges} 
+						nelgeorges
 						nelligo)
 
 NL_DEFAULT_PROPS(ryzom_general_utilities_service "Ryzom, Services: General Utilities Service (GUS)")
diff --git a/code/ryzom/server/src/general_utilities_service/Makefile b/code/ryzom/server/src/general_utilities_service/Makefile
deleted file mode 100644
index e8a5cac5e..000000000
--- a/code/ryzom/server/src/general_utilities_service/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-lgame_share \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= general_utilities_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/general_utilities_service/em_commands.cpp b/code/ryzom/server/src/general_utilities_service/em_commands.cpp
index 7437f4865..1411e515e 100644
--- a/code/ryzom/server/src/general_utilities_service/em_commands.cpp
+++ b/code/ryzom/server/src/general_utilities_service/em_commands.cpp
@@ -312,7 +312,8 @@ NLMISC_CATEGORISED_COMMAND(EventManager,emUpdateTools,"update tools installed on
 // Extra commands that open MFC windows
 //-----------------------------------------------------------------------------
 
-#ifdef _WINDOWS
+//#ifdef _WINDOWS
+#if 0
 
 #include "mfc/stdafx.h"
 #include "nel/misc/win_displayer.h"
diff --git a/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp b/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp
index 3958b360f..f000dc2e7 100644
--- a/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp
+++ b/code/ryzom/server/src/general_utilities_service/em_event_manager.cpp
@@ -358,7 +358,7 @@ void CEventManagerImplementation::displayModule() const
 	for (TShards::const_iterator it=_Shards.begin(); it!=_Shards.end(); ++it)
 	{
 		CSString s= (*it).first+ ": ";
-		for (TShardsMapEntry::iterator it2= (*it).second.begin(); it2!=(*it).second.end(); ++it2)
+		for (TShardsMapEntry::const_iterator it2= (*it).second.begin(); it2!=(*it).second.end(); ++it2)
 		{
 			s+= NLMISC::toString((*it2))+" ";
 		}
@@ -478,7 +478,7 @@ void CEventManagerImplementation::startEvent(const NLMISC::CSString& shardName)
 
 	// build vector of destinations to send the module message to
 	TModuleIdVector moduleIds;
-	for (TShardsMapEntry::iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
+	for (TShardsMapEntry::const_iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
 	{
 		nlinfo("Sending event start request to event executor: %d",(*it));
 		moduleIds.push_back(*it);
@@ -502,7 +502,7 @@ void CEventManagerImplementation::stopEvent(const NLMISC::CSString& shardName)
 
 	// build vector of destinations to send the module message to
 	TModuleIdVector moduleIds;
-	for (TShardsMapEntry::iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
+	for (TShardsMapEntry::const_iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
 	{
 		nlinfo("Sending event stop request to event executor: %d",(*it));
 		moduleIds.push_back(*it);
@@ -569,7 +569,7 @@ void CEventManagerImplementation::peekInstalledEvent(const NLMISC::CSString& sha
 
 	// build vector of destinations to send the module message to
 	TModuleIdVector moduleIds;
-	for (TShardsMapEntry::iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
+	for (TShardsMapEntry::const_iterator it= (*shard).second.begin(); it!= (*shard).second.end(); ++it)
 	{
 		nlinfo("Sending history request to event executor: %d",(*it));
 		moduleIds.push_back(*it);
diff --git a/code/ryzom/server/src/general_utilities_service/general_utilities_service.vcproj b/code/ryzom/server/src/general_utilities_service/general_utilities_service.vcproj
deleted file mode 100644
index 8ce47feb6..000000000
--- a/code/ryzom/server/src/general_utilities_service/general_utilities_service.vcproj
+++ /dev/null
@@ -1,649 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="general_utilities_service"
-	ProjectGUID="{61416D5D-D5B3-4E6E-8A6C-1BEA789722D1}"
-	RootNamespace="general_utilities_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\cc_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cc_contest_ctrl_script.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cc_contest_ctrl_script.h"
-			>
-		</File>
-		<File
-			RelativePath=".\cc_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ce_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ce_contest_executor.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ce_contest_executor.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ce_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\cl_contest_logger.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cl_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_channel.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_channel.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_ctrl_channel.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_ctrl_channel.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_event_chat_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_event_chat_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_faction_channel.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_faction_channel.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_party_channel.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_party_channel.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ec_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ee_event_executor.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ee_event_executor.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ee_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\em_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\em_event_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\em_event_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\em_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_chat.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_chat.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_client_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_client_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_mirror.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_mirror.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_module_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_module_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_module_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_module_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_module_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_connection.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_connection.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_hub.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_hub.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_implementation.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_implementation.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_remote_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_remote_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_net_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_text.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_text.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_util_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_utils.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gus_utils.h"
-			>
-		</File>
-		<File
-			RelativePath=".\merge_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\merge_shard_merger.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\re_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\remote_saves_interface.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\remote_saves_interface.h"
-			>
-		</File>
-		<File
-			RelativePath=".\repository.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\repository.h"
-			>
-		</File>
-		<File
-			RelativePath=".\resource.h"
-			>
-		</File>
-		<File
-			RelativePath=".\rfr_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\rfr_ryzom_file_retriever.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\rfr_ryzom_file_retriever.h"
-			>
-		</File>
-		<File
-			RelativePath=".\rr_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\rs_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\rs_remote_saves.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\rs_remote_saves.h"
-			>
-		</File>
-		<File
-			RelativePath=".\saves_module_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\saves_shard_saves.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\saves_unit.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\saves_unit.h"
-			>
-		</File>
-		<File
-			RelativePath=".\server_control_modules.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\server_control_modules.h"
-			>
-		</File>
-		<File
-			RelativePath=".\service_main.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\service_main.h"
-			>
-		</File>
-		<File
-			RelativePath=".\spa_server_patch_applier.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_command_executor.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_command_executor.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_script_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_script_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_service_comms_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_service_comms_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_state_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ss_state_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_filter_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_filter_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_info_extractor_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_info_extractor_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_scan_script.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_scan_script.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character_scan_job.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character_scan_job.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_file_list_builder_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_file_list_builder_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_globals.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_globals.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_guild_container.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_guild_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_job_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_job_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_user_char_filters.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_user_char_info_extractors.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_user_file_list_builders.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stats_guild_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stats_guild_scan_job.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stats_guild_scan_job.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdin_monitor_thread.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/general_utilities_service/gus_chat.h b/code/ryzom/server/src/general_utilities_service/gus_chat.h
index 077f24506..2c49c14f8 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_chat.h
+++ b/code/ryzom/server/src/general_utilities_service/gus_chat.h
@@ -71,6 +71,7 @@ namespace GUS
 		//-----------------------------------------------------------------------------
 		// Public interface
 		//-----------------------------------------------------------------------------
+		virtual ~CChatChannel() {}
 
 		// open the chat channel on all clients and set its name
 		// If historySize is set other than 0, the the chat channel is
diff --git a/code/ryzom/server/src/general_utilities_service/gus_client_manager.h b/code/ryzom/server/src/general_utilities_service/gus_client_manager.h
index c6f8b3f07..6714e4185 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_client_manager.h
+++ b/code/ryzom/server/src/general_utilities_service/gus_client_manager.h
@@ -93,6 +93,7 @@ namespace GUS
 		class IConnectionHandler: public NLMISC::CRefCount
 		{
 		public:
+			virtual ~IConnectionHandler() {}
 			virtual void connect(TClientId)=0;
 			virtual void disconnect(TClientId)=0;
 		};
diff --git a/code/ryzom/server/src/general_utilities_service/gus_mirror.h b/code/ryzom/server/src/general_utilities_service/gus_mirror.h
index 096685d50..97e8d97c6 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_mirror.h
+++ b/code/ryzom/server/src/general_utilities_service/gus_mirror.h
@@ -40,15 +40,15 @@ namespace GUS
 		{
 		public:
 			// General callback
-			virtual void mirrorIsReady(CGusMirror *gusMirror) {};
-			virtual void serviceMirrorUp(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {};
-			virtual void serviceMirrorDown(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {};
-			virtual void mirrorTickUpdate(CGusMirror *gusMirror) {};
+			virtual void mirrorIsReady(CGusMirror *gusMirror) {}
+			virtual void serviceMirrorUp(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {}
+			virtual void serviceMirrorDown(CGusMirror *gusMirror, const std::string &serviceName, NLNET::TServiceId serviceId) {}
+			virtual void mirrorTickUpdate(CGusMirror *gusMirror) {}
 
 			// mirror updates
-			virtual void entityAdded(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex) {};
-			virtual void entityRemoved(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, const NLMISC::CEntityId *entityId) {};
-			virtual void propertyChanged(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, TPropertyIndex propIndex) {};
+			virtual void entityAdded(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex) {}
+			virtual void entityRemoved(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, const NLMISC::CEntityId *entityId) {}
+			virtual void propertyChanged(CGusMirror *gusMirror, CMirroredDataSet *dataSet, const TDataSetRow &entityIndex, TPropertyIndex propIndex) {}
 
 			IMirrorModuleCallback();
 			virtual ~IMirrorModuleCallback();
diff --git a/code/ryzom/server/src/general_utilities_service/gus_module_factory.h b/code/ryzom/server/src/general_utilities_service/gus_module_factory.h
index 57c39bf06..fc9a62d38 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_module_factory.h
+++ b/code/ryzom/server/src/general_utilities_service/gus_module_factory.h
@@ -41,7 +41,7 @@ namespace GUS
 	class IModuleBuilder: public NLMISC::CRefCount
 	{
 	public:
-		virtual ~IModuleBuilder() {};
+		virtual ~IModuleBuilder() {}
 		virtual const NLMISC::CSString& getName() const=0;
 		virtual const NLMISC::CSString& getArgs() const=0;
 		virtual const NLMISC::CSString& getDescription() const=0;
diff --git a/code/ryzom/server/src/general_utilities_service/gus_utils.cpp b/code/ryzom/server/src/general_utilities_service/gus_utils.cpp
index db1f2bf5a..183386bc5 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_utils.cpp
+++ b/code/ryzom/server/src/general_utilities_service/gus_utils.cpp
@@ -45,74 +45,6 @@ using namespace NLNET;
 
 namespace GUS
 {
-	//-----------------------------------------------------------------------------
-	// cleanPath - convert a path to standardised format
-	//-----------------------------------------------------------------------------
-
-	CSString cleanPath(const CSString& path,bool addTrailingSlash)
-	{
-		CSString result;
-
-		// split the path up into its component elements
-		CVectorSString pathComponents;
-		path.unquoteIfQuoted().splitByOneOfSeparators("/\\",pathComponents,false,false,true,false,true);
-
-		// iterate over path components collapsing '.' and '..' entries
-		for (uint32 i=0;i<pathComponents.size();++i)
-		{
-			// skip "." entries
-			if (pathComponents[i]==".")
-			{
-				pathComponents[i].clear();
-				continue;
-			}
-
-			// deal with ".."
-			if (pathComponents[i]=="..")
-			{
-				// run back through our component list looking for an element to remove
-				uint32 j;
-				for (j=i;j--;)
-				{
-					if (!pathComponents[j].empty())
-						break;
-				}
-				// if we found an element then remove it and the '..' as well
-				if (j!=~0u)
-				{
-					pathComponents[j].clear();
-					pathComponents[i].clear();
-				}
-				continue;
-			}
-		}
-
-		// treat the special case where oriinal path started with a '/' or '//'
-		if (path.left(1)=="/" || path.left(1)=="\\")
-		{
-			result= (path.left(2).right(1)=="/" || path.left(2).right(1)=="\\")? "//": "/";
-		}
-
-		// concatenate the path bits
-		for (uint32 i=0;i<pathComponents.size();++i)
-		{
-			if (!pathComponents[i].empty())
-			{
-				result+= pathComponents[i];
-				result+= '/';
-			}
-		}
-
-		// if we're not supposed to have a trailing slash then get rid of the one that's added by default
-		if (addTrailingSlash==false && path.right(1)!='/' && path.right(1)!='\\')
-		{
-			result.resize(result.size()-1);
-		}
-
-		return result;
-	}
-
-
 	//-----------------------------------------------------------------------------
 	// private routines for layer 5 service tracking
 	//-----------------------------------------------------------------------------
diff --git a/code/ryzom/server/src/general_utilities_service/gus_utils.h b/code/ryzom/server/src/general_utilities_service/gus_utils.h
index b35293454..9935aa5ca 100644
--- a/code/ryzom/server/src/general_utilities_service/gus_utils.h
+++ b/code/ryzom/server/src/general_utilities_service/gus_utils.h
@@ -39,27 +39,6 @@ namespace GUS
 	// handy utilities
 	//-----------------------------------------------------------------------------
 
-	// Clean a path performing the following operations:
-	//	- convert '\\' characters to '/'
-	//	- replace '//' strings in the middle of the path with '/'
-	//	- remove '.' directory entries
-	//	- colapse '..' directory entries (removing parent entries)
-	//	- append a final '/' (optionally)
-	//
-	// examples:
-	//	- a:/bcd/efg/		=>	a:/bcd/efg/ (no change)
-	//	- a:\bcd\efg		=>	a:/bcd/efg/
-	//	- \bcd\\efg			=>	/bcd/efg/
-	//	- \\bcd\efg			=>	//bcd/efg/
-	//	- \bcd\.\efg		=>	/bcd/efg/
-	//	- \bcd\..\efg		=>	/efg/
-	//	- bcd\..\efg		=>	efg/
-	//	- bcd\..\..\efg		=>	../efg/
-	//	- \bcd\..\..\efg	=>	/efg/		(NOTE: the redundant '..' entry is lost due to leading '\')
-	//
-	NLMISC::CSString cleanPath(const NLMISC::CSString& path,bool addTrailingSlash);
-
-
 	// execute a command on a remote service
 	void executeRemoteCommand(NLNET::TServiceId sid,const NLMISC::CSString& cmdLine);
 	void executeRemoteCommand(const char* serviceName,const NLMISC::CSString& cmdLine);
diff --git a/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp b/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp
index fa3811dec..014f679e4 100644
--- a/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp
+++ b/code/ryzom/server/src/general_utilities_service/rfr_ryzom_file_retriever.cpp
@@ -472,7 +472,11 @@ bool CRyzomFileRetrieverImplementation::downloadBackupFiles(const CSString& shar
 			continue;
 
 		// generate a local filename for the downloaded file
-		CSString localFileName= NLMISC::CPath::standardizePath(localDirectory)+(fileName+"_"+fdc[i].FileName.replace("/","_")).replace(".","_");
+		CSString fdcFileNameUnderscore = fdc[i].FileName;
+		fdcFileNameUnderscore = fdcFileNameUnderscore.replace("/","_");
+		CSString localFileNameWithoutPath = fileName + "_" + fdcFileNameUnderscore;
+		localFileNameWithoutPath = localFileNameWithoutPath.replace(".","_");
+		CSString localFileName = NLMISC::CPath::standardizePath(localDirectory) + localFileNameWithoutPath;
 		nlinfo("Requesting file download: REMOTE:%s => LOCAL:%s",fdc[i].FileName.c_str(),localFileName.c_str());
 
 		// put in a request for the file to be retrieved
diff --git a/code/ryzom/server/src/general_utilities_service/rs_remote_saves.h b/code/ryzom/server/src/general_utilities_service/rs_remote_saves.h
index 5ab25b8ac..1d91279bf 100644
--- a/code/ryzom/server/src/general_utilities_service/rs_remote_saves.h
+++ b/code/ryzom/server/src/general_utilities_service/rs_remote_saves.h
@@ -68,6 +68,8 @@ namespace SAVES
 	class CRemoteSavesManager: public NLMISC::CRefCount
 	{
 	public:
+		virtual ~CRemoteSavesManager() {}
+	
 		static CRemoteSavesManager* getInstance();
 
 		// interface used by CRemoteSavesInterface objects in their ctor to declare themselves
diff --git a/code/ryzom/server/src/general_utilities_service/saves_unit.h b/code/ryzom/server/src/general_utilities_service/saves_unit.h
index 3ea79287a..9685aa7bb 100644
--- a/code/ryzom/server/src/general_utilities_service/saves_unit.h
+++ b/code/ryzom/server/src/general_utilities_service/saves_unit.h
@@ -141,6 +141,9 @@ namespace SAVES
 		// ctor
 		ISavesUnitElement();
 
+		// dtor
+		virtual ~ISavesUnitElement() {}
+
 		// perform the 'rescan' operation for this element - verify whether anything has changed
 		// the parent parameter is used to supply addNew(), addChange() and addDeleted() methods
 		// to signal any detected changes
diff --git a/code/ryzom/server/src/general_utilities_service/service_main.cpp b/code/ryzom/server/src/general_utilities_service/service_main.cpp
index 573770fea..90633fa6f 100644
--- a/code/ryzom/server/src/general_utilities_service/service_main.cpp
+++ b/code/ryzom/server/src/general_utilities_service/service_main.cpp
@@ -28,11 +28,15 @@
 #include "game_share/ryzom_version.h"
 #include "game_share/tick_event_handler.h"
 #include "game_share/singleton_registry.h"
-#include "game_share/handy_commands.h"
+#include "server_share/handy_commands.h"
 
 // local
 #include "service_main.h"
 
+#ifdef NL_OS_WINDOWS
+#	define NOMINMAX
+#	include <windows.h>
+#endif // NL_OS_WINDOWS
 
 //-----------------------------------------------------------------------------
 // namespaces
diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp
index f72db4bbd..4a3b98bcd 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_char_commands.cpp
@@ -128,7 +128,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,listCharNames,"display the names of the charact
 
 	std::vector<std::string> files;
 	NLMISC::CPath::getPathContent(STAT_GLOBALS::getInputFilePath().c_str(),false,false,true,files);
-	for (uint32 i=files.size();i--;)
+	for (uint32 i=(uint32)files.size();i--;)
 	{
 		if (!NLMISC::testWildCard(NLMISC::CFile::getFilename(files[i]),wildcard))
 		{
@@ -227,7 +227,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,jobsPromote,"pause execution of jobs","<jobId>"
 	if (args.size()!=1)
 		return false;
 
-	uint32 idx= atoi(args[0].c_str());
+	uint32 idx;
+	NLMISC::fromString(args[0], idx);
 	if ( (idx==0 && args[0]!="0") )
 	{
 		nlwarning("Argument is not a valid job id - should be a number");
@@ -249,7 +250,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,JobUpdatesPerUpdate,"set or display the number
 
 	if (args.size()==1)
 	{
-		uint32 count= atoi(args[0].c_str());
+		uint32 count;
+		NLMISC::fromString(args[0], count);
 		if ( (count==0 && args[0]!="0") )
 		{
 			nlwarning("Argument is not a valid number");
@@ -311,7 +313,8 @@ NLMISC_CATEGORISED_COMMAND(Stats,jobsDisplayDetails,"display detailed info for t
 
 	case 1:
 		{
-			uint32 idx= atoi(args[0].c_str());
+			uint32 idx;
+			NLMISC::fromString(args[0], idx);
 			if ( (idx==0 && args[0]!="0") )
 			{
 				nlwarning("Argument is not a valid job id - should be a number");
@@ -476,8 +479,11 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptDeleteLine,"","<line_number>")
 		return false;
 	}
 
+	uint32 line;
+	NLMISC::fromString(args[0], line);
+
 	// line numbering starts at 1 so an invalid number will be inored anyway
-	return TheCharScanScriptFile->deleteLine(atoi(args[0].c_str()));
+	return TheCharScanScriptFile->deleteLine(line);
 }
 
 NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptAddInfoExtractor,"","<infoExtractorName> [<args>]")
@@ -761,7 +767,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se
 		return false;
 
 	// generating a new file list
-	if (args[0]==CSString("generate").left(args[0].size()))
+	if (args[0]==CSString("generate").left((uint)args[0].size()))
 	{
 		if (TheCharScanScriptFile==NULL)
 		{
@@ -796,7 +802,7 @@ NLMISC_CATEGORISED_COMMAND(Stats,charScanScriptTestFilteredFileList,"list the se
 	}
 
 	// displaying the last generated file list
-	if (args[0]==CSString("display").left(args[0].size()))
+	if (args[0]==CSString("display").left((uint)args[0].size()))
 	{
 		nlinfo("Filtered file list for the current job");
 		fdc.display(&log);
diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp
index 6902fe6ad..7c5f850fe 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.cpp
@@ -63,7 +63,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log)
 	{
 		std::string s= _Filters[i]->getName();
 		if (s.size()>longestName)
-			longestName=s.size();
+			longestName=(uint32)s.size();
 	}
 
 	// iterate over the filters displaying names and description
@@ -75,7 +75,7 @@ void CCharFilterFactory::displayFilterList(NLMISC::CLog* log)
 
 uint32 CCharFilterFactory::getFilterBuilderCount()
 {
-	return _Filters.size();
+	return (uint32)_Filters.size();
 }
 
 ICharFilterBuilder* CCharFilterFactory::getFilterBuilder(uint32 idx)
diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h
index 656cc0cca..a96b7d6a5 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h
+++ b/code/ryzom/server/src/general_utilities_service/stat_char_filter_factory.h
@@ -52,6 +52,7 @@ public:
 class ICharFilterBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharFilterBuilder() {}
 	virtual const char* getName()=0;
 	virtual const char* getDescription()=0;
 	virtual ICharFilter* build(const std::string& rawArgs)=0;
diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp
index 0ff961def..da481cf03 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.cpp
@@ -63,7 +63,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log)
 	{
 		std::string s= _InfoExtractors[i]->getName();
 		if (s.size()>longestName)
-			longestName=s.size();
+			longestName=(uint32)s.size();
 	}
 
 	// iterate over the infoExtractors displaying names and description
@@ -75,7 +75,7 @@ void CCharInfoExtractorFactory::displayInfoExtractorList(NLMISC::CLog* log)
 
 uint32 CCharInfoExtractorFactory::getInfoExtractorBuilderCount()
 {
-	return _InfoExtractors.size();
+	return (uint32)_InfoExtractors.size();
 }
 
 ICharInfoExtractorBuilder* CCharInfoExtractorFactory::getInfoExtractorBuilder(uint32 idx)
diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h
index 868004c39..cd182c169 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h
+++ b/code/ryzom/server/src/general_utilities_service/stat_char_info_extractor_factory.h
@@ -56,6 +56,7 @@ public:
 class ICharInfoExtractorBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharInfoExtractorBuilder() {}
 	virtual const char* getName() const=0;
 	virtual const char* getDescription() const=0;
 	virtual const char* getFields() const=0;
diff --git a/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp b/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp
index 48db0b447..030239d1e 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_char_scan_script.cpp
@@ -298,7 +298,7 @@ void CCharScanScriptCommandRegistry::displayScriptCommands(NLMISC::CLog* log)
 	{
 		std::string s= _ScriptCommands[i]->getName();
 		if (s.size()>longestName)
-			longestName=s.size();
+			longestName=(uint32)s.size();
 	}
 
 	// iterate over the script commands displaying names and description
diff --git a/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp b/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp
index 4b01b8574..9b85fb3b3 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_character_scan_job.cpp
@@ -293,7 +293,7 @@ bool CCharacterScanJob::runForFile(const std::string& fileName)
 	c.apply(pdr);
 
 	// iterate over the filters executing their core code
-	for (uint32 i=_Filters.size();i--;)
+	for (uint32 i=(uint32)_Filters.size();i--;)
 	{
 		if (!_Filters[i]->evaluate(&c))
 			return true;
diff --git a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp
index e6e860966..c05576c22 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.cpp
@@ -63,7 +63,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log)
 	{
 		std::string s= _FileLists[i]->getName();
 		if (s.size()>longestName)
-			longestName=s.size();
+			longestName=(uint32)s.size();
 	}
 
 	// iterate over the filters displaying names and description
@@ -75,7 +75,7 @@ void CFileListBuilderFactory::displayFileListBuilderList(NLMISC::CLog* log)
 
 uint32 CFileListBuilderFactory::getFileListBuilderCount()
 {
-	return _FileLists.size();
+	return (uint32)_FileLists.size();
 }
 
 IFileListBuilderBuilder* CFileListBuilderFactory::getFileListBuilder(uint32 idx)
diff --git a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h
index fbfb5dc61..367c0caa2 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h
+++ b/code/ryzom/server/src/general_utilities_service/stat_file_list_builder_factory.h
@@ -54,6 +54,7 @@ public:
 class IFileListBuilderBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~IFileListBuilderBuilder() {}
 	virtual const char* getName()=0;
 	virtual const char* getDescription()=0;
 	virtual IFileListBuilder* build(const std::string& rawArgs)=0;
diff --git a/code/ryzom/server/src/general_utilities_service/stat_globals.cpp b/code/ryzom/server/src/general_utilities_service/stat_globals.cpp
index af1150b0f..a959fb751 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_globals.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_globals.cpp
@@ -61,19 +61,19 @@ namespace STAT_GLOBALS
 	NLMISC::CSString getInputFilePath(const NLMISC::CSString& path)
 	{
 		NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get());
-		return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path;
+		return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
 	}
 
 	NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path)
 	{
 		NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get());
-		return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path;
+		return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
 	}
 
 	NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path)
 	{
 		NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get());
-		return (path.left(pathRoot.size())==pathRoot)? path: pathRoot+path;
+		return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
 	}
 
 
diff --git a/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp b/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp
index 818c509d7..6c5a8c008 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_job_manager.cpp
@@ -131,7 +131,7 @@ void CJobManager::serviceUpdate()
 uint32 CJobManager::addJob(NLMISC::CSmartPtr<CJobManager::IJob> job)
 {
 	nlassert(job!=NULL);
-	uint32 id= _Jobs.size();
+	uint32 id= (uint32)_Jobs.size();
 	_UnfinishedJobs.push_back(id);
 	_Jobs.push_back(job);
 	return id;
diff --git a/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp b/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp
index 3f3bbb8c7..c2a5658d5 100644
--- a/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp
+++ b/code/ryzom/server/src/general_utilities_service/stat_user_file_list_builders.cpp
@@ -73,7 +73,8 @@ FILE_LIST_BUILDER(MinFileSize,"<min_file_size>")
 		return false;
 	}
 
-	for (uint32 i=fdc.size();i--;)
+	uint32 ttlNumFiles= fdc.size();
+	for (uint32 i=ttlNumFiles;i--;)
 	{
 		if (fdc[i].FileSize<minSize)
 			fdc.removeFile(i);
@@ -91,7 +92,8 @@ FILE_LIST_BUILDER(MaxFileSize,"<max_file_size>")
 		return false;
 	}
 
-	for (uint32 i=fdc.size();i--;)
+	uint32 ttlNumFiles= fdc.size();
+	for (uint32 i=ttlNumFiles;i--;)
 	{
 		if (fdc[i].FileSize>maxSize)
 			fdc.removeFile(i);
diff --git a/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h b/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h
index e75564e49..ebcc43e7e 100644
--- a/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h
+++ b/code/ryzom/server/src/general_utilities_service/stats_guild_scan_job.h
@@ -53,7 +53,7 @@ public:
 
 private:
 	// private data - internal to job
-	typedef enum { INIT, WORK, CLOSED, ERROR } TState;
+	enum TState { INIT, WORK, CLOSED, ERROR };
 	TState _State;
 	uint32 _NextFile;
 	CFileDescriptionContainer _Files;
diff --git a/code/ryzom/server/src/gpm_service/Makefile b/code/ryzom/server/src/gpm_service/Makefile
deleted file mode 100644
index d5d334a94..000000000
--- a/code/ryzom/server/src/gpm_service/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../server_share \
-		-L../admin_modules \
-		-lserver_share \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelligo \
-		-lnelpacs \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= gpm_service
-DSP_TARGET	= $(TARGETS).vcproj
-PACKED_SHEETS = \
-	continents.packed_sheets \
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a \
-		../server_share/libserver_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets: $(TARGETS)
-	/bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/gpm_service/cell.h b/code/ryzom/server/src/gpm_service/cell.h
index 054156dbc..a4846a7a6 100644
--- a/code/ryzom/server/src/gpm_service/cell.h
+++ b/code/ryzom/server/src/gpm_service/cell.h
@@ -34,7 +34,7 @@ class CCell
 {
 public:
 	/// default constructor
-	CCell() : _LastVisionUpdate(0) {};
+	CCell() : _LastVisionUpdate(0) {}
 
 	/// initialisation
 	void	init( sint32 cellId )
diff --git a/code/ryzom/server/src/gpm_service/gpm_service.vcproj b/code/ryzom/server/src/gpm_service/gpm_service.vcproj
deleted file mode 100644
index 1fa450afe..000000000
--- a/code/ryzom/server/src/gpm_service/gpm_service.vcproj
+++ /dev/null
@@ -1,460 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gpm_service"
-	ProjectGUID="{C2B1B308-0762-41AD-966A-54EFD72869CC}"
-	RootNamespace="gpm_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\cell.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\cell.h"
-			>
-		</File>
-		<File
-			RelativePath=".\client_messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gpm_defs.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gpm_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\gpm_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\gpm_utilities.h"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\move_checker.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\move_checker.h"
-			>
-		</File>
-		<File
-			RelativePath=".\move_grid.h"
-			>
-		</File>
-		<File
-			RelativePath=".\patat_grid.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\patat_grid.h"
-			>
-		</File>
-		<File
-			RelativePath=".\patat_subscribe_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\patat_subscribe_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\sheets.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\sheets.h"
-			>
-		</File>
-		<File
-			RelativePath=".\variables.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\variables.h"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_delta_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\vision_delta_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\world_entity.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\world_entity.h"
-			>
-		</File>
-		<File
-			RelativePath=".\world_position_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\world_position_manager.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/input_output_service/Makefile b/code/ryzom/server/src/input_output_service/Makefile
deleted file mode 100644
index 7bfebd27d..000000000
--- a/code/ryzom/server/src/input_output_service/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-        -L../server_share \
-		-L../pd_lib \
-		-L../admin_modules \
-		-lpd_lib \
-        -lserver_share \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= input_output_service
-DSP_TARGET	= $(TARGETS).vcproj
-PACKED_SHEETS = \
-	ios_sheets.packed_sheets \
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a \
-		../pd_lib/libpd_lib.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets: $(TARGETS)
-	/bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/input_output_service/chat_manager.h b/code/ryzom/server/src/input_output_service/chat_manager.h
index 20704cf2f..811bdc710 100644
--- a/code/ryzom/server/src/input_output_service/chat_manager.h
+++ b/code/ryzom/server/src/input_output_service/chat_manager.h
@@ -58,13 +58,13 @@ public :
 	/// exception thrown when client is unknown
 	struct EChatClient : public NLMISC::Exception
 	{
-		EChatClient( const NLMISC::CEntityId& id ) : Exception ("Don't have chat infos for the char "+id.toString()) {};
+		EChatClient( const NLMISC::CEntityId& id ) : Exception ("Don't have chat infos for the char "+id.toString()) {}
 	};
 
 	/// exception thrown when group is unknown
 	struct EChatGroup : public NLMISC::Exception
 	{
-		EChatGroup( const TGroupId& gId ) : Exception ("Can't find the group "+gId.toString()) {};
+		EChatGroup( const TGroupId& gId ) : Exception ("Can't find the group "+gId.toString()) {}
 	};
 
 	/**
@@ -248,9 +248,9 @@ public :
 	 * \param target is the id of the target char
 	 * \param phraseId is the phrase id (uint32)
 	 */
-	void sendEmoteTextToPlayer(  const TDataSetRow& target,uint32 phraseId )
+	void sendEmoteTextToPlayer(  const TDataSetRow& sender, const TDataSetRow& target, uint32 phraseId )
 	{
-		sendChat2Ex( CChatGroup::say, target, phraseId );
+		sendChat2Ex( CChatGroup::say, target, phraseId, sender );
 	}
 
 	/**
diff --git a/code/ryzom/server/src/input_output_service/input_output_service.cpp b/code/ryzom/server/src/input_output_service/input_output_service.cpp
index 30b7186c3..a0b05a99d 100644
--- a/code/ryzom/server/src/input_output_service/input_output_service.cpp
+++ b/code/ryzom/server/src/input_output_service/input_output_service.cpp
@@ -495,8 +495,8 @@ void CInputOutputService::scanMirrorChanges()
 		if (entityId.getType() == RYZOMID::player)
 		{
 			// init event faction ID in mirror
-			CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, entityIndex, DSPropertyEVENT_FACTION_ID );
-			propEventFactionId = 0;
+			//CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, entityIndex, DSPropertyEVENT_FACTION_ID );
+			//propEventFactionId = 0;
 		}
 
 		entityIndex = DataSet->getNextAddedEntity();
@@ -620,7 +620,7 @@ void CInputOutputService::addCharacterName( const TDataSetRow& chId, const ucstr
 			if( itInfos == _NameToInfos.end() )
 			{
 				// New name does not exist
-				charInfos->ShortName = ucstring(name);
+				charInfos->ShortName.fromUtf8(name);
 			}
 
 			// Save the old name only if new name is not found (and the player is getting original name back)
diff --git a/code/ryzom/server/src/input_output_service/input_output_service.vcproj b/code/ryzom/server/src/input_output_service/input_output_service.vcproj
deleted file mode 100644
index b5d071296..000000000
--- a/code/ryzom/server/src/input_output_service/input_output_service.vcproj
+++ /dev/null
@@ -1,480 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="input_output_service"
-	ProjectGUID="{62149B6A-6CAE-41D5-86A4-A6E433BA87C9}"
-	RootNamespace="input_output_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\char_name_mapper.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_stats.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_stats.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_unifier_client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_unifier_client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\input_output_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\input_output_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ios_ring_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\news_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\news_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\parameter_traits.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\string_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\string_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\string_manager_parser.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/input_output_service/messages.cpp b/code/ryzom/server/src/input_output_service/messages.cpp
index df8eff255..fbece62b8 100644
--- a/code/ryzom/server/src/input_output_service/messages.cpp
+++ b/code/ryzom/server/src/input_output_service/messages.cpp
@@ -709,8 +709,8 @@ static void cbCharacterEventFaction(CMessage& msgin, const string &serviceName,
 		else
 			ci->UntranslatedEventFactionId = SM->storeString( eventFaction );
 
-		CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, chId, DSPropertyEVENT_FACTION_ID );
-		propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
+//		CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, chId, DSPropertyEVENT_FACTION_ID );
+//		propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
 	}
 	else
 	{
@@ -1513,12 +1513,14 @@ void cbEmoteCrowd( CMessage& msgin, const string &serviceName, TServiceId servic
 //-----------------------------------------------
 void cbEmoteSolePlayer( CMessage& msgin, const string &serviceName, TServiceId serviceId )
 {
+	TDataSetRow				sender;
 	TDataSetRow				target;
 	uint32					phraseId;
+	msgin.serial(sender);
 	msgin.serial(target);
 	msgin.serial(phraseId);
 	CChatManager &cm = IOS->getChatManager();
-	cm.sendEmoteTextToPlayer( target,phraseId );
+	cm.sendEmoteTextToPlayer(sender, target, phraseId );
 }
 
 
@@ -1567,6 +1569,10 @@ void cbSetPhrase( CMessage& msgin, const string &serviceName, TServiceId service
 	SM->setPhrase(msgin);
 }
 
+void cbSetPhraseLang( CMessage& msgin, const string& serviceName, TServiceId serviceId )
+{
+	SM->setPhraseLang(msgin);
+}
 
 //-----------------------------------------------
 //	Add a new channel in the dyn chat
@@ -2048,6 +2054,7 @@ TUnifiedCallbackItem CbIOSArray[]=
 	{ "CUSTOM_EMOTE", cbCustomEmote },	// EGS wants IOS to dispatch an emote custom text to all users around
 	
 	{ "SET_PHRASE", cbSetPhrase },			// AIS wants IOS to change a phrase content
+	{ "SET_PHRASE_LANG", cbSetPhraseLang }, // AIS or EGS wants IOS to change a phrase content for a language
 
 	{ "UPDATE_AIALIAS", cbUpdateAIAlias},
 
diff --git a/code/ryzom/server/src/input_output_service/parameter_traits.cpp b/code/ryzom/server/src/input_output_service/parameter_traits.cpp
index 56e9adcd7..6e0749033 100644
--- a/code/ryzom/server/src/input_output_service/parameter_traits.cpp
+++ b/code/ryzom/server/src/input_output_service/parameter_traits.cpp
@@ -231,7 +231,8 @@ public:
 			{
 
 				static const string NAME("name");
-				if (rep.Format != NAME)
+				CSString format = rep.Format;
+				if (format.left(4) != NAME)
 				{
 					// can't replace this parameter, write a del char
 					const static string s("\010");
@@ -270,7 +271,8 @@ public:
 			if (playerInfo != 0)
 			{
 				static const string NAME("name");
-				if (rep.Format != NAME)
+				CSString format = rep.Format;
+				if (format.left(4) != NAME)
 				{
 					// can't replace this parameter, write a del char
 					const static string s("\010");
diff --git a/code/ryzom/server/src/input_output_service/stdpch.h b/code/ryzom/server/src/input_output_service/stdpch.h
index c1a8fea5c..743601942 100644
--- a/code/ryzom/server/src/input_output_service/stdpch.h
+++ b/code/ryzom/server/src/input_output_service/stdpch.h
@@ -25,6 +25,7 @@
 #include <string>
 #include <time.h>
 #include <vector>
+#include <limits>
 #include <stddef.h>
 
 #include "nel/georges/load_form.h"
diff --git a/code/ryzom/server/src/input_output_service/string_manager.cpp b/code/ryzom/server/src/input_output_service/string_manager.cpp
index 6e61f1220..62bdb26c8 100644
--- a/code/ryzom/server/src/input_output_service/string_manager.cpp
+++ b/code/ryzom/server/src/input_output_service/string_manager.cpp
@@ -1110,6 +1110,30 @@ void CStringManager::setPhrase(NLNET::CMessage &message)
 	setPhrase(phraseName, phraseContent);
 }
 
+/*
+ * Replace a phrase in specified language (message handler)
+ */
+void CStringManager::setPhraseLang(NLNET::CMessage &message)
+{
+	std::string phraseName;
+	ucstring phraseContent;
+	std::string langString;
+	try
+	{
+		message.serial(phraseName);
+		message.serial(phraseContent);
+		message.serial(langString);
+	}
+	catch( Exception& e )
+	{
+		nlwarning("<setPhrase> %s",e.what());
+		return;
+	}
+
+	TLanguages lang = checkLanguageCode(langString);
+	setPhrase(phraseName, phraseContent, lang);
+}
+
 /*
  * Replace a phrase in default language(s)
  */
diff --git a/code/ryzom/server/src/input_output_service/string_manager.h b/code/ryzom/server/src/input_output_service/string_manager.h
index d860df126..901ac0320 100644
--- a/code/ryzom/server/src/input_output_service/string_manager.h
+++ b/code/ryzom/server/src/input_output_service/string_manager.h
@@ -673,6 +673,7 @@ public:
 	}
 
 	void setPhrase(NLNET::CMessage &message);
+	void setPhraseLang(NLNET::CMessage &message);
 	void setPhrase(std::string const& phraseName, ucstring const& phraseContent);
 	void setPhrase(std::string const& phraseName, ucstring const& phraseContent, TLanguages language);
 	/// Returns the language used in the setPhrase command.
diff --git a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
index 57b8758af..8cfbe5d90 100644
--- a/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
+++ b/code/ryzom/server/src/input_output_service/string_manager_parser.cpp
@@ -1799,8 +1799,8 @@ void CStringManager::reloadEventFactions(NLMISC::CLog * log, std::string fileNam
 		{
 			if ( TheDataset.isAccessible(ci->DataSetIndex) )
 			{
-				CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, ci->DataSetIndex, DSPropertyEVENT_FACTION_ID );
-				propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
+//				CMirrorPropValue<TYPE_EVENT_FACTION_ID> propEventFactionId( TheDataset, ci->DataSetIndex, DSPropertyEVENT_FACTION_ID );
+//				propEventFactionId = SM->translateEventFaction( ci->UntranslatedEventFactionId );
 			}
 		}
 	}
diff --git a/code/ryzom/server/src/log_analyser_service/Makefile b/code/ryzom/server/src/log_analyser_service/Makefile
deleted file mode 100644
index cd46cc580..000000000
--- a/code/ryzom/server/src/log_analyser_service/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../pd_lib \
-		-L../admin_modules \
-		-lpd_lib \
-		-lgame_share \
-		-lnelgeorges \
-		-ladmin_modules \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= log_analyser_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/log_analyser_service/log_analyser_service.vcproj b/code/ryzom/server/src/log_analyser_service/log_analyser_service.vcproj
deleted file mode 100644
index db3077368..000000000
--- a/code/ryzom/server/src/log_analyser_service/log_analyser_service.vcproj
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="log_analyser_service"
-	ProjectGUID="{376CABEA-A55F-4574-855B-7AE286E69371}"
-	RootNamespace="log_analyser_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_analyser_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_analyser_service.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/logger_service/Makefile b/code/ryzom/server/src/logger_service/Makefile
deleted file mode 100644
index e8f35c85e..000000000
--- a/code/ryzom/server/src/logger_service/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L../server_share \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-        -lserver_share \
-		-lgame_share \
-		-lnelnet \
-		-lnelmisc \
-		-ladmin_modules \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= logger_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		../server_share/libserver_share.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/logger_service/logger_service.vcproj b/code/ryzom/server/src/logger_service/logger_service.vcproj
deleted file mode 100644
index b32ccca3c..000000000
--- a/code/ryzom/server/src/logger_service/logger_service.vcproj
+++ /dev/null
@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="logger_service"
-	ProjectGUID="{8173204C-1D36-4199-B654-F3120CBA69D4}"
-	RootNamespace="logger_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\log_query.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_query.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_storage.h"
-			>
-		</File>
-		<File
-			RelativePath=".\logger_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\logger_service.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/mail_forum_service/Makefile b/code/ryzom/server/src/mail_forum_service/Makefile
deleted file mode 100644
index d55ed2c8f..000000000
--- a/code/ryzom/server/src/mail_forum_service/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../server_share \
-		-L../admin_modules \
-		-ladmin_modules \
-        -lserver_share \
-		-lgame_share \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= mail_forum_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-        ../server_share/libserver_share.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/mail_forum_service/mail_forum_service.vcproj b/code/ryzom/server/src/mail_forum_service/mail_forum_service.vcproj
deleted file mode 100644
index 9d87815d3..000000000
--- a/code/ryzom/server/src/mail_forum_service/mail_forum_service.vcproj
+++ /dev/null
@@ -1,420 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mail_forum_service"
-	ProjectGUID="{7E1F0D71-C70A-4C99-9DBB-A0627942E09A}"
-	RootNamespace="mail_forum_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\hof_generator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\hof_generator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mail_forum_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shard_stat_db_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shard_stat_db_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/mirror_service/Makefile b/code/ryzom/server/src/mirror_service/Makefile
deleted file mode 100644
index 55fcdbfe9..000000000
--- a/code/ryzom/server/src/mirror_service/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt \
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= mirror_service
-DSP_TARGET	= $(TARGETS).vcproj
-PACKED_SHEETS = \
-	datasets.packed_sheets \
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets: $(TARGETS)
-	/bin/sh ../update_packed_sheets.sh ./$(TARGETS) $(PACKED_SHEETS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/mirror_service/mirror_service.vcproj b/code/ryzom/server/src/mirror_service/mirror_service.vcproj
deleted file mode 100644
index 2eaa78170..000000000
--- a/code/ryzom/server/src/mirror_service/mirror_service.vcproj
+++ /dev/null
@@ -1,376 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="mirror_service"
-	ProjectGUID="{BDD7A914-0AAF-452E-829A-449755623790}"
-	RootNamespace="mirror_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\data_set_ms.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\data_set_ms.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ms_automaton.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\tick_proxy.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\tick_proxy.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/monitor_service/Makefile b/code/ryzom/server/src/monitor_service/Makefile
deleted file mode 100644
index 6fd930c8d..000000000
--- a/code/ryzom/server/src/monitor_service/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I/usr/include/mysql \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-lgame_share \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lmysqlclient \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= monitor_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/monitor_service/monitor_service.vcproj b/code/ryzom/server/src/monitor_service/monitor_service.vcproj
deleted file mode 100644
index 0a4b289f2..000000000
--- a/code/ryzom/server/src/monitor_service/monitor_service.vcproj
+++ /dev/null
@@ -1,432 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="monitor_service"
-	ProjectGUID="{1648BD89-6D2C-441E-9D5A-D83F22F4F5EC}"
-	RootNamespace="monitor_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrors.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mirrors.h"
-			>
-		</File>
-		<File
-			RelativePath=".\service_main.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-					PrecompiledHeaderThrough="stdpch.h"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/patchman_service/CMakeLists.txt b/code/ryzom/server/src/patchman_service/CMakeLists.txt
index 606c4e40a..dd818fc2f 100644
--- a/code/ryzom/server/src/patchman_service/CMakeLists.txt
+++ b/code/ryzom/server/src/patchman_service/CMakeLists.txt
@@ -2,11 +2,25 @@ FILE(GLOB SRC *.cpp *.h)
 
 LIST(REMOVE_ITEM SRC
 			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.cpp
-			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h)
+			${CMAKE_CURRENT_SOURCE_DIR}/rr_module_itf.h
+			${CMAKE_CURRENT_SOURCE_DIR}/re_module_itf.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/re_module_itf.h
+			${CMAKE_CURRENT_SOURCE_DIR}/spt_module_itf.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/spt_module_itf.h
+			${CMAKE_CURRENT_SOURCE_DIR}/spm_module_itf.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/spm_module_itf.h
+			${CMAKE_CURRENT_SOURCE_DIR}/spa_module_itf.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/spa_module_itf.h
+			${CMAKE_CURRENT_SOURCE_DIR}/re_repository_emitter.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/re_repository_emitter.h
+			${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/rr_repository_reciever.h
+			${CMAKE_CURRENT_SOURCE_DIR}/stdin_monitor_thread.cpp
+			${CMAKE_CURRENT_SOURCE_DIR}/stdin_monitor_thread.h)
 
-ADD_EXECUTABLE(ryzom_patchman_service ${SRC})
+ADD_EXECUTABLE(ryzom_patchman_service WIN32 ${SRC})
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/server/src ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${RZ_SERVER_SRC_DIR} ${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${NEL_INCLUDE_DIR})
 
 TARGET_LINK_LIBRARIES(ryzom_patchman_service
 					ryzom_adminmodules
diff --git a/code/ryzom/server/src/patchman_service/Makefile b/code/ryzom/server/src/patchman_service/Makefile
deleted file mode 100644
index 871805240..000000000
--- a/code/ryzom/server/src/patchman_service/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I/usr/include/mysql \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-lmysqlclient \
-		-lgame_share \
-		-lnelnet \
-		-lnelmisc \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= patchman_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/patchman_service/cpr_client_patch_repository.cpp b/code/ryzom/server/src/patchman_service/cpr_client_patch_repository.cpp
index 9f24857ba..43d5f7d63 100644
--- a/code/ryzom/server/src/patchman_service/cpr_client_patch_repository.cpp
+++ b/code/ryzom/server/src/patchman_service/cpr_client_patch_repository.cpp
@@ -97,7 +97,7 @@ protected:
 static uint32 getFileVersion(const NLMISC::CSString& fileName)
 {
 	// start at the back of the file name and scan forwards until we find a '/' or '\\' or ':' or a digit
-	uint32 i= fileName.size();
+	uint32 i= (uint32)fileName.size();
 	while (i--)
 	{
 		char c= fileName[i];
diff --git a/code/ryzom/server/src/patchman_service/deployment_configuration_synchroniser.cpp b/code/ryzom/server/src/patchman_service/deployment_configuration_synchroniser.cpp
index cd5e6ba1e..7962c49ed 100644
--- a/code/ryzom/server/src/patchman_service/deployment_configuration_synchroniser.cpp
+++ b/code/ryzom/server/src/patchman_service/deployment_configuration_synchroniser.cpp
@@ -23,6 +23,7 @@
 
 // game share
 #include "game_share/utils.h"
+#include "game_share/deployment_configuration.h"
 
 // local
 #include "deployment_configuration_synchroniser.h"
diff --git a/code/ryzom/server/src/patchman_service/file_manager.cpp b/code/ryzom/server/src/patchman_service/file_manager.cpp
index 4bd619cd6..7c37903a9 100644
--- a/code/ryzom/server/src/patchman_service/file_manager.cpp
+++ b/code/ryzom/server/src/patchman_service/file_manager.cpp
@@ -459,9 +459,9 @@ namespace PATCHMAN
 		NLMISC::CPath::getPathContent(_Root+directoryName,false,true,false,pathContents);
 
 		// run through the directories we found...
-		for (uint32 i=pathContents.size();i--;)
+		for (uint32 i=(uint32)pathContents.size();i--;)
 		{
-			NLMISC::CSString childDirectoryName= NLMISC::CSString(pathContents[i]).leftCrop(_Root.size());
+			NLMISC::CSString childDirectoryName= NLMISC::CSString(pathContents[i]).leftCrop((uint32)_Root.size());
 
 			// make sure they exist in the '_DirectoryTree' map
 			_DirectoryTree[childDirectoryName];
@@ -484,14 +484,14 @@ namespace PATCHMAN
 		NLMISC::CPath::getPathContent(_Root+directoryName,false,false,true,pathContents);
 
 		// run through the files adding them to ourself
-		for (uint32 i=pathContents.size();i--;)
+		for (uint32 i=(uint32)pathContents.size();i--;)
 		{
 			// if the file is system file then skip it
 			if (pathContents[i].find("/.")!=std::string::npos)
 				continue;
 
 			// construct the file name
-			NLMISC::CSString fileName= NLMISC::CSString(pathContents[i]).leftCrop(_Root.size()); 
+			NLMISC::CSString fileName= NLMISC::CSString(pathContents[i]).leftCrop((uint32)_Root.size()); 
 			// get hold of the directory entry for this file (or create a new one if not exist) and update it
 			_IndexFileIsUpToDate&= _DirectoryTree[directoryName][fileName].updateFileInfo(fileName,pathContents[i],SFileInfo::RECALCULATE_IF_CHANGED,updateListener);
 		}
@@ -601,7 +601,7 @@ namespace PATCHMAN
 			// read in the file
 			FILE* inf= fopen(fileName.c_str(),"rb");
 			BOMB_IF(inf==NULL,"Failed to open input file for reading: "+fileName,return false);
-			uint32 bytesRead=fread(&_CacheBuffer[newFileEntry.StartOffset],1,fileSize,inf);
+			uint32 bytesRead=(uint32)fread(&_CacheBuffer[newFileEntry.StartOffset],1,fileSize,inf);
 			fclose(inf);
 			BOMB_IF(bytesRead!=fileSize,"Failed to read data from input file: "+fileName,return false);
 
@@ -732,7 +732,7 @@ NLMISC_CATEGORISED_COMMAND(patchman,fileManagerSave,"Save a file via the file ma
 
 	CSString fileName= args[0];
 	CMemStream data;
-	data.serialBuffer((uint8*)(&args[1][0]),args[1].size());
+	data.serialBuffer((uint8*)(&args[1][0]),(uint32)args[1].size());
 	CFileManager::getInstance().save(fileName,data);
 
 	return true;
diff --git a/code/ryzom/server/src/patchman_service/file_receiver.cpp b/code/ryzom/server/src/patchman_service/file_receiver.cpp
index a3ca87da0..278f24059 100644
--- a/code/ryzom/server/src/patchman_service/file_receiver.cpp
+++ b/code/ryzom/server/src/patchman_service/file_receiver.cpp
@@ -347,7 +347,7 @@ namespace PATCHMAN
 
 		// add the data to the file
 		CSString& theBuffer= theRequest->DataSoFar;
-		uint32 oldSize= theBuffer.size();
+		uint32 oldSize= (uint32)theBuffer.size();
 		theBuffer.resize(oldSize+data.getBufferSize());
 		memcpy(&(theBuffer[oldSize]), data.getBuffer(), data.getBufferSize());
 
@@ -355,7 +355,7 @@ namespace PATCHMAN
 		if (theRequest->DataSoFar.size()>=theRequest->ExpectedFileSize)
 		{
 			// we've reached the end of file
-			_dealWithReceivedFile(sender,theRequest,NLNET::TBinBuffer((const uint8 *)&theRequest->DataSoFar[0],theRequest->DataSoFar.size()));
+			_dealWithReceivedFile(sender,theRequest,NLNET::TBinBuffer((const uint8 *)&theRequest->DataSoFar[0],(uint32)theRequest->DataSoFar.size()));
 			return;
 		}
 
@@ -374,7 +374,7 @@ namespace PATCHMAN
 		}
 
 		// log our progress
-		_downloadLog(fileName,theRequest->DataSoFar.size(),theRequest->ExpectedFileSize);
+		_downloadLog(fileName,(uint32)theRequest->DataSoFar.size(),theRequest->ExpectedFileSize);
 	}
 
 	void CFileReceiver::cbFileDataFailure(NLNET::IModuleProxy *sender, const std::string &fileName)
diff --git a/code/ryzom/server/src/patchman_service/file_repository.cpp b/code/ryzom/server/src/patchman_service/file_repository.cpp
index d1d2d4b54..72881f587 100644
--- a/code/ryzom/server/src/patchman_service/file_repository.cpp
+++ b/code/ryzom/server/src/patchman_service/file_repository.cpp
@@ -332,7 +332,7 @@ namespace PATCHMAN
 		CFileReceiverProxy rr(sender);
 		if (ok && !result.empty())
 		{
-			rr.cbFileData(_Parent,fileName,startOffset,NLNET::TBinBuffer((const uint8 *)&result[0],result.size()));
+			rr.cbFileData(_Parent,fileName,startOffset,NLNET::TBinBuffer((const uint8 *)&result[0],(uint32)result.size()));
 		}
 		else
 		{
diff --git a/code/ryzom/server/src/patchman_service/log_report_module.cpp b/code/ryzom/server/src/patchman_service/log_report_module.cpp
index 4d8dead49..bc5339e1c 100644
--- a/code/ryzom/server/src/patchman_service/log_report_module.cpp
+++ b/code/ryzom/server/src/patchman_service/log_report_module.cpp
@@ -26,6 +26,7 @@
 
 // game_share
 #include "game_share/utils.h"
+#include "game_share/deployment_configuration.h"
 
 // patchman
 #include "administered_module.h"
diff --git a/code/ryzom/server/src/patchman_service/module_admin_itf.h b/code/ryzom/server/src/patchman_service/module_admin_itf.h
index d9649f603..a0d4aa34e 100644
--- a/code/ryzom/server/src/patchman_service/module_admin_itf.h
+++ b/code/ryzom/server/src/patchman_service/module_admin_itf.h
@@ -71,9 +71,9 @@ namespace PATCHMAN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -211,9 +211,9 @@ namespace PATCHMAN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -371,9 +371,9 @@ namespace PATCHMAN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -504,9 +504,9 @@ namespace PATCHMAN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -711,9 +711,9 @@ namespace PATCHMAN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -911,9 +911,9 @@ namespace PATCHMAN
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp b/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp
index b7ec31592..60efeee33 100644
--- a/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp
+++ b/code/ryzom/server/src/patchman_service/pam_patchman_admin_module.cpp
@@ -27,7 +27,7 @@
 // game share
 #include "game_share/utils.h"
 #include "game_share/file_description_container.h"
-
+#include "game_share/deployment_configuration.h"
 // local
 #include "administered_module.h"
 #include "file_receiver.h"
@@ -134,7 +134,8 @@ bool CPatchmanAdminModule::initModule(const TParsedCommandLine &initInfo)
 	CDeploymentConfigurationSynchroniser::init(this);
 
 	// now that the base classes have been initialised, we can cumulate the module manifests
-	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip();
+	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest);
+	_Manifest = _Manifest.strip();
 
 	// we're all done so let the world know
 	registerProgress(string("PAM Initialised: ")+logMsg+" "+_Manifest);
@@ -263,7 +264,7 @@ void CPatchmanAdminModule::cbFileDownloadSuccess(const CSString& fileName,const
 		NLMISC::CPath::setCurrentPath(oldDirectory.c_str());
 		time_t rawtime;
 		nl_time ( &rawtime );
-		setStateVariable("Environment",NLMISC::toString("Updated %s",nl_asctime (nl_localtime ( &rawtime ))));
+		setStateVariable("Environment",NLMISC::toString("Updated %s",asctime (nl_localtime ( &rawtime ))));
 
 		return;
 	}
@@ -435,7 +436,7 @@ NLMISC_CLASS_COMMAND_IMPL(CPatchmanAdminModule, download)
 			}
 
 			// iterate over matching files, adding them to the download list
-			for (uint32 i=fileInfo.size();i--;)
+			for (uint i=(uint)fileInfo.size();i--;)
 			{
 				_DownloadRequests[fileInfo[i].FileName]= NLMISC::CPath::standardizePath(destination);
 				requestFile(fileInfo[i].FileName);
diff --git a/code/ryzom/server/src/patchman_service/patchman_tester.h b/code/ryzom/server/src/patchman_service/patchman_tester.h
index ccab3d800..16a620c1c 100644
--- a/code/ryzom/server/src/patchman_service/patchman_tester.h
+++ b/code/ryzom/server/src/patchman_service/patchman_tester.h
@@ -38,6 +38,8 @@ namespace PATCHMAN
 	class CPatchmanTester
 	{
 	public:
+		virtual ~CPatchmanTester() {}
+	
 		// this is a singleton so it has a getInstance() method to get to the singleton instance
 		static CPatchmanTester& getInstance();
 
diff --git a/code/ryzom/server/src/patchman_service/repository.cpp b/code/ryzom/server/src/patchman_service/repository.cpp
index b71c11ef2..a63a96bcd 100644
--- a/code/ryzom/server/src/patchman_service/repository.cpp
+++ b/code/ryzom/server/src/patchman_service/repository.cpp
@@ -52,7 +52,7 @@ NLMISC::CSString getRepositoryIndexFileName(const NLMISC::CSString& repositoryNa
 uint32 getFileVersion(const NLMISC::CSString& fileName)
 {
 	// start at the back of the file name and scan forwards until we find a '/' or '\\' or ':' or a digit
-	uint32 i= fileName.size();
+	uint32 i= (uint32)fileName.size();
 	while (i--)
 	{
 		char c= fileName[i];
@@ -184,9 +184,9 @@ void CRepository::updateFile(NLMISC::CSString fileName)
 	nldebug(("GUSREP_Updating repository entry for file: '"+fileName+"'").c_str());
 
 	// if the name of the file that has changed contains the target directory name then crop it
-	if (fileName.left(_TargetDirectory.size())==_TargetDirectory)
+	if (fileName.left((uint32)_TargetDirectory.size())==_TargetDirectory)
 	{
-		fileName=fileName.leftCrop(_TargetDirectory.size());
+		fileName=fileName.leftCrop((uint32)_TargetDirectory.size());
 	}
 
 	// lookup the file in the map
@@ -219,9 +219,9 @@ void CRepository::addFileStub(NLMISC::CSString fileName)
 	nldebug(("GUSREP_Adding repository stub for file: '"+fileName+"'").c_str());
 
 	// if the name of the file that has changed contains the target directory name then crop it
-	if (fileName.left(_TargetDirectory.size())==_TargetDirectory)
+	if (fileName.left((uint32)_TargetDirectory.size())==_TargetDirectory)
 	{
-		fileName=fileName.leftCrop(_TargetDirectory.size());
+		fileName=fileName.leftCrop((uint32)_TargetDirectory.size());
 	}
 
 	// make sure the file didn't already exist in the map
@@ -258,7 +258,7 @@ uint32 CRepository::update()
 
 		// get hold of the file name for the next file
 //		CSString fileName= NLMISC::CFile::getFilename(theFile.FileName);
-		CSString fileName= theFile.FileName.leftCrop(_TargetDirectory.size());
+		CSString fileName= theFile.FileName.leftCrop((uint32)_TargetDirectory.size());
 
 		// extract the version number from the file name and skip the file if it's too recent or the version number was invalid
 		uint32 fileVersion= getFileVersion(fileName);
@@ -345,7 +345,7 @@ void CRepository::setVersion(uint32 version)
 
 uint32 CRepository::size() const
 {
-	return _Files.size();
+	return (uint32)_Files.size();
 }
 
 const CRepository::CFilesMapEntry& CRepository::operator[](const NLMISC::CSString& key) const
diff --git a/code/ryzom/server/src/patchman_service/service_main.cpp b/code/ryzom/server/src/patchman_service/service_main.cpp
index 3751bb123..7e61baba8 100644
--- a/code/ryzom/server/src/patchman_service/service_main.cpp
+++ b/code/ryzom/server/src/patchman_service/service_main.cpp
@@ -28,13 +28,18 @@
 #include "game_share/ryzom_version.h"
 #include "game_share/tick_event_handler.h"
 #include "game_share/singleton_registry.h"
-#include "game_share/handy_commands.h"
+#include "server_share/handy_commands.h"
 #include "game_share/utils.h"
 
 // local
 #include "service_main.h"
 #include "patchman_tester.h"
 
+#ifdef NL_OS_WINDOWS
+#       define NOMINMAX
+#       include <windows.h>
+#endif // NL_OS_WINDOWS
+
 
 //-----------------------------------------------------------------------------
 // namespaces
@@ -110,12 +115,12 @@ void CTaskScheduler::update()
 	// check to see if we've broken our max sheduled tasks record...
 	if (_MaxTasks < _Tasks.size())
 	{
-		_MaxTasks = _Tasks.size();
+		_MaxTasks = (uint32)_Tasks.size();
 		nldebug("New scheduled task record: %u",_MaxTasks);
 	}
 
 	// iterate over all scheduled tasks (we go backwards to simplify deletion of executed tasks as we go)
-	for (uint32 i=_Tasks.size();i--;)
+	for (uint32 i=(uint32)_Tasks.size();i--;)
 	{
 		// get a refference to the next task
 		STask& theTask= _Tasks[i];
diff --git a/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp b/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp
index 85ca066e0..b5b35329c 100644
--- a/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp
+++ b/code/ryzom/server/src/patchman_service/spa_server_patch_applier.cpp
@@ -25,6 +25,7 @@
 // game share
 #include "game_share/utils.h"
 #include "game_share/file_description_container.h"
+#include "game_share/deployment_configuration.h"
 
 // local
 #include "administered_module.h"
@@ -214,7 +215,7 @@ static bool untar(const NLMISC::CSString& tarFile,const NLMISC::CSString& destin
 	return ok;
 }
 
-static uint32 readVersionFile(const NLMISC::CSString& fileName)
+uint32 readVersionFile(const NLMISC::CSString& fileName)
 {
 	if (!NLMISC::CFile::fileExists(fileName))
 	{
@@ -226,7 +227,7 @@ static uint32 readVersionFile(const NLMISC::CSString& fileName)
 	return s.strip().atoi();
 }
 
-static void writeVersionFile(const NLMISC::CSString& fileName, uint32 version)
+void writeVersionFile(const NLMISC::CSString& fileName, uint32 version)
 {
 	NLMISC::CSString(NLMISC::toString(version)).writeToFile(fileName);
 }
@@ -384,7 +385,8 @@ bool CServerPatchApplier::initModule(const TParsedCommandLine &initInfo)
 	CDeploymentConfigurationSynchroniser::init(this);
 
 	// now that the base classes have been initialised, we can cumulate the module manifests
-	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest).strip();
+	_Manifest= (CFileReceiver::getModuleManifest()+_Manifest);
+	_Manifest = _Manifest.strip();
 
 	// we're all done so let the world know
 	registerProgress(string("SPA Initialised: ")+logMsg+" "+_Manifest);
diff --git a/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp b/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp
index e68548086..af07c2fbb 100644
--- a/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp
+++ b/code/ryzom/server/src/patchman_service/spb_server_patch_bridge.cpp
@@ -136,7 +136,8 @@ bool CServerPatchBridge::initModule(const TParsedCommandLine &initInfo)
 	CFileReceiver::init(this,"*/*");
 
 	// now  that the base classes have been initialised, we can cumulate the module manifests
-	_Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest).strip();
+	_Manifest= (CFileRepository::buildModuleManifest()+" "+CFileReceiver::getModuleManifest()+" "+_Manifest);
+	_Manifest = _Manifest.strip();
 
 	// scan our local file cache to buildup our starting file base
 	setStateVariable("State","Scanning");
diff --git a/code/ryzom/server/src/patchman_service/spm_server_patch_manager.cpp b/code/ryzom/server/src/patchman_service/spm_server_patch_manager.cpp
index 8951fbc54..5aace43e0 100644
--- a/code/ryzom/server/src/patchman_service/spm_server_patch_manager.cpp
+++ b/code/ryzom/server/src/patchman_service/spm_server_patch_manager.cpp
@@ -32,7 +32,7 @@
 #include "deployment_configuration_synchroniser.h"
 #include "patchman_constants.h"
 
-#include "game_share/mysql_wrapper.h"
+#include "server_share/mysql_wrapper.h"
 
 
 //-------------------------------------------------------------------------------------------------
diff --git a/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp b/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp
index 365b3d0e7..f5f676989 100644
--- a/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp
+++ b/code/ryzom/server/src/patchman_service/spt_server_patch_terminal.cpp
@@ -27,6 +27,7 @@
 
 // game share
 #include "game_share/utils.h"
+#include "game_share/deployment_configuration.h"
 
 // local
 #include "module_admin_itf.h"
@@ -80,7 +81,9 @@ static void addSPTMessage(const CSString& moduleName, const CSString& msgText)
 	nldebug("SPTMSG_VERBOSE %d: %s: %s",count,moduleName.c_str(),msgText.c_str());
 
 	// look for a slot to stick the message in
-	CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':')).strip();
+	CSString cleanModuleName= (moduleName.splitTo(':')+'/'+moduleName.splitFrom(':').splitFrom(':'));
+	cleanModuleName = cleanModuleName.strip();
+
 	uint32 oldest=0;
 	uint32 oldestTime=~0u;
 	for (uint32 i=0;i<sizeof(SPTMessage)/sizeof(SPTMessage[0]) && i<NumSPTWatches.get();++i)
@@ -783,7 +786,7 @@ NLMISC_CLASS_COMMAND_IMPL(CServerPatchTerminal, depDevCfg)
 		CSString batch;
 		// hack the cmd line
 		CVectorSString cmdParams;
-		explode(appDesc.CmdLine, " ", reinterpret_cast<vector<string>&>(cmdParams), true);
+		explode(string(appDesc.CmdLine), string(" "), reinterpret_cast<vector<string>&>(cmdParams), true);
 		for (uint i=0; i<cmdParams.size(); ++i)
 		{
 			string &p = cmdParams[i];
diff --git a/code/ryzom/server/src/pd_lib/Makefile b/code/ryzom/server/src/pd_lib/Makefile
deleted file mode 100644
index fce71f9aa..000000000
--- a/code/ryzom/server/src/pd_lib/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
- 		-I.. \
- 		-I.
-
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-lnelnet \
-		-L/usr/lib \
-		-L/usr/X11R6/lib \
-		-lnelmisc \
-		-lxml2 \
-		-lpthread \
-		-lgame_share
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libpd_lib.a
-DSP_TARGET	= pd_lib.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-
-#libgame_share.so: $(OBJS)
-#	$(CXX) -o $@ $(OBJS) -shared $(LDFLAGS)
-
-libpd_lib.a: $(OBJS)
-	ar r libpd_lib.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/pd_lib/pd_lib.vcproj b/code/ryzom/server/src/pd_lib/pd_lib.vcproj
deleted file mode 100644
index d04ce84e8..000000000
--- a/code/ryzom/server/src/pd_lib/pd_lib.vcproj
+++ /dev/null
@@ -1,417 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pd_lib"
-	ProjectGUID="{86791397-FD1F-47CA-BBC9-3F548EE29872}"
-	RootNamespace="pd_lib"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\db_delta_file.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\db_delta_file.h"
-			>
-		</File>
-		<File
-			RelativePath=".\db_description_parser.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\db_description_parser.h"
-			>
-		</File>
-		<File
-			RelativePath=".\db_reference_file.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\db_reference_file.h"
-			>
-		</File>
-		<File
-			RelativePath=".\delta_builder.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\delta_builder.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_lib.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_lib.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_server_utils.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_server_utils.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_set.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_set.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_string_mapper.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_string_mapper.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pd_utils.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_common.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_common.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_table_buffer.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_table_buffer.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_table_buffer_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_types.h"
-			>
-		</File>
-		<File
-			RelativePath=".\reference_builder.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\reference_builder.h"
-			>
-		</File>
-		<File
-			RelativePath=".\timestamp.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\timestamp.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/pd_lib/pds_common.h b/code/ryzom/server/src/pd_lib/pds_common.h
index 040c0354b..18cb93c4a 100644
--- a/code/ryzom/server/src/pd_lib/pds_common.h
+++ b/code/ryzom/server/src/pd_lib/pds_common.h
@@ -144,7 +144,7 @@ bool	getProperty(xmlNodePtr node, const char* propName, T &result, const T &defa
 	if (!NLMISC::CIXml::getPropertyString(res, node, propName))
 	{
 		if (!quiet)
-			nlwarning("Couldn't get property '%s' in xml node, use '%s' value instead", propName, toString(defaultValue).c_str());
+			nlwarning("Couldn't get property '%s' in xml node, use '%s' value instead", propName, NLMISC::toString(defaultValue).c_str());
 		result = defaultValue;
 		return false;
 	}
diff --git a/code/ryzom/server/src/pd_reference_builder/Makefile b/code/ryzom/server/src/pd_reference_builder/Makefile
deleted file mode 100644
index b234dfe0b..000000000
--- a/code/ryzom/server/src/pd_reference_builder/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../pd_lib \
-		-lpd_lib \
-		-lgame_share \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= reference_builder_service
-DSP_TARGET	= pd_reference_builder.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-reference_builder_service: $(OBJS)
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/pd_reference_builder/pd_reference_builder.vcproj b/code/ryzom/server/src/pd_reference_builder/pd_reference_builder.vcproj
deleted file mode 100644
index 567c8d943..000000000
--- a/code/ryzom/server/src/pd_reference_builder/pd_reference_builder.vcproj
+++ /dev/null
@@ -1,372 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="pd_reference_builder"
-	ProjectGUID="{316CF36D-0852-4E13-8E6C-6121E2D8D0A8}"
-	RootNamespace="pd_reference_builder"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\delta_builder_task.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\delta_builder_task.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ref_builder_task.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ref_builder_task.h"
-			>
-		</File>
-		<File
-			RelativePath=".\reference_builder_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\reference_builder_service.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/pd_support_service/Makefile b/code/ryzom/server/src/pd_support_service/Makefile
deleted file mode 100644
index fbfd9ec54..000000000
--- a/code/ryzom/server/src/pd_support_service/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../server_share \
-		-L../admin_modules \
-		-lgame_share \
-        -lserver_share \
-		-lnelnet \
-		-lnelmisc \
-		-ladmin_modules \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= pd_support_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a \
-        ../server_share/libserver_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/pd_support_service/pd_support_service.vcproj b/code/ryzom/server/src/pd_support_service/pd_support_service.vcproj
deleted file mode 100644
index c0a8cbd85..000000000
--- a/code/ryzom/server/src/pd_support_service/pd_support_service.vcproj
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9,00"
-	Name="pd_support_service"
-	ProjectGUID="{F9B6E923-1504-412D-8E6F-40C5E4D22A12}"
-	RootNamespace="pd_support_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				WarningLevel="3"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\daily_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fdc_cache.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\fdc_cache.h"
-			>
-		</File>
-		<File
-			RelativePath=".\hourly_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\service_main.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\service_main.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_filter_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_filter_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_info_extractor_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_info_extractor_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_scan_script.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_char_scan_script.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character_scan_job.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_character_scan_job.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_file_list_builder_factory.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_file_list_builder_factory.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_globals.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_globals.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_guild_container.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_guild_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_job_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_job_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_user_char_filters.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_user_char_info_extractors.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_user_file_list_builders.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stats_guild_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stats_guild_scan_job.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stats_guild_scan_job.h"
-			>
-		</File>
-		<File
-			RelativePath=".\utils.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\utils.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h b/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h
index 656cc0cca..a96b7d6a5 100644
--- a/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h
+++ b/code/ryzom/server/src/pd_support_service/stat_char_filter_factory.h
@@ -52,6 +52,7 @@ public:
 class ICharFilterBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharFilterBuilder() {}
 	virtual const char* getName()=0;
 	virtual const char* getDescription()=0;
 	virtual ICharFilter* build(const std::string& rawArgs)=0;
diff --git a/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h b/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h
index 868004c39..cd182c169 100644
--- a/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h
+++ b/code/ryzom/server/src/pd_support_service/stat_char_info_extractor_factory.h
@@ -56,6 +56,7 @@ public:
 class ICharInfoExtractorBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharInfoExtractorBuilder() {}
 	virtual const char* getName() const=0;
 	virtual const char* getDescription() const=0;
 	virtual const char* getFields() const=0;
diff --git a/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h b/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h
index fbfb5dc61..367c0caa2 100644
--- a/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h
+++ b/code/ryzom/server/src/pd_support_service/stat_file_list_builder_factory.h
@@ -54,6 +54,7 @@ public:
 class IFileListBuilderBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~IFileListBuilderBuilder() {}
 	virtual const char* getName()=0;
 	virtual const char* getDescription()=0;
 	virtual IFileListBuilder* build(const std::string& rawArgs)=0;
diff --git a/code/ryzom/server/src/persistant_data_service/Makefile b/code/ryzom/server/src/persistant_data_service/Makefile
deleted file mode 100644
index 55c169b80..000000000
--- a/code/ryzom/server/src/persistant_data_service/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../pd_lib \
-		-lpd_lib \
-		-lgame_share \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= persistant_data_service
-DSP_TARGET	= $(TARGETS).dsp
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS)
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/persistant_data_service/persistant_data_service.vcproj b/code/ryzom/server/src/persistant_data_service/persistant_data_service.vcproj
deleted file mode 100644
index 8bd6cc9ab..000000000
--- a/code/ryzom/server/src/persistant_data_service/persistant_data_service.vcproj
+++ /dev/null
@@ -1,436 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="persistant_data_service"
-	ProjectGUID="{C0F5F05F-A2AC-44B9-B12E-A33D8CA9A685}"
-	RootNamespace="persistant_data_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\database_adapter.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\database_adapter.h"
-			>
-		</File>
-		<File
-			RelativePath=".\db_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\db_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\db_manager_messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\db_manager_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_attribute.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_attribute.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_column.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_column.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_database.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_database.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_database_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_table.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_table.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_table_inline.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pds_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\persistant_data_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\persistant_data_service.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/ryzom_admin_service/Makefile b/code/ryzom/server/src/ryzom_admin_service/Makefile
deleted file mode 100644
index d2fdbf0e9..000000000
--- a/code/ryzom/server/src/ryzom_admin_service/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L../admin_modules \
-		-ladmin_modules \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= ryzom_admin_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.vcproj b/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.vcproj
deleted file mode 100644
index 738debe33..000000000
--- a/code/ryzom/server/src/ryzom_admin_service/ryzom_admin_service.vcproj
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ryzom_admin_service"
-	ProjectGUID="{4319E0CA-A7CD-48A4-B4D4-0DF3574B27EE}"
-	RootNamespace="ryzom_admin_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\ryzom_admin_service.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/ryzom_naming_service/Makefile b/code/ryzom/server/src/ryzom_naming_service/Makefile
deleted file mode 100644
index 89234b94d..000000000
--- a/code/ryzom/server/src/ryzom_naming_service/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L../admin_modules \
-		-lnelnet \
-		-lnelmisc \
-		-ladmin_modules \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= ryzom_naming_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.vcproj b/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.vcproj
deleted file mode 100644
index d87909004..000000000
--- a/code/ryzom/server/src/ryzom_naming_service/ryzom_naming_service.vcproj
+++ /dev/null
@@ -1,351 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ryzom_naming_service"
-	ProjectGUID="{76E2A386-207B-4E7D-879C-F723A6A1F193}"
-	RootNamespace="ryzom_naming_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\ryzom_naming_service.cpp"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/ryzom_welcome_service/Makefile b/code/ryzom/server/src/ryzom_welcome_service/Makefile
deleted file mode 100644
index 279986552..000000000
--- a/code/ryzom/server/src/ryzom_welcome_service/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L../admin_modules \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-lgame_share \
-		-lnelnet \
-		-lnelmisc \
-		-ladmin_modules \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= ryzom_welcome_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.vcproj b/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.vcproj
deleted file mode 100644
index c223fb76a..000000000
--- a/code/ryzom/server/src/ryzom_welcome_service/ryzom_welcome_service.vcproj
+++ /dev/null
@@ -1,355 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="ryzom_welcome_service"
-	ProjectGUID="{745FBE4A-EA96-4564-A323-0CF31D8C46FC}"
-	RootNamespace="ryzom_welcome_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\ryzom_welcome_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ryzom_welcome_service.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/sabrina/faber_phrase.h b/code/ryzom/server/src/sabrina/faber_phrase.h
index 8069dc4f6..4d85e8b53 100644
--- a/code/ryzom/server/src/sabrina/faber_phrase.h
+++ b/code/ryzom/server/src/sabrina/faber_phrase.h
@@ -64,21 +64,21 @@ public:
 	/**
 	 * set the actor
 	 */
-	virtual void setActor( const TDataSetRow &entityRowId ){};
+	virtual void setActor( const TDataSetRow &entityRowId ){}
 	
 	/**
 	 * called at the end of the latency time
 	 */
-	virtual void end(){};
+	virtual void end(){}
 	//@}
 
 	///\unused basic methods from CSPhrase
 	//@{
-	virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
-	virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
-	virtual void addConsumableItem( CGameItemPtr itemPtr ){};
-	virtual void setPrimaryTarget( const TDataSetRow& ) {};
-	virtual void addTargetEntity( const TDataSetRow& ) {};
+	virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
+	virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
+	virtual void addConsumableItem( CGameItemPtr itemPtr ){}
+	virtual void setPrimaryTarget( const TDataSetRow& ) {}
+	virtual void addTargetEntity( const TDataSetRow& ) {}
 	//@}
 
 	inline const TDataSetRow & getActor() { return _ActorRowId;}
diff --git a/code/ryzom/server/src/sabrina/harvest_phrase.h b/code/ryzom/server/src/sabrina/harvest_phrase.h
index b5f290019..c300b1abd 100644
--- a/code/ryzom/server/src/sabrina/harvest_phrase.h
+++ b/code/ryzom/server/src/sabrina/harvest_phrase.h
@@ -62,11 +62,11 @@ public:
 
 	///\unused basic methods from CSPhrase
 	//@{
-	virtual void setPrimaryItem( CGameItemPtr itemPtr ){};
-	virtual void setSecondaryItem( CGameItemPtr itemPtr ){};
-	virtual void addConsumableItem( CGameItemPtr itemPtr ){};
-	virtual void setPrimaryTarget( const TDataSetRow& ) {};
-	virtual void addTargetEntity( const TDataSetRow& ) {};
+	virtual void setPrimaryItem( CGameItemPtr itemPtr ){}
+	virtual void setSecondaryItem( CGameItemPtr itemPtr ){}
+	virtual void addConsumableItem( CGameItemPtr itemPtr ){}
+	virtual void setPrimaryTarget( const TDataSetRow& ) {}
+	virtual void addTargetEntity( const TDataSetRow& ) {}
 	//@}
 
 	//@}
@@ -74,7 +74,7 @@ public:
 	/**
 	 * set the actor
 	 */
-	virtual void setActor( const TDataSetRow &entityRowId ){};
+	virtual void setActor( const TDataSetRow &entityRowId ){}
 	
 	/**
 	 * called at the end of the latency time
diff --git a/code/ryzom/server/src/sabrina/magic_phrase.h b/code/ryzom/server/src/sabrina/magic_phrase.h
index fbfe5dee2..45ee645cd 100644
--- a/code/ryzom/server/src/sabrina/magic_phrase.h
+++ b/code/ryzom/server/src/sabrina/magic_phrase.h
@@ -78,17 +78,17 @@ public:
 	virtual void execute();
 	virtual void apply();
 	virtual void stop();
-	virtual void setPrimaryTarget( const TDataSetRow &entityRowId ){ _Targets[0] = entityRowId; };
-	virtual void addTargetEntity( const TDataSetRow &entityRowId ){ _Targets.push_back(entityRowId);};
+	virtual void setPrimaryTarget( const TDataSetRow &entityRowId ){ _Targets[0] = entityRowId; }
+	virtual void addTargetEntity( const TDataSetRow &entityRowId ){ _Targets.push_back(entityRowId);}
 	//@}
 
 	/// \name Unused virtual methods from CSPhrase
 	//@{
 	virtual void setActor( const TDataSetRow & actorRowId ){  }
-	virtual void end(){};	
-	virtual void setPrimaryItem( CGameItemPtr itemPtr ){  };
-	virtual void setSecondaryItem( CGameItemPtr itemPtr ){  };
-	virtual void addConsumableItem( CGameItemPtr itemPtr ){  };
+	virtual void end(){}
+	virtual void setPrimaryItem( CGameItemPtr itemPtr ){  }
+	virtual void setSecondaryItem( CGameItemPtr itemPtr ){  }
+	virtual void addConsumableItem( CGameItemPtr itemPtr ){  }
 	//@}
 
 private:
diff --git a/code/ryzom/server/src/sabrina/s_effect.h b/code/ryzom/server/src/sabrina/s_effect.h
index ca34245ee..c706756eb 100644
--- a/code/ryzom/server/src/sabrina/s_effect.h
+++ b/code/ryzom/server/src/sabrina/s_effect.h
@@ -55,7 +55,7 @@ public:
 	virtual bool update( uint32 & updateFlag ) = 0;
 
 	/// callback called when the effect is actually removed. Does nothing by default
-	virtual void removed(){};
+	virtual void removed(){}
 
 	///\name accessors
 	//@{
diff --git a/code/ryzom/server/src/server_share/CMakeLists.txt b/code/ryzom/server/src/server_share/CMakeLists.txt
index 0a8cb6045..d043c55ca 100644
--- a/code/ryzom/server/src/server_share/CMakeLists.txt
+++ b/code/ryzom/server/src/server_share/CMakeLists.txt
@@ -1,6 +1,14 @@
 FILE(GLOB SRC *.cpp *.h)
 
-NL_TARGET_LIB(ryzom_servershare ${SRC})
+FILE(GLOB R2 
+	r2_*.h r2_*.cpp)
+
+LIST(REMOVE_ITEM SRC R2)
+
+SOURCE_GROUP("" FILES ${SRC})
+SOURCE_GROUP("R2" FILES ${R2})
+
+NL_TARGET_LIB(ryzom_servershare ${SRC} ${R2})
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${MYSQL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
 
diff --git a/code/ryzom/server/src/server_share/Makefile b/code/ryzom/server/src/server_share/Makefile
deleted file mode 100644
index cf00f3aae..000000000
--- a/code/ryzom/server/src/server_share/Makefile
+++ /dev/null
@@ -1,56 +0,0 @@
-#############################################################################
-# Simple make file for compiling GAME SHARE
-
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I/usr/include/mysql \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_PATH)/common/src \
-		-I./ \
-		-I./character_structure \
-		-I./egs_sheets \
-		-I./entity_structure \
-		-I./game_item_manager
-
-# The flags for the linker
-LDFLAGS      = 	$(LD_FLAGS_CMN) -L$(RYZOM_PATH)/install/$(DIR_DBG_$(DBG))/lib \
-		-llibmysqlclient \
-		-lnelnet \
-		-lnelgeorges \
-		-lnelpacs \
-		-L/usr/lib \
-		-L/usr/X11R6/lib \
-		-lnelmisc \
-		-lxml2 \
-		-lstlport \
-		-lpthread \
-		-lld
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= libserver_share.a
-DSP_TARGET	= server_share.vcproj
-
-# The default build rule
-all:			check-deps $(TARGETS)
-
-
-#libgame_share.so: $(OBJS)
-#	$(CXX) -o $@ $(OBJS) -shared $(LDFLAGS)
-
-libserver_share.a: $(OBJS)
-	ar r libserver_share.a $(OBJS)
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/server_share/backup_service_itf.h b/code/ryzom/server/src/server_share/backup_service_itf.h
index ed6aadc0d..5b1ffe352 100644
--- a/code/ryzom/server/src/server_share/backup_service_itf.h
+++ b/code/ryzom/server/src/server_share/backup_service_itf.h
@@ -63,9 +63,9 @@ namespace BS
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -185,9 +185,9 @@ namespace BS
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/server_share/char_name_mapper_itf.h b/code/ryzom/server/src/server_share/char_name_mapper_itf.h
index b7133fe9a..456bcc0c7 100644
--- a/code/ryzom/server/src/server_share/char_name_mapper_itf.h
+++ b/code/ryzom/server/src/server_share/char_name_mapper_itf.h
@@ -217,9 +217,9 @@ namespace CNM
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -330,9 +330,9 @@ namespace CNM
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/server_share/chat_unifier_itf.h b/code/ryzom/server/src/server_share/chat_unifier_itf.h
index 8b736a082..f284c8fbb 100644
--- a/code/ryzom/server/src/server_share/chat_unifier_itf.h
+++ b/code/ryzom/server/src/server_share/chat_unifier_itf.h
@@ -214,9 +214,9 @@ namespace CHATUNI
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
@@ -331,9 +331,9 @@ namespace CHATUNI
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/server_share/command_executor_itf.h b/code/ryzom/server/src/server_share/command_executor_itf.h
index dce7dce44..58a7f1c51 100644
--- a/code/ryzom/server/src/server_share/command_executor_itf.h
+++ b/code/ryzom/server/src/server_share/command_executor_itf.h
@@ -63,9 +63,9 @@ namespace CMDEXE
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/server_share/entity_locator_itf.h b/code/ryzom/server/src/server_share/entity_locator_itf.h
index c5d230ab5..317ad5199 100644
--- a/code/ryzom/server/src/server_share/entity_locator_itf.h
+++ b/code/ryzom/server/src/server_share/entity_locator_itf.h
@@ -98,7 +98,7 @@ namespace ENTITYLOC
 		{
 
 		}
-		
+
 		void serial(NLMISC::IStream &s)
 		{
 			s.serial(_CharEId);
@@ -137,12 +137,12 @@ namespace ENTITYLOC
 			_Interceptor.init(this, module);
 		}
 
-		// unused interceptors 
+		// unused interceptors
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
-	
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
+
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
 	private:
@@ -273,8 +273,10 @@ namespace ENTITYLOC
 		uint32	_CharId;
 		// Type of the event : true for a connection, false otherwise
 		bool	_Connection;
-		// The privilege of the character (e.g :GM:)
+		// The privilege of the character (e.g :GM:DEV:)
 		std::string	_Privilege;
+		// Last Connection Date
+		uint32	_lastConnectionDate;
 	public:
 		// The character id of the character
 		uint32 getCharId() const
@@ -300,7 +302,7 @@ namespace ENTITYLOC
 				_Connection = value;
 
 		}
-			// The privilege of the character (e.g :GM:)
+			// The privilege of the character (e.g :GM:DEV:)
 		std::string getPrivilege() const
 		{
 			return _Privilege;
@@ -311,13 +313,26 @@ namespace ENTITYLOC
 
 				_Privilege = value;
 
+		}
+			// Last Connection Date
+		uint32 getlastConnectionDate() const
+		{
+			return _lastConnectionDate;
+		}
+
+		void setlastConnectionDate(uint32 value)
+		{
+
+				_lastConnectionDate = value;
+
 		}
 	
 		bool operator == (const TCharConnectionEvent &other) const
 		{
 			return _CharId == other._CharId
 				&& _Connection == other._Connection
-				&& _Privilege == other._Privilege;
+				&& _Privilege == other._Privilege
+				&& _lastConnectionDate == other._lastConnectionDate;
 		}
 
 
@@ -326,12 +341,13 @@ namespace ENTITYLOC
 		{
 
 		}
-		
+
 		void serial(NLMISC::IStream &s)
 		{
 			s.serial(_CharId);
 			s.serial(_Connection);
 			s.serial(_Privilege);
+			s.serial(_lastConnectionDate);
 
 		}
 		
@@ -366,12 +382,12 @@ namespace ENTITYLOC
 			_Interceptor.init(this, module);
 		}
 
-		// unused interceptors 
+		// unused interceptors
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
-	
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
+
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
 	private:
@@ -454,7 +470,7 @@ namespace ENTITYLOC
 		static void broadcast_connectionEvents(ProxyIterator first, ProxyIterator last, NLNET::IModule *sender, const std::vector < TCharConnectionEvent > &events)
 		{
 			NLNET::CMessage message;
-			
+
 			// create the message to send to multiple dest
 			buildMessageFor_connectionEvents(message , events);
 
diff --git a/code/ryzom/server/src/server_share/entity_locator_itf.xml b/code/ryzom/server/src/server_share/entity_locator_itf.xml
index 829d4c51e..998c395a8 100644
--- a/code/ryzom/server/src/server_share/entity_locator_itf.xml
+++ b/code/ryzom/server/src/server_share/entity_locator_itf.xml
@@ -70,7 +70,8 @@
 
 			<property type="uint32"			name="CharId"		doc="The character id the the character"/>
 			<property type="bool"			name="Connection"	doc="Type of the event : true for a connection, false otherwise"/>
-			<property type="std::string"	name="Privilege"	doc="The privilege of the character (e.g :GM:)"/>
+			<property type="std::string"	name="Privilege"	doc="The privilege of the character (e.g :GM:DEV:)"/>
+			<property type="uint32"			name="lastConnectionDate"		doc="Last Connection Date"/>
 		</class>
 
 
diff --git a/code/ryzom/server/src/server_share/logger_service_itf.h b/code/ryzom/server/src/server_share/logger_service_itf.h
index 8996c1369..051cc85cb 100644
--- a/code/ryzom/server/src/server_share/logger_service_itf.h
+++ b/code/ryzom/server/src/server_share/logger_service_itf.h
@@ -983,9 +983,9 @@ namespace LGS
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/server_share/mail_forum_itf.h b/code/ryzom/server/src/server_share/mail_forum_itf.h
index aeaf0709b..b16cd7d24 100644
--- a/code/ryzom/server/src/server_share/mail_forum_itf.h
+++ b/code/ryzom/server/src/server_share/mail_forum_itf.h
@@ -63,9 +63,9 @@ namespace MFS
 
 		// unused interceptors 
 		std::string			fwdBuildModuleManifest() const	{ return std::string(); }
-		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {};
-		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {};
-		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {};
+		void				fwdOnModuleUp(NLNET::IModuleProxy *moduleProxy)  {}
+		void				fwdOnModuleDown(NLNET::IModuleProxy *moduleProxy) {}
+		void				fwdOnModuleSecurityChange(NLNET::IModuleProxy *moduleProxy) {}
 	
 		// process module message interceptor
 		bool fwdOnProcessModuleMessage(NLNET::IModuleProxy *sender, const NLNET::CMessage &message);
diff --git a/code/ryzom/server/src/server_share/mission_messages.h b/code/ryzom/server/src/server_share/mission_messages.h
index d779b709d..9c03f1f91 100644
--- a/code/ryzom/server/src/server_share/mission_messages.h
+++ b/code/ryzom/server/src/server_share/mission_messages.h
@@ -56,7 +56,7 @@ public:
 		property ("Length", PropUInt8, (uint8)0,Length);
 	}
 
-	virtual void callback (const std::string &name, uint8 id) {};
+	virtual void callback (const std::string &name, uint8 id) {}
 
 };
 */
@@ -115,7 +115,7 @@ public:
 		property ("RewardType", PropUInt8, (uint8)MISSION_DESC::NbReward, RewardType);
 	}
 	
-	virtual void callback (const std::string &name, uint8 id) {};
+	virtual void callback (const std::string &name, uint8 id) {}
 };
 */
 
diff --git a/code/ryzom/server/src/server_share/msg_ai_service.h b/code/ryzom/server/src/server_share/msg_ai_service.h
index 1f6a23053..132e56e1c 100644
--- a/code/ryzom/server/src/server_share/msg_ai_service.h
+++ b/code/ryzom/server/src/server_share/msg_ai_service.h
@@ -49,7 +49,7 @@ public:
 		propertyCont ("Character", PropDataSetRow, Character);
 		propertyCont ("Creature", PropDataSetRow, Creature);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -68,7 +68,7 @@ public:
 		propertyCont ("Content", PropString, Content);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -94,7 +94,7 @@ public:
 		propertyCont ("Params", PropString, Params);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -115,7 +115,7 @@ public:
 		propertyCont ("GrpAlias", PropUInt32, GrpAlias);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -138,7 +138,7 @@ public:
 		property ("TeamId", PropUInt16, CTEAM::InvalidTeamId, TeamId);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -160,7 +160,7 @@ public:
 //		propertyCont ("OutpostNames", PropString, OutpostNames);
 //	}
 //	
-//	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+//	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 //};
 
 //----------------------------------------------------------------------------
@@ -198,7 +198,7 @@ public:
 ////		propertyCont ("Fames", PropString, DutyNames);
 //	}
 //	
-//	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+//	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 //};
 
 //----------------------------------------------------------------------------
@@ -227,7 +227,7 @@ public:
 		propertyCont ("Parameters", PropString, Parameters);
 	}
 	
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -253,7 +253,7 @@ public:
 //		property ("GuildIndex", PropDataSetRow, TDataSetRow() ,GuildIndex);
 //	}
 //	
-//	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+//	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 //};
 
 
@@ -280,7 +280,7 @@ public:
 //		property ("GuildId", PropDataSetRow, TDataSetRow() ,GuildId);
 //	}
 //	
-//	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+//	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 //};
 
 //----------------------------------------------------------------------------
@@ -299,7 +299,7 @@ public:
 		property ("BotRowId", PropDataSetRow, TDataSetRow() , BotRowId);
 		property ("Heading", PropFloat,0.0f,Heading);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -317,7 +317,7 @@ public:
 		property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId);
 		property ("TargetRowId", PropDataSetRow, TDataSetRow(), TargetRowId);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -336,7 +336,7 @@ public:
 		property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId);
 		property ("CreatureRowId", PropDataSetRow, TDataSetRow(), CreatureRowId);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -365,7 +365,7 @@ public:
 		property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId);
 		property ("TargetRowId", PropDataSetRow, TDataSetRow(), TargetRowId);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -394,7 +394,7 @@ public:
 		property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId);
 		property ("TargetRowId", PropDataSetRow, TDataSetRow(), TargetRowId);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -410,7 +410,7 @@ public:
 		className ("CAIPlayerRespawnMsg");
 		property ("PlayerRowId", PropDataSetRow, TDataSetRow(), PlayerRowId);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -428,7 +428,7 @@ public:
 		property ("EntityRowId", PropDataSetRow, TDataSetRow(), EntityRowId);
 		property ("AskerRowID", PropDataSetRow, TDataSetRow(), AskerRowID);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -448,7 +448,7 @@ public:
 		property ("AskerRowID", PropDataSetRow, TDataSetRow(), AskerRowID);
 		propertyCont ("Infos", PropString, Infos);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -466,7 +466,7 @@ public:
 		property ("EntityRowId", PropDataSetRow, TDataSetRow(), EntityRowId);
 		property ("EnableAggro", PropBool, true, EnableAggro);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -482,7 +482,7 @@ public:
 		className ("CReportAICollisionAvailableMsg");
 		propertyCont ("ContinentsCollision", PropString, ContinentsCollision);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -500,7 +500,27 @@ public:
 		property ("InstanceNumber", PropUInt32, uint32(0), InstanceNumber);
 		property ("InstanceContinent", PropString, std::string(), InstanceContinent);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
+};
+
+//----------------------------------------------------------------------------
+// AIS -> EGS send bot url information
+//----------------------------------------------------------------------------
+class CCreatureSetUrlMsg : public CMirrorTransportClass
+{
+public:
+	std::vector<TDataSetRow>	Entities;
+	std::string		ActionName;
+	std::string		Url;
+	
+	virtual void description ()
+	{
+		className ("CCreatureSetUrlMsg");
+		propertyCont ("Entities", PropDataSetRow, Entities);
+		property ("ActionName", PropString, std::string(), ActionName);
+		property ("Url", PropString, std::string(), Url);
+	}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -516,7 +536,7 @@ public:
 		className ("CReportAIInstanceDespawnMsg");
 		propertyCont ("InstanceNumbers", PropUInt32, InstanceNumbers);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 
@@ -535,7 +555,7 @@ public:
 		className ("CWarnBadInstanceMsg");
 		property ("InstanceNumber", PropUInt32, uint32(0), InstanceNumber);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -555,7 +575,7 @@ public:
 		propertyCont ("ActionFlags", PropUInt8, ActionFlags);
 		propertyVector ("Values", PropBool, Values);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 
 	inline void push(TDataSetRow entity, uint8 flag, bool value)
 	{
@@ -579,7 +599,28 @@ public:
 		propertyCont ("Entities", PropDataSetRow, Entities);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
+};
+
+//----------------------------------------------------------------------------
+// AIS -> EGS ais change creature Max HP
+//----------------------------------------------------------------------------
+class CChangeCreatureMaxHPMsg : public CMirrorTransportClass
+{
+public:
+	std::vector<TDataSetRow>    Entities;
+	std::vector<uint32>         MaxHp;
+	std::vector<uint8>          SetFull;
+	
+	virtual void description ()
+	{
+		className ("CChangeCreatureMaxHPMsg");
+		propertyCont ("Entities", PropDataSetRow, Entities);
+		propertyCont ("MaxHp", PropUInt32, MaxHp);
+		propertyCont ("SetFull", PropUInt8, SetFull);
+	}
+	
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -598,7 +639,7 @@ public:
 		propertyCont ("DeltaHp", PropSInt32, DeltaHp);
 	}
 	
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -616,7 +657,7 @@ public:
 		property ("CreatureId", PropDataSetRow, TDataSetRow(), CreatureId);
 		property ("NewMode", PropUInt8, (uint8)0, NewMode);	}
 	
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -632,7 +673,7 @@ public:
 		className ("CCreatureDespawnMsg");
 		propertyCont ("Entities", PropDataSetRow, Entities);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -893,7 +934,7 @@ public:
 		property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias);
 		property ("DespawnTimeInTick", PropUInt32, uint32(0), DespawnTimeInTick);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -913,7 +954,7 @@ public:
 		property ("GroupAlias", PropUInt32, uint32(0xffffffff), GroupAlias);
 		property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -933,7 +974,7 @@ public:
 		property ("GroupAlias", PropUInt32, uint32(0xffffffff), GroupAlias);
 		property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -953,7 +994,7 @@ public:
 		property ("GroupAlias", PropUInt32, uint32(0xffffffff), GroupAlias);
 		property ("MissionAlias", PropUInt32, uint32(0xffffffff), MissionAlias);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 
@@ -1005,7 +1046,7 @@ public:
 		propertyCont ("Quantities", PropUInt32, Quantities);
 		property ("MissionText", PropString, std::string(), MissionText);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------------------
@@ -1041,7 +1082,7 @@ public:
 		propertyCont ("Quantities", PropUInt32, Quantities);
 		property ("MissionText", PropString, std::string(), MissionText);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 
@@ -1089,7 +1130,7 @@ public:
 		propertyCont ("Params", PropString, Params);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 	
 	TFunEnum getFunEnum(const std::string& funName) const;
 	
diff --git a/code/ryzom/server/src/server_share/msg_gpm_service.h b/code/ryzom/server/src/server_share/msg_gpm_service.h
index c4039be97..d985c8781 100644
--- a/code/ryzom/server/src/server_share/msg_gpm_service.h
+++ b/code/ryzom/server/src/server_share/msg_gpm_service.h
@@ -73,7 +73,7 @@ public:
 		property("Type", PropUInt32, (uint32)Player, Type);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &name, NLNET::TServiceId id) {}
 };
 
 
diff --git a/code/ryzom/server/src/server_share/npc_description_messages.h b/code/ryzom/server/src/server_share/npc_description_messages.h
index fcccd8b11..1c838ad80 100644
--- a/code/ryzom/server/src/server_share/npc_description_messages.h
+++ b/code/ryzom/server/src/server_share/npc_description_messages.h
@@ -48,7 +48,8 @@ class CNpcChatProfile
 {
 public:
 	CNpcChatProfile() : /*_guildCreator(false),*/ /*_dynamicMissionGiver(false),*/ _FilterExplicitActionTradeByPlayerRace(false), 
-		_ExplicitActionSPType(EGSPD::CSPType::Unknown), _FilterExplicitActionTradeByBotRace(true){}
+		_ExplicitActionSPType(EGSPD::CSPType::Unknown), _FilterExplicitActionTradeByBotRace(true),
+		_DynamicMissionGiver(false), _Organization(0) {}
 	CNpcChatProfile(const CNpcChatProfile &other0,const CNpcChatProfile &other1);
 	virtual ~CNpcChatProfile() {}
 
@@ -84,6 +85,7 @@ public:
 	const std::string					&getWebPageName() const		{ return _WebPageName; }
 
 	const NLMISC::CSheetId				&getOutpost() const			{ return _Outpost; }
+	uint32								getOrganization() const		{ return _Organization; }
 	
 protected:
 	std::vector< RYMSG::TExplicitSale >	_ExplicitSales;
@@ -125,6 +127,8 @@ protected:
 	std::vector<std::string>		_OptionalProperties;
 	
 	NLMISC::CSheetId				_Outpost;
+
+	uint32							_Organization;
 };
 
 //----------------------------------------------------------------
@@ -143,7 +147,7 @@ struct CCharacterBotChatBeginEnd : public CMirrorTransportClass
 		propertyCont ("botChatEnd",		PropUInt32, BotChatEnd);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) { }
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) { }
 };
 
 struct CCharacterDynChatBeginEnd : public CMirrorTransportClass
@@ -159,7 +163,7 @@ struct CCharacterDynChatBeginEnd : public CMirrorTransportClass
 		propertyCont ("dnChatEnd",		PropUInt32, DynChatEnd);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) { }
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) { }
 };
 
 struct CCustomElementId
diff --git a/code/ryzom/server/src/server_share/pet_interface_msg.h b/code/ryzom/server/src/server_share/pet_interface_msg.h
index c7bce60b7..6571b271a 100644
--- a/code/ryzom/server/src/server_share/pet_interface_msg.h
+++ b/code/ryzom/server/src/server_share/pet_interface_msg.h
@@ -42,6 +42,7 @@ public:
 	uint16				PetIdx;	// must be returned to EGS with CPetSpawnConfirmationMsg class
 	sint32				Coordinate_X, Coordinate_Y, Coordinate_H; //For NEAR_POINT mode
 	float				Heading; //For NEAR_POINT mode
+	ucstring			CustomName;
 
 	virtual void description ()
 	{
@@ -55,9 +56,10 @@ public:
 		property ("Coordinate_Y", PropSInt32, (sint32)0, Coordinate_Y);
 		property ("Coordinate_H", PropSInt32, (sint32)0, Coordinate_H);
 		property ("Heading", PropFloat, 0.0f, Heading);
+		property ("CustomName", PropUCString, ucstring(""), CustomName);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 		
@@ -91,7 +93,7 @@ public:
 		property ("PetMirrorRow",		PropDataSetRow,	TDataSetRow(), PetMirrorRow);
 		property ("PetIndex", PropUInt16, (uint16)0, PetIdx);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 
@@ -121,7 +123,7 @@ public:
 		property ("Heading", PropFloat, 0.0f, Heading);
 	}
 
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------
@@ -149,7 +151,7 @@ public:
 		className ("CPetCommandConfirmationMsg");
 		property ("CommandError", PropUInt16, (uint16)NO_ERROR_COMMAND, CommandError);
 	}
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 //----------------------------------------------------------------
@@ -169,7 +171,7 @@ public:
 		property ("PetMirrorRow", PropDataSetRow, TDataSetRow(), PetMirrorRow);
 	}
 	
-	virtual void callback (const std::string &name, NLNET::TServiceId id) {};
+	virtual void callback (const std::string &/* name */, NLNET::TServiceId /* id */) {}
 };
 
 #endif //RY_PET_INTERFACE_MESSAGES_H
diff --git a/code/ryzom/server/src/server_share/pvp_relation.h b/code/ryzom/server/src/server_share/pvp_relation.h
index b5219555b..6a3a09b21 100644
--- a/code/ryzom/server/src/server_share/pvp_relation.h
+++ b/code/ryzom/server/src/server_share/pvp_relation.h
@@ -23,10 +23,10 @@ namespace PVP_RELATION
 {
 	enum TPVPRelation
 	{
-		Neutral,
-		NeutralPVP,
-		Ally,
-		Ennemy,
+		Neutral, // Only Heal, no propagation
+		NeutralPVP, // No Heal, No attack
+		Ally, // Only heal, propagation
+		Ennemy, // Only attack, propagation
 		Unknown
 	};
 
diff --git a/code/ryzom/server/src/server_share/server_share.vcproj b/code/ryzom/server/src/server_share/server_share.vcproj
deleted file mode 100644
index 0a47ea263..000000000
--- a/code/ryzom/server/src/server_share/server_share.vcproj
+++ /dev/null
@@ -1,806 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="server_share"
-	ProjectGUID="{792FF016-D048-44E3-BDA8-59C00D1480F7}"
-	RootNamespace="server_share"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-				OutputFile="..\..\lib64\$(ProjectName)_d.lib"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="4"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src"
-				PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\action_flags.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\action_flags.h"
-			>
-		</File>
-		<File
-			RelativePath=".\animal_hunger.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\animal_hunger.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\backup_service_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\basic_effect.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\basic_effect.h"
-			>
-		</File>
-		<File
-			RelativePath=".\bmp4image.h"
-			>
-		</File>
-		<File
-			RelativePath=".\char_name_mapper_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\char_name_mapper_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\char_name_mapper_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_unifier_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_unifier_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_unifier_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\combat_state.h"
-			>
-		</File>
-		<File
-			RelativePath=".\combat_vision_delta.h"
-			>
-		</File>
-		<File
-			RelativePath=".\command_executor.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\command_executor_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\command_executor_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\command_executor_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\continent_container.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\continent_container.h"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_size.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\creature_size.h"
-			>
-		</File>
-		<File
-			RelativePath=".\effect_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\effect_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\effect_message.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\effect_message.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_locator_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_locator_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_locator_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_state.h"
-			>
-		</File>
-		<File
-			RelativePath=".\event_report.h"
-			>
-		</File>
-		<File
-			RelativePath=".\fixed_size_int_vector.h"
-			>
-		</File>
-		<File
-			RelativePath=".\handy_commands.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\handy_commands.h"
-			>
-		</File>
-		<File
-			RelativePath=".\item_service_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\item_service_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\light_ig_loader.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\light_ig_loader.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_character_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_character_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_chat_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_chat_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_command_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_command_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_gather_all_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_item_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_item_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_outpost_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_outpost_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_player_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_player_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\log_ring_gen.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\log_ring_gen.h"
-			>
-		</File>
-		<File
-			RelativePath=".\logger_service_client.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\logger_service_client.h"
-			>
-		</File>
-		<File
-			RelativePath=".\logger_service_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\logger_service_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\logger_service_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\login_service_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\login_service_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\login_service_itf.php"
-			>
-		</File>
-		<File
-			RelativePath=".\login_service_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\mail_forum_itf.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mail_forum_itf.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mail_forum_itf.xml"
-			>
-		</File>
-		<File
-			RelativePath=".\mail_forum_validator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mail_forum_validator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_equipment.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mirror_equipment.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mission_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_ai_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_ai_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_brick_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_gpm_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\msg_object_player_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mysql_wrapper.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\mysql_wrapper.h"
-			>
-		</File>
-		<File
-			RelativePath=".\npc_description_messages.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\npc_description_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pet_interface_msg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\place_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\place_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\primitive_cfg.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\primitive_cfg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_relation.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\pvp_relation.h"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_session_backup_module.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_session_backup_module.h"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_variables.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_variables.h"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_vision.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\r2_vision.h"
-			>
-		</File>
-		<File
-			RelativePath=".\respawn_point_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\respawn_point_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db_common.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db_msg.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db_tree.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db_tree.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db_tree_pd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db_tree_pd.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stat_db_tree_visitor.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stats_status.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stl_allocator_checker.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\stl_allocator_checker.h"
-			>
-		</File>
-		<File
-			RelativePath=".\taming_tool_type.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\taming_tool_type.h"
-			>
-		</File>
-		<File
-			RelativePath=".\target.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\target.h"
-			>
-		</File>
-		<File
-			RelativePath=".\testing_tool_structures.h"
-			>
-		</File>
-		<File
-			RelativePath=".\used_continent.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\used_continent.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/server_share/stat_db_tree.h b/code/ryzom/server/src/server_share/stat_db_tree.h
index 8faaa85ee..7472a2092 100644
--- a/code/ryzom/server/src/server_share/stat_db_tree.h
+++ b/code/ryzom/server/src/server_share/stat_db_tree.h
@@ -95,13 +95,13 @@ class CStatDBLeaf : public IStatDBNode
 public:
 	virtual ~CStatDBLeaf() {}
 
-	bool setNode(const std::string & path, IStatDBNodePtr node) { return false; }
-	IStatDBNodePtr getNode(const std::string & path) { return NULL; }
-	void getNodes(const std::string & pathPattern, std::vector<CMatchingNode> & matchingNodes,
-		const std::string & currentPath) {}
-	IStatDBNodePtr removeNode(const std::string & path) { return NULL; }
+	bool setNode(const std::string & /* path */, IStatDBNodePtr  /* node */) { return false; }
+	IStatDBNodePtr getNode(const std::string & /* path */) { return NULL; }
+	void getNodes(const std::string & /* pathPattern */, std::vector<CMatchingNode> & /* matchingNodes */,
+		const std::string & /* currentPath */) {}
+	IStatDBNodePtr removeNode(const std::string & /* path */) { return NULL; }
 	
-	virtual void acceptVisitor(CStatDBNodeVisitor & visitor, const std::string & currentPath) {}
+	virtual void acceptVisitor(CStatDBNodeVisitor & /* visitor */, const std::string & /* currentPath */) {}
 };
 
 /**
diff --git a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h
index 1d57a6491..98e7455d3 100644
--- a/code/ryzom/server/src/server_share/stat_db_tree_visitor.h
+++ b/code/ryzom/server/src/server_share/stat_db_tree_visitor.h
@@ -34,9 +34,9 @@ class CStatDBTableLeaf;
 class CStatDBNodeVisitor
 {
 public:
-	virtual void visitBranch(CStatDBBranch * branch, const std::string & path) {}
-	virtual void visitValueLeaf(CStatDBValueLeaf * valueLeaf, const std::string & path) {}
-	virtual void visitTableLeaf(CStatDBTableLeaf * tableLeaf, const std::string & path) {}
+	virtual void visitBranch(CStatDBBranch * /* branch */, const std::string & /* path */) {}
+	virtual void visitValueLeaf(CStatDBValueLeaf * /* valueLeaf */, const std::string & /* path */) {}
+	virtual void visitTableLeaf(CStatDBTableLeaf * /* tableLeaf */, const std::string & /* path */) {}
 
 protected:
 	CStatDBNodeVisitor() {}
diff --git a/code/ryzom/server/src/session_browser_server/Makefile b/code/ryzom/server/src/session_browser_server/Makefile
deleted file mode 100644
index d7612c98f..000000000
--- a/code/ryzom/server/src/session_browser_server/Makefile
+++ /dev/null
@@ -1,61 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I/usr/include/mysql \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I.. \
-		-I.
-
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-		-L../server_share \
-		-lmysqlclient \
-		-lserver_share \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= session_browser_server
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) \
-		../admin_modules/libadmin_modules.a \
-		../server_share/libserver_share.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/session_browser_server/session_browser_server.vcproj b/code/ryzom/server/src/session_browser_server/session_browser_server.vcproj
deleted file mode 100644
index 6f9476a0a..000000000
--- a/code/ryzom/server/src/session_browser_server/session_browser_server.vcproj
+++ /dev/null
@@ -1,356 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="session_browser_server"
-	ProjectGUID="{F0429C92-09ED-4B3B-BD75-53921CC324A1}"
-	RootNamespace="session_browser_server"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\session_browser_server.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\session_browser_server.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/shard_unifier_service/Makefile b/code/ryzom/server/src/shard_unifier_service/Makefile
deleted file mode 100644
index e3d3fb9a3..000000000
--- a/code/ryzom/server/src/shard_unifier_service/Makefile
+++ /dev/null
@@ -1,59 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I/usr/include/mysql \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I.. \
-		-I.
-
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-        -L../server_share \
-		-lmysqlclient \
-        -lserver_share \
-		-lgame_share \
-		-ladmin_modules \
-		-lnelgeorges \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= shard_unifier_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) \
-		../admin_modules/libadmin_modules.a \
-        ../server_share/libserver_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
diff --git a/code/ryzom/server/src/shard_unifier_service/database_mapping.h b/code/ryzom/server/src/shard_unifier_service/database_mapping.h
index d6f9b8689..61df29e9a 100644
--- a/code/ryzom/server/src/shard_unifier_service/database_mapping.h
+++ b/code/ryzom/server/src/shard_unifier_service/database_mapping.h
@@ -111,9 +111,9 @@ namespace RSMGR
 		CKnownUserPtr()
 			: _FileName(NULL),
 			_LineNum(0),
-			_Ptr(NULL),
 			_NextPtr(NULL),
-			_PrevPtr(NULL)
+			_PrevPtr(NULL),
+			_Ptr(NULL)
 		{
 		}
 
@@ -1091,9 +1091,9 @@ namespace RSMGR
 		CGuildInvitePtr()
 			: _FileName(NULL),
 			_LineNum(0),
-			_Ptr(NULL),
 			_NextPtr(NULL),
-			_PrevPtr(NULL)
+			_PrevPtr(NULL),
+			_Ptr(NULL)
 		{
 		}
 
@@ -1231,9 +1231,9 @@ namespace RSMGR
 		CPlayerRatingPtr()
 			: _FileName(NULL),
 			_LineNum(0),
-			_Ptr(NULL),
 			_NextPtr(NULL),
-			_PrevPtr(NULL)
+			_PrevPtr(NULL),
+			_Ptr(NULL)
 		{
 		}
 
@@ -1371,9 +1371,9 @@ namespace RSMGR
 		CJournalEntryPtr()
 			: _FileName(NULL),
 			_LineNum(0),
-			_Ptr(NULL),
 			_NextPtr(NULL),
-			_PrevPtr(NULL)
+			_PrevPtr(NULL),
+			_Ptr(NULL)
 		{
 		}
 
diff --git a/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp b/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp
index 06c9ff36e..9b56812a6 100644
--- a/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp
+++ b/code/ryzom/server/src/shard_unifier_service/entity_locator.cpp
@@ -582,6 +582,8 @@ namespace ENTITYLOC
 
 		void _charConnected(NLNET::IModuleProxy *sender, uint32 charId, uint32 lastDisconnectionDate, uint32 shardId)
 		{
+			uint32 lastConnectionDate = CTime::getSecondsSince1970();
+
 			TCharMap::iterator it(_ConnectedChars.find(charId));
 			if (it != _ConnectedChars.end())
 			{
@@ -605,7 +607,7 @@ namespace ENTITYLOC
 					ci.CharName = toLower(fullName);
 
 					// update the last played date
-					character->setLastPlayedDate(CTime::getSecondsSince1970());
+					character->setLastPlayedDate(lastConnectionDate);
 					character->update(_RingDB);
 				}
 
@@ -634,6 +636,7 @@ namespace ENTITYLOC
 			cce.setCharId(charId);
 			cce.setConnection(true);
 			cce.setPrivilege(privilege);
+			cce.setlastConnectionDate(lastConnectionDate);
 			connections.push_back(cce);
 
 			CEntityLocatorClientProxy::broadcast_connectionEvents(_ClientTracker.getTrackedModules().begin(), _ClientTracker.getTrackedModules().end(),
@@ -658,7 +661,7 @@ namespace ENTITYLOC
 			if (character !=NULL)
 			{
 				// update the last played date
-				character->setLastPlayedDate(CTime::getSecondsSince1970());
+				character->setLastPlayedDate(0);
 				character->update(_RingDB);
 			}
 
diff --git a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.vcproj b/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.vcproj
deleted file mode 100644
index fa67ae0f8..000000000
--- a/code/ryzom/server/src/shard_unifier_service/shard_unifier_service.vcproj
+++ /dev/null
@@ -1,468 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="shard_unifier_service"
-	ProjectGUID="{1639711D-A1A5-4D09-B042-7475C3290207}"
-	RootNamespace="shard_unifier_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="mysqlclient.lib"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				UsePrecompiledHeader="2"
-				PrecompiledHeaderThrough="stdpch.h"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib mysqlclient.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\character_sync.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\character_sync.h"
-			>
-		</File>
-		<File
-			RelativePath=".\chat_unifier.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\database_mapping.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\database_mapping.h"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_locator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\entity_locator.h"
-			>
-		</File>
-		<File
-			RelativePath=".\login_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\login_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\mail_forum_notfier_fwd.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\name_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\name_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\nel_database_mapping.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\nel_database_mapping.h"
-			>
-		</File>
-		<File
-			RelativePath=".\ring_session_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ring_session_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\shard_unifier_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\shard_unifier_service.h"
-			>
-		</File>
-		<File
-			RelativePath=".\stdpch.cpp"
-			>
-			<FileConfiguration
-				Name="Debug|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Debug|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|Win32"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-			<FileConfiguration
-				Name="Release|x64"
-				>
-				<Tool
-					Name="VCCLCompilerTool"
-					UsePrecompiledHeader="1"
-				/>
-			</FileConfiguration>
-		</File>
-		<File
-			RelativePath=".\stdpch.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/tick_service/Makefile b/code/ryzom/server/src/tick_service/Makefile
deleted file mode 100644
index 5afedf0bd..000000000
--- a/code/ryzom/server/src/tick_service/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = $(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../admin_modules \
-		-lgame_share \
-		-lnelgeorges \
-		-ladmin_modules \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= tick_service
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) ../admin_modules/libadmin_modules.a \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../../Rules.mk
-
diff --git a/code/ryzom/server/src/tick_service/tick_service.vcproj b/code/ryzom/server/src/tick_service/tick_service.vcproj
deleted file mode 100644
index 2fc70db5b..000000000
--- a/code/ryzom/server/src/tick_service/tick_service.vcproj
+++ /dev/null
@@ -1,363 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="tick_service"
-	ProjectGUID="{11073F98-7CC6-456C-B565-111B0EFAC68F}"
-	RootNamespace="tick_service"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="4"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				SmallerTypeCheck="true"
-				RuntimeLibrary="3"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames="msvcrt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(SolutionDir)obj64\$(ConfigurationName)\$(ProjectName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="3"
-				InlineFunctionExpansion="2"
-				EnableIntrinsicFunctions="true"
-				FavorSizeOrSpeed="1"
-				OmitFramePointers="true"
-				EnableFiberSafeOptimizations="true"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="../../../common/src;.;.."
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				BufferSecurityCheck="false"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="libxml2.lib zlib.lib"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames="libcmt.lib"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\range_mirror_manager.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\range_mirror_manager.h"
-			>
-		</File>
-		<File
-			RelativePath=".\tick_service.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\tick_service.h"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/code/ryzom/server/src/update_cxxpath_flags.sh b/code/ryzom/server/src/update_cxxpath_flags.sh
deleted file mode 100755
index 2cdba81a5..000000000
--- a/code/ryzom/server/src/update_cxxpath_flags.sh
+++ /dev/null
@@ -1 +0,0 @@
-echo CXXPATHS=$(pwd |cut -d/ -f1-5) > Variables2.mk 
diff --git a/code/ryzom/server/src/update_packed_sheets.sh b/code/ryzom/server/src/update_packed_sheets.sh
deleted file mode 100755
index 0c98eef45..000000000
--- a/code/ryzom/server/src/update_packed_sheets.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# make sure the args are valid
-if [ $# -lt 2 ]
-then
-	echo SYNTAX: $0 \<exe_name\> \[\<packed_sheet_file_name\>...\[\<packed_sheet_file_name\>...\]\]
-	exit
-fi
-
-# extract the executable name (as the first arg)
-EXE_NAME=$1
-shift
-
-# run through the remaining args checking that files of the given names exist
-REQUIRE_REBUILD=0
-while [ $# -gt 0 ]
-do
-  if [ ! -e $1 ]
-	  then
-	  REQUIRE_REBUILD=1
-  fi
-  shift
-done
-
-# if one of the files was missing then call the executable to rebuild the packed sheets
-if [ $REQUIRE_REBUILD == 1 ]
-then
-	PACK_SHEETS_FLAGS=`grep PACK_SHEETS_FLAGS ../../../Variables.mk|cut -f2 -d=`
-	PACK_SHEETS_FLAGS=`eval echo $PACK_SHEETS_FLAGS`
-	echo "$EXE_NAME $PACK_SHEETS_FLAGS"
-	$EXE_NAME $PACK_SHEETS_FLAGS
-fi
diff --git a/code/ryzom/tools/client/client_config/base_dialog.h b/code/ryzom/tools/client/client_config/base_dialog.h
index c81c8a207..4082968b4 100644
--- a/code/ryzom/tools/client/client_config/base_dialog.h
+++ b/code/ryzom/tools/client/client_config/base_dialog.h
@@ -34,7 +34,7 @@ class CBaseDialog : public CDialog
 public:
 
 	/// Constructor
-	CBaseDialog (uint id, CWnd* pParent = NULL) : CDialog(id, pParent) {};
+	CBaseDialog (uint id, CWnd* pParent = NULL) : CDialog(id, pParent) {}
 
 	/// On ok
 	virtual void OnOK ();
diff --git a/code/ryzom/tools/leveldesign/georges_convert/string_ex.h b/code/ryzom/tools/leveldesign/georges_convert/string_ex.h
index 69489c4ac..a395e8f42 100644
--- a/code/ryzom/tools/leveldesign/georges_convert/string_ex.h
+++ b/code/ryzom/tools/leveldesign/georges_convert/string_ex.h
@@ -26,9 +26,9 @@ class CStringEx : public std::basic_string<char, std::char_traits<char>, std::al
 {
 
 public:
-	CStringEx()						: std::basic_string<char, std::char_traits<char>, std::allocator<char> >() {;} 
-	CStringEx( char* _pc ) 			: std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (char *)_pc ) {};
-	CStringEx( std::string _s ) 	: std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (std::string)_s) {}; 
+	CStringEx()						: std::basic_string<char, std::char_traits<char>, std::allocator<char> >() {} 
+	CStringEx( char* _pc ) 			: std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (char *)_pc ) {}
+	CStringEx( std::string _s ) 	: std::basic_string<char, std::char_traits<char>, std::allocator<char> >( (std::string)_s) {}
 	CStringEx( const char _c, int _i ) 	{ append( _i, _c ); }
 	
 	virtual ~CStringEx();
diff --git a/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h b/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h
index 8b61618a1..08b477e38 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/edit_list_ctrl.h
@@ -84,12 +84,12 @@ public:
 	uint		Item, SubItem, ColumnCount;
 	uint		DlgIndex;
 
-	virtual		TItemEdit getItemEditMode (uint item, uint subItem) {return EditFixedCombo;};
+	virtual		TItemEdit getItemEditMode (uint item, uint subItem) {return EditFixedCombo;}
 	virtual		void getComboBoxStrings (uint item, uint subItem, std::vector<std::string> &retStrings);
-	virtual		void getMemComboBoxProp (uint item, uint subItem, std::string &regAdr, bool &browse) { regAdr = ""; browse = false; };
-	virtual		void getNewItemText (uint item, uint subItem, std::string &ret) { ret = "new"; };
-	virtual		void getBrowseInfo (uint item, uint subItem, std::string &defExt, std::string &defFilename, std::string &defDir, std::string &filter) { defExt=""; defFilename=""; filter=""; defDir="";};
-	virtual		void onItemChanged (uint item, uint subItem) {};
+	virtual		void getMemComboBoxProp (uint item, uint subItem, std::string &regAdr, bool &browse) { regAdr = ""; browse = false; }
+	virtual		void getNewItemText (uint item, uint subItem, std::string &ret) { ret = "new"; }
+	virtual		void getBrowseInfo (uint item, uint subItem, std::string &defExt, std::string &defFilename, std::string &defDir, std::string &filter) { defExt=""; defFilename=""; filter=""; defDir="";}
+	virtual		void onItemChanged (uint item, uint subItem) {}
 
 	void	memComboBoxAsChange (bool selChange);
 	void	closeMemComboBox (bool update);
diff --git a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h b/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h
index 0fe05ab8c..29e10aa00 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/form_dialog.h
@@ -66,7 +66,7 @@ public:
 	IFormWidget (CFormDialog *dialog, uint structId, const char *formName, TTypeSrc typeSrc, uint slot);
 
 	// Destructor
-	virtual ~IFormWidget () {};
+	virtual ~IFormWidget () {}
 
 	// Update the text of the base label
 	void updateLabel ();
@@ -90,8 +90,8 @@ public:
 	virtual bool extendableHeight () const;
 
 	// Ok / cancel hit
-	virtual void onOk () {};
-	virtual void onCancel () {};
+	virtual void onOk () {}
+	virtual void onCancel () {}
 
 	// Update widget date
 	virtual void updateData (bool update = true) = 0;
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h
index 649a2927d..b6f9ef7f6 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/georges_edit_doc.h
@@ -311,7 +311,7 @@ public:
 class CGeorgesEditDocType : public CGeorgesEditDoc
 {
 protected: // create from serialization only
-	CGeorgesEditDocType() {};
+	CGeorgesEditDocType() {}
 	DECLARE_DYNCREATE(CGeorgesEditDocType)
 
 	// Document is a type ?
@@ -341,7 +341,7 @@ protected:
 class CGeorgesEditDocDfn : public CGeorgesEditDoc
 {
 protected: // create from serialization only
-	CGeorgesEditDocDfn() {};
+	CGeorgesEditDocDfn() {}
 	DECLARE_DYNCREATE(CGeorgesEditDocDfn)
 
 	// Document is a dfn ?
@@ -371,7 +371,7 @@ protected:
 class CGeorgesEditDocForm : public CGeorgesEditDoc
 {
 protected: // create from serialization only
-	CGeorgesEditDocForm() {};
+	CGeorgesEditDocForm() {}
 	DECLARE_DYNCREATE(CGeorgesEditDocForm)
 
 	// Docuemnt is a form ?
diff --git a/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h b/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h
index 28ab22042..fbac91024 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/georges_interface.h
@@ -61,7 +61,7 @@ enum TUI
 class IGeorges
 {
 public:
-	virtual ~IGeorges() {};
+	virtual ~IGeorges() {}
 
 	// Init the UI
 	virtual void initUI (int m_nCmdShow, bool exeStandalone, HWND parent=NULL)=0;
diff --git a/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h b/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h
index a796e7fe6..47d447c59 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/output_console_dlg.h
@@ -36,8 +36,8 @@ public:
 	void outputString (const char *message);
 
 	// From CDialog
-	void	OnOK () {};
-	void	OnCancel ();
+	void	OnOK () {}
+	void	OnCancel ()
 
 // Dialog Data
 	//{{AFX_DATA(COutputConsoleDlg)
diff --git a/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h b/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h
index 4908d9474..36ad36062 100644
--- a/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h
+++ b/code/ryzom/tools/leveldesign/georges_dll/plugin_interface.h
@@ -65,7 +65,7 @@ public:
 	/**
 	  * Destructor must uninitialise the plugin interface
 	  */
-	virtual ~IEditPlugin () {};
+	virtual ~IEditPlugin () {}
 
 	/// Window related
 
@@ -157,7 +157,7 @@ public:
 	/**
 	  * Destructor must uninitialise the plugin interface
 	  */
-	virtual ~IEditDocumentPlugin () {};
+	virtual ~IEditDocumentPlugin () {}
 
 	/// Event message
 
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h
index 4cee69902..6af4bc18c 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBase.h
@@ -62,7 +62,7 @@ public:
 	/// The master dialog call this method when the document is changed/updated
 	static void docChanged();
 	/// The docChanged static method call this method on each page.
-	virtual void onDocChanged() {};
+	virtual void onDocChanged() {}
 };
 
 
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h
index 306f39293..43a339225 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFades.h
@@ -33,7 +33,7 @@ class CPageBgFades : public CPageBase
 
 // Construction
 public:
-	CPageBgFades() {};
+	CPageBgFades() {}
 	CPageBgFades(NLGEORGES::CSoundDialog *soundDialog);
 	~CPageBgFades();
 
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h
index 6fab075c3..6e5c2488c 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageBgFlags.h
@@ -46,7 +46,7 @@ class CPageBgFlags : public CPageBase
 
 // Construction
 public:
-	CPageBgFlags() {};
+	CPageBgFlags() {}
 	CPageBgFlags(NLGEORGES::CSoundDialog *soundDialog);
 	~CPageBgFlags();
 
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h
index 7f9ed68ad..26ee864de 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComplex.h
@@ -35,7 +35,7 @@ class CPageComplex : public CPageBase
 
 // Construction
 public:
-	CPageComplex(){};
+	CPageComplex(){}
 	CPageComplex(NLGEORGES::CSoundDialog *soundDialog);
 	~CPageComplex();
 
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h
index c34d6ef64..3c99f9089 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageComtext.h
@@ -34,7 +34,7 @@ class CPageComtext : public CPageBase
 
 // Construction
 public:
-	CPageComtext(){};
+	CPageComtext(){}
 	CPageComtext(NLGEORGES::CSoundDialog *soundDialog);
 	~CPageComtext();
 
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h
index 88f21c614..1510c2ea8 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PagePosition.h
@@ -41,7 +41,7 @@ class CPagePosition : public CPageBase
 
 // Construction
 public:
-	CPagePosition(){};
+	CPagePosition(){}
 	CPagePosition(NLGEORGES::CSoundDialog *soundDialog);
 	~CPagePosition();
 
diff --git a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h
index 8da0328dc..935f33acb 100644
--- a/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h
+++ b/code/ryzom/tools/leveldesign/georges_plugin_sound/PageSimple.h
@@ -36,7 +36,7 @@ class CPageSimple : public CPageBase
 
 // Construction
 public:
-	CPageSimple() {};
+	CPageSimple() {}
 	CPageSimple(NLGEORGES::CSoundDialog *soundDialog);
 	~CPageSimple();
 
diff --git a/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h b/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h
index fdb1db4be..3a38f8689 100644
--- a/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h
+++ b/code/ryzom/tools/leveldesign/mission_compiler_lib/step.h
@@ -89,7 +89,7 @@ public:
 	IStep(CMissionData &md, NLLIGO::IPrimitive *prim);
 	virtual ~IStep() {}
 
-	virtual void init(CMissionData &md, NLLIGO::IPrimitive *prim) {};
+	virtual void init(CMissionData &md, NLLIGO::IPrimitive *prim) {}
 
 	
 	/// Get the step name
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h
index 511f2a16e..9145f4af4 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/action.h
@@ -32,7 +32,7 @@ class IAction
 public:
 
 	// Virtual destructor
-	virtual ~IAction () {};
+	virtual ~IAction () {}
 
 	// Do / undo
 	virtual void undo () = 0;
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h
index d2c38ca58..2bbe143c1 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor/plugin_interface.h
@@ -163,7 +163,7 @@ public:
 	/// Init the plugin. The plugin receive the world editor interface.
 	virtual void		init(IPluginAccess *pluginAccess) =0;
 	/// Delete the plugin.
-	virtual ~IPluginCallback() {};
+	virtual ~IPluginCallback() {}
 
 	/// The current region has changed.
 //	virtual void		primRegionChanged(const std::vector<NLLIGO::CPrimRegion*> &regions) = 0;
diff --git a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
index 1ea94a512..7fcb78fc1 100644
--- a/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
+++ b/code/ryzom/tools/leveldesign/world_editor/world_editor_primitive_plugin/primitive_plugin.h
@@ -51,9 +51,9 @@ public:
 
 	CPrimitivePlugin();
 
-	virtual void		positionMoved(const NLMISC::CVector &position) {};
-	virtual void		lostPositionControl() {};
-	virtual void		onIdle() {};
+	virtual void		positionMoved(const NLMISC::CVector &position) {}
+	virtual void		lostPositionControl() {}
+	virtual void		onIdle() {}
 
 	virtual void drawPrimitive(const NLLIGO::IPrimitive *primitive, const TRenderContext &renderContext);
 
@@ -72,9 +72,9 @@ private:
 
 		void	serial (NLMISC::IStream &s);
 
-		static uint getVersion ();
+		static uint getVersion ()
 
-		void removed() {};
+		void removed() {}
 	};
 
 	std::map<NLMISC::CSheetId, TCreatureInfo>	_CreatureInfos;
diff --git a/code/ryzom/tools/pdr_util/Makefile b/code/ryzom/tools/pdr_util/Makefile
deleted file mode 100644
index 6835f1248..000000000
--- a/code/ryzom/tools/pdr_util/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-#############################################################################
-# Setting up the compiler settings...
-
-# Global variables
-include ../../Variables.mk
-
-# The flags for the C++ compiler
-CXXFLAGS     = $(FLAGS_CMN) $(FLAGS_DBG_$(DBG)) \
-		-I/usr/include/libxml2 \
-		-I$(NEL_INCLUDE) \
-		-I$(RYZOM_COMMON_SRC) \
-		-I..
-
-LDFLAGS      = 	$(LD_FLAGS_CMN) \
-		-L$(NEL_PATH)/lib \
-		-L$(RYZOM_COMMON_SRC)/game_share \
-		-L../../server/src/server_share \
-		-lgame_share \
-        -lserver_share \
-		-lnelnet \
-		-lnelmisc \
-		-lxml2 \
-		-lrt\
-		-ldl
-
-#############################################################################
-# The bit that changes each time we cut paste and hack this file :o)
-
-# The list of targets to build
-TARGETS		= pdr_util
-DSP_TARGET	= $(TARGETS).vcproj
-
-# The default build rule
-all: exe packed_sheets
-
-exe: check-deps $(TARGETS)
-
-$(TARGETS): $(OBJS) \
-		$(RYZOM_COMMON_SRC)/game_share/libgame_share.a \
-		../../server/src/server_share/libserver_share.a
-	$(CXX) -o $@ $(OBJS) $(LDFLAGS)
-	cp -a $(TARGETS) $(TARGETS)_debug
-	strip $(TARGETS)
-
-packed_sheets:
-# this service has no packed_sheets to pack
-# ./$(TARGETS) $(PACK_SHEETS_FLAGS)
-
-
-#############################################################################
-# Rules
-
-include ../../Rules.mk
-
diff --git a/code/ryzom/tools/server/admin/crons/cron_harddisk.php b/code/ryzom/tools/server/admin/crons/cron_harddisk.php
index 59bc30452..7a6f93d31 100644
--- a/code/ryzom/tools/server/admin/crons/cron_harddisk.php
+++ b/code/ryzom/tools/server/admin/crons/cron_harddisk.php
@@ -6,7 +6,7 @@
     define('NELTOOL_NO_USER_NEEDED',    true);
     define('NELTOOL_CRON_DEBUG',        false);
 
-	if ($HTTP_GET_VARS['dbg']) define('NELTOOL_CRON_DEBUG', true);
+	if ($_GET['dbg']) define('NELTOOL_CRON_DEBUG', true);
 
 	if (defined('NELTOOL_CRON_DEBUG')) echo "Checking HDs ... \n";
 
diff --git a/code/ryzom/tools/server/admin/index.php b/code/ryzom/tools/server/admin/index.php
index ae1a57211..9fdada32f 100644
--- a/code/ryzom/tools/server/admin/index.php
+++ b/code/ryzom/tools/server/admin/index.php
@@ -21,11 +21,11 @@
 		nt_auth_set_session_var('view_shard_id', $view_shard_id);
 	}
 
-	if (isset($HTTP_GET_VARS['domain']))
+	if (isset($_GET['domain']))
 	{
-		if ($view_domain_id != $HTTP_GET_VARS['domain'])
+		if ($view_domain_id != $_GET['domain'])
 		{
-			$view_domain_id = $HTTP_GET_VARS['domain'];
+			$view_domain_id = $_GET['domain'];
 			nt_auth_set_session_var('view_domain_id', $view_domain_id);
 
 			$view_shard_id = null;
@@ -33,9 +33,9 @@
 		}
 	}
 
-	if (isset($HTTP_GET_VARS['shard']))
+	if (isset($_GET['shard']))
 	{
-		$view_shard_id = $HTTP_GET_VARS['shard'];
+		$view_shard_id = $_GET['shard'];
 		nt_auth_set_session_var('view_shard_id', $view_shard_id);
 	}
 
@@ -44,11 +44,11 @@
 
 	$current_refresh_rate = nt_auth_get_session_var('current_refresh_rate');
 
-	if (isset($HTTP_POST_VARS['services_refresh']))
+	if (isset($_POST['services_refresh']))
 	{
-		if ($current_refresh_rate != $HTTP_POST_VARS['services_refresh'])
+		if ($current_refresh_rate != $_POST['services_refresh'])
 		{
-			$current_refresh_rate = $HTTP_POST_VARS['services_refresh'];
+			$current_refresh_rate = $_POST['services_refresh'];
 			nt_auth_set_session_var('current_refresh_rate',$current_refresh_rate);
 		}
 	}
@@ -637,10 +637,10 @@
 					//	exit();
 					//}
 				}
-				elseif (isset($HTTP_POST_VARS['shards_update']) && tool_admin_applications_check('tool_main_shard_autostart'))
+				elseif (isset($_POST['shards_update']) && tool_admin_applications_check('tool_main_shard_autostart'))
 				{
-					$shard_update_mode	= $HTTP_POST_VARS['shards_update'];
-					$shard_update_name	= $HTTP_POST_VARS['shards_update_name'];
+					$shard_update_mode	= $_POST['shards_update'];
+					$shard_update_name	= $_POST['shards_update_name'];
 
 					switch ($shard_update_mode)
 					{
@@ -678,14 +678,14 @@
 					}
 
 				}
-				elseif (isset($HTTP_POST_VARS['ws_update']) && tool_admin_applications_check('tool_main_ws'))
+				elseif (isset($_POST['ws_update']) && tool_admin_applications_check('tool_main_ws'))
 				{
-					$shard_ws_su			= $HTTP_POST_VARS['ws_su'];
-					$shard_ws_shard_name	= $HTTP_POST_VARS['ws_shard_name'];
-					$shard_ws_shard_id		= $HTTP_POST_VARS['ws_shard_id'];
+					$shard_ws_su			= $_POST['ws_su'];
+					$shard_ws_shard_name	= $_POST['ws_shard_name'];
+					$shard_ws_shard_id		= $_POST['ws_shard_id'];
 
-					$shard_ws_state			= $HTTP_POST_VARS['ws_state_'. $shard_ws_shard_name];
-					$shard_ws_motd			= $HTTP_POST_VARS['ws_motd_'. $shard_ws_shard_name];
+					$shard_ws_state			= $_POST['ws_state_'. $shard_ws_shard_name];
+					$shard_ws_motd			= $_POST['ws_motd_'. $shard_ws_shard_name];
 
 					// coders don't know how to write it seems
 					// ace: now they know if ($shard_ws_state == 'close') $shard_ws_state = 'closed';
@@ -705,9 +705,9 @@
 					$tpl->clear_assign('tool_execute_result');
 					nt_sleep(VIEW_DELAY);
 				}
-				elseif (isset($HTTP_POST_VARS['services_update']))
+				elseif (isset($_POST['services_update']))
 				{
-					$service_update_mode	= $HTTP_POST_VARS['services_update'];
+					$service_update_mode	= $_POST['services_update'];
 
 					switch ($service_update_mode)
 					{
@@ -997,9 +997,9 @@
 						case 'execute':
 							if (tool_admin_applications_check('tool_main_execute'))
 							{
-								if (isset($HTTP_POST_VARS['service_command']))
+								if (isset($_POST['service_command']))
 								{
-									$service_command = trim(stripslashes(html_entity_decode($HTTP_POST_VARS['service_command'], ENT_QUOTES)));
+									$service_command = trim(stripslashes(html_entity_decode($_POST['service_command'], ENT_QUOTES)));
 									$service_list = tool_main_get_checked_services();
 									if (sizeof($service_list))
 									{
diff --git a/code/ryzom/tools/server/admin/tool_administration.php b/code/ryzom/tools/server/admin/tool_administration.php
index 05b99366e..ce3fb5786 100644
--- a/code/ryzom/tools/server/admin/tool_administration.php
+++ b/code/ryzom/tools/server/admin/tool_administration.php
@@ -10,7 +10,7 @@
 	if (!isset($NELTOOL['GET_VARS']['toolmode']))	$NELTOOL['GET_VARS']['toolmode'] = 'help';
 	$tool_menu_item = tool_admin_menu_get_item_from_key($NELTOOL['GET_VARS']['toolmode']);
 
-	$IE_CHECK = strpos($HTTP_SERVER_VARS['HTTP_USER_AGENT'], 'MSIE');
+	$IE_CHECK = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE');
 
 	$tpl->assign('tool_title',		'Administration&nbsp;/&nbsp;'. $tool_menu_item['title']);
 	$tpl->assign('tool_menu',		tool_admin_menu_get_list($IE_CHECK)); //$tool_admin_menu); // defined in 'functions_tool_administration.php'
@@ -42,7 +42,7 @@
 			$log_step 	= 30;
 			$num_logs	= tool_admin_logs_get_count();
 
-			if (isset($HTTP_GET_VARS['page']))	$log_start = $HTTP_GET_VARS['page'];
+			if (isset($_GET['page']))	$log_start = $_GET['page'];
 
 			$tool_log_list	= tool_admin_logs_get_list($log_start * $log_step, $log_step);
 
@@ -76,8 +76,8 @@
 			if (!tool_admin_applications_check('tool_admin_user'))	nt_common_redirect('index.php');
 
 			$tool_action = null;
-			if (isset($HTTP_POST_VARS['toolaction']))		$tool_action = $HTTP_POST_VARS['toolaction'];
-			elseif (isset($HTTP_GET_VARS['toolaction']))	$tool_action = $HTTP_GET_VARS['toolaction'];
+			if (isset($_POST['toolaction']))		$tool_action = $_POST['toolaction'];
+			elseif (isset($_GET['toolaction']))	$tool_action = $_GET['toolaction'];
 
 			switch ($tool_action)
 			{
@@ -85,12 +85,12 @@
 
 					if ($tool_action == 'update applications')
 					{
-						$tool_user_update_id			= $HTTP_POST_VARS['tool_form_user_id'];
-						$tool_user_update_appl_ids		= $HTTP_POST_VARS['tool_form_application_ids'];
+						$tool_user_update_id			= $_POST['tool_form_user_id'];
+						$tool_user_update_appl_ids		= $_POST['tool_form_application_ids'];
 
 						tool_admin_users_applications_update($tool_user_update_id, $tool_user_update_appl_ids);
 
-						$HTTP_GET_VARS['user_id'] = $tool_user_update_id;
+						$_GET['user_id'] = $tool_user_update_id;
 					}
 
 					// break;
@@ -99,15 +99,15 @@
 
 					if ($tool_action == 'update domains')
 					{
-						$tool_user_update_id			= $HTTP_POST_VARS['tool_form_user_id'];
-						$tool_user_update_domain_ids	= $HTTP_POST_VARS['tool_form_domain_ids'];
+						$tool_user_update_id			= $_POST['tool_form_user_id'];
+						$tool_user_update_domain_ids	= $_POST['tool_form_domain_ids'];
 
 						$tool_user_data 				= tool_admin_users_get_id($tool_user_update_id);
 						$tool_user_group_id				= $tool_user_data['user_group_id'];
 
 						tool_admin_users_domains_update($tool_user_update_id, $tool_user_group_id, $tool_user_update_domain_ids);
 
-						$HTTP_GET_VARS['user_id']		= $tool_user_update_id;
+						$_GET['user_id']		= $tool_user_update_id;
 					}
 
 					//break;
@@ -116,15 +116,15 @@
 
 					if ($tool_action == 'update shards')
 					{
-						$tool_user_update_id			= $HTTP_POST_VARS['tool_form_user_id'];
-						$tool_user_update_shard_ids		= $HTTP_POST_VARS['tool_form_shard_ids'];
+						$tool_user_update_id			= $_POST['tool_form_user_id'];
+						$tool_user_update_shard_ids		= $_POST['tool_form_shard_ids'];
 
 						$tool_user_data 				= tool_admin_users_get_id($tool_user_update_id);
 						$tool_user_group_id				= $tool_user_data['user_group_id'];
 
 						tool_admin_users_shards_update($tool_user_update_id, $tool_user_group_id, $tool_user_update_shard_ids);
 
-						$HTTP_GET_VARS['user_id']		= $tool_user_update_id;
+						$_GET['user_id']		= $tool_user_update_id;
 					}
 
 					//break;
@@ -138,11 +138,11 @@
 
 					if ($tool_action == 'update')
 					{
-						$tool_user_update_id		= $HTTP_POST_VARS['tool_form_user_id'];
-						$tool_user_update_name		= $HTTP_POST_VARS['tool_form_user_name'];
-						$tool_user_update_password	= $HTTP_POST_VARS['tool_form_user_password'];
-						$tool_user_update_group		= $HTTP_POST_VARS['tool_form_user_group'];
-						$tool_user_update_active	= $HTTP_POST_VARS['tool_form_user_active'];
+						$tool_user_update_id		= $_POST['tool_form_user_id'];
+						$tool_user_update_name		= $_POST['tool_form_user_name'];
+						$tool_user_update_password	= $_POST['tool_form_user_password'];
+						$tool_user_update_group		= $_POST['tool_form_user_group'];
+						$tool_user_update_active	= $_POST['tool_form_user_active'];
 
 						$tool_error = tool_admin_users_update($tool_user_update_id, $tool_user_update_name, $tool_user_update_password, $tool_user_update_group, $tool_user_update_active);
 						if ($tool_error != "")
@@ -150,7 +150,7 @@
 							$tpl->assign('tool_alert_message',	$tool_error);
 						}
 
-						$HTTP_GET_VARS['user_id'] = $tool_user_update_id;
+						$_GET['user_id'] = $tool_user_update_id;
 					}
 
 					//break;
@@ -162,7 +162,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_user_edit_id		= $HTTP_GET_VARS['user_id'];
+					$tool_user_edit_id		= $_GET['user_id'];
 					$tool_user_edit_data 	= tool_admin_users_get_id($tool_user_edit_id);
 					$tool_user_group_id		= $tool_user_edit_data['user_group_id'];
 
@@ -199,7 +199,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_user_delete_id		= $HTTP_POST_VARS['tool_form_user_id'];
+					$tool_user_delete_id		= $_POST['tool_form_user_id'];
 					if (!($tool_user_delete_id > 0))
 					{
 						$tpl->assign('tool_alert_message',	"/!\ Error: invalid user!");
@@ -222,10 +222,10 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_user_create_name		= $HTTP_POST_VARS['tool_form_user_name'];
-					$tool_user_create_password	= $HTTP_POST_VARS['tool_form_user_password'];
-					$tool_user_create_group		= $HTTP_POST_VARS['tool_form_user_group'];
-					$tool_user_create_active	= $HTTP_POST_VARS['tool_form_user_active'];
+					$tool_user_create_name		= $_POST['tool_form_user_name'];
+					$tool_user_create_password	= $_POST['tool_form_user_password'];
+					$tool_user_create_group		= $_POST['tool_form_user_group'];
+					$tool_user_create_active	= $_POST['tool_form_user_active'];
 
 					$tool_error = tool_admin_users_add($tool_user_create_name, $tool_user_create_password, $tool_user_create_group, $tool_user_create_active);
 					if ($tool_error != "")
@@ -255,8 +255,8 @@
 			if (!tool_admin_applications_check('tool_admin_group'))	nt_common_redirect('index.php');
 
 			$tool_action = null;
-			if (isset($HTTP_POST_VARS['toolaction']))		$tool_action = $HTTP_POST_VARS['toolaction'];
-			elseif (isset($HTTP_GET_VARS['toolaction']))	$tool_action = $HTTP_GET_VARS['toolaction'];
+			if (isset($_POST['toolaction']))		$tool_action = $_POST['toolaction'];
+			elseif (isset($_GET['toolaction']))	$tool_action = $_GET['toolaction'];
 
 			switch ($tool_action)
 			{
@@ -264,12 +264,12 @@
 
 					if ($tool_action == 'update applications')
 					{
-						$tool_group_update_id			= $HTTP_POST_VARS['tool_form_group_id'];
-						$tool_group_update_appl_ids		= $HTTP_POST_VARS['tool_form_application_ids'];
+						$tool_group_update_id			= $_POST['tool_form_group_id'];
+						$tool_group_update_appl_ids		= $_POST['tool_form_application_ids'];
 
 						tool_admin_groups_applications_update($tool_group_update_id, $tool_group_update_appl_ids);
 
-						$HTTP_GET_VARS['group_id'] = $tool_group_update_id;
+						$_GET['group_id'] = $tool_group_update_id;
 					}
 
 					// break;
@@ -278,12 +278,12 @@
 
 					if ($tool_action == 'update domains')
 					{
-						$tool_group_update_id			= $HTTP_POST_VARS['tool_form_group_id'];
-						$tool_group_update_domain_ids	= $HTTP_POST_VARS['tool_form_domain_ids'];
+						$tool_group_update_id			= $_POST['tool_form_group_id'];
+						$tool_group_update_domain_ids	= $_POST['tool_form_domain_ids'];
 
 						tool_admin_groups_domains_update($tool_group_update_id, $tool_group_update_domain_ids);
 
-						$HTTP_GET_VARS['group_id'] = $tool_group_update_id;
+						$_GET['group_id'] = $tool_group_update_id;
 					}
 
 					//break;
@@ -292,12 +292,12 @@
 
 					if ($tool_action == 'update shards')
 					{
-						$tool_group_update_id			= $HTTP_POST_VARS['tool_form_group_id'];
-						$tool_group_update_shard_ids	= $HTTP_POST_VARS['tool_form_shard_ids'];
+						$tool_group_update_id			= $_POST['tool_form_group_id'];
+						$tool_group_update_shard_ids	= $_POST['tool_form_shard_ids'];
 
 						tool_admin_groups_shards_update($tool_group_update_id, $tool_group_update_shard_ids);
 
-						$HTTP_GET_VARS['group_id']		= $tool_group_update_id;
+						$_GET['group_id']		= $tool_group_update_id;
 					}
 
 					//break;
@@ -311,11 +311,11 @@
 
 					if ($tool_action == 'update')
 					{
-						$tool_group_update_id		= $HTTP_POST_VARS['tool_form_group_id'];
-						$tool_group_update_name		= $HTTP_POST_VARS['tool_form_group_name'];
-						$tool_group_update_level	= $HTTP_POST_VARS['tool_form_group_level'];
-						$tool_group_update_default	= $HTTP_POST_VARS['tool_form_group_default'];
-						$tool_group_update_active	= $HTTP_POST_VARS['tool_form_group_active'];
+						$tool_group_update_id		= $_POST['tool_form_group_id'];
+						$tool_group_update_name		= $_POST['tool_form_group_name'];
+						$tool_group_update_level	= $_POST['tool_form_group_level'];
+						$tool_group_update_default	= $_POST['tool_form_group_default'];
+						$tool_group_update_active	= $_POST['tool_form_group_active'];
 
 						$tool_error = tool_admin_groups_update($tool_group_update_id, $tool_group_update_name, $tool_group_update_level, $tool_group_update_default, $tool_group_update_active);
 						if ($tool_error != "")
@@ -323,7 +323,7 @@
 							$tpl->assign('tool_alert_message',	$tool_error);
 						}
 
-						$HTTP_GET_VARS['group_id'] = $tool_group_update_id;
+						$_GET['group_id'] = $tool_group_update_id;
 					}
 
 					//break;
@@ -337,8 +337,8 @@
 
 					if ($tool_action == 'update default domain')
 					{
-						$tool_group_update_id		= $HTTP_POST_VARS['tool_form_group_id'];
-						$tool_group_default_domain	= $HTTP_POST_VARS['tool_form_domain_default'];
+						$tool_group_update_id		= $_POST['tool_form_group_id'];
+						$tool_group_default_domain	= $_POST['tool_form_domain_default'];
 
 						$tool_error = tool_admin_groups_update_default_domain($tool_group_update_id, $tool_group_default_domain);
 						if ($tool_error != "")
@@ -346,7 +346,7 @@
 							$tpl->assign('tool_alert_message',	$tool_error);
 						}
 
-						$HTTP_GET_VARS['group_id'] = $tool_group_update_id;
+						$_GET['group_id'] = $tool_group_update_id;
 					}
 
 					//break;
@@ -360,8 +360,8 @@
 
 					if ($tool_action == 'update default shard')
 					{
-						$tool_group_update_id		= $HTTP_POST_VARS['tool_form_group_id'];
-						$tool_group_default_shard	= $HTTP_POST_VARS['tool_form_shard_default'];
+						$tool_group_update_id		= $_POST['tool_form_group_id'];
+						$tool_group_default_shard	= $_POST['tool_form_shard_default'];
 
 						$tool_error = tool_admin_groups_update_default_shard($tool_group_update_id, $tool_group_default_shard);
 						if ($tool_error != "")
@@ -369,7 +369,7 @@
 							$tpl->assign('tool_alert_message',	$tool_error);
 						}
 
-						$HTTP_GET_VARS['group_id'] = $tool_group_update_id;
+						$_GET['group_id'] = $tool_group_update_id;
 					}
 
 					//break;
@@ -383,8 +383,8 @@
 
 					if ($tool_action == 'update default application')
 					{
-						$tool_group_update_id			= $HTTP_POST_VARS['tool_form_group_id'];
-						$tool_group_default_application	= $HTTP_POST_VARS['tool_form_application_default'];
+						$tool_group_update_id			= $_POST['tool_form_group_id'];
+						$tool_group_default_application	= $_POST['tool_form_application_default'];
 
 						$tool_error = tool_admin_groups_update_default_application($tool_group_update_id, $tool_group_default_application);
 						if ($tool_error != "")
@@ -392,7 +392,7 @@
 							$tpl->assign('tool_alert_message',	$tool_error);
 						}
 
-						$HTTP_GET_VARS['group_id'] = $tool_group_update_id;
+						$_GET['group_id'] = $tool_group_update_id;
 					}
 
 					//break;
@@ -404,7 +404,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_group_edit_id		= $HTTP_GET_VARS['group_id'];
+					$tool_group_edit_id		= $_GET['group_id'];
 					$tool_group_edit_data 	= tool_admin_groups_get_id($tool_group_edit_id);
 					$tpl->assign('tool_group_edit_data',	$tool_group_edit_data);
 
@@ -439,7 +439,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_group_delete_id		= $HTTP_POST_VARS['tool_form_group_id'];
+					$tool_group_delete_id		= $_POST['tool_form_group_id'];
 					if (!($tool_group_delete_id > 0))
 					{
 						$tpl->assign('tool_alert_message',	"/!\ Error: invalid group!");
@@ -462,10 +462,10 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_group_create_name		= $HTTP_POST_VARS['tool_form_group_name'];
-					$tool_group_create_level	= $HTTP_POST_VARS['tool_form_group_level'];
-					$tool_group_create_default	= $HTTP_POST_VARS['tool_form_group_default'];
-					$tool_group_create_active	= $HTTP_POST_VARS['tool_form_group_active'];
+					$tool_group_create_name		= $_POST['tool_form_group_name'];
+					$tool_group_create_level	= $_POST['tool_form_group_level'];
+					$tool_group_create_default	= $_POST['tool_form_group_default'];
+					$tool_group_create_active	= $_POST['tool_form_group_active'];
 
 					$tool_error = tool_admin_groups_add($tool_group_create_name, $tool_group_create_level, $tool_group_create_default, $tool_group_create_active);
 					if ($tool_error != "")
@@ -492,8 +492,8 @@
 			if (!tool_admin_applications_check('tool_admin_application'))	nt_common_redirect('index.php');
 
 			$tool_action = null;
-			if (isset($HTTP_POST_VARS['toolaction']))		$tool_action = $HTTP_POST_VARS['toolaction'];
-			elseif (isset($HTTP_GET_VARS['toolaction']))	$tool_action = $HTTP_GET_VARS['toolaction'];
+			if (isset($_POST['toolaction']))		$tool_action = $_POST['toolaction'];
+			elseif (isset($_GET['toolaction']))	$tool_action = $_GET['toolaction'];
 
 			switch ($tool_action)
 			{
@@ -504,13 +504,13 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_application_update_id				= $HTTP_POST_VARS['tool_form_application_id'];
-					$tool_application_update_name			= $HTTP_POST_VARS['tool_form_application_name'];
-					$tool_application_update_uri			= $HTTP_POST_VARS['tool_form_application_uri'];
-					$tool_application_update_restriction	= $HTTP_POST_VARS['tool_form_application_restriction'];
-					$tool_application_update_icon			= $HTTP_POST_VARS['tool_form_application_icon'];
-					$tool_application_update_order			= $HTTP_POST_VARS['tool_form_application_order'];
-					$tool_application_update_visible		= $HTTP_POST_VARS['tool_form_application_visible'];
+					$tool_application_update_id				= $_POST['tool_form_application_id'];
+					$tool_application_update_name			= $_POST['tool_form_application_name'];
+					$tool_application_update_uri			= $_POST['tool_form_application_uri'];
+					$tool_application_update_restriction	= $_POST['tool_form_application_restriction'];
+					$tool_application_update_icon			= $_POST['tool_form_application_icon'];
+					$tool_application_update_order			= $_POST['tool_form_application_order'];
+					$tool_application_update_visible		= $_POST['tool_form_application_visible'];
 
 					$tool_error = tool_admin_applications_update($tool_application_update_id, $tool_application_update_name, $tool_application_update_uri, $tool_application_update_restriction, $tool_application_update_icon, $tool_application_update_order, $tool_application_update_visible);
 					if ($tool_error != "")
@@ -518,7 +518,7 @@
 						$tpl->assign('tool_alert_message',	$tool_error);
 					}
 
-					$HTTP_GET_VARS['application_id'] = $tool_application_update_id;
+					$_GET['application_id'] = $tool_application_update_id;
 
 					//break;
 
@@ -529,7 +529,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_application_edit_id		= $HTTP_GET_VARS['application_id'];
+					$tool_application_edit_id		= $_GET['application_id'];
 					$tool_application_edit_data 	= tool_admin_applications_get_id($tool_application_edit_id);
 					$tpl->assign('tool_application_edit_data',	$tool_application_edit_data);
 
@@ -542,7 +542,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_application_delete_id		= $HTTP_POST_VARS['tool_form_application_id'];
+					$tool_application_delete_id		= $_POST['tool_form_application_id'];
 					if (!($tool_application_delete_id > 0))
 					{
 						$tpl->assign('tool_alert_message',	"/!\ Error: invalid application!");
@@ -561,12 +561,12 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_application_create_name			= $HTTP_POST_VARS['tool_form_application_name'];
-					$tool_application_create_uri			= $HTTP_POST_VARS['tool_form_application_uri'];
-					$tool_application_create_restriction	= $HTTP_POST_VARS['tool_form_application_restriction'];
-					$tool_application_create_icon			= $HTTP_POST_VARS['tool_form_application_icon'];
-					$tool_application_create_order			= $HTTP_POST_VARS['tool_form_application_order'];
-					$tool_application_create_visible		= $HTTP_POST_VARS['tool_form_application_visible'];
+					$tool_application_create_name			= $_POST['tool_form_application_name'];
+					$tool_application_create_uri			= $_POST['tool_form_application_uri'];
+					$tool_application_create_restriction	= $_POST['tool_form_application_restriction'];
+					$tool_application_create_icon			= $_POST['tool_form_application_icon'];
+					$tool_application_create_order			= $_POST['tool_form_application_order'];
+					$tool_application_create_visible		= $_POST['tool_form_application_visible'];
 
 					$tool_error = tool_admin_applications_add($tool_application_create_name, $tool_application_create_uri, $tool_application_create_restriction, $tool_application_create_icon, $tool_application_create_order, $tool_application_create_visible);
 					if ($tool_error != "")
@@ -592,8 +592,8 @@
 			if (!tool_admin_applications_check('tool_admin_domain'))	nt_common_redirect('index.php');
 
 			$tool_action = null;
-			if (isset($HTTP_POST_VARS['toolaction']))		$tool_action = $HTTP_POST_VARS['toolaction'];
-			elseif (isset($HTTP_GET_VARS['toolaction']))	$tool_action = $HTTP_GET_VARS['toolaction'];
+			if (isset($_POST['toolaction']))		$tool_action = $_POST['toolaction'];
+			elseif (isset($_GET['toolaction']))	$tool_action = $_GET['toolaction'];
 
 			switch ($tool_action)
 			{
@@ -604,18 +604,18 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_domain_update_id				= $HTTP_POST_VARS['tool_form_domain_id'];
-					$tool_domain_update_name			= $HTTP_POST_VARS['tool_form_domain_name'];
-					$tool_domain_update_application		= $HTTP_POST_VARS['tool_form_domain_application'];
-					$tool_domain_update_as_host			= $HTTP_POST_VARS['tool_form_domain_as_host'];
-					$tool_domain_update_as_port			= $HTTP_POST_VARS['tool_form_domain_as_port'];
-					$tool_domain_update_mfs_web			= $HTTP_POST_VARS['tool_form_domain_mfs_web'];
-					$tool_domain_update_rrd_path		= $HTTP_POST_VARS['tool_form_domain_rrd_path'];
-					$tool_domain_update_las_admin_path	= $HTTP_POST_VARS['tool_form_domain_las_admin_path'];
-					$tool_domain_update_las_local_path	= $HTTP_POST_VARS['tool_form_domain_las_local_path'];
-					$tool_domain_update_sql_string		= $HTTP_POST_VARS['tool_form_domain_sql_string'];
-					$tool_domain_update_cs_sql_string	= $HTTP_POST_VARS['tool_form_domain_cs_sql_string'];
-					$tool_domain_update_hd_check		= $HTTP_POST_VARS['tool_form_domain_hd_check'];
+					$tool_domain_update_id				= $_POST['tool_form_domain_id'];
+					$tool_domain_update_name			= $_POST['tool_form_domain_name'];
+					$tool_domain_update_application		= $_POST['tool_form_domain_application'];
+					$tool_domain_update_as_host			= $_POST['tool_form_domain_as_host'];
+					$tool_domain_update_as_port			= $_POST['tool_form_domain_as_port'];
+					$tool_domain_update_mfs_web			= $_POST['tool_form_domain_mfs_web'];
+					$tool_domain_update_rrd_path		= $_POST['tool_form_domain_rrd_path'];
+					$tool_domain_update_las_admin_path	= $_POST['tool_form_domain_las_admin_path'];
+					$tool_domain_update_las_local_path	= $_POST['tool_form_domain_las_local_path'];
+					$tool_domain_update_sql_string		= $_POST['tool_form_domain_sql_string'];
+					$tool_domain_update_cs_sql_string	= $_POST['tool_form_domain_cs_sql_string'];
+					$tool_domain_update_hd_check		= $_POST['tool_form_domain_hd_check'];
 
 					$tool_error = tool_admin_domains_update($tool_domain_update_id, $tool_domain_update_name, $tool_domain_update_application,
 															$tool_domain_update_as_host, $tool_domain_update_as_port, $tool_domain_update_rrd_path,
@@ -627,7 +627,7 @@
 						$tpl->assign('tool_alert_message',	$tool_error);
 					}
 
-					$HTTP_GET_VARS['domain_id'] = $tool_domain_update_id;
+					$_GET['domain_id'] = $tool_domain_update_id;
 
 					//break;
 
@@ -638,17 +638,17 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					if (isset($HTTP_POST_VARS['tool_form_domain_nel_id']))
+					if (isset($_POST['tool_form_domain_nel_id']))
 					{
-						$tool_domain_nel_update_id		= $HTTP_POST_VARS['tool_form_domain_nel_id'];
-						$tool_domain_nel_update_name	= $HTTP_POST_VARS['tool_form_domain_nel_name'];
-						$tool_domain_nel_update_status	= $HTTP_POST_VARS['tool_form_domain_nel_status'];
-						//$tool_domain_nel_update_version	= $HTTP_POST_VARS['tool_form_domain_nel_version'];
+						$tool_domain_nel_update_id		= $_POST['tool_form_domain_nel_id'];
+						$tool_domain_nel_update_name	= $_POST['tool_form_domain_nel_name'];
+						$tool_domain_nel_update_status	= $_POST['tool_form_domain_nel_status'];
+						//$tool_domain_nel_update_version	= $_POST['tool_form_domain_nel_version'];
 
 						//tool_admin_domains_update_nel($tool_domain_nel_update_id, $tool_domain_nel_update_name, $tool_domain_nel_update_version, $tool_domain_nel_update_status);
 						tool_admin_domains_update_nel($tool_domain_nel_update_id, $tool_domain_nel_update_name, $tool_domain_nel_update_status);
 
-						$HTTP_GET_VARS['domain_id'] = $HTTP_POST_VARS['tool_form_domain_id'];
+						$_GET['domain_id'] = $_POST['tool_form_domain_id'];
 					}
 
 					// break;
@@ -660,7 +660,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_domain_edit_id	= $HTTP_GET_VARS['domain_id'];
+					$tool_domain_edit_id	= $_GET['domain_id'];
 					$tool_domain_edit_data 	= tool_admin_domains_get_id($tool_domain_edit_id);
 					$tpl->assign('tool_domain_edit_data',	$tool_domain_edit_data);
 
@@ -682,7 +682,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_domain_delete_id	= $HTTP_POST_VARS['tool_form_domain_id'];
+					$tool_domain_delete_id	= $_POST['tool_form_domain_id'];
 					if (!($tool_domain_delete_id > 0))
 					{
 						$tpl->assign('tool_alert_message',	"/!\ Error: invalid domain!");
@@ -701,17 +701,17 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_domain_create_name			= $HTTP_POST_VARS['tool_form_domain_name'];
-					$tool_domain_create_application		= $HTTP_POST_VARS['tool_form_domain_application'];
-					$tool_domain_create_as_host			= $HTTP_POST_VARS['tool_form_domain_as_host'];
-					$tool_domain_create_as_port			= $HTTP_POST_VARS['tool_form_domain_as_port'];
-					$tool_domain_create_mfs_web			= $HTTP_POST_VARS['tool_form_domain_mfs_web'];
-					$tool_domain_create_rrd_path		= $HTTP_POST_VARS['tool_form_domain_rrd_path'];
-					$tool_domain_create_las_admin_path	= $HTTP_POST_VARS['tool_form_domain_las_admin_path'];
-					$tool_domain_create_las_local_path	= $HTTP_POST_VARS['tool_form_domain_las_local_path'];
-					$tool_domain_create_sql_string		= $HTTP_POST_VARS['tool_form_domain_sql_string'];
-					$tool_domain_create_cs_sql_string	= $HTTP_POST_VARS['tool_form_domain_cs_sql_string'];
-					$tool_domain_create_hd_check		= $HTTP_POST_VARS['tool_form_domain_hd_check'];
+					$tool_domain_create_name			= $_POST['tool_form_domain_name'];
+					$tool_domain_create_application		= $_POST['tool_form_domain_application'];
+					$tool_domain_create_as_host			= $_POST['tool_form_domain_as_host'];
+					$tool_domain_create_as_port			= $_POST['tool_form_domain_as_port'];
+					$tool_domain_create_mfs_web			= $_POST['tool_form_domain_mfs_web'];
+					$tool_domain_create_rrd_path		= $_POST['tool_form_domain_rrd_path'];
+					$tool_domain_create_las_admin_path	= $_POST['tool_form_domain_las_admin_path'];
+					$tool_domain_create_las_local_path	= $_POST['tool_form_domain_las_local_path'];
+					$tool_domain_create_sql_string		= $_POST['tool_form_domain_sql_string'];
+					$tool_domain_create_cs_sql_string	= $_POST['tool_form_domain_cs_sql_string'];
+					$tool_domain_create_hd_check		= $_POST['tool_form_domain_hd_check'];
 
 					$tool_error = tool_admin_domains_add(	$tool_domain_create_name, $tool_domain_create_application, $tool_domain_create_as_host,
 															$tool_domain_create_as_port, $tool_domain_create_rrd_path,
@@ -741,8 +741,8 @@
 			if (!tool_admin_applications_check('tool_admin_shard'))	nt_common_redirect('index.php');
 
 			$tool_action = null;
-			if (isset($HTTP_POST_VARS['toolaction']))		$tool_action = $HTTP_POST_VARS['toolaction'];
-			elseif (isset($HTTP_GET_VARS['toolaction']))	$tool_action = $HTTP_GET_VARS['toolaction'];
+			if (isset($_POST['toolaction']))		$tool_action = $_POST['toolaction'];
+			elseif (isset($_GET['toolaction']))	$tool_action = $_GET['toolaction'];
 
 			switch ($tool_action)
 			{
@@ -753,11 +753,11 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_shard_update_id			= $HTTP_POST_VARS['tool_form_shard_id'];
-					$tool_shard_update_name			= $HTTP_POST_VARS['tool_form_shard_name'];
-					$tool_shard_update_as_id		= $HTTP_POST_VARS['tool_form_shard_as_id'];
-					$tool_shard_update_domain_id	= $HTTP_POST_VARS['tool_form_shard_domain_id'];
-					$tool_shard_update_language		= $HTTP_POST_VARS['tool_form_shard_language'];
+					$tool_shard_update_id			= $_POST['tool_form_shard_id'];
+					$tool_shard_update_name			= $_POST['tool_form_shard_name'];
+					$tool_shard_update_as_id		= $_POST['tool_form_shard_as_id'];
+					$tool_shard_update_domain_id	= $_POST['tool_form_shard_domain_id'];
+					$tool_shard_update_language		= $_POST['tool_form_shard_language'];
 
 					$tool_error = tool_admin_shards_update($tool_shard_update_id, $tool_shard_update_name, $tool_shard_update_as_id, $tool_shard_update_domain_id, $tool_shard_update_language);
 					if ($tool_error != "")
@@ -765,7 +765,7 @@
 						$tpl->assign('tool_alert_message',	$tool_error);
 					}
 
-					$HTTP_GET_VARS['shard_id'] = $tool_shard_update_id;
+					$_GET['shard_id'] = $tool_shard_update_id;
 
 					//break;
 
@@ -776,7 +776,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_shard_edit_id		= $HTTP_GET_VARS['shard_id'];
+					$tool_shard_edit_id		= $_GET['shard_id'];
 					$tool_shard_edit_data 	= tool_admin_shards_get_id($tool_shard_edit_id);
 					$tpl->assign('tool_shard_edit_data',	$tool_shard_edit_data);
 
@@ -789,7 +789,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_shard_delete_id	= $HTTP_POST_VARS['tool_form_shard_id'];
+					$tool_shard_delete_id	= $_POST['tool_form_shard_id'];
 					if (!($tool_shard_delete_id > 0))
 					{
 						$tpl->assign('tool_alert_message',	"/!\ Error: invalid shard!");
@@ -808,10 +808,10 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_shard_create_name			= $HTTP_POST_VARS['tool_form_shard_name'];
-					$tool_shard_create_as_id		= $HTTP_POST_VARS['tool_form_shard_as_id'];
-					$tool_shard_create_domain_id	= $HTTP_POST_VARS['tool_form_shard_domain_id'];
-					$tool_shard_create_language		= $HTTP_POST_VARS['tool_form_shard_language'];
+					$tool_shard_create_name			= $_POST['tool_form_shard_name'];
+					$tool_shard_create_as_id		= $_POST['tool_form_shard_as_id'];
+					$tool_shard_create_domain_id	= $_POST['tool_form_shard_domain_id'];
+					$tool_shard_create_language		= $_POST['tool_form_shard_language'];
 
 					$tool_error = tool_admin_shards_add($tool_shard_create_name, $tool_shard_create_as_id, $tool_shard_create_domain_id, $tool_shard_create_language);
 					if ($tool_error != "")
@@ -842,8 +842,8 @@
 			if (!tool_admin_applications_check('tool_admin_restart'))	nt_common_redirect('index.php');
 
 			$tool_action = null;
-			if (isset($HTTP_POST_VARS['toolaction']))		$tool_action = $HTTP_POST_VARS['toolaction'];
-			elseif (isset($HTTP_GET_VARS['toolaction']))	$tool_action = $HTTP_GET_VARS['toolaction'];
+			if (isset($_POST['toolaction']))		$tool_action = $_POST['toolaction'];
+			elseif (isset($_GET['toolaction']))	$tool_action = $_GET['toolaction'];
 
 			switch ($tool_action)
 			{
@@ -854,10 +854,10 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_restart_update_id			= $HTTP_POST_VARS['tool_form_restart_id'];
-					$tool_restart_update_name		= $HTTP_POST_VARS['tool_form_restart_name'];
-					$tool_restart_update_services	= $HTTP_POST_VARS['tool_form_restart_services'];
-					$tool_restart_update_order		= $HTTP_POST_VARS['tool_form_restart_order'];
+					$tool_restart_update_id			= $_POST['tool_form_restart_id'];
+					$tool_restart_update_name		= $_POST['tool_form_restart_name'];
+					$tool_restart_update_services	= $_POST['tool_form_restart_services'];
+					$tool_restart_update_order		= $_POST['tool_form_restart_order'];
 
 					$tool_error = tool_admin_restarts_update($tool_restart_update_id, $tool_restart_update_name, $tool_restart_update_services, $tool_restart_update_order);
 					if ($tool_error != "")
@@ -865,7 +865,7 @@
 						$tpl->assign('tool_alert_message',	$tool_error);
 					}
 
-					$HTTP_GET_VARS['restart_id'] = $tool_restart_update_id;
+					$_GET['restart_id'] = $tool_restart_update_id;
 
 					//break;
 
@@ -876,7 +876,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_restart_edit_id		= $HTTP_GET_VARS['restart_id'];
+					$tool_restart_edit_id		= $_GET['restart_id'];
 					$tool_restart_edit_data 	= tool_admin_restarts_get_id($tool_restart_edit_id);
 					$tpl->assign('tool_restart_edit_data',	$tool_restart_edit_data);
 
@@ -889,7 +889,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_restart_delete_id	= $HTTP_POST_VARS['tool_form_restart_id'];
+					$tool_restart_delete_id	= $_POST['tool_form_restart_id'];
 					if (!($tool_restart_delete_id > 0))
 					{
 						$tpl->assign('tool_alert_message',	"/!\ Error: invalid restart group!");
@@ -908,9 +908,9 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_restart_create_name		= $HTTP_POST_VARS['tool_form_restart_name'];
-					$tool_restart_create_services	= $HTTP_POST_VARS['tool_form_restart_services'];
-					$tool_restart_create_order		= $HTTP_POST_VARS['tool_form_restart_order'];
+					$tool_restart_create_name		= $_POST['tool_form_restart_name'];
+					$tool_restart_create_services	= $_POST['tool_form_restart_services'];
+					$tool_restart_create_order		= $_POST['tool_form_restart_order'];
 
 					$tool_error = tool_admin_restarts_add($tool_restart_create_name, $tool_restart_create_services, $tool_restart_create_order);
 					if ($tool_error != "")
@@ -927,10 +927,10 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_message_update_id			= $HTTP_POST_VARS['tool_form_message_id'];
-					$tool_message_update_name		= $HTTP_POST_VARS['tool_form_message_name'];
-					$tool_message_update_value		= $HTTP_POST_VARS['tool_form_message_value'];
-					$tool_message_update_lang		= $HTTP_POST_VARS['tool_form_message_lang'];
+					$tool_message_update_id			= $_POST['tool_form_message_id'];
+					$tool_message_update_name		= $_POST['tool_form_message_name'];
+					$tool_message_update_value		= $_POST['tool_form_message_value'];
+					$tool_message_update_lang		= $_POST['tool_form_message_lang'];
 
 					$tool_error = tool_admin_restart_messages_update($tool_message_update_id, $tool_message_update_name, $tool_message_update_value, $tool_message_update_lang);
 					if ($tool_error != "")
@@ -938,7 +938,7 @@
 						$tpl->assign('tool_alert_message',	$tool_error);
 					}
 
-					$HTTP_GET_VARS['msg_id'] = $tool_message_update_id;
+					$_GET['msg_id'] = $tool_message_update_id;
 
 					//break;
 
@@ -949,7 +949,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_message_edit_id		= $HTTP_GET_VARS['msg_id'];
+					$tool_message_edit_id		= $_GET['msg_id'];
 					$tool_message_edit_data 	= tool_admin_restart_messages_get_id($tool_message_edit_id);
 					$tpl->assign('tool_message_edit_data',	$tool_message_edit_data);
 
@@ -962,7 +962,7 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_message_delete_id	= $HTTP_POST_VARS['tool_form_message_id'];
+					$tool_message_delete_id	= $_POST['tool_form_message_id'];
 					if (!($tool_message_delete_id > 0))
 					{
 						$tpl->assign('tool_alert_message',	"/!\ Error: invalid restart message!");
@@ -982,9 +982,9 @@
 					 * -------------------------------------------------------------------------------------------
 					 */
 
-					$tool_message_create_name		= $HTTP_POST_VARS['tool_form_message_name'];
-					$tool_message_create_value		= $HTTP_POST_VARS['tool_form_message_value'];
-					$tool_message_create_lang		= $HTTP_POST_VARS['tool_form_message_lang'];
+					$tool_message_create_name		= $_POST['tool_form_message_name'];
+					$tool_message_create_value		= $_POST['tool_form_message_value'];
+					$tool_message_create_lang		= $_POST['tool_form_message_lang'];
 
 					$tool_error = tool_admin_restart_messages_add($tool_message_create_name, $tool_message_create_value, $tool_message_create_lang);
 					if ($tool_error != "")
diff --git a/code/ryzom/tools/server/admin/tool_graphs.php b/code/ryzom/tools/server/admin/tool_graphs.php
index b2c285d54..a628f45b2 100644
--- a/code/ryzom/tools/server/admin/tool_graphs.php
+++ b/code/ryzom/tools/server/admin/tool_graphs.php
@@ -82,11 +82,11 @@
 
 
 	$current_refresh_rate = nt_auth_get_session_var('current_refresh_rate');
-	if (isset($HTTP_POST_VARS['services_refresh']))
+	if (isset($_POST['services_refresh']))
 	{
-		if ($current_refresh_rate != $HTTP_POST_VARS['services_refresh'])
+		if ($current_refresh_rate != $_POST['services_refresh'])
 		{
-			$current_refresh_rate = $HTTP_POST_VARS['services_refresh'];
+			$current_refresh_rate = $_POST['services_refresh'];
 			nt_auth_set_session_var('current_refresh_rate',$current_refresh_rate);
 		}
 	}
@@ -361,8 +361,8 @@
 							$tpl->assign('tool_graph_variables',	$graph_variables);
 							$tpl->assign('tool_graph_datas',		$graph_datas);
 
-							$tool_variable_selected = $HTTP_GET_VARS['variable'];
-							$tool_service_selected	= $HTTP_GET_VARS['service'];
+							$tool_variable_selected = $_GET['variable'];
+							$tool_service_selected	= $_GET['service'];
 
 							$tpl->assign('tool_graph_variable_selected',	$tool_variable_selected);
 							$tpl->assign('tool_graph_service_selected',		$tool_service_selected);
diff --git a/code/ryzom/tools/server/admin/tool_guild_locator.php b/code/ryzom/tools/server/admin/tool_guild_locator.php
index c8733381f..841846ae4 100644
--- a/code/ryzom/tools/server/admin/tool_guild_locator.php
+++ b/code/ryzom/tools/server/admin/tool_guild_locator.php
@@ -50,11 +50,11 @@
 
 	$current_refresh_rate = nt_auth_get_session_var('current_refresh_rate');
 
-	if (isset($HTTP_POST_VARS['services_refresh']))
+	if (isset($_POST['services_refresh']))
 	{
-		if ($current_refresh_rate != $HTTP_POST_VARS['services_refresh'])
+		if ($current_refresh_rate != $_POST['services_refresh'])
 		{
-			$current_refresh_rate = $HTTP_POST_VARS['services_refresh'];
+			$current_refresh_rate = $_POST['services_refresh'];
 			nt_auth_set_session_var('current_refresh_rate',$current_refresh_rate);
 		}
 	}
diff --git a/code/ryzom/tools/server/admin/tool_player_locator.php b/code/ryzom/tools/server/admin/tool_player_locator.php
index 9f53b446b..145ff0c09 100644
--- a/code/ryzom/tools/server/admin/tool_player_locator.php
+++ b/code/ryzom/tools/server/admin/tool_player_locator.php
@@ -50,11 +50,11 @@
 
 	$current_refresh_rate = nt_auth_get_session_var('current_refresh_rate');
 
-	if (isset($HTTP_POST_VARS['services_refresh']))
+	if (isset($_POST['services_refresh']))
 	{
-		if ($current_refresh_rate != $HTTP_POST_VARS['services_refresh'])
+		if ($current_refresh_rate != $_POST['services_refresh'])
 		{
-			$current_refresh_rate = $HTTP_POST_VARS['services_refresh'];
+			$current_refresh_rate = $_POST['services_refresh'];
 			nt_auth_set_session_var('current_refresh_rate',$current_refresh_rate);
 		}
 	}
diff --git a/code/ryzom/tools/server/www/webig/app_hello.php b/code/ryzom/tools/server/www/webig/app_hello.php
new file mode 100644
index 000000000..0589d9ec2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webig/app_hello.php
@@ -0,0 +1,29 @@
+<?php
+
+require_once 'lib/functions.php';
+
+$user = app_authenticate();
+if(empty($user)){
+	// redirect to login page
+	$url = 'http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+	header('Location: index.php?redirect='.urlencode($url));
+	exit;
+}
+
+// get more info about character - race, civlization, cult, guild, etc
+$character = webig_load_character($user['cid']);
+
+?>
+<html>
+<head>
+	<title>App Hello World!</title>
+</head>
+<body>
+	<h1>APP Hello World!</h1>
+
+	<a href="index.php">index</a><?=(!isWEBIG ? '| <a href="?logout">logout</a>' : '')?>
+
+	<h2>Character</h2>
+	<pre><?php print_r($character);?></pre>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webig/index.php b/code/ryzom/tools/server/www/webig/index.php
new file mode 100644
index 000000000..57ddd7b55
--- /dev/null
+++ b/code/ryzom/tools/server/www/webig/index.php
@@ -0,0 +1,133 @@
+<?php
+
+$__start = microtime(true);
+require_once 'lib/functions.php';
+
+session_start();
+
+// do user login
+$user = app_authenticate();
+
+if(empty($user)){
+	// user not verified
+	//
+	$error = is($_SESSION['login']['error'], '');
+	if(!empty($error)){
+		$error = '<p style="color: red;">login error</p>';
+	}
+	echo '
+	<html>
+	<head>
+		<title>WebIG - Login</title>
+	</head>
+	<body
+		<h1>Login</h1>
+		<form method="post" action="">
+			<input type="hidden" name="login[shardid]" value="302" />
+			Char name <input type="text" name="login[name]" value="" /><br />
+			Password <input type="password" name="login[passwd]" value="" /><br />
+			<input type="submit" name="login[submit]" value="Login" />
+		</form>
+	</body>
+	</html>';
+	exit;
+}
+
+// if this was login request from app, then redirect back there
+$redirect = is($_GET['redirect'], '');
+if(!empty($redirect)){
+	header('Location: '.$redirect);
+	exit;
+}
+
+// check user privileges
+$is_admin = webig_is_admin($user['cid']>>4);
+
+// get more info about character - race, civlization, cult, guild, etc
+$character = webig_load_character($user['cid']);
+
+// user is verified
+?>
+<html>
+<head>
+	<title>App Index</title>
+</head>
+<body>
+	<h1>Hello "<?=h($user['name'])?>"!</h1>
+
+	<a href="index.php">index</a> | <a href="app_hello.php">Hello APP</a><?=(!isWEBIG ? '| <a href="?logout">logout</a>' : '')?>
+
+<?php
+	if($is_admin){
+		if(isWEBIG){
+			display_teleport_list();
+		}
+	}
+
+echo '<h2>User info</h2>';
+echo 'USER:'.dump_array($user);
+echo 'CHARACTER:'.dump_array($character);
+
+	$__end = microtime(true);
+	echo "<pre>\n---\npage created ".sprintf("%.5fsec", $__end - $__start).'</pre>';
+
+?>
+</body>
+</html>
+<?php
+
+function dump_array($array){
+	ob_start();
+
+	echo '
+	<table cellspacing="2" cellpadding="0" bgcolor="#4f4f4f">
+	<tr><td>
+	<table cellspacing="0" cellpadding="0">
+	';
+	$c=0;
+	foreach($array as $k => $v){
+		if(is_array($v)){
+			$v = dump_array($v);
+		}else{
+			// make value safe for html
+			$v = h($v);
+		}
+		echo '
+		<tr valign="middle" bgcolor="'.($c%2 ? '#9f9f9f' : '#909090').'">
+			<td height="20">'.h($k).'</td><td>'.$v.'</td>
+		</tr>
+		';
+		$c++;
+	}
+	echo '
+		</table>
+	</td></tr>
+	</table>
+	';
+
+	return ob_get_clean();
+}
+
+function display_teleport_list(){
+	$places = array(
+		'Ranger Camp'  => array(10314,-11734),
+		'Shining Lake' => array(9056, -10822),
+	);
+?>
+	<h2>Teleport destinations</h2>
+	<table cellspacing="2" cellpadding="0" bgcolor="#4f4f4f">
+	<tr><td>
+		<table cellspacing="0" cellpadding="0">
+		<?php $c=0; foreach($places as $txt => $xyz){
+			echo '
+			<tr valign="middle" bgcolor="'.($c%2 ? '#3f3f3f' : '#303030').'">
+				<td height="20">'.h($txt).'</td><td><a href="ah:command&a&Position&'.join(',', $xyz).'">'.join(',', $xyz).'</a></td>
+			</tr>
+			';
+			$c++;
+		} ?>
+		</table>
+	</td></tr>
+	</table>
+<?php
+}
diff --git a/code/ryzom/tools/server/www/webig/lib/config.php b/code/ryzom/tools/server/www/webig/lib/config.php
new file mode 100644
index 000000000..30dbbb648
--- /dev/null
+++ b/code/ryzom/tools/server/www/webig/lib/config.php
@@ -0,0 +1,23 @@
+<?php
+// ----------------------------------------------------------------------------------------
+// Variables for PdrUtil class
+// ----------------------------------------------------------------------------------------
+define('CMD_PDR_UTIL', 'C:/RyzomCore/ryzom_core_server/ryzom/tools/pdr_util');
+define('SHARD_SAVE',   'C:/RyzomCore/ryzom_core_server/ryzom/server/save_shard');
+define('SHEETID_DIR',  'C:/RyzomCore/ryzom_core_server/ryzom/common/data_leveldesign/leveldesign/Game_elem');
+define('TEMP_UNPACK',  'c:/temp');
+
+// ----------------------------------------------------------------------------------------
+// Variables for nel database access
+// ----------------------------------------------------------------------------------------
+
+// where we can find the mysql database
+$DBHost         = 'localhost';
+$DBUserName     = 'shard';
+$DBPassword     = '';
+$DBName         = 'nel';
+
+//
+$RingDBUserName = 'shard';
+$RingDBName     = 'ring_open';
+$RingDBPassword = '';
diff --git a/code/ryzom/tools/server/www/webig/lib/functions.php b/code/ryzom/tools/server/www/webig/lib/functions.php
new file mode 100644
index 000000000..ffdee0b4c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webig/lib/functions.php
@@ -0,0 +1,394 @@
+<?php
+
+if(strstr($_SERVER['HTTP_USER_AGENT'], 'Ryzom')){
+	define('isWEBIG', true);
+}else{
+	define('isWEBIG', false);
+}
+
+
+require_once 'config.php';
+require_once 'pdr_util.php';
+require_once 'pdr_util_character.php';
+require_once 'pdr_util_guild.php';
+
+/**
+ * Singleton wrapper class for PDO database connection
+ */
+class DB {
+	private $_pdo = null;
+
+	private function __construct(){
+		$this->_pdo = new PDO('mysql:host='.$GLOBALS['DBHost'].';dbname='.$GLOBALS['DBName'].';charset=utf-8', $GLOBALS['DBUserName'], $GLOBALS['DBPassword'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'set names utf8'));
+		$this->_pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+	}
+
+	public function getInstance(){
+		static $instance = null;
+		if($instance === null){
+			$instance = new DB();
+		}
+		return $instance;
+	}
+
+	/**
+	 * @param string $sql
+	 * @param array $params (optional)
+	 * @return PDOStatement
+	 */
+	function query($sql, $params=array()){
+		if(empty($params)){
+			$stmt = $this->_pdo->query($sql);
+		}else{
+			$stmt = $this->_pdo->prepare($sql);
+			$stmt->execute($params);
+		}
+		return $stmt;
+	}
+}
+
+/**
+ * Verify and log-in user
+ *
+ * @return mixed user info array or boolean FALSE when user was not verified
+ */
+function app_authenticate(){
+	// mask possible double session_start() warning
+	@session_start();
+
+	if(isWEBIG){
+		// ingame login
+
+		// gather user from $_GET or $_POST variables
+		$user = webig_user();
+
+		// verify it against database
+		$user = webig_auth($user);
+	}else{
+		// outgame login
+
+		if(isset($_POST['login'])){
+			// login request
+			$shardid = is($_POST['login']['shardid'], '');
+			$name    = is($_POST['login']['name'], '');
+			$passwd  = is($_POST['login']['passwd'], '');
+
+			// verify character and password against database and populate $_GET with user info
+			$user = login_auth($shardid, $name, $passwd);
+			$_SESSION['login']['error'] = ($user === false);
+		}elseif(isset($_GET['logout'])){
+			// logout request
+			unset($_SESSION['user']);
+			unset($_SESSION['authkey']);
+
+			// redirect to self without URL parameters
+			header('Location: '.$_SERVER['PHP_SELF']);
+			exit;
+		}else{
+			// continue session
+			$user = is($_SESSION['user'], false);
+
+			// verify user in session against database (e.g. user might be deleted)
+			$user = load_user($user['shardid'], null, $user['cid']);
+		}
+	}
+
+	// auth failed?
+	if(empty($user)){
+		return false;
+	}
+
+	// remove values we do not need to keep in session
+	unset($user['password']);
+	unset($user['cookie']);
+
+	// return user info array on success
+	$_SESSION['user'] = $user;
+	return $user;
+}
+
+// get user info that WebIG sends us
+function webig_user(){
+	$user = array();
+
+	// shard id (302)
+	$user['shardid'] = ryzom_get_param('shardid');
+
+	// character name (User)
+	$user['name']    = ryzom_get_param('name');
+
+	// character id (16), user id is calculated as 'uid = cid >> 4';
+	$user['cid']     = ryzom_get_param('cid');
+
+	// language
+	$user['lang']    = ryzom_get_param('lang');
+
+	$user['authkey'] = ryzom_get_param('authkey');
+
+	return $user;
+}
+
+/**
+ * Verify character using info from ig browser
+ *
+ * @param  array $user
+ * @return bool  return user info array on success and FALSE on error
+ */
+function webig_auth($user){
+	// find user by shard and character id (name might be temporarily changed in game)
+	$result = load_user($user['shardid'], null, $user['cid']);
+	if(empty($result)){
+		// should not happen, but user was not found
+		return false;
+	}
+
+	// Create auth key by using cookie from DB and user info from user
+	$authkey = webig_create_authkey($user, $result['cookie']);
+	if($user['authkey'] !== $authkey){
+		// something is out of sync - either user info or cookie
+		return false;
+	}
+
+	// return result from DB
+	return $result;
+}
+
+/**
+ * Verify character
+ *
+ * @param  int    $shardid character shard id
+ * @param  string $name    character name
+ * @param  string $passwd  plain text password
+ * @return mixed  return user info array on success or boolean false on error
+ */
+function login_auth($shardid, $name, $passwd){
+	// get character from db
+	$user = load_user($shardid, $name);
+	if(empty($user)){
+		// user was not found
+		return false;
+	}
+
+	$passwd = crypt($passwd, substr($user['password'], 0, 2));
+	if($passwd !== $user['password']){
+		// password failed
+		return false;
+	}
+
+	return $user;
+}
+
+/**
+ * Fetch user info from db
+ *
+ * If name is NULL, then $cid is used
+ *
+ * @param int    $shardid
+ * @param string $name
+ * @param int    $cid
+ * @return array
+ */
+function load_user($shardid, $name, $cid = null){
+	// `nel`.`user` has password
+	// `ring_open`.`ring_users` has cookie
+	// `ring_open`.`characters` has char_id, char_name, home_mainland_session_id(==shardid)
+
+	$sql = 'SELECT c.`char_id` cid, c.`char_name` name, c.`home_mainland_session_id` shardid, n.`password`, u.`cookie`
+		FROM `ring_open`.`characters` c
+		JOIN `ring_open`.`ring_users` u on u.`user_id` = c.`user_id`
+		JOIN `nel`.`user`             n on n.`uid` = c.`user_id`
+		WHERE c.`home_mainland_session_id` = :shardid';
+	$params = array('shardid' => $shardid);
+	if($name !== null){
+		$sql .= ' AND c.`char_name` = :name';
+		$params['name'] = $name;
+	}elseif($cid !== null){
+		$sql .= ' AND c.`char_id` = :cid';
+		$params['cid'] = $cid;
+	}else{
+		// $name or $cid both empty
+		return false;
+	}
+
+	$result = DB::getInstance()->query($sql, $params)->fetch(PDO::FETCH_ASSOC);
+	return $result;
+}
+
+/**
+ * Verify user info that ig browser sent us using cookie from database
+ *
+ * @param  array  $user   user info array
+ * @param  string $cookie User login cookie from database
+ * @return string         md5 hash
+ */
+function webig_create_authkey($user, $cookie){
+	return md5($user['shardid'].$user['name'].$user['cid'].'\''.$cookie.'\'');
+}
+
+/**
+ * Return user privileges from DB
+ *
+ * @param int $uid user id (uid = cid >> 4)
+ * @return mixed array of user privileges or boolean FALSE when user was not found
+ */
+function webig_get_privileges($uid){
+	$sql = 'select `privilege` from `nel`.`user` where `uid` = :id';
+	$params = array('id' => $uid);
+
+	$result = DB::getInstance()->query($sql, $params)->fetchColumn(0);
+
+	if($result !== false){
+		$result = explode(':', $result);
+		$ret = array();
+		foreach($result as $k=>$v){
+			if($v != ''){
+				$ret[]=$v;
+			}
+		}
+		$result = $ret;
+	}
+
+	return $result;
+}
+
+/**
+ * Test user privileges
+ *
+ * @param  int   $uid  user id
+ * @param  array $priv array of privileges, like array('DEV', 'GM')
+ * @return bool
+ */
+function webig_has_privileges($uid, $priv){
+	$userpriv = webig_get_privileges($uid);
+	$result   = array_intersect($priv, $userpriv);
+	return !empty($result);
+}
+
+/**
+ * Test user privileges against (DEV, SGM, GM)
+ *
+ * @param int $uid user id
+ * @return bool
+ */
+function webig_is_admin($uid){
+	// entities_game_service/player_manager/player_manager.cpp defines order
+	// DEV > SGM > EM > GM > EG > VG > SG > G > OBSERVER > PR
+	return webig_has_privileges($uid, array('DEV', 'SGM', 'EM', 'GM'));
+}
+
+/**
+ * Load character from shard save binary file
+ *
+ * @param int $cid
+ * @return mixed array with character info or boolean FALSE on error
+ */
+function webig_load_character($cid){
+	$pdr  = CharacterPdr::createDefault();
+	$char = $pdr->load($cid);
+	if(empty($char)){
+		return false;
+	}
+
+	$result = array(
+		'id'     => (int)    $cid,
+		'name'   => (string) $char->EntityBase->_Name['value'],
+		'title'  => (string) $char->_Title['value'],
+		'race'   => (string) $char->EntityBase->_Race['value'],
+		'gender' => (int)    $char->EntityBase->_Gender['value'] == '0' ? 'male' : 'female',
+		'cult'   => (string) $char->DeclaredCult['value'],
+		'civ'    => (string) $char->DeclaredCiv['value'],
+		'guild'  => false,
+	);
+
+	$guild_id = (int) $char->_GuildId['value'];
+	if($guild_id>0){
+		// if char is in guild, then also get guild info
+		$result['guild'] = webig_load_guild($guild_id);
+
+		// get guild rank (also from guild file)
+		$result['guild_membership'] = webig_load_guild_membership($guild_id, $cid);
+	}
+	unset($char);
+
+	return $result;
+}
+
+/**
+ * Load basic guild info (name, description, motd, culv, civ)
+ *
+ * @param int $guild_id
+ * @return mixed array with guild info or boolean FALSE on error
+ */
+function webig_load_guild($guild_id){
+	$pdr   = GuildPdr::createDefault();
+	$guild = $pdr->load($guild_id);
+	if(empty($guild)){
+		return false;
+	}
+
+	$result = array(
+		'id'          => (int) $guild_id,
+		'icon'        => (string) $guild->Icon['value'],
+		'name'        => (string) $guild->_Name['value'],
+		'description' => (string) $guild->_Description['value'],
+		'motd'        => (string) $guild->_MessageOfTheDay['value'],
+		'cult'        => (string) $guild->DeclaredCult['value'],
+		'civ'         => (string) $guild->DeclaredCiv['value'],
+	);
+	unset($guild);
+
+	return $result;
+}
+
+/**
+ * Load guild member info
+ *
+ * @param int $guild_id
+ * @param int $char_id
+ * @return mixed array with guild member info or boolean FALSE if guild or character not found
+ */
+function webig_load_guild_membership($guild_id, $char_id){
+	$pdr   = GuildPdr::createDefault();
+	$guild = $pdr->load($guild_id);
+	if(empty($guild)){
+		return false;
+	}
+
+	$result = false;
+
+	// test for 'id' and type (CHAR == 0), ignore creator (should be 0x00) and dynamic
+	// 0x0000000013:00:00:87
+	$eid = sprintf('0x%010x:00:', $char_id);
+	$i = 0;
+	while(isset($guild->Members->__Key__[$i])){
+		$key = $guild->Members->__Key__[$i];
+		$pos = strpos((string)$key['value'], $eid);
+		if($pos === 1){
+			$val = $guild->Members->__Val__[$i];
+			$result = array(
+				'grade'  => (string) $val->Members->Grade['value'],
+				'joined' => (int) $val->Members->EnterTime['value'],
+			);
+			break;
+		}
+		$i++;
+	}
+	unset($guild);
+
+	return $result;
+}
+
+// shortcut for 'isset() ? .. : ..'
+function is(&$var, $default = null){
+	return isset($var) ? $var : $default;
+}
+
+// escape string so it's safe for HTML
+function h($str){
+	return htmlspecialchars($str, ENT_QUOTES, 'UTF-8');
+}
+
+// return $_GET[var] or $_POST[var] or $default
+function ryzom_get_param($var, $default=''){
+	return is($_GET[$var], is($_POST[$var], $default));
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webig/lib/pdr_util.php b/code/ryzom/tools/server/www/webig/lib/pdr_util.php
new file mode 100644
index 000000000..1e28124a8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webig/lib/pdr_util.php
@@ -0,0 +1,124 @@
+<?php
+
+class PdrUtil {
+	/**
+	 * Shard seems to be saving guild file every few seconds.
+	 * Increase cache valid timer a bit.
+	 *
+	 * @const int cache expire in seconds
+	 */
+	const CACHE_MIN_TIME = 15;
+
+	/**
+	 * Where does shard keep it's character, guild files
+	 *
+	 * @var string
+	 */
+	private $_shard_save;
+
+	/**
+	 * Directory where sheet_id.bin is
+	 *
+	 * @var string
+	 */
+	private $_sheetid_dir;
+
+	/**
+	 * Directory for extracted character, guild xml files
+	 *
+	 * @var string
+	 */
+	private $_unpack_dir;
+
+	/**
+	 * Public Constructor for PdrUtil
+	 *
+	 * @param string $save_path
+	 * @param string $unpack    temp unpack directory, default is /tmp/
+	 */
+	function __construct($shard_save, $sheetid_dir, $unpack = '/tmp/'){
+		$this->_shard_save  = $shard_save;
+		$this->_sheetid_dir = $sheetid_dir;
+
+		$this->_unpack_dir  = $unpack;
+	}
+
+	function setShardSaveDirectory($dir){
+		$this->_shard_save = $dir;
+	}
+	function getShardSaveDirectory(){
+		return $this->_shard_save;
+	}
+
+	function setSheetIdDirectory($dir){
+		$this->_sheetid_dir = $dir;
+	}
+	function getSheetIdDirectory(){
+		return $this->_sheetid_dir;
+	}
+
+	function setUnpackDirectory($dir){
+		$this->_unpack_dir = $dir;
+	}
+	function getUnpackDirectory(){
+		return $this->_unpack_dir;
+	}
+
+	/**
+	 * Extract $pdr file to $xml file
+	 *
+	 * @param string $pdr
+	 * @param string $xml
+	 * @return bool
+	 */
+	function extract($pdr, $xml){
+		if(!file_exists($pdr)){
+			return false;
+		}
+
+		$pdr_mtime = filemtime($pdr);
+		if(file_exists($xml)){
+			$xml_mtime = filemtime($xml);
+		}else{
+			$xml_mtime = 0;
+		}
+
+		$diff = $pdr_mtime - $xml_mtime;
+		if($diff > self::CACHE_MIN_TIME){
+			// remove expired xml file
+			@unlink($xml);
+
+			// change working directory to unpack directory to keep pdr_util log file in one place
+			$pwd = getcwd();
+			chdir($this->_unpack_dir);
+
+			// run pdr_util
+			$cmd = sprintf(' -s%s -x -o%s %s', $this->_sheetid_dir, $xml, $pdr);
+			exec(CMD_PDR_UTIL.' '.$cmd);
+
+			// change working directory back what it was before
+			chdir($pwd);
+		}
+
+		// if pdr_util failed, then there is no xml file
+		return file_exists($xml);
+	}
+
+	/**
+	 * @param string $fname
+	 * @return string ShardSaveDirectory + fname
+	 */
+	function getSaveFileName($fname){
+		return $this->getShardSaveDirectory().'/'.$fname;
+	}
+
+	/**
+	 * @param string $fname
+	 * return string TempDirectory + $fname
+	 */
+	function getXmlFileName($fname){
+		return $this->getUnpackDirectory().'/'.$fname;
+	}
+
+}
+
diff --git a/code/ryzom/tools/server/www/webig/lib/pdr_util_character.php b/code/ryzom/tools/server/www/webig/lib/pdr_util_character.php
new file mode 100644
index 000000000..7e2d689ce
--- /dev/null
+++ b/code/ryzom/tools/server/www/webig/lib/pdr_util_character.php
@@ -0,0 +1,46 @@
+<?php
+
+class CharacterPdr extends PdrUtil {
+
+	/**
+	 * Factory method to create new instance using default path values from config.php
+	 */
+	static public function createDefault(){
+		return new self(SHARD_SAVE, SHEETID_DIR, TEMP_UNPACK);
+	}
+
+	/**
+	 * Load character from shard binary file
+	 *
+	 * @param int $char_id
+	 * @return SimpleXML object or boolean FALSE on error
+	 */
+	function load($char_id){
+		$char_save = $this->getSaveFileName($char_id >> 4, $char_id & 0x0F);
+		$xml_file  = $this->getXmlFileName($char_id);
+
+		if($this->extract($char_save, $xml_file)){
+			return simplexml_load_file($xml_file);
+		}
+
+		// extract failed
+		return false;
+	}
+
+	/**
+	 * @param int $uid  user id
+	 * @param int $slot character slot, starting from 0
+	 * @return string character save path + filename
+	 */
+	function getSaveFileName($uid, $slot){
+		return parent::getSaveFileName(sprintf('characters/%03d/account_%d_%d_pdr.bin', $uid, $uid, $slot));
+	}
+
+	/**
+	 * @param $char_id
+	 * return string character xml file in unpack directory
+	 */
+	function getXmlFileName($char_id){
+		return parent::getXmlFileName(sprintf('character_%d.xml', $char_id));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webig/lib/pdr_util_guild.php b/code/ryzom/tools/server/www/webig/lib/pdr_util_guild.php
new file mode 100644
index 000000000..54249f781
--- /dev/null
+++ b/code/ryzom/tools/server/www/webig/lib/pdr_util_guild.php
@@ -0,0 +1,47 @@
+<?php
+
+class GuildPdr extends PdrUtil {
+
+	/**
+	 * Factory method to create new instance using default path values from config.php
+	 */
+	static public function createDefault(){
+		return new self(SHARD_SAVE, SHEETID_DIR, TEMP_UNPACK);
+	}
+
+	/**
+	 * Load guild info from shard binary file
+	 *
+	 * @param int $guild_id
+	 * @return SimpleXML object or boolean FALSE on error
+	 */
+	function load($guild_id){
+		$guild_save = $this->getSaveFileName($guild_id);
+		$xml_file   = $this->getXmlFileName($guild_id);
+
+		if($this->extract($guild_save, $xml_file)){
+			return simplexml_load_file($xml_file);
+		}
+
+		// extract failed
+		return false;
+	}
+
+	/**
+	 * @param int $guild_id
+	 * @return string full path to guild binary file
+	 */
+	function getSaveFileName($guild_id){
+		// chop off shard component from guild id
+		return parent::getSaveFileName(sprintf('guilds/guild_%05d.bin', $guild_id & 0xFFFFF));
+	}
+
+	/**
+	 * @param $guild_id
+	 * return string full path to extracted guild xml file
+	 */
+	function getXmlFileName($guild_id){
+		return parent::getXmlFileName(sprintf('guild_%d.xml', $guild_id));
+	}
+}
+
diff --git a/code/ryzom/tools/server/www/webtt/.gitignore b/code/ryzom/tools/server/www/webtt/.gitignore
new file mode 100644
index 000000000..9edf61016
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/.gitignore
@@ -0,0 +1,4 @@
+/app/config
+/app/tmp
+/plugins
+/vendors
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/.htaccess b/code/ryzom/tools/server/www/webtt/.htaccess
new file mode 100644
index 000000000..f23dbaf66
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/.htaccess
@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+   RewriteEngine on
+   RewriteRule    ^$ app/webroot/    [L]
+   RewriteRule    (.*) app/webroot/$1 [L]
+</IfModule>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/CakePHP_README b/code/ryzom/tools/server/www/webtt/CakePHP_README
new file mode 100644
index 000000000..ddf42020f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/CakePHP_README
@@ -0,0 +1,28 @@
+CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC. Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.
+
+The Cake Software Foundation - promoting development related to CakePHP
+http://cakefoundation.org/
+
+CakePHP - the rapid development PHP framework
+http://www.cakephp.org
+
+Cookbook - user documentation for learning about CakePHP
+http://book.cakephp.org
+
+API - quick reference to CakePHP
+http://api.cakephp.org
+
+The Bakery - everything CakePHP
+http://bakery.cakephp.org
+
+The Show - live and archived podcasts about CakePHP and more
+http://live.cakephp.org
+
+CakePHP TV - screen casts from events and video tutorials
+http://tv.cakephp.org
+
+CakePHP Google Group - community mailing list and forum
+http://groups.google.com/group/cake-php
+
+#cakephp on irc.freenode.net - chat with CakePHP developers
+irc://irc.freenode.net/cakephp
diff --git a/code/ryzom/tools/server/www/webtt/app/.htaccess b/code/ryzom/tools/server/www/webtt/app/.htaccess
new file mode 100644
index 000000000..0ed8662ea
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/.htaccess
@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine on
+    RewriteRule    ^$    webroot/    [L]
+    RewriteRule    (.*) webroot/$1    [L]
+ </IfModule>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/config/acl.ini.php b/code/ryzom/tools/server/www/webtt/app/config/acl.ini.php
new file mode 100644
index 000000000..0907fbd4d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/acl.ini.php
@@ -0,0 +1,70 @@
+;<?php die() ?>
+; SVN FILE: $Id$
+;/**
+; * ACL configuration
+; *
+; *
+; * PHP versions 4 and 5
+; *
+; * CakePHP(tm) :  Rapid Development Framework http://cakephp.org
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; *
+; *  Licensed under The MIT License
+; *  Redistributions of files must retain the above copyright notice.
+; *
+; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; * @link          http://cakephp.org CakePHP(tm) Project
+; * @package       cake
+; * @subpackage    cake.app.config
+; * @since         CakePHP(tm) v 0.10.0.1076
+; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+; */
+
+; acl.ini.php - Cake ACL Configuration
+; ---------------------------------------------------------------------
+; Use this file to specify user permissions.
+; aco = access control object (something in your application)
+; aro = access request object (something requesting access)
+;
+; User records are added as follows:
+;
+; [uid]
+; groups = group1, group2, group3
+; allow = aco1, aco2, aco3
+; deny = aco4, aco5, aco6
+;
+; Group records are added in a similar manner:
+;
+; [gid]
+; allow = aco1, aco2, aco3
+; deny = aco4, aco5, aco6
+;
+; The allow, deny, and groups sections are all optional.
+; NOTE: groups names *cannot* ever be the same as usernames!
+;
+; ACL permissions are checked in the following order:
+; 1. Check for user denies (and DENY if specified)
+; 2. Check for user allows (and ALLOW if specified)
+; 3. Gather user's groups
+; 4. Check group denies (and DENY if specified)
+; 5. Check group allows (and ALLOW if specified)
+; 6. If no aro, aco, or group information is found, DENY
+;
+; ---------------------------------------------------------------------
+
+;-------------------------------------
+;Users
+;-------------------------------------
+
+[username-goes-here]
+groups = group1, group2
+deny = aco1, aco2
+allow = aco3, aco4
+
+;-------------------------------------
+;Groups
+;-------------------------------------
+
+[groupname-goes-here]
+deny = aco5, aco6
+allow = aco7, aco8
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/config/bootstrap.php b/code/ryzom/tools/server/www/webtt/app/config/bootstrap.php
new file mode 100644
index 000000000..51c786373
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/bootstrap.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * This file is loaded automatically by the app/webroot/index.php file after the core bootstrap.php
+ *
+ * This is an application wide file to load any function that is not used within a class
+ * define. You can also use this to include or require any files in your application.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.10.8.2117
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The settings below can be used to set additional paths to models, views and controllers.
+ * This is related to Ticket #470 (https://trac.cakephp.org/ticket/470)
+ *
+ * App::build(array(
+ *     'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
+ *     'models' =>  array('/full/path/to/models/', '/next/full/path/to/models/'),
+ *     'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
+ *     'controllers' => array('/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ *     'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
+ *     'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
+ *     'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),
+ *     'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
+ *     'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
+ *     'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
+ *     'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
+ * ));
+ *
+ */
+
+/**
+ * As of 1.3, additional rules for the inflector are added below
+ *
+ * Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
+ * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
+ *
+ */
diff --git a/code/ryzom/tools/server/www/webtt/app/config/core.php b/code/ryzom/tools/server/www/webtt/app/config/core.php
new file mode 100644
index 000000000..6bd8d65c6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/core.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * This is core configuration file.
+ *
+ * Use it to configure core behavior of Cake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * CakePHP Debug Level:
+ *
+ * Production Mode:
+ * 	0: No error messages, errors, or warnings shown. Flash messages redirect.
+ *
+ * Development Mode:
+ * 	1: Errors and warnings shown, model caches refreshed, flash messages halted.
+ * 	2: As in 1, but also with full debug messages and SQL output.
+ *
+ * In production mode, flash messages redirect after a time interval.
+ * In development mode, you need to click the flash message to continue.
+ */
+	Configure::write('debug', 2);
+
+/**
+ * CakePHP Log Level:
+ *
+ * In case of Production Mode CakePHP gives you the possibility to continue logging errors.
+ *
+ * The following parameters can be used:
+ *  Boolean: Set true/false to activate/deactivate logging
+ *    Configure::write('log', true);
+ *
+ *  Integer: Use built-in PHP constants to set the error level (see error_reporting)
+ *    Configure::write('log', E_ERROR | E_WARNING);
+ *    Configure::write('log', E_ALL ^ E_NOTICE);
+ */
+	Configure::write('log', true);
+
+/**
+ * Application wide charset encoding
+ */
+	Configure::write('App.encoding', 'UTF-8');
+
+/**
+ * To configure CakePHP *not* to use mod_rewrite and to
+ * use CakePHP pretty URLs, remove these .htaccess
+ * files:
+ *
+ * /.htaccess
+ * /app/.htaccess
+ * /app/webroot/.htaccess
+ *
+ * And uncomment the App.baseUrl below:
+ */
+	//Configure::write('App.baseUrl', env('SCRIPT_NAME'));
+
+/**
+ * Uncomment the define below to use CakePHP prefix routes.
+ *
+ * The value of the define determines the names of the routes
+ * and their associated controller actions:
+ *
+ * Set to an array of prefixes you want to use in your application. Use for
+ * admin or other prefixed routes.
+ *
+ * 	Routing.prefixes = array('admin', 'manager');
+ *
+ * Enables:
+ *	`admin_index()` and `/admin/controller/index`
+ *	`manager_index()` and `/manager/controller/index`
+ *
+ * [Note Routing.admin is deprecated in 1.3.  Use Routing.prefixes instead]
+ */
+	Configure::write('Routing.prefixes', array('admin'));
+
+/**
+ * Turn off all caching application-wide.
+ *
+ */
+	//Configure::write('Cache.disable', true);
+
+/**
+ * Enable cache checking.
+ *
+ * If set to true, for view caching you must still use the controller
+ * var $cacheAction inside your controllers to define caching settings.
+ * You can either set it controller-wide by setting var $cacheAction = true,
+ * or in each action using $this->cacheAction = true.
+ *
+ */
+	//Configure::write('Cache.check', true);
+
+/**
+ * Defines the default error type when using the log() function. Used for
+ * differentiating error logging and debugging. Currently PHP supports LOG_DEBUG.
+ */
+	define('LOG_ERROR', 2);
+
+/**
+ * The preferred session handling method. Valid values:
+ *
+ * 'php'	 		Uses settings defined in your php.ini.
+ * 'cake'		Saves session files in CakePHP's /tmp directory.
+ * 'database'	Uses CakePHP's database sessions.
+ *
+ * To define a custom session handler, save it at /app/config/<name>.php.
+ * Set the value of 'Session.save' to <name> to utilize it in CakePHP.
+ *
+ * To use database sessions, run the app/config/schema/sessions.php schema using
+ * the cake shell command: cake schema create Sessions
+ *
+ */
+	Configure::write('Session.save', 'php');
+
+/**
+ * The model name to be used for the session model.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ *
+ * The model name set here should *not* be used elsewhere in your application.
+ */
+	//Configure::write('Session.model', 'Session');
+
+/**
+ * The name of the table used to store CakePHP database sessions.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ *
+ * The table name set here should *not* include any table prefix defined elsewhere.
+ *
+ * Please note that if you set a value for Session.model (above), any value set for
+ * Session.table will be ignored.
+ *
+ * [Note: Session.table is deprecated as of CakePHP 1.3]
+ */
+	//Configure::write('Session.table', 'cake_sessions');
+
+/**
+ * The DATABASE_CONFIG::$var to use for database session handling.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ */
+	//Configure::write('Session.database', 'default');
+
+/**
+ * The name of CakePHP's session cookie.
+ *
+ * Note the guidelines for Session names states: "The session name references
+ * the session id in cookies and URLs. It should contain only alphanumeric
+ * characters."
+ * @link http://php.net/session_name
+ */
+	Configure::write('Session.cookie', 'CAKEPHP');
+
+/**
+ * Session time out time (in seconds).
+ * Actual value depends on 'Security.level' setting.
+ */
+	Configure::write('Session.timeout', '120');
+
+/**
+ * If set to false, sessions are not automatically started.
+ */
+	Configure::write('Session.start', true);
+
+/**
+ * When set to false, HTTP_USER_AGENT will not be checked
+ * in the session. You might want to set the value to false, when dealing with
+ * older versions of IE, Chrome Frame or certain web-browsing devices and AJAX
+ */
+	Configure::write('Session.checkAgent', true);
+
+/**
+ * The level of CakePHP security. The session timeout time defined
+ * in 'Session.timeout' is multiplied according to the settings here.
+ * Valid values:
+ *
+ * 'high'   Session timeout in 'Session.timeout' x 10
+ * 'medium' Session timeout in 'Session.timeout' x 100
+ * 'low'    Session timeout in 'Session.timeout' x 300
+ *
+ * CakePHP session IDs are also regenerated between requests if
+ * 'Security.level' is set to 'high'.
+ */
+	Configure::write('Security.level', 'medium');
+
+/**
+ * A random string used in security hashing methods.
+ */
+	Configure::write('Security.salt', '3928c5uM398u4R39m4u8c3m493U49');
+
+/**
+ * A random numeric string (digits only) used to encrypt/decrypt strings.
+ */
+	Configure::write('Security.cipherSeed', '849713027853098175087095830289');
+
+/**
+ * Apply timestamps with the last modified time to static assets (js, css, images).
+ * Will append a querystring parameter containing the time the file was modified. This is
+ * useful for invalidating browser caches.
+ *
+ * Set to `true` to apply timestamps, when debug = 0, or set to 'force' to always enable
+ * timestamping.
+ */
+	//Configure::write('Asset.timestamp', true);
+/**
+ * Compress CSS output by removing comments, whitespace, repeating tags, etc.
+ * This requires a/var/cache directory to be writable by the web server for caching.
+ * and /vendors/csspp/csspp.php
+ *
+ * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use HtmlHelper::css().
+ */
+	//Configure::write('Asset.filter.css', 'css.php');
+
+/**
+ * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the
+ * output, and setting the config below to the name of the script.
+ *
+ * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link().
+ */
+	//Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
+
+/**
+ * The classname and database used in CakePHP's
+ * access control lists.
+ */
+	Configure::write('Acl.classname', 'DbAcl');
+	Configure::write('Acl.database', 'default');
+
+/**
+ * If you are on PHP 5.3 uncomment this line and correct your server timezone
+ * to fix the date & time related errors.
+ */
+	//date_default_timezone_set('UTC');
+
+/**
+ *
+ * Cache Engine Configuration
+ * Default settings provided below
+ *
+ * File storage engine.
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'File', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
+ * 		'prefix' => 'cake_', //[optional]  prefix every cache file with this string
+ * 		'lock' => false, //[optional]  use file locking
+ * 		'serialize' => true, [optional]
+ *	));
+ *
+ *
+ * APC (http://pecl.php.net/package/APC)
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'Apc', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
+ *	));
+ *
+ * Xcache (http://xcache.lighttpd.net/)
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'Xcache', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ *		'user' => 'user', //user from xcache.admin.user settings
+ *      'password' => 'password', //plaintext password (xcache.admin.pass)
+ *	));
+ *
+ *
+ * Memcache (http://www.danga.com/memcached/)
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'Memcache', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
+ * 		'servers' => array(
+ * 			'127.0.0.1:11211' // localhost, default port 11211
+ * 		), //[optional]
+ * 		'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
+ * 		'persistent' => true, // [optional] set this to false for non-persistent connections
+ *	));
+ *
+ */
+	Cache::config('default', array('engine' => 'File'));
diff --git a/code/ryzom/tools/server/www/webtt/app/config/database.php b/code/ryzom/tools/server/www/webtt/app/config/database.php
new file mode 100644
index 000000000..3119752d2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/database.php
@@ -0,0 +1,21 @@
+<?php
+class DATABASE_CONFIG {
+
+	var $default = array(
+		'driver' => 'mysqli',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'webtt',
+		'password' => 'webtt77',
+		'database' => 'webtt2',
+		'encoding' => 'utf8'
+	);
+	var $raw_files = array(
+		'datasource' => 'RawFilesSource',
+		'path' => '/path/to/translation',
+		'extension' => '(uxt|txt)',
+		'readonly' => true,
+		'recursive' => true,
+	);
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/config/database.php.default b/code/ryzom/tools/server/www/webtt/app/config/database.php.default
new file mode 100644
index 000000000..043ba5ccc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/database.php.default
@@ -0,0 +1,95 @@
+<?php
+/**
+ * This is core configuration file.
+ *
+ * Use it to configure core behaviour ofCake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * In this file you set up your database connection details.
+ *
+ * @package       cake
+ * @subpackage    cake.config
+ */
+/**
+ * Database configuration class.
+ * You can specify multiple configurations for production, development and testing.
+ *
+ * driver => The name of a supported driver; valid options are as follows:
+ *		mysql 		- MySQL 4 & 5,
+ *		mysqli 		- MySQL 4 & 5 Improved Interface (PHP5 only),
+ *		sqlite		- SQLite (PHP5 only),
+ *		postgres	- PostgreSQL 7 and higher,
+ *		mssql		- Microsoft SQL Server 2000 and higher,
+ *		db2			- IBM DB2, Cloudscape, and Apache Derby (http://php.net/ibm-db2)
+ *		oracle		- Oracle 8 and higher
+ *		firebird	- Firebird/Interbase
+ *		sybase		- Sybase ASE
+ *		adodb-[drivername]	- ADOdb interface wrapper (see below),
+ *		odbc		- ODBC DBO driver
+ *
+ * You can add custom database drivers (or override existing drivers) by adding the
+ * appropriate file to app/models/datasources/dbo.  Drivers should be named 'dbo_x.php',
+ * where 'x' is the name of the database.
+ *
+ * persistent => true / false
+ * Determines whether or not the database should use a persistent connection
+ *
+ * connect =>
+ * ADOdb set the connect to one of these
+ *	(http://phplens.com/adodb/supported.databases.html) and
+ *	append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
+ * For all other databases, this setting is deprecated.
+ *
+ * host =>
+ * the host you connect to the database.  To add a socket or port number, use 'port' => #
+ *
+ * prefix =>
+ * Uses the given prefix for all the tables in this database.  This setting can be overridden
+ * on a per-table basis with the Model::$tablePrefix property.
+ *
+ * schema =>
+ * For Postgres and DB2, specifies which schema you would like to use the tables in. Postgres defaults to
+ * 'public', DB2 defaults to empty.
+ *
+ * encoding =>
+ * For MySQL, MySQLi, Postgres and DB2, specifies the character encoding to use when connecting to the
+ * database.  Uses database default.
+ *
+ */
+class DATABASE_CONFIG {
+
+	var $default = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'database_name',
+		'prefix' => '',
+	);
+
+	var $test = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'test_database_name',
+		'prefix' => '',
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/config/routes.php b/code/ryzom/tools/server/www/webtt/app/config/routes.php
new file mode 100644
index 000000000..7f5ab74fe
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/routes.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Routes configuration
+ *
+ * In this file, you set up routes to your controllers and their actions.
+ * Routes are very important mechanism that allows you to freely connect
+ * different urls to chosen controllers and their actions (functions).
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * Here, we are connecting '/' (base path) to controller called 'Pages',
+ * its action called 'display', and we pass a param to select the view file
+ * to use (in this case, /app/views/pages/home.ctp)...
+ */
+	Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+/**
+ * ...and connect the rest of 'Pages' controller's urls.
+ */
+	Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+/**
+ * Connect 'Pages' controller's urls for admin prefix.
+ */
+	Router::connect('/admin/pages/*', array('controller' => 'pages', 'action' => 'display', 'admin' => true));
+	Router::connect('/admin/pages', array('controller' => 'pages', 'action' => 'display', 'admin' => true, 'home'));
+	Router::connect('/admin', array('controller' => 'pages', 'action' => 'display', 'admin' => true, 'home'));
diff --git a/code/ryzom/tools/server/www/webtt/app/config/schema/db_acl.php b/code/ryzom/tools/server/www/webtt/app/config/schema/db_acl.php
new file mode 100644
index 000000000..96b96bd9a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/schema/db_acl.php
@@ -0,0 +1,73 @@
+<?php
+/*DbAcl schema generated on: 2007-11-24 15:11:13 : 1195945453*/
+/**
+ * This is Acl Schema file
+ *
+ * Use it to configure database for ACL
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config.sql
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/*
+ *
+ * Using the Schema command line utility
+ * cake schema run create DbAcl
+ *
+ */
+class DbAclSchema extends CakeSchema {
+
+	var $name = 'DbAcl';
+
+	function before($event = array()) {
+		return true;
+	}
+
+	function after($event = array()) {
+	}
+
+	var $acos = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'model' => array('type'=>'string', 'null' => true),
+			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'alias' => array('type'=>'string', 'null' => true),
+			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		);
+
+	var $aros = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'model' => array('type'=>'string', 'null' => true),
+			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'alias' => array('type'=>'string', 'null' => true),
+			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		);
+
+	var $aros_acos = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'aro_id' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
+			'aco_id' => array('type'=>'integer', 'null' => false, 'length' => 10),
+			'_create' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'_read' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'_update' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'_delete' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
+		);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/config/schema/i18n.php b/code/ryzom/tools/server/www/webtt/app/config/schema/i18n.php
new file mode 100644
index 000000000..27e1ec357
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/schema/i18n.php
@@ -0,0 +1,50 @@
+<?php
+/*i18n schema generated on: 2007-11-25 07:11:25 : 1196004805*/
+/**
+ * This is i18n Schema file
+ *
+ * Use it to configure database for i18n
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config.sql
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/*
+ *
+ * Using the Schema command line utility
+ * cake schema run create i18n
+ *
+ */
+class i18nSchema extends CakeSchema {
+
+	var $name = 'i18n';
+
+	function before($event = array()) {
+		return true;
+	}
+
+	function after($event = array()) {
+	}
+
+	var $i18n = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
+			'model' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+			'foreign_key' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
+			'field' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+			'content' => array('type'=>'text', 'null' => true, 'default' => NULL),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'locale' => array('column' => 'locale', 'unique' => 0), 'model' => array('column' => 'model', 'unique' => 0), 'row_id' => array('column' => 'foreign_key', 'unique' => 0), 'field' => array('column' => 'field', 'unique' => 0))
+		);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/config/schema/sessions.php b/code/ryzom/tools/server/www/webtt/app/config/schema/sessions.php
new file mode 100644
index 000000000..4581c29c6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/config/schema/sessions.php
@@ -0,0 +1,47 @@
+<?php
+/*Sessions schema generated on: 2007-11-25 07:11:54 : 1196004714*/
+/**
+ * This is Sessions Schema file
+ *
+ * Use it to configure database for Sessions
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config.sql
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/*
+ *
+ * Using the Schema command line utility
+ * cake schema run create Sessions
+ *
+ */
+class SessionsSchema extends CakeSchema {
+
+	var $name = 'Sessions';
+
+	function before($event = array()) {
+		return true;
+	}
+
+	function after($event = array()) {
+	}
+
+	var $cake_sessions = array(
+			'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
+			'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
+			'expires' => array('type'=>'integer', 'null' => true, 'default' => NULL),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/app_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/app_controller.php
new file mode 100644
index 000000000..03bfdf4cb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/app_controller.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Application level Controller
+ *
+ * This file is application-wide controller file. You can put all
+ * application-wide controller-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * This is a placeholder class.
+ * Create the same file in app/app_controller.php
+ *
+ * Add your application-wide methods in the class below, your controllers
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @link http://book.cakephp.org/view/957/The-App-Controller
+ */
+class AppController extends Controller {
+	var $components = array('DebugKit.Toolbar' => array(
+//			'panels' => array('variables'=>false)
+		), 'Session', 'PathResolver', 'Auth');
+	var $layout = "new";
+	
+	function beforeFilter() {
+		parent::beforeFilter();
+		$this->Auth->autoRedirect = false;
+		$this->Auth->authorize = 'controller';
+		$this->Auth->userScope = array('User.activated' => true, 'User.confirm_hash' => null);
+		$this->Auth->loginAction = array('admin' => false, 'controller' => 'users', 'action' => 'login');
+
+		if ($this->Auth->user('role') == "admin")
+			$this->Auth->allow("*");
+		else if ($this->Auth->user())
+		{
+			// $this->Auth->allow('index', 'view', 'add', 'delete', 'edit');
+			foreach ($this->methods as $method)
+				if (mb_strpos($method, 'admin_') !== 0)
+					$this->Auth->allow($method);
+		}
+	}
+
+	function isAuthorized() {
+/*		if (isset($this->params['prefix']) && $this->params['prefix'] == "admin" && $this->Auth->user('role') != "admin")
+		{
+			return false;
+		}
+
+		return true;*/
+		$action = $this->params['action'];
+		$allowedActions = array_map('strtolower', $this->Auth->allowedActions);
+		$isAllowed = (
+			$this->Auth->allowedActions == array('*') ||
+			in_array($action, $allowedActions)
+		);
+//		$this->log($isAllowed);
+		return $isAllowed;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/comments_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/comments_controller.php
new file mode 100644
index 000000000..a746622e4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/comments_controller.php
@@ -0,0 +1,164 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class CommentsController extends AppController {
+
+	var $name = 'Comments';
+
+	function index() {
+		$this->Comment->recursive = 0;
+		$this->set('comments', $this->paginate());
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid comment', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('comment', $this->Comment->read(null, $id));
+	}
+
+	function add() {
+		if (!empty($this->data)) {
+			$this->Comment->create();
+			if ($this->Comment->save($this->data)) {
+				$this->Session->setFlash(__('The comment has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The comment could not be saved. Please, try again.', true));
+			}
+		}
+		if (empty($this->passedArgs['identifier_id']))
+		{
+			$this->Session->setFlash(__('You need to choose identifier to comment', true));
+			$this->redirect(array('controller' => 'identifiers', 'action' => 'index'));
+		}
+		else
+		{
+			$identifier_id = $this->passedArgs['identifier_id'];
+			$this->set('identifier', $identifier = $this->Comment->Identifier->read(null, $identifier_id));
+//			$this->data['Translation.identifier_id'] = $identifier_id;
+		}
+//		$translations = $this->Comment->Translation->find('list');
+		$identifiers = $this->Comment->Identifier->find('list');
+		$users = $this->Comment->User->find('list');
+		$this->set(compact('translations', 'identifiers', 'users'));
+	}
+
+	function edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid comment', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Comment->save($this->data)) {
+				$this->Session->setFlash(__('The comment has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The comment could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('comment', $comment_data = $this->Comment->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $comment_data;
+		}
+		$translations = $this->Comment->Translation->find('list');
+		$identifiers = $this->Comment->Identifier->find('list');
+		$users = $this->Comment->User->find('list');
+		$this->set(compact('translations', 'identifiers', 'users'));
+	}
+
+	function delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for comment', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Comment->delete($id)) {
+			$this->Session->setFlash(__('Comment deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Comment was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+	function admin_index() {
+		$this->Comment->recursive = 0;
+		$this->set('comments', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid comment', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('comment', $this->Comment->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->Comment->create();
+			if ($this->Comment->save($this->data)) {
+				$this->Session->setFlash(__('The comment has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The comment could not be saved. Please, try again.', true));
+			}
+		}
+		$translations = $this->Comment->Translation->find('list');
+		$identifiers = $this->Comment->Identifier->find('list');
+		$users = $this->Comment->User->find('list');
+		$this->set(compact('translations', 'identifiers', 'users'));
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid comment', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Comment->save($this->data)) {
+				$this->Session->setFlash(__('The comment has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The comment could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('comment', $comment_data = $this->Comment->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $comment_data;
+		}
+		$translations = $this->Comment->Translation->find('list');
+		$identifiers = $this->Comment->Identifier->find('list');
+		$users = $this->Comment->User->find('list');
+		$this->set(compact('translations', 'identifiers', 'users'));
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for comment', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Comment->delete($id)) {
+			$this->Session->setFlash(__('Comment deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Comment was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/nel/nel.m4 b/code/ryzom/tools/server/www/webtt/app/controllers/components/empty
similarity index 100%
rename from code/nel/nel.m4
rename to code/ryzom/tools/server/www/webtt/app/controllers/components/empty
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/components/path_resolver.php b/code/ryzom/tools/server/www/webtt/app/controllers/components/path_resolver.php
new file mode 100644
index 000000000..8dcd96c99
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/components/path_resolver.php
@@ -0,0 +1,80 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class PathResolverComponent extends Object {
+	function getAssociationsTree($model)
+	{
+		$names = array();
+		foreach ($model->belongsTo as $childModel => $junk)
+		{
+			if ($model->alias != $model->{$childModel}->alias)
+				$names[] = $this->getAssociationsTree($model->{$childModel});
+		}
+		return array($model->alias => $names);
+	}
+
+	function t($i)
+	{
+		return str_repeat("\t",$i);
+	}
+
+	function findModelPath($name, $assocTree, $path = null)
+	{
+		foreach ($assocTree as $model => $childs)
+		{
+			if (!isset($path))
+				$path = array($model => "");
+			foreach ($childs as $childModelArray)
+			{
+				foreach ($childModelArray as $childModel => $newAssocTree)
+				{
+					$newPath[$childModel] = $path;
+					if ($name == $childModel)
+					{
+						return $newPath;
+					}
+					else
+					{
+						if ($ret = $this->findModelPath($name, array($childModel => $newAssocTree), $newPath))
+							return $ret;
+					}
+				}
+			}
+		}
+		
+	}
+
+	function beforeRender($controller)
+	{
+		if (!isset($controller->{$controller->modelClass}))
+			return 0;
+		$model = $controller->{$controller->modelClass};
+		if (!isset($model->belongsTo))
+			return 0;
+		$assocTree = $this->getAssociationsTree($model);
+		$rootModel = 'Language';
+		$path = $this->findModelPath($rootModel, $assocTree);
+		if (!$path && $model->alias == $rootModel)
+			$path = array($rootModel => array());
+		$controller->set('assocPath', $path);
+
+	}
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/file_identifiers_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/file_identifiers_controller.php
new file mode 100644
index 000000000..fd87e4928
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/file_identifiers_controller.php
@@ -0,0 +1,95 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class FileIdentifiersController extends AppController {
+
+	var $name = 'FileIdentifiers';
+
+	function index() {
+		$this->FileIdentifier->recursive = 0;
+		$this->set('fileIdentifiers', $this->paginate());
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid file identifier', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('fileIdentifier', $this->FileIdentifier->read(null, $id));
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid file identifier', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('fileIdentifier', $this->FileIdentifier->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->FileIdentifier->create();
+			if ($this->FileIdentifier->save($this->data)) {
+				$this->Session->setFlash(__('The file identifier has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The file identifier could not be saved. Please, try again.', true));
+			}
+		}
+		$importedTranslationFiles = $this->FileIdentifier->ImportedTranslationFile->find('list');
+		$identifiers = $this->FileIdentifier->Identifier->find('list');
+		$this->set(compact('importedTranslationFiles', 'identifiers'));
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid file identifier', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->FileIdentifier->save($this->data)) {
+				$this->Session->setFlash(__('The file identifier has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The file identifier could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('fileIdentifier', $fileIdentifier_data = $this->FileIdentifier->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $fileIdentifier_data;
+		}
+		$importedTranslationFiles = $this->FileIdentifier->ImportedTranslationFile->find('list');
+		$identifiers = $this->FileIdentifier->Identifier->find('list');
+		$this->set(compact('importedTranslationFiles', 'identifiers'));
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for file identifier', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->FileIdentifier->delete($id)) {
+			$this->Session->setFlash(__('File identifier deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('File identifier was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/identifier_columns_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/identifier_columns_controller.php
new file mode 100644
index 000000000..0c29ebe22
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/identifier_columns_controller.php
@@ -0,0 +1,98 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class IdentifierColumnsController extends AppController {
+
+	var $name = 'IdentifierColumns';
+
+	function index() {
+		$this->IdentifierColumn->recursive = 0;
+		$this->set('identifierColumns', $this->paginate());
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid identifier column', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('identifierColumn', $this->IdentifierColumn->read(null, $id));
+	}
+
+	function admin_index() {
+		$this->IdentifierColumn->recursive = 0;
+		$this->set('identifierColumns', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid identifier column', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('identifierColumn', $this->IdentifierColumn->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->IdentifierColumn->create();
+			if ($this->IdentifierColumn->save($this->data)) {
+				$this->Session->setFlash(__('The identifier column has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The identifier column could not be saved. Please, try again.', true));
+			}
+		}
+		$identifiers = $this->IdentifierColumn->Identifier->find('list');
+		$this->set(compact('identifiers'));
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid identifier column', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->IdentifierColumn->save($this->data)) {
+				$this->Session->setFlash(__('The identifier column has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The identifier column could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('identifierColumn', $identifierColumn_data = $this->IdentifierColumn->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $identifierColumn_data;
+		}
+		$identifiers = $this->IdentifierColumn->Identifier->find('list');
+		$this->set(compact('identifiers'));
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for identifier column', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->IdentifierColumn->delete($id)) {
+			$this->Session->setFlash(__('Identifier column deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Identifier column was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/identifiers_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/identifiers_controller.php
new file mode 100644
index 000000000..57bb7e812
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/identifiers_controller.php
@@ -0,0 +1,130 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class IdentifiersController extends AppController {
+	var $name = 'Identifiers';
+	function index() {
+		$this->Identifier->recursive = 0;
+		$conditions = null;
+		if (isset($this->passedArgs['language']) && $lang = $this->passedArgs['language'])
+			$conditions = array('Identifier.language_id' => $lang);
+		if (isset($this->passedArgs['translation_file_id']) && $translation_file_id = $this->passedArgs['translation_file_id'])
+			$conditions = array('Identifier.translation_file_id' => $translation_file_id);
+		$this->set('identifiers', $this->paginate($conditions));
+	}
+
+	function admin_withoutBestTranslation()
+	{
+		if (isset($this->passedArgs['imported_translation_file_id']) && $imported_translation_file_id = $this->passedArgs['imported_translation_file_id'])
+		{
+			$identifier_ids = $this->Identifier->withoutBestTranslation(array('ImportedTranslationFile.id' => $this->passedArgs['imported_translation_file_id']));
+			if ($identifier_ids === false)
+			{
+				$this->Session->setFlash(__('Error: no conditions specified', true));
+			}
+			else
+			{
+				$conditions = array('Identifier.id' => $identifier_ids, 'BestTranslation.id' => NULL);
+				$this->set('identifiers', $this->paginate($conditions));
+			}
+//			$this->log($this->Identifier->withoutBestTranslation(array('ImportedTranslationFile.id' => $this->passedArgs['imported_translation_file_id'])));
+			// TOTHINK: try to achieve that with custom find with pagination
+		}
+		else
+		{
+			$this->Session->setFlash(__('No imported file specified', true));
+			$this->redirect($this->referer());
+		}
+		$this->render('index');
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid identifier', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('identifier', $identifier = $this->Identifier->read(null, $id));
+		if ($identifier)
+			$this->set('identifierNeighbours', $this->Identifier->getNeighbours($id));
+	}
+
+	function admin_index() {
+		$this->Identifier->recursive = 0;
+		$this->set('identifiers', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid identifier', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('identifier', $identifier = $this->Identifier->read(null, $id));
+		if ($identifier)
+			$this->set('identifierNeighbours', $this->Identifier->getNeighbours($id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->Identifier->create();
+			if ($this->Identifier->save($this->data)) {
+				$this->Session->setFlash(__('The identifier has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The identifier could not be saved. Please, try again.', true));
+			}
+		}
+		$languages = $this->Identifier->Language->find('list');
+		$this->set(compact('languages'));
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid identifier', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Identifier->save($this->data)) {
+				$this->Session->setFlash(__('The identifier has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The identifier could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('identifier', $identifier_data = $this->Identifier->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $identifier_data;
+		}
+		$languages = $this->Identifier->Language->find('list');
+		$this->set(compact('languages'));
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for identifier', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Identifier->delete($id)) {
+			$this->Session->setFlash(__('Identifier deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Identifier was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/imported_translation_files_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/imported_translation_files_controller.php
new file mode 100644
index 000000000..2a64123bb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/imported_translation_files_controller.php
@@ -0,0 +1,97 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class ImportedTranslationFilesController extends AppController {
+
+	var $name = 'ImportedTranslationFiles';
+	function index() {
+		$this->ImportedTranslationFile->recursive = 0;
+		$this->set('importedTranslationFiles', $this->paginate());
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid translation file', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('importedTranslationFile', $this->ImportedTranslationFile->read(null, $id));
+	}
+
+	function admin_index() {
+		$this->ImportedTranslationFile->recursive = 0;
+		$this->set('importedTranslationFiles', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid translation file', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('importedTranslationFile', $this->ImportedTranslationFile->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->ImportedTranslationFile->create();
+			if ($this->ImportedTranslationFile->save($this->data)) {
+				$this->Session->setFlash(__('The translation file has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The translation file could not be saved. Please, try again.', true));
+			}
+		}
+		$languages = $this->ImportedTranslationFile->Language->find('list');
+		$this->set(compact('languages'));
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid translation file', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->ImportedTranslationFile->save($this->data)) {
+				$this->Session->setFlash(__('The translation file has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The translation file could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('importedTranslationFile', $importedTranslationFile_data = $this->ImportedTranslationFile->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $importedTranslationFile_data;
+		}
+		$languages = $this->ImportedTranslationFile->Language->find('list');
+		$this->set(compact('languages'));
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for translation file', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->ImportedTranslationFile->delete($id)) {
+			$this->Session->setFlash(__('Translation file deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Translation file was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php
new file mode 100644
index 000000000..7b0626316
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php
@@ -0,0 +1,96 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class LanguagesController extends AppController {
+
+	var $name = 'Languages';
+	var $layout="new";
+
+	function index() {
+		App::import("Vendor","functions_render");
+		$this->Language->recursive = 0;
+		$this->set('languages', $this->paginate());
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid language', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('language', $this->Language->read(null, $id));
+	}
+
+	function admin_index() {
+		$this->Language->recursive = 0;
+		$this->set('languages', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid language', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('language', $this->Language->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->Language->create();
+			if ($this->Language->save($this->data)) {
+				$this->Session->setFlash(__('The language has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The language could not be saved. Please, try again.', true));
+			}
+		}
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid language', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Language->save($this->data)) {
+				$this->Session->setFlash(__('The language has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The language could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('language', $language_data = $this->Language->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $language_data;
+		}
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for language', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Language->delete($id)) {
+			$this->Session->setFlash(__('Language deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Language was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php.bak b/code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php.bak
new file mode 100644
index 000000000..46234b733
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php.bak
@@ -0,0 +1,125 @@
+<?php
+class LanguagesController extends AppController {
+
+	var $name = 'Languages';
+
+	function index() {
+		$this->Language->recursive = 0;
+		$this->set('languages', $this->paginate());
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid language', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('language', $this->Language->read(null, $id));
+/*		$options = array('Language.id' => $id, 'recursive' => 1,
+				"joins" => array(
+					array('table' => '
+				),
+			);
+	var_dump($this);
+		$this->set('language', $bumz = $this->Language->find('first', $options));
+var_dump($bumz);*/
+//		$this->set('identifier', $this->Language->TranslationFile->read(null, $id));
+	}
+
+	function add() {
+		if (!empty($this->data)) {
+			$this->Language->create();
+			if ($this->Language->save($this->data)) {
+				$this->Session->setFlash(__('The language has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The language could not be saved. Please, try again.', true));
+			}
+		}
+	}
+
+	function edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid language', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Language->save($this->data)) {
+				$this->Session->setFlash(__('The language has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The language could not be saved. Please, try again.', true));
+			}
+		}
+		if (empty($this->data)) {
+			$this->data = $this->Language->read(null, $id);
+		}
+	}
+
+	function delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for language', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Language->delete($id)) {
+			$this->Session->setFlash(__('Language deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Language was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+	function admin_index() {
+		$this->Language->recursive = 0;
+		$this->set('languages', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid language', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('language', $this->Language->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->Language->create();
+			if ($this->Language->save($this->data)) {
+				$this->Session->setFlash(__('The language has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The language could not be saved. Please, try again.', true));
+			}
+		}
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid language', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Language->save($this->data)) {
+				$this->Session->setFlash(__('The language has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The language could not be saved. Please, try again.', true));
+			}
+		}
+		if (empty($this->data)) {
+			$this->data = $this->Language->read(null, $id);
+		}
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for language', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Language->delete($id)) {
+			$this->Session->setFlash(__('Language deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Language was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/pages_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/pages_controller.php
new file mode 100644
index 000000000..a6d2362b6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/pages_controller.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Static content controller.
+ *
+ * This file will render views from views/pages/
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Static content controller
+ *
+ * Override this controller by placing a copy in controllers directory of an application
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @link http://book.cakephp.org/view/958/The-Pages-Controller
+ */
+class PagesController extends AppController {
+
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Pages';
+
+/**
+ * Default helper
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html', 'Session');
+
+/**
+ * This controller does not use a model
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * Displays a view
+ *
+ * @param mixed What page to display
+ * @access public
+ */
+	function display() {
+		$path = func_get_args();
+
+
+		$count = count($path);
+		if (!$count) {
+			$this->redirect('/');
+		}
+		$page = $subpage = $title_for_layout = null;
+
+		if (!empty($path[0])) {
+			$page = $path[0];
+		}
+		if (!empty($path[1])) {
+			$subpage = $path[1];
+		}
+		if (!empty($path[$count - 1])) {
+			$title_for_layout = Inflector::humanize($path[$count - 1]);
+		}
+		$this->set(compact('page', 'subpage', 'title_for_layout'));
+		$this->render(implode('/', $path));
+	}
+
+	function admin_display() {
+		$path = func_get_args();
+
+/*		if (isset($this->params['admin']))
+			array_shift($path);*/
+		if (!isset($path[0]) || $path[0] != 'admin') {
+			//This adds admin to the beginning of the path so the pages controller will look in the 'admin' folder in pages directory
+			$path = array_merge((array)'admin', $path);
+		}
+		$count = count($path);
+		if (!$count) {
+			$this->redirect('/');
+		}
+		$page = $subpage = $title_for_layout = null;
+
+		if (!empty($path[0])) {
+			$page = $path[0];
+		}
+		if (!empty($path[1])) {
+			$subpage = $path[1];
+		}
+		if (!empty($path[$count - 1])) {
+			$title_for_layout = Inflector::humanize($path[$count - 1]);
+		}
+		$this->set(compact('page', 'subpage', 'title_for_layout'));
+		$this->render(implode('/', $path));
+	}
+	
+	function beforeFilter() {
+		parent::beforeFilter();
+		$this->Auth->allow(array('display'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/raw_files_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/raw_files_controller.php
new file mode 100644
index 000000000..0620a1312
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/raw_files_controller.php
@@ -0,0 +1,476 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class RawFilesController extends AppController {
+
+	var $name = 'RawFiles';
+	var $helpers = array('Paginator', 'Time', 'Session');
+	var $components = array('Session');
+
+	function admin_index() {
+		$this->RawFile->recursive = 1;
+		$conditions['RawFile.dir'] = array("diff","translated");
+		$this->set('rawFiles', $this->paginate($conditions));
+	}
+
+	function admin_listdir($extension = null) {
+		$this->RawFile->recursive = 0;
+		$this->set('rawFiles', $this->paginate(array("RawFile.extension" => $extension)));
+		$this->rendeR("admin_index");
+	}
+
+	function admin_view($dir = null, $filename = null) {
+		if (!$filename) {
+			$this->Session->setFlash(__('Invalid raw file', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!$this->RawFile->open($dir, $filename))
+		{
+			$this->Session->setFlash(__('Can\'t open file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+		$this->set('rawFile', $rawFile = $this->RawFile->find('first', array(
+			"conditions" => array(
+				"RawFile.dir" => $dir,
+				"RawFile.filename" => $filename,
+				),
+					)));
+		
+		$this->set('fileContent', $this->RawFile->_currentFile->read());
+	}
+
+	function admin_import($dir = null, $filename = null) {
+		if (!$filename) {
+			$this->Session->setFlash(__('Invalid file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+		if (!$this->RawFile->open($dir, $filename))
+		{
+			$this->Session->setFlash(__('Can\'t open file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+		$importedTranslationFileModel = $this->RawFile->ImportedTranslationFile;
+		$translationFileModel = $importedTranslationFileModel->TranslationFile;
+		$languageModel = $translationFileModel->Language;
+		$identifierModel = $translationFileModel->Identifier;
+		$identifierColumnModel = $identifierModel->IdentifierColumn;
+		$translationModel = $identifierModel->Translation;
+		$fileIdentifierModel = $importedTranslationFileModel->FileIdentifier;
+
+		$importedTranslationFile = $importedTranslationFileModel->find('first', array('conditions' => array('ImportedTranslationFile.filename' => $dir . DS . $filename), "recursive" => -1));
+		if ($importedTranslationFile)
+		{
+			$this->Session->setFlash(__('Translation file already imported', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+
+		$languageCode = $this->RawFile->getLanguageCode($filename);
+		if (!$languageCode)
+		{
+			$this->Session->setFlash(__('Can\'t identify language', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+		$language = $languageModel->find('first', array('conditions' => array('code' => $languageCode), "recursive" => -1));
+		$language_id = $language['Language']['id'];
+		if (!$language_id)
+		{
+			$this->Session->setFlash(__('Can\'t find language in database', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+
+		$filename_template = preg_replace('/_diff/', '', $filename);
+		$filename_template = preg_replace('/_[A-F0-9]{8}/', '', $filename_template);
+
+//		for global identifiers
+/*		if (preg_match('|^.*_' . $language['Language']['code'] . '.*$|', $filename_template, $matches))
+			$filename_template = preg_replace('/_' . $language['Language']['code'] . '/', '_LC', $filename_template);
+		else if (preg_match('|^.*' . $language['Language']['code'] . '.*$|', $filename_template, $matches))
+			$filename_template = preg_replace('/' . $language['Language']['code'] . '/', 'LC', $filename_template);
+		else
+		{
+			$this->Session->setFlash(__('Can\'t create master translation filename template from current filename', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}*/
+		
+		$translationFile = $translationFileModel->find('first', array('conditions' => array('filename_template' => $filename_template), "recursive" => -1));
+		if (!$translationFile)
+		{
+			$tf_data['filename_template'] = $filename_template;
+			$tf_data['language_id'] = $language_id;
+		}
+		else
+			$tf_data['id'] = $translationFile['TranslationFile']['id'];
+
+		$res = $translationFileModel->saveAll(array('TranslationFile' => $tf_data));
+		$translation_file_id = $translationFileModel->id;
+
+		$parsedFile = $this->RawFile->parseFile();
+		if (!$parsedFile)
+		{
+			$this->Session->setFlash(__('Error importing file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+
+		ini_set('max_execution_time',0);
+
+		$processedEntities = 0;
+
+		$importedTranslationFileModel->create();
+		$data['ImportedTranslationFile']['language_id'] = $language_id;
+		$data['ImportedTranslationFile']['translation_file_id'] = $translation_file_id;
+		$data['ImportedTranslationFile']['filename'] = $dir . DS . $filename;
+		$data['ImportedTranslationFile']['file_last_modified_date'] = $this->RawFile->_currentFileLastChange;
+
+		$importedTranslationFileModel->saveAll($data);
+		$importedTranslationFile_id = $importedTranslationFileModel->id;
+
+		foreach ($parsedFile as $ent)
+		{
+			if (!isset($ent['type']))
+				var_dump($ent);
+
+			if ($ent['type'] == 'sheet_description')
+			{
+				$_columns = $ent['columns'];
+				$_sheet_id_column = $ent['sheet_id_column'];
+			}
+
+			if ($ent['type'] != "string" && $ent['type'] != "phrase" && $ent['type'] != 'sheet')
+				continue;
+
+			$newIdentifier = false;
+			$i_data = array();
+			$i_data['language_id'] = $language_id;
+			$i_data['translation_file_id'] = $translation_file_id;
+			if (isset($ent['index']))
+				$i_data['translation_index'] = $ent['index'];
+			if (isset($ent['arguments']))
+				$i_data['arguments'] = $ent['arguments'];
+	
+			if (isset($ent['columns']) && is_array($ent['columns']) && !isset($ent['string']))
+			{
+				foreach ($ent['columns'] as $column_no => $value)
+				{
+					$ent['string'] .= $value . "\t";
+				}
+				$ent['string'] = substr($ent['string'], 0, -1);
+			}
+
+			if (isset($ent['diff']))
+			{
+				$i_data['reference_string'] = $ent['string'];
+			}
+
+			unset($identifierModel->id);
+			$identifier = $identifierModel->find('first',array('conditions' => array('Identifier.identifier' => $ent['identifier'], 'Identifier.translation_file_id' => $translation_file_id), 'contain' => 'IdentifierColumn'));
+			if ($identifier)
+			{
+				$i_data['id']=$identifier['Identifier']['id'];
+			}
+			else
+			{
+				$identifierModel->create();
+				$i_data['identifier'] = $ent['identifier'];
+				if (isset($ent['diff']))
+					$i_data['translated'] = false;
+				$newIdentifier = true;
+			}
+			$res = $identifierModel->saveAll($tarr = array('Identifier' => $i_data));
+			$identifier_id = $identifierModel->id;
+
+				if (!isset($ent['diff'])) // it is translated file and we add translation
+				{
+					unset($translationModel->id);
+					unset($t_data);
+					$translationHash = $translationModel->makeHash($ent);
+
+					if ($newIdentifier) // ovbiously there's no translation for identifier we just created
+						$translation = array();
+					else
+					{
+						$this->log('new translation check');
+						$this->log($translationHash);
+						$translation = $translationModel->find('first',array('conditions' => array('Translation.identifier_id' => $identifier_id, 'Translation.translation_text' => $ent["string"], 'Translation.translation_hash' => NULL), "recursive" => -1));
+						$this->log($translation);
+						if (!$translation)
+						{
+							$translation = $translationModel->find('first',array('conditions' => array('Translation.identifier_id' => $identifier_id, 'Translation.translation_hash' => $translationHash), "recursive" => -1));
+							$this->log($translation);
+						}
+						$this->log('new translation check end');
+					}
+
+					if (!$translation)
+					{
+						$this->log('new translation');
+						$t_data['identifier_id'] = $identifier_id;
+						$t_data['translation_text'] = $ent['string'];
+						$t_data['user_id'] = $this->Auth->user('id');
+						$t_data['translation_hash'] = $translationHash;
+						$translationModel->save(array('Translation' => $t_data));
+					}
+/*					else
+						$t_data['id'] = $translation['Translation']['id'];*/
+					if ($translation)
+						$parentTranslation_id = $translation['Translation']['id'];
+					else
+						$parentTranslation_id = $translationModel->id;
+				}
+
+			if (isset($ent['columns']) && is_array($ent['columns']))
+			{
+				$ic_data = array();
+				foreach ($ent['columns'] as $column_no => $value)
+				{
+					unset($identifierColumnModel->id);
+					$ic_arr = array();
+					$ic_arr['identifier_id'] = $identifier_id;
+					$column_name = $_columns[$column_no];
+					if (!$newIdentifier)
+					{
+						foreach ($identifier['IdentifierColumn'] as $identifierColumn_no => $identifierColumn)
+						{
+							if ($identifierColumn['column_name'] == $column_name)
+							{
+								$ic_arr['id'] = $identifierColumn['id'];
+								break;
+							}
+						}
+					}
+					$ic_arr['column_name'] = $column_name;
+					if (isset($ent['diff']))
+						$ic_arr['reference_string'] = $value;
+					$ic_data[] = $ic_arr;
+					$res = $identifierColumnModel->save($ic_arr);
+					$identifierColumn_id = $identifierColumnModel->id;
+					
+					if (!isset($ent['diff'])) // it is translated file and we add translation
+					{
+						unset($translationModel->id);
+						unset($t_data);
+						if ($newIdentifier) // ovbiously there's no translation for identifier we just created
+							$translation = array();
+						else
+							$translation = $translationModel->find('first',array('conditions' => array('Translation.identifier_column_id' => $identifierColumn_id, 'Translation.translation_text' => $value, 'Translation.parent_id' => $parentTranslation_id), "recursive" => -1));
+
+						if (!$translation)
+						{
+							$t_data['identifier_column_id'] = $identifierColumn_id;
+							$t_data['translation_text'] = $value;
+							$t_data['user_id'] = $this->Auth->user('id');
+							$t_data['parent_id'] = $parentTranslation_id;
+							$translationModel->save(array('Translation' => $t_data));
+						}
+/*						else
+							$t_data['id'] = $translation['Translation']['id'];*/
+					}
+				}
+			}
+
+			unset($fileIdentifierModel->id);
+			$fi_data = array();
+			$fi_data['imported_translation_file_id'] = $importedTranslationFile_id;
+			// TOTHINK - set FileIdentifier['id'] if we import already imported file (not supporting importing imported file)
+//			$identifier = $this->ImportedTranslationFile->FileIdentifier->find('first',array('conditions' => array('FileIdentifier.identifier' => $ent['identifier'], 'FileIdentifier.translation_file_id' => $)));
+//			$data['FileIdentifier']['translation_file_id'] = $this->ImportedTranslationFile->id;
+			if (isset($ent['arguments']))
+				$fi_data['arguments'] = $ent['arguments'];
+
+			if (isset($_sheet_id_column))
+				$fi_data['arguments'] = $_sheet_id_column;
+
+			if (isset($ent['diff'])) // it is diff file
+			{
+				if (isset($ent['command']))
+					$fi_data['command'] = $ent['command'];
+				else
+					$fi_data['command'] = "DIFF " . mb_strtoupper($ent['diff']);
+
+				if (isset($ent['string']))
+					$fi_data['reference_string'] = $ent['string'];
+
+				if (isset($ent['index']))
+					$fi_data['translation_index'] = $ent['index'];
+				$fi_data['identifier_id'] = $identifier_id;
+
+				$res = $fileIdentifierModel->saveAll($tarr = array('FileIdentifier' => $fi_data));
+				$fileIdentifier_id = $fileIdentifierModel->id;
+			}
+
+			$processedEntities++;
+
+		}
+		if ($processedEntities == 0)
+		{
+			$importedTranslationFileModel->delete($importedTranslationFile_id);
+			$this->Session->setFlash(__('File was not imported because it seems empty', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+		else
+		{
+			$this->Session->setFlash(__('Translation file imported into database successfully. Processed entities: ' . $processedEntities, true));
+			$this->redirect(array('controller' => 'imported_translation_files', 'action' => 'view', $importedTranslationFileModel->id));
+			return 0;
+		}
+	}
+
+	function admin_export($dir = null, $filename = null, $importedTranslationFileId = null) {
+		if (!$filename) {
+			$this->Session->setFlash(__('Invalid file', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+		if (!$this->RawFile->open($dir, $filename, $writable = true))
+		{
+			$this->Session->setFlash(__('Can\'t open file for writing', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+
+		$importedTranslationFileModel = $this->RawFile->ImportedTranslationFile;
+
+		$importedTranslationFileModel->contain(array(
+			'TranslationFile',
+			'FileIdentifier' => array('Identifier' => array(
+				'Translation',
+				'IdentifierColumn' => 'Translation',
+				)),
+		));
+
+		$importedTranslationFile = $importedTranslationFileModel->find('first', array(
+			'conditions' => array(
+				'ImportedTranslationFile.filename' => $dir . DS . $filename
+				),
+			)
+		);
+		if (!$importedTranslationFile)
+		{
+			$this->Session->setFlash(__('No imported translation file found for chosen file', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+		
+		$translationFileModel = $importedTranslationFileModel->TranslationFile;
+		$identifierModel = $translationFileModel->Identifier;
+
+		// check if all identifiers have "best" translation
+		$identifier_ids = $identifierModel->withoutBestTranslation(array('ImportedTranslationFile.id' => $importedTranslationFile['ImportedTranslationFile']['id']));
+		if ($identifier_ids === false)
+		{
+			$this->Session->setFlash(__('Error: no conditions specified', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+		else if (count($identifier_ids) > 0)
+		{
+			$this->Session->setFlash(__('Best translation is not set for some of the identifiers in this file. Set best translation before export.', true));
+			$this->redirect(array('controller' => 'identifiers', 'action' => 'withoutBestTranslation', 'imported_translation_file_id' => $importedTranslationFile['ImportedTranslationFile']['id']));
+			return 0;
+		}
+
+		$translationFile_id = $importedTranslationFile['ImportedTranslationFile']['translation_file_id'];
+
+		$i=0;
+		$sortResult = Set::sort($importedTranslationFile['FileIdentifier'], '{n}.translation_index', 'asc');
+		if (!$sortResult)
+		{
+			$this->Session->setFlash(__('Sorting error', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+
+		foreach ($sortResult as $fileIdentifier)
+		{
+			if ($fileIdentifier['Identifier']['IdentifierColumn'] && !isset($entities[0]))
+			{
+				foreach ($fileIdentifier['Identifier']['IdentifierColumn'] as $column_no => $identifierColumn)
+					$_columns[$column_no] = $identifierColumn['column_name'];
+				$ent['columns'] = $_columns;
+				$ent['type'] = 'sheet_description';
+				$ent['sheet_id_column'] = $fileIdentifier['arguments'];
+				$ent['diff'] = ((isset($fileIdentifier['command']) && !empty($fileIdentifier['command'])) ? true : null);
+				$entities[] = $ent;
+				$ent = array();
+			}
+			$ent = array(
+				'diff' => ((isset($fileIdentifier['command']) && !empty($fileIdentifier['command'])) ? $fileIdentifier['command'] : null),
+				'command' => ((isset($fileIdentifier['command']) && !empty($fileIdentifier['command'])) ? $fileIdentifier['command'] : null),
+				'index' => ((isset($fileIdentifier['translation_index']) && !empty($fileIdentifier['translation_index'])) ? $fileIdentifier['translation_index'] : null),
+				'internal_index' => $i++,
+				'type' => ((count($fileIdentifier['Identifier']['IdentifierColumn']) > 0) ? 'sheet' : 'string'),
+				'identifier' => $fileIdentifier['Identifier']['identifier'],
+				'arguments' => ((isset($fileIdentifier['arguments']) && !empty($fileIdentifier['arguments'])) ? $fileIdentifier['arguments'] : null),
+			);
+			if (isset($fileIdentifier['Identifier']['Translation'][0]))
+			{
+				$ent['string'] = $fileIdentifier['Identifier']['Translation'][0]['translation_text'];
+			}
+			else if (isset($fileIdentifier['Identifier']['Translation']['translation_text']))
+				$ent['string'] = $fileIdentifier['Identifier']['Translation']['translation_text'];
+
+			if (isset($fileIdentifier['Identifier']['BestTranslation']['translation_text']))
+				$ent['string'] = $fileIdentifier['Identifier']['BestTranslation']['translation_text'];
+
+			if (($export_reference_if_empty_translation = true) && !isset($ent['string']))
+				$ent['string'] = $fileIdentifier['Identifier']['reference_string'];
+			else if (!isset($ent['string']))
+				$ent['string'] = '';
+
+			foreach ($fileIdentifier['Identifier']['IdentifierColumn'] as $column_no => $identifierColumn)
+			{
+				if (isset($identifierColumn['Translation'][0]))
+					$ent['columns'][$column_no] = $identifierColumn['Translation'][0]['translation_text'];
+				else if (isset($identifierColumn['Translation']['translation_text']))
+					$ent['columns'][$column_no] = $identifierColumn['Translation']['translation_text'];
+
+				if (isset($identifierColumn['BestTranslation']['translation_text']))
+					$ent['columns'][$column_no] = $identifierColumn['BestTranslation']['translation_text'];
+
+				if ($export_reference_if_empty_translation && !isset($ent['columns'][$column_no]))
+					$ent['columns'][$column_no] = $identifierColumn['reference_string'];
+				else if (!isset($ent['columns'][$column_no]))
+					$ent['columns'][$column_no] = '';
+			}
+			if ($fileIdentifier['command'])
+				$ent['command'] = $ent['diff'] = $fileIdentifier['command'];
+
+			$entities[] = $ent;
+		}
+
+		ini_set('max_execution_time',0);
+
+		$result = $this->RawFile->buildFile($entities);
+		if (!$result)
+		{
+			$this->Session->setFlash(__('Error exporting file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/translation_files_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/translation_files_controller.php
new file mode 100644
index 000000000..dc386711b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/translation_files_controller.php
@@ -0,0 +1,102 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class TranslationFilesController extends AppController {
+
+	var $name = 'TranslationFiles';
+
+	function index() {
+		$this->TranslationFile->recursive = 0;
+
+		$conditions = null;
+		if (isset($this->passedArgs['language_id']) && $language_id = $this->passedArgs['language_id'])
+			$conditions = array('TranslationFile.language_id' => $language_id);
+		$this->set('translationFiles', $this->paginate($conditions));
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid translation file', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('translationFile', $this->TranslationFile->read(null, $id));
+	}
+
+	function admin_index() {
+		$this->TranslationFile->recursive = 0;
+		$this->set('translationFiles', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid translation file', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('translationFile', $this->TranslationFile->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->TranslationFile->create();
+			if ($this->TranslationFile->save($this->data)) {
+				$this->Session->setFlash(__('The translation file has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The translation file could not be saved. Please, try again.', true));
+			}
+		}
+		$languages = $this->TranslationFile->Language->find('list');
+		$this->set(compact('languages'));
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid translation file', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->TranslationFile->save($this->data)) {
+				$this->Session->setFlash(__('The translation file has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The translation file could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('translationFile', $translationFile_data = $this->TranslationFile->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $translationFile_data;
+		}
+		$languages = $this->TranslationFile->Language->find('list');
+		$this->set(compact('languages'));
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for translation file', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->TranslationFile->delete($id)) {
+			$this->Session->setFlash(__('Translation file deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Translation file was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/translations_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/translations_controller.php
new file mode 100644
index 000000000..875799e10
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/translations_controller.php
@@ -0,0 +1,212 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class TranslationsController extends AppController {
+
+	var $name = 'Translations';
+
+	function index() {
+		$this->Translation->recursive = 0;
+		$conditions = null;
+		if (isset($this->passedArgs['identifier_id']) && $identifier = $this->passedArgs['identifier_id'])
+			$conditions = array('Translation.identifier_id' => $identifier);
+		$this->set('translations', $this->paginate($conditions));
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid translation', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('translation', $translation = $this->Translation->read(null, $id));
+		if (isset($translation['Translation']['identifier_id']))
+		{
+			$this->set('identifier', $identifier = $this->Translation->Identifier->read(null, $translation['Translation']['identifier_id']));
+			$this->set('columnTranslations', $columnTranslations = $this->Translation->find('all', array('conditions' => array('Translation.parent_id' => $translation['Translation']['id']), 'order' => 'Translation.id')));
+		}
+		if ($identifier_id = $translation['Translation']['identifier_id'])
+			$this->set('identifierNeighbours', $this->Translation->Identifier->getNeighbours($identifier_id));
+	}
+
+	function add() {
+		if (!empty($this->data)) {
+			$this->Translation->create();
+			if ($this->data['ChildTranslation'])
+			{
+				unset($translationText);
+				foreach ($this->data['ChildTranslation'] as $num => $childTranslation)
+				{
+					$ent['columns'][] = $childTranslation['translation_text'];
+					$translationText .= $childTranslation['translation_text'] . "\t";
+				}
+				$this->data['Translation']['translation_text'] = substr($translationText, 0, -1);
+			}
+			else
+				$ent['string'] = $this->data['Translation']['translation_text'];
+			sort($ent['columns']);
+			$this->data['Translation']['translation_hash'] = $this->Translation->makeHash($ent);
+			$this->data['Identifier']['id'] = $this->data['Translation']['identifier_id'];
+			$this->data['Identifier']['translated'] = 1;
+			$res = $this->Translation->saveAll($this->data);
+			$this->log($this->data);
+			if ($res) {
+				$this->Session->setFlash(__('The translation has been saved', true));
+				if ($this->params['form']['Next'])
+				{
+					$identifier_id = $this->data['Translation']['identifier_id'];
+					$identifier = $this->Translation->Identifier->read(null, $identifier_id);
+					$identifierNeighbors = $this->Translation->Identifier->find('neighbors', array('field' => 'id', 'value' => $identifier_id, 'conditions' => array('translation_file_id' => $identifier['Identifier']['translation_file_id'])));
+					if ($nextIdentifier = $identifierNeighbors['next'])
+						$this->redirect(array('action' => 'add', 'identifier_id' => $nextIdentifier['Identifier']['id']));
+					else
+						$this->redirect(array('controller' => 'identifiers', 'action' => 'index', 'translation_file_id' => $identifier['Identifier']['translation_file_id']));
+				}
+				else
+					$this->redirect(array('controller' => 'identifiers', 'action' => 'view', $this->data['Translation']['identifier_id']));
+			} else {
+				$this->Session->setFlash(__('The translation could not be saved. Please, try again.', true));
+			}
+		}
+		if (empty($this->passedArgs['identifier_id']))
+		{
+			$this->Session->setFlash(__('You need to choose identifier for translation', true));
+			$this->redirect($this->referer());
+		}
+		else
+		{
+			$identifier_id = $this->passedArgs['identifier_id'];
+			$this->set('identifier', $identifier = $this->Translation->Identifier->read(null, $identifier_id));
+			$this->set('identifierNeighbours', $this->Translation->Identifier->getNeighbours($identifier_id));
+			$this->set('identifierColumns', $identifierColumns = $this->Translation->IdentifierColumn->find('list', array('conditions' => array('identifier_id' => $identifier_id), 'order' => 'IdentifierColumn.id')));
+			if ($identifierColumns)
+				$this->set('identifierColumnsDetails', Set::combine($this->Translation->IdentifierColumn->find('all', array('conditions' => array('identifier_id' => $identifier_id), 'order' => 'IdentifierColumn.id')), '{n}.IdentifierColumn.id', '{n}.IdentifierColumn'));
+		}
+		$users = $this->Translation->User->find('list');
+		$this->set(compact('identifiers', 'users'));
+	}
+
+	function edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid translation', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->data['ChildTranslation'])
+			{
+				unset($translationText);
+				foreach ($this->data['ChildTranslation'] as $num => $childTranslation)
+				{
+					$ent['columns'][] = $childTranslation['translation_text'];
+					$translationText .= $childTranslation['translation_text'] . "\t";
+				}
+				$this->data['Translation']['translation_text'] = substr($translationText, 0, -1);
+			}
+			else
+				$ent['string'] = $this->data['Translation']['translation_text'];
+			$this->data['Translation']['translation_hash'] = $this->Translation->makeHash($ent);
+			$this->data['Identifier']['id'] = $this->data['Translation']['identifier_id'];
+			$this->data['Identifier']['translated'] = 1;
+			if ($this->Translation->saveAll($this->data)) {
+				$this->Session->setFlash(__('The translation has been saved', true));
+				$this->redirect(array('controller' => 'identifiers', 'action' => 'view', $this->data['Translation']['identifier_id']));
+			} else {
+				$this->Session->setFlash(__('The translation could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('translation', $translation_data = $this->Translation->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $translation_data;
+		}
+		$identifier_id= $translation_data['Translation']['identifier_id'];
+		$this->set('identifierNeighbours', $this->Translation->Identifier->getNeighbours($identifier_id));
+		$this->set('identifierColumns', $identifierColumns = $this->Translation->IdentifierColumn->find('list', array('conditions' => array('identifier_id' => $identifier_id), 'order' => 'IdentifierColumn.id')));
+		if ($identifierColumns)
+		{
+			$contain = array('Translation' => array(
+				'conditions' => array('Translation.parent_id' => $translation_data['Translation']['id']),
+			));
+			$identifierColumnsAll = $this->Translation->IdentifierColumn->find('all', array('conditions' => array('identifier_id' => $identifier_id), 'order' => 'IdentifierColumn.id', 'contain' => $contain));
+			foreach ($translation_data['ChildTranslation'] as $childTranslationKey => $childTranslation)
+			{
+				$mapChildTranslationsColumns[$childTranslation['identifier_column_id']] = $childTranslationKey;
+				
+			}
+			$this->set(compact('mapChildTranslationsColumns'));
+			$this->set('identifierColumnsDetails', Set::combine($identifierColumnsAll, '{n}.IdentifierColumn.id', '{n}.IdentifierColumn'));
+			$this->set('identifierColumnTranslations', Set::combine($translation_data['ChildTranslation'], '{n}.identifier_column_id'));//, '{n}.identifier_column_id'));
+		}
+		$identifier = $this->Translation->Identifier->read(null, $this->data['Translation']['identifier_id']);
+		$users = $this->Translation->User->find('list');
+		$this->set(compact('identifiers', 'users', 'identifier'));
+	}
+
+	function delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for translation', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Translation->delete($id)) {
+			$this->Session->setFlash(__('Translation deleted', true));
+			$this->redirect($this->referer());
+		}
+		$this->Session->setFlash(__('Translation was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+	function admin_index() {
+		return $this->index();
+	}
+
+	function admin_setBest($id) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for translation', true));
+			$this->redirect($this->referer());
+		}
+		if ($this->Translation->setBest($id))
+			$this->Session->setFlash(__('Set successful', true));
+		else
+			$this->Session->setFlash(__('Set error', true));
+		$this->redirect($this->referer());
+	}
+
+	function admin_view($id = null) {
+		return $this->view($id);
+	}
+
+	function admin_add() {
+		return $this->add();
+	}
+
+	function admin_edit($id = null) {
+		return $this->edit($id);
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for translation', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Translation->delete($id)) {
+			$this->Session->setFlash(__('Translation deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Translation was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/users_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/users_controller.php
new file mode 100644
index 000000000..adc42655b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/users_controller.php
@@ -0,0 +1,171 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class UsersController extends AppController {
+
+	var $name = 'Users';
+
+	var $components = array('Email');
+
+	function index() {
+		$this->User->recursive = 0;
+		$this->set('users', $this->paginate());
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid user', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('user', $this->User->read(null, $id));
+	}
+
+	function admin_index() {
+		$this->User->recursive = 0;
+		$this->set('users', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid user', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('user', $this->User->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->User->create();
+			if ($this->User->save($this->data)) {
+				$this->Session->setFlash(__('The user has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The user could not be saved. Please, try again.', true));
+			}
+		}
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid user', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->User->save($this->data)) {
+				$this->Session->setFlash(__('The user has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The user could not be saved. Please, try again.', true));
+			}
+		}
+		$this->set('user', $user_data = $this->User->read(null, $id));
+		if (empty($this->data)) {
+			$this->data = $user_data;
+		}
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for user', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->User->delete($id)) {
+			$this->Session->setFlash(__('User deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('User was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+	
+	function login() {
+		if (!empty($this->data))
+		{
+			$user = $this->User->find('first', array('conditions' => array('User.username' => $this->data['User']['username'])));
+			$this->log($user);
+			if ($user['User']['confirm_hash'])
+			{
+				$this->Session->delete('Message.auth');
+				$this->Session->setFlash('This account is not yet confirmed. Please use confirmation link from email to finalize registration.');
+				$this->redirect($this->referer());
+			}
+			if (!$user['User']['activated'])
+			{
+				$this->Session->delete('Message.auth');
+				$this->Session->setFlash('This account is not yet activated. Please wait until administrator activates your account.');
+				$this->redirect($this->referer());
+			}
+
+		}
+		if (!(empty($this->data)) && $this->Auth->user())
+		{
+			$this->log('a');
+			$this->User->id = $this->Auth->user('id');
+			$this->User->saveField('last_login', date('Y-m-d H:i:s'));
+			$this->redirect($this->Auth->redirect());
+		}
+					$this->log('b');
+	}
+
+	function logout() {
+		   $this->redirect($this->Auth->logout());
+	}
+	
+	function beforeFilter() {
+		parent::beforeFilter();
+		$this->Auth->allow(array('register', 'login', 'logout', 'confirm'));
+	}
+
+	function register() {
+		if(!empty($this->data)) {
+			$this->User->create();
+			$this->data['User']['password'] = $this->Auth->password($this->data['User']['passwd']);
+			$this->data['User']['confirm_hash'] = $this->Auth->password($this->data['User']['name'] . time());
+			if($user = $this->User->save($this->data)) {
+				// send signup email containing password to the user
+				$this->Email->from = 'webtt-noreply@openlink.pl';
+				$this->Email->to = $user['User']['email'];
+				$this->Email->subject = 'WebTT registration';
+				$this->Email->sendAs = 'text';
+				$this->Email->template = 'registration';
+				$this->set('user', $this->data);
+				$this->set('serverName', $_SERVER['SERVER_NAME']);
+				$this->params['url']['ext'] = 'no_debug';
+				unset($this->helpers['DebugKit.Toolbar']);
+				$this->Email->send();
+				$this->Session->setFlash('Thank you for registrating. Please use confirmation link from email to finalize registration.');
+				$this->redirect('/');
+			}
+		}
+	}
+	
+	function confirm($confirm_hash)
+	{
+		$user = $this->User->find('first', array('conditions' => array('User.confirm_hash' => $confirm_hash)));
+		if (!$user)
+		{
+			$this->Session->setFlash('No user found. Please register again.');
+			$this->redirect('/');
+		}
+		$this->User->id = $user['User']['id'];
+		$this->User->save(array('confirm_hash' => null));
+		$this->Session->setFlash('Thank you for registrating. You will be able to log in after your account is activated by administrator.');
+		$this->redirect('/');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/controllers/votes_controller.php b/code/ryzom/tools/server/www/webtt/app/controllers/votes_controller.php
new file mode 100644
index 000000000..7a0e0bb9e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/controllers/votes_controller.php
@@ -0,0 +1,177 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class VotesController extends AppController {
+
+	var $name = 'Votes';
+
+	function index() {
+		$this->Vote->recursive = 0;
+		$conditions = null;
+		if (isset($this->passedArgs['translation_id']) && $translation_id = $this->passedArgs['translation_id'])
+			$conditions = array('Vote.translation_id' => $translation_id);
+		$this->set('votes', $this->paginate($conditions));
+	}
+
+	function view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid vote', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('vote', $this->Vote->read(null, $id));
+	}
+
+	function add() {
+		if (!empty($this->data)) {
+			$this->Vote->create();
+			if ($this->Vote->save($this->data)) {
+				$this->Session->setFlash(__('The vote has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The vote could not be saved. Please, try again.', true));
+			}
+		}
+		$translations = $this->Vote->Translation->find('list');
+		$users = $this->Vote->User->find('list');
+		$this->set(compact('translations', 'users'));
+	}
+
+	function vote() {
+		if (empty($this->passedArgs['translation_id']))
+		{
+			$this->Session->setFlash(__('You need to choose translation for your vote', true));
+			$this->redirect(array('controller' => 'translations', 'action' => 'index'));
+		}
+		else
+		{
+			$translation_id = $this->passedArgs['translation_id'];
+			$translation = $this->Vote->Translation->read(null, $translation_id);
+			if (!$translation)
+			{
+				$this->Session->setFlash(__("Translation doesn't exist.", true));
+				$this->redirect(array('controller' => 'translations', 'action' => 'index'));
+			}
+			$vote = array("Vote" => array(
+							'translation_id' => $translation_id,
+							'user_id' => $this->Auth->user('id'),
+						),
+					);
+			$this->Vote->create();
+			$this->Vote->save($vote);
+			$this->Session->setFlash(__('Vote added', true));
+			$this->redirect($this->referer());
+		}
+	}
+
+	function edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid vote', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Vote->save($this->data)) {
+				$this->Session->setFlash(__('The vote has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The vote could not be saved. Please, try again.', true));
+			}
+		}
+		if (empty($this->data)) {
+			$this->data = $this->Vote->read(null, $id);
+		}
+		$translations = $this->Vote->Translation->find('list');
+		$users = $this->Vote->User->find('list');
+		$this->set(compact('translations', 'users'));
+	}
+
+	function delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for vote', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Vote->delete($id)) {
+			$this->Session->setFlash(__('Vote deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Vote was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+	function admin_index() {
+		$this->Vote->recursive = 0;
+		$this->set('votes', $this->paginate());
+	}
+
+	function admin_view($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid vote', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		$this->set('vote', $this->Vote->read(null, $id));
+	}
+
+	function admin_add() {
+		if (!empty($this->data)) {
+			$this->Vote->create();
+			if ($this->Vote->save($this->data)) {
+				$this->Session->setFlash(__('The vote has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The vote could not be saved. Please, try again.', true));
+			}
+		}
+		$translations = $this->Vote->Translation->find('list');
+		$users = $this->Vote->User->find('list');
+		$this->set(compact('translations', 'users'));
+	}
+
+	function admin_edit($id = null) {
+		if (!$id && empty($this->data)) {
+			$this->Session->setFlash(__('Invalid vote', true));
+			$this->redirect(array('action' => 'index'));
+		}
+		if (!empty($this->data)) {
+			if ($this->Vote->save($this->data)) {
+				$this->Session->setFlash(__('The vote has been saved', true));
+				$this->redirect(array('action' => 'index'));
+			} else {
+				$this->Session->setFlash(__('The vote could not be saved. Please, try again.', true));
+			}
+		}
+		if (empty($this->data)) {
+			$this->data = $this->Vote->read(null, $id);
+		}
+		$translations = $this->Vote->Translation->find('list');
+		$users = $this->Vote->User->find('list');
+		$this->set(compact('translations', 'users'));
+	}
+
+	function admin_delete($id = null) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for vote', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		if ($this->Vote->delete($id)) {
+			$this->Session->setFlash(__('Vote deleted', true));
+			$this->redirect(array('action'=>'index'));
+		}
+		$this->Session->setFlash(__('Vote was not deleted', true));
+		$this->redirect(array('action' => 'index'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/index.php b/code/ryzom/tools/server/www/webtt/app/index.php
new file mode 100644
index 000000000..732c01021
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/index.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
diff --git a/code/ryzom/tools/server/www/webtt/app/libs/empty b/code/ryzom/tools/server/www/webtt/app/libs/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/locale/eng/LC_MESSAGES/empty b/code/ryzom/tools/server/www/webtt/app/locale/eng/LC_MESSAGES/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/models/app_model.php b/code/ryzom/tools/server/www/webtt/app/models/app_model.php
new file mode 100644
index 000000000..82b358feb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/app_model.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Application model for Cake.
+ *
+ * This file is application-wide model file. You can put all
+ * application-wide model-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Application model for Cake.
+ *
+ * This is a placeholder class.
+ * Create the same file in app/app_model.php
+ * Add your application-wide methods to the class, your models will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class AppModel extends Model {
+//	var $recursive = 0;
+
+	var $scaffoldForbiddenActions = null;
+	var $scaffoldActions = null;
+	var $scaffoldForbiddenFields = null;
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/behaviors/empty b/code/ryzom/tools/server/www/webtt/app/models/behaviors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/models/behaviors/null.php b/code/ryzom/tools/server/www/webtt/app/models/behaviors/null.php
new file mode 100644
index 000000000..6e8b406c9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/behaviors/null.php
@@ -0,0 +1,39 @@
+<?php 
+/*
+	http://bakery.cakephp.org/articles/Jippi/2007/03/25/null-behavior
+*/
+class NullBehavior extends ModelBehavior {
+	var $settings = array();
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param AppModel $model
+	 * @param unknown_type $config
+	 */
+	function setup(&$model, $config = array())
+	{
+		$this->settings[$model->name] = $config;
+	}
+
+	/**
+	 * Enter description here...
+	 *
+	 * @param AppModel $model
+	 */
+	function beforeSave(&$model)
+	{
+		foreach ($this->settings[$model->name] as $field)
+		{
+			if(
+				true === array_key_exists($field,$model->data[$model->name]) &&
+				true === empty($model->data[$model->name][$field]) &&
+				0 === strlen($model->data[$model->name][$field]) )
+			{
+				$model->data[$model->name][$field] = null;
+			}
+		}
+		return true;
+	}
+}
+?> 
diff --git a/code/ryzom/tools/server/www/webtt/app/models/comment.php b/code/ryzom/tools/server/www/webtt/app/models/comment.php
new file mode 100644
index 000000000..94e51f1df
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/comment.php
@@ -0,0 +1,50 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class Comment extends AppModel {
+	var $name = 'Comment';
+	var $displayField = 'id';
+
+	var $scaffoldActions = array("add" => "fk");
+
+	var $belongsTo = array(
+/*		'Translation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'translation_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),*/
+		'Identifier' => array(
+			'className' => 'Identifier',
+			'foreignKey' => 'identifier_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'User' => array(
+			'className' => 'User',
+			'foreignKey' => 'user_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/datasources/empty b/code/ryzom/tools/server/www/webtt/app/models/datasources/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/models/datasources/raw_files_source.php b/code/ryzom/tools/server/www/webtt/app/models/datasources/raw_files_source.php
new file mode 100644
index 000000000..b775a09bc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/datasources/raw_files_source.php
@@ -0,0 +1,275 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+if (!class_exists('Folder')) {
+	App::import('Core', 'Folder');
+}
+
+if (!class_exists('File')) {
+	App::import('Core', 'File');
+}
+
+/**
+ * CSVSource Datasource
+ *
+ * @package datasources
+ * @subpackage datasources.models.datasources
+ */
+class RawFilesSource extends DataSource {
+
+/**
+ * Description
+ *
+ * @var string
+ */
+	public $description = 'Directory Contents Data Source';
+
+/**
+ * File Handle
+ *
+ * @var mixed
+ */
+	public $handle = false;
+
+/**
+ * Default configuration.
+ *
+ * @var array
+ */
+	var $_baseConfig = array(
+		'datasource' => 'Datasources.RawFilesSource',
+		'path' => '.',
+		'extension' => 'txt',
+		'readonly' => true,
+		'recursive' => false);
+
+	var $_schema = array(
+//		'files' => array(
+			'filename' => array(
+				'type' => 'string',
+				'null' => false,
+				'key' => 'primary',
+				'length' => 255	
+				),
+			'size' => array(
+				'type' => 'string',
+				'null' => false,
+				'length' => 40,
+				),
+			'modified' => array(
+				'type' => 'string',
+				'null' => false,
+				'length' => 40,
+				),
+	//		)
+		);
+
+/**
+ * Constructor
+ *
+ * @param string $config Configuration array
+ * @param boolean $autoConnect Automatically connect to / open the file
+ */
+	public function __construct($config = null, $autoConnect = true) {
+		$this->debug = Configure::read('debug') > 0;
+		$this->fullDebug = Configure::read('debug') > 1;
+		parent::__construct($config);
+		if ($autoConnect) {
+			$this->connect();
+		}
+	}
+
+/**
+ * Connects to the directory using options in the given configuration array.
+ *
+ * @return boolean True if the file could be opened.
+ */
+	public function connect() {
+		$this->connected = false;
+
+		if ($this->config['readonly']) {
+			$create = false;
+			$mode = 0;
+		} else {
+			$create = true;
+			$mode = 0777;
+		}
+
+		$this->connection =& new Folder($this->config['path'], $create, $mode);
+		if ($this->connection) {
+			$this->handle = array();
+			$this->connected = true;
+		}
+
+		return $this->connected;
+	}
+
+/**
+ * List available sources
+ *
+ * @return array of available files
+ */
+ 	public function listSources() {
+		return array('raw_files');
+	}
+
+/**
+ * Returns a Model description (metadata).
+ *
+ * @return mixed
+ */
+	public function describe($model) {
+		return $this->_schema;
+	}
+
+/**
+ * Close file handle
+ *
+ * @return null
+ */
+	public function close() {
+		if ($this->connected) {
+			if ($this->handle) {
+				foreach($this->handle as $h) {
+					@fclose($h);
+				}
+				$this->handle = false;
+			}
+			$this->connected = false;
+		}
+	}
+
+/**
+ * Private method to determine if file is in one of given directories
+ *
+ * @return boolean
+ */
+	private function fileInDir($filepath, $dirs)
+	{
+		foreach ($dirs as $dir)
+		{
+			$dir = $this->connection->realpath($this->config['path']) . DS . $dir;
+			if ($dir . DS . basename($filepath) === $filepath)
+				return true;
+		}
+		return false;
+	}
+
+/**
+ * Read Data
+ *
+ * @param Model $model
+ * @param array $queryData
+ * @param integer $recursive Number of levels of association
+ * @return mixed
+ */
+	public function read(&$model, $queryData = array(), $recursive = null) {
+		if (isset($queryData["conditions"][$model->alias . ".extension"]))
+			$extension = preg_quote($queryData["conditions"][$model->alias . ".extension"]);
+		else
+			$extension = $this->config['extension'];
+
+		if (isset($queryData["conditions"][$model->alias . ".filename"]))
+		{
+			$filename = $queryData["conditions"][$model->alias .".filename"];
+			$searchPattern = preg_quote($queryData["conditions"][$model->alias .".filename"], '/');
+		}
+		else
+		{
+//			$searchPattern = '.*' . '\.' . preg_quote($extension);
+			$searchPattern = '.*' . '\.' . $extension;
+		}
+
+		if (isset($queryData["conditions"][$model->alias . ".dir"]))
+		{
+//			$dir = $this->connection->realpath($this->config['path']) . DS . $queryData["conditions"][$model->alias . ".dir"];
+			$dir = is_array($dir = $queryData["conditions"][$model->alias . ".dir"]) ? $dir : array($dir);
+		}
+
+/*		var_dump($queryData);*/
+//		var_dump($searchPattern);
+
+		if ($this->config['recursive']) {
+			$list = $this->connection->findRecursive($searchPattern, true);
+/*			$this->log($list);
+			echo "list#\n";
+			var_dump($list);*/
+			foreach($list as &$item) {
+				$temp = $item;
+				$item = array();
+				$item["full"] = $temp;
+				$item["short"] = mb_substr($temp, mb_strlen($this->connection->realpath($this->config['path']) . DS));
+			}
+			unset($item);
+		} else {
+			$list = $this->connection->find($searchPattern, true);
+			foreach($list as &$item) {
+				$temp = $item;
+				$item = array();
+				$item["full"] = $this->config['path'] . DS .$temp;
+				$item["short"] = $temp;
+			}
+			unset($item);
+		}
+
+		$resultSet = array();
+		foreach ($list as $item) {
+/*			if (isset($dir) && isset($filename))
+			{
+				echo "dirconcat#\n";
+				var_dump($dir . DS . $filename);
+				echo "itemfull#\n";
+				var_dump($item["full"]);
+				if ($dir . DS . $filename === $item["full"])
+					continue;
+			}*/
+			if (isset($dir))
+				if (!$this->fileInDir($item["full"], $dir))
+					continue;
+			$file = new File($path = $this->config['path'] . DS . $item["short"], false);
+//			var_dump($item);
+//			$item = preg_replace('/' . $extPattern . '$/i', '', $item);
+			$resultSet[] = array(
+				$model->alias => array(
+					'filename' => $item["short"],
+					'size' => $file->size(),
+					'modified' => $file->lastChange(),
+					),
+				);
+		}
+		if ($model->findQueryType === 'count') {
+			return array(array(array('count' => count($resultSet))));
+		}
+
+		return $resultSet;
+	}
+
+/**
+ * Calculate
+ *
+ * @param Model $model 
+ * @param mixed $func 
+ * @param array $params 
+ * @return array with the field name with records count
+ */
+	public function calculate(&$model, $func, $params = array()) {
+		return array('count');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/file_identifier.php b/code/ryzom/tools/server/www/webtt/app/models/file_identifier.php
new file mode 100644
index 000000000..9b0a78bfe
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/file_identifier.php
@@ -0,0 +1,44 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class FileIdentifier extends AppModel {
+	var $name = 'FileIdentifier';
+	var $displayField = 'command';
+	var $order = 'FileIdentifier.id';
+
+	var $scaffoldForbiddenActions = array("index", "add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
+
+	var $belongsTo = array(
+		'ImportedTranslationFile' => array(
+			'className' => 'ImportedTranslationFile',
+			'foreignKey' => 'imported_translation_file_id',
+			'conditions' => '',
+			'fields' => '',
+//			'order' => ''
+		),
+		'Identifier' => array(
+			'className' => 'Identifier',
+			'foreignKey' => 'identifier_id',
+			'conditions' => '',
+			'fields' => '',
+//			'order' => ''
+		)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/identifier.php b/code/ryzom/tools/server/www/webtt/app/models/identifier.php
new file mode 100644
index 000000000..14796c74f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/identifier.php
@@ -0,0 +1,144 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class Identifier extends AppModel {
+	var $name = 'Identifier';
+	var $displayField = 'identifier';
+	var $actsAs = array('Containable');
+
+	var $validate = array(
+		'identifier' => array(
+			'A_Za_z0_9' => array(
+				'rule' => '/[A-Za-z0-9_@]+/',
+				'message' => 'Identifier must consist only of the following caracteres: "A-Z", "a-z", "0-9", "@" and "_"',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+		),
+	);
+
+	var $scaffoldForbiddenActions = array("add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
+
+	var $belongsTo = array(
+		'TranslationFile' => array(
+			'className' => 'TranslationFile',
+			'foreignKey' => 'translation_file_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+	);
+
+	var $hasOne = array(
+		'BestTranslation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'identifier_id',
+			'dependent' => false,
+			'conditions' => array('BestTranslation.best' => true),
+			'fields' => '',
+			'order' => '',
+		),
+	);
+
+	var $hasMany = array(
+		'Translation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'identifier_id',
+			'dependent' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'Comment' => array(
+			'className' => 'Comment',
+			'foreignKey' => 'identifier_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'FileIdentifier' => array(
+			'className' => 'FileIdentifier',
+			'foreignKey' => 'identifier_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'IdentifierColumn' => array(
+			'className' => 'IdentifierColumn',
+			'foreignKey' => 'identifier_id',
+			'dependent' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+	);
+	
+	function withoutBestTranslation($conditions = array())
+	{
+/*		$this->contain(array(
+			'FileIdentifier' => array('ImportedTranslationFile' => array(
+				'conditions' => array('ImportedTranslationFile.id' => 248)
+			)),
+		));
+
+		$res = $this->find('all', array('conditions' => array('Identifier.id' => array(125219, 131609, 67133))));*/
+//		$fileIdentifier_ids = $this->FileIdentifier->find('list', array('fields' => array('FileIdentifier.id', 'FileIdentifier.id'), 'conditions' => array('FileIdentifier.imported_translation_file_id' => 248)));
+		// TOTHINK: try to achieve that with Linkable behaviour
+		if (isset($conditions['ImportedTranslationFile.id']))
+			return $identifier_ids = $this->FileIdentifier->find('list', array('fields' => array('Identifier.id', 'Identifier.id'), 'conditions' => array('FileIdentifier.imported_translation_file_id' => $conditions['ImportedTranslationFile.id']), 'recursive' => 1));
+		else
+			return false;
+	}
+	
+	function getNeighbours($id)
+	{
+		$identifierNeighbours['current'][] = $this->read(null, $id);
+		if ($identifierNeighbours['current'])
+		{
+			$identifierNeighbours['prev'] = $this->find('all', array('order' => 'Identifier.id DESC', 'limit' => 5, 'conditions' => array('Identifier.translation_file_id' => $identifierNeighbours['current'][0]['Identifier']['translation_file_id'], 'Identifier.id <' => $identifierNeighbours['current'][0]['Identifier']['id'])));
+			$identifierNeighbours['next'] = $this->find('all', array('order' => 'Identifier.id ASC', 'limit' => 5, 'conditions' => array('Identifier.translation_file_id' => $identifierNeighbours['current'][0]['Identifier']['translation_file_id'], 'Identifier.id >' => $identifierNeighbours['current'][0]['Identifier']['id'])));
+		}
+		return $identifierNeighbours;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/identifier_column.php b/code/ryzom/tools/server/www/webtt/app/models/identifier_column.php
new file mode 100644
index 000000000..abb038407
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/identifier_column.php
@@ -0,0 +1,53 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class IdentifierColumn extends AppModel {
+	var $name = 'IdentifierColumn';
+	var $displayField = 'column_name';
+	var $actsAs = array('Containable');
+
+	var $scaffoldForbiddenActions = array("add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
+
+	var $belongsTo = array(
+		'Identifier' => array(
+			'className' => 'Identifier',
+			'foreignKey' => 'identifier_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+	var $hasMany = array(
+		'Translation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'identifier_column_id',
+			'dependent' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/imported_translation_file.php b/code/ryzom/tools/server/www/webtt/app/models/imported_translation_file.php
new file mode 100644
index 000000000..9c4021977
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/imported_translation_file.php
@@ -0,0 +1,66 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class ImportedTranslationFile extends AppModel {
+	var $name = 'ImportedTranslationFile';
+	var $displayField = 'filename';
+
+	var $scaffoldForbiddenActions = array("index", "add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
+
+	var $actsAs = array('Containable');
+
+	var $belongsTo = array(
+		'TranslationFile' => array(
+			'className' => 'TranslationFile',
+			'foreignKey' => 'translation_file_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+	);
+
+	var $hasMany = array(
+		'FileIdentifier' => array(
+			'className' => 'FileIdentifier',
+			'foreignKey' => 'imported_translation_file_id',
+			'dependent' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => 'FileIdentifier.id',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		)
+	);
+
+	var $hasOne = array(
+		'RawFile' => array(
+			'className' => 'RawFile',
+			'foreignKey' => 'filename',
+			'dependand' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+		),
+	);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/language.php b/code/ryzom/tools/server/www/webtt/app/models/language.php
new file mode 100644
index 000000000..bc8bdadcd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/language.php
@@ -0,0 +1,42 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class Language extends AppModel {
+	var $name = 'Language';
+	var $displayField = 'name';
+
+	var $scaffoldForbiddenActions = array("add", "edit", "delete");
+
+	var $hasMany = array(
+		'TranslationFile' => array(
+			'className' => 'TranslationFile',
+			'foreignKey' => 'language_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/raw_file.php b/code/ryzom/tools/server/www/webtt/app/models/raw_file.php
new file mode 100644
index 000000000..b1a72e26c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/raw_file.php
@@ -0,0 +1,151 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class RawFile extends AppModel {
+	var $name = 'RawFile';
+	var $useDbConfig = 'raw_files';
+	var $displayField = 'filename';
+//	var $useTable = false;
+	var $primaryKey = 'filename';
+	
+	var $_parser;
+
+	var $belongsTo = array(
+		'ImportedTranslationFile' => array(
+			'className' => 'ImportedTranslationFile',
+			'foreignKey' => 'filename',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+	);
+
+	public function open($dir, $filename, $write = false)
+	{
+		$this->_currentFile = null;
+		$this->_currentFileLastModified = null;
+
+		$ds = $this->getDataSource();
+		$file = new File($filepath = $ds->config['path'] . DS . $dir . DS . $filename, false);
+		if (!$file)
+			return false;
+		if (!$file->readable())
+			return false;
+		if ($write && !$file->writable())
+			return false;
+		$this->_currentFile = $file;
+		$this->_currentFileLastChange = $file->lastChange();
+		return $file;
+	}
+
+	public function parseFile()
+	{
+		if (!$this->_currentFile)
+			return false;
+
+		// TODO: file types array with filenames regex
+		if (
+			preg_match('|^([a-z]{2})_diff_[A-F0-9]{8}\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^r2_([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","StringParser", array("file" => 'StringParser.php'));
+			$parser = $this->_parser = new StringParser();
+		}
+		else if (
+			preg_match('|^phrase_([a-z]{2})_diff_[A-F0-9]{8}\.txt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^phrase_([a-z]{2})\.txt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","PhraseParser", array("file" => 'PhraseParser.php'));
+			$parser = $this->_parser = new PhraseParser();
+		}
+		else if (preg_match('|^.*_words_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^.*_words_([a-z]{2})\..*$|', $this->_currentFile->name, $matches))
+		{
+			App::import("Vendor","SheetParser", array("file" => 'SheetParser.php'));
+			$parser = $this->_parser = new SheetParser();
+		}
+		else
+		{
+			return false;
+		}
+		$entities = $parser->parseFile($this->_currentFile->read());
+		return $entities;
+	}
+
+	public function buildFile($entities)
+	{
+		if (!$this->_currentFile)
+			return false;
+
+		// TODO: file types array with filenames regex
+		if (
+			preg_match('|^([a-z]{2})_diff_[A-F0-9]{8}\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^r2_([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","StringParser", array("file" => 'StringParser.php'));
+			$parser = $this->_parser = new StringParser();
+		}
+		else if (
+			preg_match('|^phrase_([a-z]{2})_diff_[A-F0-9]{8}\.txt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^phrase_([a-z]{2})\.txt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","PhraseParser", array("file" => 'PhraseParser.php'));
+			$parser = $this->_parser = new PhraseParser();
+		}
+		else if (preg_match('|^.*_words_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^.*_words_([a-z]{2})\..*$|', $this->_currentFile->name, $matches))
+		{
+			App::import("Vendor","SheetParser", array("file" => 'SheetParser.php'));
+			$parser = $this->_parser = new SheetParser();
+		}
+		else
+		{
+			return false;
+		}
+		$content = $parser->buildFile($entities);
+		$ret = $this->_currentFile->write($content);
+		return $ret;
+	}
+
+
+	public function getLanguageCode($filename)
+	{
+		if (preg_match('|^([a-z]{2})_diff_[A-F0-9]{8}\.uxt$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^([a-z]{2})\.uxt$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^r2_([a-z]{2})\.uxt$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^phrase_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^phrase_([a-z]{2})\..*$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^.*_words_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^.*_words_([a-z]{2})\..*$|', $filename, $matches))
+			return $matches[1];
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/translation.php b/code/ryzom/tools/server/www/webtt/app/models/translation.php
new file mode 100644
index 000000000..fd481f1e9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/translation.php
@@ -0,0 +1,135 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class Translation extends AppModel {
+	var $name = 'Translation';
+	var $displayField = 'translation_text';
+
+	var $scaffoldForbiddenActions = array();
+	var $scaffoldActions = array("add" => "fk", "index" => "fk");
+
+	var $belongsTo = array(
+		'Identifier' => array(
+			'className' => 'Identifier',
+			'foreignKey' => 'identifier_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'IdentifierColumn' => array(
+			'className' => 'IdentifierColumn',
+			'foreignKey' => 'identifier_column_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'User' => array(
+			'className' => 'User',
+			'foreignKey' => 'user_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'ParentTranslation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'parent_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+	);
+
+	var $hasMany = array(
+		'Vote' => array(
+			'className' => 'Vote',
+			'foreignKey' => 'translation_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+/*		'Comment' => array(
+			'className' => 'Comment',
+			'foreignKey' => 'translation_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),*/
+		'ChildTranslation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'parent_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+	);
+
+	function setBest()
+	{
+		if (!$this->id)
+			return false;
+		$this->read();
+		if (!isset($this->data['Translation']['identifier_id']))
+			return false;
+
+		// set best on chosen translation
+		$ret = $this->save(array('best' => 1));
+		$best_id = $this->id;
+
+		// reset best on other translations
+		$ret = $this->updateAll(array('Translation.best' => 0), array(
+			'AND' => array(
+				'Translation.identifier_id' => $ret['Translation']['identifier_id'],
+				'Translation.id !=' => $best_id,
+			),
+		));
+		$this->log($ret);
+		
+		return $this->id;
+	}
+	
+	function makeHash($ent)
+	{
+		if (isset($ent['columns']) && is_array($ent['columns']))
+		{
+			sort($ent['columns']);
+			return md5(serialize($ent['columns']));
+		}
+		else if (isset($ent['string']))
+			return md5($ent['string']);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/translation_file.php b/code/ryzom/tools/server/www/webtt/app/models/translation_file.php
new file mode 100644
index 000000000..ef4ed9421
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/translation_file.php
@@ -0,0 +1,66 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class TranslationFile extends AppModel {
+	var $name = 'TranslationFile';
+	var $displayField = 'filename_template';
+
+	var $scaffoldForbiddenActions = array("add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
+
+	var $belongsTo = array(
+		'Language' => array(
+			'className' => 'Language',
+			'foreignKey' => 'language_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+
+	var $hasMany = array(
+		'ImportedTranslationFile' => array(
+			'className' => 'ImportedTranslationFile',
+			'foreignKey' => 'translation_file_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'Identifier' => array(
+			'className' => 'Identifier',
+			'foreignKey' => 'translation_file_id',
+			'dependent' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+	);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/user.php b/code/ryzom/tools/server/www/webtt/app/models/user.php
new file mode 100644
index 000000000..75dde4d62
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/user.php
@@ -0,0 +1,88 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class User extends AppModel {
+	var $name = 'User';
+	var $displayField = 'name';
+
+	var $actsAs = array('Null' => array('confirm_hash'));
+
+	var $recursive = 0;
+
+	var $validate = array(
+		'username' => array(
+			'alphaNumeric',
+			'uniqueCheck' => array(
+				'rule' => 'isUnique',
+				'message' => 'That username has already been taken.',
+			),
+		),
+		'email' => array('rule' => 'email', 'message' => 'Wrong format'),
+		'name' => array('rule' => 'notEmpty'),
+//		'password' => array('rule' => 'notEmpty'),
+		'passwd' => array('rule' => 'notEmpty'),
+	);
+
+	var $scaffoldForbiddenActions = array("add", "edit", "delete");
+	var $scaffoldForbiddenFields = array("" => array("activated","password","confirm_hash","created","modified"),/* "admin_" => array("password")*/);
+
+	var $hasMany = array(
+		'Translation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'user_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'Vote' => array(
+			'className' => 'Vote',
+			'foreignKey' => 'user_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'Comment' => array(
+			'className' => 'Comment',
+			'foreignKey' => 'user_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+	);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/models/vote.php b/code/ryzom/tools/server/www/webtt/app/models/vote.php
new file mode 100644
index 000000000..18737144d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/models/vote.php
@@ -0,0 +1,43 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class Vote extends AppModel {
+	var $name = 'Vote';
+	var $displayField = 'translation_id';
+
+	var $scaffoldForbiddenActions = array("delete");
+
+	var $belongsTo = array(
+		'Translation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'translation_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+		'User' => array(
+			'className' => 'User',
+			'foreignKey' => 'user_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/plugins/empty b/code/ryzom/tools/server/www/webtt/app/plugins/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/behaviors/empty b/code/ryzom/tools/server/www/webtt/app/tests/cases/behaviors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/components/empty b/code/ryzom/tools/server/www/webtt/app/tests/cases/components/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/controllers/empty b/code/ryzom/tools/server/www/webtt/app/tests/cases/controllers/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/helpers/empty b/code/ryzom/tools/server/www/webtt/app/tests/cases/helpers/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tests/cases/models/empty b/code/ryzom/tools/server/www/webtt/app/tests/cases/models/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tests/fixtures/empty b/code/ryzom/tools/server/www/webtt/app/tests/fixtures/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tests/groups/empty b/code/ryzom/tools/server/www/webtt/app/tests/groups/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/cache/models/empty b/code/ryzom/tools/server/www/webtt/app/tmp/cache/models/empty
new file mode 100755
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/cache/persistent/empty b/code/ryzom/tools/server/www/webtt/app/tmp/cache/persistent/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/cache/views/empty b/code/ryzom/tools/server/www/webtt/app/tmp/cache/views/empty
new file mode 100755
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/logs/empty b/code/ryzom/tools/server/www/webtt/app/tmp/logs/empty
new file mode 100755
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/sessions/empty b/code/ryzom/tools/server/www/webtt/app/tmp/sessions/empty
new file mode 100755
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/tmp/tests/empty b/code/ryzom/tools/server/www/webtt/app/tmp/tests/empty
new file mode 100755
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/PhraseParser.php b/code/ryzom/tools/server/www/webtt/app/vendors/PhraseParser.php
new file mode 100644
index 000000000..91da72a72
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/PhraseParser.php
@@ -0,0 +1,307 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class PhraseParser
+{
+	var $debug = false;
+
+	function removeComments($str)
+	{
+//As a pertinent note, there's an issue with this function where parsing any string longer than 94326 characters long will silently return null. So be careful where you use it at.
+//http://pl.php.net/manual/en/function.preg-replace.php#98843
+		ini_set('pcre.backtrack_limit', 10000000);
+		//$returnString = preg_replace('!/\*.*?\*/!s', '', $str); // /* .*? */ s
+		// added [^/] because there was //******* in translation file
+		$returnString = preg_replace('![^/]/\*.*?\*/!s', '', $str); // /* .*? */ s
+		// PHP 5.2.0
+		// if (PREG_NO_ERROR !== preg_last_error())
+		if ($returnString === null)
+		{
+			$returnStr = $str;
+			var_dump("PREG ERROR");
+			// exception
+		}
+		return $returnString;
+	}
+
+	function removeBOM($str)
+	{
+		if(($bom = substr($str, 0,3)) == pack("CCC",0xef,0xbb,0xbf))
+		{
+			$bla = substr($str, 3);
+			return $bla;
+		}
+		else
+		{
+			return $str;
+		}
+	}
+
+	function addBOM($str)
+	{
+		if(($bom = substr($str, 0,3)) != pack("CCC",0xef,0xbb,0xbf))
+			return pack("CCC",0xef,0xbb,0xbf) . $str;
+		else
+			return $str;
+	}
+
+	function parseLine($str)
+	{
+		$arr = array();
+		if (mb_substr($str, 0, 2) == "//")
+		{
+			if (mb_substr($str, 0, 7) == "// DIFF")
+			{
+				$tmp = explode(" ", $str);
+				$type = 'diff';
+				$command = mb_strtolower($tmp[2]);
+				$args = isset($tmp[3]) ? $tmp[3] : null;
+				if ($command == "add" || $command == "changed")
+				{
+					if (isset($args))
+						$index = intval($args);
+					else
+						$index = null;
+					$command = mb_substr($str, 3);
+				}
+				else
+					unset($type);
+			}
+			else if (mb_substr($str, 0, 8) == "// INDEX")
+			{
+				list($j, $type, $index) = explode(" ", $str);
+				$type = "internal_index";
+			}
+			else if (mb_substr($str, 0, 13) == "// HASH_VALUE")
+			{
+				list($j, $type, $hash_value) = explode(" ", $str);
+				$type = "hash_value";
+			}
+/*			if (!isset($type))
+			{
+				var_dump(isset($type));
+				debug_print_backtrace();
+			}
+			var_dump($type);*/
+			if (isset($type))
+			{
+				$type = mb_strtolower($type);
+				$arr = compact("type","command","index","hash_value");
+			}
+		}
+		else if (!(mb_substr($str, 0, 2) == "//") && mb_strlen($str))
+		{
+			$type = "string";
+			$string = "";
+			$identifier = "";
+			$arguments = "";
+			$body = "";
+			if (preg_match('|^([0-9A-Za-z@_]*) \((.*?)\).*$|', $str, $matches))
+			{
+				$identifier = $matches[1];
+				$arguments = $matches[2];
+			}
+			else if ($str == "{")
+				 $body = "begin";
+			else if ($str == "}")
+				$body = "end";
+			else
+			{
+				$string = $str;
+			}
+			$arr = compact("type", "identifier", "arguments", "string", "body");
+		}
+/*		echo "<pre>################################\n";
+		var_dump($str);
+		var_dump($arr);
+		echo "</pre>\n";*/
+		return $arr;
+	}
+
+	function addEnt(&$parsedEnt, &$entities, &$newEnt)
+	{
+				if ($this->debug)
+				{
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
+					echo "\t%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%\n";
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\n";
+					var_dump($parsedEnt);
+				}
+				if (!isset($parsedEnt["diff"]) && !isset($parsedEnt["index"]))
+					$parsedEnt["index"] = $parsedEnt["internal_index"];
+
+				$parsedEnt["type"] = "phrase";
+				$entities[] = $parsedEnt;
+				$parsedEnt =array();
+				$newEnt = false;
+	}
+
+	function parseFile($file)
+	{
+		$parsedEnt = array();
+		$newEnt = false;
+		$prevStringLine = false;
+		$entities = array();
+
+		$file = $this->removeBOM($file);
+//		var_dump($file);
+		$file = $this->removeComments($file);
+//		var_dump($file);
+		$lines = explode("\n", $file);
+		if ($this->debug)			
+		{
+			echo "<pre>\n\n";
+		}
+		$line_no=1;
+		foreach ($lines as $line)
+		{
+			if ($this->debug)
+			{
+				echo "\n\t#################### LINE NUMBER " . $line_no++ . "\n\n";
+				var_dump($line);
+			}
+
+			$line = rtrim($line, "\r\n");
+			$parsedLine = $this->parseLine($line);
+
+			if ($this->debug)
+			{
+				echo "%%%% parsedLine\n";
+				var_dump($parsedLine);
+				echo "\n";
+			
+				echo "%%%% prevStringLine\n";
+				var_dump($prevStringLine);
+				echo "\n";
+			}
+
+			if (!$parsedLine)
+				continue;
+
+			// if line start with diff (diff files) or hash_value (translated files) and before was line with translation, then we start new ent
+
+			if ($prevStringLine && (
+					($parsedLine["type"] == "diff" && $parsedEnt) || ($parsedLine["type"] == "hash_value" && $parsedEnt)
+				))
+			{
+/*				echo "%%%% prevStringLine %%%%%\n";
+				var_dump($parsedEnt);*/
+				$newEnt = true;
+			}
+
+			if ($newEnt)
+			{
+				$this->addEnt($parsedEnt, $entities, $newEnt);
+			}
+
+			if ($parsedLine["type"] == "internal_index")
+					$parsedEnt["internal_index"] = $parsedLine["index"];
+
+			if ($parsedLine["type"] == "string")
+			{
+				$prevStringLine = true;
+
+				if ($parsedLine["body"] == "begin" || $parsedLine["body"] == "end")
+					continue;
+
+				if ($this->debug)			
+				{
+					echo "%%%% parsedEnt before %%%%%\n";
+					var_dump($parsedEnt);
+
+//					echo "%%%% parsedLine %%%%%\n";
+//					var_dump($parsedLine);
+				}
+
+				if (!$parsedLine['identifier'])
+				{
+					if ($this->debug) echo "%%%% parsedEnt ZLACZENIE \n";
+					if ($this->debug && !isset($parsedEnt['string']))
+					{
+						echo "!isset parsedEnt['string']\n";
+						var_dump($line);
+						var_dump($parsedEnt);
+						var_dump($parsedLine);
+					}
+					$parsedEnt['string'] .= $parsedLine['string'] . "\n";
+				}
+				else
+				{
+					if ($this->debug) echo "DODANIE \n";
+					$parsedEnt += $parsedLine;
+//					$parsedEnt['string'] .= "\n";
+				}
+
+				if ($this->debug)			
+				{
+					echo "%%%% parsedEnt after %%%%%\n";
+					var_dump($parsedEnt);
+				}
+			}
+			else
+				$prevStringLine = false;
+
+			if ($parsedLine["type"] == "diff")
+			{
+				$parsedEnt["diff"] = $parsedEnt["command"] = $parsedLine["command"];
+				$parsedEnt["index"] = $parsedLine["index"];
+			}
+		}
+		if ($parsedEnt)
+		{
+			$this->addEnt($parsedEnt, $entities, $newEnt);
+		}
+
+		if ($this->debug)			
+		{
+			echo "<pre>";
+			var_dump($entities);
+			echo "</pre>\n";
+		}
+		return $entities;
+	}
+
+	function CRLF($s)
+	{
+		$s = str_replace("\r\n", "\n", $s);
+		$s = str_replace("\n", "\r\n", $s);
+		return $s;
+	}
+
+	function buildFile($entities)
+	{
+		$content = '// DIFF_VERSION 2' . "\n";
+		foreach ($entities as $ent)
+		{
+			if (isset($ent['command']))
+				$content .= '// ' . $ent['command'] . "\n";
+			if (isset($ent['hash_value']))
+				$content .= '// HASH_VALUE ' . $ent['hash_value'];
+/*			if (isset($ent['command']))
+				$content .= '// INDEX ' . $ent['internal_index'] . "\n";
+			else
+				$content .= '// INDEX ' . $ent['index'] . "\n";*/
+			$content .= $ent['identifier'] . ' (' . $ent['arguments'] . ')' . "\n" . '{' . "\n" . $ent['string'] . "\n" . '}' . "\n";
+			$content .= "\n";
+		}
+		return $this->addBOM($this->CRLF($content));
+	}
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/SheetParser.php b/code/ryzom/tools/server/www/webtt/app/vendors/SheetParser.php
new file mode 100644
index 000000000..066468c7f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/SheetParser.php
@@ -0,0 +1,203 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class SheetParser
+{
+	var $debug = false;
+
+	function parseLine($str)
+	{
+		$arr = str_getcsv($str, "\t");
+		return $arr;
+	}
+
+	function parseFile($file)
+	{
+		$parsedEnt = array();
+		$newEnt = false;
+		$prevStringLine = false;
+		$entities = array();
+		$diffFile = false;
+
+		$file = mb_convert_encoding($file, 'UTF-8', 'UTF-16');
+//		$file = $this->removeBOM($file);
+//		$file = $this->removeComments($file);
+		$lines = explode("\n", $file);
+		if ($this->debug)			
+		{
+			echo "<pre>\n\n";
+		}
+		$line_no=1;
+
+/*		var_dump(setlocale(LC_ALL,NULL));
+		var_dump(setlocale(LC_ALL,'pl_PL.UTF-8'));*/
+		// Need to set UTF-8 locale to get str_getcsv to work with UTF-8 cyryllic
+		setlocale(LC_ALL,'pl_PL.UTF-8');
+
+		foreach ($lines as $line)
+		{
+			if ($this->debug)
+			{
+				echo "\n\t#################### LINE NUMBER " . $line_no . "\n\n";
+			}
+
+//			var_dump($line);
+			$line = rtrim($line,"\r\n");
+
+			$parsedLine = $this->parseLine($line);
+
+			if (!$line || mb_strpos($line, "DIFF NOT") === 0 || mb_strpos($line, "REMOVE THE") === 0)
+				continue;
+
+			if ($line_no == 1)
+			{
+				$parsedEnt["type"] = "sheet_description";
+				if ($parsedLine[0] == "DIFF_CMD")
+					$diffFile = true;
+				$parsedEnt["sheet_id_column"] = $parsedLine[2];
+			}
+			else
+			{
+				if ($diffFile)
+				{
+					$parsedEnt["diff"] = $parsedEnt["command"] = rtrim($parsedLine[0]);
+					$parsedEnt["hash_value"] = $parsedLine[1];
+					$parsedEnt["identifier"] = $parsedLine[2];
+				}
+				else
+				{
+					$parsedEnt["hash_value"] = $parsedLine[0];
+					$parsedEnt["identifier"] = $parsedLine[1];
+				}
+				$parsedEnt["type"] = "sheet";
+			}
+
+			if ($diffFile)
+				$columns = array_slice($parsedLine, 3);
+			else
+				$columns = array_slice($parsedLine, 2);
+
+			if (!isset($columnsCount))
+				$columnsCount = count($columns);
+
+			$parsedEnt["columns"] = $columns;
+
+			if ($this->debug)
+			{
+				echo "%%%% parsedEnt %%%%%\n";
+				var_dump($parsedEnt);
+			}
+
+/*			if ($parsedLine["type"] == "internal_index")
+					$parsedEnt["internal_index"] = $parsedLine["index"];
+
+			if ($parsedLine["type"] == "diff")
+			{
+				$parsedEnt["diff"] = $parsedLine["command"];
+				$parsedEnt["index"] = $parsedLine["index"];
+			}*/
+
+			$newEnt = true;
+
+			if ($newEnt)
+			{
+				if ($this->debug && 0)
+				{
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
+					echo "\t%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%\n";
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\n";
+					var_dump($parsedEnt);
+				}
+/*				if (!isset($parsedEnt["diff"]) && !isset($parsedEnt["index"]))
+					$parsedEnt["index"] = $parsedEnt["internal_index"];*/
+
+				$entities[] = $parsedEnt;
+				$parsedEnt =array();
+				$newEnt = false;
+			}
+			$line_no++;
+		}
+
+		if ($this->debug && 0)
+		{
+			echo "<pre>";
+			var_dump($entities);
+			echo "</pre>\n";
+		}
+		return $entities;
+	}
+
+	function CRLF($s)
+	{
+		$s = str_replace("\r\n", "\n", $s);
+		$s = str_replace("\n", "\r\n", $s);
+		return $s;
+	}
+
+	function addBOM($str)
+	{
+		if(($bom = substr($str, 0,3)) != pack("CCC",0xef,0xbb,0xbf))
+			return pack("CCC",0xef,0xbb,0xbf) . $str;
+		else
+			return $str;
+	}
+
+	function buildFile($entities)
+	{
+		$content = '';
+		foreach ($entities as $ent)
+		{
+			if ($ent['type'] == 'sheet_description')
+			{
+				$_columns = $ent['columns'];
+				$_sheet_id_column = $ent['sheet_id_column'];
+				
+				if (isset($ent['diff']))
+				{
+					$content .= 'DIFF_CMD' . "\t" . '*HASH_VALUE' . "\t" . $_sheet_id_column . "\t";
+					foreach ($ent['columns'] as $value)
+					{
+						$content .= $value . "\t";
+					}
+					$content = mb_substr($content, 0, -1);
+					$content .= "\n";
+				}
+				continue;
+			}
+
+			if (isset($ent['command']))
+				$content .= $ent['command'] . "\t";
+			if (isset($ent['hash_value']))
+				$content .= $ent['hash_value'] . "\t";
+			else
+				$content .= '_0000000000000000' . "\t";
+			$content .= $ent['identifier'] . "\t";
+			foreach ($ent['columns'] as $value)
+			{
+				$content .= $value . "\t";
+			}
+			$content = mb_substr($content, 0, -1);
+			$content .= "\n";
+		}
+		return mb_convert_encoding($this->addBOM($this->CRLF($content)), 'UTF-16LE', 'UTF-8');
+//		return mb_convert_encoding($this->CRLF($content), 'UTF-16LE', 'UTF-8');
+	}
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/StringParser.php b/code/ryzom/tools/server/www/webtt/app/vendors/StringParser.php
new file mode 100644
index 000000000..f2b4bc184
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/StringParser.php
@@ -0,0 +1,316 @@
+<?php
+/*
+	Ryzom Core Web-Based Translation Tool
+	Copyright (C) 2011 Piotr Kaczmarek <p.kaczmarek@openlink.pl>
+
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+?>
+<?php
+class StringParser
+{
+	var $pipeline_directory = "/home/kaczorek/projects/webtt/distfiles/translation/";
+	var $debug = false;
+
+	function removeComments($str)
+	{
+/*		while (($cstart = mb_strpos($str, "/*", $offset)) !== false)
+		{
+			$cend = mb_strpos();
+		}*/
+//		var_dump($str);
+//As a pertinent note, there's an issue with this function where parsing any string longer than 94326 characters long will silently return null. So be careful where you use it at.
+//http://pl.php.net/manual/en/function.preg-replace.php#98843
+		ini_set('pcre.backtrack_limit', 10000000);
+		//$returnString = preg_replace('!/\*.*?\*/!s', '', $str); // /* .*? */ s
+		// added [^/] because there was //******* in translation file
+		$returnString = preg_replace('![^/]/\*.*?\*/!s', '', $str); // /* .*? */ s
+		// PHP 5.2.0
+		// if (PREG_NO_ERROR !== preg_last_error())
+		if ($returnString === null)
+		{
+			$returnStr = $str;
+			var_dump("PREG ERROR");
+			// exception
+		}
+		return $returnString;
+	}
+
+	function removeBOM($str)
+	{
+//		mb_internal_encoding("ISO-8859-2");
+//		var_dump(substr($str, 0, 3));
+		if(($bom = substr($str, 0,3)) == pack("CCC",0xef,0xbb,0xbf))
+		{
+//			var_dump("jest bom");
+			$bla = substr($str, 3);
+//			var_dump($bla);
+			return $bla;
+		}
+		else
+		{
+//			var_dump($bom);
+			return $str;
+		}
+	}
+
+	function addBOM($str)
+	{
+		if(($bom = substr($str, 0,3)) != pack("CCC",0xef,0xbb,0xbf))
+			return pack("CCC",0xef,0xbb,0xbf) . $str;
+		else
+			return $str;
+	}
+
+	function parseLine($str)
+	{
+		$arr = array();
+//		var_dump(mb_internal_encoding());
+//		mb_internal_encoding("ISO-8859-2");
+		if (mb_substr($str, 0, 2) == "//")
+		{
+			if (mb_substr($str, 0, 7) == "// DIFF")
+			{
+				list($j, $type, $command, $args) = explode(" ", $str);
+				$command = mb_strtolower($command);
+				if ($command == "add" || $command == "changed")
+				{
+					$index = intval($args);
+					$command = mb_substr($str, 3);
+				}
+				else
+					unset($type);
+			}
+			else if (mb_substr($str, 0, 8) == "// INDEX")
+			{
+				list($j, $type, $index) = explode(" ", $str);
+				$type = "internal_index";
+//				$arr = explode(" ", $str);
+			}
+			else if (mb_substr($str, 0, 13) == "// HASH_VALUE")
+			{
+				list($j, $type, $hash_value) = explode(" ", $str);
+				$type = "hash_value";
+			}
+/*			if (!isset($type))
+			{
+				var_dump(isset($type));
+				debug_print_backtrace();
+			}
+			var_dump($type);*/
+			if (isset($type))
+			{
+				$type = mb_strtolower($type);
+				$arr = compact("type","command","index","hash_value");
+			}
+		}
+		else if (!(mb_substr($str, 0, 2) == "//") && mb_strlen($str))
+		{
+			//list($ident, $j
+			$type = "string";
+			$lBracket = mb_strpos($str, "[");
+			$rBracket = mb_strrpos($str, "]");
+			$sStart = $lBracket + 1;
+			$sEnd = $rBracket - ($sStart);
+			$identifier = trim(mb_substr($str, 0, $lBracket));
+			if (!$rBracket)
+				$sEnd = mb_strlen($str);
+			$string = mb_substr($str, $sStart, $sEnd);
+			$string = str_replace(
+					array('\\\\', '\[','\]'),
+					array('\\', '[',']'),				// '
+					$string
+				);
+			$arr = compact("type", "identifier", "string");
+		}
+/*		echo "<pre>################################\n";
+		var_dump($str);
+		var_dump($arr);
+		echo "</pre>\n";*/
+		return $arr;
+	}
+
+	function parseFile($file)
+	{
+		$parsedEnt = array();
+		$newEnt = false;
+		$prevStringLine = false;
+		$entities = array();
+
+//		$file = file_get_contents($this->pipeline_directory . $file);
+//		var_dump(mb_substr($file, 0,3));
+//		var_dump(substr($file, 0,3));
+//		var_dump($file);
+		$file = $this->removeBOM($file);
+//		var_dump($file);
+		$file = $this->removeComments($file);
+//		var_dump($file);
+		$lines = explode("\n", $file);
+		if ($this->debug)			
+		{
+			echo "<pre>\n\n";
+		}
+		$line_no=1;
+		foreach ($lines as $line)
+		{
+			if ($this->debug)
+			{
+				echo "\n\t#################### LINE NUMBER " . $line_no++ . "\n\n";
+			}
+
+//			var_dump($line);
+//			$line = rtrim($line);
+//			$line = str_replace(array("\r\n","\n","\r"), '', $line);
+			$line = rtrim($line, "\r\n");
+			$parsedLine = $this->parseLine($line);
+
+			if ($this->debug)
+			{
+				echo "%%%% parsedLine\n";
+				var_dump($parsedLine);
+				echo "\n";
+			
+				echo "%%%% prevStringLine\n";
+				var_dump($prevStringLine);
+				echo "\n";
+			}
+
+			if (!$parsedLine)
+				continue;
+
+			// if line start with diff (diff files) or hash_value (translated files) and before was line with translation, then we start new ent
+
+			if ($prevStringLine && (
+					($parsedLine["type"] == "diff" && $parsedEnt) || ($parsedLine["type"] == "hash_value" && $parsedEnt)
+				))
+			{
+/*				echo "%%%% prevStringLine %%%%%\n";
+				var_dump($parsedEnt);*/
+				$newEnt = true;
+			}
+
+			if ($newEnt)
+			{
+				if ($this->debug)			
+				{
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
+					echo "\t%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%\n";
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\n";
+					var_dump($parsedEnt);
+				}
+				if (!isset($parsedEnt["diff"]) && !isset($parsedEnt["index"]))
+					$parsedEnt["index"] = $parsedEnt["internal_index"];
+
+				$entities[] = $parsedEnt;
+				$parsedEnt =array();
+				$newEnt = false;
+			}
+
+			if ($parsedLine["type"] == "internal_index")
+					$parsedEnt["internal_index"] = $parsedLine["index"];
+
+			if ($parsedLine["type"] == "string")
+			{
+				$prevStringLine = true;
+
+				if ($this->debug)			
+				{
+					echo "%%%% parsedEnt %%%%%\n";
+					var_dump($parsedEnt);
+
+//					echo "%%%% parsedLine %%%%%\n";
+//					var_dump($parsedLine);
+				}
+
+				if (!$parsedLine['identifier'])
+				{
+					if ($this->debug) echo "ZLACZENIE \n";
+					if ($this->debug && !isset($parsedEnt['string']))
+					{
+						echo "!isset parsedEnt['string']\n";
+						var_dump($line);
+						var_dump($parsedEnt);
+						var_dump($parsedLine);
+					}
+//					$parsedEnt['string'] .= $parsedLine['string'] . "\n";
+					$parsedEnt['string'] .= "\n" . $parsedLine['string'];
+				}
+				else
+				{
+					if ($this->debug) echo "DODANIE \n";
+					$parsedEnt += $parsedLine;
+//					$parsedEnt['string'] .= "\n";
+				}
+
+				if ($this->debug)			
+				{
+					echo "%%%% parsedEnt after %%%%%\n";
+					var_dump($parsedEnt);
+				}
+			}
+			else
+				$prevStringLine = false;
+
+			if ($parsedLine["type"] == "diff")
+			{
+				$parsedEnt["diff"] = $parsedEnt["command"] = $parsedLine["command"];
+				$parsedEnt["index"] = $parsedLine["index"];
+			}
+		}
+		if ($parsedEnt)
+		{
+			if (!isset($parsedEnt["diff"]) && !isset($parsedEnt["index"]))
+				$parsedEnt["index"] = $parsedEnt["internal_index"];
+
+			$entities[] = $parsedEnt;
+		}
+
+		if ($this->debug)			
+		{
+			echo "<pre>";
+			var_dump($entities);
+			echo "</pre>\n";
+		}
+		return $entities;
+	}
+	
+	function CRLF($s)
+	{
+		$s = str_replace("\r\n", "\n", $s);
+		$s = str_replace("\n", "\r\n", $s);
+		return $s;
+	}
+
+	
+	function buildFile($entities)
+	{
+		$content = '';
+		foreach ($entities as $ent)
+		{
+			if (isset($ent['command']))
+				$content .= '// ' . $ent['command'] . "\n";
+			if (isset($ent['hash_value']))
+				$content .= '// HASH_VALUE ' . $ent['hash_value'];
+/*			if (isset($ent['command']))
+				$content .= '// INDEX ' . $ent['internal_index'] . "\n";
+			else*/
+			if (!isset($ent['command']))
+				$content .= '// INDEX ' . $ent['index'] . "\n";
+			$content .= $ent['identifier'] . "\t" . '[' . $ent['string'] . ']' . "\n";
+			$content .= "\n";
+		}
+		return $this->addBOM($this->CRLF($content));
+	}
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/tasks/empty b/code/ryzom/tools/server/www/webtt/app/vendors/shells/tasks/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/form.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/form.ctp
new file mode 100644
index 000000000..373f86fdc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/form.ctp
@@ -0,0 +1,83 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="grid_4">	
+	<div class="box">			
+		<?php //// ACTIONS ?>
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="block" id="admin-actions">			
+			<h5><?php echo $pluralHumanName; ?></h5>
+			<ul class="menu">
+			<?php if (strpos($action, 'add') === false): ?>
+					<li><?php echo "<?php echo \$this->Html->link(__('Delete', true), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, sprintf(__('Are you sure you want to delete # %s?', true), \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?></li>
+			<?php endif;?>
+					<li><?php echo "<?php echo \$this->Html->link(sprintf(__('List %s', true), __('{$pluralHumanName}', true)), array('action' => 'index'));?>";?></li>
+			</ul>
+			<?php
+					$done = array();
+					foreach ($associations as $type => $data) {							
+						foreach ($data as $alias => $details) {								
+							echo "\n\t\t\t<h5>".Inflector::humanize($details['controller'])."</h5>";
+							echo "\n\t\t\t<ul class=\"menu\">\n";
+							if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+								echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+								echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+								$done[] = $details['controller'];
+							}
+							echo "\t\t\t</ul>\n";
+						}							
+					}
+			?>
+		</div>
+	</div>
+</div>
+
+<div class="grid_12">
+    <h2 id="page-heading"><?php echo "<?php printf(__('" . Inflector::humanize($action) . " %s', true), __('{$singularHumanName}', true)); ?>";?></h2>
+    
+	<div class="<?php echo $pluralVar;?> form">
+	<?php echo "<?php echo \$this->Form->create('{$modelClass}');?>\n";?>
+		<fieldset>
+	 		<legend><?php echo "<?php printf(__('{$singularHumanName} Record', true)); ?>";?></legend>
+	<?php
+			echo "\t<?php\n";
+			foreach ($fields as $field) {
+				if (strpos($action, 'add') !== false && $field == $primaryKey) {
+					continue;
+				} elseif (!in_array($field, array('created', 'modified', 'updated'))) {
+					echo "\t\techo \$this->Form->input('{$field}');\n";
+				}
+			}
+			if (!empty($associations['hasAndBelongsToMany'])) {
+				foreach ($associations['hasAndBelongsToMany'] as $assocName => $assocData) {
+					echo "\t\techo \$this->Form->input('{$assocName}');\n";
+				}
+			}
+			echo "\t?>\n";
+	?>
+		</fieldset>
+	<?php
+		echo "<?php echo \$this->Form->end(__('Submit', true));?>\n";
+	?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/home.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/home.ctp
new file mode 100644
index 000000000..89e973e25
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/home.ctp
@@ -0,0 +1,89 @@
+<div class="grid_16">
+
+<?php
+$output = "<h2>Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!</h2>\n";
+$output .="
+<?php
+if (Configure::read() > 0):
+	Debugger::checkSecurityKeys();
+endif;
+?>
+<p>
+<?php
+	if (is_writable(TMP)):
+		echo '<span class=\"notice success\">';
+			__('Your tmp directory is writable.');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Your tmp directory is NOT writable.');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	\$settings = Cache::settings();
+	if (!empty(\$settings)):
+		echo '<span class=\"notice success\">';
+				printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. \$settings['engine'] . 'Engine</em>');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+				__('Your cache is NOT working. Please check the settings in APP/config/core.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	\$filePresent = null;
+	if (file_exists(CONFIGS . 'database.php')):
+		echo '<span class=\"notice success\">';
+			__('Your database configuration file is present.');
+			\$filePresent = true;
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Your database configuration file is NOT present.');
+			echo '<br/>';
+			__('Rename config/database.php.default to config/database.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<?php
+if (!empty(\$filePresent)):
+	if (!class_exists('ConnectionManager')) {
+		require LIBS . 'model' . DS . 'connection_manager.php';
+	}
+	\$db = ConnectionManager::getInstance();
+ 	\$connected = \$db->getDataSource('default');
+?>
+<p>
+<?php
+	if (\$connected->isConnected()):
+		echo '<span class=\"notice success\">';
+ 			__('Cake is able to connect to the database.');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Cake is NOT able to connect to the database.');
+		echo '</span>';
+	endif;
+?>
+</p>\n";
+$output .= "<?php endif;?>\n";
+$output .= "<h3><?php __('Editing this Page') ?></h3>\n";
+$output .= "<p>\n";
+$output .= "<?php\n";
+$output .= "\tprintf(__('To change the content of this page, edit: %s\n";
+$output .= "\t\tTo change its layout, edit: %s\n";
+$output .= "\t\tYou can also add some CSS styles for your pages at: %s', true),\n";
+$output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />',  APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
+$output .= "?>\n";
+$output .= "</p>\n";
+?>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/index.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/index.ctp
new file mode 100644
index 000000000..1a98eba2a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/index.ctp
@@ -0,0 +1,126 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="grid_4">	
+	<div class="box">			
+		<?php //// ACTIONS ?>
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="block" id="admin-actions">			
+			<h5><?php echo $pluralHumanName; ?></h5>
+			<ul class="menu">
+				<li><?php echo "<?php echo \$this->Html->link(sprintf(__('New %s', true), __('{$singularHumanName}', true)), array('action' => 'add')); ?>";?></li>
+			</ul>
+			<?php
+					$done = array();
+					foreach ($associations as $type => $data) {							
+						foreach ($data as $alias => $details) {								
+							echo "\n\t\t\t<h5>".Inflector::humanize($details['controller'])."</h5>";
+							echo "\n\t\t\t<ul class=\"menu\">\n";
+							if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+								echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+								echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+								$done[] = $details['controller'];
+							}
+							echo "\t\t\t</ul>\n";
+						}							
+					}
+			?>
+		</div>
+	</div>
+</div>
+
+<div class="grid_12">
+    <h2 id="page-heading"><?php echo "<?php __('{$pluralHumanName}');?>";?></h2>
+	
+	<?php //// TABLE WITH RECORDS ?>
+	
+	<table cellpadding="0" cellspacing="0">
+    <?php 
+    //// TABLE HEADERS
+    echo "<?php \$tableHeaders = \$html->tableHeaders(array("; 
+    
+    foreach($fields as $field) { 
+    	echo "\$paginator->sort('{$field}'),";
+    }
+    echo "__('Actions', true),";
+    echo "));\n";
+    
+    echo "echo '<thead>'.\$tableHeaders.'</thead>'; ?>\n\n"; 
+    
+    //// TABLE ROWS
+    
+	echo "<?php
+	\$i = 0;
+	foreach (\${$pluralVar} as \${$singularVar}):
+		\$class = null;
+		if (\$i++ % 2 == 0) {
+			\$class = ' class=\"altrow\"';
+		}
+	?>\n";
+	echo "\t<tr<?php echo \$class;?>>\n";
+		foreach ($fields as $field) {
+			$isKey = false;
+			if (!empty($associations['belongsTo'])) {
+				foreach ($associations['belongsTo'] as $alias => $details) {
+					if ($field === $details['foreignKey']) {
+						$isKey = true;
+						echo "\t\t<td>\n\t\t\t<?php echo \$this->Html->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t</td>\n";
+						break;
+					}
+				}
+			}
+			if ($isKey !== true) {
+				echo "\t\t<td><?php echo \${$singularVar}['{$modelClass}']['{$field}']; ?>&nbsp;</td>\n";
+			}
+		}
+
+		echo "\t\t<td class=\"actions\">\n";
+		echo "\t\t\t<?php echo \$this->Html->link(__('View', true), array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+	 	echo "\t\t\t<?php echo ' | ' . \$this->Html->link(__('Edit', true), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+	 	echo "\t\t\t<?php echo ' | ' . \$this->Html->link(__('Delete', true), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+		echo "\t\t</td>\n";
+	echo "\t</tr>\n";
+
+	echo "<?php endforeach; ?>\n";
+	
+	//// TABLE FOOTER
+    echo "<?php echo '<tfoot class=\'dark\'>'.\$tableHeaders.'</tfoot>'; ?>";
+    ?>
+    </table>
+    
+    <?php //// PAGINATION ?>
+      
+	<p>
+	<?php echo "<?php
+	echo \$this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>";?>
+	</p>
+
+	<div class="paging">
+	<?php echo "\t<?php echo \$this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>\n";?>
+	 | <?php echo "\t<?php echo \$this->Paginator->numbers();?>\n"?> |
+	<?php echo "\t<?php echo \$this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>\n";?>
+	</div>
+		
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/view.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/view.ctp
new file mode 100644
index 000000000..fa7a17221
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/960grid/views/view.ctp
@@ -0,0 +1,184 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="grid_4">	
+	<div class="box">			
+		<?php //// ACTIONS ?>
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="block" id="admin-actions">
+			<h5><?php echo $pluralHumanName; ?></h5>
+			<ul class="menu">				
+			<?php
+			echo "\t<li><?php echo \$this->Html->link(sprintf(__('Edit %s', true), __('{$singularHumanName}', true)), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+			echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('Delete %s', true), __('{$singularHumanName}', true)), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+			echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List %s', true), __('{$pluralHumanName}', true)), array('action' => 'index')); ?> </li>\n";
+			echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('{$singularHumanName}', true)), array('action' => 'add')); ?> </li>\n";
+			?>
+			</ul>			
+				<?php
+					$done = array();
+					foreach ($associations as $type => $data) {
+						foreach ($data as $alias => $details) {
+							echo "\n\t\t\t<h5>".Inflector::humanize($details['controller'])."</h5>";
+							echo "\n\t\t\t<ul class=\"menu\">\n";
+							if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+								echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+								echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+								$done[] = $details['controller'];
+							}
+							echo "\t\t\t</ul>\n";
+						}
+					}
+				?>
+		</div>
+	</div>
+</div>
+
+<div class="grid_12">
+
+<div class="box">
+	<div class="<?php echo $pluralVar;?> view">
+	<h2><?php echo "<?php  __('{$singularHumanName}');?>";?></h2>
+		<div class="block">
+			<dl><?php echo "<?php \$i = 0; \$class = ' class=\"altrow\"';?>\n";?>
+				<?php
+				foreach ($fields as $field) {
+					$isKey = false;
+					if (!empty($associations['belongsTo'])) {
+						foreach ($associations['belongsTo'] as $alias => $details) {
+							if ($field === $details['foreignKey']) {
+								$isKey = true;
+								echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize(Inflector::underscore($alias)) . "'); ?></dt>\n";
+								echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t\t\t<?php echo \$this->Html->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t\t&nbsp;\n\t\t</dd>\n";
+								break;
+							}
+						}
+					}
+					if ($isKey !== true) {
+						echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize($field) . "'); ?></dt>\n";
+						echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t\t\t<?php echo \${$singularVar}['{$modelClass}']['{$field}']; ?>\n\t\t\t&nbsp;\n\t\t</dd>\n";
+					}
+				}
+				?>
+			</dl>
+		</div>
+	</div>
+</div>
+
+<?php if(
+		(!empty($associations['hasOne'])) ||
+		(!empty($associations['hasMany'])) ||
+		(!empty($associations['hasAndBelongsToMany']))
+		) { ?>
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo "<?php echo (__('Related', true)); ?>"; ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<?php
+		if (!empty($associations['hasOne'])) :
+			foreach ($associations['hasOne'] as $alias => $details): ?>
+			<div class="related">
+				<h3><?php echo "<?php printf(__('Related %s', true), __('" . Inflector::humanize($details['controller']) . "', true));?>";?></h3>
+			<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?>
+				<dl><?php echo "\t<?php \$i = 0; \$class = ' class=\"altrow\"';?>\n";?>
+			<?php
+					foreach ($details['fields'] as $field) {
+						echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize($field) . "');?></dt>\n";
+						echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t<?php echo \${$singularVar}['{$alias}']['{$field}'];?>\n&nbsp;</dd>\n";
+					}
+			?>
+				</dl>
+			<?php echo "<?php endif; ?>\n";?>
+				<div class="actions">
+					<ul>
+						<li><?php echo "<?php echo \$this->Html->link(sprintf(__('Edit %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?></li>\n";?>
+					</ul>
+				</div>
+			</div>
+			<?php
+			endforeach;
+		endif;
+		if (empty($associations['hasMany'])) {
+			$associations['hasMany'] = array();
+		}
+		if (empty($associations['hasAndBelongsToMany'])) {
+			$associations['hasAndBelongsToMany'] = array();
+		}
+		$relations = array_merge($associations['hasMany'], $associations['hasAndBelongsToMany']);
+		$i = 0;
+		foreach ($relations as $alias => $details):
+			$otherSingularVar = Inflector::variable($alias);
+			$otherPluralHumanName = Inflector::humanize($details['controller']);
+			?>
+		<div class="related">
+			<h3><?php echo "<?php printf(__('Related %s', true), __('{$otherPluralHumanName}', true));?>";?></h3>
+			<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<?php
+							foreach ($details['fields'] as $field) {
+								echo "\t\t<th><?php __('" . Inflector::humanize($field) . "'); ?></th>\n";
+							}
+						?>
+						<th class="actions"><?php echo "<?php __('Actions');?>";?></th>
+					</tr>
+				</thead>
+		<?php
+		echo "\t<?php
+				\$i = 0;
+				foreach (\${$singularVar}['{$alias}'] as \${$otherSingularVar}):
+					\$class = null;
+					if (\$i++ % 2 == 0) {
+						\$class = ' class=\"altrow\"';
+					}
+				?>\n";
+				echo "\t\t<tr<?php echo \$class;?>>\n";
+
+						foreach ($details['fields'] as $field) {
+							echo "\t\t\t<td><?php echo \${$otherSingularVar}['{$field}'];?></td>\n";
+						}
+
+						echo "\t\t\t<td class=\"actions\">\n";
+						echo "\t\t\t\t<?php echo \$this->Html->link(__('View', true), array('controller' => '{$details['controller']}', 'action' => 'view', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+						echo "\t\t\t\t<?php echo ' | '. \$this->Html->link(__('Edit', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+						echo "\t\t\t\t<?php echo ' | '. \$this->Html->link(__('Delete', true), array('controller' => '{$details['controller']}', 'action' => 'delete', \${$otherSingularVar}['{$details['primaryKey']}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+						echo "\t\t\t</td>\n";
+					echo "\t\t</tr>\n";
+
+		echo "\t<?php endforeach; ?>\n";
+		?>
+			</table>
+		<?php echo "<?php endif; ?>\n\n";?>
+			<div class="actions">
+				<ul>
+					<li><?php echo "<?php echo \$this->Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add'));?>";?> </li>
+				</ul>
+			</div>
+		</div>
+		<?php endforeach;?>
+	</div>
+</div>
+<?php } ?>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/empty b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/form.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/form.ctp
new file mode 100644
index 000000000..1845005c0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/form.ctp
@@ -0,0 +1,115 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2009, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ *
+ * WebTT bake template based on 960grid template
+ * http://bakery.cakephp.org/articles/tom_m/2010/05/26/960-fluid-grid-system-bake-templates
+ *
+ */
+?>
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo "<?php echo __('" . $pluralHumanName . "', true); ?>"; ?></h5>
+			<ul class="menu">
+			<?php if (strpos($action, 'add') === false): ?><?php
+				if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "delete", $scaffoldForbiddenActions))) {
+				echo "\t\t\t"; ?><li><?php echo "<?php echo \$this->Html->link(sprintf(__('Delete this %s', true), __('" . Inflector::humanize(Inflector::underscore($modelClass)) . "', true)),array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, sprintf(__('Are you sure you want to delete # %s?', true), \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?></li><?php
+				} ?>
+			<?php endif;?><?php
+				if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "index", $scaffoldForbiddenActions))) {
+				echo "\t\t\t"; ?><li><?php echo "<?php echo \$this->Html->link(sprintf(__('List all %s', true), __('{$pluralHumanName}', true)), array('action' => 'index'));?>";?></li><?php
+				} ?>
+			</ul>
+			<?php
+					$done = array();
+					foreach ($associations as $_type => $_data)
+					{
+						foreach ($_data as $alias => $details)
+						{
+							if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "index", $details['scaffoldForbiddenActions'])))
+							{
+								echo "\n\t\t\t<h5>".Inflector::humanize($details['controller'])."</h5>";
+								echo "\n\t\t\t<ul class=\"menu\">\n";
+								if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+									if ($_type == 'hasMany' && strpos($action, 'add') === false)
+									{
+										echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List related %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index', '{$details['foreignKey']}' => \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+										if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "add", $details['scaffoldForbiddenActions'])))
+											echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New related %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add', '{$details['foreignKey']}' => \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+									}
+
+									if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "index", $details['scaffoldForbiddenActions'])))
+										echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List all %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+									if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "add", $details['scaffoldForbiddenActions'])))
+										echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+									$done[] = $details['controller'];
+								}
+								echo "\t\t\t</ul>\n";
+							}
+						}
+					}
+			?>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php echo "<?php printf(__('" . Inflector::humanize($action) . " %s', true), __('{$singularHumanName}', true)); ?>";?></h2>
+    
+	<div class="<?php echo $pluralVar;?> form">
+	<?php echo "<?php echo \$this->Form->create('{$modelClass}');?>\n";?>
+		<fieldset>
+			<?php if (strpos($action, 'add') === false): ?>
+			<legend><?php echo "<?php printf(__('{$singularHumanName} # %s', true), \$this->Form->value('{$modelClass}.{$primaryKey}')); ?>";?></legend>
+			<?php else:;?>
+	 		<legend><?php echo "<?php printf(__('{$singularHumanName}', true)); ?>";?></legend>
+			<?php endif;?>
+	<?php
+			echo "\t<?php\n";
+			foreach ($fields as $field) {
+				if (!(empty($scaffoldForbiddenFields) || !isset($scaffoldForbiddenFields[$scaffoldPrefix]) || (!empty($scaffoldForbiddenFields) && isset($scaffoldForbiddenFields[$scaffoldPrefix]) && !in_array($field, $scaffoldForbiddenFields[$scaffoldPrefix]))))
+					continue;
+
+				if (strpos($action, 'add') !== false && $field == $primaryKey) {
+					continue;
+				} elseif (!in_array($field, array('created', 'modified', 'updated'))) {
+					echo "\t\techo \$this->Form->input('{$field}');\n";
+				}
+			}
+			if (!empty($associations['hasAndBelongsToMany'])) {
+				foreach ($associations['hasAndBelongsToMany'] as $assocName => $assocData) {
+					echo "\t\techo \$this->Form->input('{$assocName}');\n";
+				}
+			}
+			echo "\t?>\n";
+	?>
+		</fieldset>
+		<?php
+			echo "<div class=\"box\">\n";
+			echo "<?php echo \$this->Form->end(__('Submit', true));?>\n";
+			echo "</div>";
+		?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/home.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/home.ctp
new file mode 100644
index 000000000..329f684c8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/home.ctp
@@ -0,0 +1,112 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ *
+ * WebTT bake template based on 960grid template
+ * http://bakery.cakephp.org/articles/tom_m/2010/05/26/960-fluid-grid-system-bake-templates
+ *
+ */
+?>
+<div class="grid_16">
+
+<?php
+$output = "<h2>Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!</h2>\n";
+$output .="
+<?php
+if (Configure::read() > 0):
+	Debugger::checkSecurityKeys();
+endif;
+?>
+<p>
+<?php
+	if (is_writable(TMP)):
+		echo '<span class=\"notice success\">';
+			__('Your tmp directory is writable.');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Your tmp directory is NOT writable.');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	\$settings = Cache::settings();
+	if (!empty(\$settings)):
+		echo '<span class=\"notice success\">';
+				printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. \$settings['engine'] . 'Engine</em>');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+				__('Your cache is NOT working. Please check the settings in APP/config/core.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	\$filePresent = null;
+	if (file_exists(CONFIGS . 'database.php')):
+		echo '<span class=\"notice success\">';
+			__('Your database configuration file is present.');
+			\$filePresent = true;
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Your database configuration file is NOT present.');
+			echo '<br/>';
+			__('Rename config/database.php.default to config/database.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<?php
+if (!empty(\$filePresent)):
+	if (!class_exists('ConnectionManager')) {
+		require LIBS . 'model' . DS . 'connection_manager.php';
+	}
+	\$db = ConnectionManager::getInstance();
+ 	\$connected = \$db->getDataSource('default');
+?>
+<p>
+<?php
+	if (\$connected->isConnected()):
+		echo '<span class=\"notice success\">';
+ 			__('Cake is able to connect to the database.');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Cake is NOT able to connect to the database.');
+		echo '</span>';
+	endif;
+?>
+</p>\n";
+$output .= "<?php endif;?>\n";
+$output .= "<h3><?php __('Editing this Page') ?></h3>\n";
+$output .= "<p>\n";
+$output .= "<?php\n";
+$output .= "\tprintf(__('To change the content of this page, edit: %s\n";
+$output .= "\t\tTo change its layout, edit: %s\n";
+$output .= "\t\tYou can also add some CSS styles for your pages at: %s', true),\n";
+$output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />',  APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
+$output .= "?>\n";
+$output .= "</p>\n";
+?>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/index.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/index.ctp
new file mode 100644
index 000000000..320c67f64
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/index.ctp
@@ -0,0 +1,142 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ *
+ * WebTT bake template based on 960grid template
+ * http://bakery.cakephp.org/articles/tom_m/2010/05/26/960-fluid-grid-system-bake-templates
+ *
+ */
+?>
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo "<?php echo __('" . $pluralHumanName . "', true); ?>"; ?></h5>
+				<ul class="menu">
+				<?php
+				if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "index", $scaffoldForbiddenActions)))
+					echo "\t<li><?php echo \$this->Html->link(sprintf(__('List %s', true), __('{$pluralHumanName}', true)), array('action' => 'index')); ?> </li>\n";
+				if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "add", $scaffoldForbiddenActions)))
+					echo "\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('{$singularHumanName}', true)), array('action' => 'add')); ?> </li>\n";
+				?>
+				</ul><?php echo "\n";
+				$done = array();
+				foreach ($associations as $_type => $_data)
+				{
+					foreach ($_data as $alias => $details)
+					{
+						if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "index", $details['scaffoldForbiddenActions'])))
+						{
+							echo "\t\t\t\t<h5><?php echo __('" . Inflector::humanize($details['controller']) . "', true); ?></h5>\n";
+							echo "\t\t\t\t<ul class=\"menu\">\n";
+							if ($details['controller'] != $this->name && !in_array($details['controller'], $done))
+							{
+								if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "index", $details['scaffoldForbiddenActions'])))
+									echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List all %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+								if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "add", $details['scaffoldForbiddenActions'])))
+									echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+								$done[] = $details['controller'];
+							}
+							echo "\t\t\t\t</ul>\n";
+						}
+					}
+				}
+				?>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php echo "<?php __('{$pluralHumanName}');?>";?></h2>
+	<table cellpadding="0" cellspacing="0"><?php
+		//// TABLE HEADERS
+		echo "\t\t<?php \$tableHeaders = \$html->tableHeaders(array("; 
+
+		foreach($fields as $field) {
+			if (!(empty($scaffoldForbiddenFields) || !isset($scaffoldForbiddenFields[$scaffoldPrefix]) || (!empty($scaffoldForbiddenFields) && isset($scaffoldForbiddenFields[$scaffoldPrefix]) && !in_array($field, $scaffoldForbiddenFields[$scaffoldPrefix]))))
+				continue;
+
+			echo "\$paginator->sort('{$field}'),";
+		}
+		echo "__('Actions', true),";
+		echo "));\n";
+		echo "\t\techo '<thead>'.\$tableHeaders.'</thead>'; ?>\n\n"; 
+
+		//// TABLE ROWS
+		echo "\t\t<?php
+		\$i = 0;
+		foreach (\${$pluralVar} as \${$singularVar}):
+			\$class = null;
+			if (\$i++ % 2 == 0) {
+				\$class = ' class=\"altrow\"';
+			}
+		?>\n";
+		echo "\t<tr<?php echo \$class;?>>\n";
+			foreach ($fields as $field) {
+				if (!(empty($scaffoldForbiddenFields) || !isset($scaffoldForbiddenFields[$scaffoldPrefix]) || (!empty($scaffoldForbiddenFields) && isset($scaffoldForbiddenFields[$scaffoldPrefix]) && !in_array($field, $scaffoldForbiddenFields[$scaffoldPrefix]))))
+					continue;
+
+				$isKey = false;
+				if (!empty($associations['belongsTo'])) {
+					foreach ($associations['belongsTo'] as $alias => $details) {
+						if ($field === $details['foreignKey'] && $field !== $primaryKey) {
+							$isKey = true;
+							echo "\t\t<td>\n\t\t\t<?php echo \$this->Html->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t</td>\n";
+							break;
+						}
+					}
+				}
+				if ($isKey !== true) {
+					echo "\t\t<td><?php echo \${$singularVar}['{$modelClass}']['{$field}']; ?></td>\n";
+				}
+			}
+
+			echo "\t\t<td class=\"actions\">\n";
+			if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "view", $scaffoldForbiddenActions)))
+				echo "\t\t\t<?php echo \$this->Html->link(__('View', true), array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+			if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "edit", $scaffoldForbiddenActions)))
+				echo "\t\t\t<?php echo ' | ' . \$this->Html->link(__('Edit', true), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+			if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "delete", $scaffoldForbiddenActions)))
+			 	echo "\t\t\t<?php echo ' | ' . \$this->Html->link(__('Delete', true), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+			echo "\t\t</td>\n";
+			echo "\t</tr>\n";
+
+			echo "\t<?php endforeach; ?>\n";
+			//// TABLE FOOTER
+			echo "\t<?php echo '<tfoot class=\'dark\'>'.\$tableHeaders.'</tfoot>'; ?>\n";
+			?>
+	</table>
+
+	<?php //// PAGINATION ?>
+
+	<p>
+	<?php echo "<?php
+	echo \$this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>";?>
+	</p>
+
+	<div class="paging">
+	<?php echo "\t<?php echo \$this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>\n";?>
+		| <?php echo "<?php echo \$this->Paginator->numbers();?>"?> |
+	<?php echo "\t<?php echo \$this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>\n";?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/view.ctp b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/view.ctp
new file mode 100644
index 000000000..37a88037f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/vendors/shells/templates/webtt/views/view.ctp
@@ -0,0 +1,255 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * WebTT bake template based on 960grid template
+ * http://bakery.cakephp.org/articles/tom_m/2010/05/26/960-fluid-grid-system-bake-templates
+ *
+ */
+?>
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo "<?php echo __('" . $pluralHumanName . "', true); ?>"; ?></h5>
+			<ul class="menu">
+			<?php
+			if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "edit", $scaffoldForbiddenActions)))
+				echo "\t<li><?php echo \$this->Html->link(sprintf(__('Edit %s', true), __('{$singularHumanName}', true)), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+			if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "delete", $scaffoldForbiddenActions)))
+				echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('Delete %s', true), __('{$singularHumanName}', true)), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+			if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "index", $scaffoldForbiddenActions)))
+				echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List %s', true), __('{$pluralHumanName}', true)), array('action' => 'index')); ?> </li>\n";
+			if (empty($scaffoldForbiddenActions) || (!empty($scaffoldForbiddenActions) && !in_array($scaffoldPrefix . "add", $scaffoldForbiddenActions)))
+				echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('{$singularHumanName}', true)), array('action' => 'add')); ?> </li>\n";
+			?>
+			</ul>
+				<?php
+					$done = array();
+					foreach ($associations as $_type => $_data)
+					{
+						foreach ($_data as $alias => $details)
+						{
+							if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "index", $details['scaffoldForbiddenActions'])))
+							{
+								echo "\n\t\t\t<h5>".Inflector::humanize($details['controller'])."</h5>";
+								echo "\n\t\t\t<ul class=\"menu\">\n";
+								if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+									if ($_type == 'hasMany')
+									{
+										echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List related %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index', '{$details['foreignKey']}' => \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+										if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "add", $details['scaffoldForbiddenActions'])))
+											echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New related %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add', '{$details['foreignKey']}' => \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+									}
+									echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('List all %s', true), __('" . Inflector::humanize($details['controller']) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+									if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "add", $details['scaffoldForbiddenActions'])))
+									{
+										echo "\t\t\t\t<li><?php echo \$this->Html->link(sprintf(__('New %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+									}
+									$done[] = $details['controller'];
+								}
+								echo "\t\t\t</ul>\n";
+							}
+						}
+					}
+				?>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="<?php echo $pluralVar;?> view">
+	<h2><?php echo "<?php  __('{$singularHumanName}');?>";?></h2>
+		<div class="block">
+			<div class="dl">
+				<?php
+				echo "<?php \$i = 1; \$class = ' altrow';?>\n";
+				foreach ($fields as $field) {
+					if (!(empty($scaffoldForbiddenFields) || !isset($scaffoldForbiddenFields[$scaffoldPrefix]) || (!empty($scaffoldForbiddenFields) && isset($scaffoldForbiddenFields[$scaffoldPrefix]) && !in_array($field, $scaffoldForbiddenFields[$scaffoldPrefix]))))
+						continue;
+
+					$isKey = false;
+					if (!empty($associations['belongsTo'])) {
+						foreach ($associations['belongsTo'] as $alias => $details) {
+							if ($field === $details['foreignKey'] && $field !== $primaryKey) {
+								$isKey = true;
+								echo "\t\t\t\t<div class=\"dt<?php if (\$i % 2 == 0) echo \$class;?>\"><?php __('" . Inflector::humanize(Inflector::underscore($alias)) . "'); ?></div>\n";
+								echo "\t\t\t\t<div class=\"dd<?php if (\$i % 2 == 0) echo \$class;?>\">\n\t\t\t\t\t<?php echo \$this->Html->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t\t\t</div>\n";
+								break;
+							}
+						}
+					}
+					if ($isKey !== true) {
+						echo "\t\t\t\t<div class=\"dt<?php if (\$i == 1) echo \" dh\"; else if (\$i % 2 == 0) echo \$class;?>\"><?php __('" . Inflector::humanize($field) . "'); ?></div>\n";
+						echo "\t\t\t\t<div class=\"dd<?php if (\$i == 1) echo \" dh\"; else if (\$i % 2 == 0) echo \$class;?>\">\n\t\t\t\t\t<?php echo \${$singularVar}['{$modelClass}']['{$field}']; ?>\n\t\t\t\t</div>\n";
+					}
+					echo "\t\t\t\t<?php \$i++; ?>\n";
+					echo "\t\t\t\t<div style=\"clear: both\"></div>\n\n";
+				}
+				?>
+			</div>
+		</div>
+	</div>
+</div>
+
+<?php if(
+		(!empty($associations['hasOne'])) ||
+		(!empty($associations['hasMany'])) ||
+		(!empty($associations['hasAndBelongsToMany']))
+		) {
+		?>
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo "<?php echo (__('Related', true)); ?>"; ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED --><?php echo "\n";
+		if (!empty($associations['hasOne'])) :
+			foreach ($associations['hasOne'] as $alias => $details): ?>
+			<!-- <?php echo $alias; ?> -->
+			<div class="related">
+				<h3><?php echo "<?php printf(__('Related %s (%s)', true), __('" . Inflector::humanize($details['controller']) . "', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true));?>";?></h3>
+				<?php echo "<?php if (!empty(\${$singularVar}['{$alias}']['{$details['primaryKey']}'])):?>\n";?>
+				<div class="dl">
+				<?php
+				echo "<?php \$i = 0; \$class = ' class=\"altrow\"';?>\n";?><?php echo "\n";
+					foreach ($details['fields'] as $field) {
+						echo "\t\t\t\t\t<div class=\"dt<?php if (\$i % 2 == 0) echo \$class;?>\"><?php __('" . Inflector::humanize($field) . "');?></div>\n";
+						echo "\t\t\t\t\t<div class=\"dd<?php if (\$i++ % 2 == 0) echo \$class;?>\">\n";
+						echo "\t\t\t\t\t\t<?php echo \${$singularVar}['{$alias}']['{$field}'];?>\n\t\t\t\t\t</div>\n";
+						echo "\t\t\t\t\t<div style=\"clear: both\"></div>\n";
+					}
+					?>
+				</div>
+				<?php echo "<?php endif; ?>\n";?>
+
+				<div class="actions">
+					<ul>
+					<?php echo "<?php if (!empty(\${$singularVar}['{$alias}']['{$details['primaryKey']}'])):?>\n";
+					if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "view", $details['scaffoldForbiddenActions']))) {
+						?>
+						<li><?php echo "<?php echo \$this->Html->link(sprintf(__('View %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>";
+						?></li><? echo "\n";
+					}
+					?>
+					<?php echo "<?php endif; ?>\n";?>
+					<?php echo "<?php if (!empty(\${$singularVar}['{$alias}']['{$details['primaryKey']}'])):?>\n";
+					if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "add", $details['scaffoldForbiddenActions']))) {
+						?>
+						<li><?php echo "<?php echo \$this->Html->link(sprintf(__('Edit %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>";
+						?></li><? echo "\n";
+					}
+					?>
+					<?php echo "<?php endif; ?>\n";?>
+					</ul>
+				</div>
+			</div><?php
+			echo "\n";
+			endforeach;
+		endif;
+		if (empty($associations['hasMany'])) {
+			$associations['hasMany'] = array();
+		}
+		if (empty($associations['hasAndBelongsToMany'])) {
+			$associations['hasAndBelongsToMany'] = array();
+		}
+		$relations = array_merge($associations['hasMany'], $associations['hasAndBelongsToMany']);
+		$i = 0;
+		foreach ($relations as $alias => $details):
+		if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "index", $details['scaffoldForbiddenActions']))):
+			
+			$otherSingularVar = Inflector::variable($alias);
+			$otherPluralHumanName = Inflector::humanize($details['controller']);
+			?>
+		<!-- <?php echo $alias; ?> -->
+		<div class="related">
+			<h3><?php echo "<?php printf(__('Related %s', true), __('{$otherPluralHumanName}', true));?>";?></h3>
+			<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr><?php echo "\n";
+							foreach ($details['fields'] as $field) {
+								echo "\t\t\t\t\t\t<th><?php __('" . Inflector::humanize($field) . "'); ?></th>\n";
+							}
+						?>
+						<th class="actions"><?php echo "<?php __('Actions');?>";?></th>
+					</tr>
+				</thead>
+				<?php
+				echo "<?php
+				\$i = 0;
+				foreach (\${$singularVar}['{$alias}'] as \${$otherSingularVar}):
+					\$class = null;
+					if (\$i++ % 2 == 0) {
+						\$class = ' class=\"altrow\"';
+					}
+				?>\n";
+				echo "\t\t\t\t<tr<?php echo \$class;?>>\n";
+
+						foreach ($details['fields'] as $field) {
+							echo "\t\t\t\t\t<td><?php echo \${$otherSingularVar}['{$field}'];?></td>\n";
+						}
+
+						echo "\t\t\t\t\t<td class=\"actions\">\n";
+						if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "view", $details['scaffoldForbiddenActions'])))
+							echo "\t\t\t\t\t\t<?php echo \$this->Html->link(__('View', true), array('controller' => '{$details['controller']}', 'action' => 'view', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+						if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "edit", $details['scaffoldForbiddenActions'])))
+							echo "\t\t\t\t\t\t<?php echo ' | '. \$this->Html->link(__('Edit', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+						if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "delete", $details['scaffoldForbiddenActions'])))
+							echo "\t\t\t\t\t\t<?php echo ' | '. \$this->Html->link(__('Delete', true), array('controller' => '{$details['controller']}', 'action' => 'delete', \${$otherSingularVar}['{$details['primaryKey']}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+						echo "\t\t\t\t\t</td>\n";
+					echo "\t\t\t\t</tr>\n";
+
+			echo "\t\t\t\t<?php endforeach; ?>\n";
+			?>
+			</table>
+			<?php echo "<?php endif; ?>\n\n";?>
+			<div class="actions">
+				<ul><?php echo "\n";
+				if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "index", $details['scaffoldForbiddenActions']))) { ?>
+					<li><?php
+					echo "<?php echo \$this->Html->link(sprintf(__('List related %s', true), __('" . $otherPluralHumanName . "', true)), array('controller' => '{$details['controller']}', 'action' => 'index'";
+					echo ", '{$details['foreignKey']}' => \${$singularVar}['{$modelClass}']['{$primaryKey}']";
+					echo "));?>";
+					?></li><? echo "\n";
+				}
+				if (empty($details['scaffoldForbiddenActions']) || (!empty($details['scaffoldForbiddenActions']) && !in_array($scaffoldPrefix . "add", $details['scaffoldForbiddenActions']))) { ?>
+					<li><?php
+					echo "<?php echo \$this->Html->link(sprintf(__('New related %s', true), __('" . Inflector::humanize(Inflector::underscore($alias)) . "', true)), array('controller' => '{$details['controller']}', 'action' => 'add'";
+					echo ", '{$details['foreignKey']}' => \${$singularVar}['{$modelClass}']['{$primaryKey}']";
+					echo "));?>";
+					?></li><? echo "\n";
+				}
+				?>
+				</ul>
+			</div>
+		</div><?php
+		echo "\n";
+		endif;
+		endforeach; ?>
+		<!-- /RELATED -->
+	</div>
+</div>
+<?php } ?>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/add.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/add.ctp
new file mode 100644
index 000000000..63c6ee423
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/add.ctp
@@ -0,0 +1,117 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Comments', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Comment', true)); ?></h2>
+    
+	<div class="comments form">
+	<?php echo $this->Form->create('Comment');?>
+		<fieldset>
+				 		<legend><?php printf(__('Comment', true)); ?></legend>
+					<?php
+//		echo $this->Form->input('translation_id');
+		echo $this->Form->hidden('identifier_id', array('default' => $identifier['Identifier']['id']));
+		echo $this->Form->hidden('user_id', array('value' => $this->Session->read('Auth.User.id')));
+		echo $this->Form->input('comment');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translation_index']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_add.ctp
new file mode 100644
index 000000000..4510c6f25
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_add.ctp
@@ -0,0 +1,52 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Comments', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Comment', true)); ?></h2>
+    
+	<div class="comments form">
+	<?php echo $this->Form->create('Comment');?>
+		<fieldset>
+				 		<legend><?php printf(__('Comment', true)); ?></legend>
+					<?php
+		echo $this->Form->input('translation_id');
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('user_id');
+		echo $this->Form->input('comment');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_edit.ctp
new file mode 100644
index 000000000..3341db17f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_edit.ctp
@@ -0,0 +1,53 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Comments', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Comment.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Comment.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Comment', true)); ?></h2>
+    
+	<div class="comments form">
+	<?php echo $this->Form->create('Comment');?>
+		<fieldset>
+						<legend><?php printf(__('Comment # %s', true), $this->Form->value('Comment.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('translation_id');
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('user_id');
+		echo $this->Form->input('comment');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_index.ctp
new file mode 100644
index 000000000..ba9dd8769
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_index.ctp
@@ -0,0 +1,81 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Comments', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index')); ?> </li>
+	<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Comments');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_id'),$paginator->sort('identifier_id'),$paginator->sort('user_id'),$paginator->sort('comment'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($comments as $comment):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $comment['Comment']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($comment['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $comment['Translation']['id'])); ?>
+		</td>
+		<td>
+			<?php echo $this->Html->link($comment['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $comment['Identifier']['id'])); ?>
+		</td>
+		<td>
+			<?php echo $this->Html->link($comment['User']['name'], array('controller' => 'users', 'action' => 'view', $comment['User']['id'])); ?>
+		</td>
+		<td><?php echo $comment['Comment']['comment']; ?></td>
+		<td><?php echo $comment['Comment']['created']; ?></td>
+		<td><?php echo $comment['Comment']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $comment['Comment']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $comment['Comment']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $comment['Comment']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['Comment']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_view.ctp
new file mode 100644
index 000000000..f7f6d1d75
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/admin_view.ctp
@@ -0,0 +1,97 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Comments', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Comment', true)), array('action' => 'edit', $comment['Comment']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Comment', true)), array('action' => 'delete', $comment['Comment']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['Comment']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="comments view">
+	<h2><?php  __('Comment');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($comment['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $comment['Translation']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($comment['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $comment['Identifier']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($comment['User']['name'], array('controller' => 'users', 'action' => 'view', $comment['User']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Comment'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['comment']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/edit.ctp
new file mode 100644
index 000000000..ad7b8cbbb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/edit.ctp
@@ -0,0 +1,51 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Comments', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Comment.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Comment.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Comment', true)); ?></h2>
+    
+	<div class="comments form">
+	<?php echo $this->Form->create('Comment');?>
+		<fieldset>
+						<legend><?php printf(__('Comment # %s', true), $this->Form->value('Comment.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('translation_id');
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('user_id');
+		echo $this->Form->input('comment');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/index.ctp
new file mode 100644
index 000000000..9dca44d44
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/index.ctp
@@ -0,0 +1,72 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Comments', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index')); ?> </li>
+	<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Comments');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('identifier_id'),$paginator->sort('user_id'),$paginator->sort('comment'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($comments as $comment):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $comment['Comment']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($comment['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $comment['Identifier']['id'])); ?>
+		</td>
+		<td>
+			<?php echo $this->Html->link($comment['User']['name'], array('controller' => 'users', 'action' => 'view', $comment['User']['id'])); ?>
+		</td>
+		<td><?php echo $comment['Comment']['comment']; ?></td>
+		<td><?php echo $comment['Comment']['created']; ?></td>
+		<td><?php echo $comment['Comment']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $comment['Comment']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $comment['Comment']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $comment['Comment']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['Comment']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/comments/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/comments/view.ctp
new file mode 100644
index 000000000..bf60e8bc0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/comments/view.ctp
@@ -0,0 +1,84 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Comments', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Comment', true)), array('action' => 'edit', $comment['Comment']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Comment', true)), array('action' => 'delete', $comment['Comment']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['Comment']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="comments view">
+	<h2><?php  __('Comment');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($comment['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $comment['Identifier']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($comment['User']['name'], array('controller' => 'users', 'action' => 'view', $comment['User']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Comment'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['comment']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $comment['Comment']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/html/empty b/code/ryzom/tools/server/www/webtt/app/views/elements/email/html/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/html/registration.ctp b/code/ryzom/tools/server/www/webtt/app/views/elements/email/html/registration.ctp
new file mode 100644
index 000000000..3e90bb9d2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/elements/email/html/registration.ctp
@@ -0,0 +1,9 @@
+Hello <?php echo $user['User']['name']; ?>,
+Thank you for registering to WebTT!
+
+Your password is: <?php echo $user['User']['passwd']; echo "\n"; ?>
+<?php
+$url = $this->Html->url(array('controller' => 'users', 'action' => 'confirm', $user['User']['confirm_hash']));
+$completeUrl = 'http://' . $serverName . $url;
+?>
+Go to this link to confirm you account: <?php echo $this->Html->link(__('Confirm', true), $completeUrl); ?>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/text/empty b/code/ryzom/tools/server/www/webtt/app/views/elements/email/text/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/email/text/registration.ctp b/code/ryzom/tools/server/www/webtt/app/views/elements/email/text/registration.ctp
new file mode 100644
index 000000000..42755916d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/elements/email/text/registration.ctp
@@ -0,0 +1,9 @@
+Hello <?php echo $user['User']['name']; echo "\n"; ?>,
+Thank you for registering to WebTT!
+
+Your password is: <?php echo $user['User']['passwd']; echo "\n"; ?>
+<?php
+$url = $this->Html->url(array('controller' => 'users', 'action' => 'confirm', $user['User']['confirm_hash']));
+$completeUrl = 'http://' . $serverName . $url;
+?>
+Go to this link to confirm you account: <?php echo $completeUrl; ?>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/empty b/code/ryzom/tools/server/www/webtt/app/views/elements/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/elements/neighbours.ctp b/code/ryzom/tools/server/www/webtt/app/views/elements/neighbours.ctp
new file mode 100644
index 000000000..33e9438ba
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/elements/neighbours.ctp
@@ -0,0 +1,19 @@
+	<?php if (isset($identifierNeighbours)): ?>
+	<?php //var_dump($identifierNeighbours); ?>
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-neighbour-actions"><?php echo sprintf(__('Neighbour %s', true), __('Identifiers', true)); ?></a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="neighbour-actions">
+		<?php foreach (array('prev', 'current', 'next') as $pos): ?>
+		<?php foreach ($identifierNeighbours[$pos] as $neighbourIdentifier): ?>
+			<ul class="list menu">
+				<li<?php if ($pos == 'current') { echo " class=\"current\""; } ?>><?php echo $this->Html->link($neighbourIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $neighbourIdentifier['Identifier']['id'])); ?> </li>
+			</ul>
+		<?php endforeach; ?>
+		<?php endforeach; ?>
+		</div>
+		</div>
+	</div>
+	<?php endif; ?>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/errors/empty b/code/ryzom/tools/server/www/webtt/app/views/errors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/add.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/add.ctp
new file mode 100644
index 000000000..7a7d0c0be
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/add.ctp
@@ -0,0 +1,46 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('File Identifier', true)); ?></h2>
+    
+	<div class="fileIdentifiers form">
+	<?php echo $this->Form->create('FileIdentifier');?>
+		<fieldset>
+				 		<legend><?php printf(__('File Identifier', true)); ?></legend>
+					<?php
+		echo $this->Form->input('imported_translation_file_id');
+		echo $this->Form->input('command');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_add.ctp
new file mode 100644
index 000000000..0073afd78
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_add.ctp
@@ -0,0 +1,46 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('File Identifier', true)); ?></h2>
+    
+	<div class="fileIdentifiers form">
+	<?php echo $this->Form->create('FileIdentifier');?>
+		<fieldset>
+				 		<legend><?php printf(__('File Identifier', true)); ?></legend>
+					<?php
+		echo $this->Form->input('imported_translation_file_id');
+		echo $this->Form->input('command');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_edit.ctp
new file mode 100644
index 000000000..2d69ae33f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_edit.ctp
@@ -0,0 +1,47 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('File Identifier', true)); ?></h2>
+    
+	<div class="fileIdentifiers form">
+	<?php echo $this->Form->create('FileIdentifier');?>
+		<fieldset>
+						<legend><?php printf(__('File Identifier # %s', true), $this->Form->value('FileIdentifier.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('imported_translation_file_id');
+		echo $this->Form->input('command');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_index.ctp
new file mode 100644
index 000000000..9220d8a55
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_index.ctp
@@ -0,0 +1,70 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
+				</ul>				<h5><?php echo __('Imported Translation Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('File Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('imported_translation_file_id'),$paginator->sort('command'),$paginator->sort('translation_index'),$paginator->sort('identifier_id'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($fileIdentifiers as $fileIdentifier):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $fileIdentifier['FileIdentifier']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
+		</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['command']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?></td>
+		<td>
+			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
+		</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['arguments']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['created']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $fileIdentifier['FileIdentifier']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_view.ctp
new file mode 100644
index 000000000..6c945cae1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_view.ctp
@@ -0,0 +1,101 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="fileIdentifiers view">
+	<h2><?php  __('File Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Imported Translation File'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Command'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['command']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<textarea rows="10" style="width: 100%" readonly="true"><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></textarea>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/edit.ctp
new file mode 100644
index 000000000..326ee782a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/edit.ctp
@@ -0,0 +1,47 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('File Identifier', true)); ?></h2>
+    
+	<div class="fileIdentifiers form">
+	<?php echo $this->Form->create('FileIdentifier');?>
+		<fieldset>
+						<legend><?php printf(__('File Identifier # %s', true), $this->Form->value('FileIdentifier.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('imported_translation_file_id');
+		echo $this->Form->input('command');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/index.ctp
new file mode 100644
index 000000000..9220d8a55
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/index.ctp
@@ -0,0 +1,70 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
+				</ul>				<h5><?php echo __('Imported Translation Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('File Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('imported_translation_file_id'),$paginator->sort('command'),$paginator->sort('translation_index'),$paginator->sort('identifier_id'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($fileIdentifiers as $fileIdentifier):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $fileIdentifier['FileIdentifier']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
+		</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['command']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?></td>
+		<td>
+			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
+		</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['arguments']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['created']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $fileIdentifier['FileIdentifier']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/view.ctp
new file mode 100644
index 000000000..6c945cae1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/file_identifiers/view.ctp
@@ -0,0 +1,101 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="fileIdentifiers view">
+	<h2><?php  __('File Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Imported Translation File'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Command'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['command']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<textarea rows="10" style="width: 100%" readonly="true"><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></textarea>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $fileIdentifier['FileIdentifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/helpers/empty b/code/ryzom/tools/server/www/webtt/app/views/helpers/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_index.ctp
new file mode 100644
index 000000000..d0ce4f8a1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_index.ctp
@@ -0,0 +1,71 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Identifier Columns', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('action' => 'index')); ?> </li>
+	<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier Column', true)), array('action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Identifier Columns');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('identifier_id'),$paginator->sort('column_name'),$paginator->sort('reference_string'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($identifierColumns as $identifierColumn):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $identifierColumn['IdentifierColumn']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($identifierColumn['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $identifierColumn['Identifier']['id'])); ?>
+		</td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['column_name']; ?></td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['reference_string']; ?></td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['created']; ?></td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $identifierColumn['IdentifierColumn']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $identifierColumn['IdentifierColumn']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $identifierColumn['IdentifierColumn']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifierColumn['IdentifierColumn']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_view.ctp
new file mode 100644
index 000000000..f50428a1e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/admin_view.ctp
@@ -0,0 +1,146 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifier Columns', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Identifier Column', true)), array('action' => 'edit', $identifierColumn['IdentifierColumn']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Identifier Column', true)), array('action' => 'delete', $identifierColumn['IdentifierColumn']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifierColumn['IdentifierColumn']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier Column', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="identifierColumns view">
+	<h2><?php  __('Identifier Column');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifierColumn['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $identifierColumn['Identifier']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Column Name'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['column_name']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- Translation -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
+			<?php if (!empty($identifierColumn['Translation'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Identifier Column Id'); ?></th>
+						<th><?php __('Translation Text'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Best'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifierColumn['Translation'] as $translation):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translation['id'];?></td>
+					<td><?php echo $translation['identifier_id'];?></td>
+					<td><?php echo $translation['identifier_column_id'];?></td>
+					<td><?php echo $translation['translation_text'];?></td>
+					<td><?php echo $translation['user_id'];?></td>
+					<td><?php echo $translation['best'];?></td>
+					<td><?php echo $translation['created'];?></td>
+					<td><?php echo $translation['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add'));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/index.ctp
new file mode 100644
index 000000000..d0ce4f8a1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/index.ctp
@@ -0,0 +1,71 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Identifier Columns', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('action' => 'index')); ?> </li>
+	<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier Column', true)), array('action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Identifier Columns');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('identifier_id'),$paginator->sort('column_name'),$paginator->sort('reference_string'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($identifierColumns as $identifierColumn):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $identifierColumn['IdentifierColumn']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($identifierColumn['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $identifierColumn['Identifier']['id'])); ?>
+		</td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['column_name']; ?></td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['reference_string']; ?></td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['created']; ?></td>
+		<td><?php echo $identifierColumn['IdentifierColumn']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $identifierColumn['IdentifierColumn']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $identifierColumn['IdentifierColumn']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $identifierColumn['IdentifierColumn']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifierColumn['IdentifierColumn']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/view.ctp
new file mode 100644
index 000000000..f8b9fc85a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifier_columns/view.ctp
@@ -0,0 +1,146 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifier Columns', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Identifier Column', true)), array('action' => 'edit', $identifierColumn['IdentifierColumn']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Identifier Column', true)), array('action' => 'delete', $identifierColumn['IdentifierColumn']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifierColumn['IdentifierColumn']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier Column', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="identifierColumns view">
+	<h2><?php  __('Identifier Column');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifierColumn['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $identifierColumn['Identifier']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Column Name'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['column_name']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifierColumn['IdentifierColumn']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- Translation -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
+			<?php if (!empty($identifierColumn['Translation'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Identifier Column Id'); ?></th>
+						<th><?php __('Translation Text'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Best'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifierColumn['Translation'] as $translation):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translation['id'];?></td>
+					<td><?php echo $translation['identifier_id'];?></td>
+					<td><?php echo $translation['identifier_column_id'];?></td>
+					<td><?php echo $translation['translation_text'];?></td>
+					<td><?php echo $translation['user_id'];?></td>
+					<td><?php echo $translation['best'];?></td>
+					<td><?php echo $translation['created'];?></td>
+					<td><?php echo $translation['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'identifier_column_id' => $identifierColumn['IdentifierColumn']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/add.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/add.ctp
new file mode 100644
index 000000000..28b80c3e8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/add.ctp
@@ -0,0 +1,54 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+
+	<?php echo $this->element('neighbours'); ?>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Identifier', true)); ?></h2>
+    
+	<div class="identifiers form">
+	<?php echo $this->Form->create('Identifier');?>
+		<fieldset>
+				 		<legend><?php printf(__('Identifier', true)); ?></legend>
+					<?php
+		echo $this->Form->input('language_id');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+		echo $this->Form->input('translated');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_add.ctp
new file mode 100644
index 000000000..12fd5bdab
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_add.ctp
@@ -0,0 +1,69 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifier Columns</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Identifier', true)); ?></h2>
+    
+	<div class="identifiers form">
+	<?php echo $this->Form->create('Identifier');?>
+		<fieldset>
+				 		<legend><?php printf(__('Identifier', true)); ?></legend>
+					<?php
+		echo $this->Form->input('language_id');
+		echo $this->Form->input('translation_file_id');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+		echo $this->Form->input('translated');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_edit.ctp
new file mode 100644
index 000000000..78c2e80f4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_edit.ctp
@@ -0,0 +1,70 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifier Columns</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Identifier', true)); ?></h2>
+    
+	<div class="identifiers form">
+	<?php echo $this->Form->create('Identifier');?>
+		<fieldset>
+						<legend><?php printf(__('Identifier # %s', true), $this->Form->value('Identifier.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('language_id');
+		echo $this->Form->input('translation_file_id');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+		echo $this->Form->input('translated');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_index.ctp
new file mode 100644
index 000000000..187df0bd3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_index.ctp
@@ -0,0 +1,88 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translation Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				</ul>
+				<h5><?php echo __('Comments', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifier Columns', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('language_id'),$paginator->sort('translation_file_id'),$paginator->sort('translation_index'),$paginator->sort('identifier'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('translated'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($identifiers as $identifier):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $identifier['Identifier']['id']; ?></td>
+		<td><?php echo $identifier['Identifier']['language_id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+		</td>
+		<td><?php echo $identifier['Identifier']['translation_index']; ?></td>
+		<td><?php echo $identifier['Identifier']['identifier']; ?></td>
+		<td><?php echo $identifier['Identifier']['arguments']; ?></td>
+		<td><?php echo $identifier['Identifier']['reference_string']; ?></td>
+		<td><?php echo $identifier['Identifier']['translated']; ?></td>
+		<td><?php echo $identifier['Identifier']['created']; ?></td>
+		<td><?php echo $identifier['Identifier']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $identifier['Identifier']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_view.ctp
new file mode 100644
index 000000000..e4335a348
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_view.ctp
@@ -0,0 +1,394 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifier Columns</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+								<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['id']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Language Id'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['language_id']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
+				<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+					<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['translation_index']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['identifier']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['arguments']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['reference_string']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['translated']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['created']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['modified']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+			<!-- BestTranslation -->
+			<div class="related">
+				<h3><?php printf(__('Related %s (%s)', true), __('Translations', true), __('Best Translation', true));?></h3>
+				<?php if (!empty($identifier['BestTranslation']['id'])):?>
+				<div class="dl">
+				<?php $i = 0; $class = ' class="altrow"';?>
+
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['id'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['identifier_id'];?>
+					</div>
+					<div style="clear: both"></div>
+<!--					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier Column Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['identifier_column_id'];?>
+					</div>
+					<div style="clear: both"></div>-->
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation Text');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['translation_text'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['user_id'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Best');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['best'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Created');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['created'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Modified');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['modified'];?>
+					</div>
+					<div style="clear: both"></div>
+				</div>
+				<?php endif; ?>
+
+				<div class="actions">
+					<ul>
+<?php if (!empty($identifier['BestTranslation']['id'])):?>
+						<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'edit', $identifier['BestTranslation']['id'])); ?></li>
+					<?php endif; ?>
+					</ul>
+				</div>
+			</div>
+		<!-- Translation -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
+			<?php if (!empty($identifier['Translation'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Identifier Column Id'); ?></th>
+						<th><?php __('Translation Text'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Best'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['Translation'] as $translation):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translation['id'];?></td>
+					<td><?php echo $translation['identifier_id'];?></td>
+					<td><?php echo $translation['identifier_column_id'];?></td>
+					<td><?php echo $translation['translation_text'];?></td>
+					<td><?php echo $translation['user_id'];?></td>
+					<td><?php echo $translation['best'];?></td>
+					<td><?php echo $translation['created'];?></td>
+					<td><?php echo $translation['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(sprintf(__('Set as %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'setBest', $translation['id']));?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add'));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- Comment -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Comments', true));?></h3>
+			<?php if (!empty($identifier['Comment'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Comment'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['Comment'] as $comment):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $comment['id'];?></td>
+					<td><?php echo $comment['translation_id'];?></td>
+					<td><?php echo $comment['identifier_id'];?></td>
+					<td><?php echo $comment['user_id'];?></td>
+					<td><?php echo $comment['comment'];?></td>
+					<td><?php echo $comment['created'];?></td>
+					<td><?php echo $comment['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'comments', 'action' => 'view', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'comments', 'action' => 'edit', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'comments', 'action' => 'delete', $comment['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add'));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- FileIdentifier -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('File Identifiers', true));?></h3>
+			<?php if (!empty($identifier['FileIdentifier'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Imported Translation File Id'); ?></th>
+						<th><?php __('Command'); ?></th>
+						<th><?php __('Translation Index'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Arguments'); ?></th>
+						<th><?php __('Reference String'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['FileIdentifier'] as $fileIdentifier):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $fileIdentifier['id'];?></td>
+					<td><?php echo $fileIdentifier['imported_translation_file_id'];?></td>
+					<td><?php echo $fileIdentifier['command'];?></td>
+					<td><?php echo $fileIdentifier['translation_index'];?></td>
+					<td><?php echo $fileIdentifier['identifier_id'];?></td>
+					<td><?php echo $fileIdentifier['arguments'];?></td>
+					<td><?php echo $fileIdentifier['reference_string'];?></td>
+					<td><?php echo $fileIdentifier['created'];?></td>
+					<td><?php echo $fileIdentifier['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+		<!-- IdentifierColumn -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Identifier Columns', true));?></h3>
+			<?php if (!empty($identifier['IdentifierColumn'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Column Name'); ?></th>
+						<th><?php __('Reference String'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['IdentifierColumn'] as $identifierColumn):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $identifierColumn['id'];?></td>
+					<td><?php echo $identifierColumn['identifier_id'];?></td>
+					<td><?php echo $identifierColumn['column_name'];?></td>
+					<td><?php echo $identifierColumn['reference_string'];?></td>
+					<td><?php echo $identifierColumn['created'];?></td>
+					<td><?php echo $identifierColumn['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'identifier_columns', 'action' => 'view', $identifierColumn['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/edit.ctp
new file mode 100644
index 000000000..6d4155106
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/edit.ctp
@@ -0,0 +1,54 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+
+	<?php echo $this->element('neighbours'); ?></div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Identifier', true)); ?></h2>
+    
+	<div class="identifiers form">
+	<?php echo $this->Form->create('Identifier');?>
+		<fieldset>
+						<legend><?php printf(__('Identifier # %s', true), $this->Form->value('Identifier.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('language_id');
+		echo $this->Form->input('translation_index');
+		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
+		echo $this->Form->input('reference_string');
+		echo $this->Form->input('translated');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/index.ctp
new file mode 100644
index 000000000..51338e607
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/index.ctp
@@ -0,0 +1,69 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
+				</ul>				<h5><?php echo __('Languages', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<p class="help">Choose an identifier you want to translate and click "View details and comments" to see details and its translations or use shortcut actions, ie. "Add Translation", "List Translations", "Add Comment".</p>
+	<h2 id="page-heading"><?php __('Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_file_id'),$paginator->sort('identifier'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('translated'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($identifiers as $identifier):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $identifier['Identifier']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+		</td>
+		<td><?php echo $identifier['Identifier']['identifier']; ?></td>
+		<td><?php echo $identifier['Identifier']['arguments']; ?></td>
+		<td><?php echo $identifier['Identifier']['reference_string']; ?></td>
+		<td><?php echo $identifier['Identifier']['translated']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View details and comments', true), array('action' => 'view', $identifier['Identifier']['id'])); ?>
+			| <?php echo $this->Html->link(__('Add Comment', true), array('controller' => 'comments', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id'])); ?>
+			| <?php echo $this->Html->link(__('Add Translation', true), array('controller' => 'translations', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id'])); ?>
+			| <?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index', 'identifier_id' => $identifier['Identifier']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/identifiers/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/identifiers/view.ctp
new file mode 100644
index 000000000..84a9d13f4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/identifiers/view.ctp
@@ -0,0 +1,253 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index', 'identifier_id' => $identifier['Identifier']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id'])); ?> </li>
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index', 'identifier_id' => $identifier['Identifier']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id'])); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+
+	<?php echo $this->element('neighbours'); ?>
+</div>
+
+<div class="grid_13">
+<p class="help">You can see translations for this identifier in "Related Translations" section. Click "View" on the list to see translation details. Click "New related Translation" below the list to add one.</p>
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<textarea rows="10" style="width: 100%" readonly="true"><?php echo $identifier['Identifier']['reference_string']; ?></textarea>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- IdentifierColumn -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Identifier Columns', true));?></h3>
+			<?php if (!empty($identifier['IdentifierColumn'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Column Name'); ?></th>
+						<th><?php __('Reference String'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['IdentifierColumn'] as $identifierColumn):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $identifierColumn['id'];?></td>
+					<td><?php echo $identifierColumn['identifier_id'];?></td>
+					<td><?php echo $identifierColumn['column_name'];?></td>
+					<td><?php echo $identifierColumn['reference_string'];?></td>
+					<td><?php echo $identifierColumn['created'];?></td>
+					<td><?php echo $identifierColumn['modified'];?></td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+		<!-- Translation -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
+			<?php if (!empty($identifier['Translation'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Translation Text'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['Translation'] as $translation):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translation['id'];?></td>
+					<td><?php echo $translation['identifier_id'];?></td>
+					<td><?php echo $translation['translation_text'];?></td>
+					<td><?php echo $translation['user_id'];?></td>
+					<td><?php echo $translation['created'];?></td>
+					<td><?php echo $translation['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Vote', true), array('controller' => 'votes', 'action' => 'vote', 'translation_id' => $translation['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index', 'identifier_id' => $identifier['Identifier']['id']));?></li>
+						<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- Comment -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Comments', true));?></h3>
+			<?php if (!empty($identifier['Comment'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Comment'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['Comment'] as $comment):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $comment['id'];?></td>
+					<td><?php echo $comment['translation_id'];?></td>
+					<td><?php echo $comment['identifier_id'];?></td>
+					<td><?php echo $comment['user_id'];?></td>
+					<td><?php echo $comment['comment'];?></td>
+					<td><?php echo $comment['created'];?></td>
+					<td><?php echo $comment['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'comments', 'action' => 'view', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'comments', 'action' => 'edit', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'comments', 'action' => 'delete', $comment['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index', 'identifier_id' => $identifier['Identifier']['id']));?></li>
+						<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_add.ctp
new file mode 100644
index 000000000..af3952f73
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_add.ctp
@@ -0,0 +1,50 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Raw Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Imported Translation File', true)); ?></h2>
+    
+	<div class="importedTranslationFiles form">
+	<?php echo $this->Form->create('ImportedTranslationFile');?>
+		<fieldset>
+				 		<legend><?php printf(__('Imported Translation File', true)); ?></legend>
+					<?php
+		echo $this->Form->input('language_id');
+		echo $this->Form->input('filename');
+		echo $this->Form->input('merged');
+		echo $this->Form->input('file_last_modified_date');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_edit.ctp
new file mode 100644
index 000000000..d18d4fbac
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_edit.ctp
@@ -0,0 +1,51 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Raw Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Imported Translation File', true)); ?></h2>
+    
+	<div class="importedTranslationFiles form">
+	<?php echo $this->Form->create('ImportedTranslationFile');?>
+		<fieldset>
+						<legend><?php printf(__('Imported Translation File # %s', true), $this->Form->value('ImportedTranslationFile.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('language_id');
+		echo $this->Form->input('filename');
+		echo $this->Form->input('merged');
+		echo $this->Form->input('file_last_modified_date');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_index.ctp
new file mode 100644
index 000000000..c120af9c5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_index.ctp
@@ -0,0 +1,73 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Imported Translation Files', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
+				</ul>				<h5><?php echo __('Languages', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Raw Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Imported Translation Files');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_file_id'),$paginator->sort('filename'),$paginator->sort('merged'),$paginator->sort('file_last_modified_date'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($importedTranslationFiles as $importedTranslationFile):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($importedTranslationFile['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $importedTranslationFile['TranslationFile']['id'])); ?>
+		</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $importedTranslationFile['ImportedTranslationFile']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Export', true), array('controller' => 'raw_files', 'action' => 'export', $importedTranslationFile['ImportedTranslationFile']['filename']), null, sprintf(__('Are you sure you want to export "%s"?', true), $importedTranslationFile['ImportedTranslationFile']['filename'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_view.ctp
new file mode 100644
index 000000000..5c176d6a4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_view.ctp
@@ -0,0 +1,147 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Raw Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="importedTranslationFiles view">
+	<h2><?php  __('Imported Translation File');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Filename Template'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($importedTranslationFile['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $importedTranslationFile['TranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Filename'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Merged'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('File Last Modified Date'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+					<div class="related">
+			<h3><?php printf(__('Related %s', true), __('File Identifiers', true));?></h3>
+			<?php if (!empty($importedTranslationFile['FileIdentifier'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+								<th><?php __('Id'); ?></th>
+		<th><?php __('Imported Translation File Id'); ?></th>
+		<th><?php __('Command'); ?></th>
+		<th><?php __('Translation Index'); ?></th>
+		<th><?php __('Identifier Id'); ?></th>
+		<th><?php __('Arguments'); ?></th>
+		<th><?php __('Created'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+			<?php
+				$i = 0;
+				foreach ($importedTranslationFile['FileIdentifier'] as $fileIdentifier):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+		<tr<?php echo $class;?>>
+			<td><?php echo $fileIdentifier['id'];?></td>
+			<td><?php echo $fileIdentifier['imported_translation_file_id'];?></td>
+			<td><?php echo $fileIdentifier['command'];?></td>
+			<td><?php echo $fileIdentifier['translation_index'];?></td>
+			<td><?php echo $fileIdentifier['identifier_id'];?></td>
+			<td><?php echo $fileIdentifier['arguments'];?></td>
+			<td><?php echo $fileIdentifier['created'];?></td>
+			<td class="actions">
+				<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
+			</td>
+		</tr>
+	<?php endforeach; ?>
+			</table>
+		<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/index.ctp
new file mode 100644
index 000000000..f3fb264e5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/index.ctp
@@ -0,0 +1,70 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Imported Translation Files', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
+				</ul>				<h5><?php echo __('Languages', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Raw Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Imported Translation Files');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('language_id'),$paginator->sort('filename'),$paginator->sort('merged'),$paginator->sort('file_last_modified_date'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($importedTranslationFiles as $importedTranslationFile):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($importedTranslationFile['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $importedTranslationFile['TranslationFile']['id'])); ?>
+		</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/view.ctp
new file mode 100644
index 000000000..ee711e443
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/view.ctp
@@ -0,0 +1,172 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Raw Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="importedTranslationFiles view">
+	<h2><?php  __('Imported Translation File');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($importedTranslationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $importedTranslationFile['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Filename'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Merged'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('File Last Modified Date'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+					<div class="related">
+				<h3><?php printf(__('Related %s', true), __('Raw Files', true));?></h3>
+			<?php if (!empty($importedTranslationFile['RawFile'])):?>
+				<dl>	<?php $i = 0; $class = ' class="altrow"';?>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Filename');?></div>
+		<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+	<?php echo $importedTranslationFile['RawFile']['filename'];?>
+</div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Size');?></div>
+		<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+	<?php echo $importedTranslationFile['RawFile']['size'];?>
+</div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Modified');?></div>
+		<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+	<?php echo $importedTranslationFile['RawFile']['modified'];?>
+</div>
+				</dl>
+			<?php endif; ?>
+				<div class="actions">
+					<ul>
+						<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Raw File', true)), array('controller' => 'raw_files', 'action' => 'edit', $importedTranslationFile['RawFile']['filename'])); ?></li>
+					</ul>
+				</div>
+			</div>
+					<div class="related">
+			<h3><?php printf(__('Related %s', true), __('File Identifiers', true));?></h3>
+			<?php if (!empty($importedTranslationFile['FileIdentifier'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+								<th><?php __('Id'); ?></th>
+		<th><?php __('Imported Translation File Id'); ?></th>
+		<th><?php __('Command'); ?></th>
+		<th><?php __('Translation Index'); ?></th>
+		<th><?php __('Identifier Id'); ?></th>
+		<th><?php __('Arguments'); ?></th>
+		<th><?php __('Created'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+			<?php
+				$i = 0;
+				foreach ($importedTranslationFile['FileIdentifier'] as $fileIdentifier):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+		<tr<?php echo $class;?>>
+			<td><?php echo $fileIdentifier['id'];?></td>
+			<td><?php echo $fileIdentifier['imported_translation_file_id'];?></td>
+			<td><?php echo $fileIdentifier['command'];?></td>
+			<td><?php echo $fileIdentifier['translation_index'];?></td>
+			<td><?php echo $fileIdentifier['identifier_id'];?></td>
+			<td><?php echo $fileIdentifier['arguments'];?></td>
+			<td><?php echo $fileIdentifier['created'];?></td>
+			<td class="actions">
+				<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
+			</td>
+		</tr>
+	<?php endforeach; ?>
+			</table>
+		<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li></li>
+				</ul>
+			</div>
+		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/add.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/add.ctp
new file mode 100644
index 000000000..3315b4f4a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/add.ctp
@@ -0,0 +1,38 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Languages', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Language', true)); ?></h2>
+    
+	<div class="languages form">
+	<?php echo $this->Form->create('Language');?>
+		<fieldset>
+				 		<legend><?php printf(__('Language', true)); ?></legend>
+					<?php
+		echo $this->Form->input('name');
+		echo $this->Form->input('code');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_add.ctp
new file mode 100644
index 000000000..64cc85c80
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_add.ctp
@@ -0,0 +1,38 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Languages', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Language', true)); ?></h2>
+    
+	<div class="languages form">
+	<?php echo $this->Form->create('Language');?>
+		<fieldset>
+				 		<legend><?php printf(__('Language', true)); ?></legend>
+					<?php
+		echo $this->Form->input('name');
+		echo $this->Form->input('code');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_edit.ctp
new file mode 100644
index 000000000..4537d5059
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_edit.ctp
@@ -0,0 +1,40 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Languages', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('Delete this %s', true), __('Language', true)),array('action' => 'delete', $this->Form->value('Language.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Language.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Language', true)); ?></h2>
+    
+	<div class="languages form">
+	<?php echo $this->Form->create('Language');?>
+		<fieldset>
+						<legend><?php printf(__('Language # %s', true), $this->Form->value('Language.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('name');
+		echo $this->Form->input('code');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_index.ctp
new file mode 100644
index 000000000..e12c967e8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_index.ctp
@@ -0,0 +1,63 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Languages', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index')); ?> </li>
+	<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translation Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Languages');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('code'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($languages as $language):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $language['Language']['id']; ?></td>
+		<td><?php echo $language['Language']['name']; ?></td>
+		<td><?php echo $language['Language']['code']; ?></td>
+		<td><?php echo $language['Language']['created']; ?></td>
+		<td><?php echo $language['Language']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $language['Language']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $language['Language']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $language['Language']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $language['Language']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_view.ctp
new file mode 100644
index 000000000..b34a0785a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/admin_view.ctp
@@ -0,0 +1,128 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Languages', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Language', true)), array('action' => 'edit', $language['Language']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Language', true)), array('action' => 'delete', $language['Language']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $language['Language']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="languages view">
+	<h2><?php  __('Language');?></h2>
+		<div class="block">
+			<div class="dl">
+				<?php $i = 1; $class = ' altrow';?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['id']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['name']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Code'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['code']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['created']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['modified']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- TranslationFile -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translation Files', true));?></h3>
+			<?php if (!empty($language['TranslationFile'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Language Id'); ?></th>
+						<th><?php __('Filename Template'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($language['TranslationFile'] as $translationFile):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translationFile['id'];?></td>
+					<td><?php echo $translationFile['language_id'];?></td>
+					<td><?php echo $translationFile['filename_template'];?></td>
+					<td><?php echo $translationFile['created'];?></td>
+					<td><?php echo $translationFile['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translation_files', 'action' => 'view', $translationFile['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/edit.ctp
new file mode 100644
index 000000000..1d3927ff3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/edit.ctp
@@ -0,0 +1,40 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Languages', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Language', true)); ?></h2>
+    
+	<div class="languages form">
+	<?php echo $this->Form->create('Language');?>
+		<fieldset>
+						<legend><?php printf(__('Language # %s', true), $this->Form->value('Language.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('name');
+		echo $this->Form->input('code');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/index.ctp
new file mode 100644
index 000000000..79343d4be
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/index.ctp
@@ -0,0 +1,62 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Languages', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translation Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<p class="help">Choose a language and click "List Translation Files" to see project language files you can translate.</p>
+	<h2 id="page-heading"><?php __('Languages');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('code'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($languages as $language):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $language['Language']['id']; ?></td>
+		<td><?php echo $language['Language']['name']; ?></td>
+		<td><?php echo $language['Language']['code']; ?></td>
+		<td><?php echo $language['Language']['created']; ?></td>
+		<td><?php echo $language['Language']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $language['Language']['id'])); ?>
+			| <?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/languages/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/languages/view.ctp
new file mode 100644
index 000000000..44f27f047
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/languages/view.ctp
@@ -0,0 +1,125 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Languages', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="languages view">
+	<h2><?php  __('Language');?></h2>
+		<div class="block">
+			<div class="dl">
+				<?php $i = 1; $class = ' altrow';?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['id']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['name']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Code'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['code']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['created']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $language['Language']['modified']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- TranslationFile -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translation Files', true));?></h3>
+			<?php if (!empty($language['TranslationFile'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Language Id'); ?></th>
+						<th><?php __('Filename Template'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($language['TranslationFile'] as $translationFile):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translationFile['id'];?></td>
+					<td><?php echo $translationFile['language_id'];?></td>
+					<td><?php echo $translationFile['filename_template'];?></td>
+					<td><?php echo $translationFile['created'];?></td>
+					<td><?php echo $translationFile['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translation_files', 'action' => 'view', $translationFile['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/admin.ctp b/code/ryzom/tools/server/www/webtt/app/views/layouts/admin.ctp
new file mode 100644
index 000000000..68fba719a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/layouts/admin.ctp
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<?php echo $this->Html->charset(); ?>
+	<title>
+		<?php __('Administration'); ?> - 
+		<?php echo $title_for_layout; ?>
+	</title>
+	<?php
+		echo $this->Html->meta('icon');
+		//echo $this->Html->css('cake.generic');
+		echo $this->Html->css(array('reset', 'text', 'grid', 'layout', 'nav'));
+		echo '<!--[if IE 6]>'.$this->Html->css('ie6').'<![endif]-->';
+		echo '<!--[if IE 7]>'.$this->Html->css('ie').'<![endif]-->';
+		echo $this->Html->script(array('jquery-1.3.2.min.js', 'jquery-ui.js', 'jquery-fluid16.js'));
+		echo $scripts_for_layout;
+	?>
+</head>
+<body>
+	<div class="container_16">			
+		<div class="grid_16">
+			<h1 id="branding">
+				<a href="/admin">Administration</a>
+			</h1>
+		</div>
+		<div class="clear"></div>
+		<div class="grid_16">
+			 <?php echo $this->element('admin/main_menu'); ?>
+		</div>
+		
+		<div class="clear" style="height: 10px; width: 100%;"></div>
+		
+			<?php echo $this->Session->flash(); ?>
+
+			<?php echo $content_for_layout; ?>
+		
+		<div class="clear"></div>
+	</div>
+	<?php echo $this->element('sql_dump'); ?>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/default.ctp b/code/ryzom/tools/server/www/webtt/app/views/layouts/default.ctp
new file mode 100644
index 000000000..083a2a64c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/layouts/default.ctp
@@ -0,0 +1,59 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<?php echo $this->Html->charset(); ?>
+	<title>
+		<?php __('Ryzom Core: Web Translation Tool :: '); ?>
+		<?php echo $title_for_layout; ?>
+	</title>
+	<?php
+		echo $this->Html->meta('icon');
+
+		echo $this->Html->css('cake.generic');
+
+		echo $scripts_for_layout;
+	?>
+</head>
+<body>
+	<div id="container">
+		<div id="header">
+			<h1><?php echo $this->Html->link(__('Ryzom Core: Web Translation Tool', true), 'http://webtt.openlink.pl'); ?></h1>
+		</div>
+		<div id="content">
+
+			<?php echo $this->Session->flash(); ?>
+
+			<?php echo $content_for_layout; ?>
+
+		</div>
+		<div id="footer">
+			<?php echo $this->Html->link(
+					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework', true), 'border' => '0')),
+					'http://www.cakephp.org/',
+					array('target' => '_blank', 'escape' => false)
+				);
+			?>
+		</div>
+	</div>
+	<?php //echo $this->element('sql_dump'); ?>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/default_debug.ctp b/code/ryzom/tools/server/www/webtt/app/views/layouts/default_debug.ctp
new file mode 100644
index 000000000..5e06ca479
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/layouts/default_debug.ctp
@@ -0,0 +1,59 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<?php echo $this->Html->charset(); ?>
+	<title>
+		<?php __('Ryzom Core: Web Translation Tool :: '); ?>
+		<?php echo $title_for_layout; ?>
+	</title>
+	<?php
+		echo $this->Html->meta('icon');
+
+		echo $this->Html->css('cake.generic');
+
+		echo $scripts_for_layout;
+	?>
+</head>
+<body>
+	<div id="container">
+		<div id="header">
+			<h1><?php echo $this->Html->link(__('Ryzom Core: Web Translation Tool', true), 'http://webtt.openlink.pl'); ?></h1>
+		</div>
+		<div id="content">
+
+			<?php echo $this->Session->flash(); ?>
+
+			<?php echo $content_for_layout; ?>
+
+		</div>
+		<div id="footer">
+			<?php echo $this->Html->link(
+					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework', true), 'border' => '0')),
+					'http://www.cakephp.org/',
+					array('target' => '_blank', 'escape' => false)
+				);
+			?>
+		</div>
+	</div>
+	<?php echo $this->element('sql_dump'); ?>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/email/html/default.ctp b/code/ryzom/tools/server/www/webtt/app/views/layouts/email/html/default.ctp
new file mode 100644
index 000000000..2f797c7a3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/layouts/email/html/default.ctp
@@ -0,0 +1,6 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<body>
+<?php echo $content_for_layout; ?>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/email/text/default.ctp b/code/ryzom/tools/server/www/webtt/app/views/layouts/email/text/default.ctp
new file mode 100644
index 000000000..3f290130e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/layouts/email/text/default.ctp
@@ -0,0 +1 @@
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/js/empty b/code/ryzom/tools/server/www/webtt/app/views/layouts/js/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/new.ctp b/code/ryzom/tools/server/www/webtt/app/views/layouts/new.ctp
new file mode 100644
index 000000000..c47f19055
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/layouts/new.ctp
@@ -0,0 +1,114 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<?php echo $this->Html->charset(); ?>
+	<title>
+		<?php __('Ryzom Core: Web Translation Tool :: '); ?>
+		<?php echo $title_for_layout; ?>
+	</title>
+	<?php
+		echo $this->Html->meta('icon');
+		//echo $this->Html->css('cake.generic');
+		echo $this->Html->css(array('reset', 'text', 'grid', 'layout', 'nav', 'labelWidth'));
+		echo '<!--[if IE 6]>'.$this->Html->css('ie6').'<![endif]-->';
+		echo '<!--[if IE 7]>'.$this->Html->css('ie').'<![endif]-->';
+		echo $this->Html->script(array('jquery-1.3.2.min.js', 'jquery-ui.js', 'jquery-fluid16.js'));
+		echo $scripts_for_layout;
+	?>
+	<script>
+		function fix_layout() {
+			$('.dd').each(function(index) {
+				if ($.trim($(this).text()) == "")
+				{
+					$(this).html('&nbsp;');
+				}
+			});
+		}
+		$(function() { fix_layout(); });
+	</script>
+</head>
+<body>
+	<div class="container_16" style="background: none repeat scroll 0pt 0pt rgba(40, 60, 60, 0.6);">
+		<div class="grid_16">
+			<div style="text-align: right; float: right">
+				<a href="http://dev.ryzom.com/"><img border="0" alt="" src="http://www.ryzom.com/data/logo.gif"></a>
+			</div>
+			<h2 id="branding" style="float: left">
+				<a href="/">Ryzom Core: Web-Based Translation Tool</a>
+			</h1>
+		</div>
+		<div style="clear: both"></div>
+	</div>
+	<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+	<?php
+	if
 (isset($this->params['prefix']) && $this->params['prefix'] == "admin") {
+		?>
+		<div class="container_16" style="background: none repeat scroll 0pt 0pt rgba(40, 60, 60, 0.9);">
+			<div class="grid_16">
+				<div style="margin:5px">
+				<h5>
+				<?php echo $this->Html->link(__('Back to admin page', true), array('controller' => 'pages', 'action' => 'display', 'prefix' => 'admin', 'home')); ?>
+				</h5>
+				</div>		
+			</div>
+			<div style="clear: both"></div>
+		</div>
+		<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+		<?php
+	}
+	?>
+	<div class="container_16" style="background: none repeat scroll 0pt 0pt rgba(40, 60, 60, 0.9);">
+		<div class="grid_16">
+		<?php
+			if
 (isset($assocPath)) {
+			?>
+			<div style="margin:5px; float: left">
+			<h5>/
+			<?php
+			$path = $assocPath;
+			$text = null;
+			while ($path)
+			{
+				$model = key($path);
+				$path = $path[$model];
+				$controller = Inflector::pluralize(Inflector::underscore($model));
+				echo $this->Html->link(__(Inflector::pluralize($model), true), array('controller' => $controller, 'action' => 'index'));
+				if ($path)
+					echo " / ";
+			}
+			?>
+			</h5>
+			</div>
+			<?php
+			}
+			?>
+			<div style="margin: 5px; float: right"><h5>
+			<?php
+			if ($this->Session->read('Auth.User.id'))
+				echo $this->Html->link(__('Logout', true), array('admin' => false, 'controller' => 'users', 'action' => 'logout'));
+			else if ($this->params['controller'] == 'users')
+				echo $this->Html->link(__('Register', true), array('admin' => false, 'controller' => 'users', 'action' => 'register'));
+			?>
+			</h5></div>
+			<div style="clear: both"></div>
+		</div>
+		<div style="clear: both"></div>
+	</div>
+	<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+	<div class="container_16">
+<!--		<div class="clear"></div>
-->
+		
+		<div class="clear" style="height: 10px; width: 100%;"></div>
+		
+			<?php echo $this->Session->flash(); ?>
+			<?php echo $this->Session->flash('auth'); ?>
+
+			<?php echo $content_for_layout; ?>
+		
+		<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+
+		<div class="clear"></div>
+	</div>
+	<?php // echo $this->element('sql_dump'); ?>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/rss/empty b/code/ryzom/tools/server/www/webtt/app/views/layouts/rss/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/layouts/xml/empty b/code/ryzom/tools/server/www/webtt/app/views/layouts/xml/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/pages/admin/home.ctp b/code/ryzom/tools/server/www/webtt/app/views/pages/admin/home.ctp
new file mode 100644
index 000000000..9c2ebc08d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/pages/admin/home.ctp
@@ -0,0 +1,103 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.pages
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="grid_8">
+	<h2 id="page-heading"><?php __('Translation Collaboration'); ?></h3>
+
+	<div class="box menubox"><div class="inbox">
+		<div id="admin-actions" class="block">
+		
+				<h5><?php __('Languages'); ?></h3>
+				<ul class="menu">
+				<li>
+				<?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+				</li>
+				</ul>
+
+				<h5>Translation Files</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+		
+				<h5>Identifiers</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+		
+				<h5>Translations</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+
+				<h5>Comments</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+				</ul>
+
+				<h5>Votes</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+				</ul>
+
+				<h5>Users</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+				</ul>
+		</div>
+	</div></div>
+</div>
+
+<!--<div class="grid_4">
+	<h2 id="page-heading"><?php __('Both'); ?></h3>
+
+	<div class="box menubox"><div class="inbox">
+		<div id="admin-actions" class="block">
+		</div>
+	</div></div>
+</div>-->
+
+
+<div class="grid_8">
+	<h2 id="page-heading"><?php __('Translation Pipeline'); ?></h3>
+	<div class="box menubox"><div class="inbox">
+		<div id="admin-actions" class="block">
+				<h5>Imported Translation Files</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+
+				<h5>File Identifiers</h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+
+				<h5>Raw Files</h5>
+				<ul class="menu">				
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+				</ul>
+
+		</div>
+	</div></div>
+
+</div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/pages/home.ctp b/code/ryzom/tools/server/www/webtt/app/views/pages/home.ctp
new file mode 100644
index 000000000..4746aa692
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/pages/home.ctp
@@ -0,0 +1,25 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.pages
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="grid_16">
+	<p class="help">Click the link below to list the languages in the project.</p>
+	<p>
+	<?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?>
+	</p>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_index.ctp
new file mode 100644
index 000000000..885c9cfdf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_index.ctp
@@ -0,0 +1,64 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5>Raw Files</h5>
+				<ul class="menu">				
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5>Imported Translation Files</h5>
+<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Raw Files');?></h2>
+	<table cellpadding="0" cellspacing="0">
+		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('filename'),$paginator->sort('size'),$paginator->sort('modified'),__('Actions', true),));
+echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+<?php
+		$i = 0;
+		foreach ($rawFiles as $rawFile):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $rawFile['RawFile']['filename']; ?></td>
+		<td><?php echo $rawFile['RawFile']['size']; ?></td>
+		<td><?php echo $this->Time->nice($rawFile['RawFile']['modified']); ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $rawFile['RawFile']['filename'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Import', true), array('action' => 'import', $rawFile['RawFile']['filename'])); ?>
+<!--			<?php echo ' | ' . $this->Html->link(__('Export', true), array('action' => 'export', $rawFile['RawFile']['filename'])); ?>-->
+<!--			<?php echo ' | ' . __('Export', true); ?>-->
+<!--			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $rawFile['RawFile']['filename']), null, sprintf(__('Are you sure you want to delete # %s?', true), $rawFile['RawFile']['filename'])); ?>-->
+		</td>
+	</tr>
+<?php endforeach; ?>
+<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+	 | 	<?php echo $this->Paginator->numbers();?>
+ |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
+<? echo $this->element('sql_dump');?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_view.ctp
new file mode 100644
index 000000000..4400a58d4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/raw_files/admin_view.ctp
@@ -0,0 +1,65 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox"><div class="block" id="admin-actions">
+			<h5>Raw Files</h5>
+			<ul class="menu">				
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('action' => 'index')); ?> </li>
+			</ul>			
+				
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+		</div></div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="rawFiles view">
+		<h2><?php  __('Raw File');?></h2>
+		<div class="block">
+			<div class="dl">
+				<?php $i = 1; $class = ' altrow';?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Filename'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $rawFile['RawFile']['filename']; ?>
+					&nbsp;
+				</div>
+				<?php $i++; ?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Size'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $rawFile['RawFile']['size']; ?>
+					&nbsp;
+				</div>
+				<?php $i++; ?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $this->Time->nice($rawFile['RawFile']['modified']); ?>
+					&nbsp;
+				</div>
+				<?php $i++; ?>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('File Content', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<div class="related">
+		<textarea style="width: 100%; height: 300px" readonly>
+		<?php echo htmlentities($fileContent, ENT_COMPAT, "UTF-8"); ?>
+		</textarea>
+		</div>
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/raw_files/index.ctp
new file mode 100644
index 000000000..885c9cfdf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/raw_files/index.ctp
@@ -0,0 +1,64 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5>Raw Files</h5>
+				<ul class="menu">				
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5>Imported Translation Files</h5>
+<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Raw Files');?></h2>
+	<table cellpadding="0" cellspacing="0">
+		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('filename'),$paginator->sort('size'),$paginator->sort('modified'),__('Actions', true),));
+echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+<?php
+		$i = 0;
+		foreach ($rawFiles as $rawFile):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $rawFile['RawFile']['filename']; ?></td>
+		<td><?php echo $rawFile['RawFile']['size']; ?></td>
+		<td><?php echo $this->Time->nice($rawFile['RawFile']['modified']); ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $rawFile['RawFile']['filename'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Import', true), array('action' => 'import', $rawFile['RawFile']['filename'])); ?>
+<!--			<?php echo ' | ' . $this->Html->link(__('Export', true), array('action' => 'export', $rawFile['RawFile']['filename'])); ?>-->
+<!--			<?php echo ' | ' . __('Export', true); ?>-->
+<!--			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $rawFile['RawFile']['filename']), null, sprintf(__('Are you sure you want to delete # %s?', true), $rawFile['RawFile']['filename'])); ?>-->
+		</td>
+	</tr>
+<?php endforeach; ?>
+<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+	 | 	<?php echo $this->Paginator->numbers();?>
+ |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
+<? echo $this->element('sql_dump');?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/listdir.ctp b/code/ryzom/tools/server/www/webtt/app/views/raw_files/listdir.ctp
new file mode 100644
index 000000000..885c9cfdf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/raw_files/listdir.ctp
@@ -0,0 +1,64 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5>Raw Files</h5>
+				<ul class="menu">				
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5>Imported Translation Files</h5>
+<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Raw Files');?></h2>
+	<table cellpadding="0" cellspacing="0">
+		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('filename'),$paginator->sort('size'),$paginator->sort('modified'),__('Actions', true),));
+echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+<?php
+		$i = 0;
+		foreach ($rawFiles as $rawFile):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $rawFile['RawFile']['filename']; ?></td>
+		<td><?php echo $rawFile['RawFile']['size']; ?></td>
+		<td><?php echo $this->Time->nice($rawFile['RawFile']['modified']); ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $rawFile['RawFile']['filename'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Import', true), array('action' => 'import', $rawFile['RawFile']['filename'])); ?>
+<!--			<?php echo ' | ' . $this->Html->link(__('Export', true), array('action' => 'export', $rawFile['RawFile']['filename'])); ?>-->
+<!--			<?php echo ' | ' . __('Export', true); ?>-->
+<!--			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $rawFile['RawFile']['filename']), null, sprintf(__('Are you sure you want to delete # %s?', true), $rawFile['RawFile']['filename'])); ?>-->
+		</td>
+	</tr>
+<?php endforeach; ?>
+<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+	 | 	<?php echo $this->Paginator->numbers();?>
+ |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
+<? echo $this->element('sql_dump');?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/raw_files/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/raw_files/view.ctp
new file mode 100644
index 000000000..ee5e7e265
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/raw_files/view.ctp
@@ -0,0 +1,43 @@
+<div class="votes view">
+<h2><?php  __('Vote');?></h2>
+	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php echo $vote['Vote']['id']; ?>
+			&nbsp;
+		</dd>
+		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation'); ?></dt>
+		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
+			&nbsp;
+		</dd>
+		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('User'); ?></dt>
+		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
+			&nbsp;
+		</dd>
+		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php echo $vote['Vote']['created']; ?>
+			&nbsp;
+		</dd>
+		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php echo $vote['Vote']['modified']; ?>
+			&nbsp;
+		</dd>
+	</dl>
+</div>
+<div class="actions">
+	<h3><?php __('Actions'); ?></h3>
+	<ul>
+		<li><?php echo $this->Html->link(__('Edit Vote', true), array('action' => 'edit', $vote['Vote']['id'])); ?> </li>
+		<li><?php echo $this->Html->link(__('Delete Vote', true), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?> </li>
+		<li><?php echo $this->Html->link(__('List Votes', true), array('action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('New Vote', true), array('action' => 'add')); ?> </li>
+		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
+		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
+	</ul>
+</div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/scaffolds/edit.ctp
new file mode 100644
index 000000000..34b570631
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/scaffolds/edit.ctp
@@ -0,0 +1,47 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.scaffolds
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> form">
+<?php
+	echo $this->Form->create();
+	echo $this->Form->inputs($scaffoldFields, array('created', 'modified', 'updated'));
+	echo $this->Form->end(__('Submit', true));
+?>
+</div>
+<div class="actions">
+	<h3><?php __('Actions'); ?></h3>
+	<ul>
+<?php if ($this->action != 'add'):?>
+		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value($modelClass.'.'.$primaryKey)), null, __('Are you sure you want to delete', true).' #' . $this->Form->value($modelClass.'.'.$primaryKey)); ?></li>
+<?php endif;?>
+		<li><?php echo $this->Html->link(__('List', true).' '.$pluralHumanName, array('action' => 'index'));?></li>
+<?php
+		$done = array();
+		foreach ($associations as $_type => $_data) {
+			foreach ($_data as $_alias => $_details) {
+				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "</li>\n";
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "</li>\n";
+					$done[] = $_details['controller'];
+				}
+			}
+		}
+?>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/empty b/code/ryzom/tools/server/www/webtt/app/views/scaffolds/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/scaffolds/index.ctp
new file mode 100644
index 000000000..ce4a09a3d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/scaffolds/index.ctp
@@ -0,0 +1,93 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> index">
+<h2><?php echo $pluralHumanName;?></h2>
+<table cellpadding="0" cellspacing="0">
+<tr>
+<?php foreach ($scaffoldFields as $_field):?>
+	<th><?php echo $this->Paginator->sort($_field);?></th>
+<?php endforeach;?>
+	<th><?php __('Actions');?></th>
+</tr>
+<?php
+$i = 0;
+foreach (${$pluralVar} as ${$singularVar}):
+	$class = null;
+	if ($i++ % 2 == 0) {
+		$class = ' class="altrow"';
+	}
+echo "\n";
+	echo "\t<tr{$class}>\n";
+		foreach ($scaffoldFields as $_field) {
+			$isKey = false;
+			if (!empty($associations['belongsTo'])) {
+				foreach ($associations['belongsTo'] as $_alias => $_details) {
+					if ($_field === $_details['foreignKey']) {
+						$isKey = true;
+						echo "\t\t<td>\n\t\t\t" . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t</td>\n";
+						break;
+					}
+				}
+			}
+			if ($isKey !== true) {
+				echo "\t\t<td>\n\t\t\t" . ${$singularVar}[$modelClass][$_field] . " \n\t\t</td>\n";
+			}
+		}
+
+		echo "\t\t<td class=\"actions\">\n";
+		echo "\t\t\t" . $this->Html->link(__('View', true), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
+		echo "\t\t\t" . $this->Html->link(__('Edit', true), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
+		echo "\t\t\t" . $this->Html->link(__('Delete', true), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete', true).' #' . ${$singularVar}[$modelClass][$primaryKey]) . "\n";
+		echo "\t\t</td>\n";
+	echo "\t</tr>\n";
+
+endforeach;
+echo "\n";
+?>
+</table>
+	<p><?php
+	echo $this->Paginator->counter(array(
+		'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?></p>
+	<div class="paging">
+	<?php echo "\t" . $this->Paginator->prev('<< ' . __('previous', true), array(), null, array('class' => 'disabled')) . "\n";?>
+	 | <?php echo $this->Paginator->numbers() . "\n"?>
+	<?php echo "\t ". $this->Paginator->next(__('next', true) .' >>', array(), null, array('class' => 'disabled')) . "\n";?>
+	</div>
+</div>
+<div class="actions">
+	<h3><?php __('Actions'); ?></h3>
+	<ul>
+		<li><?php echo $this->Html->link(sprintf(__('New %s', true), $singularHumanName), array('action' => 'add')); ?></li>
+<?php
+		$done = array();
+		foreach ($associations as $_type => $_data) {
+			foreach ($_data as $_alias => $_details) {
+				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
+					$done[] = $_details['controller'];
+				}
+			}
+		}
+?>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/scaffolds/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/scaffolds/view.ctp
new file mode 100644
index 000000000..ae898d1fa
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/scaffolds/view.ctp
@@ -0,0 +1,161 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.scaffolds
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> view">
+<h2><?php printf(__("View %s", true), $singularHumanName); ?></h2>
+	<dl>
+<?php
+$i = 0;
+foreach ($scaffoldFields as $_field) {
+	$class = null;
+	if ($i++ % 2 == 0) {
+		$class = ' class="altrow"';
+	}
+	$isKey = false;
+	if (!empty($associations['belongsTo'])) {
+		foreach ($associations['belongsTo'] as $_alias => $_details) {
+			if ($_field === $_details['foreignKey']) {
+				$isKey = true;
+				echo "\t\t<dt{$class}>" . Inflector::humanize($_alias) . "</dt>\n";
+				echo "\t\t<dd{$class}>\n\t\t\t" . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t&nbsp;</dd>\n";
+				break;
+			}
+		}
+	}
+	if ($isKey !== true) {
+		echo "\t\t<dt{$class}>" . Inflector::humanize($_field) . "</dt>\n";
+		echo "\t\t<dd{$class}>\n\t\t\t{${$singularVar}[$modelClass][$_field]}\n&nbsp;\t\t</dd>\n";
+	}
+}
+?>
+	</dl>
+</div>
+<div class="actions">
+	<h3><?php __('Actions'); ?></h3>
+	<ul>
+<?php
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('Edit %s', true), $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('Delete %s', true), $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete', true).' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('List %s', true), $pluralHumanName), array('action' => 'index')). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('New %s', true), $singularHumanName), array('action' => 'add')). " </li>\n";
+
+	$done = array();
+	foreach ($associations as $_type => $_data) {
+		foreach ($_data as $_alias => $_details) {
+			if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
+				echo "\t\t<li>" . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
+				echo "\t\t<li>" . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
+				$done[] = $_details['controller'];
+			}
+		}
+	}
+?>
+	</ul>
+</div>
+<?php
+if (!empty($associations['hasOne'])) :
+foreach ($associations['hasOne'] as $_alias => $_details): ?>
+<div class="related">
+	<h3><?php printf(__("Related %s", true), Inflector::humanize($_details['controller'])); ?></h3>
+<?php if (!empty(${$singularVar}[$_alias])):?>
+	<dl>
+<?php
+		$i = 0;
+		$otherFields = array_keys(${$singularVar}[$_alias]);
+		foreach ($otherFields as $_field) {
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+			echo "\t\t<dt{$class}>" . Inflector::humanize($_field) . "</dt>\n";
+			echo "\t\t<dd{$class}>\n\t" . ${$singularVar}[$_alias][$_field] . "\n&nbsp;</dd>\n";
+		}
+?>
+	</dl>
+<?php endif; ?>
+	<div class="actions">
+		<ul>
+			<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."</li>\n";?>
+		</ul>
+	</div>
+</div>
+<?php
+endforeach;
+endif;
+
+if (empty($associations['hasMany'])) {
+	$associations['hasMany'] = array();
+}
+if (empty($associations['hasAndBelongsToMany'])) {
+	$associations['hasAndBelongsToMany'] = array();
+}
+
+$relations = array_merge($associations['hasMany'], $associations['hasAndBelongsToMany']);
+var_dump($relations);
+$i = 0;
+foreach ($relations as $_alias => $_details):
+$otherSingularVar = Inflector::variable($_alias);
+?>
+<div class="related">
+	<h3><?php printf(__("Related %s", true), Inflector::humanize($_details['controller'])); ?></h3>
+<?php if (!empty(${$singularVar}[$_alias])):?>
+	<table cellpadding="0" cellspacing="0">
+	<tr>
+<?php
+		$otherFields = array_keys(${$singularVar}[$_alias][0]);
+		if (isset($_details['with'])) {
+			$index = array_search($_details['with'], $otherFields);
+			unset($otherFields[$index]);
+		}
+		foreach ($otherFields as $_field) {
+			echo "\t\t<th>" . Inflector::humanize($_field) . "</th>\n";
+		}
+?>
+		<th class="actions">Actions</th>
+	</tr>
+<?php
+		$i = 0;
+		foreach (${$singularVar}[$_alias] as ${$otherSingularVar}):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+			echo "\t\t<tr{$class}>\n";
+
+			foreach ($otherFields as $_field) {
+				echo "\t\t\t<td>" . ${$otherSingularVar}[$_field] . "</td>\n";
+			}
+
+			echo "\t\t\t<td class=\"actions\">\n";
+			echo "\t\t\t\t" . $this->Html->link(__('View', true), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__('Edit', true), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__('Delete', true), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __('Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n";
+			echo "\t\t\t</td>\n";
+		echo "\t\t</tr>\n";
+		endforeach;
+?>
+	</table>
+<?php endif; ?>
+	<div class="actions">
+		<ul>
+			<li><?php echo $this->Html->link(sprintf(__("New %s", true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'));?> </li>
+		</ul>
+	</div>
+</div>
+<?php endforeach;?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_index.ctp
new file mode 100644
index 000000000..15f7662ef
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_index.ctp
@@ -0,0 +1,71 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Translation Files', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Languages', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Imported Translation Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Translation Files');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('language_id'),$paginator->sort('filename_template'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($translationFiles as $translationFile):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $translationFile['TranslationFile']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($translationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $translationFile['Language']['id'])); ?>
+		</td>
+		<td><?php echo $translationFile['TranslationFile']['filename_template']; ?></td>
+		<td><?php echo $translationFile['TranslationFile']['created']; ?></td>
+		<td><?php echo $translationFile['TranslationFile']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $translationFile['TranslationFile']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_view.ctp
new file mode 100644
index 000000000..883355dc9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translation_files/admin_view.ctp
@@ -0,0 +1,188 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translation Files', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="translationFiles view">
+	<h2><?php  __('Translation File');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($translationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $translationFile['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Filename Template'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['filename_template']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- ImportedTranslationFile -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Imported Translation Files', true));?></h3>
+			<?php if (!empty($translationFile['ImportedTranslationFile'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Language Id'); ?></th>
+						<th><?php __('Translation File Id'); ?></th>
+						<th><?php __('Filename'); ?></th>
+						<th><?php __('Merged'); ?></th>
+						<th><?php __('File Last Modified Date'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($translationFile['ImportedTranslationFile'] as $importedTranslationFile):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $importedTranslationFile['id'];?></td>
+					<td><?php echo $importedTranslationFile['language_id'];?></td>
+					<td><?php echo $importedTranslationFile['translation_file_id'];?></td>
+					<td><?php echo $importedTranslationFile['filename'];?></td>
+					<td><?php echo $importedTranslationFile['merged'];?></td>
+					<td><?php echo $importedTranslationFile['file_last_modified_date'];?></td>
+					<td><?php echo $importedTranslationFile['created'];?></td>
+					<td><?php echo $importedTranslationFile['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'imported_translation_files', 'action' => 'view', $importedTranslationFile['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+		<!-- Identifier -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Identifiers', true));?></h3>
+			<?php if (!empty($translationFile['Identifier'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Language Id'); ?></th>
+						<th><?php __('Translation File Id'); ?></th>
+						<th><?php __('Translation Index'); ?></th>
+						<th><?php __('Identifier'); ?></th>
+						<th><?php __('Arguments'); ?></th>
+						<th><?php __('Translated'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($translationFile['Identifier'] as $identifier):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $identifier['id'];?></td>
+					<td><?php echo $identifier['language_id'];?></td>
+					<td><?php echo $identifier['translation_file_id'];?></td>
+					<td><?php echo $identifier['translation_index'];?></td>
+					<td><?php echo $identifier['identifier'];?></td>
+					<td><?php echo $identifier['arguments'];?></td>
+					<td><?php echo $identifier['translated'];?></td>
+					<td><?php echo $identifier['created'];?></td>
+					<td><?php echo $identifier['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'identifiers', 'action' => 'view', $identifier['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/translation_files/index.ctp
new file mode 100644
index 000000000..411739e17
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translation_files/index.ctp
@@ -0,0 +1,68 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Translation Files', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Languages', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<p class="help">Choose a file and click "List Identifiers" to see identifiers you can translate.</p>
+	<h2 id="page-heading"><?php __('Translation Files');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('language_id'),$paginator->sort('filename_template'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($translationFiles as $translationFile):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $translationFile['TranslationFile']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($translationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $translationFile['Language']['id'])); ?>
+		</td>
+		<td><?php echo $translationFile['TranslationFile']['filename_template']; ?></td>
+		<td><?php echo $translationFile['TranslationFile']['created']; ?></td>
+		<td><?php echo $translationFile['TranslationFile']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $translationFile['TranslationFile']['id'])); ?>
+			| <?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index', 'translation_file_id' => $translationFile['TranslationFile']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translation_files/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/translation_files/view.ctp
new file mode 100644
index 000000000..a77a28b04
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translation_files/view.ctp
@@ -0,0 +1,90 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translation Files', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index', 'translation_file_id' => $translationFile['TranslationFile']['id'])); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="translationFiles view">
+	<h2><?php  __('Translation File');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($translationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $translationFile['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Filename Template'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['filename_template']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translationFile['TranslationFile']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<!--<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- Identifier -->
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		<!-- /RELATED -->
+	</div>
+</div>-->
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/add.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/add.ctp
new file mode 100644
index 000000000..d23e0f5c6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/add.ctp
@@ -0,0 +1,151 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+
+	<?php echo $this->element('neighbours'); ?>
+</div>
+
+<?php // var_dump($identifierColumnsDetails); ?>
+<?php // var_dump($this->data['IdentifierColumn']); ?>
+
+<div class="grid_13">
+
+
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Translation', true)); ?></h2>
+    
+	<div class="translations form">
+	<?php echo $this->Form->create('Translation');?>
+		<fieldset>
+				 		<legend><?php printf(__('Translation', true) . ' :: ' . $identifier['Identifier']['identifier']); ?></legend>
+					<?php
+//		echo ($identifiers[$identifier['Identifier']['id']
+		echo $form->hidden('Translation.identifier_id', array('default' => $identifier['Identifier']['id']));
+		echo $form->hidden('Translation.user_id', array('value' => $this->Session->read('Auth.User.id')));
+		if (!empty($identifier['IdentifierColumn']))
+		{
+			$i=0;
+			foreach($identifierColumns as $key => $column) {
+				echo $form->hidden('ChildTranslation.'.$i.'.identifier_column_id', array('default' => $key));
+				echo $form->input('ChildTranslation.'.$i.'.identifier_column_id', array('type' => 'text', 'name'=>'buzu', 'value'=>$column, 'readonly' => 'readonly'));
+				echo $form->input('ChildTranslation.'.$i.'.translation_text', array('default' => $identifierColumnsDetails[$key]['reference_string'], 'rows' => 1, 'cols' => 80));
+//				echo $form->input('ChildTranslation.'.$i.'.id');
+				echo $form->hidden('ChildTranslation.'.$i.'.user_id', array('value' => $this->Session->read('Auth.User.id')));
+				$i++;
+			}
+//			echo $this->Form->input('translation_text', array("rows" => 1, "cols" => 60));
+		}
+		else
+		{
+			echo $this->Form->hidden('identifier_id', array('default' => $identifier['Identifier']['id']));
+			echo $this->Form->input('translation_text', array('default' => $identifier['Identifier']['reference_string'], 'rows' => 8, 'cols' => 80));
+			echo $this->Form->hidden('user_id', array('value' => $this->Session->read('Auth.User.id')));
+		}
+		
+	?>
+		</fieldset>
+		<div class="box">
+		<?php echo $this->Form->end(array('label' => __('Save and go to next identifier', true), 'name' => 'Next'));?>
+		<?php echo $this->Form->end(__('Save', true));?>
+		</div>
+	</div>
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translation_index']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_add.ctp
new file mode 100644
index 000000000..199001ba6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_add.ctp
@@ -0,0 +1,50 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Translation', true)); ?></h2>
+    
+	<div class="translations form">
+	<?php echo $this->Form->create('Translation');?>
+		<fieldset>
+				 		<legend><?php printf(__('Translation', true)); ?></legend>
+					<?php
+		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('translation_text');
+		echo $this->Form->input('user_id');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_edit.ctp
new file mode 100644
index 000000000..c4ef20b1b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_edit.ctp
@@ -0,0 +1,120 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Translation.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Translation.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Translation', true)); ?></h2>
+    
+	<div class="translations form">
+	<?php echo $this->Form->create('Translation');?>
+		<fieldset>
+						<legend><?php printf(__('Translation # %s', true), $this->Form->value('Translation.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('identifier_id', array('type' => 'text', 'name'=>'buzu', 'value'=>$this->Form->value('Identifier.identifier'), 'readonly' => 'readonly'));
+		echo $this->Form->hidden('identifier_id', array('default' => $this->Form->value('Translation.identifier_id')));
+		echo $this->Form->input('translation_text');
+		echo $this->Form->hidden('user_id', array('value' => $this->Session->read('Auth.User.id')));
+	?>
+		</fieldset>
+		<div class="box">
+		<?php echo $this->Form->end(__('Submit', true));?>
+		</div>
+	</div>
+
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_index.ctp
new file mode 100644
index 000000000..b878f7bda
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_index.ctp
@@ -0,0 +1,76 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('action' => 'add')); ?> </li>
+				</ul>				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Translations');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('identifier_id'),$paginator->sort('translation_text'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($translations as $translation):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $translation['Translation']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
+		</td>
+		<td><?php echo $translation['Translation']['translation_text']; ?></td>
+		<td>
+			<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
+		</td>
+		<td><?php echo $translation['Translation']['created']; ?></td>
+		<td><?php echo $translation['Translation']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_view.ctp
new file mode 100644
index 000000000..6b852a9dc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/admin_view.ctp
@@ -0,0 +1,142 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Translation', true)), array('action' => 'edit', $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Translation', true)), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="translations view">
+	<h2><?php  __('Translation');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translation['Translation']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Text'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translation['Translation']['translation_text']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translation['Translation']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $translation['Translation']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+				<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
+			<?php if (!empty($translation['Vote'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+								<th><?php __('Id'); ?></th>
+		<th><?php __('Translation Id'); ?></th>
+		<th><?php __('User Id'); ?></th>
+		<th><?php __('Created'); ?></th>
+		<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+			<?php
+				$i = 0;
+				foreach ($translation['Vote'] as $vote):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+		<tr<?php echo $class;?>>
+			<td><?php echo $vote['id'];?></td>
+			<td><?php echo $vote['translation_id'];?></td>
+			<td><?php echo $vote['user_id'];?></td>
+			<td><?php echo $vote['created'];?></td>
+			<td><?php echo $vote['modified'];?></td>
+			<td class="actions">
+				<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'votes', 'action' => 'delete', $vote['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['id'])); ?>
+			</td>
+		</tr>
+	<?php endforeach; ?>
+			</table>
+		<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add'));?></li>
+				</ul>
+			</div>
+		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/edit.ctp
new file mode 100644
index 000000000..fc9233056
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/edit.ctp
@@ -0,0 +1,146 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Translation.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Translation.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+
+	<?php echo $this->element('neighbours'); ?>
+</div>
+
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Translation', true)); ?></h2>
+    
+	<div class="translations form">
+	<?php echo $this->Form->create('Translation');?>
+		<fieldset>
+						<legend><?php printf(__('Translation # %s', true), $this->Form->value('Translation.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->hidden('identifier_id', array('default' => $this->Form->value('Translation.identifier_id')));
+		echo $this->Form->hidden('user_id', array('value' => $this->Session->read('Auth.User.id')));
+		if (!empty($identifier['IdentifierColumn']))
+		{
+//			var_dump($this->data);
+//			var_dump($translation);
+//			var_dump($identifierColumnTranslations);
+//			var_dump($identifierColumnsDetails2);
+//			var_dump($mapChildTranslationsColumns);
+			$i=$j=0;
+			foreach($identifierColumns as $key => $column) {
+				if (isset($mapChildTranslationsColumns[$key]))
+					$i = $mapChildTranslationsColumns[$key];
+				else
+					$i = 'n'.$j++;
+				echo $form->hidden('ChildTranslation.'.$i.'.identifier_column_id', array('default' => $key));
+				echo $form->input('ChildTranslation.'.$i.'.identifier_column_id', array('type' => 'text', 'name'=>'buzu', 'value'=>$column, 'readonly' => 'readonly'));
+				echo $form->input('ChildTranslation.'.$i.'.translation_text', array('rows' => 1, 'cols' => 80));
+				echo $form->input('ChildTranslation.'.$i.'.id');
+				echo $form->hidden('ChildTranslation.'.$i.'.user_id', array('value' => $this->Session->read('Auth.User.id')));
+			}
+		}
+		else
+		{
+			echo $this->Form->input('identifier_id', array('type' => 'text', 'name'=>'buzu', 'value'=>$this->Form->value('Identifier.identifier'), 'readonly' => 'readonly'));
+			echo $this->Form->input('translation_text', array('rows' => 8, 'cols' => 80));
+		}
+		
+	?>
+		</fieldset>
+		<div class="box">
+		<?php echo $this->Form->end(__('Save', true));?>
+		</div>
+	</div>
+
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/index.ctp
new file mode 100644
index 000000000..d33f04bb7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/index.ctp
@@ -0,0 +1,76 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Translations');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('identifier_id'),$paginator->sort('translation_text'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($translations as $translation):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $translation['Translation']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
+		</td>
+		<td><?php echo $translation['Translation']['translation_text']; ?></td>
+		<td>
+			<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
+		</td>
+		<td><?php echo $translation['Translation']['created']; ?></td>
+		<td><?php echo $translation['Translation']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?>
+			| <?php echo $this->Html->link(__('Vote', true), array('controller' => 'votes', 'action' => 'vote', 'translation_id' => $translation['Translation']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/translations/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/translations/view.ctp
new file mode 100644
index 000000000..cc943d0f0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/translations/view.ctp
@@ -0,0 +1,234 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Translation', true)), array('action' => 'edit', $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Translation', true)), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?> </li>
+			</ul>
+				
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index', 'translation_id' => $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add', 'translation_id' => $translation['Translation']['id'])); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+
+	<?php echo $this->element('neighbours'); ?>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="translations view">
+		<h2><?php  __('Translation');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+				<?php echo $translation['Translation']['id']; ?>
+			</div>
+			<?php $i++; ?>
+			<div style="clear: both"></div>
+			<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+			<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+				<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
+			</div>
+			<?php $i++; ?>
+			<div style="clear: both"></div>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Text'); ?></div>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+				<?php echo $translation['Translation']['translation_text']; ?>
+	
+			</div>
+			<?php $i++; ?>
+			<div style="clear: both"></div>
+			<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+			<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+				<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
+			</div>
+			<?php $i++; ?>
+			<div style="clear: both"></div>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+				<?php echo $translation['Translation']['created']; ?>
+	
+			</div>
+			<?php $i++; ?>
+			<div style="clear: both"></div>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+				<?php echo $translation['Translation']['modified']; ?>
+	
+			</div>
+			<?php $i++; ?>
+			<div style="clear: both"></div>
+			</div>
+		</div>
+
+			<?php if (!empty($identifier['IdentifierColumn'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Column Name'); ?></th>
+						<th><?php __('Reference String'); ?></th>
+						<th><?php __('Translation'); ?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($columnTranslations as $identifierColumn):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $identifierColumn['IdentifierColumn']['column_name'];?></td>
+					<td><?php echo $identifierColumn['IdentifierColumn']['reference_string'];?></td>
+					<td><?php echo $identifierColumn['Translation']['translation_text'];?></td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+
+	</div>
+</div>
+
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+				<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
+			<?php if (!empty($translation['Vote'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+								<th><?php __('Id'); ?></th>
+		<th><?php __('Translation Id'); ?></th>
+		<th><?php __('User Id'); ?></th>
+		<th><?php __('Created'); ?></th>
+		<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+			<?php
+				$i = 0;
+				foreach ($translation['Vote'] as $vote):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+		<tr<?php echo $class;?>>
+			<td><?php echo $vote['id'];?></td>
+			<td><?php echo $vote['translation_id'];?></td>
+			<td><?php echo $vote['user_id'];?></td>
+			<td><?php echo $vote['created'];?></td>
+			<td><?php echo $vote['modified'];?></td>
+			<td class="actions">
+				<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+			</td>
+		</tr>
+	<?php endforeach; ?>
+			</table>
+		<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index', 'translation_id' => $translation['Translation']['id']));?></li>
+					<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'vote', 'translation_id' => $translation['Translation']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/admin_add.ctp
new file mode 100644
index 000000000..3052a1c61
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/admin_add.ctp
@@ -0,0 +1,56 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Users', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('User', true)); ?></h2>
+    
+	<div class="users form">
+	<?php echo $this->Form->create('User');?>
+		<fieldset>
+				 		<legend><?php printf(__('User', true)); ?></legend>
+					<?php
+		echo $this->Form->input('name');
+		echo $this->Form->input('email');
+		echo $this->Form->input('activated');
+		echo $this->Form->input('username');
+		echo $this->Form->input('password');
+		echo $this->Form->input('role');
+		echo $this->Form->input('confirm_hash');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/admin_edit.ctp
new file mode 100644
index 000000000..66b84f137
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/admin_edit.ctp
@@ -0,0 +1,62 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('User.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('User.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('User', true)); ?></h2>
+    
+	<div class="users form">
+	<?php echo $this->Form->create('User');?>
+		<fieldset>
+						<legend><?php printf(__('User # %s', true), $this->Form->value('User.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('name');
+		echo $this->Form->input('email');
+		echo $this->Form->input('activated');
+		echo $this->Form->input('username');
+		echo $this->Form->input('role');
+		echo $this->Form->input('confirm_hash');
+	?>
+		</fieldset>
+		<div class="box">
+<?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/admin_index.ctp
new file mode 100644
index 000000000..4f300270b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/admin_index.ctp
@@ -0,0 +1,78 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
+	<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Comments', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Users');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('email'),$paginator->sort('activated'),$paginator->sort('username'),$paginator->sort('role'),$paginator->sort('confirm_hash'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($users as $user):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $user['User']['id']; ?></td>
+		<td><?php echo $user['User']['name']; ?></td>
+		<td><?php echo $user['User']['email']; ?></td>
+		<td><?php echo $user['User']['activated']; ?></td>
+		<td><?php echo $user['User']['username']; ?></td>
+		<td><?php echo $user['User']['role']; ?></td>
+		<td><?php echo $user['User']['confirm_hash']; ?></td>
+		<td><?php echo $user['User']['created']; ?></td>
+		<td><?php echo $user['User']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $user['User']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $user['User']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/admin_view.ctp
new file mode 100644
index 000000000..780494378
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/admin_view.ctp
@@ -0,0 +1,286 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('User', true)), array('action' => 'edit', $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('User', true)), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="users view">
+	<h2><?php  __('User');?></h2>
+		<div class="block">
+			<div class="dl">
+				<?php $i = 1; $class = ' altrow';?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['id']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['name']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Email'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['email']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Activated'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['activated']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Username'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['username']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Password'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['password'] ? 'Set' : 'Not set'; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Role'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['role']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Confirm Hash'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['confirm_hash'] ? $user['User']['confirm_hash'] : 'Confirmed'; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['created']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['modified']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- Translation -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
+			<?php if (!empty($user['Translation'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Identifier Column Id'); ?></th>
+						<th><?php __('Translation Text'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Best'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($user['Translation'] as $translation):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translation['id'];?></td>
+					<td><?php echo $translation['identifier_id'];?></td>
+					<td><?php echo $translation['identifier_column_id'];?></td>
+					<td><?php echo $translation['translation_text'];?></td>
+					<td><?php echo $translation['user_id'];?></td>
+					<td><?php echo $translation['best'];?></td>
+					<td><?php echo $translation['created'];?></td>
+					<td><?php echo $translation['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index', 'user_id' => $user['User']['id']));?></li>
+					<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'user_id' => $user['User']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- Vote -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
+			<?php if (!empty($user['Vote'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($user['Vote'] as $vote):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $vote['id'];?></td>
+					<td><?php echo $vote['translation_id'];?></td>
+					<td><?php echo $vote['user_id'];?></td>
+					<td><?php echo $vote['created'];?></td>
+					<td><?php echo $vote['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'votes', 'action' => 'delete', $vote['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index', 'user_id' => $user['User']['id']));?></li>
+					<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add', 'user_id' => $user['User']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- Comment -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Comments', true));?></h3>
+			<?php if (!empty($user['Comment'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Comment'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($user['Comment'] as $comment):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $comment['id'];?></td>
+					<td><?php echo $comment['translation_id'];?></td>
+					<td><?php echo $comment['identifier_id'];?></td>
+					<td><?php echo $comment['user_id'];?></td>
+					<td><?php echo $comment['comment'];?></td>
+					<td><?php echo $comment['created'];?></td>
+					<td><?php echo $comment['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'comments', 'action' => 'view', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'comments', 'action' => 'edit', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'comments', 'action' => 'delete', $comment['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index', 'user_id' => $user['User']['id']));?></li>
+					<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'user_id' => $user['User']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/index.ctp
new file mode 100644
index 000000000..376183c78
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/index.ctp
@@ -0,0 +1,71 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Comments', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Users');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('email'),$paginator->sort('username'),$paginator->sort('role'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($users as $user):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $user['User']['id']; ?></td>
+		<td><?php echo $user['User']['name']; ?></td>
+		<td><?php echo $user['User']['email']; ?></td>
+		<td><?php echo $user['User']['username']; ?></td>
+		<td><?php echo $user['User']['role']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $user['User']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/login.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/login.ctp
new file mode 100644
index 000000000..d5b4bdbc3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/login.ctp
@@ -0,0 +1,13 @@
+<div class="grid_6">
+<p style="font-size: larger">Please login or <?php echo $this->Html->link(__('Register', true), array('admin' => false, 'controller' => 'users', 'action' => 'register')); ?>.</p>
+<?php
+echo $this->Session->flash('auth');
+echo $this->Form->create('User', array('action' => 'login'));
+echo $this->Form->inputs(array(
+'legend' => __('Login', true),
+'username',
+'password'
+));
+echo $this->Form->end('Login');
+?>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/register.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/register.ctp
new file mode 100644
index 000000000..01477d189
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/register.ctp
@@ -0,0 +1,16 @@
+<div class="grid_6">
+<?php
+echo $this->Session->flash('email');
+
+echo $this->Session->flash('auth');
+echo $this->Form->create('User', array('action' => 'register'));
+echo $this->Form->inputs(array(
+'legend' => __('Register', true),
+'username',
+'name',
+'email',
+'passwd',
+));
+echo $this->Form->end('Register');
+?>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/views/users/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/users/view.ctp
new file mode 100644
index 000000000..1014a2d71
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/users/view.ctp
@@ -0,0 +1,246 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'user_id' => $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="users view">
+	<h2><?php  __('User');?></h2>
+		<div class="block">
+			<div class="dl">
+				<?php $i = 1; $class = ' altrow';?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['id']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['name']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Email'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['email']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Username'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['username']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Role'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $user['User']['role']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- Translation -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
+			<?php if (!empty($user['Translation'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Identifier Column Id'); ?></th>
+						<th><?php __('Translation Text'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Best'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($user['Translation'] as $translation):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $translation['id'];?></td>
+					<td><?php echo $translation['identifier_id'];?></td>
+					<td><?php echo $translation['identifier_column_id'];?></td>
+					<td><?php echo $translation['translation_text'];?></td>
+					<td><?php echo $translation['user_id'];?></td>
+					<td><?php echo $translation['best'];?></td>
+					<td><?php echo $translation['created'];?></td>
+					<td><?php echo $translation['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index', 'user_id' => $user['User']['id']));?></li>
+					<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'user_id' => $user['User']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- Vote -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
+			<?php if (!empty($user['Vote'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($user['Vote'] as $vote):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $vote['id'];?></td>
+					<td><?php echo $vote['translation_id'];?></td>
+					<td><?php echo $vote['user_id'];?></td>
+					<td><?php echo $vote['created'];?></td>
+					<td><?php echo $vote['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index', 'user_id' => $user['User']['id']));?></li>
+					<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add', 'user_id' => $user['User']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- Comment -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Comments', true));?></h3>
+			<?php if (!empty($user['Comment'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Comment'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($user['Comment'] as $comment):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $comment['id'];?></td>
+					<td><?php echo $comment['translation_id'];?></td>
+					<td><?php echo $comment['identifier_id'];?></td>
+					<td><?php echo $comment['user_id'];?></td>
+					<td><?php echo $comment['comment'];?></td>
+					<td><?php echo $comment['created'];?></td>
+					<td><?php echo $comment['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'comments', 'action' => 'view', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'comments', 'action' => 'edit', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'comments', 'action' => 'delete', $comment['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li><?php echo $this->Html->link(sprintf(__('List related %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index', 'user_id' => $user['User']['id']));?></li>
+					<li><?php echo $this->Html->link(sprintf(__('New related %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'user_id' => $user['User']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/add.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/add.ctp
new file mode 100644
index 000000000..2fab35c25
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/add.ctp
@@ -0,0 +1,42 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Vote', true)); ?></h2>
+    
+	<div class="votes form">
+	<?php echo $this->Form->create('Vote');?>
+		<fieldset>
+				 		<legend><?php printf(__('Vote', true)); ?></legend>
+					<?php
+		echo $this->Form->input('translation_id');
+		echo $this->Form->input('user_id');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_add.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_add.ctp
new file mode 100644
index 000000000..879155f32
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_add.ctp
@@ -0,0 +1,44 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Vote', true)); ?></h2>
+    
+	<div class="votes form">
+	<?php echo $this->Form->create('Vote');?>
+		<fieldset>
+				 		<legend><?php printf(__('Vote', true)); ?></legend>
+					<?php
+		echo $this->Form->input('translation_id');
+		echo $this->Form->input('user_id');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_edit.ctp
new file mode 100644
index 000000000..9b662d5bc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_edit.ctp
@@ -0,0 +1,45 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Vote.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Vote.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Vote', true)); ?></h2>
+    
+	<div class="votes form">
+	<?php echo $this->Form->create('Vote');?>
+		<fieldset>
+						<legend><?php printf(__('Vote # %s', true), $this->Form->value('Vote.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('translation_id');
+		echo $this->Form->input('user_id');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_index.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_index.ctp
new file mode 100644
index 000000000..2bbc1e9a1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_index.ctp
@@ -0,0 +1,71 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('action' => 'add')); ?> </li>
+				</ul>				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Votes');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_id'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($votes as $vote):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $vote['Vote']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
+		</td>
+		<td>
+			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
+		</td>
+		<td><?php echo $vote['Vote']['created']; ?></td>
+		<td><?php echo $vote['Vote']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $vote['Vote']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $vote['Vote']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/admin_view.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_view.ctp
new file mode 100644
index 000000000..fdc48cebd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/admin_view.ctp
@@ -0,0 +1,79 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Vote', true)), array('action' => 'edit', $vote['Vote']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Vote', true)), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="votes view">
+	<h2><?php  __('Vote');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $vote['Vote']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $vote['Vote']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $vote['Vote']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/edit.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/edit.ctp
new file mode 100644
index 000000000..c77827257
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/edit.ctp
@@ -0,0 +1,43 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Vote', true)); ?></h2>
+    
+	<div class="votes form">
+	<?php echo $this->Form->create('Vote');?>
+		<fieldset>
+						<legend><?php printf(__('Vote # %s', true), $this->Form->value('Vote.id')); ?></legend>
+					<?php
+		echo $this->Form->input('id');
+		echo $this->Form->input('translation_id');
+		echo $this->Form->input('user_id');
+	?>
+		</fieldset>
+	<?php echo $this->Form->end(__('Submit', true));?>
+	</div>
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/index.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/index.ctp
new file mode 100644
index 000000000..4acc4185c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/index.ctp
@@ -0,0 +1,67 @@
+<div class="grid_3">
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
+				</ul>				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List all %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Votes');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_id'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
+		<?php
+		$i = 0;
+		foreach ($votes as $vote):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+		?>
+	<tr<?php echo $class;?>>
+		<td><?php echo $vote['Vote']['id']; ?></td>
+		<td>
+			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
+		</td>
+		<td>
+			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
+		</td>
+		<td><?php echo $vote['Vote']['created']; ?></td>
+		<td><?php echo $vote['Vote']['modified']; ?></td>
+		<td class="actions">
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $vote['Vote']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $vote['Vote']['id'])); ?>
+		</td>
+	</tr>
+	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
+
+	
+	<p>
+	<?php
+	echo $this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>	</p>
+
+	<div class="paging">
+		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
+		| <?php echo $this->Paginator->numbers();?> |
+		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
+	</div>
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/views/votes/view.ctp b/code/ryzom/tools/server/www/webtt/app/views/votes/view.ctp
new file mode 100644
index 000000000..0373b8e16
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/views/votes/view.ctp
@@ -0,0 +1,76 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Vote', true)), array('action' => 'edit', $vote['Vote']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="votes view">
+	<h2><?php  __('Vote');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $vote['Vote']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $vote['Vote']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $vote['Vote']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+</div>
+<div class="clear"></div>
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/.htaccess b/code/ryzom/tools/server/www/webtt/app/webroot/.htaccess
new file mode 100644
index 000000000..f9d8b938b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/.htaccess
@@ -0,0 +1,6 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css.php b/code/ryzom/tools/server/www/webtt/app/webroot/css.php
new file mode 100644
index 000000000..aae68cba8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * CSS helping functions
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.webroot
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+	header('HTTP/1.1 404 Not Found');
+	exit('File Not Found');
+}
+
+/**
+ * Ensure required classes are available.
+ */
+if (!class_exists('File')) {
+	uses('file');
+}
+
+/**
+ * Make clean CSS
+ *
+ * @param unknown_type $path
+ * @param unknown_type $name
+ * @return unknown
+ */
+	function make_clean_css($path, $name) {
+		App::import('Vendor', 'csspp' . DS . 'csspp');
+		$data = file_get_contents($path);
+		$csspp = new csspp();
+		$output = $csspp->compress($data);
+		$ratio = 100 - (round(strlen($output) / strlen($data), 3) * 100);
+		$output = " /* file: $name, ratio: $ratio% */ " . $output;
+		return $output;
+	}
+/**
+ * Write CSS cache
+ *
+ * @param unknown_type $path
+ * @param unknown_type $content
+ * @return unknown
+ */
+	function write_css_cache($path, $content) {
+		if (!is_dir(dirname($path))) {
+			mkdir(dirname($path));
+		}
+		$cache = new File($path);
+		return $cache->write($content);
+	}
+
+	if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs)) {
+		die('Wrong file name.');
+	}
+
+	$filename = 'css/' . $regs[1];
+	$filepath = CSS . $regs[1];
+	$cachepath = CACHE . 'css' . DS . str_replace(array('/','\\'), '-', $regs[1]);
+
+	if (!file_exists($filepath)) {
+		die('Wrong file name.');
+	}
+
+	if (file_exists($cachepath)) {
+		$templateModified = filemtime($filepath);
+		$cacheModified = filemtime($cachepath);
+
+		if ($templateModified > $cacheModified) {
+			$output = make_clean_css($filepath, $filename);
+			write_css_cache($cachepath, $output);
+		} else {
+			$output = file_get_contents($cachepath);
+		}
+	} else {
+		$output = make_clean_css($filepath, $filename);
+		write_css_cache($cachepath, $output);
+		$templateModified = time();
+	}
+
+	header("Date: " . date("D, j M Y G:i:s ", $templateModified) . 'GMT');
+	header("Content-Type: text/css");
+	header("Expires: " . gmdate("D, d M Y H:i:s", time() + DAY) . " GMT");
+	header("Cache-Control: max-age=86400, must-revalidate"); // HTTP/1.1
+	header("Pragma: cache");        // HTTP/1.0
+	print $output;
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/960.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/960.css
new file mode 100755
index 000000000..9e670fc02
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/960.css
@@ -0,0 +1,493 @@
+/*
+	960 Grid System ~ Core CSS.
+	Learn more ~ http://960.gs/
+
+	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
+*/
+
+/* =Containers
+--------------------------------------------------------------------------------*/
+
+.container_12,
+.container_16
+{
+	margin-left: auto;
+	margin-right: auto;
+	width: 960px;
+}
+
+/* =Grid >> Global
+--------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16
+{
+	display: inline;
+	float: left;
+	margin-left: 10px;
+	margin-right: 10px;
+}
+
+.container_12 .grid_3,
+.container_16 .grid_4
+{
+	width: 220px;
+}
+
+.container_12 .grid_6,
+.container_16 .grid_8
+{
+	width: 460px;
+}
+
+.container_12 .grid_9,
+.container_16 .grid_12
+{
+	width: 700px;
+}
+
+.container_12 .grid_12,
+.container_16 .grid_16
+{
+	width: 940px;
+}
+
+/* =Grid >> Children (Alpha ~ First, Omega ~ Last)
+--------------------------------------------------------------------------------*/
+
+.alpha
+{
+	margin-left: 0;
+}
+
+.omega
+{
+	margin-right: 0;
+}
+
+/* =Grid >> 12 Columns
+--------------------------------------------------------------------------------*/
+
+.container_12 .grid_1
+{
+	width: 60px;
+}
+
+.container_12 .grid_2
+{
+	width: 140px;
+}
+
+.container_12 .grid_4
+{
+	width: 300px;
+}
+
+.container_12 .grid_5
+{
+	width: 380px;
+}
+
+.container_12 .grid_7
+{
+	width: 540px;
+}
+
+.container_12 .grid_8
+{
+	width: 620px;
+}
+
+.container_12 .grid_10
+{
+	width: 780px;
+}
+
+.container_12 .grid_11
+{
+	width: 860px;
+}
+
+/* =Grid >> 16 Columns
+--------------------------------------------------------------------------------*/
+
+.container_16 .grid_1
+{
+	width: 40px;
+}
+
+.container_16 .grid_2
+{
+	width: 100px;
+}
+
+.container_16 .grid_3
+{
+	width: 160px;
+}
+
+.container_16 .grid_5
+{
+	width: 280px;
+}
+
+.container_16 .grid_6
+{
+	width: 340px;
+}
+
+.container_16 .grid_7
+{
+	width: 400px;
+}
+
+.container_16 .grid_9
+{
+	width: 520px;
+}
+
+.container_16 .grid_10
+{
+	width: 580px;
+}
+
+.container_16 .grid_11
+{
+	width: 640px;
+}
+
+.container_16 .grid_13
+{
+	width: 760px;
+}
+
+.container_16 .grid_14
+{
+	width: 820px;
+}
+
+.container_16 .grid_15
+{
+	width: 880px;
+}
+
+/* =Prefix Extra Space >> Global
+--------------------------------------------------------------------------------*/
+
+.container_12 .prefix_3,
+.container_16 .prefix_4
+{
+	padding-left: 240px;
+}
+
+.container_12 .prefix_6,
+.container_16 .prefix_8
+{
+	padding-left: 480px;
+}
+
+.container_12 .prefix_9,
+.container_16 .prefix_12
+{
+	padding-left: 720px;
+}
+
+/* =Prefix Extra Space >> 12 Columns
+--------------------------------------------------------------------------------*/
+
+.container_12 .prefix_1
+{
+	padding-left: 80px;
+}
+
+.container_12 .prefix_2
+{
+	padding-left: 160px;
+}
+
+.container_12 .prefix_4
+{
+	padding-left: 320px;
+}
+
+.container_12 .prefix_5
+{
+	padding-left: 400px;
+}
+
+.container_12 .prefix_7
+{
+	padding-left: 560px;
+}
+
+.container_12 .prefix_8
+{
+	padding-left: 640px;
+}
+
+.container_12 .prefix_10
+{
+	padding-left: 800px;
+}
+
+.container_12 .prefix_11
+{
+	padding-left: 880px;
+}
+
+/* =Prefix Extra Space >> 16 Columns
+--------------------------------------------------------------------------------*/
+
+.container_16 .prefix_1
+{
+	padding-left: 60px;
+}
+
+.container_16 .prefix_2
+{
+	padding-left: 120px;
+}
+
+.container_16 .prefix_3
+{
+	padding-left: 180px;
+}
+
+.container_16 .prefix_5
+{
+	padding-left: 300px;
+}
+
+.container_16 .prefix_6
+{
+	padding-left: 360px;
+}
+
+.container_16 .prefix_7
+{
+	padding-left: 420px;
+}
+
+.container_16 .prefix_9
+{
+	padding-left: 540px;
+}
+
+.container_16 .prefix_10
+{
+	padding-left: 600px;
+}
+
+.container_16 .prefix_11
+{
+	padding-left: 660px;
+}
+
+.container_16 .prefix_13
+{
+	padding-left: 780px;
+}
+
+.container_16 .prefix_14
+{
+	padding-left: 840px;
+}
+
+.container_16 .prefix_15
+{
+	padding-left: 900px;
+}
+
+/* =Suffix Extra Space >> Global
+--------------------------------------------------------------------------------*/
+
+.container_12 .suffix_3,
+.container_16 .suffix_4
+{
+	padding-right: 240px;
+}
+
+.container_12 .suffix_6,
+.container_16 .suffix_8
+{
+	padding-right: 480px;
+}
+
+.container_12 .suffix_9,
+.container_16 .suffix_12
+{
+	padding-right: 720px;
+}
+
+/* =Suffix Extra Space >> 12 Columns
+--------------------------------------------------------------------------------*/
+
+.container_12 .suffix_1
+{
+	padding-right: 80px;
+}
+
+.container_12 .suffix_2
+{
+	padding-right: 160px;
+}
+
+.container_12 .suffix_4
+{
+	padding-right: 320px;
+}
+
+.container_12 .suffix_5
+{
+	padding-right: 400px;
+}
+
+.container_12 .suffix_7
+{
+	padding-right: 560px;
+}
+
+.container_12 .suffix_8
+{
+	padding-right: 640px;
+}
+
+.container_12 .suffix_10
+{
+	padding-right: 800px;
+}
+
+.container_12 .suffix_11
+{
+	padding-right: 880px;
+}
+
+/* =Suffix Extra Space >> 16 Columns
+--------------------------------------------------------------------------------*/
+
+.container_16 .suffix_1
+{
+	padding-right: 60px;
+}
+
+.container_16 .suffix_2
+{
+	padding-right: 120px;
+}
+
+.container_16 .suffix_3
+{
+	padding-right: 180px;
+}
+
+.container_16 .suffix_5
+{
+	padding-right: 300px;
+}
+
+.container_16 .suffix_6
+{
+	padding-right: 360px;
+}
+
+.container_16 .suffix_7
+{
+	padding-right: 420px;
+}
+
+.container_16 .suffix_9
+{
+	padding-right: 540px;
+}
+
+.container_16 .suffix_10
+{
+	padding-right: 600px;
+}
+
+.container_16 .suffix_11
+{
+	padding-right: 660px;
+}
+
+.container_16 .suffix_13
+{
+	padding-right: 780px;
+}
+
+.container_16 .suffix_14
+{
+	padding-right: 840px;
+}
+
+.container_16 .suffix_15
+{
+	padding-right: 900px;
+}
+
+/* =Clear Floated Elements
+--------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+html body * span.clear,
+html body * div.clear,
+html body * li.clear,
+html body * dd.clear
+{
+	background: none;
+	border: 0;
+	clear: both;
+	display: block;
+	float: none;
+	font-size: 0;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	overflow: hidden;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
+
+/* http://www.positioniseverything.net/easyclearing.html */
+
+.clearfix:after
+{
+	clear: both;
+	content: '.';
+	display: block;
+	visibility: hidden;
+	height: 0;
+}
+
+.clearfix
+{
+	display: inline-block;
+}
+
+* html .clearfix
+{
+	height: 1%;
+}
+
+.clearfix
+{
+	display: block;
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/cake.generic.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/cake.generic.css
new file mode 100644
index 000000000..101deb26a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/cake.generic.css
@@ -0,0 +1,535 @@
+/**
+ *
+ * Generic CSS for CakePHP
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.webroot.css
+ * @since         CakePHP(tm)
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+* {
+	margin:0;
+	padding:0;
+}
+
+/** General Style Info **/
+body {
+	background: #003d4c;
+	color: #fff;
+	font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
+	font-size:90%;
+	margin: 0;
+}
+a {
+	color: #003d4c;
+	text-decoration: underline;
+	font-weight: bold;
+}
+a:hover {
+	color: #367889;
+	text-decoration:none;
+}
+a img {
+	border:none;
+}
+h1, h2, h3, h4 {
+	font-weight: normal;
+	margin-bottom:0.5em;
+}
+h1 {
+	background:#fff;
+	color: #003d4c;
+	font-size: 100%;
+}
+h2 {
+	background:#fff;
+	color: #e32;
+	font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
+	font-size: 190%;
+}
+h3 {
+	color: #993;
+	font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
+	font-size: 165%;
+}
+h4 {
+	color: #993;
+	font-weight: normal;
+}
+ul, li {
+	margin: 0 12px;
+}
+
+/** Layout **/
+#container {
+	text-align: left;
+}
+
+#header{
+	padding: 10px 20px;
+}
+#header h1 {
+	line-height:20px;
+	background: #003d4c url('../img/cake.icon.png') no-repeat left;
+	color: #fff;
+	padding: 0px 30px;
+}
+#header h1 a {
+	color: #fff;
+	background: #003d4c;
+	font-weight: normal;
+	text-decoration: none;
+}
+#header h1 a:hover {
+	color: #fff;
+	background: #003d4c;
+	text-decoration: underline;
+}
+#content{
+	background: #fff;
+	clear: both;
+	color: #333;
+	padding: 10px 20px 40px 20px;
+	overflow: auto;
+}
+#footer {
+	clear: both;
+	padding: 6px 10px;
+	text-align: right;
+}
+
+/** containers **/
+div.form,
+div.index,
+div.view {
+	float:right;
+	width:76%;
+	border-left:1px solid #666;
+	padding:10px 2%;
+}
+div.actions {
+	float:left;
+	width:16%;
+	padding:10px 1.5%;
+}
+div.actions h3 {
+	padding-top:0;
+	color:#777;
+}
+
+
+/** Tables **/
+table {
+	background: #fff;
+	border-right:0;
+	clear: both;
+	color: #333;
+	margin-bottom: 10px;
+	width: 100%;
+}
+th {
+	border:0;
+	border-bottom:2px solid #555;
+	text-align: left;
+	padding:4px;
+}
+th a {
+	display: block;
+	padding: 2px 4px;
+	text-decoration: none;
+}
+th a.asc:after {
+	content: ' ⇣';
+}
+th a.desc:after {
+	content: ' ⇡';
+}
+table tr td {
+	background: #fff;
+	padding: 6px;
+	text-align: left;
+	vertical-align: top;
+	border-bottom:1px solid #ddd;
+}
+table tr:nth-child(2n) td {
+	background: #f5f5f5;
+}
+table .altrow td {
+	background: #f5f5f5;
+}
+td.actions {
+	text-align: center;
+	white-space: nowrap;
+}
+table td.actions a {
+	margin: 0px 6px;
+	padding:2px 5px;
+}
+.cake-sql-log table {
+	background: #f4f4f4;
+}
+.cake-sql-log td {
+	padding: 4px 8px;
+	text-align: left;
+	font-family: Monaco, Consolas, "Courier New", monospaced;
+}
+.cake-sql-log caption {
+	color:#fff;
+}
+
+/** Paging **/
+div.paging {
+	background:#fff;
+	color: #ccc;
+	margin-top: 1em;
+	clear:both;
+}
+div.paging span.disabled {
+	color: #ddd;
+	display: inline;
+}
+div.paging span.current {
+	color: #c73e14;
+}
+div.paging span a {
+}
+
+/** Scaffold View **/
+dl {
+	line-height: 2em;
+	margin: 0em 0em;
+	width: 80%;
+}
+dl .altrow {
+	background: #f4f4f4;
+}
+dt {
+	font-weight: bold;
+	padding-left: 4px;
+	vertical-align: top;
+}
+dd {
+	margin-left: 15em;
+	margin-top: -2em;
+	vertical-align: top;
+}
+
+/** Forms **/
+form {
+	clear: both;
+	margin-right: 20px;
+	padding: 0;
+	width: 95%;
+}
+fieldset {
+	border: 1px solid #ccc;
+	margin-bottom: 1em;
+	padding: 16px 20px;
+}
+fieldset legend {
+	background:#fff;
+	color: #e32;
+	font-size: 160%;
+	font-weight: bold;
+}
+fieldset fieldset {
+	margin-top: 0px;
+	margin-bottom: 20px;
+	padding: 16px 10px;
+}
+fieldset fieldset legend {
+	font-size: 120%;
+	font-weight: normal;
+}
+fieldset fieldset div {
+	clear: left;
+	margin: 0 20px;
+}
+form div {
+	clear: both;
+	margin-bottom: 1em;
+	padding: .5em;
+	vertical-align: text-top;
+}
+form .input {
+	color: #444;
+}
+form .required {
+	font-weight: bold;
+}
+form .required label:after {
+	color: #e32;
+	content: '*';
+	display:inline;
+}
+form div.submit {
+	border: 0;
+	clear: both;
+	margin-top: 10px;
+}
+label {
+	display: block;
+	font-size: 110%;
+	margin-bottom:3px;
+}
+input, textarea {
+	clear: both;
+	font-size: 140%;
+	font-family: "frutiger linotype", "lucida grande", "verdana", sans-serif;
+	padding: 1%;
+	width:98%;
+}
+select {
+	clear: both;
+	font-size: 120%;
+	vertical-align: text-bottom;
+}
+select[multiple=multiple] {
+	width: 100%;
+}
+option {
+	font-size: 120%;
+	padding: 0 3px;
+}
+input[type=checkbox] {
+	clear: left;
+	float: left;
+	margin: 0px 6px 7px 2px;
+	width: auto;
+}
+div.checkbox label {
+	display: inline;
+}
+input[type=radio] {
+	float:left;
+	width:auto;
+	margin: 0 3px 7px 0;
+}
+div.radio label {
+	margin: 0 0 6px 20px;
+}
+input[type=submit] {
+	display: inline;
+	font-size: 110%;
+	width: auto;
+}
+form .submit input[type=submit] {
+	background:#62af56;
+	background: -webkit-gradient(linear, left top, left bottom, from(#a8ea9c), to(#62af56));
+	background-image: -moz-linear-gradient(top, #a8ea9c, #62af56);
+	border-color: #2d6324;
+	color: #000;
+	text-shadow: #8cee7c 0px 1px 0px;
+}
+form .submit input[type=submit]:hover {
+	background:#4ca83d;
+	background: -webkit-gradient(linear, left top, left bottom, from(#85e573), to(#4ca83d));
+	background-image: -moz-linear-gradient(top, #85e573, #4ca83d);
+}
+
+/** Notices and Errors **/
+div.message {
+	clear: both;
+	color: #fff;
+	font-size: 140%;
+	font-weight: bold;
+	margin: 0 0 1em 0;
+	background: #c73e14;
+	padding: 5px;
+}
+div.error-message {
+	clear: both;
+	color: #fff;
+	font-weight: bold;
+	background: #c73e14;
+}
+p.error {
+	background-color: #e32;
+	color: #fff;
+	font-family: Courier, monospace;
+	font-size: 120%;
+	line-height: 140%;
+	padding: 0.8em;
+	margin: 1em 0;
+}
+p.error em {
+	color: #000;
+	font-weight: normal;
+	line-height: 140%;
+}
+.notice {
+	background: #ffcc00;
+	color: #000;
+	display: block;
+	font-family: Courier, monospace;
+	font-size: 120%;
+	line-height: 140%;
+	padding: 0.8em;
+	margin: 1em 0;
+}
+.success {
+	background: green;
+	color: #fff;
+}
+
+/**  Actions  **/
+div.actions ul {
+	margin: 0;
+	padding: 0;
+}
+div.actions li {
+	margin:0 0 0.5em 0;
+	list-style-type: none;
+	white-space: nowrap;
+	padding: 0;
+}
+div.actions ul li a {
+	font-weight: normal;
+	display: block;
+	clear: both;
+}
+div.actions ul li a:hover {
+	text-decoration: underline;
+}
+
+input[type=submit],
+div.actions ul li a,
+td.actions a {
+	font-weight:normal;
+	padding: 4px 8px;
+	background:#e6e49f;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f1f1d4), to(#e6e49f));
+	background-image: -moz-linear-gradient(top, #f1f1d4, #e6e49f);
+	color:#333;
+	border:1px solid #aaac62;
+	-webkit-border-radius:8px;
+	-moz-border-radius:8px;
+	border-radius:8px;
+	text-decoration:none;
+	text-shadow: #fff 0px 1px 0px;
+	min-width: 0;
+}
+input[type=submit]:hover,
+div.actions ul li a:hover,
+td.actions a:hover {
+	background: #f0f09a;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f7f7e1), to(#eeeca9));
+}
+
+/** Related **/
+div.related {
+	clear: both;
+	display: block;
+}
+
+/** Debugging **/
+pre {
+	color: #000;
+	background: #f0f0f0;
+	padding: 1em;
+}
+pre.cake-debug {
+	background: #ffcc00;
+	font-size: 120%;
+	line-height: 140%;
+	margin-top: 1em;
+	overflow: auto;
+	position: relative;
+}
+div.cake-stack-trace {
+	background: #fff;
+	color: #333;
+	margin: 0px;
+	padding: 6px;
+	font-size: 120%;
+	line-height: 140%;
+	overflow: auto;
+	position: relative;
+}
+div.cake-code-dump pre {
+	position: relative;
+	overflow: auto;
+}
+div.cake-stack-trace pre, div.cake-code-dump pre {
+	color: #000;
+	background-color: #F0F0F0;
+	margin: 0px;
+	padding: 1em;
+	overflow: auto;
+}
+div.cake-code-dump pre, div.cake-code-dump pre code {
+	clear: both;
+	font-size: 12px;
+	line-height: 15px;
+	margin: 4px 2px;
+	padding: 4px;
+	overflow: auto;
+}
+div.cake-code-dump span.code-highlight {
+	background-color: #ff0;
+	padding: 4px;
+}
+div.code-coverage-results div.code-line {
+	padding-left:5px;
+	display:block;
+	margin-left:10px;
+}
+div.code-coverage-results div.uncovered span.content {
+	background:#ecc;
+}
+div.code-coverage-results div.covered span.content {
+	background:#cec;
+}
+div.code-coverage-results div.ignored span.content {
+	color:#aaa;
+}
+div.code-coverage-results span.line-num {
+	color:#666;
+	display:block;
+	float:left;
+	width:20px;
+	text-align:right;
+	margin-right:5px;
+}
+div.code-coverage-results span.line-num strong {
+	color:#666;
+}
+div.code-coverage-results div.start {
+	border:1px solid #aaa;
+	border-width:1px 1px 0px 1px;
+	margin-top:30px;
+	padding-top:5px;
+}
+div.code-coverage-results div.end {
+	border:1px solid #aaa;
+	border-width:0px 1px 1px 1px;
+	margin-bottom:30px;
+	padding-bottom:5px;
+}
+div.code-coverage-results div.realstart {
+	margin-top:0px;
+}
+div.code-coverage-results p.note {
+	color:#bbb;
+	padding:5px;
+	margin:5px 0 10px;
+	font-size:10px;
+}
+div.code-coverage-results span.result-bad {
+	color: #a00;
+}
+div.code-coverage-results span.result-ok {
+	color: #fa0;
+}
+div.code-coverage-results span.result-good {
+	color: #0a0;
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/grid.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/grid.css
new file mode 100755
index 000000000..f39ac87fd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/grid.css
@@ -0,0 +1,493 @@
+/*
+	960 Grid System ~ Core CSS.
+	Learn more ~ http://960.gs/
+
+	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
+*/
+
+/* =Containers
+--------------------------------------------------------------------------------*/
+
+.container_12,
+.container_16
+{
+	width: 92%;
+	margin-left: 4%;
+	margin-right: 4%;
+}
+
+/* =Grid >> Global
+--------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16
+{
+	display: inline;
+	float: left;
+	margin-left: 1%;
+	margin-right: 1%;
+}
+
+.container_12 .grid_3,
+.container_16 .grid_4
+{
+	width: 23%;
+}
+
+.container_12 .grid_6,
+.container_16 .grid_8
+{
+	width: 48%;
+}
+
+.container_12 .grid_9,
+.container_16 .grid_12
+{
+	width: 73%;
+}
+
+.container_12 .grid_12,
+.container_16 .grid_16
+{
+	width: 98%;
+}
+
+/* =Grid >> Children (Alpha ~ First, Omega ~ Last)
+--------------------------------------------------------------------------------*/
+
+.alpha
+{
+	margin-left: 0;
+}
+
+.omega
+{
+	margin-right: 0;
+}
+
+/* =Grid >> 12 Columns
+--------------------------------------------------------------------------------*/
+
+.container_12 .grid_1
+{
+	width: 6.333%;
+}
+
+.container_12 .grid_2
+{
+	width: 14.666%;
+}
+
+.container_12 .grid_4
+{
+	width: 31.333%;
+}
+
+.container_12 .grid_5
+{
+	width: 39.666%;
+}
+
+.container_12 .grid_7
+{
+	width: 56.333%;
+}
+
+.container_12 .grid_8
+{
+	width: 64.666%;
+}
+
+.container_12 .grid_10
+{
+	width: 81.333%;
+}
+
+.container_12 .grid_11
+{
+	width: 89.666%;
+}
+
+/* =Grid >> 16 Columns
+--------------------------------------------------------------------------------*/
+
+.container_16 .grid_1
+{
+	width: 4.25%;
+}
+
+.container_16 .grid_2
+{
+	width: 10.5%;
+}
+
+.container_16 .grid_3
+{
+	width: 16.75%;
+}
+
+.container_16 .grid_5
+{
+	width: 29.25%;
+}
+
+.container_16 .grid_6
+{
+	width: 35.5%;
+}
+
+.container_16 .grid_7
+{
+	width: 41.75%;
+}
+
+.container_16 .grid_9
+{
+	width: 54.25%;
+}
+
+.container_16 .grid_10
+{
+	width: 60.5%;
+}
+
+.container_16 .grid_11
+{
+	width: 66.75%;
+}
+
+.container_16 .grid_13
+{
+	width: 79.25%;
+}
+
+.container_16 .grid_14
+{
+	width: 85.5%;
+}
+
+.container_16 .grid_15
+{
+	width: 91.75%;
+}
+
+/* =Prefix Extra Space >> Global
+--------------------------------------------------------------------------------*/
+
+.container_12 .prefix_3,
+.container_16 .prefix_4
+{
+	padding-left: 25%;
+}
+
+.container_12 .prefix_6,
+.container_16 .prefix_8
+{
+	padding-left: 50%;
+}
+
+.container_12 .prefix_9,
+.container_16 .prefix_12
+{
+	padding-left: 75%;
+}
+
+/* =Prefix Extra Space >> 12 Columns
+--------------------------------------------------------------------------------*/
+
+.container_12 .prefix_1
+{
+	padding-left: 8.333%;
+}
+
+.container_12 .prefix_2
+{
+	padding-left: 16.666%;
+}
+
+.container_12 .prefix_4
+{
+	padding-left: 33.333%;
+}
+
+.container_12 .prefix_5
+{
+	padding-left: 41.666%;
+}
+
+.container_12 .prefix_7
+{
+	padding-left: 58.333%;
+}
+
+.container_12 .prefix_8
+{
+	padding-left: 66.666%;
+}
+
+.container_12 .prefix_10
+{
+	padding-left: 83.333%;
+}
+
+.container_12 .prefix_11
+{
+	padding-left: 91.666%;
+}
+
+/* =Prefix Extra Space >> 16 Columns
+--------------------------------------------------------------------------------*/
+
+.container_16 .prefix_1
+{
+	padding-left: 6.25%;
+}
+
+.container_16 .prefix_2
+{
+	padding-left: 12.5%;
+}
+
+.container_16 .prefix_3
+{
+	padding-left: 18.75%;
+}
+
+.container_16 .prefix_5
+{
+	padding-left: 31.25%;
+}
+
+.container_16 .prefix_6
+{
+	padding-left: 37.5%;
+}
+
+.container_16 .prefix_7
+{
+	padding-left: 43.75%;
+}
+
+.container_16 .prefix_9
+{
+	padding-left: 56.25%;
+}
+
+.container_16 .prefix_10
+{
+	padding-left: 62.5%;
+}
+
+.container_16 .prefix_11
+{
+	padding-left: 68.75%;
+}
+
+.container_16 .prefix_13
+{
+	padding-left: 81.25%;
+}
+
+.container_16 .prefix_14
+{
+	padding-left: 87.5%;
+}
+
+.container_16 .prefix_15
+{
+	padding-left: 93.75%;
+}
+
+/* =Suffix Extra Space >> Global
+--------------------------------------------------------------------------------*/
+
+.container_12 .suffix_3,
+.container_16 .suffix_4
+{
+	padding-right: 25%;
+}
+
+.container_12 .suffix_6,
+.container_16 .suffix_8
+{
+	padding-right: 50%;
+}
+
+.container_12 .suffix_9,
+.container_16 .suffix_12
+{
+	padding-right: 75%;
+}
+
+/* =Suffix Extra Space >> 12 Columns
+--------------------------------------------------------------------------------*/
+
+.container_12 .suffix_1
+{
+	padding-right: 8.333%;
+}
+
+.container_12 .suffix_2
+{
+	padding-right: 16.666%;
+}
+
+.container_12 .suffix_4
+{
+	padding-right: 33.333%;
+}
+
+.container_12 .suffix_5
+{
+	padding-right: 41.666%;
+}
+
+.container_12 .suffix_7
+{
+	padding-right: 58.333%;
+}
+
+.container_12 .suffix_8
+{
+	padding-right: 66.666%;
+}
+
+.container_12 .suffix_10
+{
+	padding-right: 83.333%;
+}
+
+.container_12 .suffix_11
+{
+	padding-right: 91.666%;
+}
+
+/* =Suffix Extra Space >> 16 Columns
+--------------------------------------------------------------------------------*/
+
+.container_16 .suffix_1
+{
+	padding-right: 6.25%;
+}
+
+.container_16 .suffix_2
+{
+	padding-right: 16.5%;
+}
+
+.container_16 .suffix_3
+{
+	padding-right: 18.75%;
+}
+
+.container_16 .suffix_5
+{
+	padding-right: 31.25%;
+}
+
+.container_16 .suffix_6
+{
+	padding-right: 37.5%;
+}
+
+.container_16 .suffix_7
+{
+	padding-right: 43.75%;
+}
+
+.container_16 .suffix_9
+{
+	padding-right: 56.25%;
+}
+
+.container_16 .suffix_10
+{
+	padding-right: 62.5%;
+}
+
+.container_16 .suffix_11
+{
+	padding-right: 68.75%;
+}
+
+.container_16 .suffix_13
+{
+	padding-right: 81.25%;
+}
+
+.container_16 .suffix_14
+{
+	padding-right: 87.5%;
+}
+
+.container_16 .suffix_15
+{
+	padding-right: 93.75%;
+}
+
+/* =Clear Floated Elements
+--------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+html body * span.clear,
+html body * div.clear,
+html body * li.clear,
+html body * dd.clear
+{
+	background: none;
+	border: 0;
+	clear: both;
+	display: block;
+	float: none;
+	font-size: 0;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	overflow: hidden;
+	visibility: hidden;
+	width: 0;
+	height: 0;
+}
+
+/* http://www.positioniseverything.net/easyclearing.html */
+
+.clearfix:after
+{
+	clear: both;
+	content: '.';
+	display: block;
+	visibility: hidden;
+	height: 0;
+}
+
+.clearfix
+{
+	display: inline-block;
+}
+
+* html .clearfix
+{
+	height: 1%;
+}
+
+.clearfix
+{
+	display: block;
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/ie.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/ie.css
new file mode 100755
index 000000000..1394ddd85
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/ie.css
@@ -0,0 +1,33 @@
+/*
+	Fluid 960 Grid System - IE Fixes (IE7 and greater)
+	Learn more ~ http://www.designinfluences.com/
+
+	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
+*/
+
+/* =Grid >> Global
+--------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16
+{
+	margin-left: .92%;
+	margin-right: .92%;
+}
+
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/ie6.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/ie6.css
new file mode 100755
index 000000000..091e11747
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/ie6.css
@@ -0,0 +1,33 @@
+/*
+	Fluid 960 Grid System - IE6 Fixes
+	Learn more ~ http://www.designinfluences.com/
+
+	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
+4*/
+
+/* =Grid >> Global
+--------------------------------------------------------------------------------*/
+
+.grid_1,
+.grid_2,
+.grid_3,
+.grid_4,
+.grid_5,
+.grid_6,
+.grid_7,
+.grid_8,
+.grid_9,
+.grid_10,
+.grid_11,
+.grid_12,
+.grid_13,
+.grid_14,
+.grid_15,
+.grid_16
+{
+	margin-left: .8%;
+	margin-right: .8%;
+}
+
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/labelWidth.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/labelWidth.css
new file mode 100644
index 000000000..fb63b4d53
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/labelWidth.css
@@ -0,0 +1,12 @@
+.importedTranslationFiles div.dt, .importedTranslationFiles label {
+    width: 15em;
+}
+.identifiers div.dt, .identifiers labek {
+    width: 13em;
+}
+.fileIdentifiers div.dt, .fileIdentifiers label {
+    width: 17em;
+}
+.translationFiles div.dt, .translationFiles label {
+    width: 15em;
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/layout.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/layout.css
new file mode 100755
index 000000000..342fe53c8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/layout.css
@@ -0,0 +1,782 @@
+/*
 WebTT template based on 960 Grid System (http://960.gs/)
+
+-----------------------------------------------
+Grey Box Method - Layout CSS
+----------------------------------------------- */
+
+body {
+	background: #000
;
+	background-image: url("http://www.ryzom.com/data/bg.jpg");
+	background-attachment:fixed;
+	background-repeat: repeat-x;
+//	border-top: 5px solid #000;
+	margin-top: 5px;
+//	color: #333;
+	color: #ddd;
+	font-size: 11px;
+	padding: 0 0 40px;
+}
+
+
+/* anchors
+----------------------------------------------- */
+a {
+//	color: #000;
+	color: inherit;
+	font-weight:bold;
+	text-decoration: none;
+}
+a:hover {
+//	color:#333;
+//	text-decoration: underline;
+//	text-shadow: #6374AB 0px 0px 2px;
+	text-shadow: #84AFBD 0px 0px 2px;
+}
+
+
+/* 960 grid system container background
+----------------------------------------------- */
+.container_12,
+.container_16 {
+	background: rgb(71,71,71);
+	background: rgba(0,0,0, 0.6);
+	border: 1px solid rgb(110,110,110);
+	border: 1px solid rgba(255,255,255, 0.5);
+}
+
+
+/* headings
+----------------------------------------------- */
+h1, h2, h3, h4, h5, h6 {line-height:1.2em; margin-bottom:.3em;}
+h2 {margin-top:1em;}
+h5 {font-size:1.2em;}
+h6 {font-size:1em; text-transform:uppercase;}
+
+
+h1 a {
+	font-weight:normal;
+	color: #ddd;
+}
+h1 a:hover {
+	font-weight:normal;
+	color: #ddd;
+}
+
+
+/* branding
+----------------------------------------------- */
+h1#branding {
+	font-weight:normal;
+	font-size:3em;
+	text-align:left;
+	background:#aaa;
+	padding:.7em 1em;
+	margin-bottom:0;
+}
+
+
+/* page heading
+----------------------------------------------- */
+h2#page-heading {
+	font-weight:normal;
+	padding:.5em;
+	margin:0 0 10px 0;
+	border-bottom:1px solid #ccc;
+}
+
+
+/* boxes
+----------------------------------------------- */
+.box {
+//	background:rgb(210,210,210);
+//	background:rgba(255,255,255,0.81);
+	margin-bottom:20px;
+	padding:10px 10px 1px 10px;
+//	color: #333;
+	color: #ddd;
+	border: 1px solid rgb(71,71,71);
+	border: 1px solid rgba(255,255,255,0.4);
+}
+.box h2 {
+	font-size:1em;
+	font-weight:normal;
+	text-transform:uppercase;
+	color:#fff;
+//	background:#333;
+	background:rgb(31,31,31);
+	background:rgba(90,90,0,0.6);
+	margin:-10px -10px 0 -10px;
+	padding:6px 12px;
+}
+.box h2 a,
+.box h2 a.visible {
+//	color:#fff;
+	color: #ddd;
+//	background:#333 url("../img/switch_minus.gif") 97% 50% no-repeat;
+	background:url("../img/switch_minus.gif") 97% 50% no-repeat;
+	background:url("../img/switch_minus.gif") 97% 50% no-repeat;
+	display:block;
+	padding:6px 12px;
+	margin:-6px -12px;
+	border:none;
+}
+.box h2 a.hidden,
+.box h2 a.hidden:hover {
+	background-image: url("../img/switch_plus.gif");
+}
+.box h2 a:hover {
+	background-color:#111;
+}
+
+.menubox {
+	padding:0px;
+	color: #333;
+}
+.menubox .inbox {
+	background:rgb(210,210,210);
+	background:rgba(255,255,255,0.81);
+	padding: 0px 10px 1px;
+}
+.inbox a {
+	color: #000;
+}
+.menubox h2 {
+	margin: 0px;
+}
+.menubox h2 a,
+.menubox h2 a.visible {
+	background:rgb(31,31,31) url("../img/switch_minus.gif") 97% 50% no-repeat;
+	background:rgba(90,90,0,0.6) url("../img/switch_minus.gif") 97% 50% no-repeat;
+}
+.menubox h2 a:hover {
+	background-color:#111;
+}
+
+.grid_4 .box h2 a {
+	background-position: 97% 50%;
+}
+.grid_5 .box h2 a {
+	background-position: 98% 50%;
+}
+.grid_12 .box h2 a {
+	background-position: 99% 50%;
+}
+
+
+.block {
+	padding-top:10px;
+}
+div.menu {
+	padding:0;
+}
+div.menu h2 {
+	margin:0;
+}
+div.menu .block {
+	padding-top:0;
+}
+
+
+/* paragraphs, quotes and lists
+----------------------------------------------- */
+p {
+	margin-bottom:1em;
+}
+blockquote {
+	font-family: Georgia, 'Times New Roman', serif;
+	font-size:1.2em;
+	padding-left:1em;
+	border-left:4px solid #ccc;
+}
+blockquote cite {
+	font-size:.9em;
+}
+ul, ol {
+	padding-top:0;
+}
+
+p.help {
+	padding: 5px;
+	background: rgba(255,255,255, 0.2);
+	font-weight: bold;
+}
+
+/* menus
+----------------------------------------------- */
+ul.menu {
+	list-style:none;
+	border-top:1px solid #bbb;
+}
+ul.menu li {
+	margin:0;
+}
+ul.menu li a {
+	display:block;
+	padding:4px 10px;
+	border-bottom:1px solid #ccc;
+}
+ul.menu li a:hover {
+	background:#eee;
+}
+ul.menu li a:active {
+	background:#ccc;
+}
+
+/* submenus
+----------------------------------------------- */
+ul.menu ul {
+	list-style:none;
+	margin:0;
+}
+ul.menu ul li a {
+	padding-left:30px;
+}
+
+/* menu lists
+----------------------------------------------- */
+
ul.list {
+	margin-bottom: 0px;
+	border-top: 0px none;
+}
+ul.list li.current {
+	padding: 4px 14px;
+}
+
+/* section menus
+----------------------------------------------- */
+ul.section {
+	border-top:0;
+	margin-bottom:0;
+}
+ul.section li {
+	text-transform:uppercase;
+}
+ul.section li a {
+	background:#bbb;
+}
+ul.section li a:hover {
+	background:#aaa;
+}
+ul.section li a:active {
+	color:#fff;
+	background:#666;
+}
+ul.section li li a {
+	background:#ddd;
+	border-bottom:1px solid #eee;
+}
+ul.section li li a:hover {
+	background:#ccc;
+}
+ul.section li li a:active {
+	color:#000;
+	background:#fff;
+}
+ul.section ul li {
+	text-transform:none;
+}
+ul.section ul.current li a {
+	background:#eee;
+	border-bottom:1px solid #fff;
+}
+ul.section ul.current li a:hover {
+	background:#ddd;
+}
+ul.section ul.current li a:active {
+	background:#fff;
+}
+ul.section li a.current {
+	color:#fff;
+	background:#666;
+}
+ul.section li a.current:hover {
+	background:#555;
+}
+ul.section li a.current:active {
+	background:#444;
+}
+ul.section li a.active {
+	background:#fff;
+	cursor:default;
+}
+ul.section li.current > a.active,
+ul.section li.current > a.active:hover {
+	color:#fff;
+	background:#666;
+	cursor:default;
+}
+
+
+/* table
+----------------------------------------------- */
+table {
+	width:100%;
+//	border:1px solid #bbb;
+	border:1px solid #aaa;
+//	border: 1px solid rgba(0,0,0,0.55);
+	margin-bottom:10px;
+}
+col.colC {
+	width:8em;
+}
+th, td {
+	padding:.2em 1em;
+	text-align:left;
+	color: #333;
+}
+thead th {
+	border-bottom:2px solid #888;
+	background: #eee;
+	background:rgba(212,222,255,0.65);
+	padding:.4em 1em .2em;
+}
+thead th.table-head {
+	font-size:1em;
+	font-weight:normal;
+	text-transform:uppercase;
+	color:#fff;
+	background:#555;
+	border:1px solid #555;
+}
+tbody th,
+tbody td {
+	border-top:1px solid #bbb;
+	border-bottom:1px solid #bbb;
+	background:#eee;
+	background:rgba(255,255,255,0.85);
+}
+tbody tr.odd th,
+tbody tr.odd td {
+	background:#fff;
+}
+tfoot th,
+tfoot td {
+	border-top:2px solid #666;
+	background:#eee;
+	background:rgba(212,222,255,0.65);
+}
+tfoot tr.total th,
+tfoot tr.total td {
+	border-top:6px double #666;
+}
+tfoot tr.total th {
+	text-transform:uppercase;
+}
+th.currency,
+td.currency {
+	text-align:right;
+}
+tfoot.dark th, tfoot.dark td {
+//	background: #bbbbbb;
+}
+
+
+/* forms
+----------------------------------------------- */
+form {
+	overflow:hidden;
+}
+fieldset {
+	border:1px solid #bbb;
+	padding:10px;
+	position:relative;
+	background:#e9e9e9;
+	background:rgba(255,255,255,0.81);
+	margin-bottom:10px;
+	color: #333;
+}
+legend {
+	font-size:1.1em;
+	padding:.4em .8em;
+	background:#f5f5f5;
+	border:1px solid #bbb;
+}
+fieldset.login p {
+	margin-bottom:1em;
+	margin-top:0pt;
+}
+fieldset p label {
+	width:98%;
+}
+fieldset p input {
+	width:98%;
+}
+fieldset p select {
+	width:99%;
+}
+fieldset.login p label {
+	float:left;
+	line-height:2em;
+	margin-right:3%;
+	text-align:right;
+	width:32%;
+}
+fieldset.login p input {
+	width:60%;
+}
+fieldset.login input.button {
+	margin-left:35%;
+}
+form p.notice {
+	font-weight:bold;
+}
+input.search.text {
+	width:66%;
+}
+input.search.button {
+	width:28%;
+	margin-left:2%;
+}
+
+
+/* articles
+----------------------------------------------- */
+.articles {
+	padding:0;
+}
+.articles h2 {
+	margin:0;
+}
+#articles {
+	padding-top:0;
+}
+.article {
+	border-top:1px solid #666;
+	padding-top:.5em;
+}
+.box .article {
+	border-top:3px solid #fff;
+	padding:13px 10px 0 10px;
+}
+.article h2 {
+	font-size:2em;
+	font-weight:normal;
+	text-transform:none;
+	color:#333;
+	background:transparent;
+	padding:0;
+	margin:0;
+	border:none;
+}
+.article h3 {
+	margin-bottom:.2em;
+	font-size:1.6em;
+}
+.box .first {
+	border-top:none;
+}
+.article h4 {
+	font-size:1.2em;
+	text-transform:uppercase;
+	margin-bottom:.5em;
+}
+.article a.image {
+	float:left; 
+	margin:3px 10px 3px 0; 
+	padding:4px;
+	border:1px solid #bbb;
+	background:#fff;
+}
+.article a.image:hover {
+	border:1px solid #666;
+}
+.article a.image img {
+	float:left; 
+}
+.article p.meta {
+	color:#666;
+	border-top:1px dotted #999;
+	border-bottom:1px dotted #999;
+	padding:.3em 0;
+	margin-bottom:.8em;
+}
+
+
+/* site information
+----------------------------------------------- */
+#site_info .box {
+	color:#ccc;
+	background:#666;
+	margin-bottom:10px;
+}
+#site_info a {
+	color:#fff;
+}
+#site_info a:hover {
+	color:#000;
+}
+
+
+/* AJAX sliding shelf
+----------------------------------------------- */
+#loading {float:right; margin-right:14px; margin-top:-2px;}
+.block {padding-bottom:1px;}
+
+
+/* Accordian
+----------------------------------------------- */
+.toggler {
+	color: #222;
+	margin: 0;
+	padding: 2px 5px;
+	background: #eee;
+	border-bottom: 1px solid #ddd;
+	border-right: 1px solid #ddd;
+	border-top: 1px solid #f5f5f5;
+	border-left: 1px solid #f5f5f5;
+	font-size:1.1em;
+	font-weight: normal;
+}
+.element h4 {
+	margin: 0;
+	padding:4px;
+	line-height:1.2em;
+}
+.element p {
+	margin: 0;
+	padding: 4px;
+}
+.float-right {
+	padding:10px 20px;
+	float:right;
+}
+
+#accordian-block {
+	padding-bottom:10px;
+}
+
+
+/* Mootools Kwicks
+----------------------------------------------- */
+#kwick-box { 
+	padding:0;
+	overflow:hidden;
+}
+#kwick-box h2 { 
+	margin:0;
+}
+#kwick {
+	position: relative;
+}
+#kwick .kwicks {
+	display: block;
+	background: #999;
+	height: 120px;
+	list-style:none;
+	margin:0;
+	overflow:hidden;
+}
+#kwick li {
+	float: left;
+	margin:0;
+	padding:0;
+}
+#kwick .kwick {
+	display: block;
+	cursor: pointer;
+	overflow: hidden;
+	height: 100px;
+	width: 215px;
+	padding: 10px;
+	background: #fff;
+}
+#kwick .kwick span {
+	color:#fff;
+}
+#kwick .one {
+	background: #666;
+}
+#kwick .two {
+	background: #777;
+}
+#kwick .three {
+	background: #888;
+}
+#kwick .four {
+	background: #999;
+}
+/* Main Nav Current States */
+ul.nav li a.current {
+	background: #888;
+}
+
+/* CakePHP Specific */
+div#flashMessage {
+	padding: 10px;
+	margin: 0px 13px 10px 11px;
+	border: 1px dashed #888;
+	background: #ffcccc;
+	font-size: 14px;
+}
+div.flash-error {
+	color: #bf0000;
+	background: #ffbfbf !important;
+	border-color: #bf0000 !important;
+}
+div.flash-warning {
+	color: #725600;	
+	background: #ffffbf !important;
+	border-color: #bfbf00 !important;
+}
+div.flash-success {
+	color: #00bf00;
+	background: #dfffbf !important;
+	border-color: #00bf00 !important;
+}
+div.error-message {
+	color: #bf0000;
+	font-weight: bold;
+}
+div.form div.box {
+	padding: 10px;
+	background:#e9e9e9;
+	background: none repeat scroll 0 0 rgba(255, 255, 255, 0.81);
+}
+.input {
+	margin: 0px 0px 5px 0px;
+}
+.text input {
+	width: 250px;
+}
+.input label {
+	width: 100px;
+	text-align: right;
+	display: block;
+	float: left;
+	margin: 0px 5px 0px 0px;
+	padding: 2px 0px 0px 0px;
+}
+.text label {	
+	padding: 6px 0px 0px 0px;
+}
+.form-submit-group {
+	float: right;
+	margin: 0px 0px 5px 0px;
+}
+.form-submit-group .submit {
+	float: left;
+}
+.form-cancel {
+	float: left;
+	padding-top: 5px;
+	margin-right: 5px;
+}
+/** Scaffold View **/
+dl {
+	line-height: 2em;
+	margin: 0em 0em;
+	width: 60%;
+}
+div.dl {
+	border: 1px solid #aaa;
+	color: #333;
+	margin-bottom: 10px;
+}
+div.dh {
+	background: none repeat scroll 0 0 rgba(212, 222, 255, 0.65);
+	padding: 0.4em 1em 0.2em;
+	font-weight: bold;
+	border-bottom: 1px solid #888888;
+	border-top: 0px none;
+}
+.dt, .dd {
+	padding: 0.4em 1em 0.2em;
+	border-top: 1px solid #888888;
+}
+div.dt {
+	float: left;
+	width: 10em;
+	background: transparent;
+	font-weight: bold;
+}
+.dd {
+	background: none repeat scroll 0 0 rgba(255, 255, 255, 0.85);
+}
+.dd:after {
+	clear: both;
+}
+dl .altrow, div .altrow {
+	background: #f4f4f4;
+}
+dt {
+	font-weight: bold;
+	padding-left: 4px;
+	vertical-align: top;
+}
+dd {
+	margin-left: 10em;
+	margin-top: -2em;
+	vertical-align: top;
+}
+/** CakePHP Notices and Errors **/
+div.message {
+	clear: both;
+	color: #333;
+	font-size: 140%;
+	font-weight: bold;
+	margin: 0 0 1em 0;
+	background: #c73e14;
+	padding: 5px;
+}
+div.error-message {
+	clear: both;
+	color: #bf0000;
+	background: #ffbfbf;
+	border-color: #bf0000;
+	font-weight: bold;
+}
+p.error {
+	color: #bf0000;
+	background: #ffbfbf;
+	border-color: #bf0000;
+	font-family: Courier, monospace;
+	font-size: 120%;
+	line-height: 140%;
+	padding: 0.8em;
+	margin: 1em 0;
+}
+p.error em {
+	color: #000;
+	font-weight: normal;
+	line-height: 140%;
+}
+.notice {
+	color: #725600;
+	background: #ffffbf;
+	border-color: #bfbf00;	
+	display: block;
+	font-family: Courier, monospace;
+	font-size: 120%;
+	line-height: 140%;
+	padding: 0.8em;
+	margin: 1em 0;
+}
+.success {
+	color: #00bf00;
+	background: #dfffbf;
+	border-color: #00bf00;
+}
+
+/* jQuery UI Stuff */
+#ui-datepicker-div {
+	background: #fff;
+	padding: 5px;
+	border: 1px solid #eee;
+}
+a.ui-datepicker-prev {
+	width: 35px;
+	float: left;
+	text-align: left;
+}
+a.ui-datepicker-next {
+	width: 35px;
+	float: right;
+	text-align: right;
+}
+div.ui-datepicker-title {
+	text-align: center;
+}
+table.ui-datepicker-calendar {
+	padding-bottom: 0px;
+	margin-bottom: 0px;
+}
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/nav.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/nav.css
new file mode 100755
index 000000000..cb4bf108e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/nav.css
@@ -0,0 +1,168 @@
+/*
 WebTT template based on 960 Grid System (http://960.gs/)
+
+-----------------------------------------------
+Navigation
+----------------------------------------------- */
+
+/* navigation (horizontal subnavigation)
+----------------------------------------------- */
+ul.nav,
+ul.nav * { margin:0;padding:0;}
+ul.nav {
+  position:relative;
+  background:#666;
+  max-width:100%;
+  height:2.5em;
+  }
+ul.nav li {
+	cursor:pointer;
+	float:left;
+	text-align:center;
+	list-style-type:none;
+	font-weight:normal;
+}
+ul.nav li ul {
+	cursor:default;
+	width:100%;
+	max-width:100%;
+	position:absolute;
+	height:auto;
+	top:2.5em;
+	background-position:0 0 !important;
+	left:-9000px;
+}
+ul.nav li ul li {
+	padding:0;
+	border:none;
+	width:auto;
+	max-width:none;
+}
+ul.nav li a {
+	color:#fff;
+	background:#666;
+	font-weight:bold;
+	text-decoration:none;
+	display:block;
+	float:left;
+	padding:0 1em;
+	height:2.4em;
+	line-height:2.5em;
+}
+ul.nav li ul li a {
+	position:relative !important; /* ie Mac */
+	cursor:pointer !important;
+	white-space:nowrap;
+	line-height:2em;
+	height:2em;
+	font-weight:normal;
+	color:#666;
+	background-position:0 50% !important;
+}
+
+ul.nav li:hover a,
+ul.nav li a:hover,
+ul.nav li a:focus {color:#000; background:#ccc;}
+ul.nav li a:active {color:#666; background:#fff;}
+ul.nav li:hover ul {left:0;z-index:10}
+ul.nav li ul,
+ul.nav li {background:#ccc !important}
+ul.nav li:hover ul li a {color:#444;}
+ul.nav li:hover ul li a:hover {color:#000; background:#fff;}
+ul.nav li:hover ul li a:active {color:#666; background:#fff;}
+
+ul.nav li.current a {color:#666; background:#fff; cursor:default; font-weight:bold;}
+ul.nav li.current ul {left:0;z-index:5}
+ul.nav li.current ul,
+ul.nav li.current {background:#ccc !important}
+ul.nav li.current ul li a {color:#444; background:#ccc; font-weight:normal;}
+ul.nav li.current ul li a:hover {color:#000; background:#fff;}
+ul.nav li ul li.current a,
+ul.nav li ul li.current a:hover,
+ul.nav li.current:hover ul li a:active {color:#666; background:#fff;}
+
+
+/* navigation (vertical subnavigation)
+----------------------------------------------- */
+ul.nav {
+  background:#666;
+}
+ul.main li {
+  position:relative;
+  top:0;
+  left:0;
+}
+ul.main li ul {
+  border-top:0;
+}
+ul.main li ul li {
+  float:left;
+}
+ul.main li a {
+	height:2.5em;
+	line-height:2.5em;
+	border:0;
+	color:#fff;
+	background:#666;
+}
+ul.main li ul li a {
+  width:12em;
+  line-height:2em;
+  height:2em;
+  text-align:left;
+  color:#fff;
+  border-top:1px solid #444;
+  background:#444;
+}
+ul.main li a:focus {color:#fff; background:#666;}
+ul.main li ul li a:hover {
+  color:#fff;
+  background:#555;
+}
+ul.main li:hover a {
+  color:#fff;
+  background:#555;
+}
+ul.main li:hover ul li a {color:#fff;}
+ul.main li:hover ul li a:hover {color:#fff; background:#444;}
+ul.main li:hover a:active {background:#444;}
+ul.main li:hover ul li a:active {color:#fff; background:#222;}
+
+
+/* secondary list
+----------------------------------------------- */
+ul.nav li.secondary {
+	float:right;
+	color:#cde;
+	background:transparent !important;
+}
+ul.nav li.secondary span.status {
+	float:left;
+	padding:0 1em;
+	line-height:2.77em;
+	height:2.77em;
+  font-size:0.9em;
+}
+ul.nav li.secondary span.status a {
+	float:none;
+	display:inline;
+	padding:0;
+	height:auto;
+	line-height:auto;
+	color:#cde;
+	background:transparent;
+}
+ul.nav li.secondary span.status a:hover {
+	color:#fff;
+	background:transparent;
+}
+ul.nav li.secondary span.status span {
+	text-transform:capitalize;
+}
+ul.nav li.secondary:hover a {
+	color:#fff;
+	background:#666;
+}
+ul.nav li.secondary:hover a:hover {
+	background:#555;
+}
+ul.nav li.secondary:hover a:active {background:#444;}
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/reset.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/reset.css
new file mode 100755
index 000000000..3aadd3dd6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/reset.css
@@ -0,0 +1,53 @@
+/* http://meyerweb.com/eric/tools/css/reset/ */
+/* v1.0 | 20080212 */
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-size: 100%;
+	vertical-align: baseline;
+	background: transparent;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+
+/* remember to highlight inserts somehow! */
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration: line-through;
+}
+
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/css/text.css b/code/ryzom/tools/server/www/webtt/app/webroot/css/text.css
new file mode 100755
index 000000000..a03be0190
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/css/text.css
@@ -0,0 +1,100 @@
+/*
+	960 Grid System ~ Text CSS.
+	Learn more ~ http://960.gs/
+
+	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
+*/
+
+/* =Basic HTML
+--------------------------------------------------------------------------------*/
+
+body
+{
+	font: 13px/1.5 'lucida grande',verdana,helvetica,arial,'Liberation Sans', FreeSans, sans-serif
+}
+
+a:focus
+{
+	outline: 1px dotted invert;
+}
+
+hr
+{
+	border-color: #ccc;
+	border-style: solid;
+	border-width: 1px 0 0;
+	clear: both;
+	height: 0;
+}
+
+/* =Headings
+--------------------------------------------------------------------------------*/
+
+h1
+{
+	font-size: 25px;
+}
+
+h2
+{
+	font-size: 23px;
+}
+
+h3
+{
+	font-size: 21px;
+}
+
+h4
+{
+	font-size: 19px;
+}
+
+h5
+{
+	font-size: 17px;
+}
+
+h6
+{
+	font-size: 15px;
+}
+
+/* =Spacing
+--------------------------------------------------------------------------------*/
+
+ol
+{
+	list-style: decimal;
+}
+
+ul
+{
+	list-style: square;
+}
+
+li
+{
+	margin-left: 30px;
+}
+
+p,
+dl,
+hr,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+ol,
+ul,
+pre,
+table,
+address,
+fieldset
+{
+	margin-bottom: 20px;
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/favicon.ico b/code/ryzom/tools/server/www/webtt/app/webroot/favicon.ico
new file mode 100644
index 000000000..b36e81f2f
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/app/webroot/favicon.ico differ
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/files/empty b/code/ryzom/tools/server/www/webtt/app/webroot/files/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.icon.png b/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.icon.png
new file mode 100644
index 000000000..394fa42d5
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.icon.png differ
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.power.gif b/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.power.gif
new file mode 100644
index 000000000..8f8d570a2
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/app/webroot/img/cake.power.gif differ
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_minus.gif b/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_minus.gif
new file mode 100644
index 000000000..959a5c228
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_minus.gif differ
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_plus.gif b/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_plus.gif
new file mode 100644
index 000000000..84ac35324
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/app/webroot/img/switch_plus.gif differ
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/index.php b/code/ryzom/tools/server/www/webtt/app/webroot/index.php
new file mode 100644
index 000000000..396775b73
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/index.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Index
+ *
+ * The Front Controller for handling every request
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.webroot
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * Use the DS to separate the directories in other defines
+ */
+	if (!defined('DS')) {
+		define('DS', DIRECTORY_SEPARATOR);
+	}
+/**
+ * These defines should only be edited if you have cake installed in
+ * a directory layout other than the way it is distributed.
+ * When using custom settings be sure to use the DS and do not add a trailing DS.
+ */
+
+/**
+ * The full path to the directory which holds "app", WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('ROOT')) {
+		define('ROOT', dirname(dirname(dirname(__FILE__))));
+	}
+/**
+ * The actual directory name for the "app".
+ *
+ */
+	if (!defined('APP_DIR')) {
+		define('APP_DIR', basename(dirname(dirname(__FILE__))));
+	}
+/**
+ * The absolute path to the "cake" directory, WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+		define('CAKE_CORE_INCLUDE_PATH', ROOT);
+	}
+
+/**
+ * Editing below this line should NOT be necessary.
+ * Change at your own risk.
+ *
+ */
+	if (!defined('WEBROOT_DIR')) {
+		define('WEBROOT_DIR', basename(dirname(__FILE__)));
+	}
+	if (!defined('WWW_ROOT')) {
+		define('WWW_ROOT', dirname(__FILE__) . DS);
+	}
+	if (!defined('CORE_PATH')) {
+		if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
+			define('APP_PATH', null);
+			define('CORE_PATH', null);
+		} else {
+			define('APP_PATH', ROOT . DS . APP_DIR . DS);
+			define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+		}
+	}
+	if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
+		trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
+	}
+	if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
+		return;
+	} else {
+		$Dispatcher = new Dispatcher();
+		$Dispatcher->dispatch();
+	}
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/empty b/code/ryzom/tools/server/www/webtt/app/webroot/js/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-1.3.2.min.js b/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-1.3.2.min.js
new file mode 100644
index 000000000..b1ae21d8b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-1.3.2.min.js
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-fluid16.js b/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-fluid16.js
new file mode 100755
index 000000000..4da1f0d01
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-fluid16.js
@@ -0,0 +1,103 @@
+var fluid = {
+Ajax : function(){
+	$("#loading").hide();
+	var content = $("#ajax-content").hide();
+	$("#toggle-ajax").bind("click", function(e) {
+        if ( $(this).is(".hidden") ) {
+            $("#ajax-content").empty();
+
+            $("#loading").show();
+            $("#ajax-content").load("/fluid960gs/data/ajax-response.html", function() {
+            	$("#loading").hide();
+            	content.slideDown();
+            });
+        }
+        else {
+            content.slideUp();
+        }
+        if ($(this).hasClass('hidden')){
+            $(this).removeClass('hidden').addClass('visible');
+        }
+        else {
+            $(this).removeClass('visible').addClass('hidden');
+        }
+        e.preventDefault();
+    });
+},
+Toggle : function(){
+	var default_hide = {"grid": true, "filter": true };
+	$.each(
+		["neighbour-actions", "admin-left-menu", "admin-actions", "help", "filter", "related-records", "grid", "paragraphs", "blockquote", "list-items", "section-menu", "tables", "forms", "login-forms", "search", "articles", "accordion"],
+		function() {
+			var el = $("#" + (this == 'accordon' ? 'accordion-block' : this) );
+			if (default_hide[this]) {
+				el.hide();
+				$("[id='toggle-"+this+"']").addClass("hidden")
+			}
+			$("[id='toggle-"+this+"']")
+			.bind("click", function(e) {
+				if ($(this).hasClass('hidden')){
+					$(this).removeClass('hidden').addClass('visible');
+					el.slideDown();
+				} else {
+					$(this).removeClass('visible').addClass('hidden');
+					el.slideUp();
+				}
+				e.preventDefault();
+			});
+		}
+	);
+},
+Kwicks : function(){
+	var animating = false;
+    $("#kwick .kwick")
+        .bind("mouseenter", function(e) {
+            if (animating) return false;
+            animating == true;
+            $("#kwick .kwick").not(this).animate({ "width": 125 }, 200);
+            $(this).animate({ "width": 485 }, 200, function() {
+                animating = false;
+            });
+        });
+    $("#kwick").bind("mouseleave", function(e) {
+        $(".kwick", this).animate({ "width": 215 }, 200);
+    });
+},
+SectionMenu : function(){
+	$("#section-menu")
+        .accordion({
+            "header": "a.menuitem"
+        })
+        .bind("accordionchangestart", function(e, data) {
+            data.newHeader.next().andSelf().addClass("current");
+            data.oldHeader.next().andSelf().removeClass("current");
+        })
+        .find("a.menuitem:first").addClass("current")
+        .next().addClass("current");
+},
+Accordion: function(){
+	$("#accordion").accordion({
+        'header': "h3.atStart"
+    }).bind("accordionchangestart", function(e, data) {
+        data.newHeader.css({
+            "font-weight": "bold",
+            "background": "#fff"
+        });
+
+        data.oldHeader.css({
+            "font-weight": "normal",
+            "background": "#eee"
+        });
+    }).find("h3.atStart:first").css({
+        "font-weight": "bold",
+        "background": "#fff"
+    });
+}
+}
+jQuery(function ($) {
+	if($("#accordion").length){fluid.Accordion();}
+	if($("[id$='ajax']").length){fluid.Ajax();}
+	if($("[id^='toggle']").length){fluid.Toggle();}
+	if($("#kwick .kwick").length){fluid.Kwicks();}
+	if($("#section-menu").length){fluid.SectionMenu();}
+});
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-ui.js b/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-ui.js
new file mode 100755
index 000000000..e6d1c0de4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/js/jquery-ui.js
@@ -0,0 +1,298 @@
+/*
+ * jQuery UI 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(c){var i=c.fn.remove,d=c.browser.mozilla&&(parseFloat(c.browser.version)<1.9);c.ui={version:"1.6rc6",plugin:{add:function(k,l,n){var m=c.ui[k].prototype;for(var j in n){m.plugins[j]=m.plugins[j]||[];m.plugins[j].push([l,n[j]])}},call:function(j,l,k){var n=j.plugins[l];if(!n){return}for(var m=0;m<n.length;m++){if(j.options[n[m][0]]){n[m][1].apply(j.element,k)}}}},contains:function(k,j){return document.compareDocumentPosition?k.compareDocumentPosition(j)&16:k!==j&&k.contains(j)},cssCache:{},css:function(j){if(c.ui.cssCache[j]){return c.ui.cssCache[j]}var k=c('<div class="ui-gen"></div>').addClass(j).css({position:"absolute",top:"-5000px",left:"-5000px",display:"block"}).appendTo("body");c.ui.cssCache[j]=!!((!(/auto|default/).test(k.css("cursor"))||(/^[1-9]/).test(k.css("height"))||(/^[1-9]/).test(k.css("width"))||!(/none/).test(k.css("backgroundImage"))||!(/transparent|rgba\(0, 0, 0, 0\)/).test(k.css("backgroundColor"))));try{c("body").get(0).removeChild(k.get(0))}catch(l){}return c.ui.cssCache[j]},hasScroll:function(m,k){if(c(m).css("overflow")=="hidden"){return false}var j=(k&&k=="left")?"scrollLeft":"scrollTop",l=false;if(m[j]>0){return true}m[j]=1;l=(m[j]>0);m[j]=0;return l},isOverAxis:function(k,j,l){return(k>j)&&(k<(j+l))},isOver:function(o,k,n,m,j,l){return c.ui.isOverAxis(o,n,j)&&c.ui.isOverAxis(k,m,l)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};if(d){var f=c.attr,e=c.fn.removeAttr,h="http://www.w3.org/2005/07/aaa",a=/^aria-/,b=/^wairole:/;c.attr=function(k,j,l){var m=l!==undefined;return(j=="role"?(m?f.call(this,k,j,"wairole:"+l):(f.apply(this,arguments)||"").replace(b,"")):(a.test(j)?(m?k.setAttributeNS(h,j.replace(a,"aaa:"),l):f.call(this,k,j.replace(a,"aaa:"))):f.apply(this,arguments)))};c.fn.removeAttr=function(j){return(a.test(j)?this.each(function(){this.removeAttributeNS(h,j.replace(a,""))}):e.call(this,j))}}c.fn.extend({remove:function(){c("*",this).add(this).each(function(){c(this).triggerHandler("remove")});return i.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var j;if((c.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){j=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(c.curCSS(this,"position",1))&&(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}else{j=this.parents().filter(function(){return(/(auto|scroll)/).test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!j.length?c(document):j}});c.extend(c.expr[":"],{data:function(l,k,j){return !!c.data(l,j[3])},focusable:function(k){var l=k.nodeName.toLowerCase(),j=c.attr(k,"tabindex");return(/input|select|textarea|button|object/.test(l)?!k.disabled:"a"==l||"area"==l?k.href||!isNaN(j):!isNaN(j))&&!c(k)["area"==l?"parents":"closest"](":hidden").length},tabbable:function(k){var j=c.attr(k,"tabindex");return(isNaN(j)||j>=0)&&c(k).is(":focusable")}});function g(m,n,o,l){function k(q){var p=c[m][n][q]||[];return(typeof p=="string"?p.split(/,?\s+/):p)}var j=k("getter");if(l.length==1&&typeof l[0]=="string"){j=j.concat(k("getterSetter"))}return(c.inArray(o,j)!=-1)}c.widget=function(k,j){var l=k.split(".")[0];k=k.split(".")[1];c.fn[k]=function(p){var n=(typeof p=="string"),o=Array.prototype.slice.call(arguments,1);if(n&&p.substring(0,1)=="_"){return this}if(n&&g(l,k,p,o)){var m=c.data(this[0],k);return(m?m[p].apply(m,o):undefined)}return this.each(function(){var q=c.data(this,k);(!q&&!n&&c.data(this,k,new c[l][k](this,p))._init());(q&&n&&c.isFunction(q[p])&&q[p].apply(q,o))})};c[l]=c[l]||{};c[l][k]=function(o,n){var m=this;this.namespace=l;this.widgetName=k;this.widgetEventPrefix=c[l][k].eventPrefix||k;this.widgetBaseClass=l+"-"+k;this.options=c.extend({},c.widget.defaults,c[l][k].defaults,c.metadata&&c.metadata.get(o)[k],n);this.element=c(o).bind("setData."+k,function(q,p,r){if(q.target==o){return m._setData(p,r)}}).bind("getData."+k,function(q,p){if(q.target==o){return m._getData(p)}}).bind("remove",function(){return m.destroy()})};c[l][k].prototype=c.extend({},c.widget.prototype,j);c[l][k].getterSetter="option"};c.widget.prototype={_init:function(){},destroy:function(){this.element.removeData(this.widgetName).removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").removeAttr("aria-disabled")},option:function(l,m){var k=l,j=this;if(typeof l=="string"){if(m===undefined){return this._getData(l)}k={};k[l]=m}c.each(k,function(n,o){j._setData(n,o)})},_getData:function(j){return this.options[j]},_setData:function(j,k){this.options[j]=k;if(j=="disabled"){this.element[k?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",k)}},enable:function(){this._setData("disabled",false)},disable:function(){this._setData("disabled",true)},_trigger:function(l,m,n){var p=this.options[l],j=(l==this.widgetEventPrefix?l:this.widgetEventPrefix+l);m=c.Event(m);m.type=j;if(m.originalEvent){for(var k=c.event.props.length,o;k;){o=c.event.props[--k];m[o]=m.originalEvent[o]}}this.element.trigger(m,n);return !(c.isFunction(p)&&p.call(this.element[0],m,n)===false||m.isDefaultPrevented())}};c.widget.defaults={disabled:false};c.ui.mouse={_mouseInit:function(){var j=this;this.element.bind("mousedown."+this.widgetName,function(k){return j._mouseDown(k)}).bind("click."+this.widgetName,function(k){if(j._preventClickEvent){j._preventClickEvent=false;return false}});if(c.browser.msie){this._mouseUnselectable=this.element.attr("unselectable");this.element.attr("unselectable","on")}this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName);(c.browser.msie&&this.element.attr("unselectable",this._mouseUnselectable))},_mouseDown:function(l){if(l.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(l));this._mouseDownEvent=l;var k=this,m=(l.which==1),j=(typeof this.options.cancel=="string"?c(l.target).parents().add(l.target).filter(this.options.cancel).length:false);if(!m||j||!this._mouseCapture(l)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){k.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(l)&&this._mouseDelayMet(l)){this._mouseStarted=(this._mouseStart(l)!==false);if(!this._mouseStarted){l.preventDefault();return true}}this._mouseMoveDelegate=function(n){return k._mouseMove(n)};this._mouseUpDelegate=function(n){return k._mouseUp(n)};c(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(c.browser.safari||l.preventDefault());l.originalEvent.mouseHandled=true;return true},_mouseMove:function(j){if(c.browser.msie&&!j.button){return this._mouseUp(j)}if(this._mouseStarted){this._mouseDrag(j);return j.preventDefault()}if(this._mouseDistanceMet(j)&&this._mouseDelayMet(j)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,j)!==false);(this._mouseStarted?this._mouseDrag(j):this._mouseUp(j))}return !this._mouseStarted},_mouseUp:function(j){c(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=true;this._mouseStop(j)}return false},_mouseDistanceMet:function(j){return(Math.max(Math.abs(this._mouseDownEvent.pageX-j.pageX),Math.abs(this._mouseDownEvent.pageY-j.pageY))>=this.options.distance)},_mouseDelayMet:function(j){return this.mouseDelayMet},_mouseStart:function(j){},_mouseDrag:function(j){},_mouseStop:function(j){},_mouseCapture:function(j){return true}};c.ui.mouse.defaults={cancel:null,distance:1,delay:0}})(jQuery);/*
+ * jQuery UI Draggable 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(a){a.widget("ui.draggable",a.extend({},a.ui.mouse,{_init:function(){if(this.options.helper=="original"&&!(/^(?:r|a|f)/).test(this.element.css("position"))){this.element[0].style.position="relative"}(this.options.cssNamespace&&this.element.addClass(this.options.cssNamespace+"-draggable"));(this.options.disabled&&this.element.addClass(this.options.cssNamespace+"-draggable-disabled"));this._mouseInit()},destroy:function(){if(!this.element.data("draggable")){return}this.element.removeData("draggable").unbind(".draggable").removeClass(this.options.cssNamespace+"-draggable "+this.options.cssNamespace+"-draggable-dragging "+this.options.cssNamespace+"-draggable-disabled");this._mouseDestroy()},_mouseCapture:function(b){var c=this.options;if(this.helper||c.disabled||a(b.target).is("."+this.options.cssNamespace+"-resizable-handle")){return false}this.handle=this._getHandle(b);if(!this.handle){return false}return true},_mouseStart:function(b){var c=this.options;this.helper=this._createHelper(b);this._cacheHelperProportions();if(a.ui.ddmanager){a.ui.ddmanager.current=this}this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(b);this.originalPageX=b.pageX;this.originalPageY=b.pageY;if(c.cursorAt){this._adjustOffsetFromHelper(c.cursorAt)}if(c.containment){this._setContainment()}this._trigger("start",b);this._cacheHelperProportions();if(a.ui.ddmanager&&!c.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,b)}this.helper.addClass(c.cssNamespace+"-draggable-dragging");this._mouseDrag(b,true);return true},_mouseDrag:function(b,d){this.position=this._generatePosition(b);this.positionAbs=this._convertPositionTo("absolute");if(!d){var c=this._uiHash();this._trigger("drag",b,c);this.position=c.position}if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}if(a.ui.ddmanager){a.ui.ddmanager.drag(this,b)}return false},_mouseStop:function(c){var d=false;if(a.ui.ddmanager&&!this.options.dropBehaviour){d=a.ui.ddmanager.drop(this,c)}if(this.dropped){d=this.dropped;this.dropped=false}if((this.options.revert=="invalid"&&!d)||(this.options.revert=="valid"&&d)||this.options.revert===true||(a.isFunction(this.options.revert)&&this.options.revert.call(this.element,d))){var b=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){b._trigger("stop",c);b._clear()})}else{this._trigger("stop",c);this._clear()}return false},_getHandle:function(b){var c=!this.options.handle||!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==b.target){c=true}});return c},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c])):(d.helper=="clone"?this.element.clone():this.element);if(!b.parents("body").length){b.appendTo((d.appendTo=="parent"?this.element[0].parentNode:d.appendTo))}if(b[0]!=this.element[0]&&!(/(fixed|absolute)/).test(b.css("position"))){b.css("position","absolute")}return b},_adjustOffsetFromHelper:function(b){if(b.left!=undefined){this.offset.click.left=b.left+this.margins.left}if(b.right!=undefined){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if(b.top!=undefined){this.offset.click.top=b.top+this.margins.top}if(b.bottom!=undefined){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body&&a.browser.mozilla)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.element.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.element.css("marginLeft"),10)||0),top:(parseInt(this.element.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)&&e.containment.constructor!=Array){var c=a(e.containment)[0];if(!c){return}var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}else{if(e.containment.constructor==Array){this.containment=e.containment}}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c)}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop()))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft()))}},_clear:function(){this.helper.removeClass(this.options.cssNamespace+"-draggable-dragging");if(this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval){this.helper.remove()}this.helper=null;this.cancelHelperRemoval=false},_trigger:function(b,c,d){d=d||this._uiHash();a.ui.plugin.call(this,b,[c,d]);if(b=="drag"){this.positionAbs=this._convertPositionTo("absolute")}return a.widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(b){return{helper:this.helper,position:this.position,absolutePosition:this.positionAbs,offset:this.positionAbs}}}));a.extend(a.ui.draggable,{version:"1.6rc6",eventPrefix:"drag",defaults:{appendTo:"parent",axis:false,cancel:":input,option",connectToSortable:false,containment:false,cssNamespace:"ui",cursor:"default",cursorAt:false,delay:0,distance:1,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false}});a.ui.plugin.add("draggable","connectToSortable",{start:function(b,d){var c=a(this).data("draggable"),e=c.options;c.sortables=[];a(e.connectToSortable).each(function(){a(typeof this=="string"?this+"":this).each(function(){if(a.data(this,"sortable")){var f=a.data(this,"sortable");c.sortables.push({instance:f,shouldRevert:f.options.revert});f._refreshItems();f._trigger("activate",b,c)}})})},stop:function(b,d){var c=a(this).data("draggable");a.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert){this.instance.options.revert=true}this.instance._mouseStop(b);this.instance.options.helper=this.instance.options._helper;if(c.options.helper=="original"){this.instance.currentItem.css({top:"auto",left:"auto"})}}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",b,c)}})},drag:function(c,f){var e=a(this).data("draggable"),b=this;var d=function(i){var n=this.offset.click.top,m=this.offset.click.left;var g=this.positionAbs.top,k=this.positionAbs.left;var j=i.height,l=i.width;var p=i.top,h=i.left;return a.ui.isOver(g+n,k+m,p,h,j,l)};a.each(e.sortables,function(g){if(d.call(e,this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(b).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return f.helper[0]};c.target=this.instance.currentItem[0];this.instance._mouseCapture(c,true);this.instance._mouseStart(c,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;e._trigger("toSortable",c);e.dropped=this.instance.element;this.instance.fromOutside=e}if(this.instance.currentItem){this.instance._mouseDrag(c)}}else{if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._mouseStop(c,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();if(this.instance.placeholder){this.instance.placeholder.remove()}e._trigger("fromSortable",c);e.dropped=false}}})}});a.ui.plugin.add("draggable","cursor",{start:function(c,d){var b=a("body"),e=a(this).data("draggable").options;if(b.css("cursor")){e._cursor=b.css("cursor")}b.css("cursor",e.cursor)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._cursor){a("body").css("cursor",d._cursor)}}});a.ui.plugin.add("draggable","iframeFix",{start:function(b,c){var d=a(this).data("draggable").options;a(d.iframeFix===true?"iframe":d.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1000}).css(a(this).offset()).appendTo("body")})},stop:function(b,c){a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});a.ui.plugin.add("draggable","opacity",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("opacity")){e._opacity=b.css("opacity")}b.css("opacity",e.opacity)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._opacity){a(c.helper).css("opacity",d._opacity)}}});a.ui.plugin.add("draggable","scroll",{start:function(c,d){var b=a(this).data("draggable");if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){b.overflowOffset=b.scrollParent.offset()}},drag:function(d,e){var c=a(this).data("draggable"),f=c.options,b=false;if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML"){if(!f.axis||f.axis!="x"){if((c.overflowOffset.top+c.scrollParent[0].offsetHeight)-d.pageY<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop+f.scrollSpeed}else{if(d.pageY-c.overflowOffset.top<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop-f.scrollSpeed}}}if(!f.axis||f.axis!="y"){if((c.overflowOffset.left+c.scrollParent[0].offsetWidth)-d.pageX<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft+f.scrollSpeed}else{if(d.pageX-c.overflowOffset.left<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft-f.scrollSpeed}}}}else{if(!f.axis||f.axis!="x"){if(d.pageY-a(document).scrollTop()<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-f.scrollSpeed)}else{if(a(window).height()-(d.pageY-a(document).scrollTop())<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+f.scrollSpeed)}}}if(!f.axis||f.axis!="y"){if(d.pageX-a(document).scrollLeft()<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-f.scrollSpeed)}else{if(a(window).width()-(d.pageX-a(document).scrollLeft())<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+f.scrollSpeed)}}}}if(b!==false&&a.ui.ddmanager&&!f.dropBehaviour){a.ui.ddmanager.prepareOffsets(c,d)}}});a.ui.plugin.add("draggable","snap",{start:function(c,d){var b=a(this).data("draggable"),e=b.options;b.snapElements=[];a(e.snap.constructor!=String?(e.snap.items||":data(draggable)"):e.snap).each(function(){var g=a(this);var f=g.offset();if(this!=b.element[0]){b.snapElements.push({item:this,width:g.outerWidth(),height:g.outerHeight(),top:f.top,left:f.left})}})},drag:function(u,p){var g=a(this).data("draggable"),q=g.options;var y=q.snapTolerance;var x=p.absolutePosition.left,w=x+g.helperProportions.width,f=p.absolutePosition.top,e=f+g.helperProportions.height;for(var v=g.snapElements.length-1;v>=0;v--){var s=g.snapElements[v].left,n=s+g.snapElements[v].width,m=g.snapElements[v].top,A=m+g.snapElements[v].height;if(!((s-y<x&&x<n+y&&m-y<f&&f<A+y)||(s-y<x&&x<n+y&&m-y<e&&e<A+y)||(s-y<w&&w<n+y&&m-y<f&&f<A+y)||(s-y<w&&w<n+y&&m-y<e&&e<A+y))){if(g.snapElements[v].snapping){(g.options.snap.release&&g.options.snap.release.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=false;continue}if(q.snapMode!="inner"){var c=Math.abs(m-e)<=y;var z=Math.abs(A-f)<=y;var j=Math.abs(s-w)<=y;var k=Math.abs(n-x)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m-g.helperProportions.height,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s-g.helperProportions.width}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n}).left-g.margins.left}}var h=(c||z||j||k);if(q.snapMode!="outer"){var c=Math.abs(m-f)<=y;var z=Math.abs(A-e)<=y;var j=Math.abs(s-x)<=y;var k=Math.abs(n-w)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A-g.helperProportions.height,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n-g.helperProportions.width}).left-g.margins.left}}if(!g.snapElements[v].snapping&&(c||z||j||k||h)){(g.options.snap.snap&&g.options.snap.snap.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=(c||z||j||k||h)}}});a.ui.plugin.add("draggable","stack",{start:function(b,c){var e=a(this).data("draggable").options;var d=a.makeArray(a(e.stack.group)).sort(function(g,f){return(parseInt(a(g).css("zIndex"),10)||e.stack.min)-(parseInt(a(f).css("zIndex"),10)||e.stack.min)});a(d).each(function(f){this.style.zIndex=e.stack.min+f});this[0].style.zIndex=e.stack.min+d.length}});a.ui.plugin.add("draggable","zIndex",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("zIndex")){e._zIndex=b.css("zIndex")}b.css("zIndex",e.zIndex)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._zIndex){a(c.helper).css("zIndex",d._zIndex)}}})})(jQuery);/*
+ * jQuery UI Droppable 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	ui.core.js
+ *	ui.draggable.js
+ */
+(function(a){a.widget("ui.droppable",{_init:function(){var c=this.options,b=c.accept;this.isover=0;this.isout=1;this.options.accept=this.options.accept&&a.isFunction(this.options.accept)?this.options.accept:function(e){return e.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};a.ui.ddmanager.droppables[this.options.scope]=a.ui.ddmanager.droppables[this.options.scope]||[];a.ui.ddmanager.droppables[this.options.scope].push(this);(this.options.cssNamespace&&this.element.addClass(this.options.cssNamespace+"-droppable"))},destroy:function(){var b=a.ui.ddmanager.droppables[this.options.scope];for(var c=0;c<b.length;c++){if(b[c]==this){b.splice(c,1)}}this.element.removeClass(this.options.cssNamespace+"-droppable "+this.options.cssNamespace+"-droppable-disabled").removeData("droppable").unbind(".droppable")},_setData:function(b,c){if(b=="accept"){this.options.accept=c&&a.isFunction(c)?c:function(e){return e.is(accept)}}else{a.widget.prototype._setData.apply(this,arguments)}},_activate:function(c){var b=a.ui.ddmanager.current;if(this.options.activeClass){this.element.addClass(this.options.activeClass)}(b&&this._trigger("activate",c,this.ui(b)))},_deactivate:function(c){var b=a.ui.ddmanager.current;if(this.options.activeClass){this.element.removeClass(this.options.activeClass)}(b&&this._trigger("deactivate",c,this.ui(b)))},_over:function(c){var b=a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return}if(this.options.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.hoverClass){this.element.addClass(this.options.hoverClass)}this._trigger("over",c,this.ui(b))}},_out:function(c){var b=a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return}if(this.options.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.hoverClass){this.element.removeClass(this.options.hoverClass)}this._trigger("out",c,this.ui(b))}},_drop:function(c,d){var b=d||a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return false}var e=false;this.element.find(":data(droppable)").not("."+b.options.cssNamespace+"-draggable-dragging").each(function(){var f=a.data(this,"droppable");if(f.options.greedy&&a.ui.intersect(b,a.extend(f,{offset:f.element.offset()}),f.options.tolerance)){e=true;return false}});if(e){return false}if(this.options.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.activeClass){this.element.removeClass(this.options.activeClass)}if(this.options.hoverClass){this.element.removeClass(this.options.hoverClass)}this._trigger("drop",c,this.ui(b));return this.element}return false},ui:function(b){return{draggable:(b.currentItem||b.element),helper:b.helper,position:b.position,absolutePosition:b.positionAbs,offset:b.positionAbs}}});a.extend(a.ui.droppable,{version:"1.6rc6",eventPrefix:"drop",defaults:{accept:"*",activeClass:false,cssNamespace:"ui",greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"}});a.ui.intersect=function(q,j,o){if(!j.offset){return false}var e=(q.positionAbs||q.position.absolute).left,d=e+q.helperProportions.width,n=(q.positionAbs||q.position.absolute).top,m=n+q.helperProportions.height;var g=j.offset.left,c=g+j.proportions.width,p=j.offset.top,k=p+j.proportions.height;switch(o){case"fit":return(g<e&&d<c&&p<n&&m<k);break;case"intersect":return(g<e+(q.helperProportions.width/2)&&d-(q.helperProportions.width/2)<c&&p<n+(q.helperProportions.height/2)&&m-(q.helperProportions.height/2)<k);break;case"pointer":var h=((q.positionAbs||q.position.absolute).left+(q.clickOffset||q.offset.click).left),i=((q.positionAbs||q.position.absolute).top+(q.clickOffset||q.offset.click).top),f=a.ui.isOver(i,h,p,g,j.proportions.height,j.proportions.width);return f;break;case"touch":return((n>=p&&n<=k)||(m>=p&&m<=k)||(n<p&&m>k))&&((e>=g&&e<=c)||(d>=g&&d<=c)||(e<g&&d>c));break;default:return false;break}};a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,g){var b=a.ui.ddmanager.droppables[e.options.scope];var f=g?g.type:null;var h=(e.currentItem||e.element).find(":data(droppable)").andSelf();droppablesLoop:for(var d=0;d<b.length;d++){if(b[d].options.disabled||(e&&!b[d].options.accept.call(b[d].element[0],(e.currentItem||e.element)))){continue}for(var c=0;c<h.length;c++){if(h[c]==b[d].element[0]){b[d].proportions.height=0;continue droppablesLoop}}b[d].visible=b[d].element.css("display")!="none";if(!b[d].visible){continue}b[d].offset=b[d].element.offset();b[d].proportions={width:b[d].element[0].offsetWidth,height:b[d].element[0].offsetHeight};if(f=="mousedown"){b[d]._activate.call(b[d],g)}}},drop:function(b,c){var d=false;a.each(a.ui.ddmanager.droppables[b.options.scope],function(){if(!this.options){return}if(!this.options.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance)){d=this._drop.call(this,c)}if(!this.options.disabled&&this.visible&&this.options.accept.call(this.element[0],(b.currentItem||b.element))){this.isout=1;this.isover=0;this._deactivate.call(this,c)}});return d},drag:function(b,c){if(b.options.refreshPositions){a.ui.ddmanager.prepareOffsets(b,c)}a.each(a.ui.ddmanager.droppables[b.options.scope],function(){if(this.options.disabled||this.greedyChild||!this.visible){return}var e=a.ui.intersect(b,this,this.options.tolerance);var g=!e&&this.isover==1?"isout":(e&&this.isover==0?"isover":null);if(!g){return}var f;if(this.options.greedy){var d=this.element.parents(":data(droppable):eq(0)");if(d.length){f=a.data(d[0],"droppable");f.greedyChild=(g=="isover"?1:0)}}if(f&&g=="isover"){f.isover=0;f.isout=1;f._out.call(f,c)}this[g]=1;this[g=="isout"?"isover":"isout"]=0;this[g=="isover"?"_over":"_out"].call(this,c);if(f&&g=="isout"){f.isout=0;f.isover=1;f._over.call(f,c)}})}}})(jQuery);/*
+ * jQuery UI Resizable 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(b){b.widget("ui.resizable",b.extend({},b.ui.mouse,{_init:function(){var d=this,h=this.options;this.element.addClass("ui-resizable");b.extend(this,{_aspectRatio:!!(h.aspectRatio),aspectRatio:h.aspectRatio,originalElement:this.element,proportionallyResize:h.proportionallyResize?[h.proportionallyResize]:[],_helper:h.helper||h.ghost||h.animate?h.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){if(/relative/.test(this.element.css("position"))&&b.browser.opera){this.element.css({position:"relative",top:"auto",left:"auto"})}this.element.wrap(b('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent();this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});if(b.browser.safari&&h.preventDefault){this.originalElement.css("resize","none")}this.proportionallyResize.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=h.handles||(!b(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var j=this.handles.split(",");this.handles={};for(var e=0;e<j.length;e++){var g=b.trim(j[e]),c="ui-resizable-"+g;var f=b('<div class="ui-resizable-handle '+c+'"></div>');if(/sw|se|ne|nw/.test(g)){f.css({zIndex:++h.zIndex})}if("se"==g){f.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[g]=".ui-resizable-"+g;this.element.append(f)}}this._renderAxis=function(o){o=o||this.element;for(var l in this.handles){if(this.handles[l].constructor==String){this.handles[l]=b(this.handles[l],this.element).show()}if(h.transparent){this.handles[l].css({opacity:0})}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var m=b(this.handles[l],this.element),n=0;n=/sw|ne|nw|se|n|s/.test(l)?m.outerHeight():m.outerWidth();var k=["padding",/ne|nw|n/.test(l)?"Top":/se|sw|s/.test(l)?"Bottom":/^e$/.test(l)?"Right":"Left"].join("");if(!h.transparent){o.css(k,n)}this._proportionallyResize()}if(!b(this.handles[l]).length){continue}}};this._renderAxis(this.element);this._handles=b(".ui-resizable-handle",this.element);if(h.disableSelection){this._handles.disableSelection()}this._handles.mouseover(function(){if(!d.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}d.axis=i&&i[1]?i[1]:"se"}});if(h.autoHide){this._handles.hide();b(this.element).addClass("ui-resizable-autohide").hover(function(){b(this).removeClass("ui-resizable-autohide");d._handles.show()},function(){if(!d.resizing){b(this).addClass("ui-resizable-autohide");d._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var c=function(d){b(d).removeClass("ui-resizable ui-resizable-disabled").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){c(this.element);this.wrapper.parent().append(this.originalElement.css({position:this.wrapper.css("position"),width:this.wrapper.outerWidth(),height:this.wrapper.outerHeight(),top:this.wrapper.css("top"),left:this.wrapper.css("left")})).end().remove()}c(this.originalElement)},_mouseCapture:function(d){var e=false;for(var c in this.handles){if(b(this.handles[c])[0]==d.target){e=true}}return this.options.disabled||!!e},_mouseStart:function(e){var h=this.options,d=this.element.position(),c=this.element;this.resizing=true;this.documentScroll={top:b(document).scrollTop(),left:b(document).scrollLeft()};if(c.is(".ui-draggable")||(/absolute/).test(c.css("position"))){c.css({position:"absolute",top:d.top,left:d.left})}if(b.browser.opera&&(/relative/).test(c.css("position"))){c.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var i=a(this.helper.css("left")),f=a(this.helper.css("top"));if(h.containment){i+=b(h.containment).scrollLeft()||0;f+=b(h.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:i,top:f};this.size=this._helper?{width:c.outerWidth(),height:c.outerHeight()}:{width:c.width(),height:c.height()};this.originalSize=this._helper?{width:c.outerWidth(),height:c.outerHeight()}:{width:c.width(),height:c.height()};this.originalPosition={left:i,top:f};this.sizeDiff={width:c.outerWidth()-c.width(),height:c.outerHeight()-c.height()};this.originalMousePosition={left:e.pageX,top:e.pageY};this.aspectRatio=(typeof h.aspectRatio=="number")?h.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);if(h.preserveCursor){var g=b(".ui-resizable-"+this.axis).css("cursor");b("body").css("cursor",g=="auto"?this.axis+"-resize":g)}this._propagate("start",e);return true},_mouseDrag:function(c){var f=this.helper,e=this.options,k={},n=this,h=this.originalMousePosition,l=this.axis;var p=(c.pageX-h.left)||0,m=(c.pageY-h.top)||0;var g=this._change[l];if(!g){return false}var j=g.apply(this,[c,p,m]),i=b.browser.msie&&b.browser.version<7,d=this.sizeDiff;if(this._aspectRatio||c.shiftKey){j=this._updateRatio(j,c)}j=this._respectSize(j,c);this._propagate("resize",c);f.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this.proportionallyResize.length){this._proportionallyResize()}this._updateCache(j);this._trigger("resize",c,this.ui());return false},_mouseStop:function(f){this.resizing=false;var g=this.options,k=this;if(this._helper){var e=this.proportionallyResize,c=e.length&&(/textarea/i).test(e[0].nodeName),d=c&&b.ui.hasScroll(e[0],"left")?0:k.sizeDiff.height,i=c?0:k.sizeDiff.width;var l={width:(k.size.width-i),height:(k.size.height-d)},h=(parseInt(k.element.css("left"),10)+(k.position.left-k.originalPosition.left))||null,j=(parseInt(k.element.css("top"),10)+(k.position.top-k.originalPosition.top))||null;if(!g.animate){this.element.css(b.extend(l,{top:j,left:h}))}if(this._helper&&!g.animate){this._proportionallyResize()}}if(g.preserveCursor){b("body").css("cursor","auto")}this._propagate("stop",f);if(this._helper){this.helper.remove()}return false},_updateCache:function(c){var d=this.options;this.offset=this.helper.offset();if(c.left){this.position.left=c.left}if(c.top){this.position.top=c.top}if(c.height){this.size.height=c.height}if(c.width){this.size.width=c.width}},_updateRatio:function(f,e){var g=this.options,h=this.position,d=this.size,c=this.axis;if(f.height){f.width=(d.height*this.aspectRatio)}else{if(f.width){f.height=(d.width/this.aspectRatio)}}if(c=="sw"){f.left=h.left+(d.width-f.width);f.top=null}if(c=="nw"){f.top=h.top+(d.height-f.height);f.left=h.left+(d.width-f.width)}return f},_respectSize:function(j,e){var r=function(o){return !isNaN(parseInt(o,10))};var h=this.helper,g=this.options,p=this._aspectRatio||e.shiftKey,n=this.axis,s=r(j.width)&&g.maxWidth&&(g.maxWidth<j.width),k=r(j.height)&&g.maxHeight&&(g.maxHeight<j.height),f=r(j.width)&&g.minWidth&&(g.minWidth>j.width),q=r(j.height)&&g.minHeight&&(g.minHeight>j.height);if(f){j.width=g.minWidth}if(q){j.height=g.minHeight}if(s){j.width=g.maxWidth}if(k){j.height=g.maxHeight}var d=this.originalPosition.left+this.originalSize.width,m=this.position.top+this.size.height;var i=/sw|nw|w/.test(n),c=/nw|ne|n/.test(n);if(f&&i){j.left=d-g.minWidth}if(s&&i){j.left=d-g.maxWidth}if(q&&c){j.top=m-g.minHeight}if(k&&c){j.top=m-g.maxHeight}var l=!j.width&&!j.height;if(l&&!j.left&&j.top){j.top=null}else{if(l&&!j.top&&j.left){j.left=null}}return j},_proportionallyResize:function(){var h=this.options;if(!this.proportionallyResize.length){return}var e=this.helper||this.element;for(var d=0;d<this.proportionallyResize.length;d++){var f=this.proportionallyResize[d];if(!this.borderDif){var c=[f.css("borderTopWidth"),f.css("borderRightWidth"),f.css("borderBottomWidth"),f.css("borderLeftWidth")],g=[f.css("paddingTop"),f.css("paddingRight"),f.css("paddingBottom"),f.css("paddingLeft")];this.borderDif=b.map(c,function(j,l){var k=parseInt(j,10)||0,m=parseInt(g[l],10)||0;return k+m})}if(b.browser.msie&&!(!(b(e).is(":hidden")||b(e).parents(":hidden").length))){continue}f.css({height:(e.height()-this.borderDif[0]-this.borderDif[2])||0,width:(e.width()-this.borderDif[1]-this.borderDif[3])||0})}},_renderProxy:function(){var d=this.element,g=this.options;this.elementOffset=d.offset();if(this._helper){this.helper=this.helper||b('<div style="overflow:hidden;"></div>');var c=b.browser.msie&&b.browser.version<7,e=(c?1:0),f=(c?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+f,height:this.element.outerHeight()+f,position:"absolute",left:this.elementOffset.left-e+"px",top:this.elementOffset.top-e+"px",zIndex:++g.zIndex});this.helper.appendTo("body");if(g.disableSelection){this.helper.disableSelection()}}else{this.helper=this.element}},_change:{e:function(e,d,c){return{width:this.originalSize.width+d}},w:function(f,d,c){var h=this.options,e=this.originalSize,g=this.originalPosition;return{left:g.left+d,width:e.width-d}},n:function(f,d,c){var h=this.options,e=this.originalSize,g=this.originalPosition;return{top:g.top+c,height:e.height-c}},s:function(e,d,c){return{height:this.originalSize.height+c}},se:function(e,d,c){return b.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,d,c]))},sw:function(e,d,c){return b.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,d,c]))},ne:function(e,d,c){return b.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,d,c]))},nw:function(e,d,c){return b.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,d,c]))}},_propagate:function(d,c){b.ui.plugin.call(this,d,[c,this.ui()]);(d!="resize"&&this._trigger(d,c,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}));b.extend(b.ui.resizable,{version:"1.6rc6",eventPrefix:"resize",defaults:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,cancel:":input,option",containment:false,delay:0,disableSelection:true,distance:1,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,preserveCursor:true,preventDefault:true,proportionallyResize:false,transparent:false,zIndex:1000}});b.ui.plugin.add("resizable","alsoResize",{start:function(d,e){var c=b(this).data("resizable"),f=c.options;_store=function(g){b(g).each(function(){b(this).data("resizable-alsoresize",{width:parseInt(b(this).width(),10),height:parseInt(b(this).height(),10),left:parseInt(b(this).css("left"),10),top:parseInt(b(this).css("top"),10)})})};if(typeof(f.alsoResize)=="object"&&!f.alsoResize.parentNode){if(f.alsoResize.length){f.alsoResize=f.alsoResize[0];_store(f.alsoResize)}else{b.each(f.alsoResize,function(g,h){_store(g)})}}else{_store(f.alsoResize)}},resize:function(e,g){var d=b(this).data("resizable"),h=d.options,f=d.originalSize,j=d.originalPosition;var i={height:(d.size.height-f.height)||0,width:(d.size.width-f.width)||0,top:(d.position.top-j.top)||0,left:(d.position.left-j.left)||0},c=function(k,l){b(k).each(function(){var o=b(this),p=b(this).data("resizable-alsoresize"),n={},m=l&&l.length?l:["width","height","top","left"];b.each(m||["width","height","top","left"],function(q,s){var r=(p[s]||0)+(i[s]||0);if(r&&r>=0){n[s]=r||null}});if(/relative/.test(o.css("position"))&&b.browser.opera){d._revertToRelativePosition=true;o.css({position:"absolute",top:"auto",left:"auto"})}o.css(n)})};if(typeof(h.alsoResize)=="object"&&!h.alsoResize.nodeType){b.each(h.alsoResize,function(k,l){c(k,l)})}else{c(h.alsoResize)}},stop:function(d,e){var c=b(this).data("resizable");if(c._revertToRelativePosition&&b.browser.opera){c._revertToRelativePosition=false;el.css({position:"relative"})}b(this).removeData("resizable-alsoresize-start")}});b.ui.plugin.add("resizable","animate",{stop:function(g,l){var m=b(this).data("resizable"),h=m.options;var f=h.proportionallyResize,c=f&&(/textarea/i).test(f.get(0).nodeName),d=c&&b.ui.hasScroll(f.get(0),"left")?0:m.sizeDiff.height,j=c?0:m.sizeDiff.width;var e={width:(m.size.width-j),height:(m.size.height-d)},i=(parseInt(m.element.css("left"),10)+(m.position.left-m.originalPosition.left))||null,k=(parseInt(m.element.css("top"),10)+(m.position.top-m.originalPosition.top))||null;m.element.animate(b.extend(e,k&&i?{top:k,left:i}:{}),{duration:h.animateDuration,easing:h.animateEasing,step:function(){var n={width:parseInt(m.element.css("width"),10),height:parseInt(m.element.css("height"),10),top:parseInt(m.element.css("top"),10),left:parseInt(m.element.css("left"),10)};if(f){f.css({width:n.width,height:n.height})}m._updateCache(n);m._propagate("resize",g)}})}});b.ui.plugin.add("resizable","containment",{start:function(d,n){var r=b(this).data("resizable"),h=r.options,j=r.element;var e=h.containment,i=(e instanceof b)?e.get(0):(/parent/.test(e))?j.parent().get(0):e;if(!i){return}r.containerElement=b(i);if(/document/.test(e)||e==document){r.containerOffset={left:0,top:0};r.containerPosition={left:0,top:0};r.parentData={element:b(document),left:0,top:0,width:b(document).width(),height:b(document).height()||document.body.parentNode.scrollHeight}}else{var l=b(i),g=[];b(["Top","Right","Left","Bottom"]).each(function(p,o){g[p]=a(l.css("padding"+o))});r.containerOffset=l.offset();r.containerPosition=l.position();r.containerSize={height:(l.innerHeight()-g[3]),width:(l.innerWidth()-g[1])};var m=r.containerOffset,c=r.containerSize.height,k=r.containerSize.width,f=(b.ui.hasScroll(i,"left")?i.scrollWidth:k),q=(b.ui.hasScroll(i)?i.scrollHeight:c);r.parentData={element:i,left:m.left,top:m.top,width:f,height:q}}},resize:function(e,l){var p=b(this).data("resizable"),g=p.options,d=p.containerSize,k=p.containerOffset,i=p.size,j=p.position,m=g._aspectRatio||e.shiftKey,c={top:0,left:0},f=p.containerElement;if(f[0]!=document&&(/static/).test(f.css("position"))){c=k}if(j.left<(p._helper?k.left:0)){p.size.width=p.size.width+(p._helper?(p.position.left-k.left):(p.position.left-c.left));if(m){p.size.height=p.size.width/g.aspectRatio}p.position.left=g.helper?k.left:0}if(j.top<(p._helper?k.top:0)){p.size.height=p.size.height+(p._helper?(p.position.top-k.top):p.position.top);if(m){p.size.width=p.size.height*g.aspectRatio}p.position.top=p._helper?k.top:0}var h=Math.abs((p._helper?p.offset.left-c.left:(p.offset.left-c.left))+p.sizeDiff.width),n=Math.abs((p._helper?p.offset.top-c.top:(p.offset.top-k.top))+p.sizeDiff.height);if(h+p.size.width>=p.parentData.width){p.size.width=p.parentData.width-h;if(m){p.size.height=p.size.width/g.aspectRatio}}if(n+p.size.height>=p.parentData.height){p.size.height=p.parentData.height-n;if(m){p.size.width=p.size.height*g.aspectRatio}}},stop:function(d,l){var n=b(this).data("resizable"),e=n.options,j=n.position,k=n.containerOffset,c=n.containerPosition,f=n.containerElement;var g=b(n.helper),p=g.offset(),m=g.outerWidth()-n.sizeDiff.width,i=g.outerHeight()-n.sizeDiff.height;if(n._helper&&!e.animate&&(/relative/).test(f.css("position"))){b(this).css({left:p.left-c.left-k.left,width:m,height:i})}if(n._helper&&!e.animate&&(/static/).test(f.css("position"))){b(this).css({left:p.left-c.left-k.left,width:m,height:i})}}});b.ui.plugin.add("resizable","ghost",{start:function(e,f){var c=b(this).data("resizable"),g=c.options,h=g.proportionallyResize,d=c.size;c.ghost=c.originalElement.clone();c.ghost.css({opacity:0.25,display:"block",position:"relative",height:d.height,width:d.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof g.ghost=="string"?g.ghost:"");c.ghost.appendTo(c.helper)},resize:function(d,e){var c=b(this).data("resizable"),f=c.options;if(c.ghost){c.ghost.css({position:"relative",height:c.size.height,width:c.size.width})}},stop:function(d,e){var c=b(this).data("resizable"),f=c.options;if(c.ghost&&c.helper){c.helper.get(0).removeChild(c.ghost.get(0))}}});b.ui.plugin.add("resizable","grid",{resize:function(c,k){var m=b(this).data("resizable"),f=m.options,i=m.size,g=m.originalSize,h=m.originalPosition,l=m.axis,j=f._aspectRatio||c.shiftKey;f.grid=typeof f.grid=="number"?[f.grid,f.grid]:f.grid;var e=Math.round((i.width-g.width)/(f.grid[0]||1))*(f.grid[0]||1),d=Math.round((i.height-g.height)/(f.grid[1]||1))*(f.grid[1]||1);if(/^(se|s|e)$/.test(l)){m.size.width=g.width+e;m.size.height=g.height+d}else{if(/^(ne)$/.test(l)){m.size.width=g.width+e;m.size.height=g.height+d;m.position.top=h.top-d}else{if(/^(sw)$/.test(l)){m.size.width=g.width+e;m.size.height=g.height+d;m.position.left=h.left-e}else{m.size.width=g.width+e;m.size.height=g.height+d;m.position.top=h.top-d;m.position.left=h.left-e}}}}});var a=function(c){return parseInt(c,10)||0}})(jQuery);/*
+ * jQuery UI Selectable 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(a){a.widget("ui.selectable",a.extend({},a.ui.mouse,{_init:function(){var b=this;this.element.addClass("ui-selectable");this.dragged=false;var c;this.refresh=function(){c=a(b.options.filter,b.element[0]);c.each(function(){var d=a(this);var e=d.offset();a.data(this,"selectable-item",{element:this,$element:d,left:e.left,top:e.top,right:e.left+d.outerWidth(),bottom:e.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=c.addClass("ui-selectee");this._mouseInit();this.helper=a(document.createElement("div")).css({border:"1px dotted black"}).addClass("ui-selectable-helper")},destroy:function(){this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy()},_mouseStart:function(d){var b=this;this.opos=[d.pageX,d.pageY];if(this.options.disabled){return}var c=this.options;this.selectees=a(c.filter,this.element[0]);this._trigger("start",d);a("body").append(this.helper);this.helper.css({"z-index":100,position:"absolute",left:d.clientX,top:d.clientY,width:0,height:0});if(c.autoRefresh){this.refresh()}this.selectees.filter(".ui-selected").each(function(){var e=a.data(this,"selectable-item");e.startselected=true;if(!d.metaKey){e.$element.removeClass("ui-selected");e.selected=false;e.$element.addClass("ui-unselecting");e.unselecting=true;b._trigger("unselecting",d,{unselecting:e.element})}});a(d.target).parents().andSelf().each(function(){var e=a.data(this,"selectable-item");if(e){e.$element.removeClass("ui-unselecting").addClass("ui-selecting");e.unselecting=false;e.selecting=true;e.selected=true;b._trigger("selecting",d,{selecting:e.element});return false}})},_mouseDrag:function(i){var c=this;this.dragged=true;if(this.options.disabled){return}var e=this.options;var d=this.opos[0],h=this.opos[1],b=i.pageX,g=i.pageY;if(d>b){var f=b;b=d;d=f}if(h>g){var f=g;g=h;h=f}this.helper.css({left:d,top:h,width:b-d,height:g-h});this.selectees.each(function(){var j=a.data(this,"selectable-item");if(!j||j.element==c.element[0]){return}var k=false;if(e.tolerance=="touch"){k=(!(j.left>b||j.right<d||j.top>g||j.bottom<h))}else{if(e.tolerance=="fit"){k=(j.left>d&&j.right<b&&j.top>h&&j.bottom<g)}}if(k){if(j.selected){j.$element.removeClass("ui-selected");j.selected=false}if(j.unselecting){j.$element.removeClass("ui-unselecting");j.unselecting=false}if(!j.selecting){j.$element.addClass("ui-selecting");j.selecting=true;c._trigger("selecting",i,{selecting:j.element})}}else{if(j.selecting){if(i.metaKey&&j.startselected){j.$element.removeClass("ui-selecting");j.selecting=false;j.$element.addClass("ui-selected");j.selected=true}else{j.$element.removeClass("ui-selecting");j.selecting=false;if(j.startselected){j.$element.addClass("ui-unselecting");j.unselecting=true}c._trigger("unselecting",i,{unselecting:j.element})}}if(j.selected){if(!i.metaKey&&!j.startselected){j.$element.removeClass("ui-selected");j.selected=false;j.$element.addClass("ui-unselecting");j.unselecting=true;c._trigger("unselecting",i,{unselecting:j.element})}}}});return false},_mouseStop:function(d){var b=this;this.dragged=false;var c=this.options;a(".ui-unselecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-unselecting");e.unselecting=false;e.startselected=false;b._trigger("unselected",d,{unselected:e.element})});a(".ui-selecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-selecting").addClass("ui-selected");e.selecting=false;e.selected=true;e.startselected=true;b._trigger("selected",d,{selected:e.element})});this._trigger("stop",d);this.helper.remove();return false}}));a.extend(a.ui.selectable,{version:"1.6rc6",defaults:{appendTo:"body",autoRefresh:true,cancel:":input,option",delay:0,distance:0,filter:"*",tolerance:"touch"}})})(jQuery);/*
+ * jQuery UI Sortable 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(a){a.widget("ui.sortable",a.extend({},a.ui.mouse,{_init:function(){var b=this.options;this.containerCache={};(this.options.cssNamespace&&this.element.addClass(this.options.cssNamespace+"-sortable"));this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass(this.options.cssNamespace+"-sortable "+this.options.cssNamespace+"-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--){this.items[b].item.removeData("sortable-item")}},_mouseCapture:function(e,f){if(this.reverting){return false}if(this.options.disabled||this.options.type=="static"){return false}this._refreshItems(e);var d=null,c=this,b=a(e.target).parents().each(function(){if(a.data(this,"sortable-item")==c){d=a(this);return false}});if(a.data(e.target,"sortable-item")==c){d=a(e.target)}if(!d){return false}if(this.options.handle&&!f){var g=false;a(this.options.handle,d).find("*").andSelf().each(function(){if(this==e.target){g=true}});if(!g){return false}}this.currentItem=d;this._removeCurrentsFromItems();return true},_mouseStart:function(e,f,b){var g=this.options,c=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(e);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(e);this.originalPageX=e.pageX;this.originalPageY=e.pageY;if(g.cursorAt){this._adjustOffsetFromHelper(g.cursorAt)}this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};if(this.helper[0]!=this.currentItem[0]){this.currentItem.hide()}this._createPlaceholder();if(g.containment){this._setContainment()}if(g.cursor){if(a("body").css("cursor")){this._storedCursor=a("body").css("cursor")}a("body").css("cursor",g.cursor)}if(g.opacity){if(this.helper.css("opacity")){this._storedOpacity=this.helper.css("opacity")}this.helper.css("opacity",g.opacity)}if(g.zIndex){if(this.helper.css("zIndex")){this._storedZIndex=this.helper.css("zIndex")}this.helper.css("zIndex",g.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){this.overflowOffset=this.scrollParent.offset()}this._trigger("start",e,this._uiHash());if(!this._preserveHelperProportions){this._cacheHelperProportions()}if(!b){for(var d=this.containers.length-1;d>=0;d--){this.containers[d]._trigger("activate",e,c._uiHash(this))}}if(a.ui.ddmanager){a.ui.ddmanager.current=this}if(a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,e)}this.dragging=true;this.helper.addClass(g.cssNamespace+"-sortable-helper");this._mouseDrag(e);return true},_mouseDrag:function(f){this.position=this._generatePosition(f);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs){this.lastPositionAbs=this.positionAbs}if(this.options.scroll){var g=this.options,b=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if((this.overflowOffset.top+this.scrollParent[0].offsetHeight)-f.pageY<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop+g.scrollSpeed}else{if(f.pageY-this.overflowOffset.top<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop-g.scrollSpeed}}if((this.overflowOffset.left+this.scrollParent[0].offsetWidth)-f.pageX<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft+g.scrollSpeed}else{if(f.pageX-this.overflowOffset.left<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft-g.scrollSpeed}}}else{if(f.pageY-a(document).scrollTop()<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-g.scrollSpeed)}else{if(a(window).height()-(f.pageY-a(document).scrollTop())<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+g.scrollSpeed)}}if(f.pageX-a(document).scrollLeft()<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-g.scrollSpeed)}else{if(a(window).width()-(f.pageX-a(document).scrollLeft())<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+g.scrollSpeed)}}}if(b!==false&&a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,f)}}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d],c=e.item[0],h=this._intersectsWithPointer(e);if(!h){continue}if(c!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=c&&!a.ui.contains(this.placeholder[0],c)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],c):true)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e)){this.options.sortIndicator.call(this,f,e)}else{break}this._trigger("change",f,this._uiHash());break}}this._contactContainers(f);if(a.ui.ddmanager){a.ui.ddmanager.drag(this,f)}this._trigger("sort",f,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(c,d){if(!c){return}if(a.ui.ddmanager&&!this.options.dropBehaviour){a.ui.ddmanager.drop(this,c)}if(this.options.revert){var b=this;var e=b.placeholder.offset();b.reverting=true;a(this.helper).animate({left:e.left-this.offset.parent.left-b.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-b.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){b._clear(c)})}else{this._clear(c,d)}return false},cancel:function(){var b=this;if(this.dragging){this._mouseUp();if(this.options.helper=="original"){this.currentItem.css(this._storedCSS).removeClass(this.options.cssNamespace+"-sortable-helper")}else{this.currentItem.show()}for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,b._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,b._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder[0].parentNode){this.placeholder[0].parentNode.removeChild(this.placeholder[0])}if(this.options.helper!="original"&&this.helper&&this.helper[0].parentNode){this.helper.remove()}a.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});if(this.domPosition.prev){a(this.domPosition.prev).after(this.currentItem)}else{a(this.domPosition.parent).prepend(this.currentItem)}return true},serialize:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};a(b).each(function(){var e=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||(/(.+)[-=_](.+)/));if(e){c.push((d.key||e[1]+"[]")+"="+(d.key&&d.expression?e[1]:e[2]))}});return c.join("&")},toArray:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};b.each(function(){c.push(a(d.item||this).attr(d.attribute||"id")||"")});return c},_intersectsWith:function(m){var e=this.positionAbs.left,d=e+this.helperProportions.width,k=this.positionAbs.top,j=k+this.helperProportions.height;var f=m.left,c=f+m.width,n=m.top,i=n+m.height;var o=this.offset.click.top,h=this.offset.click.left;var g=(k+o)>n&&(k+o)<i&&(e+h)>f&&(e+h)<c;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>m[this.floating?"width":"height"])){return g}else{return(f<e+(this.helperProportions.width/2)&&d-(this.helperProportions.width/2)<c&&n<k+(this.helperProportions.height/2)&&j-(this.helperProportions.height/2)<i)}},_intersectsWithPointer:function(d){var e=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height),c=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width),g=e&&c,b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(!g){return false}return this.floating?(((f&&f=="right")||b=="down")?2:1):(b&&(b=="down"?2:1))},_intersectsWithSides:function(e){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+(e.height/2),e.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+(e.width/2),e.width),b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(this.floating&&f){return((f=="right"&&d)||(f=="left"&&!d))}else{return b&&((b=="down"&&c)||(b=="up"&&!c))}},_getDragVerticalDirection:function(){var b=this.positionAbs.top-this.lastPositionAbs.top;return b!=0&&(b>0?"down":"up")},_getDragHorizontalDirection:function(){var b=this.positionAbs.left-this.lastPositionAbs.left;return b!=0&&(b>0?"right":"left")},refresh:function(b){this._refreshItems(b);this.refreshPositions()},_getItemsAsjQuery:function(b){var l=this;var g=[];var e=[];if(this.options.connectWith&&b){var h=this.options.connectWith.constructor==String?[this.options.connectWith]:this.options.connectWith;for(var d=h.length-1;d>=0;d--){var k=a(h[d]);for(var c=k.length-1;c>=0;c--){var f=a.data(k[c],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element):a(f.options.items,f.element).not("."+f.options.cssNamespace+"-sortable-helper"),f])}}}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not("."+this.options.cssNamespace+"-sortable-helper"),this]);for(var d=e.length-1;d>=0;d--){e[d][0].each(function(){g.push(this)})}return a(g)},_removeCurrentsFromItems:function(){var d=this.currentItem.find(":data(sortable-item)");for(var c=0;c<this.items.length;c++){for(var b=0;b<d.length;b++){if(d[b]==this.items[c].item[0]){this.items.splice(c,1)}}}},_refreshItems:function(b){this.items=[];this.containers=[this];var h=this.items;var o=this;var f=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]];if(this.options.connectWith){for(var e=this.options.connectWith.length-1;e>=0;e--){var l=a(this.options.connectWith[e]);for(var d=l.length-1;d>=0;d--){var g=a.data(l[d],"sortable");if(g&&g!=this&&!g.options.disabled){f.push([a.isFunction(g.options.items)?g.options.items.call(g.element[0],b,{item:this.currentItem}):a(g.options.items,g.element),g]);this.containers.push(g)}}}}for(var e=f.length-1;e>=0;e--){var k=f[e][1];var c=f[e][0];for(var d=0,m=c.length;d<m;d++){var n=a(c[d]);n.data("sortable-item",k);h.push({item:n,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){if(this.offsetParent&&this.helper){this.offset.parent=this._getParentOffset()}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d];if(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0]){continue}var c=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!b){if(this.options.accurateIntersection){e.width=c.outerWidth();e.height=c.outerHeight()}else{e.width=c[0].offsetWidth;e.height=c[0].offsetHeight}}var f=c.offset();e.left=f.left;e.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var d=this.containers.length-1;d>=0;d--){var f=this.containers[d].element.offset();this.containers[d].containerCache.left=f.left;this.containers[d].containerCache.top=f.top;this.containers[d].containerCache.width=this.containers[d].element.outerWidth();this.containers[d].containerCache.height=this.containers[d].element.outerHeight()}}},_createPlaceholder:function(d){var b=d||this,e=b.options;if(!e.placeholder||e.placeholder.constructor==String){var c=e.placeholder;e.placeholder={element:function(){var f=a(document.createElement(b.currentItem[0].nodeName)).addClass(c||b.currentItem[0].className+" "+b.options.cssNamespace+"-sortable-placeholder").removeClass(b.options.cssNamespace+"-sortable-helper")[0];if(!c){f.style.visibility="hidden"}return f},update:function(f,g){if(c&&!e.forcePlaceholderSize){return}if(!g.height()){g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10))}if(!g.width()){g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=a(e.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);e.placeholder.update(b,b.placeholder)},_contactContainers:function(d){for(var c=this.containers.length-1;c>=0;c--){if(this._intersectsWith(this.containers[c].containerCache)){if(!this.containers[c].containerCache.over){if(this.currentContainer!=this.containers[c]){var h=10000;var g=null;var e=this.positionAbs[this.containers[c].floating?"left":"top"];for(var b=this.items.length-1;b>=0;b--){if(!a.ui.contains(this.containers[c].element[0],this.items[b].item[0])){continue}var f=this.items[b][this.containers[c].floating?"left":"top"];if(Math.abs(f-e)<h){h=Math.abs(f-e);g=this.items[b]}}if(!g&&!this.options.dropOnEmpty){continue}this.currentContainer=this.containers[c];g?this.options.sortIndicator.call(this,d,g,null,true):this.options.sortIndicator.call(this,d,null,this.containers[c].element,true);this._trigger("change",d,this._uiHash());this.containers[c]._trigger("change",d,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder)}this.containers[c]._trigger("over",d,this._uiHash(this));this.containers[c].containerCache.over=1}}else{if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",d,this._uiHash(this));this.containers[c].containerCache.over=0}}}},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c,this.currentItem])):(d.helper=="clone"?this.currentItem.clone():this.currentItem);if(!b.parents("body").length){a(d.appendTo!="parent"?d.appendTo:this.currentItem[0].parentNode)[0].appendChild(b[0])}if(b[0]==this.currentItem[0]){this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}}if(b[0].style.width==""||d.forceHelperSize){b.width(this.currentItem.width())}if(b[0].style.height==""||d.forceHelperSize){b.height(this.currentItem.height())}return b},_adjustOffsetFromHelper:function(b){if(b.left!=undefined){this.offset.click.left=b.left+this.margins.left}if(b.right!=undefined){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if(b.top!=undefined){this.offset.click.top=b.top+this.margins.top}if(b.bottom!=undefined){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body&&a.browser.mozilla)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.currentItem.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)){var c=a(e.containment)[0];var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c)}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop()))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft()))}},_rearrange:function(g,f,c,e){c?c[0].appendChild(this.placeholder[0]):f.item[0].parentNode.insertBefore(this.placeholder[0],(this.direction=="down"?f.item[0]:f.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var d=this,b=this.counter;window.setTimeout(function(){if(b==d.counter){d.refreshPositions(!e)}},0)},_clear:function(d,e){this.reverting=false;var f=[],b=this;if(!this._noFinalSort){this.placeholder.before(this.currentItem)}this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var c in this._storedCSS){if(this._storedCSS[c]=="auto"||this._storedCSS[c]=="static"){this._storedCSS[c]=""}}this.currentItem.css(this._storedCSS).removeClass(this.options.cssNamespace+"-sortable-helper")}else{this.currentItem.show()}if(this.fromOutside&&!e){f.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))})}if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not("."+this.options.cssNamespace+"-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!e){f.push(function(g){this._trigger("update",g,this._uiHash())})}if(!a.ui.contains(this.element[0],this.currentItem[0])){if(!e){f.push(function(g){this._trigger("remove",g,this._uiHash())})}for(var c=this.containers.length-1;c>=0;c--){if(a.ui.contains(this.containers[c].element[0],this.currentItem[0])&&!e){f.push((function(g){return function(h){g._trigger("receive",h,this._uiHash(this))}}).call(this,this.containers[c]));f.push((function(g){return function(h){g._trigger("update",h,this._uiHash(this))}}).call(this,this.containers[c]))}}}for(var c=this.containers.length-1;c>=0;c--){if(!e){f.push((function(g){return function(h){g._trigger("deactivate",h,this._uiHash(this))}}).call(this,this.containers[c]))}if(this.containers[c].containerCache.over){f.push((function(g){return function(h){g._trigger("out",h,this._uiHash(this))}}).call(this,this.containers[c]));this.containers[c].containerCache.over=0}}if(this._storedCursor){a("body").css("cursor",this._storedCursor)}if(this._storedOpacity){this.helper.css("opacity",this._storedCursor)}if(this._storedZIndex){this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex)}this.dragging=false;if(this.cancelHelperRemoval){if(!e){this._trigger("beforeStop",d,this._uiHash());for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}return false}if(!e){this._trigger("beforeStop",d,this._uiHash())}this.placeholder[0].parentNode.removeChild(this.placeholder[0]);if(this.helper[0]!=this.currentItem[0]){this.helper.remove()}this.helper=null;if(!e){for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){if(a.widget.prototype._trigger.apply(this,arguments)===false){this.cancel()}},_uiHash:function(c){var b=c||this;return{helper:b.helper,placeholder:b.placeholder||a([]),position:b.position,absolutePosition:b.positionAbs,offset:b.positionAbs,item:b.currentItem,sender:c?c.element:null}}}));a.extend(a.ui.sortable,{getter:"serialize toArray",version:"1.6rc6",defaults:{accurateIntersection:true,appendTo:"parent",cancel:":input,option",connectWith:false,cssNamespace:"ui",delay:0,distance:1,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,handle:false,helper:"original",items:"> *",placeholder:false,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,sortIndicator:a.ui.sortable.prototype._rearrange,tolerance:"intersect",zIndex:1000}})})(jQuery);/*
+ * jQuery UI Accordion 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(a){a.widget("ui.accordion",{_init:function(){var d=this.options,b=this;this.running=0;if(d.navigation){var c=this.element.find("a").filter(d.navigationFilter);if(c.length){if(c.filter(d.header).length){this.active=c}else{this.active=c.parent().parent().prev();c.addClass("ui-accordion-content-active")}}}this.element.addClass("ui-accordion ui-widget ui-helper-reset");this.headers=this.element.find(d.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){a(this).removeClass("ui-state-hover")});this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");this.active=this._findActive(this.active||d.active).toggleClass("ui-state-default").toggleClass("ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");this.active.next().addClass("ui-accordion-content-active");a("<span/>").addClass("ui-icon "+d.icons.header).prependTo(this.headers);this.active.find(".ui-icon").toggleClass(d.icons.header).toggleClass(d.icons.headerSelected);if(a.browser.msie){this.element.find("a").css("zoom","1")}this.resize();this.element.attr("role","tablist");this.headers.attr("role","tab").bind("keydown",function(e){return b._keydown(e)}).next().attr("role","tabpanel");this.headers.not(this.active||"").attr("aria-expanded","false").attr("tabIndex","-1").next().hide();if(!this.active.length){this.headers.eq(0).attr("tabIndex","0")}else{this.active.attr("aria-expanded","true").attr("tabIndex","0")}if(!a.browser.safari){this.headers.find("a").attr("tabIndex","-1")}if(d.event){this.element.bind((d.event)+".accordion",function(e){return b._clickHandler.call(b,e)})}},destroy:function(){this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role").unbind(".accordion").removeData("accordion");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabindex");this.headers.find("a").removeAttr("tabindex");this.headers.children(".ui-icon").remove();this.headers.next().removeClass("ui-accordion-content ui-accordion-content-active")},_keydown:function(e){var g=this.options,f=a.ui.keyCode;if(g.disabled||e.altKey||e.ctrlKey){return}var d=this.headers.length;var b=this.headers.index(e.target);var c=false;switch(e.keyCode){case f.RIGHT:case f.DOWN:c=this.headers[(b+1)%d];break;case f.LEFT:case f.UP:c=this.headers[(b-1+d)%d];break;case f.SPACE:case f.ENTER:return this._clickHandler({target:e.target})}if(c){a(e.target).attr("tabIndex","-1");a(c).attr("tabIndex","0");c.focus();return false}return true},resize:function(){var e=this.options,d;if(e.fillSpace){if(a.browser.msie){var b=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}d=this.element.parent().height();if(a.browser.msie){this.element.parent().css("overflow",b)}this.headers.each(function(){d-=a(this).outerHeight()});var c=0;this.headers.next().each(function(){c=Math.max(c,a(this).innerHeight()-a(this).height())}).height(d-c).css("overflow","auto")}else{if(e.autoHeight){d=0;this.headers.next().each(function(){d=Math.max(d,a(this).outerHeight())}).height(d)}}},activate:function(b){this._clickHandler({target:this._findActive(b)[0]})},_findActive:function(b){return b?typeof b=="number"?this.headers.filter(":eq("+b+")"):this.headers.not(this.headers.not(b)):b===false?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(f){var h=this.options;if(h.disabled){return false}if(!f.target&&!h.alwaysOpen){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").find(".ui-icon").removeClass(h.icons.headerSelected).addClass(h.icons.header);this.active.next().addClass("ui-accordion-content-active");var c=this.active.next(),g={options:h,newHeader:a([]),oldHeader:h.active,newContent:a([]),oldContent:c},b=(this.active=a([]));this._toggle(b,c,g);return false}var d=a(f.target);d=a(d.parents(h.header)[0]||d);var e=d[0]==this.active[0];if(this.running||(h.alwaysOpen&&e)){return false}if(!d.is(h.header)){return}this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").find(".ui-icon").removeClass(h.icons.headerSelected).addClass(h.icons.header);this.active.next().addClass("ui-accordion-content-active");if(!e){d.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").find(".ui-icon").removeClass(h.icons.header).addClass(h.icons.headerSelected);d.next().addClass("ui-accordion-content-active")}var b=d.next(),c=this.active.next(),g={options:h,newHeader:e&&!h.alwaysOpen?a([]):d,oldHeader:this.active,newContent:e&&!h.alwaysOpen?a([]):b.find("> *"),oldContent:c.find("> *")},i=this.headers.index(this.active[0])>this.headers.index(d[0]);this.active=e?a([]):d;this._toggle(b,c,g,e,i);return false},_toggle:function(b,i,g,j,k){var d=this.options,m=this;this.toShow=b;this.toHide=i;this.data=g;var c=function(){if(!m){return}return m._completed.apply(m,arguments)};this._trigger("changestart",null,this.data);this.running=i.size()===0?b.size():i.size();if(d.animated){var f={};if(!d.alwaysOpen&&j){f={toShow:a([]),toHide:i,complete:c,down:k,autoHeight:d.autoHeight||d.fillSpace}}else{f={toShow:b,toHide:i,complete:c,down:k,autoHeight:d.autoHeight||d.fillSpace}}if(!d.proxied){d.proxied=d.animated}if(!d.proxiedDuration){d.proxiedDuration=d.duration}d.animated=a.isFunction(d.proxied)?d.proxied(f):d.proxied;d.duration=a.isFunction(d.proxiedDuration)?d.proxiedDuration(f):d.proxiedDuration;var l=a.ui.accordion.animations,e=d.duration,h=d.animated;if(!l[h]){l[h]=function(n){this.slide(n,{easing:h,duration:e||700})}}l[h](f)}else{if(!d.alwaysOpen&&j){b.toggle()}else{i.hide();b.show()}c(true)}i.prev().attr("aria-expanded","false").attr("tabIndex","-1");b.prev().attr("aria-expanded","true").attr("tabIndex","0").focus()},_completed:function(b){var c=this.options;this.running=b?0:--this.running;if(this.running){return}if(c.clearStyle){this.toShow.add(this.toHide).css({height:"",overflow:""})}this._trigger("change",null,this.data)}});a.extend(a.ui.accordion,{version:"1.6rc6",defaults:{active:null,autoHeight:true,alwaysOpen:true,animated:"slide",clearStyle:false,event:"click",fillSpace:false,header:"a",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()==location.href.toLowerCase()}},animations:{slide:function(j,h){j=a.extend({easing:"swing",duration:300},j,h);if(!j.toHide.size()){j.toShow.animate({height:"show"},j);return}var b=j.toHide.height(),i=j.toShow.height(),c=i/b,d=j.toShow.css("overflow"),e={},g={},f=["height","paddingTop","paddingBottom"];a.each(f,function(k,l){g[l]="hide";e[l]=parseFloat(j.toShow.css(l))});j.toShow.css({height:0,overflow:"hidden"}).show();j.toHide.filter(":hidden").each(j.complete).end().filter(":visible").animate(g,{step:function(l,m){if(!j.toShow[0]){return}var k=m.start!=m.end?(m.now-m.start)/(m.end-m.start):0,n=k*e[m.prop];if(a.browser.msie||a.browser.opera){n=Math.ceil(n)}j.toShow[0].style[m.prop]=n+"px"},duration:j.duration,easing:j.easing,complete:function(){if(!j.autoHeight){j.toShow.css("height","auto")}j.toShow.css({overflow:d});j.complete()}})},bounceslide:function(b){this.slide(b,{easing:b.down?"easeOutBounce":"swing",duration:b.down?1000:200})},easeslide:function(b){this.slide(b,{easing:"easeinout",duration:700})}}})})(jQuery);/*
+ * jQuery UI Dialog 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	ui.core.js
+ *	ui.draggable.js
+ *	ui.resizable.js
+ */
+(function(b){var a={dragStart:"start.draggable",drag:"drag.draggable",dragStop:"stop.draggable",maxHeight:"maxHeight.resizable",minHeight:"minHeight.resizable",maxWidth:"maxWidth.resizable",minWidth:"minWidth.resizable",resizeStart:"start.resizable",resize:"drag.resizable",resizeStop:"stop.resizable"};b.widget("ui.dialog",{_init:function(){this.originalTitle=this.element.attr("title");var k=this,l=this.options,i=l.title||this.originalTitle||"&nbsp;",d=b.ui.dialog.getTitleId(this.element),j=(this.uiDialog=b("<div/>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+l.dialogClass).css({position:"absolute",overflow:"hidden",zIndex:l.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(m){(l.closeOnEscape&&m.keyCode&&m.keyCode==b.ui.keyCode.ESCAPE&&k.close(m))}).attr({role:"dialog","aria-labelledby":d}).mousedown(function(m){k.moveToTop(m)}),f=this.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j),e=(this.uiDialogTitlebar=b("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j),h=b('<a href="#"/>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).mousedown(function(m){m.stopPropagation()}).click(function(m){k.close(m);return false}).appendTo(e),g=(this.uiDialogTitlebarCloseText=b("<span/>")).addClass("ui-icon ui-icon-closethick").text(l.closeText).appendTo(h),c=b("<span/>").addClass("ui-dialog-title").attr("id",d).html(i).prependTo(e);e.find("*").add(e).disableSelection();(l.draggable&&b.fn.draggable&&this._makeDraggable());(l.resizable&&b.fn.resizable&&this._makeResizable());this._createButtons(l.buttons);this._isOpen=false;(l.bgiframe&&b.fn.bgiframe&&j.bgiframe());(l.autoOpen&&this.open())},destroy:function(){(this.overlay&&this.overlay.destroy());(this.shadow&&this._destroyShadow());this.uiDialog.hide();this.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");this.uiDialog.remove();(this.originalTitle&&this.element.attr("title",this.originalTitle))},close:function(c){if(false===this._trigger("beforeclose",c)){return}(this.overlay&&this.overlay.destroy());(this.shadow&&this._destroyShadow());this.uiDialog.hide(this.options.hide).unbind("keypress.ui-dialog");this._trigger("close",c);b.ui.dialog.overlay.resize();this._isOpen=false},isOpen:function(){return this._isOpen},moveToTop:function(g,f){if((this.options.modal&&!g)||(!this.options.stack&&!this.options.modal)){return this._trigger("focus",f)}var e=this.options.zIndex,d=this.options;b(".ui-dialog:visible").each(function(){e=Math.max(e,parseInt(b(this).css("z-index"),10)||d.zIndex)});(this.overlay&&this.overlay.$el.css("z-index",++e));(this.shadow&&this.shadow.css("z-index",++e));var c={scrollTop:this.element.attr("scrollTop"),scrollLeft:this.element.attr("scrollLeft")};this.uiDialog.css("z-index",++e);this.element.attr(c);this._trigger("focus",f)},open:function(e){if(this._isOpen){return}var d=this.options,c=this.uiDialog;this.overlay=d.modal?new b.ui.dialog.overlay(this):null;(c.next().length&&c.appendTo("body"));this._size();this._position(d.position);c.show(d.show);this.moveToTop(true,e);(d.modal&&c.bind("keypress.ui-dialog",function(h){if(h.keyCode!=b.ui.keyCode.TAB){return}var g=b(":tabbable",this),i=g.filter(":first")[0],f=g.filter(":last")[0];if(h.target==f&&!h.shiftKey){setTimeout(function(){i.focus()},1)}else{if(h.target==i&&h.shiftKey){setTimeout(function(){f.focus()},1)}}}));b([]).add(c.find(".ui-dialog-content :tabbable:first")).add(c.find(".ui-dialog-buttonpane :tabbable:first")).add(c.find(".ui-dialog-titlebar :tabbable:first")).filter(":first").focus();if(d.shadow){this._createShadow()}this._trigger("open",e);this._isOpen=true},_createButtons:function(f){var e=this,c=false,d=b("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix");this.uiDialog.find(".ui-dialog-buttonpane").remove();(typeof f=="object"&&f!==null&&b.each(f,function(){return !(c=true)}));if(c){b.each(f,function(g,h){b('<button type="button"></button>').addClass("ui-state-default ui-corner-all").text(g).click(function(){h.apply(e.element[0],arguments)}).hover(function(){b(this).addClass("ui-state-hover")},function(){b(this).removeClass("ui-state-hover")}).focus(function(){b(this).addClass("ui-state-focus")}).blur(function(){b(this).removeClass("ui-state-focus")}).appendTo(d)});d.appendTo(this.uiDialog)}},_makeDraggable:function(){var c=this,d=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content",helper:d.dragHelper,handle:".ui-dialog-titlebar",containment:"document",start:function(){(d.dragStart&&d.dragStart.apply(c.element[0],arguments));if(b.browser.msie&&b.browser.version<7&&c.shadow){c.shadow.hide()}},drag:function(){(d.drag&&d.drag.apply(c.element[0],arguments));c._refreshShadow(1)},stop:function(){(d.dragStop&&d.dragStop.apply(c.element[0],arguments));b.ui.dialog.overlay.resize();if(b.browser.msie&&b.browser.version<7&&c.shadow){c.shadow.show()}c._refreshShadow()}})},_makeResizable:function(f){f=(f===undefined?this.options.resizable:f);var c=this,e=this.options,d=typeof f=="string"?f:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",alsoResize:this.element,helper:e.resizeHelper,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:e.minHeight,start:function(){(e.resizeStart&&e.resizeStart.apply(c.element[0],arguments));if(b.browser.msie&&b.browser.version<7&&c.shadow){c.shadow.hide()}},resize:function(){(e.resize&&e.resize.apply(c.element[0],arguments));c._refreshShadow(1)},handles:d,stop:function(){(e.resizeStop&&e.resizeStop.apply(c.element[0],arguments));b.ui.dialog.overlay.resize();if(b.browser.msie&&b.browser.version<7&&c.shadow){c.shadow.show()}c._refreshShadow()}}).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_position:function(h){var d=b(window),e=b(document),f=e.scrollTop(),c=e.scrollLeft(),g=f;if(b.inArray(h,["center","top","right","bottom","left"])>=0){h=[h=="right"||h=="left"?h:"center",h=="top"||h=="bottom"?h:"middle"]}if(h.constructor!=Array){h=["center","middle"]}if(h[0].constructor==Number){c+=h[0]}else{switch(h[0]){case"left":c+=0;break;case"right":c+=d.width()-this.uiDialog.outerWidth();break;default:case"center":c+=(d.width()-this.uiDialog.outerWidth())/2}}if(h[1].constructor==Number){f+=h[1]}else{switch(h[1]){case"top":f+=0;break;case"bottom":f+=d.height()-this.uiDialog.outerHeight();break;default:case"middle":f+=(d.height()-this.uiDialog.outerHeight())/2}}f=Math.max(f,g);this.uiDialog.css({top:f,left:c})},_setData:function(d,e){(a[d]&&this.uiDialog.data(a[d],e));switch(d){case"buttons":this._createButtons(e);break;case"closeText":this.uiDialogTitlebarCloseText.text(e);break;case"draggable":(e?this._makeDraggable():this.uiDialog.draggable("destroy"));break;case"height":this.uiDialog.height(e);break;case"position":this._position(e);break;case"resizable":var c=this.uiDialog,f=this.uiDialog.is(":data(resizable)");(f&&!e&&c.resizable("destroy"));(f&&typeof e=="string"&&c.resizable("option","handles",e));(f||this._makeResizable(e));break;case"title":b(".ui-dialog-title",this.uiDialogTitlebar).html(e||"&nbsp;");break;case"width":this.uiDialog.width(e);break}b.widget.prototype._setData.apply(this,arguments)},_size:function(){var d=this.options;this.element.css({height:0,minHeight:0,width:"auto"});var c=this.uiDialog.css({height:"auto",width:d.width}).height();this.element.css({minHeight:Math.max(d.minHeight-c,0),height:d.height=="auto"?"auto":d.height-c})},_createShadow:function(){this.shadow=b('<div class="ui-widget-shadow"></div>').css("position","absolute").appendTo(document.body);this._refreshShadow();return this.shadow},_refreshShadow:function(c){if(c&&b.browser.msie&&b.browser.version<7){return}var d=this.uiDialog.offset();this.shadow.css({left:d.left,top:d.top,width:this.uiDialog.outerWidth(),height:this.uiDialog.outerHeight()})},_destroyShadow:function(){this.shadow.remove();this.shadow=null}});b.extend(b.ui.dialog,{version:"1.6rc6",defaults:{autoOpen:true,bgiframe:false,buttons:{},closeOnEscape:true,closeText:"close",draggable:true,height:"auto",minHeight:150,minWidth:150,modal:false,position:"center",resizable:true,shadow:true,stack:true,title:"",width:300,zIndex:1000},getter:"isOpen",uuid:0,getTitleId:function(c){return"ui-dialog-title-"+(c.attr("id")||++this.uuid)},overlay:function(c){this.$el=b.ui.dialog.overlay.create(c)}});b.extend(b.ui.dialog.overlay,{instances:[],events:b.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(c){return c+".dialog-overlay"}).join(" "),create:function(d){if(this.instances.length===0){setTimeout(function(){b("a, :input").bind(b.ui.dialog.overlay.events,function(){var f=false;var h=b(this).parents(".ui-dialog");if(h.length){var e=b(".ui-dialog-overlay");if(e.length){var g=parseInt(e.css("z-index"),10);e.each(function(){g=Math.max(g,parseInt(b(this).css("z-index"),10))});f=parseInt(h.css("z-index"),10)>g}else{f=true}}return f})},1);b(document).bind("keydown.dialog-overlay",function(e){(d.options.closeOnEscape&&e.keyCode&&e.keyCode==b.ui.keyCode.ESCAPE&&d.close(e))});b(window).bind("resize.dialog-overlay",b.ui.dialog.overlay.resize)}var c=b("<div></div>").appendTo(document.body).addClass("ui-widget-overlay").css({width:this.width(),height:this.height()});(d.options.bgiframe&&b.fn.bgiframe&&c.bgiframe());this.instances.push(c);return c},destroy:function(c){this.instances.splice(b.inArray(this.instances,c),1);if(this.instances.length===0){b("a, :input").add([document,window]).unbind(".dialog-overlay")}c.remove()},height:function(){if(b.browser.msie&&b.browser.version<7){var d=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);var c=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);if(d<c){return b(window).height()+"px"}else{return d+"px"}}else{return b(document).height()+"px"}},width:function(){if(b.browser.msie&&b.browser.version<7){var c=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);var d=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);if(c<d){return b(window).width()+"px"}else{return c+"px"}}else{return b(document).width()+"px"}},resize:function(){var c=b([]);b.each(b.ui.dialog.overlay.instances,function(){c=c.add(this)});c.css({width:0,height:0}).css({width:b.ui.dialog.overlay.width(),height:b.ui.dialog.overlay.height()})}});b.extend(b.ui.dialog.overlay.prototype,{destroy:function(){b.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);/*
+ * jQuery UI Slider 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(a){a.widget("ui.slider",a.extend({},a.ui.mouse,{_init:function(){var b=this,c=this.options;this._keySliding=false;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");this.range=a([]);if(c.range){if(c.range===true){this.range=a("<div></div>");if(!c.values){c.values=[this._valueMin(),this._valueMin()]}if(c.values.length&&c.values.length!=2){c.values=[c.values[0],c.values[0]]}}else{this.range=a("<div></div>")}this.range.appendTo(this.element).addClass("ui-slider-range ui-widget-header");(c.range=="min")&&(this.orientation=="horizontal")&&this.range.css({left:0});(c.range=="max")&&(this.orientation=="horizontal")&&this.range.css({right:0});(c.range=="min")&&(this.orientation=="vertical")&&this.range.css({bottom:0});(c.range=="max")&&(this.orientation=="vertical")&&this.range.css({top:0})}if(a(".ui-slider-handle",this.element).length==0){a('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle")}if(c.values&&c.values.length){while(a(".ui-slider-handle",this.element).length<c.values.length){a('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle")}}this.handles=a(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(d){d.preventDefault()}).hover(function(){a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){b.handles.removeClass("ui-state-focus");a(this).addClass("ui-state-focus")}).blur(function(){a(this).removeClass("ui-state-focus")});this.handles.each(function(d){a(this).data("index.ui-slider-handle",d)});this.handles.keydown(function(h){var e=a(this).data("index.ui-slider-handle");if(b.options.disabled){return}switch(h.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(!b._keySliding){b._keySliding=true;a(this).addClass("ui-state-active");b._start(h)}break}var f,d,g=b._step();if(b.options.values&&b.options.values.length){f=d=b.values(e)}else{f=d=b.value()}switch(h.keyCode){case a.ui.keyCode.HOME:d=b._valueMin();break;case a.ui.keyCode.END:d=b._valueMax();break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(f==b._valueMax()){return}d=f+g;break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(f==b._valueMin()){return}d=f-g;break}b._slide(h,e,d)}).keyup(function(d){if(b._keySliding){b._stop(d);b._change(d);b._keySliding=false;a(this).removeClass("ui-state-active")}});this._refreshValue()},destroy:function(){this.handles.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy()},_mouseCapture:function(d){var e=this.options;if(e.disabled){return false}this._start(d);this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();var h={x:d.pageX,y:d.pageY};var j=this._normValueFromMouse(h);var c=this._valueMax()+1,f;var k=this,i;this.handles.each(function(l){var m=Math.abs(j-k.values(l));if(c>m){c=m;f=a(this);i=l}});if(e.range&&(this.values(0)+this.values(1))==0){f=a(this.handles[++i])}k._handleIndex=i;f.addClass("ui-state-active").focus();var g=f.offset();var b=!a(d.target).parents().andSelf().is(".ui-slider-handle");this._clickOffset=b?{left:0,top:0}:{left:d.pageX-g.left+(parseInt(f.css("marginLeft"),10)||0),top:d.pageY-g.top+(parseInt(f.css("marginTop"),10)||0)};j=this._normValueFromMouse(h);this._slide(d,i,j);return true},_mouseStart:function(b){return true},_mouseDrag:function(d){var b={x:d.pageX,y:d.pageY};var c=this._normValueFromMouse(b);this._slide(d,this._handleIndex,c);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._stop(b);this._change(b);this._handleIndex=null;this._clickOffset=null;return false},_detectOrientation:function(){this.orientation=this.options.orientation=="auto"?(this.element[0].offsetWidth/this.element[0].offsetHeight>1?"horizontal":"vertical"):this.options.orientation},_normValueFromMouse:function(d){var c,h;if("horizontal"==this.orientation){c=this.elementSize.width;h=d.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{c=this.elementSize.height;h=d.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}var f=(h/c);if(f>1){f=1}if(f<0){f=0}if("vertical"==this.orientation){f=1-f}var e=this._valueMax()-this._valueMin(),i=f*e,b=i%this.options.step,g=this._valueMin()+i-b;if(b>(this.options.step/2)){g+=this.options.step}return g},_start:function(b){this._trigger("start",b,{value:this.value()})},_slide:function(f,e,d){var g=this.handles[e];if(this.options.values&&this.options.values.length){var b=this.values(e?0:1);if((e==0&&d>=b)||(e==1&&d<=b)){d=b}if(d!=this.values(e)){var c=this.values();c[e]=d;var h=this._trigger("slide",f,{handle:g,value:d,values:c});var b=this.values(e?0:1);if(h!==false){this.values(e,d,!(f.type=="mousedown"&&this.options.animate))}}}else{if(d!=this.value()){var h=this._trigger("slide",f,{handle:g,value:d});if(h!==false){this._setData("value",d,(f.type=="mousedown"&&this.options.animate))}}}},_stop:function(b){this._trigger("stop",b,{value:this.value()})},_change:function(b){this._trigger("change",b,{value:this.value()})},value:function(b){if(arguments.length){this._setData("value",b);this._change()}return this._value()},values:function(c,d,b){if(!this.options.animate){b=true}if(arguments.length>1){this.options.values[c]=d;this._refreshValue(!b);this._change()}if(arguments.length){if(this.options.values&&this.options.values.length){return this._values(c)}else{return this.value()}}else{return this._values()}},_setData:function(b,c){a.widget.prototype._setData.apply(this,arguments);switch(b){case"orientation":this._detectOrientation();this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case"value":this._refreshValue();break}},_step:function(){var b=this.options.step;return b},_value:function(){var b=this.options.value;if(b<this._valueMin()){b=this._valueMin()}if(b>this._valueMax()){b=this._valueMax()}return b},_values:function(b){if(arguments.length){var c=this.options.values[b];if(c<this._valueMin()){c=this._valueMin()}if(c>this._valueMax()){c=this._valueMax()}return c}else{return this.options.values}},_valueMin:function(){var b=this.options.min;return b},_valueMax:function(){var b=this.options.max;return b},_refreshValue:function(e){var h=this.options.range,g=this.options,d=this;if(this.options.values&&this.options.values.length){var c,i;this.handles.each(function(n,l){var m=(d.values(n)-d._valueMin())/(d._valueMax()-d._valueMin())*100;var k={};k[d.orientation=="horizontal"?"left":"bottom"]=m+"%";a(this).stop(1,1)[e?"animate":"css"](k,g.animate);if(d.options.range===true){if(d.orientation=="horizontal"){(n==0)&&d.range.stop(1,1)[e?"animate":"css"]({left:m+"%"},g.animate);(n==1)&&d.range[e?"animate":"css"]({width:(m-lastValPercent)+"%"},{queue:false,duration:g.animate})}else{(n==0)&&d.range.stop(1,1)[e?"animate":"css"]({bottom:(m)+"%"},g.animate);(n==1)&&d.range[e?"animate":"css"]({height:(m-lastValPercent)+"%"},{queue:false,duration:g.animate})}}lastValPercent=m})}else{var f=(this.value()-this._valueMin())/(this._valueMax()-this._valueMin())*100;var b={};b[d.orientation=="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[e?"animate":"css"](b,g.animate);(h=="min")&&(this.orientation=="horizontal")&&this.range.stop(1,1)[e?"animate":"css"]({left:0,width:f+"%"},g.animate);(h=="max")&&(this.orientation=="horizontal")&&this.range[e?"animate":"css"]({left:f+"%",width:(100-f)+"%"},{queue:false,duration:g.animate});(h=="min")&&(this.orientation=="vertical")&&this.range.stop(1,1)[e?"animate":"css"]({top:(100-f)+"%",height:f+"%"},g.animate);(h=="max")&&(this.orientation=="vertical")&&this.range[e?"animate":"css"]({bottom:f+"%",height:(100-f)+"%"},{queue:false,duration:g.animate})}}}));a.extend(a.ui.slider,{getter:"value values",version:"1.6rc6",eventPrefix:"slide",defaults:{animate:false,delay:0,distance:0,max:100,min:0,orientation:"auto",range:false,step:1,value:0,values:null}})})(jQuery);/*
+ * jQuery UI Tabs 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function(a){a.widget("ui.tabs",{_init:function(){this._tabify(true)},_setData:function(b,c){if((/^selected/).test(b)){this.select(c)}else{this.options[b]=c;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^A-Za-z0-9\-_:\.]/g,"")||this.options.idPrefix+a.data(b)},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+a.data(this.list[0]));return a.cookie.apply(null,[b].concat(a.makeArray(arguments)))},_ui:function(c,b){return{tab:c,panel:b,index:this.$tabs.index(c)}},_tabify:function(q){this.list=this.element.is("div")?this.element.children("ul:first, ol:first").eq(0):this.element;this.$lis=a("li:has(a[href])",this.list);this.$tabs=this.$lis.map(function(){return a("a",this)[0]});this.$panels=a([]);var r=this,d=this.options;var c=/^#.+/;this.$tabs.each(function(t,o){var s=a(o).attr("href");if(c.test(s)){r.$panels=r.$panels.add(r._sanitizeSelector(s))}else{if(s!="#"){a.data(o,"href.tabs",s);a.data(o,"load.tabs",s.replace(/#.*$/,""));var v=r._tabId(o);o.href="#"+v;var u=a("#"+v);if(!u.length){u=a(d.panelTemplate).attr("id",v).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(r.$panels[t-1]||r.list);u.data("destroy.tabs",true)}r.$panels=r.$panels.add(u)}else{d.disabled.push(t+1)}}});if(q){if(this.element.is("div")){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all")}this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.$lis.addClass("ui-state-default ui-corner-top");this.$panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(d.selected===undefined){if(location.hash){this.$tabs.each(function(s,o){if(o.hash==location.hash){d.selected=s;return false}})}else{if(d.cookie){d.selected=parseInt(r._cookie(),10)}else{if(this.$lis.filter(".ui-tabs-selected").length){d.selected=this.$lis.index(this.$lis.filter(".ui-tabs-selected"))}else{d.selected=0}}}}else{if(d.selected===null){d.selected=-1}}d.selected=((d.selected>=0&&this.$tabs[d.selected])||d.selected<0)?d.selected:0;d.disabled=a.unique(d.disabled.concat(a.map(this.$lis.filter(".ui-state-disabled"),function(s,o){return r.$lis.index(s)}))).sort();if(a.inArray(d.selected,d.disabled)!=-1){d.disabled.splice(a.inArray(d.selected,d.disabled),1)}this.$panels.addClass("ui-tabs-hide");this.$lis.removeClass("ui-tabs-selected ui-state-active");if(d.selected>=0&&this.$tabs.length){this.$panels.eq(d.selected).removeClass("ui-tabs-hide");var f=["ui-tabs-selected ui-state-active"];if(d.deselectable){f.push("ui-tabs-deselectable")}this.$lis.eq(d.selected).addClass(f.join(" "));var k=function(){r._trigger("show",null,r._ui(r.$tabs[d.selected],r.$panels[d.selected]))};if(a.data(this.$tabs[d.selected],"load.tabs")){this.load(d.selected,k)}else{k()}}if(d.event!="mouseover"){var l=function(o,i){if(i.is(":not(.ui-state-disabled)")){i.toggleClass("ui-state-"+o)}};this.$lis.bind("mouseover.tabs mouseout.tabs",function(){l("hover",a(this))});this.$tabs.bind("focus.tabs blur.tabs",function(){l("focus",a(this).parents("li:first"))})}a(window).bind("unload",function(){r.$lis.add(r.$tabs).unbind(".tabs");r.$lis=r.$tabs=r.$panels=null})}else{d.selected=this.$lis.index(this.$lis.filter(".ui-tabs-selected"))}if(d.cookie){this._cookie(d.selected,d.cookie)}for(var h=0,p;p=this.$lis[h];h++){a(p)[a.inArray(h,d.disabled)!=-1&&!a(p).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled")}if(d.cache===false){this.$tabs.removeData("cache.tabs")}var b,j;if(d.fx){if(a.isArray(d.fx)){b=d.fx[0];j=d.fx[1]}else{b=j=d.fx}}function e(i,o){i.css({display:""});if(a.browser.msie&&o.opacity){i[0].style.removeAttribute("filter")}}var m=j?function(i,o){o.hide().removeClass("ui-tabs-hide").animate(j,500,function(){e(o,j);r._trigger("show",null,r._ui(i,o[0]))})}:function(i,o){o.removeClass("ui-tabs-hide");r._trigger("show",null,r._ui(i,o[0]))};var n=b?function(o,i,s){i.animate(b,b.duration||"normal",function(){i.addClass("ui-tabs-hide");e(i,b);if(s){m(o,s)}})}:function(o,i,s){i.addClass("ui-tabs-hide");if(s){m(o,s)}};function g(s,u,i,t){var o=["ui-tabs-selected ui-state-active"];if(d.deselectable){o.push("ui-tabs-deselectable")}u.removeClass("ui-state-default").addClass(o.join(" ")).siblings().removeClass(o.join(" ")).addClass("ui-state-default");n(s,i,t)}this.$tabs.unbind(".tabs").bind(d.event+".tabs",function(){var t=a(this).parents("li:eq(0)"),i=r.$panels.filter(":visible"),s=a(r._sanitizeSelector(this.hash));if((t.hasClass("ui-state-active")&&!d.deselectable)||t.hasClass("ui-state-disabled")||a(this).hasClass("ui-tabs-loading")||r._trigger("select",null,r._ui(this,s[0]))===false){this.blur();return false}d.selected=r.$tabs.index(this);if(d.deselectable){if(t.hasClass("ui-state-active")){d.selected=-1;if(d.cookie){r._cookie(d.selected,d.cookie)}t.removeClass("ui-tabs-selected ui-state-active ui-tabs-deselectable").addClass("ui-state-default");r.$panels.stop();n(this,i);this.blur();return false}else{if(!i.length){if(d.cookie){r._cookie(d.selected,d.cookie)}r.$panels.stop();var o=this;r.load(r.$tabs.index(this),function(){t.addClass("ui-tabs-selected ui-state-active ui-tabs-deselectable").removeClass("ui-state-default");m(o,s)});this.blur();return false}}}if(d.cookie){r._cookie(d.selected,d.cookie)}r.$panels.stop();if(s.length){var o=this;r.load(r.$tabs.index(this),i.length?function(){g(o,t,i,s)}:function(){t.addClass("ui-tabs-selected ui-state-active").removeClass("ui-state-default");m(o,s)})}else{throw"jQuery UI Tabs: Mismatching fragment identifier."}if(a.browser.msie){this.blur()}return false});if(d.event!="click"){this.$tabs.bind("click.tabs",function(){return false})}},destroy:function(){var b=this.options;this.element.removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all");this.list.unbind(".tabs").removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all").removeData("tabs");this.$tabs.each(function(){var c=a.data(this,"href.tabs");if(c){this.href=c}var d=a(this).unbind(".tabs");a.each(["href","load","cache"],function(e,f){d.removeData(f+".tabs")})});this.$lis.unbind(".tabs").add(this.$panels).each(function(){if(a.data(this,"destroy.tabs")){a(this).remove()}else{a(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-tabs-deselectable ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")}});if(b.cookie){this._cookie(null,b.cookie)}},add:function(c,h,f){if(f==undefined){f=this.$tabs.length}var i=this,e=this.options;var g=a(e.tabTemplate.replace(/#\{href\}/g,c).replace(/#\{label\}/g,h));g.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var d=c.indexOf("#")==0?c.replace("#",""):this._tabId(a("a:first-child",g)[0]);var j=a("#"+d);if(!j.length){j=a(e.panelTemplate).attr("id",d).data("destroy.tabs",true)}j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(f>=this.$lis.length){g.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{g.insertBefore(this.$lis[f]);j.insertBefore(this.$panels[f])}e.disabled=a.map(e.disabled,function(l,k){return l>=f?++l:l});this._tabify();if(this.$tabs.length==1){g.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");var b=a.data(this.$tabs[0],"load.tabs");if(b){this.load(0,function(){i._trigger("show",null,i._ui(i.$tabs[0],i.$panels[0]))})}}this._trigger("add",null,this._ui(this.$tabs[f],this.$panels[f]))},remove:function(b){var d=this.options,e=this.$lis.eq(b).remove(),c=this.$panels.eq(b).remove();if(e.hasClass("ui-tabs-selected")&&this.$tabs.length>1){this.select(b+(b+1<this.$tabs.length?1:-1))}d.disabled=a.map(a.grep(d.disabled,function(g,f){return g!=b}),function(g,f){return g>=b?--g:g});this._tabify();this._trigger("remove",null,this._ui(e.find("a")[0],c[0]))},enable:function(b){var c=this.options;if(a.inArray(b,c.disabled)==-1){return}this.$lis.eq(b).removeClass("ui-state-disabled");c.disabled=a.grep(c.disabled,function(e,d){return e!=b});this._trigger("enable",null,this._ui(this.$tabs[b],this.$panels[b]))},disable:function(c){var b=this,d=this.options;if(c!=d.selected){this.$lis.eq(c).addClass("ui-state-disabled");d.disabled.push(c);d.disabled.sort();this._trigger("disable",null,this._ui(this.$tabs[c],this.$panels[c]))}},select:function(b){if(typeof b=="string"){b=this.$tabs.index(this.$tabs.filter("[href$="+b+"]"))}this.$tabs.eq(b).trigger(this.options.event+".tabs")},load:function(g,k){var l=this,d=this.options,e=this.$tabs.eq(g),j=e[0],h=k==undefined||k===false,b=e.data("load.tabs");k=k||function(){};if(!b||!h&&a.data(j,"cache.tabs")){k();return}var m=function(n){var o=a(n),p=o.find("*:last");return p.length&&p.is(":not(img)")&&p||o};var c=function(){l.$tabs.filter(".ui-tabs-loading").removeClass("ui-tabs-loading").each(function(){if(d.spinner){m(this).parent().html(m(this).data("label.tabs"))}});l.xhr=null};if(d.spinner){var i=m(j).html();m(j).wrapInner("<em></em>").find("em").data("label.tabs",i).html(d.spinner)}var f=a.extend({},d.ajaxOptions,{url:b,success:function(o,n){a(l._sanitizeSelector(j.hash)).html(o);c();if(d.cache){a.data(j,"cache.tabs",true)}l._trigger("load",null,l._ui(l.$tabs[g],l.$panels[g]));try{d.ajaxOptions.success(o,n)}catch(p){}k()}});if(this.xhr){this.xhr.abort();c()}e.addClass("ui-tabs-loading");l.xhr=a.ajax(f)},url:function(c,b){this.$tabs.eq(c).removeData("cache.tabs").data("load.tabs",b)},length:function(){return this.$tabs.length}});a.extend(a.ui.tabs,{version:"1.6rc6",getter:"length",defaults:{ajaxOptions:null,cache:false,cookie:null,deselectable:false,disabled:[],event:"click",fx:null,idPrefix:"ui-tabs-",panelTemplate:"<div></div>",spinner:"Loading&#8230;",tabTemplate:'<li><a href="#{href}"><span>#{label}</span></a></li>'}});a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(d,f){var b=this,e=this.options.selected;function c(){clearTimeout(b.rotation);b.rotation=setTimeout(function(){e=++e<b.$tabs.length?e:0;b.select(e)},d)}if(d){this.element.bind("tabsshow",c);this.$tabs.bind(this.options.event+".tabs",!f?function(g){if(g.clientX){clearTimeout(b.rotation);b.element.unbind("tabsshow",c)}}:function(g){e=b.options.selected;c()});c()}else{clearTimeout(b.rotation);this.element.unbind("tabsshow",c);this.$tabs.unbind(this.options.event+".tabs",stop)}}})})(jQuery);/*
+ * jQuery UI Datepicker 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	ui.core.js
+ */
+(function($){$.extend($.ui,{datepicker:{version:"1.6rc6"}});var PROP_NAME="datepicker";function Datepicker(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._datepickerShowing=false;this._inDialog=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass="ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],dateFormat:"mm/dd/yy",firstDay:0,isRTL:false};this._defaults={showOn:"focus",showAnim:"show",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,showMonthAfterYear:false,yearRange:"-10:+10",showOtherMonths:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"normal",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false};$.extend(this._defaults,this.regional[""]);this.dpDiv=$('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>')}$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",log:function(){if(this.debug){console.log.apply("",arguments)}},setDefaults:function(settings){extendRemove(this._defaults,settings||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase();var inline=(nodeName=="div"||nodeName=="span");if(!target.id){target.id="dp"+(++this.uuid)}var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{});if(nodeName=="input"){this._connectDatepicker(target,inst)}else{if(inline){this._inlineDatepicker(target,inst)}}},_newInst:function(target,inline){var id=target[0].id.replace(/([:\[\]\.])/g,"\\\\$1");return{id:id,input:target,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:inline,dpDiv:(!inline?this.dpDiv:$('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(target,inst){var input=$(target);if(input.hasClass(this.markerClassName)){return}var appendText=this._get(inst,"appendText");var isRTL=this._get(inst,"isRTL");if(appendText){input[isRTL?"before":"after"]('<span class="'+this._appendClass+'">'+appendText+"</span>")}var showOn=this._get(inst,"showOn");if(showOn=="focus"||showOn=="both"){input.focus(this._showDatepicker)}if(showOn=="button"||showOn=="both"){var buttonText=this._get(inst,"buttonText");var buttonImage=this._get(inst,"buttonImage");var trigger=$(this._get(inst,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:buttonImage,alt:buttonText,title:buttonText}):$('<button type="button"></button>').addClass(this._triggerClass).html(buttonImage==""?buttonText:$("<img/>").attr({src:buttonImage,alt:buttonText,title:buttonText})));input[isRTL?"before":"after"](trigger);trigger.click(function(){if($.datepicker._datepickerShowing&&$.datepicker._lastInput==target){$.datepicker._hideDatepicker()}else{$.datepicker._showDatepicker(target)}return false})}input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst)},_inlineDatepicker:function(target,inst){var divSpan=$(target);if(divSpan.hasClass(this.markerClassName)){return}divSpan.addClass(this.markerClassName).append(inst.dpDiv).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst);this._setDate(inst,this._getDefaultDate(inst));this._updateDatepicker(inst);this._updateAlternate(inst)},_dialogDatepicker:function(input,dateText,onSelect,settings,pos){var inst=this._dialogInst;if(!inst){var id="dp"+(++this.uuid);this._dialogInput=$('<input type="text" id="'+id+'" size="1" style="position: absolute; top: -100px;"/>');this._dialogInput.keydown(this._doKeyDown);$("body").append(this._dialogInput);inst=this._dialogInst=this._newInst(this._dialogInput,false);inst.settings={};$.data(this._dialogInput[0],PROP_NAME,inst)}extendRemove(inst.settings,settings||{});this._dialogInput.val(dateText);this._pos=(pos?(pos.length?pos:[pos.pageX,pos.pageY]):null);if(!this._pos){var browserWidth=window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth;var browserHeight=window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight;var scrollX=document.documentElement.scrollLeft||document.body.scrollLeft;var scrollY=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[(browserWidth/2)-100+scrollX,(browserHeight/2)-150+scrollY]}this._dialogInput.css("left",this._pos[0]+"px").css("top",this._pos[1]+"px");inst.settings.onSelect=onSelect;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);if($.blockUI){$.blockUI(this.dpDiv)}$.data(this._dialogInput[0],PROP_NAME,inst);return this},_destroyDatepicker:function(target){var $target=$(target);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();$.removeData(target,PROP_NAME);if(nodeName=="input"){$target.siblings("."+this._appendClass).remove().end().siblings("."+this._triggerClass).remove().end().removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress)}else{if(nodeName=="div"||nodeName=="span"){$target.removeClass(this.markerClassName).empty()}}},_enableDatepicker:function(target){var $target=$(target);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();if(nodeName=="input"){target.disabled=false;$target.siblings("button."+this._triggerClass).each(function(){this.disabled=false}).end().siblings("img."+this._triggerClass).css({opacity:"1.0",cursor:""})}else{if(nodeName=="div"||nodeName=="span"){var inline=$target.children("."+this._inlineClass);inline.children().removeClass("ui-state-disabled")}}this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)})},_disableDatepicker:function(target){var $target=$(target);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();if(nodeName=="input"){target.disabled=true;$target.siblings("button."+this._triggerClass).each(function(){this.disabled=true}).end().siblings("img."+this._triggerClass).css({opacity:"0.5",cursor:"default"})}else{if(nodeName=="div"||nodeName=="span"){var inline=$target.children("."+this._inlineClass);inline.children().addClass("ui-state-disabled")}}this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)});this._disabledInputs[this._disabledInputs.length]=target},_isDisabledDatepicker:function(target){if(!target){return false}for(var i=0;i<this._disabledInputs.length;i++){if(this._disabledInputs[i]==target){return true}}return false},_getInst:function(target){try{return $.data(target,PROP_NAME)}catch(err){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(target,name,value){var settings=name||{};if(typeof name=="string"){settings={};settings[name]=value}var inst=this._getInst(target);if(inst){if(this._curInst==inst){this._hideDatepicker(null)}extendRemove(inst.settings,settings);var date=new Date();extendRemove(inst,{rangeStart:null,endDay:null,endMonth:null,endYear:null,selectedDay:date.getDate(),selectedMonth:date.getMonth(),selectedYear:date.getFullYear(),currentDay:date.getDate(),currentMonth:date.getMonth(),currentYear:date.getFullYear(),drawMonth:date.getMonth(),drawYear:date.getFullYear()});this._updateDatepicker(inst)}},_changeDatepicker:function(target,name,value){this._optionDatepicker(target,name,value)},_refreshDatepicker:function(target){var inst=this._getInst(target);if(inst){this._updateDatepicker(inst)}},_setDateDatepicker:function(target,date,endDate){var inst=this._getInst(target);if(inst){this._setDate(inst,date,endDate);this._updateDatepicker(inst);this._updateAlternate(inst)}},_getDateDatepicker:function(target){var inst=this._getInst(target);if(inst&&!inst.inline){this._setDateFromField(inst)}return(inst?this._getDate(inst):null)},_doKeyDown:function(event){var inst=$.datepicker._getInst(event.target);var handled=true;var isRTL=inst.dpDiv.is(".ui-datepicker-rtl");inst._keyEvent=true;if($.datepicker._datepickerShowing){switch(event.keyCode){case 9:$.datepicker._hideDatepicker(null,"");break;case 13:var sel=$("td."+$.datepicker._dayOverClass+", td."+$.datepicker._currentClass,inst.dpDiv);if(sel[0]){$.datepicker._selectDay(event.target,inst.selectedMonth,inst.selectedYear,sel[0])}else{$.datepicker._hideDatepicker(null,$.datepicker._get(inst,"duration"))}return false;break;case 27:$.datepicker._hideDatepicker(null,$.datepicker._get(inst,"duration"));break;case 33:$.datepicker._adjustDate(event.target,(event.ctrlKey?-$.datepicker._get(inst,"stepBigMonths"):-$.datepicker._get(inst,"stepMonths")),"M");break;case 34:$.datepicker._adjustDate(event.target,(event.ctrlKey?+$.datepicker._get(inst,"stepBigMonths"):+$.datepicker._get(inst,"stepMonths")),"M");break;case 35:if(event.ctrlKey||event.metaKey){$.datepicker._clearDate(event.target)}handled=event.ctrlKey||event.metaKey;break;case 36:if(event.ctrlKey||event.metaKey){$.datepicker._gotoToday(event.target)}handled=event.ctrlKey||event.metaKey;break;case 37:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,(isRTL?+1:-1),"D")}handled=event.ctrlKey||event.metaKey;if(event.originalEvent.altKey){$.datepicker._adjustDate(event.target,(event.ctrlKey?-$.datepicker._get(inst,"stepBigMonths"):-$.datepicker._get(inst,"stepMonths")),"M")}break;case 38:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,-7,"D")}handled=event.ctrlKey||event.metaKey;break;case 39:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,(isRTL?-1:+1),"D")}handled=event.ctrlKey||event.metaKey;if(event.originalEvent.altKey){$.datepicker._adjustDate(event.target,(event.ctrlKey?+$.datepicker._get(inst,"stepBigMonths"):+$.datepicker._get(inst,"stepMonths")),"M")}break;case 40:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,+7,"D")}handled=event.ctrlKey||event.metaKey;break;default:handled=false}}else{if(event.keyCode==36&&event.ctrlKey){$.datepicker._showDatepicker(this)}else{handled=false}}if(handled){event.preventDefault();event.stopPropagation()}},_doKeyPress:function(event){var inst=$.datepicker._getInst(event.target);if($.datepicker._get(inst,"constrainInput")){var chars=$.datepicker._possibleChars($.datepicker._get(inst,"dateFormat"));var chr=String.fromCharCode(event.charCode==undefined?event.keyCode:event.charCode);return event.ctrlKey||(chr<" "||!chars||chars.indexOf(chr)>-1)}},_showDatepicker:function(input){input=input.target||input;if(input.nodeName.toLowerCase()!="input"){input=$("input",input.parentNode)[0]}if($.datepicker._isDisabledDatepicker(input)||$.datepicker._lastInput==input){return}var inst=$.datepicker._getInst(input);var beforeShow=$.datepicker._get(inst,"beforeShow");extendRemove(inst.settings,(beforeShow?beforeShow.apply(input,[input,inst]):{}));$.datepicker._hideDatepicker(null,"");$.datepicker._lastInput=input;$.datepicker._setDateFromField(inst);if($.datepicker._inDialog){input.value=""}if(!$.datepicker._pos){$.datepicker._pos=$.datepicker._findPos(input);$.datepicker._pos[1]+=input.offsetHeight}var isFixed=false;$(input).parents().each(function(){isFixed|=$(this).css("position")=="fixed";return !isFixed});if(isFixed&&$.browser.opera){$.datepicker._pos[0]-=document.documentElement.scrollLeft;$.datepicker._pos[1]-=document.documentElement.scrollTop}var offset={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null;inst.rangeStart=null;inst.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});$.datepicker._updateDatepicker(inst);offset=$.datepicker._checkOffset(inst,offset,isFixed);inst.dpDiv.css({position:($.datepicker._inDialog&&$.blockUI?"static":(isFixed?"fixed":"absolute")),display:"none",left:offset.left+"px",top:offset.top+"px"});if(!inst.inline){var showAnim=$.datepicker._get(inst,"showAnim")||"show";var duration=$.datepicker._get(inst,"duration");var postProcess=function(){$.datepicker._datepickerShowing=true;if($.browser.msie&&parseInt($.browser.version,10)<7){$("iframe.ui-datepicker-cover").css({width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4})}};if($.effects&&$.effects[showAnim]){inst.dpDiv.show(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[showAnim](duration,postProcess)}if(duration==""){postProcess()}if(inst.input[0].type!="hidden"){inst.input[0].focus()}$.datepicker._curInst=inst}},_updateDatepicker:function(inst){var dims={width:inst.dpDiv.width()+4,height:inst.dpDiv.height()+4};var self=this;inst.dpDiv.empty().append(this._generateHTML(inst)).find("iframe.ui-datepicker-cover").css({width:dims.width,height:dims.height}).end().find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",function(){$(this).removeClass("ui-state-hover");if(this.className.indexOf("ui-datepicker-prev")!=-1){$(this).removeClass("ui-datepicker-prev-hover")}if(this.className.indexOf("ui-datepicker-next")!=-1){$(this).removeClass("ui-datepicker-next-hover")}}).bind("mouseover",function(){if(!self._isDisabledDatepicker(inst.inline?inst.dpDiv.parent()[0]:inst.input[0])){$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");$(this).addClass("ui-state-hover");if(this.className.indexOf("ui-datepicker-prev")!=-1){$(this).addClass("ui-datepicker-prev-hover")}if(this.className.indexOf("ui-datepicker-next")!=-1){$(this).addClass("ui-datepicker-next-hover")}}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();var numMonths=this._getNumberOfMonths(inst);var cols=numMonths[1];var width=17;if(cols>1){inst.dpDiv.addClass("ui-datepicker-multi-"+cols).css("width",(width*cols)+"em")}else{inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("")}inst.dpDiv[(numMonths[0]!=1||numMonths[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");inst.dpDiv[(this._get(inst,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");if(inst.input&&inst.input[0].type!="hidden"&&inst==$.datepicker._curInst){$(inst.input[0]).focus()}},_checkOffset:function(inst,offset,isFixed){var dpWidth=inst.dpDiv.outerWidth();var dpHeight=inst.dpDiv.outerHeight();var inputWidth=inst.input?inst.input.outerWidth():0;var inputHeight=inst.input?inst.input.outerHeight():0;var viewWidth=(window.innerWidth||document.documentElement.clientWidth||document.body.clientWidth)+$(document).scrollLeft();var viewHeight=(window.innerHeight||document.documentElement.clientHeight||document.body.clientHeight)+$(document).scrollTop();offset.left-=(this._get(inst,"isRTL")?(dpWidth-inputWidth):0);offset.left-=(isFixed&&offset.left==inst.input.offset().left)?$(document).scrollLeft():0;offset.top-=(isFixed&&offset.top==(inst.input.offset().top+inputHeight))?$(document).scrollTop():0;offset.left-=(offset.left+dpWidth>viewWidth&&viewWidth>dpWidth)?Math.abs(offset.left+dpWidth-viewWidth):0;offset.top-=(offset.top+dpHeight>viewHeight&&viewHeight>dpHeight)?Math.abs(offset.top+dpHeight+inputHeight*2-viewHeight):0;return offset},_findPos:function(obj){while(obj&&(obj.type=="hidden"||obj.nodeType!=1)){obj=obj.nextSibling}var position=$(obj).offset();return[position.left,position.top]},_hideDatepicker:function(input,duration){var inst=this._curInst;if(!inst||(input&&inst!=$.data(input,PROP_NAME))){return}if(inst.stayOpen){this._selectDate("#"+inst.id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear))}inst.stayOpen=false;if(this._datepickerShowing){duration=(duration!=null?duration:this._get(inst,"duration"));var showAnim=this._get(inst,"showAnim");var postProcess=function(){$.datepicker._tidyDialog(inst)};if(duration!=""&&$.effects&&$.effects[showAnim]){inst.dpDiv.hide(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[(duration==""?"hide":(showAnim=="slideDown"?"slideUp":(showAnim=="fadeIn"?"fadeOut":"hide")))](duration,postProcess)}if(duration==""){this._tidyDialog(inst)}var onClose=this._get(inst,"onClose");if(onClose){onClose.apply((inst.input?inst.input[0]:null),[(inst.input?inst.input.val():""),inst])}this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if($.blockUI){$.unblockUI();$("body").append(this.dpDiv)}}this._inDialog=false}this._curInst=null},_tidyDialog:function(inst){inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(event){if(!$.datepicker._curInst){return}var $target=$(event.target);if(($target.parents("#"+$.datepicker._mainDivId).length==0)&&!$target.hasClass($.datepicker.markerClassName)&&!$target.hasClass($.datepicker._triggerClass)&&$.datepicker._datepickerShowing&&!($.datepicker._inDialog&&$.blockUI)){$.datepicker._hideDatepicker(null,"")}},_adjustDate:function(id,offset,period){var target=$(id);var inst=this._getInst(target[0]);if(this._isDisabledDatepicker(target[0])){return}this._adjustInstDate(inst,offset+(period=="M"?this._get(inst,"showCurrentAtPos"):0),period);this._updateDatepicker(inst)},_gotoToday:function(id){var target=$(id);var inst=this._getInst(target[0]);if(this._get(inst,"gotoCurrent")&&inst.currentDay){inst.selectedDay=inst.currentDay;inst.drawMonth=inst.selectedMonth=inst.currentMonth;inst.drawYear=inst.selectedYear=inst.currentYear}else{var date=new Date();inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear()}this._notifyChange(inst);this._adjustDate(target)},_selectMonthYear:function(id,select,period){var target=$(id);var inst=this._getInst(target[0]);inst._selectingMonthYear=false;inst["selected"+(period=="M"?"Month":"Year")]=inst["draw"+(period=="M"?"Month":"Year")]=parseInt(select.options[select.selectedIndex].value,10);this._notifyChange(inst);this._adjustDate(target)},_clickMonthYear:function(id){var target=$(id);var inst=this._getInst(target[0]);if(inst.input&&inst._selectingMonthYear&&!$.browser.msie){inst.input[0].focus()}inst._selectingMonthYear=!inst._selectingMonthYear},_selectDay:function(id,month,year,td){var target=$(id);if($(td).hasClass(this._unselectableClass)||this._isDisabledDatepicker(target[0])){return}var inst=this._getInst(target[0]);inst.selectedDay=inst.currentDay=$("a",td).html();inst.selectedMonth=inst.currentMonth=month;inst.selectedYear=inst.currentYear=year;if(inst.stayOpen){inst.endDay=inst.endMonth=inst.endYear=null}this._selectDate(id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear));if(inst.stayOpen){inst.rangeStart=this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay));this._updateDatepicker(inst)}},_clearDate:function(id){var target=$(id);var inst=this._getInst(target[0]);inst.stayOpen=false;inst.endDay=inst.endMonth=inst.endYear=inst.rangeStart=null;this._selectDate(target,"")},_selectDate:function(id,dateStr){var target=$(id);var inst=this._getInst(target[0]);dateStr=(dateStr!=null?dateStr:this._formatDate(inst));if(inst.input){inst.input.val(dateStr)}this._updateAlternate(inst);var onSelect=this._get(inst,"onSelect");if(onSelect){onSelect.apply((inst.input?inst.input[0]:null),[dateStr,inst])}else{if(inst.input){inst.input.trigger("change")}}if(inst.inline){this._updateDatepicker(inst)}else{if(!inst.stayOpen){this._hideDatepicker(null,this._get(inst,"duration"));this._lastInput=inst.input[0];if(typeof(inst.input[0])!="object"){inst.input[0].focus()}this._lastInput=null}}},_updateAlternate:function(inst){var altField=this._get(inst,"altField");if(altField){var altFormat=this._get(inst,"altFormat")||this._get(inst,"dateFormat");var date=this._getDate(inst);dateStr=this.formatDate(altFormat,date,this._getFormatConfig(inst));$(altField).each(function(){$(this).val(dateStr)})}},noWeekends:function(date){var day=date.getDay();return[(day>0&&day<6),""]},iso8601Week:function(date){var checkDate=new Date(date.getFullYear(),date.getMonth(),date.getDate());var firstMon=new Date(checkDate.getFullYear(),1-1,4);var firstDay=firstMon.getDay()||7;firstMon.setDate(firstMon.getDate()+1-firstDay);if(firstDay<4&&checkDate<firstMon){checkDate.setDate(checkDate.getDate()-3);return $.datepicker.iso8601Week(checkDate)}else{if(checkDate>new Date(checkDate.getFullYear(),12-1,28)){firstDay=new Date(checkDate.getFullYear()+1,1-1,4).getDay()||7;if(firstDay>4&&(checkDate.getDay()||7)<firstDay-3){return 1}}}return Math.floor(((checkDate-firstMon)/86400000)/7)+1},parseDate:function(format,value,settings){if(format==null||value==null){throw"Invalid arguments"}value=(typeof value=="object"?value.toString():value+"");if(value==""){return null}var shortYearCutoff=(settings?settings.shortYearCutoff:null)||this._defaults.shortYearCutoff;var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var year=-1;var month=-1;var day=-1;var doy=-1;var literal=false;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var getNumber=function(match){lookAhead(match);var origSize=(match=="@"?14:(match=="y"?4:(match=="o"?3:2)));var size=origSize;var num=0;while(size>0&&iValue<value.length&&value.charAt(iValue)>="0"&&value.charAt(iValue)<="9"){num=num*10+parseInt(value.charAt(iValue++),10);size--}if(size==origSize){throw"Missing number at position "+iValue}return num};var getName=function(match,shortNames,longNames){var names=(lookAhead(match)?longNames:shortNames);var size=0;for(var j=0;j<names.length;j++){size=Math.max(size,names[j].length)}var name="";var iInit=iValue;while(size>0&&iValue<value.length){name+=value.charAt(iValue++);for(var i=0;i<names.length;i++){if(name==names[i]){return i+1}}size--}throw"Unknown name at position "+iInit};var checkLiteral=function(){if(value.charAt(iValue)!=format.charAt(iFormat)){throw"Unexpected literal at position "+iValue}iValue++};var iValue=0;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{checkLiteral()}}else{switch(format.charAt(iFormat)){case"d":day=getNumber("d");break;case"D":getName("D",dayNamesShort,dayNames);break;case"o":doy=getNumber("o");break;case"m":month=getNumber("m");break;case"M":month=getName("M",monthNamesShort,monthNames);break;case"y":year=getNumber("y");break;case"@":var date=new Date(getNumber("@"));year=date.getFullYear();month=date.getMonth()+1;day=date.getDate();break;case"'":if(lookAhead("'")){checkLiteral()}else{literal=true}break;default:checkLiteral()}}}if(year==-1){year=new Date().getFullYear()}else{if(year<100){year+=new Date().getFullYear()-new Date().getFullYear()%100+(year<=shortYearCutoff?0:-100)}}if(doy>-1){month=1;day=doy;do{var dim=this._getDaysInMonth(year,month-1);if(day<=dim){break}month++;day-=dim}while(true)}var date=this._daylightSavingAdjust(new Date(year,month-1,day));if(date.getFullYear()!=year||date.getMonth()+1!=month||date.getDate()!=day){throw"Invalid date"}return date},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TIMESTAMP:"@",W3C:"yy-mm-dd",formatDate:function(format,date,settings){if(!date){return""}var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var formatNumber=function(match,value,len){var num=""+value;if(lookAhead(match)){while(num.length<len){num="0"+num}}return num};var formatName=function(match,value,shortNames,longNames){return(lookAhead(match)?longNames[value]:shortNames[value])};var output="";var literal=false;if(date){for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{output+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":output+=formatNumber("d",date.getDate(),2);break;case"D":output+=formatName("D",date.getDay(),dayNamesShort,dayNames);break;case"o":var doy=date.getDate();for(var m=date.getMonth()-1;m>=0;m--){doy+=this._getDaysInMonth(date.getFullYear(),m)}output+=formatNumber("o",doy,3);break;case"m":output+=formatNumber("m",date.getMonth()+1,2);break;case"M":output+=formatName("M",date.getMonth(),monthNamesShort,monthNames);break;case"y":output+=(lookAhead("y")?date.getFullYear():(date.getYear()%100<10?"0":"")+date.getYear()%100);break;case"@":output+=date.getTime();break;case"'":if(lookAhead("'")){output+="'"}else{literal=true}break;default:output+=format.charAt(iFormat)}}}}return output},_possibleChars:function(format){var chars="";var literal=false;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{chars+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":case"m":case"y":case"@":chars+="0123456789";break;case"D":case"M":return null;case"'":if(lookAhead("'")){chars+="'"}else{literal=true}break;default:chars+=format.charAt(iFormat)}}}return chars},_get:function(inst,name){return inst.settings[name]!==undefined?inst.settings[name]:this._defaults[name]},_setDateFromField:function(inst){var dateFormat=this._get(inst,"dateFormat");var dates=inst.input?inst.input.val():null;inst.endDay=inst.endMonth=inst.endYear=null;var date=defaultDate=this._getDefaultDate(inst);var settings=this._getFormatConfig(inst);try{date=this.parseDate(dateFormat,dates,settings)||defaultDate}catch(event){this.log(event);date=defaultDate}inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();inst.currentDay=(dates?date.getDate():0);inst.currentMonth=(dates?date.getMonth():0);inst.currentYear=(dates?date.getFullYear():0);this._adjustInstDate(inst)},_getDefaultDate:function(inst){var date=this._determineDate(this._get(inst,"defaultDate"),new Date());var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);return date},_determineDate:function(date,defaultDate){var offsetNumeric=function(offset){var date=new Date();date.setDate(date.getDate()+offset);return date};var offsetString=function(offset,getDaysInMonth){var date=new Date();var year=date.getFullYear();var month=date.getMonth();var day=date.getDate();var pattern=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;var matches=pattern.exec(offset);while(matches){switch(matches[2]||"d"){case"d":case"D":day+=parseInt(matches[1],10);break;case"w":case"W":day+=parseInt(matches[1],10)*7;break;case"m":case"M":month+=parseInt(matches[1],10);day=Math.min(day,getDaysInMonth(year,month));break;case"y":case"Y":year+=parseInt(matches[1],10);day=Math.min(day,getDaysInMonth(year,month));break}matches=pattern.exec(offset)}return new Date(year,month,day)};date=(date==null?defaultDate:(typeof date=="string"?offsetString(date,this._getDaysInMonth):(typeof date=="number"?(isNaN(date)?defaultDate:offsetNumeric(date)):date)));date=(date&&date.toString()=="Invalid Date"?defaultDate:date);if(date){date.setHours(0);date.setMinutes(0);date.setSeconds(0);date.setMilliseconds(0)}return this._daylightSavingAdjust(date)},_daylightSavingAdjust:function(date){if(!date){return null}date.setHours(date.getHours()>12?date.getHours()+2:0);return date},_setDate:function(inst,date,endDate){var clear=!(date);var origMonth=inst.selectedMonth;var origYear=inst.selectedYear;date=this._determineDate(date,new Date());inst.selectedDay=inst.currentDay=date.getDate();inst.drawMonth=inst.selectedMonth=inst.currentMonth=date.getMonth();inst.drawYear=inst.selectedYear=inst.currentYear=date.getFullYear();if(origMonth!=inst.selectedMonth||origYear!=inst.selectedYear){this._notifyChange(inst)}this._adjustInstDate(inst);if(inst.input){inst.input.val(clear?"":this._formatDate(inst))}},_getDate:function(inst){var startDate=(!inst.currentYear||(inst.input&&inst.input.val()=="")?null:this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));return startDate},_generateHTML:function(inst){var today=new Date();today=this._daylightSavingAdjust(new Date(today.getFullYear(),today.getMonth(),today.getDate()));var isRTL=this._get(inst,"isRTL");var showButtonPanel=this._get(inst,"showButtonPanel");var hideIfNoPrevNext=this._get(inst,"hideIfNoPrevNext");var navigationAsDateFormat=this._get(inst,"navigationAsDateFormat");var numMonths=this._getNumberOfMonths(inst);var showCurrentAtPos=this._get(inst,"showCurrentAtPos");var stepMonths=this._get(inst,"stepMonths");var stepBigMonths=this._get(inst,"stepBigMonths");var isMultiMonth=(numMonths[0]!=1||numMonths[1]!=1);var currentDate=this._daylightSavingAdjust((!inst.currentDay?new Date(9999,9,9):new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");var drawMonth=inst.drawMonth-showCurrentAtPos;var drawYear=inst.drawYear;if(drawMonth<0){drawMonth+=12;drawYear--}if(maxDate){var maxDraw=this._daylightSavingAdjust(new Date(maxDate.getFullYear(),maxDate.getMonth()-numMonths[1]+1,maxDate.getDate()));maxDraw=(minDate&&maxDraw<minDate?minDate:maxDraw);while(this._daylightSavingAdjust(new Date(drawYear,drawMonth,1))>maxDraw){drawMonth--;if(drawMonth<0){drawMonth=11;drawYear--}}}inst.drawMonth=drawMonth;inst.drawYear=drawYear;var prevText=this._get(inst,"prevText");prevText=(!navigationAsDateFormat?prevText:this.formatDate(prevText,this._daylightSavingAdjust(new Date(drawYear,drawMonth-stepMonths,1)),this._getFormatConfig(inst)));var prev=(this._canAdjustMonth(inst,-1,drawYear,drawMonth)?'<a class="ui-datepicker-prev ui-corner-all" onclick="jQuery.datepicker._adjustDate(\'#'+inst.id+"', -"+stepMonths+", 'M');\" title=\""+prevText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"e":"w")+'">'+prevText+"</span></a>":(hideIfNoPrevNext?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+prevText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"e":"w")+'">'+prevText+"</span></a>"));var nextText=this._get(inst,"nextText");nextText=(!navigationAsDateFormat?nextText:this.formatDate(nextText,this._daylightSavingAdjust(new Date(drawYear,drawMonth+stepMonths,1)),this._getFormatConfig(inst)));var next=(this._canAdjustMonth(inst,+1,drawYear,drawMonth)?'<a class="ui-datepicker-next ui-corner-all" onclick="jQuery.datepicker._adjustDate(\'#'+inst.id+"', +"+stepMonths+", 'M');\" title=\""+nextText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"w":"e")+'">'+nextText+"</span></a>":(hideIfNoPrevNext?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+nextText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"w":"e")+'">'+nextText+"</span></a>"));var currentText=this._get(inst,"currentText");var gotoDate=(this._get(inst,"gotoCurrent")&&inst.currentDay?currentDate:today);currentText=(!navigationAsDateFormat?currentText:this.formatDate(currentText,gotoDate,this._getFormatConfig(inst)));var controls='<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="jQuery.datepicker._hideDatepicker();">'+this._get(inst,"closeText")+"</button>";var buttonPanel=(showButtonPanel)?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(isRTL?controls:"")+(this._isInRange(inst,gotoDate)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="jQuery.datepicker._gotoToday(\'#'+inst.id+"');\">"+currentText+"</button>":"")+(isRTL?"":controls)+"</div>":"";var firstDay=parseInt(this._get(inst,"firstDay"),10);firstDay=(isNaN(firstDay)?0:firstDay);var dayNames=this._get(inst,"dayNames");var dayNamesShort=this._get(inst,"dayNamesShort");var dayNamesMin=this._get(inst,"dayNamesMin");var monthNames=this._get(inst,"monthNames");var monthNamesShort=this._get(inst,"monthNamesShort");var beforeShowDay=this._get(inst,"beforeShowDay");var showOtherMonths=this._get(inst,"showOtherMonths");var calculateWeek=this._get(inst,"calculateWeek")||this.iso8601Week;var endDate=inst.endDay?this._daylightSavingAdjust(new Date(inst.endYear,inst.endMonth,inst.endDay)):currentDate;var defaultDate=this._getDefaultDate(inst);var html="";for(var row=0;row<numMonths[0];row++){var group="";for(var col=0;col<numMonths[1];col++){var selectedDate=this._daylightSavingAdjust(new Date(drawYear,drawMonth,inst.selectedDay));var cornerClass=" ui-corner-all";var calender="";if(isMultiMonth){calender+='<div class="ui-datepicker-group ui-datepicker-group-';switch(col){case 0:calender+="first";cornerClass=" ui-corner-"+(isRTL?"right":"left");break;case numMonths[1]-1:calender+="last";cornerClass=" ui-corner-"+(isRTL?"left":"right");break;default:calender+="middle";cornerClass="";break}calender+='">'}calender+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+cornerClass+'">'+(/all|left/.test(cornerClass)&&row==0?(isRTL?next:prev):"")+(/all|right/.test(cornerClass)&&row==0?(isRTL?prev:next):"")+this._generateMonthYearHeader(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,row>0||col>0,monthNames,monthNamesShort)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var thead="";for(var dow=0;dow<7;dow++){var day=(dow+firstDay)%7;thead+="<th"+((dow+firstDay+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+dayNames[day]+'">'+dayNamesMin[day]+"</span></th>"}calender+=thead+"</tr></thead><tbody>";var daysInMonth=this._getDaysInMonth(drawYear,drawMonth);if(drawYear==inst.selectedYear&&drawMonth==inst.selectedMonth){inst.selectedDay=Math.min(inst.selectedDay,daysInMonth)}var leadDays=(this._getFirstDayOfMonth(drawYear,drawMonth)-firstDay+7)%7;var numRows=(isMultiMonth?6:Math.ceil((leadDays+daysInMonth)/7));var printDate=this._daylightSavingAdjust(new Date(drawYear,drawMonth,1-leadDays));for(var dRow=0;dRow<numRows;dRow++){calender+="<tr>";var tbody="";for(var dow=0;dow<7;dow++){var daySettings=(beforeShowDay?beforeShowDay.apply((inst.input?inst.input[0]:null),[printDate]):[true,""]);var otherMonth=(printDate.getMonth()!=drawMonth);var unselectable=otherMonth||!daySettings[0]||(minDate&&printDate<minDate)||(maxDate&&printDate>maxDate);tbody+='<td class="'+((dow+firstDay+6)%7>=5?" ui-datepicker-week-end":"")+(otherMonth?" ui-datepicker-other-month":"")+((printDate.getTime()==selectedDate.getTime()&&drawMonth==inst.selectedMonth&&inst._keyEvent)||(defaultDate.getTime()==printDate.getTime()&&defaultDate.getTime()==selectedDate.getTime())?" "+this._dayOverClass:"")+(unselectable?" "+this._unselectableClass+" ui-state-disabled":"")+(otherMonth&&!showOtherMonths?"":" "+daySettings[1]+(printDate.getTime()>=currentDate.getTime()&&printDate.getTime()<=endDate.getTime()?" "+this._currentClass:"")+(printDate.getTime()==today.getTime()?" ui-datepicker-today":""))+'"'+((!otherMonth||showOtherMonths)&&daySettings[2]?' title="'+daySettings[2]+'"':"")+(unselectable?"":" onclick=\"jQuery.datepicker._selectDay('#"+inst.id+"',"+drawMonth+","+drawYear+', this);return false;"')+">"+(otherMonth?(showOtherMonths?printDate.getDate():"&#xa0;"):(unselectable?'<span class="ui-state-default">'+printDate.getDate()+"</span>":'<a class="ui-state-default'+(printDate.getTime()==today.getTime()?" ui-state-highlight":"")+(printDate.getTime()>=currentDate.getTime()&&printDate.getTime()<=endDate.getTime()?" ui-state-active":"")+'" href="#">'+printDate.getDate()+"</a>"))+"</td>";printDate.setDate(printDate.getDate()+1);printDate=this._daylightSavingAdjust(printDate)}calender+=tbody+"</tr>"}drawMonth++;if(drawMonth>11){drawMonth=0;drawYear++}calender+="</tbody></table>"+(isMultiMonth?"</div>":"");group+=calender}html+=group}html+=(!inst.inline?buttonPanel:"")+($.browser.msie&&parseInt($.browser.version,10)<7&&!inst.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");inst._keyEvent=false;return html},_generateMonthYearHeader:function(inst,drawMonth,drawYear,minDate,maxDate,selectedDate,secondary,monthNames,monthNamesShort){minDate=(inst.rangeStart&&minDate&&selectedDate<minDate?selectedDate:minDate);var changeMonth=this._get(inst,"changeMonth");var changeYear=this._get(inst,"changeYear");var showMonthAfterYear=this._get(inst,"showMonthAfterYear");var html='<div class="ui-datepicker-title">';var monthHtml="";if(secondary||!changeMonth){monthHtml+='<span class="ui-datepicker-month">'+monthNames[drawMonth]+"</span> "}else{var inMinYear=(minDate&&minDate.getFullYear()==drawYear);var inMaxYear=(maxDate&&maxDate.getFullYear()==drawYear);monthHtml+='<select class="ui-datepicker-month" onchange="jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'M');\" onclick=\"jQuery.datepicker._clickMonthYear('#"+inst.id+"');\">";for(var month=0;month<12;month++){if((!inMinYear||month>=minDate.getMonth())&&(!inMaxYear||month<=maxDate.getMonth())){monthHtml+='<option value="'+month+'"'+(month==drawMonth?' selected="selected"':"")+">"+monthNamesShort[month]+"</option>"}}monthHtml+="</select>"}if(!showMonthAfterYear){html+=monthHtml+((secondary||changeMonth||changeYear)&&(!(changeMonth&&changeYear))?"&#xa0;":"")}if(secondary||!changeYear){html+='<span class="ui-datepicker-year">'+drawYear+"</span>"}else{var years=this._get(inst,"yearRange").split(":");var year=0;var endYear=0;if(years.length!=2){year=drawYear-10;endYear=drawYear+10}else{if(years[0].charAt(0)=="+"||years[0].charAt(0)=="-"){year=drawYear+parseInt(years[0],10);endYear=drawYear+parseInt(years[1],10)}else{year=parseInt(years[0],10);endYear=parseInt(years[1],10)}}year=(minDate?Math.max(year,minDate.getFullYear()):year);endYear=(maxDate?Math.min(endYear,maxDate.getFullYear()):endYear);html+='<select class="ui-datepicker-year" onchange="jQuery.datepicker._selectMonthYear(\'#'+inst.id+"', this, 'Y');\" onclick=\"jQuery.datepicker._clickMonthYear('#"+inst.id+"');\">";for(;year<=endYear;year++){html+='<option value="'+year+'"'+(year==drawYear?' selected="selected"':"")+">"+year+"</option>"}html+="</select>"}if(showMonthAfterYear){html+=(secondary||changeMonth||changeYear?"&#xa0;":"")+monthHtml}html+="</div>";return html},_adjustInstDate:function(inst,offset,period){var year=inst.drawYear+(period=="Y"?offset:0);var month=inst.drawMonth+(period=="M"?offset:0);var day=Math.min(inst.selectedDay,this._getDaysInMonth(year,month))+(period=="D"?offset:0);var date=this._daylightSavingAdjust(new Date(year,month,day));var minDate=this._getMinMaxDate(inst,"min",true);var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();if(period=="M"||period=="Y"){this._notifyChange(inst)}},_notifyChange:function(inst){var onChange=this._get(inst,"onChangeMonthYear");if(onChange){onChange.apply((inst.input?inst.input[0]:null),[inst.selectedYear,inst.selectedMonth+1,inst])}},_getNumberOfMonths:function(inst){var numMonths=this._get(inst,"numberOfMonths");return(numMonths==null?[1,1]:(typeof numMonths=="number"?[1,numMonths]:numMonths))},_getMinMaxDate:function(inst,minMax,checkRange){var date=this._determineDate(this._get(inst,minMax+"Date"),null);return(!checkRange||!inst.rangeStart?date:(!date||inst.rangeStart>date?inst.rangeStart:date))},_getDaysInMonth:function(year,month){return 32-new Date(year,month,32).getDate()},_getFirstDayOfMonth:function(year,month){return new Date(year,month,1).getDay()},_canAdjustMonth:function(inst,offset,curYear,curMonth){var numMonths=this._getNumberOfMonths(inst);var date=this._daylightSavingAdjust(new Date(curYear,curMonth+(offset<0?offset:numMonths[1]),1));if(offset<0){date.setDate(this._getDaysInMonth(date.getFullYear(),date.getMonth()))}return this._isInRange(inst,date)},_isInRange:function(inst,date){var newMinDate=(!inst.rangeStart?null:this._daylightSavingAdjust(new Date(inst.selectedYear,inst.selectedMonth,inst.selectedDay)));newMinDate=(newMinDate&&inst.rangeStart<newMinDate?inst.rangeStart:newMinDate);var minDate=newMinDate||this._getMinMaxDate(inst,"min");var maxDate=this._getMinMaxDate(inst,"max");return((!minDate||date>=minDate)&&(!maxDate||date<=maxDate))},_getFormatConfig:function(inst){var shortYearCutoff=this._get(inst,"shortYearCutoff");shortYearCutoff=(typeof shortYearCutoff!="string"?shortYearCutoff:new Date().getFullYear()%100+parseInt(shortYearCutoff,10));return{shortYearCutoff:shortYearCutoff,dayNamesShort:this._get(inst,"dayNamesShort"),dayNames:this._get(inst,"dayNames"),monthNamesShort:this._get(inst,"monthNamesShort"),monthNames:this._get(inst,"monthNames")}},_formatDate:function(inst,day,month,year){if(!day){inst.currentDay=inst.selectedDay;inst.currentMonth=inst.selectedMonth;inst.currentYear=inst.selectedYear}var date=(day?(typeof day=="object"?day:this._daylightSavingAdjust(new Date(year,month,day))):this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));return this.formatDate(this._get(inst,"dateFormat"),date,this._getFormatConfig(inst))}});function extendRemove(target,props){$.extend(target,props);for(var name in props){if(props[name]==null||props[name]==undefined){target[name]=props[name]}}return target}function isArray(a){return(a&&(($.browser.safari&&typeof a=="object"&&a.length)||(a.constructor&&a.constructor.toString().match(/\Array\(\)/))))}$.fn.datepicker=function(options){if(!$.datepicker.initialized){$(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv);$.datepicker.initialized=true}var otherArgs=Array.prototype.slice.call(arguments,1);if(typeof options=="string"&&(options=="isDisabled"||options=="getDate")){return $.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this[0]].concat(otherArgs))}return this.each(function(){typeof options=="string"?$.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this].concat(otherArgs)):$.datepicker._attachDatepicker(this,options)})};$.datepicker=new Datepicker();$.datepicker.initialized=false;$.datepicker.uuid=new Date().getTime();$.datepicker.version="1.6rc6"})(jQuery);/*
+ * jQuery UI Progressbar 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   ui.core.js
+ */
+(function(a){a.widget("ui.progressbar",{_init:function(){var b=this,c=this.options;this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this._valueMin(),"aria-valuemax":this._valueMax(),"aria-valuenow":this._value()});this.valueDiv=a('<div class="ui-progressbar-value ui-widget-header ui-corner-left"></div>').appendTo(this.element);this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow").removeData("progressbar").unbind(".progressbar");this.valueDiv.remove();a.widget.prototype.destroy.apply(this,arguments)},value:function(b){arguments.length&&this._setData("value",b);return this._value()},_setData:function(b,c){switch(b){case"value":this.options.value=c;this._refreshValue();this._trigger("change",null,{});break}a.widget.prototype._setData.apply(this,arguments)},_value:function(){var b=this.options.value;if(b<this._valueMin()){b=this._valueMin()}if(b>this._valueMax()){b=this._valueMax()}return b},_valueMin:function(){var b=0;return b},_valueMax:function(){var b=100;return b},_refreshValue:function(){var b=this.value();this.valueDiv[b==this._valueMax()?"addClass":"removeClass"]("ui-corner-right");this.valueDiv.width(b+"%");this.element.attr("aria-valuenow",b)}});a.extend(a.ui.progressbar,{version:"1.6rc6",defaults:{value:0}})})(jQuery);/*
+ * jQuery UI Effects 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+(function(d){d.effects=d.effects||{};d.extend(d.effects,{version:"1.6rc6",save:function(g,h){for(var f=0;f<h.length;f++){if(h[f]!==null){g.data("ec.storage."+h[f],g[0].style[h[f]])}}},restore:function(g,h){for(var f=0;f<h.length;f++){if(h[f]!==null){g.css(h[f],g.data("ec.storage."+h[f]))}}},setMode:function(f,g){if(g=="toggle"){g=f.is(":hidden")?"show":"hide"}return g},getBaseline:function(g,h){var i,f;switch(g[0]){case"top":i=0;break;case"middle":i=0.5;break;case"bottom":i=1;break;default:i=g[0]/h.height}switch(g[1]){case"left":f=0;break;case"center":f=0.5;break;case"right":f=1;break;default:f=g[1]/h.width}return{x:f,y:i}},createWrapper:function(f){if(f.parent().is(".ui-effects-wrapper")){return f.parent()}var g={width:f.outerWidth(true),height:f.outerHeight(true),"float":f.css("float")};f.wrap('<div class="ui-effects-wrapper" style="font-size:100%;background:transparent;border:none;margin:0;padding:0"></div>');var j=f.parent();if(f.css("position")=="static"){j.css({position:"relative"});f.css({position:"relative"})}else{var i=f.css("top");if(isNaN(parseInt(i,10))){i="auto"}var h=f.css("left");if(isNaN(parseInt(h,10))){h="auto"}j.css({position:f.css("position"),top:i,left:h,zIndex:f.css("z-index")}).show();f.css({position:"relative",top:0,left:0})}j.css(g);return j},removeWrapper:function(f){if(f.parent().is(".ui-effects-wrapper")){return f.parent().replaceWith(f)}return f},setTransition:function(g,i,f,h){h=h||{};d.each(i,function(k,j){unit=g.cssUnit(j);if(unit[0]>0){h[j]=unit[0]*f+unit[1]}});return h},animateClass:function(h,i,k,j){var f=(typeof k=="function"?k:(j?j:null));var g=(typeof k=="string"?k:null);return this.each(function(){var q={};var o=d(this);var p=o.attr("style")||"";if(typeof p=="object"){p=p.cssText}if(h.toggle){o.hasClass(h.toggle)?h.remove=h.toggle:h.add=h.toggle}var l=d.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(h.add){o.addClass(h.add)}if(h.remove){o.removeClass(h.remove)}var m=d.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(h.add){o.removeClass(h.add)}if(h.remove){o.addClass(h.remove)}for(var r in m){if(typeof m[r]!="function"&&m[r]&&r.indexOf("Moz")==-1&&r.indexOf("length")==-1&&m[r]!=l[r]&&(r.match(/color/i)||(!r.match(/color/i)&&!isNaN(parseInt(m[r],10))))&&(l.position!="static"||(l.position=="static"&&!r.match(/left|top|bottom|right/)))){q[r]=m[r]}}o.animate(q,i,g,function(){if(typeof d(this).attr("style")=="object"){d(this).attr("style")["cssText"]="";d(this).attr("style")["cssText"]=p}else{d(this).attr("style",p)}if(h.add){d(this).addClass(h.add)}if(h.remove){d(this).removeClass(h.remove)}if(f){f.apply(this,arguments)}})})}});function c(g,f){var i=g[1]&&g[1].constructor==Object?g[1]:{};if(f){i.mode=f}var h=g[1]&&g[1].constructor!=Object?g[1]:i.duration;h=d.fx.off?0:typeof h==="number"?h:d.fx.speeds[h]||d.fx.speeds._default;var j=i.callback||(d.isFunction(g[2])&&g[2])||(d.isFunction(g[3])&&g[3]);return[g[0],i,h,j]}d.fn.extend({_show:d.fn.show,_hide:d.fn.hide,__toggle:d.fn.toggle,_addClass:d.fn.addClass,_removeClass:d.fn.removeClass,_toggleClass:d.fn.toggleClass,effect:function(g,f,h,i){return d.effects[g]?d.effects[g].call(this,{method:g,options:f||{},duration:h,callback:i}):null},show:function(){if(!arguments[0]||(arguments[0].constructor==Number||(/(slow|normal|fast)/).test(arguments[0]))){return this._show.apply(this,arguments)}else{return this.effect.apply(this,c(arguments,"show"))}},hide:function(){if(!arguments[0]||(arguments[0].constructor==Number||(/(slow|normal|fast)/).test(arguments[0]))){return this._hide.apply(this,arguments)}else{return this.effect.apply(this,c(arguments,"hide"))}},toggle:function(){if(!arguments[0]||(arguments[0].constructor==Number||(/(slow|normal|fast)/).test(arguments[0]))||(arguments[0].constructor==Function)){return this.__toggle.apply(this,arguments)}else{return this.effect.apply(this,c(arguments,"toggle"))}},addClass:function(g,f,i,h){return f?d.effects.animateClass.apply(this,[{add:g},f,i,h]):this._addClass(g)},removeClass:function(g,f,i,h){return f?d.effects.animateClass.apply(this,[{remove:g},f,i,h]):this._removeClass(g)},toggleClass:function(g,f,i,h){return((typeof f!=="boolean")&&f)?d.effects.animateClass.apply(this,[{toggle:g},f,i,h]):this._toggleClass(g,f)},morph:function(f,h,g,j,i){return d.effects.animateClass.apply(this,[{add:h,remove:f},g,j,i])},switchClass:function(){return this.morph.apply(this,arguments)},cssUnit:function(f){var g=this.css(f),h=[];d.each(["em","px","%","pt"],function(j,k){if(g.indexOf(k)>0){h=[parseFloat(g),k]}});return h}});d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(g,f){d.fx.step[f]=function(h){if(h.state==0){h.start=e(h.elem,f);h.end=b(h.end)}h.elem.style[f]="rgb("+[Math.max(Math.min(parseInt((h.pos*(h.end[0]-h.start[0]))+h.start[0],10),255),0),Math.max(Math.min(parseInt((h.pos*(h.end[1]-h.start[1]))+h.start[1],10),255),0),Math.max(Math.min(parseInt((h.pos*(h.end[2]-h.start[2]))+h.start[2],10),255),0)].join(",")+")"}});function b(g){var f;if(g&&g.constructor==Array&&g.length==3){return g}if(f=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(g)){return[parseInt(f[1],10),parseInt(f[2],10),parseInt(f[3],10)]}if(f=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(g)){return[parseFloat(f[1])*2.55,parseFloat(f[2])*2.55,parseFloat(f[3])*2.55]}if(f=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(g)){return[parseInt(f[1],16),parseInt(f[2],16),parseInt(f[3],16)]}if(f=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(g)){return[parseInt(f[1]+f[1],16),parseInt(f[2]+f[2],16),parseInt(f[3]+f[3],16)]}if(f=/rgba\(0, 0, 0, 0\)/.exec(g)){return a.transparent}return a[d.trim(g).toLowerCase()]}function e(h,f){var g;do{g=d.curCSS(h,f);if(g!=""&&g!="transparent"||d.nodeName(h,"body")){break}f="backgroundColor"}while(h=h.parentNode);return b(g)}var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]};d.easing.jswing=d.easing.swing;d.extend(d.easing,{def:"easeOutQuad",swing:function(g,h,f,j,i){return d.easing[d.easing.def](g,h,f,j,i)},easeInQuad:function(g,h,f,j,i){return j*(h/=i)*h+f},easeOutQuad:function(g,h,f,j,i){return -j*(h/=i)*(h-2)+f},easeInOutQuad:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h+f}return -j/2*((--h)*(h-2)-1)+f},easeInCubic:function(g,h,f,j,i){return j*(h/=i)*h*h+f},easeOutCubic:function(g,h,f,j,i){return j*((h=h/i-1)*h*h+1)+f},easeInOutCubic:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h*h+f}return j/2*((h-=2)*h*h+2)+f},easeInQuart:function(g,h,f,j,i){return j*(h/=i)*h*h*h+f},easeOutQuart:function(g,h,f,j,i){return -j*((h=h/i-1)*h*h*h-1)+f},easeInOutQuart:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h*h*h+f}return -j/2*((h-=2)*h*h*h-2)+f},easeInQuint:function(g,h,f,j,i){return j*(h/=i)*h*h*h*h+f},easeOutQuint:function(g,h,f,j,i){return j*((h=h/i-1)*h*h*h*h+1)+f},easeInOutQuint:function(g,h,f,j,i){if((h/=i/2)<1){return j/2*h*h*h*h*h+f}return j/2*((h-=2)*h*h*h*h+2)+f},easeInSine:function(g,h,f,j,i){return -j*Math.cos(h/i*(Math.PI/2))+j+f},easeOutSine:function(g,h,f,j,i){return j*Math.sin(h/i*(Math.PI/2))+f},easeInOutSine:function(g,h,f,j,i){return -j/2*(Math.cos(Math.PI*h/i)-1)+f},easeInExpo:function(g,h,f,j,i){return(h==0)?f:j*Math.pow(2,10*(h/i-1))+f},easeOutExpo:function(g,h,f,j,i){return(h==i)?f+j:j*(-Math.pow(2,-10*h/i)+1)+f},easeInOutExpo:function(g,h,f,j,i){if(h==0){return f}if(h==i){return f+j}if((h/=i/2)<1){return j/2*Math.pow(2,10*(h-1))+f}return j/2*(-Math.pow(2,-10*--h)+2)+f},easeInCirc:function(g,h,f,j,i){return -j*(Math.sqrt(1-(h/=i)*h)-1)+f},easeOutCirc:function(g,h,f,j,i){return j*Math.sqrt(1-(h=h/i-1)*h)+f},easeInOutCirc:function(g,h,f,j,i){if((h/=i/2)<1){return -j/2*(Math.sqrt(1-h*h)-1)+f}return j/2*(Math.sqrt(1-(h-=2)*h)+1)+f},easeInElastic:function(g,i,f,m,l){var j=1.70158;var k=0;var h=m;if(i==0){return f}if((i/=l)==1){return f+m}if(!k){k=l*0.3}if(h<Math.abs(m)){h=m;var j=k/4}else{var j=k/(2*Math.PI)*Math.asin(m/h)}return -(h*Math.pow(2,10*(i-=1))*Math.sin((i*l-j)*(2*Math.PI)/k))+f},easeOutElastic:function(g,i,f,m,l){var j=1.70158;var k=0;var h=m;if(i==0){return f}if((i/=l)==1){return f+m}if(!k){k=l*0.3}if(h<Math.abs(m)){h=m;var j=k/4}else{var j=k/(2*Math.PI)*Math.asin(m/h)}return h*Math.pow(2,-10*i)*Math.sin((i*l-j)*(2*Math.PI)/k)+m+f},easeInOutElastic:function(g,i,f,m,l){var j=1.70158;var k=0;var h=m;if(i==0){return f}if((i/=l/2)==2){return f+m}if(!k){k=l*(0.3*1.5)}if(h<Math.abs(m)){h=m;var j=k/4}else{var j=k/(2*Math.PI)*Math.asin(m/h)}if(i<1){return -0.5*(h*Math.pow(2,10*(i-=1))*Math.sin((i*l-j)*(2*Math.PI)/k))+f}return h*Math.pow(2,-10*(i-=1))*Math.sin((i*l-j)*(2*Math.PI)/k)*0.5+m+f},easeInBack:function(g,h,f,k,j,i){if(i==undefined){i=1.70158}return k*(h/=j)*h*((i+1)*h-i)+f},easeOutBack:function(g,h,f,k,j,i){if(i==undefined){i=1.70158}return k*((h=h/j-1)*h*((i+1)*h+i)+1)+f},easeInOutBack:function(g,h,f,k,j,i){if(i==undefined){i=1.70158}if((h/=j/2)<1){return k/2*(h*h*(((i*=(1.525))+1)*h-i))+f}return k/2*((h-=2)*h*(((i*=(1.525))+1)*h+i)+2)+f},easeInBounce:function(g,h,f,j,i){return j-d.easing.easeOutBounce(g,i-h,0,j,i)+f},easeOutBounce:function(g,h,f,j,i){if((h/=i)<(1/2.75)){return j*(7.5625*h*h)+f}else{if(h<(2/2.75)){return j*(7.5625*(h-=(1.5/2.75))*h+0.75)+f}else{if(h<(2.5/2.75)){return j*(7.5625*(h-=(2.25/2.75))*h+0.9375)+f}else{return j*(7.5625*(h-=(2.625/2.75))*h+0.984375)+f}}}},easeInOutBounce:function(g,h,f,j,i){if(h<i/2){return d.easing.easeInBounce(g,h*2,0,j,i)*0.5+f}return d.easing.easeOutBounce(g,h*2-i,0,j,i)*0.5+j*0.5+f}})})(jQuery);/*
+ * jQuery UI Effects Blind 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.blind=function(b){return this.queue(function(){var d=a(this),c=["position","top","left"];var h=a.effects.setMode(d,b.options.mode||"hide");var g=b.options.direction||"vertical";a.effects.save(d,c);d.show();var j=a.effects.createWrapper(d).css({overflow:"hidden"});var e=(g=="vertical")?"height":"width";var i=(g=="vertical")?j.height():j.width();if(h=="show"){j.css(e,0)}var f={};f[e]=h=="show"?i:0;j.animate(f,b.duration,b.options.easing,function(){if(h=="hide"){d.hide()}a.effects.restore(d,c);a.effects.removeWrapper(d);if(b.callback){b.callback.apply(d[0],arguments)}d.dequeue()})})}})(jQuery);/*
+ * jQuery UI Effects Bounce 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.bounce=function(b){return this.queue(function(){var e=a(this),l=["position","top","left"];var k=a.effects.setMode(e,b.options.mode||"effect");var n=b.options.direction||"up";var c=b.options.distance||20;var d=b.options.times||5;var g=b.duration||250;if(/show|hide/.test(k)){l.push("opacity")}a.effects.save(e,l);e.show();a.effects.createWrapper(e);var f=(n=="up"||n=="down")?"top":"left";var p=(n=="up"||n=="left")?"pos":"neg";var c=b.options.distance||(f=="top"?e.outerHeight({margin:true})/3:e.outerWidth({margin:true})/3);if(k=="show"){e.css("opacity",0).css(f,p=="pos"?-c:c)}if(k=="hide"){c=c/(d*2)}if(k!="hide"){d--}if(k=="show"){var h={opacity:1};h[f]=(p=="pos"?"+=":"-=")+c;e.animate(h,g/2,b.options.easing);c=c/2;d--}for(var j=0;j<d;j++){var o={},m={};o[f]=(p=="pos"?"-=":"+=")+c;m[f]=(p=="pos"?"+=":"-=")+c;e.animate(o,g/2,b.options.easing).animate(m,g/2,b.options.easing);c=(k=="hide")?c*2:c/2}if(k=="hide"){var h={opacity:0};h[f]=(p=="pos"?"-=":"+=")+c;e.animate(h,g/2,b.options.easing,function(){e.hide();a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}})}else{var o={},m={};o[f]=(p=="pos"?"-=":"+=")+c;m[f]=(p=="pos"?"+=":"-=")+c;e.animate(o,g/2,b.options.easing).animate(m,g/2,b.options.easing,function(){a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}})}e.queue("fx",function(){e.dequeue()});e.dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Clip 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.clip=function(b){return this.queue(function(){var f=a(this),j=["position","top","left","height","width"];var i=a.effects.setMode(f,b.options.mode||"hide");var k=b.options.direction||"vertical";a.effects.save(f,j);f.show();var c=a.effects.createWrapper(f).css({overflow:"hidden"});var e=f[0].tagName=="IMG"?c:f;var g={size:(k=="vertical")?"height":"width",position:(k=="vertical")?"top":"left"};var d=(k=="vertical")?e.height():e.width();if(i=="show"){e.css(g.size,0);e.css(g.position,d/2)}var h={};h[g.size]=i=="show"?d:0;h[g.position]=i=="show"?0:d/2;e.animate(h,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){f.hide()}a.effects.restore(f,j);a.effects.removeWrapper(f);if(b.callback){b.callback.apply(f[0],arguments)}f.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Drop 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.drop=function(b){return this.queue(function(){var e=a(this),d=["position","top","left","opacity"];var i=a.effects.setMode(e,b.options.mode||"hide");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e);var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true})/2:e.outerWidth({margin:true})/2);if(i=="show"){e.css("opacity",0).css(f,c=="pos"?-j:j)}var g={opacity:i=="show"?1:0};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Explode 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.explode=function(b){return this.queue(function(){var k=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;var e=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;b.options.mode=b.options.mode=="toggle"?(a(this).is(":visible")?"hide":"show"):b.options.mode;var h=a(this).show().css("visibility","hidden");var l=h.offset();l.top-=parseInt(h.css("marginTop"))||0;l.left-=parseInt(h.css("marginLeft"))||0;var g=h.outerWidth(true);var c=h.outerHeight(true);for(var f=0;f<k;f++){for(var d=0;d<e;d++){h.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-d*(g/e),top:-f*(c/k)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:g/e,height:c/k,left:l.left+d*(g/e)+(b.options.mode=="show"?(d-Math.floor(e/2))*(g/e):0),top:l.top+f*(c/k)+(b.options.mode=="show"?(f-Math.floor(k/2))*(c/k):0),opacity:b.options.mode=="show"?0:1}).animate({left:l.left+d*(g/e)+(b.options.mode=="show"?0:(d-Math.floor(e/2))*(g/e)),top:l.top+f*(c/k)+(b.options.mode=="show"?0:(f-Math.floor(k/2))*(c/k)),opacity:b.options.mode=="show"?1:0},b.duration||500)}}setTimeout(function(){b.options.mode=="show"?h.css({visibility:"visible"}):h.css({visibility:"visible"}).hide();if(b.callback){b.callback.apply(h[0])}h.dequeue();a("div.ui-effects-explode").remove()},b.duration||500)})}})(jQuery);/*
+ * jQuery UI Effects Fold 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.fold=function(b){return this.queue(function(){var e=a(this),k=["position","top","left"];var h=a.effects.setMode(e,b.options.mode||"hide");var o=b.options.size||15;var n=!(!b.options.horizFirst);var g=b.duration?b.duration/2:a.fx.speeds._default/2;a.effects.save(e,k);e.show();var d=a.effects.createWrapper(e).css({overflow:"hidden"});var i=((h=="show")!=n);var f=i?["width","height"]:["height","width"];var c=i?[d.width(),d.height()]:[d.height(),d.width()];var j=/([0-9]+)%/.exec(o);if(j){o=parseInt(j[1])/100*c[h=="hide"?0:1]}if(h=="show"){d.css(n?{height:0,width:o}:{height:o,width:0})}var m={},l={};m[f[0]]=h=="show"?c[0]:o;l[f[1]]=h=="show"?c[1]:0;d.animate(m,g,b.options.easing).animate(l,g,b.options.easing,function(){if(h=="hide"){e.hide()}a.effects.restore(e,k);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(e[0],arguments)}e.dequeue()})})}})(jQuery);/*
+ * jQuery UI Effects Highlight 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.highlight=function(b){return this.queue(function(){var e=a(this),d=["backgroundImage","backgroundColor","opacity"];var h=a.effects.setMode(e,b.options.mode||"show");var c=b.options.color||"#ffff99";var g=e.css("backgroundColor");a.effects.save(e,d);e.show();e.css({backgroundImage:"none",backgroundColor:c});var f={backgroundColor:g};if(h=="hide"){f.opacity=0}e.animate(f,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(h=="hide"){e.hide()}a.effects.restore(e,d);if(h=="show"&&a.browser.msie){this.style.removeAttribute("filter")}if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Pulsate 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.pulsate=function(b){return this.queue(function(){var d=a(this);var g=a.effects.setMode(d,b.options.mode||"show");var f=b.options.times||5;var e=b.duration?b.duration/2:a.fx.speeds._default/2;if(g=="hide"){f--}if(d.is(":hidden")){d.css("opacity",0);d.show();d.animate({opacity:1},e,b.options.easing);f=f-2}for(var c=0;c<f;c++){d.animate({opacity:0},e,b.options.easing).animate({opacity:1},e,b.options.easing)}if(g=="hide"){d.animate({opacity:0},e,b.options.easing,function(){d.hide();if(b.callback){b.callback.apply(this,arguments)}})}else{d.animate({opacity:0},e,b.options.easing).animate({opacity:1},e,b.options.easing,function(){if(b.callback){b.callback.apply(this,arguments)}})}d.queue("fx",function(){d.dequeue()});d.dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Scale 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.puff=function(b){return this.queue(function(){var f=a(this);var c=a.extend(true,{},b.options);var h=a.effects.setMode(f,b.options.mode||"hide");var g=parseInt(b.options.percent)||150;c.fade=true;var e={height:f.height(),width:f.width()};var d=g/100;f.from=(h=="hide")?e:{height:e.height*d,width:e.width*d};c.from=f.from;c.percent=(h=="hide")?g:100;c.mode=h;f.effect("scale",c,b.duration,b.callback);f.dequeue()})};a.effects.scale=function(b){return this.queue(function(){var g=a(this);var d=a.extend(true,{},b.options);var j=a.effects.setMode(g,b.options.mode||"effect");var h=parseInt(b.options.percent)||(parseInt(b.options.percent)==0?0:(j=="hide"?0:100));var i=b.options.direction||"both";var c=b.options.origin;if(j!="effect"){d.origin=c||["middle","center"];d.restore=true}var f={height:g.height(),width:g.width()};g.from=b.options.from||(j=="show"?{height:0,width:0}:f);var e={y:i!="horizontal"?(h/100):1,x:i!="vertical"?(h/100):1};g.to={height:f.height*e.y,width:f.width*e.x};if(b.options.fade){if(j=="show"){g.from.opacity=0;g.to.opacity=1}if(j=="hide"){g.from.opacity=1;g.to.opacity=0}}d.from=g.from;d.to=g.to;d.mode=j;g.effect("size",d,b.duration,b.callback);g.dequeue()})};a.effects.size=function(b){return this.queue(function(){var c=a(this),n=["position","top","left","width","height","overflow","opacity"];var m=["position","top","left","overflow","opacity"];var j=["width","height","overflow"];var p=["fontSize"];var k=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];var f=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"];var g=a.effects.setMode(c,b.options.mode||"effect");var i=b.options.restore||false;var e=b.options.scale||"both";var o=b.options.origin;var d={height:c.height(),width:c.width()};c.from=b.options.from||d;c.to=b.options.to||d;if(o){var h=a.effects.getBaseline(o,d);c.from.top=(d.height-c.from.height)*h.y;c.from.left=(d.width-c.from.width)*h.x;c.to.top=(d.height-c.to.height)*h.y;c.to.left=(d.width-c.to.width)*h.x}var l={from:{y:c.from.height/d.height,x:c.from.width/d.width},to:{y:c.to.height/d.height,x:c.to.width/d.width}};if(e=="box"||e=="both"){if(l.from.y!=l.to.y){n=n.concat(k);c.from=a.effects.setTransition(c,k,l.from.y,c.from);c.to=a.effects.setTransition(c,k,l.to.y,c.to)}if(l.from.x!=l.to.x){n=n.concat(f);c.from=a.effects.setTransition(c,f,l.from.x,c.from);c.to=a.effects.setTransition(c,f,l.to.x,c.to)}}if(e=="content"||e=="both"){if(l.from.y!=l.to.y){n=n.concat(p);c.from=a.effects.setTransition(c,p,l.from.y,c.from);c.to=a.effects.setTransition(c,p,l.to.y,c.to)}}a.effects.save(c,i?n:m);c.show();a.effects.createWrapper(c);c.css("overflow","hidden").css(c.from);if(e=="content"||e=="both"){k=k.concat(["marginTop","marginBottom"]).concat(p);f=f.concat(["marginLeft","marginRight"]);j=n.concat(k).concat(f);c.find("*[width]").each(function(){child=a(this);if(i){a.effects.save(child,j)}var q={height:child.height(),width:child.width()};child.from={height:q.height*l.from.y,width:q.width*l.from.x};child.to={height:q.height*l.to.y,width:q.width*l.to.x};if(l.from.y!=l.to.y){child.from=a.effects.setTransition(child,k,l.from.y,child.from);child.to=a.effects.setTransition(child,k,l.to.y,child.to)}if(l.from.x!=l.to.x){child.from=a.effects.setTransition(child,f,l.from.x,child.from);child.to=a.effects.setTransition(child,f,l.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){if(i){a.effects.restore(child,j)}})})}c.animate(c.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(g=="hide"){c.hide()}a.effects.restore(c,i?n:m);a.effects.removeWrapper(c);if(b.callback){b.callback.apply(this,arguments)}c.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Shake 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.shake=function(b){return this.queue(function(){var e=a(this),l=["position","top","left"];var k=a.effects.setMode(e,b.options.mode||"effect");var n=b.options.direction||"left";var c=b.options.distance||20;var d=b.options.times||3;var g=b.duration||b.options.duration||140;a.effects.save(e,l);e.show();a.effects.createWrapper(e);var f=(n=="up"||n=="down")?"top":"left";var p=(n=="up"||n=="left")?"pos":"neg";var h={},o={},m={};h[f]=(p=="pos"?"-=":"+=")+c;o[f]=(p=="pos"?"+=":"-=")+c*2;m[f]=(p=="pos"?"-=":"+=")+c*2;e.animate(h,g,b.options.easing);for(var j=1;j<d;j++){e.animate(o,g,b.options.easing).animate(m,g,b.options.easing)}e.animate(o,g,b.options.easing).animate(h,g/2,b.options.easing,function(){a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}});e.queue("fx",function(){e.dequeue()});e.dequeue()})}})(jQuery);/*
+ * jQuery UI Effects Slide 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.slide=function(b){return this.queue(function(){var e=a(this),d=["position","top","left"];var i=a.effects.setMode(e,b.options.mode||"show");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e).css({overflow:"hidden"});var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true}):e.outerWidth({margin:true}));if(i=="show"){e.css(f,c=="pos"?-j:j)}var g={};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);/*
+ * jQuery UI Effects Transfer 1.6rc6
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://ui.jquery.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	effects.core.js
+ */
+(function(a){a.effects.transfer=function(b){return this.queue(function(){var e=a(this);var g=a.effects.setMode(e,b.options.mode||"effect");var f=a(b.options.to);var c=e.offset();var d=a('<div class="ui-effects-transfer"></div>').appendTo(document.body);if(b.options.className){d.addClass(b.options.className)}d.addClass(b.options.className);d.css({top:c.top,left:c.left,height:e.outerHeight()-parseInt(d.css("borderTopWidth"))-parseInt(d.css("borderBottomWidth")),width:e.outerWidth()-parseInt(d.css("borderLeftWidth"))-parseInt(d.css("borderRightWidth")),position:"absolute"});c=f.offset();animation={top:c.top,left:c.left,height:f.outerHeight()-parseInt(d.css("borderTopWidth"))-parseInt(d.css("borderBottomWidth")),width:f.outerWidth()-parseInt(d.css("borderLeftWidth"))-parseInt(d.css("borderRightWidth"))};d.animate(animation,b.duration,b.options.easing,function(){d.remove();if(b.callback){b.callback.apply(e[0],arguments)}e.dequeue()})})}})(jQuery);
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/test.php b/code/ryzom/tools/server/www/webtt/app/webroot/test.php
new file mode 100644
index 000000000..2c2e9a82b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/test.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Web Access Frontend for TestSuite
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing
+ * @package       cake
+ * @subpackage    cake.app.webroot
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+set_time_limit(0);
+ini_set('display_errors', 1);
+/**
+ * Use the DS to separate the directories in other defines
+ */
+	if (!defined('DS')) {
+		define('DS', DIRECTORY_SEPARATOR);
+	}
+/**
+ * These defines should only be edited if you have cake installed in
+ * a directory layout other than the way it is distributed.
+ * When using custom settings be sure to use the DS and do not add a trailing DS.
+ */
+
+/**
+ * The full path to the directory which holds "app", WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('ROOT')) {
+		define('ROOT', dirname(dirname(dirname(__FILE__))));
+	}
+/**
+ * The actual directory name for the "app".
+ *
+ */
+	if (!defined('APP_DIR')) {
+		define('APP_DIR', basename(dirname(dirname(__FILE__))));
+	}
+/**
+ * The absolute path to the "cake" directory, WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+		define('CAKE_CORE_INCLUDE_PATH', ROOT);
+	}
+
+/**
+ * Editing below this line should not be necessary.
+ * Change at your own risk.
+ *
+ */
+if (!defined('WEBROOT_DIR')) {
+	define('WEBROOT_DIR', basename(dirname(__FILE__)));
+}
+if (!defined('WWW_ROOT')) {
+	define('WWW_ROOT', dirname(__FILE__) . DS);
+}
+if (!defined('CORE_PATH')) {
+	if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
+		define('APP_PATH', null);
+		define('CORE_PATH', null);
+	} else {
+		define('APP_PATH', ROOT . DS . APP_DIR . DS);
+		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+	}
+}
+if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
+	trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
+}
+
+$corePath = App::core('cake');
+if (isset($corePath[0])) {
+	define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
+} else {
+	define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
+}
+
+if (Configure::read('debug') < 1) {
+	die(__('Debug setting does not allow access to this url.', true));
+}
+
+require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php';
+
+$Dispatcher = new CakeTestSuiteDispatcher();
+$Dispatcher->dispatch();
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/raw_testfile.csv b/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/raw_testfile.csv
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/testdir/ugatestindir.csv b/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/testdir/ugatestindir.csv
new file mode 100644
index 000000000..a65b80e40
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/testdir/ugatestindir.csv
@@ -0,0 +1,6 @@
+fdg
+dfg
+dfg
+sd
+fgsd
+gsd
diff --git a/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/ugabla.csv b/code/ryzom/tools/server/www/webtt/app/webroot/testfiles/ugabla.csv
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/LICENSE.txt b/code/ryzom/tools/server/www/webtt/cake/LICENSE.txt
new file mode 100644
index 000000000..bf6f82dd4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/LICENSE.txt
@@ -0,0 +1,22 @@
+The MIT License
+
+CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
+Copyright 2005-2010, Cake Software Foundation, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/VERSION.txt b/code/ryzom/tools/server/www/webtt/cake/VERSION.txt
new file mode 100644
index 000000000..f443e5a7c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/VERSION.txt
@@ -0,0 +1,21 @@
+////////////////////////////////////////////////////////////////////////////////////////////////////
+// +--------------------------------------------------------------------------------------------+ //
+// CakePHP Version
+//
+// Holds a static string representing the current version of CakePHP
+//
+// CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+// Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+//
+// Licensed under The MIT License
+// Redistributions of files must retain the above copyright notice.
+//
+// @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+// @link          http://cakephp.org
+// @package       cake
+// @subpackage    cake.cake.libs
+// @since         CakePHP(tm) v 0.2.9
+// @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+// +--------------------------------------------------------------------------------------------+ //
+////////////////////////////////////////////////////////////////////////////////////////////////////
+1.3.9
diff --git a/code/ryzom/tools/server/www/webtt/cake/basics.php b/code/ryzom/tools/server/www/webtt/cake/basics.php
new file mode 100644
index 000000000..ac3f02ae0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/basics.php
@@ -0,0 +1,1026 @@
+<?php
+/**
+ * Basic Cake functionality.
+ *
+ * Core functions for including other source files, loading models and so forth.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Basic defines for timing functions.
+ */
+	define('SECOND', 1);
+	define('MINUTE', 60);
+	define('HOUR', 3600);
+	define('DAY', 86400);
+	define('WEEK', 604800);
+	define('MONTH', 2592000);
+	define('YEAR', 31536000);
+
+/**
+ * Patch for PHP < 5.0
+ */
+if (!function_exists('clone')) {
+	if (version_compare(PHP_VERSION, '5.0') < 0) {
+		eval ('
+		function clone($object)
+		{
+			return $object;
+		}');
+	}
+}
+
+/**
+ * Loads configuration files. Receives a set of configuration files
+ * to load.
+ * Example:
+ *
+ * `config('config1', 'config2');`
+ *
+ * @return boolean Success
+ * @link http://book.cakephp.org/view/1125/config
+ */
+	function config() {
+		$args = func_get_args();
+		foreach ($args as $arg) {
+			if ($arg === 'database' && file_exists(CONFIGS . 'database.php')) {
+				include_once(CONFIGS . $arg . '.php');
+			} elseif (file_exists(CONFIGS . $arg . '.php')) {
+				include_once(CONFIGS . $arg . '.php');
+
+				if (count($args) == 1) {
+					return true;
+				}
+			} else {
+				if (count($args) == 1) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Loads component/components from LIBS. Takes optional number of parameters.
+ *
+ * Example:
+ *
+ * `uses('flay', 'time');`
+ *
+ * @param string $name Filename without the .php part
+ * @deprecated Will be removed in 2.0
+ * @link http://book.cakephp.org/view/1140/uses
+ */
+	function uses() {
+		$args = func_get_args();
+		foreach ($args as $file) {
+			require_once(LIBS . strtolower($file) . '.php');
+		}
+	}
+
+/**
+ * Prints out debug information about given variable.
+ *
+ * Only runs if debug level is greater than zero.
+ *
+ * @param boolean $var Variable to show debug information for.
+ * @param boolean $showHtml If set to true, the method prints the debug data in a screen-friendly way.
+ * @param boolean $showFrom If set to true, the method prints from where the function was called.
+ * @link http://book.cakephp.org/view/1190/Basic-Debugging
+ * @link http://book.cakephp.org/view/1128/debug
+ */
+	function debug($var = false, $showHtml = false, $showFrom = true) {
+		if (Configure::read() > 0) {
+			if ($showFrom) {
+				$calledFrom = debug_backtrace();
+				echo '<strong>' . substr(str_replace(ROOT, '', $calledFrom[0]['file']), 1) . '</strong>';
+				echo ' (line <strong>' . $calledFrom[0]['line'] . '</strong>)';
+			}
+			echo "\n<pre class=\"cake-debug\">\n";
+
+			$var = print_r($var, true);
+			if ($showHtml) {
+				$var = str_replace('<', '&lt;', str_replace('>', '&gt;', $var));
+			}
+			echo $var . "\n</pre>\n";
+		}
+	}
+if (!function_exists('getMicrotime')) {
+
+/**
+ * Returns microtime for execution time checking
+ *
+ * @return float Microtime
+ */
+	function getMicrotime() {
+		list($usec, $sec) = explode(' ', microtime());
+		return ((float)$usec + (float)$sec);
+	}
+}
+if (!function_exists('sortByKey')) {
+
+/**
+ * Sorts given $array by key $sortby.
+ *
+ * @param array $array Array to sort
+ * @param string $sortby Sort by this key
+ * @param string $order  Sort order asc/desc (ascending or descending).
+ * @param integer $type Type of sorting to perform
+ * @return mixed Sorted array
+ */
+	function sortByKey(&$array, $sortby, $order = 'asc', $type = SORT_NUMERIC) {
+		if (!is_array($array)) {
+			return null;
+		}
+
+		foreach ($array as $key => $val) {
+			$sa[$key] = $val[$sortby];
+		}
+
+		if ($order == 'asc') {
+			asort($sa, $type);
+		} else {
+			arsort($sa, $type);
+		}
+
+		foreach ($sa as $key => $val) {
+			$out[] = $array[$key];
+		}
+		return $out;
+	}
+}
+if (!function_exists('array_combine')) {
+
+/**
+ * Combines given identical arrays by using the first array's values as keys,
+ * and the second one's values as values. (Implemented for backwards compatibility with PHP4)
+ *
+ * @param array $a1 Array to use for keys
+ * @param array $a2 Array to use for values
+ * @return mixed Outputs either combined array or false.
+ * @deprecated Will be removed in 2.0
+ */
+	function array_combine($a1, $a2) {
+		$a1 = array_values($a1);
+		$a2 = array_values($a2);
+		$c1 = count($a1);
+		$c2 = count($a2);
+
+		if ($c1 != $c2) {
+			return false;
+		}
+		if ($c1 <= 0) {
+			return false;
+		}
+		$output = array();
+
+		for ($i = 0; $i < $c1; $i++) {
+			$output[$a1[$i]] = $a2[$i];
+		}
+		return $output;
+	}
+}
+
+/**
+ * Convenience method for htmlspecialchars.
+ *
+ * @param string $text Text to wrap through htmlspecialchars
+ * @param string $charset Character set to use when escaping.  Defaults to config value in 'App.encoding' or 'UTF-8'
+ * @return string Wrapped text
+ * @link http://book.cakephp.org/view/1132/h
+ */
+	function h($text, $charset = null) {
+		if (is_array($text)) {
+			return array_map('h', $text);
+		}
+
+		static $defaultCharset = false;
+		if ($defaultCharset === false) {
+			$defaultCharset = Configure::read('App.encoding');
+			if ($defaultCharset === null) {
+				$defaultCharset = 'UTF-8';
+			}
+		}
+		if ($charset) {
+			return htmlspecialchars($text, ENT_QUOTES, $charset);
+		} else {
+			return htmlspecialchars($text, ENT_QUOTES, $defaultCharset);
+		}
+	}
+
+/**
+ * Splits a dot syntax plugin name into its plugin and classname.
+ * If $name does not have a dot, then index 0 will be null.
+ *
+ * Commonly used like `list($plugin, $name) = pluginSplit($name);`
+ *
+ * @param string $name The name you want to plugin split.
+ * @param boolean $dotAppend Set to true if you want the plugin to have a '.' appended to it.
+ * @param string $plugin Optional default plugin to use if no plugin is found. Defaults to null.
+ * @return array Array with 2 indexes.  0 => plugin name, 1 => classname
+ */
+	function pluginSplit($name, $dotAppend = false, $plugin = null) {
+		if (strpos($name, '.') !== false) {
+			$parts = explode('.', $name, 2);
+			if ($dotAppend) {
+				$parts[0] .= '.';
+			}
+			return $parts;
+		}
+		return array($plugin, $name);
+	}
+
+/**
+ * Returns an array of all the given parameters.
+ *
+ * Example:
+ *
+ * `a('a', 'b')`
+ *
+ * Would return:
+ *
+ * `array('a', 'b')`
+ *
+ * @return array Array of given parameters
+ * @link http://book.cakephp.org/view/1122/a
+ * @deprecated Will be removed in 2.0
+ */
+	function a() {
+		$args = func_get_args();
+		return $args;
+	}
+
+/**
+ * Constructs associative array from pairs of arguments.
+ *
+ * Example:
+ *
+ * `aa('a','b')`
+ *
+ * Would return:
+ *
+ * `array('a'=>'b')`
+ *
+ * @return array Associative array
+ * @link http://book.cakephp.org/view/1123/aa
+ * @deprecated Will be removed in 2.0
+ */
+	function aa() {
+		$args = func_get_args();
+		$argc = count($args);
+		for ($i = 0; $i < $argc; $i++) {
+			if ($i + 1 < $argc) {
+				$a[$args[$i]] = $args[$i + 1];
+			} else {
+				$a[$args[$i]] = null;
+			}
+			$i++;
+		}
+		return $a;
+	}
+
+/**
+ * Convenience method for echo().
+ *
+ * @param string $text String to echo
+ * @link http://book.cakephp.org/view/1129/e
+ * @deprecated Will be removed in 2.0
+ */
+	function e($text) {
+		echo $text;
+	}
+
+/**
+ * Convenience method for strtolower().
+ *
+ * @param string $str String to lowercase
+ * @return string Lowercased string
+ * @link http://book.cakephp.org/view/1134/low
+ * @deprecated Will be removed in 2.0
+ */
+	function low($str) {
+		return strtolower($str);
+	}
+
+/**
+ * Convenience method for strtoupper().
+ *
+ * @param string $str String to uppercase
+ * @return string Uppercased string
+ * @link http://book.cakephp.org/view/1139/up
+ * @deprecated Will be removed in 2.0
+ */
+	function up($str) {
+		return strtoupper($str);
+	}
+
+/**
+ * Convenience method for str_replace().
+ *
+ * @param string $search String to be replaced
+ * @param string $replace String to insert
+ * @param string $subject String to search
+ * @return string Replaced string
+ * @link http://book.cakephp.org/view/1137/r
+ * @deprecated Will be removed in 2.0
+ */
+	function r($search, $replace, $subject) {
+		return str_replace($search, $replace, $subject);
+	}
+
+/**
+ * Print_r convenience function, which prints out <PRE> tags around
+ * the output of given array. Similar to debug().
+ *
+ * @see	debug()
+ * @param array $var Variable to print out
+ * @link http://book.cakephp.org/view/1136/pr
+ */
+	function pr($var) {
+		if (Configure::read() > 0) {
+			echo '<pre>';
+			print_r($var);
+			echo '</pre>';
+		}
+	}
+
+/**
+ * Display parameters.
+ *
+ * @param mixed $p Parameter as string or array
+ * @return string
+ * @deprecated Will be removed in 2.0
+ */
+	function params($p) {
+		if (!is_array($p) || count($p) == 0) {
+			return null;
+		}
+		if (is_array($p[0]) && count($p) == 1) {
+			return $p[0];
+		}
+		return $p;
+	}
+
+/**
+ * Merge a group of arrays
+ *
+ * @param array First array
+ * @param array Second array
+ * @param array Third array
+ * @param array Etc...
+ * @return array All array parameters merged into one
+ * @link http://book.cakephp.org/view/1124/am
+ */
+	function am() {
+		$r = array();
+		$args = func_get_args();
+		foreach ($args as $a) {
+			if (!is_array($a)) {
+				$a = array($a);
+			}
+			$r = array_merge($r, $a);
+		}
+		return $r;
+	}
+
+/**
+ * Gets an environment variable from available sources, and provides emulation
+ * for unsupported or inconsistent environment variables (i.e. DOCUMENT_ROOT on
+ * IIS, or SCRIPT_NAME in CGI mode).  Also exposes some additional custom
+ * environment information.
+ *
+ * @param  string $key Environment variable name.
+ * @return string Environment variable setting.
+ * @link http://book.cakephp.org/view/1130/env
+ */
+	function env($key) {
+		if ($key == 'HTTPS') {
+			if (isset($_SERVER['HTTPS'])) {
+				return (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off');
+			}
+			return (strpos(env('SCRIPT_URI'), 'https://') === 0);
+		}
+
+		if ($key == 'SCRIPT_NAME') {
+			if (env('CGI_MODE') && isset($_ENV['SCRIPT_URL'])) {
+				$key = 'SCRIPT_URL';
+			}
+		}
+
+		$val = null;
+		if (isset($_SERVER[$key])) {
+			$val = $_SERVER[$key];
+		} elseif (isset($_ENV[$key])) {
+			$val = $_ENV[$key];
+		} elseif (getenv($key) !== false) {
+			$val = getenv($key);
+		}
+
+		if ($key === 'REMOTE_ADDR' && $val === env('SERVER_ADDR')) {
+			$addr = env('HTTP_PC_REMOTE_ADDR');
+			if ($addr !== null) {
+				$val = $addr;
+			}
+		}
+
+		if ($val !== null) {
+			return $val;
+		}
+
+		switch ($key) {
+			case 'SCRIPT_FILENAME':
+				if (defined('SERVER_IIS') && SERVER_IIS === true) {
+					return str_replace('\\\\', '\\', env('PATH_TRANSLATED'));
+				}
+				break;
+			case 'DOCUMENT_ROOT':
+				$name = env('SCRIPT_NAME');
+				$filename = env('SCRIPT_FILENAME');
+				$offset = 0;
+				if (!strpos($name, '.php')) {
+					$offset = 4;
+				}
+				return substr($filename, 0, strlen($filename) - (strlen($name) + $offset));
+				break;
+			case 'PHP_SELF':
+				return str_replace(env('DOCUMENT_ROOT'), '', env('SCRIPT_FILENAME'));
+				break;
+			case 'CGI_MODE':
+				return (PHP_SAPI === 'cgi');
+				break;
+			case 'HTTP_BASE':
+				$host = env('HTTP_HOST');
+				$parts = explode('.', $host);
+				$count = count($parts);
+
+				if ($count === 1) {
+					return '.' . $host;
+				} elseif ($count === 2) {
+					return '.' . $host;
+				} elseif ($count === 3) {
+					$gTLD = array('aero', 'asia', 'biz', 'cat', 'com', 'coop', 'edu', 'gov', 'info', 'int', 'jobs', 'mil', 'mobi', 'museum', 'name', 'net', 'org', 'pro', 'tel', 'travel', 'xxx');
+					if (in_array($parts[1], $gTLD)) {
+						return '.' . $host;
+					}
+				}
+				array_shift($parts);
+				return '.' . implode('.', $parts);
+				break;
+		}
+		return null;
+	}
+if (!function_exists('file_put_contents')) {
+
+/**
+ * Writes data into file.
+ *
+ * If file exists, it will be overwritten. If data is an array, it will be implode()ed with an empty string.
+ *
+ * @param string $fileName File name.
+ * @param mixed  $data String or array.
+ * @return boolean Success
+ * @deprecated Will be removed in 2.0
+ */
+	function file_put_contents($fileName, $data) {
+		if (is_array($data)) {
+			$data = implode('', $data);
+		}
+		$res = @fopen($fileName, 'w+b');
+
+		if ($res) {
+			$write = @fwrite($res, $data);
+			if ($write === false) {
+				return false;
+			} else {
+				@fclose($res);
+				return $write;
+			}
+		}
+		return false;
+	}
+}
+
+/**
+ * Reads/writes temporary data to cache files or session.
+ *
+ * @param  string $path	File path within /tmp to save the file.
+ * @param  mixed  $data	The data to save to the temporary file.
+ * @param  mixed  $expires A valid strtotime string when the data expires.
+ * @param  string $target  The target of the cached data; either 'cache' or 'public'.
+ * @return mixed  The contents of the temporary file.
+ * @deprecated Please use Cache::write() instead
+ */
+	function cache($path, $data = null, $expires = '+1 day', $target = 'cache') {
+		if (Configure::read('Cache.disable')) {
+			return null;
+		}
+		$now = time();
+
+		if (!is_numeric($expires)) {
+			$expires = strtotime($expires, $now);
+		}
+
+		switch (strtolower($target)) {
+			case 'cache':
+				$filename = CACHE . $path;
+			break;
+			case 'public':
+				$filename = WWW_ROOT . $path;
+			break;
+			case 'tmp':
+				$filename = TMP . $path;
+			break;
+		}
+		$timediff = $expires - $now;
+		$filetime = false;
+
+		if (file_exists($filename)) {
+			$filetime = @filemtime($filename);
+		}
+
+		if ($data === null) {
+			if (file_exists($filename) && $filetime !== false) {
+				if ($filetime + $timediff < $now) {
+					@unlink($filename);
+				} else {
+					$data = @file_get_contents($filename);
+				}
+			}
+		} elseif (is_writable(dirname($filename))) {
+			@file_put_contents($filename, $data);
+		}
+		return $data;
+	}
+
+/**
+ * Used to delete files in the cache directories, or clear contents of cache directories
+ *
+ * @param mixed $params As String name to be searched for deletion, if name is a directory all files in
+ *   directory will be deleted. If array, names to be searched for deletion. If clearCache() without params,
+ *   all files in app/tmp/cache/views will be deleted
+ * @param string $type Directory in tmp/cache defaults to view directory
+ * @param string $ext The file extension you are deleting
+ * @return true if files found and deleted false otherwise
+ */
+	function clearCache($params = null, $type = 'views', $ext = '.php') {
+		if (is_string($params) || $params === null) {
+			$params = preg_replace('/\/\//', '/', $params);
+			$cache = CACHE . $type . DS . $params;
+
+			if (is_file($cache . $ext)) {
+				@unlink($cache . $ext);
+				return true;
+			} elseif (is_dir($cache)) {
+				$files = glob($cache . '*');
+
+				if ($files === false) {
+					return false;
+				}
+
+				foreach ($files as $file) {
+					if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
+						@unlink($file);
+					}
+				}
+				return true;
+			} else {
+				$cache = array(
+					CACHE . $type . DS . '*' . $params . $ext,
+					CACHE . $type . DS . '*' . $params . '_*' . $ext
+				);
+				$files = array();
+				while ($search = array_shift($cache)) {
+					$results = glob($search);
+					if ($results !== false) {
+						$files = array_merge($files, $results);
+					}
+				}
+				if (empty($files)) {
+					return false;
+				}
+				foreach ($files as $file) {
+					if (is_file($file) && strrpos($file, DS . 'empty') !== strlen($file) - 6) {
+						@unlink($file);
+					}
+				}
+				return true;
+			}
+		} elseif (is_array($params)) {
+			foreach ($params as $file) {
+				clearCache($file, $type, $ext);
+			}
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Recursively strips slashes from all values in an array
+ *
+ * @param array $values Array of values to strip slashes
+ * @return mixed What is returned from calling stripslashes
+ * @link http://book.cakephp.org/view/1138/stripslashes_deep
+ */
+	function stripslashes_deep($values) {
+		if (is_array($values)) {
+			foreach ($values as $key => $value) {
+				$values[$key] = stripslashes_deep($value);
+			}
+		} else {
+			$values = stripslashes($values);
+		}
+		return $values;
+	}
+
+/**
+ * Returns a translated string if one is found; Otherwise, the submitted message.
+ *
+ * @param string $singular Text to translate
+ * @param boolean $return Set to true to return translated string, or false to echo
+ * @return mixed translated string if $return is false string will be echoed
+ * @link http://book.cakephp.org/view/1121/__
+ */
+	function __($singular, $return = false) {
+		if (!$singular) {
+			return;
+		}
+		if (!class_exists('I18n')) {
+			App::import('Core', 'i18n');
+		}
+
+		if ($return === false) {
+			echo I18n::translate($singular);
+		} else {
+			return I18n::translate($singular);
+		}
+	}
+
+/**
+ * Returns correct plural form of message identified by $singular and $plural for count $count.
+ * Some languages have more than one form for plural messages dependent on the count.
+ *
+ * @param string $singular Singular text to translate
+ * @param string $plural Plural text
+ * @param integer $count Count
+ * @param boolean $return true to return, false to echo
+ * @return mixed plural form of translated string if $return is false string will be echoed
+ */
+	function __n($singular, $plural, $count, $return = false) {
+		if (!$singular) {
+			return;
+		}
+		if (!class_exists('I18n')) {
+			App::import('Core', 'i18n');
+		}
+
+		if ($return === false) {
+			echo I18n::translate($singular, $plural, null, 6, $count);
+		} else {
+			return I18n::translate($singular, $plural, null, 6, $count);
+		}
+	}
+
+/**
+ * Allows you to override the current domain for a single message lookup.
+ *
+ * @param string $domain Domain
+ * @param string $msg String to translate
+ * @param string $return true to return, false to echo
+ * @return translated string if $return is false string will be echoed
+ */
+	function __d($domain, $msg, $return = false) {
+		if (!$msg) {
+			return;
+		}
+		if (!class_exists('I18n')) {
+			App::import('Core', 'i18n');
+		}
+
+		if ($return === false) {
+			echo I18n::translate($msg, null, $domain);
+		} else {
+			return I18n::translate($msg, null, $domain);
+		}
+	}
+
+/**
+ * Allows you to override the current domain for a single plural message lookup.
+ * Returns correct plural form of message identified by $singular and $plural for count $count
+ * from domain $domain.
+ *
+ * @param string $domain Domain
+ * @param string $singular Singular string to translate
+ * @param string $plural Plural
+ * @param integer $count Count
+ * @param boolean $return true to return, false to echo
+ * @return plural form of translated string if $return is false string will be echoed
+ */
+	function __dn($domain, $singular, $plural, $count, $return = false) {
+		if (!$singular) {
+			return;
+		}
+		if (!class_exists('I18n')) {
+			App::import('Core', 'i18n');
+		}
+
+		if ($return === false) {
+			echo I18n::translate($singular, $plural, $domain, 6, $count);
+		} else {
+			return I18n::translate($singular, $plural, $domain, 6, $count);
+		}
+	}
+
+/**
+ * Allows you to override the current domain for a single message lookup.
+ * It also allows you to specify a category.
+ *
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a numeric value, instead of the constant name.  The values are:
+ *
+ * - LC_ALL       0
+ * - LC_COLLATE   1
+ * - LC_CTYPE     2
+ * - LC_MONETARY  3
+ * - LC_NUMERIC   4
+ * - LC_TIME      5
+ * - LC_MESSAGES  6
+ *
+ * @param string $domain Domain
+ * @param string $msg Message to translate
+ * @param integer $category Category
+ * @param boolean $return true to return, false to echo
+ * @return translated string if $return is false string will be echoed
+ */
+	function __dc($domain, $msg, $category, $return = false) {
+		if (!$msg) {
+			return;
+		}
+		if (!class_exists('I18n')) {
+			App::import('Core', 'i18n');
+		}
+
+		if ($return === false) {
+			echo I18n::translate($msg, null, $domain, $category);
+		} else {
+			return I18n::translate($msg, null, $domain, $category);
+		}
+	}
+
+/**
+ * Allows you to override the current domain for a single plural message lookup.
+ * It also allows you to specify a category.
+ * Returns correct plural form of message identified by $singular and $plural for count $count
+ * from domain $domain.
+ *
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a numeric value, instead of the constant name.  The values are:
+ *
+ * - LC_ALL       0
+ * - LC_COLLATE   1
+ * - LC_CTYPE     2
+ * - LC_MONETARY  3
+ * - LC_NUMERIC   4
+ * - LC_TIME      5
+ * - LC_MESSAGES  6
+ *
+ * @param string $domain Domain
+ * @param string $singular Singular string to translate
+ * @param string $plural Plural
+ * @param integer $count Count
+ * @param integer $category Category
+ * @param boolean $return true to return, false to echo
+ * @return plural form of translated string if $return is false string will be echoed
+ */
+	function __dcn($domain, $singular, $plural, $count, $category, $return = false) {
+		if (!$singular) {
+			return;
+		}
+		if (!class_exists('I18n')) {
+			App::import('Core', 'i18n');
+		}
+
+		if ($return === false) {
+			echo I18n::translate($singular, $plural, $domain, $category, $count);
+		} else {
+			return I18n::translate($singular, $plural, $domain, $category, $count);
+		}
+	}
+
+/**
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a numeric value, instead of the constant name.  The values are:
+ *
+ * - LC_ALL       0
+ * - LC_COLLATE   1
+ * - LC_CTYPE     2
+ * - LC_MONETARY  3
+ * - LC_NUMERIC   4
+ * - LC_TIME      5
+ * - LC_MESSAGES  6
+ *
+ * @param string $msg String to translate
+ * @param integer $category Category
+ * @param string $return true to return, false to echo
+ * @return translated string if $return is false string will be echoed
+ */
+	function __c($msg, $category, $return = false) {
+		if (!$msg) {
+			return;
+		}
+		if (!class_exists('I18n')) {
+			App::import('Core', 'i18n');
+		}
+
+		if ($return === false) {
+			echo I18n::translate($msg, null, null, $category);
+		} else {
+			return I18n::translate($msg, null, null, $category);
+		}
+	}
+
+/**
+ * Computes the difference of arrays using keys for comparison.
+ *
+ * @param array First array
+ * @param array Second array
+ * @return array Array with different keys
+ * @deprecated Will be removed in 2.0
+ */
+	if (!function_exists('array_diff_key')) {
+		function array_diff_key() {
+			$valuesDiff = array();
+
+			$argc = func_num_args();
+			if ($argc < 2) {
+				return false;
+			}
+
+			$args = func_get_args();
+			foreach ($args as $param) {
+				if (!is_array($param)) {
+					return false;
+				}
+			}
+
+			foreach ($args[0] as $valueKey => $valueData) {
+				for ($i = 1; $i < $argc; $i++) {
+					if (array_key_exists($valueKey, $args[$i])) {
+						continue 2;
+					}
+				}
+				$valuesDiff[$valueKey] = $valueData;
+			}
+			return $valuesDiff;
+		}
+	}
+
+/**
+ * Computes the intersection of arrays using keys for comparison
+ *
+ * @param array First array
+ * @param array Second array
+ * @return array Array with interesected keys
+ * @deprecated Will be removed in 2.0
+ */
+	if (!function_exists('array_intersect_key')) {
+		function array_intersect_key($arr1, $arr2) {
+			$res = array();
+			foreach ($arr1 as $key => $value) {
+				if (array_key_exists($key, $arr2)) {
+					$res[$key] = $arr1[$key];
+				}
+			}
+			return $res;
+		}
+	}
+
+/**
+ * Shortcut to Log::write.
+ *
+ * @param string $message Message to write to log
+ */
+	function LogError($message) {
+		if (!class_exists('CakeLog')) {
+			App::import('Core', 'CakeLog');
+		}
+		$bad = array("\n", "\r", "\t");
+		$good = ' ';
+		CakeLog::write('error', str_replace($bad, $good, $message));
+	}
+
+/**
+ * Searches include path for files.
+ *
+ * @param string $file File to look for
+ * @return Full path to file if exists, otherwise false
+ * @link http://book.cakephp.org/view/1131/fileExistsInPath
+ */
+	function fileExistsInPath($file) {
+		$paths = explode(PATH_SEPARATOR, ini_get('include_path'));
+		foreach ($paths as $path) {
+			$fullPath = $path . DS . $file;
+
+			if (file_exists($fullPath)) {
+				return $fullPath;
+			} elseif (file_exists($file)) {
+				return $file;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Convert forward slashes to underscores and removes first and last underscores in a string
+ *
+ * @param string String to convert
+ * @return string with underscore remove from start and end of string
+ * @link http://book.cakephp.org/view/1126/convertSlash
+ */
+	function convertSlash($string) {
+		$string = trim($string, '/');
+		$string = preg_replace('/\/\//', '/', $string);
+		$string = str_replace('/', '_', $string);
+		return $string;
+	}
+
+/**
+ * Implements http_build_query for PHP4.
+ *
+ * @param string $data Data to set in query string
+ * @param string $prefix If numeric indices, prepend this to index for elements in base array.
+ * @param string $argSep String used to separate arguments
+ * @param string $baseKey Base key
+ * @return string URL encoded query string
+ * @see http://php.net/http_build_query
+ * @deprecated Will be removed in 2.0
+ */
+	if (!function_exists('http_build_query')) {
+		function http_build_query($data, $prefix = null, $argSep = null, $baseKey = null) {
+			if (empty($argSep)) {
+				$argSep = ini_get('arg_separator.output');
+			}
+			if (is_object($data)) {
+				$data = get_object_vars($data);
+			}
+			$out = array();
+
+			foreach ((array)$data as $key => $v) {
+				if (is_numeric($key) && !empty($prefix)) {
+					$key = $prefix . $key;
+				}
+				$key = urlencode($key);
+
+				if (!empty($baseKey)) {
+					$key = $baseKey . '[' . $key . ']';
+				}
+
+				if (is_array($v) || is_object($v)) {
+					$out[] = http_build_query($v, $prefix, $argSep, $key);
+				} else {
+					$out[] = $key . '=' . urlencode($v);
+				}
+			}
+			return implode($argSep, $out);
+		}
+	}
+
+/**
+ * Wraps ternary operations. If $condition is a non-empty value, $val1 is returned, otherwise $val2.
+ * Don't use for isset() conditions, or wrap your variable with @ operator:
+ * Example:
+ *
+ * `ife(isset($variable), @$variable, 'default');`
+ *
+ * @param mixed $condition Conditional expression
+ * @param mixed $val1 Value to return in case condition matches
+ * @param mixed $val2 Value to return if condition doesn't match
+ * @return mixed $val1 or $val2, depending on whether $condition evaluates to a non-empty expression.
+ * @link http://book.cakephp.org/view/1133/ife
+ * @deprecated Will be removed in 2.0
+ */
+	function ife($condition, $val1 = null, $val2 = null) {
+		if (!empty($condition)) {
+			return $val1;
+		}
+		return $val2;
+	}
diff --git a/code/ryzom/tools/server/www/webtt/cake/bootstrap.php b/code/ryzom/tools/server/www/webtt/cake/bootstrap.php
new file mode 100644
index 000000000..b69cb7b75
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/bootstrap.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Basic Cake functionality.
+ *
+ * Handles loading of core files needed on every request
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!defined('PHP5')) {
+	define('PHP5', (PHP_VERSION >= 5));
+}
+if (!defined('E_DEPRECATED')) {
+	define('E_DEPRECATED', 8192);
+}
+error_reporting(E_ALL & ~E_DEPRECATED);
+
+require CORE_PATH . 'cake' . DS . 'basics.php';
+$TIME_START = getMicrotime();
+require CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php';
+require LIBS . 'object.php';
+require LIBS . 'inflector.php';
+require LIBS . 'configure.php';
+require LIBS . 'set.php';
+require LIBS . 'cache.php';
+Configure::getInstance();
+require CAKE . 'dispatcher.php';
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/config.php b/code/ryzom/tools/server/www/webtt/cake/config/config.php
new file mode 100644
index 000000000..8c4ab11b9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/config.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Core Configurations.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 1.1.11.4062
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+return $config['Cake.version'] = '1.3.9';
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/paths.php b/code/ryzom/tools/server/www/webtt/cake/config/paths.php
new file mode 100644
index 000000000..a6e5c7c5c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/paths.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Path configuration
+ *
+ * In this file you set paths to different directories used by Cake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * If the index.php file is used instead of an .htaccess file
+ * or if the user can not set the web root to use the public
+ * directory we will define ROOT there, otherwise we set it
+ * here.
+ */
+	if (!defined('ROOT')) {
+		define('ROOT', '../');
+	}
+	if (!defined('WEBROOT_DIR')) {
+		define('WEBROOT_DIR', 'webroot');
+	}
+
+/**
+ * Path to the cake directory.
+ */
+	define('CAKE', CORE_PATH.'cake'.DS);
+
+/**
+ * Path to the application's directory.
+ */
+if (!defined('APP')) {
+	define('APP', ROOT.DS.APP_DIR.DS);
+}
+
+/**
+ * Path to the application's models directory.
+ */
+	define('MODELS', APP.'models'.DS);
+
+/**
+ * Path to model behaviors directory.
+ */
+	define('BEHAVIORS', MODELS.'behaviors'.DS);
+
+/**
+ * Path to the application's controllers directory.
+ */
+	define('CONTROLLERS', APP.'controllers'.DS);
+
+/**
+ * Path to the application's components directory.
+ */
+	define('COMPONENTS', CONTROLLERS.'components'.DS);
+
+/**
+ * Path to the application's libs directory.
+ */
+	define('APPLIBS', APP.'libs'.DS);
+
+/**
+ * Path to the application's views directory.
+ */
+	define('VIEWS', APP.'views'.DS);
+
+/**
+ * Path to the application's helpers directory.
+ */
+	define('HELPERS', VIEWS.'helpers'.DS);
+
+/**
+ * Path to the application's view's layouts directory.
+ */
+	define('LAYOUTS', VIEWS.'layouts'.DS);
+
+/**
+ * Path to the application's view's elements directory.
+ * It's supposed to hold pieces of PHP/HTML that are used on multiple pages
+ * and are not linked to a particular layout (like polls, footers and so on).
+ */
+	define('ELEMENTS', VIEWS.'elements'.DS);
+
+/**
+ * Path to the configuration files directory.
+ */
+if (!defined('CONFIGS')) {
+	define('CONFIGS', APP.'config'.DS);
+}
+
+/**
+ * Path to the libs directory.
+ */
+	define('LIBS', CAKE.'libs'.DS);
+
+/**
+ * Path to the public CSS directory.
+ */
+	define('CSS', WWW_ROOT.'css'.DS);
+
+/**
+ * Path to the public JavaScript directory.
+ */
+	define('JS', WWW_ROOT.'js'.DS);
+
+/**
+ * Path to the public images directory.
+ */
+	define('IMAGES', WWW_ROOT.'img'.DS);
+
+/**
+ * Path to the console libs direcotry.
+ */
+	define('CONSOLE_LIBS', CAKE.'console'.DS.'libs'.DS);
+
+/**
+ * Path to the tests directory.
+ */
+if (!defined('TESTS')) {
+	define('TESTS', APP.'tests'.DS);
+}
+
+/**
+ * Path to the core tests directory.
+ */
+if (!defined('CAKE_TESTS')) {
+	define('CAKE_TESTS', CAKE.'tests'.DS);
+}
+
+/**
+ * Path to the test suite.
+ */
+	define('CAKE_TESTS_LIB', CAKE_TESTS.'lib'.DS);
+
+/**
+ * Path to the controller test directory.
+ */
+	define('CONTROLLER_TESTS', TESTS.'cases'.DS.'controllers'.DS);
+
+/**
+ * Path to the components test directory.
+ */
+	define('COMPONENT_TESTS', TESTS.'cases'.DS.'components'.DS);
+
+/**
+ * Path to the helpers test directory.
+ */
+	define('HELPER_TESTS', TESTS.'cases'.DS.'views'.DS.'helpers'.DS);
+
+/**
+ * Path to the models' test directory.
+ */
+	define('MODEL_TESTS', TESTS.'cases'.DS.'models'.DS);
+
+/**
+ * Path to the lib test directory.
+ */
+	define('LIB_TESTS', CAKE_TESTS.'cases'.DS.'lib'.DS);
+
+/**
+ * Path to the temporary files directory.
+ */
+if (!defined('TMP')) {
+	define('TMP', APP.'tmp'.DS);
+}
+
+/**
+ * Path to the logs directory.
+ */
+	define('LOGS', TMP.'logs'.DS);
+
+/**
+ * Path to the cache files directory. It can be shared between hosts in a multi-server setup.
+ */
+	define('CACHE', TMP.'cache'.DS);
+
+/**
+ * Path to the vendors directory.
+ */
+if (!defined('VENDORS')) {
+	define('VENDORS', CAKE_CORE_INCLUDE_PATH.DS.'vendors'.DS);
+}
+
+/**
+ *  Full url prefix
+ */
+if (!defined('FULL_BASE_URL')) {
+	$s = null;
+	if (env('HTTPS')) {
+		$s ='s';
+	}
+
+	$httpHost = env('HTTP_HOST');
+
+	if (isset($httpHost)) {
+		define('FULL_BASE_URL', 'http'.$s.'://'.$httpHost);
+	}
+	unset($httpHost, $s);
+}
+
+/**
+ * Web path to the public images directory.
+ */
+if (!defined('IMAGES_URL')) {
+	define('IMAGES_URL', 'img/');
+}
+
+/**
+ * Web path to the CSS files directory.
+ */
+if (!defined('CSS_URL')) {
+	define('CSS_URL', 'css/');
+}
+
+/**
+ * Web path to the js files directory.
+ */
+if (!defined('JS_URL')) {
+	define('JS_URL', 'js/');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0080_00ff.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0080_00ff.php
new file mode 100644
index 000000000..080ef6279
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0080_00ff.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0080 through U+00FF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0080_00ff'][] = array('upper' => 181, 'status' => 'C', 'lower' => array(956));
+$config['0080_00ff'][] = array('upper' => 924, 'status' => 'C', 'lower' => array(181));
+$config['0080_00ff'][] = array('upper' => 192, 'status' => 'C', 'lower' => array(224)); /* LATIN CAPITAL LETTER A WITH GRAVE */
+$config['0080_00ff'][] = array('upper' => 193, 'status' => 'C', 'lower' => array(225)); /* LATIN CAPITAL LETTER A WITH ACUTE */
+$config['0080_00ff'][] = array('upper' => 194, 'status' => 'C', 'lower' => array(226)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX */
+$config['0080_00ff'][] = array('upper' => 195, 'status' => 'C', 'lower' => array(227)); /* LATIN CAPITAL LETTER A WITH TILDE */
+$config['0080_00ff'][] = array('upper' => 196, 'status' => 'C', 'lower' => array(228)); /* LATIN CAPITAL LETTER A WITH DIAERESIS */
+$config['0080_00ff'][] = array('upper' => 197, 'status' => 'C', 'lower' => array(229)); /* LATIN CAPITAL LETTER A WITH RING ABOVE */
+$config['0080_00ff'][] = array('upper' => 198, 'status' => 'C', 'lower' => array(230)); /* LATIN CAPITAL LETTER AE */
+$config['0080_00ff'][] = array('upper' => 199, 'status' => 'C', 'lower' => array(231)); /* LATIN CAPITAL LETTER C WITH CEDILLA */
+$config['0080_00ff'][] = array('upper' => 200, 'status' => 'C', 'lower' => array(232)); /* LATIN CAPITAL LETTER E WITH GRAVE */
+$config['0080_00ff'][] = array('upper' => 201, 'status' => 'C', 'lower' => array(233)); /* LATIN CAPITAL LETTER E WITH ACUTE */
+$config['0080_00ff'][] = array('upper' => 202, 'status' => 'C', 'lower' => array(234)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX */
+$config['0080_00ff'][] = array('upper' => 203, 'status' => 'C', 'lower' => array(235)); /* LATIN CAPITAL LETTER E WITH DIAERESIS */
+$config['0080_00ff'][] = array('upper' => 204, 'status' => 'C', 'lower' => array(236)); /* LATIN CAPITAL LETTER I WITH GRAVE */
+$config['0080_00ff'][] = array('upper' => 205, 'status' => 'C', 'lower' => array(237)); /* LATIN CAPITAL LETTER I WITH ACUTE */
+$config['0080_00ff'][] = array('upper' => 206, 'status' => 'C', 'lower' => array(238)); /* LATIN CAPITAL LETTER I WITH CIRCUMFLEX */
+$config['0080_00ff'][] = array('upper' => 207, 'status' => 'C', 'lower' => array(239)); /* LATIN CAPITAL LETTER I WITH DIAERESIS */
+$config['0080_00ff'][] = array('upper' => 208, 'status' => 'C', 'lower' => array(240)); /* LATIN CAPITAL LETTER ETH */
+$config['0080_00ff'][] = array('upper' => 209, 'status' => 'C', 'lower' => array(241)); /* LATIN CAPITAL LETTER N WITH TILDE */
+$config['0080_00ff'][] = array('upper' => 210, 'status' => 'C', 'lower' => array(242)); /* LATIN CAPITAL LETTER O WITH GRAVE */
+$config['0080_00ff'][] = array('upper' => 211, 'status' => 'C', 'lower' => array(243)); /* LATIN CAPITAL LETTER O WITH ACUTE */
+$config['0080_00ff'][] = array('upper' => 212, 'status' => 'C', 'lower' => array(244)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX */
+$config['0080_00ff'][] = array('upper' => 213, 'status' => 'C', 'lower' => array(245)); /* LATIN CAPITAL LETTER O WITH TILDE */
+$config['0080_00ff'][] = array('upper' => 214, 'status' => 'C', 'lower' => array(246)); /* LATIN CAPITAL LETTER O WITH DIAERESIS */
+$config['0080_00ff'][] = array('upper' => 216, 'status' => 'C', 'lower' => array(248)); /* LATIN CAPITAL LETTER O WITH STROKE */
+$config['0080_00ff'][] = array('upper' => 217, 'status' => 'C', 'lower' => array(249)); /* LATIN CAPITAL LETTER U WITH GRAVE */
+$config['0080_00ff'][] = array('upper' => 218, 'status' => 'C', 'lower' => array(250)); /* LATIN CAPITAL LETTER U WITH ACUTE */
+$config['0080_00ff'][] = array('upper' => 219, 'status' => 'C', 'lower' => array(251)); /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX */
+$config['0080_00ff'][] = array('upper' => 220, 'status' => 'C', 'lower' => array(252)); /* LATIN CAPITAL LETTER U WITH DIAERESIS */
+$config['0080_00ff'][] = array('upper' => 221, 'status' => 'C', 'lower' => array(253)); /* LATIN CAPITAL LETTER Y WITH ACUTE */
+$config['0080_00ff'][] = array('upper' => 222, 'status' => 'C', 'lower' => array(254)); /* LATIN CAPITAL LETTER THORN */
+$config['0080_00ff'][] = array('upper' => 223, 'status' => 'F', 'lower' => array(115, 115)); /* LATIN SMALL LETTER SHARP S */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0100_017f.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0100_017f.php
new file mode 100644
index 000000000..35a9f03da
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0100_017f.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0100 through U+017F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0100_017f'][] = array('upper' => 256, 'status' => 'C', 'lower' => array(257)); /* LATIN CAPITAL LETTER A WITH MACRON */
+$config['0100_017f'][] = array('upper' => 258, 'status' => 'C', 'lower' => array(259)); /* LATIN CAPITAL LETTER A WITH BREVE */
+$config['0100_017f'][] = array('upper' => 260, 'status' => 'C', 'lower' => array(261)); /* LATIN CAPITAL LETTER A WITH OGONEK */
+$config['0100_017f'][] = array('upper' => 262, 'status' => 'C', 'lower' => array(263)); /* LATIN CAPITAL LETTER C WITH ACUTE */
+$config['0100_017f'][] = array('upper' => 264, 'status' => 'C', 'lower' => array(265)); /* LATIN CAPITAL LETTER C WITH CIRCUMFLEX */
+$config['0100_017f'][] = array('upper' => 266, 'status' => 'C', 'lower' => array(267)); /* LATIN CAPITAL LETTER C WITH DOT ABOVE */
+$config['0100_017f'][] = array('upper' => 268, 'status' => 'C', 'lower' => array(269)); /* LATIN CAPITAL LETTER C WITH CARON */
+$config['0100_017f'][] = array('upper' => 270, 'status' => 'C', 'lower' => array(271)); /* LATIN CAPITAL LETTER D WITH CARON */
+$config['0100_017f'][] = array('upper' => 272, 'status' => 'C', 'lower' => array(273)); /* LATIN CAPITAL LETTER D WITH STROKE */
+$config['0100_017f'][] = array('upper' => 274, 'status' => 'C', 'lower' => array(275)); /* LATIN CAPITAL LETTER E WITH MACRON */
+$config['0100_017f'][] = array('upper' => 276, 'status' => 'C', 'lower' => array(277)); /* LATIN CAPITAL LETTER E WITH BREVE */
+$config['0100_017f'][] = array('upper' => 278, 'status' => 'C', 'lower' => array(279)); /* LATIN CAPITAL LETTER E WITH DOT ABOVE */
+$config['0100_017f'][] = array('upper' => 280, 'status' => 'C', 'lower' => array(281)); /* LATIN CAPITAL LETTER E WITH OGONEK */
+$config['0100_017f'][] = array('upper' => 282, 'status' => 'C', 'lower' => array(283)); /* LATIN CAPITAL LETTER E WITH CARON */
+$config['0100_017f'][] = array('upper' => 284, 'status' => 'C', 'lower' => array(285)); /* LATIN CAPITAL LETTER G WITH CIRCUMFLEX */
+$config['0100_017f'][] = array('upper' => 286, 'status' => 'C', 'lower' => array(287)); /* LATIN CAPITAL LETTER G WITH BREVE */
+$config['0100_017f'][] = array('upper' => 288, 'status' => 'C', 'lower' => array(289)); /* LATIN CAPITAL LETTER G WITH DOT ABOVE */
+$config['0100_017f'][] = array('upper' => 290, 'status' => 'C', 'lower' => array(291)); /* LATIN CAPITAL LETTER G WITH CEDILLA */
+$config['0100_017f'][] = array('upper' => 292, 'status' => 'C', 'lower' => array(293)); /* LATIN CAPITAL LETTER H WITH CIRCUMFLEX */
+$config['0100_017f'][] = array('upper' => 294, 'status' => 'C', 'lower' => array(295)); /* LATIN CAPITAL LETTER H WITH STROKE */
+$config['0100_017f'][] = array('upper' => 296, 'status' => 'C', 'lower' => array(297)); /* LATIN CAPITAL LETTER I WITH TILDE */
+$config['0100_017f'][] = array('upper' => 298, 'status' => 'C', 'lower' => array(299)); /* LATIN CAPITAL LETTER I WITH MACRON */
+$config['0100_017f'][] = array('upper' => 300, 'status' => 'C', 'lower' => array(301)); /* LATIN CAPITAL LETTER I WITH BREVE */
+$config['0100_017f'][] = array('upper' => 302, 'status' => 'C', 'lower' => array(303)); /* LATIN CAPITAL LETTER I WITH OGONEK */
+$config['0100_017f'][] = array('upper' => 304, 'status' => 'F', 'lower' => array(105, 775)); /* LATIN CAPITAL LETTER I WITH DOT ABOVE */
+$config['0100_017f'][] = array('upper' => 304, 'status' => 'T', 'lower' => array(105)); /* LATIN CAPITAL LETTER I WITH DOT ABOVE */
+$config['0100_017f'][] = array('upper' => 306, 'status' => 'C', 'lower' => array(307)); /* LATIN CAPITAL LIGATURE IJ */
+$config['0100_017f'][] = array('upper' => 308, 'status' => 'C', 'lower' => array(309)); /* LATIN CAPITAL LETTER J WITH CIRCUMFLEX */
+$config['0100_017f'][] = array('upper' => 310, 'status' => 'C', 'lower' => array(311)); /* LATIN CAPITAL LETTER K WITH CEDILLA */
+$config['0100_017f'][] = array('upper' => 313, 'status' => 'C', 'lower' => array(314)); /* LATIN CAPITAL LETTER L WITH ACUTE */
+$config['0100_017f'][] = array('upper' => 315, 'status' => 'C', 'lower' => array(316)); /* LATIN CAPITAL LETTER L WITH CEDILLA */
+$config['0100_017f'][] = array('upper' => 317, 'status' => 'C', 'lower' => array(318)); /* LATIN CAPITAL LETTER L WITH CARON */
+$config['0100_017f'][] = array('upper' => 319, 'status' => 'C', 'lower' => array(320)); /* LATIN CAPITAL LETTER L WITH MIDDLE DOT */
+$config['0100_017f'][] = array('upper' => 321, 'status' => 'C', 'lower' => array(322)); /* LATIN CAPITAL LETTER L WITH STROKE */
+$config['0100_017f'][] = array('upper' => 323, 'status' => 'C', 'lower' => array(324)); /* LATIN CAPITAL LETTER N WITH ACUTE */
+$config['0100_017f'][] = array('upper' => 325, 'status' => 'C', 'lower' => array(326)); /* LATIN CAPITAL LETTER N WITH CEDILLA */
+$config['0100_017f'][] = array('upper' => 327, 'status' => 'C', 'lower' => array(328)); /* LATIN CAPITAL LETTER N WITH CARON */
+$config['0100_017f'][] = array('upper' => 329, 'status' => 'F', 'lower' => array(700, 110)); /* LATIN SMALL LETTER N PRECEDED BY APOSTROPHE */
+$config['0100_017f'][] = array('upper' => 330, 'status' => 'C', 'lower' => array(331)); /* LATIN CAPITAL LETTER ENG */
+$config['0100_017f'][] = array('upper' => 332, 'status' => 'C', 'lower' => array(333)); /* LATIN CAPITAL LETTER O WITH MACRON */
+$config['0100_017f'][] = array('upper' => 334, 'status' => 'C', 'lower' => array(335)); /* LATIN CAPITAL LETTER O WITH BREVE */
+$config['0100_017f'][] = array('upper' => 336, 'status' => 'C', 'lower' => array(337)); /* LATIN CAPITAL LETTER O WITH DOUBLE ACUTE */
+$config['0100_017f'][] = array('upper' => 338, 'status' => 'C', 'lower' => array(339)); /* LATIN CAPITAL LIGATURE OE */
+$config['0100_017f'][] = array('upper' => 340, 'status' => 'C', 'lower' => array(341)); /* LATIN CAPITAL LETTER R WITH ACUTE */
+$config['0100_017f'][] = array('upper' => 342, 'status' => 'C', 'lower' => array(343)); /* LATIN CAPITAL LETTER R WITH CEDILLA */
+$config['0100_017f'][] = array('upper' => 344, 'status' => 'C', 'lower' => array(345)); /* LATIN CAPITAL LETTER R WITH CARON */
+$config['0100_017f'][] = array('upper' => 346, 'status' => 'C', 'lower' => array(347)); /* LATIN CAPITAL LETTER S WITH ACUTE */
+$config['0100_017f'][] = array('upper' => 348, 'status' => 'C', 'lower' => array(349)); /* LATIN CAPITAL LETTER S WITH CIRCUMFLEX */
+$config['0100_017f'][] = array('upper' => 350, 'status' => 'C', 'lower' => array(351)); /* LATIN CAPITAL LETTER S WITH CEDILLA */
+$config['0100_017f'][] = array('upper' => 352, 'status' => 'C', 'lower' => array(353)); /* LATIN CAPITAL LETTER S WITH CARON */
+$config['0100_017f'][] = array('upper' => 354, 'status' => 'C', 'lower' => array(355)); /* LATIN CAPITAL LETTER T WITH CEDILLA */
+$config['0100_017f'][] = array('upper' => 356, 'status' => 'C', 'lower' => array(357)); /* LATIN CAPITAL LETTER T WITH CARON */
+$config['0100_017f'][] = array('upper' => 358, 'status' => 'C', 'lower' => array(359)); /* LATIN CAPITAL LETTER T WITH STROKE */
+$config['0100_017f'][] = array('upper' => 360, 'status' => 'C', 'lower' => array(361)); /* LATIN CAPITAL LETTER U WITH TILDE */
+$config['0100_017f'][] = array('upper' => 362, 'status' => 'C', 'lower' => array(363)); /* LATIN CAPITAL LETTER U WITH MACRON */
+$config['0100_017f'][] = array('upper' => 364, 'status' => 'C', 'lower' => array(365)); /* LATIN CAPITAL LETTER U WITH BREVE */
+$config['0100_017f'][] = array('upper' => 366, 'status' => 'C', 'lower' => array(367)); /* LATIN CAPITAL LETTER U WITH RING ABOVE */
+$config['0100_017f'][] = array('upper' => 368, 'status' => 'C', 'lower' => array(369)); /* LATIN CAPITAL LETTER U WITH DOUBLE ACUTE */
+$config['0100_017f'][] = array('upper' => 370, 'status' => 'C', 'lower' => array(371)); /* LATIN CAPITAL LETTER U WITH OGONEK */
+$config['0100_017f'][] = array('upper' => 372, 'status' => 'C', 'lower' => array(373)); /* LATIN CAPITAL LETTER W WITH CIRCUMFLEX */
+$config['0100_017f'][] = array('upper' => 374, 'status' => 'C', 'lower' => array(375)); /* LATIN CAPITAL LETTER Y WITH CIRCUMFLEX */
+$config['0100_017f'][] = array('upper' => 376, 'status' => 'C', 'lower' => array(255)); /* LATIN CAPITAL LETTER Y WITH DIAERESIS */
+$config['0100_017f'][] = array('upper' => 377, 'status' => 'C', 'lower' => array(378)); /* LATIN CAPITAL LETTER Z WITH ACUTE */
+$config['0100_017f'][] = array('upper' => 379, 'status' => 'C', 'lower' => array(380)); /* LATIN CAPITAL LETTER Z WITH DOT ABOVE */
+$config['0100_017f'][] = array('upper' => 381, 'status' => 'C', 'lower' => array(382)); /* LATIN CAPITAL LETTER Z WITH CARON */
+$config['0100_017f'][] = array('upper' => 383, 'status' => 'C', 'lower' => array(115)); /* LATIN SMALL LETTER LONG S */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0180_024F.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0180_024F.php
new file mode 100644
index 000000000..1148ccc94
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0180_024F.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0180 through U+024F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0180_024F'][] = array('upper' => 385, 'status' => 'C', 'lower' => array(595)); /* LATIN CAPITAL LETTER B WITH HOOK */
+$config['0180_024F'][] = array('upper' => 386, 'status' => 'C', 'lower' => array(387)); /* LATIN CAPITAL LETTER B WITH TOPBAR */
+$config['0180_024F'][] = array('upper' => 388, 'status' => 'C', 'lower' => array(389)); /* LATIN CAPITAL LETTER TONE SIX */
+$config['0180_024F'][] = array('upper' => 390, 'status' => 'C', 'lower' => array(596)); /* LATIN CAPITAL LETTER OPEN O */
+$config['0180_024F'][] = array('upper' => 391, 'status' => 'C', 'lower' => array(392)); /* LATIN CAPITAL LETTER C WITH HOOK */
+$config['0180_024F'][] = array('upper' => 393, 'status' => 'C', 'lower' => array(598)); /* LATIN CAPITAL LETTER AFRICAN D */
+$config['0180_024F'][] = array('upper' => 394, 'status' => 'C', 'lower' => array(599)); /* LATIN CAPITAL LETTER D WITH HOOK */
+$config['0180_024F'][] = array('upper' => 395, 'status' => 'C', 'lower' => array(396)); /* LATIN CAPITAL LETTER D WITH TOPBAR */
+$config['0180_024F'][] = array('upper' => 398, 'status' => 'C', 'lower' => array(477)); /* LATIN CAPITAL LETTER REVERSED E */
+$config['0180_024F'][] = array('upper' => 399, 'status' => 'C', 'lower' => array(601)); /* LATIN CAPITAL LETTER SCHWA */
+$config['0180_024F'][] = array('upper' => 400, 'status' => 'C', 'lower' => array(603)); /* LATIN CAPITAL LETTER OPEN E */
+$config['0180_024F'][] = array('upper' => 401, 'status' => 'C', 'lower' => array(402)); /* LATIN CAPITAL LETTER F WITH HOOK */
+$config['0180_024F'][] = array('upper' => 403, 'status' => 'C', 'lower' => array(608)); /* LATIN CAPITAL LETTER G WITH HOOK */
+$config['0180_024F'][] = array('upper' => 404, 'status' => 'C', 'lower' => array(611)); /* LATIN CAPITAL LETTER GAMMA */
+$config['0180_024F'][] = array('upper' => 406, 'status' => 'C', 'lower' => array(617)); /* LATIN CAPITAL LETTER IOTA */
+$config['0180_024F'][] = array('upper' => 407, 'status' => 'C', 'lower' => array(616)); /* LATIN CAPITAL LETTER I WITH STROKE */
+$config['0180_024F'][] = array('upper' => 408, 'status' => 'C', 'lower' => array(409)); /* LATIN CAPITAL LETTER K WITH HOOK */
+$config['0180_024F'][] = array('upper' => 412, 'status' => 'C', 'lower' => array(623)); /* LATIN CAPITAL LETTER TURNED M */
+$config['0180_024F'][] = array('upper' => 413, 'status' => 'C', 'lower' => array(626)); /* LATIN CAPITAL LETTER N WITH LEFT HOOK */
+$config['0180_024F'][] = array('upper' => 415, 'status' => 'C', 'lower' => array(629)); /* LATIN CAPITAL LETTER O WITH MIDDLE TILDE */
+$config['0180_024F'][] = array('upper' => 416, 'status' => 'C', 'lower' => array(417)); /* LATIN CAPITAL LETTER O WITH HORN */
+$config['0180_024F'][] = array('upper' => 418, 'status' => 'C', 'lower' => array(419)); /* LATIN CAPITAL LETTER OI */
+$config['0180_024F'][] = array('upper' => 420, 'status' => 'C', 'lower' => array(421)); /* LATIN CAPITAL LETTER P WITH HOOK */
+$config['0180_024F'][] = array('upper' => 422, 'status' => 'C', 'lower' => array(640)); /* LATIN LETTER YR */
+$config['0180_024F'][] = array('upper' => 423, 'status' => 'C', 'lower' => array(424)); /* LATIN CAPITAL LETTER TONE TWO */
+$config['0180_024F'][] = array('upper' => 425, 'status' => 'C', 'lower' => array(643)); /* LATIN CAPITAL LETTER ESH */
+$config['0180_024F'][] = array('upper' => 428, 'status' => 'C', 'lower' => array(429)); /* LATIN CAPITAL LETTER T WITH HOOK */
+$config['0180_024F'][] = array('upper' => 430, 'status' => 'C', 'lower' => array(648)); /* LATIN CAPITAL LETTER T WITH RETROFLEX HOOK */
+$config['0180_024F'][] = array('upper' => 431, 'status' => 'C', 'lower' => array(432)); /* LATIN CAPITAL LETTER U WITH HORN */
+$config['0180_024F'][] = array('upper' => 433, 'status' => 'C', 'lower' => array(650)); /* LATIN CAPITAL LETTER UPSILON */
+$config['0180_024F'][] = array('upper' => 434, 'status' => 'C', 'lower' => array(651)); /* LATIN CAPITAL LETTER V WITH HOOK */
+$config['0180_024F'][] = array('upper' => 435, 'status' => 'C', 'lower' => array(436)); /* LATIN CAPITAL LETTER Y WITH HOOK */
+$config['0180_024F'][] = array('upper' => 437, 'status' => 'C', 'lower' => array(438)); /* LATIN CAPITAL LETTER Z WITH STROKE */
+$config['0180_024F'][] = array('upper' => 439, 'status' => 'C', 'lower' => array(658)); /* LATIN CAPITAL LETTER EZH */
+$config['0180_024F'][] = array('upper' => 440, 'status' => 'C', 'lower' => array(441)); /* LATIN CAPITAL LETTER EZH REVERSED */
+$config['0180_024F'][] = array('upper' => 444, 'status' => 'C', 'lower' => array(445)); /* LATIN CAPITAL LETTER TONE FIVE */
+$config['0180_024F'][] = array('upper' => 452, 'status' => 'C', 'lower' => array(454)); /* LATIN CAPITAL LETTER DZ WITH CARON */
+$config['0180_024F'][] = array('upper' => 453, 'status' => 'C', 'lower' => array(454)); /* LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON */
+$config['0180_024F'][] = array('upper' => 455, 'status' => 'C', 'lower' => array(457)); /* LATIN CAPITAL LETTER LJ */
+$config['0180_024F'][] = array('upper' => 456, 'status' => 'C', 'lower' => array(457)); /* LATIN CAPITAL LETTER L WITH SMALL LETTER J */
+$config['0180_024F'][] = array('upper' => 458, 'status' => 'C', 'lower' => array(460)); /* LATIN CAPITAL LETTER NJ */
+$config['0180_024F'][] = array('upper' => 459, 'status' => 'C', 'lower' => array(460)); /* LATIN CAPITAL LETTER N WITH SMALL LETTER J */
+$config['0180_024F'][] = array('upper' => 461, 'status' => 'C', 'lower' => array(462)); /* LATIN CAPITAL LETTER A WITH CARON */
+$config['0180_024F'][] = array('upper' => 463, 'status' => 'C', 'lower' => array(464)); /* LATIN CAPITAL LETTER I WITH CARON */
+$config['0180_024F'][] = array('upper' => 465, 'status' => 'C', 'lower' => array(466)); /* LATIN CAPITAL LETTER O WITH CARON */
+$config['0180_024F'][] = array('upper' => 467, 'status' => 'C', 'lower' => array(468)); /* LATIN CAPITAL LETTER U WITH CARON */
+$config['0180_024F'][] = array('upper' => 469, 'status' => 'C', 'lower' => array(470)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND MACRON */
+$config['0180_024F'][] = array('upper' => 471, 'status' => 'C', 'lower' => array(472)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND ACUTE */
+$config['0180_024F'][] = array('upper' => 473, 'status' => 'C', 'lower' => array(474)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND CARON */
+$config['0180_024F'][] = array('upper' => 475, 'status' => 'C', 'lower' => array(476)); /* LATIN CAPITAL LETTER U WITH DIAERESIS AND GRAVE */
+$config['0180_024F'][] = array('upper' => 478, 'status' => 'C', 'lower' => array(479)); /* LATIN CAPITAL LETTER A WITH DIAERESIS AND MACRON */
+$config['0180_024F'][] = array('upper' => 480, 'status' => 'C', 'lower' => array(481)); /* LATIN CAPITAL LETTER A WITH DOT ABOVE AND MACRON */
+$config['0180_024F'][] = array('upper' => 482, 'status' => 'C', 'lower' => array(483)); /* LATIN CAPITAL LETTER AE WITH MACRON */
+$config['0180_024F'][] = array('upper' => 484, 'status' => 'C', 'lower' => array(485)); /* LATIN CAPITAL LETTER G WITH STROKE */
+$config['0180_024F'][] = array('upper' => 486, 'status' => 'C', 'lower' => array(487)); /* LATIN CAPITAL LETTER G WITH CARON */
+$config['0180_024F'][] = array('upper' => 488, 'status' => 'C', 'lower' => array(489)); /* LATIN CAPITAL LETTER K WITH CARON */
+$config['0180_024F'][] = array('upper' => 490, 'status' => 'C', 'lower' => array(491)); /* LATIN CAPITAL LETTER O WITH OGONEK */
+$config['0180_024F'][] = array('upper' => 492, 'status' => 'C', 'lower' => array(493)); /* LATIN CAPITAL LETTER O WITH OGONEK AND MACRON */
+$config['0180_024F'][] = array('upper' => 494, 'status' => 'C', 'lower' => array(495)); /* LATIN CAPITAL LETTER EZH WITH CARON */
+$config['0180_024F'][] = array('upper' => 496, 'status' => 'F', 'lower' => array(106, 780)); /* LATIN SMALL LETTER J WITH CARON */
+$config['0180_024F'][] = array('upper' => 497, 'status' => 'C', 'lower' => array(499)); /* LATIN CAPITAL LETTER DZ */
+$config['0180_024F'][] = array('upper' => 498, 'status' => 'C', 'lower' => array(499)); /* LATIN CAPITAL LETTER D WITH SMALL LETTER Z */
+$config['0180_024F'][] = array('upper' => 500, 'status' => 'C', 'lower' => array(501)); /* LATIN CAPITAL LETTER G WITH ACUTE */
+$config['0180_024F'][] = array('upper' => 502, 'status' => 'C', 'lower' => array(405)); /* LATIN CAPITAL LETTER HWAIR */
+$config['0180_024F'][] = array('upper' => 503, 'status' => 'C', 'lower' => array(447)); /* LATIN CAPITAL LETTER WYNN */
+$config['0180_024F'][] = array('upper' => 504, 'status' => 'C', 'lower' => array(505)); /* LATIN CAPITAL LETTER N WITH GRAVE */
+$config['0180_024F'][] = array('upper' => 506, 'status' => 'C', 'lower' => array(507)); /* LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE */
+$config['0180_024F'][] = array('upper' => 508, 'status' => 'C', 'lower' => array(509)); /* LATIN CAPITAL LETTER AE WITH ACUTE */
+$config['0180_024F'][] = array('upper' => 510, 'status' => 'C', 'lower' => array(511)); /* LATIN CAPITAL LETTER O WITH STROKE AND ACUTE */
+$config['0180_024F'][] = array('upper' => 512, 'status' => 'C', 'lower' => array(513)); /* LATIN CAPITAL LETTER A WITH DOUBLE GRAVE */
+$config['0180_024F'][] = array('upper' => 514, 'status' => 'C', 'lower' => array(515)); /* LATIN CAPITAL LETTER A WITH INVERTED BREVE */
+$config['0180_024F'][] = array('upper' => 516, 'status' => 'C', 'lower' => array(517)); /* LATIN CAPITAL LETTER E WITH DOUBLE GRAVE */
+$config['0180_024F'][] = array('upper' => 518, 'status' => 'C', 'lower' => array(519)); /* LATIN CAPITAL LETTER E WITH INVERTED BREVE */
+$config['0180_024F'][] = array('upper' => 520, 'status' => 'C', 'lower' => array(521)); /* LATIN CAPITAL LETTER I WITH DOUBLE GRAVE */
+$config['0180_024F'][] = array('upper' => 522, 'status' => 'C', 'lower' => array(523)); /* LATIN CAPITAL LETTER I WITH INVERTED BREVE */
+$config['0180_024F'][] = array('upper' => 524, 'status' => 'C', 'lower' => array(525)); /* LATIN CAPITAL LETTER O WITH DOUBLE GRAVE */
+$config['0180_024F'][] = array('upper' => 526, 'status' => 'C', 'lower' => array(527)); /* LATIN CAPITAL LETTER O WITH INVERTED BREVE */
+$config['0180_024F'][] = array('upper' => 528, 'status' => 'C', 'lower' => array(529)); /* LATIN CAPITAL LETTER R WITH DOUBLE GRAVE */
+$config['0180_024F'][] = array('upper' => 530, 'status' => 'C', 'lower' => array(531)); /* LATIN CAPITAL LETTER R WITH INVERTED BREVE */
+$config['0180_024F'][] = array('upper' => 532, 'status' => 'C', 'lower' => array(533)); /* LATIN CAPITAL LETTER U WITH DOUBLE GRAVE */
+$config['0180_024F'][] = array('upper' => 534, 'status' => 'C', 'lower' => array(535)); /* LATIN CAPITAL LETTER U WITH INVERTED BREVE */
+$config['0180_024F'][] = array('upper' => 536, 'status' => 'C', 'lower' => array(537)); /* LATIN CAPITAL LETTER S WITH COMMA BELOW */
+$config['0180_024F'][] = array('upper' => 538, 'status' => 'C', 'lower' => array(539)); /* LATIN CAPITAL LETTER T WITH COMMA BELOW */
+$config['0180_024F'][] = array('upper' => 540, 'status' => 'C', 'lower' => array(541)); /* LATIN CAPITAL LETTER YOGH */
+$config['0180_024F'][] = array('upper' => 542, 'status' => 'C', 'lower' => array(543)); /* LATIN CAPITAL LETTER H WITH CARON */
+$config['0180_024F'][] = array('upper' => 544, 'status' => 'C', 'lower' => array(414)); /* LATIN CAPITAL LETTER N WITH LONG RIGHT LEG */
+$config['0180_024F'][] = array('upper' => 546, 'status' => 'C', 'lower' => array(547)); /* LATIN CAPITAL LETTER OU */
+$config['0180_024F'][] = array('upper' => 548, 'status' => 'C', 'lower' => array(549)); /* LATIN CAPITAL LETTER Z WITH HOOK */
+$config['0180_024F'][] = array('upper' => 550, 'status' => 'C', 'lower' => array(551)); /* LATIN CAPITAL LETTER A WITH DOT ABOVE */
+$config['0180_024F'][] = array('upper' => 552, 'status' => 'C', 'lower' => array(553)); /* LATIN CAPITAL LETTER E WITH CEDILLA */
+$config['0180_024F'][] = array('upper' => 554, 'status' => 'C', 'lower' => array(555)); /* LATIN CAPITAL LETTER O WITH DIAERESIS AND MACRON */
+$config['0180_024F'][] = array('upper' => 556, 'status' => 'C', 'lower' => array(557)); /* LATIN CAPITAL LETTER O WITH TILDE AND MACRON */
+$config['0180_024F'][] = array('upper' => 558, 'status' => 'C', 'lower' => array(559)); /* LATIN CAPITAL LETTER O WITH DOT ABOVE */
+$config['0180_024F'][] = array('upper' => 560, 'status' => 'C', 'lower' => array(561)); /* LATIN CAPITAL LETTER O WITH DOT ABOVE AND MACRON */
+$config['0180_024F'][] = array('upper' => 562, 'status' => 'C', 'lower' => array(563)); /* LATIN CAPITAL LETTER Y WITH MACRON */
+$config['0180_024F'][] = array('upper' => 570, 'status' => 'C', 'lower' => array(11365)); /* LATIN CAPITAL LETTER A WITH STROKE */
+$config['0180_024F'][] = array('upper' => 571, 'status' => 'C', 'lower' => array(572)); /* LATIN CAPITAL LETTER C WITH STROKE */
+$config['0180_024F'][] = array('upper' => 573, 'status' => 'C', 'lower' => array(410)); /* LATIN CAPITAL LETTER L WITH BAR */
+$config['0180_024F'][] = array('upper' => 574, 'status' => 'C', 'lower' => array(11366)); /* LATIN CAPITAL LETTER T WITH DIAGONAL STROKE */
+$config['0180_024F'][] = array('upper' => 577, 'status' => 'C', 'lower' => array(578)); /* LATIN CAPITAL LETTER GLOTTAL STOP */
+$config['0180_024F'][] = array('upper' => 579, 'status' => 'C', 'lower' => array(384)); /* LATIN CAPITAL LETTER B WITH STROKE */
+$config['0180_024F'][] = array('upper' => 580, 'status' => 'C', 'lower' => array(649)); /* LATIN CAPITAL LETTER U BAR */
+$config['0180_024F'][] = array('upper' => 581, 'status' => 'C', 'lower' => array(652)); /* LATIN CAPITAL LETTER TURNED V */
+$config['0180_024F'][] = array('upper' => 582, 'status' => 'C', 'lower' => array(583)); /* LATIN CAPITAL LETTER E WITH STROKE */
+$config['0180_024F'][] = array('upper' => 584, 'status' => 'C', 'lower' => array(585)); /* LATIN CAPITAL LETTER J WITH STROKE */
+$config['0180_024F'][] = array('upper' => 586, 'status' => 'C', 'lower' => array(587)); /* LATIN CAPITAL LETTER SMALL Q WITH HOOK TAIL */
+$config['0180_024F'][] = array('upper' => 588, 'status' => 'C', 'lower' => array(589)); /* LATIN CAPITAL LETTER R WITH STROKE */
+$config['0180_024F'][] = array('upper' => 590, 'status' => 'C', 'lower' => array(591)); /* LATIN CAPITAL LETTER Y WITH STROKE */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0250_02af.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0250_02af.php
new file mode 100644
index 000000000..0472e297c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0250_02af.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0080 through U+00FF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.6833
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0250_02af'][] = array('upper' => 422, 'status' => 'C', 'lower' => array(640));
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0370_03ff.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0370_03ff.php
new file mode 100644
index 000000000..90defe832
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0370_03ff.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0370 through U+03FF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0370_03ff'][] = array('upper' => 902, 'status' => 'C', 'lower' => array(940)); /* GREEK CAPITAL LETTER ALPHA WITH TONOS */
+$config['0370_03ff'][] = array('upper' => 904, 'status' => 'C', 'lower' => array(941)); /* GREEK CAPITAL LETTER EPSILON WITH TONOS */
+$config['0370_03ff'][] = array('upper' => 905, 'status' => 'C', 'lower' => array(942)); /* GREEK CAPITAL LETTER ETA WITH TONOS */
+$config['0370_03ff'][] = array('upper' => 906, 'status' => 'C', 'lower' => array(943)); /* GREEK CAPITAL LETTER IOTA WITH TONOS */
+$config['0370_03ff'][] = array('upper' => 908, 'status' => 'C', 'lower' => array(972)); /* GREEK CAPITAL LETTER OMICRON WITH TONOS */
+$config['0370_03ff'][] = array('upper' => 910, 'status' => 'C', 'lower' => array(973)); /* GREEK CAPITAL LETTER UPSILON WITH TONOS */
+$config['0370_03ff'][] = array('upper' => 911, 'status' => 'C', 'lower' => array(974)); /* GREEK CAPITAL LETTER OMEGA WITH TONOS */
+//$config['0370_03ff'][] = array('upper' => 912, 'status' => 'F', 'lower' => array(953, 776, 769)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND TONOS */
+$config['0370_03ff'][] = array('upper' => 913, 'status' => 'C', 'lower' => array(945)); /* GREEK CAPITAL LETTER ALPHA */
+$config['0370_03ff'][] = array('upper' => 914, 'status' => 'C', 'lower' => array(946)); /* GREEK CAPITAL LETTER BETA */
+$config['0370_03ff'][] = array('upper' => 915, 'status' => 'C', 'lower' => array(947)); /* GREEK CAPITAL LETTER GAMMA */
+$config['0370_03ff'][] = array('upper' => 916, 'status' => 'C', 'lower' => array(948)); /* GREEK CAPITAL LETTER DELTA */
+$config['0370_03ff'][] = array('upper' => 917, 'status' => 'C', 'lower' => array(949)); /* GREEK CAPITAL LETTER EPSILON */
+$config['0370_03ff'][] = array('upper' => 918, 'status' => 'C', 'lower' => array(950)); /* GREEK CAPITAL LETTER ZETA */
+$config['0370_03ff'][] = array('upper' => 919, 'status' => 'C', 'lower' => array(951)); /* GREEK CAPITAL LETTER ETA */
+$config['0370_03ff'][] = array('upper' => 920, 'status' => 'C', 'lower' => array(952)); /* GREEK CAPITAL LETTER THETA */
+$config['0370_03ff'][] = array('upper' => 921, 'status' => 'C', 'lower' => array(953)); /* GREEK CAPITAL LETTER IOTA */
+$config['0370_03ff'][] = array('upper' => 922, 'status' => 'C', 'lower' => array(954)); /* GREEK CAPITAL LETTER KAPPA */
+$config['0370_03ff'][] = array('upper' => 923, 'status' => 'C', 'lower' => array(955)); /* GREEK CAPITAL LETTER LAMDA */
+$config['0370_03ff'][] = array('upper' => 924, 'status' => 'C', 'lower' => array(956)); /* GREEK CAPITAL LETTER MU */
+$config['0370_03ff'][] = array('upper' => 925, 'status' => 'C', 'lower' => array(957)); /* GREEK CAPITAL LETTER NU */
+$config['0370_03ff'][] = array('upper' => 926, 'status' => 'C', 'lower' => array(958)); /* GREEK CAPITAL LETTER XI */
+$config['0370_03ff'][] = array('upper' => 927, 'status' => 'C', 'lower' => array(959)); /* GREEK CAPITAL LETTER OMICRON */
+$config['0370_03ff'][] = array('upper' => 928, 'status' => 'C', 'lower' => array(960)); /* GREEK CAPITAL LETTER PI */
+$config['0370_03ff'][] = array('upper' => 929, 'status' => 'C', 'lower' => array(961)); /* GREEK CAPITAL LETTER RHO */
+$config['0370_03ff'][] = array('upper' => 931, 'status' => 'C', 'lower' => array(963)); /* GREEK CAPITAL LETTER SIGMA */
+$config['0370_03ff'][] = array('upper' => 932, 'status' => 'C', 'lower' => array(964)); /* GREEK CAPITAL LETTER TAU */
+$config['0370_03ff'][] = array('upper' => 933, 'status' => 'C', 'lower' => array(965)); /* GREEK CAPITAL LETTER UPSILON */
+$config['0370_03ff'][] = array('upper' => 934, 'status' => 'C', 'lower' => array(966)); /* GREEK CAPITAL LETTER PHI */
+$config['0370_03ff'][] = array('upper' => 935, 'status' => 'C', 'lower' => array(967)); /* GREEK CAPITAL LETTER CHI */
+$config['0370_03ff'][] = array('upper' => 936, 'status' => 'C', 'lower' => array(968)); /* GREEK CAPITAL LETTER PSI */
+$config['0370_03ff'][] = array('upper' => 937, 'status' => 'C', 'lower' => array(969)); /* GREEK CAPITAL LETTER OMEGA */
+$config['0370_03ff'][] = array('upper' => 938, 'status' => 'C', 'lower' => array(970)); /* GREEK CAPITAL LETTER IOTA WITH DIALYTIKA */
+$config['0370_03ff'][] = array('upper' => 939, 'status' => 'C', 'lower' => array(971)); /* GREEK CAPITAL LETTER UPSILON WITH DIALYTIKA */
+$config['0370_03ff'][] = array('upper' => 944, 'status' => 'F', 'lower' => array(965, 776, 769)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND TONOS */
+$config['0370_03ff'][] = array('upper' => 962, 'status' => 'C', 'lower' => array(963)); /* GREEK SMALL LETTER FINAL SIGMA */
+$config['0370_03ff'][] = array('upper' => 976, 'status' => 'C', 'lower' => array(946)); /* GREEK BETA SYMBOL */
+$config['0370_03ff'][] = array('upper' => 977, 'status' => 'C', 'lower' => array(952)); /* GREEK THETA SYMBOL */
+$config['0370_03ff'][] = array('upper' => 981, 'status' => 'C', 'lower' => array(966)); /* GREEK PHI SYMBOL */
+$config['0370_03ff'][] = array('upper' => 982, 'status' => 'C', 'lower' => array(960)); /* GREEK PI SYMBOL */
+$config['0370_03ff'][] = array('upper' => 984, 'status' => 'C', 'lower' => array(985)); /* GREEK LETTER ARCHAIC KOPPA */
+$config['0370_03ff'][] = array('upper' => 986, 'status' => 'C', 'lower' => array(987)); /* GREEK LETTER STIGMA */
+$config['0370_03ff'][] = array('upper' => 988, 'status' => 'C', 'lower' => array(989)); /* GREEK LETTER DIGAMMA */
+$config['0370_03ff'][] = array('upper' => 990, 'status' => 'C', 'lower' => array(991)); /* GREEK LETTER KOPPA */
+$config['0370_03ff'][] = array('upper' => 992, 'status' => 'C', 'lower' => array(993)); /* GREEK LETTER SAMPI */
+$config['0370_03ff'][] = array('upper' => 994, 'status' => 'C', 'lower' => array(995)); /* COPTIC CAPITAL LETTER SHEI */
+$config['0370_03ff'][] = array('upper' => 996, 'status' => 'C', 'lower' => array(997)); /* COPTIC CAPITAL LETTER FEI */
+$config['0370_03ff'][] = array('upper' => 998, 'status' => 'C', 'lower' => array(999)); /* COPTIC CAPITAL LETTER KHEI */
+$config['0370_03ff'][] = array('upper' => 1000, 'status' => 'C', 'lower' => array(1001)); /* COPTIC CAPITAL LETTER HORI */
+$config['0370_03ff'][] = array('upper' => 1002, 'status' => 'C', 'lower' => array(1003)); /* COPTIC CAPITAL LETTER GANGIA */
+$config['0370_03ff'][] = array('upper' => 1004, 'status' => 'C', 'lower' => array(1005)); /* COPTIC CAPITAL LETTER SHIMA */
+$config['0370_03ff'][] = array('upper' => 1006, 'status' => 'C', 'lower' => array(1007)); /* COPTIC CAPITAL LETTER DEI */
+$config['0370_03ff'][] = array('upper' => 1008, 'status' => 'C', 'lower' => array(954)); /* GREEK KAPPA SYMBOL */
+$config['0370_03ff'][] = array('upper' => 1009, 'status' => 'C', 'lower' => array(961)); /* GREEK RHO SYMBOL */
+$config['0370_03ff'][] = array('upper' => 1012, 'status' => 'C', 'lower' => array(952)); /* GREEK CAPITAL THETA SYMBOL */
+$config['0370_03ff'][] = array('upper' => 1013, 'status' => 'C', 'lower' => array(949)); /* GREEK LUNATE EPSILON SYMBOL */
+$config['0370_03ff'][] = array('upper' => 1015, 'status' => 'C', 'lower' => array(1016)); /* GREEK CAPITAL LETTER SHO */
+$config['0370_03ff'][] = array('upper' => 1017, 'status' => 'C', 'lower' => array(1010)); /* GREEK CAPITAL LUNATE SIGMA SYMBOL */
+$config['0370_03ff'][] = array('upper' => 1018, 'status' => 'C', 'lower' => array(1019)); /* GREEK CAPITAL LETTER SAN */
+$config['0370_03ff'][] = array('upper' => 1021, 'status' => 'C', 'lower' => array(891)); /* GREEK CAPITAL REVERSED LUNATE SIGMA SYMBOL */
+$config['0370_03ff'][] = array('upper' => 1022, 'status' => 'C', 'lower' => array(892)); /* GREEK CAPITAL DOTTED LUNATE SIGMA SYMBOL */
+$config['0370_03ff'][] = array('upper' => 1023, 'status' => 'C', 'lower' => array(893)); /* GREEK CAPITAL REVERSED DOTTED LUNATE SIGMA SYMBOL */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0400_04ff.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0400_04ff.php
new file mode 100644
index 000000000..9900171b2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0400_04ff.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0400 through U+04FF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0400_04ff'][] = array('upper' => 1024, 'status' => 'C', 'lower' => array(1104)); /* CYRILLIC CAPITAL LETTER IE WITH GRAVE */
+$config['0400_04ff'][] = array('upper' => 1025, 'status' => 'C', 'lower' => array(1105)); /* CYRILLIC CAPITAL LETTER IO */
+$config['0400_04ff'][] = array('upper' => 1026, 'status' => 'C', 'lower' => array(1106)); /* CYRILLIC CAPITAL LETTER DJE */
+$config['0400_04ff'][] = array('upper' => 1027, 'status' => 'C', 'lower' => array(1107)); /* CYRILLIC CAPITAL LETTER GJE */
+$config['0400_04ff'][] = array('upper' => 1028, 'status' => 'C', 'lower' => array(1108)); /* CYRILLIC CAPITAL LETTER UKRAINIAN IE */
+$config['0400_04ff'][] = array('upper' => 1029, 'status' => 'C', 'lower' => array(1109)); /* CYRILLIC CAPITAL LETTER DZE */
+$config['0400_04ff'][] = array('upper' => 1030, 'status' => 'C', 'lower' => array(1110)); /* CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I */
+$config['0400_04ff'][] = array('upper' => 1031, 'status' => 'C', 'lower' => array(1111)); /* CYRILLIC CAPITAL LETTER YI */
+$config['0400_04ff'][] = array('upper' => 1032, 'status' => 'C', 'lower' => array(1112)); /* CYRILLIC CAPITAL LETTER JE */
+$config['0400_04ff'][] = array('upper' => 1033, 'status' => 'C', 'lower' => array(1113)); /* CYRILLIC CAPITAL LETTER LJE */
+$config['0400_04ff'][] = array('upper' => 1034, 'status' => 'C', 'lower' => array(1114)); /* CYRILLIC CAPITAL LETTER NJE */
+$config['0400_04ff'][] = array('upper' => 1035, 'status' => 'C', 'lower' => array(1115)); /* CYRILLIC CAPITAL LETTER TSHE */
+$config['0400_04ff'][] = array('upper' => 1036, 'status' => 'C', 'lower' => array(1116)); /* CYRILLIC CAPITAL LETTER KJE */
+$config['0400_04ff'][] = array('upper' => 1037, 'status' => 'C', 'lower' => array(1117)); /* CYRILLIC CAPITAL LETTER I WITH GRAVE */
+$config['0400_04ff'][] = array('upper' => 1038, 'status' => 'C', 'lower' => array(1118)); /* CYRILLIC CAPITAL LETTER SHORT U */
+$config['0400_04ff'][] = array('upper' => 1039, 'status' => 'C', 'lower' => array(1119)); /* CYRILLIC CAPITAL LETTER DZHE */
+$config['0400_04ff'][] = array('upper' => 1040, 'status' => 'C', 'lower' => array(1072)); /* CYRILLIC CAPITAL LETTER A */
+$config['0400_04ff'][] = array('upper' => 1041, 'status' => 'C', 'lower' => array(1073)); /* CYRILLIC CAPITAL LETTER BE */
+$config['0400_04ff'][] = array('upper' => 1042, 'status' => 'C', 'lower' => array(1074)); /* CYRILLIC CAPITAL LETTER VE */
+$config['0400_04ff'][] = array('upper' => 1043, 'status' => 'C', 'lower' => array(1075)); /* CYRILLIC CAPITAL LETTER GHE */
+$config['0400_04ff'][] = array('upper' => 1044, 'status' => 'C', 'lower' => array(1076)); /* CYRILLIC CAPITAL LETTER DE */
+$config['0400_04ff'][] = array('upper' => 1045, 'status' => 'C', 'lower' => array(1077)); /* CYRILLIC CAPITAL LETTER IE */
+$config['0400_04ff'][] = array('upper' => 1046, 'status' => 'C', 'lower' => array(1078)); /* CYRILLIC CAPITAL LETTER ZHE */
+$config['0400_04ff'][] = array('upper' => 1047, 'status' => 'C', 'lower' => array(1079)); /* CYRILLIC CAPITAL LETTER ZE */
+$config['0400_04ff'][] = array('upper' => 1048, 'status' => 'C', 'lower' => array(1080)); /* CYRILLIC CAPITAL LETTER I */
+$config['0400_04ff'][] = array('upper' => 1049, 'status' => 'C', 'lower' => array(1081)); /* CYRILLIC CAPITAL LETTER SHORT I */
+$config['0400_04ff'][] = array('upper' => 1050, 'status' => 'C', 'lower' => array(1082)); /* CYRILLIC CAPITAL LETTER KA */
+$config['0400_04ff'][] = array('upper' => 1051, 'status' => 'C', 'lower' => array(1083)); /* CYRILLIC CAPITAL LETTER EL */
+$config['0400_04ff'][] = array('upper' => 1052, 'status' => 'C', 'lower' => array(1084)); /* CYRILLIC CAPITAL LETTER EM */
+$config['0400_04ff'][] = array('upper' => 1053, 'status' => 'C', 'lower' => array(1085)); /* CYRILLIC CAPITAL LETTER EN */
+$config['0400_04ff'][] = array('upper' => 1054, 'status' => 'C', 'lower' => array(1086)); /* CYRILLIC CAPITAL LETTER O */
+$config['0400_04ff'][] = array('upper' => 1055, 'status' => 'C', 'lower' => array(1087)); /* CYRILLIC CAPITAL LETTER PE */
+$config['0400_04ff'][] = array('upper' => 1056, 'status' => 'C', 'lower' => array(1088)); /* CYRILLIC CAPITAL LETTER ER */
+$config['0400_04ff'][] = array('upper' => 1057, 'status' => 'C', 'lower' => array(1089)); /* CYRILLIC CAPITAL LETTER ES */
+$config['0400_04ff'][] = array('upper' => 1058, 'status' => 'C', 'lower' => array(1090)); /* CYRILLIC CAPITAL LETTER TE */
+$config['0400_04ff'][] = array('upper' => 1059, 'status' => 'C', 'lower' => array(1091)); /* CYRILLIC CAPITAL LETTER U */
+$config['0400_04ff'][] = array('upper' => 1060, 'status' => 'C', 'lower' => array(1092)); /* CYRILLIC CAPITAL LETTER EF */
+$config['0400_04ff'][] = array('upper' => 1061, 'status' => 'C', 'lower' => array(1093)); /* CYRILLIC CAPITAL LETTER HA */
+$config['0400_04ff'][] = array('upper' => 1062, 'status' => 'C', 'lower' => array(1094)); /* CYRILLIC CAPITAL LETTER TSE */
+$config['0400_04ff'][] = array('upper' => 1063, 'status' => 'C', 'lower' => array(1095)); /* CYRILLIC CAPITAL LETTER CHE */
+$config['0400_04ff'][] = array('upper' => 1064, 'status' => 'C', 'lower' => array(1096)); /* CYRILLIC CAPITAL LETTER SHA */
+$config['0400_04ff'][] = array('upper' => 1065, 'status' => 'C', 'lower' => array(1097)); /* CYRILLIC CAPITAL LETTER SHCHA */
+$config['0400_04ff'][] = array('upper' => 1066, 'status' => 'C', 'lower' => array(1098)); /* CYRILLIC CAPITAL LETTER HARD SIGN */
+$config['0400_04ff'][] = array('upper' => 1067, 'status' => 'C', 'lower' => array(1099)); /* CYRILLIC CAPITAL LETTER YERU */
+$config['0400_04ff'][] = array('upper' => 1068, 'status' => 'C', 'lower' => array(1100)); /* CYRILLIC CAPITAL LETTER SOFT SIGN */
+$config['0400_04ff'][] = array('upper' => 1069, 'status' => 'C', 'lower' => array(1101)); /* CYRILLIC CAPITAL LETTER E */
+$config['0400_04ff'][] = array('upper' => 1070, 'status' => 'C', 'lower' => array(1102)); /* CYRILLIC CAPITAL LETTER YU */
+$config['0400_04ff'][] = array('upper' => 1071, 'status' => 'C', 'lower' => array(1103)); /* CYRILLIC CAPITAL LETTER YA */
+$config['0400_04ff'][] = array('upper' => 1120, 'status' => 'C', 'lower' => array(1121)); /* CYRILLIC CAPITAL LETTER OMEGA */
+$config['0400_04ff'][] = array('upper' => 1122, 'status' => 'C', 'lower' => array(1123)); /* CYRILLIC CAPITAL LETTER YAT */
+$config['0400_04ff'][] = array('upper' => 1124, 'status' => 'C', 'lower' => array(1125)); /* CYRILLIC CAPITAL LETTER IOTIFIED E */
+$config['0400_04ff'][] = array('upper' => 1126, 'status' => 'C', 'lower' => array(1127)); /* CYRILLIC CAPITAL LETTER LITTLE YUS */
+$config['0400_04ff'][] = array('upper' => 1128, 'status' => 'C', 'lower' => array(1129)); /* CYRILLIC CAPITAL LETTER IOTIFIED LITTLE YUS */
+$config['0400_04ff'][] = array('upper' => 1130, 'status' => 'C', 'lower' => array(1131)); /* CYRILLIC CAPITAL LETTER BIG YUS */
+$config['0400_04ff'][] = array('upper' => 1132, 'status' => 'C', 'lower' => array(1133)); /* CYRILLIC CAPITAL LETTER IOTIFIED BIG YUS */
+$config['0400_04ff'][] = array('upper' => 1134, 'status' => 'C', 'lower' => array(1135)); /* CYRILLIC CAPITAL LETTER KSI */
+$config['0400_04ff'][] = array('upper' => 1136, 'status' => 'C', 'lower' => array(1137)); /* CYRILLIC CAPITAL LETTER PSI */
+$config['0400_04ff'][] = array('upper' => 1138, 'status' => 'C', 'lower' => array(1139)); /* CYRILLIC CAPITAL LETTER FITA */
+$config['0400_04ff'][] = array('upper' => 1140, 'status' => 'C', 'lower' => array(1141)); /* CYRILLIC CAPITAL LETTER IZHITSA */
+$config['0400_04ff'][] = array('upper' => 1142, 'status' => 'C', 'lower' => array(1143)); /* CYRILLIC CAPITAL LETTER IZHITSA WITH DOUBLE GRAVE ACCENT */
+$config['0400_04ff'][] = array('upper' => 1144, 'status' => 'C', 'lower' => array(1145)); /* CYRILLIC CAPITAL LETTER UK */
+$config['0400_04ff'][] = array('upper' => 1146, 'status' => 'C', 'lower' => array(1147)); /* CYRILLIC CAPITAL LETTER ROUND OMEGA */
+$config['0400_04ff'][] = array('upper' => 1148, 'status' => 'C', 'lower' => array(1149)); /* CYRILLIC CAPITAL LETTER OMEGA WITH TITLO */
+$config['0400_04ff'][] = array('upper' => 1150, 'status' => 'C', 'lower' => array(1151)); /* CYRILLIC CAPITAL LETTER OT */
+$config['0400_04ff'][] = array('upper' => 1152, 'status' => 'C', 'lower' => array(1153)); /* CYRILLIC CAPITAL LETTER KOPPA */
+$config['0400_04ff'][] = array('upper' => 1162, 'status' => 'C', 'lower' => array(1163)); /* CYRILLIC CAPITAL LETTER SHORT I WITH TAIL */
+$config['0400_04ff'][] = array('upper' => 1164, 'status' => 'C', 'lower' => array(1165)); /* CYRILLIC CAPITAL LETTER SEMISOFT SIGN */
+$config['0400_04ff'][] = array('upper' => 1166, 'status' => 'C', 'lower' => array(1167)); /* CYRILLIC CAPITAL LETTER ER WITH TICK */
+$config['0400_04ff'][] = array('upper' => 1168, 'status' => 'C', 'lower' => array(1169)); /* CYRILLIC CAPITAL LETTER GHE WITH UPTURN */
+$config['0400_04ff'][] = array('upper' => 1170, 'status' => 'C', 'lower' => array(1171)); /* CYRILLIC CAPITAL LETTER GHE WITH STROKE */
+$config['0400_04ff'][] = array('upper' => 1172, 'status' => 'C', 'lower' => array(1173)); /* CYRILLIC CAPITAL LETTER GHE WITH MIDDLE HOOK */
+$config['0400_04ff'][] = array('upper' => 1174, 'status' => 'C', 'lower' => array(1175)); /* CYRILLIC CAPITAL LETTER ZHE WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1176, 'status' => 'C', 'lower' => array(1177)); /* CYRILLIC CAPITAL LETTER ZE WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1178, 'status' => 'C', 'lower' => array(1179)); /* CYRILLIC CAPITAL LETTER KA WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1180, 'status' => 'C', 'lower' => array(1181)); /* CYRILLIC CAPITAL LETTER KA WITH VERTICAL STROKE */
+$config['0400_04ff'][] = array('upper' => 1182, 'status' => 'C', 'lower' => array(1183)); /* CYRILLIC CAPITAL LETTER KA WITH STROKE */
+$config['0400_04ff'][] = array('upper' => 1184, 'status' => 'C', 'lower' => array(1185)); /* CYRILLIC CAPITAL LETTER BASHKIR KA */
+$config['0400_04ff'][] = array('upper' => 1186, 'status' => 'C', 'lower' => array(1187)); /* CYRILLIC CAPITAL LETTER EN WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1188, 'status' => 'C', 'lower' => array(1189)); /* CYRILLIC CAPITAL LIGATURE EN GHE */
+$config['0400_04ff'][] = array('upper' => 1190, 'status' => 'C', 'lower' => array(1191)); /* CYRILLIC CAPITAL LETTER PE WITH MIDDLE HOOK */
+$config['0400_04ff'][] = array('upper' => 1192, 'status' => 'C', 'lower' => array(1193)); /* CYRILLIC CAPITAL LETTER ABKHASIAN HA */
+$config['0400_04ff'][] = array('upper' => 1194, 'status' => 'C', 'lower' => array(1195)); /* CYRILLIC CAPITAL LETTER ES WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1196, 'status' => 'C', 'lower' => array(1197)); /* CYRILLIC CAPITAL LETTER TE WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1198, 'status' => 'C', 'lower' => array(1199)); /* CYRILLIC CAPITAL LETTER STRAIGHT U */
+$config['0400_04ff'][] = array('upper' => 1200, 'status' => 'C', 'lower' => array(1201)); /* CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE */
+$config['0400_04ff'][] = array('upper' => 1202, 'status' => 'C', 'lower' => array(1203)); /* CYRILLIC CAPITAL LETTER HA WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1204, 'status' => 'C', 'lower' => array(1205)); /* CYRILLIC CAPITAL LIGATURE TE TSE */
+$config['0400_04ff'][] = array('upper' => 1206, 'status' => 'C', 'lower' => array(1207)); /* CYRILLIC CAPITAL LETTER CHE WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1208, 'status' => 'C', 'lower' => array(1209)); /* CYRILLIC CAPITAL LETTER CHE WITH VERTICAL STROKE */
+$config['0400_04ff'][] = array('upper' => 1210, 'status' => 'C', 'lower' => array(1211)); /* CYRILLIC CAPITAL LETTER SHHA */
+$config['0400_04ff'][] = array('upper' => 1212, 'status' => 'C', 'lower' => array(1213)); /* CYRILLIC CAPITAL LETTER ABKHASIAN CHE */
+$config['0400_04ff'][] = array('upper' => 1214, 'status' => 'C', 'lower' => array(1215)); /* CYRILLIC CAPITAL LETTER ABKHASIAN CHE WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1216, 'status' => 'C', 'lower' => array(1231)); /* CYRILLIC LETTER PALOCHKA */
+$config['0400_04ff'][] = array('upper' => 1217, 'status' => 'C', 'lower' => array(1218)); /* CYRILLIC CAPITAL LETTER ZHE WITH BREVE */
+$config['0400_04ff'][] = array('upper' => 1219, 'status' => 'C', 'lower' => array(1220)); /* CYRILLIC CAPITAL LETTER KA WITH HOOK */
+$config['0400_04ff'][] = array('upper' => 1221, 'status' => 'C', 'lower' => array(1222)); /* CYRILLIC CAPITAL LETTER EL WITH TAIL */
+$config['0400_04ff'][] = array('upper' => 1223, 'status' => 'C', 'lower' => array(1224)); /* CYRILLIC CAPITAL LETTER EN WITH HOOK */
+$config['0400_04ff'][] = array('upper' => 1225, 'status' => 'C', 'lower' => array(1226)); /* CYRILLIC CAPITAL LETTER EN WITH TAIL */
+$config['0400_04ff'][] = array('upper' => 1227, 'status' => 'C', 'lower' => array(1228)); /* CYRILLIC CAPITAL LETTER KHAKASSIAN CHE */
+$config['0400_04ff'][] = array('upper' => 1229, 'status' => 'C', 'lower' => array(1230)); /* CYRILLIC CAPITAL LETTER EM WITH TAIL */
+$config['0400_04ff'][] = array('upper' => 1232, 'status' => 'C', 'lower' => array(1233)); /* CYRILLIC CAPITAL LETTER A WITH BREVE */
+$config['0400_04ff'][] = array('upper' => 1234, 'status' => 'C', 'lower' => array(1235)); /* CYRILLIC CAPITAL LETTER A WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1236, 'status' => 'C', 'lower' => array(1237)); /* CYRILLIC CAPITAL LIGATURE A IE */
+$config['0400_04ff'][] = array('upper' => 1238, 'status' => 'C', 'lower' => array(1239)); /* CYRILLIC CAPITAL LETTER IE WITH BREVE */
+$config['0400_04ff'][] = array('upper' => 1240, 'status' => 'C', 'lower' => array(1241)); /* CYRILLIC CAPITAL LETTER SCHWA */
+$config['0400_04ff'][] = array('upper' => 1242, 'status' => 'C', 'lower' => array(1243)); /* CYRILLIC CAPITAL LETTER SCHWA WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1244, 'status' => 'C', 'lower' => array(1245)); /* CYRILLIC CAPITAL LETTER ZHE WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1246, 'status' => 'C', 'lower' => array(1247)); /* CYRILLIC CAPITAL LETTER ZE WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1248, 'status' => 'C', 'lower' => array(1249)); /* CYRILLIC CAPITAL LETTER ABKHASIAN DZE */
+$config['0400_04ff'][] = array('upper' => 1250, 'status' => 'C', 'lower' => array(1251)); /* CYRILLIC CAPITAL LETTER I WITH MACRON */
+$config['0400_04ff'][] = array('upper' => 1252, 'status' => 'C', 'lower' => array(1253)); /* CYRILLIC CAPITAL LETTER I WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1254, 'status' => 'C', 'lower' => array(1255)); /* CYRILLIC CAPITAL LETTER O WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1256, 'status' => 'C', 'lower' => array(1257)); /* CYRILLIC CAPITAL LETTER BARRED O */
+$config['0400_04ff'][] = array('upper' => 1258, 'status' => 'C', 'lower' => array(1259)); /* CYRILLIC CAPITAL LETTER BARRED O WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1260, 'status' => 'C', 'lower' => array(1261)); /* CYRILLIC CAPITAL LETTER E WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1262, 'status' => 'C', 'lower' => array(1263)); /* CYRILLIC CAPITAL LETTER U WITH MACRON */
+$config['0400_04ff'][] = array('upper' => 1264, 'status' => 'C', 'lower' => array(1265)); /* CYRILLIC CAPITAL LETTER U WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1266, 'status' => 'C', 'lower' => array(1267)); /* CYRILLIC CAPITAL LETTER U WITH DOUBLE ACUTE */
+$config['0400_04ff'][] = array('upper' => 1268, 'status' => 'C', 'lower' => array(1269)); /* CYRILLIC CAPITAL LETTER CHE WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1270, 'status' => 'C', 'lower' => array(1271)); /* CYRILLIC CAPITAL LETTER GHE WITH DESCENDER */
+$config['0400_04ff'][] = array('upper' => 1272, 'status' => 'C', 'lower' => array(1273)); /* CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS */
+$config['0400_04ff'][] = array('upper' => 1274, 'status' => 'C', 'lower' => array(1275)); /* CYRILLIC CAPITAL LETTER GHE WITH STROKE AND HOOK */
+$config['0400_04ff'][] = array('upper' => 1276, 'status' => 'C', 'lower' => array(1277)); /* CYRILLIC CAPITAL LETTER HA WITH HOOK */
+$config['0400_04ff'][] = array('upper' => 1278, 'status' => 'C', 'lower' => array(1279)); /* CYRILLIC CAPITAL LETTER HA WITH STROKE */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0500_052f.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0500_052f.php
new file mode 100644
index 000000000..7e3c956d1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0500_052f.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0500 through U+052F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0500_052f'][] = array('upper' => 1280, 'status' => 'C', 'lower' => array(1281)); /* CYRILLIC CAPITAL LETTER KOMI DE */
+$config['0500_052f'][] = array('upper' => 1282, 'status' => 'C', 'lower' => array(1283)); /* CYRILLIC CAPITAL LETTER KOMI DJE */
+$config['0500_052f'][] = array('upper' => 1284, 'status' => 'C', 'lower' => array(1285)); /* CYRILLIC CAPITAL LETTER KOMI ZJE */
+$config['0500_052f'][] = array('upper' => 1286, 'status' => 'C', 'lower' => array(1287)); /* CYRILLIC CAPITAL LETTER KOMI DZJE */
+$config['0500_052f'][] = array('upper' => 1288, 'status' => 'C', 'lower' => array(1289)); /* CYRILLIC CAPITAL LETTER KOMI LJE */
+$config['0500_052f'][] = array('upper' => 1290, 'status' => 'C', 'lower' => array(1291)); /* CYRILLIC CAPITAL LETTER KOMI NJE */
+$config['0500_052f'][] = array('upper' => 1292, 'status' => 'C', 'lower' => array(1293)); /* CYRILLIC CAPITAL LETTER KOMI SJE */
+$config['0500_052f'][] = array('upper' => 1294, 'status' => 'C', 'lower' => array(1295)); /* CYRILLIC CAPITAL LETTER KOMI TJE */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0530_058f.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0530_058f.php
new file mode 100644
index 000000000..9bfd6dc8d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/0530_058f.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+0530 through U+058F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['0530_058f'][] = array('upper' => 1329, 'status' => 'C', 'lower' => array(1377)); /* ARMENIAN CAPITAL LETTER AYB */
+$config['0530_058f'][] = array('upper' => 1330, 'status' => 'C', 'lower' => array(1378)); /* ARMENIAN CAPITAL LETTER BEN */
+$config['0530_058f'][] = array('upper' => 1331, 'status' => 'C', 'lower' => array(1379)); /* ARMENIAN CAPITAL LETTER GIM */
+$config['0530_058f'][] = array('upper' => 1332, 'status' => 'C', 'lower' => array(1380)); /* ARMENIAN CAPITAL LETTER DA */
+$config['0530_058f'][] = array('upper' => 1333, 'status' => 'C', 'lower' => array(1381)); /* ARMENIAN CAPITAL LETTER ECH */
+$config['0530_058f'][] = array('upper' => 1334, 'status' => 'C', 'lower' => array(1382)); /* ARMENIAN CAPITAL LETTER ZA */
+$config['0530_058f'][] = array('upper' => 1335, 'status' => 'C', 'lower' => array(1383)); /* ARMENIAN CAPITAL LETTER EH */
+$config['0530_058f'][] = array('upper' => 1336, 'status' => 'C', 'lower' => array(1384)); /* ARMENIAN CAPITAL LETTER ET */
+$config['0530_058f'][] = array('upper' => 1337, 'status' => 'C', 'lower' => array(1385)); /* ARMENIAN CAPITAL LETTER TO */
+$config['0530_058f'][] = array('upper' => 1338, 'status' => 'C', 'lower' => array(1386)); /* ARMENIAN CAPITAL LETTER ZHE */
+$config['0530_058f'][] = array('upper' => 1339, 'status' => 'C', 'lower' => array(1387)); /* ARMENIAN CAPITAL LETTER INI */
+$config['0530_058f'][] = array('upper' => 1340, 'status' => 'C', 'lower' => array(1388)); /* ARMENIAN CAPITAL LETTER LIWN */
+$config['0530_058f'][] = array('upper' => 1341, 'status' => 'C', 'lower' => array(1389)); /* ARMENIAN CAPITAL LETTER XEH */
+$config['0530_058f'][] = array('upper' => 1342, 'status' => 'C', 'lower' => array(1390)); /* ARMENIAN CAPITAL LETTER CA */
+$config['0530_058f'][] = array('upper' => 1343, 'status' => 'C', 'lower' => array(1391)); /* ARMENIAN CAPITAL LETTER KEN */
+$config['0530_058f'][] = array('upper' => 1344, 'status' => 'C', 'lower' => array(1392)); /* ARMENIAN CAPITAL LETTER HO */
+$config['0530_058f'][] = array('upper' => 1345, 'status' => 'C', 'lower' => array(1393)); /* ARMENIAN CAPITAL LETTER JA */
+$config['0530_058f'][] = array('upper' => 1346, 'status' => 'C', 'lower' => array(1394)); /* ARMENIAN CAPITAL LETTER GHAD */
+$config['0530_058f'][] = array('upper' => 1347, 'status' => 'C', 'lower' => array(1395)); /* ARMENIAN CAPITAL LETTER CHEH */
+$config['0530_058f'][] = array('upper' => 1348, 'status' => 'C', 'lower' => array(1396)); /* ARMENIAN CAPITAL LETTER MEN */
+$config['0530_058f'][] = array('upper' => 1349, 'status' => 'C', 'lower' => array(1397)); /* ARMENIAN CAPITAL LETTER YI */
+$config['0530_058f'][] = array('upper' => 1350, 'status' => 'C', 'lower' => array(1398)); /* ARMENIAN CAPITAL LETTER NOW */
+$config['0530_058f'][] = array('upper' => 1351, 'status' => 'C', 'lower' => array(1399)); /* ARMENIAN CAPITAL LETTER SHA */
+$config['0530_058f'][] = array('upper' => 1352, 'status' => 'C', 'lower' => array(1400)); /* ARMENIAN CAPITAL LETTER VO */
+$config['0530_058f'][] = array('upper' => 1353, 'status' => 'C', 'lower' => array(1401)); /* ARMENIAN CAPITAL LETTER CHA */
+$config['0530_058f'][] = array('upper' => 1354, 'status' => 'C', 'lower' => array(1402)); /* ARMENIAN CAPITAL LETTER PEH */
+$config['0530_058f'][] = array('upper' => 1355, 'status' => 'C', 'lower' => array(1403)); /* ARMENIAN CAPITAL LETTER JHEH */
+$config['0530_058f'][] = array('upper' => 1356, 'status' => 'C', 'lower' => array(1404)); /* ARMENIAN CAPITAL LETTER RA */
+$config['0530_058f'][] = array('upper' => 1357, 'status' => 'C', 'lower' => array(1405)); /* ARMENIAN CAPITAL LETTER SEH */
+$config['0530_058f'][] = array('upper' => 1358, 'status' => 'C', 'lower' => array(1406)); /* ARMENIAN CAPITAL LETTER VEW */
+$config['0530_058f'][] = array('upper' => 1359, 'status' => 'C', 'lower' => array(1407)); /* ARMENIAN CAPITAL LETTER TIWN */
+$config['0530_058f'][] = array('upper' => 1360, 'status' => 'C', 'lower' => array(1408)); /* ARMENIAN CAPITAL LETTER REH */
+$config['0530_058f'][] = array('upper' => 1361, 'status' => 'C', 'lower' => array(1409)); /* ARMENIAN CAPITAL LETTER CO */
+$config['0530_058f'][] = array('upper' => 1362, 'status' => 'C', 'lower' => array(1410)); /* ARMENIAN CAPITAL LETTER YIWN */
+$config['0530_058f'][] = array('upper' => 1363, 'status' => 'C', 'lower' => array(1411)); /* ARMENIAN CAPITAL LETTER PIWR */
+$config['0530_058f'][] = array('upper' => 1364, 'status' => 'C', 'lower' => array(1412)); /* ARMENIAN CAPITAL LETTER KEH */
+$config['0530_058f'][] = array('upper' => 1365, 'status' => 'C', 'lower' => array(1413)); /* ARMENIAN CAPITAL LETTER OH */
+$config['0530_058f'][] = array('upper' => 1366, 'status' => 'C', 'lower' => array(1414)); /* ARMENIAN CAPITAL LETTER FEH */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1e00_1eff.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1e00_1eff.php
new file mode 100644
index 000000000..d4214dda1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1e00_1eff.php
@@ -0,0 +1,169 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+1E00 through U+1EFF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['1e00_1eff'][] = array('upper' => 7680, 'status' => 'C', 'lower' => array(7681)); /* LATIN CAPITAL LETTER A WITH RING BELOW */
+$config['1e00_1eff'][] = array('upper' => 7682, 'status' => 'C', 'lower' => array(7683)); /* LATIN CAPITAL LETTER B WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7684, 'status' => 'C', 'lower' => array(7685)); /* LATIN CAPITAL LETTER B WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7686, 'status' => 'C', 'lower' => array(7687)); /* LATIN CAPITAL LETTER B WITH LINE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7688, 'status' => 'C', 'lower' => array(7689)); /* LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7690, 'status' => 'C', 'lower' => array(7691)); /* LATIN CAPITAL LETTER D WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7692, 'status' => 'C', 'lower' => array(7693)); /* LATIN CAPITAL LETTER D WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7694, 'status' => 'C', 'lower' => array(7695)); /* LATIN CAPITAL LETTER D WITH LINE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7696, 'status' => 'C', 'lower' => array(7697)); /* LATIN CAPITAL LETTER D WITH CEDILLA */
+$config['1e00_1eff'][] = array('upper' => 7698, 'status' => 'C', 'lower' => array(7699)); /* LATIN CAPITAL LETTER D WITH CIRCUMFLEX BELOW */
+$config['1e00_1eff'][] = array('upper' => 7700, 'status' => 'C', 'lower' => array(7701)); /* LATIN CAPITAL LETTER E WITH MACRON AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7702, 'status' => 'C', 'lower' => array(7703)); /* LATIN CAPITAL LETTER E WITH MACRON AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7704, 'status' => 'C', 'lower' => array(7705)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX BELOW */
+$config['1e00_1eff'][] = array('upper' => 7706, 'status' => 'C', 'lower' => array(7707)); /* LATIN CAPITAL LETTER E WITH TILDE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7708, 'status' => 'C', 'lower' => array(7709)); /* LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE */
+$config['1e00_1eff'][] = array('upper' => 7710, 'status' => 'C', 'lower' => array(7711)); /* LATIN CAPITAL LETTER F WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7712, 'status' => 'C', 'lower' => array(7713)); /* LATIN CAPITAL LETTER G WITH MACRON */
+$config['1e00_1eff'][] = array('upper' => 7714, 'status' => 'C', 'lower' => array(7715)); /* LATIN CAPITAL LETTER H WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7716, 'status' => 'C', 'lower' => array(7717)); /* LATIN CAPITAL LETTER H WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7718, 'status' => 'C', 'lower' => array(7719)); /* LATIN CAPITAL LETTER H WITH DIAERESIS */
+$config['1e00_1eff'][] = array('upper' => 7720, 'status' => 'C', 'lower' => array(7721)); /* LATIN CAPITAL LETTER H WITH CEDILLA */
+$config['1e00_1eff'][] = array('upper' => 7722, 'status' => 'C', 'lower' => array(7723)); /* LATIN CAPITAL LETTER H WITH BREVE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7724, 'status' => 'C', 'lower' => array(7725)); /* LATIN CAPITAL LETTER I WITH TILDE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7726, 'status' => 'C', 'lower' => array(7727)); /* LATIN CAPITAL LETTER I WITH DIAERESIS AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7728, 'status' => 'C', 'lower' => array(7729)); /* LATIN CAPITAL LETTER K WITH ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7730, 'status' => 'C', 'lower' => array(7731)); /* LATIN CAPITAL LETTER K WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7732, 'status' => 'C', 'lower' => array(7733)); /* LATIN CAPITAL LETTER K WITH LINE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7734, 'status' => 'C', 'lower' => array(7735)); /* LATIN CAPITAL LETTER L WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7736, 'status' => 'C', 'lower' => array(7737)); /* LATIN CAPITAL LETTER L WITH DOT BELOW AND MACRON */
+$config['1e00_1eff'][] = array('upper' => 7738, 'status' => 'C', 'lower' => array(7739)); /* LATIN CAPITAL LETTER L WITH LINE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7740, 'status' => 'C', 'lower' => array(7741)); /* LATIN CAPITAL LETTER L WITH CIRCUMFLEX BELOW */
+$config['1e00_1eff'][] = array('upper' => 7742, 'status' => 'C', 'lower' => array(7743)); /* LATIN CAPITAL LETTER M WITH ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7744, 'status' => 'C', 'lower' => array(7745)); /* LATIN CAPITAL LETTER M WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7746, 'status' => 'C', 'lower' => array(7747)); /* LATIN CAPITAL LETTER M WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7748, 'status' => 'C', 'lower' => array(7749)); /* LATIN CAPITAL LETTER N WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7750, 'status' => 'C', 'lower' => array(7751)); /* LATIN CAPITAL LETTER N WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7752, 'status' => 'C', 'lower' => array(7753)); /* LATIN CAPITAL LETTER N WITH LINE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7754, 'status' => 'C', 'lower' => array(7755)); /* LATIN CAPITAL LETTER N WITH CIRCUMFLEX BELOW */
+$config['1e00_1eff'][] = array('upper' => 7756, 'status' => 'C', 'lower' => array(7757)); /* LATIN CAPITAL LETTER O WITH TILDE AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7758, 'status' => 'C', 'lower' => array(7759)); /* LATIN CAPITAL LETTER O WITH TILDE AND DIAERESIS */
+$config['1e00_1eff'][] = array('upper' => 7760, 'status' => 'C', 'lower' => array(7761)); /* LATIN CAPITAL LETTER O WITH MACRON AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7762, 'status' => 'C', 'lower' => array(7763)); /* LATIN CAPITAL LETTER O WITH MACRON AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7764, 'status' => 'C', 'lower' => array(7765)); /* LATIN CAPITAL LETTER P WITH ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7766, 'status' => 'C', 'lower' => array(7767)); /* LATIN CAPITAL LETTER P WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7768, 'status' => 'C', 'lower' => array(7769)); /* LATIN CAPITAL LETTER R WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7770, 'status' => 'C', 'lower' => array(7771)); /* LATIN CAPITAL LETTER R WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7772, 'status' => 'C', 'lower' => array(7773)); /* LATIN CAPITAL LETTER R WITH DOT BELOW AND MACRON */
+$config['1e00_1eff'][] = array('upper' => 7774, 'status' => 'C', 'lower' => array(7775)); /* LATIN CAPITAL LETTER R WITH LINE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7776, 'status' => 'C', 'lower' => array(7777)); /* LATIN CAPITAL LETTER S WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7778, 'status' => 'C', 'lower' => array(7779)); /* LATIN CAPITAL LETTER S WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7780, 'status' => 'C', 'lower' => array(7781)); /* LATIN CAPITAL LETTER S WITH ACUTE AND DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7782, 'status' => 'C', 'lower' => array(7783)); /* LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7784, 'status' => 'C', 'lower' => array(7785)); /* LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7786, 'status' => 'C', 'lower' => array(7787)); /* LATIN CAPITAL LETTER T WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7788, 'status' => 'C', 'lower' => array(7789)); /* LATIN CAPITAL LETTER T WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7790, 'status' => 'C', 'lower' => array(7791)); /* LATIN CAPITAL LETTER T WITH LINE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7792, 'status' => 'C', 'lower' => array(7793)); /* LATIN CAPITAL LETTER T WITH CIRCUMFLEX BELOW */
+$config['1e00_1eff'][] = array('upper' => 7794, 'status' => 'C', 'lower' => array(7795)); /* LATIN CAPITAL LETTER U WITH DIAERESIS BELOW */
+$config['1e00_1eff'][] = array('upper' => 7796, 'status' => 'C', 'lower' => array(7797)); /* LATIN CAPITAL LETTER U WITH TILDE BELOW */
+$config['1e00_1eff'][] = array('upper' => 7798, 'status' => 'C', 'lower' => array(7799)); /* LATIN CAPITAL LETTER U WITH CIRCUMFLEX BELOW */
+$config['1e00_1eff'][] = array('upper' => 7800, 'status' => 'C', 'lower' => array(7801)); /* LATIN CAPITAL LETTER U WITH TILDE AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7802, 'status' => 'C', 'lower' => array(7803)); /* LATIN CAPITAL LETTER U WITH MACRON AND DIAERESIS */
+$config['1e00_1eff'][] = array('upper' => 7804, 'status' => 'C', 'lower' => array(7805)); /* LATIN CAPITAL LETTER V WITH TILDE */
+$config['1e00_1eff'][] = array('upper' => 7806, 'status' => 'C', 'lower' => array(7807)); /* LATIN CAPITAL LETTER V WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7808, 'status' => 'C', 'lower' => array(7809)); /* LATIN CAPITAL LETTER W WITH GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7810, 'status' => 'C', 'lower' => array(7811)); /* LATIN CAPITAL LETTER W WITH ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7812, 'status' => 'C', 'lower' => array(7813)); /* LATIN CAPITAL LETTER W WITH DIAERESIS */
+$config['1e00_1eff'][] = array('upper' => 7814, 'status' => 'C', 'lower' => array(7815)); /* LATIN CAPITAL LETTER W WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7816, 'status' => 'C', 'lower' => array(7817)); /* LATIN CAPITAL LETTER W WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7818, 'status' => 'C', 'lower' => array(7819)); /* LATIN CAPITAL LETTER X WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7820, 'status' => 'C', 'lower' => array(7821)); /* LATIN CAPITAL LETTER X WITH DIAERESIS */
+$config['1e00_1eff'][] = array('upper' => 7822, 'status' => 'C', 'lower' => array(7823)); /* LATIN CAPITAL LETTER Y WITH DOT ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7824, 'status' => 'C', 'lower' => array(7825)); /* LATIN CAPITAL LETTER Z WITH CIRCUMFLEX */
+$config['1e00_1eff'][] = array('upper' => 7826, 'status' => 'C', 'lower' => array(7827)); /* LATIN CAPITAL LETTER Z WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7828, 'status' => 'C', 'lower' => array(7829)); /* LATIN CAPITAL LETTER Z WITH LINE BELOW */
+
+//$config['1e00_1eff'][] = array('upper' => 7830, 'status' => 'F', 'lower' => array(104, 817)); /* LATIN SMALL LETTER H WITH LINE BELOW */
+//$config['1e00_1eff'][] = array('upper' => 7831, 'status' => 'F', 'lower' => array(116, 776)); /* LATIN SMALL LETTER T WITH DIAERESIS */
+//$config['1e00_1eff'][] = array('upper' => 7832, 'status' => 'F', 'lower' => array(119, 778)); /* LATIN SMALL LETTER W WITH RING ABOVE */
+//$config['1e00_1eff'][] = array('upper' => 7833, 'status' => 'F', 'lower' => array(121, 778)); /* LATIN SMALL LETTER Y WITH RING ABOVE */
+//$config['1e00_1eff'][] = array('upper' => 7834, 'status' => 'F', 'lower' => array(97, 702)); /* LATIN SMALL LETTER A WITH RIGHT HALF RING */
+//$config['1e00_1eff'][] = array('upper' => 7835, 'status' => 'C', 'lower' => array(7777)); /* LATIN SMALL LETTER LONG S WITH DOT ABOVE */
+
+$config['1e00_1eff'][] = array('upper' => 7840, 'status' => 'C', 'lower' => array(7841)); /* LATIN CAPITAL LETTER A WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7842, 'status' => 'C', 'lower' => array(7843)); /* LATIN CAPITAL LETTER A WITH HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7844, 'status' => 'C', 'lower' => array(7845)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7846, 'status' => 'C', 'lower' => array(7847)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7848, 'status' => 'C', 'lower' => array(7849)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7850, 'status' => 'C', 'lower' => array(7851)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE */
+$config['1e00_1eff'][] = array('upper' => 7852, 'status' => 'C', 'lower' => array(7853)); /* LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7854, 'status' => 'C', 'lower' => array(7855)); /* LATIN CAPITAL LETTER A WITH BREVE AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7856, 'status' => 'C', 'lower' => array(7857)); /* LATIN CAPITAL LETTER A WITH BREVE AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7858, 'status' => 'C', 'lower' => array(7859)); /* LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7860, 'status' => 'C', 'lower' => array(7861)); /* LATIN CAPITAL LETTER A WITH BREVE AND TILDE */
+$config['1e00_1eff'][] = array('upper' => 7862, 'status' => 'C', 'lower' => array(7863)); /* LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7864, 'status' => 'C', 'lower' => array(7865)); /* LATIN CAPITAL LETTER E WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7866, 'status' => 'C', 'lower' => array(7867)); /* LATIN CAPITAL LETTER E WITH HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7868, 'status' => 'C', 'lower' => array(7869)); /* LATIN CAPITAL LETTER E WITH TILDE */
+$config['1e00_1eff'][] = array('upper' => 7870, 'status' => 'C', 'lower' => array(7871)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7872, 'status' => 'C', 'lower' => array(7873)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7874, 'status' => 'C', 'lower' => array(7875)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7876, 'status' => 'C', 'lower' => array(7877)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE */
+$config['1e00_1eff'][] = array('upper' => 7878, 'status' => 'C', 'lower' => array(7879)); /* LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7880, 'status' => 'C', 'lower' => array(7881)); /* LATIN CAPITAL LETTER I WITH HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7882, 'status' => 'C', 'lower' => array(7883)); /* LATIN CAPITAL LETTER I WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7884, 'status' => 'C', 'lower' => array(7885)); /* LATIN CAPITAL LETTER O WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7886, 'status' => 'C', 'lower' => array(7887)); /* LATIN CAPITAL LETTER O WITH HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7888, 'status' => 'C', 'lower' => array(7889)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7890, 'status' => 'C', 'lower' => array(7891)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7892, 'status' => 'C', 'lower' => array(7893)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7894, 'status' => 'C', 'lower' => array(7895)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE */
+$config['1e00_1eff'][] = array('upper' => 7896, 'status' => 'C', 'lower' => array(7897)); /* LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7898, 'status' => 'C', 'lower' => array(7899)); /* LATIN CAPITAL LETTER O WITH HORN AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7900, 'status' => 'C', 'lower' => array(7901)); /* LATIN CAPITAL LETTER O WITH HORN AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7902, 'status' => 'C', 'lower' => array(7903)); /* LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7904, 'status' => 'C', 'lower' => array(7905)); /* LATIN CAPITAL LETTER O WITH HORN AND TILDE */
+$config['1e00_1eff'][] = array('upper' => 7906, 'status' => 'C', 'lower' => array(7907)); /* LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7908, 'status' => 'C', 'lower' => array(7909)); /* LATIN CAPITAL LETTER U WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7910, 'status' => 'C', 'lower' => array(7911)); /* LATIN CAPITAL LETTER U WITH HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7912, 'status' => 'C', 'lower' => array(7913)); /* LATIN CAPITAL LETTER U WITH HORN AND ACUTE */
+$config['1e00_1eff'][] = array('upper' => 7914, 'status' => 'C', 'lower' => array(7915)); /* LATIN CAPITAL LETTER U WITH HORN AND GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7916, 'status' => 'C', 'lower' => array(7917)); /* LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7918, 'status' => 'C', 'lower' => array(7919)); /* LATIN CAPITAL LETTER U WITH HORN AND TILDE */
+$config['1e00_1eff'][] = array('upper' => 7920, 'status' => 'C', 'lower' => array(7921)); /* LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7922, 'status' => 'C', 'lower' => array(7923)); /* LATIN CAPITAL LETTER Y WITH GRAVE */
+$config['1e00_1eff'][] = array('upper' => 7924, 'status' => 'C', 'lower' => array(7925)); /* LATIN CAPITAL LETTER Y WITH DOT BELOW */
+$config['1e00_1eff'][] = array('upper' => 7926, 'status' => 'C', 'lower' => array(7927)); /* LATIN CAPITAL LETTER Y WITH HOOK ABOVE */
+$config['1e00_1eff'][] = array('upper' => 7928, 'status' => 'C', 'lower' => array(7929)); /* LATIN CAPITAL LETTER Y WITH TILDE */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1f00_1fff.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1f00_1fff.php
new file mode 100644
index 000000000..b8b25cf0e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/1f00_1fff.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+1F00 through U+1FFF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['1f00_1fff'][] = array('upper' => 7944, 'status' => 'C', 'lower' => array(7936, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 7945, 'status' => 'C', 'lower' => array(7937)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 7946, 'status' => 'C', 'lower' => array(7938)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7947, 'status' => 'C', 'lower' => array(7939)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7948, 'status' => 'C', 'lower' => array(7940)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7949, 'status' => 'C', 'lower' => array(7941)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7950, 'status' => 'C', 'lower' => array(7942)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 7951, 'status' => 'C', 'lower' => array(7943)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 7960, 'status' => 'C', 'lower' => array(7952)); /* GREEK CAPITAL LETTER EPSILON WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 7961, 'status' => 'C', 'lower' => array(7953)); /* GREEK CAPITAL LETTER EPSILON WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 7962, 'status' => 'C', 'lower' => array(7954)); /* GREEK CAPITAL LETTER EPSILON WITH PSILI AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7963, 'status' => 'C', 'lower' => array(7955)); /* GREEK CAPITAL LETTER EPSILON WITH DASIA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7964, 'status' => 'C', 'lower' => array(7956)); /* GREEK CAPITAL LETTER EPSILON WITH PSILI AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7965, 'status' => 'C', 'lower' => array(7957)); /* GREEK CAPITAL LETTER EPSILON WITH DASIA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7976, 'status' => 'C', 'lower' => array(7968)); /* GREEK CAPITAL LETTER ETA WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 7977, 'status' => 'C', 'lower' => array(7969)); /* GREEK CAPITAL LETTER ETA WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 7978, 'status' => 'C', 'lower' => array(7970)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7979, 'status' => 'C', 'lower' => array(7971)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7980, 'status' => 'C', 'lower' => array(7972)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7981, 'status' => 'C', 'lower' => array(7973)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7982, 'status' => 'C', 'lower' => array(7974)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 7983, 'status' => 'C', 'lower' => array(7975)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 7992, 'status' => 'C', 'lower' => array(7984)); /* GREEK CAPITAL LETTER IOTA WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 7993, 'status' => 'C', 'lower' => array(7985)); /* GREEK CAPITAL LETTER IOTA WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 7994, 'status' => 'C', 'lower' => array(7986)); /* GREEK CAPITAL LETTER IOTA WITH PSILI AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7995, 'status' => 'C', 'lower' => array(7987)); /* GREEK CAPITAL LETTER IOTA WITH DASIA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 7996, 'status' => 'C', 'lower' => array(7988)); /* GREEK CAPITAL LETTER IOTA WITH PSILI AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7997, 'status' => 'C', 'lower' => array(7989)); /* GREEK CAPITAL LETTER IOTA WITH DASIA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 7998, 'status' => 'C', 'lower' => array(7990)); /* GREEK CAPITAL LETTER IOTA WITH PSILI AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 7999, 'status' => 'C', 'lower' => array(7991)); /* GREEK CAPITAL LETTER IOTA WITH DASIA AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8008, 'status' => 'C', 'lower' => array(8000)); /* GREEK CAPITAL LETTER OMICRON WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 8009, 'status' => 'C', 'lower' => array(8001)); /* GREEK CAPITAL LETTER OMICRON WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 8010, 'status' => 'C', 'lower' => array(8002)); /* GREEK CAPITAL LETTER OMICRON WITH PSILI AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8011, 'status' => 'C', 'lower' => array(8003)); /* GREEK CAPITAL LETTER OMICRON WITH DASIA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8012, 'status' => 'C', 'lower' => array(8004)); /* GREEK CAPITAL LETTER OMICRON WITH PSILI AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8013, 'status' => 'C', 'lower' => array(8005)); /* GREEK CAPITAL LETTER OMICRON WITH DASIA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8016, 'status' => 'F', 'lower' => array(965, 787)); /* GREEK SMALL LETTER UPSILON WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 8018, 'status' => 'F', 'lower' => array(965, 787, 768)); /* GREEK SMALL LETTER UPSILON WITH PSILI AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8020, 'status' => 'F', 'lower' => array(965, 787, 769)); /* GREEK SMALL LETTER UPSILON WITH PSILI AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8022, 'status' => 'F', 'lower' => array(965, 787, 834)); /* GREEK SMALL LETTER UPSILON WITH PSILI AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8025, 'status' => 'C', 'lower' => array(8017)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 8027, 'status' => 'C', 'lower' => array(8019)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8029, 'status' => 'C', 'lower' => array(8021)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8031, 'status' => 'C', 'lower' => array(8023)); /* GREEK CAPITAL LETTER UPSILON WITH DASIA AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8040, 'status' => 'C', 'lower' => array(8032)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 8041, 'status' => 'C', 'lower' => array(8033)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 8042, 'status' => 'C', 'lower' => array(8034)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8043, 'status' => 'C', 'lower' => array(8035)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8044, 'status' => 'C', 'lower' => array(8036)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8045, 'status' => 'C', 'lower' => array(8037)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8046, 'status' => 'C', 'lower' => array(8038)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8047, 'status' => 'C', 'lower' => array(8039)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8064, 'status' => 'F', 'lower' => array(7936, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8065, 'status' => 'F', 'lower' => array(7937, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8066, 'status' => 'F', 'lower' => array(7938, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8067, 'status' => 'F', 'lower' => array(7939, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8068, 'status' => 'F', 'lower' => array(7940, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8069, 'status' => 'F', 'lower' => array(7941, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8070, 'status' => 'F', 'lower' => array(7942, 953)); /* GREEK SMALL LETTER ALPHA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8071, 'status' => 'F', 'lower' => array(7943, 953)); /* GREEK SMALL LETTER ALPHA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8072, 'status' => 'F', 'lower' => array(7936, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8072, 'status' => 'S', 'lower' => array(8064)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8073, 'status' => 'F', 'lower' => array(7937, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8073, 'status' => 'S', 'lower' => array(8065)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8074, 'status' => 'F', 'lower' => array(7938, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8074, 'status' => 'S', 'lower' => array(8066)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8075, 'status' => 'F', 'lower' => array(7939, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8075, 'status' => 'S', 'lower' => array(8067)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8076, 'status' => 'F', 'lower' => array(7940, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8076, 'status' => 'S', 'lower' => array(8068)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8077, 'status' => 'F', 'lower' => array(7941, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8077, 'status' => 'S', 'lower' => array(8069)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8078, 'status' => 'F', 'lower' => array(7942, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8078, 'status' => 'S', 'lower' => array(8070)); /* GREEK CAPITAL LETTER ALPHA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8079, 'status' => 'F', 'lower' => array(7943, 953)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8079, 'status' => 'S', 'lower' => array(8071)); /* GREEK CAPITAL LETTER ALPHA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8080, 'status' => 'F', 'lower' => array(7968, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8081, 'status' => 'F', 'lower' => array(7969, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8082, 'status' => 'F', 'lower' => array(7970, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8083, 'status' => 'F', 'lower' => array(7971, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8084, 'status' => 'F', 'lower' => array(7972, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8085, 'status' => 'F', 'lower' => array(7973, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8086, 'status' => 'F', 'lower' => array(7974, 953)); /* GREEK SMALL LETTER ETA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8087, 'status' => 'F', 'lower' => array(7975, 953)); /* GREEK SMALL LETTER ETA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8088, 'status' => 'F', 'lower' => array(7968, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8088, 'status' => 'S', 'lower' => array(8080)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8089, 'status' => 'F', 'lower' => array(7969, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8089, 'status' => 'S', 'lower' => array(8081)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8090, 'status' => 'F', 'lower' => array(7970, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8090, 'status' => 'S', 'lower' => array(8082)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8091, 'status' => 'F', 'lower' => array(7971, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8091, 'status' => 'S', 'lower' => array(8083)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8092, 'status' => 'F', 'lower' => array(7972, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8092, 'status' => 'S', 'lower' => array(8084)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8093, 'status' => 'F', 'lower' => array(7973, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8093, 'status' => 'S', 'lower' => array(8085)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8094, 'status' => 'F', 'lower' => array(7974, 953)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8094, 'status' => 'S', 'lower' => array(8086)); /* GREEK CAPITAL LETTER ETA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8095, 'status' => 'F', 'lower' => array(7975, 953)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8095, 'status' => 'S', 'lower' => array(8087)); /* GREEK CAPITAL LETTER ETA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8096, 'status' => 'F', 'lower' => array(8032, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8097, 'status' => 'F', 'lower' => array(8033, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8098, 'status' => 'F', 'lower' => array(8034, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8099, 'status' => 'F', 'lower' => array(8035, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8100, 'status' => 'F', 'lower' => array(8036, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8101, 'status' => 'F', 'lower' => array(8037, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8102, 'status' => 'F', 'lower' => array(8038, 953)); /* GREEK SMALL LETTER OMEGA WITH PSILI AND PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8103, 'status' => 'F', 'lower' => array(8039, 953)); /* GREEK SMALL LETTER OMEGA WITH DASIA AND PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8104, 'status' => 'F', 'lower' => array(8032, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8104, 'status' => 'S', 'lower' => array(8096)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8105, 'status' => 'F', 'lower' => array(8033, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8105, 'status' => 'S', 'lower' => array(8097)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8106, 'status' => 'F', 'lower' => array(8034, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8106, 'status' => 'S', 'lower' => array(8098)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8107, 'status' => 'F', 'lower' => array(8035, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8107, 'status' => 'S', 'lower' => array(8099)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND VARIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8108, 'status' => 'F', 'lower' => array(8036, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8108, 'status' => 'S', 'lower' => array(8100)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8109, 'status' => 'F', 'lower' => array(8037, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8109, 'status' => 'S', 'lower' => array(8101)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND OXIA AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8110, 'status' => 'F', 'lower' => array(8038, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8110, 'status' => 'S', 'lower' => array(8102)); /* GREEK CAPITAL LETTER OMEGA WITH PSILI AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8111, 'status' => 'F', 'lower' => array(8039, 953)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8111, 'status' => 'S', 'lower' => array(8103)); /* GREEK CAPITAL LETTER OMEGA WITH DASIA AND PERISPOMENI AND PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8114, 'status' => 'F', 'lower' => array(8048, 953)); /* GREEK SMALL LETTER ALPHA WITH VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8115, 'status' => 'F', 'lower' => array(945, 953)); /* GREEK SMALL LETTER ALPHA WITH YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8116, 'status' => 'F', 'lower' => array(940, 953)); /* GREEK SMALL LETTER ALPHA WITH OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8118, 'status' => 'F', 'lower' => array(945, 834)); /* GREEK SMALL LETTER ALPHA WITH PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8119, 'status' => 'F', 'lower' => array(945, 834, 953)); /* GREEK SMALL LETTER ALPHA WITH PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8120, 'status' => 'C', 'lower' => array(8112)); /* GREEK CAPITAL LETTER ALPHA WITH VRACHY */
+$config['1f00_1fff'][] = array('upper' => 8121, 'status' => 'C', 'lower' => array(8113)); /* GREEK CAPITAL LETTER ALPHA WITH MACRON */
+$config['1f00_1fff'][] = array('upper' => 8122, 'status' => 'C', 'lower' => array(8048)); /* GREEK CAPITAL LETTER ALPHA WITH VARIA */
+$config['1f00_1fff'][] = array('upper' => 8123, 'status' => 'C', 'lower' => array(8049)); /* GREEK CAPITAL LETTER ALPHA WITH OXIA */
+$config['1f00_1fff'][] = array('upper' => 8124, 'status' => 'F', 'lower' => array(945, 953)); /* GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8124, 'status' => 'S', 'lower' => array(8115)); /* GREEK CAPITAL LETTER ALPHA WITH PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8126, 'status' => 'C', 'lower' => array(953)); /* GREEK PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8130, 'status' => 'F', 'lower' => array(8052, 953)); /* GREEK SMALL LETTER ETA WITH VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8131, 'status' => 'F', 'lower' => array(951, 953)); /* GREEK SMALL LETTER ETA WITH YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8132, 'status' => 'F', 'lower' => array(942, 953)); /* GREEK SMALL LETTER ETA WITH OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8134, 'status' => 'F', 'lower' => array(951, 834)); /* GREEK SMALL LETTER ETA WITH PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8135, 'status' => 'F', 'lower' => array(951, 834, 953)); /* GREEK SMALL LETTER ETA WITH PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8136, 'status' => 'C', 'lower' => array(8050)); /* GREEK CAPITAL LETTER EPSILON WITH VARIA */
+$config['1f00_1fff'][] = array('upper' => 8137, 'status' => 'C', 'lower' => array(8051)); /* GREEK CAPITAL LETTER EPSILON WITH OXIA */
+$config['1f00_1fff'][] = array('upper' => 8138, 'status' => 'C', 'lower' => array(8052)); /* GREEK CAPITAL LETTER ETA WITH VARIA */
+$config['1f00_1fff'][] = array('upper' => 8139, 'status' => 'C', 'lower' => array(8053)); /* GREEK CAPITAL LETTER ETA WITH OXIA */
+$config['1f00_1fff'][] = array('upper' => 8140, 'status' => 'F', 'lower' => array(951, 953)); /* GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8140, 'status' => 'S', 'lower' => array(8131)); /* GREEK CAPITAL LETTER ETA WITH PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8146, 'status' => 'F', 'lower' => array(953, 776, 768)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8147, 'status' => 'F', 'lower' => array(953, 776, 769)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8150, 'status' => 'F', 'lower' => array(953, 834)); /* GREEK SMALL LETTER IOTA WITH PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8151, 'status' => 'F', 'lower' => array(953, 776, 834)); /* GREEK SMALL LETTER IOTA WITH DIALYTIKA AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8152, 'status' => 'C', 'lower' => array(8144)); /* GREEK CAPITAL LETTER IOTA WITH VRACHY */
+$config['1f00_1fff'][] = array('upper' => 8153, 'status' => 'C', 'lower' => array(8145)); /* GREEK CAPITAL LETTER IOTA WITH MACRON */
+$config['1f00_1fff'][] = array('upper' => 8154, 'status' => 'C', 'lower' => array(8054)); /* GREEK CAPITAL LETTER IOTA WITH VARIA */
+$config['1f00_1fff'][] = array('upper' => 8155, 'status' => 'C', 'lower' => array(8055)); /* GREEK CAPITAL LETTER IOTA WITH OXIA */
+$config['1f00_1fff'][] = array('upper' => 8162, 'status' => 'F', 'lower' => array(965, 776, 768)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND VARIA */
+$config['1f00_1fff'][] = array('upper' => 8163, 'status' => 'F', 'lower' => array(965, 776, 769)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND OXIA */
+$config['1f00_1fff'][] = array('upper' => 8164, 'status' => 'F', 'lower' => array(961, 787)); /* GREEK SMALL LETTER RHO WITH PSILI */
+$config['1f00_1fff'][] = array('upper' => 8166, 'status' => 'F', 'lower' => array(965, 834)); /* GREEK SMALL LETTER UPSILON WITH PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8167, 'status' => 'F', 'lower' => array(965, 776, 834)); /* GREEK SMALL LETTER UPSILON WITH DIALYTIKA AND PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8168, 'status' => 'C', 'lower' => array(8160)); /* GREEK CAPITAL LETTER UPSILON WITH VRACHY */
+$config['1f00_1fff'][] = array('upper' => 8169, 'status' => 'C', 'lower' => array(8161)); /* GREEK CAPITAL LETTER UPSILON WITH MACRON */
+$config['1f00_1fff'][] = array('upper' => 8170, 'status' => 'C', 'lower' => array(8058)); /* GREEK CAPITAL LETTER UPSILON WITH VARIA */
+$config['1f00_1fff'][] = array('upper' => 8171, 'status' => 'C', 'lower' => array(8059)); /* GREEK CAPITAL LETTER UPSILON WITH OXIA */
+$config['1f00_1fff'][] = array('upper' => 8172, 'status' => 'C', 'lower' => array(8165)); /* GREEK CAPITAL LETTER RHO WITH DASIA */
+$config['1f00_1fff'][] = array('upper' => 8178, 'status' => 'F', 'lower' => array(8060, 953)); /* GREEK SMALL LETTER OMEGA WITH VARIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8179, 'status' => 'F', 'lower' => array(969, 953)); /* GREEK SMALL LETTER OMEGA WITH YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8180, 'status' => 'F', 'lower' => array(974, 953)); /* GREEK SMALL LETTER OMEGA WITH OXIA AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8182, 'status' => 'F', 'lower' => array(969, 834)); /* GREEK SMALL LETTER OMEGA WITH PERISPOMENI */
+$config['1f00_1fff'][] = array('upper' => 8183, 'status' => 'F', 'lower' => array(969, 834, 953)); /* GREEK SMALL LETTER OMEGA WITH PERISPOMENI AND YPOGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8184, 'status' => 'C', 'lower' => array(8056)); /* GREEK CAPITAL LETTER OMICRON WITH VARIA */
+$config['1f00_1fff'][] = array('upper' => 8185, 'status' => 'C', 'lower' => array(8057)); /* GREEK CAPITAL LETTER OMICRON WITH OXIA */
+$config['1f00_1fff'][] = array('upper' => 8186, 'status' => 'C', 'lower' => array(8060)); /* GREEK CAPITAL LETTER OMEGA WITH VARIA */
+$config['1f00_1fff'][] = array('upper' => 8187, 'status' => 'C', 'lower' => array(8061)); /* GREEK CAPITAL LETTER OMEGA WITH OXIA */
+$config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'F', 'lower' => array(969, 953)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */
+$config['1f00_1fff'][] = array('upper' => 8188, 'status' => 'S', 'lower' => array(8179)); /* GREEK CAPITAL LETTER OMEGA WITH PROSGEGRAMMENI */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2100_214f.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2100_214f.php
new file mode 100644
index 000000000..e0023500e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2100_214f.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+2100 through U+214F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['2100_214f'][] = array('upper' => 8486, 'status' => 'C', 'lower' => array(969)); /* OHM SIGN */
+$config['2100_214f'][] = array('upper' => 8490, 'status' => 'C', 'lower' => array(107)); /* KELVIN SIGN */
+$config['2100_214f'][] = array('upper' => 8491, 'status' => 'C', 'lower' => array(229)); /* ANGSTROM SIGN */
+$config['2100_214f'][] = array('upper' => 8498, 'status' => 'C', 'lower' => array(8526)); /* TURNED CAPITAL F */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2150_218f.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2150_218f.php
new file mode 100644
index 000000000..6a1e6855c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2150_218f.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+2150 through U+218F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['2150_218f'][] = array('upper' => 8544, 'status' => 'C', 'lower' => array(8560)); /* ROMAN NUMERAL ONE */
+$config['2150_218f'][] = array('upper' => 8545, 'status' => 'C', 'lower' => array(8561)); /* ROMAN NUMERAL TWO */
+$config['2150_218f'][] = array('upper' => 8546, 'status' => 'C', 'lower' => array(8562)); /* ROMAN NUMERAL THREE */
+$config['2150_218f'][] = array('upper' => 8547, 'status' => 'C', 'lower' => array(8563)); /* ROMAN NUMERAL FOUR */
+$config['2150_218f'][] = array('upper' => 8548, 'status' => 'C', 'lower' => array(8564)); /* ROMAN NUMERAL FIVE */
+$config['2150_218f'][] = array('upper' => 8549, 'status' => 'C', 'lower' => array(8565)); /* ROMAN NUMERAL SIX */
+$config['2150_218f'][] = array('upper' => 8550, 'status' => 'C', 'lower' => array(8566)); /* ROMAN NUMERAL SEVEN */
+$config['2150_218f'][] = array('upper' => 8551, 'status' => 'C', 'lower' => array(8567)); /* ROMAN NUMERAL EIGHT */
+$config['2150_218f'][] = array('upper' => 8552, 'status' => 'C', 'lower' => array(8568)); /* ROMAN NUMERAL NINE */
+$config['2150_218f'][] = array('upper' => 8553, 'status' => 'C', 'lower' => array(8569)); /* ROMAN NUMERAL TEN */
+$config['2150_218f'][] = array('upper' => 8554, 'status' => 'C', 'lower' => array(8570)); /* ROMAN NUMERAL ELEVEN */
+$config['2150_218f'][] = array('upper' => 8555, 'status' => 'C', 'lower' => array(8571)); /* ROMAN NUMERAL TWELVE */
+$config['2150_218f'][] = array('upper' => 8556, 'status' => 'C', 'lower' => array(8572)); /* ROMAN NUMERAL FIFTY */
+$config['2150_218f'][] = array('upper' => 8557, 'status' => 'C', 'lower' => array(8573)); /* ROMAN NUMERAL ONE HUNDRED */
+$config['2150_218f'][] = array('upper' => 8558, 'status' => 'C', 'lower' => array(8574)); /* ROMAN NUMERAL FIVE HUNDRED */
+$config['2150_218f'][] = array('upper' => 8559, 'status' => 'C', 'lower' => array(8575)); /* ROMAN NUMERAL ONE THOUSAND */
+$config['2150_218f'][] = array('upper' => 8579, 'status' => 'C', 'lower' => array(8580)); /* ROMAN NUMERAL REVERSED ONE HUNDRED */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2460_24ff.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2460_24ff.php
new file mode 100644
index 000000000..3b8dee7b3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2460_24ff.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+2460 through U+24FF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['2460_24ff'][] = array('upper' => 9398, 'status' => 'C', 'lower' => array(9424)); /* CIRCLED LATIN CAPITAL LETTER A */
+$config['2460_24ff'][] = array('upper' => 9399, 'status' => 'C', 'lower' => array(9425)); /* CIRCLED LATIN CAPITAL LETTER B */
+$config['2460_24ff'][] = array('upper' => 9400, 'status' => 'C', 'lower' => array(9426)); /* CIRCLED LATIN CAPITAL LETTER C */
+$config['2460_24ff'][] = array('upper' => 9401, 'status' => 'C', 'lower' => array(9427)); /* CIRCLED LATIN CAPITAL LETTER D */
+$config['2460_24ff'][] = array('upper' => 9402, 'status' => 'C', 'lower' => array(9428)); /* CIRCLED LATIN CAPITAL LETTER E */
+$config['2460_24ff'][] = array('upper' => 9403, 'status' => 'C', 'lower' => array(9429)); /* CIRCLED LATIN CAPITAL LETTER F */
+$config['2460_24ff'][] = array('upper' => 9404, 'status' => 'C', 'lower' => array(9430)); /* CIRCLED LATIN CAPITAL LETTER G */
+$config['2460_24ff'][] = array('upper' => 9405, 'status' => 'C', 'lower' => array(9431)); /* CIRCLED LATIN CAPITAL LETTER H */
+$config['2460_24ff'][] = array('upper' => 9406, 'status' => 'C', 'lower' => array(9432)); /* CIRCLED LATIN CAPITAL LETTER I */
+$config['2460_24ff'][] = array('upper' => 9407, 'status' => 'C', 'lower' => array(9433)); /* CIRCLED LATIN CAPITAL LETTER J */
+$config['2460_24ff'][] = array('upper' => 9408, 'status' => 'C', 'lower' => array(9434)); /* CIRCLED LATIN CAPITAL LETTER K */
+$config['2460_24ff'][] = array('upper' => 9409, 'status' => 'C', 'lower' => array(9435)); /* CIRCLED LATIN CAPITAL LETTER L */
+$config['2460_24ff'][] = array('upper' => 9410, 'status' => 'C', 'lower' => array(9436)); /* CIRCLED LATIN CAPITAL LETTER M */
+$config['2460_24ff'][] = array('upper' => 9411, 'status' => 'C', 'lower' => array(9437)); /* CIRCLED LATIN CAPITAL LETTER N */
+$config['2460_24ff'][] = array('upper' => 9412, 'status' => 'C', 'lower' => array(9438)); /* CIRCLED LATIN CAPITAL LETTER O */
+$config['2460_24ff'][] = array('upper' => 9413, 'status' => 'C', 'lower' => array(9439)); /* CIRCLED LATIN CAPITAL LETTER P */
+$config['2460_24ff'][] = array('upper' => 9414, 'status' => 'C', 'lower' => array(9440)); /* CIRCLED LATIN CAPITAL LETTER Q */
+$config['2460_24ff'][] = array('upper' => 9415, 'status' => 'C', 'lower' => array(9441)); /* CIRCLED LATIN CAPITAL LETTER R */
+$config['2460_24ff'][] = array('upper' => 9416, 'status' => 'C', 'lower' => array(9442)); /* CIRCLED LATIN CAPITAL LETTER S */
+$config['2460_24ff'][] = array('upper' => 9417, 'status' => 'C', 'lower' => array(9443)); /* CIRCLED LATIN CAPITAL LETTER T */
+$config['2460_24ff'][] = array('upper' => 9418, 'status' => 'C', 'lower' => array(9444)); /* CIRCLED LATIN CAPITAL LETTER U */
+$config['2460_24ff'][] = array('upper' => 9419, 'status' => 'C', 'lower' => array(9445)); /* CIRCLED LATIN CAPITAL LETTER V */
+$config['2460_24ff'][] = array('upper' => 9420, 'status' => 'C', 'lower' => array(9446)); /* CIRCLED LATIN CAPITAL LETTER W */
+$config['2460_24ff'][] = array('upper' => 9421, 'status' => 'C', 'lower' => array(9447)); /* CIRCLED LATIN CAPITAL LETTER X */
+$config['2460_24ff'][] = array('upper' => 9422, 'status' => 'C', 'lower' => array(9448)); /* CIRCLED LATIN CAPITAL LETTER Y */
+$config['2460_24ff'][] = array('upper' => 9423, 'status' => 'C', 'lower' => array(9449)); /* CIRCLED LATIN CAPITAL LETTER Z */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c00_2c5f.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c00_2c5f.php
new file mode 100644
index 000000000..7f80a4185
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c00_2c5f.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+2C00 through U+2C5F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['2c00_2c5f'][] = array('upper' => 11264, 'status' => 'C', 'lower' => array(11312)); /* GLAGOLITIC CAPITAL LETTER AZU */
+$config['2c00_2c5f'][] = array('upper' => 11265, 'status' => 'C', 'lower' => array(11313)); /* GLAGOLITIC CAPITAL LETTER BUKY */
+$config['2c00_2c5f'][] = array('upper' => 11266, 'status' => 'C', 'lower' => array(11314)); /* GLAGOLITIC CAPITAL LETTER VEDE */
+$config['2c00_2c5f'][] = array('upper' => 11267, 'status' => 'C', 'lower' => array(11315)); /* GLAGOLITIC CAPITAL LETTER GLAGOLI */
+$config['2c00_2c5f'][] = array('upper' => 11268, 'status' => 'C', 'lower' => array(11316)); /* GLAGOLITIC CAPITAL LETTER DOBRO */
+$config['2c00_2c5f'][] = array('upper' => 11269, 'status' => 'C', 'lower' => array(11317)); /* GLAGOLITIC CAPITAL LETTER YESTU */
+$config['2c00_2c5f'][] = array('upper' => 11270, 'status' => 'C', 'lower' => array(11318)); /* GLAGOLITIC CAPITAL LETTER ZHIVETE */
+$config['2c00_2c5f'][] = array('upper' => 11271, 'status' => 'C', 'lower' => array(11319)); /* GLAGOLITIC CAPITAL LETTER DZELO */
+$config['2c00_2c5f'][] = array('upper' => 11272, 'status' => 'C', 'lower' => array(11320)); /* GLAGOLITIC CAPITAL LETTER ZEMLJA */
+$config['2c00_2c5f'][] = array('upper' => 11273, 'status' => 'C', 'lower' => array(11321)); /* GLAGOLITIC CAPITAL LETTER IZHE */
+$config['2c00_2c5f'][] = array('upper' => 11274, 'status' => 'C', 'lower' => array(11322)); /* GLAGOLITIC CAPITAL LETTER INITIAL IZHE */
+$config['2c00_2c5f'][] = array('upper' => 11275, 'status' => 'C', 'lower' => array(11323)); /* GLAGOLITIC CAPITAL LETTER I */
+$config['2c00_2c5f'][] = array('upper' => 11276, 'status' => 'C', 'lower' => array(11324)); /* GLAGOLITIC CAPITAL LETTER DJERVI */
+$config['2c00_2c5f'][] = array('upper' => 11277, 'status' => 'C', 'lower' => array(11325)); /* GLAGOLITIC CAPITAL LETTER KAKO */
+$config['2c00_2c5f'][] = array('upper' => 11278, 'status' => 'C', 'lower' => array(11326)); /* GLAGOLITIC CAPITAL LETTER LJUDIJE */
+$config['2c00_2c5f'][] = array('upper' => 11279, 'status' => 'C', 'lower' => array(11327)); /* GLAGOLITIC CAPITAL LETTER MYSLITE */
+$config['2c00_2c5f'][] = array('upper' => 11280, 'status' => 'C', 'lower' => array(11328)); /* GLAGOLITIC CAPITAL LETTER NASHI */
+$config['2c00_2c5f'][] = array('upper' => 11281, 'status' => 'C', 'lower' => array(11329)); /* GLAGOLITIC CAPITAL LETTER ONU */
+$config['2c00_2c5f'][] = array('upper' => 11282, 'status' => 'C', 'lower' => array(11330)); /* GLAGOLITIC CAPITAL LETTER POKOJI */
+$config['2c00_2c5f'][] = array('upper' => 11283, 'status' => 'C', 'lower' => array(11331)); /* GLAGOLITIC CAPITAL LETTER RITSI */
+$config['2c00_2c5f'][] = array('upper' => 11284, 'status' => 'C', 'lower' => array(11332)); /* GLAGOLITIC CAPITAL LETTER SLOVO */
+$config['2c00_2c5f'][] = array('upper' => 11285, 'status' => 'C', 'lower' => array(11333)); /* GLAGOLITIC CAPITAL LETTER TVRIDO */
+$config['2c00_2c5f'][] = array('upper' => 11286, 'status' => 'C', 'lower' => array(11334)); /* GLAGOLITIC CAPITAL LETTER UKU */
+$config['2c00_2c5f'][] = array('upper' => 11287, 'status' => 'C', 'lower' => array(11335)); /* GLAGOLITIC CAPITAL LETTER FRITU */
+$config['2c00_2c5f'][] = array('upper' => 11288, 'status' => 'C', 'lower' => array(11336)); /* GLAGOLITIC CAPITAL LETTER HERU */
+$config['2c00_2c5f'][] = array('upper' => 11289, 'status' => 'C', 'lower' => array(11337)); /* GLAGOLITIC CAPITAL LETTER OTU */
+$config['2c00_2c5f'][] = array('upper' => 11290, 'status' => 'C', 'lower' => array(11338)); /* GLAGOLITIC CAPITAL LETTER PE */
+$config['2c00_2c5f'][] = array('upper' => 11291, 'status' => 'C', 'lower' => array(11339)); /* GLAGOLITIC CAPITAL LETTER SHTA */
+$config['2c00_2c5f'][] = array('upper' => 11292, 'status' => 'C', 'lower' => array(11340)); /* GLAGOLITIC CAPITAL LETTER TSI */
+$config['2c00_2c5f'][] = array('upper' => 11293, 'status' => 'C', 'lower' => array(11341)); /* GLAGOLITIC CAPITAL LETTER CHRIVI */
+$config['2c00_2c5f'][] = array('upper' => 11294, 'status' => 'C', 'lower' => array(11342)); /* GLAGOLITIC CAPITAL LETTER SHA */
+$config['2c00_2c5f'][] = array('upper' => 11295, 'status' => 'C', 'lower' => array(11343)); /* GLAGOLITIC CAPITAL LETTER YERU */
+$config['2c00_2c5f'][] = array('upper' => 11296, 'status' => 'C', 'lower' => array(11344)); /* GLAGOLITIC CAPITAL LETTER YERI */
+$config['2c00_2c5f'][] = array('upper' => 11297, 'status' => 'C', 'lower' => array(11345)); /* GLAGOLITIC CAPITAL LETTER YATI */
+$config['2c00_2c5f'][] = array('upper' => 11298, 'status' => 'C', 'lower' => array(11346)); /* GLAGOLITIC CAPITAL LETTER SPIDERY HA */
+$config['2c00_2c5f'][] = array('upper' => 11299, 'status' => 'C', 'lower' => array(11347)); /* GLAGOLITIC CAPITAL LETTER YU */
+$config['2c00_2c5f'][] = array('upper' => 11300, 'status' => 'C', 'lower' => array(11348)); /* GLAGOLITIC CAPITAL LETTER SMALL YUS */
+$config['2c00_2c5f'][] = array('upper' => 11301, 'status' => 'C', 'lower' => array(11349)); /* GLAGOLITIC CAPITAL LETTER SMALL YUS WITH TAIL */
+$config['2c00_2c5f'][] = array('upper' => 11302, 'status' => 'C', 'lower' => array(11350)); /* GLAGOLITIC CAPITAL LETTER YO */
+$config['2c00_2c5f'][] = array('upper' => 11303, 'status' => 'C', 'lower' => array(11351)); /* GLAGOLITIC CAPITAL LETTER IOTATED SMALL YUS */
+$config['2c00_2c5f'][] = array('upper' => 11304, 'status' => 'C', 'lower' => array(11352)); /* GLAGOLITIC CAPITAL LETTER BIG YUS */
+$config['2c00_2c5f'][] = array('upper' => 11305, 'status' => 'C', 'lower' => array(11353)); /* GLAGOLITIC CAPITAL LETTER IOTATED BIG YUS */
+$config['2c00_2c5f'][] = array('upper' => 11306, 'status' => 'C', 'lower' => array(11354)); /* GLAGOLITIC CAPITAL LETTER FITA */
+$config['2c00_2c5f'][] = array('upper' => 11307, 'status' => 'C', 'lower' => array(11355)); /* GLAGOLITIC CAPITAL LETTER IZHITSA */
+$config['2c00_2c5f'][] = array('upper' => 11308, 'status' => 'C', 'lower' => array(11356)); /* GLAGOLITIC CAPITAL LETTER SHTAPIC */
+$config['2c00_2c5f'][] = array('upper' => 11309, 'status' => 'C', 'lower' => array(11357)); /* GLAGOLITIC CAPITAL LETTER TROKUTASTI A */
+$config['2c00_2c5f'][] = array('upper' => 11310, 'status' => 'C', 'lower' => array(11358)); /* GLAGOLITIC CAPITAL LETTER LATINATE MYSLITE */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c60_2c7f.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c60_2c7f.php
new file mode 100644
index 000000000..299cbdc0b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c60_2c7f.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+2C60 through U+2C7F
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['2c60_2c7f'][] = array('upper' => 11360, 'status' => 'C', 'lower' => array(11361)); /* LATIN CAPITAL LETTER L WITH DOUBLE BAR */
+$config['2c60_2c7f'][] = array('upper' => 11362, 'status' => 'C', 'lower' => array(619)); /* LATIN CAPITAL LETTER L WITH MIDDLE TILDE */
+$config['2c60_2c7f'][] = array('upper' => 11363, 'status' => 'C', 'lower' => array(7549)); /* LATIN CAPITAL LETTER P WITH STROKE */
+$config['2c60_2c7f'][] = array('upper' => 11364, 'status' => 'C', 'lower' => array(637)); /* LATIN CAPITAL LETTER R WITH TAIL */
+$config['2c60_2c7f'][] = array('upper' => 11367, 'status' => 'C', 'lower' => array(11368)); /* LATIN CAPITAL LETTER H WITH DESCENDER */
+$config['2c60_2c7f'][] = array('upper' => 11369, 'status' => 'C', 'lower' => array(11370)); /* LATIN CAPITAL LETTER K WITH DESCENDER */
+$config['2c60_2c7f'][] = array('upper' => 11371, 'status' => 'C', 'lower' => array(11372)); /* LATIN CAPITAL LETTER Z WITH DESCENDER */
+$config['2c60_2c7f'][] = array('upper' => 11381, 'status' => 'C', 'lower' => array(11382)); /* LATIN CAPITAL LETTER HALF H */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c80_2cff.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c80_2cff.php
new file mode 100644
index 000000000..3836c6451
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/2c80_2cff.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+2C80 through U+2CFF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['2c80_2cff'][] = array('upper' => 11392, 'status' => 'C', 'lower' => array(11393)); /* COPTIC CAPITAL LETTER ALFA */
+$config['2c80_2cff'][] = array('upper' => 11394, 'status' => 'C', 'lower' => array(11395)); /* COPTIC CAPITAL LETTER VIDA */
+$config['2c80_2cff'][] = array('upper' => 11396, 'status' => 'C', 'lower' => array(11397)); /* COPTIC CAPITAL LETTER GAMMA */
+$config['2c80_2cff'][] = array('upper' => 11398, 'status' => 'C', 'lower' => array(11399)); /* COPTIC CAPITAL LETTER DALDA */
+$config['2c80_2cff'][] = array('upper' => 11400, 'status' => 'C', 'lower' => array(11401)); /* COPTIC CAPITAL LETTER EIE */
+$config['2c80_2cff'][] = array('upper' => 11402, 'status' => 'C', 'lower' => array(11403)); /* COPTIC CAPITAL LETTER SOU */
+$config['2c80_2cff'][] = array('upper' => 11404, 'status' => 'C', 'lower' => array(11405)); /* COPTIC CAPITAL LETTER ZATA */
+$config['2c80_2cff'][] = array('upper' => 11406, 'status' => 'C', 'lower' => array(11407)); /* COPTIC CAPITAL LETTER HATE */
+$config['2c80_2cff'][] = array('upper' => 11408, 'status' => 'C', 'lower' => array(11409)); /* COPTIC CAPITAL LETTER THETHE */
+$config['2c80_2cff'][] = array('upper' => 11410, 'status' => 'C', 'lower' => array(11411)); /* COPTIC CAPITAL LETTER IAUDA */
+$config['2c80_2cff'][] = array('upper' => 11412, 'status' => 'C', 'lower' => array(11413)); /* COPTIC CAPITAL LETTER KAPA */
+$config['2c80_2cff'][] = array('upper' => 11414, 'status' => 'C', 'lower' => array(11415)); /* COPTIC CAPITAL LETTER LAULA */
+$config['2c80_2cff'][] = array('upper' => 11416, 'status' => 'C', 'lower' => array(11417)); /* COPTIC CAPITAL LETTER MI */
+$config['2c80_2cff'][] = array('upper' => 11418, 'status' => 'C', 'lower' => array(11419)); /* COPTIC CAPITAL LETTER NI */
+$config['2c80_2cff'][] = array('upper' => 11420, 'status' => 'C', 'lower' => array(11421)); /* COPTIC CAPITAL LETTER KSI */
+$config['2c80_2cff'][] = array('upper' => 11422, 'status' => 'C', 'lower' => array(11423)); /* COPTIC CAPITAL LETTER O */
+$config['2c80_2cff'][] = array('upper' => 11424, 'status' => 'C', 'lower' => array(11425)); /* COPTIC CAPITAL LETTER PI */
+$config['2c80_2cff'][] = array('upper' => 11426, 'status' => 'C', 'lower' => array(11427)); /* COPTIC CAPITAL LETTER RO */
+$config['2c80_2cff'][] = array('upper' => 11428, 'status' => 'C', 'lower' => array(11429)); /* COPTIC CAPITAL LETTER SIMA */
+$config['2c80_2cff'][] = array('upper' => 11430, 'status' => 'C', 'lower' => array(11431)); /* COPTIC CAPITAL LETTER TAU */
+$config['2c80_2cff'][] = array('upper' => 11432, 'status' => 'C', 'lower' => array(11433)); /* COPTIC CAPITAL LETTER UA */
+$config['2c80_2cff'][] = array('upper' => 11434, 'status' => 'C', 'lower' => array(11435)); /* COPTIC CAPITAL LETTER FI */
+$config['2c80_2cff'][] = array('upper' => 11436, 'status' => 'C', 'lower' => array(11437)); /* COPTIC CAPITAL LETTER KHI */
+$config['2c80_2cff'][] = array('upper' => 11438, 'status' => 'C', 'lower' => array(11439)); /* COPTIC CAPITAL LETTER PSI */
+$config['2c80_2cff'][] = array('upper' => 11440, 'status' => 'C', 'lower' => array(11441)); /* COPTIC CAPITAL LETTER OOU */
+$config['2c80_2cff'][] = array('upper' => 11442, 'status' => 'C', 'lower' => array(11443)); /* COPTIC CAPITAL LETTER DIALECT-P ALEF */
+$config['2c80_2cff'][] = array('upper' => 11444, 'status' => 'C', 'lower' => array(11445)); /* COPTIC CAPITAL LETTER OLD COPTIC AIN */
+$config['2c80_2cff'][] = array('upper' => 11446, 'status' => 'C', 'lower' => array(11447)); /* COPTIC CAPITAL LETTER CRYPTOGRAMMIC EIE */
+$config['2c80_2cff'][] = array('upper' => 11448, 'status' => 'C', 'lower' => array(11449)); /* COPTIC CAPITAL LETTER DIALECT-P KAPA */
+$config['2c80_2cff'][] = array('upper' => 11450, 'status' => 'C', 'lower' => array(11451)); /* COPTIC CAPITAL LETTER DIALECT-P NI */
+$config['2c80_2cff'][] = array('upper' => 11452, 'status' => 'C', 'lower' => array(11453)); /* COPTIC CAPITAL LETTER CRYPTOGRAMMIC NI */
+$config['2c80_2cff'][] = array('upper' => 11454, 'status' => 'C', 'lower' => array(11455)); /* COPTIC CAPITAL LETTER OLD COPTIC OOU */
+$config['2c80_2cff'][] = array('upper' => 11456, 'status' => 'C', 'lower' => array(11457)); /* COPTIC CAPITAL LETTER SAMPI */
+$config['2c80_2cff'][] = array('upper' => 11458, 'status' => 'C', 'lower' => array(11459)); /* COPTIC CAPITAL LETTER CROSSED SHEI */
+$config['2c80_2cff'][] = array('upper' => 11460, 'status' => 'C', 'lower' => array(11461)); /* COPTIC CAPITAL LETTER OLD COPTIC SHEI */
+$config['2c80_2cff'][] = array('upper' => 11462, 'status' => 'C', 'lower' => array(11463)); /* COPTIC CAPITAL LETTER OLD COPTIC ESH */
+$config['2c80_2cff'][] = array('upper' => 11464, 'status' => 'C', 'lower' => array(11465)); /* COPTIC CAPITAL LETTER AKHMIMIC KHEI */
+$config['2c80_2cff'][] = array('upper' => 11466, 'status' => 'C', 'lower' => array(11467)); /* COPTIC CAPITAL LETTER DIALECT-P HORI */
+$config['2c80_2cff'][] = array('upper' => 11468, 'status' => 'C', 'lower' => array(11469)); /* COPTIC CAPITAL LETTER OLD COPTIC HORI */
+$config['2c80_2cff'][] = array('upper' => 11470, 'status' => 'C', 'lower' => array(11471)); /* COPTIC CAPITAL LETTER OLD COPTIC HA */
+$config['2c80_2cff'][] = array('upper' => 11472, 'status' => 'C', 'lower' => array(11473)); /* COPTIC CAPITAL LETTER L-SHAPED HA */
+$config['2c80_2cff'][] = array('upper' => 11474, 'status' => 'C', 'lower' => array(11475)); /* COPTIC CAPITAL LETTER OLD COPTIC HEI */
+$config['2c80_2cff'][] = array('upper' => 11476, 'status' => 'C', 'lower' => array(11477)); /* COPTIC CAPITAL LETTER OLD COPTIC HAT */
+$config['2c80_2cff'][] = array('upper' => 11478, 'status' => 'C', 'lower' => array(11479)); /* COPTIC CAPITAL LETTER OLD COPTIC GANGIA */
+$config['2c80_2cff'][] = array('upper' => 11480, 'status' => 'C', 'lower' => array(11481)); /* COPTIC CAPITAL LETTER OLD COPTIC DJA */
+$config['2c80_2cff'][] = array('upper' => 11482, 'status' => 'C', 'lower' => array(11483)); /* COPTIC CAPITAL LETTER OLD COPTIC SHIMA */
+$config['2c80_2cff'][] = array('upper' => 11484, 'status' => 'C', 'lower' => array(11485)); /* COPTIC CAPITAL LETTER OLD NUBIAN SHIMA */
+$config['2c80_2cff'][] = array('upper' => 11486, 'status' => 'C', 'lower' => array(11487)); /* COPTIC CAPITAL LETTER OLD NUBIAN NGI */
+$config['2c80_2cff'][] = array('upper' => 11488, 'status' => 'C', 'lower' => array(11489)); /* COPTIC CAPITAL LETTER OLD NUBIAN NYI */
+$config['2c80_2cff'][] = array('upper' => 11490, 'status' => 'C', 'lower' => array(11491)); /* COPTIC CAPITAL LETTER OLD NUBIAN WAU */
diff --git a/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/ff00_ffef.php b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/ff00_ffef.php
new file mode 100644
index 000000000..1fbb85d97
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/config/unicode/casefolding/ff00_ffef.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Case Folding Properties.
+ *
+ * Provides case mapping of Unicode characters for code points U+FF00 through U+FFEF
+ *
+ * @see http://www.unicode.org/Public/UNIDATA/UCD.html
+ * @see http://www.unicode.org/Public/UNIDATA/CaseFolding.txt
+ * @see http://www.unicode.org/reports/tr21/tr21-5.html
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.config.unicode.casefolding
+ * @since         CakePHP(tm) v 1.2.0.5691
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The upper field is the decimal value of the upper case character
+ *
+ * The lower filed is an array of the decimal values that form the lower case version of a character.
+ *
+ *	The status field is:
+ * C: common case folding, common mappings shared by both simple and full mappings.
+ * F: full case folding, mappings that cause strings to grow in length. Multiple characters are separated by spaces.
+ * S: simple case folding, mappings to single characters where different from F.
+ * T: special case for uppercase I and dotted uppercase I
+ *   - For non-Turkic languages, this mapping is normally not used.
+ *   - For Turkic languages (tr, az), this mapping can be used instead of the normal mapping for these characters.
+ *     Note that the Turkic mappings do not maintain canonical equivalence without additional processing.
+ *     See the discussions of case mapping in the Unicode Standard for more information.
+ */
+$config['ff00_ffef'][] = array('upper' => 65313, 'status' => 'C', 'lower' => array(65345)); /* FULLWIDTH LATIN CAPITAL LETTER A */
+$config['ff00_ffef'][] = array('upper' => 65314, 'status' => 'C', 'lower' => array(65346)); /* FULLWIDTH LATIN CAPITAL LETTER B */
+$config['ff00_ffef'][] = array('upper' => 65315, 'status' => 'C', 'lower' => array(65347)); /* FULLWIDTH LATIN CAPITAL LETTER C */
+$config['ff00_ffef'][] = array('upper' => 65316, 'status' => 'C', 'lower' => array(65348)); /* FULLWIDTH LATIN CAPITAL LETTER D */
+$config['ff00_ffef'][] = array('upper' => 65317, 'status' => 'C', 'lower' => array(65349)); /* FULLWIDTH LATIN CAPITAL LETTER E */
+$config['ff00_ffef'][] = array('upper' => 65318, 'status' => 'C', 'lower' => array(65350)); /* FULLWIDTH LATIN CAPITAL LETTER F */
+$config['ff00_ffef'][] = array('upper' => 65319, 'status' => 'C', 'lower' => array(65351)); /* FULLWIDTH LATIN CAPITAL LETTER G */
+$config['ff00_ffef'][] = array('upper' => 65320, 'status' => 'C', 'lower' => array(65352)); /* FULLWIDTH LATIN CAPITAL LETTER H */
+$config['ff00_ffef'][] = array('upper' => 65321, 'status' => 'C', 'lower' => array(65353)); /* FULLWIDTH LATIN CAPITAL LETTER I */
+$config['ff00_ffef'][] = array('upper' => 65322, 'status' => 'C', 'lower' => array(65354)); /* FULLWIDTH LATIN CAPITAL LETTER J */
+$config['ff00_ffef'][] = array('upper' => 65323, 'status' => 'C', 'lower' => array(65355)); /* FULLWIDTH LATIN CAPITAL LETTER K */
+$config['ff00_ffef'][] = array('upper' => 65324, 'status' => 'C', 'lower' => array(65356)); /* FULLWIDTH LATIN CAPITAL LETTER L */
+$config['ff00_ffef'][] = array('upper' => 65325, 'status' => 'C', 'lower' => array(65357)); /* FULLWIDTH LATIN CAPITAL LETTER M */
+$config['ff00_ffef'][] = array('upper' => 65326, 'status' => 'C', 'lower' => array(65358)); /* FULLWIDTH LATIN CAPITAL LETTER N */
+$config['ff00_ffef'][] = array('upper' => 65327, 'status' => 'C', 'lower' => array(65359)); /* FULLWIDTH LATIN CAPITAL LETTER O */
+$config['ff00_ffef'][] = array('upper' => 65328, 'status' => 'C', 'lower' => array(65360)); /* FULLWIDTH LATIN CAPITAL LETTER P */
+$config['ff00_ffef'][] = array('upper' => 65329, 'status' => 'C', 'lower' => array(65361)); /* FULLWIDTH LATIN CAPITAL LETTER Q */
+$config['ff00_ffef'][] = array('upper' => 65330, 'status' => 'C', 'lower' => array(65362)); /* FULLWIDTH LATIN CAPITAL LETTER R */
+$config['ff00_ffef'][] = array('upper' => 65331, 'status' => 'C', 'lower' => array(65363)); /* FULLWIDTH LATIN CAPITAL LETTER S */
+$config['ff00_ffef'][] = array('upper' => 65332, 'status' => 'C', 'lower' => array(65364)); /* FULLWIDTH LATIN CAPITAL LETTER T */
+$config['ff00_ffef'][] = array('upper' => 65333, 'status' => 'C', 'lower' => array(65365)); /* FULLWIDTH LATIN CAPITAL LETTER U */
+$config['ff00_ffef'][] = array('upper' => 65334, 'status' => 'C', 'lower' => array(65366)); /* FULLWIDTH LATIN CAPITAL LETTER V */
+$config['ff00_ffef'][] = array('upper' => 65335, 'status' => 'C', 'lower' => array(65367)); /* FULLWIDTH LATIN CAPITAL LETTER W */
+$config['ff00_ffef'][] = array('upper' => 65336, 'status' => 'C', 'lower' => array(65368)); /* FULLWIDTH LATIN CAPITAL LETTER X */
+$config['ff00_ffef'][] = array('upper' => 65337, 'status' => 'C', 'lower' => array(65369)); /* FULLWIDTH LATIN CAPITAL LETTER Y */
+$config['ff00_ffef'][] = array('upper' => 65338, 'status' => 'C', 'lower' => array(65370)); /* FULLWIDTH LATIN CAPITAL LETTER Z */
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/cake b/code/ryzom/tools/server/www/webtt/cake/console/cake
new file mode 100755
index 000000000..0c5f60f36
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/cake
@@ -0,0 +1,26 @@
+#!/bin/bash
+################################################################################
+#
+# Bake is a shell script for running CakePHP bake script
+# PHP versions 4 and 5
+#
+# CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
+# Copyright 2005-2010, Cake Software Foundation, Inc.
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+#
+# @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
+# @link				http://cakephp.org CakePHP(tm) Project
+# @package			cake
+# @subpackage		cake.cake.console
+# @since				CakePHP(tm) v 1.2.0.5012
+# @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
+#
+################################################################################
+LIB=${0/%cake/}
+APP=`pwd`
+
+exec php -q ${LIB}cake.php -working "${APP}" "$@"
+
+exit;
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/cake.bat b/code/ryzom/tools/server/www/webtt/cake/console/cake.bat
new file mode 100644
index 000000000..87ee1c7d9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/cake.bat
@@ -0,0 +1,33 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+::
+:: Bake is a shell script for running CakePHP bake script
+:: PHP versions 4 and 5
+::
+:: CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+:: Copyright 2005-2010, Cake Software Foundation, Inc.
+::
+:: Licensed under The MIT License
+:: Redistributions of files must retain the above copyright notice.
+::
+:: @copyright		Copyright 2005-2010, Cake Software Foundation, Inc.
+:: @link				http://cakephp.org CakePHP(tm) Project
+:: @package			cake
+:: @subpackage		cake.cake.console
+:: @since			CakePHP(tm) v 1.2.0.5012
+:: @license			MIT License (http://www.opensource.org/licenses/mit-license.php)
+::
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+
+:: In order for this script to work as intended, the cake\console\ folder must be in your PATH
+
+@echo.
+@echo off
+
+SET app=%0
+SET lib=%~dp0
+
+php -q "%lib%cake.php" -working "%CD% " %*
+
+echo.
+
+exit /B %ERRORLEVEL%
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/cake.php b/code/ryzom/tools/server/www/webtt/cake/console/cake.php
new file mode 100644
index 000000000..a0a835568
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/cake.php
@@ -0,0 +1,667 @@
+#!/usr/bin/php -q
+<?php
+/**
+ * Command-line code generation utility to automate programmer chores.
+ *
+ * Shell dispatcher class
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console
+ * @since         CakePHP(tm) v 1.2.0.5012
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!defined('E_DEPRECATED')) {
+	define('E_DEPRECATED', 8192);
+}
+/**
+ * Shell dispatcher
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console
+ */
+class ShellDispatcher {
+
+/**
+ * Standard input stream.
+ *
+ * @var filehandle
+ * @access public
+ */
+	var $stdin;
+
+/**
+ * Standard output stream.
+ *
+ * @var filehandle
+ * @access public
+ */
+	var $stdout;
+
+/**
+ * Standard error stream.
+ *
+ * @var filehandle
+ * @access public
+ */
+	var $stderr;
+
+/**
+ * Contains command switches parsed from the command line.
+ *
+ * @var array
+ * @access public
+ */
+	var $params = array();
+
+/**
+ * Contains arguments parsed from the command line.
+ *
+ * @var array
+ * @access public
+ */
+	var $args = array();
+
+/**
+ * The file name of the shell that was invoked.
+ *
+ * @var string
+ * @access public
+ */
+	var $shell = null;
+
+/**
+ * The class name of the shell that was invoked.
+ *
+ * @var string
+ * @access public
+ */
+	var $shellClass = null;
+
+/**
+ * The command called if public methods are available.
+ *
+ * @var string
+ * @access public
+ */
+	var $shellCommand = null;
+
+/**
+ * The path locations of shells.
+ *
+ * @var array
+ * @access public
+ */
+	var $shellPaths = array();
+
+/**
+ * The path to the current shell location.
+ *
+ * @var string
+ * @access public
+ */
+	var $shellPath = null;
+
+/**
+ * The name of the shell in camelized.
+ *
+ * @var string
+ * @access public
+ */
+	var $shellName = null;
+
+/**
+ * Constructor
+ *
+ * The execution of the script is stopped after dispatching the request with
+ * a status code of either 0 or 1 according to the result of the dispatch.
+ *
+ * @param array $args the argv
+ * @return void
+ * @access public
+ */
+	function ShellDispatcher($args = array()) {
+		set_time_limit(0);
+
+		$this->__initConstants();
+		$this->parseParams($args);
+		$this->_initEnvironment();
+		$this->__buildPaths();
+		$this->_stop($this->dispatch() === false ? 1 : 0);
+	}
+
+/**
+ * Defines core configuration.
+ *
+ * @access private
+ */
+	function __initConstants() {
+		if (function_exists('ini_set')) {
+			ini_set('display_errors', '1');
+			ini_set('error_reporting', E_ALL & ~E_DEPRECATED);
+			ini_set('html_errors', false);
+			ini_set('implicit_flush', true);
+			ini_set('max_execution_time', 0);
+		}
+
+		if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+			define('PHP5', (PHP_VERSION >= 5));
+			define('DS', DIRECTORY_SEPARATOR);
+			define('CAKE_CORE_INCLUDE_PATH', dirname(dirname(dirname(__FILE__))));
+			define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+			define('DISABLE_DEFAULT_ERROR_HANDLING', false);
+			define('CAKEPHP_SHELL', true);
+		}
+		require_once(CORE_PATH . 'cake' . DS . 'basics.php');
+	}
+
+/**
+ * Defines current working environment.
+ *
+ * @access protected
+ */
+	function _initEnvironment() {
+		$this->stdin = fopen('php://stdin', 'r');
+		$this->stdout = fopen('php://stdout', 'w');
+		$this->stderr = fopen('php://stderr', 'w');
+
+		if (!$this->__bootstrap()) {
+			$this->stderr("\nCakePHP Console: ");
+			$this->stderr("\nUnable to load Cake core:");
+			$this->stderr("\tMake sure " . DS . 'cake' . DS . 'libs exists in ' . CAKE_CORE_INCLUDE_PATH);
+			$this->_stop();
+		}
+
+		if (!isset($this->args[0]) || !isset($this->params['working'])) {
+			$this->stderr("\nCakePHP Console: ");
+			$this->stderr('This file has been loaded incorrectly and cannot continue.');
+			$this->stderr('Please make sure that ' . DIRECTORY_SEPARATOR . 'cake' . DIRECTORY_SEPARATOR . 'console is in your system path,');
+			$this->stderr('and check the manual for the correct usage of this command.');
+			$this->stderr('(http://manual.cakephp.org/)');
+			$this->_stop();
+		}
+
+		if (basename(__FILE__) !=  basename($this->args[0])) {
+			$this->stderr("\nCakePHP Console: ");
+			$this->stderr('Warning: the dispatcher may have been loaded incorrectly, which could lead to unexpected results...');
+			if ($this->getInput('Continue anyway?', array('y', 'n'), 'y') == 'n') {
+				$this->_stop();
+			}
+		}
+
+		$this->shiftArgs();
+	}
+
+/**
+ * Builds the shell paths.
+ *
+ * @access private
+ * @return void
+ */
+	function __buildPaths() {
+		$paths = array();
+		if (!class_exists('Folder')) {
+			require LIBS . 'folder.php';
+		}
+		$plugins = App::objects('plugin', null, false);
+		foreach ((array)$plugins as $plugin) {
+			$pluginPath = App::pluginPath($plugin);
+			$path = $pluginPath . 'vendors' . DS . 'shells' . DS;
+			if (file_exists($path)) {
+				$paths[] = $path;
+			}
+		}
+
+		$vendorPaths = array_values(App::path('vendors'));
+		foreach ($vendorPaths as $vendorPath) {
+			$path = rtrim($vendorPath, DS) . DS . 'shells' . DS;
+			if (file_exists($path)) {
+				$paths[] = $path;
+			}
+		}
+
+		$this->shellPaths = array_values(array_unique(array_merge($paths, App::path('shells'))));
+	}
+
+/**
+ * Initializes the environment and loads the Cake core.
+ *
+ * @return boolean Success.
+ * @access private
+ */
+	function __bootstrap() {
+
+		define('ROOT', $this->params['root']);
+		define('APP_DIR', $this->params['app']);
+		define('APP_PATH', $this->params['working'] . DS);
+		define('WWW_ROOT', APP_PATH . $this->params['webroot'] . DS);
+		if (!is_dir(ROOT . DS . APP_DIR . DS . 'tmp')) {
+			define('TMP', CORE_PATH . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'tmp' . DS);
+		}
+
+		$includes = array(
+			CORE_PATH . 'cake' . DS . 'config' . DS . 'paths.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'object.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'inflector.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'configure.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'file.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'cache.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'string.php',
+			CORE_PATH . 'cake' . DS . 'libs' . DS . 'class_registry.php',
+			CORE_PATH . 'cake' . DS . 'console' . DS . 'error.php'
+		);
+
+		foreach ($includes as $inc) {
+			if (!require($inc)) {
+				$this->stderr("Failed to load Cake core file {$inc}");
+				return false;
+			}
+		}
+
+		Configure::getInstance(file_exists(CONFIGS . 'bootstrap.php'));
+
+		if (!file_exists(APP_PATH . 'config' . DS . 'core.php')) {
+			include_once CORE_PATH . 'cake' . DS . 'console' . DS . 'templates' . DS . 'skel' . DS . 'config' . DS . 'core.php';
+			App::build();
+		}
+
+		return true;
+	}
+
+/**
+ * Clear the console
+ *
+ * @return void
+ * @access public
+ */
+	function clear() {
+		if (empty($this->params['noclear'])) {
+			if ( DS === '/') {
+				passthru('clear');
+			} else {
+				passthru('cls');
+			}
+		}
+	}
+
+/**
+ * Dispatches a CLI request
+ *
+ * @return boolean
+ * @access public
+ */
+	function dispatch() {
+		$arg = $this->shiftArgs();
+
+		if (!$arg) {
+			$this->help();
+			return false;
+		}
+		if ($arg == 'help') {
+			$this->help();
+			return true;
+		}
+		
+		list($plugin, $shell) = pluginSplit($arg);
+		$this->shell = $shell;
+		$this->shellName = Inflector::camelize($shell);
+		$this->shellClass = $this->shellName . 'Shell';
+
+		$arg = null;
+
+		if (isset($this->args[0])) {
+			$arg = $this->args[0];
+			$this->shellCommand = Inflector::variable($arg);
+		}
+
+		$Shell = $this->_getShell($plugin);
+
+		if (!$Shell) {
+			$title = sprintf(__('Error: Class %s could not be loaded.', true), $this->shellClass);
+			$this->stderr($title . "\n");
+			return false;
+		}
+
+		$methods = array();
+
+		if (is_a($Shell, 'Shell')) {
+			$Shell->initialize();
+			$Shell->loadTasks();
+
+			foreach ($Shell->taskNames as $task) {
+				if (is_a($Shell->{$task}, 'Shell')) {
+					$Shell->{$task}->initialize();
+					$Shell->{$task}->loadTasks();
+				}
+			}
+
+			$task = Inflector::camelize($arg);
+
+			if (in_array($task, $Shell->taskNames)) {
+				$this->shiftArgs();
+				$Shell->{$task}->startup();
+
+				if (isset($this->args[0]) && $this->args[0] == 'help') {
+					if (method_exists($Shell->{$task}, 'help')) {
+						$Shell->{$task}->help();
+					} else {
+						$this->help();
+					}
+					return true;
+				}
+				return $Shell->{$task}->execute();
+			}
+			$methods = array_diff(get_class_methods('Shell'), array('help'));
+		}
+		$methods = array_diff(get_class_methods($Shell), $methods);
+		$added = in_array(strtolower($arg), array_map('strtolower', $methods));
+		$private = $arg[0] == '_' && method_exists($Shell, $arg);
+
+		if (!$private) {
+			if ($added) {
+				$this->shiftArgs();
+				$Shell->startup();
+				return $Shell->{$arg}();
+			}
+			if (method_exists($Shell, 'main')) {
+				$Shell->startup();
+				return $Shell->main();
+			}
+		}
+
+		$title = sprintf(__('Error: Unknown %1$s command %2$s.', true), $this->shellName, $arg);
+		$message = sprintf(__('For usage try `cake %s help`', true), $this->shell);
+		$this->stderr($title . "\n" . $message . "\n");
+		return false;
+	}
+
+/**
+ * Get shell to use, either plugin shell or application shell
+ *
+ * All paths in the shellPaths property are searched.
+ * shell, shellPath and shellClass properties are taken into account.
+ *
+ * @param string $plugin Optionally the name of a plugin
+ * @return mixed False if no shell could be found or an object on success
+ * @access protected
+ */
+	function _getShell($plugin = null) {
+		foreach ($this->shellPaths as $path) {
+			$this->shellPath = $path . $this->shell . '.php';
+			$pluginShellPath =  DS . $plugin . DS . 'vendors' . DS . 'shells' . DS;
+
+			if ((strpos($path, $pluginShellPath) !== false || !$plugin) && file_exists($this->shellPath)) {
+				$loaded = true;
+				break;
+			}
+		}
+		if (!isset($loaded)) {
+			return false;
+		}
+
+		if (!class_exists('Shell')) {
+			require CONSOLE_LIBS . 'shell.php';
+		}
+
+		if (!class_exists($this->shellClass)) {
+			require $this->shellPath;
+		}
+		if (!class_exists($this->shellClass)) {
+			return false;
+		}
+		$Shell = new $this->shellClass($this);
+		return $Shell;
+	}
+
+/**
+ * Prompts the user for input, and returns it.
+ *
+ * @param string $prompt Prompt text.
+ * @param mixed $options Array or string of options.
+ * @param string $default Default input value.
+ * @return Either the default value, or the user-provided input.
+ * @access public
+ */
+	function getInput($prompt, $options = null, $default = null) {
+		if (!is_array($options)) {
+			$printOptions = '';
+		} else {
+			$printOptions = '(' . implode('/', $options) . ')';
+		}
+
+		if ($default === null) {
+			$this->stdout($prompt . " $printOptions \n" . '> ', false);
+		} else {
+			$this->stdout($prompt . " $printOptions \n" . "[$default] > ", false);
+		}
+		$result = fgets($this->stdin);
+
+		if ($result === false) {
+			exit;
+		}
+		$result = trim($result);
+
+		if ($default != null && empty($result)) {
+			return $default;
+		}
+		return $result;
+	}
+
+/**
+ * Outputs to the stdout filehandle.
+ *
+ * @param string $string String to output.
+ * @param boolean $newline If true, the outputs gets an added newline.
+ * @return integer Returns the number of bytes output to stdout.
+ * @access public
+ */
+	function stdout($string, $newline = true) {
+		if ($newline) {
+			return fwrite($this->stdout, $string . "\n");
+		} else {
+			return fwrite($this->stdout, $string);
+		}
+	}
+
+/**
+ * Outputs to the stderr filehandle.
+ *
+ * @param string $string Error text to output.
+ * @access public
+ */
+	function stderr($string) {
+		fwrite($this->stderr, $string);
+	}
+
+/**
+ * Parses command line options
+ *
+ * @param array $params Parameters to parse
+ * @access public
+ */
+	function parseParams($params) {
+		$this->__parseParams($params);
+		$defaults = array('app' => 'app', 'root' => dirname(dirname(dirname(__FILE__))), 'working' => null, 'webroot' => 'webroot');
+		$params = array_merge($defaults, array_intersect_key($this->params, $defaults));
+		$isWin = false;
+		foreach ($defaults as $default => $value) {
+			if (strpos($params[$default], '\\') !== false) {
+				$isWin = true;
+				break;
+			}
+		}
+		$params = str_replace('\\', '/', $params);
+
+		if (isset($params['working'])) {
+			$params['working'] = trim($params['working']);
+		}
+		if (!empty($params['working']) && (!isset($this->args[0]) || isset($this->args[0]) && $this->args[0]{0} !== '.')) {
+			if (empty($this->params['app']) && $params['working'] != $params['root']) {
+				$params['root'] = dirname($params['working']);
+				$params['app'] = basename($params['working']);
+			} else {
+				$params['root'] = $params['working'];
+			}
+		}
+
+		if ($params['app'][0] == '/' || preg_match('/([a-z])(:)/i', $params['app'], $matches)) {
+			$params['root'] = dirname($params['app']);
+		} elseif (strpos($params['app'], '/')) {
+			$params['root'] .= '/' . dirname($params['app']);
+		}
+
+		$params['app'] = basename($params['app']);
+		$params['working'] = rtrim($params['root'], '/');
+		if (!$isWin || !preg_match('/^[A-Z]:$/i', $params['app'])) {
+			$params['working'] .= '/' . $params['app'];
+		}
+
+		if (!empty($matches[0]) || !empty($isWin)) {
+			$params = str_replace('/', '\\', $params);
+		}
+
+		$this->params = array_merge($this->params, $params);
+	}
+
+/**
+ * Helper for recursively parsing params
+ *
+ * @return array params
+ * @access private
+ */
+	function __parseParams($params) {
+		$count = count($params);
+		for ($i = 0; $i < $count; $i++) {
+			if (isset($params[$i])) {
+				if ($params[$i]{0} === '-') {
+					$key = substr($params[$i], 1);
+					$this->params[$key] = true;
+					unset($params[$i]);
+					if (isset($params[++$i])) {
+						if ($params[$i]{0} !== '-') {
+							$this->params[$key] = str_replace('"', '', $params[$i]);
+							unset($params[$i]);
+						} else {
+							$i--;
+							$this->__parseParams($params);
+						}
+					}
+				} else {
+					$this->args[] = $params[$i];
+					unset($params[$i]);
+				}
+
+			}
+		}
+	}
+
+/**
+ * Removes first argument and shifts other arguments up
+ *
+ * @return mixed Null if there are no arguments otherwise the shifted argument
+ * @access public
+ */
+	function shiftArgs() {
+		return array_shift($this->args);
+	}
+
+/**
+ * Shows console help
+ *
+ * @access public
+ */
+	function help() {
+		$this->clear();
+		$this->stdout("\nWelcome to CakePHP v" . Configure::version() . " Console");
+		$this->stdout("---------------------------------------------------------------");
+		$this->stdout("Current Paths:");
+		$this->stdout(" -app: ". $this->params['app']);
+		$this->stdout(" -working: " . rtrim($this->params['working'], DS));
+		$this->stdout(" -root: " . rtrim($this->params['root'], DS));
+		$this->stdout(" -core: " . rtrim(CORE_PATH, DS));
+		$this->stdout("");
+		$this->stdout("Changing Paths:");
+		$this->stdout("your working path should be the same as your application path");
+		$this->stdout("to change your path use the '-app' param.");
+		$this->stdout("Example: -app relative/path/to/myapp or -app /absolute/path/to/myapp");
+
+		$this->stdout("\nAvailable Shells:");
+		$shellList = array();
+		foreach ($this->shellPaths as $path) {
+			if (!is_dir($path)) {
+				continue;
+			}
+ 			$shells = App::objects('file', $path);
+			if (empty($shells)) {
+				continue;
+			}
+			if (preg_match('@plugins[\\\/]([^\\\/]*)@', $path, $matches)) {
+				$type = Inflector::camelize($matches[1]);
+			} elseif (preg_match('@([^\\\/]*)[\\\/]vendors[\\\/]@', $path, $matches)) {
+				$type = $matches[1];
+			} elseif (strpos($path, CAKE_CORE_INCLUDE_PATH . DS . 'cake') === 0) {
+				$type = 'CORE';
+			} else {
+				$type = 'app';
+			}
+			foreach ($shells as $shell) {
+				if ($shell !== 'shell.php') {
+					$shell = str_replace('.php', '', $shell);
+					$shellList[$shell][$type] = $type;
+				}
+			}
+		}
+		if ($shellList) {
+			ksort($shellList);
+			if (DS === '/') {
+				$width = exec('tput cols') - 2;
+			}
+			if (empty($width)) {
+				$width = 80;
+			}
+			$columns = max(1, floor($width / 30));
+			$rows = ceil(count($shellList) / $columns);
+
+			foreach ($shellList as $shell => $types) {
+				sort($types);
+				$shellList[$shell] = str_pad($shell . ' [' . implode ($types, ', ') . ']', $width / $columns);
+			}
+			$out = array_chunk($shellList, $rows);
+			for ($i = 0; $i < $rows; $i++) {
+				$row = '';
+				for ($j = 0; $j < $columns; $j++) {
+					if (!isset($out[$j][$i])) {
+						continue;
+ 					}
+					$row .= $out[$j][$i];
+ 				}
+				$this->stdout(" " . $row);
+			}
+		}
+		$this->stdout("\nTo run a command, type 'cake shell_name [args]'");
+		$this->stdout("To get help on a specific command, type 'cake shell_name help'");
+	}
+
+/**
+ * Stop execution of the current script
+ *
+ * @param $status see http://php.net/exit for values
+ * @return void
+ * @access protected
+ */
+	function _stop($status = 0) {
+		exit($status);
+	}
+}
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	$dispatcher = new ShellDispatcher($argv);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/error.php b/code/ryzom/tools/server/www/webtt/cake/console/error.php
new file mode 100644
index 000000000..e837d1b8d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/error.php
@@ -0,0 +1,265 @@
+<?php
+/**
+ * ErrorHandler for Console Shells
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console
+ * @since         CakePHP(tm) v 1.2.0.5074
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Error Handler for Cake console.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console
+ */
+class ErrorHandler extends Object {
+
+/**
+ * Standard output stream.
+ *
+ * @var filehandle
+ * @access public
+ */
+	var $stdout;
+
+/**
+ * Standard error stream.
+ *
+ * @var filehandle
+ * @access public
+ */
+	var $stderr;
+
+/**
+ * Class constructor.
+ *
+ * @param string $method Method dispatching an error
+ * @param array $messages Error messages
+ */
+	function __construct($method, $messages) {
+		$this->stdout = fopen('php://stdout', 'w');
+		$this->stderr = fopen('php://stderr', 'w');
+		call_user_func_array(array(&$this, $method), $messages);
+	}
+
+/**
+ * Displays an error page (e.g. 404 Not found).
+ *
+ * @param array $params Parameters (code, name, and message)
+ * @access public
+ */
+	function error($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr($code . $name . $message."\n");
+		$this->_stop(1);
+	}
+
+/**
+ * Convenience method to display a 404 page.
+ *
+ * @param array $params Parameters (url, message)
+ * @access public
+ */
+	function error404($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->error(array(
+			'code' => '404',
+			'name' => 'Not found',
+			'message' => sprintf(__("The requested address %s was not found on this server.", true), $url, $message)
+		));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Controller web page.
+ *
+ * @param array $params Parameters (className)
+ * @access public
+ */
+	function missingController($params) {
+		extract($params, EXTR_OVERWRITE);
+		$controllerName = str_replace('Controller', '', $className);
+		$this->stderr(sprintf(__("Missing Controller '%s'", true), $controllerName));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Action web page.
+ *
+ * @param array $params Parameters (action, className)
+ * @access public
+ */
+	function missingAction($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing Method '%s' in '%s'", true), $action, $className));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Private Action web page.
+ *
+ * @param array $params Parameters (action, className)
+ * @access public
+ */
+	function privateAction($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Trying to access private method '%s' in '%s'", true), $action, $className));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Table web page.
+ *
+ * @param array $params Parameters (table, className)
+ * @access public
+ */
+	function missingTable($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing database table '%s' for model '%s'", true), $table, $className));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Database web page.
+ *
+ * @param array $params Parameters
+ * @access public
+ */
+	function missingDatabase($params = array()) {
+		$this->stderr(__("Missing Database", true));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing View web page.
+ *
+ * @param array $params Parameters (file, action, className)
+ * @access public
+ */
+	function missingView($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing View '%s' for '%s' in '%s'", true), $file, $action, $className));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Layout web page.
+ *
+ * @param array $params Parameters (file)
+ * @access public
+ */
+	function missingLayout($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing Layout '%s'", true), $file));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Database Connection web page.
+ *
+ * @param array $params Parameters
+ * @access public
+ */
+	function missingConnection($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(__("Missing Database Connection. Try 'cake bake'", true));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Helper file web page.
+ *
+ * @param array $params Parameters (file, helper)
+ * @access public
+ */
+	function missingHelperFile($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing Helper file '%s' for '%s'", true), $file, Inflector::camelize($helper)));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Helper class web page.
+ *
+ * @param array $params Parameters (file, helper)
+ * @access public
+ */
+	function missingHelperClass($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing Helper class '%s' in '%s'", true), Inflector::camelize($helper), $file));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Component file web page.
+ *
+ * @param array $params Parameters (file, component)
+ * @access public
+ */
+	function missingComponentFile($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing Component file '%s' for '%s'", true), $file, Inflector::camelize($component)));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Component class web page.
+ *
+ * @param array $params Parameters (file, component)
+ * @access public
+ */
+	function missingComponentClass($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing Component class '%s' in '%s'", true), Inflector::camelize($component), $file));
+		$this->_stop(1);
+	}
+
+/**
+ * Renders the Missing Model class web page.
+ *
+ * @param array $params Parameters (className)
+ * @access public
+ */
+	function missingModel($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->stderr(sprintf(__("Missing model '%s'", true), $className));
+		$this->_stop(1);
+	}
+
+/**
+ * Outputs to the stdout filehandle.
+ *
+ * @param string $string String to output.
+ * @param boolean $newline If true, the outputs gets an added newline.
+ * @access public
+ */
+	function stdout($string, $newline = true) {
+		if ($newline) {
+			fwrite($this->stdout, $string . "\n");
+		} else {
+			fwrite($this->stdout, $string);
+		}
+	}
+
+/**
+ * Outputs to the stderr filehandle.
+ *
+ * @param string $string Error text to output.
+ * @access public
+ */
+	function stderr($string) {
+		fwrite($this->stderr, "Error: ". $string . "\n");
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/acl.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/acl.php
new file mode 100644
index 000000000..ddedd74d2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/acl.php
@@ -0,0 +1,602 @@
+<?php
+/**
+ * Acl Shell provides Acl access in the CLI environment
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5012
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Component', 'Acl');
+App::import('Model', 'DbAcl');
+
+/**
+ * Shell for ACL management.  This console is known to have issues with zend.ze1_compatibility_mode 
+ * being enabled.  Be sure to turn it off when using this shell.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class AclShell extends Shell {
+
+/**
+ * Contains instance of AclComponent
+ *
+ * @var AclComponent
+ * @access public
+ */
+	var $Acl;
+
+/**
+ * Contains arguments parsed from the command line.
+ *
+ * @var array
+ * @access public
+ */
+	var $args;
+
+/**
+ * Contains database source to use
+ *
+ * @var string
+ * @access public
+ */
+	var $connection = 'default';
+
+/**
+ * Contains tasks to load and instantiate
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('DbConfig');
+
+/**
+ * Override startup of the Shell
+ *
+ * @access public
+ */
+	function startup() {
+		if (isset($this->params['connection'])) {
+			$this->connection = $this->params['connection'];
+		}
+
+		if (!in_array(Configure::read('Acl.classname'), array('DbAcl', 'DB_ACL'))) {
+			$out = "--------------------------------------------------\n";
+			$out .= __("Error: Your current Cake configuration is set to", true) . "\n";
+			$out .= __("an ACL implementation other than DB. Please change", true) . "\n";
+			$out .= __("your core config to reflect your decision to use", true) . "\n";
+			$out .= __("DbAcl before attempting to use this script", true) . ".\n";
+			$out .= "--------------------------------------------------\n";
+			$out .= sprintf(__("Current ACL Classname: %s", true), Configure::read('Acl.classname')) . "\n";
+			$out .= "--------------------------------------------------\n";
+			$this->err($out);
+			$this->_stop();
+		}
+
+		if ($this->command && !in_array($this->command, array('help'))) {
+			if (!config('database')) {
+				$this->out(__("Your database configuration was not found. Take a moment to create one.", true), true);
+				$this->args = null;
+				return $this->DbConfig->execute();
+			}
+			require_once (CONFIGS.'database.php');
+
+			if (!in_array($this->command, array('initdb'))) {
+				$this->Acl =& new AclComponent();
+				$controller = null;
+				$this->Acl->startup($controller);
+			}
+		}
+	}
+
+/**
+ * Override main() for help message hook
+ *
+ * @access public
+ */
+	function main() {
+		$out  = __("Available ACL commands:", true) . "\n";
+		$out .= "\t - create\n";
+		$out .= "\t - delete\n";
+		$out .= "\t - setParent\n";
+		$out .= "\t - getPath\n";
+		$out .= "\t - check\n";
+		$out .= "\t - grant\n";
+		$out .= "\t - deny\n";
+		$out .= "\t - inherit\n";
+		$out .= "\t - view\n";
+		$out .= "\t - initdb\n";
+		$out .= "\t - help\n\n";
+		$out .= __("For help, run the 'help' command.  For help on a specific command, run 'help <command>'", true);
+		$this->out($out);
+	}
+
+/**
+ * Creates an ARO/ACO node
+ *
+ * @access public
+ */
+	function create() {
+		$this->_checkArgs(3, 'create');
+		$this->checkNodeType();
+		extract($this->__dataVars());
+
+		$class = ucfirst($this->args[0]);
+		$parent = $this->parseIdentifier($this->args[1]);
+
+		if (!empty($parent) && $parent != '/' && $parent != 'root') {
+			$parent = $this->_getNodeId($class, $parent);
+		} else {
+			$parent = null;
+		}
+
+		$data = $this->parseIdentifier($this->args[2]);
+		if (is_string($data) && $data != '/') {
+			$data = array('alias' => $data);
+		} elseif (is_string($data)) {
+			$this->error(__('/ can not be used as an alias!', true), __("\t/ is the root, please supply a sub alias", true));
+		}
+
+		$data['parent_id'] = $parent;
+		$this->Acl->{$class}->create();
+		if ($this->Acl->{$class}->save($data)) {
+			$this->out(sprintf(__("New %s '%s' created.\n", true), $class, $this->args[2]), true);
+		} else {
+			$this->err(sprintf(__("There was a problem creating a new %s '%s'.", true), $class, $this->args[2]));
+		}
+	}
+
+/**
+ * Delete an ARO/ACO node.
+ *
+ * @access public
+ */
+	function delete() {
+		$this->_checkArgs(2, 'delete');
+		$this->checkNodeType();
+		extract($this->__dataVars());
+
+		$identifier = $this->parseIdentifier($this->args[1]);
+		$nodeId = $this->_getNodeId($class, $identifier);
+
+		if (!$this->Acl->{$class}->delete($nodeId)) {
+			$this->error(__("Node Not Deleted", true), sprintf(__("There was an error deleting the %s. Check that the node exists", true), $class) . ".\n");
+		}
+		$this->out(sprintf(__("%s deleted", true), $class) . ".\n", true);
+	}
+
+/**
+ * Set parent for an ARO/ACO node.
+ *
+ * @access public
+ */
+	function setParent() {
+		$this->_checkArgs(3, 'setParent');
+		$this->checkNodeType();
+		extract($this->__dataVars());
+		$target = $this->parseIdentifier($this->args[1]);
+		$parent = $this->parseIdentifier($this->args[2]);
+
+		$data = array(
+			$class => array(
+				'id' => $this->_getNodeId($class, $target),
+				'parent_id' => $this->_getNodeId($class, $parent)
+			)
+		);
+		$this->Acl->{$class}->create();
+		if (!$this->Acl->{$class}->save($data)) {
+			$this->out(__("Error in setting new parent. Please make sure the parent node exists, and is not a descendant of the node specified.", true), true);
+		} else {
+			$this->out(sprintf(__("Node parent set to %s", true), $this->args[2]) . "\n", true);
+		}
+	}
+
+/**
+ * Get path to specified ARO/ACO node.
+ *
+ * @access public
+ */
+	function getPath() {
+		$this->_checkArgs(2, 'getPath');
+		$this->checkNodeType();
+		extract($this->__dataVars());
+		$identifier = $this->parseIdentifier($this->args[1]);
+
+		$id = $this->_getNodeId($class, $identifier);
+		$nodes = $this->Acl->{$class}->getPath($id);
+
+		if (empty($nodes)) {
+			$this->error(
+				sprintf(__("Supplied Node '%s' not found", true), $this->args[1]),
+				__("No tree returned.", true)
+			);
+		}
+		$this->out(__('Path:', true));
+		$this->hr();
+		for ($i = 0; $i < count($nodes); $i++) {
+			$this->_outputNode($class, $nodes[$i], $i);
+		}
+	}
+
+/**
+ * Outputs a single node, Either using the alias or Model.key
+ *
+ * @param string $class Class name that is being used.
+ * @param array $node Array of node information.
+ * @param integer $indent indent level.
+ * @return void
+ * @access protected
+ */
+	function _outputNode($class, $node, $indent) {
+		$indent = str_repeat('  ', $indent);
+		$data = $node[$class];
+		if ($data['alias']) {
+			$this->out($indent . "[" . $data['id'] . "] " . $data['alias']);
+		 } else {
+			$this->out($indent . "[" . $data['id'] . "] " . $data['model'] . '.' . $data['foreign_key']);
+		}
+	}
+
+/**
+ * Check permission for a given ARO to a given ACO.
+ *
+ * @access public
+ */
+	function check() {
+		$this->_checkArgs(3, 'check');
+		extract($this->__getParams());
+
+		if ($this->Acl->check($aro, $aco, $action)) {
+			$this->out(sprintf(__("%s is allowed.", true), $aroName), true);
+		} else {
+			$this->out(sprintf(__("%s is not allowed.", true), $aroName), true);
+		}
+	}
+
+/**
+ * Grant permission for a given ARO to a given ACO.
+ *
+ * @access public
+ */
+	function grant() {
+		$this->_checkArgs(3, 'grant');
+		extract($this->__getParams());
+
+		if ($this->Acl->allow($aro, $aco, $action)) {
+			$this->out(__("Permission granted.", true), true);
+		} else {
+			$this->out(__("Permission was not granted.", true), true);
+		}
+	}
+
+/**
+ * Deny access for an ARO to an ACO.
+ *
+ * @access public
+ */
+	function deny() {
+		$this->_checkArgs(3, 'deny');
+		extract($this->__getParams());
+
+		if ($this->Acl->deny($aro, $aco, $action)) {
+			$this->out(__("Permission denied.", true), true);
+		} else {
+			$this->out(__("Permission was not denied.", true), true);
+		}
+	}
+
+/**
+ * Set an ARO to inhermit permission to an ACO.
+ *
+ * @access public
+ */
+	function inherit() {
+		$this->_checkArgs(3, 'inherit');
+		extract($this->__getParams());
+
+		if ($this->Acl->inherit($aro, $aco, $action)) {
+			$this->out(__("Permission inherited.", true), true);
+		} else {
+			$this->out(__("Permission was not inherited.", true), true);
+		}
+	}
+
+/**
+ * Show a specific ARO/ACO node.
+ *
+ * @access public
+ */
+	function view() {
+		$this->_checkArgs(1, 'view');
+		$this->checkNodeType();
+		extract($this->__dataVars());
+
+		if (isset($this->args[1])) {
+			$identity = $this->parseIdentifier($this->args[1]);
+
+			$topNode = $this->Acl->{$class}->find('first', array(
+				'conditions' => array($class . '.id' => $this->_getNodeId($class, $identity))
+			));
+
+			$nodes = $this->Acl->{$class}->find('all', array(
+				'conditions' => array(
+					$class . '.lft >=' => $topNode[$class]['lft'],
+					$class . '.lft <=' => $topNode[$class]['rght']
+				),
+				'order' => $class . '.lft ASC'
+			));
+		} else {
+			$nodes = $this->Acl->{$class}->find('all', array('order' => $class . '.lft ASC'));
+		}
+
+		if (empty($nodes)) {
+			if (isset($this->args[1])) {
+				$this->error(sprintf(__("%s not found", true), $this->args[1]), __("No tree returned.", true));
+			} elseif (isset($this->args[0])) {
+				$this->error(sprintf(__("%s not found", true), $this->args[0]), __("No tree returned.", true));
+			}
+		}
+		$this->out($class . " tree:");
+		$this->hr();
+
+		$stack = array();
+		$last  = null;
+
+		foreach ($nodes as $n) {
+			$stack[] = $n;
+			if (!empty($last)) {
+				$end = end($stack);
+				if ($end[$class]['rght'] > $last) {
+					foreach ($stack as $k => $v) {
+						$end = end($stack);
+						if ($v[$class]['rght'] < $end[$class]['rght']) {
+							unset($stack[$k]);
+						}
+					}
+				}
+			}
+			$last = $n[$class]['rght'];
+			$count = count($stack);
+
+			$this->_outputNode($class, $n, $count);
+		}
+		$this->hr();
+	}
+
+/**
+ * Initialize ACL database.
+ *
+ * @access public
+ */
+	function initdb() {
+		$this->Dispatch->args = array('schema', 'create', 'DbAcl');
+		$this->Dispatch->dispatch();
+	}
+
+/**
+ * Show help screen.
+ *
+ * @access public
+ */
+	function help() {
+		$head = "-----------------------------------------------\n";
+		$head .= __("Usage: cake acl <command> <arg1> <arg2>...", true) . "\n";
+		$head .= "-----------------------------------------------\n";
+		$head .= __("Commands:", true) . "\n";
+
+		$commands = array(
+			'create' => "create aro|aco <parent> <node>\n" .
+				"\t" . __("Creates a new ACL object <node> under the parent", true) . "\n" .
+				"\t" . __("specified by <parent>, an id/alias.", true) . "\n" .
+				"\t" . __("The <parent> and <node> references can be", true) . "\n" .
+				"\t" . __("in one of the following formats:", true) . "\n\n" .
+				"\t\t- " . __("<model>.<id> - The node will be bound to a", true) . "\n" .
+				"\t\t" . __("specific record of the given model.", true) . "\n\n" .
+				"\t\t- " . __("<alias> - The node will be given a string alias,", true) . "\n" .
+				"\t\t" . __(" (or path, in the case of <parent>)", true) . "\n" .
+				"\t\t  " . __("i.e. 'John'.  When used with <parent>,", true) . "\n" .
+				"\t\t" . __("this takes the form of an alias path,", true) . "\n" .
+				"\t\t  " . __("i.e. <group>/<subgroup>/<parent>.", true) . "\n\n" .
+				"\t" . __("To add a node at the root level,", true) . "\n" .
+				"\t" . __("enter 'root' or '/' as the <parent> parameter.", true) . "\n",
+
+			'delete' => "delete aro|aco <node>\n" .
+				"\t" . __("Deletes the ACL object with the given <node> reference", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'setparent' => "setParent aro|aco <node> <parent node>\n" .
+				"\t" . __("Moves the ACL object specified by <node> beneath", true) . "\n" .
+				"\t" . __("the parent ACL object specified by <parent>.", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'getpath' => "getPath aro|aco <node>\n" .
+				"\t" . __("Returns the path to the ACL object specified by <node>. This command", true) . "\n" .
+				"\t" . __("is useful in determining the inhertiance of permissions for a certain", true) . "\n" .
+				"\t" . __("object in the tree.", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'check' => "check <node> <node> [<aco_action>] " . __("or", true) . " all\n" .
+				"\t" . __("Use this command to check ACL permissions.", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'grant' => "grant <aronode> <aconode> [<aco_action>] " . __("or", true) . " all\n" .
+				"\t" . __("Use this command to grant ACL permissions. Once executed, the ARO", true) . "\n" .
+				"\t" . __("specified (and its children, if any) will have ALLOW access to the", true) . "\n" .
+				"\t" . __("specified ACO action (and the ACO's children, if any).", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'deny' => "deny <aronode> <aconode> [<aco_action>]" . __("or", true) . " all\n" .
+				"\t" . __("Use this command to deny ACL permissions. Once executed, the ARO", true) . "\n" .
+				"\t" . __("specified (and its children, if any) will have DENY access to the", true) . "\n" .
+				"\t" . __("specified ACO action (and the ACO's children, if any).", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'inherit' => "inherit <aronode> <aconode> [<aco_action>]" . __("or", true) . " all\n" .
+				"\t" . __("Use this command to force a child ARO object to inherit its", true) . "\n" .
+				"\t" . __("permissions settings from its parent.", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'view' => "view aro|aco [<node>]\n" .
+				"\t" . __("The view command will return the ARO or ACO tree.", true) . "\n" .
+				"\t" . __("The optional node parameter allows you to return", true) . "\n" .
+				"\t" . __("only a portion of the requested tree.", true) . "\n" .
+				"\t" . __("For more detailed parameter usage info,", true) . "\n" .
+				"\t" . __("see help for the 'create' command.", true),
+
+			'initdb' => "initdb\n".
+				"\t" . __("Uses this command : cake schema run create DbAcl", true),
+
+			'help' => "help [<command>]\n" .
+				"\t" . __("Displays this help message, or a message on a specific command.", true)
+		);
+
+		$this->out($head);
+		if (!isset($this->args[0])) {
+			foreach ($commands as $cmd) {
+				$this->out("{$cmd}\n\n");
+			}
+		} elseif (isset($commands[strtolower($this->args[0])])) {
+			$this->out($commands[strtolower($this->args[0])] . "\n\n");
+		} else {
+			$this->out(sprintf(__("Command '%s' not found", true), $this->args[0]));
+		}
+	}
+
+/**
+ * Check that first argument specifies a valid Node type (ARO/ACO)
+ *
+ * @access public
+ */
+	function checkNodeType() {
+		if (!isset($this->args[0])) {
+			return false;
+		}
+		if ($this->args[0] != 'aco' && $this->args[0] != 'aro') {
+			$this->error(sprintf(__("Missing/Unknown node type: '%s'", true), $this->args[0]), __('Please specify which ACL object type you wish to create. Either "aro" or "aco"', true));
+		}
+	}
+
+/**
+ * Checks that given node exists
+ *
+ * @param string $type Node type (ARO/ACO)
+ * @param integer $id Node id
+ * @return boolean Success
+ * @access public
+ */
+	function nodeExists() {
+		if (!$this->checkNodeType() && !isset($this->args[1])) {
+			return false;
+		}
+		extract($this->__dataVars($this->args[0]));
+		$key = is_numeric($this->args[1]) ? $secondary_id : 'alias';
+		$conditions = array($class . '.' . $key => $this->args[1]);
+		$possibility = $this->Acl->{$class}->find('all', compact('conditions'));
+		if (empty($possibility)) {
+			$this->error(sprintf(__("%s not found", true), $this->args[1]), __("No tree returned.", true));
+		}
+		return $possibility;
+	}
+
+/**
+ * Parse an identifier into Model.foriegnKey or an alias.
+ * Takes an identifier determines its type and returns the result as used by other methods.
+ *
+ * @param string $identifier Identifier to parse
+ * @return mixed a string for aliases, and an array for model.foreignKey
+ */
+	function parseIdentifier($identifier) {
+		if (preg_match('/^([\w]+)\.(.*)$/', $identifier, $matches)) {
+			return array(
+				'model' => $matches[1],
+				'foreign_key' => $matches[2],
+			);
+		}
+		return $identifier;
+	}
+
+/**
+ * Get the node for a given identifier. $identifier can either be a string alias
+ * or an array of properties to use in AcoNode::node()
+ *
+ * @param string $class Class type you want (Aro/Aco)
+ * @param mixed $identifier A mixed identifier for finding the node.
+ * @return int Integer of NodeId. Will trigger an error if nothing is found.
+ */
+	function _getNodeId($class, $identifier) {
+		$node = $this->Acl->{$class}->node($identifier);
+		if (empty($node)) {
+			if (is_array($identifier)) {
+				$identifier = var_export($identifier, true);
+			}
+			$this->error(sprintf(__('Could not find node using reference "%s"', true), $identifier));
+		}
+		return Set::extract($node, "0.{$class}.id");
+	}
+
+/**
+ * get params for standard Acl methods
+ *
+ * @return array aro, aco, action
+ * @access private
+ */
+	function __getParams() {
+		$aro = is_numeric($this->args[0]) ? intval($this->args[0]) : $this->args[0];
+		$aco = is_numeric($this->args[1]) ? intval($this->args[1]) : $this->args[1];
+		$aroName = $aro;
+		$acoName = $aco;
+
+		if (is_string($aro)) {
+			$aro = $this->parseIdentifier($aro);
+		}
+		if (is_string($aco)) {
+			$aco = $this->parseIdentifier($aco);
+		}
+		$action = null;
+		if (isset($this->args[2])) {
+			$action = $this->args[2];
+			if ($action == '' || $action == 'all') {
+				$action = '*';
+			}
+		}
+		return compact('aro', 'aco', 'action', 'aroName', 'acoName');
+	}
+
+/**
+ * Build data parameters based on node type
+ *
+ * @param string $type Node type  (ARO/ACO)
+ * @return array Variables
+ * @access private
+ */
+	function __dataVars($type = null) {
+		if ($type == null) {
+			$type = $this->args[0];
+		}
+		$vars = array();
+		$class = ucwords($type);
+		$vars['secondary_id'] = (strtolower($class) == 'aro') ? 'foreign_key' : 'object_id';
+		$vars['data_name'] = $type;
+		$vars['table_name'] = $type . 's';
+		$vars['class'] = $class;
+		return $vars;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/api.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/api.php
new file mode 100644
index 000000000..0b2c00529
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/api.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * API shell to get CakePHP core method signatures.
+ *
+ * Implementation of a Cake Shell to show CakePHP core method signatures.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5012
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * API shell to show method signatures of CakePHP core classes.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class ApiShell extends Shell {
+
+/**
+ * Map between short name for paths and real paths.
+ *
+ * @var array
+ * @access public
+ */
+	var $paths = array();
+
+/**
+ * Override intialize of the Shell
+ *
+ * @access public
+ */
+	function initialize() {
+		$this->paths = array_merge($this->paths, array(
+			'behavior' => LIBS . 'model' . DS . 'behaviors' . DS,
+			'cache' => LIBS . 'cache' . DS,
+			'controller' => LIBS . 'controller' . DS,
+			'component' => LIBS . 'controller' . DS . 'components' . DS,
+			'helper' => LIBS . 'view' . DS . 'helpers' . DS,
+			'model' => LIBS . 'model' . DS,
+			'view' => LIBS . 'view' . DS,
+			'core' => LIBS
+		));
+	}
+
+/**
+ * Override main() to handle action
+ *
+ * @access public
+ */
+	function main() {
+		if (empty($this->args)) {
+			return $this->help();
+		}
+
+		$type = strtolower($this->args[0]);
+
+		if (isset($this->paths[$type])) {
+			$path = $this->paths[$type];
+		} else {
+			$path = $this->paths['core'];
+		}
+
+		if (count($this->args) == 1) {
+			$file = $type;
+			$class = Inflector::camelize($type);
+		} elseif (count($this->args) > 1) {
+			$file = Inflector::underscore($this->args[1]);
+			$class = Inflector::camelize($file);
+		}
+
+		$objects = App::objects('class', $path);
+		if (in_array($class, $objects)) {
+			if (in_array($type, array('behavior', 'component', 'helper')) && $type !== $file) {
+				if (!preg_match('/' . Inflector::camelize($type) . '$/', $class)) {
+					$class .= Inflector::camelize($type);
+				}
+			}
+
+		} else {
+			$this->err(sprintf(__("%s not found", true), $class));
+			$this->_stop();
+		}
+
+		$parsed = $this->__parseClass($path . $file .'.php');
+
+		if (!empty($parsed)) {
+			if (isset($this->params['m'])) {
+				if (!isset($parsed[$this->params['m']])) {
+					$this->err(sprintf(__("%s::%s() could not be found", true), $class, $this->params['m']));
+					$this->_stop();
+				}
+				$method = $parsed[$this->params['m']];
+				$this->out($class .'::'.$method['method'] . $method['parameters']);
+				$this->hr();
+				$this->out($method['comment'], true);
+			} else {
+				$this->out(ucwords($class));
+				$this->hr();
+				$i = 0;
+				foreach ($parsed as $method) {
+					$list[] = ++$i . ". " . $method['method'] . $method['parameters'];
+				}
+				$this->out($list);
+
+				$methods = array_keys($parsed);
+				while ($number = strtolower($this->in(__('Select a number to see the more information about a specific method. q to quit. l to list.', true), null, 'q'))) {
+					if ($number === 'q') {
+						$this->out(__('Done', true));
+						$this->_stop();
+					}
+
+					if ($number === 'l') {
+						$this->out($list);
+					}
+
+					if (isset($methods[--$number])) {
+						$method = $parsed[$methods[$number]];
+						$this->hr();
+						$this->out($class .'::'.$method['method'] . $method['parameters']);
+						$this->hr();
+						$this->out($method['comment'], true);
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * Show help for this shell.
+ *
+ * @access public
+ */
+	function help() {
+		$head  = "Usage: cake api [<type>] <className> [-m <method>]\n";
+		$head .= "-----------------------------------------------\n";
+		$head .= "Parameters:\n\n";
+
+		$commands = array(
+			'path' => "\t<type>\n" .
+				"\t\tEither a full path or type of class (model, behavior, controller, component, view, helper).\n".
+				"\t\tAvailable values:\n\n".
+				"\t\tbehavior\tLook for class in CakePHP behavior path\n".
+				"\t\tcache\tLook for class in CakePHP cache path\n".
+				"\t\tcontroller\tLook for class in CakePHP controller path\n".
+				"\t\tcomponent\tLook for class in CakePHP component path\n".
+				"\t\thelper\tLook for class in CakePHP helper path\n".
+				"\t\tmodel\tLook for class in CakePHP model path\n".
+				"\t\tview\tLook for class in CakePHP view path\n",
+			'className' => "\t<className>\n" .
+				"\t\tA CakePHP core class name (e.g: Component, HtmlHelper).\n"
+		);
+
+		$this->out($head);
+		if (!isset($this->args[1])) {
+			foreach ($commands as $cmd) {
+				$this->out("{$cmd}\n\n");
+			}
+		} elseif (isset($commands[strtolower($this->args[1])])) {
+			$this->out($commands[strtolower($this->args[1])] . "\n\n");
+		} else {
+			$this->out("Command '" . $this->args[1] . "' not found");
+		}
+	}
+
+/**
+ * Parse a given class (located on given file) and get public methods and their
+ * signatures.
+ *
+ * @param object $File File object
+ * @param string $class Class name
+ * @return array Methods and signatures indexed by method name
+ * @access private
+ */
+	function __parseClass($path) {
+		$parsed = array();
+
+		$File = new File($path);
+		if (!$File->exists()) {
+			$this->err(sprintf(__("%s could not be found", true), $File->name));
+			$this->_stop();
+		}
+
+		$contents = $File->read();
+
+		if (preg_match_all('%(/\\*\\*[\\s\\S]*?\\*/)(\\s+function\\s+\\w+)(\\(.*\\))%', $contents, $result, PREG_PATTERN_ORDER)) {
+			foreach ($result[2] as $key => $method) {
+				$method = str_replace('function ', '', trim($method));
+
+				if (strpos($method, '__') === false && $method[0] != '_') {
+					$parsed[$method] = array(
+						'comment' => str_replace(array('/*', '*/', '*'), '', trim($result[1][$key])),
+						'method' => $method,
+						'parameters' => trim($result[3][$key])
+					);
+				}
+			}
+		}
+		ksort($parsed);
+		return $parsed;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/bake.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/bake.php
new file mode 100644
index 000000000..874957268
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/bake.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Command-line code generation utility to automate programmer chores.
+ *
+ * Bake is CakePHP's code generation script, which can help you kickstart
+ * application development by writing fully functional skeleton controllers,
+ * models, and views. Going further, Bake can also write Unit Tests for you.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5012
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Bake is a command-line code generation utility for automating programmer chores.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @link          http://book.cakephp.org/view/1522/Code-Generation-with-Bake
+ */
+class BakeShell extends Shell {
+
+/**
+ * Contains tasks to load and instantiate
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('Project', 'DbConfig', 'Model', 'Controller', 'View', 'Plugin', 'Fixture', 'Test');
+
+/**
+ * Override loadTasks() to handle paths
+ *
+ * @access public
+ */
+	function loadTasks() {
+		parent::loadTasks();
+		$task = Inflector::classify($this->command);
+		if (isset($this->{$task}) && !in_array($task, array('Project', 'DbConfig'))) {
+			if (isset($this->params['connection'])) {
+				$this->{$task}->connection = $this->params['connection'];
+			}
+			foreach($this->args as $i => $arg) {
+				if (strpos($arg, '.')) {
+					list($this->params['plugin'], $this->args[$i]) = pluginSplit($arg);
+					break;
+				}
+			}
+			if (isset($this->params['plugin'])) {
+				$this->{$task}->plugin = $this->params['plugin'];
+			}
+		}
+	}
+
+/**
+ * Override main() to handle action
+ *
+ * @access public
+ */
+	function main() {
+		if (!is_dir($this->DbConfig->path)) {
+			if ($this->Project->execute()) {
+				$this->DbConfig->path = $this->params['working'] . DS . 'config' . DS;
+			} else {
+				return false;
+			}
+		}
+
+		if (!config('database')) {
+			$this->out(__("Your database configuration was not found. Take a moment to create one.", true));
+			$this->args = null;
+			return $this->DbConfig->execute();
+		}
+		$this->out('Interactive Bake Shell');
+		$this->hr();
+		$this->out('[D]atabase Configuration');
+		$this->out('[M]odel');
+		$this->out('[V]iew');
+		$this->out('[C]ontroller');
+		$this->out('[P]roject');
+		$this->out('[F]ixture');
+		$this->out('[T]est case');
+		$this->out('[Q]uit');
+
+		$classToBake = strtoupper($this->in(__('What would you like to Bake?', true), array('D', 'M', 'V', 'C', 'P', 'F', 'T', 'Q')));
+		switch ($classToBake) {
+			case 'D':
+				$this->DbConfig->execute();
+				break;
+			case 'M':
+				$this->Model->execute();
+				break;
+			case 'V':
+				$this->View->execute();
+				break;
+			case 'C':
+				$this->Controller->execute();
+				break;
+			case 'P':
+				$this->Project->execute();
+				break;
+			case 'F':
+				$this->Fixture->execute();
+				break;
+			case 'T':
+				$this->Test->execute();
+				break;
+			case 'Q':
+				exit(0);
+				break;
+			default:
+				$this->out(__('You have made an invalid selection. Please choose a type of class to Bake by entering D, M, V, F, T, or C.', true));
+		}
+		$this->hr();
+		$this->main();
+	}
+
+/**
+ * Quickly bake the MVC
+ *
+ * @access public
+ */
+	function all() {
+		$this->hr();
+		$this->out('Bake All');
+		$this->hr();
+
+		if (!isset($this->params['connection']) && empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+
+		if (empty($this->args)) {
+			$this->Model->interactive = true;
+			$name = $this->Model->getName($this->connection);
+		}
+
+		foreach (array('Model', 'Controller', 'View') as $task) {
+			$this->{$task}->connection = $this->connection;
+			$this->{$task}->interactive = false;
+		}
+
+		if (!empty($this->args[0])) {
+			$name = $this->args[0];
+		}
+
+		$modelExists = false;
+		$model = $this->_modelName($name);
+		if (App::import('Model', $model)) {
+			$object = new $model();
+			$modelExists = true;
+		} else {
+			App::import('Model', 'Model', false);
+			$object = new Model(array('name' => $name, 'ds' => $this->connection));
+		}
+
+		$modelBaked = $this->Model->bake($object, false);
+
+		if ($modelBaked && $modelExists === false) {
+			$this->out(sprintf(__('%s Model was baked.', true), $model));
+			if ($this->_checkUnitTest()) {
+				$this->Model->bakeFixture($model);
+				$this->Model->bakeTest($model);
+			}
+			$modelExists = true;
+		}
+
+		if ($modelExists === true) {
+			$controller = $this->_controllerName($name);
+			if ($this->Controller->bake($controller, $this->Controller->bakeActions($controller))) {
+				$this->out(sprintf(__('%s Controller was baked.', true), $name));
+				if ($this->_checkUnitTest()) {
+					$this->Controller->bakeTest($controller);
+				}
+			}
+			if (App::import('Controller', $controller)) {
+				$this->View->args = array($controller);
+				$this->View->execute();
+				$this->out(sprintf(__('%s Views were baked.', true), $name));
+			}
+			$this->out(__('Bake All complete', true));
+			array_shift($this->args);
+		} else {
+			$this->err(__('Bake All could not continue without a valid model', true));
+		}
+		$this->_stop();
+	}
+
+/**
+ * Displays help contents
+ *
+ * @access public
+ */
+	function help() {
+		$this->out('CakePHP Bake:');
+		$this->hr();
+		$this->out('The Bake script generates controllers, views and models for your application.');
+		$this->out('If run with no command line arguments, Bake guides the user through the class');
+		$this->out('creation process. You can customize the generation process by telling Bake');
+		$this->out('where different parts of your application are using command line arguments.');
+		$this->hr();
+		$this->out("Usage: cake bake <command> <arg1> <arg2>...");
+		$this->hr();
+		$this->out('Params:');
+		$this->out("\t-app <path> Absolute/Relative path to your app folder.\n");
+		$this->out('Commands:');
+		$this->out("\n\tbake help\n\t\tshows this help message.");
+		$this->out("\n\tbake all <name>\n\t\tbakes complete MVC. optional <name> of a Model");
+		$this->out("\n\tbake project <path>\n\t\tbakes a new app folder in the path supplied\n\t\tor in current directory if no path is specified");
+		$this->out("\n\tbake plugin <name>\n\t\tbakes a new plugin folder in the path supplied\n\t\tor in current directory if no path is specified.");
+		$this->out("\n\tbake db_config\n\t\tbakes a database.php file in config directory.");
+		$this->out("\n\tbake model\n\t\tbakes a model. run 'bake model help' for more info");
+		$this->out("\n\tbake view\n\t\tbakes views. run 'bake view help' for more info");
+		$this->out("\n\tbake controller\n\t\tbakes a controller. run 'bake controller help' for more info");
+		$this->out("\n\tbake fixture\n\t\tbakes fixtures. run 'bake fixture help' for more info.");
+		$this->out("\n\tbake test\n\t\tbakes unit tests. run 'bake test help' for more info.");
+		$this->out();
+
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/console.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/console.php
new file mode 100644
index 000000000..ac7b595bb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/console.php
@@ -0,0 +1,361 @@
+<?php
+/**
+ * CakePHP Console Shell
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5012
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class ConsoleShell extends Shell {
+
+/**
+ * Available binding types
+ *
+ * @var array
+ * @access public
+ */
+	var $associations = array('hasOne', 'hasMany', 'belongsTo', 'hasAndBelongsToMany');
+
+/**
+ * Chars that describe invalid commands
+ *
+ * @var array
+ * @access public
+ */
+	var $badCommandChars = array('$', ';');
+
+/**
+ * Available models
+ *
+ * @var array
+ * @access public
+ */
+	var $models = array();
+
+/**
+ * Override intialize of the Shell
+ *
+ * @access public
+ */
+	function initialize() {
+		require_once CAKE . 'dispatcher.php';
+		$this->Dispatcher = new Dispatcher();
+		$this->models = App::objects('model');
+		App::import('Model', $this->models);
+
+		foreach ($this->models as $model) {
+			$class = Inflector::camelize(str_replace('.php', '', $model));
+			$this->models[$model] = $class;
+			$this->{$class} =& new $class();
+		}
+		$this->out('Model classes:');
+		$this->out('--------------');
+
+		foreach ($this->models as $model) {
+			$this->out(" - {$model}");
+		}
+		$this->_loadRoutes();
+	}
+
+/**
+ * Prints the help message
+ *
+ * @access public
+ */
+	function help() {
+		$out  = 'Console help:';
+		$out .= '-------------';
+		$out .= 'The interactive console is a tool for testing parts of your app before you';
+		$out .= 'write code.';
+		$out .= "\n";
+		$out .= 'Model testing:';
+		$out .= 'To test model results, use the name of your model without a leading $';
+		$out .= 'e.g. Foo->find("all")';
+		$out .= "\n";
+		$out .= 'To dynamically set associations, you can do the following:';
+		$out .= "\tModelA bind <association> ModelB";
+		$out .= "where the supported assocations are hasOne, hasMany, belongsTo, hasAndBelongsToMany";
+		$out .= "\n";
+		$out .= 'To dynamically remove associations, you can do the following:';
+		$out .= "\t ModelA unbind <association> ModelB";
+		$out .= "where the supported associations are the same as above";
+		$out .= "\n";
+		$out .= "To save a new field in a model, you can do the following:";
+		$out .= "\tModelA->save(array('foo' => 'bar', 'baz' => 0))";
+		$out .= "where you are passing a hash of data to be saved in the format";
+		$out .= "of field => value pairs";
+		$out .= "\n";
+		$out .= "To get column information for a model, use the following:";
+		$out .= "\tModelA columns";
+		$out .= "which returns a list of columns and their type";
+		$out .= "\n";
+		$out .= "\n";
+		$out .= 'Route testing:';
+		$out .= "\n";
+		$out .= 'To test URLs against your app\'s route configuration, type:';
+		$out .= "\n";
+		$out .= "\tRoute <url>";
+		$out .= "\n";
+		$out .= "where url is the path to your your action plus any query parameters,";
+		$out .= "minus the application's base path.  For example:";
+		$out .= "\n";
+		$out .= "\tRoute /posts/view/1";
+		$out .= "\n";
+		$out .= "will return something like the following:";
+		$out .= "\n";
+		$out .= "\tarray (";
+		$out .= "\t  [...]";
+		$out .= "\t  'controller' => 'posts',";
+		$out .= "\t  'action' => 'view',";
+		$out .= "\t  [...]";
+		$out .= "\t)";
+		$out .= "\n";
+		$out .= 'Alternatively, you can use simple array syntax to test reverse';
+		$out .= 'To reload your routes config (config/routes.php), do the following:';
+		$out .= "\n";
+		$out .= "\tRoutes reload";
+		$out .= "\n";
+		$out .= 'To show all connected routes, do the following:';
+		$out .= "\tRoutes show";
+		$this->out($out);
+	}
+
+/**
+ * Override main() to handle action
+ *
+ * @access public
+ */
+	function main($command = null) {
+		while (true) {
+			if (empty($command)) {
+				$command = trim($this->in(''));
+			}
+
+			switch ($command) {
+				case 'help':
+					$this->help();
+				break;
+				case 'quit':
+				case 'exit':
+					return true;
+				break;
+				case 'models':
+					$this->out('Model classes:');
+					$this->hr();
+					foreach ($this->models as $model) {
+						$this->out(" - {$model}");
+					}
+				break;
+				case (preg_match("/^(\w+) bind (\w+) (\w+)/", $command, $tmp) == true):
+					foreach ($tmp as $data) {
+						$data = strip_tags($data);
+						$data = str_replace($this->badCommandChars, "", $data);
+					}
+
+					$modelA = $tmp[1];
+					$association = $tmp[2];
+					$modelB = $tmp[3];
+
+					if ($this->_isValidModel($modelA) && $this->_isValidModel($modelB) && in_array($association, $this->associations)) {
+						$this->{$modelA}->bindModel(array($association => array($modelB => array('className' => $modelB))), false);
+						$this->out("Created $association association between $modelA and $modelB");
+					} else {
+						$this->out("Please verify you are using valid models and association types");
+					}
+				break;
+				case (preg_match("/^(\w+) unbind (\w+) (\w+)/", $command, $tmp) == true):
+					foreach ($tmp as $data) {
+						$data = strip_tags($data);
+						$data = str_replace($this->badCommandChars, "", $data);
+					}
+
+					$modelA = $tmp[1];
+					$association = $tmp[2];
+					$modelB = $tmp[3];
+
+					// Verify that there is actually an association to unbind
+					$currentAssociations = $this->{$modelA}->getAssociated();
+					$validCurrentAssociation = false;
+
+					foreach ($currentAssociations as $model => $currentAssociation) {
+						if ($model == $modelB && $association == $currentAssociation) {
+							$validCurrentAssociation = true;
+						}
+					}
+
+					if ($this->_isValidModel($modelA) && $this->_isValidModel($modelB) && in_array($association, $this->associations) && $validCurrentAssociation) {
+						$this->{$modelA}->unbindModel(array($association => array($modelB)));
+						$this->out("Removed $association association between $modelA and $modelB");
+					} else {
+						$this->out("Please verify you are using valid models, valid current association, and valid association types");
+					}
+				break;
+				case (strpos($command, "->find") > 0):
+					// Remove any bad info
+					$command = strip_tags($command);
+					$command = str_replace($this->badCommandChars, "", $command);
+
+					// Do we have a valid model?
+					list($modelToCheck, $tmp) = explode('->', $command);
+
+					if ($this->_isValidModel($modelToCheck)) {
+						$findCommand = "\$data = \$this->$command;";
+						@eval($findCommand);
+
+						if (is_array($data)) {
+							foreach ($data as $idx => $results) {
+								if (is_numeric($idx)) { // findAll() output
+									foreach ($results as $modelName => $result) {
+										$this->out("$modelName");
+
+										foreach ($result as $field => $value) {
+											if (is_array($value)) {
+												foreach ($value as $field2 => $value2) {
+													$this->out("\t$field2: $value2");
+												}
+
+												$this->out();
+											} else {
+												$this->out("\t$field: $value");
+											}
+										}
+									}
+								} else { // find() output
+									$this->out($idx);
+
+									foreach ($results as $field => $value) {
+										if (is_array($value)) {
+											foreach ($value as $field2 => $value2) {
+												$this->out("\t$field2: $value2");
+											}
+
+											$this->out();
+										} else {
+											$this->out("\t$field: $value");
+										}
+									}
+								}
+							}
+						} else {
+							$this->out("\nNo result set found");
+						}
+					} else {
+						$this->out("$modelToCheck is not a valid model");
+					}
+
+				break;
+				case (strpos($command, '->save') > 0):
+					// Validate the model we're trying to save here
+					$command = strip_tags($command);
+					$command = str_replace($this->badCommandChars, "", $command);
+					list($modelToSave, $tmp) = explode("->", $command);
+
+					if ($this->_isValidModel($modelToSave)) {
+						// Extract the array of data we are trying to build
+						list($foo, $data) = explode("->save", $command);
+						$data = preg_replace('/^\(*(array)?\(*(.+?)\)*$/i', '\\2', $data);
+						$saveCommand = "\$this->{$modelToSave}->save(array('{$modelToSave}' => array({$data})));";
+						@eval($saveCommand);
+						$this->out('Saved record for ' . $modelToSave);
+					}
+				break;
+				case (preg_match("/^(\w+) columns/", $command, $tmp) == true):
+					$modelToCheck = strip_tags(str_replace($this->badCommandChars, "", $tmp[1]));
+
+					if ($this->_isValidModel($modelToCheck)) {
+						// Get the column info for this model
+						$fieldsCommand = "\$data = \$this->{$modelToCheck}->getColumnTypes();";
+						@eval($fieldsCommand);
+
+						if (is_array($data)) {
+							foreach ($data as $field => $type) {
+								$this->out("\t{$field}: {$type}");
+							}
+						}
+					} else {
+						$this->out("Please verify that you selected a valid model");
+					}
+				break;
+				case (preg_match("/^routes\s+reload/i", $command, $tmp) == true):
+					$router =& Router::getInstance();
+					if (!$this->_loadRoutes()) {
+						$this->out("There was an error loading the routes config.  Please check that the file");
+						$this->out("exists and is free of parse errors.");
+						break;
+					}
+					$this->out("Routes configuration reloaded, " . count($router->routes) . " routes connected");
+				break;
+				case (preg_match("/^routes\s+show/i", $command, $tmp) == true):
+					$router =& Router::getInstance();
+					$this->out(implode("\n", Set::extract($router->routes, '{n}.0')));
+				break;
+				case (preg_match("/^route\s+(\(.*\))$/i", $command, $tmp) == true):
+					if ($url = eval('return array' . $tmp[1] . ';')) {
+						$this->out(Router::url($url));
+					}
+				break;
+				case (preg_match("/^route\s+(.*)/i", $command, $tmp) == true):
+					$this->out(var_export(Router::parse($tmp[1]), true));
+				break;
+				default:
+					$this->out("Invalid command\n");
+				break;
+			}
+			$command = '';
+		}
+	}
+
+/**
+ * Tells if the specified model is included in the list of available models
+ *
+ * @param string $modelToCheck
+ * @return boolean true if is an available model, false otherwise
+ * @access protected
+ */
+	function _isValidModel($modelToCheck) {
+		return in_array($modelToCheck, $this->models);
+	}
+
+/**
+ * Reloads the routes configuration from config/routes.php, and compiles
+ * all routes found
+ *
+ * @return boolean True if config reload was a success, otherwise false
+ * @access protected
+ */
+	function _loadRoutes() {
+		$router =& Router::getInstance();
+
+		$router->reload();
+		extract($router->getNamedExpressions());
+
+		if (!@include(CONFIGS . 'routes.php')) {
+			return false;
+		}
+		$router->parse('/');
+
+		foreach (array_keys($router->getNamedExpressions()) as $var) {
+			unset(${$var});
+		}
+		for ($i = 0, $len = count($router->routes); $i < $len; $i++) {
+			$router->routes[$i]->compile();
+		}
+		return true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/i18n.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/i18n.php
new file mode 100644
index 000000000..bdfa378fb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/i18n.php
@@ -0,0 +1,128 @@
+<?php
+/**
+ * Internationalization Management Shell
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Shell for I18N management.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class I18nShell extends Shell {
+
+/**
+ * Contains database source to use
+ *
+ * @var string
+ * @access public
+ */
+	var $dataSource = 'default';
+
+/**
+ * Contains tasks to load and instantiate
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('DbConfig', 'Extract');
+
+/**
+ * Override startup of the Shell
+ *
+ * @access public
+ */
+	function startup() {
+		$this->_welcome();
+		if (isset($this->params['datasource'])) {
+			$this->dataSource = $this->params['datasource'];
+		}
+
+		if ($this->command && !in_array($this->command, array('help'))) {
+			if (!config('database')) {
+				$this->out(__('Your database configuration was not found. Take a moment to create one.', true), true);
+				return $this->DbConfig->execute();
+			}
+		}
+	}
+
+/**
+ * Override main() for help message hook
+ *
+ * @access public
+ */
+	function main() {
+		$this->out(__('I18n Shell', true));
+		$this->hr();
+		$this->out(__('[E]xtract POT file from sources', true));
+		$this->out(__('[I]nitialize i18n database table', true));
+		$this->out(__('[H]elp', true));
+		$this->out(__('[Q]uit', true));
+
+		$choice = strtolower($this->in(__('What would you like to do?', true), array('E', 'I', 'H', 'Q')));
+		switch ($choice) {
+			case 'e':
+				$this->Extract->execute();
+			break;
+			case 'i':
+				$this->initdb();
+			break;
+			case 'h':
+				$this->help();
+			break;
+			case 'q':
+				exit(0);
+			break;
+			default:
+				$this->out(__('You have made an invalid selection. Please choose a command to execute by entering E, I, H, or Q.', true));
+		}
+		$this->hr();
+		$this->main();
+	}
+
+/**
+ * Initialize I18N database.
+ *
+ * @access public
+ */
+	function initdb() {
+		$this->Dispatch->args = array('schema', 'create', 'i18n');
+		$this->Dispatch->dispatch();
+	}
+
+/**
+ * Show help screen.
+ *
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out(__('I18n Shell:', true));
+		$this->hr();
+		$this->out(__('I18n Shell initializes i18n database table for your application', true));
+		$this->out(__('and generates .pot file(s) with translations.', true));
+		$this->hr();
+		$this->out(__('usage:', true));
+		$this->out('   cake i18n help');
+		$this->out('   cake i18n initdb [-datasource custom]');
+		$this->out();
+		$this->hr();
+
+		$this->Extract->help();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/schema.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/schema.php
new file mode 100644
index 000000000..8a0c9547d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/schema.php
@@ -0,0 +1,512 @@
+<?php
+/**
+ * Command-line database management utility to automate programmer chores.
+ *
+ * Schema is CakePHP's database management utility. This helps you maintain versions of
+ * of your database.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5550
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'File', false);
+App::import('Model', 'CakeSchema', false);
+
+/**
+ * Schema is a command-line database management utility for automating programmer chores.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @link          http://book.cakephp.org/view/1523/Schema-management-and-migrations
+ */
+class SchemaShell extends Shell {
+
+/**
+ * is this a dry run?
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__dry = null;
+
+/**
+ * Override initialize
+ *
+ * @access public
+ */
+	function initialize() {
+		$this->_welcome();
+		$this->out('Cake Schema Shell');
+		$this->hr();
+	}
+
+/**
+ * Override startup
+ *
+ * @access public
+ */
+	function startup() {
+		$name = $file = $path = $connection = $plugin = null;
+		if (!empty($this->params['name'])) {
+			$name = $this->params['name'];
+		} elseif (!empty($this->args[0])) {
+			$name = $this->params['name'] = $this->args[0];
+		}
+
+		if (strpos($name, '.')) {
+			list($this->params['plugin'], $splitName) = pluginSplit($name);
+			$name = $this->params['name'] = $splitName;
+		}
+
+		if ($name) {
+			$this->params['file'] = Inflector::underscore($name);
+		}
+
+		if (empty($this->params['file'])) {
+			$this->params['file'] = 'schema.php';
+		}
+		if (strpos($this->params['file'], '.php') === false) {
+			$this->params['file'] .= '.php';
+		}
+		$file = $this->params['file'];
+
+		if (!empty($this->params['path'])) {
+			$path = $this->params['path'];
+		}
+
+		if (!empty($this->params['connection'])) {
+			$connection = $this->params['connection'];
+		}
+		if (!empty($this->params['plugin'])) {
+			$plugin = $this->params['plugin'];
+			if (empty($name)) {
+				$name = $plugin;
+			}
+		}
+		$this->Schema =& new CakeSchema(compact('name', 'path', 'file', 'connection', 'plugin'));
+	}
+
+/**
+ * Override main
+ *
+ * @access public
+ */
+	function main() {
+		$this->help();
+	}
+
+/**
+ * Read and output contents of schema object
+ * path to read as second arg
+ *
+ * @access public
+ */
+	function view() {
+		$File = new File($this->Schema->path . DS . $this->params['file']);
+		if ($File->exists()) {
+			$this->out($File->read());
+			$this->_stop();
+		} else {
+			$file = $this->Schema->path . DS . $this->params['file'];
+			$this->err(sprintf(__('Schema file (%s) could not be found.', true), $file));
+			$this->_stop();
+		}
+	}
+
+/**
+ * Read database and Write schema object
+ * accepts a connection as first arg or path to save as second arg
+ *
+ * @access public
+ */
+	function generate() {
+		$this->out(__('Generating Schema...', true));
+		$options = array();
+		if (isset($this->params['f'])) {
+			$options = array('models' => false);
+		}
+
+		$snapshot = false;
+		if (isset($this->args[0]) && $this->args[0] === 'snapshot') {
+			$snapshot = true;
+		}
+
+		if (!$snapshot && file_exists($this->Schema->path . DS . $this->params['file'])) {
+			$snapshot = true;
+			$result = strtolower($this->in("Schema file exists.\n [O]verwrite\n [S]napshot\n [Q]uit\nWould you like to do?", array('o', 's', 'q'), 's'));
+			if ($result === 'q') {
+				return $this->_stop();
+			}
+			if ($result === 'o') {
+				$snapshot = false;
+			}
+		}
+
+		$cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', true);
+
+		$content = $this->Schema->read($options);
+		$content['file'] = $this->params['file'];
+		
+		Configure::write('Cache.disable', $cacheDisable);
+
+		if ($snapshot === true) {
+			$Folder =& new Folder($this->Schema->path);
+			$result = $Folder->read();
+
+			$numToUse = false;
+			if (isset($this->params['s'])) {
+				$numToUse = $this->params['s'];
+			}
+
+			$count = 1;
+			if (!empty($result[1])) {
+				foreach ($result[1] as $file) {
+					if (preg_match('/schema(?:[_\d]*)?\.php$/', $file)) {
+						$count++;
+					}
+				}
+			}
+
+			if ($numToUse !== false) {
+				if ($numToUse > $count) {
+					$count = $numToUse;
+				}
+			}
+
+			$fileName = rtrim($this->params['file'], '.php');
+			$content['file'] = $fileName . '_' . $count . '.php';
+		}
+
+		if ($this->Schema->write($content)) {
+			$this->out(sprintf(__('Schema file: %s generated', true), $content['file']));
+			$this->_stop();
+		} else {
+			$this->err(__('Schema file: %s generated', true));
+			$this->_stop();
+		}
+	}
+
+/**
+ * Dump Schema object to sql file
+ * Use the `write` param to enable and control SQL file output location.
+ * Simply using -write will write the sql file to the same dir as the schema file.
+ * If -write contains a full path name the file will be saved there. If -write only
+ * contains no DS, that will be used as the file name, in the same dir as the schema file.
+ *
+ * @access public
+ */
+	function dump() {
+		$write = false;
+		$Schema = $this->Schema->load();
+		if (!$Schema) {
+			$this->err(__('Schema could not be loaded', true));
+			$this->_stop();
+		}
+		if (isset($this->params['write'])) {
+			if ($this->params['write'] == 1) {
+				$write = Inflector::underscore($this->Schema->name);
+			} else {
+				$write = $this->params['write'];
+			}
+		}
+		$db =& ConnectionManager::getDataSource($this->Schema->connection);
+		$contents = "#" . $Schema->name . " sql generated on: " . date('Y-m-d H:i:s') . " : " . time() . "\n\n";
+		$contents .= $db->dropSchema($Schema) . "\n\n". $db->createSchema($Schema);
+
+		if ($write) {
+			if (strpos($write, '.sql') === false) {
+				$write .= '.sql';
+			}
+			if (strpos($write, DS) !== false) {
+				$File =& new File($write, true);
+			} else {
+				$File =& new File($this->Schema->path . DS . $write, true);
+			}
+
+			if ($File->write($contents)) {
+				$this->out(sprintf(__('SQL dump file created in %s', true), $File->pwd()));
+				$this->_stop();
+			} else {
+				$this->err(__('SQL dump could not be created', true));
+				$this->_stop();
+			}
+		}
+		$this->out($contents);
+		return $contents;
+	}
+
+/**
+ * Run database create commands.  Alias for run create.
+ *
+ * @return void
+ */
+	function create() {
+		list($Schema, $table) = $this->_loadSchema();
+		$this->__create($Schema, $table);
+	}
+
+/**
+ * Run database create commands.  Alias for run create.
+ *
+ * @return void
+ */
+	function update() {
+		list($Schema, $table) = $this->_loadSchema();
+		$this->__update($Schema, $table);
+	}
+
+/**
+ * Prepares the Schema objects for database operations.
+ *
+ * @return void
+ */
+	function _loadSchema() {
+		$name = $plugin = null;
+		if (isset($this->params['name'])) {
+			$name = $this->params['name'];
+		}
+		if (isset($this->params['plugin'])) {
+			$plugin = $this->params['plugin'];
+		}
+		
+		if (isset($this->params['dry'])) {
+			$this->__dry = true;
+			$this->out(__('Performing a dry run.', true));
+		}
+
+		$options = array('name' => $name, 'plugin' => $plugin);
+		if (isset($this->params['s'])) {
+			$fileName = rtrim($this->Schema->file, '.php');
+			$options['file'] = $fileName . '_' . $this->params['s'] . '.php';
+		}
+
+		$Schema =& $this->Schema->load($options);
+
+		if (!$Schema) {
+			$this->err(sprintf(__('%s could not be loaded', true), $this->Schema->path . DS . $this->Schema->file));
+			$this->_stop();
+		}
+		$table = null;
+		if (isset($this->args[1])) {
+			$table = $this->args[1];
+		}
+		return array(&$Schema, $table);
+	}
+
+/**
+ * Create database from Schema object
+ * Should be called via the run method
+ *
+ * @access private
+ */
+	function __create(&$Schema, $table = null) {
+		$db =& ConnectionManager::getDataSource($this->Schema->connection);
+
+		$drop = $create = array();
+
+		if (!$table) {
+			foreach ($Schema->tables as $table => $fields) {
+				$drop[$table] = $db->dropSchema($Schema, $table);
+				$create[$table] = $db->createSchema($Schema, $table);
+			}
+		} elseif (isset($Schema->tables[$table])) {
+			$drop[$table] = $db->dropSchema($Schema, $table);
+			$create[$table] = $db->createSchema($Schema, $table);
+		}
+		if (empty($drop) || empty($create)) {
+			$this->out(__('Schema is up to date.', true));
+			$this->_stop();
+		}
+
+		$this->out("\n" . __('The following table(s) will be dropped.', true));
+		$this->out(array_keys($drop));
+
+		if ('y' == $this->in(__('Are you sure you want to drop the table(s)?', true), array('y', 'n'), 'n')) {
+			$this->out(__('Dropping table(s).', true));
+			$this->__run($drop, 'drop', $Schema);
+		}
+
+		$this->out("\n" . __('The following table(s) will be created.', true));
+		$this->out(array_keys($create));
+
+		if ('y' == $this->in(__('Are you sure you want to create the table(s)?', true), array('y', 'n'), 'y')) {
+			$this->out(__('Creating table(s).', true));
+			$this->__run($create, 'create', $Schema);
+		}
+		$this->out(__('End create.', true));
+	}
+
+/**
+ * Update database with Schema object
+ * Should be called via the run method
+ *
+ * @access private
+ */
+	function __update(&$Schema, $table = null) {
+		$db =& ConnectionManager::getDataSource($this->Schema->connection);
+
+		$this->out(__('Comparing Database to Schema...', true));
+		$options = array();
+		if (isset($this->params['f'])) {
+			$options['models'] = false;
+		}
+		$Old = $this->Schema->read($options);
+		$compare = $this->Schema->compare($Old, $Schema);
+
+		$contents = array();
+
+		if (empty($table)) {
+			foreach ($compare as $table => $changes) {
+				$contents[$table] = $db->alterSchema(array($table => $changes), $table);
+			}
+		} elseif (isset($compare[$table])) {
+			$contents[$table] = $db->alterSchema(array($table => $compare[$table]), $table);
+		}
+
+		if (empty($contents)) {
+			$this->out(__('Schema is up to date.', true));
+			$this->_stop();
+		}
+
+		$this->out("\n" . __('The following statements will run.', true));
+		$this->out(array_map('trim', $contents));
+		if ('y' == $this->in(__('Are you sure you want to alter the tables?', true), array('y', 'n'), 'n')) {
+			$this->out();
+			$this->out(__('Updating Database...', true));
+			$this->__run($contents, 'update', $Schema);
+		}
+
+		$this->out(__('End update.', true));
+	}
+
+/**
+ * Runs sql from __create() or __update()
+ *
+ * @access private
+ */
+	function __run($contents, $event, &$Schema) {
+		if (empty($contents)) {
+			$this->err(__('Sql could not be run', true));
+			return;
+		}
+		Configure::write('debug', 2);
+		$db =& ConnectionManager::getDataSource($this->Schema->connection);
+
+		foreach ($contents as $table => $sql) {
+			if (empty($sql)) {
+				$this->out(sprintf(__('%s is up to date.', true), $table));
+			} else {
+				if ($this->__dry === true) {
+					$this->out(sprintf(__('Dry run for %s :', true), $table));
+					$this->out($sql);
+				} else {
+					if (!$Schema->before(array($event => $table))) {
+						return false;
+					}
+					$error = null;
+					if (!$db->execute($sql)) {
+						$error = $table . ': '  . $db->lastError();
+					}
+
+					$Schema->after(array($event => $table, 'errors' => $error));
+
+					if (!empty($error)) {
+						$this->out($error);
+					} else {
+						$this->out(sprintf(__('%s updated.', true), $table));
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * Displays help contents
+ *
+ * @access public
+ */
+	function help() {
+		$help = <<<TEXT
+The Schema Shell generates a schema object from
+the database and updates the database from the schema.
+---------------------------------------------------------------
+Usage: cake schema <command> <arg1> <arg2>...
+---------------------------------------------------------------
+Params:
+	-connection <config>
+		set db config <config>. uses 'default' if none is specified
+
+	-path <dir>
+		path <dir> to read and write schema.php.
+		default path: {$this->Schema->path}
+
+	-name <name>
+		Classname to use. If <name> is Plugin.className, it will
+		set the plugin and name params.
+
+	-file <name>
+		file <name> to read and write.
+		default file: {$this->Schema->file}
+
+	-s <number>
+		snapshot <number> to use for run.
+
+	-dry
+		Perform a dry run on create + update commands.
+		Queries will be output to window instead of executed.
+
+	-f
+		force 'generate' to create a new schema.
+
+	-plugin
+		Indicate the plugin to use.
+
+Commands:
+
+	schema help
+		shows this help message.
+
+	schema view <name>
+		read and output contents of schema file.
+
+	schema generate
+		reads from 'connection' writes to 'path'
+		To force generation of all tables into the schema, use the -f param.
+		Use 'schema generate snapshot <number>' to generate snapshots
+		which you can use with the -s parameter in the other operations.
+
+	schema dump <name>
+		Dump database sql based on schema file to stdout.
+		If you use the `-write` param is used a .sql will be generated.
+		If `-write` is a filename, then that file name will be generate.
+		If `-write` is a full path, the schema will be written there.
+
+	schema create <name> <table>
+		Drop and create tables based on schema file
+		optional <table> argument can be used to create only a single 
+		table in the schema. Pass the -s param with a number to use a snapshot.
+		Use the `-dry` param to preview the changes.
+
+	schema update <name> <table>
+		Alter the tables based on schema file. Optional <table>
+		parameter will only update one table. 
+		To use a snapshot pass the `-s` param with the snapshot number.
+		To preview the changes that will be done use `-dry`.
+		To force update of all tables into the schema, use the -f param.
+TEXT;
+		$this->out($help);
+		$this->_stop();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/shell.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/shell.php
new file mode 100644
index 000000000..529f1c527
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/shell.php
@@ -0,0 +1,647 @@
+<?php
+/**
+ * Base class for Shells
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5012
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Base class for command-line utilities for automating programmer chores.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class Shell extends Object {
+
+/**
+ * An instance of the ShellDispatcher object that loaded this script
+ *
+ * @var ShellDispatcher
+ * @access public
+ */
+	var $Dispatch = null;
+
+/**
+ * If true, the script will ask for permission to perform actions.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $interactive = true;
+
+/**
+ * Holds the DATABASE_CONFIG object for the app. Null if database.php could not be found,
+ * or the app does not exist.
+ *
+ * @var DATABASE_CONFIG
+ * @access public
+ */
+	var $DbConfig = null;
+
+/**
+ * Contains command switches parsed from the command line.
+ *
+ * @var array
+ * @access public
+ */
+	var $params = array();
+
+/**
+ * Contains arguments parsed from the command line.
+ *
+ * @var array
+ * @access public
+ */
+	var $args = array();
+
+/**
+ * The file name of the shell that was invoked.
+ *
+ * @var string
+ * @access public
+ */
+	var $shell = null;
+
+/**
+ * The class name of the shell that was invoked.
+ *
+ * @var string
+ * @access public
+ */
+	var $className = null;
+
+/**
+ * The command called if public methods are available.
+ *
+ * @var string
+ * @access public
+ */
+	var $command = null;
+
+/**
+ * The name of the shell in camelized.
+ *
+ * @var string
+ * @access public
+ */
+	var $name = null;
+
+/**
+ * An alias for the shell
+ *
+ * @var string
+ * @access public
+ */
+	var $alias = null;
+
+/**
+ * Contains tasks to load and instantiate
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array();
+
+/**
+ * Contains the loaded tasks
+ *
+ * @var array
+ * @access public
+ */
+	var $taskNames = array();
+
+/**
+ * Contains models to load and instantiate
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ *  Constructs this Shell instance.
+ *
+ */
+	function __construct(&$dispatch) {
+		$vars = array('params', 'args', 'shell', 'shellCommand' => 'command');
+
+		foreach ($vars as $key => $var) {
+			if (is_string($key)) {
+				$this->{$var} =& $dispatch->{$key};
+			} else {
+				$this->{$var} =& $dispatch->{$var};
+			}
+		}
+
+		if ($this->name == null) {
+			$this->name = get_class($this);
+		}
+
+		if ($this->alias == null) {
+			$this->alias = $this->name;
+		}
+
+		ClassRegistry::addObject($this->name, $this);
+		ClassRegistry::map($this->name, $this->alias);
+
+		if (!PHP5 && isset($this->args[0])) {
+			if (strpos($this->name, strtolower(Inflector::camelize($this->args[0]))) !== false) {
+				$dispatch->shiftArgs();
+			}
+			if (strtolower($this->command) == strtolower(Inflector::variable($this->args[0])) && method_exists($this, $this->command)) {
+				$dispatch->shiftArgs();
+			}
+		}
+
+		$this->Dispatch =& $dispatch;
+	}
+
+/**
+ * Initializes the Shell
+ * acts as constructor for subclasses
+ * allows configuration of tasks prior to shell execution
+ *
+ * @access public
+ */
+	function initialize() {
+		$this->_loadModels();
+	}
+
+/**
+ * Starts up the Shell
+ * allows for checking and configuring prior to command or main execution
+ * can be overriden in subclasses
+ *
+ * @access public
+ */
+	function startup() {
+		$this->_welcome();
+	}
+
+/**
+ * Displays a header for the shell
+ *
+ * @access protected
+ */
+	function _welcome() {
+		$this->Dispatch->clear();
+		$this->out();
+		$this->out('Welcome to CakePHP v' . Configure::version() . ' Console');
+		$this->hr();
+		$this->out('App : '. $this->params['app']);
+		$this->out('Path: '. $this->params['working']);
+		$this->hr();
+	}
+
+/**
+ * Loads database file and constructs DATABASE_CONFIG class
+ * makes $this->DbConfig available to subclasses
+ *
+ * @return bool
+ * @access protected
+ */
+	function _loadDbConfig() {
+		if (config('database') && class_exists('DATABASE_CONFIG')) {
+			$this->DbConfig =& new DATABASE_CONFIG();
+			return true;
+		}
+		$this->err('Database config could not be loaded.');
+		$this->out('Run `bake` to create the database configuration.');
+		return false;
+	}
+
+/**
+ * if var $uses = true
+ * Loads AppModel file and constructs AppModel class
+ * makes $this->AppModel available to subclasses
+ * if var $uses is an array of models will load those models
+ *
+ * @return bool
+ * @access protected
+ */
+	function _loadModels() {
+		if ($this->uses === null || $this->uses === false) {
+			return;
+		}
+
+		if ($this->uses === true && App::import('Model', 'AppModel')) {
+			$this->AppModel =& new AppModel(false, false, false);
+			return true;
+		}
+
+		if ($this->uses !== true && !empty($this->uses)) {
+			$uses = is_array($this->uses) ? $this->uses : array($this->uses);
+
+			$modelClassName = $uses[0];
+			if (strpos($uses[0], '.') !== false) {
+				list($plugin, $modelClassName) = explode('.', $uses[0]);
+			}
+			$this->modelClass = $modelClassName;
+
+			foreach ($uses as $modelClass) {
+				list($plugin, $modelClass) = pluginSplit($modelClass, true);
+				if (PHP5) {
+					$this->{$modelClass} = ClassRegistry::init($plugin . $modelClass);
+				} else {
+					$this->{$modelClass} =& ClassRegistry::init($plugin . $modelClass);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Loads tasks defined in var $tasks
+ *
+ * @return bool
+ * @access public
+ */
+	function loadTasks() {
+		if ($this->tasks === null || $this->tasks === false || $this->tasks === true || empty($this->tasks)) {
+			return true;
+		}
+
+		$tasks = $this->tasks;
+		if (!is_array($tasks)) {
+			$tasks = array($tasks);
+		}
+
+		foreach ($tasks as $taskName) {
+			$task = Inflector::underscore($taskName);
+			$taskClass = Inflector::camelize($taskName . 'Task');
+
+			if (!class_exists($taskClass)) {
+				foreach ($this->Dispatch->shellPaths as $path) {
+					$taskPath = $path . 'tasks' . DS . $task . '.php';
+					if (file_exists($taskPath)) {
+						require_once $taskPath;
+						break;
+					}
+				}
+			}
+			$taskClassCheck = $taskClass;
+			if (!PHP5) {
+				$taskClassCheck = strtolower($taskClass);
+			}
+			if (ClassRegistry::isKeySet($taskClassCheck)) {
+				$this->taskNames[] = $taskName;
+				if (!PHP5) {
+					$this->{$taskName} =& ClassRegistry::getObject($taskClassCheck);
+				} else {
+					$this->{$taskName} = ClassRegistry::getObject($taskClassCheck);
+				}
+			} else {
+				$this->taskNames[] = $taskName;
+				if (!PHP5) {
+					$this->{$taskName} =& new $taskClass($this->Dispatch);
+				} else {
+					$this->{$taskName} = new $taskClass($this->Dispatch);
+				}
+			}
+
+			if (!isset($this->{$taskName})) {
+				$this->err("Task `{$taskName}` could not be loaded");
+				$this->_stop();
+			}
+		}
+
+		return true;
+	}
+
+/**
+ * Prompts the user for input, and returns it.
+ *
+ * @param string $prompt Prompt text.
+ * @param mixed $options Array or string of options.
+ * @param string $default Default input value.
+ * @return Either the default value, or the user-provided input.
+ * @access public
+ */
+	function in($prompt, $options = null, $default = null) {
+		if (!$this->interactive) {
+			return $default;
+		}
+		$in = $this->Dispatch->getInput($prompt, $options, $default);
+
+		if ($options && is_string($options)) {
+			if (strpos($options, ',')) {
+				$options = explode(',', $options);
+			} elseif (strpos($options, '/')) {
+				$options = explode('/', $options);
+			} else {
+				$options = array($options);
+			}
+		}
+		if (is_array($options)) {
+			while ($in == '' || ($in && (!in_array(strtolower($in), $options) && !in_array(strtoupper($in), $options)) && !in_array($in, $options))) {
+				$in = $this->Dispatch->getInput($prompt, $options, $default);
+			}
+		}
+		if ($in) {
+			return $in;
+		}
+	}
+
+/**
+ * Outputs a single or multiple messages to stdout. If no parameters
+ * are passed outputs just a newline.
+ *
+ * @param mixed $message A string or a an array of strings to output
+ * @param integer $newlines Number of newlines to append
+ * @return integer Returns the number of bytes returned from writing to stdout.
+ * @access public
+ */
+	function out($message = null, $newlines = 1) {
+		if (is_array($message)) {
+			$message = implode($this->nl(), $message);
+		}
+		return $this->Dispatch->stdout($message . $this->nl($newlines), false);
+	}
+
+/**
+ * Outputs a single or multiple error messages to stderr. If no parameters
+ * are passed outputs just a newline.
+ *
+ * @param mixed $message A string or a an array of strings to output
+ * @param integer $newlines Number of newlines to append
+ * @access public
+ */
+	function err($message = null, $newlines = 1) {
+		if (is_array($message)) {
+			$message = implode($this->nl(), $message);
+		}
+		$this->Dispatch->stderr($message . $this->nl($newlines));
+	}
+
+/**
+ * Returns a single or multiple linefeeds sequences.
+ *
+ * @param integer $multiplier Number of times the linefeed sequence should be repeated
+ * @access public
+ * @return string
+ */
+	function nl($multiplier = 1) {
+		return str_repeat("\n", $multiplier);
+	}
+
+/**
+ * Outputs a series of minus characters to the standard output, acts as a visual separator.
+ *
+ * @param integer $newlines Number of newlines to pre- and append
+ * @access public
+ */
+	function hr($newlines = 0) {
+		$this->out(null, $newlines);
+		$this->out('---------------------------------------------------------------');
+		$this->out(null, $newlines);
+	}
+
+/**
+ * Displays a formatted error message
+ * and exits the application with status code 1
+ *
+ * @param string $title Title of the error
+ * @param string $message An optional error message
+ * @access public
+ */
+	function error($title, $message = null) {
+		$this->err(sprintf(__('Error: %s', true), $title));
+
+		if (!empty($message)) {
+			$this->err($message);
+		}
+		$this->_stop(1);
+	}
+
+/**
+ * Will check the number args matches otherwise throw an error
+ *
+ * @param integer $expectedNum Expected number of paramters
+ * @param string $command Command
+ * @access protected
+ */
+	function _checkArgs($expectedNum, $command = null) {
+		if (!$command) {
+			$command = $this->command;
+		}
+		if (count($this->args) < $expectedNum) {
+			$message[] = "Got: " . count($this->args);
+			$message[] = "Expected: {$expectedNum}";
+			$message[] = "Please type `cake {$this->shell} help` for help";
+			$message[] = "on usage of the {$this->name} {$command}.";
+			$this->error('Wrong number of parameters', $message);
+		}
+	}
+
+/**
+ * Creates a file at given path
+ *
+ * @param string $path Where to put the file.
+ * @param string $contents Content to put in the file.
+ * @return boolean Success
+ * @access public
+ */
+	function createFile($path, $contents) {
+		$path = str_replace(DS . DS, DS, $path);
+
+		$this->out();
+		$this->out(sprintf(__("Creating file %s", true), $path));
+
+		if (is_file($path) && $this->interactive === true) {
+			$prompt = sprintf(__('File `%s` exists, overwrite?', true), $path);
+			$key = $this->in($prompt,  array('y', 'n', 'q'), 'n');
+
+			if (strtolower($key) == 'q') {
+				$this->out(__('Quitting.', true), 2);
+				$this->_stop();
+			} elseif (strtolower($key) != 'y') {
+				$this->out(sprintf(__('Skip `%s`', true), $path), 2);
+				return false;
+			}
+		}
+		if (!class_exists('File')) {
+			require LIBS . 'file.php';
+		}
+
+		if ($File = new File($path, true)) {
+			$data = $File->prepare($contents);
+			$File->write($data);
+			$this->out(sprintf(__('Wrote `%s`', true), $path));
+			return true;
+		} else {
+			$this->err(sprintf(__('Could not write to `%s`.', true), $path), 2);
+			return false;
+		}
+	}
+
+/**
+ * Outputs usage text on the standard output. Implement it in subclasses.
+ *
+ * @access public
+ */
+	function help() {
+		if ($this->command != null) {
+			$this->err("Unknown {$this->name} command `{$this->command}`.");
+			$this->err("For usage, try `cake {$this->shell} help`.", 2);
+		} else {
+			$this->Dispatch->help();
+		}
+	}
+
+/**
+ * Action to create a Unit Test
+ *
+ * @return boolean Success
+ * @access protected
+ */
+	function _checkUnitTest() {
+		if (App::import('vendor', 'simpletest' . DS . 'simpletest')) {
+			return true;
+		}
+		$prompt = 'SimpleTest is not installed. Do you want to bake unit test files anyway?';
+		$unitTest = $this->in($prompt, array('y','n'), 'y');
+		$result = strtolower($unitTest) == 'y' || strtolower($unitTest) == 'yes';
+
+		if ($result) {
+			$this->out();
+			$this->out('You can download SimpleTest from http://simpletest.org');
+		}
+		return $result;
+	}
+
+/**
+ * Makes absolute file path easier to read
+ *
+ * @param string $file Absolute file path
+ * @return sting short path
+ * @access public
+ */
+	function shortPath($file) {
+		$shortPath = str_replace(ROOT, null, $file);
+		$shortPath = str_replace('..' . DS, '', $shortPath);
+		return str_replace(DS . DS, DS, $shortPath);
+	}
+
+/**
+ * Creates the proper controller path for the specified controller class name
+ *
+ * @param string $name Controller class name
+ * @return string Path to controller
+ * @access protected
+ */
+	function _controllerPath($name) {
+		return strtolower(Inflector::underscore($name));
+	}
+
+/**
+ * Creates the proper controller plural name for the specified controller class name
+ *
+ * @param string $name Controller class name
+ * @return string Controller plural name
+ * @access protected
+ */
+	function _controllerName($name) {
+		return Inflector::pluralize(Inflector::camelize($name));
+	}
+
+/**
+ * Creates the proper controller camelized name (singularized) for the specified name
+ *
+ * @param string $name Name
+ * @return string Camelized and singularized controller name
+ * @access protected
+ */
+	function _modelName($name) {
+		return Inflector::camelize(Inflector::singularize($name));
+	}
+
+/**
+ * Creates the proper underscored model key for associations
+ *
+ * @param string $name Model class name
+ * @return string Singular model key
+ * @access protected
+ */
+	function _modelKey($name) {
+		return Inflector::underscore($name) . '_id';
+	}
+
+/**
+ * Creates the proper model name from a foreign key
+ *
+ * @param string $key Foreign key
+ * @return string Model name
+ * @access protected
+ */
+	function _modelNameFromKey($key) {
+		return Inflector::camelize(str_replace('_id', '', $key));
+	}
+
+/**
+ * creates the singular name for use in views.
+ *
+ * @param string $name
+ * @return string $name
+ * @access protected
+ */
+	function _singularName($name) {
+		return Inflector::variable(Inflector::singularize($name));
+	}
+
+/**
+ * Creates the plural name for views
+ *
+ * @param string $name Name to use
+ * @return string Plural name for views
+ * @access protected
+ */
+	function _pluralName($name) {
+		return Inflector::variable(Inflector::pluralize($name));
+	}
+
+/**
+ * Creates the singular human name used in views
+ *
+ * @param string $name Controller name
+ * @return string Singular human name
+ * @access protected
+ */
+	function _singularHumanName($name) {
+		return Inflector::humanize(Inflector::underscore(Inflector::singularize($name)));
+	}
+
+/**
+ * Creates the plural human name used in views
+ *
+ * @param string $name Controller name
+ * @return string Plural human name
+ * @access protected
+ */
+	function _pluralHumanName($name) {
+		return Inflector::humanize(Inflector::underscore($name));
+	}
+
+/**
+ * Find the correct path for a plugin. Scans $pluginPaths for the plugin you want.
+ *
+ * @param string $pluginName Name of the plugin you want ie. DebugKit
+ * @return string $path path to the correct plugin.
+ */
+	function _pluginPath($pluginName) {
+		return App::pluginPath($pluginName);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/bake.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/bake.php
new file mode 100644
index 000000000..8394bb531
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/bake.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Base class for Bake Tasks.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class BakeTask extends Shell {
+
+/**
+ * Name of plugin
+ *
+ * @var string
+ * @access public
+ */
+	var $plugin = null;
+
+/**
+ * The db connection being used for baking
+ *
+ * @var string
+ * @access public
+ */
+	var $connection = null;
+
+/**
+ * Flag for interactive mode
+ *
+ * @var boolean
+ */
+	var $interactive = false;
+
+/**
+ * Gets the path for output.  Checks the plugin property
+ * and returns the correct path.
+ *
+ * @return string Path to output.
+ * @access public
+ */
+	function getPath() {
+		$path = $this->path;
+		if (isset($this->plugin)) {
+			$name = substr($this->name, 0, strlen($this->name) - 4);
+			$path = $this->_pluginPath($this->plugin) . Inflector::pluralize(Inflector::underscore($name)) . DS;
+		}
+		return $path;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/controller.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/controller.php
new file mode 100644
index 000000000..8ef10042b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/controller.php
@@ -0,0 +1,486 @@
+<?php
+/**
+ * The ControllerTask handles creating and updating controller files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+include_once dirname(__FILE__) . DS . 'bake.php';
+
+/**
+ * Task class for creating and updating controller files.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class ControllerTask extends BakeTask {
+
+/**
+ * Tasks to be loaded by this Task
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('Model', 'Test', 'Template', 'DbConfig', 'Project');
+
+/**
+ * path to CONTROLLERS directory
+ *
+ * @var array
+ * @access public
+ */
+	var $path = CONTROLLERS;
+
+/**
+ * Override initialize
+ *
+ * @access public
+ */
+	function initialize() {
+	}
+
+/**
+ * Execution method always used for tasks
+ *
+ * @access public
+ */
+	function execute() {
+		if (empty($this->args)) {
+			return $this->__interactive();
+		}
+
+		if (isset($this->args[0])) {
+			if (!isset($this->connection)) {
+				$this->connection = 'default';
+			}
+			if (strtolower($this->args[0]) == 'all') {
+				return $this->all();
+			}
+
+			$controller = $this->_controllerName($this->args[0]);
+			$actions = 'scaffold';
+
+			if (!empty($this->args[1]) && ($this->args[1] == 'public' || $this->args[1] == 'scaffold')) {
+				$this->out(__('Baking basic crud methods for ', true) . $controller);
+				$actions = $this->bakeActions($controller);
+			} elseif (!empty($this->args[1]) && $this->args[1] == 'admin') {
+				$admin = $this->Project->getPrefix();
+				if ($admin) {
+					$this->out(sprintf(__('Adding %s methods', true), $admin));
+					$actions = $this->bakeActions($controller, $admin);
+				}
+			}
+
+			if (!empty($this->args[2]) && $this->args[2] == 'admin') {
+				$admin = $this->Project->getPrefix();
+				if ($admin) {
+					$this->out(sprintf(__('Adding %s methods', true), $admin));
+					$actions .= "\n" . $this->bakeActions($controller, $admin);
+				}
+			}
+
+			if ($this->bake($controller, $actions)) {
+				if ($this->_checkUnitTest()) {
+					$this->bakeTest($controller);
+				}
+			}
+		}
+	}
+
+/**
+ * Bake All the controllers at once.  Will only bake controllers for models that exist.
+ *
+ * @access public
+ * @return void
+ */
+	function all() {
+		$this->interactive = false;
+		$this->listAll($this->connection, false);
+		ClassRegistry::config('Model', array('ds' => $this->connection));
+		$unitTestExists = $this->_checkUnitTest();
+		foreach ($this->__tables as $table) {
+			$model = $this->_modelName($table);
+			$controller = $this->_controllerName($model);
+			if (App::import('Model', $model)) {
+				$actions = $this->bakeActions($controller);
+				if ($this->bake($controller, $actions) && $unitTestExists) {
+					$this->bakeTest($controller);
+				}
+			}
+		}
+	}
+
+/**
+ * Interactive
+ *
+ * @access private
+ */
+	function __interactive() {
+		$this->interactive = true;
+		$this->hr();
+		$this->out(sprintf(__("Bake Controller\nPath: %s", true), $this->path));
+		$this->hr();
+
+		if (empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+
+		$controllerName = $this->getName();
+		$this->hr();
+		$this->out(sprintf(__('Baking %sController', true), $controllerName));
+		$this->hr();
+
+		$helpers = $components = array();
+		$actions = '';
+		$wannaUseSession = 'y';
+		$wannaBakeAdminCrud = 'n';
+		$useDynamicScaffold = 'n';
+		$wannaBakeCrud = 'y';
+
+		$controllerFile = strtolower(Inflector::underscore($controllerName));
+
+		$question[] = __("Would you like to build your controller interactively?", true);
+		if (file_exists($this->path . $controllerFile .'_controller.php')) {
+			$question[] = sprintf(__("Warning: Choosing no will overwrite the %sController.", true), $controllerName);
+		}
+		$doItInteractive = $this->in(implode("\n", $question), array('y','n'), 'y');
+
+		if (strtolower($doItInteractive) == 'y') {
+			$this->interactive = true;
+			$useDynamicScaffold = $this->in(
+				__("Would you like to use dynamic scaffolding?", true), array('y','n'), 'n'
+			);
+
+			if (strtolower($useDynamicScaffold) == 'y') {
+				$wannaBakeCrud = 'n';
+				$actions = 'scaffold';
+			} else {
+				list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
+
+				$helpers = $this->doHelpers();
+				$components = $this->doComponents();
+
+				$wannaUseSession = $this->in(
+					__("Would you like to use Session flash messages?", true), array('y','n'), 'y'
+				);
+			}
+		} else {
+			list($wannaBakeCrud, $wannaBakeAdminCrud) = $this->_askAboutMethods();
+		}
+
+		if (strtolower($wannaBakeCrud) == 'y') {
+			$actions = $this->bakeActions($controllerName, null, strtolower($wannaUseSession) == 'y');
+		}
+		if (strtolower($wannaBakeAdminCrud) == 'y') {
+			$admin = $this->Project->getPrefix();
+			$actions .= $this->bakeActions($controllerName, $admin, strtolower($wannaUseSession) == 'y');
+		}
+
+		$baked = false;
+		if ($this->interactive === true) {
+			$this->confirmController($controllerName, $useDynamicScaffold, $helpers, $components);
+			$looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y');
+
+			if (strtolower($looksGood) == 'y') {
+				$baked = $this->bake($controllerName, $actions, $helpers, $components);
+				if ($baked && $this->_checkUnitTest()) {
+					$this->bakeTest($controllerName);
+				}
+			}
+		} else {
+			$baked = $this->bake($controllerName, $actions, $helpers, $components);
+			if ($baked && $this->_checkUnitTest()) {
+				$this->bakeTest($controllerName);
+			}
+		}
+		return $baked;
+	}
+
+/**
+ * Confirm a to be baked controller with the user
+ *
+ * @return void
+ */
+	function confirmController($controllerName, $useDynamicScaffold, $helpers, $components) {
+		$this->out();
+		$this->hr();
+		$this->out(__('The following controller will be created:', true));
+		$this->hr();
+		$this->out(sprintf(__("Controller Name:\n\t%s", true), $controllerName));
+
+		if (strtolower($useDynamicScaffold) == 'y') {
+			$this->out("var \$scaffold;");
+		}
+
+		$properties = array(
+			'helpers' => __("Helpers:", true),
+			'components' => __('Components:', true),
+		);
+
+		foreach ($properties as $var => $title) {
+			if (count($$var)) {
+				$output = '';
+				$length = count($$var);
+				foreach ($$var as $i => $propElement) {
+					if ($i != $length -1) {
+						$output .= ucfirst($propElement) . ', ';
+					} else {
+						$output .= ucfirst($propElement);
+					}
+				}
+				$this->out($title . "\n\t" . $output);
+			}
+		}
+		$this->hr();
+	}
+
+/**
+ * Interact with the user and ask about which methods (admin or regular they want to bake)
+ *
+ * @return array Array containing (bakeRegular, bakeAdmin) answers
+ */
+	function _askAboutMethods() {
+		$wannaBakeCrud = $this->in(
+			__("Would you like to create some basic class methods \n(index(), add(), view(), edit())?", true),
+			array('y','n'), 'n'
+		);
+		$wannaBakeAdminCrud = $this->in(
+			__("Would you like to create the basic class methods for admin routing?", true),
+			array('y','n'), 'n'
+		);
+		return array($wannaBakeCrud, $wannaBakeAdminCrud);
+	}
+
+/**
+ * Bake scaffold actions
+ *
+ * @param string $controllerName Controller name
+ * @param string $admin Admin route to use
+ * @param boolean $wannaUseSession Set to true to use sessions, false otherwise
+ * @return string Baked actions
+ * @access private
+ */
+	function bakeActions($controllerName, $admin = null, $wannaUseSession = true) {
+		$currentModelName = $modelImport = $this->_modelName($controllerName);
+		$plugin = $this->plugin;
+		if ($plugin) {
+			$modelImport = $plugin . '.' . $modelImport;
+		}
+		if (!App::import('Model', $modelImport)) {
+			$this->err(__('You must have a model for this class to build basic methods. Please try again.', true));
+			$this->_stop();
+		}
+
+		$modelObj =& ClassRegistry::init($currentModelName);
+		$controllerPath = $this->_controllerPath($controllerName);
+		$pluralName = $this->_pluralName($currentModelName);
+		$singularName = Inflector::variable($currentModelName);
+		$singularHumanName = $this->_singularHumanName($controllerName);
+		$pluralHumanName = $this->_pluralName($controllerName);
+
+		$this->Template->set(compact('plugin', 'admin', 'controllerPath', 'pluralName', 'singularName', 'singularHumanName',
+			'pluralHumanName', 'modelObj', 'wannaUseSession', 'currentModelName'));
+		$actions = $this->Template->generate('actions', 'controller_actions');
+		return $actions;
+	}
+
+/**
+ * Assembles and writes a Controller file
+ *
+ * @param string $controllerName Controller name
+ * @param string $actions Actions to add, or set the whole controller to use $scaffold (set $actions to 'scaffold')
+ * @param array $helpers Helpers to use in controller
+ * @param array $components Components to use in controller
+ * @param array $uses Models to use in controller
+ * @return string Baked controller
+ * @access private
+ */
+	function bake($controllerName, $actions = '', $helpers = null, $components = null) {
+		$isScaffold = ($actions === 'scaffold') ? true : false;
+
+		$this->Template->set('plugin', Inflector::camelize($this->plugin));
+		$this->Template->set(compact('controllerName', 'actions', 'helpers', 'components', 'isScaffold'));
+		$contents = $this->Template->generate('classes', 'controller');
+
+		$path = $this->getPath();
+		$filename = $path . $this->_controllerPath($controllerName) . '_controller.php';
+		if ($this->createFile($filename, $contents)) {
+			return $contents;
+		}
+		return false;
+	}
+
+/**
+ * Assembles and writes a unit test file
+ *
+ * @param string $className Controller class name
+ * @return string Baked test
+ * @access private
+ */
+	function bakeTest($className) {
+		$this->Test->plugin = $this->plugin;
+		$this->Test->connection = $this->connection;
+		$this->Test->interactive = $this->interactive;
+		return $this->Test->bake('Controller', $className);
+	}
+
+/**
+ * Interact with the user and get a list of additional helpers
+ *
+ * @return array Helpers that the user wants to use.
+ */
+	function doHelpers() {
+		return $this->_doPropertyChoices(
+			__("Would you like this controller to use other helpers\nbesides HtmlHelper and FormHelper?", true),
+			__("Please provide a comma separated list of the other\nhelper names you'd like to use.\nExample: 'Ajax, Javascript, Time'", true)
+		);
+	}
+
+/**
+ * Interact with the user and get a list of additional components
+ *
+ * @return array Components the user wants to use.
+ */
+	function doComponents() {
+		return $this->_doPropertyChoices(
+			__("Would you like this controller to use any components?", true),
+			__("Please provide a comma separated list of the component names you'd like to use.\nExample: 'Acl, Security, RequestHandler'", true)
+		);
+	}
+
+/**
+ * Common code for property choice handling.
+ *
+ * @param string $prompt A yes/no question to precede the list
+ * @param sting $example A question for a comma separated list, with examples.
+ * @return array Array of values for property.
+ */
+	function _doPropertyChoices($prompt, $example) {
+		$proceed = $this->in($prompt, array('y','n'), 'n');
+		$property = array();
+		if (strtolower($proceed) == 'y') {
+			$propertyList = $this->in($example);
+			$propertyListTrimmed = str_replace(' ', '', $propertyList);
+			$property = explode(',', $propertyListTrimmed);
+		}
+		return array_filter($property);
+	}
+
+/**
+ * Outputs and gets the list of possible controllers from database
+ *
+ * @param string $useDbConfig Database configuration name
+ * @param boolean $interactive Whether you are using listAll interactively and want options output.
+ * @return array Set of controllers
+ * @access public
+ */
+	function listAll($useDbConfig = null) {
+		if (is_null($useDbConfig)) {
+			$useDbConfig = $this->connection;
+		}
+		$this->__tables = $this->Model->getAllTables($useDbConfig);
+
+		if ($this->interactive == true) {
+			$this->out(__('Possible Controllers based on your current database:', true));
+			$this->_controllerNames = array();
+			$count = count($this->__tables);
+			for ($i = 0; $i < $count; $i++) {
+				$this->_controllerNames[] = $this->_controllerName($this->_modelName($this->__tables[$i]));
+				$this->out($i + 1 . ". " . $this->_controllerNames[$i]);
+			}
+			return $this->_controllerNames;
+		}
+		return $this->__tables;
+	}
+
+/**
+ * Forces the user to specify the controller he wants to bake, and returns the selected controller name.
+ *
+ * @param string $useDbConfig Connection name to get a controller name for.
+ * @return string Controller name
+ * @access public
+ */
+	function getName($useDbConfig = null) {
+		$controllers = $this->listAll($useDbConfig);
+		$enteredController = '';
+
+		while ($enteredController == '') {
+			$enteredController = $this->in(__("Enter a number from the list above,\ntype in the name of another controller, or 'q' to exit", true), null, 'q');
+
+			if ($enteredController === 'q') {
+				$this->out(__("Exit", true));
+				$this->_stop();
+			}
+
+			if ($enteredController == '' || intval($enteredController) > count($controllers)) {
+				$this->err(__("The Controller name you supplied was empty,\nor the number you selected was not an option. Please try again.", true));
+				$enteredController = '';
+			}
+		}
+
+		if (intval($enteredController) > 0 && intval($enteredController) <= count($controllers) ) {
+			$controllerName = $controllers[intval($enteredController) - 1];
+		} else {
+			$controllerName = Inflector::camelize($enteredController);
+		}
+		return $controllerName;
+	}
+
+/**
+ * Displays help contents
+ *
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake controller <arg1> <arg2>...");
+		$this->hr();
+		$this->out('Arguments:');
+		$this->out();
+		$this->out("<name>");
+		$this->out("\tName of the controller to bake. Can use Plugin.name");
+		$this->out("\tas a shortcut for plugin baking.");
+		$this->out();
+		$this->out('Params:');
+		$this->out();
+		$this->out('-connection <config>');
+		$this->out("\tset db config <config>. uses 'default' if none is specified");
+		$this->out();
+		$this->out('Commands:');
+		$this->out();
+		$this->out("controller <name>");
+		$this->out("\tbakes controller with var \$scaffold");
+		$this->out();
+		$this->out("controller <name> public");
+		$this->out("\tbakes controller with basic crud actions");
+		$this->out("\t(index, view, add, edit, delete)");
+		$this->out();
+		$this->out("controller <name> admin");
+		$this->out("\tbakes a controller with basic crud actions for one of the");
+		$this->out("\tConfigure::read('Routing.prefixes') methods.");
+		$this->out();
+		$this->out("controller <name> public admin");
+		$this->out("\tbakes a controller with basic crud actions for one");
+		$this->out("\tConfigure::read('Routing.prefixes') and non admin methods.");
+		$this->out("\t(index, view, add, edit, delete,");
+		$this->out("\tadmin_index, admin_view, admin_edit, admin_add, admin_delete)");
+		$this->out();
+		$this->out("controller all");
+		$this->out("\tbakes all controllers with CRUD methods.");
+		$this->out();
+		$this->_stop();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/db_config.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/db_config.php
new file mode 100644
index 000000000..df86d19f2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/db_config.php
@@ -0,0 +1,368 @@
+<?php
+/**
+ * The DbConfig Task handles creating and updating the database.php
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Task class for creating and updating the database configuration file.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class DbConfigTask extends Shell {
+
+/**
+ * path to CONFIG directory
+ *
+ * @var string
+ * @access public
+ */
+	var $path = null;
+
+/**
+ * Default configuration settings to use
+ *
+ * @var array
+ * @access private
+ */
+	var $__defaultConfig = array(
+		'name' => 'default', 'driver'=> 'mysql', 'persistent'=> 'false', 'host'=> 'localhost',
+		'login'=> 'root', 'password'=> 'password', 'database'=> 'project_name',
+		'schema'=> null, 'prefix'=> null, 'encoding' => null, 'port' => null
+	);
+
+/**
+ * String name of the database config class name.
+ * Used for testing.
+ *
+ * @var string
+ */
+	var $databaseClassName = 'DATABASE_CONFIG';
+
+/**
+ * initialization callback
+ *
+ * @var string
+ * @access public
+ */
+	function initialize() {
+		$this->path = $this->params['working'] . DS . 'config' . DS;
+	}
+
+/**
+ * Execution method always used for tasks
+ *
+ * @access public
+ */
+	function execute() {
+		if (empty($this->args)) {
+			$this->__interactive();
+			$this->_stop();
+		}
+	}
+
+/**
+ * Interactive interface
+ *
+ * @access private
+ */
+	function __interactive() {
+		$this->hr();
+		$this->out('Database Configuration:');
+		$this->hr();
+		$done = false;
+		$dbConfigs = array();
+
+		while ($done == false) {
+			$name = '';
+
+			while ($name == '') {
+				$name = $this->in("Name:", null, 'default');
+				if (preg_match('/[^a-z0-9_]/i', $name)) {
+					$name = '';
+					$this->out('The name may only contain unaccented latin characters, numbers or underscores');
+				} else if (preg_match('/^[^a-z_]/i', $name)) {
+					$name = '';
+					$this->out('The name must start with an unaccented latin character or an underscore');
+				}
+			}
+
+			$driver = $this->in('Driver:', array('db2', 'firebird', 'mssql', 'mysql', 'mysqli', 'odbc', 'oracle', 'postgres', 'sqlite', 'sybase'), 'mysql');
+
+			$persistent = $this->in('Persistent Connection?', array('y', 'n'), 'n');
+			if (strtolower($persistent) == 'n') {
+				$persistent = 'false';
+			} else {
+				$persistent = 'true';
+			}
+
+			$host = '';
+			while ($host == '') {
+				$host = $this->in('Database Host:', null, 'localhost');
+			}
+
+			$port = '';
+			while ($port == '') {
+				$port = $this->in('Port?', null, 'n');
+			}
+
+			if (strtolower($port) == 'n') {
+				$port = null;
+			}
+
+			$login = '';
+			while ($login == '') {
+				$login = $this->in('User:', null, 'root');
+			}
+			$password = '';
+			$blankPassword = false;
+
+			while ($password == '' && $blankPassword == false) {
+				$password = $this->in('Password:');
+
+				if ($password == '') {
+					$blank = $this->in('The password you supplied was empty. Use an empty password?', array('y', 'n'), 'n');
+					if ($blank == 'y') {
+						$blankPassword = true;
+					}
+				}
+			}
+
+			$database = '';
+			while ($database == '') {
+				$database = $this->in('Database Name:', null, 'cake');
+			}
+
+			$prefix = '';
+			while ($prefix == '') {
+				$prefix = $this->in('Table Prefix?', null, 'n');
+			}
+			if (strtolower($prefix) == 'n') {
+				$prefix = null;
+			}
+
+			$encoding = '';
+			while ($encoding == '') {
+				$encoding = $this->in('Table encoding?', null, 'n');
+			}
+			if (strtolower($encoding) == 'n') {
+				$encoding = null;
+			}
+
+			$schema = '';
+			if ($driver == 'postgres') {
+				while ($schema == '') {
+					$schema = $this->in('Table schema?', null, 'n');
+				}
+			}
+			if (strtolower($schema) == 'n') {
+				$schema = null;
+			}
+
+			$config = compact('name', 'driver', 'persistent', 'host', 'login', 'password', 'database', 'prefix', 'encoding', 'port', 'schema');
+
+			while ($this->__verify($config) == false) {
+				$this->__interactive();
+			}
+			$dbConfigs[] = $config;
+			$doneYet = $this->in('Do you wish to add another database configuration?', null, 'n');
+
+			if (strtolower($doneYet == 'n')) {
+				$done = true;
+			}
+		}
+
+		$this->bake($dbConfigs);
+		config('database');
+		return true;
+	}
+
+/**
+ * Output verification message and bake if it looks good
+ *
+ * @return boolean True if user says it looks good, false otherwise
+ * @access private
+ */
+	function __verify($config) {
+		$config = array_merge($this->__defaultConfig, $config);
+		extract($config);
+		$this->out();
+		$this->hr();
+		$this->out('The following database configuration will be created:');
+		$this->hr();
+		$this->out("Name:         $name");
+		$this->out("Driver:       $driver");
+		$this->out("Persistent:   $persistent");
+		$this->out("Host:         $host");
+
+		if ($port) {
+			$this->out("Port:         $port");
+		}
+
+		$this->out("User:         $login");
+		$this->out("Pass:         " . str_repeat('*', strlen($password)));
+		$this->out("Database:     $database");
+
+		if ($prefix) {
+			$this->out("Table prefix: $prefix");
+		}
+
+		if ($schema) {
+			$this->out("Schema:       $schema");
+		}
+
+		if ($encoding) {
+			$this->out("Encoding:     $encoding");
+		}
+
+		$this->hr();
+		$looksGood = $this->in('Look okay?', array('y', 'n'), 'y');
+
+		if (strtolower($looksGood) == 'y') {
+			return $config;
+		}
+		return false;
+	}
+
+/**
+ * Assembles and writes database.php
+ *
+ * @param array $configs Configuration settings to use
+ * @return boolean Success
+ * @access public
+ */
+	function bake($configs) {
+		if (!is_dir($this->path)) {
+			$this->err($this->path . ' not found');
+			return false;
+		}
+
+		$filename = $this->path . 'database.php';
+		$oldConfigs = array();
+
+		if (file_exists($filename)) {
+			config('database');
+			$db = new $this->databaseClassName;
+			$temp = get_class_vars(get_class($db));
+
+			foreach ($temp as $configName => $info) {
+				$info = array_merge($this->__defaultConfig, $info);
+
+				if (!isset($info['schema'])) {
+					$info['schema'] = null;
+				}
+				if (!isset($info['encoding'])) {
+					$info['encoding'] = null;
+				}
+				if (!isset($info['port'])) {
+					$info['port'] = null;
+				}
+
+				if ($info['persistent'] === false) {
+					$info['persistent'] = 'false';
+				} else {
+					$info['persistent'] = ($info['persistent'] == true) ? 'true' : 'false';
+				}
+
+				$oldConfigs[] = array(
+					'name' => $configName,
+					'driver' => $info['driver'],
+					'persistent' => $info['persistent'],
+					'host' => $info['host'],
+					'port' => $info['port'],
+					'login' => $info['login'],
+					'password' => $info['password'],
+					'database' => $info['database'],
+					'prefix' => $info['prefix'],
+					'schema' => $info['schema'],
+					'encoding' => $info['encoding']
+				);
+			}
+		}
+
+		foreach ($oldConfigs as $key => $oldConfig) {
+			foreach ($configs as $key1 => $config) {
+				if ($oldConfig['name'] == $config['name']) {
+					unset($oldConfigs[$key]);
+				}
+			}
+		}
+
+		$configs = array_merge($oldConfigs, $configs);
+		$out = "<?php\n";
+		$out .= "class DATABASE_CONFIG {\n\n";
+
+		foreach ($configs as $config) {
+			$config = array_merge($this->__defaultConfig, $config);
+			extract($config);
+
+			$out .= "\tvar \${$name} = array(\n";
+			$out .= "\t\t'driver' => '{$driver}',\n";
+			$out .= "\t\t'persistent' => {$persistent},\n";
+			$out .= "\t\t'host' => '{$host}',\n";
+
+			if ($port) {
+				$out .= "\t\t'port' => {$port},\n";
+			}
+
+			$out .= "\t\t'login' => '{$login}',\n";
+			$out .= "\t\t'password' => '{$password}',\n";
+			$out .= "\t\t'database' => '{$database}',\n";
+
+			if ($schema) {
+				$out .= "\t\t'schema' => '{$schema}',\n";
+			}
+
+			if ($prefix) {
+				$out .= "\t\t'prefix' => '{$prefix}',\n";
+			}
+
+			if ($encoding) {
+				$out .= "\t\t'encoding' => '{$encoding}'\n";
+			}
+
+			$out .= "\t);\n";
+		}
+
+		$out .= "}\n";
+		$out .= "?>";
+		$filename = $this->path . 'database.php';
+		return $this->createFile($filename, $out);
+	}
+
+/**
+ * Get a user specified Connection name
+ *
+ * @return void
+ */
+	function getConfig() {
+		App::import('Model', 'ConnectionManager', false);
+
+		$useDbConfig = 'default';
+		$configs = get_class_vars($this->databaseClassName);
+		if (!is_array($configs)) {
+			return $this->execute();
+		}
+
+		$connections = array_keys($configs);
+		if (count($connections) > 1) {
+			$useDbConfig = $this->in(__('Use Database Config', true) .':', $connections, 'default');
+		}
+		return $useDbConfig;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/extract.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/extract.php
new file mode 100644
index 000000000..5dc928b04
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/extract.php
@@ -0,0 +1,494 @@
+<?php
+/**
+ * Language string extractor
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5012
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Language string extractor
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class ExtractTask extends Shell {
+
+/**
+ * Paths to use when looking for strings
+ *
+ * @var string
+ * @access private
+ */
+	var $__paths = array();
+
+/**
+ * Files from where to extract
+ *
+ * @var array
+ * @access private
+ */
+	var $__files = array();
+
+/**
+ * Merge all domains string into the default.pot file
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__merge = false;
+
+/**
+ * Current file being processed
+ *
+ * @var string
+ * @access private
+ */
+	var $__file = null;
+
+/**
+ * Contains all content waiting to be write
+ *
+ * @var string
+ * @access private
+ */
+	var $__storage = array();
+
+/**
+ * Extracted tokens
+ *
+ * @var array
+ * @access private
+ */
+	var $__tokens = array();
+
+/**
+ * Extracted strings
+ *
+ * @var array
+ * @access private
+ */
+	var $__strings = array();
+
+/**
+ * Destination path
+ *
+ * @var string
+ * @access private
+ */
+	var $__output = null;
+
+/**
+ * Execution method always used for tasks
+ *
+ * @return void
+ * @access private
+ */
+	function execute() {
+		if (isset($this->params['files']) && !is_array($this->params['files'])) {
+			$this->__files = explode(',', $this->params['files']);
+		}
+		if (isset($this->params['paths'])) {
+			$this->__paths = explode(',', $this->params['paths']);
+		} else {
+			$defaultPath = $this->params['working'];
+			$message = sprintf(__("What is the full path you would like to extract?\nExample: %s\n[Q]uit [D]one", true), $this->params['root'] . DS . 'myapp');
+			while (true) {
+				$response = $this->in($message, null, $defaultPath);
+				if (strtoupper($response) === 'Q') {
+					$this->out(__('Extract Aborted', true));
+					$this->_stop();
+				} elseif (strtoupper($response) === 'D') {
+					$this->out();
+					break;
+				} elseif (is_dir($response)) {
+					$this->__paths[] = $response;
+					$defaultPath = 'D';
+				} else {
+					$this->err(__('The directory path you supplied was not found. Please try again.', true));
+				}
+				$this->out();
+			}
+		}
+
+		if (isset($this->params['output'])) {
+			$this->__output = $this->params['output'];
+		} else {
+			$message = sprintf(__("What is the full path you would like to output?\nExample: %s\n[Q]uit", true), $this->__paths[0] . DS . 'locale');
+			while (true) {
+				$response = $this->in($message, null, $this->__paths[0] . DS . 'locale');
+				if (strtoupper($response) === 'Q') {
+					$this->out(__('Extract Aborted', true));
+					$this->_stop();
+				} elseif (is_dir($response)) {
+					$this->__output = $response . DS;
+					break;
+				} else {
+					$this->err(__('The directory path you supplied was not found. Please try again.', true));
+				}
+				$this->out();
+			}
+		}
+
+		if (isset($this->params['merge'])) {
+			$this->__merge = !(strtolower($this->params['merge']) === 'no');
+		} else {
+			$this->out();
+			$response = $this->in(sprintf(__('Would you like to merge all domains strings into the default.pot file?', true)), array('y', 'n'), 'n');
+			$this->__merge = strtolower($response) === 'y';
+		}
+
+		if (empty($this->__files)) {
+			$this->__searchFiles();
+		}
+		$this->__extract();
+	}
+
+/**
+ * Extract text
+ *
+ * @return void
+ * @access private
+ */
+	function __extract() {
+		$this->out();
+		$this->out();
+		$this->out(__('Extracting...', true));
+		$this->hr();
+		$this->out(__('Paths:', true));
+		foreach ($this->__paths as $path) {
+			$this->out('   ' . $path);
+		}
+		$this->out(__('Output Directory: ', true) . $this->__output);
+		$this->hr();
+		$this->__extractTokens();
+		$this->__buildFiles();
+		$this->__writeFiles();
+		$this->__paths = $this->__files = $this->__storage = array();
+		$this->__strings = $this->__tokens = array();
+		$this->out();
+		$this->out(__('Done.', true));
+	}
+
+/**
+ * Show help options
+ *
+ * @return void
+ * @access public
+ */
+	function help() {
+		$this->out(__('CakePHP Language String Extraction:', true));
+		$this->hr();
+		$this->out(__('The Extract script generates .pot file(s) with translations', true));
+		$this->out(__('By default the .pot file(s) will be place in the locale directory of -app', true));
+		$this->out(__('By default -app is ROOT/app', true));
+		$this->hr();
+		$this->out(__('Usage: cake i18n extract <command> <param1> <param2>...', true));
+		$this->out();
+		$this->out(__('Params:', true));
+		$this->out(__('   -app [path...]: directory where your application is located', true));
+		$this->out(__('   -root [path...]: path to install', true));
+		$this->out(__('   -core [path...]: path to cake directory', true));
+		$this->out(__('   -paths [comma separated list of paths, full path is needed]', true));
+		$this->out(__('   -merge [yes|no]: Merge all domains strings into the default.pot file', true));
+		$this->out(__('   -output [path...]: Full path to output directory', true));
+		$this->out(__('   -files: [comma separated list of files, full path to file is needed]', true));
+		$this->out();
+		$this->out(__('Commands:', true));
+		$this->out(__('   cake i18n extract help: Shows this help message.', true));
+		$this->out();
+	}
+
+/**
+ * Extract tokens out of all files to be processed
+ *
+ * @return void
+ * @access private
+ */
+	function __extractTokens() {
+		foreach ($this->__files as $file) {
+			$this->__file = $file;
+			$this->out(sprintf(__('Processing %s...', true), $file));
+
+			$code = file_get_contents($file);
+			$allTokens = token_get_all($code);
+			$this->__tokens = array();
+			$lineNumber = 1;
+
+			foreach ($allTokens as $token) {
+				if ((!is_array($token)) || (($token[0] != T_WHITESPACE) && ($token[0] != T_INLINE_HTML))) {
+					if (is_array($token)) {
+						$token[] = $lineNumber;
+					}
+					$this->__tokens[] = $token;
+				}
+
+				if (is_array($token)) {
+					$lineNumber += count(explode("\n", $token[1])) - 1;
+				} else {
+					$lineNumber += count(explode("\n", $token)) - 1;
+				}
+			}
+			unset($allTokens);
+			$this->__parse('__', array('singular'));
+			$this->__parse('__n', array('singular', 'plural'));
+			$this->__parse('__d', array('domain', 'singular'));
+			$this->__parse('__c', array('singular'));
+			$this->__parse('__dc', array('domain', 'singular'));
+			$this->__parse('__dn', array('domain', 'singular', 'plural'));
+			$this->__parse('__dcn', array('domain', 'singular', 'plural'));
+		}
+	}
+
+/**
+ * Parse tokens
+ *
+ * @param string $functionName Function name that indicates translatable string (e.g: '__')
+ * @param array $map Array containing what variables it will find (e.g: domain, singular, plural)
+ * @return void
+ * @access private
+ */
+	function __parse($functionName, $map) {
+		$count = 0;
+		$tokenCount = count($this->__tokens);
+
+		while (($tokenCount - $count) > 1) {
+			list($countToken, $firstParenthesis) = array($this->__tokens[$count], $this->__tokens[$count + 1]);
+			if (!is_array($countToken)) {
+				$count++;
+				continue;
+			}
+
+			list($type, $string, $line) = $countToken;
+			if (($type == T_STRING) && ($string == $functionName) && ($firstParenthesis == '(')) {
+				$position = $count;
+				$depth = 0;
+
+				while ($depth == 0) {
+					if ($this->__tokens[$position] == '(') {
+						$depth++;
+					} elseif ($this->__tokens[$position] == ')') {
+						$depth--;
+					}
+					$position++;
+				}
+
+				$mapCount = count($map);
+				$strings = array();
+				while (count($strings) < $mapCount && ($this->__tokens[$position] == ',' || $this->__tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING)) {
+					if ($this->__tokens[$position][0] == T_CONSTANT_ENCAPSED_STRING) {
+						$strings[] = $this->__tokens[$position][1];
+					}
+					$position++;
+				}
+
+				if ($mapCount == count($strings)) {
+					extract(array_combine($map, $strings));
+					if (!isset($domain)) {
+						$domain = '\'default\'';
+					}
+					$string = $this->__formatString($singular);
+					if (isset($plural)) {
+						$string .= "\0" . $this->__formatString($plural);
+					}
+					$this->__strings[$this->__formatString($domain)][$string][$this->__file][] = $line;
+				} else {
+					$this->__markerError($this->__file, $line, $functionName, $count);
+				}
+			}
+			$count++;
+		}
+	}
+
+/**
+ * Build the translate template file contents out of obtained strings
+ *
+ * @return void
+ * @access private
+ */
+	function __buildFiles() {
+		foreach ($this->__strings as $domain => $strings) {
+			foreach ($strings as $string => $files) {
+				$occurrences = array();
+				foreach ($files as $file => $lines) {
+					$occurrences[] = $file . ':' . implode(';', $lines);
+				}
+				$occurrences = implode("\n#: ", $occurrences);
+				$header = '#: ' . str_replace($this->__paths, '', $occurrences) . "\n";
+
+				if (strpos($string, "\0") === false) {
+					$sentence = "msgid \"{$string}\"\n";
+					$sentence .= "msgstr \"\"\n\n";
+				} else {
+					list($singular, $plural) = explode("\0", $string);
+					$sentence = "msgid \"{$singular}\"\n";
+					$sentence .= "msgid_plural \"{$plural}\"\n";
+					$sentence .= "msgstr[0] \"\"\n";
+					$sentence .= "msgstr[1] \"\"\n\n";
+				}
+
+				$this->__store($domain, $header, $sentence);
+				if ($domain != 'default' && $this->__merge) {
+					$this->__store('default', $header, $sentence);
+				}
+			}
+		}
+	}
+
+/**
+ * Prepare a file to be stored
+ *
+ * @return void
+ * @access private
+ */
+	function __store($domain, $header, $sentence) {
+		if (!isset($this->__storage[$domain])) {
+			$this->__storage[$domain] = array();
+		}
+		if (!isset($this->__storage[$domain][$sentence])) {
+			$this->__storage[$domain][$sentence] = $header;
+		} else {
+			$this->__storage[$domain][$sentence] .= $header;
+		}
+	}
+
+/**
+ * Write the files that need to be stored
+ *
+ * @return void
+ * @access private
+ */
+	function __writeFiles() {
+		$overwriteAll = false;
+		foreach ($this->__storage as $domain => $sentences) {
+			$output = $this->__writeHeader();
+			foreach ($sentences as $sentence => $header) {
+				$output .= $header . $sentence;
+			}
+
+			$filename = $domain . '.pot';
+			$File = new File($this->__output . $filename);
+			$response = '';
+			while ($overwriteAll === false && $File->exists() && strtoupper($response) !== 'Y') {
+				$this->out();
+				$response = $this->in(sprintf(__('Error: %s already exists in this location. Overwrite? [Y]es, [N]o, [A]ll', true), $filename), array('y', 'n', 'a'), 'y');
+				if (strtoupper($response) === 'N') {
+					$response = '';
+					while ($response == '') {
+						$response = $this->in(sprintf(__("What would you like to name this file?\nExample: %s", true), 'new_' . $filename), null, 'new_' . $filename);
+						$File = new File($this->__output . $response);
+						$filename = $response;
+					}
+				} elseif (strtoupper($response) === 'A') {
+					$overwriteAll = true;
+				}
+			}
+			$File->write($output);
+			$File->close();
+		}
+	}
+
+/**
+ * Build the translation template header
+ *
+ * @return string Translation template header
+ * @access private
+ */
+	function __writeHeader() {
+		$output  = "# LANGUAGE translation of CakePHP Application\n";
+		$output .= "# Copyright YEAR NAME <EMAIL@ADDRESS>\n";
+		$output .= "#\n";
+		$output .= "#, fuzzy\n";
+		$output .= "msgid \"\"\n";
+		$output .= "msgstr \"\"\n";
+		$output .= "\"Project-Id-Version: PROJECT VERSION\\n\"\n";
+		$output .= "\"POT-Creation-Date: " . date("Y-m-d H:iO") . "\\n\"\n";
+		$output .= "\"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\\n\"\n";
+		$output .= "\"Last-Translator: NAME <EMAIL@ADDRESS>\\n\"\n";
+		$output .= "\"Language-Team: LANGUAGE <EMAIL@ADDRESS>\\n\"\n";
+		$output .= "\"MIME-Version: 1.0\\n\"\n";
+		$output .= "\"Content-Type: text/plain; charset=utf-8\\n\"\n";
+		$output .= "\"Content-Transfer-Encoding: 8bit\\n\"\n";
+		$output .= "\"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\\n\"\n\n";
+		return $output;
+	}
+
+/**
+ * Format a string to be added as a translateable string
+ *
+ * @param string $string String to format
+ * @return string Formatted string
+ * @access private
+ */
+	function __formatString($string) {
+		$quote = substr($string, 0, 1);
+		$string = substr($string, 1, -1);
+		if ($quote == '"') {
+			$string = stripcslashes($string);
+		} else {
+			$string = strtr($string, array("\\'" => "'", "\\\\" => "\\"));
+		}
+		$string = str_replace("\r\n", "\n", $string);
+		return addcslashes($string, "\0..\37\\\"");
+	}
+
+/**
+ * Indicate an invalid marker on a processed file
+ *
+ * @param string $file File where invalid marker resides
+ * @param integer $line Line number
+ * @param string $marker Marker found
+ * @param integer $count Count
+ * @return void
+ * @access private
+ */
+	function __markerError($file, $line, $marker, $count) {
+		$this->out(sprintf(__("Invalid marker content in %s:%s\n* %s(", true), $file, $line, $marker), true);
+		$count += 2;
+		$tokenCount = count($this->__tokens);
+		$parenthesis = 1;
+
+		while ((($tokenCount - $count) > 0) && $parenthesis) {
+			if (is_array($this->__tokens[$count])) {
+				$this->out($this->__tokens[$count][1], false);
+			} else {
+				$this->out($this->__tokens[$count], false);
+				if ($this->__tokens[$count] == '(') {
+					$parenthesis++;
+				}
+
+				if ($this->__tokens[$count] == ')') {
+					$parenthesis--;
+				}
+			}
+			$count++;
+		}
+		$this->out("\n", true);
+	}
+
+/**
+ * Search files that may contain translateable strings
+ *
+ * @return void
+ * @access private
+ */
+	function __searchFiles() {
+		foreach ($this->__paths as $path) {
+			$Folder = new Folder($path);
+			$files = $Folder->findRecursive('.*\.(php|ctp|thtml|inc|tpl)', true);
+			$this->__files = array_merge($this->__files, $files);
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/fixture.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/fixture.php
new file mode 100644
index 000000000..124d61f78
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/fixture.php
@@ -0,0 +1,425 @@
+<?php
+/**
+ * The FixtureTask handles creating and updating fixture files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+include_once dirname(__FILE__) . DS . 'bake.php';
+/**
+ * Task class for creating and updating fixtures files.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class FixtureTask extends BakeTask {
+
+/**
+ * Tasks to be loaded by this Task
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('DbConfig', 'Model', 'Template');
+
+/**
+ * path to fixtures directory
+ *
+ * @var string
+ * @access public
+ */
+	var $path = null;
+
+/**
+ * Schema instance
+ *
+ * @var object
+ * @access protected
+ */
+	var $_Schema = null;
+
+/**
+ * Override initialize
+ *
+ * @access public
+ */
+	function __construct(&$dispatch) {
+		parent::__construct($dispatch);
+		$this->path = $this->params['working'] . DS . 'tests' . DS . 'fixtures' . DS;
+	}
+
+/**
+ * Execution method always used for tasks
+ * Handles dispatching to interactive, named, or all processess.
+ *
+ * @access public
+ */
+	function execute() {
+		if (empty($this->args)) {
+			$this->__interactive();
+		}
+
+		if (isset($this->args[0])) {
+			$this->interactive = false;
+			if (!isset($this->connection)) {
+				$this->connection = 'default';
+			}
+			if (strtolower($this->args[0]) == 'all') {
+				return $this->all();
+			}
+			$model = $this->_modelName($this->args[0]);
+			$this->bake($model);
+		}
+	}
+
+/**
+ * Bake All the Fixtures at once.  Will only bake fixtures for models that exist.
+ *
+ * @access public
+ * @return void
+ */
+	function all() {
+		$this->interactive = false;
+		$this->Model->interactive = false;
+		$tables = $this->Model->listAll($this->connection, false);
+		foreach ($tables as $table) {
+			$model = $this->_modelName($table);
+			$this->bake($model);
+		}
+	}
+
+/**
+ * Interactive baking function
+ *
+ * @access private
+ */
+	function __interactive() {
+		$this->DbConfig->interactive = $this->Model->interactive = $this->interactive = true;
+		$this->hr();
+		$this->out(sprintf("Bake Fixture\nPath: %s", $this->path));
+		$this->hr();
+
+		$useDbConfig = $this->connection;
+		if (!isset($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+		$modelName = $this->Model->getName($this->connection);
+		$useTable = $this->Model->getTable($modelName, $this->connection);
+		$importOptions = $this->importOptions($modelName);
+		$this->bake($modelName, $useTable, $importOptions);
+	}
+
+/**
+ * Interacts with the User to setup an array of import options. For a fixture.
+ *
+ * @param string $modelName Name of model you are dealing with.
+ * @return array Array of import options.
+ * @access public
+ */
+	function importOptions($modelName) {
+		$options = array();
+		$doSchema = $this->in(__('Would you like to import schema for this fixture?', true), array('y', 'n'), 'n');
+		if ($doSchema == 'y') {
+			$options['schema'] = $modelName;
+		}
+		$doRecords = $this->in(__('Would you like to use record importing for this fixture?', true), array('y', 'n'), 'n');
+		if ($doRecords == 'y') {
+			$options['records'] = true;
+		}
+		if ($doRecords == 'n') {
+			$prompt = sprintf(__("Would you like to build this fixture with data from %s's table?", true), $modelName);
+			$fromTable = $this->in($prompt, array('y', 'n'), 'n');
+			if (strtolower($fromTable) == 'y') {
+				$options['fromTable'] = true;
+			}
+		}
+		return $options;
+	}
+
+/**
+ * Assembles and writes a Fixture file
+ *
+ * @param string $model Name of model to bake.
+ * @param string $useTable Name of table to use.
+ * @param array $importOptions Options for var $import
+ * @return string Baked fixture content
+ * @access public
+ */
+	function bake($model, $useTable = false, $importOptions = array()) {
+		if (!class_exists('CakeSchema')) {
+			App::import('Model', 'CakeSchema', false);
+		}
+		$table = $schema = $records = $import = $modelImport = null;
+		$importBits = array();
+
+		if (!$useTable) {
+			$useTable = Inflector::tableize($model);
+		} elseif ($useTable != Inflector::tableize($model)) {
+			$table = $useTable;
+		}
+
+		if (!empty($importOptions)) {
+			if (isset($importOptions['schema'])) {
+				$modelImport = true;
+				$importBits[] = "'model' => '{$importOptions['schema']}'";
+			}
+			if (isset($importOptions['records'])) {
+				$importBits[] = "'records' => true";
+			}
+			if ($this->connection != 'default') {
+				$importBits[] .= "'connection' => '{$this->connection}'";
+			}
+			if (!empty($importBits)) {
+				$import = sprintf("array(%s)", implode(', ', $importBits));
+			}
+		}
+
+		$this->_Schema = new CakeSchema();
+		$data = $this->_Schema->read(array('models' => false, 'connection' => $this->connection));
+
+		if (!isset($data['tables'][$useTable])) {
+			$this->err('Could not find your selected table ' . $useTable);
+			return false;
+		}
+
+		$tableInfo = $data['tables'][$useTable];
+		if (is_null($modelImport)) {
+			$schema = $this->_generateSchema($tableInfo);
+		}
+
+		if (!isset($importOptions['records']) && !isset($importOptions['fromTable'])) {
+			$recordCount = 1;
+			if (isset($this->params['count'])) {
+				$recordCount = $this->params['count'];
+			}
+			$records = $this->_makeRecordString($this->_generateRecords($tableInfo, $recordCount));
+		}
+		if (isset($this->params['records']) || isset($importOptions['fromTable'])) {
+			$records = $this->_makeRecordString($this->_getRecordsFromTable($model, $useTable));
+		}
+		$out = $this->generateFixtureFile($model, compact('records', 'table', 'schema', 'import', 'fields'));
+		return $out;
+	}
+
+/**
+ * Generate the fixture file, and write to disk
+ *
+ * @param string $model name of the model being generated
+ * @param string $fixture Contents of the fixture file.
+ * @return string Content saved into fixture file.
+ * @access public
+ */
+	function generateFixtureFile($model, $otherVars) {
+		$defaults = array('table' => null, 'schema' => null, 'records' => null, 'import' => null, 'fields' => null);
+		$vars = array_merge($defaults, $otherVars);
+
+		$path = $this->getPath();
+		$filename = Inflector::underscore($model) . '_fixture.php';
+
+		$this->Template->set('model', $model);
+		$this->Template->set($vars);
+		$content = $this->Template->generate('classes', 'fixture');
+
+		$this->out("\nBaking test fixture for $model...");
+		$this->createFile($path . $filename, $content);
+		return $content;
+	}
+
+/**
+ * Get the path to the fixtures.
+ *
+ * @return void
+ */
+	function getPath() {
+		$path = $this->path;
+		if (isset($this->plugin)) {
+			$path = $this->_pluginPath($this->plugin) . 'tests' . DS . 'fixtures' . DS;
+		}
+		return $path;
+	}
+
+/**
+ * Generates a string representation of a schema.
+ *
+ * @param array $table Table schema array
+ * @return string fields definitions
+ * @access protected
+ */
+	function _generateSchema($tableInfo) {
+		$schema = $this->_Schema->generateTable('f', $tableInfo);
+		return substr($schema, 10, -2);
+	}
+
+/**
+ * Generate String representation of Records
+ *
+ * @param array $table Table schema array
+ * @return array Array of records to use in the fixture.
+ * @access protected
+ */
+	function _generateRecords($tableInfo, $recordCount = 1) {
+		$records = array();
+		for ($i = 0; $i < $recordCount; $i++) {
+			$record = array();
+			foreach ($tableInfo as $field => $fieldInfo) {
+				if (empty($fieldInfo['type'])) {
+					continue;
+				}
+				switch ($fieldInfo['type']) {
+					case 'integer':
+					case 'float':
+						$insert = $i + 1;
+					break;
+					case 'string':
+					case 'binary':
+						$isPrimaryUuid = (
+							isset($fieldInfo['key']) && strtolower($fieldInfo['key']) == 'primary' &&
+							isset($fieldInfo['length']) && $fieldInfo['length'] == 36
+						);
+						if ($isPrimaryUuid) {
+							$insert = String::uuid();
+						} else {
+							$insert = "Lorem ipsum dolor sit amet";
+							if (!empty($fieldInfo['length'])) {
+								 $insert = substr($insert, 0, (int)$fieldInfo['length'] - 2);
+							}
+						}
+						$insert = "'$insert'";
+					break;
+					case 'timestamp':
+						$ts = time();
+						$insert = "'$ts'";
+					break;
+					case 'datetime':
+						$ts = date('Y-m-d H:i:s');
+						$insert = "'$ts'";
+					break;
+					case 'date':
+						$ts = date('Y-m-d');
+						$insert = "'$ts'";
+					break;
+					case 'time':
+						$ts = date('H:i:s');
+						$insert = "'$ts'";
+					break;
+					case 'boolean':
+						$insert = 1;
+					break;
+					case 'text':
+						$insert = "'Lorem ipsum dolor sit amet, aliquet feugiat.";
+						$insert .= " Convallis morbi fringilla gravida,";
+						$insert .= " phasellus feugiat dapibus velit nunc, pulvinar eget sollicitudin";
+						$insert .= " venenatis cum nullam, vivamus ut a sed, mollitia lectus. Nulla";
+						$insert .= " vestibulum massa neque ut et, id hendrerit sit,";
+						$insert .= " feugiat in taciti enim proin nibh, tempor dignissim, rhoncus";
+						$insert .= " duis vestibulum nunc mattis convallis.'";
+					break;
+				}
+				$record[$field] = $insert;
+			}
+			$records[] = $record;
+		}
+		return $records;
+	}
+
+/**
+ * Convert a $records array into a a string.
+ *
+ * @param array $records Array of records to be converted to string
+ * @return string A string value of the $records array.
+ * @access protected
+ */
+	function _makeRecordString($records) {
+		$out = "array(\n";
+		foreach ($records as $record) {
+			$values = array();
+			foreach ($record as $field => $value) {
+				$values[] = "\t\t\t'$field' => $value";
+			}
+			$out .= "\t\tarray(\n";
+			$out .= implode(",\n", $values);
+			$out .= "\n\t\t),\n";
+		}
+		$out .= "\t)";
+		return $out;
+	}
+
+/**
+ * Interact with the user to get a custom SQL condition and use that to extract data
+ * to build a fixture.
+ *
+ * @param string $modelName name of the model to take records from.
+ * @param string $useTable Name of table to use.
+ * @return array Array of records.
+ * @access protected
+ */
+	function _getRecordsFromTable($modelName, $useTable = null) {
+		if ($this->interactive) {
+			$condition = null;
+			$prompt = __("Please provide a SQL fragment to use as conditions\nExample: WHERE 1=1 LIMIT 10", true);
+			while (!$condition) {
+				$condition = $this->in($prompt, null, 'WHERE 1=1 LIMIT 10');
+			}
+		} else {
+			$condition = 'WHERE 1=1 LIMIT ' . (isset($this->params['count']) ? $this->params['count'] : 10);
+		}
+		App::import('Model', 'Model', false);
+		$modelObject =& new Model(array('name' => $modelName, 'table' => $useTable, 'ds' => $this->connection));
+		$records = $modelObject->find('all', array(
+			'conditions' => $condition,
+			'recursive' => -1
+		));
+		$db =& ConnectionManager::getDataSource($modelObject->useDbConfig);
+		$schema = $modelObject->schema(true);
+		$out = array();
+		foreach ($records as $record) {
+			$row = array();
+			foreach ($record[$modelObject->alias] as $field => $value) {
+				$row[$field] = $db->value($value, $schema[$field]['type']);
+			}
+			$out[] = $row;
+		}
+		return $out;
+	}
+
+/**
+ * Displays help contents
+ *
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake fixture <arg1> <params>");
+		$this->hr();
+		$this->out('Arguments:');
+		$this->out();
+		$this->out("<name>");
+		$this->out("\tName of the fixture to bake. Can use Plugin.name");
+		$this->out("\tas a shortcut for plugin baking.");
+		$this->out();
+		$this->out('Commands:');
+		$this->out("\nfixture <name>\n\tbakes fixture with specified name.");
+		$this->out("\nfixture all\n\tbakes all fixtures.");
+		$this->out();
+		$this->out('Parameters:');
+		$this->out("\t-count       When using generated data, the number of records to include in the fixture(s).");
+		$this->out("\t-connection  Which database configuration to use for baking.");
+		$this->out("\t-plugin      CamelCased name of plugin to bake fixtures for.");
+		$this->out("\t-records     Used with -count and <name>/all commands to pull [n] records from the live tables");
+		$this->out("\t             Where [n] is either -count or the default of 10.");
+		$this->out();
+		$this->_stop();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/model.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/model.php
new file mode 100644
index 000000000..4324e08e6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/model.php
@@ -0,0 +1,938 @@
+<?php
+/**
+ * The ModelTask handles creating and updating models files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+include_once dirname(__FILE__) . DS . 'bake.php';
+
+/**
+ * Task class for creating and updating model files.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class ModelTask extends BakeTask {
+
+/**
+ * path to MODELS directory
+ *
+ * @var string
+ * @access public
+ */
+	var $path = MODELS;
+
+/**
+ * tasks
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('DbConfig', 'Fixture', 'Test', 'Template');
+
+/**
+ * Tables to skip when running all()
+ *
+ * @var array
+ * @access protected
+ */
+	var $skipTables = array('i18n');
+
+/**
+ * Holds tables found on connection.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_tables = array();
+
+/**
+ * Holds validation method map.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_validations = array();
+
+/**
+ * Execution method always used for tasks
+ *
+ * @access public
+ */
+	function execute() {
+		App::import('Model', 'Model', false);
+
+		if (empty($this->args)) {
+			$this->__interactive();
+		}
+
+		if (!empty($this->args[0])) {
+			$this->interactive = false;
+			if (!isset($this->connection)) {
+				$this->connection = 'default';
+			}
+			if (strtolower($this->args[0]) == 'all') {
+				return $this->all();
+			}
+			$model = $this->_modelName($this->args[0]);
+			$object = $this->_getModelObject($model);
+			if ($this->bake($object, false)) {
+				if ($this->_checkUnitTest()) {
+					$this->bakeFixture($model);
+					$this->bakeTest($model);
+				}
+			}
+		}
+	}
+
+/**
+ * Bake all models at once.
+ *
+ * @return void
+ */
+	function all() {
+		$this->listAll($this->connection, false);
+		$unitTestExists = $this->_checkUnitTest();
+		foreach ($this->_tables as $table) {
+			if (in_array($table, $this->skipTables)) {
+				continue;
+			}
+			$modelClass = Inflector::classify($table);
+			$this->out(sprintf(__('Baking %s', true), $modelClass));
+			$object = $this->_getModelObject($modelClass);
+			if ($this->bake($object, false) && $unitTestExists) {
+				$this->bakeFixture($modelClass);
+				$this->bakeTest($modelClass);
+			}
+		}
+	}
+
+/**
+ * Get a model object for a class name.
+ *
+ * @param string $className Name of class you want model to be.
+ * @return object Model instance
+ */
+	function &_getModelObject($className, $table = null) {
+		if (!$table) {
+			$table = Inflector::tableize($className);
+		}
+		$object =& new Model(array('name' => $className, 'table' => $table, 'ds' => $this->connection));
+		return $object;
+	}
+
+/**
+ * Generate a key value list of options and a prompt.
+ *
+ * @param array $options Array of options to use for the selections. indexes must start at 0
+ * @param string $prompt Prompt to use for options list.
+ * @param integer $default The default option for the given prompt.
+ * @return result of user choice.
+ */
+	function inOptions($options, $prompt = null, $default = null) {
+		$valid = false;
+		$max = count($options);
+		while (!$valid) {
+			foreach ($options as $i => $option) {
+				$this->out($i + 1 .'. ' . $option);
+			}
+			if (empty($prompt)) {
+				$prompt = __('Make a selection from the choices above', true);
+			}
+			$choice = $this->in($prompt, null, $default);
+			if (intval($choice) > 0 && intval($choice) <= $max) {
+				$valid = true;
+			}
+		}
+		return $choice - 1;
+	}
+
+/**
+ * Handles interactive baking
+ *
+ * @access private
+ */
+	function __interactive() {
+		$this->hr();
+		$this->out(sprintf("Bake Model\nPath: %s", $this->path));
+		$this->hr();
+		$this->interactive = true;
+
+		$primaryKey = 'id';
+		$validate = $associations = array();
+
+		if (empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+		$currentModelName = $this->getName();
+		$useTable = $this->getTable($currentModelName);
+		$db =& ConnectionManager::getDataSource($this->connection);
+		$fullTableName = $db->fullTableName($useTable);
+
+		if (in_array($useTable, $this->_tables)) {
+			$tempModel = new Model(array('name' => $currentModelName, 'table' => $useTable, 'ds' => $this->connection));
+			$fields = $tempModel->schema(true);
+			if (!array_key_exists('id', $fields)) {
+				$primaryKey = $this->findPrimaryKey($fields);
+			}
+		} else {
+			$this->err(sprintf(__('Table %s does not exist, cannot bake a model without a table.', true), $useTable));
+			$this->_stop();
+			return false;
+		}
+		$displayField = $tempModel->hasField(array('name', 'title'));
+		if (!$displayField) {
+			$displayField = $this->findDisplayField($tempModel->schema());
+		}
+
+		$prompt = __("Would you like to supply validation criteria \nfor the fields in your model?", true);
+		$wannaDoValidation = $this->in($prompt, array('y','n'), 'y');
+		if (array_search($useTable, $this->_tables) !== false && strtolower($wannaDoValidation) == 'y') {
+			$validate = $this->doValidation($tempModel);
+		}
+
+		$prompt = __("Would you like to define model associations\n(hasMany, hasOne, belongsTo, etc.)?", true);
+		$wannaDoAssoc = $this->in($prompt, array('y','n'), 'y');
+		if (strtolower($wannaDoAssoc) == 'y') {
+			$associations = $this->doAssociations($tempModel);
+		}
+
+		$this->out();
+		$this->hr();
+		$this->out(__('The following Model will be created:', true));
+		$this->hr();
+		$this->out("Name:       " . $currentModelName);
+
+		if ($this->connection !== 'default') {
+			$this->out(sprintf(__("DB Config:  %s", true), $this->connection));
+		}
+		if ($fullTableName !== Inflector::tableize($currentModelName)) {
+			$this->out(sprintf(__("DB Table:   %s", true), $fullTableName));
+		}
+		if ($primaryKey != 'id') {
+			$this->out(sprintf(__("Primary Key: %s", true), $primaryKey));
+		}
+		if (!empty($validate)) {
+			$this->out(sprintf(__("Validation: %s", true), print_r($validate, true)));
+		}
+		if (!empty($associations)) {
+			$this->out(__("Associations:", true));
+			$assocKeys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+			foreach ($assocKeys as $assocKey) {
+				$this->_printAssociation($currentModelName, $assocKey, $associations);
+			}
+		}
+
+		$this->hr();
+		$looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y');
+
+		if (strtolower($looksGood) == 'y') {
+			$vars = compact('associations', 'validate', 'primaryKey', 'useTable', 'displayField');
+			$vars['useDbConfig'] = $this->connection;
+			if ($this->bake($currentModelName, $vars)) {
+				if ($this->_checkUnitTest()) {
+					$this->bakeFixture($currentModelName, $useTable);
+					$this->bakeTest($currentModelName, $useTable, $associations);
+				}
+			}
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Print out all the associations of a particular type
+ *
+ * @param string $modelName Name of the model relations belong to.
+ * @param string $type Name of association you want to see. i.e. 'belongsTo'
+ * @param string $associations Collection of associations.
+ * @access protected
+ * @return void
+ */
+	function _printAssociation($modelName, $type, $associations) {
+		if (!empty($associations[$type])) {
+			for ($i = 0; $i < count($associations[$type]); $i++) {
+				$out = "\t" . $modelName . ' ' . $type . ' ' . $associations[$type][$i]['alias'];
+				$this->out($out);
+			}
+		}
+	}
+
+/**
+ * Finds a primary Key in a list of fields.
+ *
+ * @param array $fields Array of fields that might have a primary key.
+ * @return string Name of field that is a primary key.
+ * @access public
+ */
+	function findPrimaryKey($fields) {
+		foreach ($fields as $name => $field) {
+			if (isset($field['key']) && $field['key'] == 'primary') {
+				break;
+			}
+		}
+		return $this->in(__('What is the primaryKey?', true), null, $name);
+	}
+
+/**
+ * interact with the user to find the displayField value for a model.
+ *
+ * @param array $fields Array of fields to look for and choose as a displayField
+ * @return mixed Name of field to use for displayField or false if the user declines to choose
+ */
+	function findDisplayField($fields) {
+		$fieldNames = array_keys($fields);
+		$prompt = __("A displayField could not be automatically detected\nwould you like to choose one?", true);
+		$continue = $this->in($prompt, array('y', 'n'));
+		if (strtolower($continue) == 'n') {
+			return false;
+		}
+		$prompt = __('Choose a field from the options above:', true);
+		$choice = $this->inOptions($fieldNames, $prompt);
+		return $fieldNames[$choice];
+	}
+
+/**
+ * Handles Generation and user interaction for creating validation.
+ *
+ * @param object $model Model to have validations generated for.
+ * @return array $validate Array of user selected validations.
+ * @access public
+ */
+	function doValidation(&$model) {
+		if (!is_object($model)) {
+			return false;
+		}
+		$fields = $model->schema();
+
+		if (empty($fields)) {
+			return false;
+		}
+		$validate = array();
+		$this->initValidations();
+		foreach ($fields as $fieldName => $field) {
+			$validation = $this->fieldValidation($fieldName, $field, $model->primaryKey);
+			if (!empty($validation)) {
+				$validate[$fieldName] = $validation;
+			}
+		}
+		return $validate;
+	}
+
+/**
+ * Populate the _validations array
+ *
+ * @return void
+ */
+	function initValidations() {
+		$options = $choices = array();
+		if (class_exists('Validation')) {
+			$parent = get_class_methods(get_parent_class('Validation'));
+			$options = get_class_methods('Validation');
+			$options = array_diff($options, $parent);
+		}
+		sort($options);
+		$default = 1;
+		foreach ($options as $key => $option) {
+			if ($option{0} != '_' && strtolower($option) != 'getinstance') {
+				$choices[$default] = strtolower($option);
+				$default++;
+			}
+		}
+		$choices[$default] = 'none'; // Needed since index starts at 1
+		$this->_validations = $choices;
+		return $choices;
+	}
+
+/**
+ * Does individual field validation handling.
+ *
+ * @param string $fieldName Name of field to be validated.
+ * @param array $metaData metadata for field
+ * @return array Array of validation for the field.
+ */
+	function fieldValidation($fieldName, $metaData, $primaryKey = 'id') {
+		$defaultChoice = count($this->_validations);
+		$validate = $alreadyChosen = array();
+
+		$anotherValidator = 'y';
+		while ($anotherValidator == 'y') {
+			if ($this->interactive) {
+				$this->out();
+				$this->out(sprintf(__('Field: %s', true), $fieldName));
+				$this->out(sprintf(__('Type: %s', true), $metaData['type']));
+				$this->hr();
+				$this->out(__('Please select one of the following validation options:', true));
+				$this->hr();
+			}
+
+			$prompt = '';
+			for ($i = 1; $i < $defaultChoice; $i++) {
+				$prompt .= $i . ' - ' . $this->_validations[$i] . "\n";
+			}
+			$prompt .=  sprintf(__("%s - Do not do any validation on this field.\n", true), $defaultChoice);
+			$prompt .= __("... or enter in a valid regex validation string.\n", true);
+
+			$methods = array_flip($this->_validations);
+			$guess = $defaultChoice;
+			if ($metaData['null'] != 1 && !in_array($fieldName, array($primaryKey, 'created', 'modified', 'updated'))) {
+				if ($fieldName == 'email') {
+					$guess = $methods['email'];
+				} elseif ($metaData['type'] == 'string' && $metaData['length'] == 36) {
+					$guess = $methods['uuid'];
+				} elseif ($metaData['type'] == 'string') {
+					$guess = $methods['notempty'];
+				} elseif ($metaData['type'] == 'integer') {
+					$guess = $methods['numeric'];
+				} elseif ($metaData['type'] == 'boolean') {
+					$guess = $methods['boolean'];
+				} elseif ($metaData['type'] == 'date') {
+					$guess = $methods['date'];
+				} elseif ($metaData['type'] == 'time') {
+					$guess = $methods['time'];
+				}
+			}
+
+			if ($this->interactive === true) {
+				$choice = $this->in($prompt, null, $guess);
+				if (in_array($choice, $alreadyChosen)) {
+					$this->out(__("You have already chosen that validation rule,\nplease choose again", true));
+					continue;
+				}
+				if (!isset($this->_validations[$choice]) && is_numeric($choice)) {
+					$this->out(__('Please make a valid selection.', true));
+					continue;
+				}
+				$alreadyChosen[] = $choice;
+			} else {
+				$choice = $guess;
+			}
+
+			if (isset($this->_validations[$choice])) {
+				$validatorName = $this->_validations[$choice];
+			} else {
+				$validatorName = Inflector::slug($choice);
+			}
+
+			if ($choice != $defaultChoice) {
+				if (is_numeric($choice) && isset($this->_validations[$choice])) {
+					$validate[$validatorName] = $this->_validations[$choice];
+				} else {
+					$validate[$validatorName] = $choice;
+				}
+			}
+			if ($this->interactive == true && $choice != $defaultChoice) {
+				$anotherValidator = $this->in(__('Would you like to add another validation rule?', true), array('y', 'n'), 'n');
+			} else {
+				$anotherValidator = 'n';
+			}
+		}
+		return $validate;
+	}
+
+/**
+ * Handles associations
+ *
+ * @param object $model
+ * @return array $assocaitons
+ * @access public
+ */
+	function doAssociations(&$model) {
+		if (!is_object($model)) {
+			return false;
+		}
+		if ($this->interactive === true) {
+			$this->out(__('One moment while the associations are detected.', true));
+		}
+
+		$fields = $model->schema(true);
+		if (empty($fields)) {
+			return false;
+		}
+
+		if (empty($this->_tables)) {
+			$this->_tables = $this->getAllTables();
+		}
+
+		$associations = array(
+			'belongsTo' => array(), 'hasMany' => array(), 'hasOne'=> array(), 'hasAndBelongsToMany' => array()
+		);
+		$possibleKeys = array();
+
+		$associations = $this->findBelongsTo($model, $associations);
+		$associations = $this->findHasOneAndMany($model, $associations);
+		$associations = $this->findHasAndBelongsToMany($model, $associations);
+
+		if ($this->interactive !== true) {
+			unset($associations['hasOne']);
+		}
+
+		if ($this->interactive === true) {
+			$this->hr();
+			if (empty($associations)) {
+				$this->out(__('None found.', true));
+			} else {
+				$this->out(__('Please confirm the following associations:', true));
+				$this->hr();
+				$associations = $this->confirmAssociations($model, $associations);
+			}
+			$associations = $this->doMoreAssociations($model, $associations);
+		}
+		return $associations;
+	}
+
+/**
+ * Find belongsTo relations and add them to the associations list.
+ *
+ * @param object $model Model instance of model being generated.
+ * @param array $associations Array of inprogress associations
+ * @return array $associations with belongsTo added in.
+ */
+	function findBelongsTo(&$model, $associations) {
+		$fields = $model->schema(true);
+		foreach ($fields as $fieldName => $field) {
+			$offset = strpos($fieldName, '_id');
+			if ($fieldName != $model->primaryKey && $fieldName != 'parent_id' && $offset !== false) {
+				$tmpModelName = $this->_modelNameFromKey($fieldName);
+				$associations['belongsTo'][] = array(
+					'alias' => $tmpModelName,
+					'className' => $tmpModelName,
+					'foreignKey' => $fieldName,
+				);
+			} elseif ($fieldName == 'parent_id') {
+				$associations['belongsTo'][] = array(
+					'alias' => 'Parent' . $model->name,
+					'className' => $model->name,
+					'foreignKey' => $fieldName,
+				);
+			}
+		}
+		return $associations;
+	}
+
+/**
+ * Find the hasOne and HasMany relations and add them to associations list
+ *
+ * @param object $model Model instance being generated
+ * @param array $associations Array of inprogress associations
+ * @return array $associations with hasOne and hasMany added in.
+ */
+	function findHasOneAndMany(&$model, $associations) {
+		$foreignKey = $this->_modelKey($model->name);
+		foreach ($this->_tables as $otherTable) {
+			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
+			$modelFieldsTemp = $tempOtherModel->schema(true);
+
+			$pattern = '/_' . preg_quote($model->table, '/') . '|' . preg_quote($model->table, '/') . '_/';
+			$possibleJoinTable = preg_match($pattern , $otherTable);
+			if ($possibleJoinTable == true) {
+				continue;
+			}
+			foreach ($modelFieldsTemp as $fieldName => $field) {
+				$assoc = false;
+				if ($fieldName != $model->primaryKey && $fieldName == $foreignKey) {
+					$assoc = array(
+						'alias' => $tempOtherModel->name,
+						'className' => $tempOtherModel->name,
+						'foreignKey' => $fieldName
+					);
+				} elseif ($otherTable == $model->table && $fieldName == 'parent_id') {
+					$assoc = array(
+						'alias' => 'Child' . $model->name,
+						'className' => $model->name,
+						'foreignKey' => $fieldName
+					);
+				}
+				if ($assoc) {
+					$associations['hasOne'][] = $assoc;
+					$associations['hasMany'][] = $assoc;
+				}
+
+			}
+		}
+		return $associations;
+	}
+
+/**
+ * Find the hasAndBelongsToMany relations and add them to associations list
+ *
+ * @param object $model Model instance being generated
+ * @param array $associations Array of inprogress associations
+ * @return array $associations with hasAndBelongsToMany added in.
+ */
+	function findHasAndBelongsToMany(&$model, $associations) {
+		$foreignKey = $this->_modelKey($model->name);
+		foreach ($this->_tables as $otherTable) {
+			$tempOtherModel = $this->_getModelObject($this->_modelName($otherTable), $otherTable);
+			$modelFieldsTemp = $tempOtherModel->schema(true);
+
+			$offset = strpos($otherTable, $model->table . '_');
+			$otherOffset = strpos($otherTable, '_' . $model->table);
+
+			if ($offset !== false) {
+				$offset = strlen($model->table . '_');
+				$habtmName = $this->_modelName(substr($otherTable, $offset));
+				$associations['hasAndBelongsToMany'][] = array(
+					'alias' => $habtmName,
+					'className' => $habtmName,
+					'foreignKey' => $foreignKey,
+					'associationForeignKey' => $this->_modelKey($habtmName),
+					'joinTable' => $otherTable
+				);
+			} elseif ($otherOffset !== false) {
+				$habtmName = $this->_modelName(substr($otherTable, 0, $otherOffset));
+				$associations['hasAndBelongsToMany'][] = array(
+					'alias' => $habtmName,
+					'className' => $habtmName,
+					'foreignKey' => $foreignKey,
+					'associationForeignKey' => $this->_modelKey($habtmName),
+					'joinTable' => $otherTable
+				);
+			}
+		}
+		return $associations;
+	}
+
+/**
+ * Interact with the user and confirm associations.
+ *
+ * @param array $model Temporary Model instance.
+ * @param array $associations Array of associations to be confirmed.
+ * @return array Array of confirmed associations
+ */
+	function confirmAssociations(&$model, $associations) {
+		foreach ($associations as $type => $settings) {
+			if (!empty($associations[$type])) {
+				$count = count($associations[$type]);
+				$response = 'y';
+				foreach ($associations[$type] as $i => $assoc) {
+					$prompt = "{$model->name} {$type} {$assoc['alias']}?";
+					$response = $this->in($prompt, array('y','n'), 'y');
+
+					if ('n' == strtolower($response)) {
+						unset($associations[$type][$i]);
+					} elseif ($type == 'hasMany') {
+						unset($associations['hasOne'][$i]);
+					}
+				}
+				$associations[$type] = array_merge($associations[$type]);
+			}
+		}
+		return $associations;
+	}
+
+/**
+ * Interact with the user and generate additional non-conventional associations
+ *
+ * @param object $model Temporary model instance
+ * @param array $associations Array of associations.
+ * @return array Array of associations.
+ */
+	function doMoreAssociations($model, $associations) {
+		$prompt = __('Would you like to define some additional model associations?', true);
+		$wannaDoMoreAssoc = $this->in($prompt, array('y','n'), 'n');
+		$possibleKeys = $this->_generatePossibleKeys();
+		while (strtolower($wannaDoMoreAssoc) == 'y') {
+			$assocs = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+			$this->out(__('What is the association type?', true));
+			$assocType = intval($this->inOptions($assocs, __('Enter a number',true)));
+
+			$this->out(__("For the following options be very careful to match your setup exactly.\nAny spelling mistakes will cause errors.", true));
+			$this->hr();
+
+			$alias = $this->in(__('What is the alias for this association?', true));
+			$className = $this->in(sprintf(__('What className will %s use?', true), $alias), null, $alias );
+			$suggestedForeignKey = null;
+
+			if ($assocType == 0) {
+				$showKeys = $possibleKeys[$model->table];
+				$suggestedForeignKey = $this->_modelKey($alias);
+			} else {
+				$otherTable = Inflector::tableize($className);
+				if (in_array($otherTable, $this->_tables)) {
+					if ($assocType < 3) {
+						$showKeys = $possibleKeys[$otherTable];
+					} else {
+						$showKeys = null;
+					}
+				} else {
+					$otherTable = $this->in(__('What is the table for this model?', true));
+					$showKeys = $possibleKeys[$otherTable];
+				}
+				$suggestedForeignKey = $this->_modelKey($model->name);
+			}
+			if (!empty($showKeys)) {
+				$this->out(__('A helpful List of possible keys', true));
+				$foreignKey = $this->inOptions($showKeys, __('What is the foreignKey?', true));
+				$foreignKey = $showKeys[intval($foreignKey)];
+			}
+			if (!isset($foreignKey)) {
+				$foreignKey = $this->in(__('What is the foreignKey? Specify your own.', true), null, $suggestedForeignKey);
+			}
+			if ($assocType == 3) {
+				$associationForeignKey = $this->in(__('What is the associationForeignKey?', true), null, $this->_modelKey($model->name));
+				$joinTable = $this->in(__('What is the joinTable?', true));
+			}
+			$associations[$assocs[$assocType]] = array_values((array)$associations[$assocs[$assocType]]);
+			$count = count($associations[$assocs[$assocType]]);
+			$i = ($count > 0) ? $count : 0;
+			$associations[$assocs[$assocType]][$i]['alias'] = $alias;
+			$associations[$assocs[$assocType]][$i]['className'] = $className;
+			$associations[$assocs[$assocType]][$i]['foreignKey'] = $foreignKey;
+			if ($assocType == 3) {
+				$associations[$assocs[$assocType]][$i]['associationForeignKey'] = $associationForeignKey;
+				$associations[$assocs[$assocType]][$i]['joinTable'] = $joinTable;
+			}
+			$wannaDoMoreAssoc = $this->in(__('Define another association?', true), array('y','n'), 'y');
+		}
+		return $associations;
+	}
+
+/**
+ * Finds all possible keys to use on custom associations.
+ *
+ * @return array array of tables and possible keys
+ */
+	function _generatePossibleKeys() {
+		$possible = array();
+		foreach ($this->_tables as $otherTable) {
+			$tempOtherModel = & new Model(array('table' => $otherTable, 'ds' => $this->connection));
+			$modelFieldsTemp = $tempOtherModel->schema(true);
+			foreach ($modelFieldsTemp as $fieldName => $field) {
+				if ($field['type'] == 'integer' || $field['type'] == 'string') {
+					$possible[$otherTable][] = $fieldName;
+				}
+			}
+		}
+		return $possible;
+	}
+
+/**
+ * Assembles and writes a Model file.
+ *
+ * @param mixed $name Model name or object
+ * @param mixed $data if array and $name is not an object assume bake data, otherwise boolean.
+ * @access private
+ */
+	function bake($name, $data = array()) {
+		if (is_object($name)) {
+			if ($data == false) {
+				$data = $associations = array();
+				$data['associations'] = $this->doAssociations($name, $associations);
+				$data['validate'] = $this->doValidation($name);
+			}
+			$data['primaryKey'] = $name->primaryKey;
+			$data['useTable'] = $name->table;
+			$data['useDbConfig'] = $name->useDbConfig;
+			$data['name'] = $name = $name->name;
+		} else {
+			$data['name'] = $name;
+		}
+		$defaults = array('associations' => array(), 'validate' => array(), 'primaryKey' => 'id',
+			'useTable' => null, 'useDbConfig' => 'default', 'displayField' => null);
+		$data = array_merge($defaults, $data);
+
+		$this->Template->set($data);
+		$this->Template->set('plugin', Inflector::camelize($this->plugin));
+		$out = $this->Template->generate('classes', 'model');
+
+		$path = $this->getPath();
+		$filename = $path . Inflector::underscore($name) . '.php';
+		$this->out("\nBaking model class for $name...");
+		$this->createFile($filename, $out);
+		ClassRegistry::flush();
+		return $out;
+	}
+
+/**
+ * Assembles and writes a unit test file
+ *
+ * @param string $className Model class name
+ * @access private
+ */
+	function bakeTest($className) {
+		$this->Test->interactive = $this->interactive;
+		$this->Test->plugin = $this->plugin;
+		$this->Test->connection = $this->connection;
+		return $this->Test->bake('Model', $className);
+	}
+
+/**
+ * outputs the a list of possible models or controllers from database
+ *
+ * @param string $useDbConfig Database configuration name
+ * @access public
+ */
+	function listAll($useDbConfig = null) {
+		$this->_tables = $this->getAllTables($useDbConfig);
+
+		if ($this->interactive === true) {
+			$this->out(__('Possible Models based on your current database:', true));
+			$this->_modelNames = array();
+			$count = count($this->_tables);
+			for ($i = 0; $i < $count; $i++) {
+				$this->_modelNames[] = $this->_modelName($this->_tables[$i]);
+				$this->out($i + 1 . ". " . $this->_modelNames[$i]);
+			}
+		}
+		return $this->_tables;
+	}
+
+/**
+ * Interact with the user to determine the table name of a particular model
+ *
+ * @param string $modelName Name of the model you want a table for.
+ * @param string $useDbConfig Name of the database config you want to get tables from.
+ * @return void
+ */
+	function getTable($modelName, $useDbConfig = null) {
+		if (!isset($useDbConfig)) {
+			$useDbConfig = $this->connection;
+		}
+		App::import('Model', 'ConnectionManager', false);
+
+		$db =& ConnectionManager::getDataSource($useDbConfig);
+		$useTable = Inflector::tableize($modelName);
+		$fullTableName = $db->fullTableName($useTable, false);
+		$tableIsGood = false;
+
+		if (array_search($useTable, $this->_tables) === false) {
+			$this->out();
+			$this->out(sprintf(__("Given your model named '%s',\nCake would expect a database table named '%s'", true), $modelName, $fullTableName));
+			$tableIsGood = $this->in(__('Do you want to use this table?', true), array('y','n'), 'y');
+		}
+		if (strtolower($tableIsGood) == 'n') {
+			$useTable = $this->in(__('What is the name of the table?', true));
+		}
+		return $useTable;
+	}
+
+/**
+ * Get an Array of all the tables in the supplied connection
+ * will halt the script if no tables are found.
+ *
+ * @param string $useDbConfig Connection name to scan.
+ * @return array Array of tables in the database.
+ */
+	function getAllTables($useDbConfig = null) {
+		if (!isset($useDbConfig)) {
+			$useDbConfig = $this->connection;
+		}
+		App::import('Model', 'ConnectionManager', false);
+
+		$tables = array();
+		$db =& ConnectionManager::getDataSource($useDbConfig);
+		$db->cacheSources = false;
+		$usePrefix = empty($db->config['prefix']) ? '' : $db->config['prefix'];
+		if ($usePrefix) {
+			foreach ($db->listSources() as $table) {
+				if (!strncmp($table, $usePrefix, strlen($usePrefix))) {
+					$tables[] = substr($table, strlen($usePrefix));
+				}
+			}
+		} else {
+			$tables = $db->listSources();
+		}
+		if (empty($tables)) {
+			$this->err(__('Your database does not have any tables.', true));
+			$this->_stop();
+		}
+		return $tables;
+	}
+
+/**
+ * Forces the user to specify the model he wants to bake, and returns the selected model name.
+ *
+ * @return string the model name
+ * @access public
+ */
+	function getName($useDbConfig = null) {
+		$this->listAll($useDbConfig);
+
+		$enteredModel = '';
+
+		while ($enteredModel == '') {
+			$enteredModel = $this->in(__("Enter a number from the list above,\ntype in the name of another model, or 'q' to exit", true), null, 'q');
+
+			if ($enteredModel === 'q') {
+				$this->out(__("Exit", true));
+				$this->_stop();
+			}
+
+			if ($enteredModel == '' || intval($enteredModel) > count($this->_modelNames)) {
+				$this->err(__("The model name you supplied was empty,\nor the number you selected was not an option. Please try again.", true));
+				$enteredModel = '';
+			}
+		}
+		if (intval($enteredModel) > 0 && intval($enteredModel) <= count($this->_modelNames)) {
+			$currentModelName = $this->_modelNames[intval($enteredModel) - 1];
+		} else {
+			$currentModelName = $enteredModel;
+		}
+		return $currentModelName;
+	}
+
+/**
+ * Displays help contents
+ *
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake model <arg1>");
+		$this->hr();
+		$this->out('Arguments:');
+		$this->out();
+		$this->out("<name>");
+		$this->out("\tName of the model to bake. Can use Plugin.name");
+		$this->out("\tas a shortcut for plugin baking.");
+		$this->out();
+		$this->out('Params:');
+		$this->out();
+		$this->out('-connection <config>');
+		$this->out("\tset db config <config>. uses 'default' if none is specified");
+		$this->out();
+		$this->out('Commands:');
+		$this->out();
+		$this->out("model");
+		$this->out("\tbakes model in interactive mode.");
+		$this->out();
+		$this->out("model <name>");
+		$this->out("\tbakes model file with no associations or validation");
+		$this->out();
+		$this->out("model all");
+		$this->out("\tbakes all model files with associations and validation");
+		$this->out();
+		$this->_stop();
+	}
+
+/**
+ * Interact with FixtureTask to automatically bake fixtures when baking models.
+ *
+ * @param string $className Name of class to bake fixture for
+ * @param string $useTable Optional table name for fixture to use.
+ * @access public
+ * @return void
+ * @see FixtureTask::bake
+ */
+	function bakeFixture($className, $useTable = null) {
+		$this->Fixture->interactive = $this->interactive;
+		$this->Fixture->connection = $this->connection;
+		$this->Fixture->plugin = $this->plugin;
+		$this->Fixture->bake($className, $useTable);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/plugin.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/plugin.php
new file mode 100644
index 000000000..94d9e261c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/plugin.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * The Plugin Task handles creating an empty plugin, ready to be used
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Task class for creating a plugin
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class PluginTask extends Shell {
+
+/**
+ * Tasks
+ *
+ */
+	var $tasks = array('Model', 'Controller', 'View');
+
+/**
+ * path to CONTROLLERS directory
+ *
+ * @var array
+ * @access public
+ */
+	var $path = null;
+
+/**
+ * initialize
+ *
+ * @return void
+ */
+	function initialize() {
+		$this->path = APP . 'plugins' . DS;
+	}
+
+/**
+ * Execution method always used for tasks
+ *
+ * @return void
+ */
+	function execute() {
+		if (empty($this->params['skel'])) {
+			$this->params['skel'] = '';
+			if (is_dir(CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS . 'templates' . DS . 'skel') === true) {
+				$this->params['skel'] = CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS . 'templates' . DS . 'skel';
+			}
+		}
+		$plugin = null;
+
+		if (isset($this->args[0])) {
+			$plugin = Inflector::camelize($this->args[0]);
+			$pluginPath = $this->_pluginPath($plugin);
+			$this->Dispatch->shiftArgs();
+			if (is_dir($pluginPath)) {
+				$this->out(sprintf(__('Plugin: %s', true), $plugin));
+				$this->out(sprintf(__('Path: %s', true), $pluginPath));
+			} elseif (isset($this->args[0])) {
+				$this->err(sprintf(__('%s in path %s not found.', true), $plugin, $pluginPath));
+				$this->_stop();
+			} else {
+				$this->__interactive($plugin);
+			}
+		} else {
+			return $this->__interactive();
+		}
+
+		if (isset($this->args[0])) {
+			$task = Inflector::classify($this->args[0]);
+			$this->Dispatch->shiftArgs();
+			if (in_array($task, $this->tasks)) {
+				$this->{$task}->plugin = $plugin;
+				$this->{$task}->path = $pluginPath . Inflector::underscore(Inflector::pluralize($task)) . DS;
+
+				if (!is_dir($this->{$task}->path)) {
+					$this->err(sprintf(__("%s directory could not be found.\nBe sure you have created %s", true), $task, $this->{$task}->path));
+				}
+				$this->{$task}->loadTasks();
+				return $this->{$task}->execute();
+			}
+		}
+	}
+
+/**
+ * Interactive interface
+ *
+ * @access private
+ * @return void
+ */
+	function __interactive($plugin = null) {
+		while ($plugin === null) {
+			$plugin = $this->in(__('Enter the name of the plugin in CamelCase format', true));
+		}
+
+		if (!$this->bake($plugin)) {
+			$this->err(sprintf(__("An error occured trying to bake: %s in %s", true), $plugin, $this->path . Inflector::underscore($pluginPath)));
+		}
+	}
+
+/**
+ * Bake the plugin, create directories and files
+ *
+ * @params $plugin name of the plugin in CamelCased format
+ * @access public
+ * @return bool
+ */
+	function bake($plugin) {
+		$pluginPath = Inflector::underscore($plugin);
+
+		$pathOptions = App::path('plugins');
+		if (count($pathOptions) > 1) {
+			$this->findPath($pathOptions);
+		}
+		$this->hr();
+		$this->out(sprintf(__("Plugin Name: %s", true),  $plugin));
+		$this->out(sprintf(__("Plugin Directory: %s", true), $this->path . $pluginPath));
+		$this->hr();
+
+		$looksGood = $this->in(__('Look okay?', true), array('y', 'n', 'q'), 'y');
+
+		if (strtolower($looksGood) == 'y') {
+			$verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n');
+
+			$Folder =& new Folder($this->path . $pluginPath);
+			$directories = array(
+				'config' . DS . 'schema',
+				'models' . DS . 'behaviors',
+				'models' . DS . 'datasources',
+				'controllers' . DS . 'components',
+				'libs',
+				'views' . DS . 'helpers',
+				'tests' . DS . 'cases' . DS . 'components',
+				'tests' . DS . 'cases' . DS . 'helpers',
+				'tests' . DS . 'cases' . DS . 'behaviors',
+				'tests' . DS . 'cases' . DS . 'controllers',
+				'tests' . DS . 'cases' . DS . 'models',
+				'tests' . DS . 'groups',
+				'tests' . DS . 'fixtures',
+				'vendors',
+				'vendors' . DS . 'shells' . DS . 'tasks',
+				'webroot'
+			);
+
+			foreach ($directories as $directory) {
+				$dirPath = $this->path . $pluginPath . DS . $directory;
+				$Folder->create($dirPath);
+				$File =& new File($dirPath . DS . 'empty', true);
+			}
+
+			if (strtolower($verbose) == 'y') {
+				foreach ($Folder->messages() as $message) {
+					$this->out($message);
+				}
+			}
+
+			$errors = $Folder->errors();
+			if (!empty($errors)) {
+				return false;
+			}
+
+			$controllerFileName = $pluginPath . '_app_controller.php';
+
+			$out = "<?php\n\n";
+			$out .= "class {$plugin}AppController extends AppController {\n\n";
+			$out .= "}\n\n";
+			$out .= "?>";
+			$this->createFile($this->path . $pluginPath. DS . $controllerFileName, $out);
+
+			$modelFileName = $pluginPath . '_app_model.php';
+
+			$out = "<?php\n\n";
+			$out .= "class {$plugin}AppModel extends AppModel {\n\n";
+			$out .= "}\n\n";
+			$out .= "?>";
+			$this->createFile($this->path . $pluginPath . DS . $modelFileName, $out);
+
+			$this->hr();
+			$this->out(sprintf(__("Created: %s in %s", true), $plugin, $this->path . $pluginPath));
+			$this->hr();
+		}
+
+		return true;
+	}
+
+/**
+ * find and change $this->path to the user selection
+ *
+ * @return void
+ */
+	function findPath($pathOptions) {
+		$valid = false;
+		$max = count($pathOptions);
+		while (!$valid) {
+			foreach ($pathOptions as $i => $option) {
+				$this->out($i + 1 .'. ' . $option);
+			}
+			$prompt = __('Choose a plugin path from the paths above.', true);
+			$choice = $this->in($prompt);
+			if (intval($choice) > 0 && intval($choice) <= $max) {
+				$valid = true;
+			}
+		}
+		$this->path = $pathOptions[$choice - 1];
+	}
+
+/**
+ * Help
+ *
+ * @return void
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake plugin <arg1> <arg2>...");
+		$this->hr();
+		$this->out('Commands:');
+		$this->out();
+		$this->out("plugin <name>");
+		$this->out("\tbakes plugin directory structure");
+		$this->out();
+		$this->out("plugin <name> model");
+		$this->out("\tbakes model. Run 'cake bake model help' for more info.");
+		$this->out();
+		$this->out("plugin <name> controller");
+		$this->out("\tbakes controller. Run 'cake bake controller help' for more info.");
+		$this->out();
+		$this->out("plugin <name> view");
+		$this->out("\tbakes view. Run 'cake bake view help' for more info.");
+		$this->out();
+		$this->_stop();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/project.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/project.php
new file mode 100644
index 000000000..7266dc0a2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/project.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * The Project Task handles creating the base application
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.bake
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * Task class for creating new project apps and plugins
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class ProjectTask extends Shell {
+
+/**
+ * configs path (used in testing).
+ *
+ * @var string
+ */
+	var $configPath = null;
+
+/**
+ * Checks that given project path does not already exist, and
+ * finds the app directory in it. Then it calls bake() with that information.
+ *
+ * @param string $project Project path
+ * @access public
+ */
+	function execute($project = null) {
+		if ($project === null) {
+			if (isset($this->args[0])) {
+				$project = $this->args[0];
+			}
+		}
+
+		if ($project) {
+			$this->Dispatch->parseParams(array('-app', $project));
+			$project = $this->params['working'];
+		}
+
+		if (empty($this->params['skel'])) {
+			$this->params['skel'] = '';
+			if (is_dir(CAKE . 'console' . DS . 'templates' . DS . 'skel') === true) {
+				$this->params['skel'] = CAKE . 'console' . DS . 'templates' . DS . 'skel';
+			}
+		}
+
+		while (!$project) {
+			$prompt = __("What is the full path for this app including the app directory name?\n Example:", true);
+			$default = $this->params['working'] . DS . 'myapp';
+			$project = $this->in($prompt . $default, null, $default);
+		}
+
+		if ($project) {
+			$response = false;
+			while ($response == false && is_dir($project) === true && file_exists($project . 'config' . 'core.php')) {
+				$prompt = sprintf(__('A project already exists in this location: %s Overwrite?', true), $project);
+				$response = $this->in($prompt, array('y','n'), 'n');
+				if (strtolower($response) === 'n') {
+					$response = $project = false;
+				}
+			}
+		}
+
+		if ($this->bake($project)) {
+			$path = Folder::slashTerm($project);
+			if ($this->createHome($path)) {
+				$this->out(__('Welcome page created', true));
+			} else {
+				$this->out(__('The Welcome page was NOT created', true));
+			}
+
+			if ($this->securitySalt($path) === true ) {
+				$this->out(__('Random hash key created for \'Security.salt\'', true));
+			} else {
+				$this->err(sprintf(__('Unable to generate random hash for \'Security.salt\', you should change it in %s', true), CONFIGS . 'core.php'));
+			}
+
+			if ($this->securityCipherSeed($path) === true ) {
+				$this->out(__('Random seed created for \'Security.cipherSeed\'', true));
+			} else {
+				$this->err(sprintf(__('Unable to generate random seed for \'Security.cipherSeed\', you should change it in %s', true), CONFIGS . 'core.php'));
+			}
+
+			$corePath = $this->corePath($path);
+			if ($corePath === true ) {
+				$this->out(sprintf(__('CAKE_CORE_INCLUDE_PATH set to %s in webroot/index.php', true), CAKE_CORE_INCLUDE_PATH));
+				$this->out(sprintf(__('CAKE_CORE_INCLUDE_PATH set to %s in webroot/test.php', true), CAKE_CORE_INCLUDE_PATH));
+				$this->out(__('Remember to check these value after moving to production server', true));
+			} elseif ($corePath === false) {
+				$this->err(sprintf(__('Unable to set CAKE_CORE_INCLUDE_PATH, you should change it in %s', true), $path . 'webroot' .DS .'index.php'));
+			}
+			$Folder = new Folder($path);
+			if (!$Folder->chmod($path . 'tmp', 0777)) {
+				$this->err(sprintf(__('Could not set permissions on %s', true), $path . DS .'tmp'));
+				$this->out(sprintf(__('chmod -R 0777 %s', true), $path . DS .'tmp'));
+			}
+
+			$this->params['working'] = $path;
+			$this->params['app'] = basename($path);
+			return true;
+		}
+	}
+
+/**
+ * Looks for a skeleton template of a Cake application,
+ * and if not found asks the user for a path. When there is a path
+ * this method will make a deep copy of the skeleton to the project directory.
+ * A default home page will be added, and the tmp file storage will be chmod'ed to 0777.
+ *
+ * @param string $path Project path
+ * @param string $skel Path to copy from
+ * @param string $skip array of directories to skip when copying
+ * @access private
+ */
+	function bake($path, $skel = null, $skip = array('empty')) {
+		if (!$skel) {
+			$skel = $this->params['skel'];
+		}
+		while (!$skel) {
+			$skel = $this->in(sprintf(__("What is the path to the directory layout you wish to copy?\nExample: %s"), APP, null, ROOT . DS . 'myapp' . DS));
+			if ($skel == '') {
+				$this->out(__('The directory path you supplied was empty. Please try again.', true));
+			} else {
+				while (is_dir($skel) === false) {
+					$skel = $this->in(__('Directory path does not exist please choose another:', true));
+				}
+			}
+		}
+
+		$app = basename($path);
+
+		$this->out(__('Bake Project', true));
+		$this->out(__("Skel Directory: ", true) . $skel);
+		$this->out(__("Will be copied to: ", true) . $path);
+		$this->hr();
+
+		$looksGood = $this->in(__('Look okay?', true), array('y', 'n', 'q'), 'y');
+
+		if (strtolower($looksGood) == 'y') {
+			$verbose = $this->in(__('Do you want verbose output?', true), array('y', 'n'), 'n');
+
+			$Folder = new Folder($skel);
+			if (!empty($this->params['empty'])) {
+				$skip = array();
+			}
+			if ($Folder->copy(array('to' => $path, 'skip' => $skip))) {
+				$this->hr();
+				$this->out(sprintf(__("Created: %s in %s", true), $app, $path));
+				$this->hr();
+			} else {
+				$this->err(sprintf(__(" '%s' could not be created properly", true), $app));
+				return false;
+			}
+
+			if (strtolower($verbose) == 'y') {
+				foreach ($Folder->messages() as $message) {
+					$this->out($message);
+				}
+			}
+
+			return true;
+		} elseif (strtolower($looksGood) == 'q') {
+			$this->out(__('Bake Aborted.', true));
+		} else {
+			$this->execute(false);
+			return false;
+		}
+	}
+
+/**
+ * Writes a file with a default home page to the project.
+ *
+ * @param string $dir Path to project
+ * @return boolean Success
+ * @access public
+ */
+	function createHome($dir) {
+		$app = basename($dir);
+		$path = $dir . 'views' . DS . 'pages' . DS;
+		$source = CAKE . 'console' . DS . 'templates' . DS .'default' . DS . 'views' . DS . 'home.ctp';
+		include($source);
+		return $this->createFile($path.'home.ctp', $output);
+	}
+
+/**
+ * Generates and writes 'Security.salt'
+ *
+ * @param string $path Project path
+ * @return boolean Success
+ * @access public
+ */
+	function securitySalt($path) {
+		$File =& new File($path . 'config' . DS . 'core.php');
+		$contents = $File->read();
+		if (preg_match('/([\\t\\x20]*Configure::write\\(\\\'Security.salt\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
+			if (!class_exists('Security')) {
+				require LIBS . 'security.php';
+			}
+			$string = Security::generateAuthKey();
+			$result = str_replace($match[0], "\t" . 'Configure::write(\'Security.salt\', \''.$string.'\');', $contents);
+			if ($File->write($result)) {
+				return true;
+			}
+			return false;
+		}
+		return false;
+	}
+
+	/**
+	 * Generates and writes 'Security.cipherSeed'
+	 *
+	 * @param string $path Project path
+	 * @return boolean Success
+	 * @access public
+	 */
+		function securityCipherSeed($path) {
+			$File =& new File($path . 'config' . DS . 'core.php');
+			$contents = $File->read();
+			if (preg_match('/([\\t\\x20]*Configure::write\\(\\\'Security.cipherSeed\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
+				if (!class_exists('Security')) {
+					require LIBS . 'security.php';
+				}
+				$string = substr(bin2hex(Security::generateAuthKey()), 0, 30);
+				$result = str_replace($match[0], "\t" . 'Configure::write(\'Security.cipherSeed\', \''.$string.'\');', $contents);
+				if ($File->write($result)) {
+					return true;
+				}
+				return false;
+			}
+			return false;
+		}
+
+/**
+ * Generates and writes CAKE_CORE_INCLUDE_PATH
+ *
+ * @param string $path Project path
+ * @return boolean Success
+ * @access public
+ */
+	function corePath($path) {
+		if (dirname($path) !== CAKE_CORE_INCLUDE_PATH) {
+			$File =& new File($path . 'webroot' . DS . 'index.php');
+			$contents = $File->read();
+			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
+				$root = strpos(CAKE_CORE_INCLUDE_PATH, '/') === 0 ? " DS . '" : "'";
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', " . $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "');", $contents);
+				if (!$File->write($result)) {
+					return false;
+				}
+			} else {
+				return false;
+			}
+
+			$File =& new File($path . 'webroot' . DS . 'test.php');
+			$contents = $File->read();
+			if (preg_match('/([\\t\\x20]*define\\(\\\'CAKE_CORE_INCLUDE_PATH\\\',[\\t\\x20\'A-z0-9]*\\);)/', $contents, $match)) {
+				$result = str_replace($match[0], "\t\tdefine('CAKE_CORE_INCLUDE_PATH', " . $root . str_replace(DS, "' . DS . '", trim(CAKE_CORE_INCLUDE_PATH, DS)) . "');", $contents);
+				if (!$File->write($result)) {
+					return false;
+				}
+			} else {
+				return false;
+			}
+			return true;
+		}
+	}
+
+/**
+ * Enables Configure::read('Routing.prefixes') in /app/config/core.php
+ *
+ * @param string $name Name to use as admin routing
+ * @return boolean Success
+ * @access public
+ */
+	function cakeAdmin($name) {
+		$path = (empty($this->configPath)) ? CONFIGS : $this->configPath;
+		$File =& new File($path . 'core.php');
+		$contents = $File->read();
+		if (preg_match('%([/\\t\\x20]*Configure::write\(\'Routing.prefixes\',[\\t\\x20\'a-z,\)\(]*\\);)%', $contents, $match)) {
+			$result = str_replace($match[0], "\t" . 'Configure::write(\'Routing.prefixes\', array(\''.$name.'\'));', $contents);
+			if ($File->write($result)) {
+				Configure::write('Routing.prefixes', array($name));
+				return true;
+			} else {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Checks for Configure::read('Routing.prefixes') and forces user to input it if not enabled
+ *
+ * @return string Admin route to use
+ * @access public
+ */
+	function getPrefix() {
+		$admin = '';
+		$prefixes = Configure::read('Routing.prefixes');
+		if (!empty($prefixes)) {
+			if (count($prefixes) == 1) {
+				return $prefixes[0] . '_';
+			}
+			if ($this->interactive) {
+				$this->out();
+				$this->out(__('You have more than one routing prefix configured', true));
+			}
+			$options = array();
+			foreach ($prefixes as $i => $prefix) {
+				$options[] = $i + 1;
+				if ($this->interactive) {
+					$this->out($i + 1 . '. ' . $prefix);
+				}
+			}
+			$selection = $this->in(__('Please choose a prefix to bake with.', true), $options, 1);
+			return $prefixes[$selection - 1] . '_';
+		}
+		if ($this->interactive) {
+			$this->hr();
+			$this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.');
+			$this->out(__('What would you like the prefix route to be?', true));
+			$this->out(__('Example: www.example.com/admin/controller', true));
+			while ($admin == '') {
+				$admin = $this->in(__("Enter a routing prefix:", true), null, 'admin');
+			}
+			if ($this->cakeAdmin($admin) !== true) {
+				$this->out(__('Unable to write to /app/config/core.php.', true));
+				$this->out('You need to enable Configure::write(\'Routing.prefixes\',array(\'admin\')) in /app/config/core.php to use prefix routing.');
+				$this->_stop();
+			}
+			return $admin . '_';
+		}
+		return '';
+	}
+
+/**
+ * Help
+ *
+ * @return void
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake project <arg1>");
+		$this->hr();
+		$this->out('Commands:');
+		$this->out();
+		$this->out("project <name>");
+		$this->out("\tbakes app directory structure.");
+		$this->out("\tif <name> begins with '/' path is absolute.");
+		$this->out();
+		$this->_stop();
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/template.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/template.php
new file mode 100644
index 000000000..aac544abc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/template.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Template Task can generate templated output Used in other Tasks
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class TemplateTask extends Shell {
+
+/**
+ * variables to add to template scope
+ *
+ * @var array
+ */
+	var $templateVars = array();
+
+/**
+ * Paths to look for templates on.
+ * Contains a list of $theme => $path
+ *
+ * @var array
+ */
+	var $templatePaths = array();
+
+/**
+ * Initialize callback.  Setup paths for the template task.
+ *
+ * @access public
+ * @return void
+ */
+	function initialize() {
+		$this->templatePaths = $this->_findThemes();
+	}
+
+/**
+ * Find the paths to all the installed shell themes in the app.
+ *
+ * Bake themes are directories not named `skel` inside a `vendors/shells/templates` path.
+ *
+ * @return array Array of bake themes that are installed.
+ */
+	function _findThemes() {
+		$paths = App::path('shells');
+		$core = array_pop($paths);
+		$separator = DS === '/' ? '/' : '\\\\';
+		$core = preg_replace('#libs' . $separator . '$#', '', $core);
+
+		$Folder =& new Folder($core . 'templates' . DS . 'default');
+		$contents = $Folder->read();
+		$themeFolders = $contents[0];
+
+		$plugins = App::objects('plugin');
+		foreach ($plugins as $plugin) {
+			$paths[] = $this->_pluginPath($plugin) . 'vendors' . DS . 'shells' . DS;
+		}
+		$paths[] = $core;
+
+		// TEMPORARY TODO remove when all paths are DS terminated
+		foreach ($paths as $i => $path) {
+			$paths[$i] = rtrim($path, DS) . DS;
+		}
+
+		$themes = array();
+		foreach ($paths as $path) {
+			$Folder =& new Folder($path . 'templates', false);
+			$contents = $Folder->read();
+			$subDirs = $contents[0];
+			foreach ($subDirs as $dir) {
+				if (empty($dir) || preg_match('@^skel$|_skel$@', $dir)) {
+					continue;
+				}
+				$Folder =& new Folder($path . 'templates' . DS . $dir);
+				$contents = $Folder->read();
+				$subDirs = $contents[0];
+				if (array_intersect($contents[0], $themeFolders)) {
+					$templateDir = $path . 'templates' . DS . $dir . DS;
+					$themes[$dir] = $templateDir;
+				}
+			}
+		}
+		return $themes;
+	}
+
+/**
+ * Set variable values to the template scope
+ *
+ * @param mixed $one A string or an array of data.
+ * @param mixed $two Value in case $one is a string (which then works as the key).
+ *   Unused if $one is an associative array, otherwise serves as the values to $one's keys.
+ * @return void
+ */
+	function set($one, $two = null) {
+		$data = null;
+		if (is_array($one)) {
+			if (is_array($two)) {
+				$data = array_combine($one, $two);
+			} else {
+				$data = $one;
+			}
+		} else {
+			$data = array($one => $two);
+		}
+
+		if ($data == null) {
+			return false;
+		}
+		$this->templateVars = $data + $this->templateVars;
+	}
+
+/**
+ * Runs the template
+ *
+ * @param string $directory directory / type of thing you want
+ * @param string $filename template name
+ * @param string $vars Additional vars to set to template scope.
+ * @access public
+ * @return contents of generated code template
+ */
+	function generate($directory, $filename, $vars = null) {
+		if ($vars !== null) {
+			$this->set($vars);
+		}
+		if (empty($this->templatePaths)) {
+			$this->initialize();
+		}
+		$themePath = $this->getThemePath();
+		$templateFile = $this->_findTemplate($themePath, $directory, $filename);
+		if ($templateFile) {
+			extract($this->templateVars);
+			ob_start();
+			ob_implicit_flush(0);
+			include($templateFile);
+			$content = ob_get_clean();
+			return $content;
+		}
+		return '';
+	}
+
+/**
+ * Find the theme name for the current operation.
+ * If there is only one theme in $templatePaths it will be used.
+ * If there is a -theme param in the cli args, it will be used.
+ * If there is more than one installed theme user interaction will happen
+ *
+ * @return string returns the path to the selected theme.
+ */
+	function getThemePath() {
+		if (count($this->templatePaths) == 1) {
+			$paths = array_values($this->templatePaths);
+			return $paths[0];
+		}
+		if (!empty($this->params['theme']) && isset($this->templatePaths[$this->params['theme']])) {
+			return $this->templatePaths[$this->params['theme']];
+		}
+
+		$this->hr();
+		$this->out(__('You have more than one set of templates installed.', true));
+		$this->out(__('Please choose the template set you wish to use:', true));
+		$this->hr();
+
+		$i = 1;
+		$indexedPaths = array();
+		foreach ($this->templatePaths as $key => $path) {
+			$this->out($i . '. ' . $key);
+			$indexedPaths[$i] = $path;
+			$i++;
+		}
+		$index = $this->in(__('Which bake theme would you like to use?', true), range(1, $i - 1), 1);
+		$themeNames = array_keys($this->templatePaths);
+		$this->Dispatch->params['theme'] = $themeNames[$index - 1];
+		return $indexedPaths[$index];
+	}
+
+/**
+ * Find a template inside a directory inside a path.
+ * Will scan all other theme dirs if the template is not found in the first directory.
+ *
+ * @param string $path The initial path to look for the file on. If it is not found fallbacks will be used.
+ * @param string $directory Subdirectory to look for ie. 'views', 'objects'
+ * @param string $filename lower_case_underscored filename you want.
+ * @access public
+ * @return string filename will exit program if template is not found.
+ */
+	function _findTemplate($path, $directory, $filename) {
+		$themeFile = $path . $directory . DS . $filename . '.ctp';
+		if (file_exists($themeFile)) {
+			return $themeFile;
+		}
+		foreach ($this->templatePaths as $path) {
+			$templatePath = $path . $directory . DS . $filename . '.ctp';
+			if (file_exists($templatePath)) {
+				return $templatePath;
+			}
+		}
+		$this->err(sprintf(__('Could not find template for %s', true), $filename));
+		return false;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/test.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/test.php
new file mode 100644
index 000000000..ed9c7e433
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/test.php
@@ -0,0 +1,469 @@
+<?php
+/**
+ * The TestTask handles creating and updating test files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+include_once dirname(__FILE__) . DS . 'bake.php';
+
+/**
+ * Task class for creating and updating test files.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class TestTask extends BakeTask {
+
+/**
+ * path to TESTS directory
+ *
+ * @var string
+ * @access public
+ */
+	var $path = TESTS;
+
+/**
+ * Tasks used.
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('Template');
+
+/**
+ * class types that methods can be generated for
+ *
+ * @var array
+ * @access public
+ */
+	var $classTypes =  array('Model', 'Controller', 'Component', 'Behavior', 'Helper');
+
+/**
+ * Internal list of fixtures that have been added so far.
+ *
+ * @var string
+ * @access protected
+ */
+	var $_fixtures = array();
+
+
+/**
+ * Execution method always used for tasks
+ *
+ * @access public
+ */
+	function execute() {
+		if (empty($this->args)) {
+			$this->__interactive();
+		}
+
+		if (count($this->args) == 1) {
+			$this->__interactive($this->args[0]);
+		}
+
+		if (count($this->args) > 1) {
+			$type = Inflector::underscore($this->args[0]);
+			if ($this->bake($type, $this->args[1])) {
+				$this->out('done');
+			}
+		}
+	}
+
+/**
+ * Handles interactive baking
+ *
+ * @access private
+ */
+	function __interactive($type = null) {
+		$this->interactive = true;
+		$this->hr();
+		$this->out(__('Bake Tests', true));
+		$this->out(sprintf(__("Path: %s", true), $this->path));
+		$this->hr();
+
+		if ($type) {
+			$type = Inflector::camelize($type);
+			if (!in_array($type, $this->classTypes)) {
+				$this->error(sprintf('Incorrect type provided.  Please choose one of %s', implode(', ', $this->classTypes)));
+			}
+		} else {
+			$type = $this->getObjectType();
+		}
+		$className = $this->getClassName($type);
+		return $this->bake($type, $className);
+	}
+
+/**
+ * Completes final steps for generating data to create test case.
+ *
+ * @param string $type Type of object to bake test case for ie. Model, Controller
+ * @param string $className the 'cake name' for the class ie. Posts for the PostsController
+ * @access public
+ */
+	function bake($type, $className) {
+		if ($this->typeCanDetectFixtures($type) && $this->isLoadableClass($type, $className)) {
+			$this->out(__('Bake is detecting possible fixtures..', true));
+			$testSubject =& $this->buildTestSubject($type, $className);
+			$this->generateFixtureList($testSubject);
+		} elseif ($this->interactive) {
+			$this->getUserFixtures();
+		}
+		$fullClassName = $this->getRealClassName($type, $className);
+
+		$methods = array();
+		if (class_exists($fullClassName)) {
+			$methods = $this->getTestableMethods($fullClassName);
+		}
+		$mock = $this->hasMockClass($type, $fullClassName);
+		$construction = $this->generateConstructor($type, $fullClassName);
+
+		$plugin = null;
+		if ($this->plugin) {
+			$plugin = $this->plugin . '.';
+		}
+
+		$this->Template->set('fixtures', $this->_fixtures);
+		$this->Template->set('plugin', $plugin);
+		$this->Template->set(compact('className', 'methods', 'type', 'fullClassName', 'mock', 'construction'));
+		$out = $this->Template->generate('classes', 'test');
+
+		$filename = $this->testCaseFileName($type, $className);
+		$made = $this->createFile($filename, $out);
+		if ($made) {
+			return $out;
+		}
+		return false;
+	}
+
+/**
+ * Interact with the user and get their chosen type. Can exit the script.
+ *
+ * @return string Users chosen type.
+ * @access public
+ */
+	function getObjectType() {
+		$this->hr();
+		$this->out(__("Select an object type:", true));
+		$this->hr();
+
+		$keys = array();
+		foreach ($this->classTypes as $key => $option) {
+			$this->out(++$key . '. ' . $option);
+			$keys[] = $key;
+		}
+		$keys[] = 'q';
+		$selection = $this->in(__("Enter the type of object to bake a test for or (q)uit", true), $keys, 'q');
+		if ($selection == 'q') {
+			return $this->_stop();
+		}
+		return $this->classTypes[$selection - 1];
+	}
+
+/**
+ * Get the user chosen Class name for the chosen type
+ *
+ * @param string $objectType Type of object to list classes for i.e. Model, Controller.
+ * @return string Class name the user chose.
+ * @access public
+ */
+	function getClassName($objectType) {
+		$type = strtolower($objectType);
+		if ($this->plugin) {
+			$path = Inflector::pluralize($type);
+			if ($type === 'helper') {
+				$path = 'views' . DS . $path;
+			} elseif ($type === 'component') {
+				$path = 'controllers' . DS . $path;
+			} elseif ($type === 'behavior') {
+				$path = 'models' . DS . $path;
+			}
+			$options = App::objects($type, App::pluginPath($this->plugin) . $path, false);
+		} else {
+			$options = App::objects($type);
+		}
+		$this->out(sprintf(__('Choose a %s class', true), $objectType));
+		$keys = array();
+		foreach ($options as $key => $option) {
+			$this->out(++$key . '. ' . $option);
+			$keys[] = $key;
+		}
+		$selection = $this->in(__('Choose an existing class, or enter the name of a class that does not exist', true));
+		if (isset($options[$selection - 1])) {
+			return $options[$selection - 1];
+		}
+		return $selection;
+	}
+
+/**
+ * Checks whether the chosen type can find its own fixtures.
+ * Currently only model, and controller are supported
+ * 
+ * @param string $type The Type of object you are generating tests for eg. controller
+ * @param string $className the Classname of the class the test is being generated for.
+ * @return boolean
+ * @access public
+ */
+	function typeCanDetectFixtures($type) {
+		$type = strtolower($type);
+		return ($type == 'controller' || $type == 'model');
+	}
+
+/**
+ * Check if a class with the given type is loaded or can be loaded.
+ *
+ * @param string $type The Type of object you are generating tests for eg. controller
+ * @param string $className the Classname of the class the test is being generated for.
+ * @return boolean
+ * @access public
+ */
+	function isLoadableClass($type, $class) {
+		return App::import($type, $class);
+	}
+
+/**
+ * Construct an instance of the class to be tested.
+ * So that fixtures can be detected
+ *
+ * @param string $type The Type of object you are generating tests for eg. controller
+ * @param string $class the Classname of the class the test is being generated for.
+ * @return object And instance of the class that is going to be tested.
+ * @access public
+ */
+	function &buildTestSubject($type, $class) {
+		ClassRegistry::flush();
+		App::import($type, $class);
+		$class = $this->getRealClassName($type, $class);
+		if (strtolower($type) == 'model') {
+			$instance =& ClassRegistry::init($class);
+		} else {
+			$instance =& new $class();
+		}
+		return $instance;
+	}
+
+/**
+ * Gets the real class name from the cake short form.
+ *
+ * @param string $type The Type of object you are generating tests for eg. controller
+ * @param string $class the Classname of the class the test is being generated for.
+ * @return string Real classname
+ * @access public
+ */
+	function getRealClassName($type, $class) {
+		if (strtolower($type) == 'model') {
+			return $class;
+		}
+		return $class . $type;
+	}
+
+/**
+ * Get methods declared in the class given.
+ * No parent methods will be returned
+ *
+ * @param string $className Name of class to look at.
+ * @return array Array of method names.
+ * @access public
+ */
+	function getTestableMethods($className) {
+		$classMethods = get_class_methods($className);
+		$parentMethods = get_class_methods(get_parent_class($className));
+		$thisMethods = array_diff($classMethods, $parentMethods);
+		$out = array();
+		foreach ($thisMethods as $method) {
+			if (substr($method, 0, 1) != '_' && $method != strtolower($className)) {
+				$out[] = $method;
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate the list of fixtures that will be required to run this test based on
+ * loaded models.
+ *
+ * @param object $subject The object you want to generate fixtures for.
+ * @return array Array of fixtures to be included in the test.
+ * @access public
+ */
+	function generateFixtureList(&$subject) {
+		$this->_fixtures = array();
+		if (is_a($subject, 'Model')) {
+			$this->_processModel($subject);
+		} elseif (is_a($subject, 'Controller')) {
+			$this->_processController($subject);
+		}
+		return array_values($this->_fixtures);
+	}
+
+/**
+ * Process a model recursively and pull out all the
+ * model names converting them to fixture names.
+ *
+ * @param Model $subject A Model class to scan for associations and pull fixtures off of.
+ * @return void
+ * @access protected
+ */
+	function _processModel(&$subject) {
+		$this->_addFixture($subject->name);
+		$associated = $subject->getAssociated();
+		foreach ($associated as $alias => $type) {
+			$className = $subject->{$alias}->name;
+			if (!isset($this->_fixtures[$className])) {
+				$this->_processModel($subject->{$alias});
+			}
+			if ($type == 'hasAndBelongsToMany') {
+				$joinModel = Inflector::classify($subject->hasAndBelongsToMany[$alias]['joinTable']);
+				if (!isset($this->_fixtures[$joinModel])) {
+					$this->_processModel($subject->{$joinModel});
+				}
+			}
+		}
+	}
+
+/**
+ * Process all the models attached to a controller
+ * and generate a fixture list.
+ *
+ * @param Controller $subject A controller to pull model names off of.
+ * @return void
+ * @access protected
+ */
+	function _processController(&$subject) {
+		$subject->constructClasses();
+		$models = array(Inflector::classify($subject->name));
+		if (!empty($subject->uses)) {
+			$models = $subject->uses;
+		}
+		foreach ($models as $model) {
+			$this->_processModel($subject->{$model});
+		}
+	}
+
+/**
+ * Add classname to the fixture list.
+ * Sets the app. or plugin.plugin_name. prefix.
+ *
+ * @param string $name Name of the Model class that a fixture might be required for.
+ * @return void
+ * @access protected
+ */
+	function _addFixture($name) {
+		$parent = get_parent_class($name);
+		$prefix = 'app.';
+		if (strtolower($parent) != 'appmodel' && strtolower(substr($parent, -8)) == 'appmodel') {
+			$pluginName = substr($parent, 0, strlen($parent) -8);
+			$prefix = 'plugin.' . Inflector::underscore($pluginName) . '.';
+		}
+		$fixture = $prefix . Inflector::underscore($name);
+		$this->_fixtures[$name] = $fixture;
+	}
+
+/**
+ * Interact with the user to get additional fixtures they want to use.
+ *
+ * @return array Array of fixtures the user wants to add.
+ * @access public
+ */
+	function getUserFixtures() {
+		$proceed = $this->in(__('Bake could not detect fixtures, would you like to add some?', true), array('y','n'), 'n');
+		$fixtures = array();
+		if (strtolower($proceed) == 'y') {
+			$fixtureList = $this->in(__("Please provide a comma separated list of the fixtures names you'd like to use.\nExample: 'app.comment, app.post, plugin.forums.post'", true));
+			$fixtureListTrimmed = str_replace(' ', '', $fixtureList);
+			$fixtures = explode(',', $fixtureListTrimmed);
+		}
+		$this->_fixtures = array_merge($this->_fixtures, $fixtures);
+		return $fixtures;
+	}
+
+/**
+ * Is a mock class required for this type of test?
+ * Controllers require a mock class.
+ *
+ * @param string $type The type of object tests are being generated for eg. controller.
+ * @return boolean
+ * @access public
+ */
+	function hasMockClass($type) {
+		$type = strtolower($type);
+		return $type == 'controller';
+	}
+
+/**
+ * Generate a constructor code snippet for the type and classname
+ *
+ * @param string $type The Type of object you are generating tests for eg. controller
+ * @param string $className the Classname of the class the test is being generated for.
+ * @return string Constructor snippet for the thing you are building.
+ * @access public
+ */
+	function generateConstructor($type, $fullClassName) {
+		$type = strtolower($type);
+		if ($type == 'model') {
+			return "ClassRegistry::init('$fullClassName');\n";
+		}
+		if ($type == 'controller') {
+			$className = substr($fullClassName, 0, strlen($fullClassName) - 10);
+			return "new Test$fullClassName();\n\t\t\$this->{$className}->constructClasses();\n";
+		}
+		return "new $fullClassName();\n";
+	}
+
+/**
+ * Make the filename for the test case. resolve the suffixes for controllers
+ * and get the plugin path if needed.
+ *
+ * @param string $type The Type of object you are generating tests for eg. controller
+ * @param string $className the Classname of the class the test is being generated for.
+ * @return string filename the test should be created on.
+ * @access public
+ */
+	function testCaseFileName($type, $className) {
+		$path = $this->getPath();;
+		$path .= 'cases' . DS . strtolower($type) . 's' . DS;
+		if (strtolower($type) == 'controller') {
+			$className = $this->getRealClassName($type, $className);
+		}
+		return $path . Inflector::underscore($className) . '.test.php';
+	}
+
+/**
+ * Show help file.
+ *
+ * @return void
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake test <type> <class>");
+		$this->hr();
+		$this->out('Commands:');
+		$this->out("");
+		$this->out("test model post\n\tbakes a test case for the post model.");
+		$this->out("");
+		$this->out("test controller comments\n\tbakes a test case for the comments controller.");
+		$this->out("");
+		$this->out('Arguments:');
+		$this->out("\t<type>   Can be any of the following 'controller', 'model', 'helper',\n\t'component', 'behavior'.");
+		$this->out("\t<class>  Any existing class for the chosen type.");
+		$this->out("");
+		$this->out("Parameters:");
+		$this->out("\t-plugin  CamelCased name of plugin to bake tests for.");
+		$this->out("");
+		$this->_stop();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/view.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/view.php
new file mode 100644
index 000000000..b9ff719d1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/view.php
@@ -0,0 +1,498 @@
+<?php
+/**
+ * The View Tasks handles creating and updating view files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Controller', 'Controller', false);
+include_once dirname(__FILE__) . DS . 'bake.php';
+
+/**
+ * Task class for creating and updating view files.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.tasks
+ */
+class ViewTask extends BakeTask {
+
+/**
+ * Tasks to be loaded by this Task
+ *
+ * @var array
+ * @access public
+ */
+	var $tasks = array('Project', 'Controller', 'DbConfig', 'Template');
+
+/**
+ * path to VIEWS directory
+ *
+ * @var array
+ * @access public
+ */
+	var $path = VIEWS;
+
+/**
+ * Name of the controller being used
+ *
+ * @var string
+ * @access public
+ */
+	var $controllerName = null;
+
+/**
+ * Path to controller to put views
+ *
+ * @var string
+ * @access public
+ */
+	var $controllerPath = null;
+
+/**
+ * The template file to use
+ *
+ * @var string
+ * @access public
+ */
+	var $template = null;
+
+/**
+ * Actions to use for scaffolding
+ *
+ * @var array
+ * @access public
+ */
+	var $scaffoldActions = array('index', 'view', 'add', 'edit');
+
+/**
+ * An array of action names that don't require templates.  These
+ * actions will not emit errors when doing bakeActions()
+ *
+ * @var array
+ * @access public
+ */
+	var $noTemplateActions = array('delete');
+
+/**
+ * Override initialize
+ *
+ * @access public
+ */
+	function initialize() {
+	}
+
+/**
+ * Execution method always used for tasks
+ *
+ * @access public
+ */
+	function execute() {
+		if (empty($this->args)) {
+			$this->__interactive();
+		}
+		if (empty($this->args[0])) {
+			return;
+		}
+		if (!isset($this->connection)) {
+			$this->connection = 'default';
+		}
+		$controller = $action = $alias = null;
+		$this->controllerName = $this->_controllerName($this->args[0]);
+		$this->controllerPath = $this->_controllerPath($this->controllerName);
+
+		$this->Project->interactive = false;
+		if (strtolower($this->args[0]) == 'all') {
+			return $this->all();
+		}
+
+		if (isset($this->args[1])) {
+			$this->template = $this->args[1];
+		}
+		if (isset($this->args[2])) {
+			$action = $this->args[2];
+		}
+		if (!$action) {
+			$action = $this->template;
+		}
+		if ($action) {
+			return $this->bake($action, true);
+		}
+
+		$vars = $this->__loadController();
+		$methods = $this->_methodsToBake();
+
+		foreach ($methods as $method) {
+			$content = $this->getContent($method, $vars);
+			if ($content) {
+				$this->bake($method, $content);
+			}
+		}
+	}
+
+/**
+ * Get a list of actions that can / should have views baked for them.
+ *
+ * @return array Array of action names that should be baked
+ */
+	function _methodsToBake() {
+		$methods =  array_diff(
+			array_map('strtolower', get_class_methods($this->controllerName . 'Controller')),
+			array_map('strtolower', get_class_methods('appcontroller'))
+		);
+		$scaffoldActions = false;
+		if (empty($methods)) {
+			$scaffoldActions = true;
+			$methods = $this->scaffoldActions;
+		}
+		$adminRoute = $this->Project->getPrefix();
+		foreach ($methods as $i => $method) {
+			if ($adminRoute && isset($this->params['admin'])) {
+				if ($scaffoldActions) {
+					$methods[$i] = $adminRoute . $method;
+					continue;
+				} elseif (strpos($method, $adminRoute) === false) {
+					unset($methods[$i]);
+				}
+			}
+			if ($method[0] === '_' || $method == strtolower($this->controllerName . 'Controller')) {
+				unset($methods[$i]);
+			}
+		}
+		return $methods;
+	}
+
+/**
+ * Bake All views for All controllers.
+ *
+ * @return void
+ */
+	function all() {
+		$this->Controller->interactive = false;
+		$tables = $this->Controller->listAll($this->connection, false);
+
+		$actions = null;
+		if (isset($this->args[1])) {
+			$actions = array($this->args[1]);
+		}
+		$this->interactive = false;
+		foreach ($tables as $table) {
+			$model = $this->_modelName($table);
+			$this->controllerName = $this->_controllerName($model);
+			$this->controllerPath = Inflector::underscore($this->controllerName);
+			if (App::import('Model', $model)) {
+				$vars = $this->__loadController();
+				if (!$actions) {
+					$actions = $this->_methodsToBake();
+				}
+				$this->bakeActions($actions, $vars);
+				$actions = null;
+			}
+		}
+	}
+
+/**
+ * Handles interactive baking
+ *
+ * @access private
+ */
+	function __interactive() {
+		$this->hr();
+		$this->out(sprintf("Bake View\nPath: %s", $this->path));
+		$this->hr();
+
+		$this->DbConfig->interactive = $this->Controller->interactive = $this->interactive = true;
+
+		if (empty($this->connection)) {
+			$this->connection = $this->DbConfig->getConfig();
+		}
+
+		$this->Controller->connection = $this->connection;
+		$this->controllerName = $this->Controller->getName();
+
+		$this->controllerPath = strtolower(Inflector::underscore($this->controllerName));
+
+		$prompt = sprintf(__("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", true),  $this->controllerName);
+		$interactive = $this->in($prompt, array('y', 'n'), 'y');
+
+		if (strtolower($interactive) == 'n') {
+			$this->interactive = false;
+		}
+
+		$prompt = __("Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models).", true);
+		$wannaDoScaffold = $this->in($prompt, array('y','n'), 'y');
+
+		$wannaDoAdmin = $this->in(__("Would you like to create the views for admin routing?", true), array('y','n'), 'y');
+
+		if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') {
+			$vars = $this->__loadController();
+			if (strtolower($wannaDoScaffold) == 'y') {
+				$actions = $this->scaffoldActions;
+				$vars['scaffoldPrefix'] = null;
+				$this->bakeActions($actions, $vars);
+			}
+			if (strtolower($wannaDoAdmin) == 'y') {
+				$admin = $this->Project->getPrefix();
+				$regularActions = $this->scaffoldActions;
+				$adminActions = array();
+				foreach ($regularActions as $action) {
+					$adminActions[] = $admin . $action;
+				}
+				$vars['scaffoldPrefix'] = $admin;
+				$this->bakeActions($adminActions, $vars);
+			}
+			$this->hr();
+			$this->out();
+			$this->out(__("View Scaffolding Complete.\n", true));
+		} else {
+			$this->customAction();
+		}
+	}
+
+/**
+ * Loads Controller and sets variables for the template
+ * Available template variables
+ *	'modelClass', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
+ *	'singularHumanName', 'pluralHumanName', 'fields', 'foreignKeys',
+ *	'belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'
+ *
+ * @return array Returns an variables to be made available to a view template
+ * @access private
+ */
+	function __loadController() {
+		if (!$this->controllerName) {
+			$this->err(__('Controller not found', true));
+		}
+
+		$import = $this->controllerName;
+		if ($this->plugin) {
+			$import = $this->plugin . '.' . $this->controllerName;
+		}
+
+		if (!App::import('Controller', $import)) {
+			$file = $this->controllerPath . '_controller.php';
+			$this->err(sprintf(__("The file '%s' could not be found.\nIn order to bake a view, you'll need to first create the controller.", true), $file));
+			$this->_stop();
+		}
+		$controllerClassName = $this->controllerName . 'Controller';
+		$controllerObj =& new $controllerClassName();
+		$controllerObj->plugin = $this->plugin;
+		$controllerObj->constructClasses();
+		$modelClass = $controllerObj->modelClass;
+		$modelObj =& $controllerObj->{$controllerObj->modelClass};
+
+		if ($modelObj) {
+			$primaryKey = $modelObj->primaryKey;
+			$displayField = $modelObj->displayField;
+			$singularVar = Inflector::variable($modelClass);
+			$singularHumanName = $this->_singularHumanName($this->controllerName);
+			$schema = $modelObj->schema(true);
+			$fields = array_keys($schema);
+			$associations = $this->__associations($modelObj);
+			$scaffoldForbiddenActions = $modelObj->scaffoldForbiddenActions;
+		} else {
+			$primaryKey = $displayField = null;
+			$singularVar = Inflector::variable(Inflector::singularize($this->controllerName));
+			$singularHumanName = $this->_singularHumanName($this->controllerName);
+			$fields = $schema = $associations = array();
+		}
+		$controllerMethods = get_class_methods($controllerClassName);
+
+		$pluralVar = Inflector::variable($this->controllerName);
+		$pluralHumanName = $this->_pluralHumanName($this->controllerName);
+
+		return compact('modelClass', 'schema', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
+				'singularHumanName', 'pluralHumanName', 'fields','associations', 'scaffoldForbiddenActions');
+	}
+
+/**
+ * Bake a view file for each of the supplied actions
+ *
+ * @param array $actions Array of actions to make files for.
+ * @return void
+ */
+	function bakeActions($actions, $vars) {
+		foreach ($actions as $action) {
+			$content = $this->getContent($action, $vars);
+			$this->bake($action, $content);
+		}
+	}
+
+/**
+ * handle creation of baking a custom action view file
+ *
+ * @return void
+ */
+	function customAction() {
+		$action = '';
+		while ($action == '') {
+			$action = $this->in(__('Action Name? (use lowercase_underscored function name)', true));
+			if ($action == '') {
+				$this->out(__('The action name you supplied was empty. Please try again.', true));
+			}
+		}
+		$this->out();
+		$this->hr();
+		$this->out(__('The following view will be created:', true));
+		$this->hr();
+		$this->out(sprintf(__('Controller Name: %s', true), $this->controllerName));
+		$this->out(sprintf(__('Action Name:     %s', true), $action));
+		$this->out(sprintf(__('Path:            %s', true), $this->params['app'] . DS . $this->controllerPath . DS . Inflector::underscore($action) . ".ctp"));
+		$this->hr();
+		$looksGood = $this->in(__('Look okay?', true), array('y','n'), 'y');
+		if (strtolower($looksGood) == 'y') {
+			$this->bake($action);
+			$this->_stop();
+		} else {
+			$this->out(__('Bake Aborted.', true));
+		}
+	}
+
+/**
+ * Assembles and writes bakes the view file.
+ *
+ * @param string $action Action to bake
+ * @param string $content Content to write
+ * @return boolean Success
+ * @access public
+ */
+	function bake($action, $content = '') {
+		if ($content === true) {
+			$content = $this->getContent($action);
+		}
+		if (empty($content)) {
+			return false;
+		}
+		$path = $this->getPath();
+		$filename = $path . $this->controllerPath . DS . Inflector::underscore($action) . '.ctp';
+		return $this->createFile($filename, $content);
+	}
+
+/**
+ * Builds content from template and variables
+ *
+ * @param string $action name to generate content to
+ * @param array $vars passed for use in templates
+ * @return string content from template
+ * @access public
+ */
+	function getContent($action, $vars = null) {
+		if (!$vars) {
+			$vars = $this->__loadController();
+		}
+
+		$this->Template->set('action', $action);
+		$this->Template->set('plugin', $this->plugin);
+		$this->Template->set($vars);
+		$template = $this->getTemplate($action);
+		if ($template) {
+			return $this->Template->generate('views', $template);
+		}
+		return false;
+	}
+
+/**
+ * Gets the template name based on the action name
+ *
+ * @param string $action name
+ * @return string template name
+ * @access public
+ */
+	function getTemplate($action) {
+		if ($action != $this->template && in_array($action, $this->noTemplateActions)) {
+			return false;
+		}
+		if (!empty($this->template) && $action != $this->template) {
+			return $this->template;
+		} 
+		$template = $action;
+		$prefixes = Configure::read('Routing.prefixes');
+		foreach ((array)$prefixes as $prefix) {
+			if (strpos($template, $prefix) !== false) {
+				$template = str_replace($prefix . '_', '', $template);
+			}
+		}
+		if (in_array($template, array('add', 'edit'))) {
+			$template = 'form';
+		} elseif (preg_match('@(_add|_edit)$@', $template)) {
+			$template = str_replace(array('_add', '_edit'), '_form', $template);
+		}
+		return $template;
+	}
+
+/**
+ * Displays help contents
+ *
+ * @access public
+ */
+	function help() {
+		$this->hr();
+		$this->out("Usage: cake bake view <arg1> <arg2>...");
+		$this->hr();
+		$this->out('Arguments:');
+		$this->out();
+		$this->out("<controller>");
+		$this->out("\tName of the controller views to bake. Can use Plugin.name");
+		$this->out("\tas a shortcut for plugin baking.");
+		$this->out();
+		$this->out("<action>");
+		$this->out("\tName of the action view to bake");
+		$this->out();
+		$this->out('Commands:');
+		$this->out();
+		$this->out("view <controller>");
+		$this->out("\tWill read the given controller for methods");
+		$this->out("\tand bake corresponding views.");
+		$this->out("\tUsing the -admin flag will only bake views for actions");
+		$this->out("\tthat begin with Routing.admin.");
+		$this->out("\tIf var scaffold is found it will bake the CRUD actions");
+		$this->out("\t(index,view,add,edit)");
+		$this->out();
+		$this->out("view <controller> <action>");
+		$this->out("\tWill bake a template. core templates: (index, add, edit, view)");
+		$this->out();
+		$this->out("view <controller> <template> <alias>");
+		$this->out("\tWill use the template specified");
+		$this->out("\tbut name the file based on the alias");
+		$this->out();
+		$this->out("view all");
+		$this->out("\tBake all CRUD action views for all controllers.");
+		$this->out("\tRequires that models and controllers exist.");
+		$this->_stop();
+	}
+
+/**
+ * Returns associations for controllers models.
+ *
+ * @return  array $associations
+ * @access private
+ */
+	function __associations(&$model) {
+		$keys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+		$associations = array();
+
+		foreach ($keys as $key => $type) {
+			foreach ($model->{$type} as $assocKey => $assocData) {
+				$associations[$type][$assocKey]['primaryKey'] = $model->{$assocKey}->primaryKey;
+				$associations[$type][$assocKey]['displayField'] = $model->{$assocKey}->displayField;
+				$associations[$type][$assocKey]['foreignKey'] = $assocData['foreignKey'];
+				$associations[$type][$assocKey]['controller'] = Inflector::pluralize(Inflector::underscore($assocData['className']));
+				$associations[$type][$assocKey]['fields'] =  array_keys($model->{$assocKey}->schema(true));
+				$associations[$type][$assocKey]['scaffoldForbiddenActions'] = $model->{$assocKey}->scaffoldForbiddenActions;
+				$associations[$type][$assocKey]['scaffoldActions'] = $model->{$assocKey}->scaffoldActions;
+			}
+		}
+		return $associations;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/libs/testsuite.php b/code/ryzom/tools/server/www/webtt/cake/console/libs/testsuite.php
new file mode 100644
index 000000000..1a815f802
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/libs/testsuite.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * Test Suite Shell
+ *
+ * This Shell allows the running of test suites via the cake command line
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestSuiteShell extends Shell {
+
+/**
+ * The test category, "app", "core" or the name of a plugin
+ *
+ * @var string
+ * @access public
+ */
+	var $category = '';
+
+/**
+ * "group", "case" or "all"
+ *
+ * @var string
+ * @access public
+ */
+	var $type = '';
+
+/**
+ * Path to the test case/group file
+ *
+ * @var string
+ * @access public
+ */
+	var $file = '';
+
+/**
+ * Storage for plugins that have tests
+ *
+ * @var string
+ * @access public
+ */
+	var $plugins = array();
+
+/**
+ * Convenience variable to avoid duplicated code
+ *
+ * @var string
+ * @access public
+ */
+	var $isPluginTest = false;
+
+/**
+ * Stores if the user wishes to get a code coverage analysis report
+ *
+ * @var string
+ * @access public
+ */
+	var $doCoverage = false;
+
+/**
+ * Initialization method installs Simpletest and loads all plugins
+ *
+ * @return void
+ * @access public
+ */
+	function initialize() {
+		$corePath = App::core('cake');
+		if (isset($corePath[0])) {
+			define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
+		} else {
+			define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
+		}
+
+		$this->__installSimpleTest();
+
+		require_once CAKE . 'tests' . DS . 'lib' . DS . 'test_manager.php';
+		require_once CAKE . 'tests' . DS . 'lib' . DS . 'reporter' . DS . 'cake_cli_reporter.php';
+
+		$plugins = App::objects('plugin');
+		foreach ($plugins as $p) {
+			$this->plugins[] = Inflector::underscore($p);
+		}
+		$this->parseArgs();
+		$this->getManager();
+	}
+
+/**
+ * Parse the arguments given into the Shell object properties.
+ *
+ * @return void
+ * @access public
+ */
+	function parseArgs() {
+		if (empty($this->args)) {
+			return;
+		}
+		$this->category = $this->args[0];
+
+		if (!in_array($this->category, array('app', 'core'))) {
+			$this->isPluginTest = true;
+		}
+
+		if (isset($this->args[1])) {
+			$this->type = $this->args[1];
+		}
+
+		if (isset($this->args[2])) {
+			if ($this->args[2] == 'cov') {
+				$this->doCoverage = true;
+			} else {
+				$this->file = Inflector::underscore($this->args[2]);
+			}
+		}
+
+		if (isset($this->args[3]) && $this->args[3] == 'cov') {
+			$this->doCoverage = true;
+		}
+	}
+
+/**
+ * Gets a manager instance, and set the app/plugin properties.
+ *
+ * @return void
+ */
+	function getManager() {
+		$this->Manager = new TestManager();
+		$this->Manager->appTest = ($this->category === 'app');
+		if ($this->isPluginTest) {
+			$this->Manager->pluginTest = $this->category;
+		}
+	}
+
+/**
+ * Main entry point to this shell
+ *
+ * @return void
+ * @access public
+ */
+	function main() {
+		$this->out(__('CakePHP Test Shell', true));
+		$this->hr();
+
+		if (count($this->args) == 0) {
+			$this->error(__('Sorry, you did not pass any arguments!', true));
+		}
+
+		if ($this->__canRun()) {
+			$message = sprintf(__('Running %s %s %s', true), $this->category, $this->type, $this->file);
+			$this->out($message);
+
+			$exitCode = 0;
+			if (!$this->__run()) {
+				$exitCode = 1;
+			}
+			$this->_stop($exitCode);
+		} else {
+			$this->error(__('Sorry, the tests could not be found.', true));
+		}
+	}
+
+/**
+ * Help screen
+ *
+ * @return void
+ * @access public
+ */
+	function help() {
+		$this->out('Usage: ');
+		$this->out("\tcake testsuite category test_type file");
+		$this->out("\t\t- category - \"app\", \"core\" or name of a plugin");
+		$this->out("\t\t- test_type - \"case\", \"group\" or \"all\"");
+		$this->out("\t\t- test_file - file name with folder prefix and without the (test|group).php suffix");
+		$this->out();
+		$this->out('Examples: ');
+		$this->out("\t\tcake testsuite app all");
+		$this->out("\t\tcake testsuite core all");
+		$this->out();
+		$this->out("\t\tcake testsuite app case behaviors/debuggable");
+		$this->out("\t\tcake testsuite app case models/my_model");
+		$this->out("\t\tcake testsuite app case controllers/my_controller");
+		$this->out();
+		$this->out("\t\tcake testsuite core case file");
+		$this->out("\t\tcake testsuite core case router");
+		$this->out("\t\tcake testsuite core case set");
+		$this->out();
+		$this->out("\t\tcake testsuite app group mygroup");
+		$this->out("\t\tcake testsuite core group acl");
+		$this->out("\t\tcake testsuite core group socket");
+		$this->out();
+		$this->out("\t\tcake testsuite bugs case models/bug");
+		$this->out("\t\t  // for the plugin 'bugs' and its test case 'models/bug'");
+		$this->out("\t\tcake testsuite bugs group bug");
+		$this->out("\t\t  // for the plugin bugs and its test group 'bug'");
+		$this->out();
+		$this->out('Code Coverage Analysis: ');
+		$this->out("\n\nAppend 'cov' to any of the above in order to enable code coverage analysis");
+	}
+
+/**
+ * Checks if the arguments supplied point to a valid test file and thus the shell can be run.
+ *
+ * @return bool true if it's a valid test file, false otherwise
+ * @access private
+ */
+	function __canRun() {
+		$isNeitherAppNorCore = !in_array($this->category, array('app', 'core'));
+		$isPlugin = in_array(Inflector::underscore($this->category), $this->plugins);
+
+		if ($isNeitherAppNorCore && !$isPlugin) {
+			$message = sprintf(
+				__('%s is an invalid test category (either "app", "core" or name of a plugin)', true),
+				$this->category
+			);
+			$this->error($message);
+			return false;
+		}
+
+		$folder = $this->__findFolderByCategory($this->category);
+		if (!file_exists($folder)) {
+			$this->err(sprintf(__('%s not found', true), $folder));
+			return false;
+		}
+
+		if (!in_array($this->type, array('all', 'group', 'case'))) {
+			$this->err(sprintf(__('%s is invalid. Should be case, group or all', true), $this->type));
+			return false;
+		}
+
+		$fileName = $this->__getFileName($folder, $this->isPluginTest);
+		if ($fileName === true || file_exists($folder . $fileName)) {
+			return true;
+		}
+
+		$message = sprintf(
+			__('%s %s %s is an invalid test identifier', true),
+			$this->category, $this->type, $this->file
+		);
+		$this->err($message);
+		return false;
+	}
+/**
+ * Executes the tests depending on our settings
+ *
+ * @return void
+ * @access private
+ */
+	function __run() {
+		$Reporter = new CakeCliReporter('utf-8', array(
+			'app' => $this->Manager->appTest,
+			'plugin' => $this->Manager->pluginTest,
+			'group' => ($this->type === 'group'),
+			'codeCoverage' => $this->doCoverage
+		));
+
+		if ($this->type == 'all') {
+			return $this->Manager->runAllTests($Reporter);
+		}
+
+		if ($this->doCoverage) {
+			if (!extension_loaded('xdebug')) {
+				$this->out(__('You must install Xdebug to use the CakePHP(tm) Code Coverage Analyzation. Download it from http://www.xdebug.org/docs/install', true));
+				$this->_stop(0);
+			}
+		}
+
+		if ($this->type == 'group') {
+			$ucFirstGroup = ucfirst($this->file);
+			if ($this->doCoverage) {
+				require_once CAKE . 'tests' . DS . 'lib' . DS . 'code_coverage_manager.php';
+				CodeCoverageManager::init($ucFirstGroup, $Reporter);
+				CodeCoverageManager::start();
+			}
+			$result = $this->Manager->runGroupTest($ucFirstGroup, $Reporter);
+			return $result;
+		}
+
+		$folder = $folder = $this->__findFolderByCategory($this->category);
+		$case = $this->__getFileName($folder, $this->isPluginTest);
+
+		if ($this->doCoverage) {
+			require_once CAKE . 'tests' . DS . 'lib' . DS . 'code_coverage_manager.php';
+			CodeCoverageManager::init($case, $Reporter);
+			CodeCoverageManager::start();
+		}
+		$result = $this->Manager->runTestCase($case, $Reporter);
+		return $result;
+	}
+
+/**
+ * Gets the concrete filename for the inputted test name and category/type
+ *
+ * @param string $folder Folder name to look for files in.
+ * @param boolean $isPlugin If the test case is a plugin.
+ * @return mixed Either string filename or boolean false on failure. Or true if the type is 'all'
+ * @access private
+ */
+	function __getFileName($folder, $isPlugin) {
+		$ext = $this->Manager->getExtension($this->type);
+		switch ($this->type) {
+			case 'all':
+				return true;
+			case 'group':
+				return $this->file . $ext; 
+			case 'case':
+				if ($this->category == 'app' || $isPlugin) {
+					return $this->file . $ext;
+				}
+				$coreCase = $this->file . $ext;
+				$coreLibCase = 'libs' . DS . $this->file . $ext;
+
+				if ($this->category == 'core' && file_exists($folder . DS . $coreCase)) {
+					return $coreCase;
+				} elseif ($this->category == 'core' && file_exists($folder . DS . $coreLibCase)) {
+					return $coreLibCase;
+				}
+		}
+		return false;
+	}
+
+/**
+ * Finds the correct folder to look for tests for based on the input category and type.
+ *
+ * @param string $category The category of the test.  Either 'app', 'core' or a plugin name.
+ * @return string the folder path
+ * @access private
+ */
+	function __findFolderByCategory($category) {
+		$folder = '';
+		$paths = array(
+			'core' => CAKE,
+			'app' => APP
+		);
+		$typeDir = $this->type === 'group' ? 'groups' : 'cases';
+
+		if (array_key_exists($category, $paths)) {
+			$folder = $paths[$category] . 'tests' . DS . $typeDir . DS;
+		} else {
+			$pluginPath = App::pluginPath($category);
+			if (is_dir($pluginPath . 'tests')) {
+				$folder = $pluginPath . 'tests' . DS . $typeDir . DS;
+			}
+		}
+		return $folder;
+	}
+
+/**
+ * tries to install simpletest and exits gracefully if it is not there
+ *
+ * @return void
+ * @access private
+ */
+	function __installSimpleTest() {
+		if (!App::import('Vendor', 'simpletest' . DS . 'reporter')) {
+			$this->err(__('Sorry, Simpletest could not be found. Download it from http://simpletest.org and install it to your vendors directory.', true));
+			exit;
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/actions/controller_actions.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/actions/controller_actions.ctp
new file mode 100644
index 000000000..76af1b78b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/actions/controller_actions.ctp
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Bake Template for Controller action generation.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.console.libs.template.objects
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+
+	function <?php echo $admin ?>index() {
+		$this-><?php echo $currentModelName ?>->recursive = 0;
+		$this->set('<?php echo $pluralName ?>', $this->paginate());
+	}
+
+	function <?php echo $admin ?>view($id = null) {
+		if (!$id) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('Invalid <?php echo strtolower($singularHumanName) ?>', true));
+			$this->redirect(array('action' => 'index'));
+<?php else: ?>
+			$this->flash(__('Invalid <?php echo strtolower($singularHumanName); ?>', true), array('action' => 'index'));
+<?php endif; ?>
+		}
+		$this->set('<?php echo $singularName; ?>', $this-><?php echo $currentModelName; ?>->read(null, $id));
+	}
+
+<?php $compact = array(); ?>
+	function <?php echo $admin ?>add() {
+		if (!empty($this->data)) {
+			$this-><?php echo $currentModelName; ?>->create();
+			if ($this-><?php echo $currentModelName; ?>->save($this->data)) {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved', true));
+				$this->redirect(array('action' => 'index'));
+<?php else: ?>
+				$this->flash(__('<?php echo ucfirst(strtolower($currentModelName)); ?> saved.', true), array('action' => 'index'));
+<?php endif; ?>
+			} else {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.', true));
+<?php endif; ?>
+			}
+		}
+<?php
+	foreach (array('belongsTo', 'hasAndBelongsToMany') as $assoc):
+		foreach ($modelObj->{$assoc} as $associationName => $relation):
+			if (!empty($associationName)):
+				$otherModelName = $this->_modelName($associationName);
+				$otherPluralName = $this->_pluralName($associationName);
+				echo "\t\t\${$otherPluralName} = \$this->{$currentModelName}->{$otherModelName}->find('list');\n";
+				$compact[] = "'{$otherPluralName}'";
+			endif;
+		endforeach;
+	endforeach;
+	if (!empty($compact)):
+		echo "\t\t\$this->set(compact(".join(', ', $compact)."));\n";
+	endif;
+?>
+	}
+
+<?php $compact = array(); ?>
+	function <?php echo $admin; ?>edit($id = null) {
+		if (!$id && empty($this->data)) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('Invalid <?php echo strtolower($singularHumanName); ?>', true));
+			$this->redirect(array('action' => 'index'));
+<?php else: ?>
+			$this->flash(sprintf(__('Invalid <?php echo strtolower($singularHumanName); ?>', true)), array('action' => 'index'));
+<?php endif; ?>
+		}
+		if (!empty($this->data)) {
+			if ($this-><?php echo $currentModelName; ?>->save($this->data)) {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> has been saved', true));
+				$this->redirect(array('action' => 'index'));
+<?php else: ?>
+				$this->flash(__('The <?php echo strtolower($singularHumanName); ?> has been saved.', true), array('action' => 'index'));
+<?php endif; ?>
+			} else {
+<?php if ($wannaUseSession): ?>
+				$this->Session->setFlash(__('The <?php echo strtolower($singularHumanName); ?> could not be saved. Please, try again.', true));
+<?php endif; ?>
+			}
+		}
+		if (empty($this->data)) {
+			$this->data = $this-><?php echo $currentModelName; ?>->read(null, $id);
+		}
+<?php
+		foreach (array('belongsTo', 'hasAndBelongsToMany') as $assoc):
+			foreach ($modelObj->{$assoc} as $associationName => $relation):
+				if (!empty($associationName)):
+					$otherModelName = $this->_modelName($associationName);
+					$otherPluralName = $this->_pluralName($associationName);
+					echo "\t\t\${$otherPluralName} = \$this->{$currentModelName}->{$otherModelName}->find('list');\n";
+					$compact[] = "'{$otherPluralName}'";
+				endif;
+			endforeach;
+		endforeach;
+		if (!empty($compact)):
+			echo "\t\t\$this->set(compact(".join(', ', $compact)."));\n";
+		endif;
+	?>
+	}
+
+	function <?php echo $admin; ?>delete($id = null) {
+		if (!$id) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('Invalid id for <?php echo strtolower($singularHumanName); ?>', true));
+			$this->redirect(array('action'=>'index'));
+<?php else: ?>
+			$this->flash(sprintf(__('Invalid <?php echo strtolower($singularHumanName); ?>', true)), array('action' => 'index'));
+<?php endif; ?>
+		}
+		if ($this-><?php echo $currentModelName; ?>->delete($id)) {
+<?php if ($wannaUseSession): ?>
+			$this->Session->setFlash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> deleted', true));
+			$this->redirect(array('action'=>'index'));
+<?php else: ?>
+			$this->flash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> deleted', true), array('action' => 'index'));
+<?php endif; ?>
+		}
+<?php if ($wannaUseSession): ?>
+		$this->Session->setFlash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> was not deleted', true));
+<?php else: ?>
+		$this->flash(__('<?php echo ucfirst(strtolower($singularHumanName)); ?> was not deleted', true), array('action' => 'index'));
+<?php endif; ?>
+		$this->redirect(array('action' => 'index'));
+	}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/controller.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/controller.ctp
new file mode 100644
index 000000000..af5d68498
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/controller.ctp
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Controller bake template file
+ *
+ * Allows templating of Controllers generated from bake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+echo "<?php\n";
+?>
+class <?php echo $controllerName; ?>Controller extends <?php echo $plugin; ?>AppController {
+
+	var $name = '<?php echo $controllerName; ?>';
+<?php if ($isScaffold): ?>
+	var $scaffold;
+<?php else: ?>
+<?php
+if (count($helpers)):
+	echo "\tvar \$helpers = array(";
+	for ($i = 0, $len = count($helpers); $i < $len; $i++):
+		if ($i != $len - 1):
+			echo "'" . Inflector::camelize($helpers[$i]) . "', ";
+		else:
+			echo "'" . Inflector::camelize($helpers[$i]) . "'";
+		endif;
+	endfor;
+	echo ");\n";
+endif;
+
+if (count($components)):
+	echo "\tvar \$components = array(";
+	for ($i = 0, $len = count($components); $i < $len; $i++):
+		if ($i != $len - 1):
+			echo "'" . Inflector::camelize($components[$i]) . "', ";
+		else:
+			echo "'" . Inflector::camelize($components[$i]) . "'";
+		endif;
+	endfor;
+	echo ");\n";
+endif;
+
+echo $actions;
+
+endif; ?>
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/fixture.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/fixture.ctp
new file mode 100644
index 000000000..2f16bb75c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/fixture.ctp
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Fixture Template file
+ *
+ * Fixture Template used when baking fixtures with bake
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo '<?php' . "\n"; ?>
+/* <?php echo $model; ?> Fixture generated on: <?php echo  date('Y-m-d H:i:s') . " : ". time(); ?> */
+class <?php echo $model; ?>Fixture extends CakeTestFixture {
+	var $name = '<?php echo $model; ?>';
+<?php if ($table): ?>
+	var $table = '<?php echo $table; ?>';
+<?php endif; ?>
+<?php if ($import): ?>
+	var $import = <?php echo $import; ?>;
+<?php endif; ?>
+
+<?php if ($schema): ?>
+	var $fields = <?php echo $schema; ?>;
+<?php endif;?>
+
+<?php if ($records): ?>
+	var $records = <?php echo $records; ?>;
+<?php endif;?>
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/model.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/model.ctp
new file mode 100644
index 000000000..a5d2a9e49
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/model.ctp
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Model template file.
+ *
+ * Used by bake to create new Model files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.console.libs.templates.objects
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+echo "<?php\n"; ?>
+class <?php echo $name ?> extends <?php echo $plugin; ?>AppModel {
+	var $name = '<?php echo $name; ?>';
+<?php if ($useDbConfig != 'default'): ?>
+	var $useDbConfig = '<?php echo $useDbConfig; ?>';
+<?php endif;?>
+<?php if ($useTable && $useTable !== Inflector::tableize($name)):
+	$table = "'$useTable'";
+	echo "\tvar \$useTable = $table;\n";
+endif;
+if ($primaryKey !== 'id'): ?>
+	var $primaryKey = '<?php echo $primaryKey; ?>';
+<?php endif;
+if ($displayField): ?>
+	var $displayField = '<?php echo $displayField; ?>';
+<?php endif;
+
+if (!empty($validate)):
+	echo "\tvar \$validate = array(\n";
+	foreach ($validate as $field => $validations):
+		echo "\t\t'$field' => array(\n";
+		foreach ($validations as $key => $validator):
+			echo "\t\t\t'$key' => array(\n";
+			echo "\t\t\t\t'rule' => array('$validator'),\n";
+			echo "\t\t\t\t//'message' => 'Your custom message here',\n";
+			echo "\t\t\t\t//'allowEmpty' => false,\n";
+			echo "\t\t\t\t//'required' => false,\n";
+			echo "\t\t\t\t//'last' => false, // Stop validation after this rule\n";
+			echo "\t\t\t\t//'on' => 'create', // Limit validation to 'create' or 'update' operations\n";
+			echo "\t\t\t),\n";
+		endforeach;
+		echo "\t\t),\n";
+	endforeach;
+	echo "\t);\n";
+endif;
+
+foreach ($associations as $assoc):
+	if (!empty($assoc)):
+?>
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+<?php
+		break;
+	endif;
+endforeach;
+
+foreach (array('hasOne', 'belongsTo') as $assocType):
+	if (!empty($associations[$assocType])):
+		$typeCount = count($associations[$assocType]);
+		echo "\n\tvar \$$assocType = array(";
+		foreach ($associations[$assocType] as $i => $relation):
+			$out = "\n\t\t'{$relation['alias']}' => array(\n";
+			$out .= "\t\t\t'className' => '{$relation['className']}',\n";
+			$out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
+			$out .= "\t\t\t'conditions' => '',\n";
+			$out .= "\t\t\t'fields' => '',\n";
+			$out .= "\t\t\t'order' => ''\n";
+			$out .= "\t\t)";
+			if ($i + 1 < $typeCount) {
+				$out .= ",";
+			}
+			echo $out;
+		endforeach;
+		echo "\n\t);\n";
+	endif;
+endforeach;
+
+if (!empty($associations['hasMany'])):
+	$belongsToCount = count($associations['hasMany']);
+	echo "\n\tvar \$hasMany = array(";
+	foreach ($associations['hasMany'] as $i => $relation):
+		$out = "\n\t\t'{$relation['alias']}' => array(\n";
+		$out .= "\t\t\t'className' => '{$relation['className']}',\n";
+		$out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
+		$out .= "\t\t\t'dependent' => false,\n";
+		$out .= "\t\t\t'conditions' => '',\n";
+		$out .= "\t\t\t'fields' => '',\n";
+		$out .= "\t\t\t'order' => '',\n";
+		$out .= "\t\t\t'limit' => '',\n";
+		$out .= "\t\t\t'offset' => '',\n";
+		$out .= "\t\t\t'exclusive' => '',\n";
+		$out .= "\t\t\t'finderQuery' => '',\n";
+		$out .= "\t\t\t'counterQuery' => ''\n";
+		$out .= "\t\t)";
+		if ($i + 1 < $belongsToCount) {
+			$out .= ",";
+		}
+		echo $out;
+	endforeach;
+	echo "\n\t);\n\n";
+endif;
+
+if (!empty($associations['hasAndBelongsToMany'])):
+	$habtmCount = count($associations['hasAndBelongsToMany']);
+	echo "\n\tvar \$hasAndBelongsToMany = array(";
+	foreach ($associations['hasAndBelongsToMany'] as $i => $relation):
+		$out = "\n\t\t'{$relation['alias']}' => array(\n";
+		$out .= "\t\t\t'className' => '{$relation['className']}',\n";
+		$out .= "\t\t\t'joinTable' => '{$relation['joinTable']}',\n";
+		$out .= "\t\t\t'foreignKey' => '{$relation['foreignKey']}',\n";
+		$out .= "\t\t\t'associationForeignKey' => '{$relation['associationForeignKey']}',\n";
+		$out .= "\t\t\t'unique' => true,\n";
+		$out .= "\t\t\t'conditions' => '',\n";
+		$out .= "\t\t\t'fields' => '',\n";
+		$out .= "\t\t\t'order' => '',\n";
+		$out .= "\t\t\t'limit' => '',\n";
+		$out .= "\t\t\t'offset' => '',\n";
+		$out .= "\t\t\t'finderQuery' => '',\n";
+		$out .= "\t\t\t'deleteQuery' => '',\n";
+		$out .= "\t\t\t'insertQuery' => ''\n";
+		$out .= "\t\t)";
+		if ($i + 1 < $habtmCount) {
+			$out .= ",";
+		}
+		echo $out;
+	endforeach;
+	echo "\n\t);\n\n";
+endif;
+?>
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/test.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/test.ctp
new file mode 100644
index 000000000..70f4d5a09
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/classes/test.ctp
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Test Case bake template
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.console.libs.templates.objects
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+echo "<?php\n";
+echo "/* ". $className ." Test cases generated on: " . date('Y-m-d H:i:s') . " : ". time() . "*/\n";
+?>
+App::import('<?php echo $type; ?>', '<?php echo $plugin . $className;?>');
+
+<?php if ($mock and strtolower($type) == 'controller'): ?>
+class Test<?php echo $fullClassName; ?> extends <?php echo $fullClassName; ?> {
+	var $autoRender = false;
+
+	function redirect($url, $status = null, $exit = true) {
+		$this->redirectUrl = $url;
+	}
+}
+
+<?php endif; ?>
+class <?php echo $fullClassName; ?>TestCase extends CakeTestCase {
+<?php if (!empty($fixtures)): ?>
+	var $fixtures = array('<?php echo join("', '", $fixtures); ?>');
+
+<?php endif; ?>
+	function startTest() {
+		$this-><?php echo $className . ' =& ' . $construction; ?>
+	}
+
+	function endTest() {
+		unset($this-><?php echo $className;?>);
+		ClassRegistry::flush();
+	}
+
+<?php foreach ($methods as $method): ?>
+	function test<?php echo Inflector::classify($method); ?>() {
+
+	}
+
+<?php endforeach;?>
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/form.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/form.ctp
new file mode 100644
index 000000000..379e9431e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/form.ctp
@@ -0,0 +1,66 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> form">
+<?php echo "<?php echo \$this->Form->create('{$modelClass}');?>\n";?>
+	<fieldset>
+		<legend><?php printf("<?php __('%s %s'); ?>", Inflector::humanize($action), $singularHumanName); ?></legend>
+<?php
+		echo "\t<?php\n";
+		foreach ($fields as $field) {
+			if (strpos($action, 'add') !== false && $field == $primaryKey) {
+				continue;
+			} elseif (!in_array($field, array('created', 'modified', 'updated'))) {
+				echo "\t\techo \$this->Form->input('{$field}');\n";
+			}
+		}
+		if (!empty($associations['hasAndBelongsToMany'])) {
+			foreach ($associations['hasAndBelongsToMany'] as $assocName => $assocData) {
+				echo "\t\techo \$this->Form->input('{$assocName}');\n";
+			}
+		}
+		echo "\t?>\n";
+?>
+	</fieldset>
+<?php
+	echo "<?php echo \$this->Form->end(__('Submit', true));?>\n";
+?>
+</div>
+<div class="actions">
+	<h3><?php echo "<?php __('Actions'); ?>"; ?></h3>
+	<ul>
+
+<?php if (strpos($action, 'add') === false): ?>
+		<li><?php echo "<?php echo \$this->Html->link(__('Delete', true), array('action' => 'delete', \$this->Form->value('{$modelClass}.{$primaryKey}')), null, sprintf(__('Are you sure you want to delete # %s?', true), \$this->Form->value('{$modelClass}.{$primaryKey}'))); ?>";?></li>
+<?php endif;?>
+		<li><?php echo "<?php echo \$this->Html->link(__('List " . $pluralHumanName . "', true), array('action' => 'index'));?>";?></li>
+<?php
+		$done = array();
+		foreach ($associations as $type => $data) {
+			foreach ($data as $alias => $details) {
+				if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+					echo "\t\t<li><?php echo \$this->Html->link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+					echo "\t\t<li><?php echo \$this->Html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+					$done[] = $details['controller'];
+				}
+			}
+		}
+?>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/home.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/home.ctp
new file mode 100644
index 000000000..01cd41a3d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/home.ctp
@@ -0,0 +1,84 @@
+<?php
+$output = "<h2>Sweet, \"" . Inflector::humanize($app) . "\" got Baked by CakePHP!</h2>\n";
+$output .="
+<?php
+if (Configure::read() > 0):
+	Debugger::checkSecurityKeys();
+endif;
+?>
+<p>
+<?php
+	if (is_writable(TMP)):
+		echo '<span class=\"notice success\">';
+			__('Your tmp directory is writable.');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Your tmp directory is NOT writable.');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	\$settings = Cache::settings();
+	if (!empty(\$settings)):
+		echo '<span class=\"notice success\">';
+				printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. \$settings['engine'] . 'Engine</em>');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+				__('Your cache is NOT working. Please check the settings in APP/config/core.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	\$filePresent = null;
+	if (file_exists(CONFIGS . 'database.php')):
+		echo '<span class=\"notice success\">';
+			__('Your database configuration file is present.');
+			\$filePresent = true;
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Your database configuration file is NOT present.');
+			echo '<br/>';
+			__('Rename config/database.php.default to config/database.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<?php
+if (!empty(\$filePresent)):
+	if (!class_exists('ConnectionManager')) {
+		require LIBS . 'model' . DS . 'connection_manager.php';
+	}
+	\$db = ConnectionManager::getInstance();
+ 	\$connected = \$db->getDataSource('default');
+?>
+<p>
+<?php
+	if (\$connected->isConnected()):
+		echo '<span class=\"notice success\">';
+ 			__('Cake is able to connect to the database.');
+		echo '</span>';
+	else:
+		echo '<span class=\"notice\">';
+			__('Cake is NOT able to connect to the database.');
+		echo '</span>';
+	endif;
+?>
+</p>\n";
+$output .= "<?php endif;?>\n";
+$output .= "<h3><?php __('Editing this Page') ?></h3>\n";
+$output .= "<p>\n";
+$output .= "<?php\n";
+$output .= "\tprintf(__('To change the content of this page, edit: %s\n";
+$output .= "\t\tTo change its layout, edit: %s\n";
+$output .= "\t\tYou can also add some CSS styles for your pages at: %s', true),\n";
+$output .= "\t\tAPP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />',  APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');\n";
+$output .= "?>\n";
+$output .= "</p>\n";
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/index.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/index.ctp
new file mode 100644
index 000000000..5446c0049
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/index.ctp
@@ -0,0 +1,96 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> index">
+	<h2><?php echo "<?php __('{$pluralHumanName}');?>";?></h2>
+	<table cellpadding="0" cellspacing="0">
+	<tr>
+	<?php  foreach ($fields as $field):?>
+		<th><?php echo "<?php echo \$this->Paginator->sort('{$field}');?>";?></th>
+	<?php endforeach;?>
+		<th class="actions"><?php echo "<?php __('Actions');?>";?></th>
+	</tr>
+	<?php
+	echo "<?php
+	\$i = 0;
+	foreach (\${$pluralVar} as \${$singularVar}):
+		\$class = null;
+		if (\$i++ % 2 == 0) {
+			\$class = ' class=\"altrow\"';
+		}
+	?>\n";
+	echo "\t<tr<?php echo \$class;?>>\n";
+		foreach ($fields as $field) {
+			$isKey = false;
+			if (!empty($associations['belongsTo'])) {
+				foreach ($associations['belongsTo'] as $alias => $details) {
+					if ($field === $details['foreignKey']) {
+						$isKey = true;
+						echo "\t\t<td>\n\t\t\t<?php echo \$this->Html->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t</td>\n";
+						break;
+					}
+				}
+			}
+			if ($isKey !== true) {
+				echo "\t\t<td><?php echo \${$singularVar}['{$modelClass}']['{$field}']; ?>&nbsp;</td>\n";
+			}
+		}
+
+		echo "\t\t<td class=\"actions\">\n";
+		echo "\t\t\t<?php echo \$this->Html->link(__('View', true), array('action' => 'view', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+		echo "\t\t\t<?php echo \$this->Html->link(__('Edit', true), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+		echo "\t\t\t<?php echo \$this->Html->link(__('Delete', true), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?>\n";
+		echo "\t\t</td>\n";
+	echo "\t</tr>\n";
+
+	echo "<?php endforeach; ?>\n";
+	?>
+	</table>
+	<p>
+	<?php echo "<?php
+	echo \$this->Paginator->counter(array(
+	'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?>";?>
+	</p>
+
+	<div class="paging">
+	<?php echo "\t<?php echo \$this->Paginator->prev('<< ' . __('previous', true), array(), null, array('class'=>'disabled'));?>\n";?>
+	 | <?php echo "\t<?php echo \$this->Paginator->numbers();?>\n"?> |
+	<?php echo "\t<?php echo \$this->Paginator->next(__('next', true) . ' >>', array(), null, array('class' => 'disabled'));?>\n";?>
+	</div>
+</div>
+<div class="actions">
+	<h3><?php echo "<?php __('Actions'); ?>"; ?></h3>
+	<ul>
+		<li><?php echo "<?php echo \$this->Html->link(__('New " . $singularHumanName . "', true), array('action' => 'add')); ?>";?></li>
+<?php
+	$done = array();
+	foreach ($associations as $type => $data) {
+		foreach ($data as $alias => $details) {
+			if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+				echo "\t\t<li><?php echo \$this->Html->link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+				echo "\t\t<li><?php echo \$this->Html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+				$done[] = $details['controller'];
+			}
+		}
+	}
+?>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/view.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/view.ctp
new file mode 100644
index 000000000..e9934cfa5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/default/views/view.ctp
@@ -0,0 +1,146 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 1.2.0.5234
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> view">
+<h2><?php echo "<?php  __('{$singularHumanName}');?>";?></h2>
+	<dl><?php echo "<?php \$i = 0; \$class = ' class=\"altrow\"';?>\n";?>
+<?php
+foreach ($fields as $field) {
+	$isKey = false;
+	if (!empty($associations['belongsTo'])) {
+		foreach ($associations['belongsTo'] as $alias => $details) {
+			if ($field === $details['foreignKey']) {
+				$isKey = true;
+				echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize(Inflector::underscore($alias)) . "'); ?></dt>\n";
+				echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t\t\t<?php echo \$this->Html->link(\${$singularVar}['{$alias}']['{$details['displayField']}'], array('controller' => '{$details['controller']}', 'action' => 'view', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?>\n\t\t\t&nbsp;\n\t\t</dd>\n";
+				break;
+			}
+		}
+	}
+	if ($isKey !== true) {
+		echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize($field) . "'); ?></dt>\n";
+		echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t\t\t<?php echo \${$singularVar}['{$modelClass}']['{$field}']; ?>\n\t\t\t&nbsp;\n\t\t</dd>\n";
+	}
+}
+?>
+	</dl>
+</div>
+<div class="actions">
+	<h3><?php echo "<?php __('Actions'); ?>"; ?></h3>
+	<ul>
+<?php
+	echo "\t\t<li><?php echo \$this->Html->link(__('Edit " . $singularHumanName ."', true), array('action' => 'edit', \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+	echo "\t\t<li><?php echo \$this->Html->link(__('Delete " . $singularHumanName . "', true), array('action' => 'delete', \${$singularVar}['{$modelClass}']['{$primaryKey}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$singularVar}['{$modelClass}']['{$primaryKey}'])); ?> </li>\n";
+	echo "\t\t<li><?php echo \$this->Html->link(__('List " . $pluralHumanName . "', true), array('action' => 'index')); ?> </li>\n";
+	echo "\t\t<li><?php echo \$this->Html->link(__('New " . $singularHumanName . "', true), array('action' => 'add')); ?> </li>\n";
+
+	$done = array();
+	foreach ($associations as $type => $data) {
+		foreach ($data as $alias => $details) {
+			if ($details['controller'] != $this->name && !in_array($details['controller'], $done)) {
+				echo "\t\t<li><?php echo \$this->Html->link(__('List " . Inflector::humanize($details['controller']) . "', true), array('controller' => '{$details['controller']}', 'action' => 'index')); ?> </li>\n";
+				echo "\t\t<li><?php echo \$this->Html->link(__('New " .  Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add')); ?> </li>\n";
+				$done[] = $details['controller'];
+			}
+		}
+	}
+?>
+	</ul>
+</div>
+<?php
+if (!empty($associations['hasOne'])) :
+	foreach ($associations['hasOne'] as $alias => $details): ?>
+	<div class="related">
+		<h3><?php echo "<?php __('Related " . Inflector::humanize($details['controller']) . "');?>";?></h3>
+	<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?>
+		<dl><?php echo "\t<?php \$i = 0; \$class = ' class=\"altrow\"';?>\n";?>
+	<?php
+			foreach ($details['fields'] as $field) {
+				echo "\t\t<dt<?php if (\$i % 2 == 0) echo \$class;?>><?php __('" . Inflector::humanize($field) . "');?></dt>\n";
+				echo "\t\t<dd<?php if (\$i++ % 2 == 0) echo \$class;?>>\n\t<?php echo \${$singularVar}['{$alias}']['{$field}'];?>\n&nbsp;</dd>\n";
+			}
+	?>
+		</dl>
+	<?php echo "<?php endif; ?>\n";?>
+		<div class="actions">
+			<ul>
+				<li><?php echo "<?php echo \$this->Html->link(__('Edit " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$singularVar}['{$alias}']['{$details['primaryKey']}'])); ?></li>\n";?>
+			</ul>
+		</div>
+	</div>
+	<?php
+	endforeach;
+endif;
+if (empty($associations['hasMany'])) {
+	$associations['hasMany'] = array();
+}
+if (empty($associations['hasAndBelongsToMany'])) {
+	$associations['hasAndBelongsToMany'] = array();
+}
+$relations = array_merge($associations['hasMany'], $associations['hasAndBelongsToMany']);
+$i = 0;
+foreach ($relations as $alias => $details):
+	$otherSingularVar = Inflector::variable($alias);
+	$otherPluralHumanName = Inflector::humanize($details['controller']);
+	?>
+<div class="related">
+	<h3><?php echo "<?php __('Related " . $otherPluralHumanName . "');?>";?></h3>
+	<?php echo "<?php if (!empty(\${$singularVar}['{$alias}'])):?>\n";?>
+	<table cellpadding = "0" cellspacing = "0">
+	<tr>
+<?php
+			foreach ($details['fields'] as $field) {
+				echo "\t\t<th><?php __('" . Inflector::humanize($field) . "'); ?></th>\n";
+			}
+?>
+		<th class="actions"><?php echo "<?php __('Actions');?>";?></th>
+	</tr>
+<?php
+echo "\t<?php
+		\$i = 0;
+		foreach (\${$singularVar}['{$alias}'] as \${$otherSingularVar}):
+			\$class = null;
+			if (\$i++ % 2 == 0) {
+				\$class = ' class=\"altrow\"';
+			}
+		?>\n";
+		echo "\t\t<tr<?php echo \$class;?>>\n";
+
+				foreach ($details['fields'] as $field) {
+					echo "\t\t\t<td><?php echo \${$otherSingularVar}['{$field}'];?></td>\n";
+				}
+
+				echo "\t\t\t<td class=\"actions\">\n";
+				echo "\t\t\t\t<?php echo \$this->Html->link(__('View', true), array('controller' => '{$details['controller']}', 'action' => 'view', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+				echo "\t\t\t\t<?php echo \$this->Html->link(__('Edit', true), array('controller' => '{$details['controller']}', 'action' => 'edit', \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+				echo "\t\t\t\t<?php echo \$this->Html->link(__('Delete', true), array('controller' => '{$details['controller']}', 'action' => 'delete', \${$otherSingularVar}['{$details['primaryKey']}']), null, sprintf(__('Are you sure you want to delete # %s?', true), \${$otherSingularVar}['{$details['primaryKey']}'])); ?>\n";
+				echo "\t\t\t</td>\n";
+			echo "\t\t</tr>\n";
+
+echo "\t<?php endforeach; ?>\n";
+?>
+	</table>
+<?php echo "<?php endif; ?>\n\n";?>
+	<div class="actions">
+		<ul>
+			<li><?php echo "<?php echo \$this->Html->link(__('New " . Inflector::humanize(Inflector::underscore($alias)) . "', true), array('controller' => '{$details['controller']}', 'action' => 'add'));?>";?> </li>
+		</ul>
+	</div>
+</div>
+<?php endforeach;?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/.htaccess b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/.htaccess
new file mode 100644
index 000000000..0ed8662ea
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/.htaccess
@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine on
+    RewriteRule    ^$    webroot/    [L]
+    RewriteRule    (.*) webroot/$1    [L]
+ </IfModule>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_controller.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_controller.php
new file mode 100644
index 000000000..c9f09fca0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_controller.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Application level Controller
+ *
+ * This file is application-wide controller file. You can put all
+ * application-wide controller-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Application Controller
+ *
+ * Add your application-wide methods in the class below, your controllers
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.app
+ */
+class AppController extends Controller {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_helper.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_helper.php
new file mode 100644
index 000000000..a64d3cb85
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_helper.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Application level View Helper
+ *
+ * This file is application-wide helper file. You can put all
+ * application-wide helper-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', 'Helper', false);
+
+/**
+ * This is a placeholder class.
+ * Create the same file in app/app_helper.php
+ *
+ * Add your application-wide methods in the class below, your helpers
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.cake
+ */
+class AppHelper extends Helper {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_model.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_model.php
new file mode 100644
index 000000000..ab5113bf5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/app_model.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Application model for Cake.
+ *
+ * This file is application-wide model file. You can put all
+ * application-wide model-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Application model for Cake.
+ *
+ * Add your application-wide methods in the class below, your models
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.app
+ */
+class AppModel extends Model {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/acl.ini.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/acl.ini.php
new file mode 100644
index 000000000..075449856
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/acl.ini.php
@@ -0,0 +1,70 @@
+;<?php exit() ?>
+; SVN FILE: $Id$
+;/**
+; * ACL Configuration
+; *
+; *
+; * PHP versions 4 and 5
+; *
+; * CakePHP(tm) : Rapid Development Framework http://www.cakephp.org/
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; *
+; *  Licensed under The MIT License
+; *  Redistributions of files must retain the above copyright notice.
+; *
+; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; * @link          http://cakephp.org CakePHP(tm) Project
+; * @package       cake
+; * @subpackage    cake.app.config
+; * @since         CakePHP(tm) v 0.10.0.1076
+; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+; */
+
+; acl.ini.php - Cake ACL Configuration
+; ---------------------------------------------------------------------
+; Use this file to specify user permissions.
+; aco = access control object (something in your application)
+; aro = access request object (something requesting access)
+;
+; User records are added as follows:
+;
+; [uid]
+; groups = group1, group2, group3
+; allow = aco1, aco2, aco3
+; deny = aco4, aco5, aco6
+;
+; Group records are added in a similar manner:
+;
+; [gid]
+; allow = aco1, aco2, aco3
+; deny = aco4, aco5, aco6
+;
+; The allow, deny, and groups sections are all optional.
+; NOTE: groups names *cannot* ever be the same as usernames!
+;
+; ACL permissions are checked in the following order:
+; 1. Check for user denies (and DENY if specified)
+; 2. Check for user allows (and ALLOW if specified)
+; 3. Gather user's groups
+; 4. Check group denies (and DENY if specified)
+; 5. Check group allows (and ALLOW if specified)
+; 6. If no aro, aco, or group information is found, DENY
+;
+; ---------------------------------------------------------------------
+
+;-------------------------------------
+;Users
+;-------------------------------------
+
+[username-goes-here]
+groups = group1, group2
+deny = aco1, aco2
+allow = aco3, aco4
+
+;-------------------------------------
+;Groups
+;-------------------------------------
+
+[groupname-goes-here]
+deny = aco5, aco6
+allow = aco7, aco8
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/bootstrap.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/bootstrap.php
new file mode 100644
index 000000000..45c8abfd7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/bootstrap.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * This file is loaded automatically by the app/webroot/index.php file after the core bootstrap.php
+ *
+ * This is an application wide file to load any function that is not used within a class
+ * define. You can also use this to include or require any files in your application.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.10.8.2117
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * The settings below can be used to set additional paths to models, views and controllers.
+ * This is related to Ticket #470 (https://trac.cakephp.org/ticket/470)
+ *
+ * App::build(array(
+ *     'plugins' => array('/full/path/to/plugins/', '/next/full/path/to/plugins/'),
+ *     'models' =>  array('/full/path/to/models/', '/next/full/path/to/models/'),
+ *     'views' => array('/full/path/to/views/', '/next/full/path/to/views/'),
+ *     'controllers' => array(/full/path/to/controllers/', '/next/full/path/to/controllers/'),
+ *     'datasources' => array('/full/path/to/datasources/', '/next/full/path/to/datasources/'),
+ *     'behaviors' => array('/full/path/to/behaviors/', '/next/full/path/to/behaviors/'),
+ *     'components' => array('/full/path/to/components/', '/next/full/path/to/components/'),
+ *     'helpers' => array('/full/path/to/helpers/', '/next/full/path/to/helpers/'),
+ *     'vendors' => array('/full/path/to/vendors/', '/next/full/path/to/vendors/'),
+ *     'shells' => array('/full/path/to/shells/', '/next/full/path/to/shells/'),
+ *     'locales' => array('/full/path/to/locale/', '/next/full/path/to/locale/')
+ * ));
+ *
+ */
+
+/**
+ * As of 1.3, additional rules for the inflector are added below
+ *
+ * Inflector::rules('singular', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
+ * Inflector::rules('plural', array('rules' => array(), 'irregular' => array(), 'uninflected' => array()));
+ *
+ */
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/core.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/core.php
new file mode 100644
index 000000000..517e32d0d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/core.php
@@ -0,0 +1,304 @@
+<?php
+/**
+ * This is core configuration file.
+ *
+ * Use it to configure core behavior of Cake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * CakePHP Debug Level:
+ *
+ * Production Mode:
+ * 	0: No error messages, errors, or warnings shown. Flash messages redirect.
+ *
+ * Development Mode:
+ * 	1: Errors and warnings shown, model caches refreshed, flash messages halted.
+ * 	2: As in 1, but also with full debug messages and SQL output.
+ *
+ * In production mode, flash messages redirect after a time interval.
+ * In development mode, you need to click the flash message to continue.
+ */
+	Configure::write('debug', 2);
+
+/**
+ * CakePHP Log Level:
+ *
+ * In case of Production Mode CakePHP gives you the possibility to continue logging errors.
+ *
+ * The following parameters can be used:
+ *  Boolean: Set true/false to activate/deactivate logging
+ *    Configure::write('log', true);
+ *
+ *  Integer: Use built-in PHP constants to set the error level (see error_reporting)
+ *    Configure::write('log', E_ERROR | E_WARNING);
+ *    Configure::write('log', E_ALL ^ E_NOTICE);
+ */
+	Configure::write('log', true);
+
+/**
+ * Application wide charset encoding
+ */
+	Configure::write('App.encoding', 'UTF-8');
+
+/**
+ * To configure CakePHP *not* to use mod_rewrite and to
+ * use CakePHP pretty URLs, remove these .htaccess
+ * files:
+ *
+ * /.htaccess
+ * /app/.htaccess
+ * /app/webroot/.htaccess
+ *
+ * And uncomment the App.baseUrl below:
+ */
+	//Configure::write('App.baseUrl', env('SCRIPT_NAME'));
+
+/**
+ * Uncomment the define below to use CakePHP prefix routes.
+ *
+ * The value of the define determines the names of the routes
+ * and their associated controller actions:
+ *
+ * Set to an array of prefixes you want to use in your application. Use for
+ * admin or other prefixed routes.
+ *
+ * 	Routing.prefixes = array('admin', 'manager');
+ *
+ * Enables:
+ *	`admin_index()` and `/admin/controller/index`
+ *	`manager_index()` and `/manager/controller/index`
+ *
+ * [Note Routing.admin is deprecated in 1.3.  Use Routing.prefixes instead]
+ */
+	//Configure::write('Routing.prefixes', array('admin'));
+
+/**
+ * Turn off all caching application-wide.
+ *
+ */
+	//Configure::write('Cache.disable', true);
+
+/**
+ * Enable cache checking.
+ *
+ * If set to true, for view caching you must still use the controller
+ * var $cacheAction inside your controllers to define caching settings.
+ * You can either set it controller-wide by setting var $cacheAction = true,
+ * or in each action using $this->cacheAction = true.
+ *
+ */
+	//Configure::write('Cache.check', true);
+
+/**
+ * Defines the default error type when using the log() function. Used for
+ * differentiating error logging and debugging. Currently PHP supports LOG_DEBUG.
+ */
+	define('LOG_ERROR', 2);
+
+/**
+ * The preferred session handling method. Valid values:
+ *
+ * 'php'	 		Uses settings defined in your php.ini.
+ * 'cake'		Saves session files in CakePHP's /tmp directory.
+ * 'database'	Uses CakePHP's database sessions.
+ *
+ * To define a custom session handler, save it at /app/config/<name>.php.
+ * Set the value of 'Session.save' to <name> to utilize it in CakePHP.
+ *
+ * To use database sessions, run the app/config/schema/sessions.php schema using
+ * the cake shell command: cake schema create Sessions
+ *
+ */
+	Configure::write('Session.save', 'php');
+
+/**
+ * The model name to be used for the session model.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ *
+ * The model name set here should *not* be used elsewhere in your application.
+ */
+	//Configure::write('Session.model', 'Session');
+
+/**
+ * The name of the table used to store CakePHP database sessions.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ *
+ * The table name set here should *not* include any table prefix defined elsewhere.
+ *
+ * Please note that if you set a value for Session.model (above), any value set for
+ * Session.table will be ignored.
+ *
+ * [Note: Session.table is deprecated as of CakePHP 1.3]
+ */
+	//Configure::write('Session.table', 'cake_sessions');
+
+/**
+ * The DATABASE_CONFIG::$var to use for database session handling.
+ *
+ * 'Session.save' must be set to 'database' in order to utilize this constant.
+ */
+	//Configure::write('Session.database', 'default');
+
+/**
+ * The name of CakePHP's session cookie.
+ *
+ * Note the guidelines for Session names states: "The session name references
+ * the session id in cookies and URLs. It should contain only alphanumeric
+ * characters."
+ * @link http://php.net/session_name
+ */
+	Configure::write('Session.cookie', 'CAKEPHP');
+
+/**
+ * Session time out time (in seconds).
+ * Actual value depends on 'Security.level' setting.
+ */
+	Configure::write('Session.timeout', '120');
+
+/**
+ * If set to false, sessions are not automatically started.
+ */
+	Configure::write('Session.start', true);
+
+/**
+ * When set to false, HTTP_USER_AGENT will not be checked
+ * in the session. You might want to set the value to false, when dealing with
+ * older versions of IE, Chrome Frame or certain web-browsing devices and AJAX
+ */
+	Configure::write('Session.checkAgent', true);
+
+/**
+ * The level of CakePHP security. The session timeout time defined
+ * in 'Session.timeout' is multiplied according to the settings here.
+ * Valid values:
+ *
+ * 'high'   Session timeout in 'Session.timeout' x 10
+ * 'medium' Session timeout in 'Session.timeout' x 100
+ * 'low'    Session timeout in 'Session.timeout' x 300
+ *
+ * CakePHP session IDs are also regenerated between requests if
+ * 'Security.level' is set to 'high'.
+ */
+	Configure::write('Security.level', 'medium');
+
+/**
+ * A random string used in security hashing methods.
+ */
+	Configure::write('Security.salt', 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi');
+
+/**
+ * A random numeric string (digits only) used to encrypt/decrypt strings.
+ */
+	Configure::write('Security.cipherSeed', '76859309657453542496749683645');
+
+/**
+ * Apply timestamps with the last modified time to static assets (js, css, images).
+ * Will append a querystring parameter containing the time the file was modified. This is
+ * useful for invalidating browser caches.
+ *
+ * Set to `true` to apply timestamps, when debug = 0, or set to 'force' to always enable
+ * timestamping.
+ */
+	//Configure::write('Asset.timestamp', true);
+/**
+ * Compress CSS output by removing comments, whitespace, repeating tags, etc.
+ * This requires a/var/cache directory to be writable by the web server for caching.
+ * and /vendors/csspp/csspp.php
+ *
+ * To use, prefix the CSS link URL with '/ccss/' instead of '/css/' or use HtmlHelper::css().
+ */
+	//Configure::write('Asset.filter.css', 'css.php');
+
+/**
+ * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the
+ * output, and setting the config below to the name of the script.
+ *
+ * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link().
+ */
+	//Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php');
+
+/**
+ * The classname and database used in CakePHP's
+ * access control lists.
+ */
+	Configure::write('Acl.classname', 'DbAcl');
+	Configure::write('Acl.database', 'default');
+
+/**
+ * If you are on PHP 5.3 uncomment this line and correct your server timezone
+ * to fix the date & time related errors.
+ */
+	//date_default_timezone_set('UTC');
+
+/**
+ *
+ * Cache Engine Configuration
+ * Default settings provided below
+ *
+ * File storage engine.
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'File', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'path' => CACHE, //[optional] use system tmp directory - remember to use absolute path
+ * 		'prefix' => 'cake_', //[optional]  prefix every cache file with this string
+ * 		'lock' => false, //[optional]  use file locking
+ * 		'serialize' => true, [optional]
+ *	));
+ *
+ *
+ * APC (http://pecl.php.net/package/APC)
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'Apc', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
+ *	));
+ *
+ * Xcache (http://xcache.lighttpd.net/)
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'Xcache', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional] prefix every cache file with this string
+ *		'user' => 'user', //user from xcache.admin.user settings
+ *      'password' => 'password', //plaintext password (xcache.admin.pass)
+ *	));
+ *
+ *
+ * Memcache (http://www.danga.com/memcached/)
+ *
+ * 	 Cache::config('default', array(
+ *		'engine' => 'Memcache', //[required]
+ *		'duration'=> 3600, //[optional]
+ *		'probability'=> 100, //[optional]
+ * 		'prefix' => Inflector::slug(APP_DIR) . '_', //[optional]  prefix every cache file with this string
+ * 		'servers' => array(
+ * 			'127.0.0.1:11211' // localhost, default port 11211
+ * 		), //[optional]
+ * 		'compress' => false, // [optional] compress data in Memcache (slower, but uses less memory)
+ * 		'persistent' => true, // [optional] set this to false for non-persistent connections
+ *	));
+ *
+ */
+	Cache::config('default', array('engine' => 'File'));
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/database.php.default b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/database.php.default
new file mode 100644
index 000000000..043ba5ccc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/database.php.default
@@ -0,0 +1,95 @@
+<?php
+/**
+ * This is core configuration file.
+ *
+ * Use it to configure core behaviour ofCake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * In this file you set up your database connection details.
+ *
+ * @package       cake
+ * @subpackage    cake.config
+ */
+/**
+ * Database configuration class.
+ * You can specify multiple configurations for production, development and testing.
+ *
+ * driver => The name of a supported driver; valid options are as follows:
+ *		mysql 		- MySQL 4 & 5,
+ *		mysqli 		- MySQL 4 & 5 Improved Interface (PHP5 only),
+ *		sqlite		- SQLite (PHP5 only),
+ *		postgres	- PostgreSQL 7 and higher,
+ *		mssql		- Microsoft SQL Server 2000 and higher,
+ *		db2			- IBM DB2, Cloudscape, and Apache Derby (http://php.net/ibm-db2)
+ *		oracle		- Oracle 8 and higher
+ *		firebird	- Firebird/Interbase
+ *		sybase		- Sybase ASE
+ *		adodb-[drivername]	- ADOdb interface wrapper (see below),
+ *		odbc		- ODBC DBO driver
+ *
+ * You can add custom database drivers (or override existing drivers) by adding the
+ * appropriate file to app/models/datasources/dbo.  Drivers should be named 'dbo_x.php',
+ * where 'x' is the name of the database.
+ *
+ * persistent => true / false
+ * Determines whether or not the database should use a persistent connection
+ *
+ * connect =>
+ * ADOdb set the connect to one of these
+ *	(http://phplens.com/adodb/supported.databases.html) and
+ *	append it '|p' for persistent connection. (mssql|p for example, or just mssql for not persistent)
+ * For all other databases, this setting is deprecated.
+ *
+ * host =>
+ * the host you connect to the database.  To add a socket or port number, use 'port' => #
+ *
+ * prefix =>
+ * Uses the given prefix for all the tables in this database.  This setting can be overridden
+ * on a per-table basis with the Model::$tablePrefix property.
+ *
+ * schema =>
+ * For Postgres and DB2, specifies which schema you would like to use the tables in. Postgres defaults to
+ * 'public', DB2 defaults to empty.
+ *
+ * encoding =>
+ * For MySQL, MySQLi, Postgres and DB2, specifies the character encoding to use when connecting to the
+ * database.  Uses database default.
+ *
+ */
+class DATABASE_CONFIG {
+
+	var $default = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'database_name',
+		'prefix' => '',
+	);
+
+	var $test = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'test_database_name',
+		'prefix' => '',
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/routes.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/routes.php
new file mode 100644
index 000000000..9e4a28c14
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/routes.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Routes Configuration
+ *
+ * In this file, you set up routes to your controllers and their actions.
+ * Routes are very important mechanism that allows you to freely connect
+ * different urls to chosen controllers and their actions (functions).
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Here, we are connecting '/' (base path) to controller called 'Pages',
+ * its action called 'display', and we pass a param to select the view file
+ * to use (in this case, /app/views/pages/home.ctp)...
+ */
+	Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+
+/**
+ * ...and connect the rest of 'Pages' controller's urls.
+ */
+	Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.php
new file mode 100644
index 000000000..33e49eabd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.php
@@ -0,0 +1,75 @@
+<?php
+/*DbAcl schema generated on: 2007-11-24 15:11:13 : 1195945453*/
+
+/**
+ * This is Acl Schema file
+ *
+ * Use it to configure database for ACL
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config.sql
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/*
+ *
+ * Using the Schema command line utility
+ * cake schema run create DbAcl
+ *
+ */
+class DbAclSchema extends CakeSchema {
+
+	var $name = 'DbAcl';
+
+	function before($event = array()) {
+		return true;
+	}
+
+	function after($event = array()) {
+	}
+
+	var $acos = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'model' => array('type'=>'string', 'null' => true),
+			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'alias' => array('type'=>'string', 'null' => true),
+			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		);
+
+	var $aros = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'model' => array('type'=>'string', 'null' => true),
+			'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'alias' => array('type'=>'string', 'null' => true),
+			'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		);
+
+	var $aros_acos = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'aro_id' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
+			'aco_id' => array('type'=>'integer', 'null' => false, 'length' => 10),
+			'_create' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'_read' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'_update' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'_delete' => array('type'=>'string', 'null' => false, 'default' => '0', 'length' => 2),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'ARO_ACO_KEY' => array('column' => array('aro_id', 'aco_id'), 'unique' => 1))
+		);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.sql b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.sql
new file mode 100644
index 000000000..327fc77d0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/db_acl.sql
@@ -0,0 +1,40 @@
+# $Id$
+#
+# Copyright 2005-2010, Cake Software Foundation, Inc.
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+# MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+CREATE TABLE acos (
+  id INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  parent_id INTEGER(10) DEFAULT NULL,
+  model VARCHAR(255) DEFAULT '',
+  foreign_key INTEGER(10) UNSIGNED DEFAULT NULL,
+  alias VARCHAR(255) DEFAULT '',
+  lft INTEGER(10) DEFAULT NULL,
+  rght INTEGER(10) DEFAULT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE aros_acos (
+  id INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  aro_id INTEGER(10) UNSIGNED NOT NULL,
+  aco_id INTEGER(10) UNSIGNED NOT NULL,
+  _create CHAR(2) NOT NULL DEFAULT 0,
+  _read CHAR(2) NOT NULL DEFAULT 0,
+  _update CHAR(2) NOT NULL DEFAULT 0,
+  _delete CHAR(2) NOT NULL DEFAULT 0,
+  PRIMARY KEY(id)
+);
+
+CREATE TABLE aros (
+  id INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  parent_id INTEGER(10) DEFAULT NULL,
+  model VARCHAR(255) DEFAULT '',
+  foreign_key INTEGER(10) UNSIGNED DEFAULT NULL,
+  alias VARCHAR(255) DEFAULT '',
+  lft INTEGER(10) DEFAULT NULL,
+  rght INTEGER(10) DEFAULT NULL,
+  PRIMARY KEY  (id)
+);
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.php
new file mode 100644
index 000000000..52b6e3bd5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.php
@@ -0,0 +1,52 @@
+<?php
+/*i18n schema generated on: 2007-11-25 07:11:25 : 1196004805*/
+
+/**
+ * This is i18n Schema file
+ *
+ * Use it to configure database for i18n
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config.sql
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/*
+ *
+ * Using the Schema command line utility
+ * cake schema run create i18n
+ *
+ */
+class i18nSchema extends CakeSchema {
+
+	var $name = 'i18n';
+
+	function before($event = array()) {
+		return true;
+	}
+
+	function after($event = array()) {
+	}
+
+	var $i18n = array(
+			'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+			'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
+			'model' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+			'foreign_key' => array('type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'),
+			'field' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+			'content' => array('type'=>'text', 'null' => true, 'default' => NULL),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1), 'locale' => array('column' => 'locale', 'unique' => 0), 'model' => array('column' => 'model', 'unique' => 0), 'row_id' => array('column' => 'foreign_key', 'unique' => 0), 'field' => array('column' => 'field', 'unique' => 0))
+		);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.sql b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.sql
new file mode 100644
index 000000000..9598e9995
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/i18n.sql
@@ -0,0 +1,26 @@
+# $Id$
+#
+# Copyright 2005-2010, Cake Software Foundation, Inc.
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+# MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+CREATE TABLE i18n (
+	id int(10) NOT NULL auto_increment,
+	locale varchar(6) NOT NULL,
+	model varchar(255) NOT NULL,
+	foreign_key int(10) NOT NULL,
+	field varchar(255) NOT NULL,
+	content mediumtext,
+	PRIMARY KEY	(id),
+#	UNIQUE INDEX I18N_LOCALE_FIELD(locale, model, foreign_key, field),
+#	INDEX I18N_LOCALE_ROW(locale, model, foreign_key),
+#	INDEX I18N_LOCALE_MODEL(locale, model),
+#	INDEX I18N_FIELD(model, foreign_key, field),
+#	INDEX I18N_ROW(model, foreign_key),
+	INDEX locale (locale),
+	INDEX model (model),
+	INDEX row_id (foreign_key),
+	INDEX field (field)
+);
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.php
new file mode 100644
index 000000000..4f540cfe8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.php
@@ -0,0 +1,49 @@
+<?php
+/*Sessions schema generated on: 2007-11-25 07:11:54 : 1196004714*/
+
+/**
+ * This is Sessions Schema file
+ *
+ * Use it to configure database for Sessions
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config.sql
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/*
+ *
+ * Using the Schema command line utility
+ * cake schema run create Sessions
+ *
+ */
+class SessionsSchema extends CakeSchema {
+
+	var $name = 'Sessions';
+
+	function before($event = array()) {
+		return true;
+	}
+
+	function after($event = array()) {
+	}
+
+	var $cake_sessions = array(
+			'id' => array('type'=>'string', 'null' => false, 'key' => 'primary'),
+			'data' => array('type'=>'text', 'null' => true, 'default' => NULL),
+			'expires' => array('type'=>'integer', 'null' => true, 'default' => NULL),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+		);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.sql b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.sql
new file mode 100644
index 000000000..a6ba455a7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/config/schema/sessions.sql
@@ -0,0 +1,16 @@
+# $Id$
+#
+# Copyright 2005-2010, Cake Software Foundation, Inc.
+#								1785 E. Sahara Avenue, Suite 490-204
+#								Las Vegas, Nevada 89104
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+# MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+CREATE TABLE cake_sessions (
+  id varchar(255) NOT NULL default '',
+  data text,
+  expires int(11) default NULL,
+  PRIMARY KEY  (id)
+);
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/components/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/components/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/pages_controller.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/pages_controller.php
new file mode 100644
index 000000000..28cd78838
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/controllers/pages_controller.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Static content controller.
+ *
+ * This file will render views from views/pages/
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Static content controller
+ *
+ * Override this controller by placing a copy in controllers directory of an application
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ */
+class PagesController extends AppController {
+
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Pages';
+
+/**
+ * Default helper
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html');
+
+/**
+ * This controller does not use a model
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * Displays a view
+ *
+ * @param mixed What page to display
+ * @access public
+ */
+	function display() {
+		$path = func_get_args();
+
+		$count = count($path);
+		if (!$count) {
+			$this->redirect('/');
+		}
+		$page = $subpage = $title_for_layout = null;
+
+		if (!empty($path[0])) {
+			$page = $path[0];
+		}
+		if (!empty($path[1])) {
+			$subpage = $path[1];
+		}
+		if (!empty($path[$count - 1])) {
+			$title_for_layout = Inflector::humanize($path[$count - 1]);
+		}
+		$this->set(compact('page', 'subpage', 'title_for_layout'));
+		$this->render(implode('/', $path));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/index.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/index.php
new file mode 100644
index 000000000..732c01021
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/index.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/libs/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/libs/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/locale/eng/LC_MESSAGES/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/behaviors/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/behaviors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/datasources/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/models/datasources/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/plugins/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/plugins/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/behaviors/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/behaviors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/components/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/components/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/controllers/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/controllers/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/datasources/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/datasources/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/helpers/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/helpers/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/models/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/models/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/shells/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/cases/shells/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/fixtures/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/fixtures/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/groups/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tests/groups/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/models/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/models/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/persistent/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/persistent/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/views/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/cache/views/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/logs/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/logs/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/sessions/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/sessions/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/tests/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/tmp/tests/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/vendors/shells/tasks/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/vendors/shells/tasks/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp
new file mode 100644
index 000000000..70e28b22e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/html/default.ctp
@@ -0,0 +1,26 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php
+$content = explode("\n", $content);
+
+foreach ($content as $line):
+	echo '<p> ' . $line . '</p>';
+endforeach;
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp
new file mode 100644
index 000000000..574514c3f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/email/text/default.ctp
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo $content; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/elements/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/errors/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/errors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/helpers/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/helpers/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/ajax.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/ajax.ctp
new file mode 100644
index 000000000..6d1bb5a7d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/ajax.ctp
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/default.ctp
new file mode 100644
index 000000000..03be9a47f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/default.ctp
@@ -0,0 +1,59 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.skel.views.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<?php echo $this->Html->charset(); ?>
+	<title>
+		<?php __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo $title_for_layout; ?>
+	</title>
+	<?php
+		echo $this->Html->meta('icon');
+
+		echo $this->Html->css('cake.generic');
+
+		echo $scripts_for_layout;
+	?>
+</head>
+<body>
+	<div id="container">
+		<div id="header">
+			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1>
+		</div>
+		<div id="content">
+
+			<?php echo $this->Session->flash(); ?>
+
+			<?php echo $content_for_layout; ?>
+
+		</div>
+		<div id="footer">
+			<?php echo $this->Html->link(
+					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework', true), 'border' => '0')),
+					'http://www.cakephp.org/',
+					array('target' => '_blank', 'escape' => false)
+				);
+			?>
+		</div>
+	</div>
+	<?php echo $this->element('sql_dump'); ?>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp
new file mode 100644
index 000000000..beae8a600
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/html/default.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+
+<html>
+<head>
+	<title><?php echo $title_for_layout;?></title>
+</head>
+
+<body>
+	<?php echo $content_for_layout;?>
+
+	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp
new file mode 100644
index 000000000..2b794e8ad
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/email/text/default.ctp
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+
+<?php echo $content_for_layout;?>
+
+This email was sent using the CakePHP Framework, http://cakephp.org.
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/flash.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/flash.ctp
new file mode 100644
index 000000000..b4b0a61cc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/flash.ctp
@@ -0,0 +1,38 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php echo $this->Html->charset(); ?>
+<title><?php echo $page_title; ?></title>
+
+<?php if (Configure::read() == 0) { ?>
+<meta http-equiv="Refresh" content="<?php echo $pause?>;url=<?php echo $url?>"/>
+<?php } ?>
+<style><!--
+P { text-align:center; font:bold 1.1em sans-serif }
+A { color:#444; text-decoration:none }
+A:HOVER { text-decoration: underline; color:#44E }
+--></style>
+</head>
+<body>
+<p><a href="<?php echo $url?>"><?php echo $message?></a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/js/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/js/default.ctp
new file mode 100644
index 000000000..d94dc903a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/js/default.ctp
@@ -0,0 +1,2 @@
+<?php echo $scripts_for_layout; ?>
+<script type="text/javascript"><?php echo $content_for_layout; ?></script>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp
new file mode 100644
index 000000000..94067f2bf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/rss/default.ctp
@@ -0,0 +1,17 @@
+<?php
+echo $rss->header();
+
+if (!isset($channel)) {
+	$channel = array();
+}
+if (!isset($channel['title'])) {
+	$channel['title'] = $title_for_layout;
+}
+
+echo $rss->document(
+	$rss->channel(
+		array(), $channel, $content_for_layout
+	)
+);
+
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp
new file mode 100644
index 000000000..566ca2158
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/layouts/xml/default.ctp
@@ -0,0 +1,2 @@
+<?php echo $xml->header(); ?>
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/pages/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/pages/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/scaffolds/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/views/scaffolds/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/.htaccess b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/.htaccess
new file mode 100644
index 000000000..f9d8b938b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/.htaccess
@@ -0,0 +1,6 @@
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php?url=$1 [QSA,L]
+</IfModule>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css.php
new file mode 100644
index 000000000..1f04005de
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * CSS Functions
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.webroot
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+	header('HTTP/1.1 404 Not Found');
+	exit('File Not Found');
+}
+
+/**
+ * Ensure required files are included
+ */
+if (!class_exists('File')) {
+	require LIBS . 'file.php';
+}
+
+/**
+ * Make clean CSS
+ *
+ * @param unknown_type $path
+ * @param unknown_type $name
+ * @return unknown
+ */
+	function make_clean_css($path, $name) {
+		App::import('Vendor', 'csspp' . DS . 'csspp');
+		$data = file_get_contents($path);
+		$csspp = new csspp();
+		$output = $csspp->compress($data);
+		$ratio = 100 - (round(strlen($output) / strlen($data), 3) * 100);
+		$output = " /* file: $name, ratio: $ratio% */ " . $output;
+		return $output;
+	}
+
+/**
+ * Write CSS cache
+ *
+ * @param unknown_type $path
+ * @param unknown_type $content
+ * @return unknown
+ */
+	function write_css_cache($path, $content) {
+		if (!is_dir(dirname($path))) {
+			mkdir(dirname($path));
+		}
+		$cache = new File($path);
+		return $cache->write($content);
+	}
+
+	if (preg_match('|\.\.|', $url) || !preg_match('|^ccss/(.+)$|i', $url, $regs)) {
+		exit('Wrong file name.');
+	}
+
+	$filename = 'css/' . $regs[1];
+	$filepath = CSS . $regs[1];
+	$cachepath = CACHE . 'css' . DS . str_replace(array('/','\\'), '-', $regs[1]);
+
+	if (!file_exists($filepath)) {
+		exit('Wrong file name.');
+	}
+
+	if (file_exists($cachepath)) {
+		$templateModified = filemtime($filepath);
+		$cacheModified = filemtime($cachepath);
+
+		if ($templateModified > $cacheModified) {
+			$output = make_clean_css($filepath, $filename);
+			write_css_cache($cachepath, $output);
+		} else {
+			$output = file_get_contents($cachepath);
+		}
+	} else {
+		$output = make_clean_css($filepath, $filename);
+		write_css_cache($cachepath, $output);
+		$templateModified = time();
+	}
+
+	header("Date: " . date("D, j M Y G:i:s ", $templateModified) . 'GMT');
+	header("Content-Type: text/css");
+	header("Expires: " . gmdate("D, j M Y H:i:s", time() + DAY) . " GMT");
+	header("Cache-Control: max-age=86400, must-revalidate"); // HTTP/1.1
+	header("Pragma: cache");        // HTTP/1.0
+	print $output;
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css/cake.generic.css b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css/cake.generic.css
new file mode 100644
index 000000000..7f978afc0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/css/cake.generic.css
@@ -0,0 +1,535 @@
+/**
+ *
+ * Generic CSS for CakePHP
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.webroot.css
+ * @since         CakePHP(tm)
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+* {
+	margin:0;
+	padding:0;
+}
+
+/** General Style Info **/
+body {
+	background: #003d4c;
+	color: #fff;
+	font-family:'lucida grande',verdana,helvetica,arial,sans-serif;
+	font-size:90%;
+	margin: 0;
+}
+a {
+	color: #003d4c;
+	text-decoration: underline;
+	font-weight: bold;
+}
+a:hover {
+	color: #367889;
+	text-decoration:none;
+}
+a img {
+	border:none;
+}
+h1, h2, h3, h4 {
+	font-weight: normal;
+	margin-bottom:0.5em;
+}
+h1 {
+	background:#fff;
+	color: #003d4c;
+	font-size: 100%;
+}
+h2 {
+	background:#fff;
+	color: #e32;
+	font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
+	font-size: 190%;
+}
+h3 {
+	color: #993;
+	font-family:'Gill Sans','lucida grande', helvetica, arial, sans-serif;
+	font-size: 165%;
+}
+h4 {
+	color: #993;
+	font-weight: normal;
+}
+ul, li {
+	margin: 0 12px;
+}
+
+/** Layout **/
+#container {
+	text-align: left;
+}
+
+#header{
+	padding: 10px 20px;
+}
+#header h1 {
+	line-height:20px;
+	background: #003d4c url('../img/cake.icon.png') no-repeat left;
+	color: #fff;
+	padding: 0px 30px;
+}
+#header h1 a {
+	color: #fff;
+	background: #003d4c;
+	font-weight: normal;
+	text-decoration: none;
+}
+#header h1 a:hover {
+	color: #fff;
+	background: #003d4c;
+	text-decoration: underline;
+}
+#content{
+	background: #fff;
+	clear: both;
+	color: #333;
+	padding: 10px 20px 40px 20px;
+	overflow: auto;
+}
+#footer {
+	clear: both;
+	padding: 6px 10px;
+	text-align: right;
+}
+
+/** containers **/
+div.form,
+div.index,
+div.view {
+	float:right;
+	width:76%;
+	border-left:1px solid #666;
+	padding:10px 2%;
+}
+div.actions {
+	float:left;
+	width:16%;
+	padding:10px 1.5%;
+}
+div.actions h3 {
+	padding-top:0;
+	color:#777;
+}
+
+
+/** Tables **/
+table {
+	background: #fff;
+	border-right:0;
+	clear: both;
+	color: #333;
+	margin-bottom: 10px;
+	width: 100%;
+}
+th {
+	border:0;
+	border-bottom:2px solid #555;
+	text-align: left;
+	padding:4px;
+}
+th a {
+	display: block;
+	padding: 2px 4px;
+	text-decoration: none;
+}
+th a.asc:after {
+	content: ' ⇣';
+}
+th a.desc:after {
+	content: ' ⇡';
+}
+table tr td {
+	background: #fff;
+	padding: 6px;
+	text-align: left;
+	vertical-align: top;
+	border-bottom:1px solid #ddd;
+}
+table tr:nth-child(2n) td {
+	background: #f5f5f5;
+}
+table .altrow td {
+	background: #f5f5f5;
+}
+td.actions {
+	text-align: center;
+	white-space: nowrap;
+}
+table td.actions a {
+	margin: 0px 6px;
+	padding:2px 5px;
+}
+.cake-sql-log table {
+	background: #f4f4f4;
+}
+.cake-sql-log td {
+	padding: 4px 8px;
+	text-align: left;
+	font-family: Monaco, Consolas, "Courier New", monospaced;
+}
+.cake-sql-log caption {
+	color:#fff;
+}
+
+/** Paging **/
+div.paging {
+	background:#fff;
+	color: #ccc;
+	margin-top: 1em;
+	clear:both;
+}
+div.paging span.disabled {
+	color: #ddd;
+	display: inline;
+}
+div.paging span.current {
+	color: #c73e14;
+}
+div.paging span a {
+}
+
+/** Scaffold View **/
+dl {
+	line-height: 2em;
+	margin: 0em 0em;
+	width: 60%;
+}
+dl .altrow {
+	background: #f4f4f4;
+}
+dt {
+	font-weight: bold;
+	padding-left: 4px;
+	vertical-align: top;
+}
+dd {
+	margin-left: 10em;
+	margin-top: -2em;
+	vertical-align: top;
+}
+
+/** Forms **/
+form {
+	clear: both;
+	margin-right: 20px;
+	padding: 0;
+	width: 95%;
+}
+fieldset {
+	border: 1px solid #ccc;
+	margin-bottom: 1em;
+	padding: 16px 20px;
+}
+fieldset legend {
+	background:#fff;
+	color: #e32;
+	font-size: 160%;
+	font-weight: bold;
+}
+fieldset fieldset {
+	margin-top: 0px;
+	margin-bottom: 20px;
+	padding: 16px 10px;
+}
+fieldset fieldset legend {
+	font-size: 120%;
+	font-weight: normal;
+}
+fieldset fieldset div {
+	clear: left;
+	margin: 0 20px;
+}
+form div {
+	clear: both;
+	margin-bottom: 1em;
+	padding: .5em;
+	vertical-align: text-top;
+}
+form .input {
+	color: #444;
+}
+form .required {
+	font-weight: bold;
+}
+form .required label:after {
+	color: #e32;
+	content: '*';
+	display:inline;
+}
+form div.submit {
+	border: 0;
+	clear: both;
+	margin-top: 10px;
+}
+label {
+	display: block;
+	font-size: 110%;
+	margin-bottom:3px;
+}
+input, textarea {
+	clear: both;
+	font-size: 140%;
+	font-family: "frutiger linotype", "lucida grande", "verdana", sans-serif;
+	padding: 1%;
+	width:98%;
+}
+select {
+	clear: both;
+	font-size: 120%;
+	vertical-align: text-bottom;
+}
+select[multiple=multiple] {
+	width: 100%;
+}
+option {
+	font-size: 120%;
+	padding: 0 3px;
+}
+input[type=checkbox] {
+	clear: left;
+	float: left;
+	margin: 0px 6px 7px 2px;
+	width: auto;
+}
+div.checkbox label {
+	display: inline;
+}
+input[type=radio] {
+	float:left;
+	width:auto;
+	margin: 0 3px 7px 0;
+}
+div.radio label {
+	margin: 0 0 6px 20px;
+}
+input[type=submit] {
+	display: inline;
+	font-size: 110%;
+	width: auto;
+}
+form .submit input[type=submit] {
+	background:#62af56;
+	background: -webkit-gradient(linear, left top, left bottom, from(#a8ea9c), to(#62af56));
+	background-image: -moz-linear-gradient(top, #a8ea9c, #62af56);
+	border-color: #2d6324;
+	color: #000;
+	text-shadow: #8cee7c 0px 1px 0px;
+}
+form .submit input[type=submit]:hover {
+	background:#4ca83d;
+	background: -webkit-gradient(linear, left top, left bottom, from(#85e573), to(#4ca83d));
+	background-image: -moz-linear-gradient(top, #85e573, #4ca83d);
+}
+
+/** Notices and Errors **/
+div.message {
+	clear: both;
+	color: #fff;
+	font-size: 140%;
+	font-weight: bold;
+	margin: 0 0 1em 0;
+	background: #c73e14;
+	padding: 5px;
+}
+div.error-message {
+	clear: both;
+	color: #fff;
+	font-weight: bold;
+	background: #c73e14;
+}
+p.error {
+	background-color: #e32;
+	color: #fff;
+	font-family: Courier, monospace;
+	font-size: 120%;
+	line-height: 140%;
+	padding: 0.8em;
+	margin: 1em 0;
+}
+p.error em {
+	color: #000;
+	font-weight: normal;
+	line-height: 140%;
+}
+.notice {
+	background: #ffcc00;
+	color: #000;
+	display: block;
+	font-family: Courier, monospace;
+	font-size: 120%;
+	line-height: 140%;
+	padding: 0.8em;
+	margin: 1em 0;
+}
+.success {
+	background: green;
+	color: #fff;
+}
+
+/**  Actions  **/
+div.actions ul {
+	margin: 0;
+	padding: 0;
+}
+div.actions li {
+	margin:0 0 0.5em 0;
+	list-style-type: none;
+	white-space: nowrap;
+	padding: 0;
+}
+div.actions ul li a {
+	font-weight: normal;
+	display: block;
+	clear: both;
+}
+div.actions ul li a:hover {
+	text-decoration: underline;
+}
+
+input[type=submit],
+div.actions ul li a,
+td.actions a {
+	font-weight:normal;
+	padding: 4px 8px;
+	background:#e6e49f;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f1f1d4), to(#e6e49f));
+	background-image: -moz-linear-gradient(top, #f1f1d4, #e6e49f);
+	color:#333;
+	border:1px solid #aaac62;
+	-webkit-border-radius:8px;
+	-moz-border-radius:8px;
+	border-radius:8px;
+	text-decoration:none;
+	text-shadow: #fff 0px 1px 0px;
+	min-width: 0;
+}
+input[type=submit]:hover,
+div.actions ul li a:hover,
+td.actions a:hover {
+	background: #f0f09a;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f7f7e1), to(#eeeca9));
+}
+
+/** Related **/
+div.related {
+	clear: both;
+	display: block;
+}
+
+/** Debugging **/
+pre {
+	color: #000;
+	background: #f0f0f0;
+	padding: 1em;
+}
+pre.cake-debug {
+	background: #ffcc00;
+	font-size: 120%;
+	line-height: 140%;
+	margin-top: 1em;
+	overflow: auto;
+	position: relative;
+}
+div.cake-stack-trace {
+	background: #fff;
+	color: #333;
+	margin: 0px;
+	padding: 6px;
+	font-size: 120%;
+	line-height: 140%;
+	overflow: auto;
+	position: relative;
+}
+div.cake-code-dump pre {
+	position: relative;
+	overflow: auto;
+}
+div.cake-stack-trace pre, div.cake-code-dump pre {
+	color: #000;
+	background-color: #F0F0F0;
+	margin: 0px;
+	padding: 1em;
+	overflow: auto;
+}
+div.cake-code-dump pre, div.cake-code-dump pre code {
+	clear: both;
+	font-size: 12px;
+	line-height: 15px;
+	margin: 4px 2px;
+	padding: 4px;
+	overflow: auto;
+}
+div.cake-code-dump span.code-highlight {
+	background-color: #ff0;
+	padding: 4px;
+}
+div.code-coverage-results div.code-line {
+	padding-left:5px;
+	display:block;
+	margin-left:10px;
+}
+div.code-coverage-results div.uncovered span.content {
+	background:#ecc;
+}
+div.code-coverage-results div.covered span.content {
+	background:#cec;
+}
+div.code-coverage-results div.ignored span.content {
+	color:#aaa;
+}
+div.code-coverage-results span.line-num {
+	color:#666;
+	display:block;
+	float:left;
+	width:20px;
+	text-align:right;
+	margin-right:5px;
+}
+div.code-coverage-results span.line-num strong {
+	color:#666;
+}
+div.code-coverage-results div.start {
+	border:1px solid #aaa;
+	border-width:1px 1px 0px 1px;
+	margin-top:30px;
+	padding-top:5px;
+}
+div.code-coverage-results div.end {
+	border:1px solid #aaa;
+	border-width:0px 1px 1px 1px;
+	margin-bottom:30px;
+	padding-bottom:5px;
+}
+div.code-coverage-results div.realstart {
+	margin-top:0px;
+}
+div.code-coverage-results p.note {
+	color:#bbb;
+	padding:5px;
+	margin:5px 0 10px;
+	font-size:10px;
+}
+div.code-coverage-results span.result-bad {
+	color: #a00;
+}
+div.code-coverage-results span.result-ok {
+	color: #fa0;
+}
+div.code-coverage-results span.result-good {
+	color: #0a0;
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/favicon.ico b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/favicon.ico
new file mode 100644
index 000000000..b36e81f2f
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/favicon.ico differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.icon.png b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.icon.png
new file mode 100644
index 000000000..394fa42d5
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.icon.png differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.power.gif b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.power.gif
new file mode 100644
index 000000000..8f8d570a2
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/img/cake.power.gif differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/index.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/index.php
new file mode 100644
index 000000000..396775b73
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/index.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Index
+ *
+ * The Front Controller for handling every request
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.webroot
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * Use the DS to separate the directories in other defines
+ */
+	if (!defined('DS')) {
+		define('DS', DIRECTORY_SEPARATOR);
+	}
+/**
+ * These defines should only be edited if you have cake installed in
+ * a directory layout other than the way it is distributed.
+ * When using custom settings be sure to use the DS and do not add a trailing DS.
+ */
+
+/**
+ * The full path to the directory which holds "app", WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('ROOT')) {
+		define('ROOT', dirname(dirname(dirname(__FILE__))));
+	}
+/**
+ * The actual directory name for the "app".
+ *
+ */
+	if (!defined('APP_DIR')) {
+		define('APP_DIR', basename(dirname(dirname(__FILE__))));
+	}
+/**
+ * The absolute path to the "cake" directory, WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+		define('CAKE_CORE_INCLUDE_PATH', ROOT);
+	}
+
+/**
+ * Editing below this line should NOT be necessary.
+ * Change at your own risk.
+ *
+ */
+	if (!defined('WEBROOT_DIR')) {
+		define('WEBROOT_DIR', basename(dirname(__FILE__)));
+	}
+	if (!defined('WWW_ROOT')) {
+		define('WWW_ROOT', dirname(__FILE__) . DS);
+	}
+	if (!defined('CORE_PATH')) {
+		if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
+			define('APP_PATH', null);
+			define('CORE_PATH', null);
+		} else {
+			define('APP_PATH', ROOT . DS . APP_DIR . DS);
+			define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+		}
+	}
+	if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
+		trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
+	}
+	if (isset($_GET['url']) && $_GET['url'] === 'favicon.ico') {
+		return;
+	} else {
+		$Dispatcher = new Dispatcher();
+		$Dispatcher->dispatch();
+	}
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/js/empty b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/js/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/test.php b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/test.php
new file mode 100644
index 000000000..cfbf85145
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/console/templates/skel/webroot/test.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Web Access Frontend for TestSuite
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+set_time_limit(0);
+ini_set('display_errors', 1);
+/**
+ * Use the DS to separate the directories in other defines
+ */
+	if (!defined('DS')) {
+		define('DS', DIRECTORY_SEPARATOR);
+	}
+/**
+ * These defines should only be edited if you have cake installed in
+ * a directory layout other than the way it is distributed.
+ * When using custom settings be sure to use the DS and do not add a trailing DS.
+ */
+
+/**
+ * The full path to the directory which holds "app", WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('ROOT')) {
+		define('ROOT', dirname(dirname(dirname(__FILE__))));
+	}
+/**
+ * The actual directory name for the "app".
+ *
+ */
+	if (!defined('APP_DIR')) {
+		define('APP_DIR', basename(dirname(dirname(__FILE__))));
+	}
+/**
+ * The absolute path to the "cake" directory, WITHOUT a trailing DS.
+ *
+ */
+	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+		define('CAKE_CORE_INCLUDE_PATH', ROOT);
+	}
+
+/**
+ * Editing below this line should not be necessary.
+ * Change at your own risk.
+ *
+ */
+if (!defined('WEBROOT_DIR')) {
+	define('WEBROOT_DIR', basename(dirname(__FILE__)));
+}
+if (!defined('WWW_ROOT')) {
+	define('WWW_ROOT', dirname(__FILE__) . DS);
+}
+if (!defined('CORE_PATH')) {
+	if (function_exists('ini_set') && ini_set('include_path', CAKE_CORE_INCLUDE_PATH . PATH_SEPARATOR . ROOT . DS . APP_DIR . DS . PATH_SEPARATOR . ini_get('include_path'))) {
+		define('APP_PATH', null);
+		define('CORE_PATH', null);
+	} else {
+		define('APP_PATH', ROOT . DS . APP_DIR . DS);
+		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+	}
+}
+if (!include(CORE_PATH . 'cake' . DS . 'bootstrap.php')) {
+	trigger_error("CakePHP core could not be found.  Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php.  It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
+}
+
+$corePath = App::core('cake');
+if (isset($corePath[0])) {
+	define('TEST_CAKE_CORE_INCLUDE_PATH', rtrim($corePath[0], DS) . DS);
+} else {
+	define('TEST_CAKE_CORE_INCLUDE_PATH', CAKE_CORE_INCLUDE_PATH);
+}
+
+if (Configure::read('debug') < 1) {
+	die(__('Debug setting does not allow access to this url.', true));
+}
+
+require_once CAKE_TESTS_LIB . 'cake_test_suite_dispatcher.php';
+
+$Dispatcher = new CakeTestSuiteDispatcher();
+$Dispatcher->dispatch();
diff --git a/code/ryzom/tools/server/www/webtt/cake/dispatcher.php b/code/ryzom/tools/server/www/webtt/cake/dispatcher.php
new file mode 100644
index 000000000..d1e79c4d3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/dispatcher.php
@@ -0,0 +1,663 @@
+<?php
+/**
+ * Dispatcher takes the URL information, parses it for paramters and
+ * tells the involved controllers what to do.
+ *
+ * This is the heart of Cake's operation.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * List of helpers to include
+ */
+App::import('Core', 'Router');
+App::import('Controller', 'Controller', false);
+
+/**
+ * Dispatcher translates URLs to controller-action-paramter triads.
+ *
+ * Dispatches the request, creating appropriate models and controllers.
+ *
+ * @package       cake
+ * @subpackage    cake.cake
+ */
+class Dispatcher extends Object {
+
+/**
+ * Base URL
+ *
+ * @var string
+ * @access public
+ */
+	var $base = false;
+
+/**
+ * webroot path
+ *
+ * @var string
+ * @access public
+ */
+	var $webroot = '/';
+
+/**
+ * Current URL
+ *
+ * @var string
+ * @access public
+ */
+	var $here = false;
+
+/**
+ * the params for this request
+ *
+ * @var string
+ * @access public
+ */
+	var $params = null;
+
+/**
+ * Constructor.
+ */
+	function __construct($url = null, $base = false) {
+		if ($base !== false) {
+			Configure::write('App.base', $base);
+		}
+		if ($url !== null) {
+			return $this->dispatch($url);
+		}
+	}
+
+/**
+ * Dispatches and invokes given URL, handing over control to the involved controllers, and then renders the
+ * results (if autoRender is set).
+ *
+ * If no controller of given name can be found, invoke() shows error messages in
+ * the form of Missing Controllers information. It does the same with Actions (methods of Controllers are called
+ * Actions).
+ *
+ * @param string $url URL information to work on
+ * @param array $additionalParams Settings array ("bare", "return") which is melded with the GET and POST params
+ * @return boolean Success
+ * @access public
+ */
+	function dispatch($url = null, $additionalParams = array()) {
+		if ($this->base === false) {
+			$this->base = $this->baseUrl();
+		}
+
+		if (is_array($url)) {
+			$url = $this->__extractParams($url, $additionalParams);
+		} else {
+			if ($url) {
+				$_GET['url'] = $url;
+			}
+			$url = $this->getUrl();
+			$this->params = array_merge($this->parseParams($url), $additionalParams);
+		}
+		$this->here = $this->base . '/' . $url;
+
+		if ($this->asset($url) || $this->cached($url)) {
+			return;
+		}
+		$controller =& $this->__getController();
+
+		if (!is_object($controller)) {
+			Router::setRequestInfo(array($this->params, array('base' => $this->base, 'webroot' => $this->webroot)));
+			return $this->cakeError('missingController', array(array(
+				'className' => Inflector::camelize($this->params['controller']) . 'Controller',
+				'webroot' => $this->webroot,
+				'url' => $url,
+				'base' => $this->base
+			)));
+		}
+		$privateAction = $this->params['action'][0] === '_';
+		$prefixes = Router::prefixes();
+
+		if (!empty($prefixes)) {
+			if (isset($this->params['prefix'])) {
+				$this->params['action'] = $this->params['prefix'] . '_' . $this->params['action'];
+			} elseif (strpos($this->params['action'], '_') > 0) {
+				list($prefix, $action) = explode('_', $this->params['action']);
+				$privateAction = in_array($prefix, $prefixes);
+			}
+		}
+
+		Router::setRequestInfo(array(
+			$this->params, array('base' => $this->base, 'here' => $this->here, 'webroot' => $this->webroot)
+		));
+
+		if ($privateAction) {
+			return $this->cakeError('privateAction', array(array(
+				'className' => Inflector::camelize($this->params['controller'] . "Controller"),
+				'action' => $this->params['action'],
+				'webroot' => $this->webroot,
+				'url' => $url,
+				'base' => $this->base
+			)));
+		}
+		$controller->base = $this->base;
+		$controller->here = $this->here;
+		$controller->webroot = $this->webroot;
+		$controller->plugin = isset($this->params['plugin']) ? $this->params['plugin'] : null;
+		$controller->params =& $this->params;
+		$controller->action =& $this->params['action'];
+		$controller->passedArgs = array_merge($this->params['pass'], $this->params['named']);
+
+		if (!empty($this->params['data'])) {
+			$controller->data =& $this->params['data'];
+		} else {
+			$controller->data = null;
+		}
+		if (isset($this->params['return']) && $this->params['return'] == 1) {
+			$controller->autoRender = false;
+		}
+		if (!empty($this->params['bare'])) {
+			$controller->autoLayout = false;
+		}
+		return $this->_invoke($controller, $this->params);
+	}
+
+/**
+ * Initializes the components and models a controller will be using.
+ * Triggers the controller action, and invokes the rendering if Controller::$autoRender is true and echo's the output.
+ * Otherwise the return value of the controller action are returned.
+ *
+ * @param object $controller Controller to invoke
+ * @param array $params Parameters with at least the 'action' to invoke
+ * @param boolean $missingAction Set to true if missing action should be rendered, false otherwise
+ * @return string Output as sent by controller
+ * @access protected
+ */
+	function _invoke(&$controller, $params) {
+		$controller->constructClasses();
+		$controller->startupProcess();
+
+		$methods = array_flip($controller->methods);
+
+		if (!isset($methods[strtolower($params['action'])])) {
+			if ($controller->scaffold !== false) {
+				App::import('Controller', 'Scaffold', false);
+				return new Scaffold($controller, $params);
+			}
+			return $this->cakeError('missingAction', array(array(
+				'className' => Inflector::camelize($params['controller']."Controller"),
+				'action' => $params['action'],
+				'webroot' => $this->webroot,
+				'url' => $this->here,
+				'base' => $this->base
+			)));
+		}
+		$output = call_user_func_array(array(&$controller, $params['action']), $params['pass']);
+
+		if ($controller->autoRender) {
+			$controller->output = $controller->render();
+		} elseif (empty($controller->output)) {
+			$controller->output = $output;
+		}
+		$controller->shutdownProcess();
+
+		if (isset($params['return'])) {
+			return $controller->output;
+		}
+		echo($controller->output);
+	}
+
+/**
+ * Sets the params when $url is passed as an array to Object::requestAction();
+ * Merges the $url and $additionalParams and creates a string url.
+ *
+ * @param array $url Array or request parameters
+ * @param array $additionalParams Array of additional parameters.
+ * @return string $url The generated url string.
+ * @access private
+ */
+	function __extractParams($url, $additionalParams = array()) {
+		$defaults = array('pass' => array(), 'named' => array(), 'form' => array());
+		$params = array_merge($defaults, $url, $additionalParams);
+		$this->params = $params;
+
+		$params += array('base' => false, 'url' => array());
+		return ltrim(Router::reverse($params), '/');
+	}
+
+/**
+ * Returns array of GET and POST parameters. GET parameters are taken from given URL.
+ *
+ * @param string $fromUrl URL to mine for parameter information.
+ * @return array Parameters found in POST and GET.
+ * @access public
+ */
+	function parseParams($fromUrl) {
+		$params = array();
+
+		if (isset($_POST)) {
+			$params['form'] = $_POST;
+			if (ini_get('magic_quotes_gpc') === '1') {
+				$params['form'] = stripslashes_deep($params['form']);
+			}
+			if (env('HTTP_X_HTTP_METHOD_OVERRIDE')) {
+				$params['form']['_method'] = env('HTTP_X_HTTP_METHOD_OVERRIDE');
+			}
+			if (isset($params['form']['_method'])) {
+				if (!empty($_SERVER)) {
+					$_SERVER['REQUEST_METHOD'] = $params['form']['_method'];
+				} else {
+					$_ENV['REQUEST_METHOD'] = $params['form']['_method'];
+				}
+				unset($params['form']['_method']);
+			}
+		}
+		$namedExpressions = Router::getNamedExpressions();
+		extract($namedExpressions);
+		include CONFIGS . 'routes.php';
+		$params = array_merge(array('controller' => '', 'action' => ''), Router::parse($fromUrl), $params);
+		
+		if (empty($params['action'])) {
+			$params['action'] = 'index';
+		}
+		if (isset($params['form']['data'])) {
+			$params['data'] = $params['form']['data'];
+			unset($params['form']['data']);
+		}
+		if (isset($_GET)) {
+			if (ini_get('magic_quotes_gpc') === '1') {
+				$url = stripslashes_deep($_GET);
+			} else {
+				$url = $_GET;
+			}
+			if (isset($params['url'])) {
+				$params['url'] = array_merge($params['url'], $url);
+			} else {
+				$params['url'] = $url;
+			}
+		}
+
+		foreach ($_FILES as $name => $data) {
+			if ($name != 'data') {
+				$params['form'][$name] = $data;
+			}
+		}
+
+		if (isset($_FILES['data'])) {
+			foreach ($_FILES['data'] as $key => $data) {
+				foreach ($data as $model => $fields) {
+					if (is_array($fields)) {
+						foreach ($fields as $field => $value) {
+							if (is_array($value)) {
+								foreach ($value as $k => $v) {
+									$params['data'][$model][$field][$k][$key] = $v;
+								}
+							} else {
+								$params['data'][$model][$field][$key] = $value;
+							}
+						}
+					} else {
+						$params['data'][$model][$key] = $fields;
+					}
+				}
+			}
+		}
+		return $params;
+	}
+
+/**
+ * Returns a base URL and sets the proper webroot
+ *
+ * @return string Base URL
+ * @access public
+ */
+	function baseUrl() {
+		$dir = $webroot = null;
+		$config = Configure::read('App');
+		extract($config);
+
+		if (!$base) {
+			$base = $this->base;
+		}
+		if ($base !== false) {
+			$this->webroot = $base . '/';
+			return $this->base = $base;
+		}
+		if (!$baseUrl) {
+			$replace = array('<', '>', '*', '\'', '"');
+			$base = str_replace($replace, '', dirname(env('PHP_SELF')));
+
+			if ($webroot === 'webroot' && $webroot === basename($base)) {
+				$base = dirname($base);
+			}
+			if ($dir === 'app' && $dir === basename($base)) {
+				$base = dirname($base);
+			}
+
+			if ($base === DS || $base === '.') {
+				$base = '';
+			}
+
+			$this->webroot = $base .'/';
+			return $base;
+		}
+
+		$file = '/' . basename($baseUrl);
+		$base = dirname($baseUrl);
+
+		if ($base === DS || $base === '.') {
+			$base = '';
+		}
+		$this->webroot = $base . '/';
+
+		$docRoot = realpath(env('DOCUMENT_ROOT'));
+		$docRootContainsWebroot = strpos($docRoot, $dir . '/' . $webroot);
+
+		if (!empty($base) || !$docRootContainsWebroot) {
+			if (strpos($this->webroot, $dir) === false) {
+				$this->webroot .= $dir . '/' ;
+			}
+			if (strpos($this->webroot, $webroot) === false) {
+				$this->webroot .= $webroot . '/';
+			}
+		}
+		return $base . $file;
+	}
+
+/**
+ * Get controller to use, either plugin controller or application controller
+ *
+ * @param array $params Array of parameters
+ * @return mixed name of controller if not loaded, or object if loaded
+ * @access private
+ */
+	function &__getController() {
+		$controller = false;
+		$ctrlClass = $this->__loadController($this->params);
+		if (!$ctrlClass) {
+			return $controller;
+		}
+		$ctrlClass .= 'Controller';
+		if (class_exists($ctrlClass)) {
+			$controller =& new $ctrlClass();
+		}
+		return $controller;
+	}
+
+/**
+ * Load controller and return controller classname
+ *
+ * @param array $params Array of parameters
+ * @return string|bool Name of controller class name
+ * @access private
+ */
+	function __loadController($params) {
+		$pluginName = $pluginPath = $controller = null;
+		if (!empty($params['plugin'])) {
+			$pluginName = $controller = Inflector::camelize($params['plugin']);
+			$pluginPath = $pluginName . '.';
+		}
+		if (!empty($params['controller'])) {
+			$controller = Inflector::camelize($params['controller']);
+		}
+		if ($pluginPath . $controller) {
+			if (App::import('Controller', $pluginPath . $controller)) {
+				return $controller;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Returns the REQUEST_URI from the server environment, or, failing that,
+ * constructs a new one, using the PHP_SELF constant and other variables.
+ *
+ * @return string URI
+ * @access public
+ */
+	function uri() {
+		foreach (array('HTTP_X_REWRITE_URL', 'REQUEST_URI', 'argv') as $var) {
+			if ($uri = env($var)) {
+				if ($var == 'argv') {
+					$uri = $uri[0];
+				}
+				break;
+			}
+		}
+		$base = preg_replace('/^\//', '', '' . Configure::read('App.baseUrl'));
+
+		if ($base) {
+			$uri = preg_replace('/^(?:\/)?(?:' . preg_quote($base, '/') . ')?(?:url=)?/', '', $uri);
+		}
+		if (PHP_SAPI == 'isapi') {
+			$uri = preg_replace('/^(?:\/)?(?:\/)?(?:\?)?(?:url=)?/', '', $uri);
+		}
+		if (!empty($uri)) {
+			if (key($_GET) && strpos(key($_GET), '?') !== false) {
+				unset($_GET[key($_GET)]);
+			}
+			$uri = explode('?', $uri, 2);
+
+			if (isset($uri[1])) {
+				parse_str($uri[1], $_GET);
+			}
+			$uri = $uri[0];
+		} else {
+			$uri = env('QUERY_STRING');
+		}
+		if (is_string($uri) && strpos($uri, 'index.php') !== false) {
+			list(, $uri) = explode('index.php', $uri, 2);
+		}
+		if (empty($uri) || $uri == '/' || $uri == '//') {
+			return '';
+		}
+		return str_replace('//', '/', '/' . $uri);
+	}
+
+/**
+ * Returns and sets the $_GET[url] derived from the REQUEST_URI
+ *
+ * @param string $uri Request URI
+ * @param string $base Base path
+ * @return string URL
+ * @access public
+ */
+	function getUrl($uri = null, $base = null) {
+		if (empty($_GET['url'])) {
+			if ($uri == null) {
+				$uri = $this->uri();
+			}
+			if ($base == null) {
+				$base = $this->base;
+			}
+			$url = null;
+			$tmpUri = preg_replace('/^(?:\?)?(?:\/)?/', '', $uri);
+			$baseDir = preg_replace('/^\//', '', dirname($base)) . '/';
+
+			if ($tmpUri === '/' || $tmpUri == $baseDir || $tmpUri == $base) {
+				$url = $_GET['url'] = '/';
+			} else {
+				if ($base && strpos($uri, $base) === 0) {
+					$elements = explode($base, $uri, 2);
+				} elseif (preg_match('/^[\/\?\/|\/\?|\?\/]/', $uri)) {
+					$elements = array(1 => preg_replace('/^[\/\?\/|\/\?|\?\/]/', '', $uri));
+				} else {
+					$elements = array();
+				}
+
+				if (!empty($elements[1])) {
+					$_GET['url'] = $elements[1];
+					$url = $elements[1];
+				} else {
+					$url = $_GET['url'] = '/';
+				}
+
+				if (strpos($url, '/') === 0 && $url != '/') {
+					$url = $_GET['url'] = substr($url, 1);
+				}
+			}
+		} else {
+			$url = $_GET['url'];
+
+		}
+		if ($url{0} == '/') {
+			$url = substr($url, 1);
+		}
+		return $url;
+	}
+
+/**
+ * Outputs cached dispatch view cache
+ *
+ * @param string $url Requested URL
+ * @access public
+ */
+	function cached($url) {
+		if (Configure::read('Cache.check') === true) {
+			$path = $this->here;
+			if ($this->here == '/') {
+				$path = 'home';
+			}
+			$path = strtolower(Inflector::slug($path));
+
+			$filename = CACHE . 'views' . DS . $path . '.php';
+
+			if (!file_exists($filename)) {
+				$filename = CACHE . 'views' . DS . $path . '_index.php';
+			}
+
+			if (file_exists($filename)) {
+				if (!class_exists('View')) {
+					App::import('View', 'View', false);
+				}
+				$controller = null;
+				$view =& new View($controller);
+				$return = $view->renderCache($filename, getMicrotime());
+				if (!$return) {
+					ClassRegistry::removeObject('view');
+				}
+				return $return;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Checks if a requested asset exists and sends it to the browser
+ *
+ * @param $url string $url Requested URL
+ * @return boolean True on success if the asset file was found and sent
+ * @access public
+ */
+	function asset($url) {
+		if (strpos($url, '..') !== false || strpos($url, '.') === false) {
+			return false;
+		}
+		$filters = Configure::read('Asset.filter');
+		$isCss = (
+			strpos($url, 'ccss/') === 0 ||
+			preg_match('#^(theme/([^/]+)/ccss/)|(([^/]+)(?<!css)/ccss)/#i', $url)
+		);
+		$isJs = (
+			strpos($url, 'cjs/') === 0 ||
+			preg_match('#^/((theme/[^/]+)/cjs/)|(([^/]+)(?<!js)/cjs)/#i', $url)
+		);
+
+		if (($isCss && empty($filters['css'])) || ($isJs && empty($filters['js']))) {
+			header('HTTP/1.1 404 Not Found');
+			return $this->_stop();
+		} elseif ($isCss) {
+			include WWW_ROOT . DS . $filters['css'];
+			$this->_stop();
+		} elseif ($isJs) {
+			include WWW_ROOT . DS . $filters['js'];
+			$this->_stop();
+		}
+		$controller = null;
+		$ext = array_pop(explode('.', $url));
+		$parts = explode('/', $url);
+		$assetFile = null;
+
+		if ($parts[0] === 'theme') {
+			$themeName = $parts[1];
+			unset($parts[0], $parts[1]);
+			$fileFragment = implode(DS, $parts);
+			$path = App::themePath($themeName) . 'webroot' . DS;
+			if (file_exists($path . $fileFragment)) {
+				$assetFile = $path . $fileFragment;
+			}
+		} else {
+			$plugin = $parts[0];
+			unset($parts[0]);
+			$fileFragment = implode(DS, $parts);
+			$pluginWebroot = App::pluginPath($plugin) . 'webroot' . DS;
+			if (file_exists($pluginWebroot . $fileFragment)) {
+				$assetFile = $pluginWebroot . $fileFragment;
+			}
+		}
+
+		if ($assetFile !== null) {
+			$this->_deliverAsset($assetFile, $ext);
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Sends an asset file to the client
+ *
+ * @param string $assetFile Path to the asset file in the file system
+ * @param string $ext The extension of the file to determine its mime type
+ * @return void
+ * @access protected
+ */
+	function _deliverAsset($assetFile, $ext) {
+		$ob = @ini_get("zlib.output_compression") !== '1' && extension_loaded("zlib") && (strpos(env('HTTP_ACCEPT_ENCODING'), 'gzip') !== false);
+		$compressionEnabled = $ob && Configure::read('Asset.compress');
+		if ($compressionEnabled) {
+			ob_start();
+			ob_start('ob_gzhandler');
+		}
+
+		App::import('View', 'Media');
+		$controller = null;
+		$Media = new MediaView($controller);
+		if (isset($Media->mimeType[$ext])) {
+			$contentType = $Media->mimeType[$ext];
+		} else {
+			$contentType = 'application/octet-stream';
+			$agent = env('HTTP_USER_AGENT');
+			if (preg_match('%Opera(/| )([0-9].[0-9]{1,2})%', $agent) || preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) {
+				$contentType = 'application/octetstream';
+			}
+		}
+
+		header("Date: " . date("D, j M Y G:i:s ", filemtime($assetFile)) . 'GMT');
+		header('Content-type: ' . $contentType);
+		header("Expires: " . gmdate("D, j M Y H:i:s", time() + DAY) . " GMT");
+		header("Cache-Control: cache");
+		header("Pragma: cache");
+
+		if ($ext === 'css' || $ext === 'js') {
+			include($assetFile);
+		} else {
+			if ($compressionEnabled) {
+				ob_clean();
+			}
+			readfile($assetFile);
+		}
+
+		if ($compressionEnabled) {
+			ob_end_flush();
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache.php b/code/ryzom/tools/server/www/webtt/cake/libs/cache.php
new file mode 100644
index 000000000..4616a46d2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cache.php
@@ -0,0 +1,702 @@
+<?php
+/**
+ * Caching for CakePHP.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0.4933
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Caching for CakePHP.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Cache {
+
+/**
+ * Cache configuration stack
+ * Keeps the permanent/default settings for each cache engine.
+ * These settings are used to reset the engines after temporary modification.
+ *
+ * @var array
+ * @access private
+ */
+	var $__config = array();
+
+/**
+ * Holds name of the current configuration name being used.
+ *
+ * @var array
+ * @access private
+ */
+	var $__name = 'default';
+
+/**
+ * Whether to reset the settings with the next call to Cache::set();
+ *
+ * @var array
+ * @access private
+ */
+	var $__reset = false;
+
+/**
+ * Engine instances keyed by configuration name.
+ *
+ * @var array
+ */
+	var $_engines = array();
+
+/**
+ * Returns a singleton instance
+ *
+ * @return object
+ * @access public
+ * @static
+ */
+	function &getInstance() {
+		static $instance = array();
+		if (!$instance) {
+			$instance[0] =& new Cache();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Set the cache configuration to use.  config() can
+ * both create new configurations, return the settings for already configured
+ * configurations.  It also sets the 'default' configuration to use for subsequent
+ * operations.
+ *
+ * To create a new configuration:
+ *
+ * `Cache::config('my_config', array('engine' => 'File', 'path' => TMP));`
+ *
+ * To get the settings for a configuration, and set it as the currently selected configuration
+ *
+ * `Cache::config('default');`
+ *
+ * The following keys are used in core cache engines:
+ *
+ * - `duration` Specify how long items in this cache configuration last.
+ * - `prefix` Prefix appended to all entries. Good for when you need to share a keyspace
+ *    with either another cache config or annother application.
+ * - `probability` Probability of hitting a cache gc cleanup.  Setting to 0 will disable 
+ *    cache::gc from ever being called automatically.
+ * - `servers' Used by memcache. Give the address of the memcached servers to use.
+ * - `compress` Used by memcache.  Enables memcache's compressed format.
+ * - `serialize` Used by FileCache.  Should cache objects be serialized first.
+ * - `path` Used by FileCache.  Path to where cachefiles should be saved.
+ * - `lock` Used by FileCache.  Should files be locked before writing to them?
+ * - `user` Used by Xcache.  Username for XCache
+ * - `password` Used by Xcache.  Password for XCache
+ *
+ * @see app/config/core.php for configuration settings
+ * @param string $name Name of the configuration
+ * @param array $settings Optional associative array of settings passed to the engine
+ * @return array(engine, settings) on success, false on failure
+ * @access public
+ * @static
+ */
+	function config($name = null, $settings = array()) {
+		$self =& Cache::getInstance();
+		if (is_array($name)) {
+			$settings = $name;
+		}
+
+		if ($name === null || !is_string($name)) {
+			$name = $self->__name;
+		}
+
+		$current = array();
+		if (isset($self->__config[$name])) {
+			$current = $self->__config[$name];
+		}
+
+		if (!empty($settings)) {
+			$self->__config[$name] = array_merge($current, $settings);
+		}
+
+		if (empty($self->__config[$name]['engine'])) {
+			return false;
+		}
+
+		$engine = $self->__config[$name]['engine'];
+		$self->__name = $name;
+
+		if (!isset($self->_engines[$name])) {
+			$self->_buildEngine($name);
+			$settings = $self->__config[$name] = $self->settings($name);
+		} elseif ($settings = $self->set($self->__config[$name])) {
+			$self->__config[$name] = $settings;
+		}
+		return compact('engine', 'settings');
+	}
+
+/**
+ * Finds and builds the instance of the required engine class.
+ *
+ * @param string $name Name of the config array that needs an engine instance built
+ * @return void
+ * @access protected
+ */
+	function _buildEngine($name) {
+		$config = $this->__config[$name];
+
+		list($plugin, $class) = pluginSplit($config['engine']);
+		$cacheClass = $class . 'Engine';
+		if (!class_exists($cacheClass) && $this->__loadEngine($class, $plugin) === false) {
+			return false;
+		}
+		$cacheClass = $class . 'Engine';
+		$this->_engines[$name] =& new $cacheClass();
+		if ($this->_engines[$name]->init($config)) {
+			if ($this->_engines[$name]->settings['probability'] && time() % $this->_engines[$name]->settings['probability'] === 0) {
+				$this->_engines[$name]->gc();
+			}
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Returns an array containing the currently configured Cache settings.
+ *
+ * @return array Array of configured Cache config names.
+ */
+	function configured() {
+		$self =& Cache::getInstance();
+		return array_keys($self->__config);
+	}
+
+/**
+ * Drops a cache engine.  Deletes the cache configuration information
+ * If the deleted configuration is the last configuration using an certain engine,
+ * the Engine instance is also unset.
+ *
+ * @param string $name A currently configured cache config you wish to remove.
+ * @return boolen success of the removal, returns false when the config does not exist.
+ */
+	function drop($name) {
+		$self =& Cache::getInstance();
+		if (!isset($self->__config[$name])) {
+			return false;
+		}
+		unset($self->__config[$name]);
+		unset($self->_engines[$name]);
+		return true;
+	}
+
+/**
+ * Tries to find and include a file for a cache engine and returns object instance
+ *
+ * @param $name Name of the engine (without 'Engine')
+ * @return mixed $engine object or null
+ * @access private
+ */
+	function __loadEngine($name, $plugin = null) {
+		if ($plugin) {
+			return App::import('Lib', $plugin . '.cache' . DS . $name, false);
+		} else {
+			$core = App::core();
+			$path = $core['libs'][0] . 'cache' . DS . strtolower($name) . '.php';
+			if (file_exists($path)) {
+				require $path;
+				return true;
+			}
+			return App::import('Lib', 'cache' . DS . $name, false);
+		}
+	}
+
+/**
+ * Temporarily change settings to current config options. if no params are passed, resets settings if needed
+ * Cache::write() will reset the configuration changes made
+ *
+ * @param mixed $settings Optional string for simple name-value pair or array
+ * @param string $value Optional for a simple name-value pair
+ * @return array Array of settings.
+ * @access public
+ * @static
+ */
+	function set($settings = array(), $value = null) {
+		$self =& Cache::getInstance();
+		if (!isset($self->__config[$self->__name]) || !isset($self->_engines[$self->__name])) {
+			return false;
+		}
+		$name = $self->__name;
+		if (!empty($settings)) {
+			$self->__reset = true;
+		}
+
+		if ($self->__reset === true) {
+			if (empty($settings)) {
+				$self->__reset = false;
+				$settings = $self->__config[$name];
+			} else {
+				if (is_string($settings) && $value !== null) {
+					$settings = array($settings => $value);
+				}
+				$settings = array_merge($self->__config[$name], $settings);
+				if (isset($settings['duration']) && !is_numeric($settings['duration'])) {
+					$settings['duration'] = strtotime($settings['duration']) - time();
+				}
+			}
+			$self->_engines[$name]->settings = $settings;
+		}
+		return $self->settings($name);
+	}
+
+/**
+ * Garbage collection
+ *
+ * Permanently remove all expired and deleted data
+ *
+ * @return void
+ * @access public
+ * @static
+ */
+	function gc() {
+		$self =& Cache::getInstance();
+		$self->_engines[$self->__name]->gc();
+	}
+
+/**
+ * Write data for key into cache. Will automatically use the currently
+ * active cache configuration.  To set the currently active configuration use
+ * Cache::config()
+ *
+ * ### Usage:
+ *
+ * Writing to the active cache config:
+ *
+ * `Cache::write('cached_data', $data);`
+ *
+ * Writing to a specific cache config:
+ *
+ * `Cache::write('cached_data', $data, 'long_term');`
+ *
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached - anything except a resource
+ * @param string $config Optional string configuration name to write to.
+ * @return boolean True if the data was successfully cached, false on failure
+ * @access public
+ * @static
+ */
+	function write($key, $value, $config = null) {
+		$self =& Cache::getInstance();
+
+		if (!$config) {
+			$config = $self->__name;
+		}
+		$settings = $self->settings($config);
+
+		if (empty($settings)) {
+			return null;
+		}
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$key = $self->_engines[$config]->key($key);
+
+		if (!$key || is_resource($value)) {
+			return false;
+		}
+
+		$success = $self->_engines[$config]->write($settings['prefix'] . $key, $value, $settings['duration']);
+		$self->set();
+		return $success;
+	}
+
+/**
+ * Read a key from the cache.  Will automatically use the currently
+ * active cache configuration.  To set the currently active configuration use
+ * Cache::config()
+ *
+ * ### Usage:
+ *
+ * Reading from the active cache configuration.
+ *
+ * `Cache::read('my_data');`
+ *
+ * Reading from a specific cache configuration.
+ *
+ * `Cache::read('my_data', 'long_term');`
+ *
+ * @param string $key Identifier for the data
+ * @param string $config optional name of the configuration to use.
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @access public
+ * @static
+ */
+	function read($key, $config = null) {
+		$self =& Cache::getInstance();
+
+		if (!$config) {
+			$config = $self->__name;
+		}
+		$settings = $self->settings($config);
+
+		if (empty($settings)) {
+			return null;
+		}
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$key = $self->_engines[$config]->key($key);
+		if (!$key) {
+			return false;
+		}
+		$success = $self->_engines[$config]->read($settings['prefix'] . $key);
+
+		if ($config !== null && $config !== $self->__name) {
+			$self->set();
+		}
+		return $success;
+	}
+
+/**
+ * Increment a number under the key and return incremented value.
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to add
+ * @param string $config Optional string configuration name.  If not specified the current
+ *   default config will be used.
+ * @return mixed new value, or false if the data doesn't exist, is not integer,
+ *    or if there was an error fetching it.
+ * @access public
+ */
+	function increment($key, $offset = 1, $config = null) {
+		$self =& Cache::getInstance();
+
+		if (!$config) {
+			$config = $self->__name;
+		}
+		$settings = $self->settings($config);
+
+		if (empty($settings)) {
+			return null;
+		}
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$key = $self->_engines[$config]->key($key);
+
+		if (!$key || !is_integer($offset) || $offset < 0) {
+			return false;
+		}
+		$success = $self->_engines[$config]->increment($settings['prefix'] . $key, $offset);
+		$self->set();
+		return $success;
+	}
+/**
+ * Decrement a number under the key and return decremented value.
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to substract
+ * @param string $config Optional string configuration name, if not specified the current
+ *   default config will be used.
+ * @return mixed new value, or false if the data doesn't exist, is not integer,
+ *   or if there was an error fetching it
+ * @access public
+ */
+	function decrement($key, $offset = 1, $config = null) {
+		$self =& Cache::getInstance();
+
+		if (!$config) {
+			$config = $self->__name;
+		}
+		$settings = $self->settings($config);
+
+		if (empty($settings)) {
+			return null;
+		}
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$key = $self->_engines[$config]->key($key);
+
+		if (!$key || !is_integer($offset) || $offset < 0) {
+			return false;
+		}
+		$success = $self->_engines[$config]->decrement($settings['prefix'] . $key, $offset);
+		$self->set();
+		return $success;
+	}
+/**
+ * Delete a key from the cache. Will automatically use the currently
+ * active cache configuration.  To set the currently active configuration use
+ * Cache::config()
+ *
+ * ### Usage:
+ *
+ * Deleting from the active cache configuration.
+ *
+ * `Cache::delete('my_data');`
+ *
+ * Deleting from a specific cache configuration.
+ *
+ * `Cache::delete('my_data', 'long_term');`
+ *
+ * @param string $key Identifier for the data
+ * @param string $config name of the configuration to use
+ * @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
+ * @access public
+ * @static
+ */
+	function delete($key, $config = null) {
+		$self =& Cache::getInstance();
+		if (!$config) {
+			$config = $self->__name;
+		}
+		$settings = $self->settings($config);
+
+		if (empty($settings)) {
+			return null;
+		}
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$key = $self->_engines[$config]->key($key);
+		if (!$key) {
+			return false;
+		}
+
+		$success = $self->_engines[$config]->delete($settings['prefix'] . $key);
+		$self->set();
+		return $success;
+	}
+
+/**
+ * Delete all keys from the cache.
+ *
+ * @param boolean $check if true will check expiration, otherwise delete all
+ * @param string $config name of the configuration to use
+ * @return boolean True if the cache was succesfully cleared, false otherwise
+ * @access public
+ * @static
+ */
+	function clear($check = false, $config = null) {
+		$self =& Cache::getInstance();
+		if (!$config) {
+			$config = $self->__name;
+		}
+		$settings = $self->settings($config);
+
+		if (empty($settings)) {
+			return null;
+		}
+
+		if (!$self->isInitialized($config)) {
+			return false;
+		}
+		$success = $self->_engines[$config]->clear($check);
+		$self->set();
+		return $success;
+	}
+
+/**
+ * Check if Cache has initialized a working config for the given name.
+ *
+ * @param string $engine Name of the engine
+ * @param string $config Name of the configuration setting
+ * @return bool Whether or not the config name has been initialized.
+ * @access public
+ * @static
+ */
+	function isInitialized($name = null) {
+		if (Configure::read('Cache.disable')) {
+			return false;
+		}
+		$self =& Cache::getInstance();
+		if (!$name && isset($self->__config[$self->__name])) {
+			$name = $self->__name;
+		}
+		return isset($self->_engines[$name]);
+	}
+
+/**
+ * Return the settings for current cache engine. If no name is supplied the settings
+ * for the 'active default' configuration will be returned.  To set the 'active default'
+ * configuration use `Cache::config()`
+ *
+ * @param string $engine Name of the configuration to get settings for.
+ * @return array list of settings for this engine
+ * @see Cache::config()
+ * @access public
+ * @static
+ */
+	function settings($name = null) {
+		$self =& Cache::getInstance();
+		if (!$name && isset($self->__config[$self->__name])) {
+			$name = $self->__name;
+		}
+		if (!empty($self->_engines[$name])) {
+			return $self->_engines[$name]->settings();
+		}
+		return array();
+	}
+
+/**
+ * Write the session when session data is persisted with cache.
+ *
+ * @return void
+ * @access public
+ */ 
+	function __destruct() {
+		if (Configure::read('Session.save') == 'cache' && function_exists('session_write_close')) {
+			session_write_close();
+		}
+	}
+}
+
+/**
+ * Storage engine for CakePHP caching
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class CacheEngine {
+
+/**
+ * Settings of current engine instance
+ *
+ * @var int
+ * @access public
+ */
+	var $settings = array();
+
+/**
+ * Initialize the cache engine
+ *
+ * Called automatically by the cache frontend
+ *
+ * @param array $params Associative array of parameters for the engine
+ * @return boolean True if the engine has been succesfully initialized, false if not
+ * @access public
+ */
+	function init($settings = array()) {
+		$this->settings = array_merge(
+			array('prefix' => 'cake_', 'duration'=> 3600, 'probability'=> 100),
+			$this->settings,
+			$settings
+		);
+		if (!is_numeric($this->settings['duration'])) {
+			$this->settings['duration'] = strtotime($this->settings['duration']) - time();
+		}
+		return true;
+	}
+
+/**
+ * Garbage collection
+ *
+ * Permanently remove all expired and deleted data
+ *
+ * @access public
+ */
+	function gc() {
+	}
+
+/**
+ * Write value for a key into cache
+ *
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached
+ * @param mixed $duration How long to cache the data, in seconds
+ * @return boolean True if the data was succesfully cached, false on failure
+ * @access public
+ */
+	function write($key, &$value, $duration) {
+		trigger_error(sprintf(__('Method write() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+	}
+
+/**
+ * Read a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @access public
+ */
+	function read($key) {
+		trigger_error(sprintf(__('Method read() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+	}
+
+/**
+ * Increment a number under the key and return incremented value
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to add
+ * @return New incremented value, false otherwise
+ * @access public
+ */
+	function increment($key, $offset = 1) {
+		trigger_error(sprintf(__('Method increment() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+	}
+/**
+ * Decrement a number under the key and return decremented value
+ *
+ * @param string $key Identifier for the data
+ * @param integer $value How much to substract
+ * @return New incremented value, false otherwise
+ * @access public
+ */
+	function decrement($key, $offset = 1) {
+		trigger_error(sprintf(__('Method decrement() not implemented in %s', true), get_class($this)), E_USER_ERROR);
+	}
+/**
+ * Delete a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
+ * @access public
+ */
+	function delete($key) {
+	}
+
+/**
+ * Delete all keys from the cache
+ *
+ * @param boolean $check if true will check expiration, otherwise delete all
+ * @return boolean True if the cache was succesfully cleared, false otherwise
+ * @access public
+ */
+	function clear($check) {
+	}
+
+/**
+ * Cache Engine settings
+ *
+ * @return array settings
+ * @access public
+ */
+	function settings() {
+		return $this->settings;
+	}
+
+/**
+ * Generates a safe key for use with cache engine storage engines.
+ *
+ * @param string $key the key passed over
+ * @return mixed string $key or false
+ * @access public
+ */
+	function key($key) {
+		if (empty($key)) {
+			return false;
+		}
+		$key = Inflector::underscore(str_replace(array(DS, '/', '.'), '_', strval($key)));
+		return $key;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/apc.php b/code/ryzom/tools/server/www/webtt/cake/libs/cache/apc.php
new file mode 100644
index 000000000..92a458d22
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cache/apc.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * APC storage engine for cache.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.4933
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * APC storage engine for cache
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ */
+class ApcEngine extends CacheEngine {
+
+/**
+ * Initialize the Cache Engine
+ *
+ * Called automatically by the cache frontend
+ * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
+ *
+ * @param array $setting array of setting for the engine
+ * @return boolean True if the engine has been successfully initialized, false if not
+ * @see CacheEngine::__defaults
+ * @access public
+ */
+	function init($settings = array()) {
+		parent::init(array_merge(array('engine' => 'Apc', 'prefix' => Inflector::slug(APP_DIR) . '_'), $settings));
+		return function_exists('apc_cache_info');
+	}
+
+/**
+ * Write data for key into cache
+ *
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached
+ * @param integer $duration How long to cache the data, in seconds
+ * @return boolean True if the data was succesfully cached, false on failure
+ * @access public
+ */
+	function write($key, &$value, $duration) {
+		$expires = time() + $duration;
+		apc_store($key.'_expires', $expires, $duration);
+		return apc_store($key, $value, $duration);
+	}
+
+/**
+ * Read a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @access public
+ */
+	function read($key) {
+		$time = time();
+		$cachetime = intval(apc_fetch($key.'_expires'));
+		if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
+			return false;
+		}
+		return apc_fetch($key);
+	}
+
+/**
+ * Increments the value of an integer cached key
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to increment
+ * @param integer $duration How long to cache the data, in seconds
+ * @return New incremented value, false otherwise
+ * @access public
+ */
+	function increment($key, $offset = 1) {
+		return apc_inc($key, $offset);
+	}
+
+/**
+ * Decrements the value of an integer cached key
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to substract
+ * @param integer $duration How long to cache the data, in seconds
+ * @return New decremented value, false otherwise
+ * @access public
+ */
+	function decrement($key, $offset = 1) {
+		return apc_dec($key, $offset);
+	}
+
+/**
+ * Delete a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
+ * @access public
+ */
+	function delete($key) {
+		return apc_delete($key);
+	}
+
+/**
+ * Delete all keys from the cache
+ *
+ * @return boolean True if the cache was succesfully cleared, false otherwise
+ * @access public
+ */
+	function clear() {
+		return apc_clear_cache('user');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/file.php b/code/ryzom/tools/server/www/webtt/cake/libs/cache/file.php
new file mode 100644
index 000000000..55a678100
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cache/file.php
@@ -0,0 +1,272 @@
+<?php
+/**
+ * File Storage engine for cache
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.4933
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+if (!class_exists('File')) {
+	require LIBS . 'file.php';
+}
+/**
+ * File Storage engine for cache
+ *
+ * @todo use the File and Folder classes (if it's not a too big performance hit)
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ */
+class FileEngine extends CacheEngine {
+
+/**
+ * Instance of File class
+ *
+ * @var File
+ * @access protected
+ */
+	var $_File = null;
+
+/**
+ * Settings
+ * 
+ * - path = absolute path to cache directory, default => CACHE
+ * - prefix = string prefix for filename, default => cake_
+ * - lock = enable file locking on write, default => false
+ * - serialize = serialize the data, default => true
+ *
+ * @var array
+ * @see CacheEngine::__defaults
+ * @access public
+ */
+	var $settings = array();
+
+/**
+ * True unless FileEngine::__active(); fails
+ *
+ * @var boolean
+ * @access protected
+ */
+	var $_init = true;
+
+/**
+ * Initialize the Cache Engine
+ *
+ * Called automatically by the cache frontend
+ * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
+ *
+ * @param array $setting array of setting for the engine
+ * @return boolean True if the engine has been successfully initialized, false if not
+ * @access public
+ */
+	function init($settings = array()) {
+		parent::init(array_merge(
+			array(
+				'engine' => 'File', 'path' => CACHE, 'prefix'=> 'cake_', 'lock'=> false,
+				'serialize'=> true, 'isWindows' => false
+			),
+			$settings
+		));
+		if (!isset($this->_File)) {
+			$this->_File =& new File($this->settings['path'] . DS . 'cake');
+		}
+
+		if (DIRECTORY_SEPARATOR === '\\') {
+			$this->settings['isWindows'] = true;
+		}
+
+		$path = $this->_File->Folder->cd($this->settings['path']);
+		if ($path) {
+			$this->settings['path'] = $path;
+		}
+		return $this->__active();
+	}
+
+/**
+ * Garbage collection. Permanently remove all expired and deleted data
+ *
+ * @return boolean True if garbage collection was succesful, false on failure
+ * @access public
+ */
+	function gc() {
+		return $this->clear(true);
+	}
+
+/**
+ * Write data for key into cache
+ *
+ * @param string $key Identifier for the data
+ * @param mixed $data Data to be cached
+ * @param mixed $duration How long to cache the data, in seconds
+ * @return boolean True if the data was succesfully cached, false on failure
+ * @access public
+ */
+	function write($key, &$data, $duration) {
+		if ($data === '' || !$this->_init) {
+			return false;
+		}
+
+		if ($this->_setKey($key) === false) {
+			return false;
+		}
+
+		$lineBreak = "\n";
+
+		if ($this->settings['isWindows']) {
+			$lineBreak = "\r\n";
+		}
+
+		if (!empty($this->settings['serialize'])) {
+			if ($this->settings['isWindows']) {
+				$data = str_replace('\\', '\\\\\\\\', serialize($data));
+			} else {
+				$data = serialize($data);
+			}
+		}
+
+		if ($this->settings['lock']) {
+			$this->_File->lock = true;
+		}
+		$expires = time() + $duration;
+		$contents = $expires . $lineBreak . $data . $lineBreak;
+		$success = $this->_File->write($contents);
+		$this->_File->close();
+		return $success;
+	}
+
+/**
+ * Read a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @access public
+ */
+	function read($key) {
+		if ($this->_setKey($key) === false || !$this->_init || !$this->_File->exists()) {
+			return false;
+		}
+		if ($this->settings['lock']) {
+			$this->_File->lock = true;
+		}
+		$time = time();
+		$cachetime = intval($this->_File->read(11));
+
+		if ($cachetime !== false && ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime)) {
+			$this->_File->close();
+			return false;
+		}
+		$data = $this->_File->read(true);
+
+		if ($data !== '' && !empty($this->settings['serialize'])) {
+			if ($this->settings['isWindows']) {
+				$data = str_replace('\\\\\\\\', '\\', $data);
+			}
+			$data = unserialize((string)$data);
+		}
+		$this->_File->close();
+		return $data;
+	}
+
+/**
+ * Delete a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return boolean True if the value was successfully deleted, false if it didn't exist or couldn't be removed
+ * @access public
+ */
+	function delete($key) {
+		if ($this->_setKey($key) === false || !$this->_init) {
+			return false;
+		}
+		return $this->_File->delete();
+	}
+
+/**
+ * Delete all values from the cache
+ *
+ * @param boolean $check Optional - only delete expired cache items
+ * @return boolean True if the cache was succesfully cleared, false otherwise
+ * @access public
+ */
+	function clear($check) {
+		if (!$this->_init) {
+			return false;
+		}
+		$dir = dir($this->settings['path']);
+		if ($check) {
+			$now = time();
+			$threshold = $now - $this->settings['duration'];
+		}
+		$prefixLength = strlen($this->settings['prefix']);
+		while (($entry = $dir->read()) !== false) {
+			if (substr($entry, 0, $prefixLength) !== $this->settings['prefix']) {
+				continue;
+			}
+			if ($this->_setKey($entry) === false) {
+				continue;
+			}
+			if ($check) {
+				$mtime = $this->_File->lastChange();
+
+				if ($mtime === false || $mtime > $threshold) {
+					continue;
+				}
+
+				$expires = $this->_File->read(11);
+				$this->_File->close();
+
+				if ($expires > $now) {
+					continue;
+				}
+			}
+			$this->_File->delete();
+		}
+		$dir->close();
+		return true;
+	}
+
+/**
+ * Get absolute file for a given key
+ *
+ * @param string $key The key
+ * @return mixed Absolute cache file for the given key or false if erroneous
+ * @access private
+ */
+	function _setKey($key) {
+		$this->_File->Folder->cd($this->settings['path']);
+		if ($key !== $this->_File->name) {
+			$this->_File->name = $key;
+			$this->_File->path = null;
+		}
+		if (!$this->_File->Folder->inPath($this->_File->pwd(), true)) {
+			return false;
+		}
+	}
+
+/**
+ * Determine is cache directory is writable
+ *
+ * @return boolean
+ * @access private
+ */
+	function __active() {
+		if ($this->_init && !is_writable($this->settings['path'])) {
+			$this->_init = false;
+			trigger_error(sprintf(__('%s is not writable', true), $this->settings['path']), E_USER_WARNING);
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/memcache.php b/code/ryzom/tools/server/www/webtt/cake/libs/cache/memcache.php
new file mode 100644
index 000000000..a1bcc5c55
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cache/memcache.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Memcache storage engine for cache
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.4933
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Memcache storage engine for cache.  Memcache has some limitations in the amount of 
+ * control you have over expire times far in the future.  See MemcacheEngine::write() for
+ * more information.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ */
+class MemcacheEngine extends CacheEngine {
+
+/**
+ * Memcache wrapper.
+ *
+ * @var Memcache
+ * @access private
+ */
+	var $__Memcache = null;
+
+/**
+ * Settings
+ *
+ *  - servers = string or array of memcache servers, default => 127.0.0.1. If an
+ *    array MemcacheEngine will use them as a pool.
+ *  - compress = boolean, default => false
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array();
+
+/**
+ * Initialize the Cache Engine
+ *
+ * Called automatically by the cache frontend
+ * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
+ *
+ * @param array $setting array of setting for the engine
+ * @return boolean True if the engine has been successfully initialized, false if not
+ * @access public
+ */
+	function init($settings = array()) {
+		if (!class_exists('Memcache')) {
+			return false;
+		}
+		parent::init(array_merge(array(
+			'engine'=> 'Memcache', 
+			'prefix' => Inflector::slug(APP_DIR) . '_', 
+			'servers' => array('127.0.0.1'),
+			'compress'=> false,
+			'persistent' => true
+			), $settings)
+		);
+
+		if ($this->settings['compress']) {
+			$this->settings['compress'] = MEMCACHE_COMPRESSED;
+		}
+		if (!is_array($this->settings['servers'])) {
+			$this->settings['servers'] = array($this->settings['servers']);
+		}
+		if (!isset($this->__Memcache)) {
+			$return = false;
+			$this->__Memcache =& new Memcache();
+			foreach ($this->settings['servers'] as $server) {
+				list($host, $port) = $this->_parseServerString($server);
+				if ($this->__Memcache->addServer($host, $port, $this->settings['persistent'])) {
+					$return = true;
+				}
+			}
+			return $return;
+		}
+		return true;
+	}
+
+/**
+ * Parses the server address into the host/port.  Handles both IPv6 and IPv4
+ * addresses
+ *
+ * @param string $server The server address string.
+ * @return array Array containing host, port
+ */
+	function _parseServerString($server) {
+		if (substr($server, 0, 1) == '[') {
+			$position = strpos($server, ']:');
+			if ($position !== false) {
+				$position++;
+			}
+		} else {
+		    $position = strpos($server, ':');
+		}
+		$port = 11211;
+		$host = $server;
+		if ($position !== false) {
+			$host = substr($server, 0, $position);
+			$port = substr($server, $position + 1);
+		}
+		return array($host, $port);
+	}
+
+/**
+ * Write data for key into cache.  When using memcache as your cache engine
+ * remember that the Memcache pecl extension does not support cache expiry times greater 
+ * than 30 days in the future. Any duration greater than 30 days will be treated as never expiring.
+ *
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached
+ * @param integer $duration How long to cache the data, in seconds
+ * @return boolean True if the data was succesfully cached, false on failure
+ * @see http://php.net/manual/en/memcache.set.php
+ * @access public
+ */
+	function write($key, &$value, $duration) {
+		if ($duration > 30 * DAY) {
+			$duration = 0;
+		}
+		return $this->__Memcache->set($key, $value, $this->settings['compress'], $duration);
+	}
+
+/**
+ * Read a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @access public
+ */
+	function read($key) {
+		return $this->__Memcache->get($key);
+	}
+
+/**
+ * Increments the value of an integer cached key
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to increment
+ * @param integer $duration How long to cache the data, in seconds
+ * @return New incremented value, false otherwise
+ * @access public
+ */
+	function increment($key, $offset = 1) {
+		if ($this->settings['compress']) {
+			trigger_error(sprintf(__('Method increment() not implemented for compressed cache in %s', true), get_class($this)), E_USER_ERROR);
+		}
+		return $this->__Memcache->increment($key, $offset);
+	}
+
+/**
+ * Decrements the value of an integer cached key
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to substract
+ * @param integer $duration How long to cache the data, in seconds
+ * @return New decremented value, false otherwise
+ * @access public
+ */
+	function decrement($key, $offset = 1) {
+		if ($this->settings['compress']) {
+			trigger_error(sprintf(__('Method decrement() not implemented for compressed cache in %s', true), get_class($this)), E_USER_ERROR);
+		}
+		return $this->__Memcache->decrement($key, $offset);
+	}
+
+/**
+ * Delete a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
+ * @access public
+ */
+	function delete($key) {
+		return $this->__Memcache->delete($key);
+	}
+
+/**
+ * Delete all keys from the cache
+ *
+ * @return boolean True if the cache was succesfully cleared, false otherwise
+ * @access public
+ */
+	function clear() {
+		return $this->__Memcache->flush();
+	}
+
+/**
+ * Connects to a server in connection pool
+ *
+ * @param string $host host ip address or name
+ * @param integer $port Server port
+ * @return boolean True if memcache server was connected
+ * @access public
+ */
+	function connect($host, $port = 11211) {
+		if ($this->__Memcache->getServerStatus($host, $port) === 0) {
+			if ($this->__Memcache->connect($host, $port)) {
+				return true;
+			}
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cache/xcache.php b/code/ryzom/tools/server/www/webtt/cake/libs/cache/xcache.php
new file mode 100644
index 000000000..db93b8dfd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cache/xcache.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * Xcache storage engine for cache.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.4947
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Xcache storage engine for cache
+ *
+ * @link          http://trac.lighttpd.net/xcache/ Xcache
+ * @package       cake
+ * @subpackage    cake.cake.libs.cache
+ */
+class XcacheEngine extends CacheEngine {
+
+/**
+ * Settings
+ *
+ *  - PHP_AUTH_USER = xcache.admin.user, default cake
+ *  - PHP_AUTH_PW = xcache.admin.password, default cake
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array();
+
+/**
+ * Initialize the Cache Engine
+ *
+ * Called automatically by the cache frontend
+ * To reinitialize the settings call Cache::engine('EngineName', [optional] settings = array());
+ *
+ * @param array $setting array of setting for the engine
+ * @return boolean True if the engine has been successfully initialized, false if not
+ * @access public
+ */
+	function init($settings) {
+		parent::init(array_merge(array(
+			'engine' => 'Xcache', 'prefix' => Inflector::slug(APP_DIR) . '_', 'PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'password'
+			), $settings)
+		);
+		return function_exists('xcache_info');
+	}
+
+/**
+ * Write data for key into cache
+ *
+ * @param string $key Identifier for the data
+ * @param mixed $value Data to be cached
+ * @param integer $duration How long to cache the data, in seconds
+ * @return boolean True if the data was succesfully cached, false on failure
+ * @access public
+ */
+	function write($key, &$value, $duration) {
+		$expires = time() + $duration;
+		xcache_set($key . '_expires', $expires, $duration);
+		return xcache_set($key, $value, $duration);
+	}
+
+/**
+ * Read a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return mixed The cached data, or false if the data doesn't exist, has expired, or if there was an error fetching it
+ * @access public
+ */
+	function read($key) {
+		if (xcache_isset($key)) {
+			$time = time();
+			$cachetime = intval(xcache_get($key . '_expires'));
+			if ($cachetime < $time || ($time + $this->settings['duration']) < $cachetime) {
+				return false;
+			}
+			return xcache_get($key);
+		}
+		return false;
+	}
+
+/**
+ * Increments the value of an integer cached key
+ * If the cache key is not an integer it will be treated as 0
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to increment
+ * @param integer $duration How long to cache the data, in seconds
+ * @return New incremented value, false otherwise
+ * @access public
+ */
+	function increment($key, $offset = 1) {
+		return xcache_inc($key, $offset);
+	}
+
+/**
+ * Decrements the value of an integer cached key.
+ * If the cache key is not an integer it will be treated as 0
+ *
+ * @param string $key Identifier for the data
+ * @param integer $offset How much to substract
+ * @param integer $duration How long to cache the data, in seconds
+ * @return New decremented value, false otherwise
+ * @access public
+ */
+	function decrement($key, $offset = 1) {
+		return xcache_dec($key, $offset);
+	}
+/**
+ * Delete a key from the cache
+ *
+ * @param string $key Identifier for the data
+ * @return boolean True if the value was succesfully deleted, false if it didn't exist or couldn't be removed
+ * @access public
+ */
+	function delete($key) {
+		return xcache_unset($key);
+	}
+
+/**
+ * Delete all keys from the cache
+ *
+ * @return boolean True if the cache was succesfully cleared, false otherwise
+ * @access public
+ */
+	function clear() {
+		$this->__auth();
+		$max = xcache_count(XC_TYPE_VAR);
+		for ($i = 0; $i < $max; $i++) {
+			xcache_clear_cache(XC_TYPE_VAR, $i);
+		}
+		$this->__auth(true);
+		return true;
+	}
+
+/**
+ * Populates and reverses $_SERVER authentication values
+ * Makes necessary changes (and reverting them back) in $_SERVER
+ *
+ * This has to be done because xcache_clear_cache() needs to pass Basic Http Auth
+ * (see xcache.admin configuration settings)
+ *
+ * @param boolean Revert changes
+ * @access private
+ */
+	function __auth($reverse = false) {
+		static $backup = array();
+		$keys = array('PHP_AUTH_USER' => 'user', 'PHP_AUTH_PW' => 'password');
+		foreach ($keys as $key => $setting) {
+			if ($reverse) {
+				if (isset($backup[$key])) {
+					$_SERVER[$key] = $backup[$key];
+					unset($backup[$key]);
+				} else {
+					unset($_SERVER[$key]);
+				}
+			} else {
+				$value = env($key);
+				if (!empty($value)) {
+					$backup[$key] = $value;
+				}
+				if (!empty($this->settings[$setting])) {
+					$_SERVER[$key] = $this->settings[$setting];
+				} else if (!empty($this->settings[$key])) {
+					$_SERVER[$key] = $this->settings[$key];
+				} else {
+					$_SERVER[$key] = $value;
+				}
+			}
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cake_log.php b/code/ryzom/tools/server/www/webtt/cake/libs/cake_log.php
new file mode 100644
index 000000000..1d92ad854
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cake_log.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * Logging.
+ *
+ * Log messages to text files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * Set up error level constants to be used within the framework if they are not defined within the
+ * system.
+ *
+ */
+	if (!defined('LOG_WARNING')) {
+		define('LOG_WARNING', 3);
+	}
+	if (!defined('LOG_NOTICE')) {
+		define('LOG_NOTICE', 4);
+	}
+	if (!defined('LOG_DEBUG')) {
+		define('LOG_DEBUG', 5);
+	}
+	if (!defined('LOG_INFO')) {
+		define('LOG_INFO', 6);
+	}
+
+/**
+ * Logs messages to configured Log adapters.  One or more adapters can be configured
+ * using CakeLogs's methods.  If you don't configure any adapters, and write to the logs
+ * a default FileLog will be autoconfigured for you.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class CakeLog {
+
+/**
+ * An array of connected streams.
+ * Each stream represents a callable that will be called when write() is called.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_streams = array();
+
+/**
+ * Get an instance
+ *
+ * @return void
+ * @static
+ */
+	function &getInstance() {
+		static $instance = array();
+		if (!isset($instance[0])) {
+			$instance[0] =& new CakeLog();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Configure and add a new logging stream to CakeLog
+ * You can use add loggers from app/libs use app.loggername, or any plugin/libs using plugin.loggername.
+ *
+ * ### Usage:
+ *
+ * {{{
+ * CakeLog::config('second_file', array(
+ * 		'engine' => 'FileLog',
+ * 		'path' => '/var/logs/my_app/'
+ * ));
+ * }}}
+ *
+ * Will configure a FileLog instance to use the specified path.  All options that are not `engine`
+ * are passed onto the logging adapter, and handled there.  Any class can be configured as a logging
+ * adapter as long as it implements a `write` method with the following signature.
+ *
+ * `write($type, $message)`
+ *
+ * For an explaination of these parameters, see CakeLog::write()
+ *
+ * @param string $key The keyname for this logger, used to remove the logger later.
+ * @param array $config Array of configuration information for the logger
+ * @return boolean success of configuration.
+ * @static
+ */
+	function config($key, $config) {
+		if (empty($config['engine'])) {
+			trigger_error(__('Missing logger classname', true), E_USER_WARNING);
+			return false;
+		}
+		$self =& CakeLog::getInstance();
+		$className = $self->_getLogger($config['engine']);
+		if (!$className) {
+			return false;
+		}
+		unset($config['engine']);
+		$self->_streams[$key] = new $className($config);
+		return true;
+	}
+
+/**
+ * Attempts to import a logger class from the various paths it could be on.
+ * Checks that the logger class implements a write method as well.
+ *
+ * @param string $loggerName the plugin.className of the logger class you want to build.
+ * @return mixed boolean false on any failures, string of classname to use if search was successful.
+ * @access protected
+ */
+	function _getLogger($loggerName) {
+		list($plugin, $loggerName) = pluginSplit($loggerName);
+
+		if ($plugin) {
+			App::import('Lib', $plugin . '.log/' . $loggerName);
+		} else {
+			if (!App::import('Lib', 'log/' . $loggerName)) {
+				App::import('Core', 'log/' . $loggerName);
+			}
+		}
+		if (!class_exists($loggerName)) {
+			trigger_error(sprintf(__('Could not load logger class %s', true), $loggerName), E_USER_WARNING);
+			return false;
+		}
+		if (!is_callable(array($loggerName, 'write'))) {
+			trigger_error(
+				sprintf(__('logger class %s does not implement a write method.', true), $loggerName),
+				E_USER_WARNING
+			);
+			return false;
+		}
+		return $loggerName;
+	}
+
+/**
+ * Returns the keynames of the currently active streams
+ *
+ * @return array Array of configured log streams.
+ * @access public
+ * @static
+ */
+	function configured() {
+		$self =& CakeLog::getInstance();
+		return array_keys($self->_streams);
+	}
+
+/**
+ * Removes a stream from the active streams.  Once a stream has been removed
+ * it will no longer have messages sent to it.
+ *
+ * @param string $keyname Key name of a configured stream to remove.
+ * @return void
+ * @access public
+ * @static
+ */
+	function drop($streamName) {
+		$self =& CakeLog::getInstance();
+		unset($self->_streams[$streamName]);
+	}
+
+/**
+ * Configures the automatic/default stream a FileLog.
+ *
+ * @return void
+ * @access protected
+ */
+	function _autoConfig() {
+		if (!class_exists('FileLog')) {
+			App::import('Core', 'log/FileLog');
+		}
+		$this->_streams['default'] =& new FileLog(array('path' => LOGS));
+	}
+
+/**
+ * Writes the given message and type to all of the configured log adapters.
+ * Configured adapters are passed both the $type and $message variables. $type
+ * is one of the following strings/values.
+ *
+ * ### Types:
+ *
+ * - `LOG_WARNING` => 'warning',
+ * - `LOG_NOTICE` => 'notice',
+ * - `LOG_INFO` => 'info',
+ * - `LOG_DEBUG` => 'debug',
+ * - `LOG_ERR` => 'error',
+ * - `LOG_ERROR` => 'error'
+ *
+ * ### Usage:
+ *
+ * Write a message to the 'warning' log:
+ * 
+ * `CakeLog::write('warning', 'Stuff is broken here');`
+ *
+ * @param string $type Type of message being written
+ * @param string $message Message content to log
+ * @return boolean Success
+ * @access public
+ * @static
+ */
+	function write($type, $message) {
+		if (!defined('LOG_ERROR')) {
+			define('LOG_ERROR', 2);
+		}
+		if (!defined('LOG_ERR')) {
+			define('LOG_ERR', LOG_ERROR);
+		}
+		$levels = array(
+			LOG_WARNING => 'warning',
+			LOG_NOTICE => 'notice',
+			LOG_INFO => 'info',
+			LOG_DEBUG => 'debug',
+			LOG_ERR => 'error',
+			LOG_ERROR => 'error'
+		);
+
+		if (is_int($type) && isset($levels[$type])) {
+			$type = $levels[$type];
+		}
+		$self =& CakeLog::getInstance();
+		if (empty($self->_streams)) {
+			$self->_autoConfig();
+		}
+		$keys = array_keys($self->_streams);
+		foreach ($keys as $key) {
+			$logger =& $self->_streams[$key];
+			$logger->write($type, $message);
+		}
+		return true;
+	}
+
+/**
+ * An error_handler that will log errors to file using CakeLog::write();
+ * You can control how verbose and what type of errors this error_handler will 
+ * catch using `Configure::write('log', $value)`.  See core.php for more information.
+ *
+ *
+ * @param integer $code Code of error
+ * @param string $description Error description
+ * @param string $file File on which error occurred
+ * @param integer $line Line that triggered the error
+ * @param array $context Context
+ * @return void
+ */
+	function handleError($code, $description, $file = null, $line = null, $context = null) {
+		if ($code === 2048 || $code === 8192 || error_reporting() === 0) {
+			return;
+		}
+		switch ($code) {
+			case E_PARSE:
+			case E_ERROR:
+			case E_CORE_ERROR:
+			case E_COMPILE_ERROR:
+			case E_USER_ERROR:
+				$error = 'Fatal Error';
+				$level = LOG_ERROR;
+			break;
+			case E_WARNING:
+			case E_USER_WARNING:
+			case E_COMPILE_WARNING:
+			case E_RECOVERABLE_ERROR:
+				$error = 'Warning';
+				$level = LOG_WARNING;
+			break;
+			case E_NOTICE:
+			case E_USER_NOTICE:
+				$error = 'Notice';
+				$level = LOG_NOTICE;
+			break;
+			default:
+				return;
+			break;
+		}
+		$message = $error . ' (' . $code . '): ' . $description . ' in [' . $file . ', line ' . $line . ']';
+		CakeLog::write($level, $message);
+	}
+}
+
+if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) {
+	$cakeLog =& CakeLog::getInstance();
+	set_error_handler(array($cakeLog, 'handleError'));
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cake_session.php b/code/ryzom/tools/server/www/webtt/cake/libs/cake_session.php
new file mode 100644
index 000000000..395f68536
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cake_session.php
@@ -0,0 +1,794 @@
+<?php
+/**
+ * Session class for Cake.
+ *
+ * Cake abstracts the handling of sessions.
+ * There are several convenient methods to access session information.
+ * This class is the implementation of those methods.
+ * They are mostly used by the Session Component.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v .0.10.0.1222
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('Security')) {
+	App::import('Core', 'Security');
+}
+
+/**
+ * Session class for Cake.
+ *
+ * Cake abstracts the handling of sessions. There are several convenient methods to access session information.
+ * This class is the implementation of those methods. They are mostly used by the Session Component.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class CakeSession extends Object {
+
+/**
+ * True if the Session is still valid
+ *
+ * @var boolean
+ * @access public
+ */
+	var $valid = false;
+
+/**
+ * Error messages for this session
+ *
+ * @var array
+ * @access public
+ */
+	var $error = false;
+
+/**
+ * User agent string
+ *
+ * @var string
+ * @access protected
+ */
+	var $_userAgent = '';
+
+/**
+ * Path to where the session is active.
+ *
+ * @var string
+ * @access public
+ */
+	var $path = '/';
+
+/**
+ * Error number of last occurred error
+ *
+ * @var integer
+ * @access public
+ */
+	var $lastError = null;
+
+/**
+ * 'Security.level' setting, "high", "medium", or "low".
+ *
+ * @var string
+ * @access public
+ */
+	var $security = null;
+
+/**
+ * Start time for this session.
+ *
+ * @var integer
+ * @access public
+ */
+	var $time = false;
+
+/**
+ * Time when this session becomes invalid.
+ *
+ * @var integer
+ * @access public
+ */
+	var $sessionTime = false;
+
+/**
+ * The number of seconds to set for session.cookie_lifetime.  0 means
+ * at browser close.
+ *
+ * @var integer
+ */
+	var $cookieLifeTime = false;
+
+/**
+ * Keeps track of keys to watch for writes on
+ *
+ * @var array
+ * @access public
+ */
+	var $watchKeys = array();
+
+/**
+ * Current Session id
+ *
+ * @var string
+ * @access public
+ */
+	var $id = null;
+
+/**
+ * Hostname
+ *
+ * @var string
+ * @access public
+ */
+	var $host = null;
+
+/**
+ * Session timeout multiplier factor
+ *
+ * @var integer
+ * @access public
+ */
+	var $timeout = null;
+
+/**
+ * Constructor.
+ *
+ * @param string $base The base path for the Session
+ * @param boolean $start Should session be started right now
+ * @access public
+ */
+	function __construct($base = null, $start = true) {
+		App::import('Core', array('Set', 'Security'));
+		$this->time = time();
+
+		if (Configure::read('Session.checkAgent') === true || Configure::read('Session.checkAgent') === null) {
+			if (env('HTTP_USER_AGENT') != null) {
+				$this->_userAgent = md5(env('HTTP_USER_AGENT') . Configure::read('Security.salt'));
+			}
+		}
+		if (Configure::read('Session.save') === 'database') {
+			$modelName = Configure::read('Session.model');
+			$database = Configure::read('Session.database');
+			$table = Configure::read('Session.table');
+
+			if (empty($database)) {
+				$database = 'default';
+			}
+			$settings = array(
+				'class' => 'Session',
+				'alias' => 'Session',
+				'table' => 'cake_sessions',
+				'ds' => $database
+			);
+			if (!empty($modelName)) {
+				$settings['class'] = $modelName;
+			}
+			if (!empty($table)) {
+				$settings['table'] = $table;
+			}
+			ClassRegistry::init($settings);
+		}
+		if ($start === true) {
+			if (!empty($base)) {
+				$this->path = $base;
+				if (strpos($base, 'index.php') !== false) {
+				   $this->path = str_replace('index.php', '', $base);
+				}
+				if (strpos($base, '?') !== false) {
+				   $this->path = str_replace('?', '', $base);
+				}
+			}
+			$this->host = env('HTTP_HOST');
+
+			if (strpos($this->host, ':') !== false) {
+				$this->host = substr($this->host, 0, strpos($this->host, ':'));
+			}
+		}
+		if (isset($_SESSION) || $start === true) {
+			$this->sessionTime = $this->time + (Security::inactiveMins() * Configure::read('Session.timeout'));
+			$this->security = Configure::read('Security.level');
+		}
+		parent::__construct();
+	}
+
+/**
+ * Starts the Session.
+ *
+ * @return boolean True if session was started
+ * @access public
+ */
+	function start() {
+		if ($this->started()) {
+			return true;
+		}
+		if (function_exists('session_write_close')) {
+			session_write_close();
+		}
+		$this->__initSession();
+		$this->__startSession();
+		return $this->started();
+	}
+
+/**
+ * Determine if Session has been started.
+ *
+ * @access public
+ * @return boolean True if session has been started.
+ */
+	function started() {
+		if (isset($_SESSION) && session_id()) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Returns true if given variable is set in session.
+ *
+ * @param string $name Variable name to check for
+ * @return boolean True if variable is there
+ * @access public
+ */
+	function check($name) {
+		if (empty($name)) {
+			return false;
+		}
+		$result = Set::classicExtract($_SESSION, $name);
+		return isset($result);
+	}
+
+/**
+ * Returns the Session id
+ *
+ * @param id $name string
+ * @return string Session id
+ * @access public
+ */
+	function id($id = null) {
+		if ($id) {
+			$this->id = $id;
+			session_id($this->id);
+		}
+		if ($this->started()) {
+			return session_id();
+		} else {
+			return $this->id;
+		}
+	}
+
+/**
+ * Removes a variable from session.
+ *
+ * @param string $name Session variable to remove
+ * @return boolean Success
+ * @access public
+ */
+	function delete($name) {
+		if ($this->check($name)) {
+			if (in_array($name, $this->watchKeys)) {
+				trigger_error(sprintf(__('Deleting session key {%s}', true), $name), E_USER_NOTICE);
+			}
+			$this->__overwrite($_SESSION, Set::remove($_SESSION, $name));
+			return ($this->check($name) == false);
+		}
+		$this->__setError(2, sprintf(__("%s doesn't exist", true), $name));
+		return false;
+	}
+
+/**
+ * Used to write new data to _SESSION, since PHP doesn't like us setting the _SESSION var itself
+ *
+ * @param array $old Set of old variables => values
+ * @param array $new New set of variable => value
+ * @access private
+ */
+	function __overwrite(&$old, $new) {
+		if (!empty($old)) {
+			foreach ($old as $key => $var) {
+				if (!isset($new[$key])) {
+					unset($old[$key]);
+				}
+			}
+		}
+		foreach ($new as $key => $var) {
+			$old[$key] = $var;
+		}
+	}
+
+/**
+ * Return error description for given error number.
+ *
+ * @param integer $errorNumber Error to set
+ * @return string Error as string
+ * @access private
+ */
+	function __error($errorNumber) {
+		if (!is_array($this->error) || !array_key_exists($errorNumber, $this->error)) {
+			return false;
+		} else {
+			return $this->error[$errorNumber];
+		}
+	}
+
+/**
+ * Returns last occurred error as a string, if any.
+ *
+ * @return mixed Error description as a string, or false.
+ * @access public
+ */
+	function error() {
+		if ($this->lastError) {
+			return $this->__error($this->lastError);
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Returns true if session is valid.
+ *
+ * @return boolean Success
+ * @access public
+ */
+	function valid() {
+		if ($this->read('Config')) {
+			if ((Configure::read('Session.checkAgent') === false || $this->_userAgent == $this->read('Config.userAgent')) && $this->time <= $this->read('Config.time')) {
+				if ($this->error === false) {
+					$this->valid = true;
+				}
+			} else {
+				$this->valid = false;
+				$this->__setError(1, 'Session Highjacking Attempted !!!');
+			}
+		}
+		return $this->valid;
+	}
+
+/**
+ * Returns given session variable, or all of them, if no parameters given.
+ *
+ * @param mixed $name The name of the session variable (or a path as sent to Set.extract)
+ * @return mixed The value of the session variable
+ * @access public
+ */
+	function read($name = null) {
+		if (is_null($name)) {
+			return $this->__returnSessionVars();
+		}
+		if (empty($name)) {
+			return false;
+		}
+		$result = Set::classicExtract($_SESSION, $name);
+
+		if (!is_null($result)) {
+			return $result;
+		}
+		$this->__setError(2, "$name doesn't exist");
+		return null;
+	}
+
+/**
+ * Returns all session variables.
+ *
+ * @return mixed Full $_SESSION array, or false on error.
+ * @access private
+ */
+	function __returnSessionVars() {
+		if (!empty($_SESSION)) {
+			return $_SESSION;
+		}
+		$this->__setError(2, "No Session vars set");
+		return false;
+	}
+
+/**
+ * Tells Session to write a notification when a certain session path or subpath is written to
+ *
+ * @param mixed $var The variable path to watch
+ * @return void
+ * @access public
+ */
+	function watch($var) {
+		if (empty($var)) {
+			return false;
+		}
+		if (!in_array($var, $this->watchKeys, true)) {
+			$this->watchKeys[] = $var;
+		}
+	}
+
+/**
+ * Tells Session to stop watching a given key path
+ *
+ * @param mixed $var The variable path to watch
+ * @return void
+ * @access public
+ */
+	function ignore($var) {
+		if (!in_array($var, $this->watchKeys)) {
+			return;
+		}
+		foreach ($this->watchKeys as $i => $key) {
+			if ($key == $var) {
+				unset($this->watchKeys[$i]);
+				$this->watchKeys = array_values($this->watchKeys);
+				return;
+			}
+		}
+	}
+
+/**
+ * Writes value to given session variable name.
+ *
+ * @param mixed $name Name of variable
+ * @param string $value Value to write
+ * @return boolean True if the write was successful, false if the write failed
+ * @access public
+ */
+	function write($name, $value) {
+		if (empty($name)) {
+			return false;
+		}
+		if (in_array($name, $this->watchKeys)) {
+			trigger_error(sprintf(__('Writing session key {%s}: %s', true), $name, Debugger::exportVar($value)), E_USER_NOTICE);
+		}
+		$this->__overwrite($_SESSION, Set::insert($_SESSION, $name, $value));
+		return (Set::classicExtract($_SESSION, $name) === $value);
+	}
+
+/**
+ * Helper method to destroy invalid sessions.
+ *
+ * @return void
+ * @access public
+ */
+	function destroy() {
+		if ($this->started()) {
+			session_destroy();
+		}
+		$_SESSION = null;
+		$this->__construct($this->path);
+		$this->start();
+		$this->renew();
+		$this->_checkValid();
+	}
+
+/**
+ * Helper method to initialize a session, based on Cake core settings.
+ *
+ * @access private
+ */
+	function __initSession() {
+		$iniSet = function_exists('ini_set');
+		if ($iniSet && env('HTTPS')) {
+			ini_set('session.cookie_secure', 1);
+		}
+		if ($iniSet && ($this->security === 'high' || $this->security === 'medium')) {
+			ini_set('session.referer_check', $this->host);
+		}
+
+		if ($this->security == 'high') {
+			$this->cookieLifeTime = 0;
+		} else {
+			$this->cookieLifeTime = Configure::read('Session.timeout') * (Security::inactiveMins() * 60);
+		}
+
+		switch (Configure::read('Session.save')) {
+			case 'cake':
+				if (empty($_SESSION)) {
+					if ($iniSet) {
+						ini_set('session.use_trans_sid', 0);
+						ini_set('url_rewriter.tags', '');
+						ini_set('session.serialize_handler', 'php');
+						ini_set('session.use_cookies', 1);
+						ini_set('session.name', Configure::read('Session.cookie'));
+						ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+						ini_set('session.cookie_path', $this->path);
+						ini_set('session.auto_start', 0);
+						ini_set('session.save_path', TMP . 'sessions');
+					}
+				}
+			break;
+			case 'database':
+				if (empty($_SESSION)) {
+					if (Configure::read('Session.model') === null) {
+						trigger_error(__("You must set the all Configure::write('Session.*') in core.php to use database storage"), E_USER_WARNING);
+						$this->_stop();
+					}
+					if ($iniSet) {
+						ini_set('session.use_trans_sid', 0);
+						ini_set('url_rewriter.tags', '');
+						ini_set('session.save_handler', 'user');
+						ini_set('session.serialize_handler', 'php');
+						ini_set('session.use_cookies', 1);
+						ini_set('session.name', Configure::read('Session.cookie'));
+						ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+						ini_set('session.cookie_path', $this->path);
+						ini_set('session.auto_start', 0);
+					}
+				}
+				session_set_save_handler(
+					array('CakeSession','__open'),
+					array('CakeSession', '__close'),
+					array('CakeSession', '__read'),
+					array('CakeSession', '__write'),
+					array('CakeSession', '__destroy'),
+					array('CakeSession', '__gc')
+				);
+			break;
+			case 'php':
+				if (empty($_SESSION)) {
+					if ($iniSet) {
+						ini_set('session.use_trans_sid', 0);
+						ini_set('session.name', Configure::read('Session.cookie'));
+						ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+						ini_set('session.cookie_path', $this->path);
+					}
+				}
+			break;
+			case 'cache':
+				if (empty($_SESSION)) {
+					if (!class_exists('Cache')) {
+						require LIBS . 'cache.php';
+					}
+					if ($iniSet) {
+						ini_set('session.use_trans_sid', 0);
+						ini_set('url_rewriter.tags', '');
+						ini_set('session.save_handler', 'user');
+						ini_set('session.use_cookies', 1);
+						ini_set('session.name', Configure::read('Session.cookie'));
+						ini_set('session.cookie_lifetime', $this->cookieLifeTime);
+						ini_set('session.cookie_path', $this->path);
+					}
+				}
+				session_set_save_handler(
+					array('CakeSession','__open'),
+					array('CakeSession', '__close'),
+					array('Cache', 'read'),
+					array('Cache', 'write'),
+					array('Cache', 'delete'),
+					array('Cache', 'gc')
+				);
+			break;
+			default:
+				$config = CONFIGS . Configure::read('Session.save') . '.php';
+
+				if (is_file($config)) {
+					require($config);
+				}
+			break;
+		}
+	}
+
+/**
+ * Helper method to start a session
+ *
+ * @access private
+ */
+	function __startSession() {
+		if (headers_sent()) {
+			if (empty($_SESSION)) {
+				$_SESSION = array();
+			}
+			return true;
+		} elseif (!isset($_SESSION)) {
+			session_cache_limiter ("must-revalidate");
+			session_start();
+			header ('P3P: CP="NOI ADM DEV PSAi COM NAV OUR OTRo STP IND DEM"');
+			return true;
+		} else {
+			session_start();
+			return true;
+		}
+	}
+
+/**
+ * Helper method to create a new session.
+ *
+ * @return void
+ * @access protected
+ */
+	function _checkValid() {
+		if ($this->read('Config')) {
+			if ((Configure::read('Session.checkAgent') === false || $this->_userAgent == $this->read('Config.userAgent')) && $this->time <= $this->read('Config.time')) {
+				$time = $this->read('Config.time');
+				$this->write('Config.time', $this->sessionTime);
+				if (Configure::read('Security.level') === 'high') {
+					$check = $this->read('Config.timeout');
+					$check -= 1;
+					$this->write('Config.timeout', $check);
+
+					if (time() > ($time - (Security::inactiveMins() * Configure::read('Session.timeout')) + 2) || $check < 1) {
+						$this->renew();
+						$this->write('Config.timeout', 10);
+					}
+				}
+				$this->valid = true;
+			} else {
+				$this->destroy();
+				$this->valid = false;
+				$this->__setError(1, 'Session Highjacking Attempted !!!');
+			}
+		} else {
+			$this->write('Config.userAgent', $this->_userAgent);
+			$this->write('Config.time', $this->sessionTime);
+			$this->write('Config.timeout', 10);
+			$this->valid = true;
+			$this->__setError(1, 'Session is valid');
+		}
+	}
+
+/**
+ * Helper method to restart a session.
+ *
+ * @return void
+ * @access private
+ */
+	function __regenerateId() {
+		$oldSessionId = session_id();
+		if ($oldSessionId) {
+			if (session_id() != ''|| isset($_COOKIE[session_name()])) {
+				setcookie(Configure::read('Session.cookie'), '', time() - 42000, $this->path);
+			}
+			session_regenerate_id(true);
+			if (PHP_VERSION < 5.1) {
+				$sessionPath = session_save_path();
+				if (empty($sessionPath)) {
+					$sessionPath = '/tmp';
+				}
+				$newSessid = session_id();
+
+				if (function_exists('session_write_close')) {
+					session_write_close();
+				}
+				$this->__initSession();
+				session_id($oldSessionId);
+				session_start();
+				session_destroy();
+				$file = $sessionPath . DS . 'sess_' . $oldSessionId;
+				@unlink($file);
+				$this->__initSession();
+				session_id($newSessid);
+				session_start();
+			}
+		}
+	}
+
+/**
+ * Restarts this session.
+ *
+ * @access public
+ */
+	function renew() {
+		$this->__regenerateId();
+	}
+
+/**
+ * Helper method to set an internal error message.
+ *
+ * @param integer $errorNumber Number of the error
+ * @param string $errorMessage Description of the error
+ * @return void
+ * @access private
+ */
+	function __setError($errorNumber, $errorMessage) {
+		if ($this->error === false) {
+			$this->error = array();
+		}
+		$this->error[$errorNumber] = $errorMessage;
+		$this->lastError = $errorNumber;
+	}
+
+/**
+ * Method called on open of a database session.
+ *
+ * @return boolean Success
+ * @access private
+ */
+	function __open() {
+		return true;
+	}
+
+/**
+ * Method called on close of a database session.
+ *
+ * @return boolean Success
+ * @access private
+ */
+	function __close() {
+		$probability = mt_rand(1, 150);
+		if ($probability <= 3) {
+			switch (Configure::read('Session.save')) {
+				case 'cache':
+					Cache::gc();
+				break;
+				default:
+					CakeSession::__gc();
+				break;
+			}
+		}
+		return true;
+	}
+
+/**
+ * Method used to read from a database session.
+ *
+ * @param mixed $id The key of the value to read
+ * @return mixed The value of the key or false if it does not exist
+ * @access private
+ */
+	function __read($id) {
+		$model =& ClassRegistry::getObject('Session');
+
+		$row = $model->find('first', array(
+			'conditions' => array($model->primaryKey => $id)
+		));
+
+		if (empty($row[$model->alias]['data'])) {
+			return false;
+		}
+
+		return $row[$model->alias]['data'];
+	}
+
+/**
+ * Helper function called on write for database sessions.
+ *
+ * @param integer $id ID that uniquely identifies session in database
+ * @param mixed $data The value of the data to be saved.
+ * @return boolean True for successful write, false otherwise.
+ * @access private
+ */
+	function __write($id, $data) {
+		if (!$id) {
+			return false;
+		}
+		$expires = time() + Configure::read('Session.timeout') * Security::inactiveMins();
+		$model =& ClassRegistry::getObject('Session');
+		$return = $model->save(array($model->primaryKey => $id) + compact('data', 'expires'));
+		return $return;
+	}
+
+/**
+ * Method called on the destruction of a database session.
+ *
+ * @param integer $id ID that uniquely identifies session in database
+ * @return boolean True for successful delete, false otherwise.
+ * @access private
+ */
+	function __destroy($id) {
+		$model =& ClassRegistry::getObject('Session');
+		$return = $model->delete($id);
+
+		return $return;
+	}
+
+/**
+ * Helper function called on gc for database sessions.
+ *
+ * @param integer $expires Timestamp (defaults to current time)
+ * @return boolean Success
+ * @access private
+ */
+	function __gc($expires = null) {
+		$model =& ClassRegistry::getObject('Session');
+
+		if (!$expires) {
+			$expires = time();
+		}
+
+		$return = $model->deleteAll(array($model->alias . ".expires <" => $expires), false, false);
+		return $return;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/cake_socket.php b/code/ryzom/tools/server/www/webtt/cake/libs/cake_socket.php
new file mode 100644
index 000000000..00eff6e3c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/cake_socket.php
@@ -0,0 +1,310 @@
+<?php
+/**
+ * Cake Socket connection class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'Validation');
+
+/**
+ * Cake network socket connection class.
+ *
+ * Core base class for network communication.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class CakeSocket extends Object {
+
+/**
+ * Object description
+ *
+ * @var string
+ * @access public
+ */
+	var $description = 'Remote DataSource Network Socket Interface';
+
+/**
+ * Base configuration settings for the socket connection
+ *
+ * @var array
+ * @access protected
+ */
+	var $_baseConfig = array(
+		'persistent'	=> false,
+		'host'			=> 'localhost',
+		'protocol'		=> 'tcp',
+		'port'			=> 80,
+		'timeout'		=> 30
+	);
+
+/**
+ * Configuration settings for the socket connection
+ *
+ * @var array
+ * @access public
+ */
+	var $config = array();
+
+/**
+ * Reference to socket connection resource
+ *
+ * @var resource
+ * @access public
+ */
+	var $connection = null;
+
+/**
+ * This boolean contains the current state of the CakeSocket class
+ *
+ * @var boolean
+ * @access public
+ */
+	var $connected = false;
+
+/**
+ * This variable contains an array with the last error number (num) and string (str)
+ *
+ * @var array
+ * @access public
+ */
+	var $lastError = array();
+
+/**
+ * Constructor.
+ *
+ * @param array $config Socket configuration, which will be merged with the base configuration
+ * @see CakeSocket::$_baseConfig
+ */
+	function __construct($config = array()) {
+		parent::__construct();
+
+		$this->config = array_merge($this->_baseConfig, $config);
+		if (!is_numeric($this->config['protocol'])) {
+			$this->config['protocol'] = getprotobyname($this->config['protocol']);
+		}
+	}
+
+/**
+ * Connect the socket to the given host and port.
+ *
+ * @return boolean Success
+ * @access public
+ */
+	function connect() {
+		if ($this->connection != null) {
+			$this->disconnect();
+		}
+
+		$scheme = null;
+		if (isset($this->config['request']) && $this->config['request']['uri']['scheme'] == 'https') {
+			$scheme = 'ssl://';
+		}
+
+		if ($this->config['persistent'] == true) {
+			$tmp = null;
+			$this->connection = @pfsockopen($scheme.$this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']);
+		} else {
+			$this->connection = @fsockopen($scheme.$this->config['host'], $this->config['port'], $errNum, $errStr, $this->config['timeout']);
+		}
+
+		if (!empty($errNum) || !empty($errStr)) {
+			$this->setLastError($errNum, $errStr);
+		}
+
+		$this->connected = is_resource($this->connection);
+		if ($this->connected) {
+			stream_set_timeout($this->connection, $this->config['timeout']);
+		}
+		return $this->connected;
+	}
+
+/**
+ * Get the host name of the current connection.
+ *
+ * @return string Host name
+ * @access public
+ */
+	function host() {
+		if (Validation::ip($this->config['host'])) {
+			return gethostbyaddr($this->config['host']);
+		} else {
+			return gethostbyaddr($this->address());
+		}
+	}
+
+/**
+ * Get the IP address of the current connection.
+ *
+ * @return string IP address
+ * @access public
+ */
+	function address() {
+		if (Validation::ip($this->config['host'])) {
+			return $this->config['host'];
+		} else {
+			return gethostbyname($this->config['host']);
+		}
+	}
+
+/**
+ * Get all IP addresses associated with the current connection.
+ *
+ * @return array IP addresses
+ * @access public
+ */
+	function addresses() {
+		if (Validation::ip($this->config['host'])) {
+			return array($this->config['host']);
+		} else {
+			return gethostbynamel($this->config['host']);
+		}
+	}
+
+/**
+ * Get the last error as a string.
+ *
+ * @return string Last error
+ * @access public
+ */
+	function lastError() {
+		if (!empty($this->lastError)) {
+			return $this->lastError['num'] . ': ' . $this->lastError['str'];
+		} else {
+			return null;
+		}
+	}
+
+/**
+ * Set the last error.
+ *
+ * @param integer $errNum Error code
+ * @param string $errStr Error string
+ * @access public
+ */
+	function setLastError($errNum, $errStr) {
+		$this->lastError = array('num' => $errNum, 'str' => $errStr);
+	}
+
+/**
+ * Write data to the socket.
+ *
+ * @param string $data The data to write to the socket
+ * @return boolean Success
+ * @access public
+ */
+	function write($data) {
+		if (!$this->connected) {
+			if (!$this->connect()) {
+				return false;
+			}
+		}
+		$totalBytes = strlen($data);
+		for ($written = 0, $rv = 0; $written < $totalBytes; $written += $rv) {
+			$rv = fwrite($this->connection, substr($data, $written));
+			if ($rv === false || $rv === 0) {
+				return $written;
+			}
+		}
+		return $written;
+	}
+
+/**
+ * Read data from the socket. Returns false if no data is available or no connection could be
+ * established.
+ *
+ * @param integer $length Optional buffer length to read; defaults to 1024
+ * @return mixed Socket data
+ * @access public
+ */
+	function read($length = 1024) {
+		if (!$this->connected) {
+			if (!$this->connect()) {
+				return false;
+			}
+		}
+
+		if (!feof($this->connection)) {
+			$buffer = fread($this->connection, $length);
+			$info = stream_get_meta_data($this->connection);
+			if ($info['timed_out']) {
+				$this->setLastError(E_WARNING, __('Connection timed out', true));
+				return false;
+			}
+			return $buffer;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Abort socket operation.
+ *
+ * @return boolean Success
+ * @access public
+ */
+	function abort() {
+	}
+
+/**
+ * Disconnect the socket from the current connection.
+ *
+ * @return boolean Success
+ * @access public
+ */
+	function disconnect() {
+		if (!is_resource($this->connection)) {
+			$this->connected = false;
+			return true;
+		}
+		$this->connected = !fclose($this->connection);
+
+		if (!$this->connected) {
+			$this->connection = null;
+		}
+		return !$this->connected;
+	}
+
+/**
+ * Destructor, used to disconnect from current connection.
+ *
+ * @access private
+ */
+	function __destruct() {
+		$this->disconnect();
+	}
+
+/**
+ * Resets the state of this Socket instance to it's initial state (before Object::__construct got executed)
+ *
+ * @return boolean True on success
+ * @access public
+ */
+	function reset($state = null) {
+		if (empty($state)) {
+			static $initalState = array();
+			if (empty($initalState)) {
+				$initalState = get_class_vars(__CLASS__);
+			}
+			$state = $initalState;
+		}
+
+		foreach ($state as $property => $value) {
+			$this->{$property} = $value;
+		}
+		return true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/class_registry.php b/code/ryzom/tools/server/www/webtt/cake/libs/class_registry.php
new file mode 100644
index 000000000..0ab7f08b3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/class_registry.php
@@ -0,0 +1,365 @@
+<?php
+/**
+ * Class collections.
+ *
+ * A repository for class objects, each registered with a key.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.9.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Class Collections.
+ *
+ * A repository for class objects, each registered with a key.
+ * If you try to add an object with the same key twice, nothing will come of it.
+ * If you need a second instance of an object, give it another key.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class ClassRegistry {
+
+/**
+ * Names of classes with their objects.
+ *
+ * @var array
+ * @access private
+ */
+	var $__objects = array();
+
+/**
+ * Names of class names mapped to the object in the registry.
+ *
+ * @var array
+ * @access private
+ */
+	var $__map = array();
+
+/**
+ * Default constructor parameter settings, indexed by type
+ *
+ * @var array
+ * @access private
+ */
+	var $__config = array();
+
+/**
+ * Return a singleton instance of the ClassRegistry.
+ *
+ * @return ClassRegistry instance
+ * @access public
+ */
+	function &getInstance() {
+		static $instance = array();
+		if (!$instance) {
+			$instance[0] =& new ClassRegistry();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Loads a class, registers the object in the registry and returns instance of the object. ClassRegistry::init()
+ * is used as a factory for models, and handle correct injecting of settings, that assist in testing.
+ *
+ * Examples
+ * Simple Use: Get a Post model instance ```ClassRegistry::init('Post');```
+ *
+ * Exapanded: ```array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry', 'type' => 'Model');```
+ *
+ * Model Classes can accept optional ```array('id' => $id, 'table' => $table, 'ds' => $ds, 'alias' => $alias);```
+ *
+ * When $class is a numeric keyed array, multiple class instances will be stored in the registry,
+ *  no instance of the object will be returned
+ * {{{
+ * array(
+ *		array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry', 'type' => 'Model'),
+ *		array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry', 'type' => 'Model'),
+ *		array('class' => 'ClassName', 'alias' => 'AliasNameStoredInTheRegistry', 'type' => 'Model')
+ * );
+ * }}}
+ * @param mixed $class as a string or a single key => value array instance will be created,
+ *  stored in the registry and returned.
+ * @param string $type Only model is accepted as a valid value for $type.
+ * @return object instance of ClassName
+ * @access public
+ * @static
+ */
+	function &init($class, $type = null) {
+		$_this =& ClassRegistry::getInstance();
+		$id = $false = false;
+		$true = true;
+
+		if (!$type) {
+			$type = 'Model';
+		}
+
+		if (is_array($class)) {
+			$objects = $class;
+			if (!isset($class[0])) {
+				$objects = array($class);
+			}
+		} else {
+			$objects = array(array('class' => $class));
+		}
+		$defaults = isset($_this->__config[$type]) ? $_this->__config[$type] : array();
+		$count = count($objects);
+
+		foreach ($objects as $key => $settings) {
+			if (is_array($settings)) {
+				$pluginPath = null;
+				$settings = array_merge($defaults, $settings);
+				$class = $settings['class'];
+				
+				list($plugin, $class) = pluginSplit($class);
+				if ($plugin) {
+					$pluginPath = $plugin . '.';
+				}
+
+				if (empty($settings['alias'])) {
+					$settings['alias'] = $class;
+				}
+				$alias = $settings['alias'];
+
+				if ($model =& $_this->__duplicate($alias, $class)) {
+					$_this->map($alias, $class);
+					return $model;
+				}
+
+				if (class_exists($class) || App::import($type, $pluginPath . $class)) {
+					${$class} =& new $class($settings);
+				} elseif ($type === 'Model') {
+					if ($plugin && class_exists($plugin . 'AppModel')) {
+						$appModel = $plugin . 'AppModel';
+					} else {
+						$appModel = 'AppModel';
+					}
+					$settings['name'] = $class;
+					${$class} =& new $appModel($settings);
+				}
+
+				if (!isset(${$class})) {
+					trigger_error(sprintf(__('(ClassRegistry::init() could not create instance of %1$s class %2$s ', true), $class, $type), E_USER_WARNING);
+					return $false;
+				}
+
+				if ($type !== 'Model') {
+					$_this->addObject($alias, ${$class});
+				} else {
+					$_this->map($alias, $class);
+				}
+			} elseif (is_numeric($settings)) {
+				trigger_error(__('(ClassRegistry::init() Attempted to create instance of a class with a numeric name', true), E_USER_WARNING);
+				return $false;
+			}
+		}
+
+		if ($count > 1) {
+			return $true;
+		}
+		return ${$class};
+	}
+
+/**
+ * Add $object to the registry, associating it with the name $key.
+ *
+ * @param string $key	Key for the object in registry
+ * @param mixed $object	Object to store
+ * @return boolean True if the object was written, false if $key already exists
+ * @access public
+ * @static
+ */
+	function addObject($key, &$object) {
+		$_this =& ClassRegistry::getInstance();
+		$key = Inflector::underscore($key);
+		if (!isset($_this->__objects[$key])) {
+			$_this->__objects[$key] =& $object;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Remove object which corresponds to given key.
+ *
+ * @param string $key	Key of object to remove from registry
+ * @return void
+ * @access public
+ * @static
+ */
+	function removeObject($key) {
+		$_this =& ClassRegistry::getInstance();
+		$key = Inflector::underscore($key);
+		if (isset($_this->__objects[$key])) {
+			unset($_this->__objects[$key]);
+		}
+	}
+
+/**
+ * Returns true if given key is present in the ClassRegistry.
+ *
+ * @param string $key Key to look for
+ * @return boolean true if key exists in registry, false otherwise
+ * @access public
+ * @static
+ */
+	function isKeySet($key) {
+		$_this =& ClassRegistry::getInstance();
+		$key = Inflector::underscore($key);
+		if (isset($_this->__objects[$key])) {
+			return true;
+		} elseif (isset($_this->__map[$key])) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Get all keys from the registry.
+ *
+ * @return array Set of keys stored in registry
+ * @access public
+ * @static
+ */
+	function keys() {
+		$_this =& ClassRegistry::getInstance();
+		return array_keys($_this->__objects);
+	}
+
+/**
+ * Return object which corresponds to given key.
+ *
+ * @param string $key Key of object to look for
+ * @return mixed Object stored in registry or boolean false if the object does not exist.
+ * @access public
+ * @static
+ */
+	function &getObject($key) {
+		$_this =& ClassRegistry::getInstance();
+		$key = Inflector::underscore($key);
+		$return = false;
+		if (isset($_this->__objects[$key])) {
+			$return =& $_this->__objects[$key];
+		} else {
+			$key = $_this->__getMap($key);
+			if (isset($_this->__objects[$key])) {
+				$return =& $_this->__objects[$key];
+			}
+		}
+		return $return;
+	}
+
+/**
+ * Sets the default constructor parameter for an object type
+ *
+ * @param string $type Type of object.  If this parameter is omitted, defaults to "Model"
+ * @param array $param The parameter that will be passed to object constructors when objects
+ *                      of $type are created
+ * @return mixed Void if $param is being set.  Otherwise, if only $type is passed, returns
+ *               the previously-set value of $param, or null if not set.
+ * @access public
+ * @static
+ */
+	function config($type, $param = array()) {
+		$_this =& ClassRegistry::getInstance();
+
+		if (empty($param) && is_array($type)) {
+			$param = $type;
+			$type = 'Model';
+		} elseif (is_null($param)) {
+			unset($_this->__config[$type]);
+		} elseif (empty($param) && is_string($type)) {
+			return isset($_this->__config[$type]) ? $_this->__config[$type] : null;
+		}
+		$_this->__config[$type] = $param;
+	}
+
+/**
+ * Checks to see if $alias is a duplicate $class Object
+ *
+ * @param string $alias
+ * @param string $class
+ * @return boolean
+ * @access private
+ * @static
+ */
+	function &__duplicate($alias,  $class) {
+		$duplicate = false;
+		if ($this->isKeySet($alias)) {
+			$model =& $this->getObject($alias);
+			if (is_object($model) && (is_a($model, $class) || $model->alias === $class)) {
+				$duplicate =& $model;
+			}
+			unset($model);
+		}
+		return $duplicate;
+	}
+
+/**
+ * Add a key name pair to the registry to map name to class in the registry.
+ *
+ * @param string $key Key to include in map
+ * @param string $name Key that is being mapped
+ * @access public
+ * @static
+ */
+	function map($key, $name) {
+		$_this =& ClassRegistry::getInstance();
+		$key = Inflector::underscore($key);
+		$name = Inflector::underscore($name);
+		if (!isset($_this->__map[$key])) {
+			$_this->__map[$key] = $name;
+		}
+	}
+
+/**
+ * Get all keys from the map in the registry.
+ *
+ * @return array Keys of registry's map
+ * @access public
+ * @static
+ */
+	function mapKeys() {
+		$_this =& ClassRegistry::getInstance();
+		return array_keys($_this->__map);
+	}
+
+/**
+ * Return the name of a class in the registry.
+ *
+ * @param string $key Key to find in map
+ * @return string Mapped value
+ * @access private
+ * @static
+ */
+	function __getMap($key) {
+		if (isset($this->__map[$key])) {
+			return $this->__map[$key];
+		}
+	}
+
+/**
+ * Flushes all objects from the ClassRegistry.
+ *
+ * @return void
+ * @access public
+ * @static
+ */
+	function flush() {
+		$_this =& ClassRegistry::getInstance();
+		$_this->__objects = array();
+		$_this->__map = array();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/configure.php b/code/ryzom/tools/server/www/webtt/cake/libs/configure.php
new file mode 100644
index 000000000..e3e8e7835
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/configure.php
@@ -0,0 +1,1320 @@
+<?php
+/**
+ * App and Configure classes
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.0.0.2363
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Configuration class (singleton). Used for managing runtime configuration information.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @link          http://book.cakephp.org/view/924/The-Configuration-Class
+ */
+class Configure extends Object {
+
+/**
+ * Current debug level.
+ *
+ * @link          http://book.cakephp.org/view/931/CakePHP-Core-Configuration-Variables
+ * @var integer
+ * @access public
+ */
+	var $debug = 0;
+
+/**
+ * Returns a singleton instance of the Configure class.
+ *
+ * @return Configure instance
+ * @access public
+ */
+	function &getInstance($boot = true) {
+		static $instance = array();
+		if (!$instance) {
+			if (!class_exists('Set')) {
+				require LIBS . 'set.php';
+			}
+			$instance[0] =& new Configure();
+			$instance[0]->__loadBootstrap($boot);
+		}
+		return $instance[0];
+	}
+
+/**
+ * Used to store a dynamic variable in the Configure instance.
+ *
+ * Usage:
+ * {{{
+ * Configure::write('One.key1', 'value of the Configure::One[key1]');
+ * Configure::write(array('One.key1' => 'value of the Configure::One[key1]'));
+ * Configure::write('One', array(
+ *     'key1' => 'value of the Configure::One[key1]',
+ *     'key2' => 'value of the Configure::One[key2]'
+ * );
+ *
+ * Configure::write(array(
+ *     'One.key1' => 'value of the Configure::One[key1]',
+ *     'One.key2' => 'value of the Configure::One[key2]'
+ * ));
+ * }}}
+ *
+ * @link http://book.cakephp.org/view/926/write
+ * @param array $config Name of var to write
+ * @param mixed $value Value to set for var
+ * @return boolean True if write was successful
+ * @access public
+ */
+	function write($config, $value = null) {
+		$_this =& Configure::getInstance();
+
+		if (!is_array($config)) {
+			$config = array($config => $value);
+		}
+
+		foreach ($config as $name => $value) {
+			if (strpos($name, '.') === false) {
+				$_this->{$name} = $value;
+			} else {
+				$names = explode('.', $name, 4);
+				switch (count($names)) {
+					case 2:
+						$_this->{$names[0]}[$names[1]] = $value;
+					break;
+					case 3:
+						$_this->{$names[0]}[$names[1]][$names[2]] = $value;
+						break;
+					case 4:
+						$names = explode('.', $name, 2);
+						if (!isset($_this->{$names[0]})) {
+							$_this->{$names[0]} = array();
+						}
+						$_this->{$names[0]} = Set::insert($_this->{$names[0]}, $names[1], $value);
+					break;
+				}
+			}
+		}
+
+		if (isset($config['debug']) || isset($config['log'])) {
+			$reporting = 0;
+			if ($_this->debug) {
+				if (!class_exists('Debugger')) {
+					require LIBS . 'debugger.php';
+				}
+				$reporting = E_ALL & ~E_DEPRECATED;
+				if (function_exists('ini_set')) {
+					ini_set('display_errors', 1);
+				}
+			} elseif (function_exists('ini_set')) {
+				ini_set('display_errors', 0);
+			}
+
+			if (isset($_this->log) && $_this->log) {
+				if (!class_exists('CakeLog')) {
+					require LIBS . 'cake_log.php';
+				}
+				if (is_integer($_this->log) && !$_this->debug) {
+					$reporting = $_this->log;
+				} else {
+					$reporting = E_ALL & ~E_DEPRECATED;
+				}
+			}
+			error_reporting($reporting);
+		}
+		return true;
+	}
+
+/**
+ * Used to read information stored in the Configure instance.
+ *
+ * Usage:
+ * {{{
+ * Configure::read('Name'); will return all values for Name
+ * Configure::read('Name.key'); will return only the value of Configure::Name[key]
+ * }}}
+ *
+ * @link http://book.cakephp.org/view/927/read
+ * @param string $var Variable to obtain.  Use '.' to access array elements.
+ * @return string value of Configure::$var
+ * @access public
+ */
+	function read($var = 'debug') {
+		$_this =& Configure::getInstance();
+
+		if ($var === 'debug') {
+			return $_this->debug;
+		}
+
+		if (strpos($var, '.') !== false) {
+			$names = explode('.', $var, 3);
+			$var = $names[0];
+		}
+		if (!isset($_this->{$var})) {
+			return null;
+		}
+		if (!isset($names[1])) {
+			return $_this->{$var};
+		}
+		switch (count($names)) {
+			case 2:
+				if (isset($_this->{$var}[$names[1]])) {
+					return $_this->{$var}[$names[1]];
+				}
+			break;
+			case 3:
+				if (isset($_this->{$var}[$names[1]][$names[2]])) {
+					return $_this->{$var}[$names[1]][$names[2]];
+				}
+				if (!isset($_this->{$var}[$names[1]])) {
+					return null;
+				}
+				return Set::classicExtract($_this->{$var}[$names[1]], $names[2]);
+			break;
+		}
+		return null;
+	}
+
+/**
+ * Used to delete a variable from the Configure instance.
+ *
+ * Usage:
+ * {{{
+ * Configure::delete('Name'); will delete the entire Configure::Name
+ * Configure::delete('Name.key'); will delete only the Configure::Name[key]
+ * }}}
+ *
+ * @link http://book.cakephp.org/view/928/delete
+ * @param string $var the var to be deleted
+ * @return void
+ * @access public
+ */
+	function delete($var = null) {
+		$_this =& Configure::getInstance();
+
+		if (strpos($var, '.') === false) {
+			unset($_this->{$var});
+			return;
+		}
+
+		$names = explode('.', $var, 2);
+		$_this->{$names[0]} = Set::remove($_this->{$names[0]}, $names[1]);
+	}
+
+/**
+ * Loads a file from app/config/configure_file.php.
+ * Config file variables should be formated like:
+ *  `$config['name'] = 'value';`
+ * These will be used to create dynamic Configure vars. load() is also used to
+ * load stored config files created with Configure::store()
+ *
+ * - To load config files from app/config use `Configure::load('configure_file');`.
+ * - To load config files from a plugin `Configure::load('plugin.configure_file');`.
+ *
+ * @link http://book.cakephp.org/view/929/load
+ * @param string $fileName name of file to load, extension must be .php and only the name
+ *     should be used, not the extenstion
+ * @return mixed false if file not found, void if load successful
+ * @access public
+ */
+	function load($fileName) {
+		$found = $plugin = $pluginPath = false;
+		list($plugin, $fileName) = pluginSplit($fileName);
+		if ($plugin) {
+			$pluginPath = App::pluginPath($plugin);
+		}
+		$pos = strpos($fileName, '..');
+
+		if ($pos === false) {
+			if ($pluginPath && file_exists($pluginPath . 'config' . DS . $fileName . '.php')) {
+				include($pluginPath . 'config' . DS . $fileName . '.php');
+				$found = true;
+			} elseif (file_exists(CONFIGS . $fileName . '.php')) {
+				include(CONFIGS . $fileName . '.php');
+				$found = true;
+			} elseif (file_exists(CACHE . 'persistent' . DS . $fileName . '.php')) {
+				include(CACHE . 'persistent' . DS . $fileName . '.php');
+				$found = true;
+			} else {
+				foreach (App::core('cake') as $key => $path) {
+					if (file_exists($path . DS . 'config' . DS . $fileName . '.php')) {
+						include($path . DS . 'config' . DS . $fileName . '.php');
+						$found = true;
+						break;
+					}
+				}
+			}
+		}
+
+		if (!$found) {
+			return false;
+		}
+
+		if (!isset($config)) {
+			trigger_error(sprintf(__('Configure::load() - no variable $config found in %s.php', true), $fileName), E_USER_WARNING);
+			return false;
+		}
+		return Configure::write($config);
+	}
+
+/**
+ * Used to determine the current version of CakePHP.
+ *
+ * Usage `Configure::version();`
+ *
+ * @link http://book.cakephp.org/view/930/version
+ * @return string Current version of CakePHP
+ * @access public
+ */
+	function version() {
+		$_this =& Configure::getInstance();
+
+		if (!isset($_this->Cake['version'])) {
+			require(CORE_PATH . 'cake' . DS . 'config' . DS . 'config.php');
+			$_this->write($config);
+		}
+		return $_this->Cake['version'];
+	}
+
+/**
+ * Used to write a config file to disk.
+ *
+ * {{{
+ * Configure::store('Model', 'class_paths', array('Users' => array(
+ *      'path' => 'users', 'plugin' => true
+ * )));
+ * }}}
+ *
+ * @param string $type Type of config file to write, ex: Models, Controllers, Helpers, Components
+ * @param string $name file name.
+ * @param array $data array of values to store.
+ * @return void
+ * @access public
+ */
+	function store($type, $name, $data = array()) {
+		$write = true;
+		$content = '';
+
+		foreach ($data as $key => $value) {
+			$content .= "\$config['$type']['$key'] = " . var_export($value, true) . ";\n";
+		}
+		if (is_null($type)) {
+			$write = false;
+		}
+		Configure::__writeConfig($content, $name, $write);
+	}
+
+/**
+ * Creates a cached version of a configuration file.
+ * Appends values passed from Configure::store() to the cached file
+ *
+ * @param string $content Content to write on file
+ * @param string $name Name to use for cache file
+ * @param boolean $write true if content should be written, false otherwise
+ * @return void
+ * @access private
+ */
+	function __writeConfig($content, $name, $write = true) {
+		$file = CACHE . 'persistent' . DS . $name . '.php';
+
+		if (Configure::read() > 0) {
+			$expires = "+10 seconds";
+		} else {
+			$expires = "+999 days";
+		}
+		$cache = cache('persistent' . DS . $name . '.php', null, $expires);
+
+		if ($cache === null) {
+			cache('persistent' . DS . $name . '.php', "<?php\n\$config = array();\n", $expires);
+		}
+
+		if ($write === true) {
+			if (!class_exists('File')) {
+				require LIBS . 'file.php';
+			}
+			$fileClass = new File($file);
+
+			if ($fileClass->writable()) {
+				$fileClass->append($content);
+			}
+		}
+	}
+
+/**
+ * @deprecated
+ * @see App::objects()
+ */
+	function listObjects($type, $path = null, $cache = true) {
+		return App::objects($type, $path, $cache);
+	}
+
+/**
+ * @deprecated
+ * @see App::core()
+ */
+	function corePaths($type = null) {
+		return App::core($type);
+	}
+
+/**
+ * @deprecated
+ * @see App::build()
+ */
+	function buildPaths($paths) {
+		return App::build($paths);
+	}
+
+/**
+ * Loads app/config/bootstrap.php.
+ * If the alternative paths are set in this file
+ * they will be added to the paths vars.
+ *
+ * @param boolean $boot Load application bootstrap (if true)
+ * @return void
+ * @access private
+ */
+	function __loadBootstrap($boot) {
+		if ($boot) {
+			Configure::write('App', array('base' => false, 'baseUrl' => false, 'dir' => APP_DIR, 'webroot' => WEBROOT_DIR, 'www_root' => WWW_ROOT));
+
+			if (!include(CONFIGS . 'core.php')) {
+				trigger_error(sprintf(__("Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
+			}
+
+			if (Configure::read('Cache.disable') !== true) {
+				$cache = Cache::config('default');
+
+				if (empty($cache['settings'])) {
+					trigger_error(__('Cache not configured properly. Please check Cache::config(); in APP/config/core.php', true), E_USER_WARNING);
+					$cache = Cache::config('default', array('engine' => 'File'));
+				}
+				$path = $prefix = $duration = null;
+
+				if (!empty($cache['settings']['path'])) {
+					$path = realpath($cache['settings']['path']);
+				} else {
+					$prefix = $cache['settings']['prefix'];
+				}
+
+				if (Configure::read() >= 1) {
+					$duration = '+10 seconds';
+				} else {
+					$duration = '+999 days';
+				}
+
+				if (Cache::config('_cake_core_') === false) {
+					Cache::config('_cake_core_', array_merge((array)$cache['settings'], array(
+						'prefix' => $prefix . 'cake_core_', 'path' => $path . DS . 'persistent' . DS,
+						'serialize' => true, 'duration' => $duration
+					)));
+				}
+
+				if (Cache::config('_cake_model_') === false) {
+					Cache::config('_cake_model_', array_merge((array)$cache['settings'], array(
+						'prefix' => $prefix . 'cake_model_', 'path' => $path . DS . 'models' . DS,
+						'serialize' => true, 'duration' => $duration
+					)));
+				}
+				Cache::config('default');
+			}
+			App::build();
+			if (!include(CONFIGS . 'bootstrap.php')) {
+				trigger_error(sprintf(__("Can't find application bootstrap file. Please create %sbootstrap.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
+			}
+		}
+	}
+}
+
+/**
+ * Class/file loader and path management.
+ *
+ * @link          http://book.cakephp.org/view/933/The-App-Class
+ * @since         CakePHP(tm) v 1.2.0.6001
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class App extends Object {
+
+/**
+ * List of object types and their properties
+ *
+ * @var array
+ * @access public
+ */
+	var $types = array(
+		'class' => array('suffix' => '.php', 'extends' => null, 'core' => true),
+		'file' => array('suffix' => '.php', 'extends' => null, 'core' => true),
+		'model' => array('suffix' => '.php', 'extends' => 'AppModel', 'core' => false),
+		'behavior' => array('suffix' => '.php', 'extends' => 'ModelBehavior', 'core' => true),
+		'controller' => array('suffix' => '_controller.php', 'extends' => 'AppController', 'core' => true),
+		'component' => array('suffix' => '.php', 'extends' => null, 'core' => true),
+		'lib' => array('suffix' => '.php', 'extends' => null, 'core' => true),
+		'view' => array('suffix' => '.php', 'extends' => null, 'core' => true),
+		'helper' => array('suffix' => '.php', 'extends' => 'AppHelper', 'core' => true),
+		'vendor' => array('suffix' => '', 'extends' => null, 'core' => true),
+		'shell' => array('suffix' => '.php', 'extends' => 'Shell', 'core' => true),
+		'plugin' => array('suffix' => '', 'extends' => null, 'core' => true)
+	);
+
+/**
+ * List of additional path(s) where model files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $models = array();
+
+/**
+ * List of additional path(s) where behavior files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $behaviors = array();
+
+/**
+ * List of additional path(s) where controller files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $controllers = array();
+
+/**
+ * List of additional path(s) where component files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array();
+
+/**
+ * List of additional path(s) where datasource files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $datasources = array();
+
+/**
+ * List of additional path(s) where libs files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $libs = array();
+/**
+ * List of additional path(s) where view files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $views = array();
+
+/**
+ * List of additional path(s) where helper files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array();
+
+/**
+ * List of additional path(s) where plugins reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $plugins = array();
+
+/**
+ * List of additional path(s) where vendor packages reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $vendors = array();
+
+/**
+ * List of additional path(s) where locale files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $locales = array();
+
+/**
+ * List of additional path(s) where console shell files reside.
+ *
+ * @var array
+ * @access public
+ */
+	var $shells = array();
+
+/**
+ * Paths to search for files.
+ *
+ * @var array
+ * @access public
+ */
+	var $search = array();
+
+/**
+ * Whether or not to return the file that is loaded.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $return = false;
+
+/**
+ * Holds key/value pairs of $type => file path.
+ *
+ * @var array
+ * @access private
+ */
+	var $__map = array();
+
+/**
+ * Holds paths for deep searching of files.
+ *
+ * @var array
+ * @access private
+ */
+	var $__paths = array();
+
+/**
+ * Holds loaded files.
+ *
+ * @var array
+ * @access private
+ */
+	var $__loaded = array();
+
+/**
+ * Holds and key => value array of object types.
+ *
+ * @var array
+ * @access private
+ */
+	var $__objects = array();
+
+/**
+ * Used to read information stored path
+ *
+ * Usage:
+ *
+ * `App::path('models'); will return all paths for models`
+ *
+ * @param string $type type of path
+ * @return string array
+ * @access public
+ */
+	function path($type) {
+		$_this =& App::getInstance();
+		if (!isset($_this->{$type})) {
+			return array();
+		}
+		return $_this->{$type};
+	}
+
+/**
+ * Build path references. Merges the supplied $paths
+ * with the base paths and the default core paths.
+ *
+ * @param array $paths paths defines in config/bootstrap.php
+ * @param boolean $reset true will set paths, false merges paths [default] false
+ * @return void
+ * @access public
+ */
+	function build($paths = array(), $reset = false) {
+		$_this =& App::getInstance();
+		$defaults = array(
+			'models' => array(MODELS),
+			'behaviors' => array(BEHAVIORS),
+			'datasources' => array(MODELS . 'datasources'),
+			'controllers' => array(CONTROLLERS),
+			'components' => array(COMPONENTS),
+			'libs' => array(APPLIBS),
+			'views' => array(VIEWS),
+			'helpers' => array(HELPERS),
+			'locales' => array(APP . 'locale' . DS),
+			'shells' => array(APP . 'vendors' . DS . 'shells' . DS, VENDORS . 'shells' . DS),
+			'vendors' => array(APP . 'vendors' . DS, VENDORS),
+			'plugins' => array(APP . 'plugins' . DS)
+		);
+
+		if ($reset == true) {
+			foreach ($paths as $type => $new) {
+				$_this->{$type} = (array)$new;
+			}
+			return $paths;
+		}
+
+		$core = $_this->core();
+		$app = array('models' => true, 'controllers' => true, 'helpers' => true);
+
+		foreach ($defaults as $type => $default) {
+			$merge = array();
+
+			if (isset($app[$type])) {
+				$merge = array(APP);
+			}
+			if (isset($core[$type])) {
+				$merge = array_merge($merge, (array)$core[$type]);
+			}
+
+			if (empty($_this->{$type}) || empty($paths)) {
+				$_this->{$type} = $default;
+			}
+
+			if (!empty($paths[$type])) {
+				$path = array_flip(array_flip(array_merge(
+					(array)$paths[$type], $_this->{$type}, $merge
+				)));
+				$_this->{$type} = array_values($path);
+			} else {
+				$path = array_flip(array_flip(array_merge($_this->{$type}, $merge)));
+				$_this->{$type} = array_values($path);
+			}
+		}
+	}
+
+/**
+ * Get the path that a plugin is on.  Searches through the defined plugin paths.
+ *
+ * @param string $plugin CamelCased/lower_cased plugin name to find the path of.
+ * @return string full path to the plugin.
+ */
+	function pluginPath($plugin) {
+		$_this =& App::getInstance();
+		$pluginDir = Inflector::underscore($plugin);
+		for ($i = 0, $length = count($_this->plugins); $i < $length; $i++) {
+			if (is_dir($_this->plugins[$i] . $pluginDir)) {
+				return $_this->plugins[$i] . $pluginDir . DS ;
+			}
+		}
+		return $_this->plugins[0] . $pluginDir . DS;
+	}
+
+/**
+ * Find the path that a theme is on.  Search through the defined theme paths.
+ *
+ * @param string $theme lower_cased theme name to find the path of.
+ * @return string full path to the theme.
+ */
+	function themePath($theme) {
+		$_this =& App::getInstance();
+		$themeDir = 'themed' . DS . Inflector::underscore($theme);
+		for ($i = 0, $length = count($_this->views); $i < $length; $i++) {
+			if (is_dir($_this->views[$i] . $themeDir)) {
+				return $_this->views[$i] . $themeDir . DS ;
+			}
+		}
+		return $_this->views[0] . $themeDir . DS;
+	}
+
+/**
+ * Returns a key/value list of all paths where core libs are found.
+ * Passing $type only returns the values for a given value of $key.
+ *
+ * @param string $type valid values are: 'model', 'behavior', 'controller', 'component',
+ *    'view', 'helper', 'datasource', 'libs', and 'cake'
+ * @return array numeric keyed array of core lib paths
+ * @access public
+ */
+	function core($type = null) {
+		static $paths = false;
+		if ($paths === false) {
+			$paths = Cache::read('core_paths', '_cake_core_');
+		}
+		if (!$paths) {
+			$paths = array();
+			$libs = dirname(__FILE__) . DS;
+			$cake = dirname($libs) . DS;
+			$path = dirname($cake) . DS;
+
+			$paths['cake'][] = $cake;
+			$paths['libs'][] = $libs;
+			$paths['models'][] = $libs . 'model' . DS;
+			$paths['datasources'][] = $libs . 'model' . DS . 'datasources' . DS;
+			$paths['behaviors'][] = $libs . 'model' . DS . 'behaviors' . DS;
+			$paths['controllers'][] = $libs . 'controller' . DS;
+			$paths['components'][] = $libs . 'controller' . DS . 'components' . DS;
+			$paths['views'][] = $libs . 'view' . DS;
+			$paths['helpers'][] = $libs . 'view' . DS . 'helpers' . DS;
+			$paths['plugins'][] = $path . 'plugins' . DS;
+			$paths['vendors'][] = $path . 'vendors' . DS;
+			$paths['shells'][] = $cake . 'console' . DS . 'libs' . DS;
+
+			Cache::write('core_paths', array_filter($paths), '_cake_core_');
+		}
+		if ($type && isset($paths[$type])) {
+			return $paths[$type];
+		}
+		return $paths;
+	}
+
+/**
+ * Returns an array of objects of the given type.
+ *
+ * Example usage:
+ *
+ * `App::objects('plugin');` returns `array('DebugKit', 'Blog', 'User');`
+ *
+ * @param string $type Type of object, i.e. 'model', 'controller', 'helper', or 'plugin'
+ * @param mixed $path Optional Scan only the path given. If null, paths for the chosen
+ *   type will be used.
+ * @param boolean $cache Set to false to rescan objects of the chosen type. Defaults to true.
+ * @return mixed Either false on incorrect / miss.  Or an array of found objects.
+ * @access public
+ */
+	function objects($type, $path = null, $cache = true) {
+		$objects = array();
+		$extension = false;
+		$name = $type;
+
+		if ($type === 'file' && !$path) {
+			return false;
+		} elseif ($type === 'file') {
+			$extension = true;
+			$name = $type . str_replace(DS, '', $path);
+		}
+		$_this =& App::getInstance();
+
+		if (empty($_this->__objects) && $cache === true) {
+			$_this->__objects = Cache::read('object_map', '_cake_core_');
+		}
+
+		if (!isset($_this->__objects[$name]) || $cache !== true) {
+			$types = $_this->types;
+
+			if (!isset($types[$type])) {
+				return false;
+			}
+			$objects = array();
+
+			if (empty($path)) {
+				$path = $_this->{"{$type}s"};
+				if (isset($types[$type]['core']) && $types[$type]['core'] === false) {
+					array_pop($path);
+				}
+			}
+			$items = array();
+
+			foreach ((array)$path as $dir) {
+				if ($dir != APP) {
+					$items = $_this->__list($dir, $types[$type]['suffix'], $extension);
+					$objects = array_merge($items, array_diff($objects, $items));
+				}
+			}
+
+			if ($type !== 'file') {
+				foreach ($objects as $key => $value) {
+					$objects[$key] = Inflector::camelize($value);
+				}
+			}
+
+			if ($cache === true) {
+				$_this->__resetCache(true);
+			}
+			$_this->__objects[$name] = $objects;
+		}
+
+		return $_this->__objects[$name];
+	}
+
+/**
+ * Finds classes based on $name or specific file(s) to search.  Calling App::import() will
+ * not construct any classes contained in the files. It will only find and require() the file.
+ *
+ * @link          http://book.cakephp.org/view/934/Using-App-import
+ * @param mixed $type The type of Class if passed as a string, or all params can be passed as
+ *                    an single array to $type,
+ * @param string $name Name of the Class or a unique name for the file
+ * @param mixed $parent boolean true if Class Parent should be searched, accepts key => value
+ *              array('parent' => $parent ,'file' => $file, 'search' => $search, 'ext' => '$ext');
+ *              $ext allows setting the extension of the file name
+ *              based on Inflector::underscore($name) . ".$ext";
+ * @param array $search paths to search for files, array('path 1', 'path 2', 'path 3');
+ * @param string $file full name of the file to search for including extension
+ * @param boolean $return, return the loaded file, the file must have a return
+ *                         statement in it to work: return $variable;
+ * @return boolean true if Class is already in memory or if file is found and loaded, false if not
+ * @access public
+ */
+	function import($type = null, $name = null, $parent = true, $search = array(), $file = null, $return = false) {
+		$plugin = $directory = null;
+
+		if (is_array($type)) {
+			extract($type, EXTR_OVERWRITE);
+		}
+
+		if (is_array($parent)) {
+			extract($parent, EXTR_OVERWRITE);
+		}
+
+		if ($name === null && $file === null) {
+			$name = $type;
+			$type = 'Core';
+		} elseif ($name === null) {
+			$type = 'File';
+		}
+
+		if (is_array($name)) {
+			foreach ($name as $class) {
+				$tempType = $type;
+				$plugin = null;
+
+				if (strpos($class, '.') !== false) {
+					$value = explode('.', $class);
+					$count = count($value);
+
+					if ($count > 2) {
+						$tempType = $value[0];
+						$plugin = $value[1] . '.';
+						$class = $value[2];
+					} elseif ($count === 2 && ($type === 'Core' || $type === 'File')) {
+						$tempType = $value[0];
+						$class = $value[1];
+					} else {
+						$plugin = $value[0] . '.';
+						$class = $value[1];
+					}
+				}
+
+				if (!App::import($tempType, $plugin . $class, $parent)) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		if ($name != null && strpos($name, '.') !== false) {
+			list($plugin, $name) = explode('.', $name);
+			$plugin = Inflector::camelize($plugin);
+		}
+		$_this =& App::getInstance();
+		$_this->return = $return;
+
+		if (isset($ext)) {
+			$file = Inflector::underscore($name) . ".{$ext}";
+		}
+		$ext = $_this->__settings($type, $plugin, $parent);
+		if ($name != null && !class_exists($name . $ext['class'])) {
+			if ($load = $_this->__mapped($name . $ext['class'], $type, $plugin)) {
+				if ($_this->__load($load)) {
+					$_this->__overload($type, $name . $ext['class'], $parent);
+
+					if ($_this->return) {
+						return include($load);
+					}
+					return true;
+				} else {
+					$_this->__remove($name . $ext['class'], $type, $plugin);
+					$_this->__resetCache(true);
+				}
+			}
+			if (!empty($search)) {
+				$_this->search = $search;
+			} elseif ($plugin) {
+				$_this->search = $_this->__paths('plugin');
+			} else {
+				$_this->search = $_this->__paths($type);
+			}
+			$find = $file;
+
+			if ($find === null) {
+				$find = Inflector::underscore($name . $ext['suffix']).'.php';
+
+				if ($plugin) {
+					$paths = $_this->search;
+					foreach ($paths as $key => $value) {
+						$_this->search[$key] = $value . $ext['path'];
+					}
+				}
+			}
+
+			if (strtolower($type) !== 'vendor' && empty($search) && $_this->__load($file)) {
+				$directory = false;
+			} else {
+				$file = $find;
+				$directory = $_this->__find($find, true);
+			}
+
+			if ($directory !== null) {
+				$_this->__resetCache(true);
+				$_this->__map($directory . $file, $name . $ext['class'], $type, $plugin);
+				$_this->__overload($type, $name . $ext['class'], $parent);
+
+				if ($_this->return) {
+					return include($directory . $file);
+				}
+				return true;
+			}
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Returns a single instance of App.
+ *
+ * @return object
+ * @access public
+ */
+	function &getInstance() {
+		static $instance = array();
+		if (!$instance) {
+			$instance[0] =& new App();
+			$instance[0]->__map = (array)Cache::read('file_map', '_cake_core_');
+		}
+		return $instance[0];
+	}
+
+/**
+ * Locates the $file in $__paths, searches recursively.
+ *
+ * @param string $file full file name
+ * @param boolean $recursive search $__paths recursively
+ * @return mixed boolean on fail, $file directory path on success
+ * @access private
+ */
+	function __find($file, $recursive = true) {
+		static $appPath = false;
+
+		if (empty($this->search)) {
+			return null;
+		} elseif (is_string($this->search)) {
+			$this->search = array($this->search);
+		}
+
+		if (empty($this->__paths)) {
+			$this->__paths = Cache::read('dir_map', '_cake_core_');
+		}
+
+		foreach ($this->search as $path) {
+			if ($appPath === false) {
+				$appPath = rtrim(APP, DS);
+			}
+			$path = rtrim($path, DS);
+
+			if ($path === $appPath) {
+				$recursive = false;
+			}
+			if ($recursive === false) {
+				if ($this->__load($path . DS . $file)) {
+					return $path . DS;
+				}
+				continue;
+			}
+
+			if (!isset($this->__paths[$path])) {
+				if (!class_exists('Folder')) {
+					require LIBS . 'folder.php';
+				}
+				$Folder =& new Folder();
+				$directories = $Folder->tree($path, array('.svn', '.git', 'CVS', 'tests', 'templates'), 'dir');
+				sort($directories);
+				$this->__paths[$path] = $directories;
+			}
+
+			foreach ($this->__paths[$path] as $directory) {
+				if ($this->__load($directory . DS . $file)) {
+					return $directory . DS;
+				}
+			}
+		}
+		return null;
+	}
+
+/**
+ * Attempts to load $file.
+ *
+ * @param string $file full path to file including file name
+ * @return boolean
+ * @access private
+ */
+	function __load($file) {
+		if (empty($file)) {
+			return false;
+		}
+		if (!$this->return && isset($this->__loaded[$file])) {
+			return true;
+		}
+		if (file_exists($file)) {
+			if (!$this->return) {
+				require($file);
+				$this->__loaded[$file] = true;
+			}
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Maps the $name to the $file.
+ *
+ * @param string $file full path to file
+ * @param string $name unique name for this map
+ * @param string $type type object being mapped
+ * @param string $plugin camelized if object is from a plugin, the name of the plugin
+ * @return void
+ * @access private
+ */
+	function __map($file, $name, $type, $plugin) {
+		if ($plugin) {
+			$this->__map['Plugin'][$plugin][$type][$name] = $file;
+		} else {
+			$this->__map[$type][$name] = $file;
+		}
+	}
+
+/**
+ * Returns a file's complete path.
+ *
+ * @param string $name unique name
+ * @param string $type type object
+ * @param string $plugin camelized if object is from a plugin, the name of the plugin
+ * @return mixed, file path if found, false otherwise
+ * @access private
+ */
+	function __mapped($name, $type, $plugin) {
+		if ($plugin) {
+			if (isset($this->__map['Plugin'][$plugin][$type]) && isset($this->__map['Plugin'][$plugin][$type][$name])) {
+				return $this->__map['Plugin'][$plugin][$type][$name];
+			}
+			return false;
+		}
+
+		if (isset($this->__map[$type]) && isset($this->__map[$type][$name])) {
+			return $this->__map[$type][$name];
+		}
+		return false;
+	}
+
+/**
+ * Used to overload objects as needed.
+ *
+ * @param string $type Model or Helper
+ * @param string $name Class name to overload
+ * @access private
+ */
+	function __overload($type, $name, $parent) {
+		if (($type === 'Model' || $type === 'Helper') && $parent !== false) {
+			Overloadable::overload($name);
+		}
+	}
+
+/**
+ * Loads parent classes based on $type.
+ * Returns a prefix or suffix needed for loading files.
+ *
+ * @param string $type type of object
+ * @param string $plugin camelized name of plugin
+ * @param boolean $parent false will not attempt to load parent
+ * @return array
+ * @access private
+ */
+	function __settings($type, $plugin, $parent) {
+		if (!$parent) {
+			return array('class' => null, 'suffix' => null, 'path' => null);
+		}
+
+		if ($plugin) {
+			$pluginPath = Inflector::underscore($plugin);
+		}
+		$path = null;
+		$load = strtolower($type);
+
+		switch ($load) {
+			case 'model':
+				if (!class_exists('Model')) {
+					require LIBS . 'model' . DS . 'model.php';
+				}
+				if (!class_exists('AppModel')) {
+					App::import($type, 'AppModel', false);
+				}
+				if ($plugin) {
+					if (!class_exists($plugin . 'AppModel')) {
+						App::import($type, $plugin . '.' . $plugin . 'AppModel', false, array(), $pluginPath . DS . $pluginPath . '_app_model.php');
+					}
+					$path = $pluginPath . DS . 'models' . DS;
+				}
+				return array('class' => null, 'suffix' => null, 'path' => $path);
+			break;
+			case 'behavior':
+				if ($plugin) {
+					$path = $pluginPath . DS . 'models' . DS . 'behaviors' . DS;
+				}
+				return array('class' => $type, 'suffix' => null, 'path' => $path);
+			break;
+			case 'datasource':
+				if ($plugin) {
+					$path = $pluginPath . DS . 'models' . DS . 'datasources' . DS;
+				}
+				return array('class' => $type, 'suffix' => null, 'path' => $path);
+			case 'controller':
+				App::import($type, 'AppController', false);
+				if ($plugin) {
+					App::import($type, $plugin . '.' . $plugin . 'AppController', false, array(), $pluginPath . DS . $pluginPath . '_app_controller.php');
+					$path = $pluginPath . DS . 'controllers' . DS;
+				}
+				return array('class' => $type, 'suffix' => $type, 'path' => $path);
+			break;
+			case 'component':
+				if ($plugin) {
+					$path = $pluginPath . DS . 'controllers' . DS . 'components' . DS;
+				}
+				return array('class' => $type, 'suffix' => null, 'path' => $path);
+			break;
+			case 'lib':
+				if ($plugin) {
+					$path = $pluginPath . DS . 'libs' . DS;
+				}
+				return array('class' => null, 'suffix' => null, 'path' => $path);
+			break;
+			case 'view':
+				if ($plugin) {
+					$path = $pluginPath . DS . 'views' . DS;
+				}
+				return array('class' => $type, 'suffix' => null, 'path' => $path);
+			break;
+			case 'helper':
+				if (!class_exists('AppHelper')) {
+					App::import($type, 'AppHelper', false);
+				}
+				if ($plugin) {
+					$path = $pluginPath . DS . 'views' . DS . 'helpers' . DS;
+				}
+				return array('class' => $type, 'suffix' => null, 'path' => $path);
+			break;
+			case 'vendor':
+				if ($plugin) {
+					$path = $pluginPath . DS . 'vendors' . DS;
+				}
+				return array('class' => null, 'suffix' => null, 'path' => $path);
+			break;
+			default:
+				$type = $suffix = $path = null;
+			break;
+		}
+		return array('class' => null, 'suffix' => null, 'path' => null);
+	}
+
+/**
+ * Returns default search paths.
+ *
+ * @param string $type type of object to be searched
+ * @return array list of paths
+ * @access private
+ */
+	function __paths($type) {
+		$type = strtolower($type);
+		$paths = array();
+
+		if ($type === 'core') {
+			return App::core('libs');
+		}
+		if (isset($this->{$type . 's'})) {
+			return $this->{$type . 's'};
+		}
+		return $paths;
+	}
+
+/**
+ * Removes file location from map if the file has been deleted.
+ *
+ * @param string $name name of object
+ * @param string $type type of object
+ * @param string $plugin camelized name of plugin
+ * @return void
+ * @access private
+ */
+	function __remove($name, $type, $plugin) {
+		if ($plugin) {
+			unset($this->__map['Plugin'][$plugin][$type][$name]);
+		} else {
+			unset($this->__map[$type][$name]);
+		}
+	}
+
+/**
+ * Returns an array of filenames of PHP files in the given directory.
+ *
+ * @param string $path Path to scan for files
+ * @param string $suffix if false, return only directories. if string, match and return files
+ * @return array  List of directories or files in directory
+ * @access private
+ */
+	function __list($path, $suffix = false, $extension = false) {
+		if (!class_exists('Folder')) {
+			require LIBS . 'folder.php';
+		}
+		$items = array();
+		$Folder =& new Folder($path);
+		$contents = $Folder->read(false, true);
+
+		if (is_array($contents)) {
+			if (!$suffix) {
+				return $contents[0];
+			} else {
+				foreach ($contents[1] as $item) {
+					if (substr($item, - strlen($suffix)) === $suffix) {
+						if ($extension) {
+							$items[] = $item;
+						} else {
+							$items[] = substr($item, 0, strlen($item) - strlen($suffix));
+						}
+					}
+				}
+			}
+		}
+		return $items;
+	}
+	
+/**
+ * Determines if $__maps, $__objects and $__paths cache should be reset.
+ *
+ * @param boolean $reset 
+ * @return boolean
+ * @access private
+ */	
+	function __resetCache($reset = null) {
+		static $cache = array();
+		if (!$cache && $reset === true) {
+			$cache = true;	
+		}
+		return $cache;
+	}
+
+/**
+ * Object destructor.
+ *
+ * Writes cache file if changes have been made to the $__map or $__paths
+ *
+ * @return void
+ * @access private
+ */
+	function __destruct() {
+		if ($this->__resetCache() === true) {
+			$core = App::core('cake');
+			unset($this->__paths[rtrim($core[0], DS)]);
+			Cache::write('dir_map', array_filter($this->__paths), '_cake_core_');
+			Cache::write('file_map', array_filter($this->__map), '_cake_core_');
+			Cache::write('object_map', $this->__objects, '_cake_core_');
+		}
+	}
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/app_controller.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/app_controller.php
new file mode 100644
index 000000000..073c6405e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/app_controller.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Application level Controller
+ *
+ * This file is application-wide controller file. You can put all
+ * application-wide controller-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * This is a placeholder class.
+ * Create the same file in app/app_controller.php
+ *
+ * Add your application-wide methods in the class below, your controllers
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @link http://book.cakephp.org/view/957/The-App-Controller
+ */
+class AppController extends Controller {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/component.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/component.php
new file mode 100644
index 000000000..b1cb50c0d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/component.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v TBD
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Handler for Controller::$components
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @link          http://book.cakephp.org/view/993/Components
+ */
+class Component extends Object {
+
+/**
+ * Contains various controller variable information (plugin, name, base).
+ *
+ * @var object
+ * @access private
+ */
+	var $__controllerVars = array('plugin' => null, 'name' => null, 'base' => null);
+
+/**
+ * List of loaded components.
+ *
+ * @var object
+ * @access protected
+ */
+	var $_loaded = array();
+
+/**
+ * List of components attached directly to the controller, which callbacks
+ * should be executed on.
+ *
+ * @var object
+ * @access protected
+ */
+	var $_primary = array();
+
+/**
+ * Settings for loaded components.
+ *
+ * @var array
+ * @access private
+ */
+	var $__settings = array();
+
+/**
+ * Used to initialize the components for current controller.
+ *
+ * @param object $controller Controller with components to load
+ * @return void
+ * @access public
+ */
+	function init(&$controller) {
+		if (!is_array($controller->components)) {
+			return;
+		}
+		$this->__controllerVars = array(
+			'plugin' => $controller->plugin, 'name' => $controller->name,
+			'base' => $controller->base
+		);
+
+		$this->_loadComponents($controller);
+	}
+
+/**
+ * Called before the Controller::beforeFilter().
+ *
+ * @param object $controller Controller with components to initialize
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/998/MVC-Class-Access-Within-Components
+ */
+	function initialize(&$controller) {
+		foreach (array_keys($this->_loaded) as $name) {
+			$component =& $this->_loaded[$name];
+
+			if (method_exists($component,'initialize') && $component->enabled === true) {
+				$settings = array();
+				if (isset($this->__settings[$name])) {
+					$settings = $this->__settings[$name];
+				}
+				$component->initialize($controller, $settings);
+			}
+		}
+	}
+
+/**
+ * Called after the Controller::beforeFilter() and before the controller action
+ *
+ * @param object $controller Controller with components to startup
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/998/MVC-Class-Access-Within-Components
+ * @deprecated See Component::triggerCallback()
+ */
+	function startup(&$controller) {
+		$this->triggerCallback('startup', $controller);
+	}
+
+/**
+ * Called after the Controller::beforeRender(), after the view class is loaded, and before the
+ * Controller::render()
+ *
+ * @param object $controller Controller with components to beforeRender
+ * @return void
+ * @access public
+ * @deprecated See Component::triggerCallback()
+ */
+	function beforeRender(&$controller) {
+		$this->triggerCallback('beforeRender', $controller);
+	}
+
+/**
+ * Called before Controller::redirect().
+ *
+ * @param object $controller Controller with components to beforeRedirect
+ * @return void
+ * @access public
+ */
+	function beforeRedirect(&$controller, $url, $status = null, $exit = true) {
+		$response = array();
+
+		foreach ($this->_primary as $name) {
+			$component =& $this->_loaded[$name];
+
+			if ($component->enabled === true && method_exists($component, 'beforeRedirect')) {
+				$resp = $component->beforeRedirect($controller, $url, $status, $exit);
+				if ($resp === false) {
+					return false;
+				}
+				$response[] = $resp;
+			}
+		}
+		return $response;
+	}
+
+/**
+ * Called after Controller::render() and before the output is printed to the browser.
+ *
+ * @param object $controller Controller with components to shutdown
+ * @return void
+ * @access public
+ * @deprecated See Component::triggerCallback()
+ */
+	function shutdown(&$controller) {
+		$this->triggerCallback('shutdown', $controller);
+	}
+
+/**
+ * Trigger a callback on all primary components.  Will fire $callback on all components
+ * that have such a method.  You can implement and fire custom callbacks in addition to the
+ * standard ones.
+ *
+ * example use, from inside a controller:
+ *
+ * `$this->Component->triggerCallback('beforeFilter', $this);`
+ *
+ * will trigger the beforeFilter callback on all components that have implemented one. You
+ * can trigger any method in this fashion.
+ *
+ * @param Controller $controller Controller instance
+ * @param string $callback Callback to trigger.
+ * @return void
+ * @access public
+ */
+	function triggerCallback($callback, &$controller) {
+		foreach ($this->_primary as $name) {
+			$component =& $this->_loaded[$name];
+			if (method_exists($component, $callback) && $component->enabled === true) {
+				$component->{$callback}($controller);
+			}
+		}
+	}
+
+/**
+ * Loads components used by this component.
+ *
+ * @param object $object Object with a Components array
+ * @param object $parent the parent of the current object
+ * @return void
+ * @access protected
+ */
+	function _loadComponents(&$object, $parent = null) {
+		$base = $this->__controllerVars['base'];
+		$normal = Set::normalize($object->components);
+		foreach ((array)$normal as $component => $config) {
+			$plugin = isset($this->__controllerVars['plugin']) ? $this->__controllerVars['plugin'] . '.' : null;
+			list($plugin, $component) = pluginSplit($component, true, $plugin);
+			$componentCn = $component . 'Component';
+
+			if (!class_exists($componentCn)) {
+				if (is_null($plugin) || !App::import('Component', $plugin . $component)) {
+					if (!App::import('Component', $component)) {
+						$this->cakeError('missingComponentFile', array(array(
+							'className' => $this->__controllerVars['name'],
+							'component' => $component,
+							'file' => Inflector::underscore($component) . '.php',
+							'base' => $base,
+							'code' => 500
+						)));
+						return false;
+					}
+				}
+
+				if (!class_exists($componentCn)) {
+					$this->cakeError('missingComponentClass', array(array(
+						'className' => $this->__controllerVars['name'],
+						'component' => $component,
+						'file' => Inflector::underscore($component) . '.php',
+						'base' => $base,
+						'code' => 500
+					)));
+					return false;
+				}
+			}
+
+			if ($parent === null) {
+				$this->_primary[] = $component;
+			}
+
+			if (isset($this->_loaded[$component])) {
+				$object->{$component} =& $this->_loaded[$component];
+
+				if (!empty($config) && isset($this->__settings[$component])) {
+					$this->__settings[$component] = array_merge($this->__settings[$component], $config);
+				} elseif (!empty($config)) {
+					$this->__settings[$component] = $config;
+				}
+			} else {
+				if ($componentCn === 'SessionComponent') {
+					$object->{$component} =& new $componentCn($base);
+				} else {
+					if (PHP5) {
+						$object->{$component} = new $componentCn();
+					} else {
+						$object->{$component} =& new $componentCn();
+					}
+				}
+				$object->{$component}->enabled = true;
+				$this->_loaded[$component] =& $object->{$component};
+				if (!empty($config)) {
+					$this->__settings[$component] = $config;
+				}
+			}
+
+			if (isset($object->{$component}->components) && is_array($object->{$component}->components) && (!isset($object->{$component}->{$parent}))) {
+				$this->_loadComponents($object->{$component}, $component);
+			}
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/acl.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/acl.php
new file mode 100644
index 000000000..2e5407739
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/acl.php
@@ -0,0 +1,638 @@
+<?php
+/**
+ * Access Control List factory class.
+ *
+ * Permissions system.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Access Control List factory class.
+ *
+ * Uses a strategy pattern to allow custom ACL implementations to be used with the same component interface.
+ * You can define by changing `Configure::write('Acl.classname', 'DbAcl');` in your core.php. Concrete ACL
+ * implementations should extend `AclBase` and implement the methods it defines.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @link http://book.cakephp.org/view/1242/Access-Control-Lists
+ */
+class AclComponent extends Object {
+
+/**
+ * Instance of an ACL class
+ *
+ * @var object
+ * @access protected
+ */
+	var $_Instance = null;
+
+/**
+ * Constructor. Will return an instance of the correct ACL class as defined in `Configure::read('Acl.classname')`
+ *
+ */
+	function __construct() {
+		$name = Inflector::camelize(strtolower(Configure::read('Acl.classname')));
+		if (!class_exists($name)) {
+			if (App::import('Component', $name)) {
+				list($plugin, $name) = pluginSplit($name);
+				$name .= 'Component';
+			} else {
+				trigger_error(sprintf(__('Could not find %s.', true), $name), E_USER_WARNING);
+			}
+		}
+		$this->_Instance =& new $name();
+		$this->_Instance->initialize($this);
+	}
+
+/**
+ * Startup is not used
+ *
+ * @param object $controller Controller using this component
+ * @return boolean Proceed with component usage (true), or fail (false)
+ * @access public
+ */
+	function startup(&$controller) {
+		return true;
+	}
+
+/**
+ * Empty class defintion, to be overridden in subclasses.
+ *
+ * @access protected
+ */
+	function _initACL() {
+	}
+
+/**
+ * Pass-thru function for ACL check instance.  Check methods
+ * are used to check whether or not an ARO can access an ACO
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ */
+	function check($aro, $aco, $action = "*") {
+		return $this->_Instance->check($aro, $aco, $action);
+	}
+
+/**
+ * Pass-thru function for ACL allow instance. Allow methods
+ * are used to grant an ARO access to an ACO.
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ */
+	function allow($aro, $aco, $action = "*") {
+		return $this->_Instance->allow($aro, $aco, $action);
+	}
+
+/**
+ * Pass-thru function for ACL deny instance. Deny methods
+ * are used to remove permission from an ARO to access an ACO.
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ */
+	function deny($aro, $aco, $action = "*") {
+		return $this->_Instance->deny($aro, $aco, $action);
+	}
+
+/**
+ * Pass-thru function for ACL inherit instance. Inherit methods
+ * modify the permission for an ARO to be that of its parent object.
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ */
+	function inherit($aro, $aco, $action = "*") {
+		return $this->_Instance->inherit($aro, $aco, $action);
+	}
+
+/**
+ * Pass-thru function for ACL grant instance. An alias for AclComponent::allow()
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ */
+	function grant($aro, $aco, $action = "*") {
+		return $this->_Instance->grant($aro, $aco, $action);
+	}
+
+/**
+ * Pass-thru function for ACL grant instance. An alias for AclComponent::deny()
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ */
+	function revoke($aro, $aco, $action = "*") {
+		return $this->_Instance->revoke($aro, $aco, $action);
+	}
+}
+
+/**
+ * Access Control List abstract class. Not to be instantiated.
+ * Subclasses of this class are used by AclComponent to perform ACL checks in Cake.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @abstract
+ */
+class AclBase extends Object {
+
+/**
+ * This class should never be instantiated, just subclassed.
+ *
+ */
+	function __construct() {
+		if (strcasecmp(get_class($this), "AclBase") == 0 || !is_subclass_of($this, "AclBase")) {
+			trigger_error(__("[acl_base] The AclBase class constructor has been called, or the class was instantiated. This class must remain abstract. Please refer to the Cake docs for ACL configuration.", true), E_USER_ERROR);
+			return NULL;
+		}
+	}
+
+/**
+ * Empty method to be overridden in subclasses
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @access public
+ */
+	function check($aro, $aco, $action = "*") {
+	}
+
+/**
+ * Empty method to be overridden in subclasses
+ *
+ * @param object $component Component
+ * @access public
+ */
+	function initialize(&$component) {
+	}
+}
+
+/**
+ * DbAcl implements an ACL control system in the database.  ARO's and ACO's are 
+ * structured into trees and a linking table is used to define permissions.  You 
+ * can install the schema for DbAcl with the Schema Shell.
+ *
+ * `$aco` and `$aro` parameters can be slash delimited paths to tree nodes.
+ *
+ * eg. `controllers/Users/edit`
+ *
+ * Would point to a tree structure like
+ *
+ * {{{
+ *	controllers
+ *		Users
+ *			edit
+ * }}}
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class DbAcl extends AclBase {
+
+/**
+ * Constructor
+ *
+ */
+	function __construct() {
+		parent::__construct();
+		if (!class_exists('AclNode')) {
+			require LIBS . 'model' . DS . 'db_acl.php';
+		}
+		$this->Aro =& ClassRegistry::init(array('class' => 'Aro', 'alias' => 'Aro'));
+		$this->Aco =& ClassRegistry::init(array('class' => 'Aco', 'alias' => 'Aco'));
+	}
+
+/**
+ * Initializes the containing component and sets the Aro/Aco objects to it.
+ *
+ * @param AclComponent $component
+ * @return void
+ * @access public
+ */
+	function initialize(&$component) {
+		$component->Aro =& $this->Aro;
+		$component->Aco =& $this->Aco;
+	}
+
+/**
+ * Checks if the given $aro has access to action $action in $aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $action Action (defaults to *)
+ * @return boolean Success (true if ARO has access to action in ACO, false otherwise)
+ * @access public
+ * @link http://book.cakephp.org/view/1249/Checking-Permissions-The-ACL-Component
+ */
+	function check($aro, $aco, $action = "*") {
+		if ($aro == null || $aco == null) {
+			return false;
+		}
+
+		$permKeys = $this->_getAcoKeys($this->Aro->Permission->schema());
+		$aroPath = $this->Aro->node($aro);
+		$acoPath = $this->Aco->node($aco);
+
+		if (empty($aroPath) || empty($acoPath)) {
+			trigger_error(__("DbAcl::check() - Failed ARO/ACO node lookup in permissions check.  Node references:\nAro: ", true) . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
+			return false;
+		}
+
+		if ($acoPath == null || $acoPath == array()) {
+			trigger_error(__("DbAcl::check() - Failed ACO node lookup in permissions check.  Node references:\nAro: ", true) . print_r($aro, true) . "\nAco: " . print_r($aco, true), E_USER_WARNING);
+			return false;
+		}
+
+		$aroNode = $aroPath[0];
+		$acoNode = $acoPath[0];
+
+		if ($action != '*' && !in_array('_' . $action, $permKeys)) {
+			trigger_error(sprintf(__("ACO permissions key %s does not exist in DbAcl::check()", true), $action), E_USER_NOTICE);
+			return false;
+		}
+
+		$inherited = array();
+		$acoIDs = Set::extract($acoPath, '{n}.' . $this->Aco->alias . '.id');
+
+		$count = count($aroPath);
+		for ($i = 0 ; $i < $count; $i++) {
+			$permAlias = $this->Aro->Permission->alias;
+
+			$perms = $this->Aro->Permission->find('all', array(
+				'conditions' => array(
+					"{$permAlias}.aro_id" => $aroPath[$i][$this->Aro->alias]['id'],
+					"{$permAlias}.aco_id" => $acoIDs
+				),
+				'order' => array($this->Aco->alias . '.lft' => 'desc'),
+				'recursive' => 0
+			));
+
+			if (empty($perms)) {
+				continue;
+			} else {
+				$perms = Set::extract($perms, '{n}.' . $this->Aro->Permission->alias);
+				foreach ($perms as $perm) {
+					if ($action == '*') {
+
+						foreach ($permKeys as $key) {
+							if (!empty($perm)) {
+								if ($perm[$key] == -1) {
+									return false;
+								} elseif ($perm[$key] == 1) {
+									$inherited[$key] = 1;
+								}
+							}
+						}
+
+						if (count($inherited) === count($permKeys)) {
+							return true;
+						}
+					} else {
+						switch ($perm['_' . $action]) {
+							case -1:
+								return false;
+							case 0:
+								continue;
+							break;
+							case 1:
+								return true;
+							break;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+/**
+ * Allow $aro to have access to action $actions in $aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $actions Action (defaults to *)
+ * @param integer $value Value to indicate access type (1 to give access, -1 to deny, 0 to inherit)
+ * @return boolean Success
+ * @access public
+ * @link http://book.cakephp.org/view/1248/Assigning-Permissions
+ */
+	function allow($aro, $aco, $actions = "*", $value = 1) {
+		$perms = $this->getAclLink($aro, $aco);
+		$permKeys = $this->_getAcoKeys($this->Aro->Permission->schema());
+		$save = array();
+
+		if ($perms == false) {
+			trigger_error(__('DbAcl::allow() - Invalid node', true), E_USER_WARNING);
+			return false;
+		}
+		if (isset($perms[0])) {
+			$save = $perms[0][$this->Aro->Permission->alias];
+		}
+
+		if ($actions == "*") {
+			$permKeys = $this->_getAcoKeys($this->Aro->Permission->schema());
+			$save = array_combine($permKeys, array_pad(array(), count($permKeys), $value));
+		} else {
+			if (!is_array($actions)) {
+				$actions = array('_' . $actions);
+			}
+			if (is_array($actions)) {
+				foreach ($actions as $action) {
+					if ($action{0} != '_') {
+						$action = '_' . $action;
+					}
+					if (in_array($action, $permKeys)) {
+						$save[$action] = $value;
+					}
+				}
+			}
+		}
+		list($save['aro_id'], $save['aco_id']) = array($perms['aro'], $perms['aco']);
+
+		if ($perms['link'] != null && !empty($perms['link'])) {
+			$save['id'] = $perms['link'][0][$this->Aro->Permission->alias]['id'];
+		} else {
+			unset($save['id']);
+			$this->Aro->Permission->id = null;
+		}
+		return ($this->Aro->Permission->save($save) !== false);
+	}
+
+/**
+ * Deny access for $aro to action $action in $aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $actions Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ * @link http://book.cakephp.org/view/1248/Assigning-Permissions
+ */
+	function deny($aro, $aco, $action = "*") {
+		return $this->allow($aro, $aco, $action, -1);
+	}
+
+/**
+ * Let access for $aro to action $action in $aco be inherited
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $actions Action (defaults to *)
+ * @return boolean Success
+ * @access public
+ */
+	function inherit($aro, $aco, $action = "*") {
+		return $this->allow($aro, $aco, $action, 0);
+	}
+
+/**
+ * Allow $aro to have access to action $actions in $aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $actions Action (defaults to *)
+ * @return boolean Success
+ * @see allow()
+ * @access public
+ */
+	function grant($aro, $aco, $action = "*") {
+		return $this->allow($aro, $aco, $action);
+	}
+
+/**
+ * Deny access for $aro to action $action in $aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @param string $actions Action (defaults to *)
+ * @return boolean Success
+ * @see deny()
+ * @access public
+ */
+	function revoke($aro, $aco, $action = "*") {
+		return $this->deny($aro, $aco, $action);
+	}
+
+/**
+ * Get an array of access-control links between the given Aro and Aco
+ *
+ * @param string $aro ARO The requesting object identifier.
+ * @param string $aco ACO The controlled object identifier.
+ * @return array Indexed array with: 'aro', 'aco' and 'link'
+ * @access public
+ */
+	function getAclLink($aro, $aco) {
+		$obj = array();
+		$obj['Aro'] = $this->Aro->node($aro);
+		$obj['Aco'] = $this->Aco->node($aco);
+
+		if (empty($obj['Aro']) || empty($obj['Aco'])) {
+			return false;
+		}
+
+		return array(
+			'aro' => Set::extract($obj, 'Aro.0.'.$this->Aro->alias.'.id'),
+			'aco'  => Set::extract($obj, 'Aco.0.'.$this->Aco->alias.'.id'),
+			'link' => $this->Aro->Permission->find('all', array('conditions' => array(
+				$this->Aro->Permission->alias . '.aro_id' => Set::extract($obj, 'Aro.0.'.$this->Aro->alias.'.id'),
+				$this->Aro->Permission->alias . '.aco_id' => Set::extract($obj, 'Aco.0.'.$this->Aco->alias.'.id')
+			)))
+		);
+	}
+
+/**
+ * Get the keys used in an ACO
+ *
+ * @param array $keys Permission model info
+ * @return array ACO keys
+ * @access protected
+ */
+	function _getAcoKeys($keys) {
+		$newKeys = array();
+		$keys = array_keys($keys);
+		foreach ($keys as $key) {
+			if (!in_array($key, array('id', 'aro_id', 'aco_id'))) {
+				$newKeys[] = $key;
+			}
+		}
+		return $newKeys;
+	}
+}
+
+/**
+ * IniAcl implements an access control system using an INI file.  An example 
+ * of the ini file used can be found in /config/acl.ini.php.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.iniacl
+ */
+class IniAcl extends AclBase {
+
+/**
+ * Array with configuration, parsed from ini file
+ *
+ * @var array
+ * @access public
+ */
+	var $config = null;
+
+/**
+ * The constructor must be overridden, as AclBase is abstract.
+ *
+ */
+	function __construct() {
+	}
+
+/**
+ * Main ACL check function. Checks to see if the ARO (access request object) has access to the 
+ * ACO (access control object).Looks at the acl.ini.php file for permissions 
+ * (see instructions in /config/acl.ini.php).
+ *
+ * @param string $aro ARO
+ * @param string $aco ACO
+ * @param string $aco_action Action
+ * @return boolean Success
+ * @access public
+ */
+	function check($aro, $aco, $aco_action = null) {
+		if ($this->config == null) {
+			$this->config = $this->readConfigFile(CONFIGS . 'acl.ini.php');
+		}
+		$aclConfig = $this->config;
+
+		if (isset($aclConfig[$aro]['deny'])) {
+			$userDenies = $this->arrayTrim(explode(",", $aclConfig[$aro]['deny']));
+
+			if (array_search($aco, $userDenies)) {
+				return false;
+			}
+		}
+
+		if (isset($aclConfig[$aro]['allow'])) {
+			$userAllows = $this->arrayTrim(explode(",", $aclConfig[$aro]['allow']));
+
+			if (array_search($aco, $userAllows)) {
+				return true;
+			}
+		}
+
+		if (isset($aclConfig[$aro]['groups'])) {
+			$userGroups = $this->arrayTrim(explode(",", $aclConfig[$aro]['groups']));
+
+			foreach ($userGroups as $group) {
+				if (array_key_exists($group, $aclConfig)) {
+					if (isset($aclConfig[$group]['deny'])) {
+						$groupDenies=$this->arrayTrim(explode(",", $aclConfig[$group]['deny']));
+
+						if (array_search($aco, $groupDenies)) {
+							return false;
+						}
+					}
+
+					if (isset($aclConfig[$group]['allow'])) {
+						$groupAllows = $this->arrayTrim(explode(",", $aclConfig[$group]['allow']));
+
+						if (array_search($aco, $groupAllows)) {
+							return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+
+/**
+ * Parses an INI file and returns an array that reflects the INI file's section structure. Double-quote friendly.
+ *
+ * @param string $fileName File
+ * @return array INI section structure
+ * @access public
+ */
+	function readConfigFile($fileName) {
+		$fileLineArray = file($fileName);
+
+		foreach ($fileLineArray as $fileLine) {
+			$dataLine = trim($fileLine);
+			$firstChar = substr($dataLine, 0, 1);
+
+			if ($firstChar != ';' && $dataLine != '') {
+				if ($firstChar == '[' && substr($dataLine, -1, 1) == ']') {
+					$sectionName = preg_replace('/[\[\]]/', '', $dataLine);
+				} else {
+					$delimiter = strpos($dataLine, '=');
+
+					if ($delimiter > 0) {
+						$key = strtolower(trim(substr($dataLine, 0, $delimiter)));
+						$value = trim(substr($dataLine, $delimiter + 1));
+
+						if (substr($value, 0, 1) == '"' && substr($value, -1) == '"') {
+							$value = substr($value, 1, -1);
+						}
+
+						$iniSetting[$sectionName][$key]=stripcslashes($value);
+					} else {
+						if (!isset($sectionName)) {
+							$sectionName = '';
+						}
+
+						$iniSetting[$sectionName][strtolower(trim($dataLine))]='';
+					}
+				}
+			}
+		}
+
+		return $iniSetting;
+	}
+
+/**
+ * Removes trailing spaces on all array elements (to prepare for searching)
+ *
+ * @param array $array Array to trim
+ * @return array Trimmed array
+ * @access public
+ */
+	function arrayTrim($array) {
+		foreach ($array as $key => $value) {
+			$array[$key] = trim($value);
+		}
+		array_unshift($array, "");
+		return $array;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/auth.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/auth.php
new file mode 100644
index 000000000..b619bd814
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/auth.php
@@ -0,0 +1,959 @@
+<?php
+/**
+ * Authentication component
+ *
+ * Manages user logins and permissions.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+App::import('Core', array('Router', 'Security'), false);
+
+/**
+ * Authentication control component class
+ *
+ * Binds access control with user authentication and session management.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @link http://book.cakephp.org/view/1250/Authentication
+ */
+class AuthComponent extends Object {
+
+/**
+ * Maintains current user login state.
+ *
+ * @var boolean
+ * @access private
+ */
+	var $_loggedIn = false;
+
+/**
+ * Other components utilized by AuthComponent
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Session', 'RequestHandler');
+
+/**
+ * A reference to the object used for authentication
+ *
+ * @var object
+ * @access public
+ * @link http://book.cakephp.org/view/1278/authenticate
+ */
+	var $authenticate = null;
+
+/**
+ * The name of the component to use for Authorization or set this to
+ * 'controller' will validate against Controller::isAuthorized()
+ * 'actions' will validate Controller::action against an AclComponent::check()
+ * 'crud' will validate mapActions against an AclComponent::check()
+ * array('model'=> 'name'); will validate mapActions against model $name::isAuthorized(user, controller, mapAction)
+ * 'object' will validate Controller::action against object::isAuthorized(user, controller, action)
+ *
+ * @var mixed
+ * @access public
+ * @link http://book.cakephp.org/view/1275/authorize
+ */
+	var $authorize = false;
+
+/**
+ * The name of an optional view element to render when an Ajax request is made
+ * with an invalid or expired session
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1277/ajaxLogin
+ */
+	var $ajaxLogin = null;
+
+/**
+ * The name of the element used for SessionComponent::setFlash
+ *
+ * @var string
+ * @access public
+ */
+	var $flashElement = 'default';
+
+/**
+ * The name of the model that represents users which will be authenticated.  Defaults to 'User'.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1266/userModel
+ */
+	var $userModel = 'User';
+
+/**
+ * Additional query conditions to use when looking up and authenticating users,
+ * i.e. array('User.is_active' => 1).
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1268/userScope
+ */
+	var $userScope = array();
+
+/**
+ * Allows you to specify non-default login name and password fields used in
+ * $userModel, i.e. array('username' => 'login_name', 'password' => 'passwd').
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1267/fields
+ */
+	var $fields = array('username' => 'username', 'password' => 'password');
+
+/**
+ * The session key name where the record of the current user is stored.  If
+ * unspecified, it will be "Auth.{$userModel name}".
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1276/sessionKey
+ */
+	var $sessionKey = null;
+
+/**
+ * If using action-based access control, this defines how the paths to action
+ * ACO nodes is computed.  If, for example, all controller nodes are nested
+ * under an ACO node named 'Controllers', $actionPath should be set to
+ * "Controllers/".
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1279/actionPath
+ */
+	var $actionPath = null;
+
+/**
+ * A URL (defined as a string or array) to the controller action that handles
+ * logins.
+ *
+ * @var mixed
+ * @access public
+ * @link http://book.cakephp.org/view/1269/loginAction
+ */
+	var $loginAction = null;
+
+/**
+ * Normally, if a user is redirected to the $loginAction page, the location they
+ * were redirected from will be stored in the session so that they can be
+ * redirected back after a successful login.  If this session value is not
+ * set, the user will be redirected to the page specified in $loginRedirect.
+ *
+ * @var mixed
+ * @access public
+ * @link http://book.cakephp.org/view/1270/loginRedirect
+ */
+	var $loginRedirect = null;
+
+/**
+ * The default action to redirect to after the user is logged out.  While AuthComponent does
+ * not handle post-logout redirection, a redirect URL will be returned from AuthComponent::logout().
+ * Defaults to AuthComponent::$loginAction.
+ *
+ * @var mixed
+ * @access public
+ * @see AuthComponent::$loginAction
+ * @see AuthComponent::logout()
+ * @link http://book.cakephp.org/view/1271/logoutRedirect
+ */
+	var $logoutRedirect = null;
+
+/**
+ * The name of model or model object, or any other object has an isAuthorized method.
+ *
+ * @var string
+ * @access public
+ */
+	var $object = null;
+
+/**
+ * Error to display when user login fails.  For security purposes, only one error is used for all
+ * login failures, so as not to expose information on why the login failed.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1272/loginError
+ */
+	var $loginError = null;
+
+/**
+ * Error to display when user attempts to access an object or action to which they do not have
+ * acccess.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1273/authError
+ */
+	var $authError = null;
+
+/**
+ * Determines whether AuthComponent will automatically redirect and exit if login is successful.
+ *
+ * @var boolean
+ * @access public
+ * @link http://book.cakephp.org/view/1274/autoRedirect
+ */
+	var $autoRedirect = true;
+
+/**
+ * Controller actions for which user validation is not required.
+ *
+ * @var array
+ * @access public
+ * @see AuthComponent::allow()
+ * @link http://book.cakephp.org/view/1251/Setting-Auth-Component-Variables
+ */
+	var $allowedActions = array();
+
+/**
+ * Maps actions to CRUD operations.  Used for controller-based validation ($validate = 'controller').
+ *
+ * @var array
+ * @access public
+ * @see AuthComponent::mapActions()
+ */
+	var $actionMap = array(
+		'index'		=> 'read',
+		'add'		=> 'create',
+		'edit'		=> 'update',
+		'view'		=> 'read',
+		'remove'	=> 'delete'
+	);
+
+/**
+ * Form data from Controller::$data
+ *
+ * @var array
+ * @access public
+ */
+	var $data = array();
+
+/**
+ * Parameter data from Controller::$params
+ *
+ * @var array
+ * @access public
+ */
+	var $params = array();
+
+/**
+ * Method list for bound controller
+ *
+ * @var array
+ * @access protected
+ */
+	var $_methods = array();
+
+/**
+ * Initializes AuthComponent for use in the controller
+ *
+ * @param object $controller A reference to the instantiating controller object
+ * @return void
+ * @access public
+ */
+	function initialize(&$controller, $settings = array()) {
+		$this->params = $controller->params;
+		$crud = array('create', 'read', 'update', 'delete');
+		$this->actionMap = array_merge($this->actionMap, array_combine($crud, $crud));
+		$this->_methods = $controller->methods;
+
+		$prefixes = Router::prefixes();
+		if (!empty($prefixes)) {
+			foreach ($prefixes as $prefix) {
+				$this->actionMap = array_merge($this->actionMap, array(
+					$prefix . '_index' => 'read',
+					$prefix . '_add' => 'create',
+					$prefix . '_edit' => 'update',
+					$prefix . '_view' => 'read',
+					$prefix . '_remove' => 'delete',
+					$prefix . '_create' => 'create',
+					$prefix . '_read' => 'read',
+					$prefix . '_update' => 'update',
+					$prefix . '_delete' => 'delete'
+				));
+			}
+		}
+		$this->_set($settings);
+		if (Configure::read() > 0) {
+			App::import('Debugger');
+			Debugger::checkSecurityKeys();
+		}
+	}
+
+/**
+ * Main execution method.  Handles redirecting of invalid users, and processing
+ * of login form data.
+ *
+ * @param object $controller A reference to the instantiating controller object
+ * @return boolean
+ * @access public
+ */
+	function startup(&$controller) {
+		$isErrorOrTests = (
+			strtolower($controller->name) == 'cakeerror' ||
+			(strtolower($controller->name) == 'tests' && Configure::read() > 0)
+		);
+		if ($isErrorOrTests) {
+			return true;
+		}
+
+		$methods = array_flip($controller->methods);
+		$action = strtolower($controller->params['action']);
+		$isMissingAction = (
+			$controller->scaffold === false &&
+			!isset($methods[$action])
+		);
+
+		if ($isMissingAction) {
+			return true;
+		}
+
+		if (!$this->__setDefaults()) {
+			return false;
+		}
+
+		$this->data = $controller->data = $this->hashPasswords($controller->data);
+		$url = '';
+
+		if (isset($controller->params['url']['url'])) {
+			$url = $controller->params['url']['url'];
+		}
+		$url = Router::normalize($url);
+		$loginAction = Router::normalize($this->loginAction);
+
+		$allowedActions = array_map('strtolower', $this->allowedActions);
+		$isAllowed = (
+			$this->allowedActions == array('*') ||
+			in_array($action, $allowedActions)
+		);
+
+		if ($loginAction != $url && $isAllowed) {
+			return true;
+		}
+
+		if ($loginAction == $url) {
+			$model =& $this->getModel();
+			if (empty($controller->data) || !isset($controller->data[$model->alias])) {
+				if (!$this->Session->check('Auth.redirect') && !$this->loginRedirect && env('HTTP_REFERER')) {
+					$this->Session->write('Auth.redirect', $controller->referer(null, true));
+				}
+				return false;
+			}
+
+			$isValid = !empty($controller->data[$model->alias][$this->fields['username']]) &&
+				!empty($controller->data[$model->alias][$this->fields['password']]);
+
+			if ($isValid) {
+				$username = $controller->data[$model->alias][$this->fields['username']];
+				$password = $controller->data[$model->alias][$this->fields['password']];
+
+				$data = array(
+					$model->alias . '.' . $this->fields['username'] => $username,
+					$model->alias . '.' . $this->fields['password'] => $password
+				);
+
+				if ($this->login($data)) {
+					if ($this->autoRedirect) {
+						$controller->redirect($this->redirect(), null, true);
+					}
+					return true;
+				}
+			}
+
+			$this->Session->setFlash($this->loginError, $this->flashElement, array(), 'auth');
+			$controller->data[$model->alias][$this->fields['password']] = null;
+			return false;
+		} else {
+			$user = $this->user();
+			if (!$user) {
+				if (!$this->RequestHandler->isAjax()) {
+					$this->Session->setFlash($this->authError, $this->flashElement, array(), 'auth');
+					if (!empty($controller->params['url']) && count($controller->params['url']) >= 2) {
+						$query = $controller->params['url'];
+						unset($query['url'], $query['ext']);
+						$url .= Router::queryString($query, array());
+					}
+					$this->Session->write('Auth.redirect', $url);
+					$controller->redirect($loginAction);
+					return false;
+				} elseif (!empty($this->ajaxLogin)) {
+					$controller->viewPath = 'elements';
+					echo $controller->render($this->ajaxLogin, $this->RequestHandler->ajaxLayout);
+					$this->_stop();
+					return false;
+				} else {
+					$controller->redirect(null, 403);
+				}
+			}
+		}
+
+		if (!$this->authorize) {
+			return true;
+		}
+
+		extract($this->__authType());
+		switch ($type) {
+			case 'controller':
+				$this->object =& $controller;
+			break;
+			case 'crud':
+			case 'actions':
+				if (isset($controller->Acl)) {
+					$this->Acl =& $controller->Acl;
+				} else {
+					trigger_error(__('Could not find AclComponent. Please include Acl in Controller::$components.', true), E_USER_WARNING);
+				}
+			break;
+			case 'model':
+				if (!isset($object)) {
+					$hasModel = (
+						isset($controller->{$controller->modelClass}) &&
+						is_object($controller->{$controller->modelClass})
+					);
+					$isUses = (
+						!empty($controller->uses) && isset($controller->{$controller->uses[0]}) &&
+						is_object($controller->{$controller->uses[0]})
+					);
+
+					if ($hasModel) {
+						$object = $controller->modelClass;
+					} elseif ($isUses) {
+						$object = $controller->uses[0];
+					}
+				}
+				$type = array('model' => $object);
+			break;
+		}
+
+		if ($this->isAuthorized($type, null, $user)) {
+			return true;
+		}
+
+		$this->Session->setFlash($this->authError, $this->flashElement, array(), 'auth');
+		$controller->redirect($controller->referer(), null, true);
+		return false;
+	}
+
+/**
+ * Attempts to introspect the correct values for object properties including
+ * $userModel and $sessionKey.
+ *
+ * @param object $controller A reference to the instantiating controller object
+ * @return boolean
+ * @access private
+ */
+	function __setDefaults() {
+		if (empty($this->userModel)) {
+			trigger_error(__("Could not find \$userModel. Please set AuthComponent::\$userModel in beforeFilter().", true), E_USER_WARNING);
+			return false;
+		}
+		list($plugin, $model) = pluginSplit($this->userModel);
+		$defaults = array(
+			'loginAction' => array(
+				'controller' => Inflector::underscore(Inflector::pluralize($model)),
+				'action' => 'login',
+				'plugin' => Inflector::underscore($plugin),
+			),
+			'sessionKey' => 'Auth.' . $model,
+			'logoutRedirect' => $this->loginAction,
+			'loginError' => __('Login failed. Invalid username or password.', true),
+			'authError' => __('You are not authorized to access that location.', true)
+		);
+		foreach ($defaults as $key => $value) {
+			if (empty($this->{$key})) {
+				$this->{$key} = $value;
+			}
+		}
+		return true;
+	}
+
+/**
+ * Determines whether the given user is authorized to perform an action.  The type of
+ * authorization used is based on the value of AuthComponent::$authorize or the
+ * passed $type param.
+ *
+ * Types:
+ * 'controller' will validate against Controller::isAuthorized() if controller instance is
+ * 				passed in $object
+ * 'actions' will validate Controller::action against an AclComponent::check()
+ * 'crud' will validate mapActions against an AclComponent::check()
+ * 		array('model'=> 'name'); will validate mapActions against model
+ * 		$name::isAuthorized(user, controller, mapAction)
+ * 'object' will validate Controller::action against
+ * 		object::isAuthorized(user, controller, action)
+ *
+ * @param string $type Type of authorization
+ * @param mixed $object object, model object, or model name
+ * @param mixed $user The user to check the authorization of
+ * @return boolean True if $user is authorized, otherwise false
+ * @access public
+ */
+	function isAuthorized($type = null, $object = null, $user = null) {
+		if (empty($user) && !$this->user()) {
+			return false;
+		} elseif (empty($user)) {
+			$user = $this->user();
+		}
+
+		extract($this->__authType($type));
+
+		if (!$object) {
+			$object = $this->object;
+		}
+
+		$valid = false;
+		switch ($type) {
+			case 'controller':
+				$valid = $object->isAuthorized();
+			break;
+			case 'actions':
+				$valid = $this->Acl->check($user, $this->action());
+			break;
+			case 'crud':
+				if (!isset($this->actionMap[$this->params['action']])) {
+					trigger_error(
+						sprintf(__('Auth::startup() - Attempted access of un-mapped action "%1$s" in controller "%2$s"', true), $this->params['action'], $this->params['controller']),
+						E_USER_WARNING
+					);
+				} else {
+					$valid = $this->Acl->check(
+						$user,
+						$this->action(':controller'),
+						$this->actionMap[$this->params['action']]
+					);
+				}
+			break;
+			case 'model':
+				$action = $this->params['action'];
+				if (isset($this->actionMap[$action])) {
+					$action = $this->actionMap[$action];
+				}
+				if (is_string($object)) {
+					$object = $this->getModel($object);
+				}
+			case 'object':
+				if (!isset($action)) {
+					$action = $this->action(':action');
+				}
+				if (empty($object)) {
+					trigger_error(sprintf(__('Could not find %s. Set AuthComponent::$object in beforeFilter() or pass a valid object', true), get_class($object)), E_USER_WARNING);
+					return;
+				}
+				if (method_exists($object, 'isAuthorized')) {
+					$valid = $object->isAuthorized($user, $this->action(':controller'), $action);
+				} elseif ($object) {
+					trigger_error(sprintf(__('%s::isAuthorized() is not defined.', true), get_class($object)), E_USER_WARNING);
+				}
+			break;
+			case null:
+			case false:
+				return true;
+			break;
+			default:
+				trigger_error(__('Auth::isAuthorized() - $authorize is set to an incorrect value.  Allowed settings are: "actions", "crud", "model" or null.', true), E_USER_WARNING);
+			break;
+		}
+		return $valid;
+	}
+
+/**
+ * Get authorization type
+ *
+ * @param string $auth Type of authorization
+ * @return array Associative array with: type, object
+ * @access private
+ */
+	function __authType($auth = null) {
+		if ($auth == null) {
+			$auth = $this->authorize;
+		}
+		$object = null;
+		if (is_array($auth)) {
+			$type = key($auth);
+			$object = $auth[$type];
+		} else {
+			$type = $auth;
+			return compact('type');
+		}
+		return compact('type', 'object');
+	}
+
+/**
+ * Takes a list of actions in the current controller for which authentication is not required, or
+ * no parameters to allow all actions.
+ *
+ * @param mixed $action Controller action name or array of actions
+ * @param string $action Controller action name
+ * @param string ... etc.
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1257/allow
+ */
+	function allow() {
+		$args = func_get_args();
+		if (empty($args) || $args == array('*')) {
+			$this->allowedActions = $this->_methods;
+		} else {
+			if (isset($args[0]) && is_array($args[0])) {
+				$args = $args[0];
+			}
+			$this->allowedActions = array_merge($this->allowedActions, array_map('strtolower', $args));
+		}
+	}
+
+/**
+ * Removes items from the list of allowed actions.
+ *
+ * @param mixed $action Controller action name or array of actions
+ * @param string $action Controller action name
+ * @param string ... etc.
+ * @return void
+ * @see AuthComponent::allow()
+ * @access public
+ * @link http://book.cakephp.org/view/1258/deny
+ */
+	function deny() {
+		$args = func_get_args();
+		if (isset($args[0]) && is_array($args[0])) {
+			$args = $args[0];
+		}
+		foreach ($args as $arg) {
+			$i = array_search(strtolower($arg), $this->allowedActions);
+			if (is_int($i)) {
+				unset($this->allowedActions[$i]);
+			}
+		}
+		$this->allowedActions = array_values($this->allowedActions);
+	}
+
+/**
+ * Maps action names to CRUD operations. Used for controller-based authentication.
+ *
+ * @param array $map Actions to map
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1260/mapActions
+ */
+	function mapActions($map = array()) {
+		$crud = array('create', 'read', 'update', 'delete');
+		foreach ($map as $action => $type) {
+			if (in_array($action, $crud) && is_array($type)) {
+				foreach ($type as $typedAction) {
+					$this->actionMap[$typedAction] = $action;
+				}
+			} else {
+				$this->actionMap[$action] = $type;
+			}
+		}
+	}
+
+/**
+ * Manually log-in a user with the given parameter data.  The $data provided can be any data
+ * structure used to identify a user in AuthComponent::identify().  If $data is empty or not
+ * specified, POST data from Controller::$data will be used automatically.
+ *
+ * After (if) login is successful, the user record is written to the session key specified in
+ * AuthComponent::$sessionKey.
+ *
+ * @param mixed $data User object
+ * @return boolean True on login success, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1261/login
+ */
+	function login($data = null) {
+		$this->__setDefaults();
+		$this->_loggedIn = false;
+
+		if (empty($data)) {
+			$data = $this->data;
+		}
+
+		if ($user = $this->identify($data)) {
+			$this->Session->write($this->sessionKey, $user);
+			$this->_loggedIn = true;
+		}
+		return $this->_loggedIn;
+	}
+
+/**
+ * Logs a user out, and returns the login action to redirect to.
+ *
+ * @param mixed $url Optional URL to redirect the user to after logout
+ * @return string AuthComponent::$loginAction
+ * @see AuthComponent::$loginAction
+ * @access public
+ * @link http://book.cakephp.org/view/1262/logout
+ */
+	function logout() {
+		$this->__setDefaults();
+		$this->Session->delete($this->sessionKey);
+		$this->Session->delete('Auth.redirect');
+		$this->_loggedIn = false;
+		return Router::normalize($this->logoutRedirect);
+	}
+
+/**
+ * Get the current user from the session.
+ *
+ * @param string $key field to retrive.  Leave null to get entire User record
+ * @return mixed User record. or null if no user is logged in.
+ * @access public
+ * @link http://book.cakephp.org/view/1264/user
+ */
+	function user($key = null) {
+		$this->__setDefaults();
+		if (!$this->Session->check($this->sessionKey)) {
+			return null;
+		}
+
+		if ($key == null) {
+			$model =& $this->getModel();
+			return array($model->alias => $this->Session->read($this->sessionKey));
+		} else {
+			$user = $this->Session->read($this->sessionKey);
+			if (isset($user[$key])) {
+				return $user[$key];
+			}
+			return null;
+		}
+	}
+
+/**
+ * If no parameter is passed, gets the authentication redirect URL.
+ *
+ * @param mixed $url Optional URL to write as the login redirect URL.
+ * @return string Redirect URL
+ * @access public
+ */
+	function redirect($url = null) {
+		if (!is_null($url)) {
+			$redir = $url;
+			$this->Session->write('Auth.redirect', $redir);
+		} elseif ($this->Session->check('Auth.redirect')) {
+			$redir = $this->Session->read('Auth.redirect');
+			$this->Session->delete('Auth.redirect');
+
+			if (Router::normalize($redir) == Router::normalize($this->loginAction)) {
+				$redir = $this->loginRedirect;
+			}
+		} else {
+			$redir = $this->loginRedirect;
+		}
+		return Router::normalize($redir);
+	}
+
+/**
+ * Validates a user against an abstract object.
+ *
+ * @param mixed $object  The object to validate the user against.
+ * @param mixed $user    Optional.  The identity of the user to be validated.
+ *                       Uses the current user session if none specified.  For
+ *                       valid forms of identifying users, see
+ *                       AuthComponent::identify().
+ * @param string $action Optional. The action to validate against.
+ * @see AuthComponent::identify()
+ * @return boolean True if the user validates, false otherwise.
+ * @access public
+ */
+	function validate($object, $user = null, $action = null) {
+		if (empty($user)) {
+			$user = $this->user();
+		}
+		if (empty($user)) {
+			return false;
+		}
+		return $this->Acl->check($user, $object, $action);
+	}
+
+/**
+ * Returns the path to the ACO node bound to a controller/action.
+ *
+ * @param string $action  Optional.  The controller/action path to validate the
+ *                        user against.  The current request action is used if
+ *                        none is specified.
+ * @return boolean ACO node path
+ * @access public
+ * @link http://book.cakephp.org/view/1256/action
+ */
+	function action($action = ':plugin/:controller/:action') {
+		$plugin = empty($this->params['plugin']) ? null : Inflector::camelize($this->params['plugin']) . '/';
+		return str_replace(
+			array(':controller', ':action', ':plugin/'),
+			array(Inflector::camelize($this->params['controller']), $this->params['action'], $plugin),
+			$this->actionPath . $action
+		);
+	}
+
+/**
+ * Returns a reference to the model object specified, and attempts
+ * to load it if it is not found.
+ *
+ * @param string $name Model name (defaults to AuthComponent::$userModel)
+ * @return object A reference to a model object
+ * @access public
+ */
+	function &getModel($name = null) {
+		$model = null;
+		if (!$name) {
+			$name = $this->userModel;
+		}
+
+		if (PHP5) {
+			$model = ClassRegistry::init($name);
+		} else {
+			$model =& ClassRegistry::init($name);
+		}
+
+		if (empty($model)) {
+			trigger_error(__('Auth::getModel() - Model is not set or could not be found', true), E_USER_WARNING);
+			return null;
+		}
+
+		return $model;
+	}
+
+/**
+ * Identifies a user based on specific criteria.
+ *
+ * @param mixed $user Optional. The identity of the user to be validated.
+ *              Uses the current user session if none specified.
+ * @param array $conditions Optional. Additional conditions to a find.
+ * @return array User record data, or null, if the user could not be identified.
+ * @access public
+ */
+	function identify($user = null, $conditions = null) {
+		if ($conditions === false) {
+			$conditions = array();
+		} elseif (is_array($conditions)) {
+			$conditions = array_merge((array)$this->userScope, $conditions);
+		} else {
+			$conditions = $this->userScope;
+		}
+		$model =& $this->getModel();
+		if (empty($user)) {
+			$user = $this->user();
+			if (empty($user)) {
+				return null;
+			}
+		} elseif (is_object($user) && is_a($user, 'Model')) {
+			if (!$user->exists()) {
+				return null;
+			}
+			$user = $user->read();
+			$user = $user[$model->alias];
+		} elseif (is_array($user) && isset($user[$model->alias])) {
+			$user = $user[$model->alias];
+		}
+
+		if (is_array($user) && (isset($user[$this->fields['username']]) || isset($user[$model->alias . '.' . $this->fields['username']]))) {
+			if (isset($user[$this->fields['username']]) && !empty($user[$this->fields['username']])  && !empty($user[$this->fields['password']])) {
+				if (trim($user[$this->fields['username']]) == '=' || trim($user[$this->fields['password']]) == '=') {
+					return false;
+				}
+				$find = array(
+					$model->alias.'.'.$this->fields['username'] => $user[$this->fields['username']],
+					$model->alias.'.'.$this->fields['password'] => $user[$this->fields['password']]
+				);
+			} elseif (isset($user[$model->alias . '.' . $this->fields['username']]) && !empty($user[$model->alias . '.' . $this->fields['username']])) {
+				if (trim($user[$model->alias . '.' . $this->fields['username']]) == '=' || trim($user[$model->alias . '.' . $this->fields['password']]) == '=') {
+					return false;
+				}
+				$find = array(
+					$model->alias.'.'.$this->fields['username'] => $user[$model->alias . '.' . $this->fields['username']],
+					$model->alias.'.'.$this->fields['password'] => $user[$model->alias . '.' . $this->fields['password']]
+				);
+			} else {
+				return false;
+			}
+			$data = $model->find('first', array(
+				'conditions' => array_merge($find, $conditions),
+				'recursive' => 0
+			));
+			if (empty($data) || empty($data[$model->alias])) {
+				return null;
+			}
+		} elseif (!empty($user) && is_string($user)) {
+			$data = $model->find('first', array(
+				'conditions' => array_merge(array($model->escapeField() => $user), $conditions),
+			));
+			if (empty($data) || empty($data[$model->alias])) {
+				return null;
+			}
+		}
+
+		if (!empty($data)) {
+			if (!empty($data[$model->alias][$this->fields['password']])) {
+				unset($data[$model->alias][$this->fields['password']]);
+			}
+			return $data[$model->alias];
+		}
+		return null;
+	}
+
+/**
+ * Hash any passwords found in $data using $userModel and $fields['password']
+ *
+ * @param array $data Set of data to look for passwords
+ * @return array Data with passwords hashed
+ * @access public
+ * @link http://book.cakephp.org/view/1259/hashPasswords
+ */
+	function hashPasswords($data) {
+		if (is_object($this->authenticate) && method_exists($this->authenticate, 'hashPasswords')) {
+			return $this->authenticate->hashPasswords($data);
+		}
+
+		if (is_array($data)) {
+			$model =& $this->getModel();
+			
+			if(isset($data[$model->alias])) {
+				if (isset($data[$model->alias][$this->fields['username']]) && isset($data[$model->alias][$this->fields['password']])) {
+					$data[$model->alias][$this->fields['password']] = $this->password($data[$model->alias][$this->fields['password']]);
+				}
+			}
+		}
+		return $data;
+	}
+
+/**
+ * Hash a password with the application's salt value (as defined with Configure::write('Security.salt');
+ *
+ * @param string $password Password to hash
+ * @return string Hashed password
+ * @access public
+ * @link http://book.cakephp.org/view/1263/password
+ */
+	function password($password) {
+		return Security::hash($password, null, true);
+	}
+
+/**
+ * Component shutdown.  If user is logged in, wipe out redirect.
+ *
+ * @param object $controller Instantiating controller
+ * @access public
+ */
+	function shutdown(&$controller) {
+		if ($this->_loggedIn) {
+			$this->Session->delete('Auth.redirect');
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/cookie.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/cookie.php
new file mode 100644
index 000000000..b2ca100df
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/cookie.php
@@ -0,0 +1,480 @@
+<?php
+/**
+ * Cookie Component
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.4213
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Load Security class
+ */
+App::import('Core', 'Security');
+
+/**
+ * Cookie Component.
+ *
+ * Cookie handling for the controller.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @link http://book.cakephp.org/view/1280/Cookies
+ *
+ */
+class CookieComponent extends Object {
+
+/**
+ * The name of the cookie.
+ *
+ * Overridden with the controller beforeFilter();
+ * $this->Cookie->name = 'CookieName';
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'CakeCookie';
+
+/**
+ * The time a cookie will remain valid.
+ *
+ * Can be either integer Unix timestamp or a date string.
+ *
+ * Overridden with the controller beforeFilter();
+ * $this->Cookie->time = '5 Days';
+ *
+ * @var mixed
+ * @access public
+ */
+	var $time = null;
+
+/**
+ * Cookie path.
+ *
+ * Overridden with the controller beforeFilter();
+ * $this->Cookie->path = '/';
+ *
+ * The path on the server in which the cookie will be available on.
+ * If  var $cookiePath is set to '/foo/', the cookie will only be available
+ * within the /foo/ directory and all sub-directories such as /foo/bar/ of domain.
+ * The default value is the entire domain.
+ *
+ * @var string
+ * @access public
+ */
+	var $path = '/';
+
+/**
+ * Domain path.
+ *
+ * The domain that the cookie is available.
+ *
+ * Overridden with the controller beforeFilter();
+ * $this->Cookie->domain = '.example.com';
+ *
+ * To make the cookie available on all subdomains of example.com.
+ * Set $this->Cookie->domain = '.example.com'; in your controller beforeFilter
+ *
+ * @var string
+ * @access public
+ */
+	var $domain = '';
+
+/**
+ * Secure HTTPS only cookie.
+ *
+ * Overridden with the controller beforeFilter();
+ * $this->Cookie->secure = true;
+ *
+ * Indicates that the cookie should only be transmitted over a secure HTTPS connection.
+ * When set to true, the cookie will only be set if a secure connection exists.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $secure = false;
+
+/**
+ * Encryption key.
+ *
+ * Overridden with the controller beforeFilter();
+ * $this->Cookie->key = 'SomeRandomString';
+ *
+ * @var string
+ * @access protected
+ */
+	var $key = null;
+
+/**
+ * Values stored in the cookie.
+ *
+ * Accessed in the controller using $this->Cookie->read('Name.key');
+ *
+ * @see CookieComponent::read();
+ * @var string
+ * @access private
+ */
+	var $__values = array();
+
+/**
+ * Type of encryption to use.
+ *
+ * Currently only one method is available
+ * Defaults to Security::cipher();
+ *
+ * @var string
+ * @access private
+ * @todo add additional encryption methods
+ */
+	var $__type = 'cipher';
+
+/**
+ * Used to reset cookie time if $expire is passed to CookieComponent::write()
+ *
+ * @var string
+ * @access private
+ */
+	var $__reset = null;
+
+/**
+ * Expire time of the cookie
+ *
+ * This is controlled by CookieComponent::time;
+ *
+ * @var string
+ * @access private
+ */
+	var $__expires = 0;
+
+/**
+ * Main execution method.
+ *
+ * @param object $controller A reference to the instantiating controller object
+ * @access public
+ */
+	function initialize(&$controller, $settings) {
+		$this->key = Configure::read('Security.salt');
+		$this->_set($settings);
+		if (isset($this->time)) {
+			$this->__expire($this->time);
+		}
+	}
+
+/**
+ * Start CookieComponent for use in the controller
+ *
+ * @access public
+ */
+	function startup() {
+		$this->__expire($this->time);
+
+		if (isset($_COOKIE[$this->name])) {
+			$this->__values = $this->__decrypt($_COOKIE[$this->name]);
+		}
+	}
+
+/**
+ * Write a value to the $_COOKIE[$key];
+ *
+ * Optional [Name.], required key, optional $value, optional $encrypt, optional $expires
+ * $this->Cookie->write('[Name.]key, $value);
+ *
+ * By default all values are encrypted.
+ * You must pass $encrypt false to store values in clear test
+ *
+ * You must use this method before any output is sent to the browser.
+ * Failure to do so will result in header already sent errors.
+ *
+ * @param mixed $key Key for the value
+ * @param mixed $value Value
+ * @param boolean $encrypt Set to true to encrypt value, false otherwise
+ * @param string $expires Can be either Unix timestamp, or date string
+ * @access public
+ */
+	function write($key, $value = null, $encrypt = true, $expires = null) {
+		if (is_null($encrypt)) {
+			$encrypt = true;
+		}
+		$this->__encrypted = $encrypt;
+		$this->__expire($expires);
+
+		if (!is_array($key)) {
+			$key = array($key => $value);
+		}
+
+		foreach ($key as $name => $value) {
+			if (strpos($name, '.') === false) {
+				$this->__values[$name] = $value;
+				$this->__write("[$name]", $value);
+
+			} else {
+				$names = explode('.', $name, 2);
+				if (!isset($this->__values[$names[0]])) {
+					$this->__values[$names[0]] = array();
+				}
+				$this->__values[$names[0]] = Set::insert($this->__values[$names[0]], $names[1], $value);
+				$this->__write('[' . implode('][', $names) . ']', $value);
+			}
+		}
+		$this->__encrypted = true;
+	}
+
+/**
+ * Read the value of the $_COOKIE[$key];
+ *
+ * Optional [Name.], required key
+ * $this->Cookie->read(Name.key);
+ *
+ * @param mixed $key Key of the value to be obtained. If none specified, obtain map key => values
+ * @return string or null, value for specified key
+ * @access public
+ */
+	function read($key = null) {
+		if (empty($this->__values) && isset($_COOKIE[$this->name])) {
+			$this->__values = $this->__decrypt($_COOKIE[$this->name]);
+		}
+
+		if (is_null($key)) {
+			return $this->__values;
+		}
+
+		if (strpos($key, '.') !== false) {
+			$names = explode('.', $key, 2);
+			$key = $names[0];
+		}
+		if (!isset($this->__values[$key])) {
+			return null;
+		}
+
+		if (!empty($names[1])) {
+			return Set::extract($this->__values[$key], $names[1]);
+		}
+		return $this->__values[$key];
+	}
+
+/**
+ * Delete a cookie value
+ *
+ * Optional [Name.], required key
+ * $this->Cookie->read('Name.key);
+ *
+ * You must use this method before any output is sent to the browser.
+ * Failure to do so will result in header already sent errors.
+ *
+ * @param string $key Key of the value to be deleted
+ * @return void
+ * @access public
+ */
+	function delete($key) {
+		if (empty($this->__values)) {
+			$this->read();
+		}
+		if (strpos($key, '.') === false) {
+			if (isset($this->__values[$key]) && is_array($this->__values[$key])) {
+				foreach ($this->__values[$key] as $idx => $val) {
+					$this->__delete("[$key][$idx]");
+				}
+			} else {
+				$this->__delete("[$key]");
+			}
+			unset($this->__values[$key]);
+			return;
+		}
+		$names = explode('.', $key, 2);
+		$this->__values[$names[0]] = Set::remove($this->__values[$names[0]], $names[1]);
+		$this->__delete('[' . implode('][', $names) . ']');
+	}
+
+/**
+ * Destroy current cookie
+ *
+ * You must use this method before any output is sent to the browser.
+ * Failure to do so will result in header already sent errors.
+ *
+ * @return void
+ * @access public
+ */
+	function destroy() {
+		if (isset($_COOKIE[$this->name])) {
+			$this->__values = $this->__decrypt($_COOKIE[$this->name]);
+		}
+
+		foreach ($this->__values as $name => $value) {
+			if (is_array($value)) {
+				foreach ($value as $key => $val) {
+					unset($this->__values[$name][$key]);
+					$this->__delete("[$name][$key]");
+				}
+			}
+			unset($this->__values[$name]);
+			$this->__delete("[$name]");
+		}
+	}
+
+/**
+ * Will allow overriding default encryption method.
+ *
+ * @param string $type Encryption method
+ * @access public
+ * @todo NOT IMPLEMENTED
+ */
+	function type($type = 'cipher') {
+		$this->__type = 'cipher';
+	}
+
+/**
+ * Set the expire time for a session variable.
+ *
+ * Creates a new expire time for a session variable.
+ * $expire can be either integer Unix timestamp or a date string.
+ *
+ * Used by write()
+ * CookieComponent::write(string, string, boolean, 8400);
+ * CookieComponent::write(string, string, boolean, '5 Days');
+ *
+ * @param mixed $expires Can be either Unix timestamp, or date string
+ * @return int Unix timestamp
+ * @access private
+ */
+	function __expire($expires = null) {
+		$now = time();
+		if (is_null($expires)) {
+			return $this->__expires;
+		}
+		$this->__reset = $this->__expires;
+
+		if ($expires == 0) {
+			return $this->__expires = 0;
+		}
+
+		if (is_integer($expires) || is_numeric($expires)) {
+			return $this->__expires = $now + intval($expires);
+		}
+		return $this->__expires = strtotime($expires, $now);
+	}
+
+/**
+ * Set cookie
+ *
+ * @param string $name Name for cookie
+ * @param string $value Value for cookie
+ * @access private
+ */
+	function __write($name, $value) {
+		setcookie($this->name . $name, $this->__encrypt($value), $this->__expires, $this->path, $this->domain, $this->secure);
+
+		if (!is_null($this->__reset)) {
+			$this->__expires = $this->__reset;
+			$this->__reset = null;
+		}
+	}
+
+/**
+ * Sets a cookie expire time to remove cookie value
+ *
+ * @param string $name Name of cookie
+ * @access private
+ */
+	function __delete($name) {
+		setcookie($this->name . $name, '', time() - 42000, $this->path, $this->domain, $this->secure);
+	}
+
+/**
+ * Encrypts $value using var $type method in Security class
+ *
+ * @param string $value Value to encrypt
+ * @return string encrypted string
+ * @access private
+ */
+	function __encrypt($value) {
+		if (is_array($value)) {
+			$value = $this->__implode($value);
+		}
+
+		if ($this->__encrypted === true) {
+			$type = $this->__type;
+			$value = "Q2FrZQ==." .base64_encode(Security::$type($value, $this->key));
+		}
+		return $value;
+	}
+
+/**
+ * Decrypts $value using var $type method in Security class
+ *
+ * @param array $values Values to decrypt
+ * @return string decrypted string
+ * @access private
+ */
+	function __decrypt($values) {
+		$decrypted = array();
+		$type = $this->__type;
+
+		foreach ((array)$values as $name => $value) {
+			if (is_array($value)) {
+				foreach ($value as $key => $val) {
+					$pos = strpos($val, 'Q2FrZQ==.');
+					$decrypted[$name][$key] = $this->__explode($val);
+
+					if ($pos !== false) {
+						$val = substr($val, 8);
+						$decrypted[$name][$key] = $this->__explode(Security::$type(base64_decode($val), $this->key));
+					}
+				}
+			} else {
+				$pos = strpos($value, 'Q2FrZQ==.');
+				$decrypted[$name] = $this->__explode($value);
+
+				if ($pos !== false) {
+					$value = substr($value, 8);
+					$decrypted[$name] = $this->__explode(Security::$type(base64_decode($value), $this->key));
+				}
+			}
+		}
+		return $decrypted;
+	}
+
+/**
+ * Implode method to keep keys are multidimensional arrays
+ *
+ * @param array $array Map of key and values
+ * @return string String in the form key1|value1,key2|value2
+ * @access private
+ */
+	function __implode($array) {
+		$string = '';
+		foreach ($array as $key => $value) {
+			$string .= ',' . $key . '|' . $value;
+		}
+		return substr($string, 1);
+	}
+
+/**
+ * Explode method to return array from string set in CookieComponent::__implode()
+ *
+ * @param string $string String in the form key1|value1,key2|value2
+ * @return array Map of key and values
+ * @access private
+ */
+	function __explode($string) {
+		$array = array();
+		foreach (explode(',', $string) as $pair) {
+			$key = explode('|', $pair);
+			if (!isset($key[1])) {
+				return $key[0];
+			}
+			$array[$key[0]] = $key[1];
+		}
+		return $array;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/email.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/email.php
new file mode 100755
index 000000000..43ee594b7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/email.php
@@ -0,0 +1,1004 @@
+<?php
+/**
+ * Email Component
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.3467
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'Multibyte');
+
+/**
+ * EmailComponent
+ *
+ * This component is used for handling Internet Message Format based
+ * based on the standard outlined in http://www.rfc-editor.org/rfc/rfc2822.txt
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @link http://book.cakephp.org/view/1283/Email
+ *
+ */
+class EmailComponent extends Object{
+
+/**
+ * Recipient of the email
+ *
+ * @var string
+ * @access public
+ */
+	var $to = null;
+
+/**
+ * The mail which the email is sent from
+ *
+ * @var string
+ * @access public
+ */
+	var $from = null;
+
+/**
+ * The email the recipient will reply to
+ *
+ * @var string
+ * @access public
+ */
+	var $replyTo = null;
+
+/**
+ * The read receipt email
+ *
+ * @var string
+ * @access public
+ */
+	var $readReceipt = null;
+
+/**
+ * The mail that will be used in case of any errors like
+ * - Remote mailserver down
+ * - Remote user has exceeded his quota
+ * - Unknown user
+ *
+ * @var string
+ * @access public
+ */
+	var $return = null;
+
+/**
+ * Carbon Copy
+ *
+ * List of email's that should receive a copy of the email.
+ * The Recipient WILL be able to see this list
+ *
+ * @var array
+ * @access public
+ */
+	var $cc = array();
+
+/**
+ * Blind Carbon Copy
+ *
+ * List of email's that should receive a copy of the email.
+ * The Recipient WILL NOT be able to see this list
+ *
+ * @var array
+ * @access public
+ */
+	var $bcc = array();
+
+/**
+ * The date to put in the Date: header.  This should be a date
+ * conformant with the RFC2822 standard.  Leave null, to have
+ * today's date generated.
+ *
+ * @var string
+ */
+	var $date = null;
+
+/**
+ * The subject of the email
+ *
+ * @var string
+ * @access public
+ */
+	var $subject = null;
+
+/**
+ * Associative array of a user defined headers
+ * Keys will be prefixed 'X-' as per RFC2822 Section 4.7.5
+ *
+ * @var array
+ * @access public
+ */
+	var $headers = array();
+
+/**
+ * List of additional headers
+ *
+ * These will NOT be used if you are using safemode and mail()
+ *
+ * @var string
+ * @access public
+ */
+	var $additionalParams = null;
+
+/**
+ * Layout for the View
+ *
+ * @var string
+ * @access public
+ */
+	var $layout = 'default';
+
+/**
+ * Template for the view
+ *
+ * @var string
+ * @access public
+ */
+	var $template = null;
+
+/**
+ * as per RFC2822 Section 2.1.1
+ *
+ * @var integer
+ * @access public
+ */
+	var $lineLength = 70;
+
+/**
+ * Line feed character(s) to be used when sending using mail() function
+ * By default PHP_EOL is used.
+ * RFC2822 requires it to be CRLF but some Unix
+ * mail transfer agents replace LF by CRLF automatically
+ * (which leads to doubling CR if CRLF is used).
+ *
+ * @var string
+ * @access public
+ */
+	var $lineFeed = PHP_EOL;
+
+/**
+ * @deprecated see lineLength
+ */
+	var $_lineLength = null;
+
+/**
+ * What format should the email be sent in
+ *
+ * Supported formats:
+ * - text
+ * - html
+ * - both
+ *
+ * @var string
+ * @access public
+ */
+	var $sendAs = 'text';
+
+/**
+ * What method should the email be sent by
+ *
+ * Supported methods:
+ * - mail
+ * - smtp
+ * - debug
+ *
+ * @var string
+ * @access public
+ */
+	var $delivery = 'mail';
+
+/**
+ * charset the email is sent in
+ *
+ * @var string
+ * @access public
+ */
+	var $charset = 'utf-8';
+
+/**
+ * List of files that should be attached to the email.
+ *
+ * Can be both absolute and relative paths
+ *
+ * @var array
+ * @access public
+ */
+	var $attachments = array();
+
+/**
+ * What mailer should EmailComponent identify itself as
+ *
+ * @var string
+ * @access public
+ */
+	var $xMailer = 'CakePHP Email Component';
+
+/**
+ * The list of paths to search if an attachment isnt absolute
+ *
+ * @var array
+ * @access public
+ */
+	var $filePaths = array();
+
+/**
+ * List of options to use for smtp mail method
+ *
+ * Options is:
+ * - port
+ * - host
+ * - timeout
+ * - username
+ * - password
+ * - client
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1290/Sending-A-Message-Using-SMTP
+ */
+	var $smtpOptions = array();
+
+/**
+ * Placeholder for any errors that might happen with the
+ * smtp mail methods
+ *
+ * @var string
+ * @access public
+ */
+	var $smtpError = null;
+
+/**
+ * Contains the rendered plain text message if one was sent.
+ *
+ * @var string
+ * @access public
+ */
+	var $textMessage = null;
+
+/**
+ * Contains the rendered HTML message if one was sent.
+ *
+ * @var string
+ * @access public
+ */
+	var $htmlMessage = null;
+
+/**
+ * Whether to generate a Message-ID header for the
+ * e-mail. True to generate a Message-ID, False to let
+ * it be handled by sendmail (or similar) or a string
+ * to completely override the Message-ID.
+ *
+ * If you are sending Email from a shell, be sure to set this value.  As you
+ * could encounter delivery issues if you do not.
+ *
+ * @var mixed
+ * @access public
+ */
+	var $messageId = true;
+
+/**
+ * Temporary store of message header lines
+ *
+ * @var array
+ * @access private
+ */
+	var $__header = array();
+
+/**
+ * If set, boundary to use for multipart mime messages
+ *
+ * @var string
+ * @access private
+ */
+	var $__boundary = null;
+
+/**
+ * Temporary store of message lines
+ *
+ * @var array
+ * @access private
+ */
+	var $__message = array();
+
+/**
+ * Variable that holds SMTP connection
+ *
+ * @var resource
+ * @access private
+ */
+	var $__smtpConnection = null;
+
+/**
+ * Initialize component
+ *
+ * @param object $controller Instantiating controller
+ * @access public
+ */
+	function initialize(&$controller, $settings = array()) {
+		$this->Controller =& $controller;
+		if (Configure::read('App.encoding') !== null) {
+			$this->charset = Configure::read('App.encoding');
+		}
+		$this->_set($settings);
+	}
+
+/**
+ * Startup component
+ *
+ * @param object $controller Instantiating controller
+ * @access public
+ */
+	function startup(&$controller) {}
+
+/**
+ * Send an email using the specified content, template and layout
+ *
+ * @param mixed $content Either an array of text lines, or a string with contents
+ *  If you are rendering a template this variable will be sent to the templates as `$content`
+ * @param string $template Template to use when sending email
+ * @param string $layout Layout to use to enclose email body
+ * @return boolean Success
+ * @access public
+ */
+	function send($content = null, $template = null, $layout = null) {
+		$this->_createHeader();
+
+		if ($template) {
+			$this->template = $template;
+		}
+
+		if ($layout) {
+			$this->layout = $layout;
+		}
+
+		if (is_array($content)) {
+			$content = implode("\n", $content) . "\n";
+		}
+
+		$this->htmlMessage = $this->textMessage = null;
+		if ($content) {
+			if ($this->sendAs === 'html') {
+				$this->htmlMessage = $content;
+			} elseif ($this->sendAs === 'text') {
+				$this->textMessage = $content;
+			} else {
+				$this->htmlMessage = $this->textMessage = $content;
+			}
+		}
+
+		if ($this->sendAs === 'text') {
+			$message = $this->_wrap($content);
+		} else {
+			$message = $this->_wrap($content, 998);
+		}
+
+		if ($this->template === null) {
+			$message = $this->_formatMessage($message);
+		} else {
+			$message = $this->_render($message);
+		}
+
+		$message[] = '';
+		$this->__message = $message;
+
+		if (!empty($this->attachments)) {
+			$this->_attachFiles();
+		}
+
+		if (!is_null($this->__boundary)) {
+			$this->__message[] = '';
+			$this->__message[] = '--' . $this->__boundary . '--';
+			$this->__message[] = '';
+		}
+
+
+		$_method = '_' . $this->delivery;
+		$sent = $this->$_method();
+
+		$this->__header = array();
+		$this->__message = array();
+
+		return $sent;
+	}
+
+/**
+ * Reset all EmailComponent internal variables to be able to send out a new email.
+ *
+ * @access public
+ * @link http://book.cakephp.org/view/1285/Sending-Multiple-Emails-in-a-loop
+ */
+	function reset() {
+		$this->template = null;
+		$this->to = array();
+		$this->from = null;
+		$this->replyTo = null;
+		$this->return = null;
+		$this->cc = array();
+		$this->bcc = array();
+		$this->subject = null;
+		$this->additionalParams = null;
+		$this->date = null;
+		$this->smtpError = null;
+		$this->attachments = array();
+		$this->htmlMessage = null;
+		$this->textMessage = null;
+		$this->messageId = true;
+		$this->__header = array();
+		$this->__boundary = null;
+		$this->__message = array();
+	}
+
+/**
+ * Render the contents using the current layout and template.
+ *
+ * @param string $content Content to render
+ * @return array Email ready to be sent
+ * @access private
+ */
+	function _render($content) {
+		$viewClass = $this->Controller->view;
+
+		if ($viewClass != 'View') {
+			list($plugin, $viewClass) = pluginSplit($viewClass);
+			$viewClass = $viewClass . 'View';
+			App::import('View', $this->Controller->view);
+		}
+
+		$View = new $viewClass($this->Controller);
+		$View->layout = $this->layout;
+		$msg = array();
+
+		$content = implode("\n", $content);
+
+		if ($this->sendAs === 'both') {
+			$htmlContent = $content;
+			if (!empty($this->attachments)) {
+				$msg[] = '--' . $this->__boundary;
+				$msg[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->__boundary . '"';
+				$msg[] = '';
+			}
+			$msg[] = '--alt-' . $this->__boundary;
+			$msg[] = 'Content-Type: text/plain; charset=' . $this->charset;
+			$msg[] = 'Content-Transfer-Encoding: 7bit';
+			$msg[] = '';
+
+			$content = $View->element('email' . DS . 'text' . DS . $this->template, array('content' => $content), true);
+			$View->layoutPath = 'email' . DS . 'text';
+			$content = explode("\n", $this->textMessage = str_replace(array("\r\n", "\r"), "\n", $View->renderLayout($content)));
+
+			$msg = array_merge($msg, $content);
+
+			$msg[] = '';
+			$msg[] = '--alt-' . $this->__boundary;
+			$msg[] = 'Content-Type: text/html; charset=' . $this->charset;
+			$msg[] = 'Content-Transfer-Encoding: 7bit';
+			$msg[] = '';
+
+			$htmlContent = $View->element('email' . DS . 'html' . DS . $this->template, array('content' => $htmlContent), true);
+			$View->layoutPath = 'email' . DS . 'html';
+			$htmlContent = explode("\n", $this->htmlMessage = str_replace(array("\r\n", "\r"), "\n", $View->renderLayout($htmlContent)));
+			$msg = array_merge($msg, $htmlContent);
+			$msg[] = '';
+			$msg[] = '--alt-' . $this->__boundary . '--';
+			$msg[] = '';
+
+			ClassRegistry::removeObject('view');
+			return $msg;
+		}
+
+		if (!empty($this->attachments)) {
+			if ($this->sendAs === 'html') {
+				$msg[] = '';
+				$msg[] = '--' . $this->__boundary;
+				$msg[] = 'Content-Type: text/html; charset=' . $this->charset;
+				$msg[] = 'Content-Transfer-Encoding: 7bit';
+				$msg[] = '';
+			} else {
+				$msg[] = '--' . $this->__boundary;
+				$msg[] = 'Content-Type: text/plain; charset=' . $this->charset;
+				$msg[] = 'Content-Transfer-Encoding: 7bit';
+				$msg[] = '';
+			}
+		}
+
+		$content = $View->element('email' . DS . $this->sendAs . DS . $this->template, array('content' => $content), true);
+		$View->layoutPath = 'email' . DS . $this->sendAs;
+		$content = explode("\n", $rendered = str_replace(array("\r\n", "\r"), "\n", $View->renderLayout($content)));
+
+		if ($this->sendAs === 'html') {
+			$this->htmlMessage = $rendered;
+		} else {
+			$this->textMessage = $rendered;
+		}
+
+		$msg = array_merge($msg, $content);
+		ClassRegistry::removeObject('view');
+
+		return $msg;
+	}
+
+/**
+ * Create unique boundary identifier
+ *
+ * @access private
+ */
+	function _createboundary() {
+		$this->__boundary = md5(uniqid(time()));
+	}
+
+/**
+ * Sets headers for the message
+ *
+ * @access public
+ * @param array Associative array containing headers to be set.
+ */
+	function header($headers) {
+		foreach ($headers as $header => $value) {
+			$this->__header[] = sprintf('%s: %s', trim($header), trim($value));
+		}
+	}
+/**
+ * Create emails headers including (but not limited to) from email address, reply to,
+ * bcc and cc.
+ *
+ * @access private
+ */
+	function _createHeader() {
+        $headers = array();
+
+		if ($this->delivery == 'smtp') {
+			$headers['To'] = implode(', ', array_map(array($this, '_formatAddress'), (array)$this->to));
+		}
+		$headers['From'] = $this->_formatAddress($this->from);
+
+		if (!empty($this->replyTo)) {
+			$headers['Reply-To'] = $this->_formatAddress($this->replyTo);
+		}
+		if (!empty($this->return)) {
+			$headers['Return-Path'] = $this->_formatAddress($this->return);
+		}
+		if (!empty($this->readReceipt)) {
+			$headers['Disposition-Notification-To'] = $this->_formatAddress($this->readReceipt);
+		}
+
+		if (!empty($this->cc)) {
+			$headers['Cc'] = implode(', ', array_map(array($this, '_formatAddress'), (array)$this->cc));
+		}
+
+		if (!empty($this->bcc) && $this->delivery != 'smtp') {
+			$headers['Bcc'] = implode(', ', array_map(array($this, '_formatAddress'), (array)$this->bcc));
+		}
+		if ($this->delivery == 'smtp') {
+			$headers['Subject'] = $this->_encode($this->subject);
+		}
+
+		if ($this->messageId !== false) {
+			if ($this->messageId === true) {
+				$headers['Message-ID'] = '<' . String::UUID() . '@' . env('HTTP_HOST') . '>';
+			} else {
+				$headers['Message-ID'] = $this->messageId;
+			}
+		}
+
+		$date = $this->date;
+		if ($date == false) {
+			$date = date(DATE_RFC2822);
+		}
+		$headers['Date'] = $date;
+
+		$headers['X-Mailer'] = $this->xMailer;
+
+		if (!empty($this->headers)) {
+			foreach ($this->headers as $key => $val) {
+				$headers['X-' . $key] = $val;
+			}
+		}
+
+		if (!empty($this->attachments)) {
+			$this->_createBoundary();
+			$headers['MIME-Version'] = '1.0';
+			$headers['Content-Type'] = 'multipart/mixed; boundary="' . $this->__boundary . '"';
+			$headers[] = 'This part of the E-mail should never be seen. If';
+			$headers[] = 'you are reading this, consider upgrading your e-mail';
+			$headers[] = 'client to a MIME-compatible client.';
+		} elseif ($this->sendAs === 'text') {
+			$headers['Content-Type'] = 'text/plain; charset=' . $this->charset;
+		} elseif ($this->sendAs === 'html') {
+			$headers['Content-Type'] = 'text/html; charset=' . $this->charset;
+		} elseif ($this->sendAs === 'both') {
+			$headers['Content-Type'] = 'multipart/alternative; boundary="alt-' . $this->__boundary . '"';
+		}
+
+		$headers['Content-Transfer-Encoding'] = '7bit';
+
+        $this->header($headers);
+	}
+
+/**
+ * Format the message by seeing if it has attachments.
+ *
+ * @param string $message Message to format
+ * @access private
+ */
+	function _formatMessage($message) {
+		if (!empty($this->attachments)) {
+			$prefix = array('--' . $this->__boundary);
+			if ($this->sendAs === 'text') {
+				$prefix[] = 'Content-Type: text/plain; charset=' . $this->charset;
+			} elseif ($this->sendAs === 'html') {
+				$prefix[] = 'Content-Type: text/html; charset=' . $this->charset;
+			} elseif ($this->sendAs === 'both') {
+				$prefix[] = 'Content-Type: multipart/alternative; boundary="alt-' . $this->__boundary . '"';
+			}
+			$prefix[] = 'Content-Transfer-Encoding: 7bit';
+			$prefix[] = '';
+			$message = array_merge($prefix, $message);
+		}
+		return $message;
+	}
+
+/**
+ * Attach files by adding file contents inside boundaries.
+ *
+ * @access private
+ * @TODO: modify to use the core File class?
+ */
+	function _attachFiles() {
+		$files = array();
+		foreach ($this->attachments as $filename => $attachment) {
+			$file = $this->_findFiles($attachment);
+			if (!empty($file)) {
+				if (is_int($filename)) {
+					$filename = basename($file);
+				}
+				$files[$filename] = $file;
+			}
+		}
+
+		foreach ($files as $filename => $file) {
+			$handle = fopen($file, 'rb');
+			$data = fread($handle, filesize($file));
+			$data = chunk_split(base64_encode($data)) ;
+			fclose($handle);
+
+			$this->__message[] = '--' . $this->__boundary;
+			$this->__message[] = 'Content-Type: application/octet-stream';
+			$this->__message[] = 'Content-Transfer-Encoding: base64';
+			$this->__message[] = 'Content-Disposition: attachment; filename="' . basename($filename) . '"';
+			$this->__message[] = '';
+			$this->__message[] = $data;
+			$this->__message[] = '';
+		}
+	}
+
+/**
+ * Find the specified attachment in the list of file paths
+ *
+ * @param string $attachment Attachment file name to find
+ * @return string Path to located file
+ * @access private
+ */
+	function _findFiles($attachment) {
+		if (file_exists($attachment)) {
+			return $attachment;
+		}
+		foreach ($this->filePaths as $path) {
+			if (file_exists($path . DS . $attachment)) {
+				$file = $path . DS . $attachment;
+				return $file;
+			}
+		}
+		return null;
+	}
+
+/**
+ * Wrap the message using EmailComponent::$lineLength
+ *
+ * @param string $message Message to wrap
+ * @param integer $lineLength Max length of line
+ * @return array Wrapped message
+ * @access protected
+ */
+	function _wrap($message, $lineLength = null) {
+		$message = $this->_strip($message, true);
+		$message = str_replace(array("\r\n","\r"), "\n", $message);
+		$lines = explode("\n", $message);
+		$formatted = array();
+
+		if ($this->_lineLength !== null) {
+			trigger_error(__('_lineLength cannot be accessed please use lineLength', true), E_USER_WARNING);
+			$this->lineLength = $this->_lineLength;
+		}
+
+		if (!$lineLength) {
+			$lineLength = $this->lineLength;
+		}
+
+		foreach ($lines as $line) {
+			if (substr($line, 0, 1) == '.') {
+				$line = '.' . $line;
+			}
+			$formatted = array_merge($formatted, explode("\n", wordwrap($line, $lineLength, "\n", true)));
+		}
+		$formatted[] = '';
+		return $formatted;
+	}
+
+/**
+ * Encode the specified string using the current charset
+ *
+ * @param string $subject String to encode
+ * @return string Encoded string
+ * @access private
+ */
+	function _encode($subject) {
+		$subject = $this->_strip($subject);
+
+		$nl = "\r\n";
+		if ($this->delivery == 'mail') {
+			$nl = '';
+		}
+		$internalEncoding = function_exists('mb_internal_encoding');
+		if ($internalEncoding) {
+			$restore = mb_internal_encoding();
+			mb_internal_encoding($this->charset);
+		}
+		$return = mb_encode_mimeheader($subject, $this->charset, 'B', $nl);
+		if ($internalEncoding) {
+			mb_internal_encoding($restore);
+		}
+		return $return;
+	}
+
+/**
+ * Format a string as an email address
+ *
+ * @param string $string String representing an email address
+ * @return string Email address suitable for email headers or smtp pipe
+ * @access private
+ */
+	function _formatAddress($string, $smtp = false) {
+		$hasAlias = preg_match('/((.*))?\s?<(.+)>/', $string, $matches);
+		if ($smtp && $hasAlias) {
+			return $this->_strip('<' .  $matches[3] . '>');
+		} elseif ($smtp) {
+			return $this->_strip('<' . $string . '>');
+		}
+
+		if ($hasAlias && !empty($matches[2])) {
+			return $this->_encode($matches[2]) . $this->_strip(' <' . $matches[3] . '>');
+		}
+		return $this->_strip($string);
+	}
+
+/**
+ * Remove certain elements (such as bcc:, to:, %0a) from given value.
+ * Helps prevent header injection / mainipulation on user content.
+ *
+ * @param string $value Value to strip
+ * @param boolean $message Set to true to indicate main message content
+ * @return string Stripped value
+ * @access private
+ */
+	function _strip($value, $message = false) {
+		$search  = '%0a|%0d|Content-(?:Type|Transfer-Encoding)\:';
+		$search .= '|charset\=|mime-version\:|multipart/mixed|(?:[^a-z]to|b?cc)\:.*';
+
+		if ($message !== true) {
+			$search .= '|\r|\n';
+		}
+		$search = '#(?:' . $search . ')#i';
+		while (preg_match($search, $value)) {
+			$value = preg_replace($search, '', $value);
+		}
+		return $value;
+	}
+
+/**
+ * Wrapper for PHP mail function used for sending out emails
+ *
+ * @return bool Success
+ * @access private
+ */
+	function _mail() {
+		$header = implode($this->lineFeed, $this->__header);
+		$message = implode($this->lineFeed, $this->__message);
+		if (is_array($this->to)) {
+			$to = implode(', ', array_map(array($this, '_formatAddress'), $this->to));
+		} else {
+			$to = $this->to;
+		}
+		if (ini_get('safe_mode')) {
+			return @mail($to, $this->_encode($this->subject), $message, $header);
+		}
+		return @mail($to, $this->_encode($this->subject), $message, $header, $this->additionalParams);
+	}
+
+
+/**
+ * Helper method to get socket, overridden in tests
+ *
+ * @param array $config Config data for the socket.
+ * @return void
+ * @access protected
+ */
+	function _getSocket($config) {
+		$this->__smtpConnection =& new CakeSocket($config);
+	}
+
+/**
+ * Sends out email via SMTP
+ *
+ * @return bool Success
+ * @access private
+ */
+	function _smtp() {
+		App::import('Core', array('CakeSocket'));
+
+		$defaults = array(
+			'host' => 'localhost',
+			'port' => 25,
+			'protocol' => 'smtp',
+			'timeout' => 30
+		);
+		$this->smtpOptions = array_merge($defaults, $this->smtpOptions);
+		$this->_getSocket($this->smtpOptions);
+
+		if (!$this->__smtpConnection->connect()) {
+			$this->smtpError = $this->__smtpConnection->lastError();
+			return false;
+		} elseif (!$this->_smtpSend(null, '220')) {
+			return false;
+		}
+
+		$httpHost = env('HTTP_HOST');
+
+		if (isset($this->smtpOptions['client'])) {
+			$host = $this->smtpOptions['client'];
+		} elseif (!empty($httpHost)) {
+			list($host) = explode(':', $httpHost);
+		} else {
+			$host = 'localhost';
+		}
+
+		if (!$this->_smtpSend("EHLO {$host}", '250') && !$this->_smtpSend("HELO {$host}", '250')) {
+			return false;
+		}
+
+		if (isset($this->smtpOptions['username']) && isset($this->smtpOptions['password'])) {
+			$authRequired = $this->_smtpSend('AUTH LOGIN', '334|503');
+			if ($authRequired == '334') {
+				if (!$this->_smtpSend(base64_encode($this->smtpOptions['username']), '334')) {
+					return false;
+				}
+				if (!$this->_smtpSend(base64_encode($this->smtpOptions['password']), '235')) {
+					return false;
+				}
+			} elseif ($authRequired != '503') {
+				return false;
+			}
+		}
+
+		if (!$this->_smtpSend('MAIL FROM: ' . $this->_formatAddress($this->from, true))) {
+			return false;
+		}
+
+		if (!is_array($this->to)) {
+			$tos = array_map('trim', explode(',', $this->to));
+		} else {
+			$tos = $this->to;
+		}
+		foreach ($tos as $to) {
+			if (!$this->_smtpSend('RCPT TO: ' . $this->_formatAddress($to, true))) {
+				return false;
+			}
+		}
+
+		foreach ($this->cc as $cc) {
+			if (!$this->_smtpSend('RCPT TO: ' . $this->_formatAddress($cc, true))) {
+				return false;
+			}
+		}
+		foreach ($this->bcc as $bcc) {
+			if (!$this->_smtpSend('RCPT TO: ' . $this->_formatAddress($bcc, true))) {
+				return false;
+			}
+		}
+
+		if (!$this->_smtpSend('DATA', '354')) {
+			return false;
+		}
+
+		$header = implode("\r\n", $this->__header);
+		$message = implode("\r\n", $this->__message);
+		if (!$this->_smtpSend($header . "\r\n\r\n" . $message . "\r\n\r\n\r\n.")) {
+			return false;
+		}
+		$this->_smtpSend('QUIT', false);
+
+		$this->__smtpConnection->disconnect();
+		return true;
+	}
+
+/**
+ * Protected method for sending data to SMTP connection
+ *
+ * @param string $data data to be sent to SMTP server
+ * @param mixed $checkCode code to check for in server response, false to skip
+ * @return bool Success
+ * @access protected
+ */
+	function _smtpSend($data, $checkCode = '250') {
+		if (!is_null($data)) {
+			$this->__smtpConnection->write($data . "\r\n");
+		}
+		while ($checkCode !== false) {
+			$response = '';
+			$startTime = time();
+			while (substr($response, -2) !== "\r\n" && ((time() - $startTime) < $this->smtpOptions['timeout'])) {
+				$response .= $this->__smtpConnection->read();
+			}
+			if (substr($response, -2) !== "\r\n") {
+				$this->smtpError = 'timeout';
+				return false;
+			}
+			$response = end(explode("\r\n", rtrim($response, "\r\n")));
+
+			if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) {
+				if ($code[2] === '-') {
+					continue;
+				}
+				return $code[1];
+			}
+			$this->smtpError = $response;
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Set as controller flash message a debug message showing current settings in component
+ *
+ * @return boolean Success
+ * @access private
+ */
+	function _debug() {
+		$nl = "\n";
+		$header = implode($nl, $this->__header);
+		$message = implode($nl, $this->__message);
+		$fm = '<pre>';
+
+		if (is_array($this->to)) {
+			$to = implode(', ', array_map(array($this, '_formatAddress'), $this->to));
+		} else {
+			$to = $this->to;
+		}
+		$fm .= sprintf('%s %s%s', 'To:', $to, $nl);
+		$fm .= sprintf('%s %s%s', 'From:', $this->from, $nl);
+		$fm .= sprintf('%s %s%s', 'Subject:', $this->_encode($this->subject), $nl);
+		$fm .= sprintf('%s%3$s%3$s%s', 'Header:', $header, $nl);
+		$fm .= sprintf('%s%3$s%3$s%s', 'Parameters:', $this->additionalParams, $nl);
+		$fm .= sprintf('%s%3$s%3$s%s', 'Message:', $message, $nl);
+		$fm .= '</pre>';
+
+		if (isset($this->Controller->Session)) {
+			$this->Controller->Session->setFlash($fm, 'default', null, 'email');
+			return true;
+		}
+		return $fm;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/request_handler.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/request_handler.php
new file mode 100644
index 000000000..ae33ab27d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/request_handler.php
@@ -0,0 +1,827 @@
+<?php
+/**
+ * Request object for handling alternative HTTP requests
+ *
+ * Alternative HTTP requests can come from wireless units like mobile phones, palmtop computers,
+ * and the like.  These units have no use for Ajax requests, and this Component can tell how Cake
+ * should respond to the different needs of a handheld computer and a desktop machine.
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @since         CakePHP(tm) v 0.10.4.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Request object for handling HTTP requests
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @link http://book.cakephp.org/view/1291/Request-Handling
+ *
+ */
+class RequestHandlerComponent extends Object {
+
+/**
+ * The layout that will be switched to for Ajax requests
+ *
+ * @var string
+ * @access public
+ * @see RequestHandler::setAjax()
+ */
+	var $ajaxLayout = 'ajax';
+
+/**
+ * Determines whether or not callbacks will be fired on this component
+ *
+ * @var boolean
+ * @access public
+ */
+	var $enabled = true;
+
+/**
+ * Holds the content-type of the response that is set when using
+ * RequestHandler::respondAs()
+ *
+ * @var string
+ * @access private
+ */
+	var $__responseTypeSet = null;
+
+/**
+ * Holds the copy of Controller::$params
+ *
+ * @var array
+ * @access public
+ */
+	var $params = array();
+
+/**
+ * Friendly content-type mappings used to set response types and determine
+ * request types.  Can be modified with RequestHandler::setContent()
+ *
+ * @var array
+ * @access private
+ * @see RequestHandlerComponent::setContent
+ */
+	var $__requestContent = array(
+		'javascript'	=> 'text/javascript',
+		'js'			=> 'text/javascript',
+		'json'			=> 'application/json',
+		'css'			=> 'text/css',
+		'html'			=> array('text/html', '*/*'),
+		'text'			=> 'text/plain',
+		'txt'			=> 'text/plain',
+		'csv'			=> array('application/vnd.ms-excel', 'text/plain'),
+		'form'			=> 'application/x-www-form-urlencoded',
+		'file'			=> 'multipart/form-data',
+		'xhtml'			=> array('application/xhtml+xml', 'application/xhtml', 'text/xhtml'),
+		'xhtml-mobile'	=> 'application/vnd.wap.xhtml+xml',
+		'xml'			=> array('application/xml', 'text/xml'),
+		'rss'			=> 'application/rss+xml',
+		'atom'			=> 'application/atom+xml',
+		'amf'			=> 'application/x-amf',
+		'wap'			=> array(
+			'text/vnd.wap.wml',
+			'text/vnd.wap.wmlscript',
+			'image/vnd.wap.wbmp'
+		),
+		'wml'			=> 'text/vnd.wap.wml',
+		'wmlscript'		=> 'text/vnd.wap.wmlscript',
+		'wbmp'			=> 'image/vnd.wap.wbmp',
+		'pdf'			=> 'application/pdf',
+		'zip'			=> 'application/x-zip',
+		'tar'			=> 'application/x-tar'
+	);
+
+/**
+ * List of regular expressions for matching mobile device's user agent string
+ *
+ * @var array
+ * @access public
+ */
+	var $mobileUA = array(
+		'Android',
+		'AvantGo',
+		'BlackBerry',
+		'DoCoMo',
+		'iPod',
+		'iPhone',
+		'J2ME',
+		'MIDP',
+		'NetFront',
+		'Nokia',
+		'Opera Mini',
+		'PalmOS',
+		'PalmSource',
+		'portalmmm',
+		'Plucker',
+		'ReqwirelessWeb',
+		'SonyEricsson',
+		'Symbian',
+		'UP\.Browser',
+		'webOS',
+		'Windows CE',
+		'Xiino'
+	);
+
+/**
+ * Content-types accepted by the client.  If extension parsing is enabled in the
+ * Router, and an extension is detected, the corresponding content-type will be
+ * used as the overriding primary content-type accepted.
+ *
+ * @var array
+ * @access private
+ * @see Router::parseExtensions()
+ */
+	var $__acceptTypes = array();
+
+/**
+ * The template to use when rendering the given content type.
+ *
+ * @var string
+ * @access private
+ */
+	var $__renderType = null;
+
+/**
+ * Contains the file extension parsed out by the Router
+ *
+ * @var string
+ * @access public
+ * @see Router::parseExtensions()
+ */
+	var $ext = null;
+
+/**
+ * Flag set when MIME types have been initialized
+ *
+ * @var boolean
+ * @access private
+ * @see RequestHandler::__initializeTypes()
+ */
+	var $__typesInitialized = false;
+
+/**
+ * Constructor. Parses the accepted content types accepted by the client using HTTP_ACCEPT
+ *
+ */
+	function __construct() {
+		$this->__acceptTypes = explode(',', env('HTTP_ACCEPT'));
+
+		foreach ($this->__acceptTypes as $i => $type) {
+			if (strpos($type, ';')) {
+				$type = explode(';', $type);
+				$this->__acceptTypes[$i] = $type[0];
+			}
+		}
+		parent::__construct();
+	}
+
+/**
+ * Initializes the component, gets a reference to Controller::$parameters, and
+ * checks to see if a file extension has been parsed by the Router.  If yes, the
+ * corresponding content-type is pushed onto the list of accepted content-types
+ * as the first item.
+ *
+ * @param object $controller A reference to the controller
+ * @param array $settings Array of settings to _set().
+ * @return void
+ * @see Router::parseExtensions()
+ * @access public
+ */
+	function initialize(&$controller, $settings = array()) {
+		if (isset($controller->params['url']['ext'])) {
+			$this->ext = $controller->params['url']['ext'];
+		}
+		$this->params = $controller->params;
+		$this->_set($settings);
+	}
+
+/**
+ * The startup method of the RequestHandler enables several automatic behaviors
+ * related to the detection of certain properties of the HTTP request, including:
+ *
+ * - Disabling layout rendering for Ajax requests (based on the HTTP_X_REQUESTED_WITH header)
+ * - If Router::parseExtensions() is enabled, the layout and template type are
+ *   switched based on the parsed extension.  For example, if controller/action.xml
+ *   is requested, the view path becomes <i>app/views/controller/xml/action.ctp</i>.
+ * - If a helper with the same name as the extension exists, it is added to the controller.
+ * - If the extension is of a type that RequestHandler understands, it will set that
+ *   Content-type in the response header.
+ * - If the XML data is POSTed, the data is parsed into an XML object, which is assigned
+ *   to the $data property of the controller, which can then be saved to a model object.
+ *
+ * @param object $controller A reference to the controller
+ * @return void
+ * @access public
+ */
+	function startup(&$controller) {
+		if (!$this->enabled) {
+			return;
+		}
+
+		$this->__initializeTypes();
+		$controller->params['isAjax'] = $this->isAjax();
+		$isRecognized = (
+			!in_array($this->ext, array('html', 'htm')) &&
+			in_array($this->ext, array_keys($this->__requestContent))
+		);
+
+		if (!empty($this->ext) && $isRecognized) {
+			$this->renderAs($controller, $this->ext);
+		} elseif ($this->isAjax()) {
+			$this->renderAs($controller, 'ajax');
+		} elseif (empty($this->ext) || in_array($this->ext, array('html', 'htm'))) {
+			$this->respondAs('html', array('charset' => Configure::read('App.encoding')));
+		}
+
+		if ($this->requestedWith('xml')) {
+			if (!class_exists('XmlNode')) {
+				App::import('Core', 'Xml');
+			}
+			$xml = new Xml(trim(file_get_contents('php://input')));
+
+			if (count($xml->children) == 1 && is_object($dataNode = $xml->child('data'))) {
+				$controller->data = $dataNode->toArray();
+			} else {
+				$controller->data = $xml->toArray();
+			}
+		}
+	}
+
+/**
+ * Handles (fakes) redirects for Ajax requests using requestAction()
+ *
+ * @param object $controller A reference to the controller
+ * @param mixed $url A string or array containing the redirect location
+ * @param mixed HTTP Status for redirect
+ * @access public
+ */
+	function beforeRedirect(&$controller, $url, $status = null) {
+		if (!$this->isAjax()) {
+			return;
+		}
+		foreach ($_POST as $key => $val) {
+			unset($_POST[$key]);
+		}
+		if (is_array($url)) {
+			$url = Router::url($url + array('base' => false));
+		}
+		if (!empty($status)) {
+			$statusCode = $controller->httpCodes($status);
+			$code = key($statusCode);
+			$msg = $statusCode[$code];
+			$controller->header("HTTP/1.1 {$code} {$msg}");
+		}
+		echo $this->requestAction($url, array('return', 'bare' => false));
+		$this->_stop();
+	}
+
+/**
+ * Returns true if the current HTTP request is Ajax, false otherwise
+ *
+ * @return boolean True if call is Ajax
+ * @access public
+ */
+	function isAjax() {
+		return env('HTTP_X_REQUESTED_WITH') === "XMLHttpRequest";
+	}
+
+/**
+ * Returns true if the current HTTP request is coming from a Flash-based client
+ *
+ * @return boolean True if call is from Flash
+ * @access public
+ */
+	function isFlash() {
+		return (preg_match('/^(Shockwave|Adobe) Flash/', env('HTTP_USER_AGENT')) == 1);
+	}
+
+/**
+ * Returns true if the current request is over HTTPS, false otherwise.
+ *
+ * @return bool True if call is over HTTPS
+ * @access public
+ */
+	function isSSL() {
+		return env('HTTPS');
+	}
+
+/**
+ * Returns true if the current call accepts an XML response, false otherwise
+ *
+ * @return boolean True if client accepts an XML response
+ * @access public
+ */
+	function isXml() {
+		return $this->prefers('xml');
+	}
+
+/**
+ * Returns true if the current call accepts an RSS response, false otherwise
+ *
+ * @return boolean True if client accepts an RSS response
+ * @access public
+ */
+	function isRss() {
+		return $this->prefers('rss');
+	}
+
+/**
+ * Returns true if the current call accepts an Atom response, false otherwise
+ *
+ * @return boolean True if client accepts an RSS response
+ * @access public
+ */
+	function isAtom() {
+		return $this->prefers('atom');
+	}
+
+/**
+ * Returns true if user agent string matches a mobile web browser, or if the
+ * client accepts WAP content.
+ *
+ * @return boolean True if user agent is a mobile web browser
+ * @access public
+ * @deprecated Use of constant REQUEST_MOBILE_UA is deprecated and will be removed in future versions
+ */
+	function isMobile() {
+		if (defined('REQUEST_MOBILE_UA')) {
+			$regex = '/' . REQUEST_MOBILE_UA . '/i';
+		} else {
+			$regex = '/' . implode('|', $this->mobileUA) . '/i';
+		}
+
+		if (preg_match($regex, env('HTTP_USER_AGENT')) || $this->accepts('wap')) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Returns true if the client accepts WAP content
+ *
+ * @return bool
+ * @access public
+ */
+	function isWap() {
+		return $this->prefers('wap');
+	}
+
+/**
+ * Returns true if the current call a POST request
+ *
+ * @return boolean True if call is a POST
+ * @access public
+ */
+	function isPost() {
+		return (strtolower(env('REQUEST_METHOD')) == 'post');
+	}
+
+/**
+ * Returns true if the current call a PUT request
+ *
+ * @return boolean True if call is a PUT
+ * @access public
+ */
+	function isPut() {
+		return (strtolower(env('REQUEST_METHOD')) == 'put');
+	}
+
+/**
+ * Returns true if the current call a GET request
+ *
+ * @return boolean True if call is a GET
+ * @access public
+ */
+	function isGet() {
+		return (strtolower(env('REQUEST_METHOD')) == 'get');
+	}
+
+/**
+ * Returns true if the current call a DELETE request
+ *
+ * @return boolean True if call is a DELETE
+ * @access public
+ */
+	function isDelete() {
+		return (strtolower(env('REQUEST_METHOD')) == 'delete');
+	}
+
+/**
+ * Gets Prototype version if call is Ajax, otherwise empty string.
+ * The Prototype library sets a special "Prototype version" HTTP header.
+ *
+ * @return string Prototype version of component making Ajax call
+ * @access public
+ */
+	function getAjaxVersion() {
+		if (env('HTTP_X_PROTOTYPE_VERSION') != null) {
+			return env('HTTP_X_PROTOTYPE_VERSION');
+		}
+		return false;
+	}
+
+/**
+ * Adds/sets the Content-type(s) for the given name.  This method allows
+ * content-types to be mapped to friendly aliases (or extensions), which allows
+ * RequestHandler to automatically respond to requests of that type in the
+ * startup method.
+ *
+ * @param string $name The name of the Content-type, i.e. "html", "xml", "css"
+ * @param mixed $type The Content-type or array of Content-types assigned to the name,
+ *    i.e. "text/html", or "application/xml"
+ * @return void
+ * @access public
+ */
+	function setContent($name, $type = null) {
+		if (is_array($name)) {
+			$this->__requestContent = array_merge($this->__requestContent, $name);
+			return;
+		}
+		$this->__requestContent[$name] = $type;
+	}
+
+/**
+ * Gets the server name from which this request was referred
+ *
+ * @return string Server address
+ * @access public
+ */
+	function getReferer() {
+		if (env('HTTP_HOST') != null) {
+			$sessHost = env('HTTP_HOST');
+		}
+
+		if (env('HTTP_X_FORWARDED_HOST') != null) {
+			$sessHost = env('HTTP_X_FORWARDED_HOST');
+		}
+		return trim(preg_replace('/(?:\:.*)/', '', $sessHost));
+	}
+
+/**
+ * Gets remote client IP
+ *
+ * @return string Client IP address
+ * @access public
+ */
+	function getClientIP($safe = true) {
+		if (!$safe && env('HTTP_X_FORWARDED_FOR') != null) {
+			$ipaddr = preg_replace('/(?:,.*)/', '', env('HTTP_X_FORWARDED_FOR'));
+		} else {
+			if (env('HTTP_CLIENT_IP') != null) {
+				$ipaddr = env('HTTP_CLIENT_IP');
+			} else {
+				$ipaddr = env('REMOTE_ADDR');
+			}
+		}
+
+		if (env('HTTP_CLIENTADDRESS') != null) {
+			$tmpipaddr = env('HTTP_CLIENTADDRESS');
+
+			if (!empty($tmpipaddr)) {
+				$ipaddr = preg_replace('/(?:,.*)/', '', $tmpipaddr);
+			}
+		}
+		return trim($ipaddr);
+	}
+
+/**
+ * Determines which content types the client accepts.  Acceptance is based on
+ * the file extension parsed by the Router (if present), and by the HTTP_ACCEPT
+ * header.
+ *
+ * @param mixed $type Can be null (or no parameter), a string type name, or an
+ *   array of types
+ * @return mixed If null or no parameter is passed, returns an array of content
+ *   types the client accepts.  If a string is passed, returns true
+ *   if the client accepts it.  If an array is passed, returns true
+ *   if the client accepts one or more elements in the array.
+ * @access public
+ * @see RequestHandlerComponent::setContent()
+ */
+	function accepts($type = null) {
+		$this->__initializeTypes();
+
+		if ($type == null) {
+			return $this->mapType($this->__acceptTypes);
+
+		} elseif (is_array($type)) {
+			foreach ($type as $t) {
+				if ($this->accepts($t) == true) {
+					return true;
+				}
+			}
+			return false;
+		} elseif (is_string($type)) {
+
+			if (!isset($this->__requestContent[$type])) {
+				return false;
+			}
+
+			$content = $this->__requestContent[$type];
+
+			if (is_array($content)) {
+				foreach ($content as $c) {
+					if (in_array($c, $this->__acceptTypes)) {
+						return true;
+					}
+				}
+			} else {
+				if (in_array($content, $this->__acceptTypes)) {
+					return true;
+				}
+			}
+		}
+	}
+
+/**
+ * Determines the content type of the data the client has sent (i.e. in a POST request)
+ *
+ * @param mixed $type Can be null (or no parameter), a string type name, or an array of types
+ * @return mixed
+ * @access public
+ */
+	function requestedWith($type = null) {
+		if (!$this->isPost() && !$this->isPut()) {
+			return null;
+		}
+
+		list($contentType) = explode(';', env('CONTENT_TYPE'));
+		if ($type == null) {
+			return $this->mapType($contentType);
+		} elseif (is_array($type)) {
+			foreach ($type as $t) {
+				if ($this->requestedWith($t)) {
+					return $this->mapType($t);
+				}
+			}
+			return false;
+		} elseif (is_string($type)) {
+			return ($type == $this->mapType($contentType));
+		}
+	}
+
+/**
+ * Determines which content-types the client prefers.  If no parameters are given,
+ * the content-type that the client most likely prefers is returned.  If $type is
+ * an array, the first item in the array that the client accepts is returned.
+ * Preference is determined primarily by the file extension parsed by the Router
+ * if provided, and secondarily by the list of content-types provided in
+ * HTTP_ACCEPT.
+ *
+ * @param mixed $type An optional array of 'friendly' content-type names, i.e.
+ *   'html', 'xml', 'js', etc.
+ * @return mixed If $type is null or not provided, the first content-type in the
+ *    list, based on preference, is returned.
+ * @access public
+ * @see RequestHandlerComponent::setContent()
+ */
+	function prefers($type = null) {
+		$this->__initializeTypes();
+		$accept = $this->accepts();
+
+		if ($type == null) {
+			if (empty($this->ext)) {
+				if (is_array($accept)) {
+					return $accept[0];
+				}
+				return $accept;
+			}
+			return $this->ext;
+		}
+
+		$types = $type;
+		if (is_string($type)) {
+			$types = array($type);
+		}
+
+		if (count($types) === 1) {
+			if (!empty($this->ext)) {
+				return ($types[0] == $this->ext);
+			}
+			return ($types[0] == $accept[0]);
+		}
+		$accepts = array();
+
+		foreach ($types as $type) {
+			if (in_array($type, $accept)) {
+				$accepts[] = $type;
+			}
+		}
+
+		if (count($accepts) === 0) {
+			return false;
+		} elseif (count($types) === 1) {
+			return ($types[0] === $accepts[0]);
+		} elseif (count($accepts) === 1) {
+			return $accepts[0];
+		}
+
+		$acceptedTypes = array();
+		foreach ($this->__acceptTypes as $type) {
+			$acceptedTypes[] = $this->mapType($type);
+		}
+		$accepts = array_intersect($acceptedTypes, $accepts);
+		return $accepts[0];
+	}
+
+/**
+ * Sets the layout and template paths for the content type defined by $type.
+ *
+ * @param object $controller A reference to a controller object
+ * @param string $type Type of response to send (e.g: 'ajax')
+ * @return void
+ * @access public
+ * @see RequestHandlerComponent::setContent()
+ * @see RequestHandlerComponent::respondAs()
+ */
+	function renderAs(&$controller, $type) {
+		$this->__initializeTypes();
+		$options = array('charset' => 'UTF-8');
+
+		if (Configure::read('App.encoding') !== null) {
+			$options = array('charset' => Configure::read('App.encoding'));
+		}
+
+		if ($type == 'ajax') {
+			$controller->layout = $this->ajaxLayout;
+			return $this->respondAs('html', $options);
+		}
+		$controller->ext = '.ctp';
+
+		if (empty($this->__renderType)) {
+			$controller->viewPath .= DS . $type;
+		} else {
+			$remove = preg_replace("/([\/\\\\]{$this->__renderType})$/", DS . $type, $controller->viewPath);
+			$controller->viewPath = $remove;
+		}
+		$this->__renderType = $type;
+		$controller->layoutPath = $type;
+
+		if (isset($this->__requestContent[$type])) {
+			$this->respondAs($type, $options);
+		}
+
+		$helper = ucfirst($type);
+		$isAdded = (
+			in_array($helper, $controller->helpers) ||
+			array_key_exists($helper, $controller->helpers)
+		);
+
+		if (!$isAdded) {
+			if (App::import('Helper', $helper)) {
+				$controller->helpers[] = $helper;
+			}
+		}
+	}
+
+/**
+ * Sets the response header based on type map index name.  If DEBUG is greater than 2, the header
+ * is not set.
+ *
+ * @param mixed $type Friendly type name, i.e. 'html' or 'xml', or a full content-type,
+ *    like 'application/x-shockwave'.
+ * @param array $options If $type is a friendly type name that is associated with
+ *    more than one type of content, $index is used to select which content-type to use.
+ * @return boolean Returns false if the friendly type name given in $type does
+ *    not exist in the type map, or if the Content-type header has
+ *    already been set by this method.
+ * @access public
+ * @see RequestHandlerComponent::setContent()
+ */
+	function respondAs($type, $options = array()) {
+		$this->__initializeTypes();
+		if (!array_key_exists($type, $this->__requestContent) && strpos($type, '/') === false) {
+			return false;
+		}
+		$defaults = array('index' => 0, 'charset' => null, 'attachment' => false);
+		$options = array_merge($defaults, $options);
+
+		if (strpos($type, '/') === false && isset($this->__requestContent[$type])) {
+			$cType = null;
+			if (is_array($this->__requestContent[$type]) && isset($this->__requestContent[$type][$options['index']])) {
+				$cType = $this->__requestContent[$type][$options['index']];
+			} elseif (is_array($this->__requestContent[$type]) && isset($this->__requestContent[$type][0])) {
+				$cType = $this->__requestContent[$type][0];
+			} elseif (isset($this->__requestContent[$type])) {
+				$cType = $this->__requestContent[$type];
+			} else {
+				return false;
+			}
+
+			if (is_array($cType)) {
+				if ($this->prefers($cType)) {
+					$cType = $this->prefers($cType);
+				} else {
+					$cType = $cType[0];
+				}
+			}
+		} else {
+			$cType = $type;
+		}
+
+		if ($cType != null) {
+			$header = 'Content-type: ' . $cType;
+
+			if (!empty($options['charset'])) {
+				$header .= '; charset=' . $options['charset'];
+			}
+			if (!empty($options['attachment'])) {
+				$this->_header("Content-Disposition: attachment; filename=\"{$options['attachment']}\"");
+			}
+			if (Configure::read() < 2 && !defined('CAKEPHP_SHELL') && empty($this->params['requested'])) {
+				$this->_header($header);
+			}
+			$this->__responseTypeSet = $cType;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Wrapper for header() so calls can be easily tested.
+ *
+ * @param string $header The header to be sent.
+ * @return void
+ * @access protected
+ */
+	function _header($header) {
+		header($header);
+	}
+
+/**
+ * Returns the current response type (Content-type header), or null if none has been set
+ *
+ * @return mixed A string content type alias, or raw content type if no alias map exists,
+ *    otherwise null
+ * @access public
+ */
+	function responseType() {
+		if ($this->__responseTypeSet == null) {
+			return null;
+		}
+		return $this->mapType($this->__responseTypeSet);
+	}
+
+/**
+ * Maps a content-type back to an alias
+ *
+ * @param mixed $type Content type
+ * @return mixed Alias
+ * @access public
+ */
+	function mapType($ctype) {
+		if (is_array($ctype)) {
+			$out = array();
+			foreach ($ctype as $t) {
+				$out[] = $this->mapType($t);
+			}
+			return $out;
+		} else {
+			$keys = array_keys($this->__requestContent);
+			$count = count($keys);
+
+			for ($i = 0; $i < $count; $i++) {
+				$name = $keys[$i];
+				$type = $this->__requestContent[$name];
+
+				if (is_array($type) && in_array($ctype, $type)) {
+					return $name;
+				} elseif (!is_array($type) && $type == $ctype) {
+					return $name;
+				}
+			}
+			return $ctype;
+		}
+	}
+
+/**
+ * Initializes MIME types
+ *
+ * @return void
+ * @access private
+ */
+	function __initializeTypes() {
+		if ($this->__typesInitialized) {
+			return;
+		}
+		if (isset($this->__requestContent[$this->ext])) {
+			$content = $this->__requestContent[$this->ext];
+			if (is_array($content)) {
+				$content = $content[0];
+			}
+			array_unshift($this->__acceptTypes, $content);
+		}
+		$this->__typesInitialized = true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/security.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/security.php
new file mode 100644
index 000000000..0de6c6ae4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/security.php
@@ -0,0 +1,747 @@
+<?php
+/**
+ * Security Component
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @since         CakePHP(tm) v 0.10.8.2156
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('String', 'Security'));
+
+/**
+ * SecurityComponent
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @link http://book.cakephp.org/view/1296/Security-Component
+ */
+class SecurityComponent extends Object {
+
+/**
+ * The controller method that will be called if this request is black-hole'd
+ *
+ * @var string
+ * @access public
+ */
+	var $blackHoleCallback = null;
+
+/**
+ * List of controller actions for which a POST request is required
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requirePost()
+ */
+	var $requirePost = array();
+
+/**
+ * List of controller actions for which a GET request is required
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireGet()
+ */
+	var $requireGet = array();
+
+/**
+ * List of controller actions for which a PUT request is required
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requirePut()
+ */
+	var $requirePut = array();
+
+/**
+ * List of controller actions for which a DELETE request is required
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireDelete()
+ */
+	var $requireDelete = array();
+
+/**
+ * List of actions that require an SSL-secured connection
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireSecure()
+ */
+	var $requireSecure = array();
+
+/**
+ * List of actions that require a valid authentication key
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireAuth()
+ */
+	var $requireAuth = array();
+
+/**
+ * List of actions that require an HTTP-authenticated login (basic or digest)
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireLogin()
+ */
+	var $requireLogin = array();
+
+/**
+ * Login options for SecurityComponent::requireLogin()
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireLogin()
+ */
+	var $loginOptions = array('type' => '', 'prompt' => null);
+
+/**
+ * An associative array of usernames/passwords used for HTTP-authenticated logins.
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireLogin()
+ */
+	var $loginUsers = array();
+
+/**
+ * Controllers from which actions of the current controller are allowed to receive
+ * requests.
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireAuth()
+ */
+	var $allowedControllers = array();
+
+/**
+ * Actions from which actions of the current controller are allowed to receive
+ * requests.
+ *
+ * @var array
+ * @access public
+ * @see SecurityComponent::requireAuth()
+ */
+	var $allowedActions = array();
+
+/**
+ * Form fields to disable
+ *
+ * @var array
+ * @access public
+ */
+	var $disabledFields = array();
+
+/**
+ * Whether to validate POST data.  Set to false to disable for data coming from 3rd party
+ * services, etc.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $validatePost = true;
+
+/**
+ * Other components used by the Security component
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('RequestHandler', 'Session');
+
+/**
+ * Holds the current action of the controller
+ *
+ * @var string
+ */
+	var $_action = null;
+
+/**
+ * Initialize the SecurityComponent
+ *
+ * @param object $controller Controller instance for the request
+ * @param array $settings Settings to set to the component
+ * @return void
+ * @access public
+ */
+	function initialize(&$controller, $settings = array()) {
+		$this->_set($settings);
+	}
+
+/**
+ * Component startup. All security checking happens here.
+ *
+ * @param object $controller Instantiating controller
+ * @return void
+ * @access public
+ */
+	function startup(&$controller) {
+		$this->_action = strtolower($controller->action);
+		$this->_methodsRequired($controller);
+		$this->_secureRequired($controller);
+		$this->_authRequired($controller);
+		$this->_loginRequired($controller);
+
+		$isPost = ($this->RequestHandler->isPost() || $this->RequestHandler->isPut());
+		$isRequestAction = (
+			!isset($controller->params['requested']) ||
+			$controller->params['requested'] != 1
+		);
+
+		if ($isPost && $isRequestAction && $this->validatePost) {
+			if ($this->_validatePost($controller) === false) {
+				if (!$this->blackHole($controller, 'auth')) {
+					return null;
+				}
+			}
+		}
+		$this->_generateToken($controller);
+	}
+
+/**
+ * Sets the actions that require a POST request, or empty for all actions
+ *
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1299/requirePost
+ */
+	function requirePost() {
+		$args = func_get_args();
+		$this->_requireMethod('Post', $args);
+	}
+
+/**
+ * Sets the actions that require a GET request, or empty for all actions
+ *
+ * @return void
+ * @access public
+ */
+	function requireGet() {
+		$args = func_get_args();
+		$this->_requireMethod('Get', $args);
+	}
+
+/**
+ * Sets the actions that require a PUT request, or empty for all actions
+ *
+ * @return void
+ * @access public
+ */
+	function requirePut() {
+		$args = func_get_args();
+		$this->_requireMethod('Put', $args);
+	}
+
+/**
+ * Sets the actions that require a DELETE request, or empty for all actions
+ *
+ * @return void
+ * @access public
+ */
+	function requireDelete() {
+		$args = func_get_args();
+		$this->_requireMethod('Delete', $args);
+	}
+
+/**
+ * Sets the actions that require a request that is SSL-secured, or empty for all actions
+ *
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1300/requireSecure
+ */
+	function requireSecure() {
+		$args = func_get_args();
+		$this->_requireMethod('Secure', $args);
+	}
+
+/**
+ * Sets the actions that require an authenticated request, or empty for all actions
+ *
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1301/requireAuth
+ */
+	function requireAuth() {
+		$args = func_get_args();
+		$this->_requireMethod('Auth', $args);
+	}
+
+/**
+ * Sets the actions that require an HTTP-authenticated request, or empty for all actions
+ *
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1302/requireLogin
+ */
+	function requireLogin() {
+		$args = func_get_args();
+		$base = $this->loginOptions;
+
+		foreach ($args as $i => $arg) {
+			if (is_array($arg)) {
+				$this->loginOptions = $arg;
+				unset($args[$i]);
+			}
+		}
+		$this->loginOptions = array_merge($base, $this->loginOptions);
+		$this->_requireMethod('Login', $args);
+
+		if (isset($this->loginOptions['users'])) {
+			$this->loginUsers =& $this->loginOptions['users'];
+		}
+	}
+
+/**
+ * Attempts to validate the login credentials for an HTTP-authenticated request
+ *
+ * @param string $type Either 'basic', 'digest', or null. If null/empty, will try both.
+ * @return mixed If successful, returns an array with login name and password, otherwise null.
+ * @access public
+ * @link http://book.cakephp.org/view/1303/loginCredentials-string-type
+ */
+	function loginCredentials($type = null) {
+		switch (strtolower($type)) {
+			case 'basic':
+				$login = array('username' => env('PHP_AUTH_USER'), 'password' => env('PHP_AUTH_PW'));
+				if (!empty($login['username'])) {
+					return $login;
+				}
+			break;
+			case 'digest':
+			default:
+				$digest = null;
+
+				if (version_compare(PHP_VERSION, '5.1') != -1) {
+					$digest = env('PHP_AUTH_DIGEST');
+				} elseif (function_exists('apache_request_headers')) {
+					$headers = apache_request_headers();
+					if (isset($headers['Authorization']) && !empty($headers['Authorization']) && substr($headers['Authorization'], 0, 7) == 'Digest ') {
+						$digest = substr($headers['Authorization'], 7);
+					}
+				} else {
+					// Server doesn't support digest-auth headers
+					trigger_error(__('SecurityComponent::loginCredentials() - Server does not support digest authentication', true), E_USER_WARNING);
+				}
+
+				if (!empty($digest)) {
+					return $this->parseDigestAuthData($digest);
+				}
+			break;
+		}
+		return null;
+	}
+
+/**
+ * Generates the text of an HTTP-authentication request header from an array of options.
+ *
+ * @param array $options Set of options for header
+ * @return string HTTP-authentication request header
+ * @access public
+ * @link http://book.cakephp.org/view/1304/loginRequest-array-options
+ */
+	function loginRequest($options = array()) {
+		$options = array_merge($this->loginOptions, $options);
+		$this->_setLoginDefaults($options);
+		$auth = 'WWW-Authenticate: ' . ucfirst($options['type']);
+		$out = array('realm="' . $options['realm'] . '"');
+
+		if (strtolower($options['type']) == 'digest') {
+			$out[] = 'qop="auth"';
+			$out[] = 'nonce="' . uniqid("") . '"';
+			$out[] = 'opaque="' . md5($options['realm']) . '"';
+		}
+
+		return $auth . ' ' . implode(',', $out);
+	}
+
+/**
+ * Parses an HTTP digest authentication response, and returns an array of the data, or null on failure.
+ *
+ * @param string $digest Digest authentication response
+ * @return array Digest authentication parameters
+ * @access public
+ * @link http://book.cakephp.org/view/1305/parseDigestAuthData-string-digest
+ */
+	function parseDigestAuthData($digest) {
+		if (substr($digest, 0, 7) == 'Digest ') {
+			$digest = substr($digest, 7);
+		}
+		$keys = array();
+		$match = array();
+		$req = array('nonce' => 1, 'nc' => 1, 'cnonce' => 1, 'qop' => 1, 'username' => 1, 'uri' => 1, 'response' => 1);
+		preg_match_all('/(\w+)=([\'"]?)([a-zA-Z0-9@=.\/_-]+)\2/', $digest, $match, PREG_SET_ORDER);
+
+		foreach ($match as $i) {
+			$keys[$i[1]] = $i[3];
+			unset($req[$i[1]]);
+		}
+
+		if (empty($req)) {
+			return $keys;
+		}
+		return null;
+	}
+
+/**
+ * Generates a hash to be compared with an HTTP digest-authenticated response
+ *
+ * @param array $data HTTP digest response data, as parsed by SecurityComponent::parseDigestAuthData()
+ * @return string Digest authentication hash
+ * @access public
+ * @see SecurityComponent::parseDigestAuthData()
+ * @link http://book.cakephp.org/view/1306/generateDigestResponseHash-array-data
+ */
+	function generateDigestResponseHash($data) {
+		return md5(
+			md5($data['username'] . ':' . $this->loginOptions['realm'] . ':' . $this->loginUsers[$data['username']]) .
+			':' . $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' .
+			md5(env('REQUEST_METHOD') . ':' . $data['uri'])
+		);
+	}
+
+/**
+ * Black-hole an invalid request with a 404 error or custom callback. If SecurityComponent::$blackHoleCallback
+ * is specified, it will use this callback by executing the method indicated in $error
+ *
+ * @param object $controller Instantiating controller
+ * @param string $error Error method
+ * @return mixed If specified, controller blackHoleCallback's response, or no return otherwise
+ * @access public
+ * @see SecurityComponent::$blackHoleCallback
+ * @link http://book.cakephp.org/view/1307/blackHole-object-controller-string-error
+ */
+	function blackHole(&$controller, $error = '') {
+		if ($this->blackHoleCallback == null) {
+			$code = 404;
+			if ($error == 'login') {
+				$code = 401;
+				$controller->header($this->loginRequest());
+			}
+			$controller->redirect(null, $code, true);
+		} else {
+			return $this->_callback($controller, $this->blackHoleCallback, array($error));
+		}
+	}
+
+/**
+ * Sets the actions that require a $method HTTP request, or empty for all actions
+ *
+ * @param string $method The HTTP method to assign controller actions to
+ * @param array $actions Controller actions to set the required HTTP method to.
+ * @return void
+ * @access protected
+ */
+	function _requireMethod($method, $actions = array()) {
+		if (isset($actions[0]) && is_array($actions[0])) {
+			$actions = $actions[0];
+		}
+		$this->{'require' . $method} = (empty($actions)) ? array('*'): $actions;
+	}
+
+/**
+ * Check if HTTP methods are required
+ *
+ * @param object $controller Instantiating controller
+ * @return bool true if $method is required
+ * @access protected
+ */
+	function _methodsRequired(&$controller) {
+		foreach (array('Post', 'Get', 'Put', 'Delete') as $method) {
+			$property = 'require' . $method;
+			if (is_array($this->$property) && !empty($this->$property)) {
+				$require = array_map('strtolower', $this->$property);
+
+				if (in_array($this->_action, $require) || $this->$property == array('*')) {
+					if (!$this->RequestHandler->{'is' . $method}()) {
+						if (!$this->blackHole($controller, strtolower($method))) {
+							return null;
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Check if access requires secure connection
+ *
+ * @param object $controller Instantiating controller
+ * @return bool true if secure connection required
+ * @access protected
+ */
+	function _secureRequired(&$controller) {
+		if (is_array($this->requireSecure) && !empty($this->requireSecure)) {
+			$requireSecure = array_map('strtolower', $this->requireSecure);
+
+			if (in_array($this->_action, $requireSecure) || $this->requireSecure == array('*')) {
+				if (!$this->RequestHandler->isSSL()) {
+					if (!$this->blackHole($controller, 'secure')) {
+						return null;
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Check if authentication is required
+ *
+ * @param object $controller Instantiating controller
+ * @return bool true if authentication required
+ * @access protected
+ */
+	function _authRequired(&$controller) {
+		if (is_array($this->requireAuth) && !empty($this->requireAuth) && !empty($controller->data)) {
+			$requireAuth = array_map('strtolower', $this->requireAuth);
+
+			if (in_array($this->_action, $requireAuth) || $this->requireAuth == array('*')) {
+				if (!isset($controller->data['_Token'] )) {
+					if (!$this->blackHole($controller, 'auth')) {
+						return null;
+					}
+				}
+
+				if ($this->Session->check('_Token')) {
+					$tData = unserialize($this->Session->read('_Token'));
+
+					if (!empty($tData['allowedControllers']) && !in_array($controller->params['controller'], $tData['allowedControllers']) || !empty($tData['allowedActions']) && !in_array($controller->params['action'], $tData['allowedActions'])) {
+						if (!$this->blackHole($controller, 'auth')) {
+							return null;
+						}
+					}
+				} else {
+					if (!$this->blackHole($controller, 'auth')) {
+						return null;
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Check if login is required
+ *
+ * @param object $controller Instantiating controller
+ * @return bool true if login is required
+ * @access protected
+ */
+	function _loginRequired(&$controller) {
+		if (is_array($this->requireLogin) && !empty($this->requireLogin)) {
+			$requireLogin = array_map('strtolower', $this->requireLogin);
+
+			if (in_array($this->_action, $requireLogin) || $this->requireLogin == array('*')) {
+				$login = $this->loginCredentials($this->loginOptions['type']);
+
+				if ($login == null) {
+					$controller->header($this->loginRequest());
+
+					if (!empty($this->loginOptions['prompt'])) {
+						$this->_callback($controller, $this->loginOptions['prompt']);
+					} else {
+						$this->blackHole($controller, 'login');
+					}
+				} else {
+					if (isset($this->loginOptions['login'])) {
+						$this->_callback($controller, $this->loginOptions['login'], array($login));
+					} else {
+						if (strtolower($this->loginOptions['type']) == 'digest') {
+							if ($login && isset($this->loginUsers[$login['username']])) {
+								if ($login['response'] == $this->generateDigestResponseHash($login)) {
+									return true;
+								}
+							}
+							$this->blackHole($controller, 'login');
+						} else {
+							if (
+								!(in_array($login['username'], array_keys($this->loginUsers)) &&
+								$this->loginUsers[$login['username']] == $login['password'])
+							) {
+								$this->blackHole($controller, 'login');
+							}
+						}
+					}
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Validate submitted form
+ *
+ * @param object $controller Instantiating controller
+ * @return bool true if submitted form is valid
+ * @access protected
+ */
+	function _validatePost(&$controller) {
+		if (empty($controller->data)) {
+			return true;
+		}
+		$data = $controller->data;
+
+		if (!isset($data['_Token']) || !isset($data['_Token']['fields']) || !isset($data['_Token']['key'])) {
+			return false;
+		}
+		$token = $data['_Token']['key'];
+
+		if ($this->Session->check('_Token')) {
+			$tokenData = unserialize($this->Session->read('_Token'));
+
+			if ($tokenData['expires'] < time() || $tokenData['key'] !== $token) {
+				return false;
+			}
+		}
+
+		$locked = null;
+		$check = $controller->data;
+		$token = urldecode($check['_Token']['fields']);
+
+		if (strpos($token, ':')) {
+			list($token, $locked) = explode(':', $token, 2);
+		}
+		unset($check['_Token']);
+
+		$locked = explode('|', $locked);
+
+		$lockedFields = array();
+		$fields = Set::flatten($check);
+		$fieldList = array_keys($fields);
+		$multi = array();
+
+		foreach ($fieldList as $i => $key) {
+			if (preg_match('/\.\d+$/', $key)) {
+				$multi[$i] = preg_replace('/\.\d+$/', '', $key);
+				unset($fieldList[$i]);
+			}
+		}
+		if (!empty($multi)) {
+			$fieldList += array_unique($multi);
+		}
+
+		foreach ($fieldList as $i => $key) {
+			$isDisabled = false;
+			$isLocked = (is_array($locked) && in_array($key, $locked));
+
+			if (!empty($this->disabledFields)) {
+				foreach ((array)$this->disabledFields as $disabled) {
+					$disabled = explode('.', $disabled);
+					$field = array_values(array_intersect(explode('.', $key), $disabled));
+					$isDisabled = ($field === $disabled);
+					if ($isDisabled) {
+						break;
+					}
+				}
+			}
+
+			if ($isDisabled || $isLocked) {
+				unset($fieldList[$i]);
+				if ($isLocked) {
+					$lockedFields[$key] = $fields[$key];
+				}
+			}
+		}
+		sort($fieldList, SORT_STRING);
+		ksort($lockedFields, SORT_STRING);
+
+		$fieldList += $lockedFields;
+		$check = Security::hash(serialize($fieldList) . Configure::read('Security.salt'));
+		return ($token === $check);
+	}
+
+/**
+ * Add authentication key for new form posts
+ *
+ * @param object $controller Instantiating controller
+ * @return bool Success
+ * @access protected
+ */
+	function _generateToken(&$controller) {
+		if (isset($controller->params['requested']) && $controller->params['requested'] === 1) {
+			if ($this->Session->check('_Token')) {
+				$tokenData = unserialize($this->Session->read('_Token'));
+				$controller->params['_Token'] = $tokenData;
+			}
+			return false;
+		}
+		$authKey = Security::generateAuthKey();
+		$expires = strtotime('+' . Security::inactiveMins() . ' minutes');
+		$token = array(
+			'key' => $authKey,
+			'expires' => $expires,
+			'allowedControllers' => $this->allowedControllers,
+			'allowedActions' => $this->allowedActions,
+			'disabledFields' => $this->disabledFields
+		);
+
+		if (!isset($controller->data)) {
+			$controller->data = array();
+		}
+
+		if ($this->Session->check('_Token')) {
+			$tokenData = unserialize($this->Session->read('_Token'));
+			$valid = (
+				isset($tokenData['expires']) &&
+				$tokenData['expires'] > time() &&
+				isset($tokenData['key'])
+			);
+
+			if ($valid) {
+				$token['key'] = $tokenData['key'];
+			}
+		}
+		$controller->params['_Token'] = $token;
+		$this->Session->write('_Token', serialize($token));
+		return true;
+	}
+
+/**
+ * Sets the default login options for an HTTP-authenticated request
+ *
+ * @param array $options Default login options
+ * @return void
+ * @access protected
+ */
+	function _setLoginDefaults(&$options) {
+		$options = array_merge(array(
+			'type' => 'basic',
+			'realm' => env('SERVER_NAME'),
+			'qop' => 'auth',
+			'nonce' => String::uuid()
+		), array_filter($options));
+		$options = array_merge(array('opaque' => md5($options['realm'])), $options);
+	}
+
+/**
+ * Calls a controller callback method
+ *
+ * @param object $controller Controller to run callback on
+ * @param string $method Method to execute
+ * @param array $params Parameters to send to method
+ * @return mixed Controller callback method's response
+ * @access protected
+ */
+	function _callback(&$controller, $method, $params = array()) {
+		if (is_callable(array($controller, $method))) {
+			return call_user_func_array(array(&$controller, $method), empty($params) ? null : $params);
+		} else {
+			return null;
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/session.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/session.php
new file mode 100644
index 000000000..60af59b38
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/components/session.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * SessionComponent.  Provides access to Sessions from the Controller layer
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @since         CakePHP(tm) v 0.10.0.1232
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('cakesession')) {
+	require LIBS . 'cake_session.php';
+}
+
+/**
+ * Session Component.
+ *
+ * Session handling from the controller.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller.components
+ * @link http://book.cakephp.org/view/1310/Sessions
+ *
+ */
+class SessionComponent extends CakeSession {
+
+/**
+ * Used to determine if methods implementation is used, or bypassed
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__active = true;
+
+/**
+ * Used to determine if request are from an Ajax request
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__bare = 0;
+
+/**
+ * Class constructor
+ *
+ * @param string $base The base path for the Session
+ */
+	function __construct($base = null) {
+		if (Configure::read('Session.start') === true) {
+			parent::__construct($base);
+		} else {
+			$this->__active = false;
+		}
+	}
+
+/**
+ * Startup method.
+ *
+ * @param object $controller Instantiating controller
+ * @return void
+ * @access public
+ */
+	function startup(&$controller) {
+		if ($this->started() === false && $this->__active === true) {
+			$this->__start();
+		}
+	}
+
+/**
+ * Starts Session on if 'Session.start' is set to false in core.php
+ *
+ * @param string $base The base path for the Session
+ * @return void
+ * @access public
+ */
+	function activate($base = null) {
+		if ($this->__active === true) {
+			return;
+		}
+		parent::__construct($base);
+		$this->__active = true;
+	}
+
+/**
+ * Used to write a value to a session key.
+ *
+ * In your controller: $this->Session->write('Controller.sessKey', 'session value');
+ *
+ * @param string $name The name of the key your are setting in the session.
+ * 							This should be in a Controller.key format for better organizing
+ * @param string $value The value you want to store in a session.
+ * @return boolean Success
+ * @access public
+ * @link http://book.cakephp.org/view/1312/write
+ */
+	function write($name, $value = null) {
+		if ($this->__active === true) {
+			$this->__start();
+			if (is_array($name)) {
+				foreach ($name as $key => $value) {
+					if (parent::write($key, $value) === false) {
+						return false;
+					}
+				}
+				return true;
+			}
+			if (parent::write($name, $value) === false) {
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Used to read a session values for a key or return values for all keys.
+ *
+ * In your controller: $this->Session->read('Controller.sessKey');
+ * Calling the method without a param will return all session vars
+ *
+ * @param string $name the name of the session key you want to read
+ * @return mixed value from the session vars
+ * @access public
+ * @link http://book.cakephp.org/view/1314/read
+ */
+	function read($name = null) {
+		if ($this->__active === true) {
+			$this->__start();
+			return parent::read($name);
+		}
+		return false;
+	}
+
+/**
+ * Wrapper for SessionComponent::del();
+ *
+ * In your controller: $this->Session->delete('Controller.sessKey');
+ *
+ * @param string $name the name of the session key you want to delete
+ * @return boolean true is session variable is set and can be deleted, false is variable was not set.
+ * @access public
+ * @link http://book.cakephp.org/view/1316/delete
+ */
+	function delete($name) {
+		if ($this->__active === true) {
+			$this->__start();
+			return parent::delete($name);
+		}
+		return false;
+	}
+
+/**
+ * Used to check if a session variable is set
+ *
+ * In your controller: $this->Session->check('Controller.sessKey');
+ *
+ * @param string $name the name of the session key you want to check
+ * @return boolean true is session variable is set, false if not
+ * @access public
+ * @link http://book.cakephp.org/view/1315/check
+ */
+	function check($name) {
+		if ($this->__active === true) {
+			$this->__start();
+			return parent::check($name);
+		}
+		return false;
+	}
+
+/**
+ * Used to determine the last error in a session.
+ *
+ * In your controller: $this->Session->error();
+ *
+ * @return string Last session error
+ * @access public
+ * @link http://book.cakephp.org/view/1318/error
+ */
+	function error() {
+		if ($this->__active === true) {
+			$this->__start();
+			return parent::error();
+		}
+		return false;
+	}
+
+/**
+ * Used to set a session variable that can be used to output messages in the view.
+ *
+ * In your controller: $this->Session->setFlash('This has been saved');
+ *
+ * Additional params below can be passed to customize the output, or the Message.[key]
+ *
+ * @param string $message Message to be flashed
+ * @param string $element Element to wrap flash message in.
+ * @param array $params Parameters to be sent to layout as view variables
+ * @param string $key Message key, default is 'flash'
+ * @access public
+ * @link http://book.cakephp.org/view/1313/setFlash
+ */
+	function setFlash($message, $element = 'default', $params = array(), $key = 'flash') {
+		if ($this->__active === true) {
+			$this->__start();
+			$this->write('Message.' . $key, compact('message', 'element', 'params'));
+		}
+	}
+
+/**
+ * Used to renew a session id
+ *
+ * In your controller: $this->Session->renew();
+ *
+ * @return void
+ * @access public
+ */
+	function renew() {
+		if ($this->__active === true) {
+			$this->__start();
+			parent::renew();
+		}
+	}
+
+/**
+ * Used to check for a valid session.
+ *
+ * In your controller: $this->Session->valid();
+ *
+ * @return boolean true is session is valid, false is session is invalid
+ * @access public
+ */
+	function valid() {
+		if ($this->__active === true) {
+			$this->__start();
+			return parent::valid();
+		}
+		return false;
+	}
+
+/**
+ * Used to destroy sessions
+ *
+ * In your controller: $this->Session->destroy();
+ *
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1317/destroy
+ */
+	function destroy() {
+		if ($this->__active === true) {
+			$this->__start();
+			parent::destroy();
+		}
+	}
+
+/**
+ * Returns Session id
+ *
+ * If $id is passed in a beforeFilter, the Session will be started
+ * with the specified id
+ *
+ * @param $id string
+ * @return string
+ * @access public
+ */
+	function id($id = null) {
+		return parent::id($id);
+	}
+
+/**
+ * Starts Session if SessionComponent is used in Controller::beforeFilter(),
+ * or is called from
+ *
+ * @return boolean
+ * @access private
+ */
+	function __start() {
+		if ($this->started() === false) {
+			if (!$this->id() && parent::start()) {
+				parent::_checkValid();
+			} else {
+				parent::start();
+			}
+		}
+		return $this->started();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/controller.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/controller.php
new file mode 100644
index 000000000..d0cad823b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/controller.php
@@ -0,0 +1,1321 @@
+<?php
+/**
+ * Base controller class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Include files
+ */
+App::import('Controller', 'Component', false);
+App::import('View', 'View', false);
+/**
+ * Controller
+ *
+ * Application controller class for organization of business logic.
+ * Provides basic functionality, such as rendering views inside layouts,
+ * automatic model availability, redirection, callbacks, and more.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @link          http://book.cakephp.org/view/956/Introduction
+ */
+class Controller extends Object {
+
+/**
+ * The name of this controller. Controller names are plural, named after the model they manipulate.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/959/Controller-Attributes
+ */
+	var $name = null;
+
+/**
+ * Stores the current URL, relative to the webroot of the application.
+ *
+ * @var string
+ * @access public
+ */
+	var $here = null;
+
+/**
+ * The webroot of the application.
+ *
+ * @var string
+ * @access public
+ */
+	var $webroot = null;
+
+/**
+ * The name of the currently requested controller action.
+ *
+ * @var string
+ * @access public
+ */
+	var $action = null;
+
+/**
+ * An array containing the class names of models this controller uses.
+ *
+ * Example: `var $uses = array('Product', 'Post', 'Comment');`
+ *
+ * Can be set to array() to use no models.  Can be set to false to
+ * use no models and prevent the merging of $uses with AppController
+ *
+ * @var mixed A single name as a string or a list of names as an array.
+ * @access protected
+ * @link http://book.cakephp.org/view/961/components-helpers-and-uses
+ */
+	var $uses = false;
+
+/**
+ * An array containing the names of helpers this controller uses. The array elements should
+ * not contain the "Helper" part of the classname.
+ *
+ * Example: `var $helpers = array('Html', 'Javascript', 'Time', 'Ajax');`
+ *
+ * @var mixed A single name as a string or a list of names as an array.
+ * @access protected
+ * @link http://book.cakephp.org/view/961/components-helpers-and-uses
+ */
+	var $helpers = array('Session', 'Html', 'Form');
+
+/**
+ * Parameters received in the current request: GET and POST data, information
+ * about the request, etc.
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/963/The-Parameters-Attribute-params
+ */
+	var $params = array();
+
+/**
+ * Data POSTed to the controller using the HtmlHelper. Data here is accessible
+ * using the `$this->data['ModelName']['fieldName']` pattern.
+ *
+ * @var array
+ * @access public
+ */
+	var $data = array();
+
+/**
+ * Holds pagination defaults for controller actions. The keys that can be included
+ * in this array are: 'conditions', 'fields', 'order', 'limit', 'page', and 'recursive',
+ * similar to the keys in the second parameter of Model::find().
+ *
+ * Pagination defaults can also be supplied in a model-by-model basis by using
+ * the name of the model as a key for a pagination array:
+ *
+ * {{{
+ * var $paginate = array(
+ * 		'Post' => array(...),
+ * 		'Comment' => array(...)
+ * 	);
+ * }}}
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1231/Pagination
+ */
+	var $paginate = array('limit' => 20, 'page' => 1);
+
+/**
+ * The name of the views subfolder containing views for this controller.
+ *
+ * @var string
+ * @access public
+ */
+	var $viewPath = null;
+
+/**
+ * The name of the layouts subfolder containing layouts for this controller.
+ *
+ * @var string
+ * @access public
+ */
+	var $layoutPath = null;
+
+/**
+ * Contains variables to be handed to the view.
+ *
+ * @var array
+ * @access public
+ */
+	var $viewVars = array();
+
+/**
+ * An array containing the class names of the models this controller uses.
+ *
+ * @var array Array of model objects.
+ * @access public
+ */
+	var $modelNames = array();
+
+/**
+ * Base URL path.
+ *
+ * @var string
+ * @access public
+ */
+	var $base = null;
+
+/**
+ * The name of the layout file to render the view inside of. The name specified
+ * is the filename of the layout in /app/views/layouts without the .ctp
+ * extension.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/962/Page-related-Attributes-layout-and-pageTitle
+ */
+	var $layout = 'default';
+
+/**
+ * Set to true to automatically render the view
+ * after action logic.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $autoRender = true;
+
+/**
+ * Set to true to automatically render the layout around views.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $autoLayout = true;
+
+/**
+ * Instance of Component used to handle callbacks.
+ *
+ * @var string
+ * @access public
+ */
+	var $Component = null;
+
+/**
+ * Array containing the names of components this controller uses. Component names
+ * should not contain the "Component" portion of the classname.
+ *
+ * Example: `var $components = array('Session', 'RequestHandler', 'Acl');`
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/961/components-helpers-and-uses
+ */
+	var $components = array('Session');
+
+/**
+ * The name of the View class this controller sends output to.
+ *
+ * @var string
+ * @access public
+ */
+	var $view = 'View';
+
+/**
+ * File extension for view templates. Defaults to Cake's conventional ".ctp".
+ *
+ * @var string
+ * @access public
+ */
+	var $ext = '.ctp';
+
+/**
+ * The output of the requested action.  Contains either a variable
+ * returned from the action, or the data of the rendered view;
+ * You can use this var in child controllers' afterFilter() callbacks to alter output.
+ *
+ * @var string
+ * @access public
+ */
+	var $output = null;
+
+/**
+ * Automatically set to the name of a plugin.
+ *
+ * @var string
+ * @access public
+ */
+	var $plugin = null;
+
+/**
+ * Used to define methods a controller that will be cached. To cache a
+ * single action, the value is set to an array containing keys that match
+ * action names and values that denote cache expiration times (in seconds).
+ *
+ * Example:
+ *
+ * {{{
+ * var $cacheAction = array(
+ *		'view/23/' => 21600,
+ *		'recalled/' => 86400
+ *	);
+ * }}}
+ *
+ * $cacheAction can also be set to a strtotime() compatible string. This
+ * marks all the actions in the controller for view caching.
+ *
+ * @var mixed
+ * @access public
+ * @link http://book.cakephp.org/view/1380/Caching-in-the-Controller
+ */
+	var $cacheAction = false;
+
+/**
+ * Used to create cached instances of models a controller uses.
+ * When set to true, all models related to the controller will be cached.
+ * This can increase performance in many cases.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $persistModel = false;
+
+/**
+ * Holds all params passed and named.
+ *
+ * @var mixed
+ * @access public
+ */
+	var $passedArgs = array();
+
+/**
+ * Triggers Scaffolding
+ *
+ * @var mixed
+ * @access public
+ * @link http://book.cakephp.org/view/1103/Scaffolding
+ */
+	var $scaffold = false;
+
+/**
+ * Holds current methods of the controller
+ *
+ * @var array
+ * @access public
+ * @link
+ */
+	var $methods = array();
+
+/**
+ * This controller's primary model class name, the Inflector::classify()'ed version of
+ * the controller's $name property.
+ *
+ * Example: For a controller named 'Comments', the modelClass would be 'Comment'
+ *
+ * @var string
+ * @access public
+ */
+	var $modelClass = null;
+
+/**
+ * This controller's model key name, an underscored version of the controller's $modelClass property.
+ *
+ * Example: For a controller named 'ArticleComments', the modelKey would be 'article_comment'
+ *
+ * @var string
+ * @access public
+ */
+	var $modelKey = null;
+
+/**
+ * Holds any validation errors produced by the last call of the validateErrors() method/
+ *
+ * @var array Validation errors, or false if none
+ * @access public
+ */
+	var $validationErrors = null;
+
+/**
+ * Contains a list of the HTTP codes that CakePHP recognizes. These may be
+ * queried and/or modified through Controller::httpCodes(), which is also
+ * tasked with their lazy-loading.
+ *
+ * @var array Associative array of HTTP codes and their associated messages.
+ * @access private
+ */
+	var $__httpCodes = null;
+
+/**
+ * Constructor.
+ *
+ */
+	function __construct() {
+		if ($this->name === null) {
+			$r = null;
+			if (!preg_match('/(.*)Controller/i', get_class($this), $r)) {
+				__("Controller::__construct() : Can not get or parse my own class name, exiting.");
+				$this->_stop();
+			}
+			$this->name = $r[1];
+		}
+
+		if ($this->viewPath == null) {
+			$this->viewPath = Inflector::underscore($this->name);
+		}
+		$this->modelClass = Inflector::classify($this->name);
+		$this->modelKey = Inflector::underscore($this->modelClass);
+		$this->Component =& new Component();
+
+		$childMethods = get_class_methods($this);
+		$parentMethods = get_class_methods('Controller');
+
+		foreach ($childMethods as $key => $value) {
+			$childMethods[$key] = strtolower($value);
+		}
+
+		foreach ($parentMethods as $key => $value) {
+			$parentMethods[$key] = strtolower($value);
+		}
+		$this->methods = array_diff($childMethods, $parentMethods);
+		parent::__construct();
+	}
+
+/**
+ * Merge components, helpers, and uses vars from AppController and PluginAppController.
+ *
+ * @return void
+ * @access protected
+ */
+	function __mergeVars() {
+		$pluginName = Inflector::camelize($this->plugin);
+		$pluginController = $pluginName . 'AppController';
+
+		if (is_subclass_of($this, 'AppController') || is_subclass_of($this, $pluginController)) {
+			$appVars = get_class_vars('AppController');
+			$uses = $appVars['uses'];
+			$merge = array('components', 'helpers');
+			$plugin = null;
+
+			if (!empty($this->plugin)) {
+				$plugin = $pluginName . '.';
+				if (!is_subclass_of($this, $pluginController)) {
+					$pluginController = null;
+				}
+			} else {
+				$pluginController = null;
+			}
+
+			if ($uses == $this->uses && !empty($this->uses)) {
+				if (!in_array($plugin . $this->modelClass, $this->uses)) {
+					array_unshift($this->uses, $plugin . $this->modelClass);
+				} elseif ($this->uses[0] !== $plugin . $this->modelClass) {
+					$this->uses = array_flip($this->uses);
+					unset($this->uses[$plugin . $this->modelClass]);
+					$this->uses = array_flip($this->uses);
+					array_unshift($this->uses, $plugin . $this->modelClass);
+				}
+			} elseif ($this->uses !== null || $this->uses !== false) {
+				$merge[] = 'uses';
+			}
+
+			foreach ($merge as $var) {
+				if (!empty($appVars[$var]) && is_array($this->{$var})) {
+					if ($var !== 'uses') {
+						$normal = Set::normalize($this->{$var});
+						$app = Set::normalize($appVars[$var]);
+						if ($app !== $normal) {
+							$this->{$var} = Set::merge($app, $normal);
+						}
+					} else {
+						$this->{$var} = array_merge($this->{$var}, array_diff($appVars[$var], $this->{$var}));
+					}
+				}
+			}
+		}
+
+		if ($pluginController && $pluginName != null) {
+			$appVars = get_class_vars($pluginController);
+			$uses = $appVars['uses'];
+			$merge = array('components', 'helpers');
+
+			if ($this->uses !== null || $this->uses !== false) {
+				$merge[] = 'uses';
+			}
+
+			foreach ($merge as $var) {
+				if (isset($appVars[$var]) && !empty($appVars[$var]) && is_array($this->{$var})) {
+					if ($var !== 'uses') {
+						$normal = Set::normalize($this->{$var});
+						$app = Set::normalize($appVars[$var]);
+						if ($app !== $normal) {
+							$this->{$var} = Set::merge($app, $normal);
+						}
+					} else {
+						$this->{$var} = array_merge($this->{$var}, array_diff($appVars[$var], $this->{$var}));
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * Loads Model classes based on the uses property
+ * see Controller::loadModel(); for more info.
+ * Loads Components and prepares them for initialization.
+ *
+ * @return mixed true if models found and instance created, or cakeError if models not found.
+ * @access public
+ * @see Controller::loadModel()
+ * @link http://book.cakephp.org/view/977/Controller-Methods#constructClasses-986
+ */
+	function constructClasses() {
+		$this->__mergeVars();
+		$this->Component->init($this);
+
+		if ($this->uses !== null || ($this->uses !== array())) {
+			if (empty($this->passedArgs) || !isset($this->passedArgs['0'])) {
+				$id = false;
+			} else {
+				$id = $this->passedArgs['0'];
+			}
+
+			if ($this->uses === false) {
+				$this->loadModel($this->modelClass, $id);
+			} elseif ($this->uses) {
+				$uses = is_array($this->uses) ? $this->uses : array($this->uses);
+				$modelClassName = $uses[0];
+				if (strpos($uses[0], '.') !== false) {
+					list($plugin, $modelClassName) = explode('.', $uses[0]);
+				}
+				$this->modelClass = $modelClassName;
+				foreach ($uses as $modelClass) {
+					$this->loadModel($modelClass);
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Perform the startup process for this controller.
+ * Fire the Component and Controller callbacks in the correct order.
+ *
+ * - Initializes components, which fires their `initialize` callback
+ * - Calls the controller `beforeFilter`.
+ * - triggers Component `startup` methods.
+ *
+ * @return void
+ * @access public
+ */
+	function startupProcess() {
+		$this->Component->initialize($this);
+		$this->beforeFilter();
+		$this->Component->triggerCallback('startup', $this);
+	}
+
+/**
+ * Perform the various shutdown processes for this controller.
+ * Fire the Component and Controller callbacks in the correct order.
+ *
+ * - triggers the component `shutdown` callback.
+ * - calls the Controller's `afterFilter` method.
+ *
+ * @return void
+ * @access public
+ */
+	function shutdownProcess() {
+		$this->Component->triggerCallback('shutdown', $this);
+		$this->afterFilter();
+	}
+
+/**
+ * Queries & sets valid HTTP response codes & messages.
+ *
+ * @param mixed $code If $code is an integer, then the corresponding code/message is
+ *        returned if it exists, null if it does not exist. If $code is an array,
+ *        then the 'code' and 'message' keys of each nested array are added to the default
+ *        HTTP codes. Example:
+ *
+ *        httpCodes(404); // returns array(404 => 'Not Found')
+ *
+ *        httpCodes(array(
+ *            701 => 'Unicorn Moved',
+ *            800 => 'Unexpected Minotaur'
+ *        )); // sets these new values, and returns true
+ *
+ * @return mixed Associative array of the HTTP codes as keys, and the message
+ *    strings as values, or null of the given $code does not exist.
+ */
+	function httpCodes($code = null) {
+		if (empty($this->__httpCodes)) {
+			$this->__httpCodes = array(
+				100 => 'Continue', 101 => 'Switching Protocols',
+				200 => 'OK', 201 => 'Created', 202 => 'Accepted',
+				203 => 'Non-Authoritative Information', 204 => 'No Content',
+				205 => 'Reset Content', 206 => 'Partial Content',
+				300 => 'Multiple Choices', 301 => 'Moved Permanently',
+				302 => 'Found', 303 => 'See Other',
+				304 => 'Not Modified', 305 => 'Use Proxy', 307 => 'Temporary Redirect',
+				400 => 'Bad Request', 401 => 'Unauthorized', 402 => 'Payment Required',
+				403 => 'Forbidden', 404 => 'Not Found', 405 => 'Method Not Allowed',
+				406 => 'Not Acceptable', 407 => 'Proxy Authentication Required',
+				408 => 'Request Time-out', 409 => 'Conflict', 410 => 'Gone',
+				411 => 'Length Required', 412 => 'Precondition Failed',
+				413 => 'Request Entity Too Large', 414 => 'Request-URI Too Large',
+				415 => 'Unsupported Media Type', 416 => 'Requested range not satisfiable',
+				417 => 'Expectation Failed', 500 => 'Internal Server Error',
+				501 => 'Not Implemented', 502 => 'Bad Gateway',
+				503 => 'Service Unavailable', 504 => 'Gateway Time-out'
+			);
+		}
+
+		if (empty($code)) {
+			return $this->__httpCodes;
+		}
+
+		if (is_array($code)) {
+			$this->__httpCodes = $code + $this->__httpCodes;
+			return true;
+		}
+
+		if (!isset($this->__httpCodes[$code])) {
+			return null;
+		}
+		return array($code => $this->__httpCodes[$code]);
+	}
+
+/**
+ * Loads and instantiates models required by this controller.
+ * If Controller::$persistModel; is true, controller will cache model instances on first request,
+ * additional request will used cached models.
+ * If the model is non existent, it will throw a missing database table error, as Cake generates
+ * dynamic models for the time being.
+ *
+ * @param string $modelClass Name of model class to load
+ * @param mixed $id Initial ID the instanced model class should have
+ * @return mixed true when single model found and instance created, error returned if model not found.
+ * @access public
+ */
+	function loadModel($modelClass = null, $id = null) {
+		if ($modelClass === null) {
+			$modelClass = $this->modelClass;
+		}
+		$cached = false;
+		$object = null;
+		$plugin = null;
+		if ($this->uses === false) {
+			if ($this->plugin) {
+				$plugin = $this->plugin . '.';
+			}
+		}
+		list($plugin, $modelClass) = pluginSplit($modelClass, true, $plugin);
+
+		if ($this->persistModel === true) {
+			$cached = $this->_persist($modelClass, null, $object);
+		}
+
+		if (($cached === false)) {
+			$this->modelNames[] = $modelClass;
+
+			if (!PHP5) {
+				$this->{$modelClass} =& ClassRegistry::init(array(
+					'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id
+				));
+			} else {
+				$this->{$modelClass} = ClassRegistry::init(array(
+					'class' => $plugin . $modelClass, 'alias' => $modelClass, 'id' => $id
+				));
+			}
+
+			if (!$this->{$modelClass}) {
+				return $this->cakeError('missingModel', array(array(
+					'className' => $modelClass, 'webroot' => '', 'base' => $this->base
+				)));
+			}
+
+			if ($this->persistModel === true) {
+				$this->_persist($modelClass, true, $this->{$modelClass});
+				$registry =& ClassRegistry::getInstance();
+				$this->_persist($modelClass . 'registry', true, $registry->__objects, 'registry');
+			}
+		} else {
+			$this->_persist($modelClass . 'registry', true, $object, 'registry');
+			$this->_persist($modelClass, true, $object);
+			$this->modelNames[] = $modelClass;
+		}
+
+		return true;
+	}
+
+/**
+ * Redirects to given $url, after turning off $this->autoRender.
+ * Script execution is halted after the redirect.
+ *
+ * @param mixed $url A string or array-based URL pointing to another location within the app,
+ *     or an absolute URL
+ * @param integer $status Optional HTTP status code (eg: 404)
+ * @param boolean $exit If true, exit() will be called after the redirect
+ * @return mixed void if $exit = false. Terminates script if $exit = true
+ * @access public
+ * @link http://book.cakephp.org/view/982/redirect
+ */
+	function redirect($url, $status = null, $exit = true) {
+		$this->autoRender = false;
+
+		if (is_array($status)) {
+			extract($status, EXTR_OVERWRITE);
+		}
+		$response = $this->Component->beforeRedirect($this, $url, $status, $exit);
+
+		if ($response === false) {
+			return;
+		}
+		if (is_array($response)) {
+			foreach ($response as $resp) {
+				if (is_array($resp) && isset($resp['url'])) {
+					extract($resp, EXTR_OVERWRITE);
+				} elseif ($resp !== null) {
+					$url = $resp;
+				}
+			}
+		}
+
+		if (function_exists('session_write_close')) {
+			session_write_close();
+		}
+
+		if (!empty($status)) {
+			$codes = $this->httpCodes();
+
+			if (is_string($status)) {
+				$codes = array_flip($codes);
+			}
+
+			if (isset($codes[$status])) {
+				$code = $msg = $codes[$status];
+				if (is_numeric($status)) {
+					$code = $status;
+				}
+				if (is_string($status)) {
+					$msg = $status;
+				}
+				$status = "HTTP/1.1 {$code} {$msg}";
+
+			} else {
+				$status = null;
+			}
+			$this->header($status);
+		}
+
+		if ($url !== null) {
+			$this->header('Location: ' . Router::url($url, true));
+		}
+
+		if (!empty($status) && ($status >= 300 && $status < 400)) {
+			$this->header($status);
+		}
+
+		if ($exit) {
+			$this->_stop();
+		}
+	}
+
+/**
+ * Convenience and object wrapper method for header().  Useful when doing tests and
+ * asserting that particular headers have been set.
+ *
+ * @param string $status The header message that is being set.
+ * @return void
+ * @access public
+ */
+	function header($status) {
+		header($status);
+	}
+
+/**
+ * Saves a variable for use inside a view template.
+ *
+ * @param mixed $one A string or an array of data.
+ * @param mixed $two Value in case $one is a string (which then works as the key).
+ *   Unused if $one is an associative array, otherwise serves as the values to $one's keys.
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/979/set
+ */
+	function set($one, $two = null) {
+		$data = array();
+
+		if (is_array($one)) {
+			if (is_array($two)) {
+				$data = array_combine($one, $two);
+			} else {
+				$data = $one;
+			}
+		} else {
+			$data = array($one => $two);
+		}
+		$this->viewVars = $data + $this->viewVars;
+	}
+
+/**
+ * Internally redirects one action to another. Does not perform another HTTP request unlike Controller::redirect()
+ *
+ * Examples:
+ *
+ * {{{
+ * setAction('another_action');
+ * setAction('action_with_parameters', $parameter1);
+ * }}}
+ *
+ * @param string $action The new action to be 'redirected' to
+ * @param mixed  Any other parameters passed to this method will be passed as
+ *    parameters to the new action.
+ * @return mixed Returns the return value of the called action
+ * @access public
+ */
+	function setAction($action) {
+		$this->action = $action;
+		$args = func_get_args();
+		unset($args[0]);
+		return call_user_func_array(array(&$this, $action), $args);
+	}
+
+/**
+ * Controller callback to tie into Auth component.
+ * Only called when AuthComponent::$authorize is set to 'controller'.
+ *
+ * @return bool true if authorized, false otherwise
+ * @access public
+ * @link http://book.cakephp.org/view/1275/authorize
+ */
+	function isAuthorized() {
+		trigger_error(sprintf(
+			__('%sController::isAuthorized() is not defined.', true), $this->name
+		), E_USER_WARNING);
+		return false;
+	}
+
+/**
+ * Returns number of errors in a submitted FORM.
+ *
+ * @return integer Number of errors
+ * @access public
+ */
+	function validate() {
+		$args = func_get_args();
+		$errors = call_user_func_array(array(&$this, 'validateErrors'), $args);
+
+		if ($errors === false) {
+			return 0;
+		}
+		return count($errors);
+	}
+
+/**
+ * Validates models passed by parameters. Example:
+ *
+ * `$errors = $this->validateErrors($this->Article, $this->User);`
+ *
+ * @param mixed A list of models as a variable argument
+ * @return array Validation errors, or false if none
+ * @access public
+ */
+	function validateErrors() {
+		$objects = func_get_args();
+
+		if (empty($objects)) {
+			return false;
+		}
+
+		$errors = array();
+		foreach ($objects as $object) {
+			if (isset($this->{$object->alias})) {
+				$object =& $this->{$object->alias};
+			}
+			$object->set($object->data);
+			$errors = array_merge($errors, (array)$object->invalidFields());
+		}
+
+		return $this->validationErrors = (!empty($errors) ? $errors : false);
+	}
+
+/**
+ * Instantiates the correct view class, hands it its data, and uses it to render the view output.
+ *
+ * @param string $action Action name to render
+ * @param string $layout Layout to use
+ * @param string $file File to use for rendering
+ * @return string Full output string of view contents
+ * @access public
+ * @link http://book.cakephp.org/view/980/render
+ */
+	function render($action = null, $layout = null, $file = null) {
+		$this->beforeRender();
+		$this->Component->triggerCallback('beforeRender', $this);
+
+		$viewClass = $this->view;
+		if ($this->view != 'View') {
+			list($plugin, $viewClass) = pluginSplit($viewClass);
+			$viewClass = $viewClass . 'View';
+			App::import('View', $this->view);
+		}
+
+		$this->params['models'] = $this->modelNames;
+
+		if (Configure::read() > 2) {
+			$this->set('cakeDebug', $this);
+		}
+
+		$View =& new $viewClass($this);
+
+		if (!empty($this->modelNames)) {
+			$models = array();
+			foreach ($this->modelNames as $currentModel) {
+				if (isset($this->$currentModel) && is_a($this->$currentModel, 'Model')) {
+					$models[] = Inflector::underscore($currentModel);
+				}
+				$isValidModel = (
+					isset($this->$currentModel) && is_a($this->$currentModel, 'Model') &&
+					!empty($this->$currentModel->validationErrors)
+				);
+				if ($isValidModel) {
+					$View->validationErrors[Inflector::camelize($currentModel)] =&
+						$this->$currentModel->validationErrors;
+				}
+			}
+			$models = array_diff(ClassRegistry::keys(), $models);
+			foreach ($models as $currentModel) {
+				if (ClassRegistry::isKeySet($currentModel)) {
+					$currentObject =& ClassRegistry::getObject($currentModel);
+					if (is_a($currentObject, 'Model') && !empty($currentObject->validationErrors)) {
+						$View->validationErrors[Inflector::camelize($currentModel)] =&
+							$currentObject->validationErrors;
+					}
+				}
+			}
+		}
+
+		$this->autoRender = false;
+		$this->output .= $View->render($action, $layout, $file);
+
+		return $this->output;
+	}
+
+/**
+ * Returns the referring URL for this request.
+ *
+ * @param string $default Default URL to use if HTTP_REFERER cannot be read from headers
+ * @param boolean $local If true, restrict referring URLs to local server
+ * @return string Referring URL
+ * @access public
+ * @link http://book.cakephp.org/view/987/referer
+ */
+	function referer($default = null, $local = false) {
+		$ref = env('HTTP_REFERER');
+		if (!empty($ref) && defined('FULL_BASE_URL')) {
+			$base = FULL_BASE_URL . $this->webroot;
+			if (strpos($ref, $base) === 0) {
+				$return =  substr($ref, strlen($base));
+				if ($return[0] != '/') {
+					$return = '/'.$return;
+				}
+				return $return;
+			} elseif (!$local) {
+				return $ref;
+			}
+		}
+
+		if ($default != null) {
+			$url = Router::url($default, true);
+			return $url;
+		}
+		return '/';
+	}
+
+/**
+ * Forces the user's browser not to cache the results of the current request.
+ *
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/988/disableCache
+ */
+	function disableCache() {
+		header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+		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");
+	}
+
+/**
+ * Shows a message to the user for $pause seconds, then redirects to $url.
+ * Uses flash.ctp as the default layout for the message.
+ * Does not work if the current debug level is higher than 0.
+ *
+ * @param string $message Message to display to the user
+ * @param mixed $url Relative string or array-based URL to redirect to after the time expires
+ * @param integer $pause Time to show the message
+ * @param string $layout Layout you want to use, defaults to 'flash'
+ * @return void Renders flash layout
+ * @access public
+ * @link http://book.cakephp.org/view/983/flash
+ */
+	function flash($message, $url, $pause = 1, $layout = 'flash') {
+		$this->autoRender = false;
+		$this->set('url', Router::url($url));
+		$this->set('message', $message);
+		$this->set('pause', $pause);
+		$this->set('page_title', $message);
+		$this->render(false, $layout);
+	}
+
+/**
+ * Converts POST'ed form data to a model conditions array, suitable for use in a Model::find() call.
+ *
+ * @param array $data POST'ed data organized by model and field
+ * @param mixed $op A string containing an SQL comparison operator, or an array matching operators
+ *        to fields
+ * @param string $bool SQL boolean operator: AND, OR, XOR, etc.
+ * @param boolean $exclusive If true, and $op is an array, fields not included in $op will not be
+ *        included in the returned conditions
+ * @return array An array of model conditions
+ * @access public
+ * @link http://book.cakephp.org/view/989/postConditions
+ */
+	function postConditions($data = array(), $op = null, $bool = 'AND', $exclusive = false) {
+		if (!is_array($data) || empty($data)) {
+			if (!empty($this->data)) {
+				$data = $this->data;
+			} else {
+				return null;
+			}
+		}
+		$cond = array();
+
+		if ($op === null) {
+			$op = '';
+		}
+
+		$arrayOp = is_array($op);
+		foreach ($data as $model => $fields) {
+			foreach ($fields as $field => $value) {
+				$key = $model.'.'.$field;
+				$fieldOp = $op;
+				if ($arrayOp) {
+					if (array_key_exists($key, $op)) {
+						$fieldOp = $op[$key];
+					} elseif (array_key_exists($field, $op)) {
+						$fieldOp = $op[$field];
+					} else {
+						$fieldOp = false;
+					}
+				}
+				if ($exclusive && $fieldOp === false) {
+					continue;
+				}
+				$fieldOp = strtoupper(trim($fieldOp));
+				if ($fieldOp === 'LIKE') {
+					$key = $key.' LIKE';
+					$value = '%'.$value.'%';
+				} elseif ($fieldOp && $fieldOp != '=') {
+					$key = $key.' '.$fieldOp;
+				}
+				$cond[$key] = $value;
+			}
+		}
+		if ($bool != null && strtoupper($bool) != 'AND') {
+			$cond = array($bool => $cond);
+		}
+		return $cond;
+	}
+
+/**
+ * Handles automatic pagination of model records.
+ *
+ * @param mixed $object Model to paginate (e.g: model instance, or 'Model', or 'Model.InnerModel')
+ * @param mixed $scope Conditions to use while paginating
+ * @param array $whitelist List of allowed options for paging
+ * @return array Model query results
+ * @access public
+ * @link http://book.cakephp.org/view/1232/Controller-Setup
+ */
+	function paginate($object = null, $scope = array(), $whitelist = array()) {
+		if (is_array($object)) {
+			$whitelist = $scope;
+			$scope = $object;
+			$object = null;
+		}
+		$assoc = null;
+
+		if (is_string($object)) {
+			$assoc = null;
+			if (strpos($object, '.')  !== false) {
+				list($object, $assoc) = pluginSplit($object);
+			}
+
+			if ($assoc && isset($this->{$object}->{$assoc})) {
+				$object =& $this->{$object}->{$assoc};
+			} elseif (
+				$assoc && isset($this->{$this->modelClass}) &&
+				isset($this->{$this->modelClass}->{$assoc}
+			)) {
+				$object =& $this->{$this->modelClass}->{$assoc};
+			} elseif (isset($this->{$object})) {
+				$object =& $this->{$object};
+			} elseif (
+				isset($this->{$this->modelClass}) && isset($this->{$this->modelClass}->{$object}
+			)) {
+				$object =& $this->{$this->modelClass}->{$object};
+			}
+		} elseif (empty($object) || $object === null) {
+			if (isset($this->{$this->modelClass})) {
+				$object =& $this->{$this->modelClass};
+			} else {
+				$className = null;
+				$name = $this->uses[0];
+				if (strpos($this->uses[0], '.') !== false) {
+					list($name, $className) = explode('.', $this->uses[0]);
+				}
+				if ($className) {
+					$object =& $this->{$className};
+				} else {
+					$object =& $this->{$name};
+				}
+			}
+		}
+
+		if (!is_object($object)) {
+			trigger_error(sprintf(
+				__('Controller::paginate() - can\'t find model %1$s in controller %2$sController',
+					true
+				), $object, $this->name
+			), E_USER_WARNING);
+			return array();
+		}
+		$options = array_merge($this->params, $this->params['url'], $this->passedArgs);
+
+		if (isset($this->paginate[$object->alias])) {
+			$defaults = $this->paginate[$object->alias];
+		} else {
+			$defaults = $this->paginate;
+		}
+
+		if (isset($options['show'])) {
+			$options['limit'] = $options['show'];
+		}
+
+		if (isset($options['sort'])) {
+			$direction = null;
+			if (isset($options['direction'])) {
+				$direction = strtolower($options['direction']);
+			}
+			if ($direction != 'asc' && $direction != 'desc') {
+				$direction = 'asc';
+			}
+			$options['order'] = array($options['sort'] => $direction);
+		}
+
+		if (!empty($options['order']) && is_array($options['order'])) {
+			$alias = $object->alias ;
+			$key = $field = key($options['order']);
+
+			if (strpos($key, '.') !== false) {
+				list($alias, $field) = explode('.', $key);
+			}
+			$value = $options['order'][$key];
+			unset($options['order'][$key]);
+
+			if ($object->hasField($field)) {
+				$options['order'][$alias . '.' . $field] = $value;
+			} elseif ($object->hasField($field, true)) {
+				$options['order'][$field] = $value;
+			} elseif (isset($object->{$alias}) && $object->{$alias}->hasField($field)) {
+				$options['order'][$alias . '.' . $field] = $value;
+			}
+		}
+		$vars = array('fields', 'order', 'limit', 'page', 'recursive');
+		$keys = array_keys($options);
+		$count = count($keys);
+
+		for ($i = 0; $i < $count; $i++) {
+			if (!in_array($keys[$i], $vars, true)) {
+				unset($options[$keys[$i]]);
+			}
+			if (empty($whitelist) && ($keys[$i] === 'fields' || $keys[$i] === 'recursive')) {
+				unset($options[$keys[$i]]);
+			} elseif (!empty($whitelist) && !in_array($keys[$i], $whitelist)) {
+				unset($options[$keys[$i]]);
+			}
+		}
+		$conditions = $fields = $order = $limit = $page = $recursive = null;
+
+		if (!isset($defaults['conditions'])) {
+			$defaults['conditions'] = array();
+		}
+
+		$type = 'all';
+
+		if (isset($defaults[0])) {
+			$type = $defaults[0];
+			unset($defaults[0]);
+		}
+
+		$options = array_merge(array('page' => 1, 'limit' => 20), $defaults, $options);
+		$options['limit'] = (int) $options['limit'];
+		if (empty($options['limit']) || $options['limit'] < 1) {
+			$options['limit'] = 1;
+		}
+
+		extract($options);
+
+		if (is_array($scope) && !empty($scope)) {
+			$conditions = array_merge($conditions, $scope);
+		} elseif (is_string($scope)) {
+			$conditions = array($conditions, $scope);
+		}
+		if ($recursive === null) {
+			$recursive = $object->recursive;
+		}
+
+		$extra = array_diff_key($defaults, compact(
+			'conditions', 'fields', 'order', 'limit', 'page', 'recursive'
+		));
+		if ($type !== 'all') {
+			$extra['type'] = $type;
+		}
+
+		if (method_exists($object, 'paginateCount')) {
+			$count = $object->paginateCount($conditions, $recursive, $extra);
+		} else {
+			$parameters = compact('conditions');
+			if ($recursive != $object->recursive) {
+				$parameters['recursive'] = $recursive;
+			}
+			$count = $object->find('count', array_merge($parameters, $extra));
+//			var_dump(array_merge($parameters, $extra));
+		}
+		$pageCount = intval(ceil($count / $limit));
+
+		if ($page === 'last' || $page >= $pageCount) {
+			$options['page'] = $page = $pageCount;
+		} elseif (intval($page) < 1) {
+			$options['page'] = $page = 1;
+		}
+		$page = $options['page'] = (integer)$page;
+
+		if (method_exists($object, 'paginate')) {
+			$results = $object->paginate(
+				$conditions, $fields, $order, $limit, $page, $recursive, $extra
+			);
+		} else {
+			$parameters = compact('conditions', 'fields', 'order', 'limit', 'page');
+			if ($recursive != $object->recursive) {
+				$parameters['recursive'] = $recursive;
+			}
+			$results = $object->find($type, array_merge($parameters, $extra));
+		}
+		$paging = array(
+			'page'		=> $page,
+			'current'	=> count($results),
+			'count'		=> $count,
+			'prevPage'	=> ($page > 1),
+			'nextPage'	=> ($count > ($page * $limit)),
+			'pageCount'	=> $pageCount,
+			'defaults'	=> array_merge(array('limit' => 20, 'step' => 1), $defaults),
+			'options'	=> $options
+		);
+		$this->params['paging'][$object->alias] = $paging;
+
+		if (!in_array('Paginator', $this->helpers) && !array_key_exists('Paginator', $this->helpers)) {
+			$this->helpers[] = 'Paginator';
+		}
+		return $results;
+	}
+
+/**
+ * Called before the controller action.
+ *
+ * @access public
+ * @link http://book.cakephp.org/view/984/Callbacks
+ */
+	function beforeFilter() {
+	}
+
+/**
+ * Called after the controller action is run, but before the view is rendered.
+ *
+ * @access public
+ * @link http://book.cakephp.org/view/984/Callbacks
+ */
+	function beforeRender() {
+	}
+
+/**
+ * Called after the controller action is run and rendered.
+ *
+ * @access public
+ * @link http://book.cakephp.org/view/984/Callbacks
+ */
+	function afterFilter() {
+	}
+
+/**
+ * This method should be overridden in child classes.
+ *
+ * @param string $method name of method called example index, edit, etc.
+ * @return boolean Success
+ * @access protected
+ * @link http://book.cakephp.org/view/984/Callbacks
+ */
+	function _beforeScaffold($method) {
+		return true;
+	}
+
+/**
+ * This method should be overridden in child classes.
+ *
+ * @param string $method name of method called either edit or update.
+ * @return boolean Success
+ * @access protected
+ * @link http://book.cakephp.org/view/984/Callbacks
+ */
+	function _afterScaffoldSave($method) {
+		return true;
+	}
+
+/**
+ * This method should be overridden in child classes.
+ *
+ * @param string $method name of method called either edit or update.
+ * @return boolean Success
+ * @access protected
+ * @link http://book.cakephp.org/view/984/Callbacks
+ */
+	function _afterScaffoldSaveError($method) {
+		return true;
+	}
+
+/**
+ * This method should be overridden in child classes.
+ * If not it will render a scaffold error.
+ * Method MUST return true in child classes
+ *
+ * @param string $method name of method called example index, edit, etc.
+ * @return boolean Success
+ * @access protected
+ * @link http://book.cakephp.org/view/984/Callbacks
+ */
+	function _scaffoldError($method) {
+		return false;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/pages_controller.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/pages_controller.php
new file mode 100644
index 000000000..6dcc2a3ec
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/pages_controller.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Static content controller.
+ *
+ * This file will render views from views/pages/
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Static content controller
+ *
+ * Override this controller by placing a copy in controllers directory of an application
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @link http://book.cakephp.org/view/958/The-Pages-Controller
+ */
+class PagesController extends AppController {
+
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Pages';
+
+/**
+ * Default helper
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html', 'Session');
+
+/**
+ * This controller does not use a model
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * Displays a view
+ *
+ * @param mixed What page to display
+ * @access public
+ */
+	function display() {
+		$path = func_get_args();
+
+		$count = count($path);
+		if (!$count) {
+			$this->redirect('/');
+		}
+		$page = $subpage = $title_for_layout = null;
+
+		if (!empty($path[0])) {
+			$page = $path[0];
+		}
+		if (!empty($path[1])) {
+			$subpage = $path[1];
+		}
+		if (!empty($path[$count - 1])) {
+			$title_for_layout = Inflector::humanize($path[$count - 1]);
+		}
+		$this->set(compact('page', 'subpage', 'title_for_layout'));
+		$this->render(implode('/', $path));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/controller/scaffold.php b/code/ryzom/tools/server/www/webtt/cake/libs/controller/scaffold.php
new file mode 100644
index 000000000..27b7632c8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/controller/scaffold.php
@@ -0,0 +1,615 @@
+<?php
+/**
+ * Scaffold.
+ *
+ * Automatic forms and actions generation for rapid web application development.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ * @since         Cake v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Scaffolding is a set of automatic actions for starting web development work faster.
+ *
+ * Scaffold inspects your database tables, and making educated guesses, sets up a
+ * number of pages for each of your Models. These pages have data forms that work,
+ * and afford the web developer an early look at the data, and the possibility to over-ride
+ * scaffolded actions with custom-made ones.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+ */
+class Scaffold extends Object {
+
+/**
+ * Controller object
+ *
+ * @var Controller
+ * @access public
+ */
+	var $controller = null;
+
+/**
+ * Name of the controller to scaffold
+ *
+ * @var string
+ * @access public
+ */
+	var $name = null;
+
+/**
+ * Action to be performed.
+ *
+ * @var string
+ * @access public
+ */
+	var $action = null;
+
+/**
+ * Name of current model this view context is attached to
+ *
+ * @var string
+ * @access public
+ */
+	var $model = null;
+
+/**
+ * Path to View.
+ *
+ * @var string
+ * @access public
+ */
+	var $viewPath;
+
+/**
+ * Path parts for creating links in views.
+ *
+ * @var string Base URL
+ * @access public
+ */
+	var $base = null;
+
+/**
+ * Name of layout to use with this View.
+ *
+ * @var string
+ * @access public
+ */
+	var $layout = 'default';
+
+/**
+ * Array of parameter data
+ *
+ * @var array
+ * @access public
+ */
+	var $params;
+
+/**
+ * File extension. Defaults to Cake's template ".ctp".
+ *
+ * @var array
+ * @access public
+ */
+	var $ext = '.ctp';
+
+/**
+ * Sub-directory for this view file.
+ *
+ * @var string
+ * @access public
+ */
+	var $subDir = null;
+
+/**
+ * Plugin name.
+ *
+ * @var string
+ * @access public
+ */
+	var $plugin = null;
+
+/**
+ * valid session.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $_validSession = null;
+
+/**
+ * List of variables to collect from the associated controller
+ *
+ * @var array
+ * @access private
+ */
+	var $__passedVars = array(
+		'action', 'base', 'webroot', 'layout', 'name',
+		'viewPath', 'ext', 'params', 'data', 'plugin', 'cacheAction'
+	);
+
+/**
+ * Title HTML element for current scaffolded view
+ *
+ * @var string
+ * @access public
+ */
+	var $scaffoldTitle = null;
+
+/**
+ * Construct and set up given controller with given parameters.
+ *
+ * @param string $controller_class Name of controller
+ * @param array $params Parameters for scaffolding
+ */
+	function __construct(&$controller, $params) {
+		$this->controller =& $controller;
+
+		$count = count($this->__passedVars);
+		for ($j = 0; $j < $count; $j++) {
+			$var = $this->__passedVars[$j];
+			$this->{$var} = $controller->{$var};
+		}
+
+		$this->redirect = array('action' => 'index');
+
+		$this->modelClass = $controller->modelClass;
+		$this->modelKey = $controller->modelKey;
+
+		if (!is_object($this->controller->{$this->modelClass})) {
+			return $this->cakeError('missingModel', array(array(
+				'className' => $this->modelClass, 'webroot' => '', 'base' => $controller->base
+			)));
+		}
+
+		$this->ScaffoldModel =& $this->controller->{$this->modelClass};
+		$this->scaffoldTitle = Inflector::humanize($this->viewPath);
+		$this->scaffoldActions = $controller->scaffold;
+		$title_for_layout = __('Scaffold :: ', true) . Inflector::humanize($this->action) . ' :: ' . $this->scaffoldTitle;
+		$modelClass = $this->controller->modelClass;
+		$primaryKey = $this->ScaffoldModel->primaryKey;
+		$displayField = $this->ScaffoldModel->displayField;
+		$singularVar = Inflector::variable($modelClass);
+		$pluralVar = Inflector::variable($this->controller->name);
+		$singularHumanName = Inflector::humanize(Inflector::underscore($modelClass));
+		$pluralHumanName = Inflector::humanize(Inflector::underscore($this->controller->name));
+		$scaffoldFields = array_keys($this->ScaffoldModel->schema());
+		$associations = $this->__associations();
+
+		$this->controller->set(compact(
+			'title_for_layout', 'modelClass', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
+			'singularHumanName', 'pluralHumanName', 'scaffoldFields', 'associations'
+		));
+
+		if ($this->controller->view) {
+			$this->controller->view = 'Scaffold';
+		}
+		$this->_validSession = (
+			isset($this->controller->Session) && $this->controller->Session->valid() != false
+		);
+		$this->__scaffold($params);
+	}
+
+/**
+ * Outputs the content of a scaffold method passing it through the Controller::afterFilter()
+ *
+ * @return void
+ * @access protected
+ */
+	function _output() {
+		$this->controller->afterFilter();
+		echo($this->controller->output);
+	}
+
+/**
+ * Renders a view action of scaffolded model.
+ *
+ * @param array $params Parameters for scaffolding
+ * @return mixed A rendered view of a row from Models database table
+ * @access private
+ */
+	function __scaffoldView($params) {
+		if ($this->controller->_beforeScaffold('view')) {
+
+			$message = sprintf(__("No id set for %s::view()", true), Inflector::humanize($this->modelKey));
+			if (isset($params['pass'][0])) {
+				$this->ScaffoldModel->id = $params['pass'][0];
+			} elseif ($this->_validSession) {
+				$this->controller->Session->setFlash($message);
+				$this->controller->redirect($this->redirect);
+			} else {
+				return $this->controller->flash($message, '/' . Inflector::underscore($this->controller->viewPath));
+			}
+			$this->ScaffoldModel->recursive = 1;
+			$this->controller->data = $this->ScaffoldModel->read();
+			$this->controller->set(
+				Inflector::variable($this->controller->modelClass), $this->controller->data
+			);
+			$this->controller->render($this->action, $this->layout);
+			$this->_output();
+		} elseif ($this->controller->_scaffoldError('view') === false) {
+			return $this->__scaffoldError();
+		}
+	}
+
+/**
+ * Renders index action of scaffolded model.
+ *
+ * @param array $params Parameters for scaffolding
+ * @return mixed A rendered view listing rows from Models database table
+ * @access private
+ */
+	function __scaffoldIndex($params) {
+		if ($this->controller->_beforeScaffold('index')) {
+			$this->ScaffoldModel->recursive = 0;
+			$this->controller->set(
+				Inflector::variable($this->controller->name), $this->controller->paginate()
+			);
+			$this->controller->render($this->action, $this->layout);
+			$this->_output();
+		} elseif ($this->controller->_scaffoldError('index') === false) {
+			return $this->__scaffoldError();
+		}
+	}
+
+/**
+ * Renders an add or edit action for scaffolded model.
+ *
+ * @param string $action Action (add or edit)
+ * @return mixed A rendered view with a form to edit or add a record in the Models database table
+ * @access private
+ */
+	function __scaffoldForm($action = 'edit') {
+		$this->controller->viewVars['scaffoldFields'] = array_merge(
+			$this->controller->viewVars['scaffoldFields'],
+			array_keys($this->ScaffoldModel->hasAndBelongsToMany)
+		);
+		$this->controller->render($action, $this->layout);
+		$this->_output();
+	}
+
+/**
+ * Saves or updates the scaffolded model.
+ *
+ * @param array $params Parameters for scaffolding
+ * @param string $action add or edt
+ * @return mixed Success on save/update, add/edit form if data is empty or error if save or update fails
+ * @access private
+ */
+	function __scaffoldSave($params = array(), $action = 'edit') {
+		$formAction = 'edit';
+		$success = __('updated', true);
+		if ($action === 'add') {
+			$formAction = 'add';
+			$success = __('saved', true);
+		}
+
+		if ($this->controller->_beforeScaffold($action)) {
+			if ($action == 'edit') {
+				if (isset($params['pass'][0])) {
+					$this->ScaffoldModel->id = $params['pass'][0];
+				}
+
+				if (!$this->ScaffoldModel->exists()) {
+					$message = sprintf(__("Invalid id for %s::edit()", true), Inflector::humanize($this->modelKey));
+					if ($this->_validSession) {
+						$this->controller->Session->setFlash($message);
+						$this->controller->redirect($this->redirect);
+					} else {
+						$this->controller->flash($message, $this->redirect);
+						$this->_output();
+					}
+				}
+			}
+
+			if (!empty($this->controller->data)) {
+				if ($action == 'create') {
+					$this->ScaffoldModel->create();
+				}
+
+				if ($this->ScaffoldModel->save($this->controller->data)) {
+					if ($this->controller->_afterScaffoldSave($action)) {
+						$message = sprintf(
+							__('The %1$s has been %2$s', true),
+							Inflector::humanize($this->modelKey),
+							$success
+						);
+						if ($this->_validSession) {
+							$this->controller->Session->setFlash($message);
+							$this->controller->redirect($this->redirect);
+						} else {
+							$this->controller->flash($message, $this->redirect);
+							return $this->_output();
+						}
+					} else {
+						return $this->controller->_afterScaffoldSaveError($action);
+					}
+				} else {
+					if ($this->_validSession) {
+						$this->controller->Session->setFlash(__('Please correct errors below.', true));
+					}
+				}
+			}
+
+			if (empty($this->controller->data)) {
+				if ($this->ScaffoldModel->id) {
+					$this->controller->data = $this->ScaffoldModel->read();
+				} else {
+					$this->controller->data = $this->ScaffoldModel->create();
+				}
+			}
+
+			foreach ($this->ScaffoldModel->belongsTo as $assocName => $assocData) {
+				$varName = Inflector::variable(Inflector::pluralize(
+					preg_replace('/(?:_id)$/', '', $assocData['foreignKey'])
+				));
+				$this->controller->set($varName, $this->ScaffoldModel->{$assocName}->find('list'));
+			}
+			foreach ($this->ScaffoldModel->hasAndBelongsToMany as $assocName => $assocData) {
+				$varName = Inflector::variable(Inflector::pluralize($assocName));
+				$this->controller->set($varName, $this->ScaffoldModel->{$assocName}->find('list'));
+			}
+
+			return $this->__scaffoldForm($formAction);
+		} elseif ($this->controller->_scaffoldError($action) === false) {
+			return $this->__scaffoldError();
+		}
+	}
+
+/**
+ * Performs a delete on given scaffolded Model.
+ *
+ * @param array $params Parameters for scaffolding
+ * @return mixed Success on delete, error if delete fails
+ * @access private
+ */
+	function __scaffoldDelete($params = array()) {
+		if ($this->controller->_beforeScaffold('delete')) {
+			$message = sprintf(
+				__("No id set for %s::delete()", true),
+				Inflector::humanize($this->modelKey)
+			);
+			if (isset($params['pass'][0])) {
+				$id = $params['pass'][0];
+			} elseif ($this->_validSession) {
+				$this->controller->Session->setFlash($message);
+				$this->controller->redirect($this->redirect);
+			} else {
+				$this->controller->flash($message, $this->redirect);
+				return $this->_output();
+			}
+
+			if ($this->ScaffoldModel->delete($id)) {
+				$message = sprintf(
+					__('The %1$s with id: %2$d has been deleted.', true),
+					Inflector::humanize($this->modelClass), $id
+				);
+				if ($this->_validSession) {
+					$this->controller->Session->setFlash($message);
+					$this->controller->redirect($this->redirect);
+				} else {
+					$this->controller->flash($message, $this->redirect);
+					return $this->_output();
+				}
+			} else {
+				$message = sprintf(
+					__('There was an error deleting the %1$s with id: %2$d', true),
+					Inflector::humanize($this->modelClass), $id
+				);
+				if ($this->_validSession) {
+					$this->controller->Session->setFlash($message);
+					$this->controller->redirect($this->redirect);
+				} else {
+					$this->controller->flash($message, $this->redirect);
+					return $this->_output();
+				}
+			}
+		} elseif ($this->controller->_scaffoldError('delete') === false) {
+			return $this->__scaffoldError();
+		}
+	}
+
+/**
+ * Show a scaffold error
+ *
+ * @return mixed A rendered view showing the error
+ * @access private
+ */
+	function __scaffoldError() {
+		return $this->controller->render('error', $this->layout);
+		$this->_output();
+	}
+
+/**
+ * When methods are now present in a controller
+ * scaffoldView is used to call default Scaffold methods if:
+ * `var $scaffold;` is placed in the controller's class definition.
+ *
+ * @param array $params Parameters for scaffolding
+ * @return mixed A rendered view of scaffold action, or showing the error
+ * @access private
+ */
+	function __scaffold($params) {
+		$db = &ConnectionManager::getDataSource($this->ScaffoldModel->useDbConfig);
+		$prefixes = Configure::read('Routing.prefixes');
+		$scaffoldPrefix = $this->scaffoldActions;
+
+		if (isset($db)) {
+			if (empty($this->scaffoldActions)) {
+				$this->scaffoldActions = array(
+					'index', 'list', 'view', 'add', 'create', 'edit', 'update', 'delete'
+				);
+			} elseif (!empty($prefixes) && in_array($scaffoldPrefix, $prefixes)) {
+				$this->scaffoldActions = array(
+					$scaffoldPrefix . '_index',
+					$scaffoldPrefix . '_list',
+					$scaffoldPrefix . '_view',
+					$scaffoldPrefix . '_add',
+					$scaffoldPrefix . '_create',
+					$scaffoldPrefix . '_edit',
+					$scaffoldPrefix . '_update',
+					$scaffoldPrefix . '_delete'
+				);
+			}
+
+			if (in_array($params['action'], $this->scaffoldActions)) {
+				if (!empty($prefixes)) {
+					$params['action'] = str_replace($scaffoldPrefix . '_', '', $params['action']);
+				}
+				switch ($params['action']) {
+					case 'index':
+					case 'list':
+						$this->__scaffoldIndex($params);
+					break;
+					case 'view':
+						$this->__scaffoldView($params);
+					break;
+					case 'add':
+					case 'create':
+						$this->__scaffoldSave($params, 'add');
+					break;
+					case 'edit':
+					case 'update':
+						$this->__scaffoldSave($params, 'edit');
+					break;
+					case 'delete':
+						$this->__scaffoldDelete($params);
+					break;
+				}
+			} else {
+				return $this->cakeError('missingAction', array(array(
+					'className' => $this->controller->name . "Controller",
+					'base' => $this->controller->base,
+					'action' => $this->action,
+					'webroot' => $this->controller->webroot
+				)));
+			}
+		} else {
+			return $this->cakeError('missingDatabase', array(array(
+				'webroot' => $this->controller->webroot
+			)));
+		}
+	}
+
+/**
+ * Returns associations for controllers models.
+ *
+ * @return array Associations for model
+ * @access private
+ */
+	function __associations() {
+		$keys = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+		$associations = array();
+
+		foreach ($keys as $key => $type) {
+			foreach ($this->ScaffoldModel->{$type} as $assocKey => $assocData) {
+				$associations[$type][$assocKey]['primaryKey'] =
+					$this->ScaffoldModel->{$assocKey}->primaryKey;
+
+				$associations[$type][$assocKey]['displayField'] =
+					$this->ScaffoldModel->{$assocKey}->displayField;
+
+				$associations[$type][$assocKey]['foreignKey'] =
+					$assocData['foreignKey'];
+
+				$associations[$type][$assocKey]['controller'] =
+					Inflector::pluralize(Inflector::underscore($assocData['className']));
+
+				if ($type == 'hasAndBelongsToMany') {
+					$associations[$type][$assocKey]['with'] = $assocData['with'];
+				}
+			}
+		}
+		return $associations;
+	}
+}
+
+/**
+ * Scaffold View.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.controller
+*/
+if (!class_exists('ThemeView')) {
+	App::import('View', 'Theme');
+}
+
+/**
+ * ScaffoldView provides specific view file loading features for scaffolded views.
+ *
+ * @package cake.libs.view
+ */
+class ScaffoldView extends ThemeView {
+
+/**
+ * Override _getViewFileName Appends special scaffolding views in.
+ *
+ * @param string $name name of the view file to get.
+ * @return string action
+ * @access protected
+ */
+	function _getViewFileName($name = null) {
+		if ($name === null) {
+			$name = $this->action;
+		}
+		$name = Inflector::underscore($name);
+		$prefixes = Configure::read('Routing.prefixes');
+
+		if (!empty($prefixes)) {
+			foreach ($prefixes as $prefix) {
+				if (strpos($name, $prefix . '_') !== false) {
+					$name = substr($name, strlen($prefix) + 1);
+					break;
+				}
+			}
+		}
+
+		if ($name === 'add') {
+			$name = 'edit';
+		}
+
+		$scaffoldAction = 'scaffold.' . $name;
+
+		if (!is_null($this->subDir)) {
+			$subDir = strtolower($this->subDir) . DS;
+		} else {
+			$subDir = null;
+		}
+
+		$names[] = $this->viewPath . DS . $subDir . $scaffoldAction;
+		$names[] = 'scaffolds' . DS . $subDir . $name;
+
+		$paths = $this->_paths($this->plugin);
+		$exts = array($this->ext);
+		if ($this->ext !== '.ctp') {
+			array_push($exts, '.ctp');
+		}
+		foreach ($exts as $ext) {
+			foreach ($paths as $path) {
+				foreach ($names as $name) {
+					if (file_exists($path . $name . $ext)) {
+						return $path . $name . $ext;
+					}
+				}
+			}
+		}
+
+		if ($name === 'scaffolds' . DS . $subDir . 'error') {
+			return LIBS . 'view' . DS . 'errors' . DS . 'scaffold_error.ctp';
+		}
+
+		return $this->_missingView($paths[0] . $name . $this->ext, 'missingView');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/debugger.php b/code/ryzom/tools/server/www/webtt/cake/libs/debugger.php
new file mode 100644
index 000000000..b66c7366c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/debugger.php
@@ -0,0 +1,708 @@
+<?php
+/**
+ * Framework debugging and PHP error-handling class
+ *
+ * Provides enhanced logging, stack traces, and rendering debug views
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.4560
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libraries.
+ *
+ */
+if (!class_exists('Object')) {
+	require_once LIBS . 'object.php';
+}
+if (!class_exists('CakeLog')) {
+	require_once LIBS . 'cake_log.php';
+}
+if (!class_exists('String')) {
+	require_once LIBS . 'string.php';
+}
+
+/**
+ * Provide custom logging and error handling.
+ *
+ * Debugger overrides PHP's default error handling to provide stack traces and enhanced logging
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @link          http://book.cakephp.org/view/1191/Using-the-Debugger-Class
+ */
+class Debugger extends Object {
+
+/**
+ * A list of errors generated by the application.
+ *
+ * @var array
+ * @access public
+ */
+	var $errors = array();
+
+/**
+ * Contains the base URL for error code documentation.
+ *
+ * @var string
+ * @access public
+ */
+	var $helpPath = null;
+
+/**
+ * The current output format.
+ *
+ * @var string
+ * @access protected
+ */
+	var $_outputFormat = 'js';
+
+/**
+ * Templates used when generating trace or error strings.  Can be global or indexed by the format
+ * value used in $_outputFormat.
+ *
+ * @var string
+ * @access protected
+ */
+	var $_templates = array(
+		'log' => array(
+			'trace' => '{:reference} - {:path}, line {:line}',
+			'error' => "{:error} ({:code}): {:description} in [{:file}, line {:line}]"
+		),
+		'js' => array(
+			'error' => '',
+			'info' => '',
+			'trace' => '<pre class="stack-trace">{:trace}</pre>',
+			'code' => '',
+			'context' => '',
+			'links' => array()
+		),
+		'html' => array(
+			'trace' => '<pre class="cake-debug trace"><b>Trace</b> <p>{:trace}</p></pre>',
+			'context' => '<pre class="cake-debug context"><b>Context</b> <p>{:context}</p></pre>'
+		),
+		'txt' => array(
+			'error' => "{:error}: {:code} :: {:description} on line {:line} of {:path}\n{:info}",
+			'context' => "Context:\n{:context}\n",
+			'trace' => "Trace:\n{:trace}\n",
+			'code' => '',
+			'info' => ''
+		),
+		'base' => array(
+			'traceLine' => '{:reference} - {:path}, line {:line}'
+		)
+	);
+
+/**
+ * Holds current output data when outputFormat is false.
+ *
+ * @var string
+ * @access private
+ */
+	var $_data = array();
+
+/**
+ * Constructor.
+ *
+ */
+	function __construct() {
+		$docRef = ini_get('docref_root');
+
+		if (empty($docRef) && function_exists('ini_set')) {
+			ini_set('docref_root', 'http://php.net/');
+		}
+		if (!defined('E_RECOVERABLE_ERROR')) {
+			define('E_RECOVERABLE_ERROR', 4096);
+		}
+		if (!defined('E_DEPRECATED')) {
+			define('E_DEPRECATED', 8192);
+		}
+
+		$e = '<pre class="cake-debug">';
+		$e .= '<a href="javascript:void(0);" onclick="document.getElementById(\'{:id}-trace\')';
+		$e .= '.style.display = (document.getElementById(\'{:id}-trace\').style.display == ';
+		$e .= '\'none\' ? \'\' : \'none\');"><b>{:error}</b> ({:code})</a>: {:description} ';
+		$e .= '[<b>{:path}</b>, line <b>{:line}</b>]';
+
+		$e .= '<div id="{:id}-trace" class="cake-stack-trace" style="display: none;">';
+		$e .= '{:links}{:info}</div>';
+		$e .= '</pre>';
+		$this->_templates['js']['error'] = $e;
+
+		$t = '<div id="{:id}-trace" class="cake-stack-trace" style="display: none;">';
+		$t .= '{:context}{:code}{:trace}</div>';
+		$this->_templates['js']['info'] = $t;
+
+		$links = array();
+		$link = '<a href="javascript:void(0);" onclick="document.getElementById(\'{:id}-code\')';
+		$link .= '.style.display = (document.getElementById(\'{:id}-code\').style.display == ';
+		$link .= '\'none\' ? \'\' : \'none\')">Code</a>';
+		$links['code'] = $link;
+
+		$link = '<a href="javascript:void(0);" onclick="document.getElementById(\'{:id}-context\')';
+		$link .= '.style.display = (document.getElementById(\'{:id}-context\').style.display == ';
+		$link .= '\'none\' ? \'\' : \'none\')">Context</a>';
+		$links['context'] = $link;
+
+		$links['help'] = '<a href="{:helpPath}{:code}" target="_blank">Help</a>';
+		$this->_templates['js']['links'] = $links;
+
+		$this->_templates['js']['context'] = '<pre id="{:id}-context" class="cake-context" ';
+		$this->_templates['js']['context'] .= 'style="display: none;">{:context}</pre>';
+
+		$this->_templates['js']['code'] = '<div id="{:id}-code" class="cake-code-dump" ';
+		$this->_templates['js']['code'] .= 'style="display: none;"><pre>{:code}</pre></div>';
+
+		$e = '<pre class="cake-debug"><b>{:error}</b> ({:code}) : {:description} ';
+		$e .= '[<b>{:path}</b>, line <b>{:line}]</b></pre>';
+		$this->_templates['html']['error'] = $e;
+
+		$this->_templates['html']['context'] = '<pre class="cake-debug context"><b>Context</b> ';
+		$this->_templates['html']['context'] .= '<p>{:context}</p></pre>';
+	}
+
+/**
+ * Returns a reference to the Debugger singleton object instance.
+ *
+ * @return object
+ * @access public
+ * @static
+ */
+	function &getInstance($class = null) {
+		static $instance = array();
+		if (!empty($class)) {
+			if (!$instance || strtolower($class) != strtolower(get_class($instance[0]))) {
+				$instance[0] = & new $class();
+				if (Configure::read() > 0) {
+					Configure::version(); // Make sure the core config is loaded
+					$instance[0]->helpPath = Configure::read('Cake.Debugger.HelpPath');
+				}
+			}
+		}
+
+		if (!$instance) {
+			$instance[0] =& new Debugger();
+			if (Configure::read() > 0) {
+				Configure::version(); // Make sure the core config is loaded
+				$instance[0]->helpPath = Configure::read('Cake.Debugger.HelpPath');
+			}
+		}
+		return $instance[0];
+	}
+
+/**
+ * Formats and outputs the contents of the supplied variable.
+ *
+ * @param $var mixed the variable to dump
+ * @return void
+ * @see Debugger::exportVar()
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1191/Using-the-Debugger-Class
+*/
+	function dump($var) {
+		$_this =& Debugger::getInstance();
+		pr($_this->exportVar($var));
+	}
+
+/**
+ * Creates an entry in the log file.  The log entry will contain a stack trace from where it was called.
+ * as well as export the variable using exportVar. By default the log is written to the debug log.
+ *
+ * @param $var mixed Variable or content to log
+ * @param $level int type of log to use. Defaults to LOG_DEBUG
+ * @return void
+ * @static
+ * @link http://book.cakephp.org/view/1191/Using-the-Debugger-Class
+ */
+	function log($var, $level = LOG_DEBUG) {
+		$_this =& Debugger::getInstance();
+		$source = $_this->trace(array('start' => 1)) . "\n";
+		CakeLog::write($level, "\n" . $source . $_this->exportVar($var));
+	}
+
+/**
+ * Overrides PHP's default error handling.
+ *
+ * @param integer $code Code of error
+ * @param string $description Error description
+ * @param string $file File on which error occurred
+ * @param integer $line Line that triggered the error
+ * @param array $context Context
+ * @return boolean true if error was handled
+ * @access public
+ */
+	function handleError($code, $description, $file = null, $line = null, $context = null) {
+		if (error_reporting() == 0 || $code === 2048 || $code === 8192) {
+			return;
+		}
+
+		$_this =& Debugger::getInstance();
+
+		if (empty($file)) {
+			$file = '[internal]';
+		}
+		if (empty($line)) {
+			$line = '??';
+		}
+		$path = $_this->trimPath($file);
+
+		$info = compact('code', 'description', 'file', 'line');
+		if (!in_array($info, $_this->errors)) {
+			$_this->errors[] = $info;
+		} else {
+			return;
+		}
+
+		switch ($code) {
+			case E_PARSE:
+			case E_ERROR:
+			case E_CORE_ERROR:
+			case E_COMPILE_ERROR:
+			case E_USER_ERROR:
+				$error = 'Fatal Error';
+				$level = LOG_ERROR;
+			break;
+			case E_WARNING:
+			case E_USER_WARNING:
+			case E_COMPILE_WARNING:
+			case E_RECOVERABLE_ERROR:
+				$error = 'Warning';
+				$level = LOG_WARNING;
+			break;
+			case E_NOTICE:
+			case E_USER_NOTICE:
+				$error = 'Notice';
+				$level = LOG_NOTICE;
+			break;
+			default:
+				return;
+			break;
+		}
+
+		$helpCode = null;
+		if (!empty($_this->helpPath) && preg_match('/.*\[([0-9]+)\]$/', $description, $codes)) {
+			if (isset($codes[1])) {
+				$helpID = $codes[1];
+				$description = trim(preg_replace('/\[[0-9]+\]$/', '', $description));
+			}
+		}
+
+		$data = compact(
+			'level', 'error', 'code', 'helpID', 'description', 'file', 'path', 'line', 'context'
+		);
+		echo $_this->_output($data);
+
+		if (Configure::read('log')) {
+			$tpl = $_this->_templates['log']['error'];
+			$options = array('before' => '{:', 'after' => '}');
+			CakeLog::write($level, String::insert($tpl, $data, $options));
+		}
+
+		if ($error == 'Fatal Error') {
+			exit();
+		}
+		return true;
+	}
+
+/**
+ * Outputs a stack trace based on the supplied options.
+ *
+ * ### Options
+ *
+ * - `depth` - The number of stack frames to return. Defaults to 999
+ * - `format` - The format you want the return.  Defaults to the currently selected format.  If
+ *    format is 'array' or 'points' the return will be an array.
+ * - `args` - Should arguments for functions be shown?  If true, the arguments for each method call
+ *   will be displayed.
+ * - `start` - The stack frame to start generating a trace from.  Defaults to 0
+ *
+ * @param array $options Format for outputting stack trace
+ * @return mixed Formatted stack trace
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1191/Using-the-Debugger-Class
+ */
+	function trace($options = array()) {
+		$_this =& Debugger::getInstance();
+		$defaults = array(
+			'depth'   => 999,
+			'format'  => $_this->_outputFormat,
+			'args'    => false,
+			'start'   => 0,
+			'scope'   => null,
+			'exclude' => null
+		);
+		$options += $defaults;
+
+		$backtrace = debug_backtrace();
+		$count = count($backtrace);
+		$back = array();
+
+		$_trace = array(
+			'line'     => '??',
+			'file'     => '[internal]',
+			'class'    => null,
+			'function' => '[main]'
+		);
+
+		for ($i = $options['start']; $i < $count && $i < $options['depth']; $i++) {
+			$trace = array_merge(array('file' => '[internal]', 'line' => '??'), $backtrace[$i]);
+
+			if (isset($backtrace[$i + 1])) {
+				$next = array_merge($_trace, $backtrace[$i + 1]);
+				$reference = $next['function'];
+
+				if (!empty($next['class'])) {
+					$reference = $next['class'] . '::' . $reference . '(';
+					if ($options['args'] && isset($next['args'])) {
+						$args = array();
+						foreach ($next['args'] as $arg) {
+							$args[] = Debugger::exportVar($arg);
+						}
+						$reference .= join(', ', $args);
+					}
+					$reference .= ')';
+				}
+			} else {
+				$reference = '[main]';
+			}
+			if (in_array($reference, array('call_user_func_array', 'trigger_error'))) {
+				continue;
+			}
+			if ($options['format'] == 'points' && $trace['file'] != '[internal]') {
+				$back[] = array('file' => $trace['file'], 'line' => $trace['line']);
+			} elseif ($options['format'] == 'array') {
+				$back[] = $trace;
+			} else {
+				if (isset($_this->_templates[$options['format']]['traceLine'])) {
+					$tpl = $_this->_templates[$options['format']]['traceLine'];
+				} else {
+					$tpl = $_this->_templates['base']['traceLine'];
+				}
+				$trace['path'] = Debugger::trimPath($trace['file']);
+				$trace['reference'] = $reference;
+				unset($trace['object'], $trace['args']);
+				$back[] = String::insert($tpl, $trace, array('before' => '{:', 'after' => '}'));
+			}
+		}
+
+		if ($options['format'] == 'array' || $options['format'] == 'points') {
+			return $back;
+		}
+		return implode("\n", $back);
+	}
+
+/**
+ * Shortens file paths by replacing the application base path with 'APP', and the CakePHP core
+ * path with 'CORE'.
+ *
+ * @param string $path Path to shorten
+ * @return string Normalized path
+ * @access public
+ * @static
+ */
+	function trimPath($path) {
+		if (!defined('CAKE_CORE_INCLUDE_PATH') || !defined('APP')) {
+			return $path;
+		}
+
+		if (strpos($path, APP) === 0) {
+			return str_replace(APP, 'APP' . DS, $path);
+		} elseif (strpos($path, CAKE_CORE_INCLUDE_PATH) === 0) {
+			return str_replace(CAKE_CORE_INCLUDE_PATH, 'CORE', $path);
+		} elseif (strpos($path, ROOT) === 0) {
+			return str_replace(ROOT, 'ROOT', $path);
+		}
+		$corePaths = App::core('cake');
+
+		foreach ($corePaths as $corePath) {
+			if (strpos($path, $corePath) === 0) {
+				return str_replace($corePath, 'CORE' .DS . 'cake' .DS, $path);
+			}
+		}
+		return $path;
+	}
+
+/**
+ * Grabs an excerpt from a file and highlights a given line of code
+ *
+ * @param string $file Absolute path to a PHP file
+ * @param integer $line Line number to highlight
+ * @param integer $context Number of lines of context to extract above and below $line
+ * @return array Set of lines highlighted
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1191/Using-the-Debugger-Class
+ */
+	function excerpt($file, $line, $context = 2) {
+		$data = $lines = array();
+		if (!file_exists($file)) {
+			return array();
+		}
+		$data = @explode("\n", file_get_contents($file));
+
+		if (empty($data) || !isset($data[$line])) {
+			return;
+		}
+		for ($i = $line - ($context + 1); $i < $line + $context; $i++) {
+			if (!isset($data[$i])) {
+				continue;
+			}
+			$string = str_replace(array("\r\n", "\n"), "", highlight_string($data[$i], true));
+			if ($i == $line) {
+				$lines[] = '<span class="code-highlight">' . $string . '</span>';
+			} else {
+				$lines[] = $string;
+			}
+		}
+		return $lines;
+	}
+
+/**
+ * Converts a variable to a string for debug output.
+ *
+ * @param string $var Variable to convert
+ * @return string Variable as a formatted string
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1191/Using-the-Debugger-Class
+ */
+	function exportVar($var, $recursion = 0) {
+		$_this =& Debugger::getInstance();
+		switch (strtolower(gettype($var))) {
+			case 'boolean':
+				return ($var) ? 'true' : 'false';
+			break;
+			case 'integer':
+			case 'double':
+				return $var;
+			break;
+			case 'string':
+				if (trim($var) == "") {
+					return '""';
+				}
+				return '"' . h($var) . '"';
+			break;
+			case 'object':
+				return get_class($var) . "\n" . $_this->__object($var);
+			case 'array':
+				$out = "array(";
+				$vars = array();
+				foreach ($var as $key => $val) {
+					if ($recursion >= 0) {
+						if (is_numeric($key)) {
+							$vars[] = "\n\t" . $_this->exportVar($val, $recursion - 1);
+						} else {
+							$vars[] = "\n\t" .$_this->exportVar($key, $recursion - 1)
+										. ' => ' . $_this->exportVar($val, $recursion - 1);
+						}
+					}
+				}
+				$n = null;
+				if (!empty($vars)) {
+					$n = "\n";
+				}
+				return $out . implode(",", $vars) . "{$n})";
+			break;
+			case 'resource':
+				return strtolower(gettype($var));
+			break;
+			case 'null':
+				return 'null';
+			break;
+		}
+	}
+
+/**
+ * Handles object to string conversion.
+ *
+ * @param string $var Object to convert
+ * @return string
+ * @access private
+ * @see Debugger::exportVar()
+ */
+	function __object($var) {
+		$out = array();
+
+		if (is_object($var)) {
+			$className = get_class($var);
+			$objectVars = get_object_vars($var);
+
+			foreach ($objectVars as $key => $value) {
+				if (is_object($value)) {
+					$value = get_class($value) . ' object';
+				} elseif (is_array($value)) {
+					$value = 'array';
+				} elseif ($value === null) {
+					$value = 'NULL';
+				} elseif (in_array(gettype($value), array('boolean', 'integer', 'double', 'string', 'array', 'resource'))) {
+					$value = Debugger::exportVar($value);
+				}
+				$out[] = "$className::$$key = " . $value;
+			}
+		}
+		return implode("\n", $out);
+	}
+
+/**
+ * Switches output format, updates format strings
+ *
+ * @param string $format Format to use, including 'js' for JavaScript-enhanced HTML, 'html' for
+ *    straight HTML output, or 'txt' for unformatted text.
+ * @param array $strings Template strings to be used for the output format.
+ * @access protected
+ */
+	function output($format = null, $strings = array()) {
+		$_this =& Debugger::getInstance();
+		$data = null;
+
+		if (is_null($format)) {
+			return $_this->_outputFormat;
+		}
+
+		if (!empty($strings)) {
+			if (isset($_this->_templates[$format])) {
+				if (isset($strings['links'])) {
+					$_this->_templates[$format]['links'] = array_merge(
+						$_this->_templates[$format]['links'],
+						$strings['links']
+					);
+					unset($strings['links']);
+				}
+				$_this->_templates[$format] = array_merge($_this->_templates[$format], $strings);
+			} else {
+				$_this->_templates[$format] = $strings;
+			}
+			return $_this->_templates[$format];
+		}
+
+		if ($format === true && !empty($_this->_data)) {
+			$data = $_this->_data;
+			$_this->_data = array();
+			$format = false;
+		}
+		$_this->_outputFormat = $format;
+
+		return $data;
+	}
+
+/**
+ * Renders error messages
+ *
+ * @param array $data Data about the current error
+ * @access private
+ */
+	function _output($data = array()) {
+		$defaults = array(
+			'level' => 0,
+			'error' => 0,
+			'code' => 0,
+			'helpID' => null,
+			'description' => '',
+			'file' => '',
+			'line' => 0,
+			'context' => array()
+		);
+		$data += $defaults;
+
+		$files = $this->trace(array('start' => 2, 'format' => 'points'));
+		$code = $this->excerpt($files[0]['file'], $files[0]['line'] - 1, 1);
+		$trace = $this->trace(array('start' => 2, 'depth' => '20'));
+		$insertOpts = array('before' => '{:', 'after' => '}');
+		$context = array();
+		$links = array();
+		$info = '';
+
+		foreach ((array)$data['context'] as $var => $value) {
+			$context[] = "\${$var}\t=\t" . $this->exportVar($value, 1);
+		}
+
+		switch ($this->_outputFormat) {
+			case false:
+				$this->_data[] = compact('context', 'trace') + $data;
+				return;
+			case 'log':
+				$this->log(compact('context', 'trace') + $data);
+				return;
+		}
+
+		if (empty($this->_outputFormat) || !isset($this->_templates[$this->_outputFormat])) {
+			$this->_outputFormat = 'js';
+		}
+
+		$data['id'] = 'cakeErr' . count($this->errors);
+		$tpl = array_merge($this->_templates['base'], $this->_templates[$this->_outputFormat]);
+		$insert = array('context' => join("\n", $context), 'helpPath' => $this->helpPath) + $data;
+
+		$detect = array('help' => 'helpID', 'context' => 'context');
+
+		if (isset($tpl['links'])) {
+			foreach ($tpl['links'] as $key => $val) {
+				if (isset($detect[$key]) && empty($insert[$detect[$key]])) {
+					continue;
+				}
+				$links[$key] = String::insert($val, $insert, $insertOpts);
+			}
+		}
+
+		foreach (array('code', 'context', 'trace') as $key) {
+			if (empty($$key) || !isset($tpl[$key])) {
+				continue;
+			}
+			if (is_array($$key)) {
+				$$key = join("\n", $$key);
+			}
+			$info .= String::insert($tpl[$key], compact($key) + $insert, $insertOpts);
+		}
+		$links = join(' | ', $links);
+		unset($data['context']);
+
+		echo String::insert($tpl['error'], compact('links', 'info') + $data, $insertOpts);
+	}
+
+/**
+ * Verifies that the application's salt and cipher seed value has been changed from the default value.
+ *
+ * @access public
+ * @static
+ */
+	function checkSecurityKeys() {
+		if (Configure::read('Security.salt') == 'DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi') {
+			trigger_error(__('Please change the value of \'Security.salt\' in app/config/core.php to a salt value specific to your application', true), E_USER_NOTICE);
+		}
+
+		if (Configure::read('Security.cipherSeed') === '76859309657453542496749683645') {
+			trigger_error(__('Please change the value of \'Security.cipherSeed\' in app/config/core.php to a numeric (digits only) seed value specific to your application', true), E_USER_NOTICE);
+		}
+	}
+
+/**
+ * Invokes the given debugger object as the current error handler, taking over control from the
+ * previous handler in a stack-like hierarchy.
+ *
+ * @param object $debugger A reference to the Debugger object
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1191/Using-the-Debugger-Class
+ */
+	function invoke(&$debugger) {
+		set_error_handler(array(&$debugger, 'handleError'));
+	}
+}
+
+if (!defined('DISABLE_DEFAULT_ERROR_HANDLING')) {
+	Debugger::invoke(Debugger::getInstance());
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/error.php b/code/ryzom/tools/server/www/webtt/cake/libs/error.php
new file mode 100644
index 000000000..e8d7a0d6a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/error.php
@@ -0,0 +1,462 @@
+<?php
+/**
+ * Error handler
+ *
+ * Provides Error Capturing for Framework errors.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.10.5.1732
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Controller', 'App');
+
+/**
+ * Error Handling Controller
+ *
+ * Controller used by ErrorHandler to render error views.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class CakeErrorController extends AppController {
+	var $name = 'CakeError';
+
+/**
+ * Uses Property
+ *
+ * @var array
+ */
+	var $uses = array();
+
+/**
+ * __construct
+ *
+ * @access public
+ * @return void
+ */
+	function __construct() {
+		parent::__construct();
+		$this->_set(Router::getPaths());
+		$this->params = Router::getParams();
+		$this->constructClasses();
+		$this->Component->initialize($this);
+		$this->_set(array('cacheAction' => false, 'viewPath' => 'errors'));
+	}
+}
+
+/**
+ * Error Handler.
+ *
+ * Captures and handles all cakeError() calls.
+ * Displays helpful framework errors when debug > 1.
+ * When debug < 1 cakeError() will render 404 or 500 errors.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class ErrorHandler extends Object {
+
+/**
+ * Controller instance.
+ *
+ * @var Controller
+ * @access public
+ */
+	var $controller = null;
+
+/**
+ * Class constructor.
+ *
+ * @param string $method Method producing the error
+ * @param array $messages Error messages
+ */
+	function __construct($method, $messages) {
+		App::import('Core', 'Sanitize');
+		static $__previousError = null;
+
+		if ($__previousError != array($method, $messages)) {
+			$__previousError = array($method, $messages);
+			$this->controller =& new CakeErrorController();
+		} else {
+			$this->controller =& new Controller();
+			$this->controller->viewPath = 'errors';
+		}
+		$options = array('escape' => false);
+		$messages = Sanitize::clean($messages, $options);
+
+		if (!isset($messages[0])) {
+			$messages = array($messages);
+		}
+
+		if (method_exists($this->controller, 'apperror')) {
+			return $this->controller->appError($method, $messages);
+		}
+
+		if (!in_array(strtolower($method), array_map('strtolower', get_class_methods($this)))) {
+			$method = 'error';
+		}
+
+		if ($method !== 'error') {
+			if (Configure::read('debug') == 0) {
+				$parentClass = get_parent_class($this);
+				if (strtolower($parentClass) != 'errorhandler') {
+					$method = 'error404';
+				}
+				$parentMethods = array_map('strtolower', get_class_methods($parentClass));
+				if (in_array(strtolower($method), $parentMethods)) {
+					$method = 'error404';
+				}
+				if (isset($messages[0]['code']) && $messages[0]['code'] == 500) {
+					$method = 'error500';
+				}
+			}
+		}
+		$this->dispatchMethod($method, $messages);
+		$this->_stop();
+	}
+
+/**
+ * Displays an error page (e.g. 404 Not found).
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function error($params) {
+		extract($params, EXTR_OVERWRITE);
+		$this->controller->set(array(
+			'code' => $code,
+			'name' => $name,
+			'message' => $message,
+			'title' => $code . ' ' . $name
+		));
+		$this->_outputMessage('error404');
+	}
+
+/**
+ * Convenience method to display a 404 page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function error404($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		if (!isset($url)) {
+			$url = $this->controller->here;
+		}
+		$url = Router::normalize($url);
+		$this->controller->header("HTTP/1.0 404 Not Found");
+		$this->controller->set(array(
+			'code' => '404',
+			'name' => __('Not Found', true),
+			'message' => h($url),
+			'base' => $this->controller->base
+		));
+		$this->_outputMessage('error404');
+	}
+
+/**
+ * Convenience method to display a 500 page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function error500($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		if (!isset($url)) {
+			$url = $this->controller->here;
+		}
+		$url = Router::normalize($url);
+		$this->controller->header("HTTP/1.0 500 Internal Server Error");
+		$this->controller->set(array(
+			'code' => '500',
+			'name' => __('An Internal Error Has Occurred', true),
+			'message' => h($url),
+			'base' => $this->controller->base
+		));
+		$this->_outputMessage('error500');
+	}
+/**
+ * Renders the Missing Controller web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingController($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$controllerName = str_replace('Controller', '', $className);
+		$this->controller->set(array(
+			'controller' => $className,
+			'controllerName' => $controllerName,
+			'title' => __('Missing Controller', true)
+		));
+		$this->_outputMessage('missingController');
+	}
+
+/**
+ * Renders the Missing Action web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingAction($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$controllerName = str_replace('Controller', '', $className);
+		$this->controller->set(array(
+			'controller' => $className,
+			'controllerName' => $controllerName,
+			'action' => $action,
+			'title' => __('Missing Method in Controller', true)
+		));
+		$this->_outputMessage('missingAction');
+	}
+
+/**
+ * Renders the Private Action web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function privateAction($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'controller' => $className,
+			'action' => $action,
+			'title' => __('Trying to access private method in class', true)
+		));
+		$this->_outputMessage('privateAction');
+	}
+
+/**
+ * Renders the Missing Table web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingTable($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->header("HTTP/1.0 500 Internal Server Error");
+		$this->controller->set(array(
+			'code' => '500',
+			'model' => $className,
+			'table' => $table,
+			'title' => __('Missing Database Table', true)
+		));
+		$this->_outputMessage('missingTable');
+	}
+
+/**
+ * Renders the Missing Database web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingDatabase($params = array()) {
+		$this->controller->header("HTTP/1.0 500 Internal Server Error");
+		$this->controller->set(array(
+			'code' => '500',
+			'title' => __('Scaffold Missing Database Connection', true)
+		));
+		$this->_outputMessage('missingScaffolddb');
+	}
+
+/**
+ * Renders the Missing View web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingView($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'controller' => $className,
+			'action' => $action,
+			'file' => $file,
+			'title' => __('Missing View', true)
+		));
+		$this->_outputMessage('missingView');
+	}
+
+/**
+ * Renders the Missing Layout web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingLayout($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->layout = 'default';
+		$this->controller->set(array(
+			'file' => $file,
+			'title' => __('Missing Layout', true)
+		));
+		$this->_outputMessage('missingLayout');
+	}
+
+/**
+ * Renders the Database Connection web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingConnection($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->header("HTTP/1.0 500 Internal Server Error");
+		$this->controller->set(array(
+			'code' => '500',
+			'model' => $className,
+			'title' => __('Missing Database Connection', true)
+		));
+		$this->_outputMessage('missingConnection');
+	}
+
+/**
+ * Renders the Missing Helper file web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingHelperFile($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'helperClass' => Inflector::camelize($helper) . "Helper",
+			'file' => $file,
+			'title' => __('Missing Helper File', true)
+		));
+		$this->_outputMessage('missingHelperFile');
+	}
+
+/**
+ * Renders the Missing Helper class web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingHelperClass($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'helperClass' => Inflector::camelize($helper) . "Helper",
+			'file' => $file,
+			'title' => __('Missing Helper Class', true)
+		));
+		$this->_outputMessage('missingHelperClass');
+	}
+
+/**
+ * Renders the Missing Behavior file web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingBehaviorFile($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'behaviorClass' => Inflector::camelize($behavior) . "Behavior",
+			'file' => $file,
+			'title' => __('Missing Behavior File', true)
+		));
+		$this->_outputMessage('missingBehaviorFile');
+	}
+
+/**
+ * Renders the Missing Behavior class web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingBehaviorClass($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'behaviorClass' => Inflector::camelize($behavior) . "Behavior",
+			'file' => $file,
+			'title' => __('Missing Behavior Class', true)
+		));
+		$this->_outputMessage('missingBehaviorClass');
+	}
+
+/**
+ * Renders the Missing Component file web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingComponentFile($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'controller' => $className,
+			'component' => $component,
+			'file' => $file,
+			'title' => __('Missing Component File', true)
+		));
+		$this->_outputMessage('missingComponentFile');
+	}
+
+/**
+ * Renders the Missing Component class web page.
+ *
+ * @param array $params Parameters for controller
+ * @access public
+ */
+	function missingComponentClass($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'controller' => $className,
+			'component' => $component,
+			'file' => $file,
+			'title' => __('Missing Component Class', true)
+		));
+		$this->_outputMessage('missingComponentClass');
+	}
+
+/**
+ * Renders the Missing Model class web page.
+ *
+ * @param unknown_type $params Parameters for controller
+ * @access public
+ */
+	function missingModel($params) {
+		extract($params, EXTR_OVERWRITE);
+
+		$this->controller->set(array(
+			'model' => $className,
+			'title' => __('Missing Model', true)
+		));
+		$this->_outputMessage('missingModel');
+	}
+
+/**
+ * Output message
+ *
+ * @access protected
+ */
+	function _outputMessage($template) {
+		$this->controller->render($template);
+		$this->controller->afterFilter();
+		echo $this->controller->output;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/file.php b/code/ryzom/tools/server/www/webtt/cake/libs/file.php
new file mode 100644
index 000000000..86755a513
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/file.php
@@ -0,0 +1,542 @@
+<?php
+/**
+ * Convenience class for reading, writing and appending to files.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libraries.
+ *
+ */
+if (!class_exists('Object')) {
+	require LIBS . 'object.php';
+}
+if (!class_exists('Folder')) {
+	require LIBS . 'folder.php';
+}
+
+/**
+ * Convenience class for reading, writing and appending to files.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class File extends Object {
+
+/**
+ * Folder object of the File
+ *
+ * @var Folder
+ * @access public
+ */
+	var $Folder = null;
+
+/**
+ * Filename
+ *
+ * @var string
+ * @access public
+ */
+	var $name = null;
+
+/**
+ * file info
+ *
+ * @var string
+ * @access public
+ */
+	var $info = array();
+
+/**
+ * Holds the file handler resource if the file is opened
+ *
+ * @var resource
+ * @access public
+ */
+	var $handle = null;
+
+/**
+ * enable locking for file reading and writing
+ *
+ * @var boolean
+ * @access public
+ */
+	var $lock = null;
+
+/**
+ * path property
+ *
+ * Current file's absolute path
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $path = null;
+
+/**
+ * Constructor
+ *
+ * @param string $path Path to file
+ * @param boolean $create Create file if it does not exist (if true)
+ * @param integer $mode Mode to apply to the folder holding the file
+ */
+	function __construct($path, $create = false, $mode = 0755) {
+		parent::__construct();
+		$this->Folder =& new Folder(dirname($path), $create, $mode);
+		if (!is_dir($path)) {
+			$this->name = basename($path);
+		}
+		$this->pwd();
+		$create && !$this->exists() && $this->safe($path) && $this->create();
+	}
+
+/**
+ * Closes the current file if it is opened
+ *
+ */
+	function __destruct() {
+		$this->close();
+	}
+
+/**
+ * Creates the File.
+ *
+ * @return boolean Success
+ * @access public
+ */
+	function create() {
+		$dir = $this->Folder->pwd();
+		if (is_dir($dir) && is_writable($dir) && !$this->exists()) {
+			$old = umask(0);
+			if (touch($this->path)) {
+				umask($old);
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Opens the current file with a given $mode
+ *
+ * @param string $mode A valid 'fopen' mode string (r|w|a ...)
+ * @param boolean $force If true then the file will be re-opened even if its already opened, otherwise it won't
+ * @return boolean True on success, false on failure
+ * @access public
+ */
+	function open($mode = 'r', $force = false) {
+		if (!$force && is_resource($this->handle)) {
+			return true;
+		}
+		clearstatcache();
+		if ($this->exists() === false) {
+			if ($this->create() === false) {
+				return false;
+			}
+		}
+
+		$this->handle = fopen($this->path, $mode);
+		if (is_resource($this->handle)) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Return the contents of this File as a string.
+ *
+ * @param string $bytes where to start
+ * @param string $mode A `fread` compatible mode.
+ * @param boolean $force If true then the file will be re-opened even if its already opened, otherwise it won't
+ * @return mixed string on success, false on failure
+ * @access public
+ */
+	function read($bytes = false, $mode = 'rb', $force = false) {
+		if ($bytes === false && $this->lock === null) {
+			return file_get_contents($this->path);
+		}
+		if ($this->open($mode, $force) === false) {
+			return false;
+		}
+		if ($this->lock !== null && flock($this->handle, LOCK_SH) === false) {
+			return false;
+		}
+		if (is_int($bytes)) {
+			return fread($this->handle, $bytes);
+		}
+
+		$data = '';
+		while (!feof($this->handle)) {
+			$data .= fgets($this->handle, 4096);
+		}
+
+		if ($this->lock !== null) {
+			flock($this->handle, LOCK_UN);
+		}
+		if ($bytes === false) {
+			$this->close();
+		}
+		return trim($data);
+	}
+
+/**
+ * Sets or gets the offset for the currently opened file.
+ *
+ * @param mixed $offset The $offset in bytes to seek. If set to false then the current offset is returned.
+ * @param integer $seek PHP Constant SEEK_SET | SEEK_CUR | SEEK_END determining what the $offset is relative to
+ * @return mixed True on success, false on failure (set mode), false on failure or integer offset on success (get mode)
+ * @access public
+ */
+	function offset($offset = false, $seek = SEEK_SET) {
+		if ($offset === false) {
+			if (is_resource($this->handle)) {
+				return ftell($this->handle);
+			}
+		} elseif ($this->open() === true) {
+			return fseek($this->handle, $offset, $seek) === 0;
+		}
+		return false;
+	}
+
+/**
+ * Prepares a ascii string for writing.  Converts line endings to the 
+ * correct terminator for the current platform.  If windows "\r\n" will be used
+ * all other platforms will use "\n"
+ *
+ * @param string $data Data to prepare for writing.
+ * @return string The with converted line endings.
+ * @access public
+ */
+	function prepare($data, $forceWindows = false) {
+		$lineBreak = "\n";
+		if (DIRECTORY_SEPARATOR == '\\' || $forceWindows === true) {
+			$lineBreak = "\r\n";
+		}
+		return strtr($data, array("\r\n" => $lineBreak, "\n" => $lineBreak, "\r" => $lineBreak));
+	}
+
+/**
+ * Write given data to this File.
+ *
+ * @param string $data Data to write to this File.
+ * @param string $mode Mode of writing. {@link http://php.net/fwrite See fwrite()}.
+ * @param string $force force the file to open
+ * @return boolean Success
+ * @access public
+ */
+	function write($data, $mode = 'w', $force = false) {
+		$success = false;
+		if ($this->open($mode, $force) === true) {
+			if ($this->lock !== null) {
+				if (flock($this->handle, LOCK_EX) === false) {
+					return false;
+				}
+			}
+
+			if (fwrite($this->handle, $data) !== false) {
+				$success = true;
+			}
+			if ($this->lock !== null) {
+				flock($this->handle, LOCK_UN);
+			}
+		}
+		return $success;
+	}
+
+/**
+ * Append given data string to this File.
+ *
+ * @param string $data Data to write
+ * @param string $force force the file to open
+ * @return boolean Success
+ * @access public
+ */
+	function append($data, $force = false) {
+		return $this->write($data, 'a', $force);
+	}
+
+/**
+ * Closes the current file if it is opened.
+ *
+ * @return boolean True if closing was successful or file was already closed, otherwise false
+ * @access public
+ */
+	function close() {
+		if (!is_resource($this->handle)) {
+			return true;
+		}
+		return fclose($this->handle);
+	}
+
+/**
+ * Deletes the File.
+ *
+ * @return boolean Success
+ * @access public
+ */
+	function delete() {
+		clearstatcache();
+		if ($this->exists()) {
+			return unlink($this->path);
+		}
+		return false;
+	}
+
+/**
+ * Returns the File info.
+ *
+ * @return string The File extension
+ * @access public
+ */
+	function info() {
+		if ($this->info == null) {
+			$this->info = pathinfo($this->path);
+		}
+		if (!isset($this->info['filename'])) {
+			$this->info['filename'] = $this->name();
+		}
+		return $this->info;
+	}
+
+/**
+ * Returns the File extension.
+ *
+ * @return string The File extension
+ * @access public
+ */
+	function ext() {
+		if ($this->info == null) {
+			$this->info();
+		}
+		if (isset($this->info['extension'])) {
+			return $this->info['extension'];
+		}
+		return false;
+	}
+
+/**
+ * Returns the File name without extension.
+ *
+ * @return string The File name without extension.
+ * @access public
+ */
+	function name() {
+		if ($this->info == null) {
+			$this->info();
+		}
+		if (isset($this->info['extension'])) {
+			return basename($this->name, '.'.$this->info['extension']);
+		} elseif ($this->name) {
+			return $this->name;
+		}
+		return false;
+	}
+
+/**
+ * makes filename safe for saving
+ *
+ * @param string $name The name of the file to make safe if different from $this->name
+ * @param strin $ext The name of the extension to make safe if different from $this->ext
+ * @return string $ext the extension of the file
+ * @access public
+ */
+	function safe($name = null, $ext = null) {
+		if (!$name) {
+			$name = $this->name;
+		}
+		if (!$ext) {
+			$ext = $this->ext();
+		}
+		return preg_replace( "/(?:[^\w\.-]+)/", "_", basename($name, $ext));
+	}
+
+/**
+ * Get md5 Checksum of file with previous check of Filesize
+ *
+ * @param mixed $maxsize in MB or true to force
+ * @return string md5 Checksum {@link http://php.net/md5_file See md5_file()}
+ * @access public
+ */
+	function md5($maxsize = 5) {
+		if ($maxsize === true) {
+			return md5_file($this->path);
+		}
+
+		$size = $this->size();
+		if ($size && $size < ($maxsize * 1024) * 1024) {
+			return md5_file($this->path);
+		}
+
+		return false;
+	}
+
+/**
+ * Returns the full path of the File.
+ *
+ * @return string Full path to file
+ * @access public
+ */
+	function pwd() {
+		if (is_null($this->path)) {
+			$this->path = $this->Folder->slashTerm($this->Folder->pwd()) . $this->name;
+		}
+		return $this->path;
+	}
+
+/**
+ * Returns true if the File exists.
+ *
+ * @return boolean true if it exists, false otherwise
+ * @access public
+ */
+	function exists() {
+		return (file_exists($this->path) && is_file($this->path));
+	}
+
+/**
+ * Returns the "chmod" (permissions) of the File.
+ *
+ * @return string Permissions for the file
+ * @access public
+ */
+	function perms() {
+		if ($this->exists()) {
+			return substr(sprintf('%o', fileperms($this->path)), -4);
+		}
+		return false;
+	}
+
+/**
+ * Returns the Filesize
+ *
+ * @return integer size of the file in bytes, or false in case of an error
+ * @access public
+ */
+	function size() {
+		if ($this->exists()) {
+			return filesize($this->path);
+		}
+		return false;
+	}
+
+/**
+ * Returns true if the File is writable.
+ *
+ * @return boolean true if its writable, false otherwise
+ * @access public
+ */
+	function writable() {
+		return is_writable($this->path);
+	}
+
+/**
+ * Returns true if the File is executable.
+ *
+ * @return boolean true if its executable, false otherwise
+ * @access public
+ */
+	function executable() {
+		return is_executable($this->path);
+	}
+
+/**
+ * Returns true if the File is readable.
+ *
+ * @return boolean true if file is readable, false otherwise
+ * @access public
+ */
+	function readable() {
+		return is_readable($this->path);
+	}
+
+/**
+ * Returns the File's owner.
+ *
+ * @return integer the Fileowner
+ * @access public
+ */
+	function owner() {
+		if ($this->exists()) {
+			return fileowner($this->path);
+		}
+		return false;
+	}
+
+/**
+ * Returns the File's group.
+ *
+ * @return integer the Filegroup
+ * @access public
+ */
+	function group() {
+		if ($this->exists()) {
+			return filegroup($this->path);
+		}
+		return false;
+	}
+
+/**
+ * Returns last access time.
+ *
+ * @return integer timestamp Timestamp of last access time
+ * @access public
+ */
+	function lastAccess() {
+		if ($this->exists()) {
+			return fileatime($this->path);
+		}
+		return false;
+	}
+
+/**
+ * Returns last modified time.
+ *
+ * @return integer timestamp Timestamp of last modification
+ * @access public
+ */
+	function lastChange() {
+		if ($this->exists()) {
+			return filemtime($this->path);
+		}
+		return false;
+	}
+
+/**
+ * Returns the current folder.
+ *
+ * @return Folder Current folder
+ * @access public
+ */
+	function &Folder() {
+		return $this->Folder;
+	}
+
+/**
+ * Copy the File to $dest
+ *
+ * @param string $dest destination for the copy
+ * @param boolean $overwrite Overwrite $dest if exists
+ * @return boolean Succes
+ * @access public
+ */
+	function copy($dest, $overwrite = true) {
+		if (!$this->exists() || is_file($dest) && !$overwrite) {
+			return false;
+		}
+		return copy($this->path, $dest);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/folder.php b/code/ryzom/tools/server/www/webtt/cake/libs/folder.php
new file mode 100644
index 000000000..97de64e8c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/folder.php
@@ -0,0 +1,787 @@
+<?php
+/**
+ * Convenience class for handling directories.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libraries.
+ *
+ */
+if (!class_exists('Object')) {
+	require LIBS . 'object.php';
+}
+
+/**
+ * Folder structure browser, lists folders and files.
+ * Provides an Object interface for Common directory related tasks.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Folder extends Object {
+
+/**
+ * Path to Folder.
+ *
+ * @var string
+ * @access public
+ */
+	var $path = null;
+
+/**
+ * Sortedness. Whether or not list results
+ * should be sorted by name.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $sort = false;
+
+/**
+ * Mode to be used on create. Does nothing on windows platforms.
+ *
+ * @var integer
+ * @access public
+ */
+	var $mode = 0755;
+
+/**
+ * Holds messages from last method.
+ *
+ * @var array
+ * @access private
+ */
+	var $__messages = array();
+
+/**
+ * Holds errors from last method.
+ *
+ * @var array
+ * @access private
+ */
+	var $__errors = false;
+
+/**
+ * Holds array of complete directory paths.
+ *
+ * @var array
+ * @access private
+ */
+	var $__directories;
+
+/**
+ * Holds array of complete file paths.
+ *
+ * @var array
+ * @access private
+ */
+	var $__files;
+
+/**
+ * Constructor.
+ *
+ * @param string $path Path to folder
+ * @param boolean $create Create folder if not found
+ * @param mixed $mode Mode (CHMOD) to apply to created folder, false to ignore
+ */
+	function __construct($path = false, $create = false, $mode = false) {
+		parent::__construct();
+		if (empty($path)) {
+			$path = TMP;
+		}
+		if ($mode) {
+			$this->mode = $mode;
+		}
+
+		if (!file_exists($path) && $create === true) {
+			$this->create($path, $this->mode);
+		}
+		if (!Folder::isAbsolute($path)) {
+			$path = realpath($path);
+		}
+		if (!empty($path)) {
+			$this->cd($path);
+		}
+	}
+
+/**
+ * Return current path.
+ *
+ * @return string Current path
+ * @access public
+ */
+	function pwd() {
+		return $this->path;
+	}
+
+/**
+ * Change directory to $path.
+ *
+ * @param string $path Path to the directory to change to
+ * @return string The new path. Returns false on failure
+ * @access public
+ */
+	function cd($path) {
+		$path = $this->realpath($path);
+		if (is_dir($path)) {
+			return $this->path = $path;
+		}
+		return false;
+	}
+
+/**
+ * Returns an array of the contents of the current directory.
+ * The returned array holds two arrays: One of directories and one of files.
+ *
+ * @param boolean $sort Whether you want the results sorted, set this and the sort property
+ *   to false to get unsorted results.
+ * @param mixed $exceptions Either an array or boolean true will not grab dot files
+ * @param boolean $fullPath True returns the full path
+ * @return mixed Contents of current directory as an array, an empty array on failure
+ * @access public
+ */
+	function read($sort = true, $exceptions = false, $fullPath = false) {
+		$dirs = $files = array();
+
+		if (!$this->pwd()) {
+			return array($dirs, $files);
+		}
+		if (is_array($exceptions)) {
+			$exceptions = array_flip($exceptions);
+		}
+		$skipHidden = isset($exceptions['.']) || $exceptions === true;
+
+		if (false === ($dir = @opendir($this->path))) {
+			return array($dirs, $files);
+		}
+
+		while (false !== ($item = readdir($dir))) {
+			if ($item === '.' || $item === '..' || ($skipHidden && $item[0] === '.') || isset($exceptions[$item])) {
+				continue;
+			}
+
+			$path = Folder::addPathElement($this->path, $item);
+			if (is_dir($path)) {
+				$dirs[] = $fullPath ? $path : $item;
+			} else {
+				$files[] = $fullPath ? $path : $item;
+			}
+		}
+
+		if ($sort || $this->sort) {
+			sort($dirs);
+			sort($files);
+		}
+
+		closedir($dir);
+		return array($dirs, $files);
+	}
+
+/**
+ * Returns an array of all matching files in current directory.
+ *
+ * @param string $pattern Preg_match pattern (Defaults to: .*)
+ * @param boolean $sort Whether results should be sorted.
+ * @return array Files that match given pattern
+ * @access public
+ */
+	function find($regexpPattern = '.*', $sort = false) {
+		list($dirs, $files) = $this->read($sort);
+		return array_values(preg_grep('/^' . $regexpPattern . '$/i', $files)); ;
+	}
+
+/**
+ * Returns an array of all matching files in and below current directory.
+ *
+ * @param string $pattern Preg_match pattern (Defaults to: .*)
+ * @param boolean $sort Whether results should be sorted.
+ * @return array Files matching $pattern
+ * @access public
+ */
+	function findRecursive($pattern = '.*', $sort = false) {
+		if (!$this->pwd()) {
+			return array();
+		}
+		$startsOn = $this->path;
+		$out = $this->_findRecursive($pattern, $sort);
+		$this->cd($startsOn);
+		return $out;
+	}
+
+/**
+ * Private helper function for findRecursive.
+ *
+ * @param string $pattern Pattern to match against
+ * @param boolean $sort Whether results should be sorted.
+ * @return array Files matching pattern
+ * @access private
+ */
+	function _findRecursive($pattern, $sort = false) {
+		list($dirs, $files) = $this->read($sort);
+		$found = array();
+
+		foreach ($files as $file) {
+			if (preg_match('/^' . $pattern . '$/i', $file)) {
+				$found[] = Folder::addPathElement($this->path, $file);
+			}
+		}
+		$start = $this->path;
+
+		foreach ($dirs as $dir) {
+			$this->cd(Folder::addPathElement($start, $dir));
+			$found = array_merge($found, $this->findRecursive($pattern, $sort));
+		}
+		return $found;
+	}
+
+/**
+ * Returns true if given $path is a Windows path.
+ *
+ * @param string $path Path to check
+ * @return boolean true if windows path, false otherwise
+ * @access public
+ * @static
+ */
+	function isWindowsPath($path) {
+		return (preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) == '\\\\');
+	}
+
+/**
+ * Returns true if given $path is an absolute path.
+ *
+ * @param string $path Path to check
+ * @return bool true if path is absolute.
+ * @access public
+ * @static
+ */
+	function isAbsolute($path) {
+		return !empty($path) && ($path[0] === '/' || preg_match('/^[A-Z]:\\\\/i', $path) || substr($path, 0, 2) == '\\\\');
+	}
+
+/**
+ * Returns a correct set of slashes for given $path. (\\ for Windows paths and / for other paths.)
+ *
+ * @param string $path Path to check
+ * @return string Set of slashes ("\\" or "/")
+ * @access public
+ * @static
+ */
+	function normalizePath($path) {
+		return Folder::correctSlashFor($path);
+	}
+
+/**
+ * Returns a correct set of slashes for given $path. (\\ for Windows paths and / for other paths.)
+ *
+ * @param string $path Path to check
+ * @return string Set of slashes ("\\" or "/")
+ * @access public
+ * @static
+ */
+	function correctSlashFor($path) {
+		return (Folder::isWindowsPath($path)) ? '\\' : '/';
+	}
+
+/**
+ * Returns $path with added terminating slash (corrected for Windows or other OS).
+ *
+ * @param string $path Path to check
+ * @return string Path with ending slash
+ * @access public
+ * @static
+ */
+	function slashTerm($path) {
+		if (Folder::isSlashTerm($path)) {
+			return $path;
+		}
+		return $path . Folder::correctSlashFor($path);
+	}
+
+/**
+ * Returns $path with $element added, with correct slash in-between.
+ *
+ * @param string $path Path
+ * @param string $element Element to and at end of path
+ * @return string Combined path
+ * @access public
+ * @static
+ */
+	function addPathElement($path, $element) {
+		return rtrim($path, DS) . DS . $element;
+	}
+
+/**
+ * Returns true if the File is in a given CakePath.
+ *
+ * @param string $path The path to check.
+ * @return bool
+ * @access public
+ */
+	function inCakePath($path = '') {
+		$dir = substr(Folder::slashTerm(ROOT), 0, -1);
+		$newdir = $dir . $path;
+
+		return $this->inPath($newdir);
+	}
+
+/**
+ * Returns true if the File is in given path.
+ *
+ * @param string $path The path to check that the current pwd() resides with in.
+ * @param boolean $reverse
+ * @return bool
+ * @access public
+ */
+	function inPath($path = '', $reverse = false) {
+		$dir = Folder::slashTerm($path);
+		$current = Folder::slashTerm($this->pwd());
+
+		if (!$reverse) {
+			$return = preg_match('/^(.*)' . preg_quote($dir, '/') . '(.*)/', $current);
+		} else {
+			$return = preg_match('/^(.*)' . preg_quote($current, '/') . '(.*)/', $dir);
+		}
+		return (bool)$return;
+	}
+
+/**
+ * Change the mode on a directory structure recursively. This includes changing the mode on files as well.
+ *
+ * @param string $path The path to chmod
+ * @param integer $mode octal value 0755
+ * @param boolean $recursive chmod recursively, set to false to only change the current directory.
+ * @param array $exceptions array of files, directories to skip
+ * @return boolean Returns TRUE on success, FALSE on failure
+ * @access public
+ */
+	function chmod($path, $mode = false, $recursive = true, $exceptions = array()) {
+		if (!$mode) {
+			$mode = $this->mode;
+		}
+
+		if ($recursive === false && is_dir($path)) {
+			if (@chmod($path, intval($mode, 8))) {
+				$this->__messages[] = sprintf(__('%s changed to %s', true), $path, $mode);
+				return true;
+			}
+
+			$this->__errors[] = sprintf(__('%s NOT changed to %s', true), $path, $mode);
+			return false;
+		}
+
+		if (is_dir($path)) {
+			$paths = $this->tree($path);
+
+			foreach ($paths as $type) {
+				foreach ($type as $key => $fullpath) {
+					$check = explode(DS, $fullpath);
+					$count = count($check);
+
+					if (in_array($check[$count - 1], $exceptions)) {
+						continue;
+					}
+
+					if (@chmod($fullpath, intval($mode, 8))) {
+						$this->__messages[] = sprintf(__('%s changed to %s', true), $fullpath, $mode);
+					} else {
+						$this->__errors[] = sprintf(__('%s NOT changed to %s', true), $fullpath, $mode);
+					}
+				}
+			}
+
+			if (empty($this->__errors)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Returns an array of nested directories and files in each directory
+ *
+ * @param string $path the directory path to build the tree from
+ * @param mixed $exceptions Array of files to exclude, defaults to excluding hidden files.
+ * @param string $type either file or dir. null returns both files and directories
+ * @return mixed array of nested directories and files in each directory
+ * @access public
+ */
+	function tree($path, $exceptions = true, $type = null) {
+		$original = $this->path;
+		$path = rtrim($path, DS);
+		if (!$this->cd($path)) {
+			if ($type === null) {
+				return array(array(), array());
+			}
+			return array();
+		}
+		$this->__files = array();
+		$this->__directories = array($this->realpath($path));
+		$directories = array();
+
+		if ($exceptions === false) {
+			$exceptions = true;
+		}
+		while (!empty($this->__directories)) {
+			$dir = array_pop($this->__directories);
+			$this->__tree($dir, $exceptions);
+			$directories[] = $dir;
+		}
+
+		if ($type === null) {
+			return array($directories, $this->__files);
+		}
+		if ($type === 'dir') {
+			return $directories;
+		}
+		$this->cd($original);
+
+		return $this->__files;
+	}
+
+/**
+ * Private method to list directories and files in each directory
+ *
+ * @param string $path The Path to read.
+ * @param mixed $exceptions Array of files to exclude from the read that will be performed.
+ * @access private
+ */
+	function __tree($path, $exceptions) {
+		$this->path = $path;
+		list($dirs, $files) = $this->read(false, $exceptions, true);
+		$this->__directories = array_merge($this->__directories, $dirs);
+		$this->__files = array_merge($this->__files, $files);
+	}
+
+/**
+ * Create a directory structure recursively. Can be used to create
+ * deep path structures like `/foo/bar/baz/shoe/horn`
+ *
+ * @param string $pathname The directory structure to create
+ * @param integer $mode octal value 0755
+ * @return boolean Returns TRUE on success, FALSE on failure
+ * @access public
+ */
+	function create($pathname, $mode = false) {
+		if (is_dir($pathname) || empty($pathname)) {
+			return true;
+		}
+
+		if (!$mode) {
+			$mode = $this->mode;
+		}
+
+		if (is_file($pathname)) {
+			$this->__errors[] = sprintf(__('%s is a file', true), $pathname);
+			return false;
+		}
+		$pathname = rtrim($pathname, DS);
+		$nextPathname = substr($pathname, 0, strrpos($pathname, DS));
+
+		if ($this->create($nextPathname, $mode)) {
+			if (!file_exists($pathname)) {
+				$old = umask(0);
+				if (mkdir($pathname, $mode)) {
+					umask($old);
+					$this->__messages[] = sprintf(__('%s created', true), $pathname);
+					return true;
+				} else {
+					umask($old);
+					$this->__errors[] = sprintf(__('%s NOT created', true), $pathname);
+					return false;
+				}
+			}
+		}
+		return false;
+	}
+
+/**
+ * Returns the size in bytes of this Folder and its contents.
+ *
+ * @param string $directory Path to directory
+ * @return int size in bytes of current folder
+ * @access public
+ */
+	function dirsize() {
+		$size = 0;
+		$directory = Folder::slashTerm($this->path);
+		$stack = array($directory);
+		$count = count($stack);
+		for ($i = 0, $j = $count; $i < $j; ++$i) {
+			if (is_file($stack[$i])) {
+				$size += filesize($stack[$i]);
+			} elseif (is_dir($stack[$i])) {
+				$dir = dir($stack[$i]);
+				if ($dir) {
+					while (false !== ($entry = $dir->read())) {
+						if ($entry === '.' || $entry === '..') {
+							continue;
+						}
+						$add = $stack[$i] . $entry;
+
+						if (is_dir($stack[$i] . $entry)) {
+							$add = Folder::slashTerm($add);
+						}
+						$stack[] = $add;
+					}
+					$dir->close();
+				}
+			}
+			$j = count($stack);
+		}
+		return $size;
+	}
+
+/**
+ * Recursively Remove directories if the system allows.
+ *
+ * @param string $path Path of directory to delete
+ * @return boolean Success
+ * @access public
+ */
+	function delete($path = null) {
+		if (!$path) {
+			$path = $this->pwd();
+		}
+		if (!$path) {
+			return null;
+		}
+		$path = Folder::slashTerm($path);
+		if (is_dir($path) === true) {
+			$normalFiles = glob($path . '*');
+			$hiddenFiles = glob($path . '\.?*');
+
+			$normalFiles = $normalFiles ? $normalFiles : array();
+			$hiddenFiles = $hiddenFiles ? $hiddenFiles : array();
+
+			$files = array_merge($normalFiles, $hiddenFiles);
+			if (is_array($files)) {
+				foreach ($files as $file) {
+					if (preg_match('/(\.|\.\.)$/', $file)) {
+						continue;
+					}
+					if (is_file($file) === true) {
+						if (@unlink($file)) {
+							$this->__messages[] = sprintf(__('%s removed', true), $file);
+						} else {
+							$this->__errors[] = sprintf(__('%s NOT removed', true), $file);
+						}
+					} elseif (is_dir($file) === true && $this->delete($file) === false) {
+						return false;
+					}
+				}
+			}
+			$path = substr($path, 0, strlen($path) - 1);
+			if (rmdir($path) === false) {
+				$this->__errors[] = sprintf(__('%s NOT removed', true), $path);
+				return false;
+			} else {
+				$this->__messages[] = sprintf(__('%s removed', true), $path);
+			}
+		}
+		return true;
+	}
+
+/**
+ * Recursive directory copy.
+ *
+ * ### Options
+ *
+ * - `to` The directory to copy to.
+ * - `from` The directory to copy from, this will cause a cd() to occur, changing the results of pwd().
+ * - `chmod` The mode to copy the files/directories with.
+ * - `skip` Files/directories to skip.
+ *
+ * @param mixed $options Either an array of options (see above) or a string of the destination directory.
+ * @return bool Success
+ * @access public
+ */
+	function copy($options = array()) {
+		if (!$this->pwd()) {
+			return false;
+		}
+		$to = null;
+		if (is_string($options)) {
+			$to = $options;
+			$options = array();
+		}
+		$options = array_merge(array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array()), $options);
+
+		$fromDir = $options['from'];
+		$toDir = $options['to'];
+		$mode = $options['mode'];
+
+		if (!$this->cd($fromDir)) {
+			$this->__errors[] = sprintf(__('%s not found', true), $fromDir);
+			return false;
+		}
+
+		if (!is_dir($toDir)) {
+			$this->create($toDir, $mode);
+		}
+
+		if (!is_writable($toDir)) {
+			$this->__errors[] = sprintf(__('%s not writable', true), $toDir);
+			return false;
+		}
+
+		$exceptions = array_merge(array('.', '..', '.svn'), $options['skip']);
+		if ($handle = @opendir($fromDir)) {
+			while (false !== ($item = readdir($handle))) {
+				if (!in_array($item, $exceptions)) {
+					$from = Folder::addPathElement($fromDir, $item);
+					$to = Folder::addPathElement($toDir, $item);
+					if (is_file($from)) {
+						if (copy($from, $to)) {
+							chmod($to, intval($mode, 8));
+							touch($to, filemtime($from));
+							$this->__messages[] = sprintf(__('%s copied to %s', true), $from, $to);
+						} else {
+							$this->__errors[] = sprintf(__('%s NOT copied to %s', true), $from, $to);
+						}
+					}
+
+					if (is_dir($from) && !file_exists($to)) {
+						$old = umask(0);
+						if (mkdir($to, $mode)) {
+							umask($old);
+							$old = umask(0);
+							chmod($to, $mode);
+							umask($old);
+							$this->__messages[] = sprintf(__('%s created', true), $to);
+							$options = array_merge($options, array('to'=> $to, 'from'=> $from));
+							$this->copy($options);
+						} else {
+							$this->__errors[] = sprintf(__('%s not created', true), $to);
+						}
+					}
+				}
+			}
+			closedir($handle);
+		} else {
+			return false;
+		}
+
+		if (!empty($this->__errors)) {
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Recursive directory move.
+ *
+ * ### Options
+ *
+ * - `to` The directory to copy to.
+ * - `from` The directory to copy from, this will cause a cd() to occur, changing the results of pwd().
+ * - `chmod` The mode to copy the files/directories with.
+ * - `skip` Files/directories to skip.
+ *
+ * @param array $options (to, from, chmod, skip)
+ * @return boolean Success
+ * @access public
+ */
+	function move($options) {
+		$to = null;
+		if (is_string($options)) {
+			$to = $options;
+			$options = (array)$options;
+		}
+		$options = array_merge(array('to' => $to, 'from' => $this->path, 'mode' => $this->mode, 'skip' => array()), $options);
+
+		if ($this->copy($options)) {
+			if ($this->delete($options['from'])) {
+				return $this->cd($options['to']);
+			}
+		}
+		return false;
+	}
+
+/**
+ * get messages from latest method
+ *
+ * @return array
+ * @access public
+ */
+	function messages() {
+		return $this->__messages;
+	}
+
+/**
+ * get error from latest method
+ *
+ * @return array
+ * @access public
+ */
+	function errors() {
+		return $this->__errors;
+	}
+
+/**
+ * Get the real path (taking ".." and such into account)
+ *
+ * @param string $path Path to resolve
+ * @return string The resolved path
+ */
+	function realpath($path) {
+		$path = str_replace('/', DS, trim($path));
+		if (strpos($path, '..') === false) {
+			if (!Folder::isAbsolute($path)) {
+				$path = Folder::addPathElement($this->path, $path);
+			}
+			return $path;
+		}
+		$parts = explode(DS, $path);
+		$newparts = array();
+		$newpath = '';
+		if ($path[0] === DS) {
+			$newpath = DS;
+		}
+
+		while (($part = array_shift($parts)) !== NULL) {
+			if ($part === '.' || $part === '') {
+				continue;
+			}
+			if ($part === '..') {
+				if (!empty($newparts)) {
+					array_pop($newparts);
+					continue;
+				} else {
+					return false;
+				}
+			}
+			$newparts[] = $part;
+		}
+		$newpath .= implode(DS, $newparts);
+
+		return Folder::slashTerm($newpath);
+	}
+
+/**
+ * Returns true if given $path ends in a slash (i.e. is slash-terminated).
+ *
+ * @param string $path Path to check
+ * @return boolean true if path ends with slash, false otherwise
+ * @access public
+ * @static
+ */
+	function isSlashTerm($path) {
+		$lastChar = $path[strlen($path) - 1];
+		return $lastChar === '/' || $lastChar === '\\';
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/http_socket.php b/code/ryzom/tools/server/www/webtt/cake/libs/http_socket.php
new file mode 100644
index 000000000..a01776cb3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/http_socket.php
@@ -0,0 +1,1081 @@
+<?php
+/**
+ * HTTP Socket connection class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('CakeSocket', 'Set', 'Router'));
+
+/**
+ * Cake network socket connection class.
+ *
+ * Core base class for HTTP network communication. HttpSocket can be used as an
+ * Object Oriented replacement for cURL in many places.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class HttpSocket extends CakeSocket {
+
+/**
+ * Object description
+ *
+ * @var string
+ * @access public
+ */
+	var $description = 'HTTP-based DataSource Interface';
+
+/**
+ * When one activates the $quirksMode by setting it to true, all checks meant to
+ * enforce RFC 2616 (HTTP/1.1 specs).
+ * will be disabled and additional measures to deal with non-standard responses will be enabled.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $quirksMode = false;
+
+/**
+ * The default values to use for a request
+ *
+ * @var array
+ * @access public
+ */
+	var $request = array(
+		'method' => 'GET',
+		'uri' => array(
+			'scheme' => 'http',
+			'host' => null,
+			'port' => 80,
+			'user' => null,
+			'pass' => null,
+			'path' => null,
+			'query' => null,
+			'fragment' => null
+		),
+		'auth' => array(
+			'method' => 'Basic',
+			'user' => null,
+			'pass' => null
+		),
+		'version' => '1.1',
+		'body' => '',
+		'line' => null,
+		'header' => array(
+			'Connection' => 'close',
+			'User-Agent' => 'CakePHP'
+		),
+		'raw' => null,
+		'cookies' => array()
+	);
+
+/**
+* The default structure for storing the response
+*
+* @var array
+* @access public
+*/
+	var $response = array(
+		'raw' => array(
+			'status-line' => null,
+			'header' => null,
+			'body' => null,
+			'response' => null
+		),
+		'status' => array(
+			'http-version' => null,
+			'code' => null,
+			'reason-phrase' => null
+		),
+		'header' => array(),
+		'body' => '',
+		'cookies' => array()
+	);
+
+/**
+ * Default configuration settings for the HttpSocket
+ *
+ * @var array
+ * @access public
+ */
+	var $config = array(
+		'persistent' => false,
+		'host' => 'localhost',
+		'protocol' => 'tcp',
+		'port' => 80,
+		'timeout' => 30,
+		'request' => array(
+			'uri' => array(
+				'scheme' => 'http',
+				'host' => 'localhost',
+				'port' => 80
+			),
+			'auth' => array(
+				'method' => 'Basic',
+				'user' => null,
+				'pass' => null
+			),
+			'cookies' => array()
+		)
+	);
+
+/**
+ * String that represents a line break.
+ *
+ * @var string
+ * @access public
+ */
+	var $lineBreak = "\r\n";
+
+/**
+ * Build an HTTP Socket using the specified configuration.
+ *
+ * You can use a url string to set the url and use default configurations for
+ * all other options:
+ *
+ * `$http =& new HttpSocket('http://cakephp.org/');`
+ *
+ * Or use an array to configure multiple options:
+ *
+ * {{{
+ * $http =& new HttpSocket(array(
+ *    'host' => 'cakephp.org',
+ *    'timeout' => 20
+ * ));
+ * }}}
+ *
+ * See HttpSocket::$config for options that can be used.
+ *
+ * @param mixed $config Configuration information, either a string url or an array of options.
+ * @access public
+ */
+	function __construct($config = array()) {
+		if (is_string($config)) {
+			$this->_configUri($config);
+		} elseif (is_array($config)) {
+			if (isset($config['request']['uri']) && is_string($config['request']['uri'])) {
+				$this->_configUri($config['request']['uri']);
+				unset($config['request']['uri']);
+			}
+			$this->config = Set::merge($this->config, $config);
+		}
+		parent::__construct($this->config);
+	}
+
+/**
+ * Issue the specified request. HttpSocket::get() and HttpSocket::post() wrap this
+ * method and provide a more granular interface.
+ *
+ * @param mixed $request Either an URI string, or an array defining host/uri
+ * @return mixed false on error, request body on success
+ * @access public
+ */
+	function request($request = array()) {
+		$this->reset(false);
+
+		if (is_string($request)) {
+			$request = array('uri' => $request);
+		} elseif (!is_array($request)) {
+			return false;
+		}
+
+		if (!isset($request['uri'])) {
+			$request['uri'] = null;
+		}
+		$uri = $this->_parseUri($request['uri']);
+		$hadAuth = false;
+		if (is_array($uri) && array_key_exists('user', $uri)) {
+			$hadAuth = true;
+		}
+		if (!isset($uri['host'])) {
+			$host = $this->config['host'];
+		}
+		if (isset($request['host'])) {
+			$host = $request['host'];
+			unset($request['host']);
+		}
+		$request['uri'] = $this->url($request['uri']);
+		$request['uri'] = $this->_parseUri($request['uri'], true);
+		$this->request = Set::merge($this->request, $this->config['request'], $request);
+
+		if (!$hadAuth && !empty($this->config['request']['auth']['user'])) {
+			$this->request['uri']['user'] = $this->config['request']['auth']['user'];
+			$this->request['uri']['pass'] = $this->config['request']['auth']['pass'];
+		}
+		$this->_configUri($this->request['uri']);
+
+		if (isset($host)) {
+			$this->config['host'] = $host;
+		}
+		$cookies = null;
+
+		if (is_array($this->request['header'])) {
+			$this->request['header'] = $this->_parseHeader($this->request['header']);
+			if (!empty($this->request['cookies'])) {
+				$cookies = $this->buildCookies($this->request['cookies']);
+			}
+			$Host = $this->request['uri']['host'];
+			$schema = '';
+			$port = 0;
+			if (isset($this->request['uri']['schema'])) {
+				$schema = $this->request['uri']['schema'];
+			}
+			if (isset($this->request['uri']['port'])) {
+				$port = $this->request['uri']['port'];
+			}
+			if (
+				($schema === 'http' && $port != 80) ||
+				($schema === 'https' && $port != 443) ||
+				($port != 80 && $port != 443)
+			) {
+				$Host .= ':' . $port;
+			}
+			$this->request['header'] = array_merge(compact('Host'), $this->request['header']);
+		}
+
+		if (isset($this->request['auth']['user']) && isset($this->request['auth']['pass'])) {
+			$this->request['header']['Authorization'] = $this->request['auth']['method'] . " " . base64_encode($this->request['auth']['user'] . ":" . $this->request['auth']['pass']);
+		}
+		if (isset($this->request['uri']['user']) && isset($this->request['uri']['pass'])) {
+			$this->request['header']['Authorization'] = $this->request['auth']['method'] . " " . base64_encode($this->request['uri']['user'] . ":" . $this->request['uri']['pass']);
+		}
+
+		if (is_array($this->request['body'])) {
+			$this->request['body'] = $this->_httpSerialize($this->request['body']);
+		}
+
+		if (!empty($this->request['body']) && !isset($this->request['header']['Content-Type'])) {
+			$this->request['header']['Content-Type'] = 'application/x-www-form-urlencoded';
+		}
+
+		if (!empty($this->request['body']) && !isset($this->request['header']['Content-Length'])) {
+			$this->request['header']['Content-Length'] = strlen($this->request['body']);
+		}
+
+		$connectionType = null;
+		if (isset($this->request['header']['Connection'])) {
+			$connectionType = $this->request['header']['Connection'];
+		}
+		$this->request['header'] = $this->_buildHeader($this->request['header']) . $cookies;
+
+		if (empty($this->request['line'])) {
+			$this->request['line'] = $this->_buildRequestLine($this->request);
+		}
+
+		if ($this->quirksMode === false && $this->request['line'] === false) {
+			return $this->response = false;
+		}
+
+		if ($this->request['line'] !== false) {
+			$this->request['raw'] = $this->request['line'];
+		}
+
+		if ($this->request['header'] !== false) {
+			$this->request['raw'] .= $this->request['header'];
+		}
+
+		$this->request['raw'] .= "\r\n";
+		$this->request['raw'] .= $this->request['body'];
+		$this->write($this->request['raw']);
+
+		$response = null;
+		while ($data = $this->read()) {
+			$response .= $data;
+		}
+
+		if ($connectionType == 'close') {
+			$this->disconnect();
+		}
+
+		$this->response = $this->_parseResponse($response);
+		if (!empty($this->response['cookies'])) {
+			$this->config['request']['cookies'] = array_merge($this->config['request']['cookies'], $this->response['cookies']);
+		}
+
+		return $this->response['body'];
+	}
+
+/**
+ * Issues a GET request to the specified URI, query, and request.
+ *
+ * Using a string uri and an array of query string parameters:
+ *
+ * `$response = $http->get('http://google.com/search', array('q' => 'cakephp', 'client' => 'safari'));`
+ *
+ * Would do a GET request to `http://google.com/search?q=cakephp&client=safari`
+ *
+ * You could express the same thing using a uri array and query string parameters:
+ *
+ * {{{
+ * $response = $http->get(
+ *     array('host' => 'google.com', 'path' => '/search'),
+ *     array('q' => 'cakephp', 'client' => 'safari')
+ * );
+ * }}}
+ *
+ * @param mixed $uri URI to request. Either a string uri, or a uri array, see HttpSocket::_parseUri()
+ * @param array $query Querystring parameters to append to URI
+ * @param array $request An indexed array with indexes such as 'method' or uri
+ * @return mixed Result of request, either false on failure or the response to the request.
+ * @access public
+ */
+	function get($uri = null, $query = array(), $request = array()) {
+		if (!empty($query)) {
+			$uri = $this->_parseUri($uri);
+			if (isset($uri['query'])) {
+				$uri['query'] = array_merge($uri['query'], $query);
+			} else {
+				$uri['query'] = $query;
+			}
+			$uri = $this->_buildUri($uri);
+		}
+
+		$request = Set::merge(array('method' => 'GET', 'uri' => $uri), $request);
+		return $this->request($request);
+	}
+
+/**
+ * Issues a POST request to the specified URI, query, and request.
+ *
+ * `post()` can be used to post simple data arrays to a url:
+ *
+ * {{{
+ * $response = $http->post('http://example.com', array(
+ *     'username' => 'batman',
+ *     'password' => 'bruce_w4yne'
+ * ));
+ * }}}
+ *
+ * @param mixed $uri URI to request. See HttpSocket::_parseUri()
+ * @param array $data Array of POST data keys and values.
+ * @param array $request An indexed array with indexes such as 'method' or uri
+ * @return mixed Result of request, either false on failure or the response to the request.
+ * @access public
+ */
+	function post($uri = null, $data = array(), $request = array()) {
+		$request = Set::merge(array('method' => 'POST', 'uri' => $uri, 'body' => $data), $request);
+		return $this->request($request);
+	}
+
+/**
+ * Issues a PUT request to the specified URI, query, and request.
+ *
+ * @param mixed $uri URI to request, See HttpSocket::_parseUri()
+ * @param array $data Array of PUT data keys and values.
+ * @param array $request An indexed array with indexes such as 'method' or uri
+ * @return mixed Result of request
+ * @access public
+ */
+	function put($uri = null, $data = array(), $request = array()) {
+		$request = Set::merge(array('method' => 'PUT', 'uri' => $uri, 'body' => $data), $request);
+		return $this->request($request);
+	}
+
+/**
+ * Issues a DELETE request to the specified URI, query, and request.
+ *
+ * @param mixed $uri URI to request (see {@link _parseUri()})
+ * @param array $data Query to append to URI
+ * @param array $request An indexed array with indexes such as 'method' or uri
+ * @return mixed Result of request
+ * @access public
+ */
+	function delete($uri = null, $data = array(), $request = array()) {
+		$request = Set::merge(array('method' => 'DELETE', 'uri' => $uri, 'body' => $data), $request);
+		return $this->request($request);
+	}
+
+/**
+ * Normalizes urls into a $uriTemplate.  If no template is provided
+ * a default one will be used. Will generate the url using the
+ * current config information.
+ *
+ * ### Usage:
+ *
+ * After configuring part of the request parameters, you can use url() to generate
+ * urls.
+ *
+ * {{{
+ * $http->configUri('http://www.cakephp.org');
+ * $url = $http->url('/search?q=bar');
+ * }}}
+ *
+ * Would return `http://www.cakephp.org/search?q=bar`
+ *
+ * url() can also be used with custom templates:
+ *
+ * `$url = $http->url('http://www.cakephp/search?q=socket', '/%path?%query');`
+ *
+ * Would return `/search?q=socket`.
+ *
+ * @param mixed $url Either a string or array of url options to create a url with.
+ * @param string $uriTemplate A template string to use for url formatting.
+ * @return mixed Either false on failure or a string containing the composed url.
+ * @access public
+ */
+	function url($url = null, $uriTemplate = null) {
+		if (is_null($url)) {
+			$url = '/';
+		}
+		if (is_string($url)) {
+			if ($url{0} == '/') {
+				$url = $this->config['request']['uri']['host'].':'.$this->config['request']['uri']['port'] . $url;
+			}
+			if (!preg_match('/^.+:\/\/|\*|^\//', $url)) {
+				$url = $this->config['request']['uri']['scheme'].'://'.$url;
+			}
+		} elseif (!is_array($url) && !empty($url)) {
+			return false;
+		}
+
+		$base = array_merge($this->config['request']['uri'], array('scheme' => array('http', 'https'), 'port' => array(80, 443)));
+		$url = $this->_parseUri($url, $base);
+
+		if (empty($url)) {
+			$url = $this->config['request']['uri'];
+		}
+
+		if (!empty($uriTemplate)) {
+			return $this->_buildUri($url, $uriTemplate);
+		}
+		return $this->_buildUri($url);
+	}
+
+/**
+ * Parses the given message and breaks it down in parts.
+ *
+ * @param string $message Message to parse
+ * @return array Parsed message (with indexed elements such as raw, status, header, body)
+ * @access protected
+ */
+	function _parseResponse($message) {
+		if (is_array($message)) {
+			return $message;
+		} elseif (!is_string($message)) {
+			return false;
+		}
+
+		static $responseTemplate;
+
+		if (empty($responseTemplate)) {
+			$classVars = get_class_vars(__CLASS__);
+			$responseTemplate = $classVars['response'];
+		}
+
+		$response = $responseTemplate;
+
+		if (!preg_match("/^(.+\r\n)(.*)(?<=\r\n)\r\n/Us", $message, $match)) {
+			return false;
+		}
+
+		list($null, $response['raw']['status-line'], $response['raw']['header']) = $match;
+		$response['raw']['response'] = $message;
+		$response['raw']['body'] = substr($message, strlen($match[0]));
+
+		if (preg_match("/(.+) ([0-9]{3}) (.+)\r\n/DU", $response['raw']['status-line'], $match)) {
+			$response['status']['http-version'] = $match[1];
+			$response['status']['code'] = (int)$match[2];
+			$response['status']['reason-phrase'] = $match[3];
+		}
+
+		$response['header'] = $this->_parseHeader($response['raw']['header']);
+		$transferEncoding = null;
+		if (isset($response['header']['Transfer-Encoding'])) {
+			$transferEncoding = $response['header']['Transfer-Encoding'];
+		}
+		$decoded = $this->_decodeBody($response['raw']['body'], $transferEncoding);
+		$response['body'] = $decoded['body'];
+
+		if (!empty($decoded['header'])) {
+			$response['header'] = $this->_parseHeader($this->_buildHeader($response['header']).$this->_buildHeader($decoded['header']));
+		}
+
+		if (!empty($response['header'])) {
+			$response['cookies'] = $this->parseCookies($response['header']);
+		}
+
+		foreach ($response['raw'] as $field => $val) {
+			if ($val === '') {
+				$response['raw'][$field] = null;
+			}
+		}
+
+		return $response;
+	}
+
+/**
+ * Generic function to decode a $body with a given $encoding. Returns either an array with the keys
+ * 'body' and 'header' or false on failure.
+ *
+ * @param string $body A string continaing the body to decode.
+ * @param mixed $encoding Can be false in case no encoding is being used, or a string representing the encoding.
+ * @return mixed Array of response headers and body or false.
+ * @access protected
+ */
+	function _decodeBody($body, $encoding = 'chunked') {
+		if (!is_string($body)) {
+			return false;
+		}
+		if (empty($encoding)) {
+			return array('body' => $body, 'header' => false);
+		}
+		$decodeMethod = '_decode'.Inflector::camelize(str_replace('-', '_', $encoding)).'Body';
+
+		if (!is_callable(array(&$this, $decodeMethod))) {
+			if (!$this->quirksMode) {
+				trigger_error(sprintf(__('HttpSocket::_decodeBody - Unknown encoding: %s. Activate quirks mode to surpress error.', true), h($encoding)), E_USER_WARNING);
+			}
+			return array('body' => $body, 'header' => false);
+		}
+		return $this->{$decodeMethod}($body);
+	}
+
+/**
+ * Decodes a chunked message $body and returns either an array with the keys 'body' and 'header' or false as
+ * a result.
+ *
+ * @param string $body A string continaing the chunked body to decode.
+ * @return mixed Array of response headers and body or false.
+ * @access protected
+ */
+	function _decodeChunkedBody($body) {
+		if (!is_string($body)) {
+			return false;
+		}
+
+		$decodedBody = null;
+		$chunkLength = null;
+
+		while ($chunkLength !== 0) {
+			if (!preg_match("/^([0-9a-f]+) *(?:;(.+)=(.+))?\r\n/iU", $body, $match)) {
+				if (!$this->quirksMode) {
+					trigger_error(__('HttpSocket::_decodeChunkedBody - Could not parse malformed chunk. Activate quirks mode to do this.', true), E_USER_WARNING);
+					return false;
+				}
+				break;
+			}
+
+			$chunkSize = 0;
+			$hexLength = 0;
+			$chunkExtensionName = '';
+			$chunkExtensionValue = '';
+			if (isset($match[0])) {
+				$chunkSize = $match[0];
+			}
+			if (isset($match[1])) {
+				$hexLength = $match[1];
+			}
+			if (isset($match[2])) {
+				$chunkExtensionName = $match[2];
+			}
+			if (isset($match[3])) {
+				$chunkExtensionValue = $match[3];
+			}
+
+			$body = substr($body, strlen($chunkSize));
+			$chunkLength = hexdec($hexLength);
+			$chunk = substr($body, 0, $chunkLength);
+			if (!empty($chunkExtensionName)) {
+				/**
+				 * @todo See if there are popular chunk extensions we should implement
+				 */
+			}
+			$decodedBody .= $chunk;
+			if ($chunkLength !== 0) {
+				$body = substr($body, $chunkLength+strlen("\r\n"));
+			}
+		}
+
+		$entityHeader = false;
+		if (!empty($body)) {
+			$entityHeader = $this->_parseHeader($body);
+		}
+		return array('body' => $decodedBody, 'header' => $entityHeader);
+	}
+
+/**
+ * Parses and sets the specified URI into current request configuration.
+ *
+ * @param mixed $uri URI, See HttpSocket::_parseUri()
+ * @return array Current configuration settings
+ * @access protected
+ */
+	function _configUri($uri = null) {
+		if (empty($uri)) {
+			return false;
+		}
+
+		if (is_array($uri)) {
+			$uri = $this->_parseUri($uri);
+		} else {
+			$uri = $this->_parseUri($uri, true);
+		}
+
+		if (!isset($uri['host'])) {
+			return false;
+		}
+		$config = array(
+			'request' => array(
+				'uri' => array_intersect_key($uri, $this->config['request']['uri']),
+				'auth' => array_intersect_key($uri, $this->config['request']['auth'])
+			)
+		);
+		$this->config = Set::merge($this->config, $config);
+		$this->config = Set::merge($this->config, array_intersect_key($this->config['request']['uri'], $this->config));
+		return $this->config;
+	}
+
+/**
+ * Takes a $uri array and turns it into a fully qualified URL string
+ *
+ * @param mixed $uri Either A $uri array, or a request string.  Will use $this->config if left empty.
+ * @param string $uriTemplate The Uri template/format to use.
+ * @return mixed A fully qualified URL formated according to $uriTemplate, or false on failure
+ * @access protected
+ */
+	function _buildUri($uri = array(), $uriTemplate = '%scheme://%user:%pass@%host:%port/%path?%query#%fragment') {
+		if (is_string($uri)) {
+			$uri = array('host' => $uri);
+		}
+		$uri = $this->_parseUri($uri, true);
+
+		if (!is_array($uri) || empty($uri)) {
+			return false;
+		}
+
+		$uri['path'] = preg_replace('/^\//', null, $uri['path']);
+		$uri['query'] = $this->_httpSerialize($uri['query']);
+		$stripIfEmpty = array(
+			'query' => '?%query',
+			'fragment' => '#%fragment',
+			'user' => '%user:%pass@',
+			'host' => '%host:%port/'
+		);
+
+		foreach ($stripIfEmpty as $key => $strip) {
+			if (empty($uri[$key])) {
+				$uriTemplate = str_replace($strip, null, $uriTemplate);
+			}
+		}
+
+		$defaultPorts = array('http' => 80, 'https' => 443);
+		if (array_key_exists($uri['scheme'], $defaultPorts) && $defaultPorts[$uri['scheme']] == $uri['port']) {
+			$uriTemplate = str_replace(':%port', null, $uriTemplate);
+		}
+		foreach ($uri as $property => $value) {
+			$uriTemplate = str_replace('%'.$property, $value, $uriTemplate);
+		}
+
+		if ($uriTemplate === '/*') {
+			$uriTemplate = '*';
+		}
+		return $uriTemplate;
+	}
+
+/**
+ * Parses the given URI and breaks it down into pieces as an indexed array with elements
+ * such as 'scheme', 'port', 'query'.
+ *
+ * @param string $uri URI to parse
+ * @param mixed $base If true use default URI config, otherwise indexed array to set 'scheme', 'host', 'port', etc.
+ * @return array Parsed URI
+ * @access protected
+ */
+	function _parseUri($uri = null, $base = array()) {
+		$uriBase = array(
+			'scheme' => array('http', 'https'),
+			'host' => null,
+			'port' => array(80, 443),
+			'user' => null,
+			'pass' => null,
+			'path' => '/',
+			'query' => null,
+			'fragment' => null
+		);
+
+		if (is_string($uri)) {
+			$uri = parse_url($uri);
+		}
+		if (!is_array($uri) || empty($uri)) {
+			return false;
+		}
+		if ($base === true) {
+			$base = $uriBase;
+		}
+
+		if (isset($base['port'], $base['scheme']) && is_array($base['port']) && is_array($base['scheme'])) {
+			if (isset($uri['scheme']) && !isset($uri['port'])) {
+				$base['port'] = $base['port'][array_search($uri['scheme'], $base['scheme'])];
+			} elseif (isset($uri['port']) && !isset($uri['scheme'])) {
+				$base['scheme'] = $base['scheme'][array_search($uri['port'], $base['port'])];
+			}
+		}
+
+		if (is_array($base) && !empty($base)) {
+			$uri = array_merge($base, $uri);
+		}
+
+		if (isset($uri['scheme']) && is_array($uri['scheme'])) {
+			$uri['scheme'] = array_shift($uri['scheme']);
+		}
+		if (isset($uri['port']) && is_array($uri['port'])) {
+			$uri['port'] = array_shift($uri['port']);
+		}
+
+		if (array_key_exists('query', $uri)) {
+			$uri['query'] = $this->_parseQuery($uri['query']);
+		}
+
+		if (!array_intersect_key($uriBase, $uri)) {
+			return false;
+		}
+		return $uri;
+	}
+
+/**
+ * This function can be thought of as a reverse to PHP5's http_build_query(). It takes a given query string and turns it into an array and
+ * supports nesting by using the php bracket syntax. So this menas you can parse queries like:
+ *
+ * - ?key[subKey]=value
+ * - ?key[]=value1&key[]=value2
+ *
+ * A leading '?' mark in $query is optional and does not effect the outcome of this function. 
+ * For the complete capabilities of this implementation take a look at HttpSocketTest::testparseQuery()
+ *
+ * @param mixed $query A query string to parse into an array or an array to return directly "as is"
+ * @return array The $query parsed into a possibly multi-level array. If an empty $query is
+ *     given, an empty array is returned.
+ * @access protected
+ */
+	function _parseQuery($query) {
+		if (is_array($query)) {
+			return $query;
+		}
+		$parsedQuery = array();
+
+		if (is_string($query) && !empty($query)) {
+			$query = preg_replace('/^\?/', '', $query);
+			$items = explode('&', $query);
+
+			foreach ($items as $item) {
+				if (strpos($item, '=') !== false) {
+					list($key, $value) = explode('=', $item, 2);
+				} else {
+					$key = $item;
+					$value = null;
+				}
+
+				$key = urldecode($key);
+				$value = urldecode($value);
+
+				if (preg_match_all('/\[([^\[\]]*)\]/iUs', $key, $matches)) {
+					$subKeys = $matches[1];
+					$rootKey = substr($key, 0, strpos($key, '['));
+					if (!empty($rootKey)) {
+						array_unshift($subKeys, $rootKey);
+					}
+					$queryNode =& $parsedQuery;
+
+					foreach ($subKeys as $subKey) {
+						if (!is_array($queryNode)) {
+							$queryNode = array();
+						}
+
+						if ($subKey === '') {
+							$queryNode[] = array();
+							end($queryNode);
+							$subKey = key($queryNode);
+						}
+						$queryNode =& $queryNode[$subKey];
+					}
+					$queryNode = $value;
+				} else {
+					$parsedQuery[$key] = $value;
+				}
+			}
+		}
+		return $parsedQuery;
+	}
+
+/**
+ * Builds a request line according to HTTP/1.1 specs. Activate quirks mode to work outside specs.
+ *
+ * @param array $request Needs to contain a 'uri' key. Should also contain a 'method' key, otherwise defaults to GET.
+ * @param string $versionToken The version token to use, defaults to HTTP/1.1
+ * @return string Request line
+ * @access protected
+ */
+	function _buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') {
+		$asteriskMethods = array('OPTIONS');
+
+		if (is_string($request)) {
+			$isValid = preg_match("/(.+) (.+) (.+)\r\n/U", $request, $match);
+			if (!$this->quirksMode && (!$isValid || ($match[2] == '*' && !in_array($match[3], $asteriskMethods)))) {
+				trigger_error(__('HttpSocket::_buildRequestLine - Passed an invalid request line string. Activate quirks mode to do this.', true), E_USER_WARNING);
+				return false;
+			}
+			return $request;
+		} elseif (!is_array($request)) {
+			return false;
+		} elseif (!array_key_exists('uri', $request)) {
+			return false;
+		}
+
+		$request['uri']	= $this->_parseUri($request['uri']);
+		$request = array_merge(array('method' => 'GET'), $request);
+		$request['uri'] = $this->_buildUri($request['uri'], '/%path?%query');
+
+		if (!$this->quirksMode && $request['uri'] === '*' && !in_array($request['method'], $asteriskMethods)) {
+			trigger_error(sprintf(__('HttpSocket::_buildRequestLine - The "*" asterisk character is only allowed for the following methods: %s. Activate quirks mode to work outside of HTTP/1.1 specs.', true), join(',', $asteriskMethods)), E_USER_WARNING);
+			return false;
+		}
+		return $request['method'].' '.$request['uri'].' '.$versionToken.$this->lineBreak;
+	}
+
+/**
+ * Serializes an array for transport.
+ *
+ * @param array $data Data to serialize
+ * @return string Serialized variable
+ * @access protected
+ */
+	function _httpSerialize($data = array()) {
+		if (is_string($data)) {
+			return $data;
+		}
+		if (empty($data) || !is_array($data)) {
+			return false;
+		}
+		return substr(Router::queryString($data), 1);
+	}
+
+/**
+ * Builds the header.
+ *
+ * @param array $header Header to build
+ * @return string Header built from array
+ * @access protected
+ */
+	function _buildHeader($header, $mode = 'standard') {
+		if (is_string($header)) {
+			return $header;
+		} elseif (!is_array($header)) {
+			return false;
+		}
+
+		$returnHeader = '';
+		foreach ($header as $field => $contents) {
+			if (is_array($contents) && $mode == 'standard') {
+				$contents = implode(',', $contents);
+			}
+			foreach ((array)$contents as $content) {
+				$contents = preg_replace("/\r\n(?![\t ])/", "\r\n ", $content);
+				$field = $this->_escapeToken($field);
+
+				$returnHeader .= $field.': '.$contents.$this->lineBreak;
+			}
+		}
+		return $returnHeader;
+	}
+
+/**
+ * Parses an array based header.
+ *
+ * @param array $header Header as an indexed array (field => value)
+ * @return array Parsed header
+ * @access protected
+ */
+	function _parseHeader($header) {
+		if (is_array($header)) {
+			foreach ($header as $field => $value) {
+				unset($header[$field]);
+				$field = strtolower($field);
+				preg_match_all('/(?:^|(?<=-))[a-z]/U', $field, $offsets, PREG_OFFSET_CAPTURE);
+
+				foreach ($offsets[0] as $offset) {
+					$field = substr_replace($field, strtoupper($offset[0]), $offset[1], 1);
+				}
+				$header[$field] = $value;
+			}
+			return $header;
+		} elseif (!is_string($header)) {
+			return false;
+		}
+
+		preg_match_all("/(.+):(.+)(?:(?<![\t ])" . $this->lineBreak . "|\$)/Uis", $header, $matches, PREG_SET_ORDER);
+
+		$header = array();
+		foreach ($matches as $match) {
+			list(, $field, $value) = $match;
+
+			$value = trim($value);
+			$value = preg_replace("/[\t ]\r\n/", "\r\n", $value);
+
+			$field = $this->_unescapeToken($field);
+
+			$field = strtolower($field);
+			preg_match_all('/(?:^|(?<=-))[a-z]/U', $field, $offsets, PREG_OFFSET_CAPTURE);
+			foreach ($offsets[0] as $offset) {
+				$field = substr_replace($field, strtoupper($offset[0]), $offset[1], 1);
+			}
+
+			if (!isset($header[$field])) {
+				$header[$field] = $value;
+			} else {
+				$header[$field] = array_merge((array)$header[$field], (array)$value);
+			}
+		}
+		return $header;
+	}
+
+/**
+ * Parses cookies in response headers.
+ *
+ * @param array $header Header array containing one ore more 'Set-Cookie' headers.
+ * @return mixed Either false on no cookies, or an array of cookies received.
+ * @access public
+ * @todo Make this 100% RFC 2965 confirm
+ */
+	function parseCookies($header) {
+		if (!isset($header['Set-Cookie'])) {
+			return false;
+		}
+
+		$cookies = array();
+		foreach ((array)$header['Set-Cookie'] as $cookie) {
+			if (strpos($cookie, '";"') !== false) {
+				$cookie = str_replace('";"', "{__cookie_replace__}", $cookie);
+				$parts  = str_replace("{__cookie_replace__}", '";"', explode(';', $cookie));
+			} else {
+				$parts = preg_split('/\;[ \t]*/', $cookie);
+			}
+
+			list($name, $value) = explode('=', array_shift($parts), 2);
+			$cookies[$name] = compact('value');
+
+			foreach ($parts as $part) {
+				if (strpos($part, '=') !== false) {
+					list($key, $value) = explode('=', $part);
+				} else {
+					$key = $part;
+					$value = true;
+				}
+
+				$key = strtolower($key);
+				if (!isset($cookies[$name][$key])) {
+					$cookies[$name][$key] = $value;
+				}
+			}
+		}
+		return $cookies;
+	}
+
+/**
+ * Builds cookie headers for a request.
+ *
+ * @param array $cookies Array of cookies to send with the request.
+ * @return string Cookie header string to be sent with the request.
+ * @access public
+ * @todo Refactor token escape mechanism to be configurable
+ */
+	function buildCookies($cookies) {
+		$header = array();
+		foreach ($cookies as $name => $cookie) {
+			$header[] = $name.'='.$this->_escapeToken($cookie['value'], array(';'));
+		}
+		$header = $this->_buildHeader(array('Cookie' => implode('; ', $header)), 'pragmatic');
+		return $header;
+	}
+
+/**
+ * Unescapes a given $token according to RFC 2616 (HTTP 1.1 specs)
+ *
+ * @param string $token Token to unescape
+ * @return string Unescaped token
+ * @access protected
+ * @todo Test $chars parameter
+ */
+	function _unescapeToken($token, $chars = null) {
+		$regex = '/"(['.join('', $this->_tokenEscapeChars(true, $chars)).'])"/';
+		$token = preg_replace($regex, '\\1', $token);
+		return $token;
+	}
+
+/**
+ * Escapes a given $token according to RFC 2616 (HTTP 1.1 specs)
+ *
+ * @param string $token Token to escape
+ * @return string Escaped token
+ * @access protected
+ * @todo Test $chars parameter
+ */
+	function _escapeToken($token, $chars = null) {
+		$regex = '/(['.join('', $this->_tokenEscapeChars(true, $chars)).'])/';
+		$token = preg_replace($regex, '"\\1"', $token);
+		return $token;
+	}
+
+/**
+ * Gets escape chars according to RFC 2616 (HTTP 1.1 specs).
+ *
+ * @param boolean $hex true to get them as HEX values, false otherwise
+ * @return array Escape chars
+ * @access protected
+ * @todo Test $chars parameter
+ */
+	function _tokenEscapeChars($hex = true, $chars = null) {
+		if (!empty($chars)) {
+			$escape = $chars;
+		} else {
+			$escape = array('"', "(", ")", "<", ">", "@", ",", ";", ":", "\\", "/", "[", "]", "?", "=", "{", "}", " ");
+			for ($i = 0; $i <= 31; $i++) {
+				$escape[] = chr($i);
+			}
+			$escape[] = chr(127);
+		}
+
+		if ($hex == false) {
+			return $escape;
+		}
+		$regexChars = '';
+		foreach ($escape as $key => $char) {
+			$escape[$key] = '\\x'.str_pad(dechex(ord($char)), 2, '0', STR_PAD_LEFT);
+		}
+		return $escape;
+	}
+
+/**
+ * Resets the state of this HttpSocket instance to it's initial state (before Object::__construct got executed) or does
+ * the same thing partially for the request and the response property only.
+ *
+ * @param boolean $full If set to false only HttpSocket::response and HttpSocket::request are reseted
+ * @return boolean True on success
+ * @access public
+ */
+	function reset($full = true) {
+		static $initalState = array();
+		if (empty($initalState)) {
+			$initalState = get_class_vars(__CLASS__);
+		}
+		if ($full == false) {
+			$this->request = $initalState['request'];
+			$this->response = $initalState['response'];
+			return true;
+		}
+		parent::reset($initalState);
+		return true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/i18n.php b/code/ryzom/tools/server/www/webtt/cake/libs/i18n.php
new file mode 100644
index 000000000..3fb94f336
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/i18n.php
@@ -0,0 +1,568 @@
+<?php
+/**
+ * Internationalization
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0.4116
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libraries.
+ */
+App::import('Core', array('l10n', 'Multibyte'));
+
+/**
+ * I18n handles translation of Text and time format strings.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class I18n extends Object {
+
+/**
+ * Instance of the I10n class for localization
+ *
+ * @var I10n
+ * @access public
+ */
+	var $l10n = null;
+
+/**
+ * Current domain of translation
+ *
+ * @var string
+ * @access public
+ */
+	var $domain = null;
+
+/**
+ * Current category of translation
+ *
+ * @var string
+ * @access public
+ */
+	var $category = 'LC_MESSAGES';
+
+/**
+ * Current language used for translations
+ *
+ * @var string
+ * @access private
+ */
+	var $__lang = null;
+
+/**
+ * Translation strings for a specific domain read from the .mo or .po files
+ *
+ * @var array
+ * @access private
+ */
+	var $__domains = array();
+
+/**
+ * Set to true when I18N::__bindTextDomain() is called for the first time.
+ * If a translation file is found it is set to false again
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__noLocale = false;
+
+/**
+ * Set to true when I18N::__bindTextDomain() is called for the first time.
+ * If a translation file is found it is set to false again
+ *
+ * @var array
+ * @access private
+ */
+	var $__categories = array(
+		 'LC_ALL', 'LC_COLLATE', 'LC_CTYPE', 'LC_MONETARY', 'LC_NUMERIC', 'LC_TIME', 'LC_MESSAGES'
+	);
+
+/**
+ * Return a static instance of the I18n class
+ *
+ * @return object I18n
+ * @access public
+ */
+	function &getInstance() {
+		static $instance = array();
+		if (!$instance) {
+			$instance[0] =& new I18n();
+			$instance[0]->l10n =& new L10n();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Used by the translation functions in basics.php
+ * Can also be used like I18n::translate(); but only if the App::import('I18n'); has been used to load the class.
+ *
+ * @param string $singular String to translate
+ * @param string $plural Plural string (if any)
+ * @param string $domain Domain The domain of the translation.  Domains are often used by plugin translations
+ * @param string $category Category The integer value of the category to use.
+ * @param integer $count Count Count is used with $plural to choose the correct plural form.
+ * @return string translated string.
+ * @access public
+ */
+	function translate($singular, $plural = null, $domain = null, $category = 6, $count = null) {
+		$_this =& I18n::getInstance();
+		
+		if (strpos($singular, "\r\n") !== false) {
+			$singular = str_replace("\r\n", "\n", $singular);
+		}
+		if ($plural !== null && strpos($plural, "\r\n") !== false) {
+			$plural = str_replace("\r\n", "\n", $plural);
+		}
+
+		if (is_numeric($category)) {
+			$_this->category = $_this->__categories[$category];
+		}
+		$language = Configure::read('Config.language');
+
+		if (!empty($_SESSION['Config']['language'])) {
+			$language = $_SESSION['Config']['language'];
+		}
+
+		if (($_this->__lang && $_this->__lang !== $language) || !$_this->__lang) {
+			$lang = $_this->l10n->get($language);
+			$_this->__lang = $lang;
+		}
+
+		if (is_null($domain)) {
+			$domain = 'default';
+		}
+
+		$_this->domain = $domain . '_' . $_this->l10n->lang;
+
+		if (!isset($_this->__domains[$domain][$_this->__lang])) {
+			$_this->__domains[$domain][$_this->__lang] = Cache::read($_this->domain, '_cake_core_');
+		}
+
+		if (!isset($_this->__domains[$domain][$_this->__lang][$_this->category])) {
+			$_this->__bindTextDomain($domain);
+			Cache::write($_this->domain, $_this->__domains[$domain][$_this->__lang], '_cake_core_');
+		}
+
+		if ($_this->category == 'LC_TIME') {
+			return $_this->__translateTime($singular,$domain);
+		}
+
+		if (!isset($count)) {
+			$plurals = 0;
+		} elseif (!empty($_this->__domains[$domain][$_this->__lang][$_this->category]["%plural-c"]) && $_this->__noLocale === false) {
+			$header = $_this->__domains[$domain][$_this->__lang][$_this->category]["%plural-c"];
+			$plurals = $_this->__pluralGuess($header, $count);
+		} else {
+			if ($count != 1) {
+				$plurals = 1;
+			} else {
+				$plurals = 0;
+			}
+		}
+
+		if (!empty($_this->__domains[$domain][$_this->__lang][$_this->category][$singular])) {
+			if (($trans = $_this->__domains[$domain][$_this->__lang][$_this->category][$singular]) || ($plurals) && ($trans = $_this->__domains[$domain][$_this->__lang][$_this->category][$plural])) {
+				if (is_array($trans)) {
+					if (isset($trans[$plurals])) {
+						$trans = $trans[$plurals];
+					}
+				}
+				if (strlen($trans)) {
+					return $trans;
+				}
+			}
+		}
+
+		if (!empty($plurals)) {
+			return $plural;
+		}
+		return $singular;
+	}
+
+/**
+ * Clears the domains internal data array.  Useful for testing i18n.
+ *
+ * @return void
+ */
+	function clear() {
+		$self =& I18n::getInstance();
+		$self->__domains = array();
+	}
+
+/**
+ * Attempts to find the plural form of a string.
+ *
+ * @param string $header Type
+ * @param integrer $n Number
+ * @return integer plural match
+ * @access private
+ */
+	function __pluralGuess($header, $n) {
+		if (!is_string($header) || $header === "nplurals=1;plural=0;" || !isset($header[0])) {
+			return 0;
+		}
+
+		if ($header === "nplurals=2;plural=n!=1;") {
+			return $n != 1 ? 1 : 0;
+		} elseif ($header === "nplurals=2;plural=n>1;") {
+			return $n > 1 ? 1 : 0;
+		}
+
+		if (strpos($header, "plurals=3")) {
+			if (strpos($header, "100!=11")) {
+				if (strpos($header, "10<=4")) {
+					return $n % 10 == 1 && $n % 100 != 11 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+				} elseif (strpos($header, "100<10")) {
+					return $n % 10 == 1 && $n % 100 != 11 ? 0 : ($n % 10 >= 2 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+				}
+				return $n % 10 == 1 && $n % 100 != 11 ? 0 : ($n != 0 ? 1 : 2);
+			} elseif (strpos($header, "n==2")) {
+				return $n == 1 ? 0 : ($n == 2 ? 1 : 2);
+			} elseif (strpos($header, "n==0")) {
+				return $n == 1 ? 0 : ($n == 0 || ($n % 100 > 0 && $n % 100 < 20) ? 1 : 2);
+			} elseif (strpos($header, "n>=2")) {
+				return $n == 1 ? 0 : ($n >= 2 && $n <= 4 ? 1 : 2);
+			} elseif (strpos($header, "10>=2")) {
+				return $n == 1 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+			}
+			return $n % 10 == 1 ? 0 : ($n % 10 == 2 ? 1 : 2);
+		} elseif (strpos($header, "plurals=4")) {
+			if (strpos($header, "100==2")) {
+				return $n % 100 == 1 ? 0 : ($n % 100 == 2 ? 1 : ($n % 100 == 3 || $n % 100 == 4 ? 2 : 3));
+			} elseif (strpos($header, "n>=3")) {
+				return $n == 1 ? 0 : ($n == 2 ? 1 : ($n == 0 || ($n >= 3 && $n <= 10) ? 2 : 3));
+			} elseif (strpos($header, "100>=1")) {
+				return $n == 1 ? 0 : ($n == 0 || ($n % 100 >= 1 && $n % 100 <= 10) ? 1 : ($n % 100 >= 11 && $n % 100 <= 20 ? 2 : 3));
+			}
+		} elseif (strpos($header, "plurals=5")) {
+			return $n == 1 ? 0 : ($n == 2 ? 1 : ($n >= 3 && $n <= 6 ? 2 : ($n >= 7 && $n <= 10 ? 3 : 4)));
+		}
+	}
+
+/**
+ * Binds the given domain to a file in the specified directory.
+ *
+ * @param string $domain Domain to bind
+ * @return string Domain binded
+ * @access private
+ */
+	function __bindTextDomain($domain) {
+		$this->__noLocale = true;
+		$core = true;
+		$merge = array();
+		$searchPaths = App::path('locales');
+		$plugins = App::objects('plugin');
+
+		if (!empty($plugins)) {
+			foreach ($plugins as $plugin) {
+				$plugin = Inflector::underscore($plugin);
+				if ($plugin === $domain) {
+					$searchPaths[] = App::pluginPath($plugin) . DS . 'locale' . DS;
+					$searchPaths = array_reverse($searchPaths);
+					break;
+				}
+			}
+		}
+
+
+		foreach ($searchPaths as $directory) {
+
+			foreach ($this->l10n->languagePath as $lang) {
+				$file = $directory . $lang . DS . $this->category . DS . $domain;
+				$localeDef = $directory . $lang . DS . $this->category;
+
+				if ($core) {
+					$app = $directory . $lang . DS . $this->category . DS . 'core';
+
+					if (file_exists($fn = "$app.mo")) {
+						$this->__loadMo($fn, $domain);
+						$this->__noLocale = false;
+						$merge[$domain][$this->__lang][$this->category] = $this->__domains[$domain][$this->__lang][$this->category];
+						$core = null;
+					} elseif (file_exists($fn = "$app.po") && ($f = fopen($fn, "r"))) {
+						$this->__loadPo($f, $domain);
+						$this->__noLocale = false;
+						$merge[$domain][$this->__lang][$this->category] = $this->__domains[$domain][$this->__lang][$this->category];
+						$core = null;
+					}
+				}
+
+				if (file_exists($fn = "$file.mo")) {
+					$this->__loadMo($fn, $domain);
+					$this->__noLocale = false;
+					break 2;
+				} elseif (file_exists($fn = "$file.po") && ($f = fopen($fn, "r"))) {
+					$this->__loadPo($f, $domain);
+					$this->__noLocale = false;
+					break 2;
+				} elseif (is_file($localeDef) && ($f = fopen($localeDef, "r"))) {
+					$this->__loadLocaleDefinition($f, $domain);
+					$this->__noLocale = false;
+					return $domain;
+				}
+			}
+		}
+
+		if (empty($this->__domains[$domain][$this->__lang][$this->category])) {
+			$this->__domains[$domain][$this->__lang][$this->category] = array();
+			return $domain;
+		}
+		
+		if (isset($this->__domains[$domain][$this->__lang][$this->category][""])) {
+			$head = $this->__domains[$domain][$this->__lang][$this->category][""];
+			
+			foreach (explode("\n", $head) as $line) {
+				$header = strtok($line,":");
+				$line = trim(strtok("\n"));
+				$this->__domains[$domain][$this->__lang][$this->category]["%po-header"][strtolower($header)] = $line;
+			}
+
+			if (isset($this->__domains[$domain][$this->__lang][$this->category]["%po-header"]["plural-forms"])) {
+				$switch = preg_replace("/(?:[() {}\\[\\]^\\s*\\]]+)/", "", $this->__domains[$domain][$this->__lang][$this->category]["%po-header"]["plural-forms"]);
+				$this->__domains[$domain][$this->__lang][$this->category]["%plural-c"] = $switch;
+				unset($this->__domains[$domain][$this->__lang][$this->category]["%po-header"]);
+			}
+			$this->__domains = Set::pushDiff($this->__domains, $merge);
+
+			if (isset($this->__domains[$domain][$this->__lang][$this->category][null])) {
+				unset($this->__domains[$domain][$this->__lang][$this->category][null]);
+			}
+		}
+		return $domain;
+	}
+
+/**
+ * Loads the binary .mo file for translation and sets the values for this translation in the var I18n::__domains
+ *
+ * @param resource $file Binary .mo file to load
+ * @param string $domain Domain where to load file in
+ * @access private
+ */
+	function __loadMo($file, $domain) {
+		$data = file_get_contents($file);
+
+		if ($data) {
+			$header = substr($data, 0, 20);
+			$header = unpack("L1magic/L1version/L1count/L1o_msg/L1o_trn", $header);
+			extract($header);
+
+			if ((dechex($magic) == '950412de' || dechex($magic) == 'ffffffff950412de') && $version == 0) {
+				for ($n = 0; $n < $count; $n++) {
+					$r = unpack("L1len/L1offs", substr($data, $o_msg + $n * 8, 8));
+					$msgid = substr($data, $r["offs"], $r["len"]);
+					unset($msgid_plural);
+
+					if (strpos($msgid, "\000")) {
+						list($msgid, $msgid_plural) = explode("\000", $msgid);
+					}
+					$r = unpack("L1len/L1offs", substr($data, $o_trn + $n * 8, 8));
+					$msgstr = substr($data, $r["offs"], $r["len"]);
+
+					if (strpos($msgstr, "\000")) {
+						$msgstr = explode("\000", $msgstr);
+					}
+					$this->__domains[$domain][$this->__lang][$this->category][$msgid] = $msgstr;
+
+					if (isset($msgid_plural)) {
+						$this->__domains[$domain][$this->__lang][$this->category][$msgid_plural] =& $this->__domains[$domain][$this->__lang][$this->category][$msgid];
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * Loads the text .po file for translation and sets the values for this translation in the var I18n::__domains
+ *
+ * @param resource $file Text .po file to load
+ * @param string $domain Domain to load file in
+ * @return array Binded domain elements
+ * @access private
+ */
+	function __loadPo($file, $domain) {
+		$type = 0;
+		$translations = array();
+		$translationKey = "";
+		$plural = 0;
+		$header = "";
+
+		do {
+			$line = trim(fgets($file));
+			if ($line == "" || $line[0] == "#") {
+				continue;
+			}
+			if (preg_match("/msgid[[:space:]]+\"(.+)\"$/i", $line, $regs)) {
+				$type = 1;
+				$translationKey = stripcslashes($regs[1]);
+			} elseif (preg_match("/msgid[[:space:]]+\"\"$/i", $line, $regs)) {
+				$type = 2;
+				$translationKey = "";
+			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && ($type == 1 || $type == 2 || $type == 3)) {
+				$type = 3;
+				$translationKey .= stripcslashes($regs[1]);
+			} elseif (preg_match("/msgstr[[:space:]]+\"(.+)\"$/i", $line, $regs) && ($type == 1 || $type == 3) && $translationKey) {
+				$translations[$translationKey] = stripcslashes($regs[1]);
+				$type = 4;
+			} elseif (preg_match("/msgstr[[:space:]]+\"\"$/i", $line, $regs) && ($type == 1 || $type == 3) && $translationKey) {
+				$type = 4;
+				$translations[$translationKey] = "";
+			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 4 && $translationKey) {
+				$translations[$translationKey] .= stripcslashes($regs[1]);
+			} elseif (preg_match("/msgid_plural[[:space:]]+\".*\"$/i", $line, $regs)) {
+				$type = 6;
+			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 6 && $translationKey) {
+				$type = 6;
+			} elseif (preg_match("/msgstr\[(\d+)\][[:space:]]+\"(.+)\"$/i", $line, $regs) && ($type == 6 || $type == 7) && $translationKey) {
+				$plural = $regs[1];
+				$translations[$translationKey][$plural] = stripcslashes($regs[2]);
+				$type = 7;
+			} elseif (preg_match("/msgstr\[(\d+)\][[:space:]]+\"\"$/i", $line, $regs) && ($type == 6 || $type == 7) && $translationKey) {
+				$plural = $regs[1];
+				$translations[$translationKey][$plural] = "";
+				$type = 7;
+			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 7 && $translationKey) {
+				$translations[$translationKey][$plural] .= stripcslashes($regs[1]);
+			} elseif (preg_match("/msgstr[[:space:]]+\"(.+)\"$/i", $line, $regs) && $type == 2 && !$translationKey) {
+				$header .= stripcslashes($regs[1]);
+				$type = 5;
+			} elseif (preg_match("/msgstr[[:space:]]+\"\"$/i", $line, $regs) && !$translationKey) {
+				$header = "";
+				$type = 5;
+			} elseif (preg_match("/^\"(.*)\"$/i", $line, $regs) && $type == 5) {
+				$header .= stripcslashes($regs[1]);
+			} else {
+				unset($translations[$translationKey]);
+				$type = 0;
+				$translationKey = "";
+				$plural = 0;
+			}
+		} while (!feof($file));
+		fclose($file);
+		$merge[""] = $header;
+		return $this->__domains[$domain][$this->__lang][$this->category] = array_merge($merge ,$translations);
+	}
+
+/**
+ * Parses a locale definition file following the POSIX standard
+ *
+ * @param resource $file file handler
+ * @param string $domain Domain where locale definitions will be stored
+ * @return void
+ * @access private
+ */
+	function __loadLocaleDefinition($file, $domain = null) {
+		$comment = '#';
+		$escape = '\\';
+		$currentToken = false;
+		$value = '';
+		while ($line = fgets($file)) {
+			$line = trim($line);
+			if (empty($line) || $line[0] === $comment) {
+				continue;
+			}
+			$parts = preg_split("/[[:space:]]+/",$line);
+			if ($parts[0] === 'comment_char') {
+				$comment = $parts[1];
+				continue;
+			}
+			if ($parts[0] === 'escape_char') {
+				$escape = $parts[1];
+				continue;
+			}
+			$count = count($parts);
+			if ($count == 2) {
+				$currentToken = $parts[0];
+				$value = $parts[1];
+			} elseif ($count == 1) {
+				$value .= $parts[0];
+			} else {
+				continue;
+			}
+
+			$len = strlen($value) - 1;
+			if ($value[$len] === $escape) {
+				$value = substr($value, 0, $len);
+				continue;
+			}
+
+			$mustEscape = array($escape . ',' , $escape . ';', $escape . '<', $escape . '>', $escape . $escape);
+			$replacements = array_map('crc32', $mustEscape);
+			$value = str_replace($mustEscape, $replacements, $value);
+			$value = explode(';', $value);
+			$this->__escape = $escape;
+			foreach ($value as $i => $val) {
+				$val = trim($val, '"');
+				$val = preg_replace_callback('/(?:<)?(.[^>]*)(?:>)?/', array(&$this, '__parseLiteralValue'), $val);
+				$val = str_replace($replacements, $mustEscape, $val);
+				$value[$i] = $val;
+			}
+			if (count($value) == 1) {
+				$this->__domains[$domain][$this->__lang][$this->category][$currentToken] = array_pop($value);
+			} else {
+				$this->__domains[$domain][$this->__lang][$this->category][$currentToken] = $value;
+			}
+		}
+	}
+
+/**
+ * Auxiliary function to parse a symbol from a locale definition file
+ *
+ * @param string $string Symbol to be parsed
+ * @return string parsed symbol
+ * @access private
+ */
+	function __parseLiteralValue($string) {
+		$string = $string[1];
+		if (substr($string, 0, 2) === $this->__escape . 'x') {
+			$delimiter = $this->__escape . 'x';
+			return join('', array_map('chr', array_map('hexdec',array_filter(explode($delimiter, $string)))));
+		}
+		if (substr($string, 0, 2) === $this->__escape . 'd') {
+			$delimiter = $this->__escape . 'd';
+			return join('', array_map('chr', array_filter(explode($delimiter, $string))));
+		}
+		if ($string[0] === $this->__escape && isset($string[1]) && is_numeric($string[1])) {
+			$delimiter = $this->__escape;
+			return join('', array_map('chr', array_filter(explode($delimiter, $string))));
+		}
+		if (substr($string, 0, 3) === 'U00') {
+			$delimiter = 'U00';
+			return join('', array_map('chr', array_map('hexdec', array_filter(explode($delimiter, $string)))));
+		}
+		if (preg_match('/U([0-9a-fA-F]{4})/', $string, $match)) {
+			return Multibyte::ascii(array(hexdec($match[1])));
+		}
+		return $string;
+	}
+
+/**
+ * Returns a Time format definition from corresponding domain
+ *
+ * @param string $format Format to be translated
+ * @param string $domain Domain where format is stored
+ * @return mixed translated format string if only value or array of translated strings for corresponding format.
+ * @access private
+ */
+	function __translateTime($format, $domain) {
+		if (!empty($this->__domains[$domain][$this->__lang]['LC_TIME'][$format])) {
+			if (($trans = $this->__domains[$domain][$this->__lang][$this->category][$format])) {
+				return $trans;
+			}
+		}
+		return $format;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/inflector.php b/code/ryzom/tools/server/www/webtt/cake/libs/inflector.php
new file mode 100644
index 000000000..65563639f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/inflector.php
@@ -0,0 +1,626 @@
+<?php
+/**
+ * Pluralize and singularize English words.
+ *
+ * Used by Cake's naming conventions throughout the framework.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Pluralize and singularize English words.
+ *
+ * Inflector pluralizes and singularizes English nouns.
+ * Used by Cake's naming conventions throughout the framework.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @link          http://book.cakephp.org/view/1478/Inflector
+ */
+class Inflector {
+
+/**
+ * Plural inflector rules
+ *
+ * @var array
+ * @access protected
+ */
+	var $_plural = array(
+		'rules' => array(
+			'/(s)tatus$/i' => '\1\2tatuses',
+			'/(quiz)$/i' => '\1zes',
+			'/^(ox)$/i' => '\1\2en',
+			'/([m|l])ouse$/i' => '\1ice',
+			'/(matr|vert|ind)(ix|ex)$/i'  => '\1ices',
+			'/(x|ch|ss|sh)$/i' => '\1es',
+			'/([^aeiouy]|qu)y$/i' => '\1ies',
+			'/(hive)$/i' => '\1s',
+			'/(?:([^f])fe|([lr])f)$/i' => '\1\2ves',
+			'/sis$/i' => 'ses',
+			'/([ti])um$/i' => '\1a',
+			'/(p)erson$/i' => '\1eople',
+			'/(m)an$/i' => '\1en',
+			'/(c)hild$/i' => '\1hildren',
+			'/(buffal|tomat)o$/i' => '\1\2oes',
+			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|vir)us$/i' => '\1i',
+			'/us$/i' => 'uses',
+			'/(alias)$/i' => '\1es',
+			'/(ax|cris|test)is$/i' => '\1es',
+			'/s$/' => 's',
+			'/^$/' => '',
+			'/$/' => 's',
+		),
+		'uninflected' => array(
+			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', 'people'
+		),
+		'irregular' => array(
+			'atlas' => 'atlases',
+			'beef' => 'beefs',
+			'brother' => 'brothers',
+			'child' => 'children',
+			'corpus' => 'corpuses',
+			'cow' => 'cows',
+			'ganglion' => 'ganglions',
+			'genie' => 'genies',
+			'genus' => 'genera',
+			'graffito' => 'graffiti',
+			'hoof' => 'hoofs',
+			'loaf' => 'loaves',
+			'man' => 'men',
+			'money' => 'monies',
+			'mongoose' => 'mongooses',
+			'move' => 'moves',
+			'mythos' => 'mythoi',
+			'niche' => 'niches',
+			'numen' => 'numina',
+			'occiput' => 'occiputs',
+			'octopus' => 'octopuses',
+			'opus' => 'opuses',
+			'ox' => 'oxen',
+			'penis' => 'penises',
+			'person' => 'people',
+			'sex' => 'sexes',
+			'soliloquy' => 'soliloquies',
+			'testis' => 'testes',
+			'trilby' => 'trilbys',
+			'turf' => 'turfs'
+		)
+	);
+
+/**
+ * Singular inflector rules
+ *
+ * @var array
+ * @access protected
+ */
+	var $_singular = array(
+		'rules' => array(
+			'/(s)tatuses$/i' => '\1\2tatus',
+			'/^(.*)(menu)s$/i' => '\1\2',
+			'/(quiz)zes$/i' => '\\1',
+			'/(matr)ices$/i' => '\1ix',
+			'/(vert|ind)ices$/i' => '\1ex',
+			'/^(ox)en/i' => '\1',
+			'/(alias)(es)*$/i' => '\1',
+			'/(alumn|bacill|cact|foc|fung|nucle|radi|stimul|syllab|termin|viri?)i$/i' => '\1us',
+			'/([ftw]ax)es/i' => '\1',
+			'/(cris|ax|test)es$/i' => '\1is',
+			'/(shoe|slave)s$/i' => '\1',
+			'/(o)es$/i' => '\1',
+			'/ouses$/' => 'ouse',
+			'/([^a])uses$/' => '\1us',
+			'/([m|l])ice$/i' => '\1ouse',
+			'/(x|ch|ss|sh)es$/i' => '\1',
+			'/(m)ovies$/i' => '\1\2ovie',
+			'/(s)eries$/i' => '\1\2eries',
+			'/([^aeiouy]|qu)ies$/i' => '\1y',
+			'/([lr])ves$/i' => '\1f',
+			'/(tive)s$/i' => '\1',
+			'/(hive)s$/i' => '\1',
+			'/(drive)s$/i' => '\1',
+			'/([^fo])ves$/i' => '\1fe',
+			'/(^analy)ses$/i' => '\1sis',
+			'/(analy|ba|diagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i' => '\1\2sis',
+			'/([ti])a$/i' => '\1um',
+			'/(p)eople$/i' => '\1\2erson',
+			'/(m)en$/i' => '\1an',
+			'/(c)hildren$/i' => '\1\2hild',
+			'/(n)ews$/i' => '\1\2ews',
+			'/eaus$/' => 'eau',
+			'/^(.*us)$/' => '\\1',
+			'/s$/i' => ''
+		),
+		'uninflected' => array(
+			'.*[nrlm]ese', '.*deer', '.*fish', '.*measles', '.*ois', '.*pox', '.*sheep', '.*ss'
+		),
+		'irregular' => array(
+			'waves' => 'wave'
+		)
+	);
+
+/**
+ * Words that should not be inflected
+ *
+ * @var array
+ * @access protected
+ */
+	var $_uninflected = array(
+		'Amoyese', 'bison', 'Borghese', 'bream', 'breeches', 'britches', 'buffalo', 'cantus',
+		'carp', 'chassis', 'clippers', 'cod', 'coitus', 'Congoese', 'contretemps', 'corps',
+		'debris', 'diabetes', 'djinn', 'eland', 'elk', 'equipment', 'Faroese', 'flounder',
+		'Foochowese', 'gallows', 'Genevese', 'Genoese', 'Gilbertese', 'graffiti',
+		'headquarters', 'herpes', 'hijinks', 'Hottentotese', 'information', 'innings',
+		'jackanapes', 'Kiplingese', 'Kongoese', 'Lucchese', 'mackerel', 'Maltese', 'media',
+		'mews', 'moose', 'mumps', 'Nankingese', 'news', 'nexus', 'Niasese',
+		'Pekingese', 'Piedmontese', 'pincers', 'Pistoiese', 'pliers', 'Portuguese',
+		'proceedings', 'rabies', 'rice', 'rhinoceros', 'salmon', 'Sarawakese', 'scissors',
+		'sea[- ]bass', 'series', 'Shavese', 'shears', 'siemens', 'species', 'swine', 'testes',
+		'trousers', 'trout','tuna', 'Vermontese', 'Wenchowese', 'whiting', 'wildebeest',
+		'Yengeese'
+	);
+
+/**
+ * Default map of accented and special characters to ASCII characters
+ *
+ * @var array
+ * @access protected
+ */
+	var $_transliteration = array(
+		'/ä|æ|ǽ/' => 'ae',
+		'/ö|œ/' => 'oe',
+		'/ü/' => 'ue',
+		'/Ä/' => 'Ae',
+		'/Ü/' => 'Ue',
+		'/Ö/' => 'Oe',
+		'/À|�|Â|Ã|Ä|Å|Ǻ|Ā|Ă|Ą|�/' => 'A',
+		'/à|á|â|ã|å|ǻ|�|ă|ą|ǎ|ª/' => 'a',
+		'/Ç|Ć|Ĉ|Ċ|Č/' => 'C',
+		'/ç|ć|ĉ|ċ|�/' => 'c',
+		'/�|Ď|�/' => 'D',
+		'/ð|�|đ/' => 'd',
+		'/È|É|Ê|Ë|Ē|Ĕ|Ė|Ę|Ě/' => 'E',
+		'/è|é|ê|ë|ē|ĕ|ė|ę|ě/' => 'e',
+		'/Ĝ|Ğ|Ġ|Ģ/' => 'G',
+		'/�|ğ|ġ|ģ/' => 'g',
+		'/Ĥ|Ħ/' => 'H',
+		'/ĥ|ħ/' => 'h',
+		'/Ì|�|Î|�|Ĩ|Ī|Ĭ|�|Į|İ/' => 'I',
+		'/ì|í|î|ï|ĩ|ī|ĭ|�|į|ı/' => 'i',
+		'/Ä´/' => 'J',
+		'/ĵ/' => 'j',
+		'/Ķ/' => 'K',
+		'/Ä·/' => 'k',
+		'/Ĺ|Ļ|Ľ|Ŀ|�/' => 'L',
+		'/ĺ|ļ|ľ|ŀ|ł/' => 'l',
+		'/Ñ|Ń|Ņ|Ň/' => 'N',
+		'/ñ|ń|ņ|ň|ʼn/' => 'n',
+		'/Ò|Ó|Ô|Õ|Ō|Ŏ|Ǒ|�|Ơ|Ø|Ǿ/' => 'O',
+		'/ò|ó|ô|õ|�|�|ǒ|ő|ơ|ø|ǿ|º/' => 'o',
+		'/Ŕ|Ŗ|Ř/' => 'R',
+		'/Å•|Å—|Å™/' => 'r',
+		'/Ś|Ŝ|Ş|Š/' => 'S',
+		'/ś|�|ş|š|ſ/' => 's',
+		'/Ţ|Ť|Ŧ/' => 'T',
+		'/ţ|ť|ŧ/' => 't',
+		'/Ù|Ú|Û|Ũ|Ū|Ŭ|Ů|Ű|Ų|Ư|Ǔ|Ǖ|Ǘ|Ǚ|Ǜ/' => 'U',
+		'/ù|ú|û|ũ|ū|ŭ|ů|ű|ų|ư|ǔ|ǖ|ǘ|ǚ|ǜ/' => 'u',
+		'/�|Ÿ|Ŷ/' => 'Y',
+		'/ý|ÿ|ŷ/' => 'y',
+		'/Å´/' => 'W',
+		'/ŵ/' => 'w',
+		'/Ź|Ż|Ž/' => 'Z',
+		'/ź|ż|ž/' => 'z',
+		'/Æ|Ǽ/' => 'AE',
+		'/ß/'=> 'ss',
+		'/IJ/' => 'IJ',
+		'/ij/' => 'ij',
+		'/Å’/' => 'OE',
+		'/Æ’/' => 'f'
+	);
+
+/**
+ * Cached array identity map of pluralized words.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_pluralized = array();
+
+/**
+ * Cached array identity map of singularized words.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_singularized = array();
+
+/**
+ * Cached Underscore Inflections
+ *
+ * @var array
+ * @access protected
+ */
+	var $_underscore = array();
+
+/**
+ * Cached Camelize Inflections
+ *
+ * @var array
+ * @access protected
+ */
+	var $_camelize = array();
+
+/**
+ * Classify cached inflecctions
+ *
+ * @var array
+ * @access protected
+ */
+	var $_classify = array();
+
+/**
+ * Tablize cached inflections
+ *
+ * @var array
+ * @access protected
+ */
+	var $_tableize = array();
+
+/**
+ * Humanize cached inflections
+ *
+ * @var array
+ * @access protected
+ */
+	var $_humanize = array();
+
+/**
+ * Gets a reference to the Inflector object instance
+ *
+ * @return object
+ * @access public
+ */
+	function &getInstance() {
+		static $instance = array();
+
+		if (!$instance) {
+			$instance[0] =& new Inflector();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Cache inflected values, and return if already available
+ *
+ * @param string $type Inflection type
+ * @param string $key Original value
+ * @param string $value Inflected value
+ * @return string Inflected value, from cache
+ * @access protected
+ */
+	function _cache($type, $key, $value = false) {
+		$key = '_' . $key;
+		$type = '_' . $type;
+		if ($value !== false) {
+			$this->{$type}[$key] = $value;
+			return $value;
+		}
+
+		if (!isset($this->{$type}[$key])) {
+			return false;
+		}
+		return $this->{$type}[$key];
+	}
+
+/**
+ * Adds custom inflection $rules, of either 'plural', 'singular' or 'transliteration' $type.
+ *
+ * ### Usage:
+ *
+ * {{{
+ * Inflector::rules('plural', array('/^(inflect)or$/i' => '\1ables'));
+ * Inflector::rules('plural', array(
+ *     'rules' => array('/^(inflect)ors$/i' => '\1ables'),
+ *     'uninflected' => array('dontinflectme'),
+ *     'irregular' => array('red' => 'redlings')
+ * ));
+ * Inflector::rules('transliteration', array('/Ã¥/' => 'aa'));
+ * }}}
+ *
+ * @param string $type The type of inflection, either 'plural', 'singular' or 'transliteration'
+ * @param array $rules Array of rules to be added.
+ * @param boolean $reset If true, will unset default inflections for all
+ *        new rules that are being defined in $rules.
+ * @access public
+ * @return void
+ * @static
+ */
+	function rules($type, $rules, $reset = false) {
+		$_this =& Inflector::getInstance();
+		$var = '_'.$type;
+
+		switch ($type) {
+			case 'transliteration':
+				if ($reset) {
+					$_this->_transliteration = $rules;
+				} else {
+					$_this->_transliteration = $rules + $_this->_transliteration;
+				}
+			break;
+
+			default:
+				foreach ($rules as $rule => $pattern) {
+					if (is_array($pattern)) {
+						if ($reset) {
+							$_this->{$var}[$rule] = $pattern;
+						} else {
+							$_this->{$var}[$rule] = array_merge($pattern, $_this->{$var}[$rule]);
+						}
+						unset($rules[$rule], $_this->{$var}['cache' . ucfirst($rule)]);
+						if (isset($_this->{$var}['merged'][$rule])) {
+							unset($_this->{$var}['merged'][$rule]);
+						}
+						if ($type === 'plural') {
+							$_this->_pluralized = $_this->_tableize = array();
+						} elseif ($type === 'singular') {
+							$_this->_singularized = array();
+						}
+					}
+				}
+				$_this->{$var}['rules'] = array_merge($rules, $_this->{$var}['rules']);
+			break;
+		}
+	}
+
+/**
+ * Return $word in plural form.
+ *
+ * @param string $word Word in singular
+ * @return string Word in plural
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function pluralize($word) {
+		$_this =& Inflector::getInstance();
+
+		if (isset($_this->_pluralized[$word])) {
+			return $_this->_pluralized[$word];
+		}
+
+		if (!isset($_this->_plural['merged']['irregular'])) {
+			$_this->_plural['merged']['irregular'] = $_this->_plural['irregular'];
+		}
+
+		if (!isset($_this->plural['merged']['uninflected'])) {
+			$_this->_plural['merged']['uninflected'] = array_merge($_this->_plural['uninflected'], $_this->_uninflected);
+		}
+
+		if (!isset($_this->_plural['cacheUninflected']) || !isset($_this->_plural['cacheIrregular'])) {
+			$_this->_plural['cacheUninflected'] = '(?:' . implode('|', $_this->_plural['merged']['uninflected']) . ')';
+			$_this->_plural['cacheIrregular'] = '(?:' . implode('|', array_keys($_this->_plural['merged']['irregular'])) . ')';
+		}
+
+		if (preg_match('/(.*)\\b(' . $_this->_plural['cacheIrregular'] . ')$/i', $word, $regs)) {
+			$_this->_pluralized[$word] = $regs[1] . substr($word, 0, 1) . substr($_this->_plural['merged']['irregular'][strtolower($regs[2])], 1);
+			return $_this->_pluralized[$word];
+		}
+
+		if (preg_match('/^(' . $_this->_plural['cacheUninflected'] . ')$/i', $word, $regs)) {
+			$_this->_pluralized[$word] = $word;
+			return $word;
+		}
+
+		foreach ($_this->_plural['rules'] as $rule => $replacement) {
+			if (preg_match($rule, $word)) {
+				$_this->_pluralized[$word] = preg_replace($rule, $replacement, $word);
+				return $_this->_pluralized[$word];
+			}
+		}
+	}
+
+/**
+ * Return $word in singular form.
+ *
+ * @param string $word Word in plural
+ * @return string Word in singular
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function singularize($word) {
+		$_this =& Inflector::getInstance();
+
+		if (isset($_this->_singularized[$word])) {
+			return $_this->_singularized[$word];
+		}
+
+		if (!isset($_this->_singular['merged']['uninflected'])) {
+			$_this->_singular['merged']['uninflected'] = array_merge($_this->_singular['uninflected'], $_this->_uninflected);
+		}
+
+		if (!isset($_this->_singular['merged']['irregular'])) {
+			$_this->_singular['merged']['irregular'] = array_merge($_this->_singular['irregular'], array_flip($_this->_plural['irregular']));
+		}
+
+		if (!isset($_this->_singular['cacheUninflected']) || !isset($_this->_singular['cacheIrregular'])) {
+			$_this->_singular['cacheUninflected'] = '(?:' . join( '|', $_this->_singular['merged']['uninflected']) . ')';
+			$_this->_singular['cacheIrregular'] = '(?:' . join( '|', array_keys($_this->_singular['merged']['irregular'])) . ')';
+		}
+
+		if (preg_match('/(.*)\\b(' . $_this->_singular['cacheIrregular'] . ')$/i', $word, $regs)) {
+			$_this->_singularized[$word] = $regs[1] . substr($word, 0, 1) . substr($_this->_singular['merged']['irregular'][strtolower($regs[2])], 1);
+			return $_this->_singularized[$word];
+		}
+
+		if (preg_match('/^(' . $_this->_singular['cacheUninflected'] . ')$/i', $word, $regs)) {
+			$_this->_singularized[$word] = $word;
+			return $word;
+		}
+
+		foreach ($_this->_singular['rules'] as $rule => $replacement) {
+			if (preg_match($rule, $word)) {
+				$_this->_singularized[$word] = preg_replace($rule, $replacement, $word);
+				return $_this->_singularized[$word];
+			}
+		}
+		$_this->_singularized[$word] = $word;
+		return $word;
+	}
+
+/**
+ * Returns the given lower_case_and_underscored_word as a CamelCased word.
+ *
+ * @param string $lower_case_and_underscored_word Word to camelize
+ * @return string Camelized word. LikeThis.
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function camelize($lowerCaseAndUnderscoredWord) {
+		$_this =& Inflector::getInstance();
+		if (!($result = $_this->_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) {
+			$result = str_replace(' ', '', Inflector::humanize($lowerCaseAndUnderscoredWord));
+			$_this->_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result);
+		}
+		return $result;
+	}
+
+/**
+ * Returns the given camelCasedWord as an underscored_word.
+ *
+ * @param string $camelCasedWord Camel-cased word to be "underscorized"
+ * @return string Underscore-syntaxed version of the $camelCasedWord
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function underscore($camelCasedWord) {
+		$_this =& Inflector::getInstance();
+		if (!($result = $_this->_cache(__FUNCTION__, $camelCasedWord))) {
+			$result = strtolower(preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $camelCasedWord));
+			$_this->_cache(__FUNCTION__, $camelCasedWord, $result);
+		}
+		return $result;
+	}
+
+/**
+ * Returns the given underscored_word_group as a Human Readable Word Group.
+ * (Underscores are replaced by spaces and capitalized following words.)
+ *
+ * @param string $lower_case_and_underscored_word String to be made more readable
+ * @return string Human-readable string
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function humanize($lowerCaseAndUnderscoredWord) {
+		$_this =& Inflector::getInstance();
+		if (!($result = $_this->_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord))) {
+			$result = ucwords(str_replace('_', ' ', $lowerCaseAndUnderscoredWord));
+			$_this->_cache(__FUNCTION__, $lowerCaseAndUnderscoredWord, $result);
+		}
+		return $result;
+	}
+
+/**
+ * Returns corresponding table name for given model $className. ("people" for the model class "Person").
+ *
+ * @param string $className Name of class to get database table name for
+ * @return string Name of the database table for given class
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function tableize($className) {
+		$_this =& Inflector::getInstance();
+		if (!($result = $_this->_cache(__FUNCTION__, $className))) {
+			$result = Inflector::pluralize(Inflector::underscore($className));
+			$_this->_cache(__FUNCTION__, $className, $result);
+		}
+		return $result;
+	}
+
+/**
+ * Returns Cake model class name ("Person" for the database table "people".) for given database table.
+ *
+ * @param string $tableName Name of database table to get class name for
+ * @return string Class name
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function classify($tableName) {
+		$_this =& Inflector::getInstance();
+		if (!($result = $_this->_cache(__FUNCTION__, $tableName))) {
+			$result = Inflector::camelize(Inflector::singularize($tableName));
+			$_this->_cache(__FUNCTION__, $tableName, $result);
+		}
+		return $result;
+	}
+
+/**
+ * Returns camelBacked version of an underscored string.
+ *
+ * @param string $string
+ * @return string in variable form
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function variable($string) {
+		$_this =& Inflector::getInstance();
+		if (!($result = $_this->_cache(__FUNCTION__, $string))) {
+			$string2 = Inflector::camelize(Inflector::underscore($string));
+			$replace = strtolower(substr($string2, 0, 1));
+			$result = preg_replace('/\\w/', $replace, $string2, 1);
+			$_this->_cache(__FUNCTION__, $string, $result);
+		}
+		return $result;
+	}
+
+/**
+ * Returns a string with all spaces converted to underscores (by default), accented
+ * characters converted to non-accented characters, and non word characters removed.
+ *
+ * @param string $string the string you want to slug
+ * @param string $replacement will replace keys in map
+ * @param array $map extra elements to map to the replacement
+ * @deprecated $map param will be removed in future versions. Use Inflector::rules() instead
+ * @return string
+ * @access public
+ * @static
+ * @link http://book.cakephp.org/view/1479/Class-methods
+ */
+	function slug($string, $replacement = '_', $map = array()) {
+		$_this =& Inflector::getInstance();
+
+		if (is_array($replacement)) {
+			$map = $replacement;
+			$replacement = '_';
+		}
+		$quotedReplacement = preg_quote($replacement, '/');
+
+		$merge = array(
+			'/[^\s\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]/mu' => ' ',
+			'/\\s+/' => $replacement,
+			sprintf('/^[%s]+|[%s]+$/', $quotedReplacement, $quotedReplacement) => '',
+		);
+
+		$map = $map + $_this->_transliteration + $merge;
+		return preg_replace(array_keys($map), array_values($map), $string);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/l10n.php b/code/ryzom/tools/server/www/webtt/cake/libs/l10n.php
new file mode 100644
index 000000000..801112e82
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/l10n.php
@@ -0,0 +1,488 @@
+<?php
+/**
+ * Localization
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0.4116
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Localization
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class L10n extends Object {
+
+/**
+ * The language for current locale
+ *
+ * @var string
+ * @access public
+ */
+	var $language = 'English (United States)';
+
+/**
+ * Locale search paths
+ *
+ * @var array
+ * @access public
+ */
+	var $languagePath = array('eng');
+
+/**
+ * ISO 639-3 for current locale
+ *
+ * @var string
+ * @access public
+ */
+	var $lang = 'eng';
+
+/**
+ * Locale
+ *
+ * @var string
+ * @access public
+ */
+	var $locale = 'en_us';
+
+/**
+ * Default ISO 639-3 language.
+ *
+ * DEFAULT_LANGUAGE is defined in an application this will be set as a fall back
+ *
+ * @var string
+ * @access public
+ */
+	var $default = null;
+
+/**
+ * Encoding used for current locale
+ *
+ * @var string
+ * @access public
+ */
+	var $charset = 'utf-8';
+
+/**
+ * Text direction for current locale
+ *
+ * @var string
+ * @access public
+ */
+	var $direction = 'ltr';
+
+/**
+ * Set to true if a locale is found
+ *
+ * @var string
+ * @access public
+ */
+	var $found = false;
+
+/**
+ * Maps ISO 639-3 to I10n::__l10nCatalog
+ *
+ * @var array
+ * @access private
+ */
+	var $__l10nMap = array(/* Afrikaans */ 'afr' => 'af',
+								/* Albanian */ 'alb' => 'sq',
+								/* Arabic */ 'ara' => 'ar',
+								/* Armenian - Armenia */ 'hye' => 'hy',
+								/* Basque */ 'baq' => 'eu',
+								/* Bosnian */ 'bos' => 'bs',
+								/* Bulgarian */ 'bul' => 'bg',
+								/* Byelorussian */ 'bel' => 'be',
+								/* Catalan */ 'cat' => 'ca',
+								/* Chinese */ 'chi' => 'zh',
+								/* Chinese */ 'zho' => 'zh',
+								/* Croatian */ 'hrv' => 'hr',
+								/* Czech */ 'cze' => 'cs',
+								/* Czech */ 'ces' => 'cs',
+								/* Danish */ 'dan' => 'da',
+								/* Dutch (Standard) */ 'dut' => 'nl',
+								/* Dutch (Standard) */ 'nld' => 'nl',
+								/* English */ 'eng' => 'en',
+								/* Estonian */ 'est' => 'et',
+								/* Faeroese */ 'fao' => 'fo',
+								/* Farsi */ 'fas' => 'fa',
+								/* Farsi */ 'per' => 'fa',
+								/* Finnish */ 'fin' => 'fi',
+								/* French (Standard) */ 'fre' => 'fr',
+								/* French (Standard) */ 'fra' => 'fr',
+								/* Gaelic (Scots) */ 'gla' => 'gd',
+								/* Galician */ 'glg' => 'gl',
+								/* German (Standard) */ 'deu' => 'de',
+								/* German (Standard) */ 'ger' => 'de',
+								/* Greek */ 'gre' => 'el',
+								/* Greek */ 'ell' => 'el',
+								/* Hebrew */ 'heb' => 'he',
+								/* Hindi */ 'hin' => 'hi',
+								/* Hungarian */ 'hun' => 'hu',
+								/* Icelandic */ 'ice' => 'is',
+								/* Icelandic */ 'isl' => 'is',
+								/* Indonesian */ 'ind' => 'id',
+								/* Irish */ 'gle' => 'ga',
+								/* Italian */ 'ita' => 'it',
+								/* Japanese */ 'jpn' => 'ja',
+								/* Korean */ 'kor' => 'ko',
+								/* Latvian */ 'lav' => 'lv',
+								/* Lithuanian */ 'lit' => 'lt',
+								/* Macedonian */ 'mac' => 'mk',
+								/* Macedonian */ 'mkd' => 'mk',
+								/* Malaysian */ 'may' => 'ms',
+								/* Malaysian */ 'msa' => 'ms',
+								/* Maltese */ 'mlt' => 'mt',
+								/* Norwegian */ 'nor' => 'no',
+								/* Norwegian Bokmal */ 'nob' => 'nb',
+								/* Norwegian Nynorsk */ 'nno' => 'nn',
+								/* Polish */ 'pol' => 'pl',
+								/* Portuguese (Portugal) */ 'por' => 'pt',
+								/* Rhaeto-Romanic */ 'roh' => 'rm',
+								/* Romanian */ 'rum' => 'ro',
+								/* Romanian */ 'ron' => 'ro',
+								/* Russian */ 'rus' => 'ru',
+								/* Sami (Lappish) */ 'smi' => 'sz',
+								/* Serbian */ 'scc' => 'sr',
+								/* Serbian */ 'srp' => 'sr',
+								/* Slovak */ 'slo' => 'sk',
+								/* Slovak */ 'slk' => 'sk',
+								/* Slovenian */ 'slv' => 'sl',
+								/* Sorbian */ 'wen' => 'sb',
+								/* Spanish (Spain - Traditional) */ 'spa' => 'es',
+								/* Swedish */ 'swe' => 'sv',
+								/* Thai */ 'tha' => 'th',
+								/* Tsonga */ 'tso' => 'ts',
+								/* Tswana */ 'tsn' => 'tn',
+								/* Turkish */ 'tur' => 'tr',
+								/* Ukrainian */ 'ukr' => 'uk',
+								/* Urdu */ 'urd' => 'ur',
+								/* Venda */ 'ven' => 've',
+								/* Vietnamese */ 'vie' => 'vi',
+								/* Welsh */ 'cym' => 'cy',
+								/* Xhosa */ 'xho' => 'xh',
+								/* Yiddish */ 'yid' => 'yi',
+								/* Zulu */ 'zul' => 'zu');
+
+/**
+ * HTTP_ACCEPT_LANGUAGE catalog
+ *
+ * holds all information related to a language
+ *
+ * @var array
+ * @access private
+ */
+	var $__l10nCatalog = array('af' => array('language' => 'Afrikaans', 'locale' => 'afr', 'localeFallback' => 'afr', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ar' => array('language' => 'Arabic', 'locale' => 'ara', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-ae' => array('language' => 'Arabic (U.A.E.)', 'locale' => 'ar_ae', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-bh' => array('language' => 'Arabic (Bahrain)', 'locale' => 'ar_bh', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-dz' => array('language' => 'Arabic (Algeria)', 'locale' => 'ar_dz', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-eg' => array('language' => 'Arabic (Egypt)', 'locale' => 'ar_eg', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-iq' => array('language' => 'Arabic (Iraq)', 'locale' => 'ar_iq', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-jo' => array('language' => 'Arabic (Jordan)', 'locale' => 'ar_jo', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-kw' => array('language' => 'Arabic (Kuwait)', 'locale' => 'ar_kw', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-lb' => array('language' => 'Arabic (Lebanon)', 'locale' => 'ar_lb', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-ly' => array('language' => 'Arabic (Libya)', 'locale' => 'ar_ly', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-ma' => array('language' => 'Arabic (Morocco)', 'locale' => 'ar_ma', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-om' => array('language' => 'Arabic (Oman)', 'locale' => 'ar_om', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-qa' => array('language' => 'Arabic (Qatar)', 'locale' => 'ar_qa', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-sa' => array('language' => 'Arabic (Saudi Arabia)', 'locale' => 'ar_sa', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-sy' => array('language' => 'Arabic (Syria)', 'locale' => 'ar_sy', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-tn' => array('language' => 'Arabic (Tunisia)', 'locale' => 'ar_tn', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'ar-ye' => array('language' => 'Arabic (Yemen)', 'locale' => 'ar_ye', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'be' => array('language' => 'Byelorussian', 'locale' => 'bel', 'localeFallback' => 'bel', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'bg' => array('language' => 'Bulgarian', 'locale' => 'bul', 'localeFallback' => 'bul', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'bs' => array('language' => 'Bosnian', 'locale' => 'bos', 'localeFallback' => 'bos', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ca' => array('language' => 'Catalan', 'locale' => 'cat', 'localeFallback' => 'cat', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'cs' => array('language' => 'Czech', 'locale' => 'cze', 'localeFallback' => 'cze', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'da' => array('language' => 'Danish', 'locale' => 'dan', 'localeFallback' => 'dan', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'de' => array('language' => 'German (Standard)', 'locale' => 'deu', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'de-at' => array('language' => 'German (Austria)', 'locale' => 'de_at', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'de-ch' => array('language' => 'German (Swiss)', 'locale' => 'de_ch', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'de-de' => array('language' => 'German (Germany)', 'locale' => 'de_de', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'de-li' => array('language' => 'German (Liechtenstein)', 'locale' => 'de_li', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'de-lu' => array('language' => 'German (Luxembourg)', 'locale' => 'de_lu', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'e' => array('language' => 'Greek', 'locale' => 'gre', 'localeFallback' => 'gre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'el' => array('language' => 'Greek', 'locale' => 'gre', 'localeFallback' => 'gre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en' => array('language' => 'English', 'locale' => 'eng', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-au' => array('language' => 'English (Australian)', 'locale' => 'en_au', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-bz' => array('language' => 'English (Belize)', 'locale' => 'en_bz', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-ca' => array('language' => 'English (Canadian)', 'locale' => 'en_ca', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-gb' => array('language' => 'English (British)', 'locale' => 'en_gb', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-ie' => array('language' => 'English (Ireland)', 'locale' => 'en_ie', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-jm' => array('language' => 'English (Jamaica)', 'locale' => 'en_jm', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-nz' => array('language' => 'English (New Zealand)', 'locale' => 'en_nz', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-tt' => array('language' => 'English (Trinidad)', 'locale' => 'en_tt', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-us' => array('language' => 'English (United States)', 'locale' => 'en_us', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'en-za' => array('language' => 'English (South Africa)', 'locale' => 'en_za', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es' => array('language' => 'Spanish (Spain - Traditional)', 'locale' => 'spa', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-ar' => array('language' => 'Spanish (Argentina)', 'locale' => 'es_ar', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-bo' => array('language' => 'Spanish (Bolivia)', 'locale' => 'es_bo', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-cl' => array('language' => 'Spanish (Chile)', 'locale' => 'es_cl', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-co' => array('language' => 'Spanish (Colombia)', 'locale' => 'es_co', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-cr' => array('language' => 'Spanish (Costa Rica)', 'locale' => 'es_cr', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-do' => array('language' => 'Spanish (Dominican Republic)', 'locale' => 'es_do', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-ec' => array('language' => 'Spanish (Ecuador)', 'locale' => 'es_ec', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-es' => array('language' => 'Spanish (Spain)', 'locale' => 'es_es', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-gt' => array('language' => 'Spanish (Guatemala)', 'locale' => 'es_gt', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-hn' => array('language' => 'Spanish (Honduras)', 'locale' => 'es_hn', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-mx' => array('language' => 'Spanish (Mexican)', 'locale' => 'es_mx', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-ni' => array('language' => 'Spanish (Nicaragua)', 'locale' => 'es_ni', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-pa' => array('language' => 'Spanish (Panama)', 'locale' => 'es_pa', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-pe' => array('language' => 'Spanish (Peru)', 'locale' => 'es_pe', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-pr' => array('language' => 'Spanish (Puerto Rico)', 'locale' => 'es_pr', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-py' => array('language' => 'Spanish (Paraguay)', 'locale' => 'es_py', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-sv' => array('language' => 'Spanish (El Salvador)', 'locale' => 'es_sv', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-uy' => array('language' => 'Spanish (Uruguay)', 'locale' => 'es_uy', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'es-ve' => array('language' => 'Spanish (Venezuela)', 'locale' => 'es_ve', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'et' => array('language' => 'Estonian', 'locale' => 'est', 'localeFallback' => 'est', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'eu' => array('language' => 'Basque', 'locale' => 'baq', 'localeFallback' => 'baq', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fa' => array('language' => 'Farsi', 'locale' => 'per', 'localeFallback' => 'per', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'fi' => array('language' => 'Finnish', 'locale' => 'fin', 'localeFallback' => 'fin', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fo' => array('language' => 'Faeroese', 'locale' => 'fao', 'localeFallback' => 'fao', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fr' => array('language' => 'French (Standard)', 'locale' => 'fre', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fr-be' => array('language' => 'French (Belgium)', 'locale' => 'fr_be', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fr-ca' => array('language' => 'French (Canadian)', 'locale' => 'fr_ca', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fr-ch' => array('language' => 'French (Swiss)', 'locale' => 'fr_ch', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fr-fr' => array('language' => 'French (France)', 'locale' => 'fr_fr', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'fr-lu' => array('language' => 'French (Luxembourg)', 'locale' => 'fr_lu', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ga' => array('language' => 'Irish', 'locale' => 'gle', 'localeFallback' => 'gle', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'gd' => array('language' => 'Gaelic (Scots)', 'locale' => 'gla', 'localeFallback' => 'gla', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'gd-ie' => array('language' => 'Gaelic (Irish)', 'locale' => 'gd_ie', 'localeFallback' => 'gla', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'gl' => array('language' => 'Galician', 'locale' => 'glg', 'localeFallback' => 'glg', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'he' => array('language' => 'Hebrew', 'locale' => 'heb', 'localeFallback' => 'heb', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										'hi' => array('language' => 'Hindi', 'locale' => 'hin', 'localeFallback' => 'hin', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'hr' => array('language' => 'Croatian', 'locale' => 'hrv', 'localeFallback' => 'hrv', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'hu' => array('language' => 'Hungarian', 'locale' => 'hun', 'localeFallback' => 'hun', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'hy' => array('language' => 'Armenian - Armenia', 'locale' => 'hye', 'localeFallback' => 'hye', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'id' => array('language' => 'Indonesian', 'locale' => 'ind', 'localeFallback' => 'ind', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'in' => array('language' => 'Indonesian', 'locale' => 'ind', 'localeFallback' => 'ind', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'is' => array('language' => 'Icelandic', 'locale' => 'ice', 'localeFallback' => 'ice', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'it' => array('language' => 'Italian', 'locale' => 'ita', 'localeFallback' => 'ita', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'it-ch' => array('language' => 'Italian (Swiss) ', 'locale' => 'it_ch', 'localeFallback' => 'ita', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ja' => array('language' => 'Japanese', 'locale' => 'jpn', 'localeFallback' => 'jpn', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ko' => array('language' => 'Korean', 'locale' => 'kor', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
+										'ko-kp' => array('language' => 'Korea (North)', 'locale' => 'ko_kp', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
+										'ko-kr' => array('language' => 'Korea (South)', 'locale' => 'ko_kr', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
+										'koi8-r' => array('language' => 'Russian', 'locale' => 'koi8_r', 'localeFallback' => 'rus', 'charset' => 'koi8-r', 'direction' => 'ltr'),
+										'lt' => array('language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'lv' => array('language' => 'Latvian', 'locale' => 'lav', 'localeFallback' => 'lav', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'mk' => array('language' => 'FYRO Macedonian', 'locale' => 'mk', 'localeFallback' => 'mac', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'mk-mk' => array('language' => 'Macedonian', 'locale' => 'mk_mk', 'localeFallback' => 'mac', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ms' => array('language' => 'Malaysian', 'locale' => 'may', 'localeFallback' => 'may', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'mt' => array('language' => 'Maltese', 'locale' => 'mlt', 'localeFallback' => 'mlt', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'n' => array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'nb' => array('language' => 'Norwegian Bokmal', 'locale' => 'nob', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'nl' => array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'nl-be' => array('language' => 'Dutch (Belgium)', 'locale' => 'nl_be', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'nn' => array('language' => 'Norwegian Nynorsk', 'locale' => 'nno', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'no' => array('language' => 'Norwegian', 'locale' => 'nor', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'p' => array('language' => 'Polish', 'locale' => 'pol', 'localeFallback' => 'pol', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'pl' => array('language' => 'Polish', 'locale' => 'pol', 'localeFallback' => 'pol', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'pt' => array('language' => 'Portuguese (Portugal)', 'locale' => 'por', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'pt-br' => array('language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'rm' => array('language' => 'Rhaeto-Romanic', 'locale' => 'roh', 'localeFallback' => 'roh', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ro' => array('language' => 'Romanian', 'locale' => 'rum', 'localeFallback' => 'rum', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ro-mo' => array('language' => 'Romanian (Moldavia)', 'locale' => 'ro_mo', 'localeFallback' => 'rum', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ru' => array('language' => 'Russian', 'locale' => 'rus', 'localeFallback' => 'rus', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ru-mo' => array('language' => 'Russian (Moldavia)', 'locale' => 'ru_mo', 'localeFallback' => 'rus', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sb' => array('language' => 'Sorbian', 'locale' => 'wen', 'localeFallback' => 'wen', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sk' => array('language' => 'Slovak', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sl' => array('language' => 'Slovenian', 'locale' => 'slv', 'localeFallback' => 'slv', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sq' => array('language' => 'Albanian', 'locale' => 'alb', 'localeFallback' => 'alb', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sr' => array('language' => 'Serbian', 'locale' => 'scc', 'localeFallback' => 'scc', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sv' => array('language' => 'Swedish', 'locale' => 'swe', 'localeFallback' => 'swe', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sv-fi' => array('language' => 'Swedish (Finland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sx' => array('language' => 'Sutu', 'locale' => 'sx', 'localeFallback' => 'sx', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'sz' => array('language' => 'Sami (Lappish)', 'locale' => 'smi', 'localeFallback' => 'smi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'th' => array('language' => 'Thai', 'locale' => 'tha', 'localeFallback' => 'tha', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'tn' => array('language' => 'Tswana', 'locale' => 'tsn', 'localeFallback' => 'tsn', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'tr' => array('language' => 'Turkish', 'locale' => 'tur', 'localeFallback' => 'tur', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ts' => array('language' => 'Tsonga', 'locale' => 'tso', 'localeFallback' => 'tso', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'uk' => array('language' => 'Ukrainian', 'locale' => 'ukr', 'localeFallback' => 'ukr', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'ur' => array('language' => 'Urdu', 'locale' => 'urd', 'localeFallback' => 'urd', 'charset' => 'utf-8', 'direction' => 'rtl'),
+										've' => array('language' => 'Venda', 'locale' => 'ven', 'localeFallback' => 'ven', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'vi' => array('language' => 'Vietnamese', 'locale' => 'vie', 'localeFallback' => 'vie', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'xh' => array('language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'yi' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'zh' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'zh-cn' => array('language' => 'Chinese (PRC)', 'locale' => 'zh_cn', 'localeFallback' => 'chi', 'charset' => 'GB2312', 'direction' => 'ltr'),
+										'zh-hk' => array('language' => 'Chinese (Hong Kong)', 'locale' => 'zh_hk', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'zh-sg' => array('language' => 'Chinese (Singapore)', 'locale' => 'zh_sg', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'zh-tw' => array('language' => 'Chinese (Taiwan)', 'locale' => 'zh_tw', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+										'zu' => array('language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr'));
+
+/**
+ * Class constructor
+ */
+	function __construct() {
+		if (defined('DEFAULT_LANGUAGE')) {
+			$this->default = DEFAULT_LANGUAGE;
+		}
+		parent::__construct();
+	}
+
+/**
+ * Gets the settings for $language.
+ * If $language is null it attempt to get settings from L10n::__autoLanguage(); if this fails
+ * the method will get the settings from L10n::__setLanguage();
+ *
+ * @param string $language Language (if null will use DEFAULT_LANGUAGE if defined)
+ * @access public
+ */
+	function get($language = null) {
+		if ($language !== null) {
+			return $this->__setLanguage($language);
+		} elseif ($this->__autoLanguage() === false) {
+			return $this->__setLanguage();
+		}
+	}
+
+/**
+ * Sets the class vars to correct values for $language.
+ * If $language is null it will use the DEFAULT_LANGUAGE if defined
+ *
+ * @param string $language Language (if null will use DEFAULT_LANGUAGE if defined)
+ * @access private
+ */
+	function __setLanguage($language = null) {
+		$langKey = null;
+		if ($language !== null && isset($this->__l10nMap[$language]) && isset($this->__l10nCatalog[$this->__l10nMap[$language]])) {
+			$langKey = $this->__l10nMap[$language];
+		} else if ($language !== null && isset($this->__l10nCatalog[$language])) {
+			$langKey = $language;
+		} else if (defined('DEFAULT_LANGUAGE')) {
+			$langKey = $language = DEFAULT_LANGUAGE;
+		}
+
+		if ($langKey !== null && isset($this->__l10nCatalog[$langKey])) {
+			$this->language = $this->__l10nCatalog[$langKey]['language'];
+			$this->languagePath = array(
+				$this->__l10nCatalog[$langKey]['locale'],
+				$this->__l10nCatalog[$langKey]['localeFallback']
+			);
+			$this->lang = $language;
+			$this->locale = $this->__l10nCatalog[$langKey]['locale'];
+			$this->charset = $this->__l10nCatalog[$langKey]['charset'];
+			$this->direction = $this->__l10nCatalog[$langKey]['direction'];
+		} else {
+			$this->lang = $language;
+			$this->languagePath = array($language);
+		}
+
+		if ($this->default) {
+			if (isset($this->__l10nMap[$this->default]) && isset($this->__l10nCatalog[$this->__l10nMap[$this->default]])) {
+				$this->languagePath[] = $this->__l10nCatalog[$this->__l10nMap[$this->default]]['localeFallback'];
+			} else if (isset($this->__l10nCatalog[$this->default])) {
+				$this->languagePath[] = $this->__l10nCatalog[$this->default]['localeFallback'];
+			}
+		}
+		$this->found = true;
+
+		if (Configure::read('Config.language') === null) {
+			Configure::write('Config.language', $this->lang);
+		}
+
+		if ($language) {
+			return $language;
+		}
+	}
+
+/**
+ * Attempts to find the locale settings based on the HTTP_ACCEPT_LANGUAGE variable
+ *
+ * @return boolean Success
+ * @access private
+ */
+	function __autoLanguage() {
+		$_detectableLanguages = preg_split('/[,;]/', env('HTTP_ACCEPT_LANGUAGE'));
+		foreach ($_detectableLanguages as $key => $langKey) {
+			$langKey = strtolower($langKey);
+			if (strpos($langKey, '_') !== false) {
+				$langKey = str_replace('_', '-', $langKey);
+			}
+
+			if (isset($this->__l10nCatalog[$langKey])) {
+				$this->__setLanguage($langKey);
+				return true;
+			} else if (strpos($langKey, '-') !== false) {
+				$langKey = substr($langKey, 0, 2);
+				if (isset($this->__l10nCatalog[$langKey])) {
+					$this->__setLanguage($langKey);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+/**
+ * Attempts to find locale for language, or language for locale
+ *
+ * @param mixed $mixed 2/3 char string (language/locale), array of those strings, or null
+ * @return mixed string language/locale, array of those values, whole map as an array, 
+ *    or false when language/locale doesn't exist
+ * @access public
+ */
+	function map($mixed = null) {
+		if (is_array($mixed)) {
+			$result = array();
+			foreach ($mixed as $_mixed) {
+				if ($_result = $this->map($_mixed)) {
+					$result[$_mixed] = $_result;
+				}
+			}
+			return $result;
+		} else if (is_string($mixed)) {
+			if (strlen($mixed) === 2 && in_array($mixed, $this->__l10nMap)) {
+				return array_search($mixed, $this->__l10nMap);
+			} else if (isset($this->__l10nMap[$mixed])) {
+				return $this->__l10nMap[$mixed];
+			}
+			return false;
+		}
+		return $this->__l10nMap;
+	}
+
+/**
+ * Attempts to find catalog record for requested language
+ *
+ * @param mixed $language string requested language, array of requested languages, or null for whole catalog
+ * @return mixed array catalog record for requested language, array of catalog records, whole catalog, 
+ *    or false when language doesn't exist
+ * @access public
+ */
+	function catalog($language = null) {
+		if (is_array($language)) {
+			$result = array();
+			foreach ($language as $_language) {
+				if ($_result = $this->catalog($_language)) {
+					$result[$_language] = $_result;
+				}
+			}
+			return $result;
+		} else if (is_string($language)) {
+			if (isset($this->__l10nCatalog[$language])) {
+				return $this->__l10nCatalog[$language];
+			} else if (isset($this->__l10nMap[$language]) && isset($this->__l10nCatalog[$this->__l10nMap[$language]])) {
+				return $this->__l10nCatalog[$this->__l10nMap[$language]];
+			}
+			return false;
+		}
+		return $this->__l10nCatalog;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/log/file_log.php b/code/ryzom/tools/server/www/webtt/cake/libs/log/file_log.php
new file mode 100644
index 000000000..dfc24eac5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/log/file_log.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * File Storage stream for Logging
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.log
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('File')) {
+	require LIBS . 'file.php';
+}
+/**
+ * File Storage stream for Logging.  Writes logs to different files
+ * based on the type of log it is.
+ *
+ * @package cake
+ * @subpackage cake.cake.libs.log
+ */
+class FileLog {
+
+/**
+ * Path to save log files on.
+ *
+ * @var string
+ */
+	var $_path = null;
+
+/**
+ * Constructs a new File Logger.
+ * 
+ * Options
+ *
+ * - `path` the path to save logs on.
+ *
+ * @param array $options Options for the FileLog, see above.
+ * @return void
+ */
+	function FileLog($options = array()) {
+		$options += array('path' => LOGS);
+		$this->_path = $options['path'];
+	}
+
+/**
+ * Implements writing to log files.
+ *
+ * @param string $type The type of log you are making.
+ * @param string $message The message you want to log.
+ * @return boolean success of write.
+ */
+	function write($type, $message) {
+		$debugTypes = array('notice', 'info', 'debug');
+
+		if ($type == 'error' || $type == 'warning') {
+			$filename = $this->_path  . 'error.log';
+		} elseif (in_array($type, $debugTypes)) {
+			$filename = $this->_path . 'debug.log';
+		} else {
+			$filename = $this->_path . $type . '.log';
+		}
+		$output = date('Y-m-d H:i:s') . ' ' . ucfirst($type) . ': ' . $message . "\n";
+		$log = new File($filename, true);
+		if ($log->writable()) {
+			return $log->append($output);
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/magic_db.php b/code/ryzom/tools/server/www/webtt/cake/libs/magic_db.php
new file mode 100644
index 000000000..0c94426fd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/magic_db.php
@@ -0,0 +1,302 @@
+<?php
+/**
+ * MagicDb parser and file analyzer
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('Object')) {
+	require LIBS . 'object.php';
+}
+if (!class_exists('File')) {
+	require LIBS . 'file.php';
+}
+
+/**
+ * A class to parse and use the MagicDb for file type analysis
+ *
+ * @package       cake.tests
+ * @subpackage    cake.tests.cases.libs
+ */
+class MagicDb extends Object {
+
+/**
+ * Holds the parsed MagicDb for this class instance
+ *
+ * @var array
+ */
+	var $db = array();
+
+/**
+ * Reads a MagicDb from various formats
+ *
+ * @var $magicDb mixed Can be an array containing the db, a magic db as a string, or a filename pointing to a magic db in .db or magic.db.php format
+ * @return boolean Returns false if reading / validation failed or true on success.
+ * @author        Felix
+ */
+	function read($magicDb = null) {
+		if (!is_string($magicDb) && !is_array($magicDb)) {
+			return false;
+		}
+		if (is_array($magicDb) || strpos($magicDb, '# FILE_ID DB') === 0) {
+			$data = $magicDb;
+		} else {
+			$File =& new File($magicDb);
+			if (!$File->exists()) {
+				return false;
+			}
+			if ($File->ext() == 'php') {
+				include($File->pwd());
+				$data = $magicDb;
+			} else {
+				// @TODO: Needs test coverage
+				$data = $File->read();
+			}
+		}
+
+		$magicDb = $this->toArray($data);
+		if (!$this->validates($magicDb)) {
+			return false;
+		}
+		return !!($this->db = $magicDb);
+	}
+
+/**
+ * Parses a MagicDb $data string into an array or returns the current MagicDb instance as an array
+ *
+ * @param string $data A MagicDb string to turn into an array
+ * @return array A parsed MagicDb array or an empty array if the $data param was invalid. Returns the db property if $data is not set.
+ * @access public
+ */
+	function toArray($data = null) {
+		if (is_array($data)) {
+			return $data;
+		}
+		if ($data === null) {
+			return $this->db;
+		}
+
+		if (strpos($data, '# FILE_ID DB') !== 0) {
+			return array();
+		}
+
+		$lines = explode("\r\n", $data);
+		$db = array();
+
+		$validHeader = count($lines) > 3
+					&& preg_match('/^# Date:([0-9]{4}-[0-9]{2}-[0-9]{2})$/', $lines[1], $date)
+					&& preg_match('/^# Source:(.+)$/', $lines[2], $source)
+					&& strlen($lines[3]) == 0;
+		if (!$validHeader) {
+			return $db;
+		}
+
+		$db = array('header' => array('Date' => $date[1], 'Source' => $source[1]), 'database' => array());
+		$lines = array_splice($lines, 3);
+
+		$format = array();
+		while (!empty($lines)) {
+			$line = array_shift($lines);
+			if (isset($line[0]) && $line[0] == '#' || empty($line)) {
+				continue;
+			}
+
+			$columns = explode("\t", $line);
+			if (in_array($columns[0]{0}, array('>', '&'))) {
+				$format[] = $columns;
+			} elseif (!empty($format)) {
+				$db['database'][] = $format;
+				$format = array($columns);
+			} else {
+				$format = array($columns);
+			}
+		}
+
+		return $db;
+	}
+
+/**
+ * Returns true if the MagicDb instance or the passed $magicDb is valid
+ *
+ * @param mixed $magicDb A $magicDb string / array to validate (optional)
+ * @return boolean True if the $magicDb / instance db validates, false if not
+ * @access public
+ */
+	function validates($magicDb = null) {
+		if (is_null($magicDb)) {
+			$magicDb = $this->db;
+		} elseif (!is_array($magicDb)) {
+			$magicDb = $this->toArray($magicDb);
+		}
+
+		return isset($magicDb['header'], $magicDb['database']) && is_array($magicDb['header']) && is_array($magicDb['database']);
+	}
+
+/**
+ * Analyzes a given $file using the currently loaded MagicDb information based on the desired $options
+ *
+ * @param string $file Absolute path to the file to analyze
+ * @param array $options TBT
+ * @return mixed
+ * @access public
+ */
+	function analyze($file, $options = array()) {
+		if (!is_string($file)) {
+			return false;
+		}
+
+		$matches = array();
+		$MagicFileResource =& new MagicFileResource($file);
+		foreach ($this->db['database'] as $format) {
+			$magic = $format[0];
+			$match = $MagicFileResource->test($magic);
+			if ($match === false) {
+				continue;
+			}
+			$matches[] = $magic;
+		}
+
+		return $matches;
+	}
+}
+
+/**
+ * undocumented class
+ *
+ * @package       cake.tests
+ * @subpackage    cake.tests.cases.libs
+ */
+class MagicFileResource extends Object{
+
+/**
+ * undocumented variable
+ *
+ * @var unknown
+ * @access public
+ */
+	var $resource = null;
+
+/**
+ * undocumented variable
+ *
+ * @var unknown
+ * @access public
+ */
+	var $offset = 0;
+
+/**
+ * undocumented function
+ *
+ * @param unknown $file
+ * @return void
+ * @access public
+ */
+	function __construct($file) {
+		if (file_exists($file)) {
+			$this->resource =& new File($file);
+		} else {
+			$this->resource = $file;
+		}
+	}
+
+/**
+ * undocumented function
+ *
+ * @param unknown $magic
+ * @return void
+ * @access public
+ */
+	function test($magic) {
+		$offset = null;
+		$type = null;
+		$expected = null;
+		$comment = null;
+		if (isset($magic[0])) {
+			$offset = $magic[0];
+		}
+		if (isset($magic[1])) {
+			$type = $magic[1];
+		}
+		if (isset($magic[2])) {
+			$expected = $magic[2];
+		}
+		if (isset($magic[3])) {
+			$comment = $magic[3];
+		}
+		$val = $this->extract($offset, $type, $expected);
+		return $val == $expected;
+	}
+
+/**
+ * undocumented function
+ *
+ * @param unknown $type
+ * @param unknown $length
+ * @return void
+ * @access public
+ */
+	function read($length = null) {
+		if (!is_object($this->resource)) {
+			return substr($this->resource, $this->offset, $length);
+		}
+		return $this->resource->read($length);
+	}
+
+/**
+ * undocumented function
+ *
+ * @param unknown $type
+ * @param unknown $expected
+ * @return void
+ * @access public
+ */
+	function extract($offset, $type, $expected) {
+		switch ($type) {
+			case 'string':
+				$this->offset($offset);
+				$val = $this->read(strlen($expected));
+				if ($val === $expected) {
+					return true;
+				}
+				break;
+		}
+	}
+
+/**
+ * undocumented function
+ *
+ * @param unknown $offset
+ * @param unknown $whence
+ * @return void
+ * @access public
+ */
+	function offset($offset = null) {
+		if (is_null($offset)) {
+			if (!is_object($this->resource)) {
+				return $this->offset;
+			}
+			return $this->offset;
+		}
+
+		if (!ctype_digit($offset)) {
+			return false;
+		}
+		if (is_object($this->resource)) {
+			$this->resource->offset($offset);
+		} else {
+			$this->offset = $offset;
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/app_model.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/app_model.php
new file mode 100644
index 000000000..83b944b83
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/app_model.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Application model for Cake.
+ *
+ * This file is application-wide model file. You can put all
+ * application-wide model-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Application model for Cake.
+ *
+ * This is a placeholder class.
+ * Create the same file in app/app_model.php
+ * Add your application-wide methods to the class, your models will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class AppModel extends Model {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/acl.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/acl.php
new file mode 100644
index 000000000..41cc50899
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/acl.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * ACL behavior class.
+ *
+ * Enables objects to easily tie into an ACL system
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.behaviors
+ * @since         CakePHP v 1.2.0.4487
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * ACL behavior
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.behaviors
+ * @link http://book.cakephp.org/view/1320/ACL
+ */
+class AclBehavior extends ModelBehavior {
+
+/**
+ * Maps ACL type options to ACL models
+ *
+ * @var array
+ * @access protected
+ */
+	var $__typeMaps = array('requester' => 'Aro', 'controlled' => 'Aco');
+
+/**
+ * Sets up the configuation for the model, and loads ACL models if they haven't been already
+ *
+ * @param mixed $config
+ * @return void
+ * @access public
+ */
+	function setup(&$model, $config = array()) {
+		if (is_string($config)) {
+			$config = array('type' => $config);
+		}
+		$this->settings[$model->name] = array_merge(array('type' => 'requester'), (array)$config);
+		$this->settings[$model->name]['type'] = strtolower($this->settings[$model->name]['type']);
+
+		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
+		if (!class_exists('AclNode')) {
+			require LIBS . 'model' . DS . 'db_acl.php';
+		}
+		if (PHP5) {
+			$model->{$type} = ClassRegistry::init($type);
+		} else {
+			$model->{$type} =& ClassRegistry::init($type);
+		}
+		if (!method_exists($model, 'parentNode')) {
+			trigger_error(sprintf(__('Callback parentNode() not defined in %s', true), $model->alias), E_USER_WARNING);
+		}
+	}
+
+/**
+ * Retrieves the Aro/Aco node for this model
+ *
+ * @param mixed $ref
+ * @return array
+ * @access public
+ * @link http://book.cakephp.org/view/1322/node
+ */
+	function node(&$model, $ref = null) {
+		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
+		if (empty($ref)) {
+			$ref = array('model' => $model->name, 'foreign_key' => $model->id);
+		}
+		return $model->{$type}->node($ref);
+	}
+
+/**
+ * Creates a new ARO/ACO node bound to this record
+ *
+ * @param boolean $created True if this is a new record
+ * @return void
+ * @access public
+ */
+	function afterSave(&$model, $created) {
+		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
+		$parent = $model->parentNode();
+		if (!empty($parent)) {
+			$parent = $this->node($model, $parent);
+		}
+		$data = array(
+			'parent_id' => isset($parent[0][$type]['id']) ? $parent[0][$type]['id'] : null,
+			'model' => $model->name,
+			'foreign_key' => $model->id
+		);
+		if (!$created) {
+			$node = $this->node($model);
+			$data['id'] = isset($node[0][$type]['id']) ? $node[0][$type]['id'] : null;
+		}
+		$model->{$type}->create();
+		$model->{$type}->save($data);
+	}
+
+/**
+ * Destroys the ARO/ACO node bound to the deleted record
+ *
+ * @return void
+ * @access public
+ */
+	function afterDelete(&$model) {
+		$type = $this->__typeMaps[$this->settings[$model->name]['type']];
+		$node = Set::extract($this->node($model), "0.{$type}.id");
+		if (!empty($node)) {
+			$model->{$type}->delete($node);
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/containable.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/containable.php
new file mode 100644
index 000000000..138f290d0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/containable.php
@@ -0,0 +1,453 @@
+<?php
+/**
+ * Behavior for binding management.
+ *
+ * Behavior to simplify manipulating a model's bindings when doing a find operation
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
+ * the amount of associations and data returned.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ * @link http://book.cakephp.org/view/1323/Containable
+ */
+class ContainableBehavior extends ModelBehavior {
+
+/**
+ * Types of relationships available for models
+ *
+ * @var array
+ * @access private
+ */
+	var $types = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+
+/**
+ * Runtime configuration for this behavior
+ *
+ * @var array
+ * @access private
+ */
+	var $runtime = array();
+
+/**
+ * Initiate behavior for the model using specified settings.
+ *
+ * Available settings:
+ *
+ * - recursive: (boolean, optional) set to true to allow containable to automatically
+ *   determine the recursiveness level needed to fetch specified models,
+ *   and set the model recursiveness to this level. setting it to false
+ *   disables this feature. DEFAULTS TO: true
+ * - notices: (boolean, optional) issues E_NOTICES for bindings referenced in a
+ *   containable call that are not valid. DEFAULTS TO: true
+ * - autoFields: (boolean, optional) auto-add needed fields to fetch requested
+ *   bindings. DEFAULTS TO: true
+ *
+ * @param object $Model Model using the behavior
+ * @param array $settings Settings to override for model.
+ * @access public
+ */
+	function setup(&$Model, $settings = array()) {
+		if (!isset($this->settings[$Model->alias])) {
+			$this->settings[$Model->alias] = array('recursive' => true, 'notices' => true, 'autoFields' => true);
+		}
+		if (!is_array($settings)) {
+			$settings = array();
+		}
+		$this->settings[$Model->alias] = array_merge($this->settings[$Model->alias], $settings);
+	}
+
+/**
+ * Runs before a find() operation. Used to allow 'contain' setting
+ * as part of the find call, like this:
+ *
+ * `Model->find('all', array('contain' => array('Model1', 'Model2')));`
+ *
+ * {{{
+ * Model->find('all', array('contain' => array(
+ * 	'Model1' => array('Model11', 'Model12'),
+ * 	'Model2',
+ * 	'Model3' => array(
+ * 		'Model31' => 'Model311',
+ * 		'Model32',
+ * 		'Model33' => array('Model331', 'Model332')
+ * )));
+ * }}}
+ *
+ * @param object $Model	Model using the behavior
+ * @param array $query Query parameters as set by cake
+ * @return array
+ * @access public
+ */
+	function beforeFind(&$Model, $query) {
+		$reset = (isset($query['reset']) ? $query['reset'] : true);
+		$noContain = ((isset($this->runtime[$Model->alias]['contain']) && empty($this->runtime[$Model->alias]['contain'])) || (isset($query['contain']) && empty($query['contain'])));
+		$contain = array();
+		if (isset($this->runtime[$Model->alias]['contain'])) {
+			$contain = $this->runtime[$Model->alias]['contain'];
+			unset($this->runtime[$Model->alias]['contain']);
+		}
+		if (isset($query['contain'])) {
+			$contain = array_merge($contain, (array)$query['contain']);
+		}
+		if ($noContain || !$contain || in_array($contain, array(null, false), true) || (isset($contain[0]) && $contain[0] === null)) {
+			if ($noContain) {
+				$query['recursive'] = -1;
+			}
+			return $query;
+		}
+		if ((isset($contain[0]) && is_bool($contain[0])) || is_bool(end($contain))) {
+			$reset = is_bool(end($contain))
+				? array_pop($contain)
+				: array_shift($contain);
+		}
+		$containments = $this->containments($Model, $contain);
+		$map = $this->containmentsMap($containments);
+
+		$mandatory = array();
+		foreach ($containments['models'] as $name => $model) {
+			$instance =& $model['instance'];
+			$needed = $this->fieldDependencies($instance, $map, false);
+			if (!empty($needed)) {
+				$mandatory = array_merge($mandatory, $needed);
+			}
+			if ($contain) {
+				$backupBindings = array();
+				foreach ($this->types as $relation) {
+					if (!empty($instance->__backAssociation[$relation])) {
+						$backupBindings[$relation] = $instance->__backAssociation[$relation];
+					} else {
+						$backupBindings[$relation] = $instance->{$relation};
+					}
+				}
+				foreach ($this->types as $type) {
+					$unbind = array();
+					foreach ($instance->{$type} as $assoc => $options) {
+						if (!isset($model['keep'][$assoc])) {
+							$unbind[] = $assoc;
+						}
+					}
+					if (!empty($unbind)) {
+						if (!$reset && empty($instance->__backOriginalAssociation)) {
+							$instance->__backOriginalAssociation = $backupBindings;
+						} else if ($reset && empty($instance->__backContainableAssociation)) {
+							$instance->__backContainableAssociation = $backupBindings;
+						}
+						$instance->unbindModel(array($type => $unbind), $reset);
+					}
+					foreach ($instance->{$type} as $assoc => $options) {
+						if (isset($model['keep'][$assoc]) && !empty($model['keep'][$assoc])) {
+							if (isset($model['keep'][$assoc]['fields'])) {
+								$model['keep'][$assoc]['fields'] = $this->fieldDependencies($containments['models'][$assoc]['instance'], $map, $model['keep'][$assoc]['fields']);
+							}
+							if (!$reset && empty($instance->__backOriginalAssociation)) {
+								$instance->__backOriginalAssociation = $backupBindings;
+							} else if ($reset) {
+								$instance->__backAssociation[$type] = $backupBindings[$type];
+							}
+							$instance->{$type}[$assoc] = array_merge($instance->{$type}[$assoc], $model['keep'][$assoc]);
+						}
+						if (!$reset) {
+							$instance->__backInnerAssociation[] = $assoc;
+						}
+					}
+				}
+			}
+		}
+
+		if ($this->settings[$Model->alias]['recursive']) {
+			$query['recursive'] = (isset($query['recursive'])) ? $query['recursive'] : $containments['depth'];
+		}
+
+		$autoFields = ($this->settings[$Model->alias]['autoFields']
+					&& !in_array($Model->findQueryType, array('list', 'count'))
+					&& !empty($query['fields']));
+		if (!$autoFields) {
+			return $query;
+		}
+
+		$query['fields'] = (array)$query['fields'];
+		foreach (array('hasOne', 'belongsTo') as $type) {
+			if (!empty($Model->{$type})) {
+				foreach ($Model->{$type} as $assoc => $data) {
+					if ($Model->useDbConfig == $Model->{$assoc}->useDbConfig && !empty($data['fields'])) {
+						foreach ((array) $data['fields'] as $field) {
+							$query['fields'][] = (strpos($field, '.') === false ? $assoc . '.' : '') . $field;
+						}
+					}
+				}
+			}
+		}
+
+		if (!empty($mandatory[$Model->alias])) {
+			foreach ($mandatory[$Model->alias] as $field) {
+				if ($field == '--primaryKey--') {
+					$field = $Model->primaryKey;
+				} else if (preg_match('/^.+\.\-\-[^-]+\-\-$/', $field)) {
+					list($modelName, $field) = explode('.', $field);
+					if ($Model->useDbConfig == $Model->{$modelName}->useDbConfig) {
+						$field = $modelName . '.' . (
+							($field === '--primaryKey--') ? $Model->$modelName->primaryKey : $field
+						);
+					} else {
+						$field = null;
+					}
+				}
+				if ($field !== null) {
+					$query['fields'][] = $field;
+				}
+			}
+		}
+		$query['fields'] = array_unique($query['fields']);
+		return $query;
+	}
+
+/**
+ * Resets original associations on models that may have receive multiple,
+ * subsequent unbindings.
+ *
+ * @param object $Model Model on which we are resetting
+ * @param array $results Results of the find operation
+ * @param bool $primary true if this is the primary model that issued the find operation, false otherwise
+ * @access public
+ */
+	function afterFind(&$Model, $results, $primary) {
+		if (!empty($Model->__backContainableAssociation)) {
+			foreach ($Model->__backContainableAssociation as $relation => $bindings) {
+				$Model->{$relation} = $bindings;
+				unset($Model->__backContainableAssociation);
+			}
+		}
+	}
+
+/**
+ * Unbinds all relations from a model except the specified ones. Calling this function without
+ * parameters unbinds all related models.
+ *
+ * @param object $Model Model on which binding restriction is being applied
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1323/Containable#Using-Containable-1324
+ */
+	function contain(&$Model) {
+		$args = func_get_args();
+		$contain = call_user_func_array('am', array_slice($args, 1));
+		$this->runtime[$Model->alias]['contain'] = $contain;
+	}
+
+/**
+ * Permanently restore the original binding settings of given model, useful
+ * for restoring the bindings after using 'reset' => false as part of the
+ * contain call.
+ *
+ * @param object $Model Model on which to reset bindings
+ * @return void
+ * @access public
+ */
+	function resetBindings(&$Model) {
+		if (!empty($Model->__backOriginalAssociation)) {
+			$Model->__backAssociation = $Model->__backOriginalAssociation;
+			unset($Model->__backOriginalAssociation);
+		}
+		$Model->resetAssociations();
+		if (!empty($Model->__backInnerAssociation)) {
+			$assocs = $Model->__backInnerAssociation;
+			unset($Model->__backInnerAssociation);
+			foreach ($assocs as $currentModel) {
+				$this->resetBindings($Model->$currentModel);
+			}
+		}
+	}
+
+/**
+ * Process containments for model.
+ *
+ * @param object $Model Model on which binding restriction is being applied
+ * @param array $contain Parameters to use for restricting this model
+ * @param array $containments Current set of containments
+ * @param bool $throwErrors Wether unexisting bindings show throw errors
+ * @return array Containments
+ * @access public
+ */
+	function containments(&$Model, $contain, $containments = array(), $throwErrors = null) {
+		$options = array('className', 'joinTable', 'with', 'foreignKey', 'associationForeignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'unique', 'finderQuery', 'deleteQuery', 'insertQuery');
+		$keep = array();
+		$depth = array();
+		if ($throwErrors === null) {
+			$throwErrors = (empty($this->settings[$Model->alias]) ? true : $this->settings[$Model->alias]['notices']);
+		}
+		foreach ((array)$contain as $name => $children) {
+			if (is_numeric($name)) {
+				$name = $children;
+				$children = array();
+			}
+			if (preg_match('/(?<!\.)\(/', $name)) {
+				$name = str_replace('(', '.(', $name);
+			}
+			if (strpos($name, '.') !== false) {
+				$chain = explode('.', $name);
+				$name = array_shift($chain);
+				$children = array(implode('.', $chain) => $children);
+			}
+
+			$children = (array)$children;
+			foreach ($children as $key => $val) {
+				if (is_string($key) && is_string($val) && !in_array($key, $options, true)) {
+					$children[$key] = (array) $val;
+				}
+			}
+
+			$keys = array_keys($children);
+			if ($keys && isset($children[0])) {
+				$keys = array_merge(array_values($children), $keys);
+			}
+
+			foreach ($keys as $i => $key) {
+				if (is_array($key)) {
+					continue;
+				}
+				$optionKey = in_array($key, $options, true);
+				if (!$optionKey && is_string($key) && preg_match('/^[a-z(]/', $key) && (!isset($Model->{$key}) || !is_object($Model->{$key}))) {
+					$option = 'fields';
+					$val = array($key);
+					if ($key{0} == '(') {
+						$val = preg_split('/\s*,\s*/', substr(substr($key, 1), 0, -1));
+					} elseif (preg_match('/ASC|DESC$/', $key)) {
+						$option = 'order';
+						$val = $Model->{$name}->alias.'.'.$key;
+					} elseif (preg_match('/[ =!]/', $key)) {
+						$option = 'conditions';
+						$val = $Model->{$name}->alias.'.'.$key;
+					}
+					$children[$option] = is_array($val) ? $val : array($val);
+					$newChildren = null;
+					if (!empty($name) && !empty($children[$key])) {
+						$newChildren = $children[$key];
+					}
+					unset($children[$key], $children[$i]);
+					$key = $option;
+					$optionKey = true;
+					if (!empty($newChildren)) {
+						$children = Set::merge($children, $newChildren);
+					}
+				}
+				if ($optionKey && isset($children[$key])) {
+					if (!empty($keep[$name][$key]) && is_array($keep[$name][$key])) {
+						$keep[$name][$key] = array_merge((isset($keep[$name][$key]) ? $keep[$name][$key] : array()), (array) $children[$key]);
+					} else {
+						$keep[$name][$key] = $children[$key];
+					}
+					unset($children[$key]);
+				}
+			}
+
+			if (!isset($Model->{$name}) || !is_object($Model->{$name})) {
+				if ($throwErrors) {
+					trigger_error(sprintf(__('Model "%s" is not associated with model "%s"', true), $Model->alias, $name), E_USER_WARNING);
+				}
+				continue;
+			}
+
+			$containments = $this->containments($Model->{$name}, $children, $containments);
+			$depths[] = $containments['depth'] + 1;
+			if (!isset($keep[$name])) {
+				$keep[$name] = array();
+			}
+		}
+
+		if (!isset($containments['models'][$Model->alias])) {
+			$containments['models'][$Model->alias] = array('keep' => array(),'instance' => &$Model);
+		}
+
+		$containments['models'][$Model->alias]['keep'] = array_merge($containments['models'][$Model->alias]['keep'], $keep);
+		$containments['depth'] = empty($depths) ? 0 : max($depths);
+		return $containments;
+	}
+
+/**
+ * Calculate needed fields to fetch the required bindings for the given model.
+ *
+ * @param object $Model Model
+ * @param array $map Map of relations for given model
+ * @param mixed $fields If array, fields to initially load, if false use $Model as primary model
+ * @return array Fields
+ * @access public
+ */
+	function fieldDependencies(&$Model, $map, $fields = array()) {
+		if ($fields === false) {
+			foreach ($map as $parent => $children) {
+				foreach ($children as $type => $bindings) {
+					foreach ($bindings as $dependency) {
+						if ($type == 'hasAndBelongsToMany') {
+							$fields[$parent][] = '--primaryKey--';
+						} else if ($type == 'belongsTo') {
+							$fields[$parent][] = $dependency . '.--primaryKey--';
+						}
+					}
+				}
+			}
+			return $fields;
+		}
+		if (empty($map[$Model->alias])) {
+			return $fields;
+		}
+		foreach ($map[$Model->alias] as $type => $bindings) {
+			foreach ($bindings as $dependency) {
+				$innerFields = array();
+				switch ($type) {
+					case 'belongsTo':
+						$fields[] = $Model->{$type}[$dependency]['foreignKey'];
+						break;
+					case 'hasOne':
+					case 'hasMany':
+						$innerFields[] = $Model->$dependency->primaryKey;
+						$fields[] = $Model->primaryKey;
+						break;
+				}
+				if (!empty($innerFields) && !empty($Model->{$type}[$dependency]['fields'])) {
+					$Model->{$type}[$dependency]['fields'] = array_unique(array_merge($Model->{$type}[$dependency]['fields'], $innerFields));
+				}
+			}
+		}
+		return array_unique($fields);
+	}
+
+/**
+ * Build the map of containments
+ *
+ * @param array $containments Containments
+ * @return array Built containments
+ * @access public
+ */
+	function containmentsMap($containments) {
+		$map = array();
+		foreach ($containments['models'] as $name => $model) {
+			$instance =& $model['instance'];
+			foreach ($this->types as $type) {
+				foreach ($instance->{$type} as $assoc => $options) {
+					if (isset($model['keep'][$assoc])) {
+						$map[$name][$type] = isset($map[$name][$type]) ? array_merge($map[$name][$type], (array)$assoc) : (array)$assoc;
+					}
+				}
+			}
+		}
+		return $map;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/translate.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/translate.php
new file mode 100644
index 000000000..fb2d21709
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/translate.php
@@ -0,0 +1,540 @@
+<?php
+/**
+ * Translate behavior
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.behaviors
+ * @since         CakePHP(tm) v 1.2.0.4525
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Translate behavior
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.behaviors
+ * @link http://book.cakephp.org/view/1328/Translate
+ */
+class TranslateBehavior extends ModelBehavior {
+
+/**
+ * Used for runtime configuration of model
+ * 
+ * @var array
+ */
+	var $runtime = array();
+
+/**
+ * Callback
+ *
+ * $config for TranslateBehavior should be
+ * array( 'fields' => array('field_one',
+ * 'field_two' => 'FieldAssoc', 'field_three'))
+ *
+ * With above example only one permanent hasMany will be joined (for field_two
+ * as FieldAssoc)
+ *
+ * $config could be empty - and translations configured dynamically by
+ * bindTranslation() method
+ *
+ * @param Model $model Model the behavior is being attached to.
+ * @param array $config Array of configuration information.
+ * @return mixed
+ * @access public
+ */
+	function setup(&$model, $config = array()) {
+		$db =& ConnectionManager::getDataSource($model->useDbConfig);
+		if (!$db->connected) {
+			trigger_error(
+				sprintf(__('Datasource %s for TranslateBehavior of model %s is not connected', true), $model->useDbConfig, $model->alias),
+				E_USER_ERROR
+			);
+			return false;
+		}
+
+		$this->settings[$model->alias] = array();
+		$this->runtime[$model->alias] = array('fields' => array());
+		$this->translateModel($model);
+		return $this->bindTranslation($model, $config, false);
+	}
+
+/**
+ * Cleanup Callback unbinds bound translations and deletes setting information.
+ *
+ * @param Model $model Model being detached.
+ * @return void
+ * @access public
+ */
+	function cleanup(&$model) {
+		$this->unbindTranslation($model);
+		unset($this->settings[$model->alias]);
+		unset($this->runtime[$model->alias]);
+	}
+
+/**
+ * beforeFind Callback
+ *
+ * @param Model $model Model find is being run on.
+ * @param array $query Array of Query parameters.
+ * @return array Modified query
+ * @access public
+ */
+	function beforeFind(&$model, $query) {
+		$locale = $this->_getLocale($model);
+		if (empty($locale)) {
+			return $query;
+		}
+		$db =& ConnectionManager::getDataSource($model->useDbConfig);
+		$RuntimeModel =& $this->translateModel($model);
+		if (!empty($RuntimeModel->tablePrefix)) {
+			$tablePrefix = $RuntimeModel->tablePrefix;
+		} else {
+			$tablePrefix = $db->config['prefix'];
+		}
+
+		if (is_string($query['fields']) && 'COUNT(*) AS '.$db->name('count') == $query['fields']) {
+			$query['fields'] = 'COUNT(DISTINCT('.$db->name($model->alias . '.' . $model->primaryKey) . ')) ' . $db->alias . 'count';
+			$query['joins'][] = array(
+				'type' => 'INNER',
+				'alias' => $RuntimeModel->alias,
+				'table' => $db->name($tablePrefix . $RuntimeModel->useTable),
+				'conditions' => array(
+					$model->alias . '.' . $model->primaryKey => $db->identifier($RuntimeModel->alias.'.foreign_key'),
+					$RuntimeModel->alias.'.model' => $model->name,
+					$RuntimeModel->alias.'.locale' => $locale
+				)
+			);
+			return $query;
+		}
+		$autoFields = false;
+
+		if (empty($query['fields'])) {
+			$query['fields'] = array($model->alias.'.*');
+
+			$recursive = $model->recursive;
+			if (isset($query['recursive'])) {
+				$recursive = $query['recursive'];
+			}
+
+			if ($recursive >= 0) {
+				foreach (array('hasOne', 'belongsTo') as $type) {
+					foreach ($model->{$type} as $key => $value) {
+
+						if (empty($value['fields'])) {
+							$query['fields'][] = $key.'.*';
+						} else {
+							foreach ($value['fields'] as $field) {
+								$query['fields'][] = $key.'.'.$field;
+							}
+						}
+					}
+				}
+			}
+			$autoFields = true;
+		}
+		$fields = array_merge($this->settings[$model->alias], $this->runtime[$model->alias]['fields']);
+		$addFields = array();
+		if (is_array($query['fields'])) {
+			foreach ($fields as $key => $value) {
+				$field = (is_numeric($key)) ? $value : $key;
+
+				if (in_array($model->alias.'.*', $query['fields']) || $autoFields || in_array($model->alias.'.'.$field, $query['fields']) || in_array($field, $query['fields'])) {
+					$addFields[] = $field;
+				}
+			}
+		}
+
+		if ($addFields) {
+			foreach ($addFields as $field) {
+				foreach (array($field, $model->alias.'.'.$field) as $_field) {
+					$key = array_search($_field, $query['fields']);
+
+					if ($key !== false) {
+						unset($query['fields'][$key]);
+					}
+				}
+
+				if (is_array($locale)) {
+					foreach ($locale as $_locale) {
+						$query['fields'][] = 'I18n__'.$field.'__'.$_locale.'.content';
+						$query['joins'][] = array(
+							'type' => 'LEFT',
+							'alias' => 'I18n__'.$field.'__'.$_locale,
+							'table' => $db->name($tablePrefix . $RuntimeModel->useTable),
+							'conditions' => array(
+								$model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}__{$_locale}.foreign_key"),
+								'I18n__'.$field.'__'.$_locale.'.model' => $model->name,
+								'I18n__'.$field.'__'.$_locale.'.'.$RuntimeModel->displayField => $field,
+								'I18n__'.$field.'__'.$_locale.'.locale' => $_locale
+							)
+						);
+					}
+				} else {
+					$query['fields'][] = 'I18n__'.$field.'.content';
+					$query['joins'][] = array(
+						'type' => 'LEFT',
+						'alias' => 'I18n__'.$field,
+						'table' => $db->name($tablePrefix . $RuntimeModel->useTable),
+						'conditions' => array(
+							$model->alias . '.' . $model->primaryKey => $db->identifier("I18n__{$field}.foreign_key"),
+							'I18n__'.$field.'.model' => $model->name,
+							'I18n__'.$field.'.'.$RuntimeModel->displayField => $field
+						)
+					);
+
+					if (is_string($query['conditions'])) {
+						$query['conditions'] = $db->conditions($query['conditions'], true, false, $model) . ' AND '.$db->name('I18n__'.$field.'.locale').' = \''.$locale.'\'';
+					} else {
+						$query['conditions'][$db->name("I18n__{$field}.locale")] = $locale;
+					}
+				}
+			}
+		}
+		if (is_array($query['fields'])) {
+			$query['fields'] = array_merge($query['fields']);
+		}
+		$this->runtime[$model->alias]['beforeFind'] = $addFields;
+		return $query;
+	}
+
+/**
+ * afterFind Callback
+ *
+ * @param Model $model Model find was run on
+ * @param array $results Array of model results.
+ * @param boolean $primary Did the find originate on $model.
+ * @return array Modified results
+ * @access public
+ */
+	function afterFind(&$model, $results, $primary) {
+		$this->runtime[$model->alias]['fields'] = array();
+		$locale = $this->_getLocale($model);
+
+		if (empty($locale) || empty($results) || empty($this->runtime[$model->alias]['beforeFind'])) {
+			return $results;
+		}
+		$beforeFind = $this->runtime[$model->alias]['beforeFind'];
+
+		foreach ($results as $key => $row) {
+			$results[$key][$model->alias]['locale'] = (is_array($locale)) ? @$locale[0] : $locale;
+
+			foreach ($beforeFind as $field) {
+				if (is_array($locale)) {
+					foreach ($locale as $_locale) {
+						if (!isset($results[$key][$model->alias][$field]) && !empty($results[$key]['I18n__'.$field.'__'.$_locale]['content'])) {
+							$results[$key][$model->alias][$field] = $results[$key]['I18n__'.$field.'__'.$_locale]['content'];
+						}
+						unset($results[$key]['I18n__'.$field.'__'.$_locale]);
+					}
+
+					if (!isset($results[$key][$model->alias][$field])) {
+						$results[$key][$model->alias][$field] = '';
+					}
+				} else {
+					$value = '';
+					if (!empty($results[$key]['I18n__'.$field]['content'])) {
+						$value = $results[$key]['I18n__'.$field]['content'];
+					}
+					$results[$key][$model->alias][$field] = $value;
+					unset($results[$key]['I18n__'.$field]);
+				}
+			}
+		}
+		return $results;
+	}
+
+/**
+ * beforeValidate Callback
+ *
+ * @param Model $model Model invalidFields was called on.
+ * @return boolean
+ * @access public
+ */
+	function beforeValidate(&$model) {
+		$locale = $this->_getLocale($model);
+		if (empty($locale)) {
+			return true;
+		}
+		$fields = array_merge($this->settings[$model->alias], $this->runtime[$model->alias]['fields']);
+		$tempData = array();
+
+		foreach ($fields as $key => $value) {
+			$field = (is_numeric($key)) ? $value : $key;
+
+			if (isset($model->data[$model->alias][$field])) {
+				$tempData[$field] = $model->data[$model->alias][$field];
+				if (is_array($model->data[$model->alias][$field])) {
+					if (is_string($locale) && !empty($model->data[$model->alias][$field][$locale])) {
+						$model->data[$model->alias][$field] = $model->data[$model->alias][$field][$locale];
+					} else {
+						$values = array_values($model->data[$model->alias][$field]);
+						$model->data[$model->alias][$field] = $values[0];
+					}
+				}
+			}
+		}
+		$this->runtime[$model->alias]['beforeSave'] = $tempData;
+		return true;
+	}
+
+/**
+ * afterSave Callback
+ *
+ * @param Model $model Model the callback is called on
+ * @param boolean $created Whether or not the save created a record.
+ * @return void
+ * @access public
+ */
+	function afterSave(&$model, $created) {
+		if (!isset($this->runtime[$model->alias]['beforeSave'])) {
+			return true;
+		}
+		$locale = $this->_getLocale($model);
+		$tempData = $this->runtime[$model->alias]['beforeSave'];
+		unset($this->runtime[$model->alias]['beforeSave']);
+		$conditions = array('model' => $model->alias, 'foreign_key' => $model->id);
+		$RuntimeModel =& $this->translateModel($model);
+
+		foreach ($tempData as $field => $value) {
+			unset($conditions['content']);
+			$conditions['field'] = $field;
+			if (is_array($value)) {
+				$conditions['locale'] = array_keys($value);
+			} else {
+				$conditions['locale'] = $locale;
+				if (is_array($locale)) {
+					$value = array($locale[0] => $value);
+				} else {
+					$value = array($locale => $value);
+				}
+			}
+			$translations = $RuntimeModel->find('list', array('conditions' => $conditions, 'fields' => array($RuntimeModel->alias . '.locale', $RuntimeModel->alias . '.id')));
+			foreach ($value as $_locale => $_value) {
+				$RuntimeModel->create();
+				$conditions['locale'] = $_locale;
+				$conditions['content'] = $_value;
+				if (array_key_exists($_locale, $translations)) {
+					$RuntimeModel->save(array($RuntimeModel->alias => array_merge($conditions, array('id' => $translations[$_locale]))));
+				} else {
+					$RuntimeModel->save(array($RuntimeModel->alias => $conditions));
+				}
+			}
+		}
+	}
+
+/**
+ * afterDelete Callback
+ *
+ * @param Model $model Model the callback was run on.
+ * @return void
+ * @access public
+ */
+	function afterDelete(&$model) {
+		$RuntimeModel =& $this->translateModel($model);
+		$conditions = array('model' => $model->alias, 'foreign_key' => $model->id);
+		$RuntimeModel->deleteAll($conditions);
+	}
+
+/**
+ * Get selected locale for model
+ *
+ * @param Model $model Model the locale needs to be set/get on.
+ * @return mixed string or false
+ * @access protected
+ */
+	function _getLocale(&$model) {
+		if (!isset($model->locale) || is_null($model->locale)) {
+			if (!class_exists('I18n')) {
+				App::import('Core', 'i18n');
+			}
+			$I18n =& I18n::getInstance();
+			$I18n->l10n->get(Configure::read('Config.language'));
+			$model->locale = $I18n->l10n->locale;
+		}
+
+		return $model->locale;
+	}
+
+/**
+ * Get instance of model for translations.
+ *
+ * If the model has a translateModel property set, this will be used as the class
+ * name to find/use.  If no translateModel property is found 'I18nModel' will be used.
+ *
+ * @param Model $model Model to get a translatemodel for.
+ * @return object
+ * @access public
+ */
+	function &translateModel(&$model) {
+		if (!isset($this->runtime[$model->alias]['model'])) {
+			if (!isset($model->translateModel) || empty($model->translateModel)) {
+				$className = 'I18nModel';
+			} else {
+				$className = $model->translateModel;
+			}
+
+			if (PHP5) {
+				$this->runtime[$model->alias]['model'] = ClassRegistry::init($className, 'Model');
+			} else {
+				$this->runtime[$model->alias]['model'] =& ClassRegistry::init($className, 'Model');
+			}
+		}
+		if (!empty($model->translateTable) && $model->translateTable !== $this->runtime[$model->alias]['model']->useTable) {
+			$this->runtime[$model->alias]['model']->setSource($model->translateTable);
+		} elseif (empty($model->translateTable) && empty($model->translateModel)) {
+			$this->runtime[$model->alias]['model']->setSource('i18n');
+		}
+		$model =& $this->runtime[$model->alias]['model'];
+		return $model;
+	}
+
+/**
+ * Bind translation for fields, optionally with hasMany association for
+ * fake field
+ *
+ * @param object instance of model
+ * @param mixed string with field or array(field1, field2=>AssocName, field3)
+ * @param boolean $reset
+ * @return bool
+ */
+	function bindTranslation(&$model, $fields, $reset = true) {
+		if (is_string($fields)) {
+			$fields = array($fields);
+		}
+		$associations = array();
+		$RuntimeModel =& $this->translateModel($model);
+		$default = array('className' => $RuntimeModel->alias, 'foreignKey' => 'foreign_key');
+
+		foreach ($fields as $key => $value) {
+			if (is_numeric($key)) {
+				$field = $value;
+				$association = null;
+			} else {
+				$field = $key;
+				$association = $value;
+			}
+
+			if (array_key_exists($field, $this->settings[$model->alias])) {
+				unset($this->settings[$model->alias][$field]);
+			} elseif (in_array($field, $this->settings[$model->alias])) {
+				$this->settings[$model->alias] = array_merge(array_diff_assoc($this->settings[$model->alias], array($field)));
+			}
+
+			if (array_key_exists($field, $this->runtime[$model->alias]['fields'])) {
+				unset($this->runtime[$model->alias]['fields'][$field]);
+			} elseif (in_array($field, $this->runtime[$model->alias]['fields'])) {
+				$this->runtime[$model->alias]['fields'] = array_merge(array_diff_assoc($this->runtime[$model->alias]['fields'], array($field)));
+			}
+
+			if (is_null($association)) {
+				if ($reset) {
+					$this->runtime[$model->alias]['fields'][] = $field;
+				} else {
+					$this->settings[$model->alias][] = $field;
+				}
+			} else {
+				if ($reset) {
+					$this->runtime[$model->alias]['fields'][$field] = $association;
+				} else {
+					$this->settings[$model->alias][$field] = $association;
+				}
+
+				foreach (array('hasOne', 'hasMany', 'belongsTo', 'hasAndBelongsToMany') as $type) {
+					if (isset($model->{$type}[$association]) || isset($model->__backAssociation[$type][$association])) {
+						trigger_error(
+							sprintf(__('Association %s is already binded to model %s', true), $association, $model->alias),
+							E_USER_ERROR
+						);
+						return false;
+					}
+				}
+				$associations[$association] = array_merge($default, array('conditions' => array(
+					'model' => $model->alias,
+					$RuntimeModel->displayField => $field
+				)));
+			}
+		}
+
+		if (!empty($associations)) {
+			$model->bindModel(array('hasMany' => $associations), $reset);
+		}
+		return true;
+	}
+
+/**
+ * Unbind translation for fields, optionally unbinds hasMany association for
+ * fake field
+ *
+ * @param object $model instance of model
+ * @param mixed $fields string with field, or array(field1, field2=>AssocName, field3), or null for 
+ *    unbind all original translations
+ * @return bool
+ */
+	function unbindTranslation(&$model, $fields = null) {
+		if (empty($fields) && empty($this->settings[$model->alias])) {
+			return false;
+		}
+		if (empty($fields)) {
+			return $this->unbindTranslation($model, $this->settings[$model->alias]);
+		}
+
+		if (is_string($fields)) {
+			$fields = array($fields);
+		}
+		$RuntimeModel =& $this->translateModel($model);
+		$associations = array();
+
+		foreach ($fields as $key => $value) {
+			if (is_numeric($key)) {
+				$field = $value;
+				$association = null;
+			} else {
+				$field = $key;
+				$association = $value;
+			}
+
+			if (array_key_exists($field, $this->settings[$model->alias])) {
+				unset($this->settings[$model->alias][$field]);
+			} elseif (in_array($field, $this->settings[$model->alias])) {
+				$this->settings[$model->alias] = array_merge(array_diff_assoc($this->settings[$model->alias], array($field)));
+			}
+
+			if (array_key_exists($field, $this->runtime[$model->alias]['fields'])) {
+				unset($this->runtime[$model->alias]['fields'][$field]);
+			} elseif (in_array($field, $this->runtime[$model->alias]['fields'])) {
+				$this->runtime[$model->alias]['fields'] = array_merge(array_diff_assoc($this->runtime[$model->alias]['fields'], array($field)));
+			}
+
+			if (!is_null($association) && (isset($model->hasMany[$association]) || isset($model->__backAssociation['hasMany'][$association]))) {
+				$associations[] = $association;
+			}
+		}
+
+		if (!empty($associations)) {
+			$model->unbindModel(array('hasMany' => $associations), false);
+		}
+		return true;
+	}
+}
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+
+/**
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.behaviors
+ */
+	class I18nModel extends AppModel {
+		var $name = 'I18nModel';
+		var $useTable = 'i18n';
+		var $displayField = 'field';
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/tree.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/tree.php
new file mode 100644
index 000000000..3e631190f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/behaviors/tree.php
@@ -0,0 +1,977 @@
+<?php
+/**
+ * Tree behavior class.
+ *
+ * Enables a model object to act as a node-based tree.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.behaviors
+ * @since         CakePHP v 1.2.0.4487
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Tree Behavior.
+ *
+ * Enables a model object to act as a node-based tree. Using Modified Preorder Tree Traversal
+ *
+ * @see http://en.wikipedia.org/wiki/Tree_traversal
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.behaviors
+ * @link http://book.cakephp.org/view/1339/Tree
+ */
+class TreeBehavior extends ModelBehavior {
+
+/**
+ * Errors
+ *
+ * @var array
+ */
+	var $errors = array();
+
+/**
+ * Defaults
+ *
+ * @var array
+ * @access protected
+ */
+	var $_defaults = array(
+		'parent' => 'parent_id', 'left' => 'lft', 'right' => 'rght',
+		'scope' => '1 = 1', 'type' => 'nested', '__parentChange' => false, 'recursive' => -1
+	);
+
+/**
+ * Initiate Tree behavior
+ *
+ * @param object $Model instance of model
+ * @param array $config array of configuration settings.
+ * @return void
+ * @access public
+ */
+	function setup(&$Model, $config = array()) {
+		if (!is_array($config)) {
+			$config = array('type' => $config);
+		}
+		$settings = array_merge($this->_defaults, $config);
+
+		if (in_array($settings['scope'], $Model->getAssociated('belongsTo'))) {
+			$data = $Model->getAssociated($settings['scope']);
+			$parent =& $Model->{$settings['scope']};
+			$settings['scope'] = $Model->alias . '.' . $data['foreignKey'] . ' = ' . $parent->alias . '.' . $parent->primaryKey;
+			$settings['recursive'] = 0;
+		}
+		$this->settings[$Model->alias] = $settings;
+	}
+
+/**
+ * After save method. Called after all saves
+ *
+ * Overriden to transparently manage setting the lft and rght fields if and only if the parent field is included in the
+ * parameters to be saved.
+ *
+ * @param AppModel $Model Model instance.
+ * @param boolean $created indicates whether the node just saved was created or updated
+ * @return boolean true on success, false on failure
+ * @access public
+ */
+	function afterSave(&$Model, $created) {
+		extract($this->settings[$Model->alias]);
+		if ($created) {
+			if ((isset($Model->data[$Model->alias][$parent])) && $Model->data[$Model->alias][$parent]) {
+				return $this->_setParent($Model, $Model->data[$Model->alias][$parent], $created);
+			}
+		} elseif ($__parentChange) {
+			$this->settings[$Model->alias]['__parentChange'] = false;
+			return $this->_setParent($Model, $Model->data[$Model->alias][$parent]);
+		}
+	}
+
+/**
+ * Before delete method. Called before all deletes
+ *
+ * Will delete the current node and all children using the deleteAll method and sync the table
+ *
+ * @param AppModel $Model Model instance
+ * @return boolean true to continue, false to abort the delete
+ * @access public
+ */
+	function beforeDelete(&$Model) {
+		extract($this->settings[$Model->alias]);
+		list($name, $data) = array($Model->alias, $Model->read());
+		$data = $data[$name];
+
+		if (!$data[$right] || !$data[$left]) {
+			return true;
+		}
+		$diff = $data[$right] - $data[$left] + 1;
+
+		if ($diff > 2) {
+			if (is_string($scope)) {
+				$scope = array($scope);
+			}
+			$scope[]["{$Model->alias}.{$left} BETWEEN ? AND ?"] = array($data[$left] + 1, $data[$right] - 1);
+			$Model->deleteAll($scope);
+		}
+		$this->__sync($Model, $diff, '-', '> ' . $data[$right]);
+		return true;
+	}
+
+/**
+ * Before save method. Called before all saves
+ *
+ * Overriden to transparently manage setting the lft and rght fields if and only if the parent field is included in the
+ * parameters to be saved. For newly created nodes with NO parent the left and right field values are set directly by
+ * this method bypassing the setParent logic.
+ *
+ * @since         1.2
+ * @param AppModel $Model Model instance
+ * @return boolean true to continue, false to abort the save
+ * @access public
+ */
+	function beforeSave(&$Model) {
+		extract($this->settings[$Model->alias]);
+
+		$this->_addToWhitelist($Model, array($left, $right));
+		if (!$Model->id) {
+			if (array_key_exists($parent, $Model->data[$Model->alias]) && $Model->data[$Model->alias][$parent]) {
+				$parentNode = $Model->find('first', array(
+					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
+					'fields' => array($Model->primaryKey, $right), 'recursive' => $recursive
+				));
+				if (!$parentNode) {
+					return false;
+				}
+				list($parentNode) = array_values($parentNode);
+				$Model->data[$Model->alias][$left] = 0; //$parentNode[$right];
+				$Model->data[$Model->alias][$right] = 0; //$parentNode[$right] + 1;
+			} else {
+				$edge = $this->__getMax($Model, $scope, $right, $recursive);
+				$Model->data[$Model->alias][$left] = $edge + 1;
+				$Model->data[$Model->alias][$right] = $edge + 2;
+			}
+		} elseif (array_key_exists($parent, $Model->data[$Model->alias])) {
+			if ($Model->data[$Model->alias][$parent] != $Model->field($parent)) {
+				$this->settings[$Model->alias]['__parentChange'] = true;
+			}
+			if (!$Model->data[$Model->alias][$parent]) {
+				$Model->data[$Model->alias][$parent] = null;
+				$this->_addToWhitelist($Model, $parent);
+			} else {
+				$values = $Model->find('first', array(
+					'conditions' => array($scope,$Model->escapeField() => $Model->id),
+					'fields' => array($Model->primaryKey, $parent, $left, $right ), 'recursive' => $recursive)
+				);
+
+				if ($values === false) {
+					return false;
+				}
+				list($node) = array_values($values);
+
+				$parentNode = $Model->find('first', array(
+					'conditions' => array($scope, $Model->escapeField() => $Model->data[$Model->alias][$parent]),
+					'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
+				));
+				if (!$parentNode) {
+					return false;
+				}
+				list($parentNode) = array_values($parentNode);
+
+				if (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) {
+					return false;
+				} elseif ($node[$Model->primaryKey] == $parentNode[$Model->primaryKey]) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Get the number of child nodes
+ *
+ * If the direct parameter is set to true, only the direct children are counted (based upon the parent_id field)
+ * If false is passed for the id parameter, all top level nodes are counted, or all nodes are counted.
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $id The ID of the record to read or false to read all top level nodes
+ * @param boolean $direct whether to count direct, or all, children
+ * @return integer number of child nodes
+ * @access public
+ * @link http://book.cakephp.org/view/1347/Counting-children
+ */
+	function childcount(&$Model, $id = null, $direct = false) {
+		if (is_array($id)) {
+			extract (array_merge(array('id' => null), $id));
+		}
+		if ($id === null && $Model->id) {
+			$id = $Model->id;
+		} elseif (!$id) {
+			$id = null;
+		}
+		extract($this->settings[$Model->alias]);
+
+		if ($direct) {
+			return $Model->find('count', array('conditions' => array($scope, $Model->escapeField($parent) => $id)));
+		}
+
+		if ($id === null) {
+			return $Model->find('count', array('conditions' => $scope));
+		} elseif (isset($Model->data[$Model->alias][$left]) && isset($Model->data[$Model->alias][$right])) {
+			$data = $Model->data[$Model->alias];
+		} else {
+			$data = $Model->find('first', array('conditions' => array($scope, $Model->escapeField() => $id), 'recursive' => $recursive));
+			if (!$data) {
+				return 0;
+			}
+			$data = $data[$Model->alias];
+		}
+		return ($data[$right] - $data[$left] - 1) / 2;
+	}
+
+/**
+ * Get the child nodes of the current model
+ *
+ * If the direct parameter is set to true, only the direct children are returned (based upon the parent_id field)
+ * If false is passed for the id parameter, top level, or all (depending on direct parameter appropriate) are counted.
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $id The ID of the record to read
+ * @param boolean $direct whether to return only the direct, or all, children
+ * @param mixed $fields Either a single string of a field name, or an array of field names
+ * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC") defaults to the tree order
+ * @param integer $limit SQL LIMIT clause, for calculating items per page.
+ * @param integer $page Page number, for accessing paged data
+ * @param integer $recursive The number of levels deep to fetch associated records
+ * @return array Array of child nodes
+ * @access public
+ * @link http://book.cakephp.org/view/1346/Children
+ */
+	function children(&$Model, $id = null, $direct = false, $fields = null, $order = null, $limit = null, $page = 1, $recursive = null) {
+		if (is_array($id)) {
+			extract (array_merge(array('id' => null), $id));
+		}
+		$overrideRecursive = $recursive;
+
+		if ($id === null && $Model->id) {
+			$id = $Model->id;
+		} elseif (!$id) {
+			$id = null;
+		}
+		$name = $Model->alias;
+		extract($this->settings[$Model->alias]);
+
+		if (!is_null($overrideRecursive)) {
+			$recursive = $overrideRecursive;
+		}
+		if (!$order) {
+			$order = $Model->alias . '.' . $left . ' asc';
+		}
+		if ($direct) {
+			$conditions = array($scope, $Model->escapeField($parent) => $id);
+			return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+		}
+
+		if (!$id) {
+			$conditions = $scope;
+		} else {
+			$result = array_values((array)$Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $id),
+				'fields' => array($left, $right),
+				'recursive' => $recursive
+			)));
+
+			if (empty($result) || !isset($result[0])) {
+				return array();
+			}
+			$conditions = array($scope,
+				$Model->escapeField($right) . ' <' => $result[0][$right],
+				$Model->escapeField($left) . ' >' => $result[0][$left]
+			);
+		}
+		return $Model->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+	}
+
+/**
+ * A convenience method for returning a hierarchical array used for HTML select boxes
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $conditions SQL conditions as a string or as an array('field' =>'value',...)
+ * @param string $keyPath A string path to the key, i.e. "{n}.Post.id"
+ * @param string $valuePath A string path to the value, i.e. "{n}.Post.title"
+ * @param string $spacer The character or characters which will be repeated
+ * @param integer $recursive The number of levels deep to fetch associated records
+ * @return array An associative array of records, where the id is the key, and the display field is the value
+ * @access public
+ * @link http://book.cakephp.org/view/1348/generatetreelist
+ */
+	function generatetreelist(&$Model, $conditions = null, $keyPath = null, $valuePath = null, $spacer = '_', $recursive = null) {
+		$overrideRecursive = $recursive;
+		extract($this->settings[$Model->alias]);
+		if (!is_null($overrideRecursive)) {
+			$recursive = $overrideRecursive;
+		}
+
+		if ($keyPath == null && $valuePath == null && $Model->hasField($Model->displayField)) {
+			$fields = array($Model->primaryKey, $Model->displayField, $left, $right);
+		} else {
+			$fields = null;
+		}
+
+		if ($keyPath == null) {
+			$keyPath = '{n}.' . $Model->alias . '.' . $Model->primaryKey;
+		}
+
+		if ($valuePath == null) {
+			$valuePath = array('{0}{1}', '{n}.tree_prefix', '{n}.' . $Model->alias . '.' . $Model->displayField);
+
+		} elseif (is_string($valuePath)) {
+			$valuePath = array('{0}{1}', '{n}.tree_prefix', $valuePath);
+
+		} else {
+			$valuePath[0] = '{' . (count($valuePath) - 1) . '}' . $valuePath[0];
+			$valuePath[] = '{n}.tree_prefix';
+		}
+		$order = $Model->alias . '.' . $left . ' asc';
+		$results = $Model->find('all', compact('conditions', 'fields', 'order', 'recursive'));
+		$stack = array();
+
+		foreach ($results as $i => $result) {
+			while ($stack && ($stack[count($stack) - 1] < $result[$Model->alias][$right])) {
+				array_pop($stack);
+			}
+			$results[$i]['tree_prefix'] = str_repeat($spacer,count($stack));
+			$stack[] = $result[$Model->alias][$right];
+		}
+		if (empty($results)) {
+			return array();
+		}
+		return Set::combine($results, $keyPath, $valuePath);
+	}
+
+/**
+ * Get the parent node
+ *
+ * reads the parent id and returns this node
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $id The ID of the record to read
+ * @param integer $recursive The number of levels deep to fetch associated records
+ * @return array Array of data for the parent node
+ * @access public
+ * @link http://book.cakephp.org/view/1349/getparentnode
+ */
+	function getparentnode(&$Model, $id = null, $fields = null, $recursive = null) {
+		if (is_array($id)) {
+			extract (array_merge(array('id' => null), $id));
+		}
+		$overrideRecursive = $recursive;
+		if (empty ($id)) {
+			$id = $Model->id;
+		}
+		extract($this->settings[$Model->alias]);
+		if (!is_null($overrideRecursive)) {
+			$recursive = $overrideRecursive;
+		}
+		$parentId = $Model->find('first', array('conditions' => array($Model->primaryKey => $id), 'fields' => array($parent), 'recursive' => -1));
+
+		if ($parentId) {
+			$parentId = $parentId[$Model->alias][$parent];
+			$parent = $Model->find('first', array('conditions' => array($Model->escapeField() => $parentId), 'fields' => $fields, 'recursive' => $recursive));
+
+			return $parent;
+		}
+		return false;
+	}
+
+/**
+ * Get the path to the given node
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $id The ID of the record to read
+ * @param mixed $fields Either a single string of a field name, or an array of field names
+ * @param integer $recursive The number of levels deep to fetch associated records
+ * @return array Array of nodes from top most parent to current node
+ * @access public
+ * @link http://book.cakephp.org/view/1350/getpath
+ */
+	function getpath(&$Model, $id = null, $fields = null, $recursive = null) {
+		if (is_array($id)) {
+			extract (array_merge(array('id' => null), $id));
+		}
+		$overrideRecursive = $recursive;
+		if (empty ($id)) {
+			$id = $Model->id;
+		}
+		extract($this->settings[$Model->alias]);
+		if (!is_null($overrideRecursive)) {
+			$recursive = $overrideRecursive;
+		}
+		$result = $Model->find('first', array('conditions' => array($Model->escapeField() => $id), 'fields' => array($left, $right), 'recursive' => $recursive));
+		if ($result) {
+			$result = array_values($result);
+		} else {
+			return null;
+		}
+		$item = $result[0];
+		$results = $Model->find('all', array(
+			'conditions' => array($scope, $Model->escapeField($left) . ' <=' => $item[$left], $Model->escapeField($right) . ' >=' => $item[$right]),
+			'fields' => $fields, 'order' => array($Model->escapeField($left) => 'asc'), 'recursive' => $recursive
+		));
+		return $results;
+	}
+
+/**
+ * Reorder the node without changing the parent.
+ *
+ * If the node is the last child, or is a top level node with no subsequent node this method will return false
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $id The ID of the record to move
+ * @param int|bool $number how many places to move the node or true to move to last position
+ * @return boolean true on success, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1352/moveDown
+ */
+	function movedown(&$Model, $id = null, $number = 1) {
+		if (is_array($id)) {
+			extract (array_merge(array('id' => null), $id));
+		}
+		if (!$number) {
+			return false;
+		}
+		if (empty ($id)) {
+			$id = $Model->id;
+		}
+		extract($this->settings[$Model->alias]);
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $id),
+			'fields' => array($Model->primaryKey, $left, $right, $parent), 'recursive' => $recursive
+		)));
+		if ($node[$parent]) {
+			list($parentNode) = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
+				'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
+			)));
+			if (($node[$right] + 1) == $parentNode[$right]) {
+				return false;
+			}
+		}
+		$nextNode = $Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField($left) => ($node[$right] + 1)),
+			'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive)
+		);
+		if ($nextNode) {
+			list($nextNode) = array_values($nextNode);
+		} else {
+			return false;
+		}
+		$edge = $this->__getMax($Model, $scope, $right, $recursive);
+		$this->__sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right]);
+		$this->__sync($Model, $nextNode[$left] - $node[$left], '-', 'BETWEEN ' . $nextNode[$left] . ' AND ' . $nextNode[$right]);
+		$this->__sync($Model, $edge - $node[$left] - ($nextNode[$right] - $nextNode[$left]), '-', '> ' . $edge);
+
+		if (is_int($number)) {
+			$number--;
+		}
+		if ($number) {
+			$this->moveDown($Model, $id, $number);
+		}
+		return true;
+	}
+
+/**
+ * Reorder the node without changing the parent.
+ *
+ * If the node is the first child, or is a top level node with no previous node this method will return false
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $id The ID of the record to move
+ * @param int|bool $number how many places to move the node, or true to move to first position
+ * @return boolean true on success, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1353/moveUp
+ */
+	function moveup(&$Model, $id = null, $number = 1) {
+		if (is_array($id)) {
+			extract (array_merge(array('id' => null), $id));
+		}
+		if (!$number) {
+			return false;
+		}
+		if (empty ($id)) {
+			$id = $Model->id;
+		}
+		extract($this->settings[$Model->alias]);
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $id),
+			'fields' => array($Model->primaryKey, $left, $right, $parent ), 'recursive' => $recursive
+		)));
+		if ($node[$parent]) {
+			list($parentNode) = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
+				'fields' => array($Model->primaryKey, $left, $right), 'recursive' => $recursive
+			)));
+			if (($node[$left] - 1) == $parentNode[$left]) {
+				return false;
+			}
+		}
+		$previousNode = $Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField($right) => ($node[$left] - 1)),
+			'fields' => array($Model->primaryKey, $left, $right),
+			'recursive' => $recursive
+		));
+
+		if ($previousNode) {
+			list($previousNode) = array_values($previousNode);
+		} else {
+			return false;
+		}
+		$edge = $this->__getMax($Model, $scope, $right, $recursive);
+		$this->__sync($Model, $edge - $previousNode[$left] +1, '+', 'BETWEEN ' . $previousNode[$left] . ' AND ' . $previousNode[$right]);
+		$this->__sync($Model, $node[$left] - $previousNode[$left], '-', 'BETWEEN ' .$node[$left] . ' AND ' . $node[$right]);
+		$this->__sync($Model, $edge - $previousNode[$left] - ($node[$right] - $node[$left]), '-', '> ' . $edge);
+		if (is_int($number)) {
+			$number--;
+		}
+		if ($number) {
+			$this->moveUp($Model, $id, $number);
+		}
+		return true;
+	}
+
+/**
+ * Recover a corrupted tree
+ *
+ * The mode parameter is used to specify the source of info that is valid/correct. The opposite source of data
+ * will be populated based upon that source of info. E.g. if the MPTT fields are corrupt or empty, with the $mode
+ * 'parent' the values of the parent_id field will be used to populate the left and right fields. The missingParentAction
+ * parameter only applies to "parent" mode and determines what to do if the parent field contains an id that is not present.
+ *
+ * @todo Could be written to be faster, *maybe*. Ideally using a subquery and putting all the logic burden on the DB.
+ * @param AppModel $Model Model instance
+ * @param string $mode parent or tree
+ * @param mixed $missingParentAction 'return' to do nothing and return, 'delete' to
+ * delete, or the id of the parent to set as the parent_id
+ * @return boolean true on success, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1628/Recover
+ */
+	function recover(&$Model, $mode = 'parent', $missingParentAction = null) {
+		if (is_array($mode)) {
+			extract (array_merge(array('mode' => 'parent'), $mode));
+		}
+		extract($this->settings[$Model->alias]);
+		$Model->recursive = $recursive;
+		if ($mode == 'parent') {
+			$Model->bindModel(array('belongsTo' => array('VerifyParent' => array(
+				'className' => $Model->alias,
+				'foreignKey' => $parent,
+				'fields' => array($Model->primaryKey, $left, $right, $parent),
+			))));
+			$missingParents = $Model->find('list', array(
+				'recursive' => 0,
+				'conditions' => array($scope, array(
+					'NOT' => array($Model->escapeField($parent) => null), $Model->VerifyParent->escapeField() => null
+				))
+			));
+			$Model->unbindModel(array('belongsTo' => array('VerifyParent')));
+			if ($missingParents) {
+				if ($missingParentAction == 'return') {
+					foreach ($missingParents as $id => $display) {
+						$this->errors[]	= 'cannot find the parent for ' . $Model->alias . ' with id ' . $id . '(' . $display . ')';
+
+					}
+					return false;
+				} elseif ($missingParentAction == 'delete') {
+					$Model->deleteAll(array($Model->primaryKey => array_flip($missingParents)));
+				} else {
+					$Model->updateAll(array($parent => $missingParentAction), array($Model->escapeField($Model->primaryKey) => array_flip($missingParents)));
+				}
+			}
+			$count = 1;
+			foreach ($Model->find('all', array('conditions' => $scope, 'fields' => array($Model->primaryKey), 'order' => $left)) as $array) {
+				$Model->id = $array[$Model->alias][$Model->primaryKey];
+				$lft = $count++;
+				$rght = $count++;
+				$Model->save(array($left => $lft, $right => $rght), array('callbacks' => false));
+			}
+			foreach ($Model->find('all', array('conditions' => $scope, 'fields' => array($Model->primaryKey, $parent), 'order' => $left)) as $array) {
+				$Model->create();
+				$Model->id = $array[$Model->alias][$Model->primaryKey];
+				$this->_setParent($Model, $array[$Model->alias][$parent]);
+			}
+		} else {
+			$db =& ConnectionManager::getDataSource($Model->useDbConfig);
+			foreach ($Model->find('all', array('conditions' => $scope, 'fields' => array($Model->primaryKey, $parent), 'order' => $left)) as $array) {
+				$path = $this->getpath($Model, $array[$Model->alias][$Model->primaryKey]);
+				if ($path == null || count($path) < 2) {
+					$parentId = null;
+				} else {
+					$parentId = $path[count($path) - 2][$Model->alias][$Model->primaryKey];
+				}
+				$Model->updateAll(array($parent => $db->value($parentId, $parent)), array($Model->escapeField() => $array[$Model->alias][$Model->primaryKey]));
+			}
+		}
+		return true;
+	}
+
+/**
+ * Reorder method.
+ *
+ * Reorders the nodes (and child nodes) of the tree according to the field and direction specified in the parameters.
+ * This method does not change the parent of any node.
+ *
+ * Requires a valid tree, by default it verifies the tree before beginning.
+ *
+ * Options:
+ *
+ * - 'id' id of record to use as top node for reordering
+ * - 'field' Which field to use in reordeing defaults to displayField
+ * - 'order' Direction to order either DESC or ASC (defaults to ASC)
+ * - 'verify' Whether or not to verify the tree before reorder. defaults to true.
+ *
+ * @param AppModel $Model Model instance
+ * @param array $options array of options to use in reordering.
+ * @return boolean true on success, false on failure
+ * @link http://book.cakephp.org/view/1355/reorder
+ * @link http://book.cakephp.org/view/1629/Reorder
+ */
+	function reorder(&$Model, $options = array()) {
+		$options = array_merge(array('id' => null, 'field' => $Model->displayField, 'order' => 'ASC', 'verify' => true), $options);
+		extract($options);
+		if ($verify && !$this->verify($Model)) {
+			return false;
+		}
+		$verify = false;
+		extract($this->settings[$Model->alias]);
+		$fields = array($Model->primaryKey, $field, $left, $right);
+		$sort = $field . ' ' . $order;
+		$nodes = $this->children($Model, $id, true, $fields, $sort, null, null, $recursive);
+
+		$cacheQueries = $Model->cacheQueries;
+		$Model->cacheQueries = false;
+		if ($nodes) {
+			foreach ($nodes as $node) {
+				$id = $node[$Model->alias][$Model->primaryKey];
+				$this->moveDown($Model, $id, true);
+				if ($node[$Model->alias][$left] != $node[$Model->alias][$right] - 1) {
+					$this->reorder($Model, compact('id', 'field', 'order', 'verify'));
+				}
+			}
+		}
+		$Model->cacheQueries = $cacheQueries;
+		return true;
+	}
+
+/**
+ * Remove the current node from the tree, and reparent all children up one level.
+ *
+ * If the parameter delete is false, the node will become a new top level node. Otherwise the node will be deleted
+ * after the children are reparented.
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $id The ID of the record to remove
+ * @param boolean $delete whether to delete the node after reparenting children (if any)
+ * @return boolean true on success, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1354/removeFromTree
+ */
+	function removefromtree(&$Model, $id = null, $delete = false) {
+		if (is_array($id)) {
+			extract (array_merge(array('id' => null), $id));
+		}
+		extract($this->settings[$Model->alias]);
+
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $id),
+			'fields' => array($Model->primaryKey, $left, $right, $parent),
+			'recursive' => $recursive
+		)));
+
+		if ($node[$right] == $node[$left] + 1) {
+			if ($delete) {
+				return $Model->delete($id);
+			} else {
+				$Model->id = $id;
+				return $Model->saveField($parent, null);
+			}
+		} elseif ($node[$parent]) {
+			list($parentNode) = array_values($Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $node[$parent]),
+				'fields' => array($Model->primaryKey, $left, $right),
+				'recursive' => $recursive
+			)));
+		} else {
+			$parentNode[$right] = $node[$right] + 1;
+		}
+
+		$db =& ConnectionManager::getDataSource($Model->useDbConfig);
+		$Model->updateAll(
+			array($parent => $db->value($node[$parent], $parent)), 
+			array($Model->escapeField($parent) => $node[$Model->primaryKey])
+		);
+		$this->__sync($Model, 1, '-', 'BETWEEN ' . ($node[$left] + 1) . ' AND ' . ($node[$right] - 1));
+		$this->__sync($Model, 2, '-', '> ' . ($node[$right]));
+		$Model->id = $id;
+
+		if ($delete) {
+			$Model->updateAll(
+				array(
+					$Model->escapeField($left) => 0,
+					$Model->escapeField($right) => 0,
+					$Model->escapeField($parent) => null
+				),
+				array($Model->escapeField() => $id)
+			);
+			return $Model->delete($id);
+		} else {
+			$edge = $this->__getMax($Model, $scope, $right, $recursive);
+			if ($node[$right] == $edge) {
+				$edge = $edge - 2;
+			}
+			$Model->id = $id;
+			return $Model->save(
+				array($left => $edge + 1, $right => $edge + 2, $parent => null),
+				array('callbacks' => false)
+			);
+		}
+	}
+
+/**
+ * Check if the current tree is valid.
+ *
+ * Returns true if the tree is valid otherwise an array of (type, incorrect left/right index, message)
+ *
+ * @param AppModel $Model Model instance
+ * @return mixed true if the tree is valid or empty, otherwise an array of (error type [index, node],
+ *  [incorrect left/right index,node id], message)
+ * @access public
+ * @link http://book.cakephp.org/view/1630/Verify
+ */
+	function verify(&$Model) {
+		extract($this->settings[$Model->alias]);
+		if (!$Model->find('count', array('conditions' => $scope))) {
+			return true;
+		}
+		$min = $this->__getMin($Model, $scope, $left, $recursive);
+		$edge = $this->__getMax($Model, $scope, $right, $recursive);
+		$errors =  array();
+
+		for ($i = $min; $i <= $edge; $i++) {
+			$count = $Model->find('count', array('conditions' => array(
+				$scope, 'OR' => array($Model->escapeField($left) => $i, $Model->escapeField($right) => $i)
+			)));
+			if ($count != 1) {
+				if ($count == 0) {
+					$errors[] = array('index', $i, 'missing');
+				} else {
+					$errors[] = array('index', $i, 'duplicate');
+				}
+			}
+		}
+		$node = $Model->find('first', array('conditions' => array($scope, $Model->escapeField($right) . '< ' . $Model->escapeField($left)), 'recursive' => 0));
+		if ($node) {
+			$errors[] = array('node', $node[$Model->alias][$Model->primaryKey], 'left greater than right.');
+		}
+
+		$Model->bindModel(array('belongsTo' => array('VerifyParent' => array(
+			'className' => $Model->alias,
+			'foreignKey' => $parent,
+			'fields' => array($Model->primaryKey, $left, $right, $parent)
+		))));
+
+		foreach ($Model->find('all', array('conditions' => $scope, 'recursive' => 0)) as $instance) {
+			if (is_null($instance[$Model->alias][$left]) || is_null($instance[$Model->alias][$right])) {
+				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+					'has invalid left or right values');
+			} elseif ($instance[$Model->alias][$left] == $instance[$Model->alias][$right]) {
+				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+					'left and right values identical');
+			} elseif ($instance[$Model->alias][$parent]) {
+				if (!$instance['VerifyParent'][$Model->primaryKey]) {
+					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+						'The parent node ' . $instance[$Model->alias][$parent] . ' doesn\'t exist');
+				} elseif ($instance[$Model->alias][$left] < $instance['VerifyParent'][$left]) {
+					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+						'left less than parent (node ' . $instance['VerifyParent'][$Model->primaryKey] . ').');
+				} elseif ($instance[$Model->alias][$right] > $instance['VerifyParent'][$right]) {
+					$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey],
+						'right greater than parent (node ' . $instance['VerifyParent'][$Model->primaryKey] . ').');
+				}
+			} elseif ($Model->find('count', array('conditions' => array($scope, $Model->escapeField($left) . ' <' => $instance[$Model->alias][$left], $Model->escapeField($right) . ' >' => $instance[$Model->alias][$right]), 'recursive' => 0))) {
+				$errors[] = array('node', $instance[$Model->alias][$Model->primaryKey], 'The parent field is blank, but has a parent');
+			}
+		}
+		if ($errors) {
+			return $errors;
+		}
+		return true;
+	}
+
+/**
+ * Sets the parent of the given node
+ *
+ * The force parameter is used to override the "don't change the parent to the current parent" logic in the event
+ * of recovering a corrupted table, or creating new nodes. Otherwise it should always be false. In reality this
+ * method could be private, since calling save with parent_id set also calls setParent
+ *
+ * @param AppModel $Model Model instance
+ * @param mixed $parentId
+ * @return boolean true on success, false on failure
+ * @access protected
+ */
+	function _setParent(&$Model, $parentId = null, $created = false) {
+		extract($this->settings[$Model->alias]);
+		list($node) = array_values($Model->find('first', array(
+			'conditions' => array($scope, $Model->escapeField() => $Model->id),
+			'fields' => array($Model->primaryKey, $parent, $left, $right),
+			'recursive' => $recursive
+		)));
+		$edge = $this->__getMax($Model, $scope, $right, $recursive, $created);
+
+		if (empty ($parentId)) {
+			$this->__sync($Model, $edge - $node[$left] + 1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
+			$this->__sync($Model, $node[$right] - $node[$left] + 1, '-', '> ' . $node[$left], $created);
+		} else {
+			$values = $Model->find('first', array(
+				'conditions' => array($scope, $Model->escapeField() => $parentId),
+				'fields' => array($Model->primaryKey, $left, $right),
+				'recursive' => $recursive
+			));
+
+			if ($values === false) {
+				return false;
+			}
+			$parentNode = array_values($values);
+
+			if (empty($parentNode) || empty($parentNode[0])) {
+				return false;
+			}
+			$parentNode = $parentNode[0];
+
+			if (($Model->id == $parentId)) {
+				return false;
+
+			} elseif (($node[$left] < $parentNode[$left]) && ($parentNode[$right] < $node[$right])) {
+				return false;
+			}
+			if (empty ($node[$left]) && empty ($node[$right])) {
+				$this->__sync($Model, 2, '+', '>= ' . $parentNode[$right], $created);
+				$result = $Model->save(
+					array($left => $parentNode[$right], $right => $parentNode[$right] + 1, $parent => $parentId),
+					array('validate' => false, 'callbacks' => false)
+				);
+				$Model->data = $result;
+			} else {
+				$this->__sync($Model, $edge - $node[$left] +1, '+', 'BETWEEN ' . $node[$left] . ' AND ' . $node[$right], $created);
+				$diff = $node[$right] - $node[$left] + 1;
+
+				if ($node[$left] > $parentNode[$left]) {
+					if ($node[$right] < $parentNode[$right]) {
+						$this->__sync($Model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
+						$this->__sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
+					} else {
+						$this->__sync($Model, $diff, '+', 'BETWEEN ' . $parentNode[$right] . ' AND ' . $node[$right], $created);
+						$this->__sync($Model, $edge - $parentNode[$right] + 1, '-', '> ' . $edge, $created);
+					}
+				} else {
+					$this->__sync($Model, $diff, '-', 'BETWEEN ' . $node[$right] . ' AND ' . ($parentNode[$right] - 1), $created);
+					$this->__sync($Model, $edge - $parentNode[$right] + $diff + 1, '-', '> ' . $edge, $created);
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * get the maximum index value in the table.
+ *
+ * @param AppModel $Model
+ * @param string $scope
+ * @param string $right
+ * @return int
+ * @access private
+ */
+	function __getMax($Model, $scope, $right, $recursive = -1, $created = false) {
+		$db =& ConnectionManager::getDataSource($Model->useDbConfig);
+		if ($created) {
+			if (is_string($scope)) {
+				$scope .= " AND {$Model->alias}.{$Model->primaryKey} <> ";
+				$scope .= $db->value($Model->id, $Model->getColumnType($Model->primaryKey));
+			} else {
+				$scope['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id;
+			}
+		}
+		$name = $Model->alias . '.' . $right;
+		list($edge) = array_values($Model->find('first', array(
+			'conditions' => $scope,
+			'fields' => $db->calculate($Model, 'max', array($name, $right)),
+			'recursive' => $recursive
+		)));
+		return (empty($edge[$right])) ? 0 : $edge[$right];
+	}
+
+/**
+ * get the minimum index value in the table.
+ *
+ * @param AppModel $Model
+ * @param string $scope
+ * @param string $right
+ * @return int
+ * @access private
+ */
+	function __getMin($Model, $scope, $left, $recursive = -1) {
+		$db =& ConnectionManager::getDataSource($Model->useDbConfig);
+		$name = $Model->alias . '.' . $left;
+		list($edge) = array_values($Model->find('first', array(
+			'conditions' => $scope,
+			'fields' => $db->calculate($Model, 'min', array($name, $left)),
+			'recursive' => $recursive
+		)));
+		return (empty($edge[$left])) ? 0 : $edge[$left];
+	}
+
+/**
+ * Table sync method.
+ *
+ * Handles table sync operations, Taking account of the behavior scope.
+ *
+ * @param AppModel $Model
+ * @param integer $shift
+ * @param string $direction
+ * @param array $conditions
+ * @param string $field
+ * @access private
+ */
+	function __sync(&$Model, $shift, $dir = '+', $conditions = array(), $created = false, $field = 'both') {
+		$ModelRecursive = $Model->recursive;
+		extract($this->settings[$Model->alias]);
+		$Model->recursive = $recursive;
+
+		if ($field == 'both') {
+			$this->__sync($Model, $shift, $dir, $conditions, $created, $left);
+			$field = $right;
+		}
+		if (is_string($conditions)) {
+			$conditions = array("{$Model->alias}.{$field} {$conditions}");
+		}
+		if (($scope != '1 = 1' && $scope !== true) && $scope) {
+			$conditions[] = $scope;
+		}
+		if ($created) {
+			$conditions['NOT'][$Model->alias . '.' . $Model->primaryKey] = $Model->id;
+		}
+		$Model->updateAll(array($Model->alias . '.' . $field => $Model->escapeField($field) . ' ' . $dir . ' ' . $shift), $conditions);
+		$Model->recursive = $ModelRecursive;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/cake_schema.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/cake_schema.php
new file mode 100644
index 000000000..4acf9a18d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/cake_schema.php
@@ -0,0 +1,698 @@
+<?php
+/**
+ * Schema database management for CakePHP.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 1.2.0.5550
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('Model', 'ConnectionManager'));
+
+/**
+ * Base Class for Schema management
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class CakeSchema extends Object {
+
+/**
+ * Name of the App Schema
+ *
+ * @var string
+ * @access public
+ */
+	var $name = null;
+
+/**
+ * Path to write location
+ *
+ * @var string
+ * @access public
+ */
+	var $path = null;
+
+/**
+ * File to write
+ *
+ * @var string
+ * @access public
+ */
+	var $file = 'schema.php';
+
+/**
+ * Connection used for read
+ *
+ * @var string
+ * @access public
+ */
+	var $connection = 'default';
+
+/**
+ * plugin name.
+ *
+ * @var string
+ */
+	var $plugin = null;
+
+/**
+ * Set of tables
+ *
+ * @var array
+ * @access public
+ */
+	var $tables = array();
+
+/**
+ * Constructor
+ *
+ * @param array $options optional load object properties
+ */
+	function __construct($options = array()) {
+		parent::__construct();
+
+		if (empty($options['name'])) {
+			$this->name = preg_replace('/schema$/i', '', get_class($this));
+		}
+		if (!empty($options['plugin'])) {
+			$this->plugin = $options['plugin'];
+		}
+
+		if (strtolower($this->name) === 'cake') {
+			$this->name = Inflector::camelize(Inflector::slug(Configure::read('App.dir')));
+		}
+
+		if (empty($options['path'])) {
+			if (is_dir(CONFIGS . 'schema')) {
+				$this->path = CONFIGS . 'schema';
+			} else {
+				$this->path = CONFIGS . 'sql';
+			}
+		}
+
+		$options = array_merge(get_object_vars($this), $options);
+		$this->_build($options);
+	}
+
+/**
+ * Builds schema object properties
+ *
+ * @param array $data loaded object properties
+ * @return void
+ * @access protected
+ */
+	function _build($data) {
+		$file = null;
+		foreach ($data as $key => $val) {
+			if (!empty($val)) {
+				if (!in_array($key, array('plugin', 'name', 'path', 'file', 'connection', 'tables', '_log'))) {
+					$this->tables[$key] = $val;
+					unset($this->{$key});
+				} elseif ($key !== 'tables') {
+					if ($key === 'name' && $val !== $this->name && !isset($data['file'])) {
+						$file = Inflector::underscore($val) . '.php';
+					}
+					$this->{$key} = $val;
+				}
+			}
+		}
+		if (file_exists($this->path . DS . $file) && is_file($this->path . DS . $file)) {
+			$this->file = $file;
+		} elseif (!empty($this->plugin)) {
+			$this->path = App::pluginPath($this->plugin) . 'config' . DS . 'schema';
+		}
+	}
+
+/**
+ * Before callback to be implemented in subclasses
+ *
+ * @param array $events schema object properties
+ * @return boolean Should process continue
+ * @access public
+ */
+	function before($event = array()) {
+		return true;
+	}
+
+/**
+ * After callback to be implemented in subclasses
+ *
+ * @param array $events schema object properties
+ * @access public
+ */
+	function after($event = array()) {
+	}
+
+/**
+ * Reads database and creates schema tables
+ *
+ * @param array $options schema object properties
+ * @return array Set of name and tables
+ * @access public
+ */
+	function &load($options = array()) {
+		if (is_string($options)) {
+			$options = array('path' => $options);
+		}
+
+		$this->_build($options);
+		extract(get_object_vars($this));
+
+		$class =  $name .'Schema';
+
+		if (!class_exists($class)) {
+			if (file_exists($path . DS . $file) && is_file($path . DS . $file)) {
+				require_once($path . DS . $file);
+			} elseif (file_exists($path . DS . 'schema.php') && is_file($path . DS . 'schema.php')) {
+				require_once($path . DS . 'schema.php');
+			}
+		}
+
+		if (class_exists($class)) {
+			$Schema =& new $class($options);
+			return $Schema;
+		}
+		$false = false;
+		return $false;
+	}
+
+/**
+ * Reads database and creates schema tables
+ *
+ * Options
+ *
+ * - 'connection' - the db connection to use
+ * - 'name' - name of the schema
+ * - 'models' - a list of models to use, or false to ignore models
+ *
+ * @param array $options schema object properties
+ * @return array Array indexed by name and tables
+ * @access public
+ */
+	function read($options = array()) {
+		extract(array_merge(
+			array(
+				'connection' => $this->connection,
+				'name' => $this->name,
+				'models' => true,
+			),
+			$options
+		));
+		$db =& ConnectionManager::getDataSource($connection);
+
+		App::import('Model', 'AppModel');
+		if (isset($this->plugin)) {
+			App::import('Model', Inflector::camelize($this->plugin) . 'AppModel');
+		}
+
+		$tables = array();
+		$currentTables = $db->listSources();
+
+		$prefix = null;
+		if (isset($db->config['prefix'])) {
+			$prefix = $db->config['prefix'];
+		}
+
+		if (!is_array($models) && $models !== false) {
+			if (isset($this->plugin)) {
+				$models = App::objects('model', App::pluginPath($this->plugin) . 'models' . DS, false);
+			} else {
+				$models = App::objects('model');
+			}
+		}
+
+		if (is_array($models)) {
+			foreach ($models as $model) {
+				$importModel = $model;
+				if (isset($this->plugin)) {
+					$importModel = $this->plugin . '.' . $model;
+				}
+				if (!App::import('Model', $importModel)) {
+					continue;
+				}
+				$vars = get_class_vars($model);
+				if (empty($vars['useDbConfig']) || $vars['useDbConfig'] != $connection) {
+					continue;
+				}
+
+				if (PHP5) {
+					$Object = ClassRegistry::init(array('class' => $model, 'ds' => $connection));
+				} else {
+					$Object =& ClassRegistry::init(array('class' => $model, 'ds' => $connection));
+				}
+
+				if (is_object($Object) && $Object->useTable !== false) {
+					$fulltable = $table = $db->fullTableName($Object, false);
+					if ($prefix && strpos($table, $prefix) !== 0) {
+						continue;
+					}
+					$table = str_replace($prefix, '', $table);
+
+					if (in_array($fulltable, $currentTables)) {
+						$key = array_search($fulltable, $currentTables);
+						if (empty($tables[$table])) {
+							$tables[$table] = $this->__columns($Object);
+							$tables[$table]['indexes'] = $db->index($Object);
+							$tables[$table]['tableParameters'] = $db->readTableParameters($fulltable);
+							unset($currentTables[$key]);
+						}
+						if (!empty($Object->hasAndBelongsToMany)) {
+							foreach ($Object->hasAndBelongsToMany as $Assoc => $assocData) {
+								if (isset($assocData['with'])) {
+									$class = $assocData['with'];
+								}
+								if (is_object($Object->$class)) {
+									$withTable = $db->fullTableName($Object->$class, false);
+									if ($prefix && strpos($withTable, $prefix) !== 0) {
+										continue;
+									}
+									if (in_array($withTable, $currentTables)) {
+										$key = array_search($withTable, $currentTables);
+										$noPrefixWith = str_replace($prefix, '', $withTable);
+	
+										$tables[$noPrefixWith] = $this->__columns($Object->$class);
+										$tables[$noPrefixWith]['indexes'] = $db->index($Object->$class);
+										$tables[$noPrefixWith]['tableParameters'] = $db->readTableParameters($withTable);
+										unset($currentTables[$key]);
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		if (!empty($currentTables)) {
+			foreach ($currentTables as $table) {
+				if ($prefix) {
+					if (strpos($table, $prefix) !== 0) {
+						continue;
+					}
+					$table = str_replace($prefix, '', $table);
+				}
+				$Object = new AppModel(array(
+					'name' => Inflector::classify($table), 'table' => $table, 'ds' => $connection
+				));
+
+				$systemTables = array(
+					'aros', 'acos', 'aros_acos', Configure::read('Session.table'), 'i18n'
+				);
+
+				if (in_array($table, $systemTables)) {
+					$tables[$Object->table] = $this->__columns($Object);
+					$tables[$Object->table]['indexes'] = $db->index($Object);
+					$tables[$Object->table]['tableParameters'] = $db->readTableParameters($table);
+				} elseif ($models === false) {
+					$tables[$table] = $this->__columns($Object);
+					$tables[$table]['indexes'] = $db->index($Object);
+					$tables[$table]['tableParameters'] = $db->readTableParameters($table);
+				} else {
+					$tables['missing'][$table] = $this->__columns($Object);
+					$tables['missing'][$table]['indexes'] = $db->index($Object);
+					$tables['missing'][$table]['tableParameters'] = $db->readTableParameters($table);
+				}
+			}
+		}
+
+		ksort($tables);
+		return compact('name', 'tables');
+	}
+
+/**
+ * Writes schema file from object or options
+ *
+ * @param mixed $object schema object or options array
+ * @param array $options schema object properties to override object
+ * @return mixed false or string written to file
+ * @access public
+ */
+	function write($object, $options = array()) {
+		if (is_object($object)) {
+			$object = get_object_vars($object);
+			$this->_build($object);
+		}
+
+		if (is_array($object)) {
+			$options = $object;
+			unset($object);
+		}
+
+		extract(array_merge(
+			get_object_vars($this), $options
+		));
+
+		$out = "class {$name}Schema extends CakeSchema {\n";
+
+		$out .= "\tvar \$name = '{$name}';\n\n";
+
+		if ($path !== $this->path) {
+			$out .= "\tvar \$path = '{$path}';\n\n";
+		}
+
+		if ($file !== $this->file) {
+			$out .= "\tvar \$file = '{$file}';\n\n";
+		}
+
+		if ($connection !== 'default') {
+			$out .= "\tvar \$connection = '{$connection}';\n\n";
+		}
+
+		$out .= "\tfunction before(\$event = array()) {\n\t\treturn true;\n\t}\n\n\tfunction after(\$event = array()) {\n\t}\n\n";
+
+		if (empty($tables)) {
+			$this->read();
+		}
+
+		foreach ($tables as $table => $fields) {
+			if (!is_numeric($table) && $table !== 'missing') {
+				$out .= $this->generateTable($table, $fields);
+			}
+		}
+		$out .= "}\n";
+
+		$File =& new File($path . DS . $file, true);
+		$header = '$Id';
+		$content = "<?php \n/* {$name} schema generated on: " . date('Y-m-d H:i:s') . " : ". time() . "*/\n{$out}?>";
+		$content = $File->prepare($content);
+		if ($File->write($content)) {
+			return $content;
+		}
+		return false;
+	}
+
+/**
+ * Generate the code for a table. Takes a table name and $fields array
+ * Returns a completed variable declaration to be used in schema classes
+ *
+ * @param string $table Table name you want returned.
+ * @param array $fields Array of field information to generate the table with.
+ * @return string Variable declaration for a schema class
+ */
+	function generateTable($table, $fields) {
+		$out = "\tvar \${$table} = array(\n";
+		if (is_array($fields)) {
+			$cols = array();
+			foreach ($fields as $field => $value) {
+				if ($field != 'indexes' && $field != 'tableParameters') {
+					if (is_string($value)) {
+						$type = $value;
+						$value = array('type'=> $type);
+					}
+					$col = "\t\t'{$field}' => array('type' => '" . $value['type'] . "', ";
+					unset($value['type']);
+					$col .= join(', ',  $this->__values($value));
+				} elseif ($field == 'indexes') {
+					$col = "\t\t'indexes' => array(";
+					$props = array();
+					foreach ((array)$value as $key => $index) {
+						$props[] = "'{$key}' => array(" . join(', ',  $this->__values($index)) . ")";
+					}
+					$col .= join(', ', $props);
+				} elseif ($field == 'tableParameters') {
+					//@todo add charset, collate and engine here
+					$col = "\t\t'tableParameters' => array(";
+					$props = array();
+					foreach ((array)$value as $key => $param) {
+						$props[] = "'{$key}' => '$param'";
+					}
+					$col .= join(', ', $props);
+				}
+				$col .= ")";
+				$cols[] = $col;
+			}
+			$out .= join(",\n", $cols);
+		}
+		$out .= "\n\t);\n";
+		return $out;
+	}
+
+/**
+ * Compares two sets of schemas
+ *
+ * @param mixed $old Schema object or array
+ * @param mixed $new Schema object or array
+ * @return array Tables (that are added, dropped, or changed)
+ * @access public
+ */
+	function compare($old, $new = null) {
+		if (empty($new)) {
+			$new =& $this;
+		}
+		if (is_array($new)) {
+			if (isset($new['tables'])) {
+				$new = $new['tables'];
+			}
+		} else {
+			$new = $new->tables;
+		}
+
+		if (is_array($old)) {
+			if (isset($old['tables'])) {
+				$old = $old['tables'];
+			}
+		} else {
+			$old = $old->tables;
+		}
+		$tables = array();
+		foreach ($new as $table => $fields) {
+			if ($table == 'missing') {
+				continue;
+			}
+			if (!array_key_exists($table, $old)) {
+				$tables[$table]['add'] = $fields;
+			} else {
+				$diff = $this->_arrayDiffAssoc($fields, $old[$table]);
+				if (!empty($diff)) {
+					$tables[$table]['add'] = $diff;
+				}
+				$diff = $this->_arrayDiffAssoc($old[$table], $fields);
+				if (!empty($diff)) {
+					$tables[$table]['drop'] = $diff;
+				}
+			}
+
+			foreach ($fields as $field => $value) {
+				if (isset($old[$table][$field])) {
+					$diff = $this->_arrayDiffAssoc($value, $old[$table][$field]);
+					if (!empty($diff) && $field !== 'indexes' && $field !== 'tableParameters') {
+						$tables[$table]['change'][$field] = array_merge($old[$table][$field], $diff);
+					}
+				}
+
+				if (isset($add[$table][$field])) {
+					$wrapper = array_keys($fields);
+					if ($column = array_search($field, $wrapper)) {
+						if (isset($wrapper[$column - 1])) {
+							$tables[$table]['add'][$field]['after'] = $wrapper[$column - 1];
+						}
+					}
+				}
+			}
+
+			if (isset($old[$table]['indexes']) && isset($new[$table]['indexes'])) {
+				$diff = $this->_compareIndexes($new[$table]['indexes'], $old[$table]['indexes']);
+				if ($diff) {
+					if (!isset($tables[$table])) {
+						$tables[$table] = array();
+					}
+					if (isset($diff['drop'])) {
+						$tables[$table]['drop']['indexes'] = $diff['drop'];
+					}
+					if ($diff && isset($diff['add'])) {
+						$tables[$table]['add']['indexes'] = $diff['add'];
+					}
+				}
+			}
+			if (isset($old[$table]['tableParameters']) && isset($new[$table]['tableParameters'])) {
+				$diff = $this->_compareTableParameters($new[$table]['tableParameters'], $old[$table]['tableParameters']);
+				if ($diff) {
+					$tables[$table]['change']['tableParameters'] = $diff;
+				}
+			}
+		}
+		return $tables;
+	}
+
+/**
+ * Extended array_diff_assoc noticing change from/to NULL values
+ *
+ * It behaves almost the same way as array_diff_assoc except for NULL values: if
+ * one of the values is not NULL - change is detected. It is useful in situation
+ * where one value is strval('') ant other is strval(null) - in string comparing
+ * methods this results as EQUAL, while it is not.
+ *
+ * @param array $array1 Base array
+ * @param array $array2 Corresponding array checked for equality
+ * @return array Difference as array with array(keys => values) from input array
+ *     where match was not found.
+ * @access protected
+ */
+	function _arrayDiffAssoc($array1, $array2) {
+		$difference = array();
+		foreach ($array1 as $key => $value) {
+			if (!array_key_exists($key, $array2)) {
+				$difference[$key] = $value;
+				continue;
+			}
+			$correspondingValue = $array2[$key];
+			if (is_null($value) !== is_null($correspondingValue)) {
+				$difference[$key] = $value;
+				continue;
+			}
+			if (is_bool($value) !== is_bool($correspondingValue)) {
+				$difference[$key] = $value;
+				continue;
+			}
+			$compare = strval($value);
+			$correspondingValue = strval($correspondingValue);
+			if ($compare === $correspondingValue) {
+				continue;
+			}
+			$difference[$key] = $value;
+		}
+		return $difference;
+	}
+
+/**
+ * Formats Schema columns from Model Object
+ *
+ * @param array $values options keys(type, null, default, key, length, extra)
+ * @return array Formatted values
+ * @access public
+ */
+	function __values($values) {
+		$vals = array();
+		if (is_array($values)) {
+			foreach ($values as $key => $val) {
+				if (is_array($val)) {
+					$vals[] = "'{$key}' => array('" . implode("', '",  $val) . "')";
+				} else if (!is_numeric($key)) {
+					$val = var_export($val, true);
+					$vals[] = "'{$key}' => {$val}";
+				}
+			}
+		}
+		return $vals;
+	}
+
+/**
+ * Formats Schema columns from Model Object
+ *
+ * @param array $Obj model object
+ * @return array Formatted columns
+ * @access public
+ */
+	function __columns(&$Obj) {
+		$db =& ConnectionManager::getDataSource($Obj->useDbConfig);
+		$fields = $Obj->schema(true);
+		$columns = $props = array();
+		foreach ($fields as $name => $value) {
+			if ($Obj->primaryKey == $name) {
+				$value['key'] = 'primary';
+			}
+			if (!isset($db->columns[$value['type']])) {
+				trigger_error(sprintf(__('Schema generation error: invalid column type %s does not exist in DBO', true), $value['type']), E_USER_NOTICE);
+				continue;
+			} else {
+				$defaultCol = $db->columns[$value['type']];
+				if (isset($defaultCol['limit']) && $defaultCol['limit'] == $value['length']) {
+					unset($value['length']);
+				} elseif (isset($defaultCol['length']) && $defaultCol['length'] == $value['length']) {
+					unset($value['length']);
+				}
+				unset($value['limit']);
+			}
+
+			if (isset($value['default']) && ($value['default'] === '' || $value['default'] === false)) {
+				unset($value['default']);
+			}
+			if (empty($value['length'])) {
+				unset($value['length']);
+			}
+			if (empty($value['key'])) {
+				unset($value['key']);
+			}
+			$columns[$name] = $value;
+		}
+
+		return $columns;
+	}
+
+/**
+ * Compare two schema files table Parameters
+ *
+ * @param array $new New indexes
+ * @param array $old Old indexes
+ * @return mixed False on failure, or an array of parameters to add & drop.
+ */
+	function _compareTableParameters($new, $old) {
+		if (!is_array($new) || !is_array($old)) {
+			return false;
+		}
+		$change = $this->_arrayDiffAssoc($new, $old);
+		return $change;
+	}
+
+/**
+ * Compare two schema indexes
+ *
+ * @param array $new New indexes
+ * @param array $old Old indexes
+ * @return mixed false on failure or array of indexes to add and drop
+ */
+	function _compareIndexes($new, $old) {
+		if (!is_array($new) || !is_array($old)) {
+			return false;
+		}
+
+		$add = $drop = array();
+
+		$diff = $this->_arrayDiffAssoc($new, $old);
+		if (!empty($diff)) {
+			$add = $diff;
+		}
+
+		$diff = $this->_arrayDiffAssoc($old, $new);
+		if (!empty($diff)) {
+			$drop = $diff;
+		}
+
+		foreach ($new as $name => $value) {
+			if (isset($old[$name])) {
+				$newUnique = isset($value['unique']) ? $value['unique'] : 0;
+				$oldUnique = isset($old[$name]['unique']) ? $old[$name]['unique'] : 0;
+				$newColumn = $value['column'];
+				$oldColumn = $old[$name]['column'];
+
+				$diff = false;
+
+				if ($newUnique != $oldUnique) {
+					$diff = true;
+				} elseif (is_array($newColumn) && is_array($oldColumn)) {
+					$diff = ($newColumn !== $oldColumn);
+				} elseif (is_string($newColumn) && is_string($oldColumn)) {
+					$diff = ($newColumn != $oldColumn);
+				} else {
+					$diff = true;
+				}
+				if ($diff) {
+					$drop[$name] = null;
+					$add[$name] = $value;
+				}
+			}
+		}
+		return array_filter(compact('add', 'drop'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/connection_manager.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/connection_manager.php
new file mode 100644
index 000000000..b9e599481
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/connection_manager.php
@@ -0,0 +1,295 @@
+<?php
+/**
+ * Datasource connection manager
+ *
+ * Provides an interface for loading and enumerating connections defined in app/config/database.php
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.10.x.1402
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+require LIBS . 'model' . DS . 'datasources' . DS . 'datasource.php';
+include_once CONFIGS . 'database.php';
+
+/**
+ * Manages loaded instances of DataSource objects
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class ConnectionManager extends Object {
+
+/**
+ * Holds a loaded instance of the Connections object
+ *
+ * @var DATABASE_CONFIG
+ * @access public
+ */
+	var $config = null;
+
+/**
+ * Holds instances DataSource objects
+ *
+ * @var array
+ * @access protected
+ */
+	var $_dataSources = array();
+
+/**
+ * Contains a list of all file and class names used in Connection settings
+ *
+ * @var array
+ * @access protected
+ */
+	var $_connectionsEnum = array();
+
+/**
+ * Constructor.
+ *
+ */
+	function __construct() {
+		if (class_exists('DATABASE_CONFIG')) {
+			$this->config =& new DATABASE_CONFIG();
+			$this->_getConnectionObjects();
+		}
+	}
+
+/**
+ * Gets a reference to the ConnectionManger object instance
+ *
+ * @return object Instance
+ * @access public
+ * @static
+ */
+	function &getInstance() {
+		static $instance = array();
+
+		if (!$instance) {
+			$instance[0] =& new ConnectionManager();
+		}
+
+		return $instance[0];
+	}
+
+/**
+ * Gets a reference to a DataSource object
+ *
+ * @param string $name The name of the DataSource, as defined in app/config/database.php
+ * @return object Instance
+ * @access public
+ * @static
+ */
+	function &getDataSource($name) {
+		$_this =& ConnectionManager::getInstance();
+
+		if (!empty($_this->_dataSources[$name])) {
+			$return =& $_this->_dataSources[$name];
+			return $return;
+		}
+
+		if (empty($_this->_connectionsEnum[$name])) {
+			trigger_error(sprintf(__("ConnectionManager::getDataSource - Non-existent data source %s", true), $name), E_USER_ERROR);
+			$null = null;
+			return $null;
+		}
+		$conn = $_this->_connectionsEnum[$name];
+		$class = $conn['classname'];
+
+		if ($_this->loadDataSource($name) === null) {
+			trigger_error(sprintf(__("ConnectionManager::getDataSource - Could not load class %s", true), $class), E_USER_ERROR);
+			$null = null;
+			return $null;
+		}
+		$_this->_dataSources[$name] =& new $class($_this->config->{$name});
+		$_this->_dataSources[$name]->configKeyName = $name;
+
+		$return =& $_this->_dataSources[$name];
+		return $return;
+	}
+
+/**
+ * Gets the list of available DataSource connections
+ *
+ * @return array List of available connections
+ * @access public
+ * @static
+ */
+	function sourceList() {
+		$_this =& ConnectionManager::getInstance();
+		return array_keys($_this->_dataSources);
+	}
+
+/**
+ * Gets a DataSource name from an object reference.
+ *
+ * **Warning** this method may cause fatal errors in PHP4.
+ *
+ * @param object $source DataSource object
+ * @return string Datasource name, or null if source is not present
+ *    in the ConnectionManager.
+ * @access public
+ * @static
+ */
+	function getSourceName(&$source) {
+		$_this =& ConnectionManager::getInstance();
+		foreach ($_this->_dataSources as $name => $ds) {
+			if ($ds == $source) {
+				return $name;
+			}
+		}
+		return '';
+	}
+
+/**
+ * Loads the DataSource class for the given connection name
+ *
+ * @param mixed $connName A string name of the connection, as defined in app/config/database.php,
+ *                        or an array containing the filename (without extension) and class name of the object,
+ *                        to be found in app/models/datasources/ or cake/libs/model/datasources/.
+ * @return boolean True on success, null on failure or false if the class is already loaded
+ * @access public
+ * @static
+ */
+	function loadDataSource($connName) {
+		$_this =& ConnectionManager::getInstance();
+
+		if (is_array($connName)) {
+			$conn = $connName;
+		} else {
+			$conn = $_this->_connectionsEnum[$connName];
+		}
+
+		if (class_exists($conn['classname'])) {
+			return false;
+		}
+
+		if (!empty($conn['parent'])) {
+			$_this->loadDataSource($conn['parent']);
+		}
+
+		$conn = array_merge(array('plugin' => null, 'classname' => null, 'parent' => null), $conn);
+		$class = "{$conn['plugin']}.{$conn['classname']}";
+
+		if (!App::import('Datasource', $class, !is_null($conn['plugin']))) {
+			trigger_error(sprintf(__('ConnectionManager::loadDataSource - Unable to import DataSource class %s', true), $class), E_USER_ERROR);
+			return null;
+		}
+		return true;
+	}
+
+/**
+ * Return a list of connections
+ *
+ * @return array An associative array of elements where the key is the connection name
+ *               (as defined in Connections), and the value is an array with keys 'filename' and 'classname'.
+ * @access public
+ * @static
+ */
+	function enumConnectionObjects() {
+		$_this =& ConnectionManager::getInstance();
+
+		return $_this->_connectionsEnum;
+	}
+
+/**
+ * Dynamically creates a DataSource object at runtime, with the given name and settings
+ *
+ * @param string $name The DataSource name
+ * @param array $config The DataSource configuration settings
+ * @return object A reference to the DataSource object, or null if creation failed
+ * @access public
+ * @static
+ */
+	function &create($name = '', $config = array()) {
+		$_this =& ConnectionManager::getInstance();
+
+		if (empty($name) || empty($config) || array_key_exists($name, $_this->_connectionsEnum)) {
+			$null = null;
+			return $null;
+		}
+		$_this->config->{$name} = $config;
+		$_this->_connectionsEnum[$name] = $_this->__connectionData($config);
+		$return =& $_this->getDataSource($name);
+		return $return;
+	}
+
+/**
+ * Gets a list of class and file names associated with the user-defined DataSource connections
+ *
+ * @return void
+ * @access protected
+ * @static
+ */
+	function _getConnectionObjects() {
+		$connections = get_object_vars($this->config);
+
+		if ($connections != null) {
+			foreach ($connections as $name => $config) {
+				$this->_connectionsEnum[$name] = $this->__connectionData($config);
+			}
+		} else {
+			$this->cakeError('missingConnection', array(array('code' => 500, 'className' => 'ConnectionManager')));
+		}
+	}
+
+/**
+ * Returns the file, class name, and parent for the given driver.
+ *
+ * @return array An indexed array with: filename, classname, plugin and parent
+ * @access private
+ */
+	function __connectionData($config) {
+		if (!isset($config['datasource'])) {
+			$config['datasource'] = 'dbo';
+		}
+		$filename = $classname = $parent = $plugin = null;
+
+		if (!empty($config['driver'])) {
+			$parent = $this->__connectionData(array('datasource' => $config['datasource']));
+			$parentSource = preg_replace('/_source$/', '', $parent['filename']);
+
+			list($plugin, $classname) = pluginSplit($config['driver']);
+			if ($plugin) {
+				$source = Inflector::underscore($classname);
+			} else {
+				$source = $parentSource . '_' . $config['driver'];
+				$classname = Inflector::camelize(strtolower($source));
+			}
+			$filename = $parentSource . DS . $source;
+		} else {
+			list($plugin, $classname) = pluginSplit($config['datasource']);
+			if ($plugin) {
+				$filename = Inflector::underscore($classname);
+			} else {
+				$filename = Inflector::underscore($config['datasource']);
+			}
+			if (substr($filename, -7) != '_source') {
+				$filename .= '_source';
+			}
+			$classname = Inflector::camelize(strtolower($filename));
+		}
+		return compact('filename', 'classname', 'parent', 'plugin');
+	}
+
+/**
+ * Destructor.
+ *
+ * @access private
+ */
+	function __destruct() {
+		if (Configure::read('Session.save') == 'database' && function_exists('session_write_close')) {
+			session_write_close();
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/datasource.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/datasource.php
new file mode 100644
index 000000000..5de46be8a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/datasource.php
@@ -0,0 +1,601 @@
+<?php
+/**
+ * DataSource base class
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources
+ * @since         CakePHP(tm) v 0.10.5.1790
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * DataSource base class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources
+ */
+class DataSource extends Object {
+
+/**
+ * Are we connected to the DataSource?
+ *
+ * @var boolean
+ * @access public
+ */
+	var $connected = false;
+
+/**
+ * Print full query debug info?
+ *
+ * @var boolean
+ * @access public
+ */
+	var $fullDebug = false;
+
+/**
+ * Error description of last query
+ *
+ * @var unknown_type
+ * @access public
+ */
+	var $error = null;
+
+/**
+ * String to hold how many rows were affected by the last SQL operation.
+ *
+ * @var string
+ * @access public
+ */
+	var $affected = null;
+
+/**
+ * Number of rows in current resultset
+ *
+ * @var int
+ * @access public
+ */
+	var $numRows = null;
+
+/**
+ * Time the last query took
+ *
+ * @var int
+ * @access public
+ */
+	var $took = null;
+
+/**
+ * The starting character that this DataSource uses for quoted identifiers.
+ *
+ * @var string
+ * @access public
+ */
+	var $startQuote = null;
+
+/**
+ * The ending character that this DataSource uses for quoted identifiers.
+ *
+ * @var string
+ * @access public
+ */
+	var $endQuote = null;
+
+/**
+ * Result
+ *
+ * @var array
+ * @access protected
+ */
+	var $_result = null;
+
+/**
+ * Queries count.
+ *
+ * @var int
+ * @access protected
+ */
+	var $_queriesCnt = 0;
+
+/**
+ * Total duration of all queries.
+ *
+ * @var unknown_type
+ * @access protected
+ */
+	var $_queriesTime = null;
+
+/**
+ * Log of queries executed by this DataSource
+ *
+ * @var unknown_type
+ * @access protected
+ */
+	var $_queriesLog = array();
+
+/**
+ * Maximum number of items in query log
+ *
+ * This is to prevent query log taking over too much memory.
+ *
+ * @var int Maximum number of queries in the queries log.
+ * @access protected
+ */
+	var $_queriesLogMax = 200;
+
+/**
+ * Caches serialzed results of executed queries
+ *
+ * @var array Maximum number of queries in the queries log.
+ * @access protected
+ */
+	var $_queryCache = array();
+
+/**
+ * The default configuration of a specific DataSource
+ *
+ * @var array
+ * @access protected
+ */
+	var $_baseConfig = array();
+
+/**
+ * Holds references to descriptions loaded by the DataSource
+ *
+ * @var array
+ * @access private
+ */
+	var $__descriptions = array();
+
+/**
+ * Holds a list of sources (tables) contained in the DataSource
+ *
+ * @var array
+ * @access protected
+ */
+	var $_sources = null;
+
+/**
+ * A reference to the physical connection of this DataSource
+ *
+ * @var array
+ * @access public
+ */
+	var $connection = null;
+
+/**
+ * The DataSource configuration
+ *
+ * @var array
+ * @access public
+ */
+	var $config = array();
+
+/**
+ * The DataSource configuration key name
+ *
+ * @var string
+ * @access public
+ */
+	var $configKeyName = null;
+
+/**
+ * Whether or not this DataSource is in the middle of a transaction
+ *
+ * @var boolean
+ * @access protected
+ */
+	var $_transactionStarted = false;
+
+/**
+ * Whether or not source data like available tables and schema descriptions
+ * should be cached
+ *
+ * @var boolean
+ * @access public
+ */
+	var $cacheSources = true;
+
+/**
+ * Constructor.
+ *
+ * @param array $config Array of configuration information for the datasource.
+ * @return void.
+ */
+	function __construct($config = array()) {
+		parent::__construct();
+		$this->setConfig($config);
+	}
+
+/**
+ * Caches/returns cached results for child instances
+ *
+ * @param mixed $data
+ * @return array Array of sources available in this datasource.
+ * @access public
+ */
+	function listSources($data = null) {
+		if ($this->cacheSources === false) {
+			return null;
+		}
+
+		if ($this->_sources !== null) {
+			return $this->_sources;
+		}
+
+		$key = ConnectionManager::getSourceName($this) . '_' . $this->config['database'] . '_list';
+		$key = preg_replace('/[^A-Za-z0-9_\-.+]/', '_', $key);
+		$sources = Cache::read($key, '_cake_model_');
+
+		if (empty($sources)) {
+			$sources = $data;
+			Cache::write($key, $data, '_cake_model_');
+		}
+
+		$this->_sources = $sources;
+		return $sources;
+	}
+
+/**
+ * Convenience method for DboSource::listSources().  Returns source names in lowercase.
+ *
+ * @param boolean $reset Whether or not the source list should be reset.
+ * @return array Array of sources available in this datasource
+ * @access public
+ */
+	function sources($reset = false) {
+		if ($reset === true) {
+			$this->_sources = null;
+		}
+		return array_map('strtolower', $this->listSources());
+	}
+
+/**
+ * Returns a Model description (metadata) or null if none found.
+ *
+ * @param Model $model
+ * @return array Array of Metadata for the $model
+ * @access public
+ */
+	function describe(&$model) {
+		if ($this->cacheSources === false) {
+			return null;
+		}
+		$table = $model->tablePrefix . $model->table;
+
+		if (isset($this->__descriptions[$table])) {
+			return $this->__descriptions[$table];
+		}
+		$cache = $this->__cacheDescription($table);
+
+		if ($cache !== null) {
+			$this->__descriptions[$table] =& $cache;
+			return $cache;
+		}
+		return null;
+	}
+
+/**
+ * Begin a transaction
+ *
+ * @return boolean Returns true if a transaction is not in progress
+ * @access public
+ */
+	function begin(&$model) {
+		return !$this->_transactionStarted;
+	}
+
+/**
+ * Commit a transaction
+ *
+ * @return boolean Returns true if a transaction is in progress
+ * @access public
+ */
+	function commit(&$model) {
+		return $this->_transactionStarted;
+	}
+
+/**
+ * Rollback a transaction
+ *
+ * @return boolean Returns true if a transaction is in progress
+ * @access public
+ */
+	function rollback(&$model) {
+		return $this->_transactionStarted;
+	}
+
+/**
+ * Converts column types to basic types
+ *
+ * @param string $real Real  column type (i.e. "varchar(255)")
+ * @return string Abstract column type (i.e. "string")
+ * @access public
+ */
+	function column($real) {
+		return false;
+	}
+
+/**
+ * Used to create new records. The "C" CRUD.
+ *
+ * To-be-overridden in subclasses.
+ *
+ * @param Model $model The Model to be created.
+ * @param array $fields An Array of fields to be saved.
+ * @param array $values An Array of values to save.
+ * @return boolean success
+ * @access public
+ */
+	function create(&$model, $fields = null, $values = null) {
+		return false;
+	}
+
+/**
+ * Used to read records from the Datasource. The "R" in CRUD
+ *
+ * To-be-overridden in subclasses.
+ *
+ * @param Model $model The model being read.
+ * @param array $queryData An array of query data used to find the data you want
+ * @return mixed
+ * @access public
+ */
+	function read(&$model, $queryData = array()) {
+		return false;
+	}
+
+/**
+ * Update a record(s) in the datasource.
+ *
+ * To-be-overridden in subclasses.
+ *
+ * @param Model $model Instance of the model class being updated
+ * @param array $fields Array of fields to be updated
+ * @param array $values Array of values to be update $fields to.
+ * @return boolean Success
+ * @access public
+ */
+	function update(&$model, $fields = null, $values = null) {
+		return false;
+	}
+
+/**
+ * Delete a record(s) in the datasource.
+ *
+ * To-be-overridden in subclasses.
+ *
+ * @param Model $model The model class having record(s) deleted
+ * @param mixed $id Primary key of the model
+ * @access public
+ */
+	function delete(&$model, $id = null) {
+		if ($id == null) {
+			$id = $model->id;
+		}
+	}
+
+/**
+ * Returns the ID generated from the previous INSERT operation.
+ *
+ * @param unknown_type $source
+ * @return mixed Last ID key generated in previous INSERT
+ * @access public
+ */
+	function lastInsertId($source = null) {
+		return false;
+	}
+
+/**
+ * Returns the number of rows returned by last operation.
+ *
+ * @param unknown_type $source
+ * @return integer Number of rows returned by last operation
+ * @access public
+ */
+	function lastNumRows($source = null) {
+		return false;
+	}
+
+/**
+ * Returns the number of rows affected by last query.
+ *
+ * @param unknown_type $source
+ * @return integer Number of rows affected by last query.
+ * @access public
+ */
+	function lastAffected($source = null) {
+		return false;
+	}
+
+/**
+ * Check whether the conditions for the Datasource being available
+ * are satisfied.  Often used from connect() to check for support
+ * before establishing a connection.
+ *
+ * @return boolean Whether or not the Datasources conditions for use are met.
+ * @access public
+ */
+	function enabled() {
+		return true;
+	}
+
+/**
+ * Returns true if the DataSource supports the given interface (method)
+ *
+ * @param string $interface The name of the interface (method)
+ * @return boolean True on success
+ * @access public
+ */
+	function isInterfaceSupported($interface) {
+		static $methods = false;
+		if ($methods === false) {
+			$methods = array_map('strtolower', get_class_methods($this));
+		}
+		return in_array(strtolower($interface), $methods);
+	}
+
+/**
+ * Sets the configuration for the DataSource.
+ * Merges the $config information with the _baseConfig and the existing $config property.
+ *
+ * @param array $config The configuration array
+ * @return void
+ * @access public
+ */
+	function setConfig($config = array()) {
+		$this->config = array_merge($this->_baseConfig, $this->config, $config);
+	}
+
+/**
+ * Cache the DataSource description
+ *
+ * @param string $object The name of the object (model) to cache
+ * @param mixed $data The description of the model, usually a string or array
+ * @return mixed
+ * @access private
+ */
+	function __cacheDescription($object, $data = null) {
+		if ($this->cacheSources === false) {
+			return null;
+		}
+
+		if ($data !== null) {
+			$this->__descriptions[$object] =& $data;
+		}
+
+		$key = ConnectionManager::getSourceName($this) . '_' . $object;
+		$cache = Cache::read($key, '_cake_model_');
+
+		if (empty($cache)) {
+			$cache = $data;
+			Cache::write($key, $cache, '_cake_model_');
+		}
+
+		return $cache;
+	}
+
+/**
+ * Replaces `{$__cakeID__$}` and `{$__cakeForeignKey__$}` placeholders in query data.
+ *
+ * @param string $query Query string needing replacements done.
+ * @param array $data Array of data with values that will be inserted in placeholders.
+ * @param string $association Name of association model being replaced
+ * @param unknown_type $assocData
+ * @param Model $model Instance of the model to replace $__cakeID__$
+ * @param Model $linkModel Instance of model to replace $__cakeForeignKey__$
+ * @param array $stack
+ * @return string String of query data with placeholders replaced.
+ * @access public
+ * @todo Remove and refactor $assocData, ensure uses of the method have the param removed too.
+ */
+	function insertQueryData($query, $data, $association, $assocData, &$model, &$linkModel, $stack) {
+		$keys = array('{$__cakeID__$}', '{$__cakeForeignKey__$}');
+
+		foreach ($keys as $key) {
+			$val = null;
+			$type = null;
+
+			if (strpos($query, $key) !== false) {
+				switch ($key) {
+					case '{$__cakeID__$}':
+						if (isset($data[$model->alias]) || isset($data[$association])) {
+							if (isset($data[$model->alias][$model->primaryKey])) {
+								$val = $data[$model->alias][$model->primaryKey];
+							} elseif (isset($data[$association][$model->primaryKey])) {
+								$val = $data[$association][$model->primaryKey];
+							}
+						} else {
+							$found = false;
+							foreach (array_reverse($stack) as $assoc) {
+								if (isset($data[$assoc]) && isset($data[$assoc][$model->primaryKey])) {
+									$val = $data[$assoc][$model->primaryKey];
+									$found = true;
+									break;
+								}
+							}
+							if (!$found) {
+								$val = '';
+							}
+						}
+						$type = $model->getColumnType($model->primaryKey);
+					break;
+					case '{$__cakeForeignKey__$}':
+						foreach ($model->__associations as $id => $name) {
+							foreach ($model->$name as $assocName => $assoc) {
+								if ($assocName === $association) {
+									if (isset($assoc['foreignKey'])) {
+										$foreignKey = $assoc['foreignKey'];
+										$assocModel = $model->$assocName;
+										$type = $assocModel->getColumnType($assocModel->primaryKey);
+
+										if (isset($data[$model->alias][$foreignKey])) {
+											$val = $data[$model->alias][$foreignKey];
+										} elseif (isset($data[$association][$foreignKey])) {
+											$val = $data[$association][$foreignKey];
+										} else {
+											$found = false;
+											foreach (array_reverse($stack) as $assoc) {
+												if (isset($data[$assoc]) && isset($data[$assoc][$foreignKey])) {
+													$val = $data[$assoc][$foreignKey];
+													$found = true;
+													break;
+												}
+											}
+											if (!$found) {
+												$val = '';
+											}
+										}
+									}
+									break 3;
+								}
+							}
+						}
+					break;
+				}
+				if (empty($val) && $val !== '0') {
+					return false;
+				}
+				$query = str_replace($key, $this->value($val, $type), $query);
+			}
+		}
+		return $query;
+	}
+
+/**
+ * To-be-overridden in subclasses.
+ *
+ * @param Model $model Model instance
+ * @param string $key Key name to make
+ * @return string Key name for model.
+ * @access public
+ */
+	function resolveKey(&$model, $key) {
+		return $model->alias . $key;
+	}
+
+/**
+ * Closes the current datasource.
+ *
+ * @return void
+ * @access public
+ */
+	function __destruct() {
+		if ($this->_transactionStarted) {
+			$null = null;
+			$this->rollback($null);
+		}
+		if ($this->connected) {
+			$this->close();
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php
new file mode 100644
index 000000000..b7b17f7c8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mssql.php
@@ -0,0 +1,788 @@
+<?php
+/**
+ * MS SQL layer for DBO
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @since         CakePHP(tm) v 0.10.5.1790
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * MS SQL layer for DBO
+ *
+ * Long description for class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ */
+class DboMssql extends DboSource {
+
+/**
+ * Driver description
+ *
+ * @var string
+ */
+	var $description = "MS SQL DBO Driver";
+
+/**
+ * Starting quote character for quoted identifiers
+ *
+ * @var string
+ */
+	var $startQuote = "[";
+
+/**
+ * Ending quote character for quoted identifiers
+ *
+ * @var string
+ */
+	var $endQuote = "]";
+
+/**
+ * Creates a map between field aliases and numeric indexes.  Workaround for the
+ * SQL Server driver's 30-character column name limitation.
+ *
+ * @var array
+ */
+	var $__fieldMappings = array();
+
+/**
+ * Base configuration settings for MS SQL driver
+ *
+ * @var array
+ */
+	var $_baseConfig = array(
+		'persistent' => true,
+		'host' => 'localhost',
+		'login' => 'root',
+		'password' => '',
+		'database' => 'cake',
+		'port' => '1433',
+	);
+
+/**
+ * MS SQL column definition
+ *
+ * @var array
+ */
+	var $columns = array(
+		'primary_key' => array('name' => 'IDENTITY (1, 1) NOT NULL'),
+		'string'	=> array('name' => 'varchar', 'limit' => '255'),
+		'text'		=> array('name' => 'text'),
+		'integer'	=> array('name' => 'int', 'formatter' => 'intval'),
+		'float'		=> array('name' => 'numeric', 'formatter' => 'floatval'),
+		'datetime'	=> array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'time'		=> array('name' => 'datetime', 'format' => 'H:i:s', 'formatter' => 'date'),
+		'date'		=> array('name' => 'datetime', 'format' => 'Y-m-d', 'formatter' => 'date'),
+		'binary'	=> array('name' => 'image'),
+		'boolean'	=> array('name' => 'bit')
+	);
+
+/**
+ * Index of basic SQL commands
+ *
+ * @var array
+ * @access protected
+ */
+	var $_commands = array(
+		'begin'    => 'BEGIN TRANSACTION',
+		'commit'   => 'COMMIT',
+		'rollback' => 'ROLLBACK'
+	);
+
+/**
+ * Define if the last query had error
+ *
+ * @var string
+ * @access private
+ */
+	var $__lastQueryHadError = false;
+/**
+ * MS SQL DBO driver constructor; sets SQL Server error reporting defaults
+ *
+ * @param array $config Configuration data from app/config/databases.php
+ * @return boolean True if connected successfully, false on error
+ */
+	function __construct($config, $autoConnect = true) {
+		if ($autoConnect) {
+			if (!function_exists('mssql_min_message_severity')) {
+				trigger_error(__("PHP SQL Server interface is not installed, cannot continue. For troubleshooting information, see http://php.net/mssql/", true), E_USER_WARNING);
+			}
+			mssql_min_message_severity(15);
+			mssql_min_error_severity(2);
+		}
+		return parent::__construct($config, $autoConnect);
+	}
+
+/**
+ * Connects to the database using options in the given configuration array.
+ *
+ * @return boolean True if the database could be connected, else false
+ */
+	function connect() {
+		$config = $this->config;
+
+		$os = env('OS');
+		if (!empty($os) && strpos($os, 'Windows') !== false) {
+			$sep = ',';
+		} else {
+			$sep = ':';
+		}
+		$this->connected = false;
+
+		if (is_numeric($config['port'])) {
+			$port = $sep . $config['port'];	// Port number
+		} elseif ($config['port'] === null) {
+			$port = '';						// No port - SQL Server 2005
+		} else {
+			$port = '\\' . $config['port'];	// Named pipe
+		}
+
+		if (!$config['persistent']) {
+			$this->connection = mssql_connect($config['host'] . $port, $config['login'], $config['password'], true);
+		} else {
+			$this->connection = mssql_pconnect($config['host'] . $port, $config['login'], $config['password']);
+		}
+
+		if (mssql_select_db($config['database'], $this->connection)) {
+			$this->_execute("SET DATEFORMAT ymd");
+			$this->connected = true;
+		}
+		return $this->connected;
+	}
+
+/**
+ * Check that MsSQL is installed/loaded
+ *
+ * @return boolean
+ */
+	function enabled() {
+		return extension_loaded('mssql');
+	}
+/**
+ * Disconnects from database.
+ *
+ * @return boolean True if the database could be disconnected, else false
+ */
+	function disconnect() {
+		@mssql_free_result($this->results);
+		$this->connected = !@mssql_close($this->connection);
+		return !$this->connected;
+	}
+
+/**
+ * Executes given SQL statement.
+ *
+ * @param string $sql SQL statement
+ * @return resource Result resource identifier
+ * @access protected
+ */
+	function _execute($sql) {
+		$result = @mssql_query($sql, $this->connection);
+		$this->__lastQueryHadError = ($result === false);
+		return $result;
+	}
+
+/**
+ * Returns an array of sources (tables) in the database.
+ *
+ * @return array Array of tablenames in the database
+ */
+	function listSources() {
+		$cache = parent::listSources();
+
+		if ($cache != null) {
+			return $cache;
+		}
+		$result = $this->fetchAll('SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES', false);
+
+		if (!$result || empty($result)) {
+			return array();
+		} else {
+			$tables = array();
+
+			foreach ($result as $table) {
+				$tables[] = $table[0]['TABLE_NAME'];
+			}
+
+			parent::listSources($tables);
+			return $tables;
+		}
+	}
+
+/**
+ * Returns an array of the fields in given table name.
+ *
+ * @param Model $model Model object to describe
+ * @return array Fields in table. Keys are name and type
+ */
+	function describe(&$model) {
+		$cache = parent::describe($model);
+
+		if ($cache != null) {
+			return $cache;
+		}
+
+		$table = $this->fullTableName($model, false);
+		$cols = $this->fetchAll("SELECT COLUMN_NAME as Field, DATA_TYPE as Type, COL_LENGTH('" . $table . "', COLUMN_NAME) as Length, IS_NULLABLE As [Null], COLUMN_DEFAULT as [Default], COLUMNPROPERTY(OBJECT_ID('" . $table . "'), COLUMN_NAME, 'IsIdentity') as [Key], NUMERIC_SCALE as Size FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '" . $table . "'", false);
+
+		$fields = false;
+		foreach ($cols as $column) {
+			$field = $column[0]['Field'];
+			$fields[$field] = array(
+				'type' => $this->column($column[0]['Type']),
+				'null' => (strtoupper($column[0]['Null']) == 'YES'),
+				'default' => preg_replace("/^[(]{1,2}'?([^')]*)?'?[)]{1,2}$/", "$1", $column[0]['Default']),
+				'length' => intval($column[0]['Length']),
+				'key' => ($column[0]['Key'] == '1') ? 'primary' : false
+			);
+			if ($fields[$field]['default'] === 'null') {
+				$fields[$field]['default'] = null;
+			} else {
+				$this->value($fields[$field]['default'], $fields[$field]['type']);
+			}
+
+			if ($fields[$field]['key'] && $fields[$field]['type'] == 'integer') {
+				$fields[$field]['length'] = 11;
+			} elseif (!$fields[$field]['key']) {
+				unset($fields[$field]['key']);
+			}
+			if (in_array($fields[$field]['type'], array('date', 'time', 'datetime', 'timestamp'))) {
+				$fields[$field]['length'] = null;
+			}
+		}
+		$this->__cacheDescription($this->fullTableName($model, false), $fields);
+		return $fields;
+	}
+
+/**
+ * Returns a quoted and escaped string of $data for use in an SQL statement.
+ *
+ * @param string $data String to be prepared for use in an SQL statement
+ * @param string $column The column into which this data will be inserted
+ * @param boolean $safe Whether or not numeric data should be handled automagically if no column data is provided
+ * @return string Quoted and escaped data
+ */
+	function value($data, $column = null, $safe = false) {
+		$parent = parent::value($data, $column, $safe);
+
+		if ($parent != null) {
+			return $parent;
+		}
+		if ($data === null) {
+			return 'NULL';
+		}
+		if (in_array($column, array('integer', 'float', 'binary')) && $data === '') {
+			return 'NULL';
+		}
+		if ($data === '') {
+			return "''";
+		}
+
+		switch ($column) {
+			case 'boolean':
+				$data = $this->boolean((bool)$data);
+			break;
+			default:
+				if (get_magic_quotes_gpc()) {
+					$data = stripslashes(str_replace("'", "''", $data));
+				} else {
+					$data = str_replace("'", "''", $data);
+				}
+			break;
+		}
+
+		if (in_array($column, array('integer', 'float', 'binary')) && is_numeric($data)) {
+			return $data;
+		}
+		return "'" . $data . "'";
+	}
+
+/**
+ * Generates the fields list of an SQL query.
+ *
+ * @param Model $model
+ * @param string $alias Alias tablename
+ * @param mixed $fields
+ * @return array
+ */
+	function fields(&$model, $alias = null, $fields = array(), $quote = true) {
+		if (empty($alias)) {
+			$alias = $model->alias;
+		}
+		$fields = parent::fields($model, $alias, $fields, false);
+		$count = count($fields);
+
+		if ($count >= 1 && strpos($fields[0], 'COUNT(*)') === false) {
+			$result = array();
+			for ($i = 0; $i < $count; $i++) {
+				$prepend = '';
+
+				if (strpos($fields[$i], 'DISTINCT') !== false) {
+					$prepend = 'DISTINCT ';
+					$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
+				}
+				$fieldAlias = count($this->__fieldMappings);
+
+				if (!preg_match('/\s+AS\s+/i', $fields[$i])) {
+					if (substr($fields[$i], -1) == '*') {
+						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias . '.*') {
+							$build = explode('.', $fields[$i]);
+							$AssociatedModel = $model->{$build[0]};
+						} else {
+							$AssociatedModel = $model;
+						}
+
+						$_fields = $this->fields($AssociatedModel, $AssociatedModel->alias, array_keys($AssociatedModel->schema()));
+						$result = array_merge($result, $_fields);
+						continue;
+					}
+
+					if (strpos($fields[$i], '.') === false) {
+						$this->__fieldMappings[$alias . '__' . $fieldAlias] = $alias . '.' . $fields[$i];
+						$fieldName  = $this->name($alias . '.' . $fields[$i]);
+						$fieldAlias = $this->name($alias . '__' . $fieldAlias);
+					} else {
+						$build = explode('.', $fields[$i]);
+						$this->__fieldMappings[$build[0] . '__' . $fieldAlias] = $fields[$i];
+						$fieldName  = $this->name($build[0] . '.' . $build[1]);
+						$fieldAlias = $this->name(preg_replace("/^\[(.+)\]$/", "$1", $build[0]) . '__' . $fieldAlias);
+					}
+					if ($model->getColumnType($fields[$i]) == 'datetime') {
+						$fieldName = "CONVERT(VARCHAR(20), {$fieldName}, 20)";
+					}
+					$fields[$i] =  "{$fieldName} AS {$fieldAlias}";
+				}
+				$result[] = $prepend . $fields[$i];
+			}
+			return $result;
+		} else {
+			return $fields;
+		}
+	}
+
+/**
+ * Generates and executes an SQL INSERT statement for given model, fields, and values.
+ * Removes Identity (primary key) column from update data before returning to parent, if
+ * value is empty.
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param array $values
+ * @param mixed $conditions
+ * @return array
+ */
+	function create(&$model, $fields = null, $values = null) {
+		if (!empty($values)) {
+			$fields = array_combine($fields, $values);
+		}
+		$primaryKey = $this->_getPrimaryKey($model);
+
+		if (array_key_exists($primaryKey, $fields)) {
+			if (empty($fields[$primaryKey])) {
+				unset($fields[$primaryKey]);
+			} else {
+				$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($model) . ' ON');
+			}
+		}
+		$result = parent::create($model, array_keys($fields), array_values($fields));
+		if (array_key_exists($primaryKey, $fields) && !empty($fields[$primaryKey])) {
+			$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($model) . ' OFF');
+		}
+		return $result;
+	}
+
+/**
+ * Generates and executes an SQL UPDATE statement for given model, fields, and values.
+ * Removes Identity (primary key) column from update data before returning to parent.
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param array $values
+ * @param mixed $conditions
+ * @return array
+ */
+	function update(&$model, $fields = array(), $values = null, $conditions = null) {
+		if (!empty($values)) {
+			$fields = array_combine($fields, $values);
+		}
+		if (isset($fields[$model->primaryKey])) {
+			unset($fields[$model->primaryKey]);
+		}
+		if (empty($fields)) {
+			return true;
+		}
+		return parent::update($model, array_keys($fields), array_values($fields), $conditions);
+	}
+
+/**
+ * Returns a formatted error message from previous database operation.
+ *
+ * @return string Error message with error number
+ */
+	function lastError() {
+		if ($this->__lastQueryHadError) {
+			$error = mssql_get_last_message();
+			if ($error && !preg_match('/contexto de la base de datos a|contesto di database|changed database|contexte de la base de don|datenbankkontext/i', $error)) {
+				return $error;
+			}
+		}
+		return null;
+	}
+
+/**
+ * Returns number of affected rows in previous database operation. If no previous operation exists,
+ * this returns false.
+ *
+ * @return integer Number of affected rows
+ */
+	function lastAffected() {
+		if ($this->_result) {
+			return mssql_rows_affected($this->connection);
+		}
+		return null;
+	}
+
+/**
+ * Returns number of rows in previous resultset. If no previous resultset exists,
+ * this returns false.
+ *
+ * @return integer Number of rows in resultset
+ */
+	function lastNumRows() {
+		if ($this->_result) {
+			return @mssql_num_rows($this->_result);
+		}
+		return null;
+	}
+
+/**
+ * Returns the ID generated from the previous INSERT operation.
+ *
+ * @param unknown_type $source
+ * @return in
+ */
+	function lastInsertId($source = null) {
+		$id = $this->fetchRow('SELECT SCOPE_IDENTITY() AS insertID', false);
+		return $id[0]['insertID'];
+	}
+
+/**
+ * Returns a limit statement in the correct format for the particular database.
+ *
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
+ * @return string SQL limit/offset statement
+ */
+	function limit($limit, $offset = null) {
+		if ($limit) {
+			$rt = '';
+			if (!strpos(strtolower($limit), 'top') || strpos(strtolower($limit), 'top') === 0) {
+				$rt = ' TOP';
+			}
+			$rt .= ' ' . $limit;
+			if (is_int($offset) && $offset > 0) {
+				$rt .= ' OFFSET ' . $offset;
+			}
+			return $rt;
+		}
+		return null;
+	}
+
+/**
+ * Converts database-layer column types to basic types
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return string Abstract column type (i.e. "string")
+ */
+	function column($real) {
+		if (is_array($real)) {
+			$col = $real['name'];
+
+			if (isset($real['limit'])) {
+				$col .= '(' . $real['limit'] . ')';
+			}
+			return $col;
+		}
+		$col = str_replace(')', '', $real);
+		$limit = null;
+		if (strpos($col, '(') !== false) {
+			list($col, $limit) = explode('(', $col);
+		}
+
+		if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
+			return $col;
+		}
+		if ($col == 'bit') {
+			return 'boolean';
+		}
+		if (strpos($col, 'int') !== false) {
+			return 'integer';
+		}
+		if (strpos($col, 'char') !== false) {
+			return 'string';
+		}
+		if (strpos($col, 'text') !== false) {
+			return 'text';
+		}
+		if (strpos($col, 'binary') !== false || $col == 'image') {
+			return 'binary';
+		}
+		if (in_array($col, array('float', 'real', 'decimal', 'numeric'))) {
+			return 'float';
+		}
+		return 'text';
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $results
+ */
+	function resultSet(&$results) {
+		$this->results =& $results;
+		$this->map = array();
+		$numFields = mssql_num_fields($results);
+		$index = 0;
+		$j = 0;
+
+		while ($j < $numFields) {
+			$column = mssql_field_name($results, $j);
+
+			if (strpos($column, '__')) {
+				if (isset($this->__fieldMappings[$column]) && strpos($this->__fieldMappings[$column], '.')) {
+					$map = explode('.', $this->__fieldMappings[$column]);
+				} elseif (isset($this->__fieldMappings[$column])) {
+					$map = array(0, $this->__fieldMappings[$column]);
+				} else {
+					$map = array(0, $column);
+				}
+				$this->map[$index++] = $map;
+			} else {
+				$this->map[$index++] = array(0, $column);
+			}
+			$j++;
+		}
+	}
+
+/**
+ * Builds final SQL statement
+ *
+ * @param string $type Query type
+ * @param array $data Query data
+ * @return string
+ */
+	function renderStatement($type, $data) {
+		switch (strtolower($type)) {
+			case 'select':
+				extract($data);
+				$fields = trim($fields);
+
+				if (strpos($limit, 'TOP') !== false && strpos($fields, 'DISTINCT ') === 0) {
+					$limit = 'DISTINCT ' . trim($limit);
+					$fields = substr($fields, 9);
+				}
+
+				if (preg_match('/offset\s+([0-9]+)/i', $limit, $offset)) {
+					$limit = preg_replace('/\s*offset.*$/i', '', $limit);
+					preg_match('/top\s+([0-9]+)/i', $limit, $limitVal);
+					$offset = intval($offset[1]) + intval($limitVal[1]);
+					$rOrder = $this->__switchSort($order);
+					list($order2, $rOrder) = array($this->__mapFields($order), $this->__mapFields($rOrder));
+					return "SELECT * FROM (SELECT {$limit} * FROM (SELECT TOP {$offset} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}) AS Set1 {$rOrder}) AS Set2 {$order2}";
+				} else {
+					return "SELECT {$limit} {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order}";
+				}
+			break;
+			case "schema":
+				extract($data);
+
+				foreach ($indexes as $i => $index) {
+					if (preg_match('/PRIMARY KEY/', $index)) {
+						unset($indexes[$i]);
+						break;
+					}
+				}
+
+				foreach (array('columns', 'indexes') as $var) {
+					if (is_array(${$var})) {
+						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
+					}
+				}
+				return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
+			break;
+			default:
+				return parent::renderStatement($type, $data);
+			break;
+		}
+	}
+
+/**
+ * Reverses the sort direction of ORDER statements to get paging offsets to work correctly
+ *
+ * @param string $order
+ * @return string
+ * @access private
+ */
+	function __switchSort($order) {
+		$order = preg_replace('/\s+ASC/i', '__tmp_asc__', $order);
+		$order = preg_replace('/\s+DESC/i', ' ASC', $order);
+		return preg_replace('/__tmp_asc__/', ' DESC', $order);
+	}
+
+/**
+ * Translates field names used for filtering and sorting to shortened names using the field map
+ *
+ * @param string $sql A snippet of SQL representing an ORDER or WHERE statement
+ * @return string The value of $sql with field names replaced
+ * @access private
+ */
+	function __mapFields($sql) {
+		if (empty($sql) || empty($this->__fieldMappings)) {
+			return $sql;
+		}
+		foreach ($this->__fieldMappings as $key => $val) {
+			$sql = preg_replace('/' . preg_quote($val) . '/', $this->name($key), $sql);
+			$sql = preg_replace('/' . preg_quote($this->name($val)) . '/', $this->name($key), $sql);
+		}
+		return $sql;
+	}
+
+/**
+ * Returns an array of all result rows for a given SQL query.
+ * Returns false if no rows matched.
+ *
+ * @param string $sql SQL statement
+ * @param boolean $cache Enables returning/storing cached query results
+ * @return array Array of resultset rows, or false if no rows matched
+ */
+	function read(&$model, $queryData = array(), $recursive = null) {
+		$results = parent::read($model, $queryData, $recursive);
+		$this->__fieldMappings = array();
+		return $results;
+	}
+
+/**
+ * Fetches the next row from the current result set
+ *
+ * @return unknown
+ */
+	function fetchResult() {
+		if ($row = mssql_fetch_row($this->results)) {
+			$resultRow = array();
+			$i = 0;
+
+			foreach ($row as $index => $field) {
+				list($table, $column) = $this->map[$index];
+				$resultRow[$table][$column] = $row[$index];
+				$i++;
+			}
+			return $resultRow;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Inserts multiple values into a table
+ *
+ * @param string $table
+ * @param string $fields
+ * @param array $values
+ * @access protected
+ */
+	function insertMulti($table, $fields, $values) {
+		$primaryKey = $this->_getPrimaryKey($table);
+		$hasPrimaryKey = $primaryKey != null && (
+			(is_array($fields) && in_array($primaryKey, $fields)
+			|| (is_string($fields) && strpos($fields, $this->startQuote . $primaryKey . $this->endQuote) !== false))
+		);
+
+		if ($hasPrimaryKey) {
+			$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($table) . ' ON');
+		}
+		parent::insertMulti($table, $fields, $values);
+		if ($hasPrimaryKey) {
+			$this->_execute('SET IDENTITY_INSERT ' . $this->fullTableName($table) . ' OFF');
+		}
+	}
+
+/**
+ * Generate a database-native column schema string
+ *
+ * @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]),
+ *   where options can be 'default', 'length', or 'key'.
+ * @return string
+ */
+	function buildColumn($column) {
+		$result = preg_replace('/(int|integer)\([0-9]+\)/i', '$1', parent::buildColumn($column));
+		if (strpos($result, 'DEFAULT NULL') !== false) {
+			$result = str_replace('DEFAULT NULL', 'NULL', $result);
+		} else if (array_keys($column) == array('type', 'name')) {
+			$result .= ' NULL';
+		}
+		return $result;
+	}
+
+/**
+ * Format indexes for create table
+ *
+ * @param array $indexes
+ * @param string $table
+ * @return string
+ */
+	function buildIndex($indexes, $table = null) {
+		$join = array();
+
+		foreach ($indexes as $name => $value) {
+			if ($name == 'PRIMARY') {
+				$join[] = 'PRIMARY KEY (' . $this->name($value['column']) . ')';
+			} else if (isset($value['unique']) && $value['unique']) {
+				$out = "ALTER TABLE {$table} ADD CONSTRAINT {$name} UNIQUE";
+
+				if (is_array($value['column'])) {
+					$value['column'] = implode(', ', array_map(array(&$this, 'name'), $value['column']));
+				} else {
+					$value['column'] = $this->name($value['column']);
+				}
+				$out .= "({$value['column']});";
+				$join[] = $out;
+			}
+		}
+		return $join;
+	}
+
+/**
+ * Makes sure it will return the primary key
+ *
+ * @param mixed $model
+ * @access protected
+ * @return string
+ */
+	function _getPrimaryKey($model) {
+		if (is_object($model)) {
+			$schema = $model->schema();
+		} else {
+			$schema = $this->describe($model);
+		}
+
+		foreach ($schema as $field => $props) {
+			if (isset($props['key']) && $props['key'] == 'primary') {
+				return $field;
+			}
+		}
+		return null;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php
new file mode 100644
index 000000000..7bd0fd64f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysql.php
@@ -0,0 +1,808 @@
+<?php
+/**
+ * MySQL layer for DBO
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @since         CakePHP(tm) v 0.10.5.1790
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Provides common base for MySQL & MySQLi connections
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ */
+class DboMysqlBase extends DboSource {
+
+/**
+ * Description property.
+ *
+ * @var string
+ */
+	var $description = "MySQL DBO Base Driver";
+
+/**
+ * Start quote
+ *
+ * @var string
+ */
+	var $startQuote = "`";
+
+/**
+ * End quote
+ *
+ * @var string
+ */
+	var $endQuote = "`";
+
+/**
+ * use alias for update and delete. Set to true if version >= 4.1
+ *
+ * @var boolean
+ * @access protected
+ */
+	var $_useAlias = true;
+
+/**
+ * Index of basic SQL commands
+ *
+ * @var array
+ * @access protected
+ */
+	var $_commands = array(
+		'begin'    => 'START TRANSACTION',
+		'commit'   => 'COMMIT',
+		'rollback' => 'ROLLBACK'
+	);
+
+/**
+ * List of engine specific additional field parameters used on table creating
+ *
+ * @var array
+ * @access public
+ */
+	var $fieldParameters = array(
+		'charset' => array('value' => 'CHARACTER SET', 'quote' => false, 'join' => ' ', 'column' => false, 'position' => 'beforeDefault'),
+		'collate' => array('value' => 'COLLATE', 'quote' => false, 'join' => ' ', 'column' => 'Collation', 'position' => 'beforeDefault'),
+		'comment' => array('value' => 'COMMENT', 'quote' => true, 'join' => ' ', 'column' => 'Comment', 'position' => 'afterDefault')
+	);
+
+/**
+ * List of table engine specific parameters used on table creating
+ *
+ * @var array
+ * @access public
+ */
+	var $tableParameters = array(
+		'charset' => array('value' => 'DEFAULT CHARSET', 'quote' => false, 'join' => '=', 'column' => 'charset'),
+		'collate' => array('value' => 'COLLATE', 'quote' => false, 'join' => '=', 'column' => 'Collation'),
+		'engine' => array('value' => 'ENGINE', 'quote' => false, 'join' => '=', 'column' => 'Engine')
+	);
+
+/**
+ * MySQL column definition
+ *
+ * @var array
+ */
+	var $columns = array(
+		'primary_key' => array('name' => 'NOT NULL AUTO_INCREMENT'),
+		'string' => array('name' => 'varchar', 'limit' => '255'),
+		'text' => array('name' => 'text'),
+		'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'),
+		'float' => array('name' => 'float', 'formatter' => 'floatval'),
+		'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'time' => array('name' => 'time', 'format' => 'H:i:s', 'formatter' => 'date'),
+		'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'),
+		'binary' => array('name' => 'blob'),
+		'boolean' => array('name' => 'tinyint', 'limit' => '1')
+	);
+
+/**
+ * Returns an array of the fields in given table name.
+ *
+ * @param string $tableName Name of database table to inspect
+ * @return array Fields in table. Keys are name and type
+ */
+	function describe(&$model) {
+		$cache = parent::describe($model);
+		if ($cache != null) {
+			return $cache;
+		}
+		$fields = false;
+		$cols = $this->query('SHOW FULL COLUMNS FROM ' . $this->fullTableName($model));
+
+		foreach ($cols as $column) {
+			$colKey = array_keys($column);
+			if (isset($column[$colKey[0]]) && !isset($column[0])) {
+				$column[0] = $column[$colKey[0]];
+			}
+			if (isset($column[0])) {
+				$fields[$column[0]['Field']] = array(
+					'type' => $this->column($column[0]['Type']),
+					'null' => ($column[0]['Null'] == 'YES' ? true : false),
+					'default' => $column[0]['Default'],
+					'length' => $this->length($column[0]['Type']),
+				);
+				if (!empty($column[0]['Key']) && isset($this->index[$column[0]['Key']])) {
+					$fields[$column[0]['Field']]['key'] = $this->index[$column[0]['Key']];
+				}
+				foreach ($this->fieldParameters as $name => $value) {
+					if (!empty($column[0][$value['column']])) {
+						$fields[$column[0]['Field']][$name] = $column[0][$value['column']];
+					}
+				}
+				if (isset($fields[$column[0]['Field']]['collate'])) {
+					$charset = $this->getCharsetName($fields[$column[0]['Field']]['collate']);
+					if ($charset) {
+						$fields[$column[0]['Field']]['charset'] = $charset;
+					}
+				}
+			}
+		}
+		$this->__cacheDescription($this->fullTableName($model, false), $fields);
+		return $fields;
+	}
+
+/**
+ * Generates and executes an SQL UPDATE statement for given model, fields, and values.
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param array $values
+ * @param mixed $conditions
+ * @return array
+ */
+	function update(&$model, $fields = array(), $values = null, $conditions = null) {
+		if (!$this->_useAlias) {
+			return parent::update($model, $fields, $values, $conditions);
+		}
+
+		if ($values == null) {
+			$combined = $fields;
+		} else {
+			$combined = array_combine($fields, $values);
+		}
+
+		$alias = $joins = false;
+		$fields = $this->_prepareUpdateFields($model, $combined, empty($conditions), !empty($conditions));
+		$fields = implode(', ', $fields);
+		$table = $this->fullTableName($model);
+
+		if (!empty($conditions)) {
+			$alias = $this->name($model->alias);
+			if ($model->name == $model->alias) {
+				$joins = implode(' ', $this->_getJoins($model));
+			}
+		}
+		$conditions = $this->conditions($this->defaultConditions($model, $conditions, $alias), true, true, $model);
+
+		if ($conditions === false) {
+			return false;
+		}
+
+		if (!$this->execute($this->renderStatement('update', compact('table', 'alias', 'joins', 'fields', 'conditions')))) {
+			$model->onError();
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Generates and executes an SQL DELETE statement for given id/conditions on given model.
+ *
+ * @param Model $model
+ * @param mixed $conditions
+ * @return boolean Success
+ */
+	function delete(&$model, $conditions = null) {
+		if (!$this->_useAlias) {
+			return parent::delete($model, $conditions);
+		}
+		$alias = $this->name($model->alias);
+		$table = $this->fullTableName($model);
+		$joins = implode(' ', $this->_getJoins($model));
+
+		if (empty($conditions)) {
+			$alias = $joins = false;
+		}
+		$complexConditions = false;
+		foreach ((array)$conditions as $key => $value) {
+			if (strpos($key, $model->alias) === false) {
+				$complexConditions = true;
+				break;
+			}
+		}
+		if (!$complexConditions) {
+			$joins = false;
+		}
+
+		$conditions = $this->conditions($this->defaultConditions($model, $conditions, $alias), true, true, $model);
+		if ($conditions === false) {
+			return false;
+		}
+		if ($this->execute($this->renderStatement('delete', compact('alias', 'table', 'joins', 'conditions'))) === false) {
+			$model->onError();
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Sets the database encoding
+ *
+ * @param string $enc Database encoding
+ */
+	function setEncoding($enc) {
+		return $this->_execute('SET NAMES ' . $enc) != false;
+	}
+
+/**
+ * Returns an array of the indexes in given datasource name.
+ *
+ * @param string $model Name of model to inspect
+ * @return array Fields in table. Keys are column and unique
+ */
+	function index($model) {
+		$index = array();
+		$table = $this->fullTableName($model);
+		if ($table) {
+			$indexes = $this->query('SHOW INDEX FROM ' . $table);
+			if (isset($indexes[0]['STATISTICS'])) {
+				$keys = Set::extract($indexes, '{n}.STATISTICS');
+			} else {
+				$keys = Set::extract($indexes, '{n}.0');
+			}
+			foreach ($keys as $i => $key) {
+				if (!isset($index[$key['Key_name']])) {
+					$col = array();
+					$index[$key['Key_name']]['column'] = $key['Column_name'];
+					$index[$key['Key_name']]['unique'] = intval($key['Non_unique'] == 0);
+				} else {
+					if (!is_array($index[$key['Key_name']]['column'])) {
+						$col[] = $index[$key['Key_name']]['column'];
+					}
+					$col[] = $key['Column_name'];
+					$index[$key['Key_name']]['column'] = $col;
+				}
+			}
+		}
+		return $index;
+	}
+
+/**
+ * Generate a MySQL Alter Table syntax for the given Schema comparison
+ *
+ * @param array $compare Result of a CakeSchema::compare()
+ * @return array Array of alter statements to make.
+ */
+	function alterSchema($compare, $table = null) {
+		if (!is_array($compare)) {
+			return false;
+		}
+		$out = '';
+		$colList = array();
+		foreach ($compare as $curTable => $types) {
+			$indexes = $tableParameters = $colList = array();
+			if (!$table || $table == $curTable) {
+				$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
+				foreach ($types as $type => $column) {
+					if (isset($column['indexes'])) {
+						$indexes[$type] = $column['indexes'];
+						unset($column['indexes']);
+					}
+					if (isset($column['tableParameters'])) {
+						$tableParameters[$type] = $column['tableParameters'];
+						unset($column['tableParameters']);
+					}
+					switch ($type) {
+						case 'add':
+							foreach ($column as $field => $col) {
+								$col['name'] = $field;
+								$alter = 'ADD ' . $this->buildColumn($col);
+								if (isset($col['after'])) {
+									$alter .= ' AFTER ' . $this->name($col['after']);
+								}
+								$colList[] = $alter;
+							}
+						break;
+						case 'drop':
+							foreach ($column as $field => $col) {
+								$col['name'] = $field;
+								$colList[] = 'DROP ' . $this->name($field);
+							}
+						break;
+						case 'change':
+							foreach ($column as $field => $col) {
+								if (!isset($col['name'])) {
+									$col['name'] = $field;
+								}
+								$colList[] = 'CHANGE ' . $this->name($field) . ' ' . $this->buildColumn($col);
+							}
+						break;
+					}
+				}
+				$colList = array_merge($colList, $this->_alterIndexes($curTable, $indexes));
+				$colList = array_merge($colList, $this->_alterTableParameters($curTable, $tableParameters));
+				$out .= "\t" . join(",\n\t", $colList) . ";\n\n";
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate a MySQL "drop table" statement for the given Schema object
+ *
+ * @param object $schema An instance of a subclass of CakeSchema
+ * @param string $table Optional.  If specified only the table name given will be generated.
+ *                      Otherwise, all tables defined in the schema are generated.
+ * @return string
+ */
+	function dropSchema($schema, $table = null) {
+		if (!is_a($schema, 'CakeSchema')) {
+			trigger_error(__('Invalid schema object', true), E_USER_WARNING);
+			return null;
+		}
+		$out = '';
+		foreach ($schema->tables as $curTable => $columns) {
+			if (!$table || $table == $curTable) {
+				$out .= 'DROP TABLE IF EXISTS ' . $this->fullTableName($curTable) . ";\n";
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate MySQL table parameter alteration statementes for a table.
+ *
+ * @param string $table Table to alter parameters for.
+ * @param array $parameters Parameters to add & drop.
+ * @return array Array of table property alteration statementes.
+ * @todo Implement this method.
+ */
+	function _alterTableParameters($table, $parameters) {
+		if (isset($parameters['change'])) {
+			return $this->buildTableParameters($parameters['change']);
+		}
+		return array();
+	}
+
+/**
+ * Generate MySQL index alteration statements for a table.
+ *
+ * @param string $table Table to alter indexes for
+ * @param array $new Indexes to add and drop
+ * @return array Index alteration statements
+ */
+	function _alterIndexes($table, $indexes) {
+		$alter = array();
+		if (isset($indexes['drop'])) {
+			foreach($indexes['drop'] as $name => $value) {
+				$out = 'DROP ';
+				if ($name == 'PRIMARY') {
+					$out .= 'PRIMARY KEY';
+				} else {
+					$out .= 'KEY ' . $name;
+				}
+				$alter[] = $out;
+			}
+		}
+		if (isset($indexes['add'])) {
+			foreach ($indexes['add'] as $name => $value) {
+				$out = 'ADD ';
+				if ($name == 'PRIMARY') {
+					$out .= 'PRIMARY ';
+					$name = null;
+				} else {
+					if (!empty($value['unique'])) {
+						$out .= 'UNIQUE ';
+					}
+				}
+				if (is_array($value['column'])) {
+					$out .= 'KEY '. $name .' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+				} else {
+					$out .= 'KEY '. $name .' (' . $this->name($value['column']) . ')';
+				}
+				$alter[] = $out;
+			}
+		}
+		return $alter;
+	}
+
+/**
+ * Inserts multiple values into a table
+ *
+ * @param string $table
+ * @param string $fields
+ * @param array $values
+ */
+	function insertMulti($table, $fields, $values) {
+		$table = $this->fullTableName($table);
+		if (is_array($fields)) {
+			$fields = implode(', ', array_map(array(&$this, 'name'), $fields));
+		}
+		$values = implode(', ', $values);
+		$this->query("INSERT INTO {$table} ({$fields}) VALUES {$values}");
+	}
+/**
+ * Returns an detailed array of sources (tables) in the database.
+ *
+ * @param string $name Table name to get parameters 
+ * @return array Array of tablenames in the database
+ */
+	function listDetailedSources($name = null) {
+		$condition = '';
+		if (is_string($name)) {
+			$condition = ' LIKE ' . $this->value($name);
+		}
+		$result = $this->query('SHOW TABLE STATUS FROM ' . $this->name($this->config['database']) . $condition . ';');
+		if (!$result) {
+			return array();
+		} else {
+			$tables = array();
+			foreach ($result as $row) {
+				$tables[$row['TABLES']['Name']] = $row['TABLES'];
+				if (!empty($row['TABLES']['Collation'])) {
+					$charset = $this->getCharsetName($row['TABLES']['Collation']);
+					if ($charset) {
+						$tables[$row['TABLES']['Name']]['charset'] = $charset;
+					}
+				}
+			}
+			if (is_string($name)) {
+				return $tables[$name];
+			}
+			return $tables;
+		}
+	}
+
+/**
+ * Converts database-layer column types to basic types
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return string Abstract column type (i.e. "string")
+ */
+	function column($real) {
+		if (is_array($real)) {
+			$col = $real['name'];
+			if (isset($real['limit'])) {
+				$col .= '('.$real['limit'].')';
+			}
+			return $col;
+		}
+
+		$col = str_replace(')', '', $real);
+		$limit = $this->length($real);
+		if (strpos($col, '(') !== false) {
+			list($col, $vals) = explode('(', $col);
+		}
+
+		if (in_array($col, array('date', 'time', 'datetime', 'timestamp'))) {
+			return $col;
+		}
+		if (($col == 'tinyint' && $limit == 1) || $col == 'boolean') {
+			return 'boolean';
+		}
+		if (strpos($col, 'int') !== false) {
+			return 'integer';
+		}
+		if (strpos($col, 'char') !== false || $col == 'tinytext') {
+			return 'string';
+		}
+		if (strpos($col, 'text') !== false) {
+			return 'text';
+		}
+		if (strpos($col, 'blob') !== false || $col == 'binary') {
+			return 'binary';
+		}
+		if (strpos($col, 'float') !== false || strpos($col, 'double') !== false || strpos($col, 'decimal') !== false) {
+			return 'float';
+		}
+		if (strpos($col, 'enum') !== false) {
+			return "enum($vals)";
+		}
+		return 'text';
+	}
+}
+
+/**
+ * MySQL DBO driver object
+ *
+ * Provides connection and SQL generation for MySQL RDMS
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ */
+class DboMysql extends DboMysqlBase {
+
+/**
+ * Datasource description
+ *
+ * @var string
+ */
+	var $description = "MySQL DBO Driver";
+
+/**
+ * Base configuration settings for MySQL driver
+ *
+ * @var array
+ */
+	var $_baseConfig = array(
+		'persistent' => true,
+		'host' => 'localhost',
+		'login' => 'root',
+		'password' => '',
+		'database' => 'cake',
+		'port' => '3306'
+	);
+
+/**
+ * Connects to the database using options in the given configuration array.
+ *
+ * @return boolean True if the database could be connected, else false
+ */
+	function connect() {
+		$config = $this->config;
+		$this->connected = false;
+
+		if (!$config['persistent']) {
+			$this->connection = mysql_connect($config['host'] . ':' . $config['port'], $config['login'], $config['password'], true);
+			$config['connect'] = 'mysql_connect';
+		} else {
+			$this->connection = mysql_pconnect($config['host'] . ':' . $config['port'], $config['login'], $config['password']);
+		}
+
+		if (mysql_select_db($config['database'], $this->connection)) {
+			$this->connected = true;
+		}
+
+		if (!empty($config['encoding'])) {
+			$this->setEncoding($config['encoding']);
+		}
+
+		$this->_useAlias = (bool)version_compare(mysql_get_server_info($this->connection), "4.1", ">=");
+
+		return $this->connected;
+	}
+
+/**
+ * Check whether the MySQL extension is installed/loaded
+ *
+ * @return boolean
+ */
+	function enabled() {
+		return extension_loaded('mysql');
+	}
+/**
+ * Disconnects from database.
+ *
+ * @return boolean True if the database could be disconnected, else false
+ */
+	function disconnect() {
+		if (isset($this->results) && is_resource($this->results)) {
+			mysql_free_result($this->results);
+		}
+		$this->connected = !@mysql_close($this->connection);
+		return !$this->connected;
+	}
+
+/**
+ * Executes given SQL statement.
+ *
+ * @param string $sql SQL statement
+ * @return resource Result resource identifier
+ * @access protected
+ */
+	function _execute($sql) {
+		return mysql_query($sql, $this->connection);
+	}
+
+/**
+ * Returns an array of sources (tables) in the database.
+ *
+ * @return array Array of tablenames in the database
+ */
+	function listSources() {
+		$cache = parent::listSources();
+		if ($cache != null) {
+			return $cache;
+		}
+		$result = $this->_execute('SHOW TABLES FROM ' . $this->name($this->config['database']) . ';');
+
+		if (!$result) {
+			return array();
+		} else {
+			$tables = array();
+
+			while ($line = mysql_fetch_row($result)) {
+				$tables[] = $line[0];
+			}
+			parent::listSources($tables);
+			return $tables;
+		}
+	}
+
+/**
+ * Returns a quoted and escaped string of $data for use in an SQL statement.
+ *
+ * @param string $data String to be prepared for use in an SQL statement
+ * @param string $column The column into which this data will be inserted
+ * @param boolean $safe Whether or not numeric data should be handled automagically if no column data is provided
+ * @return string Quoted and escaped data
+ */
+	function value($data, $column = null, $safe = false) {
+		$parent = parent::value($data, $column, $safe);
+
+		if ($parent != null) {
+			return $parent;
+		}
+		if ($data === null || (is_array($data) && empty($data))) {
+			return 'NULL';
+		}
+		if ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') {
+			return  "''";
+		}
+		if (empty($column)) {
+			$column = $this->introspectType($data);
+		}
+
+		switch ($column) {
+			case 'boolean':
+				return $this->boolean((bool)$data);
+			break;
+			case 'integer':
+			case 'float':
+				if ($data === '') {
+					return 'NULL';
+				}
+				if (is_float($data)) {
+					return sprintf('%F', $data);
+				}
+				if ((is_int($data) || $data === '0') || (
+					is_numeric($data) && strpos($data, ',') === false &&
+					$data[0] != '0' && strpos($data, 'e') === false)
+				) {
+					return $data;
+				}
+			default:
+				return "'" . mysql_real_escape_string($data, $this->connection) . "'";
+			break;
+		}
+	}
+
+/**
+ * Returns a formatted error message from previous database operation.
+ *
+ * @return string Error message with error number
+ */
+	function lastError() {
+		if (mysql_errno($this->connection)) {
+			return mysql_errno($this->connection).': '.mysql_error($this->connection);
+		}
+		return null;
+	}
+
+/**
+ * Returns number of affected rows in previous database operation. If no previous operation exists,
+ * this returns false.
+ *
+ * @return integer Number of affected rows
+ */
+	function lastAffected() {
+		if ($this->_result) {
+			return mysql_affected_rows($this->connection);
+		}
+		return null;
+	}
+
+/**
+ * Returns number of rows in previous resultset. If no previous resultset exists,
+ * this returns false.
+ *
+ * @return integer Number of rows in resultset
+ */
+	function lastNumRows() {
+		if ($this->hasResult()) {
+			return mysql_num_rows($this->_result);
+		}
+		return null;
+	}
+
+/**
+ * Returns the ID generated from the previous INSERT operation.
+ *
+ * @param unknown_type $source
+ * @return in
+ */
+	function lastInsertId($source = null) {
+		$id = $this->fetchRow('SELECT LAST_INSERT_ID() AS insertID', false);
+		if ($id !== false && !empty($id) && !empty($id[0]) && isset($id[0]['insertID'])) {
+			return $id[0]['insertID'];
+		}
+
+		return null;
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $results
+ */
+	function resultSet(&$results) {
+		if (isset($this->results) && is_resource($this->results) && $this->results != $results) {
+			mysql_free_result($this->results);
+		}
+		$this->results =& $results;
+		$this->map = array();
+		$numFields = mysql_num_fields($results);
+		$index = 0;
+		$j = 0;
+
+		while ($j < $numFields) {
+			$column = mysql_fetch_field($results, $j);
+			if (!empty($column->table) && strpos($column->name, $this->virtualFieldSeparator) === false) {
+				$this->map[$index++] = array($column->table, $column->name);
+			} else {
+				$this->map[$index++] = array(0, $column->name);
+			}
+			$j++;
+		}
+	}
+
+/**
+ * Fetches the next row from the current result set
+ *
+ * @return unknown
+ */
+	function fetchResult() {
+		if ($row = mysql_fetch_row($this->results)) {
+			$resultRow = array();
+			$i = 0;
+			foreach ($row as $index => $field) {
+				list($table, $column) = $this->map[$index];
+				$resultRow[$table][$column] = $row[$index];
+				$i++;
+			}
+			return $resultRow;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Gets the database encoding
+ *
+ * @return string The database encoding
+ */
+	function getEncoding() {
+		return mysql_client_encoding($this->connection);
+	}
+
+/**
+ * Query charset by collation
+ *
+ * @param string $name Collation name
+ * @return string Character set name
+ */
+	function getCharsetName($name) {
+		if ((bool)version_compare(mysql_get_server_info($this->connection), "5", ">=")) {
+			$cols = $this->query('SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME= ' . $this->value($name) . ';');
+			if (isset($cols[0]['COLLATIONS']['CHARACTER_SET_NAME'])) {
+				return $cols[0]['COLLATIONS']['CHARACTER_SET_NAME'];
+			}
+		}
+		return false;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php
new file mode 100644
index 000000000..844554cdd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_mysqli.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ * MySQLi layer for DBO
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @since         CakePHP(tm) v 1.1.4.2974
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Datasource', 'DboMysql');
+
+/**
+ * MySQLi DBO driver object
+ *
+ * Provides connection and SQL generation for MySQL RDMS using PHP's MySQLi Interface
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ */
+class DboMysqli extends DboMysqlBase {
+
+/**
+ * Datasource Description
+ *
+ * @var string
+ */
+	var $description = "Mysqli DBO Driver";
+
+/**
+ * Base configuration settings for Mysqli driver
+ *
+ * @var array
+ */
+	var $_baseConfig = array(
+		'persistent' => true,
+		'host' => 'localhost',
+		'login' => 'root',
+		'password' => '',
+		'database' => 'cake',
+		'port' => '3306',
+		'socket' => null
+	);
+
+/**
+ * Connects to the database using options in the given configuration array.
+ *
+ * @return boolean True if the database could be connected, else false
+ */
+	function connect() {
+		$config = $this->config;
+		$this->connected = false;
+
+		$this->connection = mysqli_connect($config['host'], $config['login'], $config['password'], $config['database'], $config['port'], $config['socket']);
+
+		if ($this->connection !== false) {
+			$this->connected = true;
+		}
+
+		$this->_useAlias = (bool)version_compare(mysqli_get_server_info($this->connection), "4.1", ">=");
+
+		if (!empty($config['encoding'])) {
+			$this->setEncoding($config['encoding']);
+		}
+		return $this->connected;
+	}
+
+/**
+ * Check that MySQLi is installed/enabled
+ *
+ * @return boolean
+ */
+	function enabled() {
+		return extension_loaded('mysqli');
+	}
+/**
+ * Disconnects from database.
+ *
+ * @return boolean True if the database could be disconnected, else false
+ */
+	function disconnect() {
+		if (isset($this->results) && is_resource($this->results)) {
+			mysqli_free_result($this->results);
+		}
+		$this->connected = !@mysqli_close($this->connection);
+		return !$this->connected;
+	}
+
+/**
+ * Executes given SQL statement.
+ *
+ * @param string $sql SQL statement
+ * @return resource Result resource identifier
+ * @access protected
+ */
+	function _execute($sql) {
+		if (preg_match('/^\s*call/i', $sql)) {
+			return $this->_executeProcedure($sql);
+		}
+		return mysqli_query($this->connection, $sql);
+	}
+
+/**
+ * Executes given SQL statement (procedure call).
+ *
+ * @param string $sql SQL statement (procedure call)
+ * @return resource Result resource identifier for first recordset
+ * @access protected
+ */
+	function _executeProcedure($sql) {
+		$answer = mysqli_multi_query($this->connection, $sql);
+
+		$firstResult = mysqli_store_result($this->connection);
+
+		if (mysqli_more_results($this->connection)) {
+			while ($lastResult = mysqli_next_result($this->connection));
+		}
+		return $firstResult;
+	}
+
+/**
+ * Returns an array of sources (tables) in the database.
+ *
+ * @return array Array of tablenames in the database
+ */
+	function listSources() {
+		$cache = parent::listSources();
+		if ($cache !== null) {
+			return $cache;
+		}
+		$result = $this->_execute('SHOW TABLES FROM ' . $this->name($this->config['database']) . ';');
+
+		if (!$result) {
+			return array();
+		}
+
+		$tables = array();
+
+		while ($line = mysqli_fetch_row($result)) {
+			$tables[] = $line[0];
+		}
+		parent::listSources($tables);
+		return $tables;
+	}
+
+/**
+ * Returns a quoted and escaped string of $data for use in an SQL statement.
+ *
+ * @param string $data String to be prepared for use in an SQL statement
+ * @param string $column The column into which this data will be inserted
+ * @param boolean $safe Whether or not numeric data should be handled automagically if no column data is provided
+ * @return string Quoted and escaped data
+ */
+	function value($data, $column = null, $safe = false) {
+		$parent = parent::value($data, $column, $safe);
+
+		if ($parent != null) {
+			return $parent;
+		}
+		if ($data === null || (is_array($data) && empty($data))) {
+			return 'NULL';
+		}
+		if ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') {
+			return "''";
+		}
+		if (empty($column)) {
+			$column = $this->introspectType($data);
+		}
+
+		switch ($column) {
+			case 'boolean':
+				return $this->boolean((bool)$data);
+			break;
+			case 'integer' :
+			case 'float' :
+			case null :
+				if ($data === '') {
+					return 'NULL';
+				}
+				if ((is_int($data) || is_float($data) || $data === '0') || (
+					is_numeric($data) && strpos($data, ',') === false &&
+					$data[0] != '0' && strpos($data, 'e') === false)) {
+						return $data;
+					}
+			default:
+				$data = "'" . mysqli_real_escape_string($this->connection, $data) . "'";
+			break;
+		}
+
+		return $data;
+	}
+
+/**
+ * Returns a formatted error message from previous database operation.
+ *
+ * @return string Error message with error number
+ */
+	function lastError() {
+		if (mysqli_errno($this->connection)) {
+			return mysqli_errno($this->connection).': '.mysqli_error($this->connection);
+		}
+		return null;
+	}
+
+/**
+ * Returns number of affected rows in previous database operation. If no previous operation exists,
+ * this returns false.
+ *
+ * @return integer Number of affected rows
+ */
+	function lastAffected() {
+		if ($this->_result) {
+			return mysqli_affected_rows($this->connection);
+		}
+		return null;
+	}
+
+/**
+ * Returns number of rows in previous resultset. If no previous resultset exists,
+ * this returns false.
+ *
+ * @return integer Number of rows in resultset
+ */
+	function lastNumRows() {
+		if ($this->hasResult()) {
+			return mysqli_num_rows($this->_result);
+		}
+		return null;
+	}
+
+/**
+ * Returns the ID generated from the previous INSERT operation.
+ *
+ * @param unknown_type $source
+ * @return in
+ */
+	function lastInsertId($source = null) {
+		$id = $this->fetchRow('SELECT LAST_INSERT_ID() AS insertID', false);
+		if ($id !== false && !empty($id) && !empty($id[0]) && isset($id[0]['insertID'])) {
+			return $id[0]['insertID'];
+		}
+		return null;
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $results
+ */
+	function resultSet(&$results) {
+		if (isset($this->results) && is_resource($this->results) && $this->results != $results) {
+			mysqli_free_result($this->results);
+		}
+		$this->results =& $results;
+		$this->map = array();
+		$numFields = mysqli_num_fields($results);
+		$index = 0;
+		$j = 0;
+		while ($j < $numFields) {
+			$column = mysqli_fetch_field_direct($results, $j);
+			if (!empty($column->table)) {
+				$this->map[$index++] = array($column->table, $column->name);
+			} else {
+				$this->map[$index++] = array(0, $column->name);
+			}
+			$j++;
+		}
+	}
+
+/**
+ * Fetches the next row from the current result set
+ *
+ * @return unknown
+ */
+	function fetchResult() {
+		if ($row = mysqli_fetch_row($this->results)) {
+			$resultRow = array();
+			foreach ($row as $index => $field) {
+				$table = $column = null;
+				if (count($this->map[$index]) === 2) {
+					list($table, $column) = $this->map[$index];
+				}
+				$resultRow[$table][$column] = $row[$index];
+			}
+			return $resultRow;
+		}
+		return false;
+	}
+
+/**
+ * Gets the database encoding
+ *
+ * @return string The database encoding
+ */
+	function getEncoding() {
+		return mysqli_client_encoding($this->connection);
+	}
+
+/**
+ * Query charset by collation
+ *
+ * @param string $name Collation name
+ * @return string Character set name
+ */
+	function getCharsetName($name) {
+		if ((bool)version_compare(mysqli_get_server_info($this->connection), "5", ">=")) {
+			$cols = $this->query('SELECT CHARACTER_SET_NAME FROM INFORMATION_SCHEMA.COLLATIONS WHERE COLLATION_NAME= ' . $this->value($name) . ';');
+			if (isset($cols[0]['COLLATIONS']['CHARACTER_SET_NAME'])) {
+				return $cols[0]['COLLATIONS']['CHARACTER_SET_NAME'];
+			}
+		}
+		return false;
+	}
+
+/**
+ * Checks if the result is valid
+ *
+ * @return boolean True if the result is valid, else false
+ */
+	function hasResult() {
+		return is_object($this->_result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php
new file mode 100644
index 000000000..38fb03382
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_oracle.php
@@ -0,0 +1,1159 @@
+<?php
+/**
+ * Oracle layer for DBO.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @since         CakePHP v 1.2.0.4041
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Oracle layer for DBO.
+ *
+ * Long description for class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ */
+class DboOracle extends DboSource {
+
+/**
+ * Configuration options
+ *
+ * @var array
+ * @access public
+ */
+	var $config = array();
+
+/**
+ * Alias
+ *
+ * @var string
+ */
+	var $alias = '';
+
+/**
+ * Sequence names as introspected from the database
+ */
+	var $_sequences = array();
+
+/**
+ * Transaction in progress flag
+ *
+ * @var boolean
+ */
+	var $__transactionStarted = false;
+
+/**
+ * Column definitions
+ *
+ * @var array
+ * @access public
+ */
+	var $columns = array(
+		'primary_key' => array('name' => ''),
+		'string' => array('name' => 'varchar2', 'limit' => '255'),
+		'text' => array('name' => 'varchar2'),
+		'integer' => array('name' => 'number'),
+		'float' => array('name' => 'float'),
+		'datetime' => array('name' => 'date', 'format' => 'Y-m-d H:i:s'),
+		'timestamp' => array('name' => 'date', 'format' => 'Y-m-d H:i:s'),
+		'time' => array('name' => 'date', 'format' => 'Y-m-d H:i:s'),
+		'date' => array('name' => 'date', 'format' => 'Y-m-d H:i:s'),
+		'binary' => array('name' => 'bytea'),
+		'boolean' => array('name' => 'boolean'),
+		'number' => array('name' => 'number'),
+		'inet' => array('name' => 'inet'));
+
+/**
+ * Connection object
+ *
+ * @var mixed
+ * @access protected
+ */
+	var $connection;
+
+/**
+ * Query limit
+ *
+ * @var int
+ * @access protected
+ */
+	var $_limit = -1;
+
+/**
+ * Query offset
+ *
+ * @var int
+ * @access protected
+ */
+	var $_offset = 0;
+
+/**
+ * Enter description here...
+ *
+ * @var unknown_type
+ * @access protected
+ */
+	var $_map;
+
+/**
+ * Current Row
+ *
+ * @var mixed
+ * @access protected
+ */
+	var $_currentRow;
+
+/**
+ * Number of rows
+ *
+ * @var int
+ * @access protected
+ */
+	var $_numRows;
+
+/**
+ * Query results
+ *
+ * @var mixed
+ * @access protected
+ */
+	var $_results;
+
+/**
+ * Last error issued by oci extension
+ *
+ * @var unknown_type
+ */
+	var $_error;
+
+/**
+ * Base configuration settings for MySQL driver
+ *
+ * @var array
+ */
+	var $_baseConfig = array(
+		'persistent' => true,
+		'host' => 'localhost',
+		'login' => 'system',
+		'password' => '',
+		'database' => 'cake',
+		'nls_sort' => '',
+		'nls_sort' => ''
+	);
+
+/**
+ * Table-sequence map
+ *
+ * @var unknown_type
+ */
+	var $_sequenceMap = array();
+
+/**
+ * Connects to the database using options in the given configuration array.
+ *
+ * @return boolean True if the database could be connected, else false
+ * @access public
+ */
+	function connect() {
+		$config = $this->config;
+		$this->connected = false;
+		$config['charset'] = !empty($config['charset']) ? $config['charset'] : null;
+
+		if (!$config['persistent']) {
+			$this->connection = @ocilogon($config['login'], $config['password'], $config['database'], $config['charset']);
+		} else {
+			$this->connection = @ociplogon($config['login'], $config['password'], $config['database'], $config['charset']);
+		}
+
+		if ($this->connection) {
+			$this->connected = true;
+			if (!empty($config['nls_sort'])) {
+				$this->execute('ALTER SESSION SET NLS_SORT='.$config['nls_sort']);
+			}
+
+			if (!empty($config['nls_comp'])) {
+				$this->execute('ALTER SESSION SET NLS_COMP='.$config['nls_comp']);
+			}
+			$this->execute("ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'");
+		} else {
+			$this->connected = false;
+			$this->_setError();
+			return false;
+		}
+		return $this->connected;
+	}
+
+/**
+ * Keeps track of the most recent Oracle error
+ *
+ */
+	function _setError($source = null, $clear = false) {
+		if ($source) {
+			$e = ocierror($source);
+		} else {
+			$e = ocierror();
+		}
+		$this->_error = $e['message'];
+		if ($clear) {
+			$this->_error = null;
+		}
+	}
+
+/**
+ * Sets the encoding language of the session
+ *
+ * @param string $lang language constant
+ * @return bool
+ */
+	function setEncoding($lang) {
+		if (!$this->execute('ALTER SESSION SET NLS_LANGUAGE='.$lang)) {
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Gets the current encoding language
+ *
+ * @return string language constant
+ */
+	function getEncoding() {
+		$sql = 'SELECT VALUE FROM NLS_SESSION_PARAMETERS WHERE PARAMETER=\'NLS_LANGUAGE\'';
+		if (!$this->execute($sql)) {
+			return false;
+		}
+
+		if (!$row = $this->fetchRow()) {
+			return false;
+		}
+		return $row[0]['VALUE'];
+	}
+
+/**
+ * Disconnects from database.
+ *
+ * @return boolean True if the database could be disconnected, else false
+ * @access public
+ */
+	function disconnect() {
+		if ($this->connection) {
+			$this->connected = !ocilogoff($this->connection);
+			return !$this->connected;
+		}
+	}
+
+/**
+ * Scrape the incoming SQL to create the association map. This is an extremely
+ * experimental method that creates the association maps since Oracle will not tell us.
+ *
+ * @param string $sql
+ * @return false if sql is nor a SELECT
+ * @access protected
+ */
+	function _scrapeSQL($sql) {
+		$sql = str_replace("\"", '', $sql);
+		$preFrom = preg_split('/\bFROM\b/', $sql);
+		$preFrom = $preFrom[0];
+		$find = array('SELECT');
+		$replace = array('');
+		$fieldList = trim(str_replace($find, $replace, $preFrom));
+		$fields = preg_split('/,\s+/', $fieldList);//explode(', ', $fieldList);
+		$lastTableName	= '';
+
+		foreach($fields as $key => $value) {
+			if ($value != 'COUNT(*) AS count') {
+				if (preg_match('/\s+(\w+(\.\w+)*)$/', $value, $matches)) {
+					$fields[$key]	= $matches[1];
+
+					if (preg_match('/^(\w+\.)/', $value, $matches)) {
+						$fields[$key]	= $matches[1] . $fields[$key];
+						$lastTableName	= $matches[1];
+					}
+				}
+				/*
+				if (preg_match('/(([[:alnum:]_]+)\.[[:alnum:]_]+)(\s+AS\s+(\w+))?$/i', $value, $matches)) {
+					$fields[$key]	= isset($matches[4]) ? $matches[2] . '.' . $matches[4] : $matches[1];
+				}
+				*/
+			}
+		}
+		$this->_map = array();
+
+		foreach($fields as $f) {
+			$e = explode('.', $f);
+			if (count($e) > 1) {
+				$table = $e[0];
+				$field = strtolower($e[1]);
+			} else {
+				$table = 0;
+				$field = $e[0];
+			}
+			$this->_map[] = array($table, $field);
+		}
+	}
+
+/**
+ * Modify a SQL query to limit (and offset) the result set
+ *
+ * @param integer $limit Maximum number of rows to return
+ * @param integer $offset Row to begin returning
+ * @return modified SQL Query
+ * @access public
+ */
+	function limit($limit = -1, $offset = 0) {
+		$this->_limit = (int) $limit;
+		$this->_offset = (int) $offset;
+	}
+
+/**
+ * Returns number of rows in previous resultset. If no previous resultset exists,
+ * this returns false.
+ *
+ * @return integer Number of rows in resultset
+ * @access public
+ */
+	function lastNumRows() {
+		return $this->_numRows;
+	}
+
+/**
+ * Executes given SQL statement. This is an overloaded method.
+ *
+ * @param string $sql SQL statement
+ * @return resource Result resource identifier or null
+ * @access protected
+ */
+	function _execute($sql) {
+		$this->_statementId = @ociparse($this->connection, $sql);
+		if (!$this->_statementId) {
+			$this->_setError($this->connection);
+			return false;
+		}
+
+		if ($this->__transactionStarted) {
+			$mode = OCI_DEFAULT;
+		} else {
+			$mode = OCI_COMMIT_ON_SUCCESS;
+		}
+
+		if (!@ociexecute($this->_statementId, $mode)) {
+			$this->_setError($this->_statementId);
+			return false;
+		}
+
+		$this->_setError(null, true);
+
+		switch(ocistatementtype($this->_statementId)) {
+			case 'DESCRIBE':
+			case 'SELECT':
+				$this->_scrapeSQL($sql);
+			break;
+			default:
+				return $this->_statementId;
+			break;
+		}
+
+		if ($this->_limit >= 1) {
+			ocisetprefetch($this->_statementId, $this->_limit);
+		} else {
+			ocisetprefetch($this->_statementId, 3000);
+		}
+		$this->_numRows = ocifetchstatement($this->_statementId, $this->_results, $this->_offset, $this->_limit, OCI_NUM | OCI_FETCHSTATEMENT_BY_ROW);
+		$this->_currentRow = 0;
+		$this->limit();
+		return $this->_statementId;
+	}
+
+/**
+ * Fetch result row
+ *
+ * @return array
+ * @access public
+ */
+	function fetchRow() {
+		if ($this->_currentRow >= $this->_numRows) {
+			ocifreestatement($this->_statementId);
+			$this->_map = null;
+			$this->_results = null;
+			$this->_currentRow = null;
+			$this->_numRows = null;
+			return false;
+		}
+		$resultRow = array();
+
+		foreach($this->_results[$this->_currentRow] as $index => $field) {
+			list($table, $column) = $this->_map[$index];
+
+			if (strpos($column, ' count')) {
+				$resultRow[0]['count'] = $field;
+			} else {
+				$resultRow[$table][$column] = $this->_results[$this->_currentRow][$index];
+			}
+		}
+		$this->_currentRow++;
+		return $resultRow;
+	}
+
+/**
+ * Fetches the next row from the current result set
+ *
+ * @return unknown
+ */
+	function fetchResult() {
+		return $this->fetchRow();
+	}
+
+/**
+ * Checks to see if a named sequence exists
+ *
+ * @param string $sequence
+ * @return bool
+ * @access public
+ */
+	function sequenceExists($sequence) {
+		$sql = "SELECT SEQUENCE_NAME FROM USER_SEQUENCES WHERE SEQUENCE_NAME = '$sequence'";
+		if (!$this->execute($sql)) {
+			return false;
+		}
+		return $this->fetchRow();
+	}
+
+/**
+ * Creates a database sequence
+ *
+ * @param string $sequence
+ * @return bool
+ * @access public
+ */
+	function createSequence($sequence) {
+		$sql = "CREATE SEQUENCE $sequence";
+		return $this->execute($sql);
+	}
+
+/**
+ * Create trigger
+ *
+ * @param string $table
+ * @return mixed
+ * @access public
+ */
+	function createTrigger($table) {
+		$sql = "CREATE OR REPLACE TRIGGER pk_$table" . "_trigger BEFORE INSERT ON $table FOR EACH ROW BEGIN SELECT pk_$table.NEXTVAL INTO :NEW.ID FROM DUAL; END;";
+		return $this->execute($sql);
+	}
+
+/**
+ * Returns an array of tables in the database. If there are no tables, an error is
+ * raised and the application exits.
+ *
+ * @return array tablenames in the database
+ * @access public
+ */
+	function listSources() {
+		$cache = parent::listSources();
+		if ($cache != null) {
+			return $cache;
+		}
+		$sql = 'SELECT view_name AS name FROM all_views UNION SELECT table_name AS name FROM all_tables';
+
+		if (!$this->execute($sql)) {
+			return false;
+		}
+		$sources = array();
+
+		while($r = $this->fetchRow()) {
+			$sources[] = strtolower($r[0]['name']);
+		}
+		parent::listSources($sources);
+		return $sources;
+	}
+
+/**
+ * Returns an array of the fields in given table name.
+ *
+ * @param object instance of a model to inspect
+ * @return array Fields in table. Keys are name and type
+ * @access public
+ */
+	function describe(&$model) {
+		$table = $this->fullTableName($model, false);
+
+		if (!empty($model->sequence)) {
+			$this->_sequenceMap[$table] = $model->sequence;
+		} elseif (!empty($model->table)) {
+			$this->_sequenceMap[$table] = $model->table . '_seq';
+		}
+
+		$cache = parent::describe($model);
+
+		if ($cache != null) {
+			return $cache;
+		}
+
+		$sql = 'SELECT COLUMN_NAME, DATA_TYPE, DATA_LENGTH FROM all_tab_columns WHERE table_name = \'';
+		$sql .= strtoupper($this->fullTableName($model)) . '\'';
+
+		if (!$this->execute($sql)) {
+			return false;
+		}
+
+		$fields = array();
+
+		for ($i = 0; $row = $this->fetchRow(); $i++) {
+			$fields[strtolower($row[0]['COLUMN_NAME'])] = array(
+				'type'=> $this->column($row[0]['DATA_TYPE']),
+				'length'=> $row[0]['DATA_LENGTH']
+			);
+		}
+		$this->__cacheDescription($this->fullTableName($model, false), $fields);
+
+		return $fields;
+	}
+
+/**
+ * Deletes all the records in a table and drops all associated auto-increment sequences.
+ * Using DELETE instead of TRUNCATE because it causes locking problems.
+ *
+ * @param mixed $table A string or model class representing the table to be truncated
+ * @param integer $reset If -1, sequences are dropped, if 0 (default), sequences are reset,
+ *						and if 1, sequences are not modified
+ * @return boolean	SQL TRUNCATE TABLE statement, false if not applicable.
+ * @access public
+ *
+ */
+	function truncate($table, $reset = 0) {
+
+		if (empty($this->_sequences)) {
+			$sql = "SELECT sequence_name FROM all_sequences";
+			$this->execute($sql);
+			while ($row = $this->fetchRow()) {
+				$this->_sequences[] = strtolower($row[0]['sequence_name']);
+			}
+		}
+
+		$this->execute('DELETE FROM ' . $this->fullTableName($table));
+		if (!isset($this->_sequenceMap[$table]) || !in_array($this->_sequenceMap[$table], $this->_sequences)) {
+			return true;
+		}
+		if ($reset === 0) {
+			$this->execute("SELECT {$this->_sequenceMap[$table]}.nextval FROM dual");
+			$row = $this->fetchRow();
+			$currval = $row[$this->_sequenceMap[$table]]['nextval'];
+
+			$this->execute("SELECT min_value FROM all_sequences WHERE sequence_name = '{$this->_sequenceMap[$table]}'");
+			$row = $this->fetchRow();
+			$min_value = $row[0]['min_value'];
+
+			if ($min_value == 1) $min_value = 0;
+			$offset = -($currval - $min_value);
+
+			$this->execute("ALTER SEQUENCE {$this->_sequenceMap[$table]} INCREMENT BY $offset MINVALUE $min_value");
+			$this->execute("SELECT {$this->_sequenceMap[$table]}.nextval FROM dual");
+			$this->execute("ALTER SEQUENCE {$this->_sequenceMap[$table]} INCREMENT BY 1");
+		} else {
+			//$this->execute("DROP SEQUENCE {$this->_sequenceMap[$table]}");
+		}
+		return true;
+	}
+
+/**
+ * Enables, disables, and lists table constraints
+ *
+ * Note: This method could have been written using a subselect for each table,
+ * however the effort Oracle expends to run the constraint introspection is very high.
+ * Therefore, this method caches the result once and loops through the arrays to find
+ * what it needs. It reduced my query time by 50%. YMMV.
+ *
+ * @param string $action
+ * @param string $table
+ * @return mixed boolean true or array of constraints
+ */
+	function constraint($action, $table) {
+		if (empty($table)) {
+			trigger_error(__('Must specify table to operate on constraints', true));
+		}
+
+		$table = strtoupper($table);
+
+		if (empty($this->_keyConstraints)) {
+			$sql = "SELECT
+					  table_name,
+					  c.constraint_name
+					FROM all_cons_columns cc
+					LEFT JOIN all_indexes i ON (cc.constraint_name = i.index_name)
+					LEFT JOIN all_constraints c ON(c.constraint_name = cc.constraint_name)";
+			$this->execute($sql);
+			while ($row = $this->fetchRow()) {
+				$this->_keyConstraints[] = array($row[0]['table_name'], $row['c']['constraint_name']);
+			}
+		}
+
+		$relatedKeys = array();
+		foreach ($this->_keyConstraints as $c) {
+			if ($c[0] == $table) {
+				$relatedKeys[] = $c[1];
+			}
+		}
+
+		if (empty($this->_constraints)) {
+			$sql = "SELECT
+					  table_name,
+					  constraint_name,
+					  r_constraint_name
+					FROM
+					  all_constraints";
+			$this->execute($sql);
+			while ($row = $this->fetchRow()) {
+				$this->_constraints[] = $row[0];
+			}
+		}
+
+		$constraints = array();
+		foreach ($this->_constraints as $c) {
+			if (in_array($c['r_constraint_name'], $relatedKeys)) {
+				$constraints[] = array($c['table_name'], $c['constraint_name']);
+			}
+		}
+
+		foreach ($constraints as $c) {
+			list($table, $constraint) = $c;
+			switch ($action) {
+				case 'enable':
+					$this->execute("ALTER TABLE $table ENABLE CONSTRAINT $constraint");
+					break;
+				case 'disable':
+					$this->execute("ALTER TABLE $table DISABLE CONSTRAINT $constraint");
+					break;
+				case 'list':
+					return $constraints;
+					break;
+				default:
+					trigger_error(__('DboOracle::constraint() accepts only enable, disable, or list', true));
+			}
+		}
+		return true;
+	}
+
+/**
+ * Returns an array of the indexes in given table name.
+ *
+ * @param string $model Name of model to inspect
+ * @return array Fields in table. Keys are column and unique
+ */
+	function index($model) {
+		$index = array();
+		$table = $this->fullTableName($model, false);
+		if ($table) {
+			$indexes = $this->query('SELECT
+			  cc.table_name,
+			  cc.column_name,
+			  cc.constraint_name,
+			  c.constraint_type,
+			  i.index_name,
+			  i.uniqueness
+			FROM all_cons_columns cc
+			LEFT JOIN all_indexes i ON(cc.constraint_name = i.index_name)
+			LEFT JOIN all_constraints c ON(c.constraint_name = cc.constraint_name)
+			WHERE cc.table_name = \'' . strtoupper($table) .'\'');
+			foreach ($indexes as $i => $idx) {
+				if ($idx['c']['constraint_type'] == 'P') {
+					$key = 'PRIMARY';
+				} else {
+					continue;
+				}
+				if (!isset($index[$key])) {
+					$index[$key]['column'] = strtolower($idx['cc']['column_name']);
+					$index[$key]['unique'] = intval($idx['i']['uniqueness'] == 'UNIQUE');
+				} else {
+					if (!is_array($index[$key]['column'])) {
+						$col[] = $index[$key]['column'];
+					}
+					$col[] = strtolower($idx['cc']['column_name']);
+					$index[$key]['column'] = $col;
+				}
+			}
+		}
+		return $index;
+	}
+
+/**
+ * Generate a Oracle Alter Table syntax for the given Schema comparison
+ *
+ * @param unknown_type $schema
+ * @return unknown
+ */
+	function alterSchema($compare, $table = null) {
+		if (!is_array($compare)) {
+			return false;
+		}
+		$out = '';
+		$colList = array();
+		foreach($compare as $curTable => $types) {
+			if (!$table || $table == $curTable) {
+				$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
+				foreach($types as $type => $column) {
+					switch($type) {
+						case 'add':
+							foreach($column as $field => $col) {
+								$col['name'] = $field;
+								$alter = 'ADD '.$this->buildColumn($col);
+								if (isset($col['after'])) {
+									$alter .= ' AFTER '. $this->name($col['after']);
+								}
+								$colList[] = $alter;
+							}
+						break;
+						case 'drop':
+							foreach($column as $field => $col) {
+								$col['name'] = $field;
+								$colList[] = 'DROP '.$this->name($field);
+							}
+						break;
+						case 'change':
+							foreach($column as $field => $col) {
+								if (!isset($col['name'])) {
+									$col['name'] = $field;
+								}
+								$colList[] = 'CHANGE '. $this->name($field).' '.$this->buildColumn($col);
+							}
+						break;
+					}
+				}
+				$out .= "\t" . implode(",\n\t", $colList) . ";\n\n";
+			}
+		}
+		return $out;
+	}
+
+/**
+ * This method should quote Oracle identifiers. Well it doesn't.
+ * It would break all scaffolding and all of Cake's default assumptions.
+ *
+ * @param unknown_type $var
+ * @return unknown
+ * @access public
+ */
+	function name($name) {
+		if (strpos($name, '.') !== false && strpos($name, '"') === false) {
+			list($model, $field) = explode('.', $name);
+			if ($field[0] == "_") {
+				$name = "$model.\"$field\"";
+			}
+		} else {
+			if ($name[0] == "_") {
+				$name = "\"$name\"";
+			}
+		}
+		return $name;
+	}
+
+/**
+ * Begin a transaction
+ *
+ * @param unknown_type $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions).
+ */
+	function begin() {
+		$this->__transactionStarted = true;
+		return true;
+	}
+
+/**
+ * Rollback a transaction
+ *
+ * @param unknown_type $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ */
+	function rollback() {
+		return ocirollback($this->connection);
+	}
+
+/**
+ * Commit a transaction
+ *
+ * @param unknown_type $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ */
+	function commit() {
+		$this->__transactionStarted = false;
+		return ocicommit($this->connection);
+	}
+
+/**
+ * Converts database-layer column types to basic types
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return string Abstract column type (i.e. "string")
+ * @access public
+ */
+	function column($real) {
+		if (is_array($real)) {
+			$col = $real['name'];
+
+			if (isset($real['limit'])) {
+				$col .= '('.$real['limit'].')';
+			}
+			return $col;
+		} else {
+			$real = strtolower($real);
+		}
+		$col = str_replace(')', '', $real);
+		$limit = null;
+		if (strpos($col, '(') !== false) {
+			list($col, $limit) = explode('(', $col);
+		}
+
+		if (in_array($col, array('date', 'timestamp'))) {
+			return $col;
+		}
+		if (strpos($col, 'number') !== false) {
+			return 'integer';
+		}
+		if (strpos($col, 'integer') !== false) {
+			return 'integer';
+		}
+		if (strpos($col, 'char') !== false) {
+			return 'string';
+		}
+		if (strpos($col, 'text') !== false) {
+			return 'text';
+		}
+		if (strpos($col, 'blob') !== false) {
+			return 'binary';
+		}
+		if (in_array($col, array('float', 'double', 'decimal'))) {
+			return 'float';
+		}
+		if ($col == 'boolean') {
+			return $col;
+		}
+		return 'text';
+	}
+
+/**
+ * Returns a quoted and escaped string of $data for use in an SQL statement.
+ *
+ * @param string $data String to be prepared for use in an SQL statement
+ * @return string Quoted and escaped
+ * @access public
+ */
+	function value($data, $column = null, $safe = false) {
+		$parent = parent::value($data, $column, $safe);
+
+		if ($parent != null) {
+			return $parent;
+		}
+
+		if ($data === null) {
+			return 'NULL';
+		}
+
+		if ($data === '') {
+			return  "''";
+		}
+
+		switch($column) {
+			case 'date':
+				$data = date('Y-m-d H:i:s', strtotime($data));
+				$data = "TO_DATE('$data', 'YYYY-MM-DD HH24:MI:SS')";
+			break;
+			case 'integer' :
+			case 'float' :
+			case null :
+				if (is_numeric($data)) {
+					break;
+				}
+			default:
+				$data = str_replace("'", "''", $data);
+				$data = "'$data'";
+			break;
+		}
+		return $data;
+	}
+
+/**
+ * Returns the ID generated from the previous INSERT operation.
+ *
+ * @param string
+ * @return integer
+ * @access public
+ */
+	function lastInsertId($source) {
+		$sequence = $this->_sequenceMap[$source];
+		$sql = "SELECT $sequence.currval FROM dual";
+
+		if (!$this->execute($sql)) {
+			return false;
+		}
+
+		while($row = $this->fetchRow()) {
+			return $row[$sequence]['currval'];
+		}
+		return false;
+	}
+
+/**
+ * Returns a formatted error message from previous database operation.
+ *
+ * @return string Error message with error number
+ * @access public
+ */
+	function lastError() {
+		return $this->_error;
+	}
+
+/**
+ * Returns number of affected rows in previous database operation. If no previous operation exists, this returns false.
+ *
+ * @return int Number of affected rows
+ * @access public
+ */
+	function lastAffected() {
+		return $this->_statementId ? ocirowcount($this->_statementId): false;
+	}
+
+/**
+ * Renders a final SQL statement by putting together the component parts in the correct order
+ *
+ * @param string $type
+ * @param array $data
+ * @return string
+ */
+	function renderStatement($type, $data) {
+		extract($data);
+		$aliases = null;
+
+		switch (strtolower($type)) {
+			case 'select':
+				return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
+			break;
+			case 'create':
+				return "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
+			break;
+			case 'update':
+				if (!empty($alias)) {
+					$aliases = "{$this->alias}{$alias} ";
+				}
+				return "UPDATE {$table} {$aliases}SET {$fields} {$conditions}";
+			break;
+			case 'delete':
+				if (!empty($alias)) {
+					$aliases = "{$this->alias}{$alias} ";
+				}
+				return "DELETE FROM {$table} {$aliases}{$conditions}";
+			break;
+			case 'schema':
+				foreach (array('columns', 'indexes') as $var) {
+					if (is_array(${$var})) {
+						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
+					}
+				}
+				if (trim($indexes) != '') {
+					$columns .= ',';
+				}
+				return "CREATE TABLE {$table} (\n{$columns}{$indexes})";
+			break;
+			case 'alter':
+				break;
+		}
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param Model $model
+ * @param unknown_type $linkModel
+ * @param string $type Association type
+ * @param unknown_type $association
+ * @param unknown_type $assocData
+ * @param unknown_type $queryData
+ * @param unknown_type $external
+ * @param unknown_type $resultSet
+ * @param integer $recursive Number of levels of association
+ * @param array $stack
+ */
+	function queryAssociation(&$model, &$linkModel, $type, $association, $assocData, &$queryData, $external = false, &$resultSet, $recursive, $stack) {
+		if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
+			if (!isset($resultSet) || !is_array($resultSet)) {
+				if (Configure::read() > 0) {
+					echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ';
+					if (isset($this->error) && $this->error != null) {
+						echo $this->error;
+					}
+					echo '</div>';
+				}
+				return null;
+			}
+			$count = count($resultSet);
+
+			if ($type === 'hasMany' && (!isset($assocData['limit']) || empty($assocData['limit']))) {
+				$ins = $fetch = array();
+				for ($i = 0; $i < $count; $i++) {
+					if ($in = $this->insertQueryData('{$__cakeID__$}', $resultSet[$i], $association, $assocData, $model, $linkModel, $stack)) {
+						$ins[] = $in;
+					}
+				}
+
+				if (!empty($ins)) {
+					$fetch = array();
+					$ins = array_chunk($ins, 1000);
+					foreach ($ins as $i) {
+						$q = str_replace('{$__cakeID__$}', implode(', ', $i), $query);
+						$q = str_replace('= (', 'IN (', $q);
+						$res = $this->fetchAll($q, $model->cacheQueries, $model->alias);
+						$fetch = array_merge($fetch, $res);
+					}
+				}
+
+				if (!empty($fetch) && is_array($fetch)) {
+					if ($recursive > 0) {
+
+						foreach ($linkModel->__associations as $type1) {
+							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
+								$deepModel =& $linkModel->{$assoc1};
+								$tmpStack = $stack;
+								$tmpStack[] = $assoc1;
+
+								if ($linkModel->useDbConfig === $deepModel->useDbConfig) {
+									$db =& $this;
+								} else {
+									$db =& ConnectionManager::getDataSource($deepModel->useDbConfig);
+								}
+								$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
+							}
+						}
+					}
+				}
+				return $this->__mergeHasMany($resultSet, $fetch, $association, $model, $linkModel, $recursive);
+			} elseif ($type === 'hasAndBelongsToMany') {
+				$ins = $fetch = array();
+				for ($i = 0; $i < $count; $i++) {
+					if ($in = $this->insertQueryData('{$__cakeID__$}', $resultSet[$i], $association, $assocData, $model, $linkModel, $stack)) {
+						$ins[] = $in;
+					}
+				}
+
+				$foreignKey = $model->hasAndBelongsToMany[$association]['foreignKey'];
+				$joinKeys = array($foreignKey, $model->hasAndBelongsToMany[$association]['associationForeignKey']);
+				list($with, $habtmFields) = $model->joinModel($model->hasAndBelongsToMany[$association]['with'], $joinKeys);
+				$habtmFieldsCount = count($habtmFields);
+
+				if (!empty($ins)) {
+					$fetch = array();
+					$ins = array_chunk($ins, 1000);
+					foreach ($ins as $i) {
+						$q = str_replace('{$__cakeID__$}', '(' .implode(', ', $i) .')', $query);
+						$q = str_replace('= (', 'IN (', $q);
+						$q = str_replace('  WHERE 1 = 1', '', $q);
+
+						$q = $this->insertQueryData($q, null, $association, $assocData, $model, $linkModel, $stack);
+						if ($q != false) {
+							$res = $this->fetchAll($q, $model->cacheQueries, $model->alias);
+							$fetch = array_merge($fetch, $res);
+						}
+					}
+				}
+			}
+
+			for ($i = 0; $i < $count; $i++) {
+				$row =& $resultSet[$i];
+
+				if ($type !== 'hasAndBelongsToMany') {
+					$q = $this->insertQueryData($query, $resultSet[$i], $association, $assocData, $model, $linkModel, $stack);
+					if ($q != false) {
+						$fetch = $this->fetchAll($q, $model->cacheQueries, $model->alias);
+					} else {
+						$fetch = null;
+					}
+				}
+
+				if (!empty($fetch) && is_array($fetch)) {
+					if ($recursive > 0) {
+
+						foreach ($linkModel->__associations as $type1) {
+							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
+
+								$deepModel =& $linkModel->{$assoc1};
+								if (($type1 === 'belongsTo') || ($deepModel->alias === $model->alias && $type === 'belongsTo') || ($deepModel->alias != $model->alias)) {
+									$tmpStack = $stack;
+									$tmpStack[] = $assoc1;
+									if ($linkModel->useDbConfig == $deepModel->useDbConfig) {
+										$db =& $this;
+									} else {
+										$db =& ConnectionManager::getDataSource($deepModel->useDbConfig);
+									}
+									$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
+								}
+							}
+						}
+					}
+					if ($type == 'hasAndBelongsToMany') {
+						$merge = array();
+						foreach($fetch as $j => $data) {
+							if (isset($data[$with]) && $data[$with][$foreignKey] === $row[$model->alias][$model->primaryKey]) {
+								if ($habtmFieldsCount > 2) {
+									$merge[] = $data;
+								} else {
+									$merge[] = Set::diff($data, array($with => $data[$with]));
+								}
+							}
+						}
+						if (empty($merge) && !isset($row[$association])) {
+							$row[$association] = $merge;
+						} else {
+							$this->__mergeAssociation($resultSet[$i], $merge, $association, $type);
+						}
+					} else {
+						$this->__mergeAssociation($resultSet[$i], $fetch, $association, $type);
+					}
+					$resultSet[$i][$association] = $linkModel->afterfind($resultSet[$i][$association]);
+
+				} else {
+					$tempArray[0][$association] = false;
+					$this->__mergeAssociation($resultSet[$i], $tempArray, $association, $type);
+				}
+			}
+		}
+	}
+
+/**
+ * Generate a "drop table" statement for the given Schema object
+ *
+ * @param object $schema An instance of a subclass of CakeSchema
+ * @param string $table Optional.  If specified only the table name given will be generated.
+ *						Otherwise, all tables defined in the schema are generated.
+ * @return string
+ */
+		function dropSchema($schema, $table = null) {
+			if (!is_a($schema, 'CakeSchema')) {
+				trigger_error(__('Invalid schema object', true), E_USER_WARNING);
+				return null;
+			}
+			$out = '';
+
+			foreach ($schema->tables as $curTable => $columns) {
+				if (!$table || $table == $curTable) {
+					$out .= 'DROP TABLE ' . $this->fullTableName($curTable) . "\n";
+				}
+			}
+			return $out;
+		}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php
new file mode 100644
index 000000000..9d1558e33
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_postgres.php
@@ -0,0 +1,980 @@
+<?php
+/**
+ * PostgreSQL layer for DBO.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @since         CakePHP(tm) v 0.9.1.114
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * PostgreSQL layer for DBO.
+ *
+ * Long description for class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ */
+class DboPostgres extends DboSource {
+
+/**
+ * Driver description
+ *
+ * @var string
+ * @access public
+ */
+	var $description = "PostgreSQL DBO Driver";
+
+/**
+ * Index of basic SQL commands
+ *
+ * @var array
+ * @access protected
+ */
+	var $_commands = array(
+		'begin'    => 'BEGIN',
+		'commit'   => 'COMMIT',
+		'rollback' => 'ROLLBACK'
+	);
+
+/**
+ * Base driver configuration settings.  Merged with user settings.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_baseConfig = array(
+		'persistent' => true,
+		'host' => 'localhost',
+		'login' => 'root',
+		'password' => '',
+		'database' => 'cake',
+		'schema' => 'public',
+		'port' => 5432,
+		'encoding' => ''
+	);
+
+	var $columns = array(
+		'primary_key' => array('name' => 'serial NOT NULL'),
+		'string' => array('name'  => 'varchar', 'limit' => '255'),
+		'text' => array('name' => 'text'),
+		'integer' => array('name' => 'integer', 'formatter' => 'intval'),
+		'float' => array('name' => 'float', 'formatter' => 'floatval'),
+		'datetime' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'time' => array('name' => 'time', 'format' => 'H:i:s', 'formatter' => 'date'),
+		'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'),
+		'binary' => array('name' => 'bytea'),
+		'boolean' => array('name' => 'boolean'),
+		'number' => array('name' => 'numeric'),
+		'inet' => array('name'  => 'inet')
+	);
+
+/**
+ * Starting Quote
+ *
+ * @var string
+ * @access public
+ */
+	var $startQuote = '"';
+
+/**
+ * Ending Quote
+ *
+ * @var string
+ * @access public
+ */
+	var $endQuote = '"';
+
+/**
+ * Contains mappings of custom auto-increment sequences, if a table uses a sequence name
+ * other than what is dictated by convention.
+ *
+ * @var array
+ */
+	var $_sequenceMap = array();
+
+/**
+ * Connects to the database using options in the given configuration array.
+ *
+ * @return True if successfully connected.
+ */
+	function connect() {
+		$config = $this->config;
+		$conn  = "host='{$config['host']}' port='{$config['port']}' dbname='{$config['database']}' ";
+		$conn .= "user='{$config['login']}' password='{$config['password']}'";
+
+		if (!$config['persistent']) {
+			$this->connection = pg_connect($conn, PGSQL_CONNECT_FORCE_NEW);
+		} else {
+			$this->connection = pg_pconnect($conn);
+		}
+		$this->connected = false;
+
+		if ($this->connection) {
+			$this->connected = true;
+			$this->_execute("SET search_path TO " . $config['schema']);
+		}
+		if (!empty($config['encoding'])) {
+			$this->setEncoding($config['encoding']);
+		}
+		return $this->connected;
+	}
+
+/**
+ * Check if PostgreSQL is enabled/loaded
+ *
+ * @return boolean
+ */
+	function enabled() {
+		return extension_loaded('pgsql');
+	}
+/**
+ * Disconnects from database.
+ *
+ * @return boolean True if the database could be disconnected, else false
+ */
+	function disconnect() {
+		if ($this->hasResult()) {
+			pg_free_result($this->_result);
+		}
+		if (is_resource($this->connection)) {
+			$this->connected = !pg_close($this->connection);
+		} else {
+			$this->connected = false;
+		}
+		return !$this->connected;
+	}
+
+/**
+ * Executes given SQL statement.
+ *
+ * @param string $sql SQL statement
+ * @return resource Result resource identifier
+ */
+	function _execute($sql) {
+		return pg_query($this->connection, $sql);
+	}
+
+/**
+ * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits.
+ *
+ * @return array Array of tablenames in the database
+ */
+	function listSources() {
+		$cache = parent::listSources();
+
+		if ($cache != null) {
+			return $cache;
+		}
+
+		$schema = $this->config['schema'];
+		$sql = "SELECT table_name as name FROM INFORMATION_SCHEMA.tables WHERE table_schema = '{$schema}';";
+		$result = $this->fetchAll($sql, false);
+
+		if (!$result) {
+			return array();
+		} else {
+			$tables = array();
+
+			foreach ($result as $item) {
+				$tables[] = $item[0]['name'];
+			}
+
+			parent::listSources($tables);
+			return $tables;
+		}
+	}
+
+/**
+ * Returns an array of the fields in given table name.
+ *
+ * @param string $tableName Name of database table to inspect
+ * @return array Fields in table. Keys are name and type
+ */
+	function &describe(&$model) {
+		$fields = parent::describe($model);
+		$table = $this->fullTableName($model, false);
+		$this->_sequenceMap[$table] = array();
+
+		if ($fields === null) {
+			$cols = $this->fetchAll(
+				"SELECT DISTINCT column_name AS name, data_type AS type, is_nullable AS null,
+					column_default AS default, ordinal_position AS position, character_maximum_length AS char_length,
+					character_octet_length AS oct_length FROM information_schema.columns
+				WHERE table_name = " . $this->value($table) . " AND table_schema = " .
+				$this->value($this->config['schema'])."  ORDER BY position",
+				false
+			);
+
+			foreach ($cols as $column) {
+				$colKey = array_keys($column);
+
+				if (isset($column[$colKey[0]]) && !isset($column[0])) {
+					$column[0] = $column[$colKey[0]];
+				}
+
+				if (isset($column[0])) {
+					$c = $column[0];
+
+					if (!empty($c['char_length'])) {
+						$length = intval($c['char_length']);
+					} elseif (!empty($c['oct_length'])) {
+						if ($c['type'] == 'character varying') {
+							$length = null;
+							$c['type'] = 'text';
+						} else {
+							$length = intval($c['oct_length']);
+						}
+					} else {
+						$length = $this->length($c['type']);
+					}
+					$fields[$c['name']] = array(
+						'type'    => $this->column($c['type']),
+						'null'    => ($c['null'] == 'NO' ? false : true),
+						'default' => preg_replace(
+							"/^'(.*)'$/",
+							"$1",
+							preg_replace('/::.*/', '', $c['default'])
+						),
+						'length'  => $length
+					);
+					if ($c['name'] == $model->primaryKey) {
+						$fields[$c['name']]['key'] = 'primary';
+						if ($fields[$c['name']]['type'] !== 'string') {
+							$fields[$c['name']]['length'] = 11;
+						}
+					}
+					if (
+						$fields[$c['name']]['default'] == 'NULL' ||
+						preg_match('/nextval\([\'"]?([\w.]+)/', $c['default'], $seq)
+					) {
+						$fields[$c['name']]['default'] = null;
+						if (!empty($seq) && isset($seq[1])) {
+							$this->_sequenceMap[$table][$c['name']] = $seq[1];
+						}
+					}
+					if ($fields[$c['name']]['type'] == 'boolean' && !empty($fields[$c['name']]['default'])) {
+						$fields[$c['name']]['default'] = constant($fields[$c['name']]['default']);
+					}
+				}
+			}
+			$this->__cacheDescription($table, $fields);
+		}
+		if (isset($model->sequence)) {
+			$this->_sequenceMap[$table][$model->primaryKey] = $model->sequence;
+		}
+		return $fields;
+	}
+
+/**
+ * Returns a quoted and escaped string of $data for use in an SQL statement.
+ *
+ * @param string $data String to be prepared for use in an SQL statement
+ * @param string $column The column into which this data will be inserted
+ * @param boolean $read Value to be used in READ or WRITE context
+ * @return string Quoted and escaped
+ * @todo Add logic that formats/escapes data based on column type
+ */
+	function value($data, $column = null, $read = true) {
+
+		$parent = parent::value($data, $column);
+		if ($parent != null) {
+			return $parent;
+		}
+
+		if ($data === null || (is_array($data) && empty($data))) {
+			return 'NULL';
+		}
+		if (empty($column)) {
+			$column = $this->introspectType($data);
+		}
+
+		switch($column) {
+			case 'binary':
+				$data = pg_escape_bytea($data);
+			break;
+			case 'boolean':
+				if ($data === true || $data === 't' || $data === 'true') {
+					return 'TRUE';
+				} elseif ($data === false || $data === 'f' || $data === 'false') {
+					return 'FALSE';
+				}
+				return (!empty($data) ? 'TRUE' : 'FALSE');
+			break;
+			case 'float':
+				if (is_float($data)) {
+					$data = sprintf('%F', $data);
+				}
+			case 'inet':
+			case 'integer':
+			case 'date':
+			case 'datetime':
+			case 'timestamp':
+			case 'time':
+				if ($data === '') {
+					return $read ? 'NULL' : 'DEFAULT';
+				}
+			default:
+				$data = pg_escape_string($data);
+			break;
+		}
+		return "'" . $data . "'";
+	}
+
+/**
+ * Returns a formatted error message from previous database operation.
+ *
+ * @return string Error message
+ */
+	function lastError() {
+		$error = pg_last_error($this->connection);
+		return ($error) ? $error : null;
+	}
+
+/**
+ * Returns number of affected rows in previous database operation. If no previous operation exists, this returns false.
+ *
+ * @return integer Number of affected rows
+ */
+	function lastAffected() {
+		return ($this->_result) ? pg_affected_rows($this->_result) : false;
+	}
+
+/**
+ * Returns number of rows in previous resultset. If no previous resultset exists,
+ * this returns false.
+ *
+ * @return integer Number of rows in resultset
+ */
+	function lastNumRows() {
+		return ($this->_result) ? pg_num_rows($this->_result) : false;
+	}
+
+/**
+ * Returns the ID generated from the previous INSERT operation.
+ *
+ * @param string $source Name of the database table
+ * @param string $field Name of the ID database field. Defaults to "id"
+ * @return integer
+ */
+	function lastInsertId($source, $field = 'id') {
+		$seq = $this->getSequence($source, $field);
+		$data = $this->fetchRow("SELECT currval('{$seq}') as max");
+		return $data[0]['max'];
+	}
+
+/**
+ * Gets the associated sequence for the given table/field
+ *
+ * @param mixed $table Either a full table name (with prefix) as a string, or a model object
+ * @param string $field Name of the ID database field. Defaults to "id"
+ * @return string The associated sequence name from the sequence map, defaults to "{$table}_{$field}_seq"
+ */
+	function getSequence($table, $field = 'id') {
+		if (is_object($table)) {
+			$table = $this->fullTableName($table, false);
+		}
+		if (isset($this->_sequenceMap[$table]) && isset($this->_sequenceMap[$table][$field])) {
+			return $this->_sequenceMap[$table][$field];
+		} else {
+			return "{$table}_{$field}_seq";
+		}
+	}
+
+/**
+ * Deletes all the records in a table and drops all associated auto-increment sequences
+ *
+ * @param mixed $table A string or model class representing the table to be truncated
+ * @param integer $reset If -1, sequences are dropped, if 0 (default), sequences are reset,
+ *						and if 1, sequences are not modified
+ * @return boolean	SQL TRUNCATE TABLE statement, false if not applicable.
+ * @access public
+ */
+	function truncate($table, $reset = 0) {
+		if (parent::truncate($table)) {
+			$table = $this->fullTableName($table, false);
+			if (isset($this->_sequenceMap[$table]) && $reset !== 1) {
+				foreach ($this->_sequenceMap[$table] as $field => $sequence) {
+					if ($reset === 0) {
+						$this->execute("ALTER SEQUENCE \"{$sequence}\" RESTART WITH 1");
+					} elseif ($reset === -1) {
+						$this->execute("DROP SEQUENCE IF EXISTS \"{$sequence}\"");
+					}
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Prepares field names to be quoted by parent
+ *
+ * @param string $data
+ * @return string SQL field
+ */
+	function name($data) {
+		if (is_string($data)) {
+			$data = str_replace('"__"', '__', $data);
+		}
+		return parent::name($data);
+	}
+
+/**
+ * Generates the fields list of an SQL query.
+ *
+ * @param Model $model
+ * @param string $alias Alias tablename
+ * @param mixed $fields
+ * @return array
+ */
+	function fields(&$model, $alias = null, $fields = array(), $quote = true) {
+		if (empty($alias)) {
+			$alias = $model->alias;
+		}
+		$fields = parent::fields($model, $alias, $fields, false);
+
+		if (!$quote) {
+			return $fields;
+		}
+		$count = count($fields);
+
+		if ($count >= 1 && strpos($fields[0], 'COUNT(*)') === false) {
+			$result = array();
+			for ($i = 0; $i < $count; $i++) {
+				if (!preg_match('/^.+\\(.*\\)/', $fields[$i]) && !preg_match('/\s+AS\s+/', $fields[$i])) {
+					if (substr($fields[$i], -1) == '*') {
+						if (strpos($fields[$i], '.') !== false && $fields[$i] != $alias . '.*') {
+							$build = explode('.', $fields[$i]);
+							$AssociatedModel = $model->{$build[0]};
+						} else {
+							$AssociatedModel = $model;
+						}
+
+						$_fields = $this->fields($AssociatedModel, $AssociatedModel->alias, array_keys($AssociatedModel->schema()));
+						$result = array_merge($result, $_fields);
+						continue;
+					}
+
+					$prepend = '';
+					if (strpos($fields[$i], 'DISTINCT') !== false) {
+						$prepend = 'DISTINCT ';
+						$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
+					}
+
+					if (strrpos($fields[$i], '.') === false) {
+						$fields[$i] = $prepend . $this->name($alias) . '.' . $this->name($fields[$i]) . ' AS ' . $this->name($alias . '__' . $fields[$i]);
+					} else {
+						$build = explode('.', $fields[$i]);
+						$fields[$i] = $prepend . $this->name($build[0]) . '.' . $this->name($build[1]) . ' AS ' . $this->name($build[0] . '__' . $build[1]);
+					}
+				} else {
+					$fields[$i] = preg_replace_callback('/\(([\s\.\w]+)\)/',  array(&$this, '__quoteFunctionField'), $fields[$i]);
+				}
+				$result[] = $fields[$i];
+			}
+			return $result;
+		}
+		return $fields;
+	}
+
+/**
+ * Auxiliary function to quote matched `(Model.fields)` from a preg_replace_callback call
+ *
+ * @param string matched string
+ * @return string quoted strig
+ * @access private
+ */
+	function __quoteFunctionField($match) {
+		$prepend = '';
+		if (strpos($match[1], 'DISTINCT') !== false) {
+			$prepend = 'DISTINCT ';
+			$match[1] = trim(str_replace('DISTINCT', '', $match[1]));
+		}
+		if (strpos($match[1], '.') === false) {
+			$match[1] = $this->name($match[1]);
+		} else {
+			$parts = explode('.', $match[1]);
+			if (!Set::numeric($parts)) {
+				$match[1] = $this->name($match[1]);
+			}
+		}
+		return '(' . $prepend .$match[1] . ')';
+	}
+
+/**
+ * Returns an array of the indexes in given datasource name.
+ *
+ * @param string $model Name of model to inspect
+ * @return array Fields in table. Keys are column and unique
+ */
+	function index($model) {
+		$index = array();
+		$table = $this->fullTableName($model, false);
+		if ($table) {
+			$indexes = $this->query("SELECT c2.relname, i.indisprimary, i.indisunique, i.indisclustered, i.indisvalid, pg_catalog.pg_get_indexdef(i.indexrelid, 0, true) as statement, c2.reltablespace
+			FROM pg_catalog.pg_class c, pg_catalog.pg_class c2, pg_catalog.pg_index i
+			WHERE c.oid  = (
+				SELECT c.oid
+				FROM pg_catalog.pg_class c LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace
+				WHERE c.relname ~ '^(" . $table . ")$'
+					AND pg_catalog.pg_table_is_visible(c.oid)
+					AND n.nspname ~ '^(" . $this->config['schema'] . ")$'
+			)
+			AND c.oid = i.indrelid AND i.indexrelid = c2.oid
+			ORDER BY i.indisprimary DESC, i.indisunique DESC, c2.relname", false);
+			foreach ($indexes as $i => $info) {
+				$key = array_pop($info);
+				if ($key['indisprimary']) {
+					$key['relname'] = 'PRIMARY';
+				}
+				$col = array();
+				preg_match('/\(([^\)]+)\)/', $key['statement'], $indexColumns);
+				$parsedColumn = $indexColumns[1];
+				if (strpos($indexColumns[1], ',') !== false) {
+					$parsedColumn = explode(', ', $indexColumns[1]);
+				}
+				$index[$key['relname']]['unique'] = $key['indisunique'];
+				$index[$key['relname']]['column'] = $parsedColumn;
+			}
+		}
+		return $index;
+	}
+
+/**
+ * Alter the Schema of a table.
+ *
+ * @param array $compare Results of CakeSchema::compare()
+ * @param string $table name of the table
+ * @access public
+ * @return array
+ */
+	function alterSchema($compare, $table = null) {
+		if (!is_array($compare)) {
+			return false;
+		}
+		$out = '';
+		$colList = array();
+		foreach ($compare as $curTable => $types) {
+			$indexes = $colList = array();
+			if (!$table || $table == $curTable) {
+				$out .= 'ALTER TABLE ' . $this->fullTableName($curTable) . " \n";
+				foreach ($types as $type => $column) {
+					if (isset($column['indexes'])) {
+						$indexes[$type] = $column['indexes'];
+						unset($column['indexes']);
+					}
+					switch ($type) {
+						case 'add':
+							foreach ($column as $field => $col) {
+								$col['name'] = $field;
+								$alter = 'ADD COLUMN '.$this->buildColumn($col);
+								if (isset($col['after'])) {
+									$alter .= ' AFTER '. $this->name($col['after']);
+								}
+								$colList[] = $alter;
+							}
+						break;
+						case 'drop':
+							foreach ($column as $field => $col) {
+								$col['name'] = $field;
+								$colList[] = 'DROP COLUMN '.$this->name($field);
+							}
+						break;
+						case 'change':
+							foreach ($column as $field => $col) {
+								if (!isset($col['name'])) {
+									$col['name'] = $field;
+								}
+								$fieldName = $this->name($field);
+
+								$default = isset($col['default']) ? $col['default'] : null;
+								$nullable = isset($col['null']) ? $col['null'] : null;
+								unset($col['default'], $col['null']);
+								$colList[] = 'ALTER COLUMN '. $fieldName .' TYPE ' . str_replace($fieldName, '', $this->buildColumn($col));
+
+								if (isset($nullable)) {
+									$nullable = ($nullable) ? 'DROP NOT NULL' : 'SET NOT NULL';
+									$colList[] = 'ALTER COLUMN '. $fieldName .'  ' . $nullable;
+								}
+
+								if (isset($default)) {
+									$colList[] = 'ALTER COLUMN '. $fieldName .'  SET DEFAULT ' . $this->value($default, $col['type']);
+								} else {
+									$colList[] = 'ALTER COLUMN '. $fieldName .'  DROP DEFAULT';
+								}
+
+							}
+						break;
+					}
+				}
+				if (isset($indexes['drop']['PRIMARY'])) {
+					$colList[] = 'DROP CONSTRAINT ' . $curTable . '_pkey';
+				}
+				if (isset($indexes['add']['PRIMARY'])) {
+					$cols = $indexes['add']['PRIMARY']['column'];
+					if (is_array($cols)) {
+						$cols = implode(', ', $cols);
+					}
+					$colList[] = 'ADD PRIMARY KEY (' . $cols . ')';
+				}
+
+				if (!empty($colList)) {
+					$out .= "\t" . implode(",\n\t", $colList) . ";\n\n";
+				} else {
+					$out = '';
+				}
+				$out .= implode(";\n\t", $this->_alterIndexes($curTable, $indexes));
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate PostgreSQL index alteration statements for a table.
+ *
+ * @param string $table Table to alter indexes for
+ * @param array $new Indexes to add and drop
+ * @return array Index alteration statements
+ */
+	function _alterIndexes($table, $indexes) {
+		$alter = array();
+		if (isset($indexes['drop'])) {
+			foreach($indexes['drop'] as $name => $value) {
+				$out = 'DROP ';
+				if ($name == 'PRIMARY') {
+					continue;
+				} else {
+					$out .= 'INDEX ' . $name;
+				}
+				$alter[] = $out;
+			}
+		}
+		if (isset($indexes['add'])) {
+			foreach ($indexes['add'] as $name => $value) {
+				$out = 'CREATE ';
+				if ($name == 'PRIMARY') {
+					continue;
+				} else {
+					if (!empty($value['unique'])) {
+						$out .= 'UNIQUE ';
+					}
+					$out .= 'INDEX ';
+				}
+				if (is_array($value['column'])) {
+					$out .= $name . ' ON ' . $table . ' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+				} else {
+					$out .= $name . ' ON ' . $table . ' (' . $this->name($value['column']) . ')';
+				}
+				$alter[] = $out;
+			}
+		}
+		return $alter;
+	}
+
+/**
+ * Returns a limit statement in the correct format for the particular database.
+ *
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
+ * @return string SQL limit/offset statement
+ */
+	function limit($limit, $offset = null) {
+		if ($limit) {
+			$rt = '';
+			if (!strpos(strtolower($limit), 'limit') || strpos(strtolower($limit), 'limit') === 0) {
+				$rt = ' LIMIT';
+			}
+
+			$rt .= ' ' . $limit;
+			if ($offset) {
+				$rt .= ' OFFSET ' . $offset;
+			}
+
+			return $rt;
+		}
+		return null;
+	}
+
+/**
+ * Converts database-layer column types to basic types
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return string Abstract column type (i.e. "string")
+ */
+	function column($real) {
+		if (is_array($real)) {
+			$col = $real['name'];
+			if (isset($real['limit'])) {
+				$col .= '(' . $real['limit'] . ')';
+			}
+			return $col;
+		}
+
+		$col = str_replace(')', '', $real);
+		$limit = null;
+
+		if (strpos($col, '(') !== false) {
+			list($col, $limit) = explode('(', $col);
+		}
+
+		$floats = array(
+			'float', 'float4', 'float8', 'double', 'double precision', 'decimal', 'real', 'numeric'
+		);
+
+		switch (true) {
+			case (in_array($col, array('date', 'time', 'inet', 'boolean'))):
+				return $col;
+			case (strpos($col, 'timestamp') !== false):
+				return 'datetime';
+			case (strpos($col, 'time') === 0):
+				return 'time';
+			case (strpos($col, 'int') !== false && $col != 'interval'):
+				return 'integer';
+			case (strpos($col, 'char') !== false || $col == 'uuid'):
+				return 'string';
+			case (strpos($col, 'text') !== false):
+				return 'text';
+			case (strpos($col, 'bytea') !== false):
+				return 'binary';
+			case (in_array($col, $floats)):
+				return 'float';
+			default:
+				return 'text';
+			break;
+		}
+	}
+
+/**
+ * Gets the length of a database-native column description, or null if no length
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return int An integer representing the length of the column
+ */
+	function length($real) {
+		$col = str_replace(array(')', 'unsigned'), '', $real);
+		$limit = null;
+
+		if (strpos($col, '(') !== false) {
+			list($col, $limit) = explode('(', $col);
+		}
+		if ($col == 'uuid') {
+			return 36;
+		}
+		if ($limit != null) {
+			return intval($limit);
+		}
+		return null;
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $results
+ */
+	function resultSet(&$results) {
+		$this->results =& $results;
+		$this->map = array();
+		$num_fields = pg_num_fields($results);
+		$index = 0;
+		$j = 0;
+
+		while ($j < $num_fields) {
+			$columnName = pg_field_name($results, $j);
+
+			if (strpos($columnName, '__')) {
+				$parts = explode('__', $columnName);
+				$this->map[$index++] = array($parts[0], $parts[1]);
+			} else {
+				$this->map[$index++] = array(0, $columnName);
+			}
+			$j++;
+		}
+	}
+
+/**
+ * Fetches the next row from the current result set
+ *
+ * @return unknown
+ */
+	function fetchResult() {
+		if ($row = pg_fetch_row($this->results)) {
+			$resultRow = array();
+
+			foreach ($row as $index => $field) {
+				list($table, $column) = $this->map[$index];
+				$type = pg_field_type($this->results, $index);
+
+				switch ($type) {
+					case 'bool':
+						$resultRow[$table][$column] = $this->boolean($row[$index], false);
+					break;
+					case 'binary':
+					case 'bytea':
+						$resultRow[$table][$column] = pg_unescape_bytea($row[$index]);
+					break;
+					default:
+						$resultRow[$table][$column] = $row[$index];
+					break;
+				}
+			}
+			return $resultRow;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Translates between PHP boolean values and PostgreSQL boolean values
+ *
+ * @param mixed $data Value to be translated
+ * @param boolean $quote	True to quote value, false otherwise
+ * @return mixed Converted boolean value
+ */
+	function boolean($data, $quote = true) {
+		switch (true) {
+			case ($data === true || $data === false):
+				return $data;
+			case ($data === 't' || $data === 'f'):
+				return ($data === 't');
+			case ($data === 'true' || $data === 'false'):
+				return ($data === 'true');
+			case ($data === 'TRUE' || $data === 'FALSE'):
+				return ($data === 'TRUE');
+			default:
+				return (bool)$data;
+			break;
+		}
+	}
+
+/**
+ * Sets the database encoding
+ *
+ * @param mixed $enc Database encoding
+ * @return boolean True on success, false on failure
+ */
+	function setEncoding($enc) {
+		return pg_set_client_encoding($this->connection, $enc) == 0;
+	}
+
+/**
+ * Gets the database encoding
+ *
+ * @return string The database encoding
+ */
+	function getEncoding() {
+		return pg_client_encoding($this->connection);
+	}
+
+/**
+ * Generate a Postgres-native column schema string
+ *
+ * @param array $column An array structured like the following:
+ *                      array('name'=>'value', 'type'=>'value'[, options]),
+ *                      where options can be 'default', 'length', or 'key'.
+ * @return string
+ */
+	function buildColumn($column) {
+		$col = $this->columns[$column['type']];
+		if (!isset($col['length']) && !isset($col['limit'])) {
+			unset($column['length']);
+		}
+		$out = preg_replace('/integer\([0-9]+\)/', 'integer', parent::buildColumn($column));
+		$out = str_replace('integer serial', 'serial', $out);
+		if (strpos($out, 'timestamp DEFAULT')) {
+			if (isset($column['null']) && $column['null']) {
+				$out = str_replace('DEFAULT NULL', '', $out);
+			} else {
+				$out = str_replace('DEFAULT NOT NULL', '', $out);
+			}
+		}
+		if (strpos($out, 'DEFAULT DEFAULT')) {
+			if (isset($column['null']) && $column['null']) {
+				$out = str_replace('DEFAULT DEFAULT', 'DEFAULT NULL', $out);
+			} elseif (in_array($column['type'], array('integer', 'float'))) {
+				$out = str_replace('DEFAULT DEFAULT', 'DEFAULT 0', $out);
+			} elseif ($column['type'] == 'boolean') {
+				$out = str_replace('DEFAULT DEFAULT', 'DEFAULT FALSE', $out);
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Format indexes for create table
+ *
+ * @param array $indexes
+ * @param string $table
+ * @return string
+ */
+	function buildIndex($indexes, $table = null) {
+		$join = array();
+		if (!is_array($indexes)) {
+			return array();
+		}
+		foreach ($indexes as $name => $value) {
+			if ($name == 'PRIMARY') {
+				$out = 'PRIMARY KEY  (' . $this->name($value['column']) . ')';
+			} else {
+				$out = 'CREATE ';
+				if (!empty($value['unique'])) {
+					$out .= 'UNIQUE ';
+				}
+				if (is_array($value['column'])) {
+					$value['column'] = implode(', ', array_map(array(&$this, 'name'), $value['column']));
+				} else {
+					$value['column'] = $this->name($value['column']);
+				}
+				$out .= "INDEX {$name} ON {$table}({$value['column']});";
+			}
+			$join[] = $out;
+		}
+		return $join;
+	}
+
+/**
+ * Overrides DboSource::renderStatement to handle schema generation with Postgres-style indexes
+ *
+ * @param string $type
+ * @param array $data
+ * @return string
+ */
+	function renderStatement($type, $data) {
+		switch (strtolower($type)) {
+			case 'schema':
+				extract($data);
+
+				foreach ($indexes as $i => $index) {
+					if (preg_match('/PRIMARY KEY/', $index)) {
+						unset($indexes[$i]);
+						$columns[] = $index;
+						break;
+					}
+				}
+				$join = array('columns' => ",\n\t", 'indexes' => "\n");
+
+				foreach (array('columns', 'indexes') as $var) {
+					if (is_array(${$var})) {
+						${$var} = implode($join[$var], array_filter(${$var}));
+					}
+				}
+				return "CREATE TABLE {$table} (\n\t{$columns}\n);\n{$indexes}";
+			break;
+			default:
+				return parent::renderStatement($type, $data);
+			break;
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php
new file mode 100644
index 000000000..efc660f33
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo/dbo_sqlite.php
@@ -0,0 +1,623 @@
+<?php
+/**
+ * SQLite layer for DBO
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ * @since         CakePHP(tm) v 0.9.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * DBO implementation for the SQLite DBMS.
+ *
+ * Long description for class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources.dbo
+ */
+class DboSqlite extends DboSource {
+
+/**
+ * Datasource Description
+ *
+ * @var string
+ */
+	var $description = "SQLite DBO Driver";
+
+/**
+ * Opening quote for quoted identifiers
+ *
+ * @var string
+ */
+	var $startQuote = '"';
+
+/**
+ * Closing quote for quoted identifiers
+ *
+ * @var string
+ */
+	var $endQuote = '"';
+
+/**
+ * Keeps the transaction statistics of CREATE/UPDATE/DELETE queries
+ *
+ * @var array
+ * @access protected
+ */
+	var $_queryStats = array();
+
+/**
+ * Base configuration settings for SQLite driver
+ *
+ * @var array
+ */
+	var $_baseConfig = array(
+		'persistent' => true,
+		'database' => null
+	);
+
+/**
+ * Index of basic SQL commands
+ *
+ * @var array
+ * @access protected
+ */
+	var $_commands = array(
+		'begin'    => 'BEGIN TRANSACTION',
+		'commit'   => 'COMMIT TRANSACTION',
+		'rollback' => 'ROLLBACK TRANSACTION'
+	);
+
+/**
+ * SQLite column definition
+ *
+ * @var array
+ */
+	var $columns = array(
+		'primary_key' => array('name' => 'integer primary key'),
+		'string' => array('name' => 'varchar', 'limit' => '255'),
+		'text' => array('name' => 'text'),
+		'integer' => array('name' => 'integer', 'limit' => 11, 'formatter' => 'intval'),
+		'float' => array('name' => 'float', 'formatter' => 'floatval'),
+		'datetime' => array('name' => 'datetime', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'timestamp' => array('name' => 'timestamp', 'format' => 'Y-m-d H:i:s', 'formatter' => 'date'),
+		'time' => array('name' => 'time', 'format' => 'H:i:s', 'formatter' => 'date'),
+		'date' => array('name' => 'date', 'format' => 'Y-m-d', 'formatter' => 'date'),
+		'binary' => array('name' => 'blob'),
+		'boolean' => array('name' => 'boolean')
+	);
+
+/**
+ * List of engine specific additional field parameters used on table creating
+ *
+ * @var array
+ * @access public
+ */
+	var $fieldParameters = array(
+		'collate' => array(
+			'value' => 'COLLATE',
+			'quote' => false,
+			'join' => ' ', 
+			'column' => 'Collate', 
+			'position' => 'afterDefault',
+			'options' => array(
+				'BINARY', 'NOCASE', 'RTRIM'
+			)
+		),
+	);
+
+/**
+ * Connects to the database using config['database'] as a filename.
+ *
+ * @param array $config Configuration array for connecting
+ * @return mixed
+ */
+	function connect() {
+		$config = $this->config;
+
+		if (!$config['persistent']) {
+			$this->connection = sqlite_open($config['database']);
+		} else {
+			$this->connection = sqlite_popen($config['database']);
+		}
+		$this->connected = is_resource($this->connection);
+
+		if ($this->connected) {
+			$this->_execute('PRAGMA count_changes = 1;');
+		}
+		return $this->connected;
+	}
+
+/**
+ * Check that SQLite is enabled/installed
+ *
+ * @return boolean
+ */
+	function enabled() {
+		return extension_loaded('sqlite');
+	}
+/**
+ * Disconnects from database.
+ *
+ * @return boolean True if the database could be disconnected, else false
+ */
+	function disconnect() {
+		@sqlite_close($this->connection);
+		$this->connected = false;
+		return $this->connected;
+	}
+
+/**
+ * Executes given SQL statement.
+ *
+ * @param string $sql SQL statement
+ * @return resource Result resource identifier
+ */
+	function _execute($sql) {
+		$result = sqlite_query($this->connection, $sql);
+
+		if (preg_match('/^(INSERT|UPDATE|DELETE)/', $sql)) {
+			$this->resultSet($result);
+			list($this->_queryStats) = $this->fetchResult();
+		}
+		return $result;
+	}
+
+/**
+ * Overrides DboSource::execute() to correctly handle query statistics
+ *
+ * @param string $sql
+ * @return unknown
+ */
+	function execute($sql) {
+		$result = parent::execute($sql);
+		$this->_queryStats = array();
+		return $result;
+	}
+
+/**
+ * Returns an array of tables in the database. If there are no tables, an error is raised and the application exits.
+ *
+ * @return array Array of tablenames in the database
+ */
+	function listSources() {
+		$cache = parent::listSources();
+
+		if ($cache != null) {
+			return $cache;
+		}
+		$result = $this->fetchAll("SELECT name FROM sqlite_master WHERE type='table' ORDER BY name;", false);
+
+		if (empty($result)) {
+			return array();
+		} else {
+			$tables = array();
+			foreach ($result as $table) {
+				$tables[] = $table[0]['name'];
+			}
+			parent::listSources($tables);
+			return $tables;
+		}
+		return array();
+	}
+
+/**
+ * Returns an array of the fields in given table name.
+ *
+ * @param string $tableName Name of database table to inspect
+ * @return array Fields in table. Keys are name and type
+ */
+	function describe(&$model) {
+		$cache = parent::describe($model);
+		if ($cache != null) {
+			return $cache;
+		}
+		$fields = array();
+		$result = $this->fetchAll('PRAGMA table_info(' . $this->fullTableName($model) . ')');
+
+		foreach ($result as $column) {
+			$fields[$column[0]['name']] = array(
+				'type' => $this->column($column[0]['type']),
+				'null' => !$column[0]['notnull'],
+				'default' => $column[0]['dflt_value'],
+				'length' => $this->length($column[0]['type'])
+			);
+			if ($column[0]['pk'] == 1) {
+				$colLength = $this->length($column[0]['type']);
+				$fields[$column[0]['name']] = array(
+					'type' => $fields[$column[0]['name']]['type'],
+					'null' => false,
+					'default' => $column[0]['dflt_value'],
+					'key' => $this->index['PRI'],
+					'length'=> ($colLength != null) ? $colLength : 11
+				);
+			}
+		}
+
+		$this->__cacheDescription($model->tablePrefix . $model->table, $fields);
+		return $fields;
+	}
+
+/**
+ * Returns a quoted and escaped string of $data for use in an SQL statement.
+ *
+ * @param string $data String to be prepared for use in an SQL statement
+ * @return string Quoted and escaped
+ */
+	function value($data, $column = null, $safe = false) {
+		$parent = parent::value($data, $column, $safe);
+
+		if ($parent != null) {
+			return $parent;
+		}
+		if ($data === null) {
+			return 'NULL';
+		}
+		if ($data === '' && $column !== 'integer' && $column !== 'float' && $column !== 'boolean') {
+			return  "''";
+		}
+		switch ($column) {
+			case 'boolean':
+				$data = $this->boolean((bool)$data);
+			break;
+			case 'integer':
+			case 'float':
+				if ($data === '') {
+					return 'NULL';
+				}
+			default:
+				$data = sqlite_escape_string($data);
+			break;
+		}
+		return "'" . $data . "'";
+	}
+
+/**
+ * Generates and executes an SQL UPDATE statement for given model, fields, and values.
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param array $values
+ * @param mixed $conditions
+ * @return array
+ */
+	function update(&$model, $fields = array(), $values = null, $conditions = null) {
+		if (empty($values) && !empty($fields)) {
+			foreach ($fields as $field => $value) {
+				if (strpos($field, $model->alias . '.') !== false) {
+					unset($fields[$field]);
+					$field = str_replace($model->alias . '.', "", $field);
+					$field = str_replace($model->alias . '.', "", $field);
+					$fields[$field] = $value;
+				}
+			}
+		}
+		$result = parent::update($model, $fields, $values, $conditions);
+		return $result;
+	}
+
+/**
+ * Deletes all the records in a table and resets the count of the auto-incrementing
+ * primary key, where applicable.
+ *
+ * @param mixed $table A string or model class representing the table to be truncated
+ * @return boolean	SQL TRUNCATE TABLE statement, false if not applicable.
+ * @access public
+ */
+	function truncate($table) {
+		return $this->execute('DELETE From ' . $this->fullTableName($table));
+	}
+
+/**
+ * Returns a formatted error message from previous database operation.
+ *
+ * @return string Error message
+ */
+	function lastError() {
+		$error = sqlite_last_error($this->connection);
+		if ($error) {
+			return $error.': '.sqlite_error_string($error);
+		}
+		return null;
+	}
+
+/**
+ * Returns number of affected rows in previous database operation. If no previous operation exists, this returns false.
+ *
+ * @return integer Number of affected rows
+ */
+	function lastAffected() {
+		if (!empty($this->_queryStats)) {
+			foreach (array('rows inserted', 'rows updated', 'rows deleted') as $key) {
+				if (array_key_exists($key, $this->_queryStats)) {
+					return $this->_queryStats[$key];
+				}
+			}
+		}
+		return false;
+	}
+
+/**
+ * Returns number of rows in previous resultset. If no previous resultset exists,
+ * this returns false.
+ *
+ * @return integer Number of rows in resultset
+ */
+	function lastNumRows() {
+		if ($this->hasResult()) {
+			sqlite_num_rows($this->_result);
+		}
+		return false;
+	}
+
+/**
+ * Returns the ID generated from the previous INSERT operation.
+ *
+ * @return int
+ */
+	function lastInsertId() {
+		return sqlite_last_insert_rowid($this->connection);
+	}
+
+/**
+ * Converts database-layer column types to basic types
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return string Abstract column type (i.e. "string")
+ */
+	function column($real) {
+		if (is_array($real)) {
+			$col = $real['name'];
+			if (isset($real['limit'])) {
+				$col .= '('.$real['limit'].')';
+			}
+			return $col;
+		}
+
+		$col = strtolower(str_replace(')', '', $real));
+		$limit = null;
+		if (strpos($col, '(') !== false) {
+			list($col, $limit) = explode('(', $col);
+		}
+
+		if (in_array($col, array('text', 'integer', 'float', 'boolean', 'timestamp', 'date', 'datetime', 'time'))) {
+			return $col;
+		}
+		if (strpos($col, 'varchar') !== false) {
+			return 'string';
+		}
+		if (in_array($col, array('blob', 'clob'))) {
+			return 'binary';
+		}
+		if (strpos($col, 'numeric') !== false) {
+			return 'float';
+		}
+		return 'text';
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $results
+ */
+	function resultSet(&$results) {
+		$this->results =& $results;
+		$this->map = array();
+		$fieldCount = sqlite_num_fields($results);
+		$index = $j = 0;
+
+		while ($j < $fieldCount) {
+			$columnName = str_replace('"', '', sqlite_field_name($results, $j));
+
+			if (strpos($columnName, '.')) {
+				$parts = explode('.', $columnName);
+				$this->map[$index++] = array($parts[0], $parts[1]);
+			} else {
+				$this->map[$index++] = array(0, $columnName);
+			}
+			$j++;
+		}
+	}
+
+/**
+ * Fetches the next row from the current result set
+ *
+ * @return unknown
+ */
+	function fetchResult() {
+		if ($row = sqlite_fetch_array($this->results, SQLITE_ASSOC)) {
+			$resultRow = array();
+			$i = 0;
+
+			foreach ($row as $index => $field) {
+				if (strpos($index, '.')) {
+					list($table, $column) = explode('.', str_replace('"', '', $index));
+					$resultRow[$table][$column] = $row[$index];
+				} else {
+					$resultRow[0][str_replace('"', '', $index)] = $row[$index];
+				}
+				$i++;
+			}
+			return $resultRow;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Returns a limit statement in the correct format for the particular database.
+ *
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
+ * @return string SQL limit/offset statement
+ */
+	function limit($limit, $offset = null) {
+		if ($limit) {
+			$rt = '';
+			if (!strpos(strtolower($limit), 'limit') || strpos(strtolower($limit), 'limit') === 0) {
+				$rt = ' LIMIT';
+			}
+			$rt .= ' ' . $limit;
+			if ($offset) {
+				$rt .= ' OFFSET ' . $offset;
+			}
+			return $rt;
+		}
+		return null;
+	}
+
+/**
+ * Generate a database-native column schema string
+ *
+ * @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]),
+ *                      where options can be 'default', 'length', or 'key'.
+ * @return string
+ */
+	function buildColumn($column) {
+		$name = $type = null;
+		$column = array_merge(array('null' => true), $column);
+		extract($column);
+
+		if (empty($name) || empty($type)) {
+			trigger_error(__('Column name or type not defined in schema', true), E_USER_WARNING);
+			return null;
+		}
+
+		if (!isset($this->columns[$type])) {
+			trigger_error(sprintf(__('Column type %s does not exist', true), $type), E_USER_WARNING);
+			return null;
+		}
+
+		$real = $this->columns[$type];
+		$out = $this->name($name) . ' ' . $real['name'];
+		if (isset($column['key']) && $column['key'] == 'primary' && $type == 'integer') {
+			return $this->name($name) . ' ' . $this->columns['primary_key']['name'];
+		}
+		return parent::buildColumn($column);
+	}
+
+/**
+ * Sets the database encoding
+ *
+ * @param string $enc Database encoding
+ */
+	function setEncoding($enc) {
+		if (!in_array($enc, array("UTF-8", "UTF-16", "UTF-16le", "UTF-16be"))) {
+			return false;
+		}
+		return $this->_execute("PRAGMA encoding = \"{$enc}\"") !== false;
+	}
+
+/**
+ * Gets the database encoding
+ *
+ * @return string The database encoding
+ */
+	function getEncoding() {
+		return $this->fetchRow('PRAGMA encoding');
+	}
+
+/**
+ * Removes redundant primary key indexes, as they are handled in the column def of the key.
+ *
+ * @param array $indexes
+ * @param string $table
+ * @return string
+ */
+	function buildIndex($indexes, $table = null) {
+		$join = array();
+
+		foreach ($indexes as $name => $value) {
+
+			if ($name == 'PRIMARY') {
+				continue;
+			}
+			$out = 'CREATE ';
+
+			if (!empty($value['unique'])) {
+				$out .= 'UNIQUE ';
+			}
+			if (is_array($value['column'])) {
+				$value['column'] = implode(', ', array_map(array(&$this, 'name'), $value['column']));
+			} else {
+				$value['column'] = $this->name($value['column']);
+			}
+			$out .= "INDEX {$name} ON {$table}({$value['column']});";
+			$join[] = $out;
+		}
+		return $join;
+	}
+
+/**
+ * Overrides DboSource::index to handle SQLite indexe introspection
+ * Returns an array of the indexes in given table name.
+ *
+ * @param string $model Name of model to inspect
+ * @return array Fields in table. Keys are column and unique
+ */
+	function index(&$model) {
+		$index = array();
+		$table = $this->fullTableName($model);
+		if ($table) {
+			$indexes = $this->query('PRAGMA index_list(' . $table . ')');
+			$tableInfo = $this->query('PRAGMA table_info(' . $table . ')');
+			foreach ($indexes as $i => $info) {
+				$key = array_pop($info);
+				$keyInfo = $this->query('PRAGMA index_info("' . $key['name'] . '")');
+				foreach ($keyInfo as $keyCol) {
+					if (!isset($index[$key['name']])) {
+						$col = array();
+						if (preg_match('/autoindex/', $key['name'])) {
+							$key['name'] = 'PRIMARY';
+						}
+						$index[$key['name']]['column'] = $keyCol[0]['name'];
+						$index[$key['name']]['unique'] = intval($key['unique'] == 1);
+					} else {
+						if (!is_array($index[$key['name']]['column'])) {
+							$col[] = $index[$key['name']]['column'];
+						}
+						$col[] = $keyCol[0]['name'];
+						$index[$key['name']]['column'] = $col;
+					}
+				}
+			}
+		}
+		return $index;
+	}
+
+/**
+ * Overrides DboSource::renderStatement to handle schema generation with SQLite-style indexes
+ *
+ * @param string $type
+ * @param array $data
+ * @return string
+ */
+	function renderStatement($type, $data) {
+		switch (strtolower($type)) {
+			case 'schema':
+				extract($data);
+
+				foreach (array('columns', 'indexes') as $var) {
+					if (is_array(${$var})) {
+						${$var} = "\t" . implode(",\n\t", array_filter(${$var}));
+					}
+				}
+				return "CREATE TABLE {$table} (\n{$columns});\n{$indexes}";
+			break;
+			default:
+				return parent::renderStatement($type, $data);
+			break;
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php
new file mode 100644
index 000000000..a851123e9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php
@@ -0,0 +1,2925 @@
+<?php
+/**
+ * Dbo Source
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('Set', 'String'));
+
+/**
+ * DboSource
+ *
+ * Creates DBO-descendant objects from a given db connection configuration
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources
+ */
+class DboSource extends DataSource {
+
+/**
+ * Description string for this Database Data Source.
+ *
+ * @var string
+ * @access public
+ */
+	var $description = "Database Data Source";
+
+/**
+ * index definition, standard cake, primary, index, unique
+ *
+ * @var array
+ */
+	var $index = array('PRI' => 'primary', 'MUL' => 'index', 'UNI' => 'unique');
+
+/**
+ * Database keyword used to assign aliases to identifiers.
+ *
+ * @var string
+ * @access public
+ */
+	var $alias = 'AS ';
+
+/**
+ * Caches result from query parsing operations.  Cached results for both DboSource::name() and
+ * DboSource::conditions() will be stored here.  Method caching uses `crc32()` which is
+ * fast but can collisions more easily than other hashing algorithms.  If you have problems
+ * with collisions, set DboSource::$cacheMethods to false.
+ *
+ * @var array
+ * @access public
+ */
+	var $methodCache = array();
+
+/**
+ * Whether or not to cache the results of DboSource::name() and DboSource::conditions()
+ * into the memory cache.  Set to false to disable the use of the memory cache.
+ *
+ * @var boolean.
+ * @access public
+ */
+	var $cacheMethods = true ;
+
+/**
+ * Bypass automatic adding of joined fields/associations.
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__bypass = false;
+
+/**
+ * The set of valid SQL operations usable in a WHERE statement
+ *
+ * @var array
+ * @access private
+ */
+	var $__sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', 'regexp', 'similar to');
+
+/**
+ * Index of basic SQL commands
+ *
+ * @var array
+ * @access protected
+ */
+	var $_commands = array(
+		'begin' => 'BEGIN',
+		'commit' => 'COMMIT',
+		'rollback' => 'ROLLBACK'
+	);
+
+/**
+ * Separator string for virtualField composition
+ *
+ * @var string
+ */
+	var $virtualFieldSeparator = '__';
+
+/**
+ * List of table engine specific parameters used on table creating
+ *
+ * @var array
+ * @access public
+ */
+	var $tableParameters = array();
+
+/**
+ * List of engine specific additional field parameters used on table creating
+ *
+ * @var array
+ * @access public
+ */
+	var $fieldParameters = array();
+
+/**
+ * Constructor
+ *
+ * @param array $config Array of configuration information for the Datasource.
+ * @param boolean $autoConnect Whether or not the datasource should automatically connect.
+ * @access public
+ */
+	function __construct($config = null, $autoConnect = true) {
+		if (!isset($config['prefix'])) {
+			$config['prefix'] = '';
+		}
+		parent::__construct($config);
+		$this->fullDebug = Configure::read() > 1;
+		if (!$this->enabled()) {
+			return false;
+		}
+		if ($autoConnect) {
+			return $this->connect();
+		} else {
+			return true;
+		}
+	}
+
+/**
+ * Reconnects to database server with optional new settings
+ *
+ * @param array $config An array defining the new configuration settings
+ * @return boolean True on success, false on failure
+ * @access public
+ */
+	function reconnect($config = array()) {
+		$this->disconnect();
+		$this->setConfig($config);
+		$this->_sources = null;
+
+		return $this->connect();
+	}
+
+/**
+ * Prepares a value, or an array of values for database queries by quoting and escaping them.
+ *
+ * @param mixed $data A value or an array of values to prepare.
+ * @param string $column The column into which this data will be inserted
+ * @param boolean $read Value to be used in READ or WRITE context
+ * @return mixed Prepared value or array of values.
+ * @access public
+ */
+	function value($data, $column = null, $read = true) {
+		if (is_array($data) && !empty($data)) {
+			return array_map(
+				array(&$this, 'value'),
+				$data, array_fill(0, count($data), $column), array_fill(0, count($data), $read)
+			);
+		} elseif (is_object($data) && isset($data->type)) {
+			if ($data->type == 'identifier') {
+				return $this->name($data->value);
+			} elseif ($data->type == 'expression') {
+				return $data->value;
+			}
+		} elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
+			return $data;
+		} else {
+			return null;
+		}
+	}
+
+/**
+ * Returns an object to represent a database identifier in a query
+ *
+ * @param string $identifier
+ * @return object An object representing a database identifier to be used in a query
+ * @access public
+ */
+	function identifier($identifier) {
+		$obj = new stdClass();
+		$obj->type = 'identifier';
+		$obj->value = $identifier;
+		return $obj;
+	}
+
+/**
+ * Returns an object to represent a database expression in a query
+ *
+ * @param string $expression
+ * @return object An object representing a database expression to be used in a query
+ * @access public
+ */
+	function expression($expression) {
+		$obj = new stdClass();
+		$obj->type = 'expression';
+		$obj->value = $expression;
+		return $obj;
+	}
+
+/**
+ * Executes given SQL statement.
+ *
+ * @param string $sql SQL statement
+ * @return boolean
+ * @access public
+ */
+	function rawQuery($sql) {
+		$this->took = $this->error = $this->numRows = false;
+		return $this->execute($sql);
+	}
+
+/**
+ * Queries the database with given SQL statement, and obtains some metadata about the result
+ * (rows affected, timing, any errors, number of rows in resultset). The query is also logged.
+ * If Configure::read('debug') is set, the log is shown all the time, else it is only shown on errors.
+ *
+ * ### Options
+ *
+ * - stats - Collect meta data stats for this query. Stats include time take, rows affected,
+ *   any errors, and number of rows returned. Defaults to `true`.
+ * - log - Whether or not the query should be logged to the memory log.
+ *
+ * @param string $sql
+ * @param array $options
+ * @return mixed Resource or object representing the result set, or false on failure
+ * @access public
+ */
+	function execute($sql, $options = array()) {
+		$defaults = array('stats' => true, 'log' => $this->fullDebug);
+		$options = array_merge($defaults, $options);
+
+		$t = getMicrotime();
+		$this->_result = $this->_execute($sql);
+		if ($options['stats']) {
+			$this->took = round((getMicrotime() - $t) * 1000, 0);
+			$this->affected = $this->lastAffected();
+			$this->error = $this->lastError();
+			$this->numRows = $this->lastNumRows();
+		}
+
+		if ($options['log']) {
+			$this->logQuery($sql);
+		}
+
+		if ($this->error) {
+			$this->showQuery($sql);
+			return false;
+		}
+		return $this->_result;
+	}
+
+/**
+ * DataSource Query abstraction
+ *
+ * @return resource Result resource identifier.
+ * @access public
+ */
+	function query() {
+		$args	  = func_get_args();
+		$fields	  = null;
+		$order	  = null;
+		$limit	  = null;
+		$page	  = null;
+		$recursive = null;
+
+		if (count($args) == 1) {
+			return $this->fetchAll($args[0]);
+
+		} elseif (count($args) > 1 && (strpos(strtolower($args[0]), 'findby') === 0 || strpos(strtolower($args[0]), 'findallby') === 0)) {
+			$params = $args[1];
+
+			if (strpos(strtolower($args[0]), 'findby') === 0) {
+				$all  = false;
+				$field = Inflector::underscore(preg_replace('/^findBy/i', '', $args[0]));
+			} else {
+				$all  = true;
+				$field = Inflector::underscore(preg_replace('/^findAllBy/i', '', $args[0]));
+			}
+
+			$or = (strpos($field, '_or_') !== false);
+			if ($or) {
+				$field = explode('_or_', $field);
+			} else {
+				$field = explode('_and_', $field);
+			}
+			$off = count($field) - 1;
+
+			if (isset($params[1 + $off])) {
+				$fields = $params[1 + $off];
+			}
+
+			if (isset($params[2 + $off])) {
+				$order = $params[2 + $off];
+			}
+
+			if (!array_key_exists(0, $params)) {
+				return false;
+			}
+
+			$c = 0;
+			$conditions = array();
+
+			foreach ($field as $f) {
+				$conditions[$args[2]->alias . '.' . $f] = $params[$c];
+				$c++;
+			}
+
+			if ($or) {
+				$conditions = array('OR' => $conditions);
+			}
+
+			if ($all) {
+				if (isset($params[3 + $off])) {
+					$limit = $params[3 + $off];
+				}
+
+				if (isset($params[4 + $off])) {
+					$page = $params[4 + $off];
+				}
+
+				if (isset($params[5 + $off])) {
+					$recursive = $params[5 + $off];
+				}
+				return $args[2]->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+			} else {
+				if (isset($params[3 + $off])) {
+					$recursive = $params[3 + $off];
+				}
+				return $args[2]->find('first', compact('conditions', 'fields', 'order', 'recursive'));
+			}
+		} else {
+			if (isset($args[1]) && $args[1] === true) {
+				return $this->fetchAll($args[0], true);
+			} else if (isset($args[1]) && !is_array($args[1]) ) {
+				return $this->fetchAll($args[0], false);
+			} else if (isset($args[1]) && is_array($args[1])) {
+				$offset = 0;
+				if (isset($args[2])) {
+					$cache = $args[2];
+				} else {
+					$cache = true;
+				}
+				$args[1] = array_map(array(&$this, 'value'), $args[1]);
+				return $this->fetchAll(String::insert($args[0], $args[1]), $cache);
+			}
+		}
+	}
+
+/**
+ * Returns a row from current resultset as an array
+ *
+ * @return array The fetched row as an array
+ * @access public
+ */
+	function fetchRow($sql = null) {
+		if (!empty($sql) && is_string($sql) && strlen($sql) > 5) {
+			if (!$this->execute($sql)) {
+				return null;
+			}
+		}
+
+		if ($this->hasResult()) {
+			$this->resultSet($this->_result);
+			$resultRow = $this->fetchResult();
+			if (!empty($resultRow)) {
+				$this->fetchVirtualField($resultRow);
+			}
+			return $resultRow;
+		} else {
+			return null;
+		}
+	}
+
+/**
+ * Returns an array of all result rows for a given SQL query.
+ * Returns false if no rows matched.
+ *
+ * @param string $sql SQL statement
+ * @param boolean $cache Enables returning/storing cached query results
+ * @return array Array of resultset rows, or false if no rows matched
+ * @access public
+ */
+	function fetchAll($sql, $cache = true, $modelName = null) {
+		if ($cache && isset($this->_queryCache[$sql])) {
+			if (preg_match('/^\s*select/i', $sql)) {
+				return $this->_queryCache[$sql];
+			}
+		}
+
+		if ($this->execute($sql)) {
+			$out = array();
+
+			$first = $this->fetchRow();
+			if ($first != null) {
+				$out[] = $first;
+			}
+			while ($this->hasResult() && $item = $this->fetchResult()) {
+				$this->fetchVirtualField($item);
+				$out[] = $item;
+			}
+
+			if ($cache) {
+				if (strpos(trim(strtolower($sql)), 'select') !== false) {
+					$this->_queryCache[$sql] = $out;
+				}
+			}
+			if (empty($out) && is_bool($this->_result)) {
+				return $this->_result;
+			}
+			return $out;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Modifies $result array to place virtual fields in model entry where they belongs to
+ *
+ * @param array $resut REference to the fetched row
+ * @return void
+ */
+	function fetchVirtualField(&$result) {
+		if (isset($result[0]) && is_array($result[0])) {
+			foreach ($result[0] as $field => $value) {
+				if (strpos($field, $this->virtualFieldSeparator) === false) {
+					continue;
+				}
+				list($alias, $virtual) = explode($this->virtualFieldSeparator, $field);
+
+				if (!ClassRegistry::isKeySet($alias)) {
+					return;
+				}
+				$model = ClassRegistry::getObject($alias);
+				if ($model->isVirtualField($virtual)) {
+					$result[$alias][$virtual] = $value;
+					unset($result[0][$field]);
+				}
+			}
+			if (empty($result[0])) {
+				unset($result[0]);
+			}
+		}
+	}
+
+/**
+ * Returns a single field of the first of query results for a given SQL query, or false if empty.
+ *
+ * @param string $name Name of the field
+ * @param string $sql SQL query
+ * @return mixed Value of field read.
+ * @access public
+ */
+	function field($name, $sql) {
+		$data = $this->fetchRow($sql);
+		if (!isset($data[$name]) || empty($data[$name])) {
+			return false;
+		} else {
+			return $data[$name];
+		}
+	}
+
+/**
+ * Empties the method caches.
+ * These caches are used by DboSource::name() and DboSource::conditions()
+ *
+ * @return void
+ */
+	function flushMethodCache() {
+		$this->methodCache = array();
+	}
+
+/**
+ * Cache a value into the methodCaches.  Will respect the value of DboSource::$cacheMethods.
+ * Will retrieve a value from the cache if $value is null.
+ *
+ * If caching is disabled and a write is attempted, the $value will be returned.
+ * A read will either return the value or null.
+ *
+ * @param string $method Name of the method being cached.
+ * @param string $key The keyname for the cache operation.
+ * @param mixed $value The value to cache into memory.
+ * @return mixed Either null on failure, or the value if its set.
+ */
+	function cacheMethod($method, $key, $value = null) {
+		if ($this->cacheMethods === false) {
+			return $value;
+		}
+		if ($value === null) {
+			return (isset($this->methodCache[$method][$key])) ? $this->methodCache[$method][$key] : null;
+		}
+		return $this->methodCache[$method][$key] = $value;
+	}
+
+/**
+ * Returns a quoted name of $data for use in an SQL statement.
+ * Strips fields out of SQL functions before quoting.
+ *
+ * Results of this method are stored in a memory cache.  This improves performance, but
+ * because the method uses a simple hashing algorithm it can infrequently have collisions.
+ * Setting DboSource::$cacheMethods to false will disable the memory cache.
+ *
+ * @param mixed $data Either a string with a column to quote. An array of columns to quote or an
+ *   object from DboSource::expression() or DboSource::identifier()
+ * @return string SQL field
+ * @access public
+ */
+	function name($data) {
+		if (is_object($data) && isset($data->type)) {
+			return $data->value;
+		}
+		if ($data === '*') {
+			return '*';
+		}
+		if (is_array($data)) {
+			foreach ($data as $i => $dataItem) {
+				$data[$i] = $this->name($dataItem);
+			}
+			return $data;
+		}
+		$cacheKey = crc32($this->startQuote.$data.$this->endQuote);
+		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
+			return $return;
+		}
+		$data = trim($data);
+		if (preg_match('/^[\w-]+(?:\.[^ \*]*)*$/', $data)) { // string, string.string
+			if (strpos($data, '.') === false) { // string
+				return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
+			}
+			$items = explode('.', $data);
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,
+				$this->startQuote . implode($this->endQuote . '.' . $this->startQuote, $items) . $this->endQuote
+			);
+		}
+		if (preg_match('/^[\w-]+\.\*$/', $data)) { // string.*
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,
+				$this->startQuote . str_replace('.*', $this->endQuote . '.*', $data)
+			);
+		}
+		if (preg_match('/^([\w-]+)\((.*)\)$/', $data, $matches)) { // Functions
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,
+				 $matches[1] . '(' . $this->name($matches[2]) . ')'
+			);
+		}
+		if (
+			preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches
+		)) {
+			return $this->cacheMethod(
+				__FUNCTION__, $cacheKey,
+				preg_replace(
+					'/\s{2,}/', ' ', $this->name($matches[1]) . ' ' . $this->alias . ' ' . $this->name($matches[3])
+				)
+			);
+		}
+		if (preg_match('/^[\w-_\s]*[\w-_]+/', $data)) {
+			return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
+		}
+		return $this->cacheMethod(__FUNCTION__, $cacheKey, $data);
+	}
+
+/**
+ * Checks if the source is connected to the database.
+ *
+ * @return boolean True if the database is connected, else false
+ * @access public
+ */
+	function isConnected() {
+		return $this->connected;
+	}
+
+/**
+ * Checks if the result is valid
+ *
+ * @return boolean True if the result is valid else false
+ * @access public
+ */
+	function hasResult() {
+		return is_resource($this->_result);
+	}
+
+/**
+ * Get the query log as an array.
+ *
+ * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
+ * @return array Array of queries run as an array
+ * @access public
+ */
+	function getLog($sorted = false, $clear = true) {
+		if ($sorted) {
+			$log = sortByKey($this->_queriesLog, 'took', 'desc', SORT_NUMERIC);
+		} else {
+			$log = $this->_queriesLog;
+		}
+		if ($clear) {
+			$this->_queriesLog = array();
+		}
+		return array('log' => $log, 'count' => $this->_queriesCnt, 'time' => $this->_queriesTime);
+	}
+
+/**
+ * Outputs the contents of the queries log. If in a non-CLI environment the sql_log element
+ * will be rendered and output.  If in a CLI environment, a plain text log is generated.
+ *
+ * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
+ * @return void
+ */
+	function showLog($sorted = false) {
+		$log = $this->getLog($sorted, false);
+		if (empty($log['log'])) {
+			return;
+		}
+		if (PHP_SAPI != 'cli') {
+			App::import('Core', 'View');
+			$controller = null;
+			$View =& new View($controller, false);
+			$View->set('logs', array($this->configKeyName => $log));
+			echo $View->element('sql_dump', array('_forced_from_dbo_' => true));
+		} else {
+			foreach ($log['log'] as $k => $i) {
+				print (($k + 1) . ". {$i['query']} {$i['error']}\n");
+			}
+		}
+	}
+
+/**
+ * Log given SQL query.
+ *
+ * @param string $sql SQL statement
+ * @todo: Add hook to log errors instead of returning false
+ * @access public
+ */
+	function logQuery($sql) {
+		$this->_queriesCnt++;
+		$this->_queriesTime += $this->took;
+		$this->_queriesLog[] = array(
+			'query' => $sql,
+			'error'		=> $this->error,
+			'affected'	=> $this->affected,
+			'numRows'	=> $this->numRows,
+			'took'		=> $this->took
+		);
+		if (count($this->_queriesLog) > $this->_queriesLogMax) {
+			array_pop($this->_queriesLog);
+		}
+		if ($this->error) {
+			return false;
+		}
+	}
+
+/**
+ * Output information about an SQL query. The SQL statement, number of rows in resultset,
+ * and execution time in microseconds. If the query fails, an error is output instead.
+ *
+ * @param string $sql Query to show information on.
+ * @access public
+ */
+	function showQuery($sql) {
+		$error = $this->error;
+		if (strlen($sql) > 200 && !$this->fullDebug && Configure::read() > 1) {
+			$sql = substr($sql, 0, 200) . '[...]';
+		}
+		if (Configure::read() > 0) {
+			$out = null;
+			if ($error) {
+				trigger_error('<span style="color:Red;text-align:left"><b>' . __('SQL Error:', true) . "</b> {$this->error}</span>", E_USER_WARNING);
+			} else {
+				$out = ('<small>[' . sprintf(__('Aff:%s Num:%s Took:%sms', true), $this->affected, $this->numRows, $this->took) . ']</small>');
+			}
+			pr(sprintf('<p style="text-align:left"><b>' . __('Query:', true) . '</b> %s %s</p>', $sql, $out));
+		}
+	}
+
+/**
+ * Gets full table name including prefix
+ *
+ * @param mixed $model Either a Model object or a string table name.
+ * @param boolean $quote Whether you want the table name quoted.
+ * @return string Full quoted table name
+ * @access public
+ */
+	function fullTableName($model, $quote = true) {
+		if (is_object($model)) {
+			$table = $model->tablePrefix . $model->table;
+		} elseif (isset($this->config['prefix'])) {
+			$table = $this->config['prefix'] . strval($model);
+		} else {
+			$table = strval($model);
+		}
+		if ($quote) {
+			return $this->name($table);
+		}
+		return $table;
+	}
+
+/**
+ * The "C" in CRUD
+ *
+ * Creates new records in the database.
+ *
+ * @param Model $model Model object that the record is for.
+ * @param array $fields An array of field names to insert. If null, $model->data will be
+ *   used to generate field names.
+ * @param array $values An array of values with keys matching the fields. If null, $model->data will
+ *   be used to generate values.
+ * @return boolean Success
+ * @access public
+ */
+	function create(&$model, $fields = null, $values = null) {
+		$id = null;
+
+		if ($fields == null) {
+			unset($fields, $values);
+			$fields = array_keys($model->data);
+			$values = array_values($model->data);
+		}
+		$count = count($fields);
+
+		for ($i = 0; $i < $count; $i++) {
+			$valueInsert[] = $this->value($values[$i], $model->getColumnType($fields[$i]), false);
+		}
+		for ($i = 0; $i < $count; $i++) {
+			$fieldInsert[] = $this->name($fields[$i]);
+			if ($fields[$i] == $model->primaryKey) {
+				$id = $values[$i];
+			}
+		}
+		$query = array(
+			'table' => $this->fullTableName($model),
+			'fields' => implode(', ', $fieldInsert),
+			'values' => implode(', ', $valueInsert)
+		);
+
+		if ($this->execute($this->renderStatement('create', $query))) {
+			if (empty($id)) {
+				$id = $this->lastInsertId($this->fullTableName($model, false), $model->primaryKey);
+			}
+			$model->setInsertID($id);
+			$model->id = $id;
+			return true;
+		} else {
+			$model->onError();
+			return false;
+		}
+	}
+
+/**
+ * The "R" in CRUD
+ *
+ * Reads record(s) from the database.
+ *
+ * @param Model $model A Model object that the query is for.
+ * @param array $queryData An array of queryData information containing keys similar to Model::find()
+ * @param integer $recursive Number of levels of association
+ * @return mixed boolean false on error/failure.  An array of results on success.
+ */
+	function read(&$model, $queryData = array(), $recursive = null) {
+		$queryData = $this->__scrubQueryData($queryData);
+
+		$null = null;
+		$array = array();
+		$linkedModels = array();
+		$this->__bypass = false;
+		$this->__booleans = array();
+
+		if ($recursive === null && isset($queryData['recursive'])) {
+			$recursive = $queryData['recursive'];
+		}
+
+		if (!is_null($recursive)) {
+			$_recursive = $model->recursive;
+			$model->recursive = $recursive;
+		}
+
+		if (!empty($queryData['fields'])) {
+			$this->__bypass = true;
+			$queryData['fields'] = $this->fields($model, null, $queryData['fields']);
+		} else {
+			$queryData['fields'] = $this->fields($model);
+		}
+
+		$_associations = $model->__associations;
+
+		if ($model->recursive == -1) {
+			$_associations = array();
+		} else if ($model->recursive == 0) {
+			unset($_associations[2], $_associations[3]);
+		}
+
+		foreach ($_associations as $type) {
+			foreach ($model->{$type} as $assoc => $assocData) {
+				$linkModel =& $model->{$assoc};
+				$external = isset($assocData['external']);
+
+				if ($model->useDbConfig == $linkModel->useDbConfig) {
+					if (true === $this->generateAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null)) {
+						$linkedModels[$type . '/' . $assoc] = true;
+					}
+				}
+			}
+		}
+
+		$query = $this->generateAssociationQuery($model, $null, null, null, null, $queryData, false, $null);
+
+		$resultSet = $this->fetchAll($query, $model->cacheQueries, $model->alias);
+
+		if ($resultSet === false) {
+			$model->onError();
+			return false;
+		}
+
+		$filtered = $this->__filterResults($resultSet, $model);
+
+		if ($model->recursive > -1) {
+			foreach ($_associations as $type) {
+				foreach ($model->{$type} as $assoc => $assocData) {
+					$linkModel =& $model->{$assoc};
+
+					if (empty($linkedModels[$type . '/' . $assoc])) {
+						if ($model->useDbConfig == $linkModel->useDbConfig) {
+							$db =& $this;
+						} else {
+							$db =& ConnectionManager::getDataSource($linkModel->useDbConfig);
+						}
+					} elseif ($model->recursive > 1 && ($type == 'belongsTo' || $type == 'hasOne')) {
+						$db =& $this;
+					}
+
+					if (isset($db) && method_exists($db, 'queryAssociation')) {
+						$stack = array($assoc);
+						$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
+						unset($db);
+
+						if ($type === 'hasMany') {
+							$filtered []= $assoc;
+						}
+					}
+				}
+			}
+			$this->__filterResults($resultSet, $model, $filtered);
+		}
+
+		if (!is_null($recursive)) {
+			$model->recursive = $_recursive;
+		}
+		return $resultSet;
+	}
+
+/**
+ * Passes association results thru afterFind filters of corresponding model
+ *
+ * @param array $results Reference of resultset to be filtered
+ * @param object $model Instance of model to operate against
+ * @param array $filtered List of classes already filtered, to be skipped
+ * @return array Array of results that have been filtered through $model->afterFind
+ * @access private
+ */
+	function __filterResults(&$results, &$model, $filtered = array()) {
+		$filtering = array();
+		$count = count($results);
+
+		for ($i = 0; $i < $count; $i++) {
+			if (is_array($results[$i])) {
+				$classNames = array_keys($results[$i]);
+				$count2 = count($classNames);
+
+				for ($j = 0; $j < $count2; $j++) {
+					$className = $classNames[$j];
+					if ($model->alias != $className && !in_array($className, $filtered)) {
+						if (!in_array($className, $filtering)) {
+							$filtering[] = $className;
+						}
+
+						if (isset($model->{$className}) && is_object($model->{$className})) {
+							$data = $model->{$className}->afterFind(array(array($className => $results[$i][$className])), false);
+						}
+						if (isset($data[0][$className])) {
+							$results[$i][$className] = $data[0][$className];
+						}
+					}
+				}
+			}
+		}
+		return $filtering;
+	}
+
+/**
+ * Queries associations.  Used to fetch results on recursive models.
+ *
+ * @param Model $model Primary Model object
+ * @param Model $linkModel Linked model that
+ * @param string $type Association type, one of the model association types ie. hasMany
+ * @param unknown_type $association
+ * @param unknown_type $assocData
+ * @param array $queryData
+ * @param boolean $external Whether or not the association query is on an external datasource.
+ * @param array $resultSet Existing results
+ * @param integer $recursive Number of levels of association
+ * @param array $stack
+ */
+	function queryAssociation(&$model, &$linkModel, $type, $association, $assocData, &$queryData, $external = false, &$resultSet, $recursive, $stack) {
+		if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
+			if (!isset($resultSet) || !is_array($resultSet)) {
+				if (Configure::read() > 0) {
+					echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ';
+					if (isset($this->error) && $this->error != null) {
+						echo $this->error;
+					}
+					echo '</div>';
+				}
+				return null;
+			}
+			$count = count($resultSet);
+
+			if ($type === 'hasMany' && empty($assocData['limit']) && !empty($assocData['foreignKey'])) {
+				$ins = $fetch = array();
+				for ($i = 0; $i < $count; $i++) {
+					if ($in = $this->insertQueryData('{$__cakeID__$}', $resultSet[$i], $association, $assocData, $model, $linkModel, $stack)) {
+						$ins[] = $in;
+					}
+				}
+
+				if (!empty($ins)) {
+					$ins = array_unique($ins);
+					$fetch = $this->fetchAssociated($model, $query, $ins);
+				}
+
+				if (!empty($fetch) && is_array($fetch)) {
+					if ($recursive > 0) {
+						foreach ($linkModel->__associations as $type1) {
+							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
+								$deepModel =& $linkModel->{$assoc1};
+								$tmpStack = $stack;
+								$tmpStack[] = $assoc1;
+
+								if ($linkModel->useDbConfig === $deepModel->useDbConfig) {
+									$db =& $this;
+								} else {
+									$db =& ConnectionManager::getDataSource($deepModel->useDbConfig);
+								}
+								$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
+							}
+						}
+					}
+				}
+				$this->__filterResults($fetch, $model);
+				return $this->__mergeHasMany($resultSet, $fetch, $association, $model, $linkModel, $recursive);
+			} elseif ($type === 'hasAndBelongsToMany') {
+				$ins = $fetch = array();
+				for ($i = 0; $i < $count; $i++) {
+					if ($in = $this->insertQueryData('{$__cakeID__$}', $resultSet[$i], $association, $assocData, $model, $linkModel, $stack)) {
+						$ins[] = $in;
+					}
+				}
+				if (!empty($ins)) {
+					$ins = array_unique($ins);
+					if (count($ins) > 1) {
+						$query = str_replace('{$__cakeID__$}', '(' .implode(', ', $ins) .')', $query);
+						$query = str_replace('= (', 'IN (', $query);
+					} else {
+						$query = str_replace('{$__cakeID__$}',$ins[0], $query);
+					}
+
+					$query = str_replace(' WHERE 1 = 1', '', $query);
+				}
+
+				$foreignKey = $model->hasAndBelongsToMany[$association]['foreignKey'];
+				$joinKeys = array($foreignKey, $model->hasAndBelongsToMany[$association]['associationForeignKey']);
+				list($with, $habtmFields) = $model->joinModel($model->hasAndBelongsToMany[$association]['with'], $joinKeys);
+				$habtmFieldsCount = count($habtmFields);
+				$q = $this->insertQueryData($query, null, $association, $assocData, $model, $linkModel, $stack);
+
+				if ($q != false) {
+					$fetch = $this->fetchAll($q, $model->cacheQueries, $model->alias);
+				} else {
+					$fetch = null;
+				}
+			}
+
+			for ($i = 0; $i < $count; $i++) {
+				$row =& $resultSet[$i];
+
+				if ($type !== 'hasAndBelongsToMany') {
+					$q = $this->insertQueryData($query, $resultSet[$i], $association, $assocData, $model, $linkModel, $stack);
+					if ($q != false) {
+						$fetch = $this->fetchAll($q, $model->cacheQueries, $model->alias);
+					} else {
+						$fetch = null;
+					}
+				}
+				$selfJoin = false;
+
+				if ($linkModel->name === $model->name) {
+					$selfJoin = true;
+				}
+
+				if (!empty($fetch) && is_array($fetch)) {
+					if ($recursive > 0) {
+						foreach ($linkModel->__associations as $type1) {
+							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
+								$deepModel =& $linkModel->{$assoc1};
+
+								if (($type1 === 'belongsTo') || ($deepModel->alias === $model->alias && $type === 'belongsTo') || ($deepModel->alias != $model->alias)) {
+									$tmpStack = $stack;
+									$tmpStack[] = $assoc1;
+									if ($linkModel->useDbConfig == $deepModel->useDbConfig) {
+										$db =& $this;
+									} else {
+										$db =& ConnectionManager::getDataSource($deepModel->useDbConfig);
+									}
+									$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
+								}
+							}
+						}
+					}
+					if ($type == 'hasAndBelongsToMany') {
+						$uniqueIds = $merge = array();
+
+						foreach ($fetch as $j => $data) {
+							if (
+								(isset($data[$with]) && $data[$with][$foreignKey] === $row[$model->alias][$model->primaryKey])
+							) {
+								if ($habtmFieldsCount <= 2) {
+									unset($data[$with]);
+								}
+								$merge[] = $data;
+							}
+						}
+						if (empty($merge) && !isset($row[$association])) {
+							$row[$association] = $merge;
+						} else {
+							$this->__mergeAssociation($resultSet[$i], $merge, $association, $type);
+						}
+					} else {
+						$this->__mergeAssociation($resultSet[$i], $fetch, $association, $type, $selfJoin);
+					}
+					if (isset($resultSet[$i][$association])) {
+						$resultSet[$i][$association] = $linkModel->afterFind($resultSet[$i][$association], false);
+					}
+				} else {
+					$tempArray[0][$association] = false;
+					$this->__mergeAssociation($resultSet[$i], $tempArray, $association, $type, $selfJoin);
+				}
+			}
+		}
+	}
+
+/**
+ * A more efficient way to fetch associations.	Woohoo!
+ *
+ * @param model $model Primary model object
+ * @param string $query Association query
+ * @param array $ids Array of IDs of associated records
+ * @return array Association results
+ * @access public
+ */
+	function fetchAssociated($model, $query, $ids) {
+		$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
+		if (count($ids) > 1) {
+			$query = str_replace('= (', 'IN (', $query);
+		}
+		return $this->fetchAll($query, $model->cacheQueries, $model->alias);
+	}
+
+/**
+ * mergeHasMany - Merge the results of hasMany relations.
+ *
+ *
+ * @param array $resultSet Data to merge into
+ * @param array $merge Data to merge
+ * @param string $association Name of Model being Merged
+ * @param object $model Model being merged onto
+ * @param object $linkModel Model being merged
+ * @return void
+ */
+	function __mergeHasMany(&$resultSet, $merge, $association, &$model, &$linkModel) {
+		foreach ($resultSet as $i => $value) {
+			$count = 0;
+			$merged[$association] = array();
+			foreach ($merge as $j => $data) {
+				if (isset($value[$model->alias]) && $value[$model->alias][$model->primaryKey] === $data[$association][$model->hasMany[$association]['foreignKey']]) {
+					if (count($data) > 1) {
+						$data = array_merge($data[$association], $data);
+						unset($data[$association]);
+						foreach ($data as $key => $name) {
+							if (is_numeric($key)) {
+								$data[$association][] = $name;
+								unset($data[$key]);
+							}
+						}
+						$merged[$association][] = $data;
+					} else {
+						$merged[$association][] = $data[$association];
+					}
+				}
+				$count++;
+			}
+			if (isset($value[$model->alias])) {
+				$resultSet[$i] = Set::pushDiff($resultSet[$i], $merged);
+				unset($merged);
+			}
+		}
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $data
+ * @param unknown_type $merge
+ * @param unknown_type $association
+ * @param unknown_type $type
+ * @param boolean $selfJoin
+ * @access private
+ */
+	function __mergeAssociation(&$data, $merge, $association, $type, $selfJoin = false) {
+		if (isset($merge[0]) && !isset($merge[0][$association])) {
+			$association = Inflector::pluralize($association);
+		}
+
+		if ($type == 'belongsTo' || $type == 'hasOne') {
+			if (isset($merge[$association])) {
+				$data[$association] = $merge[$association][0];
+			} else {
+				if (count($merge[0][$association]) > 1) {
+					foreach ($merge[0] as $assoc => $data2) {
+						if ($assoc != $association) {
+							$merge[0][$association][$assoc] = $data2;
+						}
+					}
+				}
+				if (!isset($data[$association])) {
+					if ($merge[0][$association] != null) {
+						$data[$association] = $merge[0][$association];
+					} else {
+						$data[$association] = array();
+					}
+				} else {
+					if (is_array($merge[0][$association])) {
+						foreach ($data[$association] as $k => $v) {
+							if (!is_array($v)) {
+								$dataAssocTmp[$k] = $v;
+							}
+						}
+
+						foreach ($merge[0][$association] as $k => $v) {
+							if (!is_array($v)) {
+								$mergeAssocTmp[$k] = $v;
+							}
+						}
+						$dataKeys = array_keys($data);
+						$mergeKeys = array_keys($merge[0]);
+
+						if ($mergeKeys[0] === $dataKeys[0] || $mergeKeys === $dataKeys) {
+							$data[$association][$association] = $merge[0][$association];
+						} else {
+							$diff = Set::diff($dataAssocTmp, $mergeAssocTmp);
+							$data[$association] = array_merge($merge[0][$association], $diff);
+						}
+					} elseif ($selfJoin && array_key_exists($association, $merge[0])) {
+						$data[$association] = array_merge($data[$association], array($association => array()));
+					}
+				}
+			}
+		} else {
+			if (isset($merge[0][$association]) && $merge[0][$association] === false) {
+				if (!isset($data[$association])) {
+					$data[$association] = array();
+				}
+			} else {
+				foreach ($merge as $i => $row) {
+					if (count($row) == 1) {
+						if (empty($data[$association]) || (isset($data[$association]) && !in_array($row[$association], $data[$association]))) {
+							$data[$association][] = $row[$association];
+						}
+					} else if (!empty($row)) {
+						$tmp = array_merge($row[$association], $row);
+						unset($tmp[$association]);
+						$data[$association][] = $tmp;
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * Generates an array representing a query or part of a query from a single model or two associated models
+ *
+ * @param Model $model
+ * @param Model $linkModel
+ * @param string $type
+ * @param string $association
+ * @param array $assocData
+ * @param array $queryData
+ * @param boolean $external
+ * @param array $resultSet
+ * @return mixed
+ * @access public
+ */
+	function generateAssociationQuery(&$model, &$linkModel, $type, $association = null, $assocData = array(), &$queryData, $external = false, &$resultSet) {
+		$queryData = $this->__scrubQueryData($queryData);
+		$assocData = $this->__scrubQueryData($assocData);
+
+		if (empty($queryData['fields'])) {
+			$queryData['fields'] = $this->fields($model, $model->alias);
+		} elseif (!empty($model->hasMany) && $model->recursive > -1) {
+			$assocFields = $this->fields($model, $model->alias, array("{$model->alias}.{$model->primaryKey}"));
+			$passedFields = $this->fields($model, $model->alias, $queryData['fields']);
+			if (count($passedFields) === 1) {
+				$match = strpos($passedFields[0], $assocFields[0]);
+				$match1 = (bool)preg_match('/^[a-z]+\(/i', $passedFields[0]);
+
+				if ($match === false && $match1 === false) {
+					$queryData['fields'] = array_merge($passedFields, $assocFields);
+				} else {
+					$queryData['fields'] = $passedFields;
+				}
+			} else {
+				$queryData['fields'] = array_merge($passedFields, $assocFields);
+			}
+			unset($assocFields, $passedFields);
+		}
+
+		if ($linkModel == null) {
+			return $this->buildStatement(
+				array(
+					'fields' => array_unique($queryData['fields']),
+					'table' => $this->fullTableName($model),
+					'alias' => $model->alias,
+					'limit' => $queryData['limit'],
+					'offset' => $queryData['offset'],
+					'joins' => $queryData['joins'],
+					'conditions' => $queryData['conditions'],
+					'order' => $queryData['order'],
+					'group' => $queryData['group']
+				),
+				$model
+			);
+		}
+		if ($external && !empty($assocData['finderQuery'])) {
+			return $assocData['finderQuery'];
+		}
+
+		$alias = $association;
+		$self = ($model->name == $linkModel->name);
+		$fields = array();
+
+		if ((!$external && in_array($type, array('hasOne', 'belongsTo')) && $this->__bypass === false) || $external) {
+			$fields = $this->fields($linkModel, $alias, $assocData['fields']);
+		}
+		if (empty($assocData['offset']) && !empty($assocData['page'])) {
+			$assocData['offset'] = ($assocData['page'] - 1) * $assocData['limit'];
+		}
+		$assocData['limit'] = $this->limit($assocData['limit'], $assocData['offset']);
+
+		switch ($type) {
+			case 'hasOne':
+			case 'belongsTo':
+				$conditions = $this->__mergeConditions(
+					$assocData['conditions'],
+					$this->getConstraint($type, $model, $linkModel, $alias, array_merge($assocData, compact('external', 'self')))
+				);
+
+				if (!$self && $external) {
+					foreach ($conditions as $key => $condition) {
+						if (is_numeric($key) && strpos($condition, $model->alias . '.') !== false) {
+							unset($conditions[$key]);
+						}
+					}
+				}
+
+				if ($external) {
+					$query = array_merge($assocData, array(
+						'conditions' => $conditions,
+						'table' => $this->fullTableName($linkModel),
+						'fields' => $fields,
+						'alias' => $alias,
+						'group' => null
+					));
+					$query = array_merge(array('order' => $assocData['order'], 'limit' => $assocData['limit']), $query);
+				} else {
+					$join = array(
+						'table' => $this->fullTableName($linkModel),
+						'alias' => $alias,
+						'type' => isset($assocData['type']) ? $assocData['type'] : 'LEFT',
+						'conditions' => trim($this->conditions($conditions, true, false, $model))
+					);
+					$queryData['fields'] = array_merge($queryData['fields'], $fields);
+
+					if (!empty($assocData['order'])) {
+						$queryData['order'][] = $assocData['order'];
+					}
+					if (!in_array($join, $queryData['joins'])) {
+						$queryData['joins'][] = $join;
+					}
+					return true;
+				}
+			break;
+			case 'hasMany':
+				$assocData['fields'] = $this->fields($linkModel, $alias, $assocData['fields']);
+				if (!empty($assocData['foreignKey'])) {
+					$assocData['fields'] = array_merge($assocData['fields'], $this->fields($linkModel, $alias, array("{$alias}.{$assocData['foreignKey']}")));
+				}
+				$query = array(
+					'conditions' => $this->__mergeConditions($this->getConstraint('hasMany', $model, $linkModel, $alias, $assocData), $assocData['conditions']),
+					'fields' => array_unique($assocData['fields']),
+					'table' => $this->fullTableName($linkModel),
+					'alias' => $alias,
+					'order' => $assocData['order'],
+					'limit' => $assocData['limit'],
+					'group' => null
+				);
+			break;
+			case 'hasAndBelongsToMany':
+				$joinFields = array();
+				$joinAssoc = null;
+
+				if (isset($assocData['with']) && !empty($assocData['with'])) {
+					$joinKeys = array($assocData['foreignKey'], $assocData['associationForeignKey']);
+					list($with, $joinFields) = $model->joinModel($assocData['with'], $joinKeys);
+
+					$joinTbl = $this->fullTableName($model->{$with});
+					$joinAlias = $joinTbl;
+
+					if (is_array($joinFields) && !empty($joinFields)) {
+						$joinFields = $this->fields($model->{$with}, $model->{$with}->alias, $joinFields);
+						$joinAssoc = $joinAlias = $model->{$with}->alias;
+					} else {
+						$joinFields = array();
+					}
+				} else {
+					$joinTbl = $this->fullTableName($assocData['joinTable']);
+					$joinAlias = $joinTbl;
+				}
+				$query = array(
+					'conditions' => $assocData['conditions'],
+					'limit' => $assocData['limit'],
+					'table' => $this->fullTableName($linkModel),
+					'alias' => $alias,
+					'fields' => array_merge($this->fields($linkModel, $alias, $assocData['fields']), $joinFields),
+					'order' => $assocData['order'],
+					'group' => null,
+					'joins' => array(array(
+						'table' => $joinTbl,
+						'alias' => $joinAssoc,
+						'conditions' => $this->getConstraint('hasAndBelongsToMany', $model, $linkModel, $joinAlias, $assocData, $alias)
+					))
+				);
+			break;
+		}
+		if (isset($query)) {
+			return $this->buildStatement($query, $model);
+		}
+		return null;
+	}
+
+/**
+ * Returns a conditions array for the constraint between two models
+ *
+ * @param string $type Association type
+ * @param object $model Model object
+ * @param array $association Association array
+ * @return array Conditions array defining the constraint between $model and $association
+ * @access public
+ */
+	function getConstraint($type, $model, $linkModel, $alias, $assoc, $alias2 = null) {
+		$assoc = array_merge(array('external' => false, 'self' => false), $assoc);
+
+		if (array_key_exists('foreignKey', $assoc) && empty($assoc['foreignKey'])) {
+			return array();
+		}
+
+		switch (true) {
+			case ($assoc['external'] && $type == 'hasOne'):
+				return array("{$alias}.{$assoc['foreignKey']}" => '{$__cakeID__$}');
+			break;
+			case ($assoc['external'] && $type == 'belongsTo'):
+				return array("{$alias}.{$linkModel->primaryKey}" => '{$__cakeForeignKey__$}');
+			break;
+			case (!$assoc['external'] && $type == 'hasOne'):
+				return array("{$alias}.{$assoc['foreignKey']}" => $this->identifier("{$model->alias}.{$model->primaryKey}"));
+			break;
+			case (!$assoc['external'] && $type == 'belongsTo'):
+				return array("{$model->alias}.{$assoc['foreignKey']}" => $this->identifier("{$alias}.{$linkModel->primaryKey}"));
+			break;
+			case ($type == 'hasMany'):
+				return array("{$alias}.{$assoc['foreignKey']}" => array('{$__cakeID__$}'));
+			break;
+			case ($type == 'hasAndBelongsToMany'):
+				return array(
+					array("{$alias}.{$assoc['foreignKey']}" => '{$__cakeID__$}'),
+					array("{$alias}.{$assoc['associationForeignKey']}" => $this->identifier("{$alias2}.{$linkModel->primaryKey}"))
+				);
+			break;
+		}
+		return array();
+	}
+
+/**
+ * Builds and generates a JOIN statement from an array.	 Handles final clean-up before conversion.
+ *
+ * @param array $join An array defining a JOIN statement in a query
+ * @return string An SQL JOIN statement to be used in a query
+ * @access public
+ * @see DboSource::renderJoinStatement()
+ * @see DboSource::buildStatement()
+ */
+	function buildJoinStatement($join) {
+		$data = array_merge(array(
+			'type' => null,
+			'alias' => null,
+			'table' => 'join_table',
+			'conditions' => array()
+		), $join);
+
+		if (!empty($data['alias'])) {
+			$data['alias'] = $this->alias . $this->name($data['alias']);
+		}
+		if (!empty($data['conditions'])) {
+			$data['conditions'] = trim($this->conditions($data['conditions'], true, false));
+		}
+		return $this->renderJoinStatement($data);
+	}
+
+/**
+ * Builds and generates an SQL statement from an array.	 Handles final clean-up before conversion.
+ *
+ * @param array $query An array defining an SQL query
+ * @param object $model The model object which initiated the query
+ * @return string An executable SQL statement
+ * @access public
+ * @see DboSource::renderStatement()
+ */
+	function buildStatement($query, &$model) {
+		$query = array_merge(array('offset' => null, 'joins' => array()), $query);
+		if (!empty($query['joins'])) {
+			$count = count($query['joins']);
+			for ($i = 0; $i < $count; $i++) {
+				if (is_array($query['joins'][$i])) {
+					$query['joins'][$i] = $this->buildJoinStatement($query['joins'][$i]);
+				}
+			}
+		}
+		return $this->renderStatement('select', array(
+			'conditions' => $this->conditions($query['conditions'], true, true, $model),
+			'fields' => implode(', ', $query['fields']),
+			'table' => $query['table'],
+			'alias' => $this->alias . $this->name($query['alias']),
+			'order' => $this->order($query['order'], 'ASC', $model),
+			'limit' => $this->limit($query['limit'], $query['offset']),
+			'joins' => implode(' ', $query['joins']),
+			'group' => $this->group($query['group'], $model)
+		));
+	}
+
+/**
+ * Renders a final SQL JOIN statement
+ *
+ * @param array $data
+ * @return string
+ * @access public
+ */
+	function renderJoinStatement($data) {
+		extract($data);
+		return trim("{$type} JOIN {$table} {$alias} ON ({$conditions})");
+	}
+
+/**
+ * Renders a final SQL statement by putting together the component parts in the correct order
+ *
+ * @param string $type type of query being run.  e.g select, create, update, delete, schema, alter.
+ * @param array $data Array of data to insert into the query.
+ * @return string Rendered SQL expression to be run.
+ * @access public
+ */
+	function renderStatement($type, $data) {
+		extract($data);
+		$aliases = null;
+
+		switch (strtolower($type)) {
+			case 'select':
+				return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
+			break;
+			case 'create':
+				return "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
+			break;
+			case 'update':
+				if (!empty($alias)) {
+					$aliases = "{$this->alias}{$alias} {$joins} ";
+				}
+				return "UPDATE {$table} {$aliases}SET {$fields} {$conditions}";
+			break;
+			case 'delete':
+				if (!empty($alias)) {
+					$aliases = "{$this->alias}{$alias} {$joins} ";
+				}
+				return "DELETE {$alias} FROM {$table} {$aliases}{$conditions}";
+			break;
+			case 'schema':
+				foreach (array('columns', 'indexes', 'tableParameters') as $var) {
+					if (is_array(${$var})) {
+						${$var} = "\t" . join(",\n\t", array_filter(${$var}));
+					} else {
+						${$var} = '';
+					}
+				}
+				if (trim($indexes) != '') {
+					$columns .= ',';
+				}
+				return "CREATE TABLE {$table} (\n{$columns}{$indexes}){$tableParameters};";
+			break;
+			case 'alter':
+			break;
+		}
+	}
+
+/**
+ * Merges a mixed set of string/array conditions
+ *
+ * @return array
+ * @access private
+ */
+	function __mergeConditions($query, $assoc) {
+		if (empty($assoc)) {
+			return $query;
+		}
+
+		if (is_array($query)) {
+			return array_merge((array)$assoc, $query);
+		}
+
+		if (!empty($query)) {
+			$query = array($query);
+			if (is_array($assoc)) {
+				$query = array_merge($query, $assoc);
+			} else {
+				$query[] = $assoc;
+			}
+			return $query;
+		}
+
+		return $assoc;
+	}
+
+/**
+ * Generates and executes an SQL UPDATE statement for given model, fields, and values.
+ * For databases that do not support aliases in UPDATE queries.
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param array $values
+ * @param mixed $conditions
+ * @return boolean Success
+ * @access public
+ */
+	function update(&$model, $fields = array(), $values = null, $conditions = null) {
+		if ($values == null) {
+			$combined = $fields;
+		} else {
+			$combined = array_combine($fields, $values);
+		}
+
+		$fields = implode(', ', $this->_prepareUpdateFields($model, $combined, empty($conditions)));
+
+		$alias = $joins = null;
+		$table = $this->fullTableName($model);
+		$conditions = $this->_matchRecords($model, $conditions);
+
+		if ($conditions === false) {
+			return false;
+		}
+		$query = compact('table', 'alias', 'joins', 'fields', 'conditions');
+
+		if (!$this->execute($this->renderStatement('update', $query))) {
+			$model->onError();
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Quotes and prepares fields and values for an SQL UPDATE statement
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param boolean $quoteValues If values should be quoted, or treated as SQL snippets
+ * @param boolean $alias Include the model alias in the field name
+ * @return array Fields and values, quoted and preparted
+ * @access protected
+ */
+	function _prepareUpdateFields(&$model, $fields, $quoteValues = true, $alias = false) {
+		$quotedAlias = $this->startQuote . $model->alias . $this->endQuote;
+
+		$updates = array();
+		foreach ($fields as $field => $value) {
+			if ($alias && strpos($field, '.') === false) {
+				$quoted = $model->escapeField($field);
+			} elseif (!$alias && strpos($field, '.') !== false) {
+				$quoted = $this->name(str_replace($quotedAlias . '.', '', str_replace(
+					$model->alias . '.', '', $field
+				)));
+			} else {
+				$quoted = $this->name($field);
+			}
+
+			if ($value === null) {
+				$updates[] = $quoted . ' = NULL';
+				continue;
+			}
+			$update = $quoted . ' = ';
+
+			if ($quoteValues) {
+				$update .= $this->value($value, $model->getColumnType($field), false);
+			} elseif (!$alias) {
+				$update .= str_replace($quotedAlias . '.', '', str_replace(
+					$model->alias . '.', '', $value
+				));
+			} else {
+				$update .= $value;
+			}
+			$updates[] =  $update;
+		}
+		return $updates;
+	}
+
+/**
+ * Generates and executes an SQL DELETE statement.
+ * For databases that do not support aliases in UPDATE queries.
+ *
+ * @param Model $model
+ * @param mixed $conditions
+ * @return boolean Success
+ * @access public
+ */
+	function delete(&$model, $conditions = null) {
+		$alias = $joins = null;
+		$table = $this->fullTableName($model);
+		$conditions = $this->_matchRecords($model, $conditions);
+
+		if ($conditions === false) {
+			return false;
+		}
+
+		if ($this->execute($this->renderStatement('delete', compact('alias', 'table', 'joins', 'conditions'))) === false) {
+			$model->onError();
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Gets a list of record IDs for the given conditions.	Used for multi-record updates and deletes
+ * in databases that do not support aliases in UPDATE/DELETE queries.
+ *
+ * @param Model $model
+ * @param mixed $conditions
+ * @return array List of record IDs
+ * @access protected
+ */
+	function _matchRecords(&$model, $conditions = null) {
+		if ($conditions === true) {
+			$conditions = $this->conditions(true);
+		} elseif ($conditions === null) {
+			$conditions = $this->conditions($this->defaultConditions($model, $conditions, false), true, true, $model);
+		} else {
+			$noJoin = true;
+			foreach ($conditions as $field => $value) {
+				$originalField = $field;
+				if (strpos($field, '.') !== false) {
+					list($alias, $field) = explode('.', $field);
+					$field = ltrim($field, $this->startQuote);
+					$field = rtrim($field, $this->endQuote);
+				}
+				if (!$model->hasField($field)) {
+					$noJoin = false;
+					break;
+				}
+				if ($field !== $originalField) {
+					$conditions[$field] = $value;
+					unset($conditions[$originalField]);
+				}
+			}
+			if ($noJoin === true) {
+				return $this->conditions($conditions);
+			}
+			$idList = $model->find('all', array(
+				'fields' => "{$model->alias}.{$model->primaryKey}",
+				'conditions' => $conditions
+			));
+
+			if (empty($idList)) {
+				return false;
+			}
+			$conditions = $this->conditions(array(
+				$model->primaryKey => Set::extract($idList, "{n}.{$model->alias}.{$model->primaryKey}")
+			));
+		}
+		return $conditions;
+	}
+
+/**
+ * Returns an array of SQL JOIN fragments from a model's associations
+ *
+ * @param object $model
+ * @return array
+ * @access protected
+ */
+	function _getJoins($model) {
+		$join = array();
+		$joins = array_merge($model->getAssociated('hasOne'), $model->getAssociated('belongsTo'));
+
+		foreach ($joins as $assoc) {
+			if (isset($model->{$assoc}) && $model->useDbConfig == $model->{$assoc}->useDbConfig) {
+				$assocData = $model->getAssociated($assoc);
+				$join[] = $this->buildJoinStatement(array(
+					'table' => $this->fullTableName($model->{$assoc}),
+					'alias' => $assoc,
+					'type' => isset($assocData['type']) ? $assocData['type'] : 'LEFT',
+					'conditions' => trim($this->conditions(
+						$this->__mergeConditions($assocData['conditions'], $this->getConstraint($assocData['association'], $model, $model->{$assoc}, $assoc, $assocData)),
+						true, false, $model
+					))
+				));
+			}
+		}
+		return $join;
+	}
+
+/**
+ * Returns an SQL calculation, i.e. COUNT() or MAX()
+ *
+ * @param model $model
+ * @param string $func Lowercase name of SQL function, i.e. 'count' or 'max'
+ * @param array $params Function parameters (any values must be quoted manually)
+ * @return string An SQL calculation function
+ * @access public
+ */
+	function calculate(&$model, $func, $params = array()) {
+		$params = (array)$params;
+
+		switch (strtolower($func)) {
+			case 'count':
+				if (!isset($params[0])) {
+					$params[0] = '*';
+				}
+				if (!isset($params[1])) {
+					$params[1] = 'count';
+				}
+				if (is_object($model) && $model->isVirtualField($params[0])){
+					$arg = $this->__quoteFields($model->getVirtualField($params[0]));
+				} else {
+					$arg = $this->name($params[0]);
+				}
+				return 'COUNT(' . $arg . ') AS ' . $this->name($params[1]);
+			case 'max':
+			case 'min':
+				if (!isset($params[1])) {
+					$params[1] = $params[0];
+				}
+				if (is_object($model) && $model->isVirtualField($params[0])) {
+					$arg = $this->__quoteFields($model->getVirtualField($params[0]));
+				} else {
+					$arg = $this->name($params[0]);
+				}
+				return strtoupper($func) . '(' . $arg . ') AS ' . $this->name($params[1]);
+			break;
+		}
+	}
+
+/**
+ * Deletes all the records in a table and resets the count of the auto-incrementing
+ * primary key, where applicable.
+ *
+ * @param mixed $table A string or model class representing the table to be truncated
+ * @return boolean	SQL TRUNCATE TABLE statement, false if not applicable.
+ * @access public
+ */
+	function truncate($table) {
+		return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table));
+	}
+
+/**
+ * Begin a transaction
+ *
+ * @param model $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ * @access public
+ */
+	function begin(&$model) {
+		if (parent::begin($model) && $this->execute($this->_commands['begin'])) {
+			$this->_transactionStarted = true;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Commit a transaction
+ *
+ * @param model $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ * @access public
+ */
+	function commit(&$model) {
+		if (parent::commit($model) && $this->execute($this->_commands['commit'])) {
+			$this->_transactionStarted = false;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Rollback a transaction
+ *
+ * @param model $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ * @access public
+ */
+	function rollback(&$model) {
+		if (parent::rollback($model) && $this->execute($this->_commands['rollback'])) {
+			$this->_transactionStarted = false;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Creates a default set of conditions from the model if $conditions is null/empty.
+ * If conditions are supplied then they will be returned.  If a model doesn't exist and no conditions
+ * were provided either null or false will be returned based on what was input.
+ *
+ * @param object $model
+ * @param mixed $conditions Array of conditions, conditions string, null or false. If an array of conditions,
+ *   or string conditions those conditions will be returned.  With other values the model's existance will be checked.
+ *   If the model doesn't exist a null or false will be returned depending on the input value.
+ * @param boolean $useAlias Use model aliases rather than table names when generating conditions
+ * @return mixed Either null, false, $conditions or an array of default conditions to use.
+ * @see DboSource::update()
+ * @see DboSource::conditions()
+ * @access public
+ */
+	function defaultConditions(&$model, $conditions, $useAlias = true) {
+		if (!empty($conditions)) {
+			return $conditions;
+		}
+		$exists = $model->exists();
+		if (!$exists && $conditions !== null) {
+			return false;
+		} elseif (!$exists) {
+			return null;
+		}
+		$alias = $model->alias;
+
+		if (!$useAlias) {
+			$alias = $this->fullTableName($model, false);
+		}
+		return array("{$alias}.{$model->primaryKey}" => $model->getID());
+	}
+
+/**
+ * Returns a key formatted like a string Model.fieldname(i.e. Post.title, or Country.name)
+ *
+ * @param unknown_type $model
+ * @param unknown_type $key
+ * @param unknown_type $assoc
+ * @return string
+ * @access public
+ */
+	function resolveKey($model, $key, $assoc = null) {
+		if (empty($assoc)) {
+			$assoc = $model->alias;
+		}
+		if (!strpos('.', $key)) {
+			return $this->name($model->alias) . '.' . $this->name($key);
+		}
+		return $key;
+	}
+
+/**
+ * Private helper method to remove query metadata in given data array.
+ *
+ * @param array $data
+ * @return array
+ * @access public
+ */
+	function __scrubQueryData($data) {
+		foreach (array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group') as $key) {
+			if (empty($data[$key])) {
+				$data[$key] = array();
+			}
+		}
+		return $data;
+	}
+
+/**
+ * Converts model virtual fields into sql expressions to be fetched later
+ *
+ * @param Model $model
+ * @param string $alias Alias tablename
+ * @param mixed $fields virtual fields to be used on query
+ * @return array
+ */
+	function _constructVirtualFields(&$model, $alias, $fields) {
+		$virtual = array();
+		foreach ($fields as $field) {
+			$virtualField = $this->name($alias . $this->virtualFieldSeparator . $field);
+			$expression = $this->__quoteFields($model->getVirtualField($field));
+			$virtual[] = '(' . $expression . ") {$this->alias} {$virtualField}";
+		}
+		return $virtual;
+	}
+
+/**
+ * Generates the fields list of an SQL query.
+ *
+ * @param Model $model
+ * @param string $alias Alias tablename
+ * @param mixed $fields
+ * @param boolean $quote If false, returns fields array unquoted
+ * @return array
+ * @access public
+ */
+	function fields(&$model, $alias = null, $fields = array(), $quote = true) {
+		if (empty($alias)) {
+			$alias = $model->alias;
+		}
+		$cacheKey = array(
+			$model->useDbConfig,
+			$model->table,
+			array_keys($model->schema()),
+			$model->name,
+			$model->getVirtualField(),
+			$alias,
+			$fields,
+			$quote
+		);
+		$cacheKey = crc32(serialize($cacheKey));
+		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
+			return $return;
+		}
+		$allFields = empty($fields);
+		if ($allFields) {
+			$fields = array_keys($model->schema());
+		} elseif (!is_array($fields)) {
+			$fields = String::tokenize($fields);
+		}
+		$fields = array_values(array_filter($fields));
+		$allFields = $allFields || in_array('*', $fields) || in_array($model->alias . '.*', $fields);
+
+		$virtual = array();
+		$virtualFields = $model->getVirtualField();
+		if (!empty($virtualFields)) {
+			$virtualKeys = array_keys($virtualFields);
+			foreach ($virtualKeys as $field) {
+				$virtualKeys[] = $model->alias . '.' . $field;
+			}
+			$virtual = ($allFields) ? $virtualKeys : array_intersect($virtualKeys, $fields);
+			foreach ($virtual as $i => $field) {
+				if (strpos($field, '.') !== false) {
+					$virtual[$i] = str_replace($model->alias . '.', '', $field);
+				}
+				$fields = array_diff($fields, array($field));
+			}
+			$fields = array_values($fields);
+		}
+
+		if (!$quote) {
+			if (!empty($virtual)) {
+				$fields = array_merge($fields, $this->_constructVirtualFields($model, $alias, $virtual));
+			}
+			return $fields;
+		}
+		$count = count($fields);
+
+		if ($count >= 1 && !in_array($fields[0], array('*', 'COUNT(*)'))) {
+			for ($i = 0; $i < $count; $i++) {
+				if (is_string($fields[$i]) && in_array($fields[$i], $virtual)) {
+					unset($fields[$i]);
+					continue;
+				}
+				if (is_object($fields[$i]) && isset($fields[$i]->type) && $fields[$i]->type === 'expression') {
+					$fields[$i] = $fields[$i]->value;
+				} elseif (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
+					continue;
+				} elseif (!preg_match('/^.+\\(.*\\)/', $fields[$i])) {
+					$prepend = '';
+
+					if (strpos($fields[$i], 'DISTINCT') !== false) {
+						$prepend = 'DISTINCT ';
+						$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
+					}
+					$dot = strpos($fields[$i], '.');
+
+					if ($dot === false) {
+						$prefix = !(
+							strpos($fields[$i], ' ') !== false ||
+							strpos($fields[$i], '(') !== false
+						);
+						$fields[$i] = $this->name(($prefix ? $alias . '.' : '') . $fields[$i]);
+					} else {
+						$value = array();
+						$comma = strpos($fields[$i], ',');
+						if ($comma === false) {
+							$build = explode('.', $fields[$i]);
+							if (!Set::numeric($build)) {
+								$fields[$i] = $this->name(implode('.', $build));
+							}
+						}
+					}
+					$fields[$i] = $prepend . $fields[$i];
+				} elseif (preg_match('/\(([\.\w]+)\)/', $fields[$i], $field)) {
+					if (isset($field[1])) {
+						if (strpos($field[1], '.') === false) {
+							$field[1] = $this->name($alias . '.' . $field[1]);
+						} else {
+							$field[0] = explode('.', $field[1]);
+							if (!Set::numeric($field[0])) {
+								$field[0] = implode('.', array_map(array(&$this, 'name'), $field[0]));
+								$fields[$i] = preg_replace('/\(' . $field[1] . '\)/', '(' . $field[0] . ')', $fields[$i], 1);
+							}
+						}
+					}
+				}
+			}
+		}
+		if (!empty($virtual)) {
+			$fields = array_merge($fields, $this->_constructVirtualFields($model, $alias, $virtual));
+		}
+		return $this->cacheMethod(__FUNCTION__, $cacheKey, array_unique($fields));
+	}
+
+/**
+ * Creates a WHERE clause by parsing given conditions data.  If an array or string
+ * conditions are provided those conditions will be parsed and quoted.  If a boolean
+ * is given it will be integer cast as condition.  Null will return 1 = 1.
+ *
+ * Results of this method are stored in a memory cache.  This improves performance, but
+ * because the method uses a simple hashing algorithm it can infrequently have collisions.
+ * Setting DboSource::$cacheMethods to false will disable the memory cache.
+ *
+ * @param mixed $conditions Array or string of conditions, or any value.
+ * @param boolean $quoteValues If true, values should be quoted
+ * @param boolean $where If true, "WHERE " will be prepended to the return value
+ * @param Model $model A reference to the Model instance making the query
+ * @return string SQL fragment
+ * @access public
+ */
+	function conditions($conditions, $quoteValues = true, $where = true, $model = null) {
+		if (is_object($model)) {
+			$cacheKey = array(
+				$model->useDbConfig,
+				$model->table,
+				$model->schema(),
+				$model->name,
+				$model->getVirtualField(),
+				$conditions,
+				$quoteValues,
+				$where
+			);
+		} else {
+			$cacheKey = array($conditions, $quoteValues, $where);
+		}
+		$cacheKey = crc32(serialize($cacheKey));
+		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
+			return $return;
+		}
+
+		$clause = $out = '';
+
+		if ($where) {
+			$clause = ' WHERE ';
+		}
+
+		if (is_array($conditions) && !empty($conditions)) {
+			$out = $this->conditionKeysToString($conditions, $quoteValues, $model);
+
+			if (empty($out)) {
+				return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . ' 1 = 1');
+			}
+			return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . implode(' AND ', $out));
+		}
+		if ($conditions === false || $conditions === true) {
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,  $clause . (int)$conditions . ' = 1');
+		}
+
+		if (empty($conditions) || trim($conditions) == '') {
+			return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . '1 = 1');
+		}
+		$clauses = '/^WHERE\\x20|^GROUP\\x20BY\\x20|^HAVING\\x20|^ORDER\\x20BY\\x20/i';
+
+		if (preg_match($clauses, $conditions, $match)) {
+			$clause = '';
+		}
+		if (trim($conditions) == '') {
+			$conditions = ' 1 = 1';
+		} else {
+			$conditions = $this->__quoteFields($conditions);
+		}
+		return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . $conditions);
+	}
+
+/**
+ * Creates a WHERE clause by parsing given conditions array.  Used by DboSource::conditions().
+ *
+ * @param array $conditions Array or string of conditions
+ * @param boolean $quoteValues If true, values should be quoted
+ * @param Model $model A reference to the Model instance making the query
+ * @return string SQL fragment
+ * @access public
+ */
+	function conditionKeysToString($conditions, $quoteValues = true, $model = null) {
+		$c = 0;
+		$out = array();
+		$data = $columnType = null;
+		$bool = array('and', 'or', 'not', 'and not', 'or not', 'xor', '||', '&&');
+
+		foreach ($conditions as $key => $value) {
+			$join = ' AND ';
+			$not = null;
+
+			if (is_array($value)) {
+				$valueInsert = (
+					!empty($value) &&
+					(substr_count($key, '?') == count($value) || substr_count($key, ':') == count($value))
+				);
+			}
+
+			if (is_numeric($key) && empty($value)) {
+				continue;
+			} elseif (is_numeric($key) && is_string($value)) {
+				$out[] = $not . $this->__quoteFields($value);
+			} elseif ((is_numeric($key) && is_array($value)) || in_array(strtolower(trim($key)), $bool)) {
+				if (in_array(strtolower(trim($key)), $bool)) {
+					$join = ' ' . strtoupper($key) . ' ';
+				} else {
+					$key = $join;
+				}
+				$value = $this->conditionKeysToString($value, $quoteValues, $model);
+
+				if (strpos($join, 'NOT') !== false) {
+					if (strtoupper(trim($key)) == 'NOT') {
+						$key = 'AND ' . trim($key);
+					}
+					$not = 'NOT ';
+				}
+
+				if (empty($value[1])) {
+					if ($not) {
+						$out[] = $not . '(' . $value[0] . ')';
+					} else {
+						$out[] = $value[0] ;
+					}
+				} else {
+					$out[] = '(' . $not . '(' . implode(') ' . strtoupper($key) . ' (', $value) . '))';
+				}
+
+			} else {
+				if (is_object($value) && isset($value->type)) {
+					if ($value->type == 'identifier') {
+						$data .= $this->name($key) . ' = ' . $this->name($value->value);
+					} elseif ($value->type == 'expression') {
+						if (is_numeric($key)) {
+							$data .= $value->value;
+						} else {
+							$data .= $this->name($key) . ' = ' . $value->value;
+						}
+					}
+				} elseif (is_array($value) && !empty($value) && !$valueInsert) {
+					$keys = array_keys($value);
+					if ($keys === array_values($keys)) {
+						$count = count($value);
+						if ($count === 1) {
+							$data = $this->__quoteFields($key) . ' = (';
+						} else {
+							$data = $this->__quoteFields($key) . ' IN (';
+						}
+						if ($quoteValues) {
+							if (is_object($model)) {
+								$columnType = $model->getColumnType($key);
+							}
+							$data .= implode(', ', $this->value($value, $columnType));
+						}
+						$data .= ')';
+					} else {
+						$ret = $this->conditionKeysToString($value, $quoteValues, $model);
+						if (count($ret) > 1) {
+							$data = '(' . implode(') AND (', $ret) . ')';
+						} elseif (isset($ret[0])) {
+							$data = $ret[0];
+						}
+					}
+				} elseif (is_numeric($key) && !empty($value)) {
+					$data = $this->__quoteFields($value);
+				} else {
+					$data = $this->__parseKey($model, trim($key), $value);
+				}
+
+				if ($data != null) {
+					$out[] = $data;
+					$data = null;
+				}
+			}
+			$c++;
+		}
+		return $out;
+	}
+
+/**
+ * Extracts a Model.field identifier and an SQL condition operator from a string, formats
+ * and inserts values, and composes them into an SQL snippet.
+ *
+ * @param Model $model Model object initiating the query
+ * @param string $key An SQL key snippet containing a field and optional SQL operator
+ * @param mixed $value The value(s) to be inserted in the string
+ * @return string
+ * @access private
+ */
+	function __parseKey(&$model, $key, $value) {
+		$operatorMatch = '/^((' . implode(')|(', $this->__sqlOps);
+		$operatorMatch .= '\\x20)|<[>=]?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)/is';
+		$bound = (strpos($key, '?') !== false || (is_array($value) && strpos($key, ':') !== false));
+
+		if (!strpos($key, ' ')) {
+			$operator = '=';
+		} else {
+			list($key, $operator) = explode(' ', trim($key), 2);
+
+			if (!preg_match($operatorMatch, trim($operator)) && strpos($operator, ' ') !== false) {
+				$key = $key . ' ' . $operator;
+				$split = strrpos($key, ' ');
+				$operator = substr($key, $split);
+				$key = substr($key, 0, $split);
+			}
+		}
+
+		$virtual = false;
+		if (is_object($model) && $model->isVirtualField($key)) {
+			$key = $this->__quoteFields($model->getVirtualField($key));
+			$virtual = true;
+		}
+
+		$type = (is_object($model) ? $model->getColumnType($key) : null);
+
+		$null = ($value === null || (is_array($value) && empty($value)));
+
+		if (strtolower($operator) === 'not') {
+			$data = $this->conditionKeysToString(
+				array($operator => array($key => $value)), true, $model
+			);
+			return $data[0];
+		}
+
+		$value = $this->value($value, $type);
+
+		if (!$virtual && $key !== '?') {
+			$isKey = (strpos($key, '(') !== false || strpos($key, ')') !== false);
+			$key = $isKey ? $this->__quoteFields($key) : $this->name($key);
+		}
+
+		if ($bound) {
+			return  String::insert($key . ' ' . trim($operator), $value);
+		}
+
+		if (!preg_match($operatorMatch, trim($operator))) {
+			$operator .= ' =';
+		}
+		$operator = trim($operator);
+
+		if (is_array($value)) {
+			$value = implode(', ', $value);
+
+			switch ($operator) {
+				case '=':
+					$operator = 'IN';
+				break;
+				case '!=':
+				case '<>':
+					$operator = 'NOT IN';
+				break;
+			}
+			$value = "({$value})";
+		} elseif ($null) {
+			switch ($operator) {
+				case '=':
+					$operator = 'IS';
+				break;
+				case '!=':
+				case '<>':
+					$operator = 'IS NOT';
+				break;
+			}
+		}
+		if ($virtual) {
+			return "({$key}) {$operator} {$value}";
+		}
+		return "{$key} {$operator} {$value}";
+	}
+
+/**
+ * Quotes Model.fields
+ *
+ * @param string $conditions
+ * @return string or false if no match
+ * @access private
+ */
+	function __quoteFields($conditions) {
+		$start = $end  = null;
+		$original = $conditions;
+
+		if (!empty($this->startQuote)) {
+			$start = preg_quote($this->startQuote);
+		}
+		if (!empty($this->endQuote)) {
+			$end = preg_quote($this->endQuote);
+		}
+		$conditions = str_replace(array($start, $end), '', $conditions);
+		$conditions = preg_replace_callback('/(?:[\'\"][^\'\"\\\]*(?:\\\.[^\'\"\\\]*)*[\'\"])|([a-z0-9_' . $start . $end . ']*\\.[a-z0-9_' . $start . $end . ']*)/i', array(&$this, '__quoteMatchedField'), $conditions);
+
+		if ($conditions !== null) {
+			return $conditions;
+		}
+		return $original;
+	}
+
+/**
+ * Auxiliary function to quote matches `Model.fields` from a preg_replace_callback call
+ *
+ * @param string matched string
+ * @return string quoted strig
+ * @access private
+ */
+	function __quoteMatchedField($match) {
+		if (is_numeric($match[0])) {
+			return $match[0];
+		}
+		return $this->name($match[0]);
+	}
+
+/**
+ * Returns a limit statement in the correct format for the particular database.
+ *
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
+ * @return string SQL limit/offset statement
+ * @access public
+ */
+	function limit($limit, $offset = null) {
+		if ($limit) {
+			$rt = '';
+			if (!strpos(strtolower($limit), 'limit') || strpos(strtolower($limit), 'limit') === 0) {
+				$rt = ' LIMIT';
+			}
+
+			if ($offset) {
+				$rt .= ' ' . $offset . ',';
+			}
+
+			$rt .= ' ' . $limit;
+			return $rt;
+		}
+		return null;
+	}
+
+/**
+ * Returns an ORDER BY clause as a string.
+ *
+ * @param string $key Field reference, as a key (i.e. Post.title)
+ * @param string $direction Direction (ASC or DESC)
+ * @param object $model model reference (used to look for virtual field)
+ * @return string ORDER BY clause
+ * @access public
+ */
+	function order($keys, $direction = 'ASC', $model = null) {
+		if (!is_array($keys)) {
+			$keys = array($keys);
+		}
+		$keys = array_filter($keys);
+		$result = array();
+		while (!empty($keys)) {
+			list($key, $dir) = each($keys);
+			array_shift($keys);
+
+			if (is_numeric($key)) {
+				$key = $dir;
+				$dir = $direction;
+			}
+
+			if (is_string($key) && strpos($key, ',') && !preg_match('/\(.+\,.+\)/', $key)) {
+				$key = array_map('trim', explode(',', $key));
+			}
+			if (is_array($key)) {
+				//Flatten the array
+				$key = array_reverse($key, true);
+				foreach ($key as $k => $v) {
+					if (is_numeric($k)) {
+						array_unshift($keys, $v);
+					} else {
+						$keys = array($k => $v) + $keys;
+					}
+				}
+				continue;
+			} elseif (is_object($key) && isset($key->type) && $key->type === 'expression') {
+				$result[] = $key->value;
+				continue;
+			}
+
+			if (preg_match('/\\x20(ASC|DESC).*/i', $key, $_dir)) {
+				$dir = $_dir[0];
+				$key = preg_replace('/\\x20(ASC|DESC).*/i', '', $key);
+			}
+
+			$key = trim($key);
+
+			if (is_object($model) && $model->isVirtualField($key)) {
+				$key =  '(' . $this->__quoteFields($model->getVirtualField($key)) . ')';
+			}
+
+			if (strpos($key, '.')) {
+				$key = preg_replace_callback('/([a-zA-Z0-9_-]{1,})\\.([a-zA-Z0-9_-]{1,})/', array(&$this, '__quoteMatchedField'), $key);
+			}
+			if (!preg_match('/\s/', $key) && !strpos($key, '.')) {
+				$key = $this->name($key);
+			}
+			$key .= ' ' . trim($dir);
+			$result[] = $key;
+		}
+		if (!empty($result)) {
+			return ' ORDER BY ' . implode(', ', $result);
+		}
+		return '';
+	}
+
+/**
+ * Create a GROUP BY SQL clause
+ *
+ * @param string $group Group By Condition
+ * @return mixed string condition or null
+ * @access public
+ */
+	function group($group, $model = null) {
+		if ($group) {
+			if (!is_array($group)) {
+				$group = array($group);
+			}
+			foreach($group as $index => $key) {
+				if (is_object($model) && $model->isVirtualField($key)) {
+					$group[$index] = '(' . $model->getVirtualField($key) . ')';
+				}
+			}
+			$group = implode(', ', $group);
+			return ' GROUP BY ' . $this->__quoteFields($group);
+		}
+		return null;
+	}
+
+/**
+ * Disconnects database, kills the connection and says the connection is closed.
+ *
+ * @return void
+ * @access public
+ */
+	function close() {
+		$this->disconnect();
+	}
+
+/**
+ * Checks if the specified table contains any record matching specified SQL
+ *
+ * @param Model $model Model to search
+ * @param string $sql SQL WHERE clause (condition only, not the "WHERE" part)
+ * @return boolean True if the table has a matching record, else false
+ * @access public
+ */
+	function hasAny(&$Model, $sql) {
+		$sql = $this->conditions($sql);
+		$table = $this->fullTableName($Model);
+		$alias = $this->alias . $this->name($Model->alias);
+		$where = $sql ? "{$sql}" : ' WHERE 1 = 1';
+		$id = $Model->escapeField();
+
+		$out = $this->fetchRow("SELECT COUNT({$id}) {$this->alias}count FROM {$table} {$alias}{$where}");
+
+		if (is_array($out)) {
+			return $out[0]['count'];
+		}
+		return false;
+	}
+
+/**
+ * Gets the length of a database-native column description, or null if no length
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return mixed An integer or string representing the length of the column
+ * @access public
+ */
+	function length($real) {
+		if (!preg_match_all('/([\w\s]+)(?:\((\d+)(?:,(\d+))?\))?(\sunsigned)?(\szerofill)?/', $real, $result)) {
+			trigger_error(__("FIXME: Can't parse field: " . $real, true), E_USER_WARNING);
+			$col = str_replace(array(')', 'unsigned'), '', $real);
+			$limit = null;
+
+			if (strpos($col, '(') !== false) {
+				list($col, $limit) = explode('(', $col);
+			}
+			if ($limit != null) {
+				return intval($limit);
+			}
+			return null;
+		}
+
+		$types = array(
+			'int' => 1, 'tinyint' => 1, 'smallint' => 1, 'mediumint' => 1, 'integer' => 1, 'bigint' => 1
+		);
+
+		list($real, $type, $length, $offset, $sign, $zerofill) = $result;
+		$typeArr = $type;
+		$type = $type[0];
+		$length = $length[0];
+		$offset = $offset[0];
+
+		$isFloat = in_array($type, array('dec', 'decimal', 'float', 'numeric', 'double'));
+		if ($isFloat && $offset) {
+			return $length.','.$offset;
+		}
+
+		if (($real[0] == $type) && (count($real) == 1)) {
+			return null;
+		}
+
+		if (isset($types[$type])) {
+			$length += $types[$type];
+			if (!empty($sign)) {
+				$length--;
+			}
+		} elseif (in_array($type, array('enum', 'set'))) {
+			$length = 0;
+			foreach ($typeArr as $key => $enumValue) {
+				if ($key == 0) {
+					continue;
+				}
+				$tmpLength = strlen($enumValue);
+				if ($tmpLength > $length) {
+					$length = $tmpLength;
+				}
+			}
+		}
+		return intval($length);
+	}
+
+/**
+ * Translates between PHP boolean values and Database (faked) boolean values
+ *
+ * @param mixed $data Value to be translated
+ * @return mixed Converted boolean value
+ * @access public
+ */
+	function boolean($data) {
+		if ($data === true || $data === false) {
+			if ($data === true) {
+				return 1;
+			}
+			return 0;
+		} else {
+			return !empty($data);
+		}
+	}
+
+/**
+ * Inserts multiple values into a table
+ *
+ * @param string $table
+ * @param string $fields
+ * @param array $values
+ * @access protected
+ */
+	function insertMulti($table, $fields, $values) {
+		$table = $this->fullTableName($table);
+		if (is_array($fields)) {
+			$fields = implode(', ', array_map(array(&$this, 'name'), $fields));
+		}
+		$count = count($values);
+		for ($x = 0; $x < $count; $x++) {
+			$this->query("INSERT INTO {$table} ({$fields}) VALUES {$values[$x]}");
+		}
+	}
+
+/**
+ * Returns an array of the indexes in given datasource name.
+ *
+ * @param string $model Name of model to inspect
+ * @return array Fields in table. Keys are column and unique
+ * @access public
+ */
+	function index($model) {
+		return false;
+	}
+
+/**
+ * Generate a database-native schema for the given Schema object
+ *
+ * @param object $schema An instance of a subclass of CakeSchema
+ * @param string $tableName Optional.  If specified only the table name given will be generated.
+ *   Otherwise, all tables defined in the schema are generated.
+ * @return string
+ * @access public
+ */
+	function createSchema($schema, $tableName = null) {
+		if (!is_a($schema, 'CakeSchema')) {
+			trigger_error(__('Invalid schema object', true), E_USER_WARNING);
+			return null;
+		}
+		$out = '';
+
+		foreach ($schema->tables as $curTable => $columns) {
+			if (!$tableName || $tableName == $curTable) {
+				$cols = $colList = $indexes = $tableParameters = array();
+				$primary = null;
+				$table = $this->fullTableName($curTable);
+
+				foreach ($columns as $name => $col) {
+					if (is_string($col)) {
+						$col = array('type' => $col);
+					}
+					if (isset($col['key']) && $col['key'] == 'primary') {
+						$primary = $name;
+					}
+					if ($name !== 'indexes' && $name !== 'tableParameters') {
+						$col['name'] = $name;
+						if (!isset($col['type'])) {
+							$col['type'] = 'string';
+						}
+						$cols[] = $this->buildColumn($col);
+					} elseif ($name == 'indexes') {
+						$indexes = array_merge($indexes, $this->buildIndex($col, $table));
+					} elseif ($name == 'tableParameters') {
+						$tableParameters = array_merge($tableParameters, $this->buildTableParameters($col, $table));
+					}
+				}
+				if (empty($indexes) && !empty($primary)) {
+					$col = array('PRIMARY' => array('column' => $primary, 'unique' => 1));
+					$indexes = array_merge($indexes, $this->buildIndex($col, $table));
+				}
+				$columns = $cols;
+				$out .= $this->renderStatement('schema', compact('table', 'columns', 'indexes', 'tableParameters')) . "\n\n";
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate a alter syntax from	 CakeSchema::compare()
+ *
+ * @param unknown_type $schema
+ * @return boolean
+ */
+	function alterSchema($compare, $table = null) {
+		return false;
+	}
+
+/**
+ * Generate a "drop table" statement for the given Schema object
+ *
+ * @param object $schema An instance of a subclass of CakeSchema
+ * @param string $table Optional.  If specified only the table name given will be generated.
+ *   Otherwise, all tables defined in the schema are generated.
+ * @return string
+ * @access public
+ */
+	function dropSchema($schema, $table = null) {
+		if (!is_a($schema, 'CakeSchema')) {
+			trigger_error(__('Invalid schema object', true), E_USER_WARNING);
+			return null;
+		}
+		$out = '';
+
+		foreach ($schema->tables as $curTable => $columns) {
+			if (!$table || $table == $curTable) {
+				$out .= 'DROP TABLE ' . $this->fullTableName($curTable) . ";\n";
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate a database-native column schema string
+ *
+ * @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]),
+ *   where options can be 'default', 'length', or 'key'.
+ * @return string
+ * @access public
+ */
+	function buildColumn($column) {
+		$name = $type = null;
+		extract(array_merge(array('null' => true), $column));
+
+		if (empty($name) || empty($type)) {
+			trigger_error(__('Column name or type not defined in schema', true), E_USER_WARNING);
+			return null;
+		}
+
+		if (!isset($this->columns[$type])) {
+			trigger_error(sprintf(__('Column type %s does not exist', true), $type), E_USER_WARNING);
+			return null;
+		}
+
+		$real = $this->columns[$type];
+		$out = $this->name($name) . ' ' . $real['name'];
+
+		if (isset($real['limit']) || isset($real['length']) || isset($column['limit']) || isset($column['length'])) {
+			if (isset($column['length'])) {
+				$length = $column['length'];
+			} elseif (isset($column['limit'])) {
+				$length = $column['limit'];
+			} elseif (isset($real['length'])) {
+				$length = $real['length'];
+			} else {
+				$length = $real['limit'];
+			}
+			$out .= '(' . $length . ')';
+		}
+
+		if (($column['type'] == 'integer' || $column['type'] == 'float' ) && isset($column['default']) && $column['default'] === '') {
+			$column['default'] = null;
+		}
+		$out = $this->_buildFieldParameters($out, $column, 'beforeDefault');
+
+		if (isset($column['key']) && $column['key'] == 'primary' && $type == 'integer') {
+			$out .= ' ' . $this->columns['primary_key']['name'];
+		} elseif (isset($column['key']) && $column['key'] == 'primary') {
+			$out .= ' NOT NULL';
+		} elseif (isset($column['default']) && isset($column['null']) && $column['null'] == false) {
+			$out .= ' DEFAULT ' . $this->value($column['default'], $type) . ' NOT NULL';
+		} elseif (isset($column['default'])) {
+			$out .= ' DEFAULT ' . $this->value($column['default'], $type);
+		} elseif ($type !== 'timestamp' && !empty($column['null'])) {
+			$out .= ' DEFAULT NULL';
+		} elseif ($type === 'timestamp' && !empty($column['null'])) {
+			$out .= ' NULL';
+		} elseif (isset($column['null']) && $column['null'] == false) {
+			$out .= ' NOT NULL';
+		}
+		if ($type == 'timestamp' && isset($column['default']) && strtolower($column['default']) == 'current_timestamp') {
+			$out = str_replace(array("'CURRENT_TIMESTAMP'", "'current_timestamp'"), 'CURRENT_TIMESTAMP', $out);
+		}
+		$out = $this->_buildFieldParameters($out, $column, 'afterDefault');
+		return $out;
+	}
+
+/**
+ * Build the field parameters, in a position
+ *
+ * @param string $columnString The partially built column string
+ * @param array $columnData The array of column data.
+ * @param string $position The position type to use. 'beforeDefault' or 'afterDefault' are common
+ * @return string a built column with the field parameters added.
+ * @access public
+ */
+	function _buildFieldParameters($columnString, $columnData, $position) {
+		foreach ($this->fieldParameters as $paramName => $value) {
+			if (isset($columnData[$paramName]) && $value['position'] == $position) {
+				if (isset($value['options']) && !in_array($columnData[$paramName], $value['options'])) {
+					continue;
+				}
+				$val = $columnData[$paramName];
+				if ($value['quote']) {
+					$val = $this->value($val);
+				}
+				$columnString .= ' ' . $value['value'] . $value['join'] . $val;
+			}
+		}
+		return $columnString;
+	}
+
+/**
+ * Format indexes for create table
+ *
+ * @param array $indexes
+ * @param string $table
+ * @return array
+ * @access public
+ */
+	function buildIndex($indexes, $table = null) {
+		$join = array();
+		foreach ($indexes as $name => $value) {
+			$out = '';
+			if ($name == 'PRIMARY') {
+				$out .= 'PRIMARY ';
+				$name = null;
+			} else {
+				if (!empty($value['unique'])) {
+					$out .= 'UNIQUE ';
+				}
+				$name = $this->startQuote . $name . $this->endQuote;
+			}
+			if (is_array($value['column'])) {
+				$out .= 'KEY ' . $name . ' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+			} else {
+				$out .= 'KEY ' . $name . ' (' . $this->name($value['column']) . ')';
+			}
+			$join[] = $out;
+		}
+		return $join;
+	}
+
+/**
+ * Read additional table parameters
+ *
+ * @param array $parameters
+ * @param string $table
+ * @return array
+ * @access public
+ */
+	function readTableParameters($name) {
+		$parameters = array();
+		if ($this->isInterfaceSupported('listDetailedSources')) {
+			$currentTableDetails = $this->listDetailedSources($name);
+			foreach ($this->tableParameters as $paramName => $parameter) {
+				if (!empty($parameter['column']) && !empty($currentTableDetails[$parameter['column']])) {
+					$parameters[$paramName] = $currentTableDetails[$parameter['column']];
+				}
+			}
+		}
+		return $parameters;
+	}
+
+/**
+ * Format parameters for create table
+ *
+ * @param array $parameters
+ * @param string $table
+ * @return array
+ * @access public
+ */
+	function buildTableParameters($parameters, $table = null) {
+		$result = array();
+		foreach ($parameters as $name => $value) {
+			if (isset($this->tableParameters[$name])) {
+				if ($this->tableParameters[$name]['quote']) {
+					$value = $this->value($value);
+				}
+				$result[] = $this->tableParameters[$name]['value'] . $this->tableParameters[$name]['join'] . $value;
+			}
+		}
+		return $result;
+	}
+
+/**
+ * Guesses the data type of an array
+ *
+ * @param string $value
+ * @return void
+ * @access public
+ */
+	function introspectType($value) {
+		if (!is_array($value)) {
+			if ($value === true || $value === false) {
+				return 'boolean';
+			}
+			if (is_float($value) && floatval($value) === $value) {
+				return 'float';
+			}
+			if (is_int($value) && intval($value) === $value) {
+				return 'integer';
+			}
+			if (is_string($value) && strlen($value) > 255) {
+				return 'text';
+			}
+			return 'string';
+		}
+
+		$isAllFloat = $isAllInt = true;
+		$containsFloat = $containsInt = $containsString = false;
+		foreach ($value as $key => $valElement) {
+			$valElement = trim($valElement);
+			if (!is_float($valElement) && !preg_match('/^[\d]+\.[\d]+$/', $valElement)) {
+				$isAllFloat = false;
+			} else {
+				$containsFloat = true;
+				continue;
+			}
+			if (!is_int($valElement) && !preg_match('/^[\d]+$/', $valElement)) {
+				$isAllInt = false;
+			} else {
+				$containsInt = true;
+				continue;
+			}
+			$containsString = true;
+		}
+
+		if ($isAllFloat) {
+			return 'float';
+		}
+		if ($isAllInt) {
+			return 'integer';
+		}
+
+		if ($containsInt && !$containsString) {
+			return 'integer';
+		}
+		return 'string';
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php.bak b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php.bak
new file mode 100755
index 000000000..a851123e9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/datasources/dbo_source.php.bak
@@ -0,0 +1,2925 @@
+<?php
+/**
+ * Dbo Source
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('Set', 'String'));
+
+/**
+ * DboSource
+ *
+ * Creates DBO-descendant objects from a given db connection configuration
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model.datasources
+ */
+class DboSource extends DataSource {
+
+/**
+ * Description string for this Database Data Source.
+ *
+ * @var string
+ * @access public
+ */
+	var $description = "Database Data Source";
+
+/**
+ * index definition, standard cake, primary, index, unique
+ *
+ * @var array
+ */
+	var $index = array('PRI' => 'primary', 'MUL' => 'index', 'UNI' => 'unique');
+
+/**
+ * Database keyword used to assign aliases to identifiers.
+ *
+ * @var string
+ * @access public
+ */
+	var $alias = 'AS ';
+
+/**
+ * Caches result from query parsing operations.  Cached results for both DboSource::name() and
+ * DboSource::conditions() will be stored here.  Method caching uses `crc32()` which is
+ * fast but can collisions more easily than other hashing algorithms.  If you have problems
+ * with collisions, set DboSource::$cacheMethods to false.
+ *
+ * @var array
+ * @access public
+ */
+	var $methodCache = array();
+
+/**
+ * Whether or not to cache the results of DboSource::name() and DboSource::conditions()
+ * into the memory cache.  Set to false to disable the use of the memory cache.
+ *
+ * @var boolean.
+ * @access public
+ */
+	var $cacheMethods = true ;
+
+/**
+ * Bypass automatic adding of joined fields/associations.
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__bypass = false;
+
+/**
+ * The set of valid SQL operations usable in a WHERE statement
+ *
+ * @var array
+ * @access private
+ */
+	var $__sqlOps = array('like', 'ilike', 'or', 'not', 'in', 'between', 'regexp', 'similar to');
+
+/**
+ * Index of basic SQL commands
+ *
+ * @var array
+ * @access protected
+ */
+	var $_commands = array(
+		'begin' => 'BEGIN',
+		'commit' => 'COMMIT',
+		'rollback' => 'ROLLBACK'
+	);
+
+/**
+ * Separator string for virtualField composition
+ *
+ * @var string
+ */
+	var $virtualFieldSeparator = '__';
+
+/**
+ * List of table engine specific parameters used on table creating
+ *
+ * @var array
+ * @access public
+ */
+	var $tableParameters = array();
+
+/**
+ * List of engine specific additional field parameters used on table creating
+ *
+ * @var array
+ * @access public
+ */
+	var $fieldParameters = array();
+
+/**
+ * Constructor
+ *
+ * @param array $config Array of configuration information for the Datasource.
+ * @param boolean $autoConnect Whether or not the datasource should automatically connect.
+ * @access public
+ */
+	function __construct($config = null, $autoConnect = true) {
+		if (!isset($config['prefix'])) {
+			$config['prefix'] = '';
+		}
+		parent::__construct($config);
+		$this->fullDebug = Configure::read() > 1;
+		if (!$this->enabled()) {
+			return false;
+		}
+		if ($autoConnect) {
+			return $this->connect();
+		} else {
+			return true;
+		}
+	}
+
+/**
+ * Reconnects to database server with optional new settings
+ *
+ * @param array $config An array defining the new configuration settings
+ * @return boolean True on success, false on failure
+ * @access public
+ */
+	function reconnect($config = array()) {
+		$this->disconnect();
+		$this->setConfig($config);
+		$this->_sources = null;
+
+		return $this->connect();
+	}
+
+/**
+ * Prepares a value, or an array of values for database queries by quoting and escaping them.
+ *
+ * @param mixed $data A value or an array of values to prepare.
+ * @param string $column The column into which this data will be inserted
+ * @param boolean $read Value to be used in READ or WRITE context
+ * @return mixed Prepared value or array of values.
+ * @access public
+ */
+	function value($data, $column = null, $read = true) {
+		if (is_array($data) && !empty($data)) {
+			return array_map(
+				array(&$this, 'value'),
+				$data, array_fill(0, count($data), $column), array_fill(0, count($data), $read)
+			);
+		} elseif (is_object($data) && isset($data->type)) {
+			if ($data->type == 'identifier') {
+				return $this->name($data->value);
+			} elseif ($data->type == 'expression') {
+				return $data->value;
+			}
+		} elseif (in_array($data, array('{$__cakeID__$}', '{$__cakeForeignKey__$}'), true)) {
+			return $data;
+		} else {
+			return null;
+		}
+	}
+
+/**
+ * Returns an object to represent a database identifier in a query
+ *
+ * @param string $identifier
+ * @return object An object representing a database identifier to be used in a query
+ * @access public
+ */
+	function identifier($identifier) {
+		$obj = new stdClass();
+		$obj->type = 'identifier';
+		$obj->value = $identifier;
+		return $obj;
+	}
+
+/**
+ * Returns an object to represent a database expression in a query
+ *
+ * @param string $expression
+ * @return object An object representing a database expression to be used in a query
+ * @access public
+ */
+	function expression($expression) {
+		$obj = new stdClass();
+		$obj->type = 'expression';
+		$obj->value = $expression;
+		return $obj;
+	}
+
+/**
+ * Executes given SQL statement.
+ *
+ * @param string $sql SQL statement
+ * @return boolean
+ * @access public
+ */
+	function rawQuery($sql) {
+		$this->took = $this->error = $this->numRows = false;
+		return $this->execute($sql);
+	}
+
+/**
+ * Queries the database with given SQL statement, and obtains some metadata about the result
+ * (rows affected, timing, any errors, number of rows in resultset). The query is also logged.
+ * If Configure::read('debug') is set, the log is shown all the time, else it is only shown on errors.
+ *
+ * ### Options
+ *
+ * - stats - Collect meta data stats for this query. Stats include time take, rows affected,
+ *   any errors, and number of rows returned. Defaults to `true`.
+ * - log - Whether or not the query should be logged to the memory log.
+ *
+ * @param string $sql
+ * @param array $options
+ * @return mixed Resource or object representing the result set, or false on failure
+ * @access public
+ */
+	function execute($sql, $options = array()) {
+		$defaults = array('stats' => true, 'log' => $this->fullDebug);
+		$options = array_merge($defaults, $options);
+
+		$t = getMicrotime();
+		$this->_result = $this->_execute($sql);
+		if ($options['stats']) {
+			$this->took = round((getMicrotime() - $t) * 1000, 0);
+			$this->affected = $this->lastAffected();
+			$this->error = $this->lastError();
+			$this->numRows = $this->lastNumRows();
+		}
+
+		if ($options['log']) {
+			$this->logQuery($sql);
+		}
+
+		if ($this->error) {
+			$this->showQuery($sql);
+			return false;
+		}
+		return $this->_result;
+	}
+
+/**
+ * DataSource Query abstraction
+ *
+ * @return resource Result resource identifier.
+ * @access public
+ */
+	function query() {
+		$args	  = func_get_args();
+		$fields	  = null;
+		$order	  = null;
+		$limit	  = null;
+		$page	  = null;
+		$recursive = null;
+
+		if (count($args) == 1) {
+			return $this->fetchAll($args[0]);
+
+		} elseif (count($args) > 1 && (strpos(strtolower($args[0]), 'findby') === 0 || strpos(strtolower($args[0]), 'findallby') === 0)) {
+			$params = $args[1];
+
+			if (strpos(strtolower($args[0]), 'findby') === 0) {
+				$all  = false;
+				$field = Inflector::underscore(preg_replace('/^findBy/i', '', $args[0]));
+			} else {
+				$all  = true;
+				$field = Inflector::underscore(preg_replace('/^findAllBy/i', '', $args[0]));
+			}
+
+			$or = (strpos($field, '_or_') !== false);
+			if ($or) {
+				$field = explode('_or_', $field);
+			} else {
+				$field = explode('_and_', $field);
+			}
+			$off = count($field) - 1;
+
+			if (isset($params[1 + $off])) {
+				$fields = $params[1 + $off];
+			}
+
+			if (isset($params[2 + $off])) {
+				$order = $params[2 + $off];
+			}
+
+			if (!array_key_exists(0, $params)) {
+				return false;
+			}
+
+			$c = 0;
+			$conditions = array();
+
+			foreach ($field as $f) {
+				$conditions[$args[2]->alias . '.' . $f] = $params[$c];
+				$c++;
+			}
+
+			if ($or) {
+				$conditions = array('OR' => $conditions);
+			}
+
+			if ($all) {
+				if (isset($params[3 + $off])) {
+					$limit = $params[3 + $off];
+				}
+
+				if (isset($params[4 + $off])) {
+					$page = $params[4 + $off];
+				}
+
+				if (isset($params[5 + $off])) {
+					$recursive = $params[5 + $off];
+				}
+				return $args[2]->find('all', compact('conditions', 'fields', 'order', 'limit', 'page', 'recursive'));
+			} else {
+				if (isset($params[3 + $off])) {
+					$recursive = $params[3 + $off];
+				}
+				return $args[2]->find('first', compact('conditions', 'fields', 'order', 'recursive'));
+			}
+		} else {
+			if (isset($args[1]) && $args[1] === true) {
+				return $this->fetchAll($args[0], true);
+			} else if (isset($args[1]) && !is_array($args[1]) ) {
+				return $this->fetchAll($args[0], false);
+			} else if (isset($args[1]) && is_array($args[1])) {
+				$offset = 0;
+				if (isset($args[2])) {
+					$cache = $args[2];
+				} else {
+					$cache = true;
+				}
+				$args[1] = array_map(array(&$this, 'value'), $args[1]);
+				return $this->fetchAll(String::insert($args[0], $args[1]), $cache);
+			}
+		}
+	}
+
+/**
+ * Returns a row from current resultset as an array
+ *
+ * @return array The fetched row as an array
+ * @access public
+ */
+	function fetchRow($sql = null) {
+		if (!empty($sql) && is_string($sql) && strlen($sql) > 5) {
+			if (!$this->execute($sql)) {
+				return null;
+			}
+		}
+
+		if ($this->hasResult()) {
+			$this->resultSet($this->_result);
+			$resultRow = $this->fetchResult();
+			if (!empty($resultRow)) {
+				$this->fetchVirtualField($resultRow);
+			}
+			return $resultRow;
+		} else {
+			return null;
+		}
+	}
+
+/**
+ * Returns an array of all result rows for a given SQL query.
+ * Returns false if no rows matched.
+ *
+ * @param string $sql SQL statement
+ * @param boolean $cache Enables returning/storing cached query results
+ * @return array Array of resultset rows, or false if no rows matched
+ * @access public
+ */
+	function fetchAll($sql, $cache = true, $modelName = null) {
+		if ($cache && isset($this->_queryCache[$sql])) {
+			if (preg_match('/^\s*select/i', $sql)) {
+				return $this->_queryCache[$sql];
+			}
+		}
+
+		if ($this->execute($sql)) {
+			$out = array();
+
+			$first = $this->fetchRow();
+			if ($first != null) {
+				$out[] = $first;
+			}
+			while ($this->hasResult() && $item = $this->fetchResult()) {
+				$this->fetchVirtualField($item);
+				$out[] = $item;
+			}
+
+			if ($cache) {
+				if (strpos(trim(strtolower($sql)), 'select') !== false) {
+					$this->_queryCache[$sql] = $out;
+				}
+			}
+			if (empty($out) && is_bool($this->_result)) {
+				return $this->_result;
+			}
+			return $out;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Modifies $result array to place virtual fields in model entry where they belongs to
+ *
+ * @param array $resut REference to the fetched row
+ * @return void
+ */
+	function fetchVirtualField(&$result) {
+		if (isset($result[0]) && is_array($result[0])) {
+			foreach ($result[0] as $field => $value) {
+				if (strpos($field, $this->virtualFieldSeparator) === false) {
+					continue;
+				}
+				list($alias, $virtual) = explode($this->virtualFieldSeparator, $field);
+
+				if (!ClassRegistry::isKeySet($alias)) {
+					return;
+				}
+				$model = ClassRegistry::getObject($alias);
+				if ($model->isVirtualField($virtual)) {
+					$result[$alias][$virtual] = $value;
+					unset($result[0][$field]);
+				}
+			}
+			if (empty($result[0])) {
+				unset($result[0]);
+			}
+		}
+	}
+
+/**
+ * Returns a single field of the first of query results for a given SQL query, or false if empty.
+ *
+ * @param string $name Name of the field
+ * @param string $sql SQL query
+ * @return mixed Value of field read.
+ * @access public
+ */
+	function field($name, $sql) {
+		$data = $this->fetchRow($sql);
+		if (!isset($data[$name]) || empty($data[$name])) {
+			return false;
+		} else {
+			return $data[$name];
+		}
+	}
+
+/**
+ * Empties the method caches.
+ * These caches are used by DboSource::name() and DboSource::conditions()
+ *
+ * @return void
+ */
+	function flushMethodCache() {
+		$this->methodCache = array();
+	}
+
+/**
+ * Cache a value into the methodCaches.  Will respect the value of DboSource::$cacheMethods.
+ * Will retrieve a value from the cache if $value is null.
+ *
+ * If caching is disabled and a write is attempted, the $value will be returned.
+ * A read will either return the value or null.
+ *
+ * @param string $method Name of the method being cached.
+ * @param string $key The keyname for the cache operation.
+ * @param mixed $value The value to cache into memory.
+ * @return mixed Either null on failure, or the value if its set.
+ */
+	function cacheMethod($method, $key, $value = null) {
+		if ($this->cacheMethods === false) {
+			return $value;
+		}
+		if ($value === null) {
+			return (isset($this->methodCache[$method][$key])) ? $this->methodCache[$method][$key] : null;
+		}
+		return $this->methodCache[$method][$key] = $value;
+	}
+
+/**
+ * Returns a quoted name of $data for use in an SQL statement.
+ * Strips fields out of SQL functions before quoting.
+ *
+ * Results of this method are stored in a memory cache.  This improves performance, but
+ * because the method uses a simple hashing algorithm it can infrequently have collisions.
+ * Setting DboSource::$cacheMethods to false will disable the memory cache.
+ *
+ * @param mixed $data Either a string with a column to quote. An array of columns to quote or an
+ *   object from DboSource::expression() or DboSource::identifier()
+ * @return string SQL field
+ * @access public
+ */
+	function name($data) {
+		if (is_object($data) && isset($data->type)) {
+			return $data->value;
+		}
+		if ($data === '*') {
+			return '*';
+		}
+		if (is_array($data)) {
+			foreach ($data as $i => $dataItem) {
+				$data[$i] = $this->name($dataItem);
+			}
+			return $data;
+		}
+		$cacheKey = crc32($this->startQuote.$data.$this->endQuote);
+		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
+			return $return;
+		}
+		$data = trim($data);
+		if (preg_match('/^[\w-]+(?:\.[^ \*]*)*$/', $data)) { // string, string.string
+			if (strpos($data, '.') === false) { // string
+				return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
+			}
+			$items = explode('.', $data);
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,
+				$this->startQuote . implode($this->endQuote . '.' . $this->startQuote, $items) . $this->endQuote
+			);
+		}
+		if (preg_match('/^[\w-]+\.\*$/', $data)) { // string.*
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,
+				$this->startQuote . str_replace('.*', $this->endQuote . '.*', $data)
+			);
+		}
+		if (preg_match('/^([\w-]+)\((.*)\)$/', $data, $matches)) { // Functions
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,
+				 $matches[1] . '(' . $this->name($matches[2]) . ')'
+			);
+		}
+		if (
+			preg_match('/^([\w-]+(\.[\w-]+|\(.*\))*)\s+' . preg_quote($this->alias) . '\s*([\w-]+)$/i', $data, $matches
+		)) {
+			return $this->cacheMethod(
+				__FUNCTION__, $cacheKey,
+				preg_replace(
+					'/\s{2,}/', ' ', $this->name($matches[1]) . ' ' . $this->alias . ' ' . $this->name($matches[3])
+				)
+			);
+		}
+		if (preg_match('/^[\w-_\s]*[\w-_]+/', $data)) {
+			return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
+		}
+		return $this->cacheMethod(__FUNCTION__, $cacheKey, $data);
+	}
+
+/**
+ * Checks if the source is connected to the database.
+ *
+ * @return boolean True if the database is connected, else false
+ * @access public
+ */
+	function isConnected() {
+		return $this->connected;
+	}
+
+/**
+ * Checks if the result is valid
+ *
+ * @return boolean True if the result is valid else false
+ * @access public
+ */
+	function hasResult() {
+		return is_resource($this->_result);
+	}
+
+/**
+ * Get the query log as an array.
+ *
+ * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
+ * @return array Array of queries run as an array
+ * @access public
+ */
+	function getLog($sorted = false, $clear = true) {
+		if ($sorted) {
+			$log = sortByKey($this->_queriesLog, 'took', 'desc', SORT_NUMERIC);
+		} else {
+			$log = $this->_queriesLog;
+		}
+		if ($clear) {
+			$this->_queriesLog = array();
+		}
+		return array('log' => $log, 'count' => $this->_queriesCnt, 'time' => $this->_queriesTime);
+	}
+
+/**
+ * Outputs the contents of the queries log. If in a non-CLI environment the sql_log element
+ * will be rendered and output.  If in a CLI environment, a plain text log is generated.
+ *
+ * @param boolean $sorted Get the queries sorted by time taken, defaults to false.
+ * @return void
+ */
+	function showLog($sorted = false) {
+		$log = $this->getLog($sorted, false);
+		if (empty($log['log'])) {
+			return;
+		}
+		if (PHP_SAPI != 'cli') {
+			App::import('Core', 'View');
+			$controller = null;
+			$View =& new View($controller, false);
+			$View->set('logs', array($this->configKeyName => $log));
+			echo $View->element('sql_dump', array('_forced_from_dbo_' => true));
+		} else {
+			foreach ($log['log'] as $k => $i) {
+				print (($k + 1) . ". {$i['query']} {$i['error']}\n");
+			}
+		}
+	}
+
+/**
+ * Log given SQL query.
+ *
+ * @param string $sql SQL statement
+ * @todo: Add hook to log errors instead of returning false
+ * @access public
+ */
+	function logQuery($sql) {
+		$this->_queriesCnt++;
+		$this->_queriesTime += $this->took;
+		$this->_queriesLog[] = array(
+			'query' => $sql,
+			'error'		=> $this->error,
+			'affected'	=> $this->affected,
+			'numRows'	=> $this->numRows,
+			'took'		=> $this->took
+		);
+		if (count($this->_queriesLog) > $this->_queriesLogMax) {
+			array_pop($this->_queriesLog);
+		}
+		if ($this->error) {
+			return false;
+		}
+	}
+
+/**
+ * Output information about an SQL query. The SQL statement, number of rows in resultset,
+ * and execution time in microseconds. If the query fails, an error is output instead.
+ *
+ * @param string $sql Query to show information on.
+ * @access public
+ */
+	function showQuery($sql) {
+		$error = $this->error;
+		if (strlen($sql) > 200 && !$this->fullDebug && Configure::read() > 1) {
+			$sql = substr($sql, 0, 200) . '[...]';
+		}
+		if (Configure::read() > 0) {
+			$out = null;
+			if ($error) {
+				trigger_error('<span style="color:Red;text-align:left"><b>' . __('SQL Error:', true) . "</b> {$this->error}</span>", E_USER_WARNING);
+			} else {
+				$out = ('<small>[' . sprintf(__('Aff:%s Num:%s Took:%sms', true), $this->affected, $this->numRows, $this->took) . ']</small>');
+			}
+			pr(sprintf('<p style="text-align:left"><b>' . __('Query:', true) . '</b> %s %s</p>', $sql, $out));
+		}
+	}
+
+/**
+ * Gets full table name including prefix
+ *
+ * @param mixed $model Either a Model object or a string table name.
+ * @param boolean $quote Whether you want the table name quoted.
+ * @return string Full quoted table name
+ * @access public
+ */
+	function fullTableName($model, $quote = true) {
+		if (is_object($model)) {
+			$table = $model->tablePrefix . $model->table;
+		} elseif (isset($this->config['prefix'])) {
+			$table = $this->config['prefix'] . strval($model);
+		} else {
+			$table = strval($model);
+		}
+		if ($quote) {
+			return $this->name($table);
+		}
+		return $table;
+	}
+
+/**
+ * The "C" in CRUD
+ *
+ * Creates new records in the database.
+ *
+ * @param Model $model Model object that the record is for.
+ * @param array $fields An array of field names to insert. If null, $model->data will be
+ *   used to generate field names.
+ * @param array $values An array of values with keys matching the fields. If null, $model->data will
+ *   be used to generate values.
+ * @return boolean Success
+ * @access public
+ */
+	function create(&$model, $fields = null, $values = null) {
+		$id = null;
+
+		if ($fields == null) {
+			unset($fields, $values);
+			$fields = array_keys($model->data);
+			$values = array_values($model->data);
+		}
+		$count = count($fields);
+
+		for ($i = 0; $i < $count; $i++) {
+			$valueInsert[] = $this->value($values[$i], $model->getColumnType($fields[$i]), false);
+		}
+		for ($i = 0; $i < $count; $i++) {
+			$fieldInsert[] = $this->name($fields[$i]);
+			if ($fields[$i] == $model->primaryKey) {
+				$id = $values[$i];
+			}
+		}
+		$query = array(
+			'table' => $this->fullTableName($model),
+			'fields' => implode(', ', $fieldInsert),
+			'values' => implode(', ', $valueInsert)
+		);
+
+		if ($this->execute($this->renderStatement('create', $query))) {
+			if (empty($id)) {
+				$id = $this->lastInsertId($this->fullTableName($model, false), $model->primaryKey);
+			}
+			$model->setInsertID($id);
+			$model->id = $id;
+			return true;
+		} else {
+			$model->onError();
+			return false;
+		}
+	}
+
+/**
+ * The "R" in CRUD
+ *
+ * Reads record(s) from the database.
+ *
+ * @param Model $model A Model object that the query is for.
+ * @param array $queryData An array of queryData information containing keys similar to Model::find()
+ * @param integer $recursive Number of levels of association
+ * @return mixed boolean false on error/failure.  An array of results on success.
+ */
+	function read(&$model, $queryData = array(), $recursive = null) {
+		$queryData = $this->__scrubQueryData($queryData);
+
+		$null = null;
+		$array = array();
+		$linkedModels = array();
+		$this->__bypass = false;
+		$this->__booleans = array();
+
+		if ($recursive === null && isset($queryData['recursive'])) {
+			$recursive = $queryData['recursive'];
+		}
+
+		if (!is_null($recursive)) {
+			$_recursive = $model->recursive;
+			$model->recursive = $recursive;
+		}
+
+		if (!empty($queryData['fields'])) {
+			$this->__bypass = true;
+			$queryData['fields'] = $this->fields($model, null, $queryData['fields']);
+		} else {
+			$queryData['fields'] = $this->fields($model);
+		}
+
+		$_associations = $model->__associations;
+
+		if ($model->recursive == -1) {
+			$_associations = array();
+		} else if ($model->recursive == 0) {
+			unset($_associations[2], $_associations[3]);
+		}
+
+		foreach ($_associations as $type) {
+			foreach ($model->{$type} as $assoc => $assocData) {
+				$linkModel =& $model->{$assoc};
+				$external = isset($assocData['external']);
+
+				if ($model->useDbConfig == $linkModel->useDbConfig) {
+					if (true === $this->generateAssociationQuery($model, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null)) {
+						$linkedModels[$type . '/' . $assoc] = true;
+					}
+				}
+			}
+		}
+
+		$query = $this->generateAssociationQuery($model, $null, null, null, null, $queryData, false, $null);
+
+		$resultSet = $this->fetchAll($query, $model->cacheQueries, $model->alias);
+
+		if ($resultSet === false) {
+			$model->onError();
+			return false;
+		}
+
+		$filtered = $this->__filterResults($resultSet, $model);
+
+		if ($model->recursive > -1) {
+			foreach ($_associations as $type) {
+				foreach ($model->{$type} as $assoc => $assocData) {
+					$linkModel =& $model->{$assoc};
+
+					if (empty($linkedModels[$type . '/' . $assoc])) {
+						if ($model->useDbConfig == $linkModel->useDbConfig) {
+							$db =& $this;
+						} else {
+							$db =& ConnectionManager::getDataSource($linkModel->useDbConfig);
+						}
+					} elseif ($model->recursive > 1 && ($type == 'belongsTo' || $type == 'hasOne')) {
+						$db =& $this;
+					}
+
+					if (isset($db) && method_exists($db, 'queryAssociation')) {
+						$stack = array($assoc);
+						$db->queryAssociation($model, $linkModel, $type, $assoc, $assocData, $array, true, $resultSet, $model->recursive - 1, $stack);
+						unset($db);
+
+						if ($type === 'hasMany') {
+							$filtered []= $assoc;
+						}
+					}
+				}
+			}
+			$this->__filterResults($resultSet, $model, $filtered);
+		}
+
+		if (!is_null($recursive)) {
+			$model->recursive = $_recursive;
+		}
+		return $resultSet;
+	}
+
+/**
+ * Passes association results thru afterFind filters of corresponding model
+ *
+ * @param array $results Reference of resultset to be filtered
+ * @param object $model Instance of model to operate against
+ * @param array $filtered List of classes already filtered, to be skipped
+ * @return array Array of results that have been filtered through $model->afterFind
+ * @access private
+ */
+	function __filterResults(&$results, &$model, $filtered = array()) {
+		$filtering = array();
+		$count = count($results);
+
+		for ($i = 0; $i < $count; $i++) {
+			if (is_array($results[$i])) {
+				$classNames = array_keys($results[$i]);
+				$count2 = count($classNames);
+
+				for ($j = 0; $j < $count2; $j++) {
+					$className = $classNames[$j];
+					if ($model->alias != $className && !in_array($className, $filtered)) {
+						if (!in_array($className, $filtering)) {
+							$filtering[] = $className;
+						}
+
+						if (isset($model->{$className}) && is_object($model->{$className})) {
+							$data = $model->{$className}->afterFind(array(array($className => $results[$i][$className])), false);
+						}
+						if (isset($data[0][$className])) {
+							$results[$i][$className] = $data[0][$className];
+						}
+					}
+				}
+			}
+		}
+		return $filtering;
+	}
+
+/**
+ * Queries associations.  Used to fetch results on recursive models.
+ *
+ * @param Model $model Primary Model object
+ * @param Model $linkModel Linked model that
+ * @param string $type Association type, one of the model association types ie. hasMany
+ * @param unknown_type $association
+ * @param unknown_type $assocData
+ * @param array $queryData
+ * @param boolean $external Whether or not the association query is on an external datasource.
+ * @param array $resultSet Existing results
+ * @param integer $recursive Number of levels of association
+ * @param array $stack
+ */
+	function queryAssociation(&$model, &$linkModel, $type, $association, $assocData, &$queryData, $external = false, &$resultSet, $recursive, $stack) {
+		if ($query = $this->generateAssociationQuery($model, $linkModel, $type, $association, $assocData, $queryData, $external, $resultSet)) {
+			if (!isset($resultSet) || !is_array($resultSet)) {
+				if (Configure::read() > 0) {
+					echo '<div style = "font: Verdana bold 12px; color: #FF0000">' . sprintf(__('SQL Error in model %s:', true), $model->alias) . ' ';
+					if (isset($this->error) && $this->error != null) {
+						echo $this->error;
+					}
+					echo '</div>';
+				}
+				return null;
+			}
+			$count = count($resultSet);
+
+			if ($type === 'hasMany' && empty($assocData['limit']) && !empty($assocData['foreignKey'])) {
+				$ins = $fetch = array();
+				for ($i = 0; $i < $count; $i++) {
+					if ($in = $this->insertQueryData('{$__cakeID__$}', $resultSet[$i], $association, $assocData, $model, $linkModel, $stack)) {
+						$ins[] = $in;
+					}
+				}
+
+				if (!empty($ins)) {
+					$ins = array_unique($ins);
+					$fetch = $this->fetchAssociated($model, $query, $ins);
+				}
+
+				if (!empty($fetch) && is_array($fetch)) {
+					if ($recursive > 0) {
+						foreach ($linkModel->__associations as $type1) {
+							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
+								$deepModel =& $linkModel->{$assoc1};
+								$tmpStack = $stack;
+								$tmpStack[] = $assoc1;
+
+								if ($linkModel->useDbConfig === $deepModel->useDbConfig) {
+									$db =& $this;
+								} else {
+									$db =& ConnectionManager::getDataSource($deepModel->useDbConfig);
+								}
+								$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
+							}
+						}
+					}
+				}
+				$this->__filterResults($fetch, $model);
+				return $this->__mergeHasMany($resultSet, $fetch, $association, $model, $linkModel, $recursive);
+			} elseif ($type === 'hasAndBelongsToMany') {
+				$ins = $fetch = array();
+				for ($i = 0; $i < $count; $i++) {
+					if ($in = $this->insertQueryData('{$__cakeID__$}', $resultSet[$i], $association, $assocData, $model, $linkModel, $stack)) {
+						$ins[] = $in;
+					}
+				}
+				if (!empty($ins)) {
+					$ins = array_unique($ins);
+					if (count($ins) > 1) {
+						$query = str_replace('{$__cakeID__$}', '(' .implode(', ', $ins) .')', $query);
+						$query = str_replace('= (', 'IN (', $query);
+					} else {
+						$query = str_replace('{$__cakeID__$}',$ins[0], $query);
+					}
+
+					$query = str_replace(' WHERE 1 = 1', '', $query);
+				}
+
+				$foreignKey = $model->hasAndBelongsToMany[$association]['foreignKey'];
+				$joinKeys = array($foreignKey, $model->hasAndBelongsToMany[$association]['associationForeignKey']);
+				list($with, $habtmFields) = $model->joinModel($model->hasAndBelongsToMany[$association]['with'], $joinKeys);
+				$habtmFieldsCount = count($habtmFields);
+				$q = $this->insertQueryData($query, null, $association, $assocData, $model, $linkModel, $stack);
+
+				if ($q != false) {
+					$fetch = $this->fetchAll($q, $model->cacheQueries, $model->alias);
+				} else {
+					$fetch = null;
+				}
+			}
+
+			for ($i = 0; $i < $count; $i++) {
+				$row =& $resultSet[$i];
+
+				if ($type !== 'hasAndBelongsToMany') {
+					$q = $this->insertQueryData($query, $resultSet[$i], $association, $assocData, $model, $linkModel, $stack);
+					if ($q != false) {
+						$fetch = $this->fetchAll($q, $model->cacheQueries, $model->alias);
+					} else {
+						$fetch = null;
+					}
+				}
+				$selfJoin = false;
+
+				if ($linkModel->name === $model->name) {
+					$selfJoin = true;
+				}
+
+				if (!empty($fetch) && is_array($fetch)) {
+					if ($recursive > 0) {
+						foreach ($linkModel->__associations as $type1) {
+							foreach ($linkModel->{$type1} as $assoc1 => $assocData1) {
+								$deepModel =& $linkModel->{$assoc1};
+
+								if (($type1 === 'belongsTo') || ($deepModel->alias === $model->alias && $type === 'belongsTo') || ($deepModel->alias != $model->alias)) {
+									$tmpStack = $stack;
+									$tmpStack[] = $assoc1;
+									if ($linkModel->useDbConfig == $deepModel->useDbConfig) {
+										$db =& $this;
+									} else {
+										$db =& ConnectionManager::getDataSource($deepModel->useDbConfig);
+									}
+									$db->queryAssociation($linkModel, $deepModel, $type1, $assoc1, $assocData1, $queryData, true, $fetch, $recursive - 1, $tmpStack);
+								}
+							}
+						}
+					}
+					if ($type == 'hasAndBelongsToMany') {
+						$uniqueIds = $merge = array();
+
+						foreach ($fetch as $j => $data) {
+							if (
+								(isset($data[$with]) && $data[$with][$foreignKey] === $row[$model->alias][$model->primaryKey])
+							) {
+								if ($habtmFieldsCount <= 2) {
+									unset($data[$with]);
+								}
+								$merge[] = $data;
+							}
+						}
+						if (empty($merge) && !isset($row[$association])) {
+							$row[$association] = $merge;
+						} else {
+							$this->__mergeAssociation($resultSet[$i], $merge, $association, $type);
+						}
+					} else {
+						$this->__mergeAssociation($resultSet[$i], $fetch, $association, $type, $selfJoin);
+					}
+					if (isset($resultSet[$i][$association])) {
+						$resultSet[$i][$association] = $linkModel->afterFind($resultSet[$i][$association], false);
+					}
+				} else {
+					$tempArray[0][$association] = false;
+					$this->__mergeAssociation($resultSet[$i], $tempArray, $association, $type, $selfJoin);
+				}
+			}
+		}
+	}
+
+/**
+ * A more efficient way to fetch associations.	Woohoo!
+ *
+ * @param model $model Primary model object
+ * @param string $query Association query
+ * @param array $ids Array of IDs of associated records
+ * @return array Association results
+ * @access public
+ */
+	function fetchAssociated($model, $query, $ids) {
+		$query = str_replace('{$__cakeID__$}', implode(', ', $ids), $query);
+		if (count($ids) > 1) {
+			$query = str_replace('= (', 'IN (', $query);
+		}
+		return $this->fetchAll($query, $model->cacheQueries, $model->alias);
+	}
+
+/**
+ * mergeHasMany - Merge the results of hasMany relations.
+ *
+ *
+ * @param array $resultSet Data to merge into
+ * @param array $merge Data to merge
+ * @param string $association Name of Model being Merged
+ * @param object $model Model being merged onto
+ * @param object $linkModel Model being merged
+ * @return void
+ */
+	function __mergeHasMany(&$resultSet, $merge, $association, &$model, &$linkModel) {
+		foreach ($resultSet as $i => $value) {
+			$count = 0;
+			$merged[$association] = array();
+			foreach ($merge as $j => $data) {
+				if (isset($value[$model->alias]) && $value[$model->alias][$model->primaryKey] === $data[$association][$model->hasMany[$association]['foreignKey']]) {
+					if (count($data) > 1) {
+						$data = array_merge($data[$association], $data);
+						unset($data[$association]);
+						foreach ($data as $key => $name) {
+							if (is_numeric($key)) {
+								$data[$association][] = $name;
+								unset($data[$key]);
+							}
+						}
+						$merged[$association][] = $data;
+					} else {
+						$merged[$association][] = $data[$association];
+					}
+				}
+				$count++;
+			}
+			if (isset($value[$model->alias])) {
+				$resultSet[$i] = Set::pushDiff($resultSet[$i], $merged);
+				unset($merged);
+			}
+		}
+	}
+
+/**
+ * Enter description here...
+ *
+ * @param unknown_type $data
+ * @param unknown_type $merge
+ * @param unknown_type $association
+ * @param unknown_type $type
+ * @param boolean $selfJoin
+ * @access private
+ */
+	function __mergeAssociation(&$data, $merge, $association, $type, $selfJoin = false) {
+		if (isset($merge[0]) && !isset($merge[0][$association])) {
+			$association = Inflector::pluralize($association);
+		}
+
+		if ($type == 'belongsTo' || $type == 'hasOne') {
+			if (isset($merge[$association])) {
+				$data[$association] = $merge[$association][0];
+			} else {
+				if (count($merge[0][$association]) > 1) {
+					foreach ($merge[0] as $assoc => $data2) {
+						if ($assoc != $association) {
+							$merge[0][$association][$assoc] = $data2;
+						}
+					}
+				}
+				if (!isset($data[$association])) {
+					if ($merge[0][$association] != null) {
+						$data[$association] = $merge[0][$association];
+					} else {
+						$data[$association] = array();
+					}
+				} else {
+					if (is_array($merge[0][$association])) {
+						foreach ($data[$association] as $k => $v) {
+							if (!is_array($v)) {
+								$dataAssocTmp[$k] = $v;
+							}
+						}
+
+						foreach ($merge[0][$association] as $k => $v) {
+							if (!is_array($v)) {
+								$mergeAssocTmp[$k] = $v;
+							}
+						}
+						$dataKeys = array_keys($data);
+						$mergeKeys = array_keys($merge[0]);
+
+						if ($mergeKeys[0] === $dataKeys[0] || $mergeKeys === $dataKeys) {
+							$data[$association][$association] = $merge[0][$association];
+						} else {
+							$diff = Set::diff($dataAssocTmp, $mergeAssocTmp);
+							$data[$association] = array_merge($merge[0][$association], $diff);
+						}
+					} elseif ($selfJoin && array_key_exists($association, $merge[0])) {
+						$data[$association] = array_merge($data[$association], array($association => array()));
+					}
+				}
+			}
+		} else {
+			if (isset($merge[0][$association]) && $merge[0][$association] === false) {
+				if (!isset($data[$association])) {
+					$data[$association] = array();
+				}
+			} else {
+				foreach ($merge as $i => $row) {
+					if (count($row) == 1) {
+						if (empty($data[$association]) || (isset($data[$association]) && !in_array($row[$association], $data[$association]))) {
+							$data[$association][] = $row[$association];
+						}
+					} else if (!empty($row)) {
+						$tmp = array_merge($row[$association], $row);
+						unset($tmp[$association]);
+						$data[$association][] = $tmp;
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * Generates an array representing a query or part of a query from a single model or two associated models
+ *
+ * @param Model $model
+ * @param Model $linkModel
+ * @param string $type
+ * @param string $association
+ * @param array $assocData
+ * @param array $queryData
+ * @param boolean $external
+ * @param array $resultSet
+ * @return mixed
+ * @access public
+ */
+	function generateAssociationQuery(&$model, &$linkModel, $type, $association = null, $assocData = array(), &$queryData, $external = false, &$resultSet) {
+		$queryData = $this->__scrubQueryData($queryData);
+		$assocData = $this->__scrubQueryData($assocData);
+
+		if (empty($queryData['fields'])) {
+			$queryData['fields'] = $this->fields($model, $model->alias);
+		} elseif (!empty($model->hasMany) && $model->recursive > -1) {
+			$assocFields = $this->fields($model, $model->alias, array("{$model->alias}.{$model->primaryKey}"));
+			$passedFields = $this->fields($model, $model->alias, $queryData['fields']);
+			if (count($passedFields) === 1) {
+				$match = strpos($passedFields[0], $assocFields[0]);
+				$match1 = (bool)preg_match('/^[a-z]+\(/i', $passedFields[0]);
+
+				if ($match === false && $match1 === false) {
+					$queryData['fields'] = array_merge($passedFields, $assocFields);
+				} else {
+					$queryData['fields'] = $passedFields;
+				}
+			} else {
+				$queryData['fields'] = array_merge($passedFields, $assocFields);
+			}
+			unset($assocFields, $passedFields);
+		}
+
+		if ($linkModel == null) {
+			return $this->buildStatement(
+				array(
+					'fields' => array_unique($queryData['fields']),
+					'table' => $this->fullTableName($model),
+					'alias' => $model->alias,
+					'limit' => $queryData['limit'],
+					'offset' => $queryData['offset'],
+					'joins' => $queryData['joins'],
+					'conditions' => $queryData['conditions'],
+					'order' => $queryData['order'],
+					'group' => $queryData['group']
+				),
+				$model
+			);
+		}
+		if ($external && !empty($assocData['finderQuery'])) {
+			return $assocData['finderQuery'];
+		}
+
+		$alias = $association;
+		$self = ($model->name == $linkModel->name);
+		$fields = array();
+
+		if ((!$external && in_array($type, array('hasOne', 'belongsTo')) && $this->__bypass === false) || $external) {
+			$fields = $this->fields($linkModel, $alias, $assocData['fields']);
+		}
+		if (empty($assocData['offset']) && !empty($assocData['page'])) {
+			$assocData['offset'] = ($assocData['page'] - 1) * $assocData['limit'];
+		}
+		$assocData['limit'] = $this->limit($assocData['limit'], $assocData['offset']);
+
+		switch ($type) {
+			case 'hasOne':
+			case 'belongsTo':
+				$conditions = $this->__mergeConditions(
+					$assocData['conditions'],
+					$this->getConstraint($type, $model, $linkModel, $alias, array_merge($assocData, compact('external', 'self')))
+				);
+
+				if (!$self && $external) {
+					foreach ($conditions as $key => $condition) {
+						if (is_numeric($key) && strpos($condition, $model->alias . '.') !== false) {
+							unset($conditions[$key]);
+						}
+					}
+				}
+
+				if ($external) {
+					$query = array_merge($assocData, array(
+						'conditions' => $conditions,
+						'table' => $this->fullTableName($linkModel),
+						'fields' => $fields,
+						'alias' => $alias,
+						'group' => null
+					));
+					$query = array_merge(array('order' => $assocData['order'], 'limit' => $assocData['limit']), $query);
+				} else {
+					$join = array(
+						'table' => $this->fullTableName($linkModel),
+						'alias' => $alias,
+						'type' => isset($assocData['type']) ? $assocData['type'] : 'LEFT',
+						'conditions' => trim($this->conditions($conditions, true, false, $model))
+					);
+					$queryData['fields'] = array_merge($queryData['fields'], $fields);
+
+					if (!empty($assocData['order'])) {
+						$queryData['order'][] = $assocData['order'];
+					}
+					if (!in_array($join, $queryData['joins'])) {
+						$queryData['joins'][] = $join;
+					}
+					return true;
+				}
+			break;
+			case 'hasMany':
+				$assocData['fields'] = $this->fields($linkModel, $alias, $assocData['fields']);
+				if (!empty($assocData['foreignKey'])) {
+					$assocData['fields'] = array_merge($assocData['fields'], $this->fields($linkModel, $alias, array("{$alias}.{$assocData['foreignKey']}")));
+				}
+				$query = array(
+					'conditions' => $this->__mergeConditions($this->getConstraint('hasMany', $model, $linkModel, $alias, $assocData), $assocData['conditions']),
+					'fields' => array_unique($assocData['fields']),
+					'table' => $this->fullTableName($linkModel),
+					'alias' => $alias,
+					'order' => $assocData['order'],
+					'limit' => $assocData['limit'],
+					'group' => null
+				);
+			break;
+			case 'hasAndBelongsToMany':
+				$joinFields = array();
+				$joinAssoc = null;
+
+				if (isset($assocData['with']) && !empty($assocData['with'])) {
+					$joinKeys = array($assocData['foreignKey'], $assocData['associationForeignKey']);
+					list($with, $joinFields) = $model->joinModel($assocData['with'], $joinKeys);
+
+					$joinTbl = $this->fullTableName($model->{$with});
+					$joinAlias = $joinTbl;
+
+					if (is_array($joinFields) && !empty($joinFields)) {
+						$joinFields = $this->fields($model->{$with}, $model->{$with}->alias, $joinFields);
+						$joinAssoc = $joinAlias = $model->{$with}->alias;
+					} else {
+						$joinFields = array();
+					}
+				} else {
+					$joinTbl = $this->fullTableName($assocData['joinTable']);
+					$joinAlias = $joinTbl;
+				}
+				$query = array(
+					'conditions' => $assocData['conditions'],
+					'limit' => $assocData['limit'],
+					'table' => $this->fullTableName($linkModel),
+					'alias' => $alias,
+					'fields' => array_merge($this->fields($linkModel, $alias, $assocData['fields']), $joinFields),
+					'order' => $assocData['order'],
+					'group' => null,
+					'joins' => array(array(
+						'table' => $joinTbl,
+						'alias' => $joinAssoc,
+						'conditions' => $this->getConstraint('hasAndBelongsToMany', $model, $linkModel, $joinAlias, $assocData, $alias)
+					))
+				);
+			break;
+		}
+		if (isset($query)) {
+			return $this->buildStatement($query, $model);
+		}
+		return null;
+	}
+
+/**
+ * Returns a conditions array for the constraint between two models
+ *
+ * @param string $type Association type
+ * @param object $model Model object
+ * @param array $association Association array
+ * @return array Conditions array defining the constraint between $model and $association
+ * @access public
+ */
+	function getConstraint($type, $model, $linkModel, $alias, $assoc, $alias2 = null) {
+		$assoc = array_merge(array('external' => false, 'self' => false), $assoc);
+
+		if (array_key_exists('foreignKey', $assoc) && empty($assoc['foreignKey'])) {
+			return array();
+		}
+
+		switch (true) {
+			case ($assoc['external'] && $type == 'hasOne'):
+				return array("{$alias}.{$assoc['foreignKey']}" => '{$__cakeID__$}');
+			break;
+			case ($assoc['external'] && $type == 'belongsTo'):
+				return array("{$alias}.{$linkModel->primaryKey}" => '{$__cakeForeignKey__$}');
+			break;
+			case (!$assoc['external'] && $type == 'hasOne'):
+				return array("{$alias}.{$assoc['foreignKey']}" => $this->identifier("{$model->alias}.{$model->primaryKey}"));
+			break;
+			case (!$assoc['external'] && $type == 'belongsTo'):
+				return array("{$model->alias}.{$assoc['foreignKey']}" => $this->identifier("{$alias}.{$linkModel->primaryKey}"));
+			break;
+			case ($type == 'hasMany'):
+				return array("{$alias}.{$assoc['foreignKey']}" => array('{$__cakeID__$}'));
+			break;
+			case ($type == 'hasAndBelongsToMany'):
+				return array(
+					array("{$alias}.{$assoc['foreignKey']}" => '{$__cakeID__$}'),
+					array("{$alias}.{$assoc['associationForeignKey']}" => $this->identifier("{$alias2}.{$linkModel->primaryKey}"))
+				);
+			break;
+		}
+		return array();
+	}
+
+/**
+ * Builds and generates a JOIN statement from an array.	 Handles final clean-up before conversion.
+ *
+ * @param array $join An array defining a JOIN statement in a query
+ * @return string An SQL JOIN statement to be used in a query
+ * @access public
+ * @see DboSource::renderJoinStatement()
+ * @see DboSource::buildStatement()
+ */
+	function buildJoinStatement($join) {
+		$data = array_merge(array(
+			'type' => null,
+			'alias' => null,
+			'table' => 'join_table',
+			'conditions' => array()
+		), $join);
+
+		if (!empty($data['alias'])) {
+			$data['alias'] = $this->alias . $this->name($data['alias']);
+		}
+		if (!empty($data['conditions'])) {
+			$data['conditions'] = trim($this->conditions($data['conditions'], true, false));
+		}
+		return $this->renderJoinStatement($data);
+	}
+
+/**
+ * Builds and generates an SQL statement from an array.	 Handles final clean-up before conversion.
+ *
+ * @param array $query An array defining an SQL query
+ * @param object $model The model object which initiated the query
+ * @return string An executable SQL statement
+ * @access public
+ * @see DboSource::renderStatement()
+ */
+	function buildStatement($query, &$model) {
+		$query = array_merge(array('offset' => null, 'joins' => array()), $query);
+		if (!empty($query['joins'])) {
+			$count = count($query['joins']);
+			for ($i = 0; $i < $count; $i++) {
+				if (is_array($query['joins'][$i])) {
+					$query['joins'][$i] = $this->buildJoinStatement($query['joins'][$i]);
+				}
+			}
+		}
+		return $this->renderStatement('select', array(
+			'conditions' => $this->conditions($query['conditions'], true, true, $model),
+			'fields' => implode(', ', $query['fields']),
+			'table' => $query['table'],
+			'alias' => $this->alias . $this->name($query['alias']),
+			'order' => $this->order($query['order'], 'ASC', $model),
+			'limit' => $this->limit($query['limit'], $query['offset']),
+			'joins' => implode(' ', $query['joins']),
+			'group' => $this->group($query['group'], $model)
+		));
+	}
+
+/**
+ * Renders a final SQL JOIN statement
+ *
+ * @param array $data
+ * @return string
+ * @access public
+ */
+	function renderJoinStatement($data) {
+		extract($data);
+		return trim("{$type} JOIN {$table} {$alias} ON ({$conditions})");
+	}
+
+/**
+ * Renders a final SQL statement by putting together the component parts in the correct order
+ *
+ * @param string $type type of query being run.  e.g select, create, update, delete, schema, alter.
+ * @param array $data Array of data to insert into the query.
+ * @return string Rendered SQL expression to be run.
+ * @access public
+ */
+	function renderStatement($type, $data) {
+		extract($data);
+		$aliases = null;
+
+		switch (strtolower($type)) {
+			case 'select':
+				return "SELECT {$fields} FROM {$table} {$alias} {$joins} {$conditions} {$group} {$order} {$limit}";
+			break;
+			case 'create':
+				return "INSERT INTO {$table} ({$fields}) VALUES ({$values})";
+			break;
+			case 'update':
+				if (!empty($alias)) {
+					$aliases = "{$this->alias}{$alias} {$joins} ";
+				}
+				return "UPDATE {$table} {$aliases}SET {$fields} {$conditions}";
+			break;
+			case 'delete':
+				if (!empty($alias)) {
+					$aliases = "{$this->alias}{$alias} {$joins} ";
+				}
+				return "DELETE {$alias} FROM {$table} {$aliases}{$conditions}";
+			break;
+			case 'schema':
+				foreach (array('columns', 'indexes', 'tableParameters') as $var) {
+					if (is_array(${$var})) {
+						${$var} = "\t" . join(",\n\t", array_filter(${$var}));
+					} else {
+						${$var} = '';
+					}
+				}
+				if (trim($indexes) != '') {
+					$columns .= ',';
+				}
+				return "CREATE TABLE {$table} (\n{$columns}{$indexes}){$tableParameters};";
+			break;
+			case 'alter':
+			break;
+		}
+	}
+
+/**
+ * Merges a mixed set of string/array conditions
+ *
+ * @return array
+ * @access private
+ */
+	function __mergeConditions($query, $assoc) {
+		if (empty($assoc)) {
+			return $query;
+		}
+
+		if (is_array($query)) {
+			return array_merge((array)$assoc, $query);
+		}
+
+		if (!empty($query)) {
+			$query = array($query);
+			if (is_array($assoc)) {
+				$query = array_merge($query, $assoc);
+			} else {
+				$query[] = $assoc;
+			}
+			return $query;
+		}
+
+		return $assoc;
+	}
+
+/**
+ * Generates and executes an SQL UPDATE statement for given model, fields, and values.
+ * For databases that do not support aliases in UPDATE queries.
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param array $values
+ * @param mixed $conditions
+ * @return boolean Success
+ * @access public
+ */
+	function update(&$model, $fields = array(), $values = null, $conditions = null) {
+		if ($values == null) {
+			$combined = $fields;
+		} else {
+			$combined = array_combine($fields, $values);
+		}
+
+		$fields = implode(', ', $this->_prepareUpdateFields($model, $combined, empty($conditions)));
+
+		$alias = $joins = null;
+		$table = $this->fullTableName($model);
+		$conditions = $this->_matchRecords($model, $conditions);
+
+		if ($conditions === false) {
+			return false;
+		}
+		$query = compact('table', 'alias', 'joins', 'fields', 'conditions');
+
+		if (!$this->execute($this->renderStatement('update', $query))) {
+			$model->onError();
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Quotes and prepares fields and values for an SQL UPDATE statement
+ *
+ * @param Model $model
+ * @param array $fields
+ * @param boolean $quoteValues If values should be quoted, or treated as SQL snippets
+ * @param boolean $alias Include the model alias in the field name
+ * @return array Fields and values, quoted and preparted
+ * @access protected
+ */
+	function _prepareUpdateFields(&$model, $fields, $quoteValues = true, $alias = false) {
+		$quotedAlias = $this->startQuote . $model->alias . $this->endQuote;
+
+		$updates = array();
+		foreach ($fields as $field => $value) {
+			if ($alias && strpos($field, '.') === false) {
+				$quoted = $model->escapeField($field);
+			} elseif (!$alias && strpos($field, '.') !== false) {
+				$quoted = $this->name(str_replace($quotedAlias . '.', '', str_replace(
+					$model->alias . '.', '', $field
+				)));
+			} else {
+				$quoted = $this->name($field);
+			}
+
+			if ($value === null) {
+				$updates[] = $quoted . ' = NULL';
+				continue;
+			}
+			$update = $quoted . ' = ';
+
+			if ($quoteValues) {
+				$update .= $this->value($value, $model->getColumnType($field), false);
+			} elseif (!$alias) {
+				$update .= str_replace($quotedAlias . '.', '', str_replace(
+					$model->alias . '.', '', $value
+				));
+			} else {
+				$update .= $value;
+			}
+			$updates[] =  $update;
+		}
+		return $updates;
+	}
+
+/**
+ * Generates and executes an SQL DELETE statement.
+ * For databases that do not support aliases in UPDATE queries.
+ *
+ * @param Model $model
+ * @param mixed $conditions
+ * @return boolean Success
+ * @access public
+ */
+	function delete(&$model, $conditions = null) {
+		$alias = $joins = null;
+		$table = $this->fullTableName($model);
+		$conditions = $this->_matchRecords($model, $conditions);
+
+		if ($conditions === false) {
+			return false;
+		}
+
+		if ($this->execute($this->renderStatement('delete', compact('alias', 'table', 'joins', 'conditions'))) === false) {
+			$model->onError();
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Gets a list of record IDs for the given conditions.	Used for multi-record updates and deletes
+ * in databases that do not support aliases in UPDATE/DELETE queries.
+ *
+ * @param Model $model
+ * @param mixed $conditions
+ * @return array List of record IDs
+ * @access protected
+ */
+	function _matchRecords(&$model, $conditions = null) {
+		if ($conditions === true) {
+			$conditions = $this->conditions(true);
+		} elseif ($conditions === null) {
+			$conditions = $this->conditions($this->defaultConditions($model, $conditions, false), true, true, $model);
+		} else {
+			$noJoin = true;
+			foreach ($conditions as $field => $value) {
+				$originalField = $field;
+				if (strpos($field, '.') !== false) {
+					list($alias, $field) = explode('.', $field);
+					$field = ltrim($field, $this->startQuote);
+					$field = rtrim($field, $this->endQuote);
+				}
+				if (!$model->hasField($field)) {
+					$noJoin = false;
+					break;
+				}
+				if ($field !== $originalField) {
+					$conditions[$field] = $value;
+					unset($conditions[$originalField]);
+				}
+			}
+			if ($noJoin === true) {
+				return $this->conditions($conditions);
+			}
+			$idList = $model->find('all', array(
+				'fields' => "{$model->alias}.{$model->primaryKey}",
+				'conditions' => $conditions
+			));
+
+			if (empty($idList)) {
+				return false;
+			}
+			$conditions = $this->conditions(array(
+				$model->primaryKey => Set::extract($idList, "{n}.{$model->alias}.{$model->primaryKey}")
+			));
+		}
+		return $conditions;
+	}
+
+/**
+ * Returns an array of SQL JOIN fragments from a model's associations
+ *
+ * @param object $model
+ * @return array
+ * @access protected
+ */
+	function _getJoins($model) {
+		$join = array();
+		$joins = array_merge($model->getAssociated('hasOne'), $model->getAssociated('belongsTo'));
+
+		foreach ($joins as $assoc) {
+			if (isset($model->{$assoc}) && $model->useDbConfig == $model->{$assoc}->useDbConfig) {
+				$assocData = $model->getAssociated($assoc);
+				$join[] = $this->buildJoinStatement(array(
+					'table' => $this->fullTableName($model->{$assoc}),
+					'alias' => $assoc,
+					'type' => isset($assocData['type']) ? $assocData['type'] : 'LEFT',
+					'conditions' => trim($this->conditions(
+						$this->__mergeConditions($assocData['conditions'], $this->getConstraint($assocData['association'], $model, $model->{$assoc}, $assoc, $assocData)),
+						true, false, $model
+					))
+				));
+			}
+		}
+		return $join;
+	}
+
+/**
+ * Returns an SQL calculation, i.e. COUNT() or MAX()
+ *
+ * @param model $model
+ * @param string $func Lowercase name of SQL function, i.e. 'count' or 'max'
+ * @param array $params Function parameters (any values must be quoted manually)
+ * @return string An SQL calculation function
+ * @access public
+ */
+	function calculate(&$model, $func, $params = array()) {
+		$params = (array)$params;
+
+		switch (strtolower($func)) {
+			case 'count':
+				if (!isset($params[0])) {
+					$params[0] = '*';
+				}
+				if (!isset($params[1])) {
+					$params[1] = 'count';
+				}
+				if (is_object($model) && $model->isVirtualField($params[0])){
+					$arg = $this->__quoteFields($model->getVirtualField($params[0]));
+				} else {
+					$arg = $this->name($params[0]);
+				}
+				return 'COUNT(' . $arg . ') AS ' . $this->name($params[1]);
+			case 'max':
+			case 'min':
+				if (!isset($params[1])) {
+					$params[1] = $params[0];
+				}
+				if (is_object($model) && $model->isVirtualField($params[0])) {
+					$arg = $this->__quoteFields($model->getVirtualField($params[0]));
+				} else {
+					$arg = $this->name($params[0]);
+				}
+				return strtoupper($func) . '(' . $arg . ') AS ' . $this->name($params[1]);
+			break;
+		}
+	}
+
+/**
+ * Deletes all the records in a table and resets the count of the auto-incrementing
+ * primary key, where applicable.
+ *
+ * @param mixed $table A string or model class representing the table to be truncated
+ * @return boolean	SQL TRUNCATE TABLE statement, false if not applicable.
+ * @access public
+ */
+	function truncate($table) {
+		return $this->execute('TRUNCATE TABLE ' . $this->fullTableName($table));
+	}
+
+/**
+ * Begin a transaction
+ *
+ * @param model $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ * @access public
+ */
+	function begin(&$model) {
+		if (parent::begin($model) && $this->execute($this->_commands['begin'])) {
+			$this->_transactionStarted = true;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Commit a transaction
+ *
+ * @param model $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ * @access public
+ */
+	function commit(&$model) {
+		if (parent::commit($model) && $this->execute($this->_commands['commit'])) {
+			$this->_transactionStarted = false;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Rollback a transaction
+ *
+ * @param model $model
+ * @return boolean True on success, false on fail
+ * (i.e. if the database/model does not support transactions,
+ * or a transaction has not started).
+ * @access public
+ */
+	function rollback(&$model) {
+		if (parent::rollback($model) && $this->execute($this->_commands['rollback'])) {
+			$this->_transactionStarted = false;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Creates a default set of conditions from the model if $conditions is null/empty.
+ * If conditions are supplied then they will be returned.  If a model doesn't exist and no conditions
+ * were provided either null or false will be returned based on what was input.
+ *
+ * @param object $model
+ * @param mixed $conditions Array of conditions, conditions string, null or false. If an array of conditions,
+ *   or string conditions those conditions will be returned.  With other values the model's existance will be checked.
+ *   If the model doesn't exist a null or false will be returned depending on the input value.
+ * @param boolean $useAlias Use model aliases rather than table names when generating conditions
+ * @return mixed Either null, false, $conditions or an array of default conditions to use.
+ * @see DboSource::update()
+ * @see DboSource::conditions()
+ * @access public
+ */
+	function defaultConditions(&$model, $conditions, $useAlias = true) {
+		if (!empty($conditions)) {
+			return $conditions;
+		}
+		$exists = $model->exists();
+		if (!$exists && $conditions !== null) {
+			return false;
+		} elseif (!$exists) {
+			return null;
+		}
+		$alias = $model->alias;
+
+		if (!$useAlias) {
+			$alias = $this->fullTableName($model, false);
+		}
+		return array("{$alias}.{$model->primaryKey}" => $model->getID());
+	}
+
+/**
+ * Returns a key formatted like a string Model.fieldname(i.e. Post.title, or Country.name)
+ *
+ * @param unknown_type $model
+ * @param unknown_type $key
+ * @param unknown_type $assoc
+ * @return string
+ * @access public
+ */
+	function resolveKey($model, $key, $assoc = null) {
+		if (empty($assoc)) {
+			$assoc = $model->alias;
+		}
+		if (!strpos('.', $key)) {
+			return $this->name($model->alias) . '.' . $this->name($key);
+		}
+		return $key;
+	}
+
+/**
+ * Private helper method to remove query metadata in given data array.
+ *
+ * @param array $data
+ * @return array
+ * @access public
+ */
+	function __scrubQueryData($data) {
+		foreach (array('conditions', 'fields', 'joins', 'order', 'limit', 'offset', 'group') as $key) {
+			if (empty($data[$key])) {
+				$data[$key] = array();
+			}
+		}
+		return $data;
+	}
+
+/**
+ * Converts model virtual fields into sql expressions to be fetched later
+ *
+ * @param Model $model
+ * @param string $alias Alias tablename
+ * @param mixed $fields virtual fields to be used on query
+ * @return array
+ */
+	function _constructVirtualFields(&$model, $alias, $fields) {
+		$virtual = array();
+		foreach ($fields as $field) {
+			$virtualField = $this->name($alias . $this->virtualFieldSeparator . $field);
+			$expression = $this->__quoteFields($model->getVirtualField($field));
+			$virtual[] = '(' . $expression . ") {$this->alias} {$virtualField}";
+		}
+		return $virtual;
+	}
+
+/**
+ * Generates the fields list of an SQL query.
+ *
+ * @param Model $model
+ * @param string $alias Alias tablename
+ * @param mixed $fields
+ * @param boolean $quote If false, returns fields array unquoted
+ * @return array
+ * @access public
+ */
+	function fields(&$model, $alias = null, $fields = array(), $quote = true) {
+		if (empty($alias)) {
+			$alias = $model->alias;
+		}
+		$cacheKey = array(
+			$model->useDbConfig,
+			$model->table,
+			array_keys($model->schema()),
+			$model->name,
+			$model->getVirtualField(),
+			$alias,
+			$fields,
+			$quote
+		);
+		$cacheKey = crc32(serialize($cacheKey));
+		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
+			return $return;
+		}
+		$allFields = empty($fields);
+		if ($allFields) {
+			$fields = array_keys($model->schema());
+		} elseif (!is_array($fields)) {
+			$fields = String::tokenize($fields);
+		}
+		$fields = array_values(array_filter($fields));
+		$allFields = $allFields || in_array('*', $fields) || in_array($model->alias . '.*', $fields);
+
+		$virtual = array();
+		$virtualFields = $model->getVirtualField();
+		if (!empty($virtualFields)) {
+			$virtualKeys = array_keys($virtualFields);
+			foreach ($virtualKeys as $field) {
+				$virtualKeys[] = $model->alias . '.' . $field;
+			}
+			$virtual = ($allFields) ? $virtualKeys : array_intersect($virtualKeys, $fields);
+			foreach ($virtual as $i => $field) {
+				if (strpos($field, '.') !== false) {
+					$virtual[$i] = str_replace($model->alias . '.', '', $field);
+				}
+				$fields = array_diff($fields, array($field));
+			}
+			$fields = array_values($fields);
+		}
+
+		if (!$quote) {
+			if (!empty($virtual)) {
+				$fields = array_merge($fields, $this->_constructVirtualFields($model, $alias, $virtual));
+			}
+			return $fields;
+		}
+		$count = count($fields);
+
+		if ($count >= 1 && !in_array($fields[0], array('*', 'COUNT(*)'))) {
+			for ($i = 0; $i < $count; $i++) {
+				if (is_string($fields[$i]) && in_array($fields[$i], $virtual)) {
+					unset($fields[$i]);
+					continue;
+				}
+				if (is_object($fields[$i]) && isset($fields[$i]->type) && $fields[$i]->type === 'expression') {
+					$fields[$i] = $fields[$i]->value;
+				} elseif (preg_match('/^\(.*\)\s' . $this->alias . '.*/i', $fields[$i])){
+					continue;
+				} elseif (!preg_match('/^.+\\(.*\\)/', $fields[$i])) {
+					$prepend = '';
+
+					if (strpos($fields[$i], 'DISTINCT') !== false) {
+						$prepend = 'DISTINCT ';
+						$fields[$i] = trim(str_replace('DISTINCT', '', $fields[$i]));
+					}
+					$dot = strpos($fields[$i], '.');
+
+					if ($dot === false) {
+						$prefix = !(
+							strpos($fields[$i], ' ') !== false ||
+							strpos($fields[$i], '(') !== false
+						);
+						$fields[$i] = $this->name(($prefix ? $alias . '.' : '') . $fields[$i]);
+					} else {
+						$value = array();
+						$comma = strpos($fields[$i], ',');
+						if ($comma === false) {
+							$build = explode('.', $fields[$i]);
+							if (!Set::numeric($build)) {
+								$fields[$i] = $this->name(implode('.', $build));
+							}
+						}
+					}
+					$fields[$i] = $prepend . $fields[$i];
+				} elseif (preg_match('/\(([\.\w]+)\)/', $fields[$i], $field)) {
+					if (isset($field[1])) {
+						if (strpos($field[1], '.') === false) {
+							$field[1] = $this->name($alias . '.' . $field[1]);
+						} else {
+							$field[0] = explode('.', $field[1]);
+							if (!Set::numeric($field[0])) {
+								$field[0] = implode('.', array_map(array(&$this, 'name'), $field[0]));
+								$fields[$i] = preg_replace('/\(' . $field[1] . '\)/', '(' . $field[0] . ')', $fields[$i], 1);
+							}
+						}
+					}
+				}
+			}
+		}
+		if (!empty($virtual)) {
+			$fields = array_merge($fields, $this->_constructVirtualFields($model, $alias, $virtual));
+		}
+		return $this->cacheMethod(__FUNCTION__, $cacheKey, array_unique($fields));
+	}
+
+/**
+ * Creates a WHERE clause by parsing given conditions data.  If an array or string
+ * conditions are provided those conditions will be parsed and quoted.  If a boolean
+ * is given it will be integer cast as condition.  Null will return 1 = 1.
+ *
+ * Results of this method are stored in a memory cache.  This improves performance, but
+ * because the method uses a simple hashing algorithm it can infrequently have collisions.
+ * Setting DboSource::$cacheMethods to false will disable the memory cache.
+ *
+ * @param mixed $conditions Array or string of conditions, or any value.
+ * @param boolean $quoteValues If true, values should be quoted
+ * @param boolean $where If true, "WHERE " will be prepended to the return value
+ * @param Model $model A reference to the Model instance making the query
+ * @return string SQL fragment
+ * @access public
+ */
+	function conditions($conditions, $quoteValues = true, $where = true, $model = null) {
+		if (is_object($model)) {
+			$cacheKey = array(
+				$model->useDbConfig,
+				$model->table,
+				$model->schema(),
+				$model->name,
+				$model->getVirtualField(),
+				$conditions,
+				$quoteValues,
+				$where
+			);
+		} else {
+			$cacheKey = array($conditions, $quoteValues, $where);
+		}
+		$cacheKey = crc32(serialize($cacheKey));
+		if ($return = $this->cacheMethod(__FUNCTION__, $cacheKey)) {
+			return $return;
+		}
+
+		$clause = $out = '';
+
+		if ($where) {
+			$clause = ' WHERE ';
+		}
+
+		if (is_array($conditions) && !empty($conditions)) {
+			$out = $this->conditionKeysToString($conditions, $quoteValues, $model);
+
+			if (empty($out)) {
+				return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . ' 1 = 1');
+			}
+			return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . implode(' AND ', $out));
+		}
+		if ($conditions === false || $conditions === true) {
+			return $this->cacheMethod(__FUNCTION__, $cacheKey,  $clause . (int)$conditions . ' = 1');
+		}
+
+		if (empty($conditions) || trim($conditions) == '') {
+			return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . '1 = 1');
+		}
+		$clauses = '/^WHERE\\x20|^GROUP\\x20BY\\x20|^HAVING\\x20|^ORDER\\x20BY\\x20/i';
+
+		if (preg_match($clauses, $conditions, $match)) {
+			$clause = '';
+		}
+		if (trim($conditions) == '') {
+			$conditions = ' 1 = 1';
+		} else {
+			$conditions = $this->__quoteFields($conditions);
+		}
+		return $this->cacheMethod(__FUNCTION__, $cacheKey, $clause . $conditions);
+	}
+
+/**
+ * Creates a WHERE clause by parsing given conditions array.  Used by DboSource::conditions().
+ *
+ * @param array $conditions Array or string of conditions
+ * @param boolean $quoteValues If true, values should be quoted
+ * @param Model $model A reference to the Model instance making the query
+ * @return string SQL fragment
+ * @access public
+ */
+	function conditionKeysToString($conditions, $quoteValues = true, $model = null) {
+		$c = 0;
+		$out = array();
+		$data = $columnType = null;
+		$bool = array('and', 'or', 'not', 'and not', 'or not', 'xor', '||', '&&');
+
+		foreach ($conditions as $key => $value) {
+			$join = ' AND ';
+			$not = null;
+
+			if (is_array($value)) {
+				$valueInsert = (
+					!empty($value) &&
+					(substr_count($key, '?') == count($value) || substr_count($key, ':') == count($value))
+				);
+			}
+
+			if (is_numeric($key) && empty($value)) {
+				continue;
+			} elseif (is_numeric($key) && is_string($value)) {
+				$out[] = $not . $this->__quoteFields($value);
+			} elseif ((is_numeric($key) && is_array($value)) || in_array(strtolower(trim($key)), $bool)) {
+				if (in_array(strtolower(trim($key)), $bool)) {
+					$join = ' ' . strtoupper($key) . ' ';
+				} else {
+					$key = $join;
+				}
+				$value = $this->conditionKeysToString($value, $quoteValues, $model);
+
+				if (strpos($join, 'NOT') !== false) {
+					if (strtoupper(trim($key)) == 'NOT') {
+						$key = 'AND ' . trim($key);
+					}
+					$not = 'NOT ';
+				}
+
+				if (empty($value[1])) {
+					if ($not) {
+						$out[] = $not . '(' . $value[0] . ')';
+					} else {
+						$out[] = $value[0] ;
+					}
+				} else {
+					$out[] = '(' . $not . '(' . implode(') ' . strtoupper($key) . ' (', $value) . '))';
+				}
+
+			} else {
+				if (is_object($value) && isset($value->type)) {
+					if ($value->type == 'identifier') {
+						$data .= $this->name($key) . ' = ' . $this->name($value->value);
+					} elseif ($value->type == 'expression') {
+						if (is_numeric($key)) {
+							$data .= $value->value;
+						} else {
+							$data .= $this->name($key) . ' = ' . $value->value;
+						}
+					}
+				} elseif (is_array($value) && !empty($value) && !$valueInsert) {
+					$keys = array_keys($value);
+					if ($keys === array_values($keys)) {
+						$count = count($value);
+						if ($count === 1) {
+							$data = $this->__quoteFields($key) . ' = (';
+						} else {
+							$data = $this->__quoteFields($key) . ' IN (';
+						}
+						if ($quoteValues) {
+							if (is_object($model)) {
+								$columnType = $model->getColumnType($key);
+							}
+							$data .= implode(', ', $this->value($value, $columnType));
+						}
+						$data .= ')';
+					} else {
+						$ret = $this->conditionKeysToString($value, $quoteValues, $model);
+						if (count($ret) > 1) {
+							$data = '(' . implode(') AND (', $ret) . ')';
+						} elseif (isset($ret[0])) {
+							$data = $ret[0];
+						}
+					}
+				} elseif (is_numeric($key) && !empty($value)) {
+					$data = $this->__quoteFields($value);
+				} else {
+					$data = $this->__parseKey($model, trim($key), $value);
+				}
+
+				if ($data != null) {
+					$out[] = $data;
+					$data = null;
+				}
+			}
+			$c++;
+		}
+		return $out;
+	}
+
+/**
+ * Extracts a Model.field identifier and an SQL condition operator from a string, formats
+ * and inserts values, and composes them into an SQL snippet.
+ *
+ * @param Model $model Model object initiating the query
+ * @param string $key An SQL key snippet containing a field and optional SQL operator
+ * @param mixed $value The value(s) to be inserted in the string
+ * @return string
+ * @access private
+ */
+	function __parseKey(&$model, $key, $value) {
+		$operatorMatch = '/^((' . implode(')|(', $this->__sqlOps);
+		$operatorMatch .= '\\x20)|<[>=]?(?![^>]+>)\\x20?|[>=!]{1,3}(?!<)\\x20?)/is';
+		$bound = (strpos($key, '?') !== false || (is_array($value) && strpos($key, ':') !== false));
+
+		if (!strpos($key, ' ')) {
+			$operator = '=';
+		} else {
+			list($key, $operator) = explode(' ', trim($key), 2);
+
+			if (!preg_match($operatorMatch, trim($operator)) && strpos($operator, ' ') !== false) {
+				$key = $key . ' ' . $operator;
+				$split = strrpos($key, ' ');
+				$operator = substr($key, $split);
+				$key = substr($key, 0, $split);
+			}
+		}
+
+		$virtual = false;
+		if (is_object($model) && $model->isVirtualField($key)) {
+			$key = $this->__quoteFields($model->getVirtualField($key));
+			$virtual = true;
+		}
+
+		$type = (is_object($model) ? $model->getColumnType($key) : null);
+
+		$null = ($value === null || (is_array($value) && empty($value)));
+
+		if (strtolower($operator) === 'not') {
+			$data = $this->conditionKeysToString(
+				array($operator => array($key => $value)), true, $model
+			);
+			return $data[0];
+		}
+
+		$value = $this->value($value, $type);
+
+		if (!$virtual && $key !== '?') {
+			$isKey = (strpos($key, '(') !== false || strpos($key, ')') !== false);
+			$key = $isKey ? $this->__quoteFields($key) : $this->name($key);
+		}
+
+		if ($bound) {
+			return  String::insert($key . ' ' . trim($operator), $value);
+		}
+
+		if (!preg_match($operatorMatch, trim($operator))) {
+			$operator .= ' =';
+		}
+		$operator = trim($operator);
+
+		if (is_array($value)) {
+			$value = implode(', ', $value);
+
+			switch ($operator) {
+				case '=':
+					$operator = 'IN';
+				break;
+				case '!=':
+				case '<>':
+					$operator = 'NOT IN';
+				break;
+			}
+			$value = "({$value})";
+		} elseif ($null) {
+			switch ($operator) {
+				case '=':
+					$operator = 'IS';
+				break;
+				case '!=':
+				case '<>':
+					$operator = 'IS NOT';
+				break;
+			}
+		}
+		if ($virtual) {
+			return "({$key}) {$operator} {$value}";
+		}
+		return "{$key} {$operator} {$value}";
+	}
+
+/**
+ * Quotes Model.fields
+ *
+ * @param string $conditions
+ * @return string or false if no match
+ * @access private
+ */
+	function __quoteFields($conditions) {
+		$start = $end  = null;
+		$original = $conditions;
+
+		if (!empty($this->startQuote)) {
+			$start = preg_quote($this->startQuote);
+		}
+		if (!empty($this->endQuote)) {
+			$end = preg_quote($this->endQuote);
+		}
+		$conditions = str_replace(array($start, $end), '', $conditions);
+		$conditions = preg_replace_callback('/(?:[\'\"][^\'\"\\\]*(?:\\\.[^\'\"\\\]*)*[\'\"])|([a-z0-9_' . $start . $end . ']*\\.[a-z0-9_' . $start . $end . ']*)/i', array(&$this, '__quoteMatchedField'), $conditions);
+
+		if ($conditions !== null) {
+			return $conditions;
+		}
+		return $original;
+	}
+
+/**
+ * Auxiliary function to quote matches `Model.fields` from a preg_replace_callback call
+ *
+ * @param string matched string
+ * @return string quoted strig
+ * @access private
+ */
+	function __quoteMatchedField($match) {
+		if (is_numeric($match[0])) {
+			return $match[0];
+		}
+		return $this->name($match[0]);
+	}
+
+/**
+ * Returns a limit statement in the correct format for the particular database.
+ *
+ * @param integer $limit Limit of results returned
+ * @param integer $offset Offset from which to start results
+ * @return string SQL limit/offset statement
+ * @access public
+ */
+	function limit($limit, $offset = null) {
+		if ($limit) {
+			$rt = '';
+			if (!strpos(strtolower($limit), 'limit') || strpos(strtolower($limit), 'limit') === 0) {
+				$rt = ' LIMIT';
+			}
+
+			if ($offset) {
+				$rt .= ' ' . $offset . ',';
+			}
+
+			$rt .= ' ' . $limit;
+			return $rt;
+		}
+		return null;
+	}
+
+/**
+ * Returns an ORDER BY clause as a string.
+ *
+ * @param string $key Field reference, as a key (i.e. Post.title)
+ * @param string $direction Direction (ASC or DESC)
+ * @param object $model model reference (used to look for virtual field)
+ * @return string ORDER BY clause
+ * @access public
+ */
+	function order($keys, $direction = 'ASC', $model = null) {
+		if (!is_array($keys)) {
+			$keys = array($keys);
+		}
+		$keys = array_filter($keys);
+		$result = array();
+		while (!empty($keys)) {
+			list($key, $dir) = each($keys);
+			array_shift($keys);
+
+			if (is_numeric($key)) {
+				$key = $dir;
+				$dir = $direction;
+			}
+
+			if (is_string($key) && strpos($key, ',') && !preg_match('/\(.+\,.+\)/', $key)) {
+				$key = array_map('trim', explode(',', $key));
+			}
+			if (is_array($key)) {
+				//Flatten the array
+				$key = array_reverse($key, true);
+				foreach ($key as $k => $v) {
+					if (is_numeric($k)) {
+						array_unshift($keys, $v);
+					} else {
+						$keys = array($k => $v) + $keys;
+					}
+				}
+				continue;
+			} elseif (is_object($key) && isset($key->type) && $key->type === 'expression') {
+				$result[] = $key->value;
+				continue;
+			}
+
+			if (preg_match('/\\x20(ASC|DESC).*/i', $key, $_dir)) {
+				$dir = $_dir[0];
+				$key = preg_replace('/\\x20(ASC|DESC).*/i', '', $key);
+			}
+
+			$key = trim($key);
+
+			if (is_object($model) && $model->isVirtualField($key)) {
+				$key =  '(' . $this->__quoteFields($model->getVirtualField($key)) . ')';
+			}
+
+			if (strpos($key, '.')) {
+				$key = preg_replace_callback('/([a-zA-Z0-9_-]{1,})\\.([a-zA-Z0-9_-]{1,})/', array(&$this, '__quoteMatchedField'), $key);
+			}
+			if (!preg_match('/\s/', $key) && !strpos($key, '.')) {
+				$key = $this->name($key);
+			}
+			$key .= ' ' . trim($dir);
+			$result[] = $key;
+		}
+		if (!empty($result)) {
+			return ' ORDER BY ' . implode(', ', $result);
+		}
+		return '';
+	}
+
+/**
+ * Create a GROUP BY SQL clause
+ *
+ * @param string $group Group By Condition
+ * @return mixed string condition or null
+ * @access public
+ */
+	function group($group, $model = null) {
+		if ($group) {
+			if (!is_array($group)) {
+				$group = array($group);
+			}
+			foreach($group as $index => $key) {
+				if (is_object($model) && $model->isVirtualField($key)) {
+					$group[$index] = '(' . $model->getVirtualField($key) . ')';
+				}
+			}
+			$group = implode(', ', $group);
+			return ' GROUP BY ' . $this->__quoteFields($group);
+		}
+		return null;
+	}
+
+/**
+ * Disconnects database, kills the connection and says the connection is closed.
+ *
+ * @return void
+ * @access public
+ */
+	function close() {
+		$this->disconnect();
+	}
+
+/**
+ * Checks if the specified table contains any record matching specified SQL
+ *
+ * @param Model $model Model to search
+ * @param string $sql SQL WHERE clause (condition only, not the "WHERE" part)
+ * @return boolean True if the table has a matching record, else false
+ * @access public
+ */
+	function hasAny(&$Model, $sql) {
+		$sql = $this->conditions($sql);
+		$table = $this->fullTableName($Model);
+		$alias = $this->alias . $this->name($Model->alias);
+		$where = $sql ? "{$sql}" : ' WHERE 1 = 1';
+		$id = $Model->escapeField();
+
+		$out = $this->fetchRow("SELECT COUNT({$id}) {$this->alias}count FROM {$table} {$alias}{$where}");
+
+		if (is_array($out)) {
+			return $out[0]['count'];
+		}
+		return false;
+	}
+
+/**
+ * Gets the length of a database-native column description, or null if no length
+ *
+ * @param string $real Real database-layer column type (i.e. "varchar(255)")
+ * @return mixed An integer or string representing the length of the column
+ * @access public
+ */
+	function length($real) {
+		if (!preg_match_all('/([\w\s]+)(?:\((\d+)(?:,(\d+))?\))?(\sunsigned)?(\szerofill)?/', $real, $result)) {
+			trigger_error(__("FIXME: Can't parse field: " . $real, true), E_USER_WARNING);
+			$col = str_replace(array(')', 'unsigned'), '', $real);
+			$limit = null;
+
+			if (strpos($col, '(') !== false) {
+				list($col, $limit) = explode('(', $col);
+			}
+			if ($limit != null) {
+				return intval($limit);
+			}
+			return null;
+		}
+
+		$types = array(
+			'int' => 1, 'tinyint' => 1, 'smallint' => 1, 'mediumint' => 1, 'integer' => 1, 'bigint' => 1
+		);
+
+		list($real, $type, $length, $offset, $sign, $zerofill) = $result;
+		$typeArr = $type;
+		$type = $type[0];
+		$length = $length[0];
+		$offset = $offset[0];
+
+		$isFloat = in_array($type, array('dec', 'decimal', 'float', 'numeric', 'double'));
+		if ($isFloat && $offset) {
+			return $length.','.$offset;
+		}
+
+		if (($real[0] == $type) && (count($real) == 1)) {
+			return null;
+		}
+
+		if (isset($types[$type])) {
+			$length += $types[$type];
+			if (!empty($sign)) {
+				$length--;
+			}
+		} elseif (in_array($type, array('enum', 'set'))) {
+			$length = 0;
+			foreach ($typeArr as $key => $enumValue) {
+				if ($key == 0) {
+					continue;
+				}
+				$tmpLength = strlen($enumValue);
+				if ($tmpLength > $length) {
+					$length = $tmpLength;
+				}
+			}
+		}
+		return intval($length);
+	}
+
+/**
+ * Translates between PHP boolean values and Database (faked) boolean values
+ *
+ * @param mixed $data Value to be translated
+ * @return mixed Converted boolean value
+ * @access public
+ */
+	function boolean($data) {
+		if ($data === true || $data === false) {
+			if ($data === true) {
+				return 1;
+			}
+			return 0;
+		} else {
+			return !empty($data);
+		}
+	}
+
+/**
+ * Inserts multiple values into a table
+ *
+ * @param string $table
+ * @param string $fields
+ * @param array $values
+ * @access protected
+ */
+	function insertMulti($table, $fields, $values) {
+		$table = $this->fullTableName($table);
+		if (is_array($fields)) {
+			$fields = implode(', ', array_map(array(&$this, 'name'), $fields));
+		}
+		$count = count($values);
+		for ($x = 0; $x < $count; $x++) {
+			$this->query("INSERT INTO {$table} ({$fields}) VALUES {$values[$x]}");
+		}
+	}
+
+/**
+ * Returns an array of the indexes in given datasource name.
+ *
+ * @param string $model Name of model to inspect
+ * @return array Fields in table. Keys are column and unique
+ * @access public
+ */
+	function index($model) {
+		return false;
+	}
+
+/**
+ * Generate a database-native schema for the given Schema object
+ *
+ * @param object $schema An instance of a subclass of CakeSchema
+ * @param string $tableName Optional.  If specified only the table name given will be generated.
+ *   Otherwise, all tables defined in the schema are generated.
+ * @return string
+ * @access public
+ */
+	function createSchema($schema, $tableName = null) {
+		if (!is_a($schema, 'CakeSchema')) {
+			trigger_error(__('Invalid schema object', true), E_USER_WARNING);
+			return null;
+		}
+		$out = '';
+
+		foreach ($schema->tables as $curTable => $columns) {
+			if (!$tableName || $tableName == $curTable) {
+				$cols = $colList = $indexes = $tableParameters = array();
+				$primary = null;
+				$table = $this->fullTableName($curTable);
+
+				foreach ($columns as $name => $col) {
+					if (is_string($col)) {
+						$col = array('type' => $col);
+					}
+					if (isset($col['key']) && $col['key'] == 'primary') {
+						$primary = $name;
+					}
+					if ($name !== 'indexes' && $name !== 'tableParameters') {
+						$col['name'] = $name;
+						if (!isset($col['type'])) {
+							$col['type'] = 'string';
+						}
+						$cols[] = $this->buildColumn($col);
+					} elseif ($name == 'indexes') {
+						$indexes = array_merge($indexes, $this->buildIndex($col, $table));
+					} elseif ($name == 'tableParameters') {
+						$tableParameters = array_merge($tableParameters, $this->buildTableParameters($col, $table));
+					}
+				}
+				if (empty($indexes) && !empty($primary)) {
+					$col = array('PRIMARY' => array('column' => $primary, 'unique' => 1));
+					$indexes = array_merge($indexes, $this->buildIndex($col, $table));
+				}
+				$columns = $cols;
+				$out .= $this->renderStatement('schema', compact('table', 'columns', 'indexes', 'tableParameters')) . "\n\n";
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate a alter syntax from	 CakeSchema::compare()
+ *
+ * @param unknown_type $schema
+ * @return boolean
+ */
+	function alterSchema($compare, $table = null) {
+		return false;
+	}
+
+/**
+ * Generate a "drop table" statement for the given Schema object
+ *
+ * @param object $schema An instance of a subclass of CakeSchema
+ * @param string $table Optional.  If specified only the table name given will be generated.
+ *   Otherwise, all tables defined in the schema are generated.
+ * @return string
+ * @access public
+ */
+	function dropSchema($schema, $table = null) {
+		if (!is_a($schema, 'CakeSchema')) {
+			trigger_error(__('Invalid schema object', true), E_USER_WARNING);
+			return null;
+		}
+		$out = '';
+
+		foreach ($schema->tables as $curTable => $columns) {
+			if (!$table || $table == $curTable) {
+				$out .= 'DROP TABLE ' . $this->fullTableName($curTable) . ";\n";
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Generate a database-native column schema string
+ *
+ * @param array $column An array structured like the following: array('name'=>'value', 'type'=>'value'[, options]),
+ *   where options can be 'default', 'length', or 'key'.
+ * @return string
+ * @access public
+ */
+	function buildColumn($column) {
+		$name = $type = null;
+		extract(array_merge(array('null' => true), $column));
+
+		if (empty($name) || empty($type)) {
+			trigger_error(__('Column name or type not defined in schema', true), E_USER_WARNING);
+			return null;
+		}
+
+		if (!isset($this->columns[$type])) {
+			trigger_error(sprintf(__('Column type %s does not exist', true), $type), E_USER_WARNING);
+			return null;
+		}
+
+		$real = $this->columns[$type];
+		$out = $this->name($name) . ' ' . $real['name'];
+
+		if (isset($real['limit']) || isset($real['length']) || isset($column['limit']) || isset($column['length'])) {
+			if (isset($column['length'])) {
+				$length = $column['length'];
+			} elseif (isset($column['limit'])) {
+				$length = $column['limit'];
+			} elseif (isset($real['length'])) {
+				$length = $real['length'];
+			} else {
+				$length = $real['limit'];
+			}
+			$out .= '(' . $length . ')';
+		}
+
+		if (($column['type'] == 'integer' || $column['type'] == 'float' ) && isset($column['default']) && $column['default'] === '') {
+			$column['default'] = null;
+		}
+		$out = $this->_buildFieldParameters($out, $column, 'beforeDefault');
+
+		if (isset($column['key']) && $column['key'] == 'primary' && $type == 'integer') {
+			$out .= ' ' . $this->columns['primary_key']['name'];
+		} elseif (isset($column['key']) && $column['key'] == 'primary') {
+			$out .= ' NOT NULL';
+		} elseif (isset($column['default']) && isset($column['null']) && $column['null'] == false) {
+			$out .= ' DEFAULT ' . $this->value($column['default'], $type) . ' NOT NULL';
+		} elseif (isset($column['default'])) {
+			$out .= ' DEFAULT ' . $this->value($column['default'], $type);
+		} elseif ($type !== 'timestamp' && !empty($column['null'])) {
+			$out .= ' DEFAULT NULL';
+		} elseif ($type === 'timestamp' && !empty($column['null'])) {
+			$out .= ' NULL';
+		} elseif (isset($column['null']) && $column['null'] == false) {
+			$out .= ' NOT NULL';
+		}
+		if ($type == 'timestamp' && isset($column['default']) && strtolower($column['default']) == 'current_timestamp') {
+			$out = str_replace(array("'CURRENT_TIMESTAMP'", "'current_timestamp'"), 'CURRENT_TIMESTAMP', $out);
+		}
+		$out = $this->_buildFieldParameters($out, $column, 'afterDefault');
+		return $out;
+	}
+
+/**
+ * Build the field parameters, in a position
+ *
+ * @param string $columnString The partially built column string
+ * @param array $columnData The array of column data.
+ * @param string $position The position type to use. 'beforeDefault' or 'afterDefault' are common
+ * @return string a built column with the field parameters added.
+ * @access public
+ */
+	function _buildFieldParameters($columnString, $columnData, $position) {
+		foreach ($this->fieldParameters as $paramName => $value) {
+			if (isset($columnData[$paramName]) && $value['position'] == $position) {
+				if (isset($value['options']) && !in_array($columnData[$paramName], $value['options'])) {
+					continue;
+				}
+				$val = $columnData[$paramName];
+				if ($value['quote']) {
+					$val = $this->value($val);
+				}
+				$columnString .= ' ' . $value['value'] . $value['join'] . $val;
+			}
+		}
+		return $columnString;
+	}
+
+/**
+ * Format indexes for create table
+ *
+ * @param array $indexes
+ * @param string $table
+ * @return array
+ * @access public
+ */
+	function buildIndex($indexes, $table = null) {
+		$join = array();
+		foreach ($indexes as $name => $value) {
+			$out = '';
+			if ($name == 'PRIMARY') {
+				$out .= 'PRIMARY ';
+				$name = null;
+			} else {
+				if (!empty($value['unique'])) {
+					$out .= 'UNIQUE ';
+				}
+				$name = $this->startQuote . $name . $this->endQuote;
+			}
+			if (is_array($value['column'])) {
+				$out .= 'KEY ' . $name . ' (' . implode(', ', array_map(array(&$this, 'name'), $value['column'])) . ')';
+			} else {
+				$out .= 'KEY ' . $name . ' (' . $this->name($value['column']) . ')';
+			}
+			$join[] = $out;
+		}
+		return $join;
+	}
+
+/**
+ * Read additional table parameters
+ *
+ * @param array $parameters
+ * @param string $table
+ * @return array
+ * @access public
+ */
+	function readTableParameters($name) {
+		$parameters = array();
+		if ($this->isInterfaceSupported('listDetailedSources')) {
+			$currentTableDetails = $this->listDetailedSources($name);
+			foreach ($this->tableParameters as $paramName => $parameter) {
+				if (!empty($parameter['column']) && !empty($currentTableDetails[$parameter['column']])) {
+					$parameters[$paramName] = $currentTableDetails[$parameter['column']];
+				}
+			}
+		}
+		return $parameters;
+	}
+
+/**
+ * Format parameters for create table
+ *
+ * @param array $parameters
+ * @param string $table
+ * @return array
+ * @access public
+ */
+	function buildTableParameters($parameters, $table = null) {
+		$result = array();
+		foreach ($parameters as $name => $value) {
+			if (isset($this->tableParameters[$name])) {
+				if ($this->tableParameters[$name]['quote']) {
+					$value = $this->value($value);
+				}
+				$result[] = $this->tableParameters[$name]['value'] . $this->tableParameters[$name]['join'] . $value;
+			}
+		}
+		return $result;
+	}
+
+/**
+ * Guesses the data type of an array
+ *
+ * @param string $value
+ * @return void
+ * @access public
+ */
+	function introspectType($value) {
+		if (!is_array($value)) {
+			if ($value === true || $value === false) {
+				return 'boolean';
+			}
+			if (is_float($value) && floatval($value) === $value) {
+				return 'float';
+			}
+			if (is_int($value) && intval($value) === $value) {
+				return 'integer';
+			}
+			if (is_string($value) && strlen($value) > 255) {
+				return 'text';
+			}
+			return 'string';
+		}
+
+		$isAllFloat = $isAllInt = true;
+		$containsFloat = $containsInt = $containsString = false;
+		foreach ($value as $key => $valElement) {
+			$valElement = trim($valElement);
+			if (!is_float($valElement) && !preg_match('/^[\d]+\.[\d]+$/', $valElement)) {
+				$isAllFloat = false;
+			} else {
+				$containsFloat = true;
+				continue;
+			}
+			if (!is_int($valElement) && !preg_match('/^[\d]+$/', $valElement)) {
+				$isAllInt = false;
+			} else {
+				$containsInt = true;
+				continue;
+			}
+			$containsString = true;
+		}
+
+		if ($isAllFloat) {
+			return 'float';
+		}
+		if ($isAllInt) {
+			return 'integer';
+		}
+
+		if ($containsInt && !$containsString) {
+			return 'integer';
+		}
+		return 'string';
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/db_acl.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/db_acl.php
new file mode 100644
index 000000000..245e10b0b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/db_acl.php
@@ -0,0 +1,332 @@
+<?php
+/**
+ * This is core configuration file.
+ *
+ * Use it to configure core behaviour ofCake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Load Model and AppModel
+ */
+App::import('Model', 'App');
+
+/**
+ * ACL Node
+ *
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class AclNode extends AppModel {
+
+/**
+ * Explicitly disable in-memory query caching for ACL models
+ *
+ * @var boolean
+ * @access public
+ */
+	var $cacheQueries = false;
+
+/**
+ * ACL models use the Tree behavior
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Tree' => 'nested');
+
+/**
+ * Constructor
+ *
+ */
+	function __construct() {
+		$config = Configure::read('Acl.database');
+		if (isset($config)) {
+			$this->useDbConfig = $config;
+		}
+		parent::__construct();
+	}
+
+/**
+ * Retrieves the Aro/Aco node for this model
+ *
+ * @param mixed $ref Array with 'model' and 'foreign_key', model object, or string value
+ * @return array Node found in database
+ * @access public
+ */
+	function node($ref = null) {
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		$type = $this->alias;
+		$result = null;
+
+		if (!empty($this->useTable)) {
+			$table = $this->useTable;
+		} else {
+			$table = Inflector::pluralize(Inflector::underscore($type));
+		}
+
+		if (empty($ref)) {
+			return null;
+		} elseif (is_string($ref)) {
+			$path = explode('/', $ref);
+			$start = $path[0];
+			unset($path[0]);
+
+			$queryData = array(
+				'conditions' => array(
+					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}0.lft"),
+					$db->name("{$type}.rght") . ' >= ' . $db->name("{$type}0.rght")),
+				'fields' => array('id', 'parent_id', 'model', 'foreign_key', 'alias'),
+				'joins' => array(array(
+					'table' => $db->fullTableName($this),
+					'alias' => "{$type}0",
+					'type' => 'LEFT',
+					'conditions' => array("{$type}0.alias" => $start)
+				)),
+				'order' => $db->name("{$type}.lft") . ' DESC'
+			);
+
+			foreach ($path as $i => $alias) {
+				$j = $i - 1;
+
+				$queryData['joins'][] = array(
+					'table' => $db->fullTableName($this),
+					'alias' => "{$type}{$i}",
+					'type'  => 'LEFT',
+					'conditions' => array(
+						$db->name("{$type}{$i}.lft") . ' > ' . $db->name("{$type}{$j}.lft"),
+						$db->name("{$type}{$i}.rght") . ' < ' . $db->name("{$type}{$j}.rght"),
+						$db->name("{$type}{$i}.alias") . ' = ' . $db->value($alias, 'string'),
+						$db->name("{$type}{$j}.id") . ' = ' . $db->name("{$type}{$i}.parent_id")
+					)
+				);
+
+				$queryData['conditions'] = array('or' => array(
+					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}0.lft") . ' AND ' . $db->name("{$type}.rght") . ' >= ' . $db->name("{$type}0.rght"),
+					$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}{$i}.lft") . ' AND ' . $db->name("{$type}.rght") . ' >= ' . $db->name("{$type}{$i}.rght"))
+				);
+			}
+			$result = $db->read($this, $queryData, -1);
+			$path = array_values($path);
+
+			if (
+				!isset($result[0][$type]) ||
+				(!empty($path) && $result[0][$type]['alias'] != $path[count($path) - 1]) ||
+				(empty($path) && $result[0][$type]['alias'] != $start)
+			) {
+				return false;
+			}
+		} elseif (is_object($ref) && is_a($ref, 'Model')) {
+			$ref = array('model' => $ref->alias, 'foreign_key' => $ref->id);
+		} elseif (is_array($ref) && !(isset($ref['model']) && isset($ref['foreign_key']))) {
+			$name = key($ref);
+
+			if (PHP5) {
+				$model = ClassRegistry::init(array('class' => $name, 'alias' => $name));
+			} else {
+				$model =& ClassRegistry::init(array('class' => $name, 'alias' => $name));
+			}
+
+			if (empty($model)) {
+				trigger_error(sprintf(__("Model class '%s' not found in AclNode::node() when trying to bind %s object", true), $type, $this->alias), E_USER_WARNING);
+				return null;
+			}
+
+			$tmpRef = null;
+			if (method_exists($model, 'bindNode')) {
+				$tmpRef = $model->bindNode($ref);
+			}
+			if (empty($tmpRef)) {
+				$ref = array('model' => $name, 'foreign_key' => $ref[$name][$model->primaryKey]);
+			} else {
+				if (is_string($tmpRef)) {
+					return $this->node($tmpRef);
+				}
+				$ref = $tmpRef;
+			}
+		}
+		if (is_array($ref)) {
+			if (is_array(current($ref)) && is_string(key($ref))) {
+				$name = key($ref);
+				$ref = current($ref);
+			}
+			foreach ($ref as $key => $val) {
+				if (strpos($key, $type) !== 0 && strpos($key, '.') === false) {
+					unset($ref[$key]);
+					$ref["{$type}0.{$key}"] = $val;
+				}
+			}
+			$queryData = array(
+				'conditions' => $ref,
+				'fields' => array('id', 'parent_id', 'model', 'foreign_key', 'alias'),
+				'joins' => array(array(
+					'table' => $db->fullTableName($this),
+					'alias' => "{$type}0",
+					'type' => 'LEFT',
+					'conditions' => array(
+						$db->name("{$type}.lft") . ' <= ' . $db->name("{$type}0.lft"),
+						$db->name("{$type}.rght") . ' >= ' . $db->name("{$type}0.rght")
+					)
+				)),
+				'order' => $db->name("{$type}.lft") . ' DESC'
+			);
+			$result = $db->read($this, $queryData, -1);
+
+			if (!$result) {
+				trigger_error(sprintf(__("AclNode::node() - Couldn't find %s node identified by \"%s\"", true), $type, print_r($ref, true)), E_USER_WARNING);
+			}
+		}
+		return $result;
+	}
+}
+
+/**
+ * Access Control Object
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class Aco extends AclNode {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Aco';
+
+/**
+ * Binds to ARO nodes through permissions settings
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Aro' => array('with' => 'Permission'));
+}
+
+/**
+ * Action for Access Control Object
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class AcoAction extends AppModel {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'AcoAction';
+
+/**
+ * ACO Actions belong to ACOs
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Aco');
+}
+
+/**
+ * Access Request Object
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class Aro extends AclNode {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Aro';
+
+/**
+ * AROs are linked to ACOs by means of Permission
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Aco' => array('with' => 'Permission'));
+}
+
+/**
+ * Permissions linking AROs with ACOs
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class Permission extends AppModel {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Permission';
+
+/**
+ * Explicitly disable in-memory query caching
+ *
+ * @var boolean
+ * @access public
+ */
+	var $cacheQueries = false;
+
+/**
+ * Override default table name
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'aros_acos';
+
+/**
+ * Permissions link AROs with ACOs
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Aro', 'Aco');
+
+/**
+ * No behaviors for this model
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = null;
+
+/**
+ * Constructor, used to tell this model to use the
+ * database configured for ACL
+ */
+	function __construct() {
+		$config = Configure::read('Acl.database');
+		if (!empty($config)) {
+			$this->useDbConfig = $config;
+		}
+		parent::__construct();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/model.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/model.php
new file mode 100644
index 000000000..e6226e0e8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/model.php
@@ -0,0 +1,3072 @@
+<?php
+/**
+ * Object-relational mapper.
+ *
+ * DBO-backed object data model, for mapping database tables to Cake objects.
+ *
+ * PHP versions 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 0.10.0.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libs
+ */
+App::import('Core', array('ClassRegistry', 'Validation', 'Set', 'String'));
+App::import('Model', 'ModelBehavior', false);
+App::import('Model', 'ConnectionManager', false);
+
+if (!class_exists('Overloadable')) {
+	require LIBS . 'overloadable.php';
+}
+
+/**
+ * Object-relational mapper.
+ *
+ * DBO-backed object data model.
+ * Automatically selects a database table name based on a pluralized lowercase object class name
+ * (i.e. class 'User' => table 'users'; class 'Man' => table 'men')
+ * The table is required to have at least 'id auto_increment' primary key.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @link          http://book.cakephp.org/view/1000/Models
+ */
+class Model extends Overloadable {
+
+/**
+ * The name of the DataSource connection that this Model uses
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#useDbConfig-1058
+ */
+	var $useDbConfig = 'default';
+
+/**
+ * Custom database table name, or null/false if no table association is desired.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#useTable-1059
+ */
+	var $useTable = null;
+
+/**
+ * Custom display field name. Display fields are used by Scaffold, in SELECT boxes' OPTION elements.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#displayField-1062
+ */
+	var $displayField = null;
+
+/**
+ * Value of the primary key ID of the record that this model is currently pointing to.
+ * Automatically set after database insertions.
+ *
+ * @var mixed
+ * @access public
+ */
+	var $id = false;
+
+/**
+ * Container for the data that this model gets from persistent storage (usually, a database).
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#data-1065
+ */
+	var $data = array();
+
+/**
+ * Table name for this Model.
+ *
+ * @var string
+ * @access public
+ */
+	var $table = false;
+
+/**
+ * The name of the primary key field for this model.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#primaryKey-1061
+ */
+	var $primaryKey = null;
+
+/**
+ * Field-by-field table metadata.
+ *
+ * @var array
+ * @access protected
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#_schema-1066
+ */
+	var $_schema = null;
+
+/**
+ * List of validation rules. Append entries for validation as ('field_name' => '/^perl_compat_regexp$/')
+ * that have to match with preg_match(). Use these rules with Model::validate()
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#validate-1067
+ * @link http://book.cakephp.org/view/1143/Data-Validation
+ */
+	var $validate = array();
+
+/**
+ * List of validation errors.
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1182/Validating-Data-from-the-Controller
+ */
+	var $validationErrors = array();
+
+/**
+ * Database table prefix for tables in model.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#tablePrefix-1060
+ */
+	var $tablePrefix = null;
+
+/**
+ * Name of the model.
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#name-1068
+ */
+	var $name = null;
+
+/**
+ * Alias name for model.
+ *
+ * @var string
+ * @access public
+ */
+	var $alias = null;
+
+/**
+ * List of table names included in the model description. Used for associations.
+ *
+ * @var array
+ * @access public
+ */
+	var $tableToModel = array();
+
+/**
+ * Whether or not to log transactions for this model.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $logTransactions = false;
+
+/**
+ * Whether or not to cache queries for this model.  This enables in-memory
+ * caching only, the results are not stored beyond the current request.
+ *
+ * @var boolean
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#cacheQueries-1069
+ */
+	var $cacheQueries = false;
+
+/**
+ * Detailed list of belongsTo associations.
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1042/belongsTo
+ */
+	var $belongsTo = array();
+
+/**
+ * Detailed list of hasOne associations.
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1041/hasOne
+ */
+	var $hasOne = array();
+
+/**
+ * Detailed list of hasMany associations.
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1043/hasMany
+ */
+	var $hasMany = array();
+
+/**
+ * Detailed list of hasAndBelongsToMany associations.
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1044/hasAndBelongsToMany-HABTM
+ */
+	var $hasAndBelongsToMany = array();
+
+/**
+ * List of behaviors to load when the model object is initialized. Settings can be
+ * passed to behaviors by using the behavior name as index. Eg:
+ *
+ * var $actsAs = array('Translate', 'MyBehavior' => array('setting1' => 'value1'))
+ *
+ * @var array
+ * @access public
+ * @link http://book.cakephp.org/view/1072/Using-Behaviors
+ */
+	var $actsAs = null;
+
+/**
+ * Holds the Behavior objects currently bound to this model.
+ *
+ * @var BehaviorCollection
+ * @access public
+ */
+	var $Behaviors = null;
+
+/**
+ * Whitelist of fields allowed to be saved.
+ *
+ * @var array
+ * @access public
+ */
+	var $whitelist = array();
+
+/**
+ * Whether or not to cache sources for this model.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $cacheSources = true;
+
+/**
+ * Type of find query currently executing.
+ *
+ * @var string
+ * @access public
+ */
+	var $findQueryType = null;
+
+/**
+ * Number of associations to recurse through during find calls. Fetches only
+ * the first level by default.
+ *
+ * @var integer
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#recursive-1063
+ */
+	var $recursive = 1;
+
+/**
+ * The column name(s) and direction(s) to order find results by default.
+ *
+ * var $order = "Post.created DESC";
+ * var $order = array("Post.view_count DESC", "Post.rating DESC");
+ *
+ * @var string
+ * @access public
+ * @link http://book.cakephp.org/view/1057/Model-Attributes#order-1064
+ */
+	var $order = null;
+
+/**
+ * Array of virtual fields this model has.  Virtual fields are aliased
+ * SQL expressions. Fields added to this property will be read as other fields in a model
+ * but will not be saveable.
+ *
+ * `var $virtualFields = array('two' => '1 + 1');`
+ *
+ * Is a simplistic example of how to set virtualFields
+ *
+ * @var array
+ * @access public
+ */
+	var $virtualFields = array();
+
+/**
+ * Default list of association keys.
+ *
+ * @var array
+ * @access private
+ */
+	var $__associationKeys = array(
+		'belongsTo' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'counterCache'),
+		'hasOne' => array('className', 'foreignKey','conditions', 'fields','order', 'dependent'),
+		'hasMany' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'dependent', 'exclusive', 'finderQuery', 'counterQuery'),
+		'hasAndBelongsToMany' => array('className', 'joinTable', 'with', 'foreignKey', 'associationForeignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'unique', 'finderQuery', 'deleteQuery', 'insertQuery')
+	);
+
+/**
+ * Holds provided/generated association key names and other data for all associations.
+ *
+ * @var array
+ * @access private
+ */
+	var $__associations = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+
+/**
+ * Holds model associations temporarily to allow for dynamic (un)binding.
+ *
+ * @var array
+ * @access private
+ */
+	var $__backAssociation = array();
+
+/**
+ * The ID of the model record that was last inserted.
+ *
+ * @var integer
+ * @access private
+ */
+	var $__insertID = null;
+
+/**
+ * The number of records returned by the last query.
+ *
+ * @var integer
+ * @access private
+ */
+	var $__numRows = null;
+
+/**
+ * The number of records affected by the last query.
+ *
+ * @var integer
+ * @access private
+ */
+	var $__affectedRows = null;
+
+/**
+ * List of valid finder method options, supplied as the first parameter to find().
+ *
+ * @var array
+ * @access protected
+ */
+	var $_findMethods = array(
+		'all' => true, 'first' => true, 'count' => true,
+		'neighbors' => true, 'list' => true, 'threaded' => true
+	);
+
+/**
+ * Constructor. Binds the model's database table to the object.
+ *
+ * If `$id` is an array it can be used to pass several options into the model.
+ *
+ * - id - The id to start the model on.
+ * - table - The table to use for this model.
+ * - ds - The connection name this model is connected to.
+ * - name - The name of the model eg. Post.
+ * - alias - The alias of the model, this is used for registering the instance in the `ClassRegistry`.
+ *   eg. `ParentThread`
+ *
+ * ### Overriding Model's __construct method.
+ *
+ * When overriding Model::__construct() be careful to include and pass in all 3 of the
+ * arguments to `parent::__construct($id, $table, $ds);`
+ *
+ * ### Dynamically creating models
+ *
+ * You can dynamically create model instances using the $id array syntax.
+ *
+ * {{{
+ * $Post = new Model(array('table' => 'posts', 'name' => 'Post', 'ds' => 'connection2'));
+ * }}}
+ *
+ * Would create a model attached to the posts table on connection2.  Dynamic model creation is useful
+ * when you want a model object that contains no associations or attached behaviors.
+ *
+ * @param mixed $id Set this ID for this model on startup, can also be an array of options, see above.
+ * @param string $table Name of database table to use.
+ * @param string $ds DataSource connection name.
+ */
+	function __construct($id = false, $table = null, $ds = null) {
+		parent::__construct();
+
+		if (is_array($id)) {
+			extract(array_merge(
+				array(
+					'id' => $this->id, 'table' => $this->useTable, 'ds' => $this->useDbConfig,
+					'name' => $this->name, 'alias' => $this->alias
+				),
+				$id
+			));
+		}
+
+		if ($this->name === null) {
+			$this->name = (isset($name) ? $name : get_class($this));
+		}
+
+		if ($this->alias === null) {
+			$this->alias = (isset($alias) ? $alias : $this->name);
+		}
+
+		if ($this->primaryKey === null) {
+			$this->primaryKey = 'id';
+		}
+
+		ClassRegistry::addObject($this->alias, $this);
+
+		$this->id = $id;
+		unset($id);
+
+		if ($table === false) {
+			$this->useTable = false;
+		} elseif ($table) {
+			$this->useTable = $table;
+		}
+
+		if ($ds !== null) {
+			$this->useDbConfig = $ds;
+		}
+
+		if (is_subclass_of($this, 'AppModel')) {
+			$appVars = get_class_vars('AppModel');
+			$merge = array('_findMethods');
+
+			if ($this->actsAs !== null || $this->actsAs !== false) {
+				$merge[] = 'actsAs';
+			}
+			$parentClass = get_parent_class($this);
+			if (strtolower($parentClass) !== 'appmodel') {
+				$parentVars = get_class_vars($parentClass);
+				foreach ($merge as $var) {
+					if (isset($parentVars[$var]) && !empty($parentVars[$var])) {
+						$appVars[$var] = Set::merge($appVars[$var], $parentVars[$var]);
+					}
+				}
+			}
+
+			foreach ($merge as $var) {
+				if (isset($appVars[$var]) && !empty($appVars[$var]) && is_array($this->{$var})) {
+					$this->{$var} = Set::merge($appVars[$var], $this->{$var});
+				}
+			}
+		}
+		$this->Behaviors = new BehaviorCollection();
+
+		if ($this->useTable !== false) {
+			$this->setDataSource($ds);
+
+			if ($this->useTable === null) {
+				$this->useTable = Inflector::tableize($this->name);
+			}
+			$this->setSource($this->useTable);
+
+			if ($this->displayField == null) {
+				$this->displayField = $this->hasField(array('title', 'name', $this->primaryKey));
+			}
+		} elseif ($this->table === false) {
+			$this->table = Inflector::tableize($this->name);
+		}
+		$this->__createLinks();
+		$this->Behaviors->init($this->alias, $this->actsAs);
+	}
+
+/**
+ * Handles custom method calls, like findBy<field> for DB models,
+ * and custom RPC calls for remote data sources.
+ *
+ * @param string $method Name of method to call.
+ * @param array $params Parameters for the method.
+ * @return mixed Whatever is returned by called method
+ * @access protected
+ */
+	function call__($method, $params) {
+		$result = $this->Behaviors->dispatchMethod($this, $method, $params);
+
+		if ($result !== array('unhandled')) {
+			return $result;
+		}
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		$return = $db->query($method, $params, $this);
+
+		if (!PHP5) {
+			$this->resetAssociations();
+		}
+		return $return;
+	}
+
+/**
+ * Bind model associations on the fly.
+ *
+ * If `$reset` is false, association will not be reset
+ * to the originals defined in the model
+ *
+ * Example: Add a new hasOne binding to the Profile model not
+ * defined in the model source code:
+ *
+ * `$this->User->bindModel( array('hasOne' => array('Profile')) );`
+ *
+ * Bindings that are not made permanent will be reset by the next Model::find() call on this
+ * model.
+ *
+ * @param array $params Set of bindings (indexed by binding type)
+ * @param boolean $reset Set to false to make the binding permanent
+ * @return boolean Success
+ * @access public
+ * @link http://book.cakephp.org/view/1045/Creating-and-Destroying-Associations-on-the-Fly
+ */
+	function bindModel($params, $reset = true) {
+		foreach ($params as $assoc => $model) {
+			if ($reset === true && !isset($this->__backAssociation[$assoc])) {
+				$this->__backAssociation[$assoc] = $this->{$assoc};
+			}
+			foreach ($model as $key => $value) {
+				$assocName = $key;
+
+				if (is_numeric($key)) {
+					$assocName = $value;
+					$value = array();
+				}
+				$modelName = $assocName;
+				$this->{$assoc}[$assocName] = $value;
+
+				if ($reset === false && isset($this->__backAssociation[$assoc])) {
+					$this->__backAssociation[$assoc][$assocName] = $value;
+				}
+			}
+		}
+		$this->__createLinks();
+		return true;
+	}
+
+/**
+ * Turn off associations on the fly.
+ *
+ * If $reset is false, association will not be reset
+ * to the originals defined in the model
+ *
+ * Example: Turn off the associated Model Support request,
+ * to temporarily lighten the User model:
+ *
+ * `$this->User->unbindModel( array('hasMany' => array('Supportrequest')) );`
+ *
+ * unbound models that are not made permanent will reset with the next call to Model::find()
+ *
+ * @param array $params Set of bindings to unbind (indexed by binding type)
+ * @param boolean $reset  Set to false to make the unbinding permanent
+ * @return boolean Success
+ * @access public
+ * @link http://book.cakephp.org/view/1045/Creating-and-Destroying-Associations-on-the-Fly
+ */
+	function unbindModel($params, $reset = true) {
+		foreach ($params as $assoc => $models) {
+			if ($reset === true && !isset($this->__backAssociation[$assoc])) {
+				$this->__backAssociation[$assoc] = $this->{$assoc};
+			}
+			foreach ($models as $model) {
+				if ($reset === false && isset($this->__backAssociation[$assoc][$model])) {
+					unset($this->__backAssociation[$assoc][$model]);
+				}
+				unset($this->{$assoc}[$model]);
+			}
+		}
+		return true;
+	}
+
+/**
+ * Create a set of associations.
+ *
+ * @return void
+ * @access private
+ */
+	function __createLinks() {
+		foreach ($this->__associations as $type) {
+			if (!is_array($this->{$type})) {
+				$this->{$type} = explode(',', $this->{$type});
+
+				foreach ($this->{$type} as $i => $className) {
+					$className = trim($className);
+					unset ($this->{$type}[$i]);
+					$this->{$type}[$className] = array();
+				}
+			}
+
+			if (!empty($this->{$type})) {
+				foreach ($this->{$type} as $assoc => $value) {
+					$plugin = null;
+
+					if (is_numeric($assoc)) {
+						unset ($this->{$type}[$assoc]);
+						$assoc = $value;
+						$value = array();
+						$this->{$type}[$assoc] = $value;
+
+						if (strpos($assoc, '.') !== false) {
+							$value = $this->{$type}[$assoc];
+							unset($this->{$type}[$assoc]);
+							list($plugin, $assoc) = pluginSplit($assoc, true);
+							$this->{$type}[$assoc] = $value;
+						}
+					}
+					$className =  $assoc;
+
+					if (!empty($value['className'])) {
+						list($plugin, $className) = pluginSplit($value['className'], true);
+						$this->{$type}[$assoc]['className'] = $className;
+					}
+					$this->__constructLinkedModel($assoc, $plugin . $className);
+				}
+				$this->__generateAssociation($type);
+			}
+		}
+	}
+
+/**
+ * Private helper method to create associated models of a given class.
+ *
+ * @param string $assoc Association name
+ * @param string $className Class name
+ * @deprecated $this->$className use $this->$assoc instead. $assoc is the 'key' in the associations array;
+ * 	examples: var $hasMany = array('Assoc' => array('className' => 'ModelName'));
+ * 					usage: $this->Assoc->modelMethods();
+ *
+ * 				var $hasMany = array('ModelName');
+ * 					usage: $this->ModelName->modelMethods();
+ * @return void
+ * @access private
+ */
+	function __constructLinkedModel($assoc, $className = null) {
+		if (empty($className)) {
+			$className = $assoc;
+		}
+
+		if (!isset($this->{$assoc}) || $this->{$assoc}->name !== $className) {
+			$model = array('class' => $className, 'alias' => $assoc);
+			if (PHP5) {
+				$this->{$assoc} = ClassRegistry::init($model);
+			} else {
+				$this->{$assoc} =& ClassRegistry::init($model);
+			}
+			if (strpos($className, '.') !== false) {
+				ClassRegistry::addObject($className, $this->{$assoc});
+			}
+			if ($assoc) {
+				$this->tableToModel[$this->{$assoc}->table] = $assoc;
+			}
+		}
+	}
+
+/**
+ * Build an array-based association from string.
+ *
+ * @param string $type 'belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'
+ * @return void
+ * @access private
+ */
+	function __generateAssociation($type) {
+		foreach ($this->{$type} as $assocKey => $assocData) {
+			$class = $assocKey;
+			$dynamicWith = false;
+
+			foreach ($this->__associationKeys[$type] as $key) {
+
+				if (!isset($this->{$type}[$assocKey][$key]) || $this->{$type}[$assocKey][$key] === null) {
+					$data = '';
+
+					switch ($key) {
+						case 'fields':
+							$data = '';
+						break;
+
+						case 'foreignKey':
+							$data = (($type == 'belongsTo') ? Inflector::underscore($assocKey) : Inflector::singularize($this->table)) . '_id';
+						break;
+
+						case 'associationForeignKey':
+							$data = Inflector::singularize($this->{$class}->table) . '_id';
+						break;
+
+						case 'with':
+							$data = Inflector::camelize(Inflector::singularize($this->{$type}[$assocKey]['joinTable']));
+							$dynamicWith = true;
+						break;
+
+						case 'joinTable':
+							$tables = array($this->table, $this->{$class}->table);
+							sort ($tables);
+							$data = $tables[0] . '_' . $tables[1];
+						break;
+
+						case 'className':
+							$data = $class;
+						break;
+
+						case 'unique':
+							$data = true;
+						break;
+					}
+					$this->{$type}[$assocKey][$key] = $data;
+				}
+			}
+
+			if (!empty($this->{$type}[$assocKey]['with'])) {
+				$joinClass = $this->{$type}[$assocKey]['with'];
+				if (is_array($joinClass)) {
+					$joinClass = key($joinClass);
+				}
+
+				$plugin = null;
+				if (strpos($joinClass, '.') !== false) {
+					list($plugin, $joinClass) = explode('.', $joinClass);
+					$plugin .= '.';
+					$this->{$type}[$assocKey]['with'] = $joinClass;
+				}
+
+				if (!ClassRegistry::isKeySet($joinClass) && $dynamicWith === true) {
+					$this->{$joinClass} = new AppModel(array(
+						'name' => $joinClass,
+						'table' => $this->{$type}[$assocKey]['joinTable'],
+						'ds' => $this->useDbConfig
+					));
+				} else {
+					$this->__constructLinkedModel($joinClass, $plugin . $joinClass);
+					$this->{$type}[$assocKey]['joinTable'] = $this->{$joinClass}->table;
+				}
+
+				if (count($this->{$joinClass}->schema()) <= 2 && $this->{$joinClass}->primaryKey !== false) {
+					$this->{$joinClass}->primaryKey = $this->{$type}[$assocKey]['foreignKey'];
+				}
+			}
+		}
+	}
+
+/**
+ * Sets a custom table for your controller class. Used by your controller to select a database table.
+ *
+ * @param string $tableName Name of the custom table
+ * @return void
+ * @access public
+ */
+	function setSource($tableName) {
+//		debug_print_backtrace();
+		$this->setDataSource($this->useDbConfig);
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		$db->cacheSources = ($this->cacheSources && $db->cacheSources);
+
+		if ($db->isInterfaceSupported('listSources')) {
+			$sources = $db->listSources();
+			if (is_array($sources) && !in_array(strtolower($this->tablePrefix . $tableName), array_map('strtolower', $sources))) {
+				return $this->cakeError('missingTable', array(array(
+					'className' => $this->alias,
+					'table' => $this->tablePrefix . $tableName,
+					'code' => 500
+				)));
+			}
+			$this->_schema = null;
+		}
+		$this->table = $this->useTable = $tableName;
+		$this->tableToModel[$this->table] = $this->alias;
+		$this->schema();
+	}
+
+/**
+ * This function does two things:
+ *
+ * 1. it scans the array $one for the primary key,
+ * and if that's found, it sets the current id to the value of $one[id].
+ * For all other keys than 'id' the keys and values of $one are copied to the 'data' property of this object.
+ * 2. Returns an array with all of $one's keys and values.
+ * (Alternative indata: two strings, which are mangled to
+ * a one-item, two-dimensional array using $one for a key and $two as its value.)
+ *
+ * @param mixed $one Array or string of data
+ * @param string $two Value string for the alternative indata method
+ * @return array Data with all of $one's keys and values
+ * @access public
+ * @link http://book.cakephp.org/view/1031/Saving-Your-Data
+ */
+	function set($one, $two = null) {
+		if (!$one) {
+			return;
+		}
+		if (is_object($one)) {
+			$one = Set::reverse($one);
+		}
+
+		if (is_array($one)) {
+			$data = $one;
+			if (empty($one[$this->alias])) {
+				if ($this->getAssociated(key($one)) === null) {
+					$data = array($this->alias => $one);
+				}
+			}
+		} else {
+			$data = array($this->alias => array($one => $two));
+		}
+
+		foreach ($data as $modelName => $fieldSet) {
+			if (is_array($fieldSet)) {
+
+				foreach ($fieldSet as $fieldName => $fieldValue) {
+					if (isset($this->validationErrors[$fieldName])) {
+						unset ($this->validationErrors[$fieldName]);
+					}
+
+					if ($modelName === $this->alias) {
+						if ($fieldName === $this->primaryKey) {
+							$this->id = $fieldValue;
+						}
+					}
+					if (is_array($fieldValue) || is_object($fieldValue)) {
+						$fieldValue = $this->deconstruct($fieldName, $fieldValue);
+					}
+					$this->data[$modelName][$fieldName] = $fieldValue;
+				}
+			}
+		}
+		return $data;
+	}
+
+/**
+ * Deconstructs a complex data type (array or object) into a single field value.
+ *
+ * @param string $field The name of the field to be deconstructed
+ * @param mixed $data An array or object to be deconstructed into a field
+ * @return mixed The resulting data that should be assigned to a field
+ * @access public
+ */
+	function deconstruct($field, $data) {
+		if (!is_array($data)) {
+			return $data;
+		}
+
+		$copy = $data;
+		$type = $this->getColumnType($field);
+
+		if (in_array($type, array('datetime', 'timestamp', 'date', 'time'))) {
+			$useNewDate = (isset($data['year']) || isset($data['month']) ||
+				isset($data['day']) || isset($data['hour']) || isset($data['minute']));
+
+			$dateFields = array('Y' => 'year', 'm' => 'month', 'd' => 'day', 'H' => 'hour', 'i' => 'min', 's' => 'sec');
+			$timeFields = array('H' => 'hour', 'i' => 'min', 's' => 'sec');
+
+			$db =& ConnectionManager::getDataSource($this->useDbConfig);
+			$format = $db->columns[$type]['format'];
+			$date = array();
+
+			if (isset($data['hour']) && isset($data['meridian']) && $data['hour'] != 12 && 'pm' == $data['meridian']) {
+				$data['hour'] = $data['hour'] + 12;
+			}
+			if (isset($data['hour']) && isset($data['meridian']) && $data['hour'] == 12 && 'am' == $data['meridian']) {
+				$data['hour'] = '00';
+			}
+			if ($type == 'time') {
+				foreach ($timeFields as $key => $val) {
+					if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
+						$data[$val] = '00';
+					} elseif ($data[$val] === '') {
+						$data[$val] = '';
+					} else {
+						$data[$val] = sprintf('%02d', $data[$val]);
+					}
+					if (!empty($data[$val])) {
+						$date[$key] = $data[$val];
+					} else {
+						return null;
+					}
+				}
+			}
+
+			if ($type == 'datetime' || $type == 'timestamp' || $type == 'date') {
+				foreach ($dateFields as $key => $val) {
+					if ($val == 'hour' || $val == 'min' || $val == 'sec') {
+						if (!isset($data[$val]) || $data[$val] === '0' || $data[$val] === '00') {
+							$data[$val] = '00';
+						} else {
+							$data[$val] = sprintf('%02d', $data[$val]);
+						}
+					}
+					if (!isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) {
+						return null;
+					}
+					if (isset($data[$val]) && !empty($data[$val])) {
+						$date[$key] = $data[$val];
+					}
+				}
+			}
+			$date = str_replace(array_keys($date), array_values($date), $format);
+			if ($useNewDate && !empty($date)) {
+				return $date;
+			}
+		}
+		return $data;
+	}
+
+/**
+ * Returns an array of table metadata (column names and types) from the database.
+ * $field => keys(type, null, default, key, length, extra)
+ *
+ * @param mixed $field Set to true to reload schema, or a string to return a specific field
+ * @return array Array of table metadata
+ * @access public
+ */
+	function schema($field = false) {
+		if (!is_array($this->_schema) || $field === true) {
+			$db =& ConnectionManager::getDataSource($this->useDbConfig);
+			$db->cacheSources = ($this->cacheSources && $db->cacheSources);
+			if ($db->isInterfaceSupported('describe') && $this->useTable !== false) {
+				$this->_schema = $db->describe($this, $field);
+			} elseif ($this->useTable === false) {
+				$this->_schema = array();
+			}
+		}
+		if (is_string($field)) {
+			if (isset($this->_schema[$field])) {
+				return $this->_schema[$field];
+			} else {
+				return null;
+			}
+		}
+		return $this->_schema;
+	}
+
+/**
+ * Returns an associative array of field names and column types.
+ *
+ * @return array Field types indexed by field name
+ * @access public
+ */
+	function getColumnTypes() {
+		$columns = $this->schema();
+		if (empty($columns)) {
+			trigger_error(__('(Model::getColumnTypes) Unable to build model field data. If you are using a model without a database table, try implementing schema()', true), E_USER_WARNING);
+		}
+		$cols = array();
+		foreach ($columns as $field => $values) {
+			$cols[$field] = $values['type'];
+		}
+		return $cols;
+	}
+
+/**
+ * Returns the column type of a column in the model.
+ *
+ * @param string $column The name of the model column
+ * @return string Column type
+ * @access public
+ */
+	function getColumnType($column) {
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		$cols = $this->schema();
+		$model = null;
+
+		$column = str_replace(array($db->startQuote, $db->endQuote), '', $column);
+
+		if (strpos($column, '.')) {
+			list($model, $column) = explode('.', $column);
+		}
+		if ($model != $this->alias && isset($this->{$model})) {
+			return $this->{$model}->getColumnType($column);
+		}
+		if (isset($cols[$column]) && isset($cols[$column]['type'])) {
+			return $cols[$column]['type'];
+		}
+		return null;
+	}
+
+/**
+ * Returns true if the supplied field exists in the model's database table.
+ *
+ * @param mixed $name Name of field to look for, or an array of names
+ * @param boolean $checkVirtual checks if the field is declared as virtual
+ * @return mixed If $name is a string, returns a boolean indicating whether the field exists.
+ *               If $name is an array of field names, returns the first field that exists,
+ *               or false if none exist.
+ * @access public
+ */
+	function hasField($name, $checkVirtual = false) {
+		if (is_array($name)) {
+			foreach ($name as $n) {
+				if ($this->hasField($n, $checkVirtual)) {
+					return $n;
+				}
+			}
+			return false;
+		}
+
+		if ($checkVirtual && !empty($this->virtualFields)) {
+			if ($this->isVirtualField($name)) {
+				return true;
+			}
+		}
+
+		if (empty($this->_schema)) {
+			$this->schema();
+		}
+
+		if ($this->_schema != null) {
+			return isset($this->_schema[$name]);
+		}
+		return false;
+	}
+
+/**
+ * Returns true if the supplied field is a model Virtual Field
+ *
+ * @param mixed $name Name of field to look for
+ * @return boolean indicating whether the field exists as a model virtual field.
+ * @access public
+ */
+	function isVirtualField($field) {
+		if (empty($this->virtualFields) || !is_string($field)) {
+			return false;
+		}
+		if (isset($this->virtualFields[$field])) {
+			return true;
+		}
+		if (strpos($field, '.') !== false) {
+			list($model, $field) = explode('.', $field);
+			if (isset($this->virtualFields[$field])) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Returns the expression for a model virtual field
+ *
+ * @param mixed $name Name of field to look for
+ * @return mixed If $field is string expression bound to virtual field $field
+ *    If $field is null, returns an array of all model virtual fields
+ *    or false if none $field exist.
+ * @access public
+ */
+	function getVirtualField($field = null) {
+		if ($field == null) {
+			return empty($this->virtualFields) ? false : $this->virtualFields;
+		}
+		if ($this->isVirtualField($field)) {
+			if (strpos($field, '.') !== false) {
+				list($model, $field) = explode('.', $field);
+			}
+			return $this->virtualFields[$field];
+		}
+		return false;
+	}
+
+/**
+ * Initializes the model for writing a new record, loading the default values
+ * for those fields that are not defined in $data, and clearing previous validation errors.
+ * Especially helpful for saving data in loops.
+ *
+ * @param mixed $data Optional data array to assign to the model after it is created.  If null or false,
+ *   schema data defaults are not merged.
+ * @param boolean $filterKey If true, overwrites any primary key input with an empty value
+ * @return array The current Model::data; after merging $data and/or defaults from database
+ * @access public
+ * @link http://book.cakephp.org/view/1031/Saving-Your-Data
+ */
+	function create($data = array(), $filterKey = false) {
+		$defaults = array();
+		$this->id = false;
+		$this->data = array();
+		$this->validationErrors = array();
+
+		if ($data !== null && $data !== false) {
+			foreach ($this->schema() as $field => $properties) {
+				if ($this->primaryKey !== $field && isset($properties['default']) && $properties['default'] !== '') {
+					$defaults[$field] = $properties['default'];
+				}
+			}
+			$this->set($defaults);
+			$this->set($data);
+		}
+		if ($filterKey) {
+			$this->set($this->primaryKey, false);
+		}
+		return $this->data;
+	}
+
+/**
+ * Returns a list of fields from the database, and sets the current model
+ * data (Model::$data) with the record found.
+ *
+ * @param mixed $fields String of single fieldname, or an array of fieldnames.
+ * @param mixed $id The ID of the record to read
+ * @return array Array of database fields, or false if not found
+ * @access public
+ * @link http://book.cakephp.org/view/1017/Retrieving-Your-Data#read-1029
+ */
+	function read($fields = null, $id = null) {
+		$this->validationErrors = array();
+
+		if ($id != null) {
+			$this->id = $id;
+		}
+
+		$id = $this->id;
+
+		if (is_array($this->id)) {
+			$id = $this->id[0];
+		}
+
+		if ($id !== null && $id !== false) {
+			$this->data = $this->find('first', array(
+				'conditions' => array($this->alias . '.' . $this->primaryKey => $id),
+				'fields' => $fields
+			));
+			return $this->data;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Returns the contents of a single field given the supplied conditions, in the
+ * supplied order.
+ *
+ * @param string $name Name of field to get
+ * @param array $conditions SQL conditions (defaults to NULL)
+ * @param string $order SQL ORDER BY fragment
+ * @return string field contents, or false if not found
+ * @access public
+ * @link http://book.cakephp.org/view/1017/Retrieving-Your-Data#field-1028
+ */
+	function field($name, $conditions = null, $order = null) {
+		if ($conditions === null && $this->id !== false) {
+			$conditions = array($this->alias . '.' . $this->primaryKey => $this->id);
+		}
+		if ($this->recursive >= 1) {
+			$recursive = -1;
+		} else {
+			$recursive = $this->recursive;
+		}
+		$fields = $name;
+		if ($data = $this->find('first', compact('conditions', 'fields', 'order', 'recursive'))) {
+			if (strpos($name, '.') === false) {
+				if (isset($data[$this->alias][$name])) {
+					return $data[$this->alias][$name];
+				}
+			} else {
+				$name = explode('.', $name);
+				if (isset($data[$name[0]][$name[1]])) {
+					return $data[$name[0]][$name[1]];
+				}
+			}
+			if (isset($data[0]) && count($data[0]) > 0) {
+				return array_shift($data[0]);
+			}
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Saves the value of a single field to the database, based on the current
+ * model ID.
+ *
+ * @param string $name Name of the table field
+ * @param mixed $value Value of the field
+ * @param array $validate See $options param in Model::save(). Does not respect 'fieldList' key if passed
+ * @return boolean See Model::save()
+ * @access public
+ * @see Model::save()
+ * @link http://book.cakephp.org/view/1031/Saving-Your-Data
+ */
+	function saveField($name, $value, $validate = false) {
+		$id = $this->id;
+		$this->create(false);
+
+		if (is_array($validate)) {
+			$options = array_merge(array('validate' => false, 'fieldList' => array($name)), $validate);
+		} else {
+			$options = array('validate' => $validate, 'fieldList' => array($name));
+		}
+		return $this->save(array($this->alias => array($this->primaryKey => $id, $name => $value)), $options);
+	}
+
+/**
+ * Saves model data (based on white-list, if supplied) to the database. By
+ * default, validation occurs before save.
+ *
+ * @param array $data Data to save.
+ * @param mixed $validate Either a boolean, or an array.
+ *   If a boolean, indicates whether or not to validate before saving.
+ *   If an array, allows control of validate, callbacks, and fieldList
+ * @param array $fieldList List of fields to allow to be written
+ * @return mixed On success Model::$data if its not empty or true, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1031/Saving-Your-Data
+ */
+	function save($data = null, $validate = true, $fieldList = array()) {
+		$defaults = array('validate' => true, 'fieldList' => array(), 'callbacks' => true);
+		$_whitelist = $this->whitelist;
+		$fields = array();
+
+		if (!is_array($validate)) {
+			$options = array_merge($defaults, compact('validate', 'fieldList', 'callbacks'));
+		} else {
+			$options = array_merge($defaults, $validate);
+		}
+
+		if (!empty($options['fieldList'])) {
+			$this->whitelist = $options['fieldList'];
+		} elseif ($options['fieldList'] === null) {
+			$this->whitelist = array();
+		}
+		$this->set($data);
+
+		if (empty($this->data) && !$this->hasField(array('created', 'updated', 'modified'))) {
+			return false;
+		}
+
+		foreach (array('created', 'updated', 'modified') as $field) {
+			$keyPresentAndEmpty = (
+				isset($this->data[$this->alias]) &&
+				array_key_exists($field, $this->data[$this->alias]) &&
+				$this->data[$this->alias][$field] === null
+			);
+			if ($keyPresentAndEmpty) {
+				unset($this->data[$this->alias][$field]);
+			}
+		}
+
+		$exists = $this->exists();
+		$dateFields = array('modified', 'updated');
+
+		if (!$exists) {
+			$dateFields[] = 'created';
+		}
+		if (isset($this->data[$this->alias])) {
+			$fields = array_keys($this->data[$this->alias]);
+		}
+		if ($options['validate'] && !$this->validates($options)) {
+			$this->whitelist = $_whitelist;
+			return false;
+		}
+
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+
+		foreach ($dateFields as $updateCol) {
+			if ($this->hasField($updateCol) && !in_array($updateCol, $fields)) {
+				$default = array('formatter' => 'date');
+				$colType = array_merge($default, $db->columns[$this->getColumnType($updateCol)]);
+				if (!array_key_exists('format', $colType)) {
+					$time = strtotime('now');
+				} else {
+					$time = $colType['formatter']($colType['format']);
+				}
+				if (!empty($this->whitelist)) {
+					$this->whitelist[] = $updateCol;
+				}
+				$this->set($updateCol, $time);
+			}
+		}
+
+		if ($options['callbacks'] === true || $options['callbacks'] === 'before') {
+			$result = $this->Behaviors->trigger($this, 'beforeSave', array($options), array(
+				'break' => true, 'breakOn' => false
+			));
+			if (!$result || !$this->beforeSave($options)) {
+				$this->whitelist = $_whitelist;
+				return false;
+			}
+		}
+
+		if (empty($this->data[$this->alias][$this->primaryKey])) {
+			unset($this->data[$this->alias][$this->primaryKey]);
+		}
+		$fields = $values = array();
+
+		foreach ($this->data as $n => $v) {
+			if (isset($this->hasAndBelongsToMany[$n])) {
+				if (isset($v[$n])) {
+					$v = $v[$n];
+				}
+				$joined[$n] = $v;
+			} else {
+				if ($n === $this->alias) {
+					foreach (array('created', 'updated', 'modified') as $field) {
+						if (array_key_exists($field, $v) && empty($v[$field])) {
+							unset($v[$field]);
+						}
+					}
+
+					foreach ($v as $x => $y) {
+						if ($this->hasField($x) && (empty($this->whitelist) || in_array($x, $this->whitelist))) {
+							list($fields[], $values[]) = array($x, $y);
+						}
+					}
+				}
+			}
+		}
+		$count = count($fields);
+
+		if (!$exists && $count > 0) {
+			$this->id = false;
+		}
+		$success = true;
+		$created = false;
+
+		if ($count > 0) {
+			$cache = $this->_prepareUpdateFields(array_combine($fields, $values));
+
+			if (!empty($this->id)) {
+				$success = (bool)$db->update($this, $fields, $values);
+			} else {
+				$fInfo = $this->_schema[$this->primaryKey];
+				$isUUID = ($fInfo['length'] == 36 &&
+					($fInfo['type'] === 'string' || $fInfo['type'] === 'binary')
+				);
+				if (empty($this->data[$this->alias][$this->primaryKey]) && $isUUID) {
+					if (array_key_exists($this->primaryKey, $this->data[$this->alias])) {
+						$j = array_search($this->primaryKey, $fields);
+						$values[$j] = String::uuid();
+					} else {
+						list($fields[], $values[]) = array($this->primaryKey, String::uuid());
+					}
+				}
+
+				if (!$db->create($this, $fields, $values)) {
+					$success = $created = false;
+				} else {
+					$created = true;
+				}
+			}
+
+			if ($success && !empty($this->belongsTo)) {
+				$this->updateCounterCache($cache, $created);
+			}
+		}
+
+		if (!empty($joined) && $success === true) {
+			$this->__saveMulti($joined, $this->id, $db);
+		}
+
+		if ($success && $count > 0) {
+			if (!empty($this->data)) {
+				$success = $this->data;
+			}
+			if ($options['callbacks'] === true || $options['callbacks'] === 'after') {
+				$this->Behaviors->trigger($this, 'afterSave', array($created, $options));
+				$this->afterSave($created);
+			}
+			if (!empty($this->data)) {
+				$success = Set::merge($success, $this->data);
+			}
+			$this->data = false;
+			$this->_clearCache();
+			$this->validationErrors = array();
+		}
+		$this->whitelist = $_whitelist;
+		return $success;
+	}
+
+/**
+ * Saves model hasAndBelongsToMany data to the database.
+ *
+ * @param array $joined Data to save
+ * @param mixed $id ID of record in this model
+ * @access private
+ */
+	function __saveMulti($joined, $id, &$db) {
+		foreach ($joined as $assoc => $data) {
+
+			if (isset($this->hasAndBelongsToMany[$assoc])) {
+				list($join) = $this->joinModel($this->hasAndBelongsToMany[$assoc]['with']);
+
+				$isUUID = !empty($this->{$join}->primaryKey) && (
+						$this->{$join}->_schema[$this->{$join}->primaryKey]['length'] == 36 && (
+						$this->{$join}->_schema[$this->{$join}->primaryKey]['type'] === 'string' ||
+						$this->{$join}->_schema[$this->{$join}->primaryKey]['type'] === 'binary'
+					)
+				);
+
+				$newData = $newValues = array();
+				$primaryAdded = false;
+
+				$fields =  array(
+					$db->name($this->hasAndBelongsToMany[$assoc]['foreignKey']),
+					$db->name($this->hasAndBelongsToMany[$assoc]['associationForeignKey'])
+				);
+
+				$idField = $db->name($this->{$join}->primaryKey);
+				if ($isUUID && !in_array($idField, $fields)) {
+					$fields[] = $idField;
+					$primaryAdded = true;
+				}
+
+				foreach ((array)$data as $row) {
+					if ((is_string($row) && (strlen($row) == 36 || strlen($row) == 16)) || is_numeric($row)) {
+						$values = array(
+							$db->value($id, $this->getColumnType($this->primaryKey)),
+							$db->value($row)
+						);
+						if ($isUUID && $primaryAdded) {
+							$values[] = $db->value(String::uuid());
+						}
+						$values = implode(',', $values);
+						$newValues[] = "({$values})";
+						unset($values);
+					} elseif (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+						$newData[] = $row;
+					} elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+						$newData[] = $row[$join];
+					}
+				}
+
+				if ($this->hasAndBelongsToMany[$assoc]['unique']) {
+					$conditions = array(
+						$join . '.' . $this->hasAndBelongsToMany[$assoc]['foreignKey'] => $id
+					);
+					if (!empty($this->hasAndBelongsToMany[$assoc]['conditions'])) {
+						$conditions = array_merge($conditions, (array)$this->hasAndBelongsToMany[$assoc]['conditions']);
+					}
+					$links = $this->{$join}->find('all', array(
+						'conditions' => $conditions,
+						'recursive' => empty($this->hasAndBelongsToMany[$assoc]['conditions']) ? -1 : 0,
+						'fields' => $this->hasAndBelongsToMany[$assoc]['associationForeignKey']
+					));
+
+					$associationForeignKey = "{$join}." . $this->hasAndBelongsToMany[$assoc]['associationForeignKey'];
+					$oldLinks = Set::extract($links, "{n}.{$associationForeignKey}");
+					if (!empty($oldLinks)) {
+ 						$conditions[$associationForeignKey] = $oldLinks;
+						$db->delete($this->{$join}, $conditions);
+					}
+				}
+
+				if (!empty($newData)) {
+					foreach ($newData as $data) {
+						$data[$this->hasAndBelongsToMany[$assoc]['foreignKey']] = $id;
+						$this->{$join}->create($data);
+						$this->{$join}->save();
+					}
+				}
+
+				if (!empty($newValues)) {
+					$fields = implode(',', $fields);
+					$db->insertMulti($this->{$join}, $fields, $newValues);
+				}
+			}
+		}
+	}
+
+/**
+ * Updates the counter cache of belongsTo associations after a save or delete operation
+ *
+ * @param array $keys Optional foreign key data, defaults to the information $this->data
+ * @param boolean $created True if a new record was created, otherwise only associations with
+ *   'counterScope' defined get updated
+ * @return void
+ * @access public
+ */
+	function updateCounterCache($keys = array(), $created = false) {
+		$keys = empty($keys) ? $this->data[$this->alias] : $keys;
+		$keys['old'] = isset($keys['old']) ? $keys['old'] : array();
+
+		foreach ($this->belongsTo as $parent => $assoc) {
+			$foreignKey = $assoc['foreignKey'];
+			$fkQuoted = $this->escapeField($assoc['foreignKey']);
+
+			if (!empty($assoc['counterCache'])) {
+				if ($assoc['counterCache'] === true) {
+					$assoc['counterCache'] = Inflector::underscore($this->alias) . '_count';
+				}
+				if (!$this->{$parent}->hasField($assoc['counterCache'])) {
+					continue;
+				}
+
+				if (!array_key_exists($foreignKey, $keys)) {
+					$keys[$foreignKey] = $this->field($foreignKey);
+				}
+				$recursive = (isset($assoc['counterScope']) ? 1 : -1);
+				$conditions = ($recursive == 1) ? (array)$assoc['counterScope'] : array();
+
+				if (isset($keys['old'][$foreignKey])) {
+					if ($keys['old'][$foreignKey] != $keys[$foreignKey]) {
+						$conditions[$fkQuoted] = $keys['old'][$foreignKey];
+						$count = intval($this->find('count', compact('conditions', 'recursive')));
+
+						$this->{$parent}->updateAll(
+							array($assoc['counterCache'] => $count),
+							array($this->{$parent}->escapeField() => $keys['old'][$foreignKey])
+						);
+					}
+				}
+				$conditions[$fkQuoted] = $keys[$foreignKey];
+
+				if ($recursive == 1) {
+					$conditions = array_merge($conditions, (array)$assoc['counterScope']);
+				}
+				$count = intval($this->find('count', compact('conditions', 'recursive')));
+
+				$this->{$parent}->updateAll(
+					array($assoc['counterCache'] => $count),
+					array($this->{$parent}->escapeField() => $keys[$foreignKey])
+				);
+			}
+		}
+	}
+
+/**
+ * Helper method for Model::updateCounterCache().  Checks the fields to be updated for
+ *
+ * @param array $data The fields of the record that will be updated
+ * @return array Returns updated foreign key values, along with an 'old' key containing the old
+ *     values, or empty if no foreign keys are updated.
+ * @access protected
+ */
+	function _prepareUpdateFields($data) {
+		$foreignKeys = array();
+		foreach ($this->belongsTo as $assoc => $info) {
+			if ($info['counterCache']) {
+				$foreignKeys[$assoc] = $info['foreignKey'];
+			}
+		}
+		$included = array_intersect($foreignKeys, array_keys($data));
+
+		if (empty($included) || empty($this->id)) {
+			return array();
+		}
+		$old = $this->find('first', array(
+			'conditions' => array($this->primaryKey => $this->id),
+			'fields' => array_values($included),
+			'recursive' => -1
+		));
+		return array_merge($data, array('old' => $old[$this->alias]));
+	}
+
+/**
+ * Saves multiple individual records for a single model; Also works with a single record, as well as
+ * all its associated records.
+ *
+ * #### Options
+ *
+ * - validate: Set to false to disable validation, true to validate each record before saving,
+ *   'first' to validate *all* records before any are saved (default),
+ *   or 'only' to only validate the records, but not save them.
+ * - atomic: If true (default), will attempt to save all records in a single transaction.
+ *   Should be set to false if database/table does not support transactions.
+ * - fieldList: Equivalent to the $fieldList parameter in Model::save()
+ *
+ * @param array $data Record data to save.  This can be either a numerically-indexed array (for saving multiple
+ *     records of the same type), or an array indexed by association name.
+ * @param array $options Options to use when saving record data, See $options above.
+ * @return mixed If atomic: True on success, or false on failure.
+ *    Otherwise: array similar to the $data array passed, but values are set to true/false
+ *    depending on whether each record saved successfully.
+ * @access public
+ * @link http://book.cakephp.org/view/1032/Saving-Related-Model-Data-hasOne-hasMany-belongsTo
+ * @link http://book.cakephp.org/view/1031/Saving-Your-Data
+ */
+	function saveAll($data = null, $options = array()) {
+		if (empty($data)) {
+			$data = $this->data;
+		}
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+
+		$options = array_merge(array('validate' => 'first', 'atomic' => true), $options);
+		$this->validationErrors = $validationErrors = array();
+		$validates = true;
+		$return = array();
+
+		if (empty($data) && $options['validate'] !== false) {
+			$result = $this->save($data, $options);
+			return !empty($result);
+		}
+
+		if ($options['atomic'] && $options['validate'] !== 'only') {
+			$transactionBegun = $db->begin($this);
+		}
+
+		if (Set::numeric(array_keys($data))) {
+			while ($validates) {
+				$return = array();
+				foreach ($data as $key => $record) {
+					if (!$currentValidates = $this->__save($record, $options)) {
+						$validationErrors[$key] = $this->validationErrors;
+					}
+
+					if ($options['validate'] === 'only' || $options['validate'] === 'first') {
+						$validating = true;
+						if ($options['atomic']) {
+							$validates = $validates && $currentValidates;
+						} else {
+							$validates = $currentValidates;
+						}
+					} else {
+						$validating = false;
+						$validates = $currentValidates;
+					}
+
+					if (!$options['atomic']) {
+						$return[] = $validates;
+					} elseif (!$validates && !$validating) {
+						break;
+					}
+				}
+				$this->validationErrors = $validationErrors;
+
+				switch (true) {
+					case ($options['validate'] === 'only'):
+						return ($options['atomic'] ? $validates : $return);
+					break;
+					case ($options['validate'] === 'first'):
+						$options['validate'] = true;
+					break;
+					default:
+						if ($options['atomic']) {
+							if ($validates) {
+								if ($transactionBegun) {
+									return $db->commit($this) !== false;
+								} else {
+									return true;
+								}
+							}
+							$db->rollback($this);
+							return false;
+						}
+						return $return;
+					break;
+				}
+			}
+			if ($options['atomic'] && !$validates) {
+				$db->rollback($this);
+				return false;
+			}
+			return $return;
+		}
+		$associations = $this->getAssociated();
+
+		while ($validates) {
+			foreach ($data as $association => $values) {
+				if (isset($associations[$association])) {
+					switch ($associations[$association]) {
+						case 'belongsTo':
+							if ($this->{$association}->__save($values, $options)) {
+								$data[$this->alias][$this->belongsTo[$association]['foreignKey']] = $this->{$association}->id;
+							} else {
+								$validationErrors[$association] = $this->{$association}->validationErrors;
+								$validates = false;
+							}
+							if (!$options['atomic']) {
+								$return[$association][] = $validates;
+							}
+						break;
+					}
+				}
+			}
+
+			if (!$this->__save($data, $options)) {
+				$validationErrors[$this->alias] = $this->validationErrors;
+				$validates = false;
+			}
+			if (!$options['atomic']) {
+				$return[$this->alias] = $validates;
+			}
+			$validating = ($options['validate'] === 'only' || $options['validate'] === 'first');
+
+			foreach ($data as $association => $values) {
+				if (!$validates && !$validating) {
+					break;
+				}
+				if (isset($associations[$association])) {
+					$type = $associations[$association];
+					switch ($type) {
+						case 'hasOne':
+							$values[$this->{$type}[$association]['foreignKey']] = $this->id;
+							if (!$this->{$association}->__save($values, $options)) {
+								$validationErrors[$association] = $this->{$association}->validationErrors;
+								$validates = false;
+							}
+							if (!$options['atomic']) {
+								$return[$association][] = $validates;
+							}
+						break;
+						case 'hasMany':
+							foreach ($values as $i => $value) {
+								$values[$i][$this->{$type}[$association]['foreignKey']] =  $this->id;
+							}
+							$_options = array_merge($options, array('atomic' => false));
+
+							if ($_options['validate'] === 'first') {
+								$_options['validate'] = 'only';
+							}
+							$_return = $this->{$association}->saveAll($values, $_options);
+
+							if ($_return === false || (is_array($_return) && in_array(false, $_return, true))) {
+								$validationErrors[$association] = $this->{$association}->validationErrors;
+								$validates = false;
+							}
+							if (is_array($_return)) {
+								foreach ($_return as $val) {
+									if (!isset($return[$association])) {
+										$return[$association] = array();
+									} elseif (!is_array($return[$association])) {
+										$return[$association] = array($return[$association]);
+									}
+									$return[$association][] = $val;
+								}
+							} else {
+								$return[$association] = $_return;
+							}
+						break;
+					}
+				}
+			}
+			$this->validationErrors = $validationErrors;
+
+			if (isset($validationErrors[$this->alias])) {
+				$this->validationErrors = $validationErrors[$this->alias];
+			}
+
+			switch (true) {
+				case ($options['validate'] === 'only'):
+					return ($options['atomic'] ? $validates : $return);
+				break;
+				case ($options['validate'] === 'first'):
+					$options['validate'] = true;
+					$return = array();
+				break;
+				default:
+					if ($options['atomic']) {
+						if ($validates) {
+							if ($transactionBegun) {
+								return $db->commit($this) !== false;
+							} else {
+								return true;
+							}
+						} else {
+							$db->rollback($this);
+						}
+					}
+					return $return;
+				break;
+			}
+			if ($options['atomic'] && !$validates) {
+				$db->rollback($this);
+				return false;
+			}
+		}
+	}
+
+/**
+ * Private helper method used by saveAll.
+ *
+ * @return boolean Success
+ * @access private
+ * @see Model::saveAll()
+ */
+	function __save($data, $options) {
+		if ($options['validate'] === 'first' || $options['validate'] === 'only') {
+			if (!($this->create($data) && $this->validates($options))) {
+				return false;
+			}
+		} elseif (!($this->create(null) !== null && $this->save($data, $options))) {
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Updates multiple model records based on a set of conditions.
+ *
+ * @param array $fields Set of fields and values, indexed by fields.
+ *    Fields are treated as SQL snippets, to insert literal values manually escape your data.
+ * @param mixed $conditions Conditions to match, true for all records
+ * @return boolean True on success, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1031/Saving-Your-Data
+ */
+	function updateAll($fields, $conditions = true) {
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		return $db->update($this, $fields, null, $conditions);
+	}
+
+/**
+ * Removes record for given ID. If no ID is given, the current ID is used. Returns true on success.
+ *
+ * @param mixed $id ID of record to delete
+ * @param boolean $cascade Set to true to delete records that depend on this record
+ * @return boolean True on success
+ * @access public
+ * @link http://book.cakephp.org/view/1036/delete
+ */
+	function delete($id = null, $cascade = true) {
+		if (!empty($id)) {
+			$this->id = $id;
+		}
+		$id = $this->id;
+
+		if ($this->beforeDelete($cascade)) {
+			$filters = $this->Behaviors->trigger($this, 'beforeDelete', array($cascade), array(
+				'break' => true, 'breakOn' => false
+			));
+			if (!$filters || !$this->exists()) {
+				return false;
+			}
+			$db =& ConnectionManager::getDataSource($this->useDbConfig);
+
+			$this->_deleteDependent($id, $cascade);
+			$this->_deleteLinks($id);
+			$this->id = $id;
+
+			if (!empty($this->belongsTo)) {
+				$keys = $this->find('first', array(
+					'fields' => $this->__collectForeignKeys(),
+					'conditions' => array($this->alias . '.' . $this->primaryKey => $id)
+				));
+			}
+
+			if ($db->delete($this, array($this->alias . '.' . $this->primaryKey => $id))) {
+				if (!empty($this->belongsTo)) {
+					$this->updateCounterCache($keys[$this->alias]);
+				}
+				$this->Behaviors->trigger($this, 'afterDelete');
+				$this->afterDelete();
+				$this->_clearCache();
+				$this->id = false;
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Cascades model deletes through associated hasMany and hasOne child records.
+ *
+ * @param string $id ID of record that was deleted
+ * @param boolean $cascade Set to true to delete records that depend on this record
+ * @return void
+ * @access protected
+ */
+	function _deleteDependent($id, $cascade) {
+		if (!empty($this->__backAssociation)) {
+			$savedAssociatons = $this->__backAssociation;
+			$this->__backAssociation = array();
+		}
+		foreach (array_merge($this->hasMany, $this->hasOne) as $assoc => $data) {
+			if ($data['dependent'] === true && $cascade === true) {
+
+				$model =& $this->{$assoc};
+				$conditions = array($model->escapeField($data['foreignKey']) => $id);
+				if ($data['conditions']) {
+					$conditions = array_merge((array)$data['conditions'], $conditions);
+				}
+				$model->recursive = -1;
+
+				if (isset($data['exclusive']) && $data['exclusive']) {
+					$model->deleteAll($conditions);
+				} else {
+					$records = $model->find('all', array(
+						'conditions' => $conditions, 'fields' => $model->primaryKey
+					));
+
+					if (!empty($records)) {
+						foreach ($records as $record) {
+							$model->delete($record[$model->alias][$model->primaryKey]);
+						}
+					}
+				}
+			}
+		}
+		if (isset($savedAssociatons)) {
+			$this->__backAssociation = $savedAssociatons;
+		}
+	}
+
+/**
+ * Cascades model deletes through HABTM join keys.
+ *
+ * @param string $id ID of record that was deleted
+ * @return void
+ * @access protected
+ */
+	function _deleteLinks($id) {
+		foreach ($this->hasAndBelongsToMany as $assoc => $data) {
+			$joinModel = $data['with'];
+			$records = $this->{$joinModel}->find('all', array(
+				'conditions' => array_merge(array($this->{$joinModel}->escapeField($data['foreignKey']) => $id)),
+				'fields' => $this->{$joinModel}->primaryKey,
+				'recursive' => -1
+			));
+			if (!empty($records)) {
+				foreach ($records as $record) {
+					$this->{$joinModel}->delete($record[$this->{$joinModel}->alias][$this->{$joinModel}->primaryKey]);
+				}
+			}
+		}
+	}
+
+/**
+ * Deletes multiple model records based on a set of conditions.
+ *
+ * @param mixed $conditions Conditions to match
+ * @param boolean $cascade Set to true to delete records that depend on this record
+ * @param boolean $callbacks Run callbacks
+ * @return boolean True on success, false on failure
+ * @access public
+ * @link http://book.cakephp.org/view/1038/deleteAll
+ */
+	function deleteAll($conditions, $cascade = true, $callbacks = false) {
+		if (empty($conditions)) {
+			return false;
+		}
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+
+		if (!$cascade && !$callbacks) {
+			return $db->delete($this, $conditions);
+		} else {
+			$ids = $this->find('all', array_merge(array(
+				'fields' => "{$this->alias}.{$this->primaryKey}",
+				'recursive' => 0), compact('conditions'))
+			);
+			if ($ids === false) {
+				return false;
+			}
+
+			$ids = Set::extract($ids, "{n}.{$this->alias}.{$this->primaryKey}");
+			if (empty($ids)) {
+				return true;
+			}
+
+			if ($callbacks) {
+				$_id = $this->id;
+				$result = true;
+				foreach ($ids as $id) {
+					$result = ($result && $this->delete($id, $cascade));
+				}
+				$this->id = $_id;
+				return $result;
+			} else {
+				foreach ($ids as $id) {
+					$this->_deleteLinks($id);
+					if ($cascade) {
+						$this->_deleteDependent($id, $cascade);
+					}
+				}
+				return $db->delete($this, array($this->alias . '.' . $this->primaryKey => $ids));
+			}
+		}
+	}
+
+/**
+ * Collects foreign keys from associations.
+ *
+ * @return array
+ * @access private
+ */
+	function __collectForeignKeys($type = 'belongsTo') {
+		$result = array();
+
+		foreach ($this->{$type} as $assoc => $data) {
+			if (isset($data['foreignKey']) && is_string($data['foreignKey'])) {
+				$result[$assoc] = $data['foreignKey'];
+			}
+		}
+		return $result;
+	}
+
+/**
+ * Returns true if a record with the currently set ID exists.
+ *
+ * Internally calls Model::getID() to obtain the current record ID to verify,
+ * and then performs a Model::find('count') on the currently configured datasource
+ * to ascertain the existence of the record in persistent storage.
+ *
+ * @return boolean True if such a record exists
+ * @access public
+ */
+	function exists() {
+		if ($this->getID() === false) {
+			return false;
+		}
+		$conditions = array($this->alias . '.' . $this->primaryKey => $this->getID());
+		$query = array('conditions' => $conditions, 'recursive' => -1, 'callbacks' => false);
+		return ($this->find('count', $query) > 0);
+	}
+
+/**
+ * Returns true if a record that meets given conditions exists.
+ *
+ * @param array $conditions SQL conditions array
+ * @return boolean True if such a record exists
+ * @access public
+ */
+	function hasAny($conditions = null) {
+		return ($this->find('count', array('conditions' => $conditions, 'recursive' => -1)) != false);
+	}
+
+/**
+ * Queries the datasource and returns a result set array.
+ *
+ * Also used to perform new-notation finds, where the first argument is type of find operation to perform
+ * (all / first / count / neighbors / list / threaded ),
+ * second parameter options for finding ( indexed array, including: 'conditions', 'limit',
+ * 'recursive', 'page', 'fields', 'offset', 'order')
+ *
+ * Eg:
+ * {{{
+ * 	find('all', array(
+ * 		'conditions' => array('name' => 'Thomas Anderson'),
+ * 		'fields' => array('name', 'email'),
+ * 		'order' => 'field3 DESC',
+ * 		'recursive' => 2,
+ * 		'group' => 'type'
+ * ));
+ * }}}
+ *
+ * In addition to the standard query keys above, you can provide Datasource, and behavior specific
+ * keys.  For example, when using a SQL based datasource you can use the joins key to specify additional
+ * joins that should be part of the query.
+ *
+ * {{{
+ * find('all', array(
+ * 		'conditions' => array('name' => 'Thomas Anderson'),
+ * 		'joins' => array(
+ *			array(
+ * 				'alias' => 'Thought',
+ * 				'table' => 'thoughts',
+ * 				'type' => 'LEFT',
+ * 				'conditions' => '`Thought`.`person_id` = `Person`.`id`'
+ *			)
+ * 		)
+ * ));
+ * }}}
+ *
+ * Behaviors and find types can also define custom finder keys which are passed into find().
+ *
+ * Specifying 'fields' for new-notation 'list':
+ *
+ *  - If no fields are specified, then 'id' is used for key and 'model->displayField' is used for value.
+ *  - If a single field is specified, 'id' is used for key and specified field is used for value.
+ *  - If three fields are specified, they are used (in order) for key, value and group.
+ *  - Otherwise, first and second fields are used for key and value.
+ *
+ * @param array $conditions SQL conditions array, or type of find operation (all / first / count /
+ *    neighbors / list / threaded)
+ * @param mixed $fields Either a single string of a field name, or an array of field names, or
+ *    options for matching
+ * @param string $order SQL ORDER BY conditions (e.g. "price DESC" or "name ASC")
+ * @param integer $recursive The number of levels deep to fetch associated records
+ * @return array Array of records
+ * @access public
+ * @link http://book.cakephp.org/view/1018/find
+ */
+	function find($conditions = null, $fields = array(), $order = null, $recursive = null) {
+		if (!is_string($conditions) || (is_string($conditions) && !array_key_exists($conditions, $this->_findMethods))) {
+			$type = 'first';
+			$query = array_merge(compact('conditions', 'fields', 'order', 'recursive'), array('limit' => 1));
+		} else {
+			list($type, $query) = array($conditions, $fields);
+		}
+
+		$this->findQueryType = $type;
+		$this->id = $this->getID();
+
+		$query = array_merge(
+			array(
+				'conditions' => null, 'fields' => null, 'joins' => array(), 'limit' => null,
+				'offset' => null, 'order' => null, 'page' => null, 'group' => null, 'callbacks' => true
+			),
+			(array)$query
+		);
+
+		if ($type != 'all') {
+			if ($this->_findMethods[$type] === true) {
+				$query = $this->{'_find' . ucfirst($type)}('before', $query);
+			}
+		}
+		if (!is_numeric($query['page']) || intval($query['page']) < 1) {
+			$query['page'] = 1;
+		}
+		if ($query['page'] > 1 && !empty($query['limit'])) {
+			$query['offset'] = ($query['page'] - 1) * $query['limit'];
+		}
+		if ($query['order'] === null && $this->order !== null) {
+			$query['order'] = $this->order;
+		}
+		$query['order'] = array($query['order']);
+
+		if ($query['callbacks'] === true || $query['callbacks'] === 'before') {
+			$return = $this->Behaviors->trigger($this, 'beforeFind', array($query), array(
+				'break' => true, 'breakOn' => false, 'modParams' => true
+			));
+			$query = (is_array($return)) ? $return : $query;
+
+			if ($return === false) {
+				return null;
+			}
+
+			$return = $this->beforeFind($query);
+			$query = (is_array($return)) ? $return : $query;
+
+			if ($return === false) {
+				return null;
+			}
+		}
+
+		if (!$db =& ConnectionManager::getDataSource($this->useDbConfig)) {
+			return false;
+		}
+		$results = $db->read($this, $query);
+		$this->resetAssociations();
+
+		if ($query['callbacks'] === true || $query['callbacks'] === 'after') {
+			$results = $this->__filterResults($results);
+		}
+
+		$this->findQueryType = null;
+		if ($type === 'all') {
+			return $results;
+		} else {
+			if ($this->_findMethods[$type] === true) {
+				return $this->{'_find' . ucfirst($type)}('after', $query, $results);
+			}
+		}
+	}
+
+/**
+ * Handles the before/after filter logic for find('first') operations.  Only called by Model::find().
+ *
+ * @param string $state Either "before" or "after"
+ * @param array $query
+ * @param array $data
+ * @return array
+ * @access protected
+ * @see Model::find()
+ */
+	function _findFirst($state, $query, $results = array()) {
+		if ($state == 'before') {
+			$query['limit'] = 1;
+			return $query;
+		} elseif ($state == 'after') {
+			if (empty($results[0])) {
+				return false;
+			}
+			return $results[0];
+		}
+	}
+
+/**
+ * Handles the before/after filter logic for find('count') operations.  Only called by Model::find().
+ *
+ * @param string $state Either "before" or "after"
+ * @param array $query
+ * @param array $data
+ * @return int The number of records found, or false
+ * @access protected
+ * @see Model::find()
+ */
+	function _findCount($state, $query, $results = array()) {
+		if ($state == 'before') {
+			$db =& ConnectionManager::getDataSource($this->useDbConfig);
+			if (empty($query['fields'])) {
+				$query['fields'] = $db->calculate($this, 'count');
+			} elseif (is_string($query['fields'])  && !preg_match('/count/i', $query['fields'])) {
+				$query['fields'] = $db->calculate($this, 'count', array(
+					$db->expression($query['fields']), 'count'
+				));
+			}
+			$query['order'] = false;
+			return $query;
+		} elseif ($state == 'after') {
+			if (isset($results[0][0]['count'])) {
+				return intval($results[0][0]['count']);
+			} elseif (isset($results[0][$this->alias]['count'])) {
+				return intval($results[0][$this->alias]['count']);
+			}
+			return false;
+		}
+	}
+
+/**
+ * Handles the before/after filter logic for find('list') operations.  Only called by Model::find().
+ *
+ * @param string $state Either "before" or "after"
+ * @param array $query
+ * @param array $data
+ * @return array Key/value pairs of primary keys/display field values of all records found
+ * @access protected
+ * @see Model::find()
+ */
+	function _findList($state, $query, $results = array()) {
+		if ($state == 'before') {
+			if (empty($query['fields'])) {
+				$query['fields'] = array("{$this->alias}.{$this->primaryKey}", "{$this->alias}.{$this->displayField}");
+				$list = array("{n}.{$this->alias}.{$this->primaryKey}", "{n}.{$this->alias}.{$this->displayField}", null);
+			} else {
+				if (!is_array($query['fields'])) {
+					$query['fields'] = String::tokenize($query['fields']);
+				}
+
+				if (count($query['fields']) == 1) {
+					if (strpos($query['fields'][0], '.') === false) {
+						$query['fields'][0] = $this->alias . '.' . $query['fields'][0];
+					}
+
+					$list = array("{n}.{$this->alias}.{$this->primaryKey}", '{n}.' . $query['fields'][0], null);
+					$query['fields'] = array("{$this->alias}.{$this->primaryKey}", $query['fields'][0]);
+				} elseif (count($query['fields']) == 3) {
+					for ($i = 0; $i < 3; $i++) {
+						if (strpos($query['fields'][$i], '.') === false) {
+							$query['fields'][$i] = $this->alias . '.' . $query['fields'][$i];
+						}
+					}
+
+					$list = array('{n}.' . $query['fields'][0], '{n}.' . $query['fields'][1], '{n}.' . $query['fields'][2]);
+				} else {
+					for ($i = 0; $i < 2; $i++) {
+						if (strpos($query['fields'][$i], '.') === false) {
+							$query['fields'][$i] = $this->alias . '.' . $query['fields'][$i];
+						}
+					}
+
+					$list = array('{n}.' . $query['fields'][0], '{n}.' . $query['fields'][1], null);
+				}
+			}
+			if (!isset($query['recursive']) || $query['recursive'] === null) {
+				$query['recursive'] = -1;
+			}
+			list($query['list']['keyPath'], $query['list']['valuePath'], $query['list']['groupPath']) = $list;
+			return $query;
+		} elseif ($state == 'after') {
+			if (empty($results)) {
+				return array();
+			}
+			$lst = $query['list'];
+			return Set::combine($results, $lst['keyPath'], $lst['valuePath'], $lst['groupPath']);
+		}
+	}
+
+/**
+ * Detects the previous field's value, then uses logic to find the 'wrapping'
+ * rows and return them.
+ *
+ * @param string $state Either "before" or "after"
+ * @param mixed $query
+ * @param array $results
+ * @return array
+ * @access protected
+ */
+	function _findNeighbors($state, $query, $results = array()) {
+		if ($state == 'before') {
+			$query = array_merge(array('recursive' => 0), $query);
+			extract($query);
+			$conditions = (array)$conditions;
+			if (isset($field) && isset($value)) {
+				if (strpos($field, '.') === false) {
+					$field = $this->alias . '.' . $field;
+				}
+			} else {
+				$field = $this->alias . '.' . $this->primaryKey;
+				$value = $this->id;
+			}
+			$query['conditions'] = 	array_merge($conditions, array($field . ' <' => $value));
+			$query['order'] = $field . ' DESC';
+			$query['limit'] = 1;
+			$query['field'] = $field;
+			$query['value'] = $value;
+			return $query;
+		} elseif ($state == 'after') {
+			extract($query);
+			unset($query['conditions'][$field . ' <']);
+			$return = array();
+			if (isset($results[0])) {
+				$prevVal = Set::extract('/' . str_replace('.', '/', $field), $results[0]);
+				$query['conditions'][$field . ' >='] = $prevVal[0];
+				$query['conditions'][$field . ' !='] = $value;
+				$query['limit'] = 2;
+			} else {
+				$return['prev'] = null;
+				$query['conditions'][$field . ' >'] = $value;
+				$query['limit'] = 1;
+			}
+			$query['order'] = $field . ' ASC';
+			$return2 = $this->find('all', $query);
+			if (!array_key_exists('prev', $return)) {
+				$return['prev'] = $return2[0];
+			}
+			if (count($return2) == 2) {
+				$return['next'] = $return2[1];
+			} elseif (count($return2) == 1 && !$return['prev']) {
+				$return['next'] = $return2[0];
+			} else {
+				$return['next'] = null;
+			}
+			return $return;
+		}
+	}
+
+/**
+ * In the event of ambiguous results returned (multiple top level results, with different parent_ids)
+ * top level results with different parent_ids to the first result will be dropped
+ *
+ * @param mixed $state
+ * @param mixed $query
+ * @param array $results
+ * @return array Threaded results
+ * @access protected
+ */
+	function _findThreaded($state, $query, $results = array()) {
+		if ($state == 'before') {
+			return $query;
+		} elseif ($state == 'after') {
+			$return = $idMap = array();
+			$ids = Set::extract($results, '{n}.' . $this->alias . '.' . $this->primaryKey);
+
+			foreach ($results as $result) {
+				$result['children'] = array();
+				$id = $result[$this->alias][$this->primaryKey];
+				$parentId = $result[$this->alias]['parent_id'];
+				if (isset($idMap[$id]['children'])) {
+					$idMap[$id] = array_merge($result, (array)$idMap[$id]);
+				} else {
+					$idMap[$id] = array_merge($result, array('children' => array()));
+				}
+				if (!$parentId || !in_array($parentId, $ids)) {
+					$return[] =& $idMap[$id];
+				} else {
+					$idMap[$parentId]['children'][] =& $idMap[$id];
+				}
+			}
+			if (count($return) > 1) {
+				$ids = array_unique(Set::extract('/' . $this->alias . '/parent_id', $return));
+				if (count($ids) > 1) {
+					$root = $return[0][$this->alias]['parent_id'];
+					foreach ($return as $key => $value) {
+						if ($value[$this->alias]['parent_id'] != $root) {
+							unset($return[$key]);
+						}
+					}
+				}
+			}
+			return $return;
+		}
+	}
+
+/**
+ * Passes query results through model and behavior afterFilter() methods.
+ *
+ * @param array Results to filter
+ * @param boolean $primary If this is the primary model results (results from model where the find operation was performed)
+ * @return array Set of filtered results
+ * @access private
+ */
+	function __filterResults($results, $primary = true) {
+		$return = $this->Behaviors->trigger($this, 'afterFind', array($results, $primary), array('modParams' => true));
+		if ($return !== true) {
+			$results = $return;
+		}
+		return $this->afterFind($results, $primary);
+	}
+
+/**
+ * This resets the association arrays for the model back
+ * to those originally defined in the model. Normally called at the end
+ * of each call to Model::find()
+ *
+ * @return boolean Success
+ * @access public
+ */
+	function resetAssociations() {
+		if (!empty($this->__backAssociation)) {
+			foreach ($this->__associations as $type) {
+				if (isset($this->__backAssociation[$type])) {
+					$this->{$type} = $this->__backAssociation[$type];
+				}
+			}
+			$this->__backAssociation = array();
+		}
+
+		foreach ($this->__associations as $type) {
+			foreach ($this->{$type} as $key => $name) {
+				if (!empty($this->{$key}->__backAssociation)) {
+					$this->{$key}->resetAssociations();
+				}
+			}
+		}
+		$this->__backAssociation = array();
+		return true;
+	}
+
+/**
+ * Returns false if any fields passed match any (by default, all if $or = false) of their matching values.
+ *
+ * @param array $fields Field/value pairs to search (if no values specified, they are pulled from $this->data)
+ * @param boolean $or If false, all fields specified must match in order for a false return value
+ * @return boolean False if any records matching any fields are found
+ * @access public
+ */
+	function isUnique($fields, $or = true) {
+		if (!is_array($fields)) {
+			$fields = func_get_args();
+			if (is_bool($fields[count($fields) - 1])) {
+				$or = $fields[count($fields) - 1];
+				unset($fields[count($fields) - 1]);
+			}
+		}
+
+		foreach ($fields as $field => $value) {
+			if (is_numeric($field)) {
+				unset($fields[$field]);
+
+				$field = $value;
+				if (isset($this->data[$this->alias][$field])) {
+					$value = $this->data[$this->alias][$field];
+				} else {
+					$value = null;
+				}
+			}
+
+			if (strpos($field, '.') === false) {
+				unset($fields[$field]);
+				$fields[$this->alias . '.' . $field] = $value;
+			}
+		}
+		if ($or) {
+			$fields = array('or' => $fields);
+		}
+		if (!empty($this->id)) {
+			$fields[$this->alias . '.' . $this->primaryKey . ' !='] =  $this->id;
+		}
+		return ($this->find('count', array('conditions' => $fields, 'recursive' => -1)) == 0);
+	}
+
+/**
+ * Returns a resultset for a given SQL statement. Custom SQL queries should be performed with this method.
+ *
+ * @param string $sql SQL statement
+ * @return array Resultset
+ * @access public
+ * @link http://book.cakephp.org/view/1027/query
+ */
+	function query() {
+		$params = func_get_args();
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		return call_user_func_array(array(&$db, 'query'), $params);
+	}
+
+/**
+ * Returns true if all fields pass validation. Will validate hasAndBelongsToMany associations
+ * that use the 'with' key as well. Since __saveMulti is incapable of exiting a save operation.
+ *
+ * Will validate the currently set data.  Use Model::set() or Model::create() to set the active data.
+ *
+ * @param string $options An optional array of custom options to be made available in the beforeValidate callback
+ * @return boolean True if there are no errors
+ * @access public
+ * @link http://book.cakephp.org/view/1182/Validating-Data-from-the-Controller
+ */
+	function validates($options = array()) {
+		$errors = $this->invalidFields($options);
+		if (empty($errors) && $errors !== false) {
+			$errors = $this->__validateWithModels($options);
+		}
+		if (is_array($errors)) {
+			return count($errors) === 0;
+		}
+		return $errors;
+	}
+
+/**
+ * Returns an array of fields that have failed validation. On the current model.
+ *
+ * @param string $options An optional array of custom options to be made available in the beforeValidate callback
+ * @return array Array of invalid fields
+ * @see Model::validates()
+ * @access public
+ * @link http://book.cakephp.org/view/1182/Validating-Data-from-the-Controller
+ */
+	function invalidFields($options = array()) {
+		if (
+			!$this->Behaviors->trigger(
+				$this,
+				'beforeValidate',
+				array($options),
+				array('break' => true, 'breakOn' => false)
+			) ||
+			$this->beforeValidate($options) === false
+		) {
+			return false;
+		}
+
+		if (!isset($this->validate) || empty($this->validate)) {
+			return $this->validationErrors;
+		}
+
+		$data = $this->data;
+		$methods = array_map('strtolower', get_class_methods($this));
+		$behaviorMethods = array_keys($this->Behaviors->methods());
+
+		if (isset($data[$this->alias])) {
+			$data = $data[$this->alias];
+		} elseif (!is_array($data)) {
+			$data = array();
+		}
+
+		$Validation =& Validation::getInstance();
+		$exists = $this->exists();
+
+		$_validate = $this->validate;
+		$whitelist = $this->whitelist;
+
+		if (!empty($options['fieldList'])) {
+			$whitelist = $options['fieldList'];
+		}
+
+		if (!empty($whitelist)) {
+			$validate = array();
+			foreach ((array)$whitelist as $f) {
+				if (!empty($this->validate[$f])) {
+					$validate[$f] = $this->validate[$f];
+				}
+			}
+			$this->validate = $validate;
+		}
+
+		foreach ($this->validate as $fieldName => $ruleSet) {
+			if (!is_array($ruleSet) || (is_array($ruleSet) && isset($ruleSet['rule']))) {
+				$ruleSet = array($ruleSet);
+			}
+			$default = array(
+				'allowEmpty' => null,
+				'required' => null,
+				'rule' => 'blank',
+				'last' => false,
+				'on' => null
+			);
+
+			foreach ($ruleSet as $index => $validator) {
+				if (!is_array($validator)) {
+					$validator = array('rule' => $validator);
+				}
+				$validator = array_merge($default, $validator);
+
+				if (isset($validator['message'])) {
+					$message = $validator['message'];
+				} else {
+					$message = __('This field cannot be left blank', true);
+				}
+
+				if (
+					empty($validator['on']) || ($validator['on'] == 'create' &&
+					!$exists) || ($validator['on'] == 'update' && $exists
+				)) {
+					$required = (
+						(!isset($data[$fieldName]) && $validator['required'] === true) ||
+						(
+							isset($data[$fieldName]) && (empty($data[$fieldName]) &&
+							!is_numeric($data[$fieldName])) && $validator['allowEmpty'] === false
+						)
+					);
+
+					if ($required) {
+						$this->invalidate($fieldName, $message);
+						if ($validator['last']) {
+							break;
+						}
+					} elseif (array_key_exists($fieldName, $data)) {
+						if (empty($data[$fieldName]) && $data[$fieldName] != '0' && $validator['allowEmpty'] === true) {
+							break;
+						}
+						if (is_array($validator['rule'])) {
+							$rule = $validator['rule'][0];
+							unset($validator['rule'][0]);
+							$ruleParams = array_merge(array($data[$fieldName]), array_values($validator['rule']));
+						} else {
+							$rule = $validator['rule'];
+							$ruleParams = array($data[$fieldName]);
+						}
+
+						$valid = true;
+
+						if (in_array(strtolower($rule), $methods)) {
+							$ruleParams[] = $validator;
+							$ruleParams[0] = array($fieldName => $ruleParams[0]);
+							$valid = $this->dispatchMethod($rule, $ruleParams);
+						} elseif (in_array($rule, $behaviorMethods) || in_array(strtolower($rule), $behaviorMethods)) {
+							$ruleParams[] = $validator;
+							$ruleParams[0] = array($fieldName => $ruleParams[0]);
+							$valid = $this->Behaviors->dispatchMethod($this, $rule, $ruleParams);
+						} elseif (method_exists($Validation, $rule)) {
+							$valid = $Validation->dispatchMethod($rule, $ruleParams);
+						} elseif (!is_array($validator['rule'])) {
+							$valid = preg_match($rule, $data[$fieldName]);
+						} elseif (Configure::read('debug') > 0) {
+							trigger_error(sprintf(__('Could not find validation handler %s for %s', true), $rule, $fieldName), E_USER_WARNING);
+						}
+
+						if (!$valid || (is_string($valid) && strlen($valid) > 0)) {
+							if (is_string($valid) && strlen($valid) > 0) {
+								$validator['message'] = $valid;
+							} elseif (!isset($validator['message'])) {
+								if (is_string($index)) {
+									$validator['message'] = $index;
+								} elseif (is_numeric($index) && count($ruleSet) > 1) {
+									$validator['message'] = $index + 1;
+								} else {
+									$validator['message'] = $message;
+								}
+							}
+							$this->invalidate($fieldName, $validator['message']);
+
+							if ($validator['last']) {
+								break;
+							}
+						}
+					}
+				}
+			}
+		}
+		$this->validate = $_validate;
+		return $this->validationErrors;
+	}
+
+/**
+ * Runs validation for hasAndBelongsToMany associations that have 'with' keys
+ * set. And data in the set() data set.
+ *
+ * @param array $options Array of options to use on Valdation of with models
+ * @return boolean Failure of validation on with models.
+ * @access private
+ * @see Model::validates()
+ */
+	function __validateWithModels($options) {
+		$valid = true;
+		foreach ($this->hasAndBelongsToMany as $assoc => $association) {
+			if (empty($association['with']) || !isset($this->data[$assoc])) {
+				continue;
+			}
+			list($join) = $this->joinModel($this->hasAndBelongsToMany[$assoc]['with']);
+			$data = $this->data[$assoc];
+
+			$newData = array();
+			foreach ((array)$data as $row) {
+				if (isset($row[$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+					$newData[] = $row;
+				} elseif (isset($row[$join]) && isset($row[$join][$this->hasAndBelongsToMany[$assoc]['associationForeignKey']])) {
+					$newData[] = $row[$join];
+				}
+			}
+			if (empty($newData)) {
+				continue;
+			}
+			foreach ($newData as $data) {
+				$data[$this->hasAndBelongsToMany[$assoc]['foreignKey']] = $this->id;
+				$this->{$join}->create($data);
+				$valid = ($valid && $this->{$join}->validates($options));
+			}
+		}
+		return $valid;
+	}
+/**
+ * Marks a field as invalid, optionally setting the name of validation
+ * rule (in case of multiple validation for field) that was broken.
+ *
+ * @param string $field The name of the field to invalidate
+ * @param mixed $value Name of validation rule that was not failed, or validation message to
+ *    be returned. If no validation key is provided, defaults to true.
+ * @access public
+ */
+	function invalidate($field, $value = true) {
+		if (!is_array($this->validationErrors)) {
+			$this->validationErrors = array();
+		}
+		$this->validationErrors[$field] = $value;
+	}
+
+/**
+ * Returns true if given field name is a foreign key in this model.
+ *
+ * @param string $field Returns true if the input string ends in "_id"
+ * @return boolean True if the field is a foreign key listed in the belongsTo array.
+ * @access public
+ */
+	function isForeignKey($field) {
+		$foreignKeys = array();
+		if (!empty($this->belongsTo)) {
+			foreach ($this->belongsTo as $assoc => $data) {
+				$foreignKeys[] = $data['foreignKey'];
+			}
+		}
+		return in_array($field, $foreignKeys);
+	}
+
+/**
+ * Escapes the field name and prepends the model name. Escaping is done according to the
+ * current database driver's rules.
+ *
+ * @param string $field Field to escape (e.g: id)
+ * @param string $alias Alias for the model (e.g: Post)
+ * @return string The name of the escaped field for this Model (i.e. id becomes `Post`.`id`).
+ * @access public
+ */
+	function escapeField($field = null, $alias = null) {
+		if (empty($alias)) {
+			$alias = $this->alias;
+		}
+		if (empty($field)) {
+			$field = $this->primaryKey;
+		}
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		if (strpos($field, $db->name($alias) . '.') === 0) {
+			return $field;
+		}
+		return $db->name($alias . '.' . $field);
+	}
+
+/**
+ * Returns the current record's ID
+ *
+ * @param integer $list Index on which the composed ID is located
+ * @return mixed The ID of the current record, false if no ID
+ * @access public
+ */
+	function getID($list = 0) {
+		if (empty($this->id) || (is_array($this->id) && isset($this->id[0]) && empty($this->id[0]))) {
+			return false;
+		}
+
+		if (!is_array($this->id)) {
+			return $this->id;
+		}
+
+		if (empty($this->id)) {
+			return false;
+		}
+
+		if (isset($this->id[$list]) && !empty($this->id[$list])) {
+			return $this->id[$list];
+		} elseif (isset($this->id[$list])) {
+			return false;
+		}
+
+		foreach ($this->id as $id) {
+			return $id;
+		}
+
+		return false;
+	}
+
+/**
+ * Returns the ID of the last record this model inserted.
+ *
+ * @return mixed Last inserted ID
+ * @access public
+ */
+	function getLastInsertID() {
+		return $this->getInsertID();
+	}
+
+/**
+ * Returns the ID of the last record this model inserted.
+ *
+ * @return mixed Last inserted ID
+ * @access public
+ */
+	function getInsertID() {
+		return $this->__insertID;
+	}
+
+/**
+ * Sets the ID of the last record this model inserted
+ *
+ * @param mixed Last inserted ID
+ * @access public
+ */
+	function setInsertID($id) {
+		$this->__insertID = $id;
+	}
+
+/**
+ * Returns the number of rows returned from the last query.
+ *
+ * @return int Number of rows
+ * @access public
+ */
+	function getNumRows() {
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		return $db->lastNumRows();
+	}
+
+/**
+ * Returns the number of rows affected by the last query.
+ *
+ * @return int Number of rows
+ * @access public
+ */
+	function getAffectedRows() {
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		return $db->lastAffected();
+	}
+
+/**
+ * Sets the DataSource to which this model is bound.
+ *
+ * @param string $dataSource The name of the DataSource, as defined in app/config/database.php
+ * @return boolean True on success
+ * @access public
+ */
+	function setDataSource($dataSource = null) {
+		$oldConfig = $this->useDbConfig;
+
+		if ($dataSource != null) {
+			$this->useDbConfig = $dataSource;
+		}
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		if (!empty($oldConfig) && isset($db->config['prefix'])) {
+			$oldDb =& ConnectionManager::getDataSource($oldConfig);
+
+			if (!isset($this->tablePrefix) || (!isset($oldDb->config['prefix']) || $this->tablePrefix == $oldDb->config['prefix'])) {
+				$this->tablePrefix = $db->config['prefix'];
+			}
+		} elseif (isset($db->config['prefix'])) {
+			$this->tablePrefix = $db->config['prefix'];
+		}
+
+		if (empty($db) || !is_object($db)) {
+			return $this->cakeError('missingConnection', array(array('code' => 500, 'className' => $this->alias)));
+		}
+	}
+
+/**
+ * Gets the DataSource to which this model is bound.
+ * Not safe for use with some versions of PHP4, because this class is overloaded.
+ *
+ * @return object A DataSource object
+ * @access public
+ */
+	function &getDataSource() {
+		$db =& ConnectionManager::getDataSource($this->useDbConfig);
+		return $db;
+	}
+
+/**
+ * Gets all the models with which this model is associated.
+ *
+ * @param string $type Only result associations of this type
+ * @return array Associations
+ * @access public
+ */
+	function getAssociated($type = null) {
+		if ($type == null) {
+			$associated = array();
+			foreach ($this->__associations as $assoc) {
+				if (!empty($this->{$assoc})) {
+					$models = array_keys($this->{$assoc});
+					foreach ($models as $m) {
+						$associated[$m] = $assoc;
+					}
+				}
+			}
+			return $associated;
+		} elseif (in_array($type, $this->__associations)) {
+			if (empty($this->{$type})) {
+				return array();
+			}
+			return array_keys($this->{$type});
+		} else {
+			$assoc = array_merge(
+				$this->hasOne,
+				$this->hasMany,
+				$this->belongsTo,
+				$this->hasAndBelongsToMany
+			);
+			if (array_key_exists($type, $assoc)) {
+				foreach ($this->__associations as $a) {
+					if (isset($this->{$a}[$type])) {
+						$assoc[$type]['association'] = $a;
+						break;
+					}
+				}
+				return $assoc[$type];
+			}
+			return null;
+		}
+	}
+
+/**
+ * Gets the name and fields to be used by a join model.  This allows specifying join fields
+ * in the association definition.
+ *
+ * @param object $model The model to be joined
+ * @param mixed $with The 'with' key of the model association
+ * @param array $keys Any join keys which must be merged with the keys queried
+ * @return array
+ * @access public
+ */
+	function joinModel($assoc, $keys = array()) {
+		if (is_string($assoc)) {
+			return array($assoc, array_keys($this->{$assoc}->schema()));
+		} elseif (is_array($assoc)) {
+			$with = key($assoc);
+			return array($with, array_unique(array_merge($assoc[$with], $keys)));
+		}
+		trigger_error(
+			sprintf(__('Invalid join model settings in %s', true), $model->alias),
+			E_USER_WARNING
+		);
+	}
+
+/**
+ * Called before each find operation. Return false if you want to halt the find
+ * call, otherwise return the (modified) query data.
+ *
+ * @param array $queryData Data used to execute this query, i.e. conditions, order, etc.
+ * @return mixed true if the operation should continue, false if it should abort; or, modified
+ *               $queryData to continue with new $queryData
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#beforeFind-1049
+ */
+	function beforeFind($queryData) {
+		return true;
+	}
+
+/**
+ * Called after each find operation. Can be used to modify any results returned by find().
+ * Return value should be the (modified) results.
+ *
+ * @param mixed $results The results of the find operation
+ * @param boolean $primary Whether this model is being queried directly (vs. being queried as an association)
+ * @return mixed Result of the find operation
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#afterFind-1050
+ */
+	function afterFind($results, $primary = false) {
+		return $results;
+	}
+
+/**
+ * Called before each save operation, after validation. Return a non-true result
+ * to halt the save.
+ *
+ * @return boolean True if the operation should continue, false if it should abort
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#beforeSave-1052
+ */
+	function beforeSave($options = array()) {
+		return true;
+	}
+
+/**
+ * Called after each successful save operation.
+ *
+ * @param boolean $created True if this save created a new record
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#afterSave-1053
+ */
+	function afterSave($created) {
+	}
+
+/**
+ * Called before every deletion operation.
+ *
+ * @param boolean $cascade If true records that depend on this record will also be deleted
+ * @return boolean True if the operation should continue, false if it should abort
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#beforeDelete-1054
+ */
+	function beforeDelete($cascade = true) {
+		return true;
+	}
+
+/**
+ * Called after every deletion operation.
+ *
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#afterDelete-1055
+ */
+	function afterDelete() {
+	}
+
+/**
+ * Called during validation operations, before validation. Please note that custom
+ * validation rules can be defined in $validate.
+ *
+ * @return boolean True if validate operation should continue, false to abort
+ * @param $options array Options passed from model::save(), see $options of model::save().
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#beforeValidate-1051
+ */
+	function beforeValidate($options = array()) {
+		return true;
+	}
+
+/**
+ * Called when a DataSource-level error occurs.
+ *
+ * @access public
+ * @link http://book.cakephp.org/view/1048/Callback-Methods#onError-1056
+ */
+	function onError() {
+	}
+
+/**
+ * Private method. Clears cache for this model.
+ *
+ * @param string $type If null this deletes cached views if Cache.check is true
+ *     Will be used to allow deleting query cache also
+ * @return boolean true on delete
+ * @access protected
+ * @todo
+ */
+	function _clearCache($type = null) {
+		if ($type === null) {
+			if (Configure::read('Cache.check') === true) {
+				$assoc[] = strtolower(Inflector::pluralize($this->alias));
+				$assoc[] = strtolower(Inflector::underscore(Inflector::pluralize($this->alias)));
+				foreach ($this->__associations as $key => $association) {
+					foreach ($this->$association as $key => $className) {
+						$check = strtolower(Inflector::pluralize($className['className']));
+						if (!in_array($check, $assoc)) {
+							$assoc[] = strtolower(Inflector::pluralize($className['className']));
+							$assoc[] = strtolower(Inflector::underscore(Inflector::pluralize($className['className'])));
+						}
+					}
+				}
+				clearCache($assoc);
+				return true;
+			}
+		} else {
+			//Will use for query cache deleting
+		}
+	}
+
+/**
+ * Called when serializing a model.
+ *
+ * @return array Set of object variable names this model has
+ * @access private
+ */
+	function __sleep() {
+		$return = array_keys(get_object_vars($this));
+		return $return;
+	}
+
+/**
+ * Called when de-serializing a model.
+ *
+ * @access private
+ * @todo
+ */
+	function __wakeup() {
+	}
+}
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	Overloadable::overload('Model');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/model/model_behavior.php b/code/ryzom/tools/server/www/webtt/cake/libs/model/model_behavior.php
new file mode 100644
index 000000000..000b3186d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/model/model_behavior.php
@@ -0,0 +1,533 @@
+<?php
+/**
+ * Model behaviors base class.
+ *
+ * Adds methods and automagic functionality to Cake Models.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ * @since         CakePHP(tm) v 1.2.0.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Model behavior base class.
+ *
+ * Defines the Behavior interface, and contains common model interaction functionality.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class ModelBehavior extends Object {
+
+/**
+ * Contains configuration settings for use with individual model objects.  This
+ * is used because if multiple models use this Behavior, each will use the same
+ * object instance.  Individual model settings should be stored as an
+ * associative array, keyed off of the model name.
+ *
+ * @var array
+ * @access public
+ * @see Model::$alias
+ */
+	var $settings = array();
+
+/**
+ * Allows the mapping of preg-compatible regular expressions to public or
+ * private methods in this class, where the array key is a /-delimited regular
+ * expression, and the value is a class method.  Similar to the functionality of
+ * the findBy* / findAllBy* magic methods.
+ *
+ * @var array
+ * @access public
+ */
+	var $mapMethods = array();
+
+/**
+ * Setup this behavior with the specified configuration settings.
+ *
+ * @param object $model Model using this behavior
+ * @param array $config Configuration settings for $model
+ * @access public
+ */
+	function setup(&$model, $config = array()) { }
+
+/**
+ * Clean up any initialization this behavior has done on a model.  Called when a behavior is dynamically
+ * detached from a model using Model::detach().
+ *
+ * @param object $model Model using this behavior
+ * @access public
+ * @see BehaviorCollection::detach()
+ */
+	function cleanup(&$model) {
+		if (isset($this->settings[$model->alias])) {
+			unset($this->settings[$model->alias]);
+		}
+	}
+
+/**
+ * Before find callback
+ *
+ * @param object $model Model using this behavior
+ * @param array $queryData Data used to execute this query, i.e. conditions, order, etc.
+ * @return mixed False if the operation should abort. An array will replace the value of $query.
+ * @access public
+ */
+	function beforeFind(&$model, $query) { }
+
+/**
+ * After find callback. Can be used to modify any results returned by find and findAll.
+ *
+ * @param object $model Model using this behavior
+ * @param mixed $results The results of the find operation
+ * @param boolean $primary Whether this model is being queried directly (vs. being queried as an association)
+ * @return mixed An array value will replace the value of $results - any other value will be ignored.
+ * @access public
+ */
+	function afterFind(&$model, $results, $primary) { }
+
+/**
+ * Before validate callback
+ *
+ * @param object $model Model using this behavior
+ * @return mixed False if the operation should abort. Any other result will continue.
+ * @access public
+ */
+	function beforeValidate(&$model) { }
+
+/**
+ * Before save callback
+ *
+ * @param object $model Model using this behavior
+ * @return mixed False if the operation should abort. Any other result will continue.
+ * @access public
+ */
+	function beforeSave(&$model) { }
+
+/**
+ * After save callback
+ *
+ * @param object $model Model using this behavior
+ * @param boolean $created True if this save created a new record
+ * @access public
+ */
+	function afterSave(&$model, $created) { }
+
+/**
+ * Before delete callback
+ *
+ * @param object $model Model using this behavior
+ * @param boolean $cascade If true records that depend on this record will also be deleted
+ * @return mixed False if the operation should abort. Any other result will continue.
+ * @access public
+ */
+	function beforeDelete(&$model, $cascade = true) { }
+
+/**
+ * After delete callback
+ *
+ * @param object $model Model using this behavior
+ * @access public
+ */
+	function afterDelete(&$model) { }
+
+/**
+ * DataSource error callback
+ *
+ * @param object $model Model using this behavior
+ * @param string $error Error generated in DataSource
+ * @access public
+ */
+	function onError(&$model, $error) { }
+
+/**
+ * Overrides Object::dispatchMethod to account for PHP4's broken reference support
+ *
+ * @see Object::dispatchMethod
+ * @access public
+ * @return mixed
+ */
+	function dispatchMethod(&$model, $method, $params = array()) {
+		if (empty($params)) {
+			return $this->{$method}($model);
+		}
+		$params = array_values($params);
+
+		switch (count($params)) {
+			case 1:
+				return $this->{$method}($model, $params[0]);
+			case 2:
+				return $this->{$method}($model, $params[0], $params[1]);
+			case 3:
+				return $this->{$method}($model, $params[0], $params[1], $params[2]);
+			case 4:
+				return $this->{$method}($model, $params[0], $params[1], $params[2], $params[3]);
+			case 5:
+				return $this->{$method}($model, $params[0], $params[1], $params[2], $params[3], $params[4]);
+			default:
+				$params = array_merge(array(&$model), $params);
+				return call_user_func_array(array(&$this, $method), $params);
+			break;
+		}
+	}
+
+/**
+ * If $model's whitelist property is non-empty, $field will be added to it.
+ * Note: this method should *only* be used in beforeValidate or beforeSave to ensure
+ * that it only modifies the whitelist for the current save operation.  Also make sure
+ * you explicitly set the value of the field which you are allowing.
+ *
+ * @param object $model Model using this behavior
+ * @param string $field Field to be added to $model's whitelist
+ * @access protected
+ * @return void
+ */
+	function _addToWhitelist(&$model, $field) {
+		if (is_array($field)) {
+			foreach ($field as $f) {
+				$this->_addToWhitelist($model, $f);
+			}
+			return;
+		}
+		if (!empty($model->whitelist) && !in_array($field, $model->whitelist)) {
+			$model->whitelist[] = $field;
+		}
+	}
+}
+
+/**
+ * Model behavior collection class.
+ *
+ * Defines the Behavior interface, and contains common model interaction functionality.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.model
+ */
+class BehaviorCollection extends Object {
+
+/**
+ * Stores a reference to the attached name
+ *
+ * @var string
+ * @access public
+ */
+	var $modelName = null;
+
+/**
+ * Lists the currently-attached behavior objects
+ *
+ * @var array
+ * @access private
+ */
+	var $_attached = array();
+
+/**
+ * Lists the currently-attached behavior objects which are disabled
+ *
+ * @var array
+ * @access private
+ */
+	var $_disabled = array();
+
+/**
+ * Keeps a list of all methods of attached behaviors
+ *
+ * @var array
+ */
+	var $__methods = array();
+
+/**
+ * Keeps a list of all methods which have been mapped with regular expressions
+ *
+ * @var array
+ */
+	var $__mappedMethods = array();
+
+/**
+ * Attaches a model object and loads a list of behaviors
+ *
+ * @access public
+ * @return void
+ */
+	function init($modelName, $behaviors = array()) {
+		$this->modelName = $modelName;
+
+		if (!empty($behaviors)) {
+			foreach (Set::normalize($behaviors) as $behavior => $config) {
+				$this->attach($behavior, $config);
+			}
+		}
+	}
+
+/**
+ * Attaches a behavior to a model
+ *
+ * @param string $behavior CamelCased name of the behavior to load
+ * @param array $config Behavior configuration parameters
+ * @return boolean True on success, false on failure
+ * @access public
+ */
+	function attach($behavior, $config = array()) {
+		list($plugin, $name) = pluginSplit($behavior);
+		$class = $name . 'Behavior';
+
+		if (!App::import('Behavior', $behavior)) {
+			$this->cakeError('missingBehaviorFile', array(array(
+				'behavior' => $behavior,
+				'file' => Inflector::underscore($behavior) . '.php',
+				'code' => 500,
+				'base' => '/'
+			)));
+			return false;
+		}
+		if (!class_exists($class)) {
+			$this->cakeError('missingBehaviorClass', array(array(
+				'behavior' => $class,
+				'file' => Inflector::underscore($class) . '.php',
+				'code' => 500,
+				'base' => '/'
+			)));
+			return false;
+		}
+
+		if (!isset($this->{$name})) {
+			if (ClassRegistry::isKeySet($class)) {
+				if (PHP5) {
+					$this->{$name} = ClassRegistry::getObject($class);
+				} else {
+					$this->{$name} =& ClassRegistry::getObject($class);
+				}
+			} else {
+				if (PHP5) {
+					$this->{$name} = new $class;
+				} else {
+					$this->{$name} =& new $class;
+				}
+				ClassRegistry::addObject($class, $this->{$name});
+				if (!empty($plugin)) {
+					ClassRegistry::addObject($plugin.'.'.$class, $this->{$name});
+				}
+			}
+		} elseif (isset($this->{$name}->settings) && isset($this->{$name}->settings[$this->modelName])) {
+			if ($config !== null && $config !== false) {
+				$config = array_merge($this->{$name}->settings[$this->modelName], $config);
+			} else {
+				$config = array();
+			}
+		}
+		if (empty($config)) {
+			$config = array();
+		}
+		$this->{$name}->setup(ClassRegistry::getObject($this->modelName), $config);
+
+		foreach ($this->{$name}->mapMethods as $method => $alias) {
+			$this->__mappedMethods[$method] = array($alias, $name);
+		}
+		$methods = get_class_methods($this->{$name});
+		$parentMethods = array_flip(get_class_methods('ModelBehavior'));
+		$callbacks = array(
+			'setup', 'cleanup', 'beforeFind', 'afterFind', 'beforeSave', 'afterSave',
+			'beforeDelete', 'afterDelete', 'afterError'
+		);
+
+		foreach ($methods as $m) {
+			if (!isset($parentMethods[$m])) {
+				$methodAllowed = (
+					$m[0] != '_' && !array_key_exists($m, $this->__methods) &&
+					!in_array($m, $callbacks)
+				);
+				if ($methodAllowed) {
+					$this->__methods[$m] = array($m, $name);
+				}
+			}
+		}
+
+		if (!in_array($name, $this->_attached)) {
+			$this->_attached[] = $name;
+		}
+		if (in_array($name, $this->_disabled) && !(isset($config['enabled']) && $config['enabled'] === false)) {
+			$this->enable($name);
+		} elseif (isset($config['enabled']) && $config['enabled'] === false) {
+			$this->disable($name);
+		}
+		return true;
+	}
+
+/**
+ * Detaches a behavior from a model
+ *
+ * @param string $name CamelCased name of the behavior to unload
+ * @return void
+ * @access public
+ */
+	function detach($name) {
+		list($plugin, $name) = pluginSplit($name);
+		if (isset($this->{$name})) {
+			$this->{$name}->cleanup(ClassRegistry::getObject($this->modelName));
+			unset($this->{$name});
+		}
+		foreach ($this->__methods as $m => $callback) {
+			if (is_array($callback) && $callback[1] == $name) {
+				unset($this->__methods[$m]);
+			}
+		}
+		$this->_attached = array_values(array_diff($this->_attached, (array)$name));
+	}
+
+/**
+ * Enables callbacks on a behavior or array of behaviors
+ *
+ * @param mixed $name CamelCased name of the behavior(s) to enable (string or array)
+ * @return void
+ * @access public
+ */
+	function enable($name) {
+		$this->_disabled = array_diff($this->_disabled, (array)$name);
+	}
+
+/**
+ * Disables callbacks on a behavior or array of behaviors.  Public behavior methods are still
+ * callable as normal.
+ *
+ * @param mixed $name CamelCased name of the behavior(s) to disable (string or array)
+ * @return void
+ * @access public
+ */
+	function disable($name) {
+		foreach ((array)$name as $behavior) {
+			if (in_array($behavior, $this->_attached) && !in_array($behavior, $this->_disabled)) {
+				$this->_disabled[] = $behavior;
+			}
+		}
+	}
+
+/**
+ * Gets the list of currently-enabled behaviors, or, the current status of a single behavior
+ *
+ * @param string $name Optional.  The name of the behavior to check the status of.  If omitted,
+ *   returns an array of currently-enabled behaviors
+ * @return mixed If $name is specified, returns the boolean status of the corresponding behavior.
+ *   Otherwise, returns an array of all enabled behaviors.
+ * @access public
+ */
+	function enabled($name = null) {
+		if (!empty($name)) {
+			return (in_array($name, $this->_attached) && !in_array($name, $this->_disabled));
+		}
+		return array_diff($this->_attached, $this->_disabled);
+	}
+
+/**
+ * Dispatches a behavior method
+ *
+ * @return array All methods for all behaviors attached to this object
+ * @access public
+ */
+	function dispatchMethod(&$model, $method, $params = array(), $strict = false) {
+		$methods = array_keys($this->__methods);
+		foreach ($methods as $key => $value) {
+			$methods[$key] = strtolower($value);
+		}
+		$method = strtolower($method);
+		$check = array_flip($methods);
+		$found = isset($check[$method]);
+		$call = null;
+
+		if ($strict && !$found) {
+			trigger_error(sprintf(__("BehaviorCollection::dispatchMethod() - Method %s not found in any attached behavior", true), $method), E_USER_WARNING);
+			return null;
+		} elseif ($found) {
+			$methods = array_combine($methods, array_values($this->__methods));
+			$call = $methods[$method];
+		} else {
+			$count = count($this->__mappedMethods);
+			$mapped = array_keys($this->__mappedMethods);
+
+			for ($i = 0; $i < $count; $i++) {
+				if (preg_match($mapped[$i] . 'i', $method)) {
+					$call = $this->__mappedMethods[$mapped[$i]];
+					array_unshift($params, $method);
+					break;
+				}
+			}
+		}
+
+		if (!empty($call)) {
+			return $this->{$call[1]}->dispatchMethod($model, $call[0], $params);
+		}
+		return array('unhandled');
+	}
+
+/**
+ * Dispatches a behavior callback on all attached behavior objects
+ *
+ * @param model $model
+ * @param string $callback
+ * @param array $params
+ * @param array $options
+ * @return mixed
+ * @access public
+ */
+	function trigger(&$model, $callback, $params = array(), $options = array()) {
+		if (empty($this->_attached)) {
+			return true;
+		}
+		$options = array_merge(array('break' => false, 'breakOn' => array(null, false), 'modParams' => false), $options);
+		$count = count($this->_attached);
+
+		for ($i = 0; $i < $count; $i++) {
+			$name = $this->_attached[$i];
+			if (in_array($name, $this->_disabled)) {
+				continue;
+			}
+			$result = $this->{$name}->dispatchMethod($model, $callback, $params);
+
+			if ($options['break'] && ($result === $options['breakOn'] || (is_array($options['breakOn']) && in_array($result, $options['breakOn'], true)))) {
+				return $result;
+			} elseif ($options['modParams'] && is_array($result)) {
+				$params[0] = $result;
+			}
+		}
+		if ($options['modParams'] && isset($params[0])) {
+			return $params[0];
+		}
+		return true;
+	}
+
+/**
+ * Gets the method list for attached behaviors, i.e. all public, non-callback methods
+ *
+ * @return array All public methods for all behaviors attached to this collection
+ * @access public
+ */
+	function methods() {
+		return $this->__methods;
+	}
+
+/**
+ * Gets the list of attached behaviors, or, whether the given behavior is attached
+ *
+ * @param string $name Optional.  The name of the behavior to check the status of.  If omitted,
+ *   returns an array of currently-attached behaviors
+ * @return mixed If $name is specified, returns the boolean status of the corresponding behavior.
+ *    Otherwise, returns an array of all attached behaviors.
+ * @access public
+ */
+	function attached($name = null) {
+		if (!empty($name)) {
+			return (in_array($name, $this->_attached));
+		}
+		return $this->_attached;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/multibyte.php b/code/ryzom/tools/server/www/webtt/cake/libs/multibyte.php
new file mode 100644
index 000000000..71a4ca6ca
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/multibyte.php
@@ -0,0 +1,1172 @@
+<?php
+/**
+ * Multibyte handling methods.
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0.6833
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (function_exists('mb_internal_encoding')) {
+	$encoding = Configure::read('App.encoding');
+	if (!empty($encoding)) {
+		mb_internal_encoding($encoding);
+	}
+}
+
+/**
+ * Find position of first occurrence of a case-insensitive string.
+ *
+ * @param string $haystack The string from which to get the position of the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset The position in $haystack to start searching.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string, or false
+ *    if $needle is not found.
+ */
+if (!function_exists('mb_stripos')) {
+	function mb_stripos($haystack, $needle, $offset = 0, $encoding = null) {
+		return Multibyte::stripos($haystack, $needle, $offset);
+	}
+}
+
+/**
+ * Finds first occurrence of a string within another, case insensitive.
+ *
+ * @param string $haystack The string from which to get the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
+ *    Default value is false.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack, or false if $needle is not found.
+ */
+if (!function_exists('mb_stristr')) {
+	function mb_stristr($haystack, $needle, $part = false, $encoding = null) {
+		return Multibyte::stristr($haystack, $needle, $part);
+	}
+}
+
+/**
+ * Get string length.
+ *
+ * @param string $string The string being checked for length.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer The number of characters in string $string having character encoding encoding.
+ *    A multi-byte character is counted as 1.
+ */
+if (!function_exists('mb_strlen')) {
+	function mb_strlen($string, $encoding = null) {
+		return Multibyte::strlen($string);
+	}
+}
+
+/**
+ * Find position of first occurrence of a string.
+ *
+ * @param string $haystack The string being checked.
+ * @param string $needle The position counted from the beginning of haystack.
+ * @param integer $offset The search offset. If it is not specified, 0 is used.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
+ *    If $needle is not found, it returns false.
+ */
+if (!function_exists('mb_strpos')) {
+	function mb_strpos($haystack, $needle, $offset = 0, $encoding = null) {
+		return Multibyte::strpos($haystack, $needle, $offset);
+	}
+}
+
+/**
+ * Finds the last occurrence of a character in a string within another.
+ *
+ * @param string $haystack The string from which to get the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
+ *    Default value is false.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ */
+if (!function_exists('mb_strrchr')) {
+	function mb_strrchr($haystack, $needle, $part = false, $encoding = null) {
+		return Multibyte::strrchr($haystack, $needle, $part);
+	}
+}
+
+/**
+ * Finds the last occurrence of a character in a string within another, case insensitive.
+ *
+ * @param string $haystack The string from which to get the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
+ *    Default value is false.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ */
+if (!function_exists('mb_strrichr')) {
+	function mb_strrichr($haystack, $needle, $part = false, $encoding = null) {
+		return Multibyte::strrichr($haystack, $needle, $part);
+	}
+}
+
+/**
+ * Finds position of last occurrence of a string within another, case insensitive
+ *
+ * @param string $haystack The string from which to get the position of the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset The position in $haystack to start searching.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
+ *    or false if $needle is not found.
+ */
+if (!function_exists('mb_strripos')) {
+	function mb_strripos($haystack, $needle, $offset = 0, $encoding = null) {
+		return Multibyte::strripos($haystack, $needle, $offset);
+	}
+}
+
+/**
+ * Find position of last occurrence of a string in a string.
+ *
+ * @param string $haystack The string being checked, for the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
+ *    Negative values will stop searching at an arbitrary point prior to the end of the string.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
+ *    If $needle is not found, it returns false.
+ */
+if (!function_exists('mb_strrpos')) {
+	function mb_strrpos($haystack, $needle, $offset = 0, $encoding = null) {
+		return Multibyte::strrpos($haystack, $needle, $offset);
+	}
+}
+
+/**
+ * Finds first occurrence of a string within another
+ *
+ * @param string $haystack The string from which to get the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
+ *    Default value is FALSE.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ */
+if (!function_exists('mb_strstr')) {
+	function mb_strstr($haystack, $needle, $part = false, $encoding = null) {
+		return Multibyte::strstr($haystack, $needle, $part);
+	}
+}
+
+/**
+ * Make a string lowercase
+ *
+ * @param string $string The string being lowercased.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string with all alphabetic characters converted to lowercase.
+ */
+if (!function_exists('mb_strtolower')) {
+	function mb_strtolower($string, $encoding = null) {
+		return Multibyte::strtolower($string);
+	}
+}
+
+/**
+ * Make a string uppercase
+ *
+ * @param string $string The string being uppercased.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string with all alphabetic characters converted to uppercase.
+ */
+if (!function_exists('mb_strtoupper')) {
+	function mb_strtoupper($string, $encoding = null) {
+		return Multibyte::strtoupper($string);
+	}
+}
+
+/**
+ * Count the number of substring occurrences
+ *
+ * @param string $haystack The string being checked.
+ * @param string $needle The string being found.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return integer The number of times the $needle substring occurs in the $haystack string.
+ */
+if (!function_exists('mb_substr_count')) {
+	function mb_substr_count($haystack, $needle, $encoding = null) {
+		return Multibyte::substrCount($haystack, $needle);
+	}
+}
+
+/**
+ * Get part of string
+ *
+ * @param string $string The string being checked.
+ * @param integer $start The first position used in $string.
+ * @param integer $length The maximum length of the returned string.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string The portion of $string specified by the $string and $length parameters.
+ */
+if (!function_exists('mb_substr')) {
+	function mb_substr($string, $start, $length = null, $encoding = null) {
+		return Multibyte::substr($string, $start, $length);
+	}
+}
+
+/**
+ * Encode string for MIME header
+ *
+ * @param string $str The string being encoded
+ * @param string $charset specifies the name of the character set in which str is represented in.
+ *    The default value is determined by the current NLS setting (mbstring.language).
+ * @param string $transfer_encoding specifies the scheme of MIME encoding.
+ *    It should be either "B" (Base64) or "Q" (Quoted-Printable). Falls back to "B" if not given.
+ * @param string $linefeed specifies the EOL (end-of-line) marker with which
+ *    mb_encode_mimeheader() performs line-folding
+ *    (a » RFC term, the act of breaking a line longer than a certain length into multiple lines.
+ *    The length is currently hard-coded to 74 characters). Falls back to "\r\n" (CRLF) if not given.
+ * @param integer $indent [definition unknown and appears to have no affect]
+ * @return string A converted version of the string represented in ASCII.
+ */
+if (!function_exists('mb_encode_mimeheader')) {
+	function mb_encode_mimeheader($str, $charset = 'UTF-8', $transfer_encoding = 'B', $linefeed = "\r\n", $indent = 1) {
+		return Multibyte::mimeEncode($str, $charset, $linefeed);
+	}
+}
+
+/**
+ * Multibyte handling methods.
+ *
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Multibyte extends Object {
+
+/**
+ *  Holds the case folding values
+ *
+ * @var array
+ * @access private
+ */
+	var $__caseFold = array();
+
+/**
+ * Holds an array of Unicode code point ranges
+ *
+ * @var array
+ * @access private
+ */
+	var $__codeRange = array();
+
+/**
+ * Holds the current code point range
+ *
+ * @var string
+ * @access private
+ */
+	var $__table = null;
+
+/**
+ * Gets a reference to the Multibyte object instance
+ *
+ * @return object Multibyte instance
+ * @access public
+ * @static
+ */
+	function &getInstance() {
+		static $instance = array();
+
+		if (!$instance) {
+			$instance[0] =& new Multibyte();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Converts a multibyte character string
+ * to the decimal value of the character
+ *
+ * @param multibyte string $string
+ * @return array
+ * @access public
+ * @static
+ */
+	function utf8($string) {
+		$map = array();
+
+		$values = array();
+		$find = 1;
+		$length = strlen($string);
+
+		for ($i = 0; $i < $length; $i++) {
+			$value = ord($string[$i]);
+
+			if ($value < 128) {
+				$map[] = $value;
+			} else {
+				if (empty($values)) {
+					$find = ($value < 224) ? 2 : 3;
+				}
+				$values[] = $value;
+
+				if (count($values) === $find) {
+					if ($find == 3) {
+						$map[] = (($values[0] % 16) * 4096) + (($values[1] % 64) * 64) + ($values[2] % 64);
+					} else {
+						$map[] = (($values[0] % 32) * 64) + ($values[1] % 64);
+					}
+					$values = array();
+					$find = 1;
+				}
+			}
+		}
+		return $map;
+	}
+
+/**
+ * Converts the decimal value of a multibyte character string
+ * to a string
+ *
+ * @param array $array
+ * @return string
+ * @access public
+ * @static
+ */
+	function ascii($array) {
+		$ascii = '';
+
+		foreach ($array as $utf8) {
+			if ($utf8 < 128) {
+				$ascii .= chr($utf8);
+			} elseif ($utf8 < 2048) {
+				$ascii .= chr(192 + (($utf8 - ($utf8 % 64)) / 64));
+				$ascii .= chr(128 + ($utf8 % 64));
+			} else {
+				$ascii .= chr(224 + (($utf8 - ($utf8 % 4096)) / 4096));
+				$ascii .= chr(128 + ((($utf8 % 4096) - ($utf8 % 64)) / 64));
+				$ascii .= chr(128 + ($utf8 % 64));
+			}
+		}
+		return $ascii;
+	}
+
+/**
+ * Find position of first occurrence of a case-insensitive string.
+ *
+ * @param multi-byte string $haystack The string from which to get the position of the first occurrence of $needle.
+ * @param multi-byte string $needle The string to find in $haystack.
+ * @param integer $offset The position in $haystack to start searching.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string,
+ *    or false if $needle is not found.
+ * @access public
+ * @static
+ */
+	function stripos($haystack, $needle, $offset = 0) {
+		if (!PHP5 || Multibyte::checkMultibyte($haystack)) {
+			$haystack = Multibyte::strtoupper($haystack);
+			$needle = Multibyte::strtoupper($needle);
+			return Multibyte::strpos($haystack, $needle, $offset);
+		}
+		return stripos($haystack, $needle, $offset);
+	}
+
+/**
+ * Finds first occurrence of a string within another, case insensitive.
+ *
+ * @param string $haystack The string from which to get the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
+ *    Default value is false.
+ * @return int|boolean The portion of $haystack, or false if $needle is not found.
+ * @access public
+ * @static
+ */
+	function stristr($haystack, $needle, $part = false) {
+		$php = (PHP_VERSION < 5.3);
+
+		if (($php && $part) || Multibyte::checkMultibyte($haystack)) {
+			$check = Multibyte::strtoupper($haystack);
+			$check = Multibyte::utf8($check);
+			$found = false;
+
+			$haystack = Multibyte::utf8($haystack);
+			$haystackCount = count($haystack);
+
+			$needle = Multibyte::strtoupper($needle);
+			$needle = Multibyte::utf8($needle);
+			$needleCount = count($needle);
+
+			$parts = array();
+			$position = 0;
+
+			while (($found === false) && ($position < $haystackCount)) {
+				if (isset($needle[0]) && $needle[0] === $check[$position]) {
+					for ($i = 1; $i < $needleCount; $i++) {
+						if ($needle[$i] !== $check[$position + $i]) {
+							break;
+						}
+					}
+					if ($i === $needleCount) {
+						$found = true;
+					}
+				}
+				if (!$found) {
+					$parts[] = $haystack[$position];
+					unset($haystack[$position]);
+				}
+				$position++;
+			}
+
+			if ($found && $part && !empty($parts)) {
+				return Multibyte::ascii($parts);
+			} elseif ($found && !empty($haystack)) {
+				return Multibyte::ascii($haystack);
+			}
+			return false;
+		}
+
+		if (!$php) {
+			return stristr($haystack, $needle, $part);
+		}
+		return stristr($haystack, $needle);
+	}
+
+/**
+ * Get string length.
+ *
+ * @param string $string The string being checked for length.
+ * @return integer The number of characters in string $string
+ * @access public
+ * @static
+ */
+	function strlen($string) {
+		if (Multibyte::checkMultibyte($string)) {
+			$string = Multibyte::utf8($string);
+			return count($string);
+		}
+		return strlen($string);
+	}
+
+/**
+ * Find position of first occurrence of a string.
+ *
+ * @param string $haystack The string being checked.
+ * @param string $needle The position counted from the beginning of haystack.
+ * @param integer $offset The search offset. If it is not specified, 0 is used.
+ * @return integer|boolean The numeric position of the first occurrence of $needle in the $haystack string.
+ *    If $needle is not found, it returns false.
+ * @access public
+ * @static
+ */
+	function strpos($haystack, $needle, $offset = 0) {
+		if (Multibyte::checkMultibyte($haystack)) {
+			$found = false;
+
+			$haystack = Multibyte::utf8($haystack);
+			$haystackCount = count($haystack);
+
+			$needle = Multibyte::utf8($needle);
+			$needleCount = count($needle);
+
+			$position = $offset;
+
+			while (($found === false) && ($position < $haystackCount)) {
+				if (isset($needle[0]) && $needle[0] === $haystack[$position]) {
+					for ($i = 1; $i < $needleCount; $i++) {
+						if ($needle[$i] !== $haystack[$position + $i]) {
+							break;
+						}
+					}
+					if ($i === $needleCount) {
+						$found = true;
+						$position--;
+					}
+				}
+				$position++;
+			}
+			if ($found) {
+				return $position;
+			}
+			return false;
+		}
+		return strpos($haystack, $needle, $offset);
+	}
+
+/**
+ * Finds the last occurrence of a character in a string within another.
+ *
+ * @param string $haystack The string from which to get the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
+ *    Default value is false.
+ * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @access public
+ * @static
+ */
+	function strrchr($haystack, $needle, $part = false) {
+		$check = Multibyte::utf8($haystack);
+		$found = false;
+
+		$haystack = Multibyte::utf8($haystack);
+		$haystackCount = count($haystack);
+
+		$matches = array_count_values($check);
+
+		$needle = Multibyte::utf8($needle);
+		$needleCount = count($needle);
+
+		$parts = array();
+		$position = 0;
+
+		while (($found === false) && ($position < $haystackCount)) {
+			if (isset($needle[0]) && $needle[0] === $check[$position]) {
+				for ($i = 1; $i < $needleCount; $i++) {
+					if ($needle[$i] !== $check[$position + $i]) {
+						if ($needle[$i] === $check[($position + $i) -1]) {
+							$found = true;
+						}
+						unset($parts[$position - 1]);
+						$haystack = array_merge(array($haystack[$position]), $haystack);
+						break;
+					}
+				}
+				if (isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+					$matches[$needle[0]] = $matches[$needle[0]] - 1;
+				} elseif ($i === $needleCount) {
+					$found = true;
+				}
+			}
+
+			if (!$found && isset($haystack[$position])) {
+				$parts[] = $haystack[$position];
+				unset($haystack[$position]);
+			}
+			$position++;
+		}
+
+		if ($found && $part && !empty($parts)) {
+			return Multibyte::ascii($parts);
+		} elseif ($found && !empty($haystack)) {
+			return Multibyte::ascii($haystack);
+		}
+		return false;
+	}
+
+/**
+ * Finds the last occurrence of a character in a string within another, case insensitive.
+ *
+ * @param string $haystack The string from which to get the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the last occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the last occurrence of $needle to the end,
+ *    Default value is false.
+ * @return string|boolean The portion of $haystack. or false if $needle is not found.
+ * @access public
+ * @static
+ */
+	function strrichr($haystack, $needle, $part = false) {
+		$check = Multibyte::strtoupper($haystack);
+		$check = Multibyte::utf8($check);
+		$found = false;
+
+		$haystack = Multibyte::utf8($haystack);
+		$haystackCount = count($haystack);
+
+		$matches = array_count_values($check);
+
+		$needle = Multibyte::strtoupper($needle);
+		$needle = Multibyte::utf8($needle);
+		$needleCount = count($needle);
+
+		$parts = array();
+		$position = 0;
+
+		while (($found === false) && ($position < $haystackCount)) {
+			if (isset($needle[0]) && $needle[0] === $check[$position]) {
+				for ($i = 1; $i < $needleCount; $i++) {
+					if ($needle[$i] !== $check[$position + $i]) {
+						if ($needle[$i] === $check[($position + $i) -1]) {
+							$found = true;
+						}
+						unset($parts[$position - 1]);
+						$haystack = array_merge(array($haystack[$position]), $haystack);
+						break;
+					}
+				}
+				if (isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+					$matches[$needle[0]] = $matches[$needle[0]] - 1;
+				} elseif ($i === $needleCount) {
+					$found = true;
+				}
+			}
+
+			if (!$found && isset($haystack[$position])) {
+				$parts[] = $haystack[$position];
+				unset($haystack[$position]);
+			}
+			$position++;
+		}
+
+		if ($found && $part && !empty($parts)) {
+			return Multibyte::ascii($parts);
+		} elseif ($found && !empty($haystack)) {
+			return Multibyte::ascii($haystack);
+		}
+		return false;
+	}
+
+/**
+ * Finds position of last occurrence of a string within another, case insensitive
+ *
+ * @param string $haystack The string from which to get the position of the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset The position in $haystack to start searching.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string,
+ *    or false if $needle is not found.
+ * @access public
+ * @static
+ */
+	function strripos($haystack, $needle, $offset = 0) {
+		if (!PHP5 || Multibyte::checkMultibyte($haystack)) {
+			$found = false;
+			$haystack = Multibyte::strtoupper($haystack);
+			$haystack = Multibyte::utf8($haystack);
+			$haystackCount = count($haystack);
+
+			$matches = array_count_values($haystack);
+
+			$needle = Multibyte::strtoupper($needle);
+			$needle = Multibyte::utf8($needle);
+			$needleCount = count($needle);
+
+			$position = $offset;
+
+			while (($found === false) && ($position < $haystackCount)) {
+				if (isset($needle[0]) && $needle[0] === $haystack[$position]) {
+					for ($i = 1; $i < $needleCount; $i++) {
+						if ($needle[$i] !== $haystack[$position + $i]) {
+							if ($needle[$i] === $haystack[($position + $i) -1]) {
+								$position--;
+								$found = true;
+								continue;
+							}
+						}
+					}
+
+					if (!$offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+						$matches[$needle[0]] = $matches[$needle[0]] - 1;
+					} elseif ($i === $needleCount) {
+						$found = true;
+						$position--;
+					}
+				}
+				$position++;
+			}
+			return ($found) ? $position : false;
+		}
+		return strripos($haystack, $needle, $offset);
+	}
+
+/**
+ * Find position of last occurrence of a string in a string.
+ *
+ * @param string $haystack The string being checked, for the last occurrence of $needle.
+ * @param string $needle The string to find in $haystack.
+ * @param integer $offset May be specified to begin searching an arbitrary number of characters into the string.
+ *    Negative values will stop searching at an arbitrary point prior to the end of the string.
+ * @return integer|boolean The numeric position of the last occurrence of $needle in the $haystack string.
+ *    If $needle is not found, it returns false.
+ * @access public
+ * @static
+ */
+	function strrpos($haystack, $needle, $offset = 0) {
+		if (!PHP5 || Multibyte::checkMultibyte($haystack)) {
+			$found = false;
+
+			$haystack = Multibyte::utf8($haystack);
+			$haystackCount = count($haystack);
+
+			$matches = array_count_values($haystack);
+
+			$needle = Multibyte::utf8($needle);
+			$needleCount = count($needle);
+
+			$position = $offset;
+
+			while (($found === false) && ($position < $haystackCount)) {
+				if (isset($needle[0]) && $needle[0] === $haystack[$position]) {
+					for ($i = 1; $i < $needleCount; $i++) {
+						if ($needle[$i] !== $haystack[$position + $i]) {
+							if ($needle[$i] === $haystack[($position + $i) -1]) {
+								$position--;
+								$found = true;
+								continue;
+							}
+						}
+					}
+
+					if (!$offset && isset($matches[$needle[0]]) && $matches[$needle[0]] > 1) {
+						$matches[$needle[0]] = $matches[$needle[0]] - 1;
+					} elseif ($i === $needleCount) {
+						$found = true;
+						$position--;
+					}
+				}
+				$position++;
+			}
+			return ($found) ? $position : false;
+		}
+		return strrpos($haystack, $needle, $offset);
+	}
+
+/**
+ * Finds first occurrence of a string within another
+ *
+ * @param string $haystack The string from which to get the first occurrence of $needle.
+ * @param string $needle The string to find in $haystack
+ * @param boolean $part Determines which portion of $haystack this function returns.
+ *    If set to true, it returns all of $haystack from the beginning to the first occurrence of $needle.
+ *    If set to false, it returns all of $haystack from the first occurrence of $needle to the end,
+ *    Default value is FALSE.
+ * @return string|boolean The portion of $haystack, or true if $needle is not found.
+ * @access public
+ * @static
+ */
+	function strstr($haystack, $needle, $part = false) {
+		$php = (PHP_VERSION < 5.3);
+
+		if (($php && $part) || Multibyte::checkMultibyte($haystack)) {
+			$check = Multibyte::utf8($haystack);
+			$found = false;
+
+			$haystack = Multibyte::utf8($haystack);
+			$haystackCount = count($haystack);
+
+			$needle = Multibyte::utf8($needle);
+			$needleCount = count($needle);
+
+			$parts = array();
+			$position = 0;
+
+			while (($found === false) && ($position < $haystackCount)) {
+				if (isset($needle[0]) && $needle[0] === $check[$position]) {
+					for ($i = 1; $i < $needleCount; $i++) {
+						if ($needle[$i] !== $check[$position + $i]) {
+							break;
+						}
+					}
+					if ($i === $needleCount) {
+						$found = true;
+					}
+				}
+				if (!$found) {
+					$parts[] = $haystack[$position];
+					unset($haystack[$position]);
+				}
+				$position++;
+			}
+
+			if ($found && $part && !empty($parts)) {
+				return Multibyte::ascii($parts);
+			} elseif ($found && !empty($haystack)) {
+				return Multibyte::ascii($haystack);
+			}
+			return false;
+		}
+
+		if (!$php) {
+			return strstr($haystack, $needle, $part);
+		}
+		return strstr($haystack, $needle);
+	}
+
+/**
+ * Make a string lowercase
+ *
+ * @param string $string The string being lowercased.
+ * @return string with all alphabetic characters converted to lowercase.
+ * @access public
+ * @static
+ */
+	function strtolower($string) {
+		$_this =& Multibyte::getInstance();
+		$utf8Map = Multibyte::utf8($string);
+
+		$length = count($utf8Map);
+		$lowerCase = array();
+		$matched = false;
+
+		for ($i = 0 ; $i < $length; $i++) {
+			$char = $utf8Map[$i];
+
+			if ($char < 128) {
+				$str = strtolower(chr($char));
+				$strlen = strlen($str);
+				for ($ii = 0 ; $ii < $strlen; $ii++) {
+					$lower = ord(substr($str, $ii, 1));
+				}
+				$lowerCase[] = $lower;
+				$matched = true;
+			} else {
+				$matched = false;
+				$keys = $_this->__find($char, 'upper');
+
+				if (!empty($keys)) {
+					foreach ($keys as $key => $value) {
+						if ($keys[$key]['upper'] == $char && count($keys[$key]['lower'][0]) === 1) {
+							$lowerCase[] = $keys[$key]['lower'][0];
+							$matched = true;
+							break 1;
+						}
+					}
+				}
+			}
+			if ($matched === false) {
+				$lowerCase[] = $char;
+			}
+		}
+		return Multibyte::ascii($lowerCase);
+	}
+
+/**
+ * Make a string uppercase
+ *
+ * @param string $string The string being uppercased.
+ * @param string $encoding Character encoding name to use. If it is omitted, internal character encoding is used.
+ * @return string with all alphabetic characters converted to uppercase.
+ * @access public
+ * @static
+ */
+	function strtoupper($string) {
+		$_this =& Multibyte::getInstance();
+		$utf8Map = Multibyte::utf8($string);
+
+		$length = count($utf8Map);
+		$matched = false;
+		$replaced = array();
+		$upperCase = array();
+
+		for ($i = 0 ; $i < $length; $i++) {
+			$char = $utf8Map[$i];
+
+			if ($char < 128) {
+				$str = strtoupper(chr($char));
+				$strlen = strlen($str);
+				for ($ii = 0 ; $ii < $strlen; $ii++) {
+					$upper = ord(substr($str, $ii, 1));
+				}
+				$upperCase[] = $upper;
+				$matched = true;
+
+			} else {
+				$matched = false;
+				$keys = $_this->__find($char);
+				$keyCount = count($keys);
+
+				if (!empty($keys)) {
+					foreach ($keys as $key => $value) {
+						$matched = false;
+						$replace = 0;
+						if ($length > 1 && count($keys[$key]['lower']) > 1) {
+							$j = 0;
+
+							for ($ii = 0, $count = count($keys[$key]['lower']); $ii < $count; $ii++) {
+								$nextChar = $utf8Map[$i + $ii];
+
+								if (isset($nextChar) && ($nextChar == $keys[$key]['lower'][$j + $ii])) {
+									$replace++;
+								}
+							}
+							if ($replace == $count) {
+								$upperCase[] = $keys[$key]['upper'];
+								$replaced = array_merge($replaced, array_values($keys[$key]['lower']));
+								$matched = true;
+								break 1;
+							}
+						} elseif ($length > 1 && $keyCount > 1) {
+							$j = 0;
+							for ($ii = 1; $ii < $keyCount; $ii++) {
+								$nextChar = $utf8Map[$i + $ii - 1];
+
+								if (in_array($nextChar, $keys[$ii]['lower'])) {
+
+									for ($jj = 0, $count = count($keys[$ii]['lower']); $jj < $count; $jj++) {
+										$nextChar = $utf8Map[$i + $jj];
+
+										if (isset($nextChar) && ($nextChar == $keys[$ii]['lower'][$j + $jj])) {
+											$replace++;
+										}
+									}
+									if ($replace == $count) {
+										$upperCase[] = $keys[$ii]['upper'];
+										$replaced = array_merge($replaced, array_values($keys[$ii]['lower']));
+										$matched = true;
+										break 2;
+									}
+								}
+							}
+						}
+						if ($keys[$key]['lower'][0] == $char) {
+							$upperCase[] = $keys[$key]['upper'];
+							$matched = true;
+							break 1;
+						}
+					}
+				}
+			}
+			if ($matched === false && !in_array($char, $replaced, true)) {
+				$upperCase[] = $char;
+			}
+		}
+		return Multibyte::ascii($upperCase);
+	}
+
+/**
+ * Count the number of substring occurrences
+ *
+ * @param string $haystack The string being checked.
+ * @param string $needle The string being found.
+ * @return integer The number of times the $needle substring occurs in the $haystack string.
+ * @access public
+ * @static
+ */
+	function substrCount($haystack, $needle) {
+		$count = 0;
+		$haystack = Multibyte::utf8($haystack);
+		$haystackCount = count($haystack);
+		$matches = array_count_values($haystack);
+		$needle = Multibyte::utf8($needle);
+		$needleCount = count($needle);
+
+		if ($needleCount === 1 && isset($matches[$needle[0]])) {
+			return $matches[$needle[0]];
+		}
+
+		for ($i = 0; $i < $haystackCount; $i++) {
+			if (isset($needle[0]) && $needle[0] === $haystack[$i]) {
+				for ($ii = 1; $ii < $needleCount; $ii++) {
+					if ($needle[$ii] === $haystack[$i + 1]) {
+						if ((isset($needle[$ii + 1]) && $haystack[$i + 2]) && $needle[$ii + 1] !== $haystack[$i + 2]) {
+							$count--;
+						} else {
+							$count++;
+						}
+					}
+				}
+			}
+		}
+		return $count;
+	}
+
+/**
+ * Get part of string
+ *
+ * @param string $string The string being checked.
+ * @param integer $start The first position used in $string.
+ * @param integer $length The maximum length of the returned string.
+ * @return string The portion of $string specified by the $string and $length parameters.
+ * @access public
+ * @static
+ */
+	function substr($string, $start, $length = null) {
+		if ($start === 0 && $length === null) {
+			return $string;
+		}
+
+		$string = Multibyte::utf8($string);
+		$stringCount = count($string);
+
+		for ($i = 1; $i <= $start; $i++) {
+			unset($string[$i - 1]);
+		}
+
+		if ($length === null || count($string) < $length) {
+			return Multibyte::ascii($string);
+		}
+		$string = array_values($string);
+
+		$value = array();
+		for ($i = 0; $i < $length; $i++) {
+			$value[] = $string[$i];
+		}
+		return Multibyte::ascii($value);
+	}
+
+/**
+ * Prepare a string for mail transport, using the provided encoding
+ *
+ * @param string $string value to encode
+ * @param string $charset charset to use for encoding. defaults to UTF-8
+ * @param string $newline
+ * @return string
+ * @access public
+ * @static
+ * @TODO: add support for 'Q'('Quoted Printable') encoding
+ */
+	function mimeEncode($string, $charset = null, $newline = "\r\n") {
+		if (!Multibyte::checkMultibyte($string) && strlen($string) < 75) {
+			return $string;
+		}
+
+		if (empty($charset)) {
+			$charset = Configure::read('App.encoding');
+		}
+		$charset = strtoupper($charset);
+
+		$start = '=?' . $charset . '?B?';
+		$end = '?=';
+		$spacer = $end . $newline . ' ' . $start;
+
+		$length = 75 - strlen($start) - strlen($end);
+		$length = $length - ($length % 4);
+		if ($charset == 'UTF-8') {
+			$parts = array();
+			$maxchars = floor(($length * 3) / 4);
+			while (strlen($string) > $maxchars) {
+				$i = $maxchars;
+				$test = ord($string[$i]);
+				while ($test >= 128 && $test <= 191) {
+					$i--;
+					$test = ord($string[$i]);
+				}
+				$parts[] = base64_encode(substr($string, 0, $i));
+				$string = substr($string, $i);
+			}
+			$parts[] = base64_encode($string);
+			$string = implode($spacer, $parts);
+		} else {
+			$string = chunk_split(base64_encode($string), $length, $spacer);
+			$string = preg_replace('/' . preg_quote($spacer) . '$/', '', $string);
+		}
+		return $start . $string . $end;
+	}
+
+/**
+ * Return the Code points range for Unicode characters
+ *
+ * @param interger $decimal
+ * @return string
+ * @access private
+ */
+	function __codepoint($decimal) {
+		if ($decimal > 128 && $decimal < 256)  {
+			$return = '0080_00ff'; // Latin-1 Supplement
+		} elseif ($decimal < 384) {
+			$return = '0100_017f'; // Latin Extended-A
+		} elseif ($decimal < 592) {
+			$return = '0180_024F'; // Latin Extended-B
+		} elseif ($decimal < 688) {
+			$return = '0250_02af'; // IPA Extensions
+		} elseif ($decimal >= 880 && $decimal < 1024) {
+			$return = '0370_03ff'; // Greek and Coptic
+		} elseif ($decimal < 1280) {
+			$return = '0400_04ff'; // Cyrillic
+		} elseif ($decimal < 1328) {
+			$return = '0500_052f'; // Cyrillic Supplement
+		} elseif ($decimal < 1424) {
+			$return = '0530_058f'; // Armenian
+		} elseif ($decimal >= 7680 && $decimal < 7936) {
+			$return = '1e00_1eff'; // Latin Extended Additional
+		} elseif ($decimal < 8192) {
+			$return = '1f00_1fff'; // Greek Extended
+		} elseif ($decimal >= 8448 && $decimal < 8528) {
+			$return = '2100_214f'; // Letterlike Symbols
+		} elseif ($decimal < 8592) {
+			$return = '2150_218f'; // Number Forms
+		} elseif ($decimal >= 9312 && $decimal < 9472) {
+			$return = '2460_24ff'; // Enclosed Alphanumerics
+		} elseif ($decimal >= 11264 && $decimal < 11360) {
+			$return = '2c00_2c5f'; // Glagolitic
+		} elseif ($decimal < 11392) {
+			$return = '2c60_2c7f'; // Latin Extended-C
+		} elseif ($decimal < 11520) {
+			$return = '2c80_2cff'; // Coptic
+		} elseif ($decimal >= 65280 && $decimal < 65520) {
+			$return = 'ff00_ffef'; // Halfwidth and Fullwidth Forms
+		} else {
+			$return = false;
+		}
+		$this->__codeRange[$decimal] = $return;
+		return $return;
+	}
+
+/**
+ * Find the related code folding values for $char
+ *
+ * @param integer $char decimal value of character
+ * @param string $type
+ * @return array
+ * @access private
+ */
+	function __find($char, $type = 'lower') {
+		$value = false;
+		$found = array();
+		if (!isset($this->__codeRange[$char])) {
+			$range = $this->__codepoint($char);
+			if ($range === false) {
+				return null;
+			}
+			Configure::load('unicode' . DS . 'casefolding' . DS . $range);
+			$this->__caseFold[$range] = Configure::read($range);
+			Configure::delete($range);
+		}
+
+		if (!$this->__codeRange[$char]) {
+			return null;
+		}
+		$this->__table = $this->__codeRange[$char];
+		$count = count($this->__caseFold[$this->__table]);
+
+		for ($i = 0; $i < $count; $i++) {
+			if ($type === 'lower' && $this->__caseFold[$this->__table][$i][$type][0] === $char) {
+				$found[] = $this->__caseFold[$this->__table][$i];
+			} elseif ($type === 'upper' && $this->__caseFold[$this->__table][$i][$type] === $char) {
+				$found[] = $this->__caseFold[$this->__table][$i];
+			}
+		}
+		return $found;
+	}
+
+/**
+ * Check the $string for multibyte characters
+ * @param string $string value to test
+ * @return boolean
+ * @access public
+ * @static
+ */
+	function checkMultibyte($string) {
+		$length = strlen($string);
+
+		for ($i = 0; $i < $length; $i++ ) {
+			$value = ord(($string[$i]));
+			if ($value > 128) {
+				return true;
+			}
+		}
+		return false;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/object.php b/code/ryzom/tools/server/www/webtt/cake/libs/object.php
new file mode 100644
index 000000000..8fcb3cf05
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/object.php
@@ -0,0 +1,298 @@
+<?php
+/**
+ * Object class, allowing __construct and __destruct in PHP4.
+ *
+ * Also includes methods for logging and the special method RequestAction,
+ * to call other Controllers' Actions from anywhere.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Object class, allowing __construct and __destruct in PHP4.
+ *
+ * Also includes methods for logging and the special method RequestAction,
+ * to call other Controllers' Actions from anywhere.
+ *
+ * @package cake
+ * @subpackage cake.cake.libs
+ */
+class Object {
+
+/**
+ * A hack to support __construct() on PHP 4
+ * Hint: descendant classes have no PHP4 class_name() constructors,
+ * so this constructor gets called first and calls the top-layer __construct()
+ * which (if present) should call parent::__construct()
+ *
+ * @return Object
+ */
+	function Object() {
+		$args = func_get_args();
+		if (method_exists($this, '__destruct')) {
+			register_shutdown_function (array(&$this, '__destruct'));
+		}
+		call_user_func_array(array(&$this, '__construct'), $args);
+	}
+
+/**
+ * Class constructor, overridden in descendant classes.
+ */
+	function __construct() {
+	}
+
+/**
+ * Object-to-string conversion.
+ * Each class can override this method as necessary.
+ *
+ * @return string The name of this class
+ * @access public
+ */
+	function toString() {
+		$class = get_class($this);
+		return $class;
+	}
+
+/**
+ * Calls a controller's method from any location. Can be used to connect controllers together
+ * or tie plugins into a main application. requestAction can be used to return rendered views
+ * or fetch the return value from controller actions.
+ *
+ * @param mixed $url String or array-based url.
+ * @param array $extra if array includes the key "return" it sets the AutoRender to true.
+ * @return mixed Boolean true or false on success/failure, or contents
+ *    of rendered action if 'return' is set in $extra.
+ * @access public
+ */
+	function requestAction($url, $extra = array()) {
+		if (empty($url)) {
+			return false;
+		}
+		if (!class_exists('dispatcher')) {
+			require CAKE . 'dispatcher.php';
+		}
+		if (in_array('return', $extra, true)) {
+			$extra = array_merge($extra, array('return' => 0, 'autoRender' => 1));
+		}
+		if (is_array($url) && !isset($extra['url'])) {
+			$extra['url'] = array();
+		}
+		$params = array_merge(array('autoRender' => 0, 'return' => 1, 'bare' => 1, 'requested' => 1), $extra);
+		$dispatcher = new Dispatcher;
+		return $dispatcher->dispatch($url, $params);
+	}
+
+/**
+ * Calls a method on this object with the given parameters. Provides an OO wrapper
+ * for `call_user_func_array`
+ *
+ * @param string $method  Name of the method to call
+ * @param array $params  Parameter list to use when calling $method
+ * @return mixed  Returns the result of the method call
+ * @access public
+ */
+	function dispatchMethod($method, $params = array()) {
+		switch (count($params)) {
+			case 0:
+				return $this->{$method}();
+			case 1:
+				return $this->{$method}($params[0]);
+			case 2:
+				return $this->{$method}($params[0], $params[1]);
+			case 3:
+				return $this->{$method}($params[0], $params[1], $params[2]);
+			case 4:
+				return $this->{$method}($params[0], $params[1], $params[2], $params[3]);
+			case 5:
+				return $this->{$method}($params[0], $params[1], $params[2], $params[3], $params[4]);
+			default:
+				return call_user_func_array(array(&$this, $method), $params);
+			break;
+		}
+	}
+
+/**
+ * Stop execution of the current script.  Wraps exit() making 
+ * testing easier.
+ *
+ * @param $status see http://php.net/exit for values
+ * @return void
+ * @access public
+ */
+	function _stop($status = 0) {
+		exit($status);
+	}
+
+/**
+ * Convience method to write a message to CakeLog.  See CakeLog::write()
+ * for more information on writing to logs.
+ *
+ * @param string $msg Log message
+ * @param integer $type Error type constant. Defined in app/config/core.php.
+ * @return boolean Success of log write
+ * @access public
+ */
+	function log($msg, $type = LOG_ERROR) {
+		if (!class_exists('CakeLog')) {
+			require LIBS . 'cake_log.php';
+		}
+		if (!is_string($msg)) {
+			$msg = print_r($msg, true);
+		}
+		return CakeLog::write($type, $msg);
+	}
+
+/**
+ * Allows setting of multiple properties of the object in a single line of code.  Will only set 
+ * properties that are part of a class declaration.
+ *
+ * @param array $properties An associative array containing properties and corresponding values.
+ * @return void
+ * @access protected
+ */
+	function _set($properties = array()) {
+		if (is_array($properties) && !empty($properties)) {
+			$vars = get_object_vars($this);
+			foreach ($properties as $key => $val) {
+				if (array_key_exists($key, $vars)) {
+					$this->{$key} = $val;
+				}
+			}
+		}
+	}
+
+/**
+ * Used to report user friendly errors.
+ * If there is a file app/error.php or app/app_error.php this file will be loaded
+ * error.php is the AppError class it should extend ErrorHandler class.
+ *
+ * @param string $method Method to be called in the error class (AppError or ErrorHandler classes)
+ * @param array $messages Message that is to be displayed by the error class
+ * @return error message
+ * @access public
+ */
+	function cakeError($method, $messages = array()) {
+		if (!class_exists('ErrorHandler')) {
+			App::import('Core', 'Error');
+
+			if (file_exists(APP . 'error.php')) {
+				include_once (APP . 'error.php');
+			} elseif (file_exists(APP . 'app_error.php')) {
+				include_once (APP . 'app_error.php');
+			}
+		}
+
+		if (class_exists('AppError')) {
+			$error = new AppError($method, $messages);
+		} else {
+			$error = new ErrorHandler($method, $messages);
+		}
+		return $error;
+	}
+
+/**
+ * Checks for a persistent class file, if found file is opened and true returned
+ * If file is not found a file is created and false returned
+ * If used in other locations of the model you should choose a unique name for the persistent file
+ * There are many uses for this method, see manual for examples
+ *
+ * @param string $name name of the class to persist
+ * @param string $object the object to persist
+ * @return boolean Success
+ * @access protected
+ * @todo add examples to manual
+ */
+	function _persist($name, $return = null, &$object, $type = null) {
+		$file = CACHE . 'persistent' . DS . strtolower($name) . '.php';
+		if ($return === null) {
+			if (!file_exists($file)) {
+				return false;
+			} else {
+				return true;
+			}
+		}
+
+		if (!file_exists($file)) {
+			$this->_savePersistent($name, $object);
+			return false;
+		} else {
+			$this->__openPersistent($name, $type);
+			return true;
+		}
+	}
+
+/**
+ * You should choose a unique name for the persistent file
+ *
+ * There are many uses for this method, see manual for examples
+ *
+ * @param string $name name used for object to cache
+ * @param object $object the object to persist
+ * @return boolean true on save, throws error if file can not be created
+ * @access protected
+ */
+	function _savePersistent($name, &$object) {
+		$file = 'persistent' . DS . strtolower($name) . '.php';
+		$objectArray = array(&$object);
+		$data = str_replace('\\', '\\\\', serialize($objectArray));
+		$data = '<?php $' . $name . ' = \'' . str_replace('\'', '\\\'', $data) . '\' ?>';
+		$duration = '+999 days';
+		if (Configure::read() >= 1) {
+			$duration = '+10 seconds';
+		}
+		cache($file, $data, $duration);
+	}
+
+/**
+ * Open the persistent class file for reading
+ * Used by Object::_persist()
+ *
+ * @param string $name Name of persisted class
+ * @param string $type Type of persistance (e.g: registry)
+ * @return void
+ * @access private
+ */
+	function __openPersistent($name, $type = null) {
+		$file = CACHE . 'persistent' . DS . strtolower($name) . '.php';
+		include($file);
+
+		switch ($type) {
+			case 'registry':
+				$vars = unserialize(${$name});
+				foreach ($vars['0'] as $key => $value) {
+					if (strpos($key, '_behavior') !== false) {
+						App::import('Behavior', Inflector::classify(substr($key, 0, -9)));
+					} else {
+						App::import('Model', Inflector::camelize($key));
+					}
+					unset ($value);
+				}
+				unset($vars);
+				$vars = unserialize(${$name});
+				foreach ($vars['0'] as $key => $value) {
+					ClassRegistry::addObject($key, $value);
+					unset ($value);
+				}
+				unset($vars);
+			break;
+			default:
+				$vars = unserialize(${$name});
+				$this->{$name} = $vars['0'];
+				unset($vars);
+			break;
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/overloadable.php b/code/ryzom/tools/server/www/webtt/cake/libs/overloadable.php
new file mode 100644
index 000000000..2d2eea290
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/overloadable.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Overload abstraction interface.  Merges differences between PHP4 and 5.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Overloadable class selector
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+
+/**
+ * Load the interface class based on the version of PHP.
+ *
+ */
+if (!PHP5) {
+	require(LIBS . 'overloadable_php4.php');
+} else {
+	require(LIBS . 'overloadable_php5.php');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php4.php b/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php4.php
new file mode 100644
index 000000000..894265ca9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php4.php
@@ -0,0 +1,165 @@
+<?php
+/**
+ * Overload abstraction interface.  Merges differences between PHP4 and 5.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Overloadable class selector
+ *
+ * Load the interface class based on the version of PHP.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Overloadable extends Object {
+
+/**
+ * Constructor.
+ *
+ * @access private
+ */
+	function __construct() {
+		$this->overload();
+		parent::__construct();
+	}
+
+/**
+ * Overload implementation.
+ *
+ * @access public
+ */
+	function overload() {
+		if (function_exists('overload')) {
+			if (func_num_args() > 0) {
+				foreach (func_get_args() as $class) {
+					if (is_object($class)) {
+						overload(get_class($class));
+					} elseif (is_string($class)) {
+						overload($class);
+					}
+				}
+			} else {
+				overload(get_class($this));
+			}
+		}
+	}
+
+/**
+ * Magic method handler.
+ *
+ * @param string $method Method name
+ * @param array $params Parameters to send to method
+ * @param mixed $return Where to store return value from method
+ * @return boolean Success
+ * @access private
+ */
+	function __call($method, $params, &$return) {
+		if (!method_exists($this, 'call__')) {
+			trigger_error(sprintf(__('Magic method handler call__ not defined in %s', true), get_class($this)), E_USER_ERROR);
+		}
+		$return = $this->call__($method, $params);
+		return true;
+	}
+}
+Overloadable::overload('Overloadable');
+
+/**
+ * Overloadable2 class selector
+ *
+ * Load the interface class based on the version of PHP.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Overloadable2 extends Object {
+
+/**
+ * Constructor
+ *
+ * @access private
+ */
+	function __construct() {
+		$this->overload();
+		parent::__construct();
+	}
+
+/**
+ * Overload implementation.
+ *
+ * @access public
+ */
+	function overload() {
+		if (function_exists('overload')) {
+			if (func_num_args() > 0) {
+				foreach (func_get_args() as $class) {
+					if (is_object($class)) {
+						overload(get_class($class));
+					} elseif (is_string($class)) {
+						overload($class);
+					}
+				}
+			} else {
+				overload(get_class($this));
+			}
+		}
+	}
+
+/**
+ * Magic method handler.
+ *
+ * @param string $method Method name
+ * @param array $params Parameters to send to method
+ * @param mixed $return Where to store return value from method
+ * @return boolean Success
+ * @access private
+ */
+	function __call($method, $params, &$return) {
+		if (!method_exists($this, 'call__')) {
+			trigger_error(sprintf(__('Magic method handler call__ not defined in %s', true), get_class($this)), E_USER_ERROR);
+		}
+		$return = $this->call__($method, $params);
+		return true;
+	}
+
+/**
+ * Getter.
+ *
+ * @param mixed $name What to get
+ * @param mixed $value Where to store returned value
+ * @return boolean Success
+ * @access private
+ */
+	function __get($name, &$value) {
+		$value = $this->get__($name);
+		return true;
+	}
+
+/**
+ * Setter.
+ *
+ * @param mixed $name What to set
+ * @param mixed $value Value to set
+ * @return boolean Success
+ * @access private
+ */
+	function __set($name, $value) {
+		$this->set__($name, $value);
+		return true;
+	}
+}
+Overloadable::overload('Overloadable2');
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php5.php b/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php5.php
new file mode 100644
index 000000000..ed27493b9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/overloadable_php5.php
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Overload abstraction interface.  Merges differences between PHP4 and 5.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Overloadable class selector
+ *
+ * Load the interface class based on the version of PHP.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Overloadable extends Object {
+
+/**
+ * Overload implementation. No need for implementation in PHP5.
+ *
+ * @access public
+ */
+	function overload() { }
+
+/**
+ * Magic method handler.
+ *
+ * @param string $method Method name
+ * @param array $params Parameters to send to method
+ * @return mixed Return value from method
+ * @access private
+ */
+	function __call($method, $params) {
+		if (!method_exists($this, 'call__')) {
+			trigger_error(sprintf(__('Magic method handler call__ not defined in %s', true), get_class($this)), E_USER_ERROR);
+		}
+		return $this->call__($method, $params);
+	}
+}
+
+/**
+ * Overloadable2 class selector
+ *
+ * Load the interface class based on the version of PHP.
+ *
+ * @package       cake
+ */
+class Overloadable2 extends Object {
+
+/**
+ * Overload implementation. No need for implementation in PHP5.
+ *
+ * @access public
+ */
+	function overload() { }
+
+/**
+ * Magic method handler.
+ *
+ * @param string $method Method name
+ * @param array $params Parameters to send to method
+ * @return mixed Return value from method
+ * @access private
+ */
+	function __call($method, $params) {
+		if (!method_exists($this, 'call__')) {
+			trigger_error(sprintf(__('Magic method handler call__ not defined in %s', true), get_class($this)), E_USER_ERROR);
+		}
+		return $this->call__($method, $params);
+	}
+
+/**
+ * Getter.
+ *
+ * @param mixed $name What to get
+ * @param mixed $value Where to store returned value
+ * @return boolean Success
+ * @access private
+ */
+	function __get($name) {
+		return $this->get__($name);
+	}
+
+/**
+ * Setter.
+ *
+ * @param mixed $name What to set
+ * @param mixed $value Value to set
+ * @return boolean Success
+ * @access private
+ */
+	function __set($name, $value) {
+		return $this->set__($name, $value);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/router.php b/code/ryzom/tools/server/www/webtt/cake/libs/router.php
new file mode 100644
index 000000000..362cef2d2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/router.php
@@ -0,0 +1,1648 @@
+<?php
+/**
+ * Parses the request URL into controller, action, and parameters.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Parses the request URL into controller, action, and parameters.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Router {
+
+/**
+ * Array of routes connected with Router::connect()
+ *
+ * @var array
+ * @access public
+ */
+	var $routes = array();
+
+/**
+ * List of action prefixes used in connected routes.
+ * Includes admin prefix
+ *
+ * @var array
+ * @access private
+ */
+	var $__prefixes = array();
+
+/**
+ * Directive for Router to parse out file extensions for mapping to Content-types.
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__parseExtensions = false;
+
+/**
+ * List of valid extensions to parse from a URL.  If null, any extension is allowed.
+ *
+ * @var array
+ * @access private
+ */
+	var $__validExtensions = null;
+
+/**
+ * 'Constant' regular expression definitions for named route elements
+ *
+ * @var array
+ * @access private
+ */
+	var $__named = array(
+		'Action'	=> 'index|show|add|create|edit|update|remove|del|delete|view|item',
+		'Year'		=> '[12][0-9]{3}',
+		'Month'		=> '0[1-9]|1[012]',
+		'Day'		=> '0[1-9]|[12][0-9]|3[01]',
+		'ID'		=> '[0-9]+',
+		'UUID'		=> '[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}'
+	);
+
+/**
+ * Stores all information necessary to decide what named arguments are parsed under what conditions.
+ *
+ * @var string
+ * @access public
+ */
+	var $named = array(
+		'default' => array('page', 'fields', 'order', 'limit', 'recursive', 'sort', 'direction', 'step'),
+		'greedy' => true,
+		'separator' => ':',
+		'rules' => false,
+	);
+
+/**
+ * The route matching the URL of the current request
+ *
+ * @var array
+ * @access private
+ */
+	var $__currentRoute = array();
+
+/**
+ * Default HTTP request method => controller action map.
+ *
+ * @var array
+ * @access private
+ */
+	var $__resourceMap = array(
+		array('action' => 'index',	'method' => 'GET',		'id' => false),
+		array('action' => 'view',	'method' => 'GET',		'id' => true),
+		array('action' => 'add',	'method' => 'POST',		'id' => false),
+		array('action' => 'edit',	'method' => 'PUT', 		'id' => true),
+		array('action' => 'delete',	'method' => 'DELETE',	'id' => true),
+		array('action' => 'edit',	'method' => 'POST', 	'id' => true)
+	);
+
+/**
+ * List of resource-mapped controllers
+ *
+ * @var array
+ * @access private
+ */
+	var $__resourceMapped = array();
+
+/**
+ * Maintains the parameter stack for the current request
+ *
+ * @var array
+ * @access private
+ */
+	var $__params = array();
+
+/**
+ * Maintains the path stack for the current request
+ *
+ * @var array
+ * @access private
+ */
+	var $__paths = array();
+
+/**
+ * Keeps Router state to determine if default routes have already been connected
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__defaultsMapped = false;
+
+/**
+ * Keeps track of whether the connection of default routes is enabled or disabled.
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__connectDefaults = true;
+
+/**
+ * Constructor for Router.
+ * Builds __prefixes
+ *
+ * @return void
+ */
+	function Router() {
+		$this->__setPrefixes();
+	}
+
+/**
+ * Sets the Routing prefixes. Includes compatibility for existing Routing.admin
+ * configurations.
+ *
+ * @return void
+ * @access private
+ * @todo Remove support for Routing.admin in future versions.
+ */
+	function __setPrefixes() {
+		$routing = Configure::read('Routing');
+		if (!empty($routing['admin'])) {
+			$this->__prefixes[] = $routing['admin'];
+		}
+		if (!empty($routing['prefixes'])) {
+			$this->__prefixes = array_merge($this->__prefixes, (array)$routing['prefixes']);
+		}
+	}
+
+/**
+ * Gets a reference to the Router object instance
+ *
+ * @return Router Instance of the Router.
+ * @access public
+ * @static
+ */
+	function &getInstance() {
+		static $instance = array();
+
+		if (!$instance) {
+			$instance[0] =& new Router();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Gets the named route elements for use in app/config/routes.php
+ *
+ * @return array Named route elements
+ * @access public
+ * @see Router::$__named
+ * @static
+ */
+	function getNamedExpressions() {
+		$self =& Router::getInstance();
+		return $self->__named;
+	}
+
+/**
+ * Connects a new Route in the router.
+ *
+ * Routes are a way of connecting request urls to objects in your application.  At their core routes
+ * are a set or regular expressions that are used to match requests to destinations.
+ *
+ * Examples:
+ *
+ * `Router::connect('/:controller/:action/*');`
+ *
+ * The first parameter will be used as a controller name while the second is used as the action name.
+ * the '/*' syntax makes this route greedy in that it will match requests like `/posts/index` as well as requests
+ * like `/posts/edit/1/foo/bar`.
+ *
+ * `Router::connect('/home-page', array('controller' => 'pages', 'action' => 'display', 'home'));`
+ *
+ * The above shows the use of route parameter defaults. And providing routing parameters for a static route.
+ *
+ * {{{
+ * Router::connect(
+ *   '/:lang/:controller/:action/:id',
+ *   array(),
+ *   array('id' => '[0-9]+', 'lang' => '[a-z]{3}')
+ * );
+ * }}}
+ *
+ * Shows connecting a route with custom route parameters as well as providing patterns for those parameters.
+ * Patterns for routing parameters do not need capturing groups, as one will be added for each route params.
+ *
+ * $options offers three 'special' keys. `pass`, `persist` and `routeClass` have special meaning in the $options array.
+ *
+ * `pass` is used to define which of the routed parameters should be shifted into the pass array.  Adding a
+ * parameter to pass will remove it from the regular route array. Ex. `'pass' => array('slug')`
+ *
+ * `persist` is used to define which route parameters should be automatically included when generating
+ * new urls. You can override persistent parameters by redefining them in a url or remove them by
+ * setting the parameter to `false`.  Ex. `'persist' => array('lang')`
+ *
+ * `routeClass` is used to extend and change how individual routes parse requests and handle reverse routing,
+ * via a custom routing class. Ex. `'routeClass' => 'SlugRoute'`
+ *
+ * @param string $route A string describing the template of the route
+ * @param array $defaults An array describing the default route parameters. These parameters will be used by default
+ *   and can supply routing parameters that are not dynamic. See above.
+ * @param array $options An array matching the named elements in the route to regular expressions which that
+ *   element should match.  Also contains additional parameters such as which routed parameters should be
+ *   shifted into the passed arguments, supplying patterns for routing parameters and supplying the name of a
+ *   custom routing class.
+ * @see routes
+ * @return array Array of routes
+ * @access public
+ * @static
+ */
+	function connect($route, $defaults = array(), $options = array()) {
+		$self =& Router::getInstance();
+
+		foreach ($self->__prefixes as $prefix) {
+			if (isset($defaults[$prefix])) {
+				$defaults['prefix'] = $prefix;
+				break;
+			}
+		}
+		if (isset($defaults['prefix'])) {
+			$self->__prefixes[] = $defaults['prefix'];
+			$self->__prefixes = array_keys(array_flip($self->__prefixes));
+		}
+		$defaults += array('plugin' => null);
+		if (empty($options['action'])) {
+			$defaults += array('action' => 'index'); 
+		}
+		$routeClass = 'CakeRoute';
+		if (isset($options['routeClass'])) {
+			$routeClass = $options['routeClass'];
+			unset($options['routeClass']);
+		}
+		//TODO 2.0 refactor this to use a string class name, throw exception, and then construct.
+		$Route =& new $routeClass($route, $defaults, $options);
+		if ($routeClass !== 'CakeRoute' && !is_subclass_of($Route, 'CakeRoute')) {
+			trigger_error(__('Route classes must extend CakeRoute', true), E_USER_WARNING);
+			return false;
+		}
+		$self->routes[] =& $Route;
+		return $self->routes;
+	}
+
+/**
+ * Specifies what named parameters CakePHP should be parsing. The most common setups are:
+ *
+ * Do not parse any named parameters:
+ *
+ * {{{ Router::connectNamed(false); }}}
+ *
+ * Parse only default parameters used for CakePHP's pagination:
+ *
+ * {{{ Router::connectNamed(false, array('default' => true)); }}}
+ *
+ * Parse only the page parameter if its value is a number:
+ *
+ * {{{ Router::connectNamed(array('page' => '[\d]+'), array('default' => false, 'greedy' => false)); }}}
+ *
+ * Parse only the page parameter no mater what.
+ *
+ * {{{ Router::connectNamed(array('page'), array('default' => false, 'greedy' => false)); }}}
+ *
+ * Parse only the page parameter if the current action is 'index'.
+ *
+ * {{{
+ * Router::connectNamed(
+ *    array('page' => array('action' => 'index')),
+ *    array('default' => false, 'greedy' => false)
+ * );
+ * }}}
+ *
+ * Parse only the page parameter if the current action is 'index' and the controller is 'pages'.
+ *
+ * {{{
+ * Router::connectNamed(
+ *    array('page' => array('action' => 'index', 'controller' => 'pages')),
+ *    array('default' => false, 'greedy' => false)
+ * ); 
+ * }}}
+ *
+ * @param array $named A list of named parameters. Key value pairs are accepted where values are 
+ *    either regex strings to match, or arrays as seen above.
+ * @param array $options Allows to control all settings: separator, greedy, reset, default
+ * @return array
+ * @access public
+ * @static
+ */
+	function connectNamed($named, $options = array()) {
+		$self =& Router::getInstance();
+
+		if (isset($options['argSeparator'])) {
+			$self->named['separator'] = $options['argSeparator'];
+			unset($options['argSeparator']);
+		}
+
+		if ($named === true || $named === false) {
+			$options = array_merge(array('default' => $named, 'reset' => true, 'greedy' => $named), $options);
+			$named = array();
+		} else {
+			$options = array_merge(array('default' => false, 'reset' => false, 'greedy' => true), $options);
+		}
+
+		if ($options['reset'] == true || $self->named['rules'] === false) {
+			$self->named['rules'] = array();
+		}
+
+		if ($options['default']) {
+			$named = array_merge($named, $self->named['default']);
+		}
+
+		foreach ($named as $key => $val) {
+			if (is_numeric($key)) {
+				$self->named['rules'][$val] = true;
+			} else {
+				$self->named['rules'][$key] = $val;
+			}
+		}
+		$self->named['greedy'] = $options['greedy'];
+		return $self->named;
+	}
+
+/**
+ * Tell router to connect or not connect the default routes.
+ *
+ * If default routes are disabled all automatic route generation will be disabled
+ * and you will need to manually configure all the routes you want.
+ *
+ * @param boolean $connect Set to true or false depending on whether you want or don't want default routes.
+ * @return void
+ * @access public
+ * @static
+ */
+	function defaults($connect = true) {
+		$self =& Router::getInstance();
+		$self->__connectDefaults = $connect;
+	}
+
+/**
+ * Creates REST resource routes for the given controller(s)
+ *
+ * ### Options:
+ *
+ * - 'id' - The regular expression fragment to use when matching IDs.  By default, matches
+ *    integer values and UUIDs.
+ * - 'prefix' - URL prefix to use for the generated routes.  Defaults to '/'.
+ *
+ * @param mixed $controller A controller name or array of controller names (i.e. "Posts" or "ListItems")
+ * @param array $options Options to use when generating REST routes
+ * @return void
+ * @access public
+ * @static
+ */
+	function mapResources($controller, $options = array()) {
+		$self =& Router::getInstance();
+		$options = array_merge(array('prefix' => '/', 'id' => $self->__named['ID'] . '|' . $self->__named['UUID']), $options);
+		$prefix = $options['prefix'];
+
+		foreach ((array)$controller as $ctlName) {
+			$urlName = Inflector::underscore($ctlName);
+
+			foreach ($self->__resourceMap as $params) {
+				extract($params);
+				$url = $prefix . $urlName . (($id) ? '/:id' : '');
+
+				Router::connect($url,
+					array('controller' => $urlName, 'action' => $action, '[method]' => $params['method']),
+					array('id' => $options['id'], 'pass' => array('id'))
+				);
+			}
+			$self->__resourceMapped[] = $urlName;
+		}
+	}
+
+/**
+ * Returns the list of prefixes used in connected routes
+ *
+ * @return array A list of prefixes used in connected routes
+ * @access public
+ * @static
+ */
+	function prefixes() {
+		$self =& Router::getInstance();
+		return $self->__prefixes;
+	}
+
+/**
+ * Parses given URL and returns an array of controller, action and parameters
+ * taken from that URL.
+ *
+ * @param string $url URL to be parsed
+ * @return array Parsed elements from URL
+ * @access public
+ * @static
+ */
+	function parse($url) {
+		$self =& Router::getInstance();
+		if (!$self->__defaultsMapped && $self->__connectDefaults) {
+			$self->__connectDefaultRoutes();
+		}
+		$out = array(
+			'pass' => array(),
+			'named' => array(),
+		);
+		$r = $ext = null;
+
+		if (ini_get('magic_quotes_gpc') === '1') {
+			$url = stripslashes_deep($url);
+		}
+
+		if ($url && strpos($url, '/') !== 0) {
+			$url = '/' . $url;
+		}
+		if (strpos($url, '?') !== false) {
+			$url = substr($url, 0, strpos($url, '?'));
+		}
+		extract($self->__parseExtension($url));
+		for ($i = 0, $len = count($self->routes); $i < $len; $i++) {
+			$route =& $self->routes[$i];
+			if (($r = $route->parse($url)) !== false) {
+				$self->__currentRoute[] =& $route;
+
+				$params = $route->options;
+				$argOptions = array();
+
+				if (array_key_exists('named', $params)) {
+					$argOptions['named'] = $params['named'];
+					unset($params['named']);
+				}
+				if (array_key_exists('greedy', $params)) {
+					$argOptions['greedy'] = $params['greedy'];
+					unset($params['greedy']);
+				}
+				$out = $r;
+
+				if (isset($out['_args_'])) {
+					$argOptions['context'] = array('action' => $out['action'], 'controller' => $out['controller']);
+					$parsedArgs = $self->getArgs($out['_args_'], $argOptions);
+					$out['pass'] = array_merge($out['pass'], $parsedArgs['pass']);
+					$out['named'] = $parsedArgs['named'];
+					unset($out['_args_']);
+				}
+
+				if (isset($params['pass'])) {
+					$j = count($params['pass']);
+					while($j--) {
+						if (isset($out[$params['pass'][$j]])) {
+							array_unshift($out['pass'], $out[$params['pass'][$j]]);
+						}
+					}
+				}
+				break;
+			}
+		}
+
+		if (!empty($ext) && !isset($out['url']['ext'])) {
+			$out['url']['ext'] = $ext;
+		}
+		return $out;
+	}
+
+/**
+ * Parses a file extension out of a URL, if Router::parseExtensions() is enabled.
+ *
+ * @param string $url
+ * @return array Returns an array containing the altered URL and the parsed extension.
+ * @access private
+ */
+	function __parseExtension($url) {
+		$ext = null;
+
+		if ($this->__parseExtensions) {
+			if (preg_match('/\.[0-9a-zA-Z]*$/', $url, $match) === 1) {
+				$match = substr($match[0], 1);
+				if (empty($this->__validExtensions)) {
+					$url = substr($url, 0, strpos($url, '.' . $match));
+					$ext = $match;
+				} else {
+					foreach ($this->__validExtensions as $name) {
+						if (strcasecmp($name, $match) === 0) {
+							$url = substr($url, 0, strpos($url, '.' . $name));
+							$ext = $match;
+							break;
+						}
+					}
+				}
+			}
+			if (empty($ext)) {
+				$ext = 'html';
+			}
+		}
+		return compact('ext', 'url');
+	}
+
+/**
+ * Connects the default, built-in routes, including prefix and plugin routes. The following routes are created
+ * in the order below:
+ *
+ * For each of the Routing.prefixes the following routes are created. Routes containing `:plugin` are only
+ * created when your application has one or more plugins.
+ *
+ * - `/:prefix/:plugin` a plugin shortcut route.
+ * - `/:prefix/:plugin/:action/*` a plugin shortcut route.
+ * - `/:prefix/:plugin/:controller`
+ * - `/:prefix/:plugin/:controller/:action/*`
+ * - `/:prefix/:controller`
+ * - `/:prefix/:controller/:action/*`
+ *
+ * If plugins are found in your application the following routes are created:
+ *
+ * - `/:plugin` a plugin shortcut route.
+ * - `/:plugin/:action/*` a plugin shortcut route.
+ * - `/:plugin/:controller`
+ * - `/:plugin/:controller/:action/*`
+ *
+ * And lastly the following catch-all routes are connected.
+ *
+ * - `/:controller'
+ * - `/:controller/:action/*'
+ *
+ * You can disable the connection of default routes with Router::defaults().
+ *
+ * @return void
+ * @access private
+ */
+	function __connectDefaultRoutes() {
+		if ($plugins = App::objects('plugin')) {
+			foreach ($plugins as $key => $value) {
+				$plugins[$key] = Inflector::underscore($value);
+			}
+			$pluginPattern = implode('|', $plugins);
+			$match = array('plugin' => $pluginPattern);
+			$shortParams = array('routeClass' => 'PluginShortRoute', 'plugin' => $pluginPattern);
+
+			foreach ($this->__prefixes as $prefix) {
+				$params = array('prefix' => $prefix, $prefix => true);
+				$indexParams = $params + array('action' => 'index');
+				$this->connect("/{$prefix}/:plugin", $indexParams, $shortParams);
+				$this->connect("/{$prefix}/:plugin/:controller", $indexParams, $match);
+				$this->connect("/{$prefix}/:plugin/:controller/:action/*", $params, $match);
+			}
+			$this->connect('/:plugin', array('action' => 'index'), $shortParams);
+			$this->connect('/:plugin/:controller', array('action' => 'index'), $match);
+			$this->connect('/:plugin/:controller/:action/*', array(), $match);
+		}
+
+		foreach ($this->__prefixes as $prefix) {
+			$params = array('prefix' => $prefix, $prefix => true);
+			$indexParams = $params + array('action' => 'index');
+			$this->connect("/{$prefix}/:controller", $indexParams);
+			$this->connect("/{$prefix}/:controller/:action/*", $params);
+		}
+		$this->connect('/:controller', array('action' => 'index'));
+		$this->connect('/:controller/:action/*');
+
+		if ($this->named['rules'] === false) {
+			$this->connectNamed(true);
+		}
+		$this->__defaultsMapped = true;
+	}
+
+/**
+ * Takes parameter and path information back from the Dispatcher, sets these
+ * parameters as the current request parameters that are merged with url arrays 
+ * created later in the request.
+ *
+ * @param array $params Parameters and path information
+ * @return void
+ * @access public
+ * @static
+ */
+	function setRequestInfo($params) {
+		$self =& Router::getInstance();
+		$defaults = array('plugin' => null, 'controller' => null, 'action' => null);
+		$params[0] = array_merge($defaults, (array)$params[0]);
+		$params[1] = array_merge($defaults, (array)$params[1]);
+		list($self->__params[], $self->__paths[]) = $params;
+
+		if (count($self->__paths)) {
+			if (isset($self->__paths[0]['namedArgs'])) {
+				foreach ($self->__paths[0]['namedArgs'] as $arg => $value) {
+					$self->named['rules'][$arg] = true;
+				}
+			}
+		}
+	}
+
+/**
+ * Gets parameter information
+ *
+ * @param boolean $current Get current request parameter, useful when using requestAction
+ * @return array Parameter information
+ * @access public
+ * @static
+ */
+	function getParams($current = false) {
+		$self =& Router::getInstance();
+		if ($current) {
+			return $self->__params[count($self->__params) - 1];
+		}
+		if (isset($self->__params[0])) {
+			return $self->__params[0];
+		}
+		return array();
+	}
+
+/**
+ * Gets URL parameter by name
+ *
+ * @param string $name Parameter name
+ * @param boolean $current Current parameter, useful when using requestAction
+ * @return string Parameter value
+ * @access public
+ * @static
+ */
+	function getParam($name = 'controller', $current = false) {
+		$params = Router::getParams($current);
+		if (isset($params[$name])) {
+			return $params[$name];
+		}
+		return null;
+	}
+
+/**
+ * Gets path information
+ *
+ * @param boolean $current Current parameter, useful when using requestAction
+ * @return array
+ * @access public
+ * @static
+ */
+	function getPaths($current = false) {
+		$self =& Router::getInstance();
+		if ($current) {
+			return $self->__paths[count($self->__paths) - 1];
+		}
+		if (!isset($self->__paths[0])) {
+			return array('base' => null);
+		}
+		return $self->__paths[0];
+	}
+
+/**
+ * Reloads default Router settings.  Resets all class variables and 
+ * removes all connected routes.
+ *
+ * @access public
+ * @return void
+ * @static
+ */
+	function reload() {
+		$self =& Router::getInstance();
+		foreach (get_class_vars('Router') as $key => $val) {
+			$self->{$key} = $val;
+		}
+		$self->__setPrefixes();
+	}
+
+/**
+ * Promote a route (by default, the last one added) to the beginning of the list
+ *
+ * @param $which A zero-based array index representing the route to move. For example,
+ *    if 3 routes have been added, the last route would be 2.
+ * @return boolean Returns false if no route exists at the position specified by $which.
+ * @access public
+ * @static
+ */
+	function promote($which = null) {
+		$self =& Router::getInstance();
+		if ($which === null) {
+			$which = count($self->routes) - 1;
+		}
+		if (!isset($self->routes[$which])) {
+			return false;
+		}
+		$route =& $self->routes[$which];
+		unset($self->routes[$which]);
+		array_unshift($self->routes, $route);
+		return true;
+	}
+
+/**
+ * Finds URL for specified action.
+ *
+ * Returns an URL pointing to a combination of controller and action. Param
+ * $url can be:
+ *
+ * - Empty - the method will find address to actual controller/action.
+ * - '/' - the method will find base URL of application.
+ * - A combination of controller/action - the method will find url for it.
+ *
+ * There are a few 'special' parameters that can change the final URL string that is generated
+ * 
+ * - `base` - Set to false to remove the base path from the generated url. If your application
+ *   is not in the root directory, this can be used to generate urls that are 'cake relative'.
+ *   cake relative urls are required when using requestAction.
+ * - `?` - Takes an array of query string parameters
+ * - `#` - Allows you to set url hash fragments.
+ * - `full_base` - If true the `FULL_BASE_URL` constant will be prepended to generated urls.
+ *
+ * @param mixed $url Cake-relative URL, like "/products/edit/92" or "/presidents/elect/4"
+ *   or an array specifying any of the following: 'controller', 'action',
+ *   and/or 'plugin', in addition to named arguments (keyed array elements),
+ *   and standard URL arguments (indexed array elements)
+ * @param mixed $full If (bool) true, the full base URL will be prepended to the result.
+ *   If an array accepts the following keys
+ *    - escape - used when making urls embedded in html escapes query string '&'
+ *    - full - if true the full base URL will be prepended.
+ * @return string Full translated URL with base path.
+ * @access public
+ * @static
+ */
+	function url($url = null, $full = false) {
+		$self =& Router::getInstance();
+		$defaults = $params = array('plugin' => null, 'controller' => null, 'action' => 'index');
+
+		if (is_bool($full)) {
+			$escape = false;
+		} else {
+			extract($full + array('escape' => false, 'full' => false));
+		}
+
+		if (!empty($self->__params)) {
+			if (isset($this) && !isset($this->params['requested'])) {
+				$params = $self->__params[0];
+			} else {
+				$params = end($self->__params);
+			}
+		}
+		$path = array('base' => null);
+
+		if (!empty($self->__paths)) {
+			if (isset($this) && !isset($this->params['requested'])) {
+				$path = $self->__paths[0];
+			} else {
+				$path = end($self->__paths);
+			}
+		}
+		$base = $path['base'];
+		$extension = $output = $mapped = $q = $frag = null;
+
+		if (is_array($url)) {
+			if (isset($url['base']) && $url['base'] === false) {
+				$base = null;
+				unset($url['base']);
+			}
+			if (isset($url['full_base']) && $url['full_base'] === true) {
+				$full = true;
+				unset($url['full_base']);
+			}
+			if (isset($url['?'])) {
+				$q = $url['?'];
+				unset($url['?']);
+			}
+			if (isset($url['#'])) {
+				$frag = '#' . urlencode($url['#']);
+				unset($url['#']);
+			}
+			if (empty($url['action'])) {
+				if (empty($url['controller']) || $params['controller'] === $url['controller']) {
+					$url['action'] = $params['action'];
+				} else {
+					$url['action'] = 'index';
+				}
+			}
+
+			$prefixExists = (array_intersect_key($url, array_flip($self->__prefixes)));
+			foreach ($self->__prefixes as $prefix) {
+				if (!empty($params[$prefix]) && !$prefixExists) {
+					$url[$prefix] = true;
+				} elseif (isset($url[$prefix]) && !$url[$prefix]) {
+					unset($url[$prefix]);
+				}
+				if (isset($url[$prefix]) && strpos($url['action'], $prefix . '_') === 0) {
+					$url['action'] = substr($url['action'], strlen($prefix) + 1);
+				}
+			}
+
+			$url += array('controller' => $params['controller'], 'plugin' => $params['plugin']);
+
+			if (isset($url['ext'])) {
+				$extension = '.' . $url['ext'];
+				unset($url['ext']);
+			}
+			$match = false;
+
+			for ($i = 0, $len = count($self->routes); $i < $len; $i++) {
+				$originalUrl = $url;
+
+				if (isset($self->routes[$i]->options['persist'], $params)) {
+					$url = $self->routes[$i]->persistParams($url, $params);
+				}
+
+				if ($match = $self->routes[$i]->match($url)) {
+					$output = trim($match, '/');
+					break;
+				}
+				$url = $originalUrl;
+			}
+			if ($match === false) {
+				$output = $self->_handleNoRoute($url);
+			}
+			$output = str_replace('//', '/', $base . '/' . $output);
+		} else {
+			if (((strpos($url, '://')) || (strpos($url, 'javascript:') === 0) || (strpos($url, 'mailto:') === 0)) || (!strncmp($url, '#', 1))) {
+				return $url;
+			}
+			if (empty($url)) {
+				if (!isset($path['here'])) {
+					$path['here'] = '/';
+				}
+				$output = $path['here'];
+			} elseif (substr($url, 0, 1) === '/') {
+				$output = $base . $url;
+			} else {
+				$output = $base . '/';
+				foreach ($self->__prefixes as $prefix) {
+					if (isset($params[$prefix])) {
+						$output .= $prefix . '/';
+						break;
+					}
+				}
+				if (!empty($params['plugin']) && $params['plugin'] !== $params['controller']) {
+					$output .= Inflector::underscore($params['plugin']) . '/';
+				}
+				$output .= Inflector::underscore($params['controller']) . '/' . $url;
+			}
+			$output = str_replace('//', '/', $output);
+		}
+		if ($full && defined('FULL_BASE_URL')) {
+			$output = FULL_BASE_URL . $output;
+		}
+		if (!empty($extension) && substr($output, -1) === '/') {
+			$output = substr($output, 0, -1);
+		}
+
+		return $output . $extension . $self->queryString($q, array(), $escape) . $frag;
+	}
+
+/**
+ * A special fallback method that handles url arrays that cannot match
+ * any defined routes.
+ *
+ * @param array $url A url that didn't match any routes
+ * @return string A generated url for the array
+ * @access protected
+ * @see Router::url()
+ */
+	function _handleNoRoute($url) {
+		$named = $args = array();
+		$skip = array_merge(
+			array('bare', 'action', 'controller', 'plugin', 'prefix'),
+			$this->__prefixes
+		);
+
+		$keys = array_values(array_diff(array_keys($url), $skip));
+		$count = count($keys);
+
+		// Remove this once parsed URL parameters can be inserted into 'pass'
+		for ($i = 0; $i < $count; $i++) {
+			if (is_numeric($keys[$i])) {
+				$args[] = $url[$keys[$i]];
+			} else {
+				$named[$keys[$i]] = $url[$keys[$i]];
+			}
+		}
+
+		list($args, $named) = array(Set::filter($args, true), Set::filter($named, true));
+		foreach ($this->__prefixes as $prefix) {
+			if (!empty($url[$prefix])) {
+				$url['action'] = str_replace($prefix . '_', '', $url['action']);
+				break;
+			}
+		}
+
+		if (empty($named) && empty($args) && (!isset($url['action']) || $url['action'] === 'index')) {
+			$url['action'] = null;
+		}
+
+		$urlOut = array_filter(array($url['controller'], $url['action']));
+
+		if (isset($url['plugin'])) {
+			array_unshift($urlOut, $url['plugin']);
+		}
+
+		foreach ($this->__prefixes as $prefix) {
+			if (isset($url[$prefix])) {
+				array_unshift($urlOut, $prefix);
+				break;
+			}
+		}
+		$output = implode('/', $urlOut);
+
+		if (!empty($args)) {
+			$output .= '/' . implode('/', $args);
+		}
+
+		if (!empty($named)) {
+			foreach ($named as $name => $value) {
+				$output .= '/' . $name . $this->named['separator'] . $value;
+			}
+		}
+		return $output;
+	}
+
+/**
+ * Takes an array of URL parameters and separates the ones that can be used as named arguments
+ *
+ * @param array $params Associative array of URL parameters.
+ * @param string $controller Name of controller being routed.  Used in scoping.
+ * @param string $action Name of action being routed.  Used in scoping.
+ * @return array
+ * @access public
+ * @static
+ */
+	function getNamedElements($params, $controller = null, $action = null) {
+		$self =& Router::getInstance();
+		$named = array();
+
+		foreach ($params as $param => $val) {
+			if (isset($self->named['rules'][$param])) {
+				$rule = $self->named['rules'][$param];
+				if (Router::matchNamed($param, $val, $rule, compact('controller', 'action'))) {
+					$named[$param] = $val;
+					unset($params[$param]);
+				}
+			}
+		}
+		return array($named, $params);
+	}
+
+/**
+ * Return true if a given named $param's $val matches a given $rule depending on $context. Currently implemented
+ * rule types are controller, action and match that can be combined with each other.
+ *
+ * @param string $param The name of the named parameter
+ * @param string $val The value of the named parameter
+ * @param array $rule The rule(s) to apply, can also be a match string
+ * @param string $context An array with additional context information (controller / action)
+ * @return boolean
+ * @access public
+ * @static
+ */
+	function matchNamed($param, $val, $rule, $context = array()) {
+		if ($rule === true || $rule === false) {
+			return $rule;
+		}
+		if (is_string($rule)) {
+			$rule = array('match' => $rule);
+		}
+		if (!is_array($rule)) {
+			return false;
+		}
+
+		$controllerMatches = !isset($rule['controller'], $context['controller']) || in_array($context['controller'], (array)$rule['controller']);
+		if (!$controllerMatches) {
+			return false;
+		}
+		$actionMatches = !isset($rule['action'], $context['action']) || in_array($context['action'], (array)$rule['action']);
+		if (!$actionMatches) {
+			return false;
+		}
+		return (!isset($rule['match']) || preg_match('/' . $rule['match'] . '/', $val));
+	}
+
+/**
+ * Generates a well-formed querystring from $q
+ *
+ * @param mixed $q Query string
+ * @param array $extra Extra querystring parameters.
+ * @param bool $escape Whether or not to use escaped &
+ * @return array
+ * @access public
+ * @static
+ */
+	function queryString($q, $extra = array(), $escape = false) {
+		if (empty($q) && empty($extra)) {
+			return null;
+		}
+		$join = '&';
+		if ($escape === true) {
+			$join = '&amp;';
+		}
+		$out = '';
+
+		if (is_array($q)) {
+			$q = array_merge($extra, $q);
+		} else {
+			$out = $q;
+			$q = $extra;
+		}
+		$out .= http_build_query($q, null, $join);
+		if (isset($out[0]) && $out[0] != '?') {
+			$out = '?' . $out;
+		}
+		return $out;
+	}
+
+/**
+ * Reverses a parsed parameter array into a string. Works similarly to Router::url(), but
+ * Since parsed URL's contain additional 'pass' and 'named' as well as 'url.url' keys.
+ * Those keys need to be specially handled in order to reverse a params array into a string url.
+ *
+ * This will strip out 'autoRender', 'bare', 'requested', and 'return' param names as those
+ * are used for CakePHP internals and should not normally be part of an output url.
+ *
+ * @param array $param The params array that needs to be reversed.
+ * @return string The string that is the reversed result of the array
+ * @access public
+ * @static
+ */
+	function reverse($params) {
+		$pass = $params['pass'];
+		$named = $params['named'];
+		$url = $params['url'];
+		unset(
+			$params['pass'], $params['named'], $params['paging'], $params['models'], $params['url'], $url['url'],
+			$params['autoRender'], $params['bare'], $params['requested'], $params['return']
+		);
+		$params = array_merge($params, $pass, $named);
+		if (!empty($url)) {
+			$params['?'] = $url;
+		}
+		return Router::url($params);
+	}
+
+/**
+ * Normalizes a URL for purposes of comparison.  Will strip the base path off
+ * and replace any double /'s.  It will not unify the casing and underscoring
+ * of the input value.
+ *
+ * @param mixed $url URL to normalize Either an array or a string url.
+ * @return string Normalized URL
+ * @access public
+ * @static
+ */
+	function normalize($url = '/') {
+		if (is_array($url)) {
+			$url = Router::url($url);
+		} elseif (preg_match('/^[a-z\-]+:\/\//', $url)) {
+			return $url;
+		}
+		$paths = Router::getPaths();
+
+		if (!empty($paths['base']) && stristr($url, $paths['base'])) {
+			$url = preg_replace('/^' . preg_quote($paths['base'], '/') . '/', '', $url, 1);
+		}
+		$url = '/' . $url;
+
+		while (strpos($url, '//') !== false) {
+			$url = str_replace('//', '/', $url);
+		}
+		$url = preg_replace('/(?:(\/$))/', '', $url);
+
+		if (empty($url)) {
+			return '/';
+		}
+		return $url;
+	}
+
+/**
+ * Returns the route matching the current request URL.
+ *
+ * @return CakeRoute Matching route object.
+ * @access public
+ * @static
+ */
+	function &requestRoute() {
+		$self =& Router::getInstance();
+		return $self->__currentRoute[0];
+	}
+
+/**
+ * Returns the route matching the current request (useful for requestAction traces)
+ *
+ * @return CakeRoute Matching route object.
+ * @access public
+ * @static
+ */
+	function &currentRoute() {
+		$self =& Router::getInstance();
+		return $self->__currentRoute[count($self->__currentRoute) - 1];
+	}
+
+/**
+ * Removes the plugin name from the base URL.
+ *
+ * @param string $base Base URL
+ * @param string $plugin Plugin name
+ * @return base url with plugin name removed if present
+ * @access public
+ * @static
+ */
+	function stripPlugin($base, $plugin = null) {
+		if ($plugin != null) {
+			$base = preg_replace('/(?:' . $plugin . ')/', '', $base);
+			$base = str_replace('//', '', $base);
+			$pos1 = strrpos($base, '/');
+			$char = strlen($base) - 1;
+
+			if ($pos1 === $char) {
+				$base = substr($base, 0, $char);
+			}
+		}
+		return $base;
+	}
+
+/**
+ * Instructs the router to parse out file extensions from the URL. For example,
+ * http://example.com/posts.rss would yield an file extension of "rss".
+ * The file extension itself is made available in the controller as
+ * $this->params['url']['ext'], and is used by the RequestHandler component to
+ * automatically switch to alternate layouts and templates, and load helpers
+ * corresponding to the given content, i.e. RssHelper.
+ *
+ * A list of valid extension can be passed to this method, i.e. Router::parseExtensions('rss', 'xml');
+ * If no parameters are given, anything after the first . (dot) after the last / in the URL will be
+ * parsed, excluding querystring parameters (i.e. ?q=...).
+ *
+ * @access public
+ * @return void
+ * @static
+ */
+	function parseExtensions() {
+		$self =& Router::getInstance();
+		$self->__parseExtensions = true;
+		if (func_num_args() > 0) {
+			$self->__validExtensions = func_get_args();
+		}
+	}
+
+/**
+ * Takes a passed params and converts it to args
+ *
+ * @param array $params
+ * @return array Array containing passed and named parameters
+ * @access public
+ * @static
+ */
+	function getArgs($args, $options = array()) {
+		$self =& Router::getInstance();
+		$pass = $named = array();
+		$args = explode('/', $args);
+
+		$greedy = isset($options['greedy']) ? $options['greedy'] : $self->named['greedy'];
+		$context = array();
+		if (isset($options['context'])) {
+			$context = $options['context'];
+		}
+		$rules = $self->named['rules'];
+		if (isset($options['named'])) {
+			$greedy = isset($options['greedy']) && $options['greedy'] === true;
+			foreach ((array)$options['named'] as $key => $val) {
+				if (is_numeric($key)) {
+					$rules[$val] = true;
+					continue;
+				}
+				$rules[$key] = $val;
+			}
+		}
+
+		foreach ($args as $param) {
+			if (empty($param) && $param !== '0' && $param !== 0) {
+				continue;
+			}
+
+			$separatorIsPresent = strpos($param, $self->named['separator']) !== false;
+			if ((!isset($options['named']) || !empty($options['named'])) && $separatorIsPresent) {
+				list($key, $val) = explode($self->named['separator'], $param, 2);
+				$hasRule = isset($rules[$key]);
+				$passIt = (!$hasRule && !$greedy) || ($hasRule && !$self->matchNamed($key, $val, $rules[$key], $context));
+				if ($passIt) {
+					$pass[] = $param;
+				} else {
+					$named[$key] = $val;
+				}
+			} else {
+				$pass[] = $param;
+			}
+		}
+		return compact('pass', 'named');
+	}
+}
+
+/**
+ * A single Route used by the Router to connect requests to
+ * parameter maps.
+ *
+ * Not normally created as a standalone.  Use Router::connect() to create
+ * Routes for your application.
+ *
+ * @package cake.libs
+ * @since 1.3.0
+ * @see Router::connect()
+ */
+class CakeRoute {
+
+/**
+ * An array of named segments in a Route.
+ * `/:controller/:action/:id` has 3 key elements
+ *
+ * @var array
+ * @access public
+ */
+	var $keys = array();
+
+/**
+ * An array of additional parameters for the Route.
+ *
+ * @var array
+ * @access public
+ */
+	var $options = array();
+
+/**
+ * Default parameters for a Route
+ *
+ * @var array
+ * @access public
+ */
+	var $defaults = array();
+
+/**
+ * The routes template string.
+ *
+ * @var string
+ * @access public
+ */
+	var $template = null;
+
+/**
+ * Is this route a greedy route?  Greedy routes have a `/*` in their
+ * template
+ *
+ * @var string
+ * @access protected
+ */
+	var $_greedy = false;
+
+/**
+ * The compiled route regular expresssion
+ *
+ * @var string
+ * @access protected
+ */
+	var $_compiledRoute = null;
+
+/**
+ * HTTP header shortcut map.  Used for evaluating header-based route expressions.
+ *
+ * @var array
+ * @access private
+ */
+	var $__headerMap = array(
+		'type' => 'content_type',
+		'method' => 'request_method',
+		'server' => 'server_name'
+	);
+
+/**
+ * Constructor for a Route
+ *
+ * @param string $template Template string with parameter placeholders
+ * @param array $defaults Array of defaults for the route.
+ * @param string $params Array of parameters and additional options for the Route
+ * @return void
+ * @access public
+ */
+	function CakeRoute($template, $defaults = array(), $options = array()) {
+		$this->template = $template;
+		$this->defaults = (array)$defaults;
+		$this->options = (array)$options;
+	}
+
+/**
+ * Check if a Route has been compiled into a regular expression.
+ *
+ * @return boolean
+ * @access public
+ */
+	function compiled() {
+		return !empty($this->_compiledRoute);
+	}
+
+/**
+ * Compiles the route's regular expression.  Modifies defaults property so all necessary keys are set
+ * and populates $this->names with the named routing elements.
+ *
+ * @return array Returns a string regular expression of the compiled route.
+ * @access public
+ */
+	function compile() {
+		if ($this->compiled()) {
+			return $this->_compiledRoute;
+		}
+		$this->_writeRoute();
+		return $this->_compiledRoute;
+	}
+
+/**
+ * Builds a route regular expression.  Uses the template, defaults and options
+ * properties to compile a regular expression that can be used to parse request strings.
+ *
+ * @return void
+ * @access protected
+ */
+	function _writeRoute() {
+		if (empty($this->template) || ($this->template === '/')) {
+			$this->_compiledRoute = '#^/*$#';
+			$this->keys = array();
+			return;
+		}
+		$route = $this->template;
+		$names = $routeParams = array();
+		$parsed = preg_quote($this->template, '#');
+		$parsed = str_replace('\\-', '-', $parsed);
+
+		preg_match_all('#:([A-Za-z0-9_-]+[A-Z0-9a-z])#', $parsed, $namedElements);
+		foreach ($namedElements[1] as $i => $name) {
+			$search = '\\' . $namedElements[0][$i];
+			if (isset($this->options[$name])) {
+				$option = null;
+				if ($name !== 'plugin' && array_key_exists($name, $this->defaults)) {
+					$option = '?';
+				}
+				$slashParam = '/\\' . $namedElements[0][$i];
+				if (strpos($parsed, $slashParam) !== false) {
+					$routeParams[$slashParam] = '(?:/(' . $this->options[$name] . ')' . $option . ')' . $option;
+				} else {
+					$routeParams[$search] = '(?:(' . $this->options[$name] . ')' . $option . ')' . $option;
+				}
+			} else {
+				$routeParams[$search] = '(?:([^/]+))';
+			}
+			$names[] = $name;
+		}
+		if (preg_match('#\/\*$#', $route, $m)) {
+			$parsed = preg_replace('#/\\\\\*$#', '(?:/(?P<_args_>.*))?', $parsed);
+			$this->_greedy = true;
+		}
+		krsort($routeParams);
+		$parsed = str_replace(array_keys($routeParams), array_values($routeParams), $parsed);
+		$this->_compiledRoute = '#^' . $parsed . '[/]*$#';
+		$this->keys = $names;
+	}
+
+/**
+ * Checks to see if the given URL can be parsed by this route.
+ * If the route can be parsed an array of parameters will be returned; if not,
+ * false will be returned. String urls are parsed if they match a routes regular expression.
+ *
+ * @param string $url The url to attempt to parse.
+ * @return mixed Boolean false on failure, otherwise an array or parameters
+ * @access public
+ */
+	function parse($url) {
+		if (!$this->compiled()) {
+			$this->compile();
+		}
+		if (!preg_match($this->_compiledRoute, $url, $parsed)) {
+			return false;
+		} else {
+			foreach ($this->defaults as $key => $val) {
+				if ($key[0] === '[' && preg_match('/^\[(\w+)\]$/', $key, $header)) {
+					if (isset($this->__headerMap[$header[1]])) {
+						$header = $this->__headerMap[$header[1]];
+					} else {
+						$header = 'http_' . $header[1];
+					}
+
+					$val = (array)$val;
+					$h = false;
+
+					foreach ($val as $v) {
+						if (env(strtoupper($header)) === $v) {
+							$h = true;
+						}
+					}
+					if (!$h) {
+						return false;
+					}
+				}
+			}
+			array_shift($parsed);
+			$route = array();
+			foreach ($this->keys as $i => $key) {
+				if (isset($parsed[$i])) {
+					$route[$key] = $parsed[$i];
+				}
+			}
+			$route['pass'] = $route['named'] = array();
+			$route += $this->defaults;
+			if (isset($parsed['_args_'])) {
+				$route['_args_'] = $parsed['_args_'];
+			}
+			foreach ($route as $key => $value) {
+				if (is_integer($key)) {
+					$route['pass'][] = $value;
+					unset($route[$key]);
+				}
+			}
+			return $route;
+		}
+	}
+
+/**
+ * Apply persistent parameters to a url array. Persistant parameters are a special 
+ * key used during route creation to force route parameters to persist when omitted from 
+ * a url array.
+ *
+ * @param array $url The array to apply persistent parameters to.
+ * @param array $params An array of persistent values to replace persistent ones.
+ * @return array An array with persistent parameters applied.
+ * @access public
+ */
+	function persistParams($url, $params) {
+		foreach ($this->options['persist'] as $persistKey) {
+			if (array_key_exists($persistKey, $params) && !isset($url[$persistKey])) {
+				$url[$persistKey] = $params[$persistKey];
+			}
+		}
+		return $url;
+	}
+
+/**
+ * Attempt to match a url array.  If the url matches the route parameters and settings, then
+ * return a generated string url.  If the url doesn't match the route parameters, false will be returned.
+ * This method handles the reverse routing or conversion of url arrays into string urls.
+ *
+ * @param array $url An array of parameters to check matching with.
+ * @return mixed Either a string url for the parameters if they match or false.
+ * @access public
+ */
+	function match($url) {
+		if (!$this->compiled()) {
+			$this->compile();
+		}
+		$defaults = $this->defaults;
+
+		if (isset($defaults['prefix'])) {
+			$url['prefix'] = $defaults['prefix'];
+		}
+
+		//check that all the key names are in the url
+		$keyNames = array_flip($this->keys);
+		if (array_intersect_key($keyNames, $url) != $keyNames) {
+			return false;
+		}
+
+		$diffUnfiltered = Set::diff($url, $defaults);
+		$diff = array();
+
+		foreach ($diffUnfiltered as $key => $var) {
+			if ($var === 0 || $var === '0' || !empty($var)) {
+				$diff[$key] = $var;
+			}
+		}
+
+		//if a not a greedy route, no extra params are allowed.
+		if (!$this->_greedy && array_diff_key($diff, $keyNames) != array()) {
+			return false;
+		}
+
+		//remove defaults that are also keys. They can cause match failures
+		foreach ($this->keys as $key) {
+			unset($defaults[$key]);
+		}
+		$filteredDefaults = array_filter($defaults);
+
+		//if the difference between the url diff and defaults contains keys from defaults its not a match
+		if (array_intersect_key($filteredDefaults, $diffUnfiltered) !== array()) {
+			return false;
+		}
+
+		$passedArgsAndParams = array_diff_key($diff, $filteredDefaults, $keyNames);
+		list($named, $params) = Router::getNamedElements($passedArgsAndParams, $url['controller'], $url['action']);
+
+		//remove any pass params, they have numeric indexes, skip any params that are in the defaults
+		$pass = array();
+		$i = 0;
+		while (isset($url[$i])) {
+			if (!isset($diff[$i])) {
+				$i++;
+				continue;
+			}
+			$pass[] = $url[$i];
+			unset($url[$i], $params[$i]);
+			$i++;
+		}
+
+		//still some left over parameters that weren't named or passed args, bail.
+		if (!empty($params)) {
+			return false;
+		}
+
+		//check patterns for routed params
+		if (!empty($this->options)) {
+			foreach ($this->options as $key => $pattern) {
+				if (array_key_exists($key, $url) && !preg_match('#^' . $pattern . '$#', $url[$key])) {
+					return false;
+				}
+			}
+		}
+		return $this->_writeUrl(array_merge($url, compact('pass', 'named')));
+	}
+
+/**
+ * Converts a matching route array into a url string. Composes the string url using the template
+ * used to create the route.
+ *
+ * @param array $params The params to convert to a string url.
+ * @return string Composed route string.
+ * @access protected
+ */
+	function _writeUrl($params) {
+		if (isset($params['prefix'], $params['action'])) {
+			$params['action'] = str_replace($params['prefix'] . '_', '', $params['action']);
+			unset($params['prefix']);
+		}
+
+		if (is_array($params['pass'])) {
+			$params['pass'] = implode('/', $params['pass']);
+		}
+
+		$instance =& Router::getInstance();
+		$separator = $instance->named['separator'];
+
+		if (!empty($params['named']) && is_array($params['named'])) {
+			$named = array();
+			foreach ($params['named'] as $key => $value) {
+				$named[] = $key . $separator . $value;
+			}
+			$params['pass'] = $params['pass'] . '/' . implode('/', $named);
+		}
+		$out = $this->template;
+
+		$search = $replace = array();
+		foreach ($this->keys as $key) {
+			$string = null;
+			if (isset($params[$key])) {
+				$string = $params[$key];
+			} elseif (strpos($out, $key) != strlen($out) - strlen($key)) {
+				$key .= '/';
+			}
+			$search[] = ':' . $key;
+			$replace[] = $string;
+		}
+		$out = str_replace($search, $replace, $out);
+
+		if (strpos($this->template, '*')) {
+			$out = str_replace('*', $params['pass'], $out);
+		}
+		$out = str_replace('//', '/', $out);
+		return $out;
+	}
+}
+
+/**
+ * Plugin short route, that copies the plugin param to the controller parameters
+ * It is used for supporting /:plugin routes.
+ *
+ * @package cake.libs
+ */
+class PluginShortRoute extends CakeRoute {
+
+/**
+ * Parses a string url into an array.  If a plugin key is found, it will be copied to the 
+ * controller parameter
+ *
+ * @param string $url The url to parse
+ * @return mixed false on failure, or an array of request parameters
+ */
+	function parse($url) {
+		$params = parent::parse($url);
+		if (!$params) {
+			return false;
+		}
+		$params['controller'] = $params['plugin'];
+		return $params;
+	}
+
+/**
+ * Reverse route plugin shortcut urls.  If the plugin and controller
+ * are not the same the match is an auto fail.
+ *
+ * @param array $url Array of parameters to convert to a string.
+ * @return mixed either false or a string url.
+ */
+	function match($url) {
+		if (isset($url['controller']) && isset($url['plugin']) && $url['plugin'] != $url['controller']) {
+			return false;
+		}
+		$this->defaults['controller'] = $url['controller'];
+		$result = parent::match($url);
+		unset($this->defaults['controller']);
+		return $result;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/sanitize.php b/code/ryzom/tools/server/www/webtt/cake/libs/sanitize.php
new file mode 100644
index 000000000..3878ac512
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/sanitize.php
@@ -0,0 +1,348 @@
+<?php
+/**
+ * Washes strings from unwanted noise.
+ *
+ * Helpful methods to make unsafe strings usable.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Data Sanitization.
+ *
+ * Removal of alpahnumeric characters, SQL-safe slash-added strings, HTML-friendly strings,
+ * and all of the above on arrays.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Sanitize {
+
+/**
+ * Removes any non-alphanumeric characters.
+ *
+ * @param string $string String to sanitize
+ * @param array $allowed An array of additional characters that are not to be removed.
+ * @return string Sanitized string
+ * @access public
+ * @static
+ */
+	function paranoid($string, $allowed = array()) {
+		$allow = null;
+		if (!empty($allowed)) {
+			foreach ($allowed as $value) {
+				$allow .= "\\$value";
+			}
+		}
+
+		if (is_array($string)) {
+			$cleaned = array();
+			foreach ($string as $key => $clean) {
+				$cleaned[$key] = preg_replace("/[^{$allow}a-zA-Z0-9]/", '', $clean);
+			}
+		} else {
+			$cleaned = preg_replace("/[^{$allow}a-zA-Z0-9]/", '', $string);
+		}
+		return $cleaned;
+	}
+
+/**
+ * Makes a string SQL-safe.
+ *
+ * @param string $string String to sanitize
+ * @param string $connection Database connection being used
+ * @return string SQL safe string
+ * @access public
+ * @static
+ */
+	function escape($string, $connection = 'default') {
+		$db =& ConnectionManager::getDataSource($connection);
+		if (is_numeric($string) || $string === null || is_bool($string)) {
+			return $string;
+		}
+		$string = substr($db->value($string), 1);
+		$string = substr($string, 0, -1);
+		return $string;
+	}
+
+/**
+ * Returns given string safe for display as HTML. Renders entities.
+ *
+ * strip_tags() does not validating HTML syntax or structure, so it might strip whole passages
+ * with broken HTML.
+ *
+ * ### Options:
+ *
+ * - remove (boolean) if true strips all HTML tags before encoding
+ * - charset (string) the charset used to encode the string
+ * - quotes (int) see http://php.net/manual/en/function.htmlentities.php
+ *
+ * @param string $string String from where to strip tags
+ * @param array $options Array of options to use.
+ * @return string Sanitized string
+ * @access public
+ * @static
+ */
+	function html($string, $options = array()) {
+		static $defaultCharset = false;
+		if ($defaultCharset === false) {
+			$defaultCharset = Configure::read('App.encoding');
+			if ($defaultCharset === null) {
+				$defaultCharset = 'UTF-8';
+			}
+		}
+		$default = array(
+			'remove' => false,
+			'charset' => $defaultCharset,
+			'quotes' => ENT_QUOTES
+		);
+
+		$options = array_merge($default, $options);
+
+		if ($options['remove']) {
+			$string = strip_tags($string);
+		}
+
+		return htmlentities($string, $options['quotes'], $options['charset']);
+	}
+
+/**
+ * Strips extra whitespace from output
+ *
+ * @param string $str String to sanitize
+ * @return string whitespace sanitized string
+ * @access public
+ * @static
+ */
+	function stripWhitespace($str) {
+		$r = preg_replace('/[\n\r\t]+/', '', $str);
+		return preg_replace('/\s{2,}/', ' ', $r);
+	}
+
+/**
+ * Strips image tags from output
+ *
+ * @param string $str String to sanitize
+ * @return string Sting with images stripped.
+ * @access public
+ * @static
+ */
+	function stripImages($str) {
+		$str = preg_replace('/(<a[^>]*>)(<img[^>]+alt=")([^"]*)("[^>]*>)(<\/a>)/i', '$1$3$5<br />', $str);
+		$str = preg_replace('/(<img[^>]+alt=")([^"]*)("[^>]*>)/i', '$2<br />', $str);
+		$str = preg_replace('/<img[^>]*>/i', '', $str);
+		return $str;
+	}
+
+/**
+ * Strips scripts and stylesheets from output
+ *
+ * @param string $str String to sanitize
+ * @return string String with <script>, <style>, <link> elements removed.
+ * @access public
+ * @static
+ */
+	function stripScripts($str) {
+		return preg_replace('/(<link[^>]+rel="[^"]*stylesheet"[^>]*>|<img[^>]*>|style="[^"]*")|<script[^>]*>.*?<\/script>|<style[^>]*>.*?<\/style>|<!--.*?-->/is', '', $str);
+	}
+
+/**
+ * Strips extra whitespace, images, scripts and stylesheets from output
+ *
+ * @param string $str String to sanitize
+ * @return string sanitized string
+ * @access public
+ */
+	function stripAll($str) {
+		$str = Sanitize::stripWhitespace($str);
+		$str = Sanitize::stripImages($str);
+		$str = Sanitize::stripScripts($str);
+		return $str;
+	}
+
+/**
+ * Strips the specified tags from output. First parameter is string from
+ * where to remove tags. All subsequent parameters are tags.
+ *
+ * Ex.`$clean = Sanitize::stripTags($dirty, 'b', 'p', 'div');`
+ *
+ * Will remove all `<b>`, `<p>`, and `<div>` tags from the $dirty string.
+ *
+ * @param string $str String to sanitize
+ * @param string $tag Tag to remove (add more parameters as needed)
+ * @return string sanitized String
+ * @access public
+ * @static
+ */
+	function stripTags() {
+		$params = params(func_get_args());
+		$str = $params[0];
+
+		for ($i = 1, $count = count($params); $i < $count; $i++) {
+			$str = preg_replace('/<' . $params[$i] . '\b[^>]*>/i', '', $str);
+			$str = preg_replace('/<\/' . $params[$i] . '[^>]*>/i', '', $str);
+		}
+		return $str;
+	}
+
+/**
+ * Sanitizes given array or value for safe input. Use the options to specify
+ * the connection to use, and what filters should be applied (with a boolean
+ * value). Valid filters:
+ *
+ * - odd_spaces - removes any non space whitespace characters
+ * - encode - Encode any html entities. Encode must be true for the `remove_html` to work.
+ * - dollar - Escape `$` with `\$`
+ * - carriage - Remove `\r`
+ * - unicode -
+ * - escape - Should the string be SQL escaped.
+ * - backslash -
+ * - remove_html - Strip HTML with strip_tags. `encode` must be true for this option to work.
+ *
+ * @param mixed $data Data to sanitize
+ * @param mixed $options If string, DB connection being used, otherwise set of options
+ * @return mixed Sanitized data
+ * @access public
+ * @static
+ */
+	function clean($data, $options = array()) {
+		if (empty($data)) {
+			return $data;
+		}
+
+		if (is_string($options)) {
+			$options = array('connection' => $options);
+		} else if (!is_array($options)) {
+			$options = array();
+		}
+
+		$options = array_merge(array(
+			'connection' => 'default',
+			'odd_spaces' => true,
+			'remove_html' => false,
+			'encode' => true,
+			'dollar' => true,
+			'carriage' => true,
+			'unicode' => true,
+			'escape' => true,
+			'backslash' => true
+		), $options);
+
+		if (is_array($data)) {
+			foreach ($data as $key => $val) {
+				$data[$key] = Sanitize::clean($val, $options);
+			}
+			return $data;
+		} else {
+			if ($options['odd_spaces']) {
+				$data = str_replace(chr(0xCA), '', str_replace(' ', ' ', $data));
+			}
+			if ($options['encode']) {
+				$data = Sanitize::html($data, array('remove' => $options['remove_html']));
+			}
+			if ($options['dollar']) {
+				$data = str_replace("\\\$", "$", $data);
+			}
+			if ($options['carriage']) {
+				$data = str_replace("\r", "", $data);
+			}
+
+			$data = str_replace("'", "'", str_replace("!", "!", $data));
+
+			if ($options['unicode']) {
+				$data = preg_replace("/&amp;#([0-9]+);/s", "&#\\1;", $data);
+			}
+			if ($options['escape']) {
+				$data = Sanitize::escape($data, $options['connection']);
+			}
+			if ($options['backslash']) {
+				$data = preg_replace("/\\\(?!&amp;#|\?#)/", "\\", $data);
+			}
+			return $data;
+		}
+	}
+
+/**
+ * Formats column data from definition in DBO's $columns array
+ *
+ * @param Model $model The model containing the data to be formatted
+ * @access public
+ * @static
+ */
+	function formatColumns(&$model) {
+		foreach ($model->data as $name => $values) {
+			if ($name == $model->alias) {
+				$curModel =& $model;
+			} elseif (isset($model->{$name}) && is_object($model->{$name}) && is_subclass_of($model->{$name}, 'Model')) {
+				$curModel =& $model->{$name};
+			} else {
+				$curModel = null;
+			}
+
+			if ($curModel != null) {
+				foreach ($values as $column => $data) {
+					$colType = $curModel->getColumnType($column);
+
+					if ($colType != null) {
+						$db =& ConnectionManager::getDataSource($curModel->useDbConfig);
+						$colData = $db->columns[$colType];
+
+						if (isset($colData['limit']) && strlen(strval($data)) > $colData['limit']) {
+							$data = substr(strval($data), 0, $colData['limit']);
+						}
+
+						if (isset($colData['formatter']) || isset($colData['format'])) {
+
+							switch (strtolower($colData['formatter'])) {
+								case 'date':
+									$data = date($colData['format'], strtotime($data));
+								break;
+								case 'sprintf':
+									$data = sprintf($colData['format'], $data);
+								break;
+								case 'intval':
+									$data = intval($data);
+								break;
+								case 'floatval':
+									$data = floatval($data);
+								break;
+							}
+						}
+						$model->data[$name][$column]=$data;
+						/*
+						switch ($colType) {
+							case 'integer':
+							case 'int':
+								return  $data;
+							break;
+							case 'string':
+							case 'text':
+							case 'binary':
+							case 'date':
+							case 'time':
+							case 'datetime':
+							case 'timestamp':
+							case 'date':
+								return "'" . $data . "'";
+							break;
+						}
+						*/
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/security.php b/code/ryzom/tools/server/www/webtt/cake/libs/security.php
new file mode 100644
index 000000000..4020b83ac
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/security.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Core Security
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v .0.10.0.1233
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Security Library contains utility methods related to security
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Security extends Object {
+
+/**
+ * Default hash method
+ *
+ * @var string
+ * @access public
+ */
+	var $hashType = null;
+
+/**
+ * Singleton implementation to get object instance.
+ *
+ * @return object
+ * @access public
+ * @static
+ */
+	function &getInstance() {
+		static $instance = array();
+		if (!$instance) {
+			$instance[0] =& new Security;
+		}
+		return $instance[0];
+	}
+
+/**
+ * Get allowed minutes of inactivity based on security level.
+ *
+ * @return integer Allowed inactivity in minutes
+ * @access public
+ * @static
+ */
+	function inactiveMins() {
+		switch (Configure::read('Security.level')) {
+			case 'high':
+				return 10;
+			break;
+			case 'medium':
+				return 100;
+			break;
+			case 'low':
+			default:
+				return 300;
+				break;
+		}
+	}
+
+/**
+ * Generate authorization hash.
+ *
+ * @return string Hash
+ * @access public
+ * @static
+ */
+	function generateAuthKey() {
+		if (!class_exists('String')) {
+			App::import('Core', 'String');
+		}
+		return Security::hash(String::uuid());
+	}
+
+/**
+ * Validate authorization hash.
+ *
+ * @param string $authKey Authorization hash
+ * @return boolean Success
+ * @access public
+ * @static
+ * @todo Complete implementation
+ */
+	function validateAuthKey($authKey) {
+		return true;
+	}
+
+/**
+ * Create a hash from string using given method.
+ * Fallback on next available method.
+ *
+ * @param string $string String to hash
+ * @param string $type Method to use (sha1/sha256/md5)
+ * @param boolean $salt If true, automatically appends the application's salt
+ *     value to $string (Security.salt)
+ * @return string Hash
+ * @access public
+ * @static
+ */
+	function hash($string, $type = null, $salt = false) {
+		$_this =& Security::getInstance();
+
+		if ($salt) {
+			if (is_string($salt)) {
+				$string = $salt . $string;
+			} else {
+				$string = Configure::read('Security.salt') . $string;
+			}
+		}
+
+		if (empty($type)) {
+			$type = $_this->hashType;
+		}
+		$type = strtolower($type);
+
+		if ($type == 'sha1' || $type == null) {
+			if (function_exists('sha1')) {
+				$return = sha1($string);
+				return $return;
+			}
+			$type = 'sha256';
+		}
+
+		if ($type == 'sha256' && function_exists('mhash')) {
+			return bin2hex(mhash(MHASH_SHA256, $string));
+		}
+
+		if (function_exists('hash')) {
+			return hash($type, $string);
+		}
+		return md5($string);
+	}
+
+/**
+ * Sets the default hash method for the Security object.  This affects all objects using
+ * Security::hash().
+ *
+ * @param string $hash Method to use (sha1/sha256/md5)
+ * @access public
+ * @return void
+ * @static
+ * @see Security::hash()
+ */
+	function setHash($hash) {
+		$_this =& Security::getInstance();
+		$_this->hashType = $hash;
+	}
+
+/**
+ * Encrypts/Decrypts a text using the given key.
+ *
+ * @param string $text Encrypted string to decrypt, normal string to encrypt
+ * @param string $key Key to use
+ * @return string Encrypted/Decrypted string
+ * @access public
+ * @static
+ */
+	function cipher($text, $key) {
+		if (empty($key)) {
+			trigger_error(__('You cannot use an empty key for Security::cipher()', true), E_USER_WARNING);
+			return '';
+		}
+
+		srand(Configure::read('Security.cipherSeed'));
+		$out = '';
+		$keyLength = strlen($key);
+		for ($i = 0, $textLength = strlen($text); $i < $textLength; $i++) {
+			$j = ord(substr($key, $i % $keyLength, 1));
+			while ($j--) {
+				rand(0, 255);
+			}
+			$mask = rand(0, 255);
+			$out .= chr(ord(substr($text, $i, 1)) ^ $mask);
+		}
+		srand();
+		return $out;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/set.php b/code/ryzom/tools/server/www/webtt/cake/libs/set.php
new file mode 100644
index 000000000..e0133bf7e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/set.php
@@ -0,0 +1,1155 @@
+<?php
+/**
+ * Library of array functions for Cake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Class used for manipulation of arrays.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class Set {
+
+/**
+ * This function can be thought of as a hybrid between PHP's array_merge and array_merge_recursive. The difference
+ * to the two is that if an array key contains another array then the function behaves recursive (unlike array_merge)
+ * but does not do if for keys containing strings (unlike array_merge_recursive).
+ * See the unit test for more information.
+ *
+ * Note: This function will work with an unlimited amount of arguments and typecasts non-array parameters into arrays.
+ *
+ * @param array $arr1 Array to be merged
+ * @param array $arr2 Array to merge with
+ * @return array Merged array
+ * @access public
+ * @static
+ */
+	function merge($arr1, $arr2 = null) {
+		$args = func_get_args();
+
+		$r = (array)current($args);
+		while (($arg = next($args)) !== false) {
+			foreach ((array)$arg as $key => $val)	 {
+				if (is_array($val) && isset($r[$key]) && is_array($r[$key])) {
+					$r[$key] = Set::merge($r[$key], $val);
+				} elseif (is_int($key)) {
+					$r[] = $val;
+				} else {
+					$r[$key] = $val;
+				}
+			}
+		}
+		return $r;
+	}
+
+/**
+ * Filters empty elements out of a route array, excluding '0'.
+ *
+ * @param mixed $var Either an array to filter, or value when in callback
+ * @param boolean $isArray Force to tell $var is an array when $var is empty
+ * @return mixed Either filtered array, or true/false when in callback
+ * @access public
+ * @static
+ */
+	function filter($var, $isArray = false) {
+		if (is_array($var) && (!empty($var) || $isArray)) {
+			return array_filter($var, array('Set', 'filter'));
+		}
+
+		if ($var === 0 || $var === '0' || !empty($var)) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Pushes the differences in $array2 onto the end of $array
+ *
+ * @param mixed $array Original array
+ * @param mixed $array2 Differences to push
+ * @return array Combined array
+ * @access public
+ * @static
+ */
+	function pushDiff($array, $array2) {
+		if (empty($array) && !empty($array2)) {
+			return $array2;
+		}
+		if (!empty($array) && !empty($array2)) {
+			foreach ($array2 as $key => $value) {
+				if (!array_key_exists($key, $array)) {
+					$array[$key] = $value;
+				} else {
+					if (is_array($value)) {
+						$array[$key] = Set::pushDiff($array[$key], $array2[$key]);
+					}
+				}
+			}
+		}
+		return $array;
+	}
+
+/**
+ * Maps the contents of the Set object to an object hierarchy.
+ * Maintains numeric keys as arrays of objects
+ *
+ * @param string $class A class name of the type of object to map to
+ * @param string $tmp A temporary class name used as $class if $class is an array
+ * @return object Hierarchical object
+ * @access public
+ * @static
+ */
+	function map($class = 'stdClass', $tmp = 'stdClass') {
+		if (is_array($class)) {
+			$val = $class;
+			$class = $tmp;
+		}
+
+		if (empty($val)) {
+			return null;
+		}
+		return Set::__map($val, $class);
+	}
+
+/**
+ * Get the array value of $array. If $array is null, it will return
+ * the current array Set holds. If it is an object of type Set, it
+ * will return its value. If it is another object, its object variables.
+ * If it is anything else but an array, it will return an array whose first
+ * element is $array.
+ *
+ * @param mixed $array Data from where to get the array.
+ * @return array Array from $array.
+ * @access private
+ */
+	function __array($array) {
+		if (empty($array)) {
+			$array = array();
+		} elseif (is_object($array)) {
+			$array = get_object_vars($array);
+		} elseif (!is_array($array)) {
+			$array = array($array);
+		}
+		return $array;
+	}
+
+/**
+ * Maps the given value as an object. If $value is an object,
+ * it returns $value. Otherwise it maps $value as an object of
+ * type $class, and if primary assign _name_ $key on first array.
+ * If $value is not empty, it will be used to set properties of
+ * returned object (recursively). If $key is numeric will maintain array
+ * structure
+ *
+ * @param mixed $value Value to map
+ * @param string $class Class name
+ * @param boolean $primary whether to assign first array key as the _name_
+ * @return mixed Mapped object
+ * @access private
+ * @static
+ */
+	function __map(&$array, $class, $primary = false) {
+		if ($class === true) {
+			$out = new stdClass;
+		} else {
+			$out = new $class;
+		}
+		if (is_array($array)) {
+			$keys = array_keys($array);
+			foreach ($array as $key => $value) {
+				if ($keys[0] === $key && $class !== true) {
+					$primary = true;
+				}
+				if (is_numeric($key)) {
+					if (is_object($out)) {
+						$out = get_object_vars($out);
+					}
+					$out[$key] = Set::__map($value, $class);
+					if (is_object($out[$key])) {
+						if ($primary !== true && is_array($value) && Set::countDim($value, true) === 2) {
+							if (!isset($out[$key]->_name_)) {
+								$out[$key]->_name_ = $primary;
+							}
+						}
+					}
+				} elseif (is_array($value)) {
+					if ($primary === true) {
+						if (!isset($out->_name_)) {
+							$out->_name_ = $key;
+						}
+						$primary = false;
+						foreach ($value as $key2 => $value2) {
+							$out->{$key2} = Set::__map($value2, true);
+						}
+					} else {
+						if (!is_numeric($key)) {
+							$out->{$key} = Set::__map($value, true, $key);
+							if (is_object($out->{$key}) && !is_numeric($key)) {
+								if (!isset($out->{$key}->_name_)) {
+									$out->{$key}->_name_ = $key;
+								}
+							}
+						} else {
+							$out->{$key} = Set::__map($value, true);
+						}
+					}
+				} else {
+					$out->{$key} = $value;
+				}
+			}
+		} else {
+			$out = $array;
+		}
+		return $out;
+	}
+
+/**
+ * Checks to see if all the values in the array are numeric
+ *
+ * @param array $array The array to check.  If null, the value of the current Set object
+ * @return boolean true if values are numeric, false otherwise
+ * @access public
+ * @static
+ */
+	function numeric($array = null) {
+		if (empty($array)) {
+			return null;
+		}
+
+		if ($array === range(0, count($array) - 1)) {
+			return true;
+		}
+
+		$numeric = true;
+		$keys = array_keys($array);
+		$count = count($keys);
+
+		for ($i = 0; $i < $count; $i++) {
+			if (!is_numeric($array[$keys[$i]])) {
+				$numeric = false;
+				break;
+			}
+		}
+		return $numeric;
+	}
+
+/**
+ * Return a value from an array list if the key exists.
+ *
+ * If a comma separated $list is passed arrays are numeric with the key of the first being 0
+ * $list = 'no, yes' would translate to  $list = array(0 => 'no', 1 => 'yes');
+ *
+ * If an array is used, keys can be strings example: array('no' => 0, 'yes' => 1);
+ *
+ * $list defaults to 0 = no 1 = yes if param is not passed
+ *
+ * @param mixed $select Key in $list to return
+ * @param mixed $list can be an array or a comma-separated list.
+ * @return string the value of the array key or null if no match
+ * @access public
+ * @static
+ */
+	function enum($select, $list = null) {
+		if (empty($list)) {
+			$list = array('no', 'yes');
+		}
+
+		$return = null;
+		$list = Set::normalize($list, false);
+
+		if (array_key_exists($select, $list)) {
+			$return = $list[$select];
+		}
+		return $return;
+	}
+
+/**
+ * Returns a series of values extracted from an array, formatted in a format string.
+ *
+ * @param array $data Source array from which to extract the data
+ * @param string $format Format string into which values will be inserted, see sprintf()
+ * @param array $keys An array containing one or more Set::extract()-style key paths
+ * @return array An array of strings extracted from $keys and formatted with $format
+ * @access public
+ * @static
+ */
+	function format($data, $format, $keys) {
+
+		$extracted = array();
+		$count = count($keys);
+
+		if (!$count) {
+			return;
+		}
+
+		for ($i = 0; $i < $count; $i++) {
+			$extracted[] = Set::extract($data, $keys[$i]);
+		}
+		$out = array();
+		$data = $extracted;
+		$count = count($data[0]);
+
+		if (preg_match_all('/\{([0-9]+)\}/msi', $format, $keys2) && isset($keys2[1])) {
+			$keys = $keys2[1];
+			$format = preg_split('/\{([0-9]+)\}/msi', $format);
+			$count2 = count($format);
+
+			for ($j = 0; $j < $count; $j++) {
+				$formatted = '';
+				for ($i = 0; $i <= $count2; $i++) {
+					if (isset($format[$i])) {
+						$formatted .= $format[$i];
+					}
+					if (isset($keys[$i]) && isset($data[$keys[$i]][$j])) {
+						$formatted .= $data[$keys[$i]][$j];
+					}
+				}
+				$out[] = $formatted;
+			}
+		} else {
+			$count2 = count($data);
+			for ($j = 0; $j < $count; $j++) {
+				$args = array();
+				for ($i = 0; $i < $count2; $i++) {
+					if (isset($data[$i][$j])) {
+						$args[] = $data[$i][$j];
+					}
+				}
+				$out[] = vsprintf($format, $args);
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Implements partial support for XPath 2.0. If $path is an array or $data is empty it the call
+ * is delegated to Set::classicExtract.
+ *
+ * #### Currently implemented selectors:
+ *
+ * - /User/id (similar to the classic {n}.User.id)
+ * - /User[2]/name (selects the name of the second User)
+ * - /User[id>2] (selects all Users with an id > 2)
+ * - /User[id>2][<5] (selects all Users with an id > 2 but < 5)
+ * - /Post/Comment[author_name=john]/../name (Selects the name of all Posts that have at least one Comment written by john)
+ * - /Posts[name] (Selects all Posts that have a 'name' key)
+ * - /Comment/.[1] (Selects the contents of the first comment)
+ * - /Comment/.[:last] (Selects the last comment)
+ * - /Comment/.[:first] (Selects the first comment)
+ * - /Comment[text=/cakephp/i] (Selects the all comments that have a text matching the regex /cakephp/i)
+ * - /Comment/@* (Selects the all key names of all comments)
+ *
+ * #### Other limitations:
+ *
+ * - Only absolute paths starting with a single '/' are supported right now
+ *
+ * **Warning**: Even so it has plenty of unit tests the XPath support has not gone through a lot of
+ * real-world testing. Please report Bugs as you find them. Suggestions for additional features to
+ * implement are also very welcome!
+ *
+ * @param string $path An absolute XPath 2.0 path
+ * @param array $data An array of data to extract from
+ * @param array $options Currently only supports 'flatten' which can be disabled for higher XPath-ness
+ * @return array An array of matched items
+ * @access public
+ * @static
+ */
+	function extract($path, $data = null, $options = array()) {
+		if (is_string($data)) {
+			$tmp = $data;
+			$data = $path;
+			$path = $tmp;
+		}
+		if (strpos($path, '/') === false) {
+			return Set::classicExtract($data, $path);
+		}
+		if (empty($data)) {
+			return array();
+		}
+		if ($path === '/') {
+			return $data;
+		}
+		$contexts = $data;
+		$options = array_merge(array('flatten' => true), $options);
+		if (!isset($contexts[0])) {
+			$current = current($data);
+			if ((is_array($current) && count($data) < 1) || !is_array($current) || !Set::numeric(array_keys($data))) {
+				$contexts = array($data);
+			}
+		}
+		$tokens = array_slice(preg_split('/(?<!=|\\\\)\/(?![a-z-\s]*\])/', $path), 1);
+
+		do {
+			$token = array_shift($tokens);
+			$conditions = false;
+			if (preg_match_all('/\[([^=]+=\/[^\/]+\/|[^\]]+)\]/', $token, $m)) {
+				$conditions = $m[1];
+				$token = substr($token, 0, strpos($token, '['));
+			}
+			$matches = array();
+			foreach ($contexts as $key => $context) {
+				if (!isset($context['trace'])) {
+					$context = array('trace' => array(null), 'item' => $context, 'key' => $key);
+				}
+				if ($token === '..') {
+					if (count($context['trace']) == 1) {
+						$context['trace'][] = $context['key'];
+					}
+					$parent = implode('/', $context['trace']) . '/.';
+					$context['item'] = Set::extract($parent, $data);
+					$context['key'] = array_pop($context['trace']);
+					if (isset($context['trace'][1]) && $context['trace'][1] > 0) {
+						$context['item'] = $context['item'][0];
+					} elseif (!empty($context['item'][$key])) {
+						$context['item'] = $context['item'][$key];
+					} else {
+						$context['item'] = array_shift($context['item']);
+					}
+					$matches[] = $context;
+					continue;
+				}
+				$match = false;
+				if ($token === '@*' && is_array($context['item'])) {
+					$matches[] = array(
+						'trace' => array_merge($context['trace'], (array)$key),
+						'key' => $key,
+						'item' => array_keys($context['item']),
+					);
+				} elseif (($key === $token || (ctype_digit($token) && $key == $token) || $token === '.')) {
+					$context['trace'][] = $key;
+					$matches[] = array(
+						'trace' => $context['trace'],
+						'key' => $key,
+						'item' => $context['item'],
+					);
+				} elseif (is_array($context['item']) && array_key_exists($token, $context['item'])) {
+					$items = $context['item'][$token];
+					if (!is_array($items)) {
+						$items = array($items);
+					} elseif (!isset($items[0])) {
+						$current = current($items);
+						$currentKey = key($items);
+						if (!is_array($current) || (is_array($current) && count($items) <= 1 && !is_numeric($currentKey))) {
+							$items = array($items);
+						}
+					}
+
+					foreach ($items as $key => $item) {
+						$ctext = array($context['key']);
+						if (!is_numeric($key)) {
+							$ctext[] = $token;
+							$tok = array_shift($tokens);
+							if (isset($items[$tok])) {
+								$ctext[] = $tok;
+								$item = $items[$tok];
+								$matches[] = array(
+									'trace' => array_merge($context['trace'], $ctext),
+									'key' => $tok,
+									'item' => $item,
+								);
+								break;
+							} elseif ($tok !== null) {
+								array_unshift($tokens, $tok);
+							}
+						} else {
+							$key = $token;
+						}
+
+						$matches[] = array(
+							'trace' => array_merge($context['trace'], $ctext),
+							'key' => $key,
+							'item' => $item,
+						);
+					}
+				}
+			}
+			if ($conditions) {
+				foreach ($conditions as $condition) {
+					$filtered = array();
+					$length = count($matches);
+					foreach ($matches as $i => $match) {
+						if (Set::matches(array($condition), $match['item'], $i + 1, $length)) {
+							$filtered[$i] = $match;
+						}
+					}
+					$matches = $filtered;
+				}
+			}
+			$contexts = $matches;
+
+			if (empty($tokens)) {
+				break;
+			}
+		} while(1);
+
+		$r = array();
+
+		foreach ($matches as $match) {
+			if ((!$options['flatten'] || is_array($match['item'])) && !is_int($match['key'])) {
+				$r[] = array($match['key'] => $match['item']);
+			} else {
+				$r[] = $match['item'];
+			}
+		}
+		return $r;
+	}
+
+/**
+ * This function can be used to see if a single item or a given xpath match certain conditions.
+ *
+ * @param mixed $conditions An array of condition strings or an XPath expression
+ * @param array $data  An array of data to execute the match on
+ * @param integer $i Optional: The 'nth'-number of the item being matched.
+ * @return boolean
+ * @access public
+ * @static
+ */
+	function matches($conditions, $data = array(), $i = null, $length = null) {
+		if (empty($conditions)) {
+			return true;
+		}
+		if (is_string($conditions)) {
+			return !!Set::extract($conditions, $data);
+		}
+		foreach ($conditions as $condition) {
+			if ($condition === ':last') {
+				if ($i != $length) {
+					return false;
+				}
+				continue;
+			} elseif ($condition === ':first') {
+				if ($i != 1) {
+					return false;
+				}
+				continue;
+			}
+			if (!preg_match('/(.+?)([><!]?[=]|[><])(.*)/', $condition, $match)) {
+				if (ctype_digit($condition)) {
+					if ($i != $condition) {
+						return false;
+					}
+				} elseif (preg_match_all('/(?:^[0-9]+|(?<=,)[0-9]+)/', $condition, $matches)) {
+					return in_array($i, $matches[0]);
+				} elseif (!array_key_exists($condition, $data)) {
+					return false;
+				}
+				continue;
+			}
+			list(,$key,$op,$expected) = $match;
+			if (!isset($data[$key])) {
+				return false;
+			}
+
+			$val = $data[$key];
+
+			if ($op === '=' && $expected && $expected{0} === '/') {
+				return preg_match($expected, $val);
+			}
+			if ($op === '=' && $val != $expected) {
+				return false;
+			}
+			if ($op === '!=' && $val == $expected) {
+				return false;
+			}
+			if ($op === '>' && $val <= $expected) {
+				return false;
+			}
+			if ($op === '<' && $val >= $expected) {
+				return false;
+			}
+			if ($op === '<=' && $val > $expected) {
+				return false;
+			}
+			if ($op === '>=' && $val < $expected) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+/**
+ * Gets a value from an array or object that is contained in a given path using an array path syntax, i.e.:
+ * "{n}.Person.{[a-z]+}" - Where "{n}" represents a numeric key, "Person" represents a string literal,
+ * and "{[a-z]+}" (i.e. any string literal enclosed in brackets besides {n} and {s}) is interpreted as
+ * a regular expression.
+ *
+ * @param array $data Array from where to extract
+ * @param mixed $path As an array, or as a dot-separated string.
+ * @return array Extracted data
+ * @access public
+ * @static
+ */
+	function classicExtract($data, $path = null) {
+		if (empty($path)) {
+			return $data;
+		}
+		if (is_object($data)) {
+			$data = get_object_vars($data);
+		}
+		if (!is_array($data)) {
+			return $data;
+		}
+
+		if (!is_array($path)) {
+			if (!class_exists('String')) {
+				App::import('Core', 'String');
+			}
+			$path = String::tokenize($path, '.', '{', '}');
+		}
+		$tmp = array();
+
+		if (!is_array($path) || empty($path)) {
+			return null;
+		}
+
+		foreach ($path as $i => $key) {
+			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
+				if (isset($data[intval($key)])) {
+					$data = $data[intval($key)];
+				} else {
+					return null;
+				}
+			} elseif ($key === '{n}') {
+				foreach ($data as $j => $val) {
+					if (is_int($j)) {
+						$tmpPath = array_slice($path, $i + 1);
+						if (empty($tmpPath)) {
+							$tmp[] = $val;
+						} else {
+							$tmp[] = Set::classicExtract($val, $tmpPath);
+						}
+					}
+				}
+				return $tmp;
+			} elseif ($key === '{s}') {
+				foreach ($data as $j => $val) {
+					if (is_string($j)) {
+						$tmpPath = array_slice($path, $i + 1);
+						if (empty($tmpPath)) {
+							$tmp[] = $val;
+						} else {
+							$tmp[] = Set::classicExtract($val, $tmpPath);
+						}
+					}
+				}
+				return $tmp;
+			} elseif (false !== strpos($key,'{') && false !== strpos($key,'}')) {
+				$pattern = substr($key, 1, -1);
+
+				foreach ($data as $j => $val) {
+					if (preg_match('/^'.$pattern.'/s', $j) !== 0) {
+						$tmpPath = array_slice($path, $i + 1);
+						if (empty($tmpPath)) {
+							$tmp[$j] = $val;
+						} else {
+							$tmp[$j] = Set::classicExtract($val, $tmpPath);
+						}
+					}
+				}
+				return $tmp;
+			} else {
+				if (isset($data[$key])) {
+					$data = $data[$key];
+				} else {
+					return null;
+				}
+			}
+		}
+		return $data;
+	}
+
+/**
+ * Inserts $data into an array as defined by $path.
+ *
+ * @param mixed $list Where to insert into
+ * @param mixed $path A dot-separated string.
+ * @param array $data Data to insert
+ * @return array
+ * @access public
+ * @static
+ */
+	function insert($list, $path, $data = null) {
+		if (!is_array($path)) {
+			$path = explode('.', $path);
+		}
+		$_list =& $list;
+
+		foreach ($path as $i => $key) {
+			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
+				$key = intval($key);
+			}
+			if ($i === count($path) - 1) {
+				$_list[$key] = $data;
+			} else {
+				if (!isset($_list[$key])) {
+					$_list[$key] = array();
+				}
+				$_list =& $_list[$key];
+			}
+		}
+		return $list;
+	}
+
+/**
+ * Removes an element from a Set or array as defined by $path.
+ *
+ * @param mixed $list From where to remove
+ * @param mixed $path A dot-separated string.
+ * @return array Array with $path removed from its value
+ * @access public
+ * @static
+ */
+	function remove($list, $path = null) {
+		if (empty($path)) {
+			return $list;
+		}
+		if (!is_array($path)) {
+			$path = explode('.', $path);
+		}
+		$_list =& $list;
+
+		foreach ($path as $i => $key) {
+			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
+				$key = intval($key);
+			}
+			if ($i === count($path) - 1) {
+				unset($_list[$key]);
+			} else {
+				if (!isset($_list[$key])) {
+					return $list;
+				}
+				$_list =& $_list[$key];
+			}
+		}
+		return $list;
+	}
+
+/**
+ * Checks if a particular path is set in an array
+ *
+ * @param mixed $data Data to check on
+ * @param mixed $path A dot-separated string.
+ * @return boolean true if path is found, false otherwise
+ * @access public
+ * @static
+ */
+	function check($data, $path = null) {
+		if (empty($path)) {
+			return $data;
+		}
+		if (!is_array($path)) {
+			$path = explode('.', $path);
+		}
+
+		foreach ($path as $i => $key) {
+			if (is_numeric($key) && intval($key) > 0 || $key === '0') {
+				$key = intval($key);
+			}
+			if ($i === count($path) - 1) {
+				return (is_array($data) && array_key_exists($key, $data));
+			}
+
+			if (!is_array($data) || !array_key_exists($key, $data)) {
+				return false;
+			}
+			$data =& $data[$key];
+		}
+		return true;
+	}
+
+/**
+ * Computes the difference between a Set and an array, two Sets, or two arrays
+ *
+ * @param mixed $val1 First value
+ * @param mixed $val2 Second value
+ * @return array Returns the key => value pairs that are not common in $val1 and $val2
+ * The expression for this function is ($val1 - $val2) + ($val2 - ($val1 - $val2))
+ * @access public
+ * @static
+ */
+	function diff($val1, $val2 = null) {
+		if (empty($val1)) {
+			return (array)$val2;
+		}
+		if (empty($val2)) {
+			return (array)$val1;
+		}
+		$intersection = array_intersect_key($val1, $val2);
+		while (($key = key($intersection)) !== null) {
+			if ($val1[$key] == $val2[$key]) {
+				unset($val1[$key]);
+				unset($val2[$key]);
+			}
+			next($intersection);
+		}
+
+		return $val1 + $val2;
+	}
+
+/**
+ * Determines if one Set or array contains the exact keys and values of another.
+ *
+ * @param array $val1 First value
+ * @param array $val2 Second value
+ * @return boolean true if $val1 contains $val2, false otherwise
+ * @access public
+ * @static
+ */
+	function contains($val1, $val2 = null) {
+		if (empty($val1) || empty($val2)) {
+			return false;
+		}
+
+		foreach ($val2 as $key => $val) {
+			if (is_numeric($key)) {
+				Set::contains($val, $val1);
+			} else {
+				if (!isset($val1[$key]) || $val1[$key] != $val) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Counts the dimensions of an array. If $all is set to false (which is the default) it will
+ * only consider the dimension of the first element in the array.
+ *
+ * @param array $array Array to count dimensions on
+ * @param boolean $all Set to true to count the dimension considering all elements in array
+ * @param integer $count Start the dimension count at this number
+ * @return integer The number of dimensions in $array
+ * @access public
+ * @static
+ */
+	function countDim($array = null, $all = false, $count = 0) {
+		if ($all) {
+			$depth = array($count);
+			if (is_array($array) && reset($array) !== false) {
+				foreach ($array as $value) {
+					$depth[] = Set::countDim($value, true, $count + 1);
+				}
+			}
+			$return = max($depth);
+		} else {
+			if (is_array(reset($array))) {
+				$return = Set::countDim(reset($array)) + 1;
+			} else {
+				$return = 1;
+			}
+		}
+		return $return;
+	}
+
+/**
+ * Normalizes a string or array list.
+ *
+ * @param mixed $list List to normalize
+ * @param boolean $assoc If true, $list will be converted to an associative array
+ * @param string $sep If $list is a string, it will be split into an array with $sep
+ * @param boolean $trim If true, separated strings will be trimmed
+ * @return array
+ * @access public
+ * @static
+ */
+	function normalize($list, $assoc = true, $sep = ',', $trim = true) {
+		if (is_string($list)) {
+			$list = explode($sep, $list);
+			if ($trim) {
+				foreach ($list as $key => $value) {
+					$list[$key] = trim($value);
+				}
+			}
+			if ($assoc) {
+				return Set::normalize($list);
+			}
+		} elseif (is_array($list)) {
+			$keys = array_keys($list);
+			$count = count($keys);
+			$numeric = true;
+
+			if (!$assoc) {
+				for ($i = 0; $i < $count; $i++) {
+					if (!is_int($keys[$i])) {
+						$numeric = false;
+						break;
+					}
+				}
+			}
+			if (!$numeric || $assoc) {
+				$newList = array();
+				for ($i = 0; $i < $count; $i++) {
+					if (is_int($keys[$i])) {
+						$newList[$list[$keys[$i]]] = null;
+					} else {
+						$newList[$keys[$i]] = $list[$keys[$i]];
+					}
+				}
+				$list = $newList;
+			}
+		}
+		return $list;
+	}
+
+/**
+ * Creates an associative array using a $path1 as the path to build its keys, and optionally
+ * $path2 as path to get the values. If $path2 is not specified, all values will be initialized
+ * to null (useful for Set::merge). You can optionally group the values by what is obtained when
+ * following the path specified in $groupPath.
+ *
+ * @param mixed $data Array or object from where to extract keys and values
+ * @param mixed $path1 As an array, or as a dot-separated string.
+ * @param mixed $path2 As an array, or as a dot-separated string.
+ * @param string $groupPath As an array, or as a dot-separated string.
+ * @return array Combined array
+ * @access public
+ * @static
+ */
+	function combine($data, $path1 = null, $path2 = null, $groupPath = null) {
+		if (empty($data)) {
+			return array();
+		}
+
+		if (is_object($data)) {
+			$data = get_object_vars($data);
+		}
+
+		if (is_array($path1)) {
+			$format = array_shift($path1);
+			$keys = Set::format($data, $format, $path1);
+		} else {
+			$keys = Set::extract($data, $path1);
+		}
+		if (empty($keys)) {
+			return array();
+		}
+
+		if (!empty($path2) && is_array($path2)) {
+			$format = array_shift($path2);
+			$vals = Set::format($data, $format, $path2);
+
+		} elseif (!empty($path2)) {
+			$vals = Set::extract($data, $path2);
+
+		} else {
+			$count = count($keys);
+			for ($i = 0; $i < $count; $i++) {
+				$vals[$i] = null;
+			}
+		}
+
+		if ($groupPath != null) {
+			$group = Set::extract($data, $groupPath);
+			if (!empty($group)) {
+				$c = count($keys);
+				for ($i = 0; $i < $c; $i++) {
+					if (!isset($group[$i])) {
+						$group[$i] = 0;
+					}
+					if (!isset($out[$group[$i]])) {
+						$out[$group[$i]] = array();
+					}
+					$out[$group[$i]][$keys[$i]] = $vals[$i];
+				}
+				return $out;
+			}
+		}
+		if (empty($vals)) {
+			return array();
+		}
+		return array_combine($keys, $vals);
+	}
+
+/**
+ * Converts an object into an array.
+ * @param object $object Object to reverse
+ * @return array Array representation of given object
+ * @public
+ * @static
+ */
+	function reverse($object) {
+		$out = array();
+		if (is_a($object, 'XmlNode')) {
+			$out = $object->toArray();
+			return $out;
+		} else if (is_object($object)) {
+			$keys = get_object_vars($object);
+			if (isset($keys['_name_'])) {
+				$identity = $keys['_name_'];
+				unset($keys['_name_']);
+			}
+			$new = array();
+			foreach ($keys as $key => $value) {
+				if (is_array($value)) {
+					$new[$key] = (array)Set::reverse($value);
+				} else {
+					if (isset($value->_name_)) {
+						$new = array_merge($new, Set::reverse($value));
+					} else {
+						$new[$key] = Set::reverse($value);
+					}
+				}
+			}
+			if (isset($identity)) {
+				$out[$identity] = $new;
+			} else {
+				$out = $new;
+			}
+		} elseif (is_array($object)) {
+			foreach ($object as $key => $value) {
+				$out[$key] = Set::reverse($value);
+			}
+		} else {
+			$out = $object;
+		}
+		return $out;
+	}
+
+/**
+ * Collapses a multi-dimensional array into a single dimension, using a delimited array path for
+ * each array element's key, i.e. array(array('Foo' => array('Bar' => 'Far'))) becomes
+ * array('0.Foo.Bar' => 'Far').
+ *
+ * @param array $data Array to flatten
+ * @param string $separator String used to separate array key elements in a path, defaults to '.'
+ * @return array
+ * @access public
+ * @static
+ */
+	function flatten($data, $separator = '.') {
+		$result = array();
+		$path = null;
+
+		if (is_array($separator)) {
+			extract($separator, EXTR_OVERWRITE);
+		}
+
+		if (!is_null($path)) {
+			$path .= $separator;
+		}
+
+		foreach ($data as $key => $val) {
+			if (is_array($val)) {
+				$result += (array)Set::flatten($val, array(
+					'separator' => $separator,
+					'path' => $path . $key
+				));
+			} else {
+				$result[$path . $key] = $val;
+			}
+		}
+		return $result;
+	}
+
+/**
+ * Flattens an array for sorting
+ *
+ * @param array $results
+ * @param string $key
+ * @return array
+ * @access private
+ */
+	function __flatten($results, $key = null) {
+		$stack = array();
+		foreach ($results as $k => $r) {
+			$id = $k;
+			if (!is_null($key)) {
+				$id = $key;
+			}
+			if (is_array($r) && !empty($r)) {
+				$stack = array_merge($stack, Set::__flatten($r, $id));
+			} else {
+				$stack[] = array('id' => $id, 'value' => $r);
+			}
+		}
+		return $stack;
+	}
+
+/**
+ * Sorts an array by any value, determined by a Set-compatible path
+ *
+ * @param array $data An array of data to sort
+ * @param string $path A Set-compatible path to the array value
+ * @param string $dir Direction of sorting - either ascending (ASC), or descending (DESC)
+ * @return array Sorted array of data
+ * @static
+ */
+	function sort($data, $path, $dir) {
+		$originalKeys = array_keys($data);
+		if (is_numeric(implode('', $originalKeys))) {
+			$data = array_values($data);
+		}
+		$result = Set::__flatten(Set::extract($data, $path));
+		list($keys, $values) = array(Set::extract($result, '{n}.id'), Set::extract($result, '{n}.value'));
+
+		$dir = strtolower($dir);
+		if ($dir === 'asc') {
+			$dir = SORT_ASC;
+		} elseif ($dir === 'desc') {
+			$dir = SORT_DESC;
+		}
+		array_multisort($values, $dir, $keys, $dir);
+		$sorted = array();
+		$keys = array_unique($keys);
+
+		foreach ($keys as $k) {
+			$sorted[] = $data[$k];
+		}
+		return $sorted;
+	}
+
+/**
+ * Allows the application of a callback method to elements of an
+ * array extracted by a Set::extract() compatible path.
+ *
+ * @param mixed $path Set-compatible path to the array value
+ * @param array $data An array of data to extract from & then process with the $callback.
+ * @param mixed $callback Callback method to be applied to extracted data.
+ * See http://ca2.php.net/manual/en/language.pseudo-types.php#language.types.callback for examples
+ * of callback formats.
+ * @param array $options Options are:
+ *                       - type : can be pass, map, or reduce. Map will handoff the given callback
+ *                                to array_map, reduce will handoff to array_reduce, and pass will
+ *                                use call_user_func_array().
+ * @return mixed Result of the callback when applied to extracted data
+ * @access public
+ * @static
+ */
+	function apply($path, $data, $callback, $options = array()) {
+		$defaults = array('type' => 'pass');
+		$options = array_merge($defaults, $options);
+
+		$extracted = Set::extract($path, $data);
+
+		if ($options['type'] === 'map') {
+			$result = array_map($callback, $extracted);
+
+		} elseif ($options['type'] === 'reduce') {
+			$result = array_reduce($extracted, $callback);
+
+		} elseif ($options['type'] === 'pass') {
+			$result = call_user_func_array($callback, array($extracted));
+		} else {
+			return null;
+		}
+
+		return  $result;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/string.php b/code/ryzom/tools/server/www/webtt/cake/libs/string.php
new file mode 100644
index 000000000..ecb63f352
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/string.php
@@ -0,0 +1,329 @@
+<?php
+/**
+ * String handling methods.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0.5551
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * String handling methods.
+ *
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ */
+class String {
+
+/**
+ * Generate a random UUID
+ *
+ * @see http://www.ietf.org/rfc/rfc4122.txt
+ * @return RFC 4122 UUID
+ * @static
+ */
+	function uuid() {
+		$node = env('SERVER_ADDR');
+		$pid = null;
+
+		if (strpos($node, ':') !== false) {
+			if (substr_count($node, '::')) {
+				$node = str_replace(
+					'::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node
+				);
+			}
+			$node = explode(':', $node) ;
+			$ipv6 = '' ;
+
+			foreach ($node as $id) {
+				$ipv6 .= str_pad(base_convert($id, 16, 2), 16, 0, STR_PAD_LEFT);
+			}
+			$node =  base_convert($ipv6, 2, 10);
+
+			if (strlen($node) < 38) {
+				$node = null;
+			} else {
+				$node = crc32($node);
+			}
+		} elseif (empty($node)) {
+			$host = env('HOSTNAME');
+
+			if (empty($host)) {
+				$host = env('HOST');
+			}
+
+			if (!empty($host)) {
+				$ip = gethostbyname($host);
+
+				if ($ip === $host) {
+					$node = crc32($host);
+				} else {
+					$node = ip2long($ip);
+				}
+			}
+		} elseif ($node !== '127.0.0.1') {
+			$node = ip2long($node);
+		} else {
+			$node = null;
+		}
+
+		if (empty($node)) {
+			$node = crc32(Configure::read('Security.salt'));
+		}
+
+		if (function_exists('zend_thread_id')) {
+			$pid = zend_thread_id();
+		} else {
+			$pid = getmypid();
+		}
+
+		if (!$pid || $pid > 65535) {
+			$pid = mt_rand(0, 0xfff) | 0x4000;
+		}
+
+		list($timeMid, $timeLow) = explode(' ', microtime());
+		$uuid = sprintf(
+			"%08x-%04x-%04x-%02x%02x-%04x%08x", (int)$timeLow, (int)substr($timeMid, 2) & 0xffff,
+			mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3f) | 0x80, mt_rand(0, 0xff), $pid, $node
+		);
+
+		return $uuid;
+	}
+
+/**
+ * Tokenizes a string using $separator, ignoring any instance of $separator that appears between
+ * $leftBound and $rightBound
+ *
+ * @param string $data The data to tokenize
+ * @param string $separator The token to split the data on.
+ * @param string $leftBound The left boundary to ignore separators in.
+ * @param string $rightBound The right boundary to ignore separators in.
+ * @return array Array of tokens in $data.
+ * @access public
+ * @static
+ */
+	function tokenize($data, $separator = ',', $leftBound = '(', $rightBound = ')') {
+		if (empty($data) || is_array($data)) {
+			return $data;
+		}
+
+		$depth = 0;
+		$offset = 0;
+		$buffer = '';
+		$results = array();
+		$length = strlen($data);
+		$open = false;
+
+		while ($offset <= $length) {
+			$tmpOffset = -1;
+			$offsets = array(
+				strpos($data, $separator, $offset),
+				strpos($data, $leftBound, $offset),
+				strpos($data, $rightBound, $offset)
+			);
+			for ($i = 0; $i < 3; $i++) {
+				if ($offsets[$i] !== false && ($offsets[$i] < $tmpOffset || $tmpOffset == -1)) {
+					$tmpOffset = $offsets[$i];
+				}
+			}
+			if ($tmpOffset !== -1) {
+				$buffer .= substr($data, $offset, ($tmpOffset - $offset));
+				if ($data{$tmpOffset} == $separator && $depth == 0) {
+					$results[] = $buffer;
+					$buffer = '';
+				} else {
+					$buffer .= $data{$tmpOffset};
+				}
+				if ($leftBound != $rightBound) {
+					if ($data{$tmpOffset} == $leftBound) {
+						$depth++;
+					}
+					if ($data{$tmpOffset} == $rightBound) {
+						$depth--;
+					}
+				} else {
+					if ($data{$tmpOffset} == $leftBound) {
+						if (!$open) {
+							$depth++;
+							$open = true;
+						} else {
+							$depth--;
+							$open = false;
+						}
+					}
+				}
+				$offset = ++$tmpOffset;
+			} else {
+				$results[] = $buffer . substr($data, $offset);
+				$offset = $length + 1;
+			}
+		}
+		if (empty($results) && !empty($buffer)) {
+			$results[] = $buffer;
+		}
+
+		if (!empty($results)) {
+			$data = array_map('trim', $results);
+		} else {
+			$data = array();
+		}
+		return $data;
+	}
+
+/**
+ * Replaces variable placeholders inside a $str with any given $data. Each key in the $data array
+ * corresponds to a variable placeholder name in $str.
+ * Example: `String::insert(':name is :age years old.', array('name' => 'Bob', '65'));`
+ * Returns: Bob is 65 years old.
+ *
+ * Available $options are:
+ *
+ * - before: The character or string in front of the name of the variable placeholder (Defaults to `:`)
+ * - after: The character or string after the name of the variable placeholder (Defaults to null)
+ * - escape: The character or string used to escape the before character / string (Defaults to `\`)
+ * - format: A regex to use for matching variable placeholders. Default is: `/(?<!\\)\:%s/`
+ *   (Overwrites before, after, breaks escape / clean)
+ * - clean: A boolean or array with instructions for String::cleanInsert
+ *
+ * @param string $str A string containing variable placeholders
+ * @param string $data A key => val array where each key stands for a placeholder variable name
+ *     to be replaced with val
+ * @param string $options An array of options, see description above
+ * @return string
+ * @access public
+ * @static
+ */
+	function insert($str, $data, $options = array()) {
+		$defaults = array(
+			'before' => ':', 'after' => null, 'escape' => '\\', 'format' => null, 'clean' => false
+		);
+		$options += $defaults;
+		$format = $options['format'];
+		$data = (array)$data;
+		if (empty($data)) {
+			return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
+		}
+
+		if (!isset($format)) {
+			$format = sprintf(
+				'/(?<!%s)%s%%s%s/',
+				preg_quote($options['escape'], '/'),
+				str_replace('%', '%%', preg_quote($options['before'], '/')),
+				str_replace('%', '%%', preg_quote($options['after'], '/'))
+			);
+		}
+
+		if (strpos($str, '?') !== false && is_numeric(key($data))) {
+			$offset = 0;
+			while (($pos = strpos($str, '?', $offset)) !== false) {
+				$val = array_shift($data);
+				$offset = $pos + strlen($val);
+				$str = substr_replace($str, $val, $pos, 1);
+			}
+			return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
+		} else {
+			asort($data);
+
+			$hashKeys = array();
+			foreach ($data as $key => $value) {
+				$hashKeys[] = crc32($key);
+			}
+
+			$tempData = array_combine(array_keys($data), array_values($hashKeys));
+			krsort($tempData);
+			foreach ($tempData as $key => $hashVal) {
+				$key = sprintf($format, preg_quote($key, '/'));
+				$str = preg_replace($key, $hashVal, $str);
+			}
+			$dataReplacements = array_combine($hashKeys, array_values($data));
+			foreach ($dataReplacements as $tmpHash => $tmpValue) {
+				$tmpValue = (is_array($tmpValue)) ? '' : $tmpValue;
+				$str = str_replace($tmpHash, $tmpValue, $str);
+			}
+		}
+
+		if (!isset($options['format']) && isset($options['before'])) {
+			$str = str_replace($options['escape'].$options['before'], $options['before'], $str);
+		}
+		return ($options['clean']) ? String::cleanInsert($str, $options) : $str;
+	}
+
+/**
+ * Cleans up a String::insert() formated string with given $options depending on the 'clean' key in
+ * $options. The default method used is text but html is also available. The goal of this function
+ * is to replace all whitespace and uneeded markup around placeholders that did not get replaced
+ * by String::insert().
+ *
+ * @param string $str
+ * @param string $options
+ * @return string
+ * @access public
+ * @static
+ * @see String::insert()
+ */
+	function cleanInsert($str, $options) {
+		$clean = $options['clean'];
+		if (!$clean) {
+			return $str;
+		}
+		if ($clean === true) {
+			$clean = array('method' => 'text');
+		}
+		if (!is_array($clean)) {
+			$clean = array('method' => $options['clean']);
+		}
+		switch ($clean['method']) {
+			case 'html':
+				$clean = array_merge(array(
+					'word' => '[\w,.]+',
+					'andText' => true,
+					'replacement' => '',
+				), $clean);
+				$kleenex = sprintf(
+					'/[\s]*[a-z]+=(")(%s%s%s[\s]*)+\\1/i',
+					preg_quote($options['before'], '/'),
+					$clean['word'],
+					preg_quote($options['after'], '/')
+				);
+				$str = preg_replace($kleenex, $clean['replacement'], $str);
+				if ($clean['andText']) {
+					$options['clean'] = array('method' => 'text');
+					$str = String::cleanInsert($str, $options);
+				}
+				break;
+			case 'text':
+				$clean = array_merge(array(
+					'word' => '[\w,.]+',
+					'gap' => '[\s]*(?:(?:and|or)[\s]*)?',
+					'replacement' => '',
+				), $clean);
+
+				$kleenex = sprintf(
+					'/(%s%s%s%s|%s%s%s%s)/',
+					preg_quote($options['before'], '/'),
+					$clean['word'],
+					preg_quote($options['after'], '/'),
+					$clean['gap'],
+					$clean['gap'],
+					preg_quote($options['before'], '/'),
+					$clean['word'],
+					preg_quote($options['after'], '/')
+				);
+				$str = preg_replace($kleenex, $clean['replacement'], $str);
+				break;
+		}
+		return $str;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/validation.php b/code/ryzom/tools/server/www/webtt/cake/libs/validation.php
new file mode 100644
index 000000000..d10d52c86
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/validation.php
@@ -0,0 +1,1060 @@
+<?php
+/**
+ * Validation Class.  Used for validation of model data
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0.3830
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('Multibyte')) {
+	App::import('Core', 'Multibyte', false);
+}
+/**
+ * Offers different validation methods.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP v 1.2.0.3830
+ */
+class Validation extends Object {
+
+/**
+ * Set the value of methods $check param.
+ *
+ * @var string
+ * @access public
+ */
+	var $check = null;
+
+/**
+ * Set to a valid regular expression in the class methods.
+ * Can be set from $regex param also
+ *
+ * @var string
+ * @access public
+ */
+	var $regex = null;
+
+/**
+ * Some complex patterns needed in multiple places
+ *
+ * @var array
+ * @access private
+ */
+	var $__pattern = array(
+		'hostname' => '(?:[a-z0-9][-a-z0-9]*\.)*(?:[a-z0-9][-a-z0-9]{0,62})\.(?:(?:[a-z]{2}\.)?[a-z]{2,4}|museum|travel)'
+	);
+
+/**
+ * Some class methods use a country to determine proper validation.
+ * This can be passed to methods in the $country param
+ *
+ * @var string
+ * @access public
+ */
+	var $country = null;
+
+/**
+ * Some class methods use a deeper validation when set to true
+ *
+ * @var string
+ * @access public
+ */
+	var $deep = null;
+
+/**
+ * Some class methods use the $type param to determine which validation to perfom in the method
+ *
+ * @var string
+ * @access public
+ */
+	var $type = null;
+
+/**
+ * Holds an array of errors messages set in this class.
+ * These are used for debugging purposes
+ *
+ * @var array
+ * @access public
+ */
+	var $errors = array();
+
+/**
+ * Gets a reference to the Validation object instance
+ *
+ * @return object Validation instance
+ * @access public
+ * @static
+ */
+	function &getInstance() {
+		static $instance = array();
+
+		if (!$instance) {
+			$instance[0] =& new Validation();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Checks that a string contains something other than whitespace
+ *
+ * Returns true if string contains something other than whitespace
+ *
+ * $check can be passed as an array:
+ * array('check' => 'valueToCheck');
+ *
+ * @param mixed $check Value to check
+ * @return boolean Success
+ * @access public
+ */
+	function notEmpty($check) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+
+		if (empty($_this->check) && $_this->check != '0') {
+			return false;
+		}
+		$_this->regex = '/[^\s]+/m';
+		return $_this->_check();
+	}
+
+/**
+ * Checks that a string contains only integer or letters
+ *
+ * Returns true if string contains only integer or letters
+ *
+ * $check can be passed as an array:
+ * array('check' => 'valueToCheck');
+ *
+ * @param mixed $check Value to check
+ * @return boolean Success
+ * @access public
+ */
+	function alphaNumeric($check) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+
+		if (empty($_this->check) && $_this->check != '0') {
+			return false;
+		}
+		$_this->regex = '/^[\p{Ll}\p{Lm}\p{Lo}\p{Lt}\p{Lu}\p{Nd}]+$/mu';
+		return $_this->_check();
+	}
+
+/**
+ * Checks that a string length is within s specified range.
+ * Spaces are included in the character count.
+ * Returns true is string matches value min, max, or between min and max,
+ *
+ * @param string $check Value to check for length
+ * @param integer $min Minimum value in range (inclusive)
+ * @param integer $max Maximum value in range (inclusive)
+ * @return boolean Success
+ * @access public
+ */
+	function between($check, $min, $max) {
+		$length = mb_strlen($check);
+		return ($length >= $min && $length <= $max);
+	}
+
+/**
+ * Returns true if field is left blank -OR- only whitespace characters are present in it's value
+ * Whitespace characters include Space, Tab, Carriage Return, Newline
+ *
+ * $check can be passed as an array:
+ * array('check' => 'valueToCheck');
+ *
+ * @param mixed $check Value to check
+ * @return boolean Success
+ * @access public
+ */
+	function blank($check) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+
+		$_this->regex = '/[^\\s]/';
+		return !$_this->_check();
+	}
+
+/**
+ * Validation of credit card numbers.
+ * Returns true if $check is in the proper credit card format.
+ *
+ * @param mixed $check credit card number to validate
+ * @param mixed $type 'all' may be passed as a sting, defaults to fast which checks format of most major credit cards
+ *    if an array is used only the values of the array are checked.
+ *    Example: array('amex', 'bankcard', 'maestro')
+ * @param boolean $deep set to true this will check the Luhn algorithm of the credit card.
+ * @param string $regex A custom regex can also be passed, this will be used instead of the defined regex values
+ * @return boolean Success
+ * @access public
+ * @see Validation::_luhn()
+ */
+	function cc($check, $type = 'fast', $deep = false, $regex = null) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->type = $type;
+		$_this->deep = $deep;
+		$_this->regex = $regex;
+
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+		$_this->check = str_replace(array('-', ' '), '', $_this->check);
+
+		if (mb_strlen($_this->check) < 13) {
+			return false;
+		}
+
+		if (!is_null($_this->regex)) {
+			if ($_this->_check()) {
+				return $_this->_luhn();
+			}
+		}
+		$cards = array(
+			'all' => array(
+				'amex' => '/^3[4|7]\\d{13}$/',
+				'bankcard' => '/^56(10\\d\\d|022[1-5])\\d{10}$/',
+				'diners'   => '/^(?:3(0[0-5]|[68]\\d)\\d{11})|(?:5[1-5]\\d{14})$/',
+				'disc'     => '/^(?:6011|650\\d)\\d{12}$/',
+				'electron' => '/^(?:417500|4917\\d{2}|4913\\d{2})\\d{10}$/',
+				'enroute'  => '/^2(?:014|149)\\d{11}$/',
+				'jcb'      => '/^(3\\d{4}|2100|1800)\\d{11}$/',
+				'maestro'  => '/^(?:5020|6\\d{3})\\d{12}$/',
+				'mc'       => '/^5[1-5]\\d{14}$/',
+				'solo'     => '/^(6334[5-9][0-9]|6767[0-9]{2})\\d{10}(\\d{2,3})?$/',
+				'switch'   => '/^(?:49(03(0[2-9]|3[5-9])|11(0[1-2]|7[4-9]|8[1-2])|36[0-9]{2})\\d{10}(\\d{2,3})?)|(?:564182\\d{10}(\\d{2,3})?)|(6(3(33[0-4][0-9])|759[0-9]{2})\\d{10}(\\d{2,3})?)$/',
+				'visa'     => '/^4\\d{12}(\\d{3})?$/',
+				'voyager'  => '/^8699[0-9]{11}$/'
+			),
+			'fast'   => '/^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$/'
+		);
+
+		if (is_array($_this->type)) {
+			foreach ($_this->type as $value) {
+				$_this->regex = $cards['all'][strtolower($value)];
+
+				if ($_this->_check()) {
+					return $_this->_luhn();
+				}
+			}
+		} elseif ($_this->type == 'all') {
+			foreach ($cards['all'] as $value) {
+				$_this->regex = $value;
+
+				if ($_this->_check()) {
+					return $_this->_luhn();
+				}
+			}
+		} else {
+			$_this->regex = $cards['fast'];
+
+			if ($_this->_check()) {
+				return $_this->_luhn();
+			}
+		}
+	}
+
+/**
+ * Used to compare 2 numeric values.
+ *
+ * @param mixed $check1 if string is passed for a string must also be passed for $check2
+ *    used as an array it must be passed as array('check1' => value, 'operator' => 'value', 'check2' -> value)
+ * @param string $operator Can be either a word or operand
+ *    is greater >, is less <, greater or equal >=
+ *    less or equal <=, is less <, equal to ==, not equal !=
+ * @param integer $check2 only needed if $check1 is a string
+ * @return boolean Success
+ * @access public
+ */
+	function comparison($check1, $operator = null, $check2 = null) {
+		if (is_array($check1)) {
+			extract($check1, EXTR_OVERWRITE);
+		}
+		$operator = str_replace(array(' ', "\t", "\n", "\r", "\0", "\x0B"), '', strtolower($operator));
+
+		switch ($operator) {
+			case 'isgreater':
+			case '>':
+				if ($check1 > $check2) {
+					return true;
+				}
+				break;
+			case 'isless':
+			case '<':
+				if ($check1 < $check2) {
+					return true;
+				}
+				break;
+			case 'greaterorequal':
+			case '>=':
+				if ($check1 >= $check2) {
+					return true;
+				}
+				break;
+			case 'lessorequal':
+			case '<=':
+				if ($check1 <= $check2) {
+					return true;
+				}
+				break;
+			case 'equalto':
+			case '==':
+				if ($check1 == $check2) {
+					return true;
+				}
+				break;
+			case 'notequal':
+			case '!=':
+				if ($check1 != $check2) {
+					return true;
+				}
+				break;
+			default:
+				$_this =& Validation::getInstance();
+				$_this->errors[] = __('You must define the $operator parameter for Validation::comparison()', true);
+				break;
+		}
+		return false;
+	}
+
+/**
+ * Used when a custom regular expression is needed.
+ *
+ * @param mixed $check When used as a string, $regex must also be a valid regular expression.
+ *								As and array: array('check' => value, 'regex' => 'valid regular expression')
+ * @param string $regex If $check is passed as a string, $regex must also be set to valid regular expression
+ * @return boolean Success
+ * @access public
+ */
+	function custom($check, $regex = null) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->regex = $regex;
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+		if ($_this->regex === null) {
+			$_this->errors[] = __('You must define a regular expression for Validation::custom()', true);
+			return false;
+		}
+		return $_this->_check();
+	}
+
+/**
+ * Date validation, determines if the string passed is a valid date.
+ * keys that expect full month, day and year will validate leap years
+ *
+ * @param string $check a valid date string
+ * @param mixed $format Use a string or an array of the keys below. Arrays should be passed as array('dmy', 'mdy', etc)
+ * 					Keys: dmy 27-12-2006 or 27-12-06 separators can be a space, period, dash, forward slash
+ * 							mdy 12-27-2006 or 12-27-06 separators can be a space, period, dash, forward slash
+ * 							ymd 2006-12-27 or 06-12-27 separators can be a space, period, dash, forward slash
+ * 							dMy 27 December 2006 or 27 Dec 2006
+ * 							Mdy December 27, 2006 or Dec 27, 2006 comma is optional
+ * 							My December 2006 or Dec 2006
+ * 							my 12/2006 separators can be a space, period, dash, forward slash
+ * @param string $regex If a custom regular expression is used this is the only validation that will occur.
+ * @return boolean Success
+ * @access public
+ */
+	function date($check, $format = 'ymd', $regex = null) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->regex = $regex;
+
+		if (!is_null($_this->regex)) {
+			return $_this->_check();
+		}
+
+		$regex['dmy'] = '%^(?:(?:31(\\/|-|\\.|\\x20)(?:0?[13578]|1[02]))\\1|(?:(?:29|30)(\\/|-|\\.|\\x20)(?:0?[1,3-9]|1[0-2])\\2))(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$|^(?:29(\\/|-|\\.|\\x20)0?2\\3(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:0?[1-9]|1\\d|2[0-8])(\\/|-|\\.|\\x20)(?:(?:0?[1-9])|(?:1[0-2]))\\4(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$%';
+		$regex['mdy'] = '%^(?:(?:(?:0?[13578]|1[02])(\\/|-|\\.|\\x20)31)\\1|(?:(?:0?[13-9]|1[0-2])(\\/|-|\\.|\\x20)(?:29|30)\\2))(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$|^(?:0?2(\\/|-|\\.|\\x20)29\\3(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00))))$|^(?:(?:0?[1-9])|(?:1[0-2]))(\\/|-|\\.|\\x20)(?:0?[1-9]|1\\d|2[0-8])\\4(?:(?:1[6-9]|[2-9]\\d)?\\d{2})$%';
+		$regex['ymd'] = '%^(?:(?:(?:(?:(?:1[6-9]|[2-9]\\d)?(?:0[48]|[2468][048]|[13579][26])|(?:(?:16|[2468][048]|[3579][26])00)))(\\/|-|\\.|\\x20)(?:0?2\\1(?:29)))|(?:(?:(?:1[6-9]|[2-9]\\d)?\\d{2})(\\/|-|\\.|\\x20)(?:(?:(?:0?[13578]|1[02])\\2(?:31))|(?:(?:0?[1,3-9]|1[0-2])\\2(29|30))|(?:(?:0?[1-9])|(?:1[0-2]))\\2(?:0?[1-9]|1\\d|2[0-8]))))$%';
+		$regex['dMy'] = '/^((31(?!\\ (Feb(ruary)?|Apr(il)?|June?|(Sep(?=\\b|t)t?|Nov)(ember)?)))|((30|29)(?!\\ Feb(ruary)?))|(29(?=\\ Feb(ruary)?\\ (((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))))|(0?[1-9])|1\\d|2[0-8])\\ (Jan(uary)?|Feb(ruary)?|Ma(r(ch)?|y)|Apr(il)?|Ju((ly?)|(ne?))|Aug(ust)?|Oct(ober)?|(Sep(?=\\b|t)t?|Nov|Dec)(ember)?)\\ ((1[6-9]|[2-9]\\d)\\d{2})$/';
+		$regex['Mdy'] = '/^(?:(((Jan(uary)?|Ma(r(ch)?|y)|Jul(y)?|Aug(ust)?|Oct(ober)?|Dec(ember)?)\\ 31)|((Jan(uary)?|Ma(r(ch)?|y)|Apr(il)?|Ju((ly?)|(ne?))|Aug(ust)?|Oct(ober)?|(Sept|Nov|Dec)(ember)?)\\ (0?[1-9]|([12]\\d)|30))|(Feb(ruary)?\\ (0?[1-9]|1\\d|2[0-8]|(29(?=,?\\ ((1[6-9]|[2-9]\\d)(0[48]|[2468][048]|[13579][26])|((16|[2468][048]|[3579][26])00)))))))\\,?\\ ((1[6-9]|[2-9]\\d)\\d{2}))$/';
+		$regex['My'] = '%^(Jan(uary)?|Feb(ruary)?|Ma(r(ch)?|y)|Apr(il)?|Ju((ly?)|(ne?))|Aug(ust)?|Oct(ober)?|(Sep(?=\\b|t)t?|Nov|Dec)(ember)?)[ /]((1[6-9]|[2-9]\\d)\\d{2})$%';
+		$regex['my'] = '%^(((0[123456789]|10|11|12)([- /.])(([1][9][0-9][0-9])|([2][0-9][0-9][0-9]))))$%';
+
+		$format = (is_array($format)) ? array_values($format) : array($format);
+		foreach ($format as $key) {
+			$_this->regex = $regex[$key];
+
+			if ($_this->_check() === true) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Time validation, determines if the string passed is a valid time.
+ * Validates time as 24hr (HH:MM) or am/pm ([H]H:MM[a|p]m)
+ * Does not allow/validate seconds.
+ *
+ * @param string $check a valid time string
+ * @return boolean Success
+ * @access public
+ */
+
+	function time($check) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->regex = '%^((0?[1-9]|1[012])(:[0-5]\d){0,2}([AP]M|[ap]m))$|^([01]\d|2[0-3])(:[0-5]\d){0,2}$%';
+		return $_this->_check();
+	}
+
+/**
+ * Boolean validation, determines if value passed is a boolean integer or true/false.
+ *
+ * @param string $check a valid boolean
+ * @return boolean Success
+ * @access public
+ */
+	function boolean($check) {
+		$booleanList = array(0, 1, '0', '1', true, false);
+		return in_array($check, $booleanList, true);
+	}
+
+/**
+ * Checks that a value is a valid decimal. If $places is null, the $check is allowed to be a scientific float
+ * If no decimal point is found a false will be returned. Both the sign and exponent are optional.
+ *
+ * @param integer $check The value the test for decimal
+ * @param integer $places if set $check value must have exactly $places after the decimal point
+ * @param string $regex If a custom regular expression is used this is the only validation that will occur.
+ * @return boolean Success
+ * @access public
+ */
+	function decimal($check, $places = null, $regex = null) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->regex = $regex;
+		$_this->check = $check;
+
+		if (is_null($_this->regex)) {
+			if (is_null($places)) {
+				$_this->regex = '/^[-+]?[0-9]*\\.{1}[0-9]+(?:[eE][-+]?[0-9]+)?$/';
+			} else {
+				$_this->regex = '/^[-+]?[0-9]*\\.{1}[0-9]{'.$places.'}$/';
+			}
+		}
+		return $_this->_check();
+	}
+
+/**
+ * Validates for an email address.
+ *
+ * @param string $check Value to check
+ * @param boolean $deep Perform a deeper validation (if true), by also checking availability of host
+ * @param string $regex Regex to use (if none it will use built in regex)
+ * @return boolean Success
+ * @access public
+ */
+	function email($check, $deep = false, $regex = null) {
+		$_this =& Validation::getInstance();
+		$_this->__reset();
+		$_this->check = $check;
+		$_this->regex = $regex;
+		$_this->deep = $deep;
+
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+
+		if (is_null($_this->regex)) {
+			$_this->regex = '/^[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&\'*+\/=?^_`{|}~-]+)*@' . $_this->__pattern['hostname'] . '$/i';
+		}
+		$return = $_this->_check();
+
+		if ($_this->deep === false || $_this->deep === null) {
+			return $return;
+		}
+
+		if ($return === true && preg_match('/@(' . $_this->__pattern['hostname'] . ')$/i', $_this->check, $regs)) {
+			if (function_exists('getmxrr') && getmxrr($regs[1], $mxhosts)) {
+				return true;
+			}
+			if (function_exists('checkdnsrr') && checkdnsrr($regs[1], 'MX')) {
+				return true;
+			}
+			return is_array(gethostbynamel($regs[1]));
+		}
+		return false;
+	}
+
+/**
+ * Check that value is exactly $comparedTo.
+ *
+ * @param mixed $check Value to check
+ * @param mixed $comparedTo Value to compare
+ * @return boolean Success
+ * @access public
+ */
+	function equalTo($check, $comparedTo) {
+		return ($check === $comparedTo);
+	}
+
+/**
+ * Check that value has a valid file extension.
+ *
+ * @param mixed $check Value to check
+ * @param array $extensions file extenstions to allow
+ * @return boolean Success
+ * @access public
+ */
+	function extension($check, $extensions = array('gif', 'jpeg', 'png', 'jpg')) {
+		if (is_array($check)) {
+			return Validation::extension(array_shift($check), $extensions);
+		}
+		$extension = strtolower(array_pop(explode('.', $check)));
+		foreach ($extensions as $value) {
+			if ($extension == strtolower($value)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Validation of an IP address.
+ *
+ * Valid IP version strings for type restriction are:
+ * - both: Check both IPv4 and IPv6, return true if the supplied address matches either version
+ * - IPv4: Version 4 (Eg: 127.0.0.1, 192.168.10.123, 203.211.24.8)
+ * - IPv6: Version 6 (Eg: ::1, 2001:0db8::1428:57ab)
+ *
+ * @param string $check The string to test.
+ * @param string $type The IP Version to test against
+ * @return boolean Success
+ * @access public
+ */
+	function ip($check, $type = 'both') {
+		$_this =& Validation::getInstance();
+		$success = false;
+		$type = strtolower($type);
+		if ($type === 'ipv4' || $type === 'both') {
+			$success |= $_this->_ipv4($check);
+		}
+		if ($type === 'ipv6' || $type === 'both') {
+			$success |= $_this->_ipv6($check);
+		}
+		return $success;
+	}
+
+/**
+ * Validation of IPv4 addresses.
+ *
+ * @param string $check IP Address to test
+ * @return boolean Success
+ * @access protected
+ */
+	function _ipv4($check) {
+		if (function_exists('filter_var')) {
+			return filter_var($check, FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV4)) !== false;
+		}
+		$this->__populateIp();
+		$this->check = $check;
+		$this->regex = '/^' . $this->__pattern['IPv4'] . '$/';
+		return $this->_check();
+	}
+
+/**
+ * Validation of IPv6 addresses.
+ *
+ * @param string $check IP Address to test
+ * @return boolean Success
+ * @access protected
+ */
+	function _ipv6($check) {
+		if (function_exists('filter_var')) {
+			return filter_var($check, FILTER_VALIDATE_IP, array('flags' => FILTER_FLAG_IPV6)) !== false;
+		}
+		$this->__populateIp();
+		$this->check = $check;
+		$this->regex = '/^' . $this->__pattern['IPv6'] . '$/';
+		return $this->_check();
+	}
+
+/**
+ * Checks whether the length of a string is greater or equal to a minimal length.
+ *
+ * @param string $check The string to test
+ * @param integer $min The minimal string length
+ * @return boolean Success
+ * @access public
+ */
+	function minLength($check, $min) {
+		$length = mb_strlen($check);
+		return ($length >= $min);
+	}
+
+/**
+ * Checks whether the length of a string is smaller or equal to a maximal length..
+ *
+ * @param string $check The string to test
+ * @param integer $max The maximal string length
+ * @return boolean Success
+ * @access public
+ */
+	function maxLength($check, $max) {
+		$length = mb_strlen($check);
+		return ($length <= $max);
+	}
+
+/**
+ * Checks that a value is a monetary amount.
+ *
+ * @param string $check Value to check
+ * @param string $symbolPosition Where symbol is located (left/right)
+ * @return boolean Success
+ * @access public
+ */
+	function money($check, $symbolPosition = 'left') {
+		$_this =& Validation::getInstance();
+		$_this->check = $check;
+
+		if ($symbolPosition == 'right') {
+			$_this->regex = '/^(?!0,?\d)(?:\d{1,3}(?:([, .])\d{3})?(?:\1\d{3})*|(?:\d+))((?!\1)[,.]\d{2})?(?<!\x{00a2})\p{Sc}?$/u';
+		} else {
+			$_this->regex = '/^(?!\x{00a2})\p{Sc}?(?!0,?\d)(?:\d{1,3}(?:([, .])\d{3})?(?:\1\d{3})*|(?:\d+))((?!\1)[,.]\d{2})?$/u';
+		}
+		return $_this->_check();
+	}
+
+/**
+ * Validate a multiple select.
+ *
+ * Valid Options
+ *
+ * - in => provide a list of choices that selections must be made from
+ * - max => maximun number of non-zero choices that can be made
+ * - min => minimum number of non-zero choices that can be made
+ *
+ * @param mixed $check Value to check
+ * @param mixed $options Options for the check.
+ * @return boolean Success
+ * @access public
+ */
+	function multiple($check, $options = array()) {
+		$defaults = array('in' => null, 'max' => null, 'min' => null);
+		$options = array_merge($defaults, $options);
+		$check = array_filter((array)$check);
+		if (empty($check)) {
+			return false;
+		}
+		if ($options['max'] && count($check) > $options['max']) {
+			return false;
+		}
+		if ($options['min'] && count($check) < $options['min']) {
+			return false;
+		}
+		if ($options['in'] && is_array($options['in'])) {
+			foreach ($check as $val) {
+				if (!in_array($val, $options['in'])) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+/**
+ * Checks if a value is numeric.
+ *
+ * @param string $check Value to check
+ * @return boolean Succcess
+ * @access public
+ */
+	function numeric($check) {
+		return is_numeric($check);
+	}
+
+/**
+ * Check that a value is a valid phone number.
+ *
+ * @param mixed $check Value to check (string or array)
+ * @param string $regex Regular expression to use
+ * @param string $country Country code (defaults to 'all')
+ * @return boolean Success
+ * @access public
+ */
+	function phone($check, $regex = null, $country = 'all') {
+		$_this =& Validation::getInstance();
+		$_this->check = $check;
+		$_this->regex = $regex;
+		$_this->country = $country;
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+
+		if (is_null($_this->regex)) {
+			switch ($_this->country) {
+				case 'us':
+				case 'all':
+				case 'can':
+				// includes all NANPA members. see http://en.wikipedia.org/wiki/North_American_Numbering_Plan#List_of_NANPA_countries_and_territories
+					$_this->regex  = '/^(?:\+?1)?[-. ]?\\(?[2-9][0-8][0-9]\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$/';
+				break;
+			}
+		}
+		if (empty($_this->regex)) {
+			return $_this->_pass('phone', $check, $country);
+		}
+		return $_this->_check();
+	}
+
+/**
+ * Checks that a given value is a valid postal code.
+ *
+ * @param mixed $check Value to check
+ * @param string $regex Regular expression to use
+ * @param string $country Country to use for formatting
+ * @return boolean Success
+ * @access public
+ */
+	function postal($check, $regex = null, $country = null) {
+		$_this =& Validation::getInstance();
+		$_this->check = $check;
+		$_this->regex = $regex;
+		$_this->country = $country;
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+		if (empty($country)) {
+			$_this->country = 'us';
+		}
+
+		if (is_null($_this->regex)) {
+			switch ($_this->country) {
+				case 'uk':
+					$_this->regex  = '/\\A\\b[A-Z]{1,2}[0-9][A-Z0-9]? [0-9][ABD-HJLNP-UW-Z]{2}\\b\\z/i';
+					break;
+				case 'ca':
+					$_this->regex  = '/\\A\\b[ABCEGHJKLMNPRSTVXY][0-9][A-Z] ?[0-9][A-Z][0-9]\\b\\z/i';
+					break;
+				case 'it':
+				case 'de':
+					$_this->regex  = '/^[0-9]{5}$/i';
+					break;
+				case 'be':
+					$_this->regex  = '/^[1-9]{1}[0-9]{3}$/i';
+					break;
+				case 'us':
+					$_this->regex  = '/\\A\\b[0-9]{5}(?:-[0-9]{4})?\\b\\z/i';
+					break;
+			}
+		}
+		if (empty($_this->regex)) {
+			return $_this->_pass('postal', $check, $country);
+		}
+		return $_this->_check();
+	}
+
+/**
+ * Validate that a number is in specified range.
+ * if $lower and $upper are not set, will return true if
+ * $check is a legal finite on this platform
+ *
+ * @param string $check Value to check
+ * @param integer $lower Lower limit
+ * @param integer $upper Upper limit
+ * @return boolean Success
+ * @access public
+ */
+	function range($check, $lower = null, $upper = null) {
+		if (!is_numeric($check)) {
+			return false;
+		}
+		if (isset($lower) && isset($upper)) {
+			return ($check > $lower && $check < $upper);
+		}
+		return is_finite($check);
+	}
+
+/**
+ * Checks that a value is a valid Social Security Number.
+ *
+ * @param mixed $check Value to check
+ * @param string $regex Regular expression to use
+ * @param string $country Country
+ * @return boolean Success
+ * @access public
+ */
+	function ssn($check, $regex = null, $country = null) {
+		$_this =& Validation::getInstance();
+		$_this->check = $check;
+		$_this->regex = $regex;
+		$_this->country = $country;
+		if (is_array($check)) {
+			$_this->_extract($check);
+		}
+
+		if (is_null($_this->regex)) {
+			switch ($_this->country) {
+				case 'dk':
+					$_this->regex  = '/\\A\\b[0-9]{6}-[0-9]{4}\\b\\z/i';
+					break;
+				case 'nl':
+					$_this->regex  = '/\\A\\b[0-9]{9}\\b\\z/i';
+					break;
+				case 'us':
+					$_this->regex  = '/\\A\\b[0-9]{3}-[0-9]{2}-[0-9]{4}\\b\\z/i';
+					break;
+			}
+		}
+		if (empty($_this->regex)) {
+			return $_this->_pass('ssn', $check, $country);
+		}
+		return $_this->_check();
+	}
+
+/**
+ * Checks that a value is a valid uuid - http://tools.ietf.org/html/rfc4122
+ * 
+ * @param string $check Value to check
+ * @return boolean Success
+ * @access public
+ */
+	function uuid($check) {
+		$_this =& Validation::getInstance();
+		$_this->check = $check;
+		$_this->regex = '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i';
+		return $_this->_check();
+	}
+
+/**
+ * Checks that a value is a valid URL according to http://www.w3.org/Addressing/URL/url-spec.txt
+ *
+ * The regex checks for the following component parts:
+ *
+ * - a valid, optional, scheme
+ * - a valid ip address OR
+ *   a valid domain name as defined by section 2.3.1 of http://www.ietf.org/rfc/rfc1035.txt
+ *   with an optional port number
+ * - an optional valid path
+ * - an optional query string (get parameters)
+ * - an optional fragment (anchor tag)
+ *
+ * @param string $check Value to check
+ * @param boolean $strict Require URL to be prefixed by a valid scheme (one of http(s)/ftp(s)/file/news/gopher)
+ * @return boolean Success
+ * @access public
+ */
+	function url($check, $strict = false) {
+		$_this =& Validation::getInstance();
+		$_this->__populateIp();
+		$_this->check = $check;
+		$validChars = '([' . preg_quote('!"$&\'()*+,-.@_:;=~[]') . '\/0-9a-z\p{L}\p{N}]|(%[0-9a-f]{2}))';
+		$_this->regex = '/^(?:(?:https?|ftps?|file|news|gopher):\/\/)' . (!empty($strict) ? '' : '?') .
+			'(?:' . $_this->__pattern['IPv4'] . '|\[' . $_this->__pattern['IPv6'] . '\]|' . $_this->__pattern['hostname'] . ')' .
+			'(?::[1-9][0-9]{0,4})?' .
+			'(?:\/?|\/' . $validChars . '*)?' .
+			'(?:\?' . $validChars . '*)?' .
+			'(?:#' . $validChars . '*)?$/iu';
+		return $_this->_check();
+	}
+
+/**
+ * Checks if a value is in a given list.
+ *
+ * @param string $check Value to check
+ * @param array $list List to check against
+ * @return boolean Succcess
+ * @access public
+ */
+	function inList($check, $list) {
+		return in_array($check, $list);
+	}
+
+/**
+ * Runs an user-defined validation.
+ *
+ * @param mixed $check value that will be validated in user-defined methods.
+ * @param object $object class that holds validation method
+ * @param string $method class method name for validation to run
+ * @param array $args arguments to send to method
+ * @return mixed user-defined class class method returns
+ * @access public
+ */
+	function userDefined($check, $object, $method, $args = null) {
+		return call_user_func_array(array(&$object, $method), array($check, $args));
+	}
+
+/**
+ * Attempts to pass unhandled Validation locales to a class starting with $classPrefix
+ * and ending with Validation.  For example $classPrefix = 'nl', the class would be
+ * `NlValidation`.
+ *
+ * @param string $method The method to call on the other class.
+ * @param mixed $check The value to check or an array of parameters for the method to be called.
+ * @param string $classPrefix The prefix for the class to do the validation.
+ * @return mixed Return of Passed method, false on failure
+ * @access protected
+ **/
+	function _pass($method, $check, $classPrefix) {
+		$className = ucwords($classPrefix) . 'Validation';
+		if (!class_exists($className)) {
+			trigger_error(sprintf(__('Could not find %s class, unable to complete validation.', true), $className), E_USER_WARNING);
+			return false;
+		}
+		if (!is_callable(array($className, $method))) {
+			trigger_error(sprintf(__('Method %s does not exist on %s unable to complete validation.', true), $method, $className), E_USER_WARNING);
+			return false;
+		}
+		$check = (array)$check;
+		return call_user_func_array(array($className, $method), $check);
+	}
+
+/**
+ * Runs a regular expression match.
+ *
+ * @return boolean Success of match
+ * @access protected
+ */
+	function _check() {
+		$_this =& Validation::getInstance();
+		if (preg_match($_this->regex, $_this->check)) {
+			$_this->error[] = false;
+			return true;
+		} else {
+			$_this->error[] = true;
+			return false;
+		}
+	}
+
+/**
+ * Get the values to use when value sent to validation method is
+ * an array.
+ *
+ * @param array $params Parameters sent to validation method
+ * @return void
+ * @access protected
+ */
+	function _extract($params) {
+		$_this =& Validation::getInstance();
+		extract($params, EXTR_OVERWRITE);
+
+		if (isset($check)) {
+			$_this->check = $check;
+		}
+		if (isset($regex)) {
+			$_this->regex = $regex;
+		}
+		if (isset($country)) {
+			$_this->country = mb_strtolower($country);
+		}
+		if (isset($deep)) {
+			$_this->deep = $deep;
+		}
+		if (isset($type)) {
+			$_this->type = $type;
+		}
+	}
+
+/**
+ * Luhn algorithm
+ *
+ * @see http://en.wikipedia.org/wiki/Luhn_algorithm
+ * @return boolean Success
+ * @access protected
+ */
+	function _luhn() {
+		$_this =& Validation::getInstance();
+		if ($_this->deep !== true) {
+			return true;
+		}
+		if ($_this->check == 0) {
+			return false;
+		}
+		$sum = 0;
+		$length = strlen($_this->check);
+
+		for ($position = 1 - ($length % 2); $position < $length; $position += 2) {
+			$sum += $_this->check[$position];
+		}
+
+		for ($position = ($length % 2); $position < $length; $position += 2) {
+			$number = $_this->check[$position] * 2;
+			$sum += ($number < 10) ? $number : $number - 9;
+		}
+
+		return ($sum % 10 == 0);
+	}
+
+/*
+ * Lazily popualate the IP address patterns used for validations
+ *
+ * @return void
+ * @access private
+ */
+	function __populateIp() {
+		if (!isset($this->__pattern['IPv6'])) {
+			$pattern  = '((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}';
+			$pattern .= '(:|((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})';
+			$pattern .= '|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})';
+			$pattern .= '(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)';
+			$pattern .= '{4}(:[0-9A-Fa-f]{1,4}){0,1}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2}))';
+			$pattern .= '{3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}';
+			$pattern .= '((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|';
+			$pattern .= '((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}';
+			$pattern .= '((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2}))';
+			$pattern .= '{3})?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)(:[0-9A-Fa-f]{1,4})';
+			$pattern .= '{0,4}((:((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)';
+			$pattern .= '|((:[0-9A-Fa-f]{1,4}){1,2})))|(:(:[0-9A-Fa-f]{1,4}){0,5}((:((25[0-5]|2[0-4]';
+			$pattern .= '\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|((:[0-9A-Fa-f]{1,4})';
+			$pattern .= '{1,2})))|(((25[0-5]|2[0-4]\d|[01]?\d{1,2})(\.(25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))(%.+)?';
+
+			$this->__pattern['IPv6'] = $pattern;
+		}
+		if (!isset($this->__pattern['IPv4'])) {
+			$pattern = '(?:(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])';
+			$this->__pattern['IPv4'] = $pattern;
+		}
+	}
+
+/**
+ * Reset internal variables for another validation run.
+ *
+ * @return void
+ * @access private
+ */
+	function __reset() {
+		$this->check = null;
+		$this->regex = null;
+		$this->country = null;
+		$this->deep = null;
+		$this->type = null;
+		$this->error = array();
+		$this->errors = array();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/html/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/html/default.ctp
new file mode 100644
index 000000000..61fb69bb0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/html/default.ctp
@@ -0,0 +1,26 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php
+$content = explode("\n", $content);
+
+foreach ($content as $line):
+	echo '<p> ' . $line . "</p>\n";
+endforeach;
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/text/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/text/default.ctp
new file mode 100644
index 000000000..574514c3f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/email/text/default.ctp
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo $content; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/sql_dump.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/sql_dump.ctp
new file mode 100644
index 000000000..7c51418c1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/elements/sql_dump.ctp
@@ -0,0 +1,61 @@
+<?php
+/**
+ * SQL Dump element.  Dumps out SQL log information 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('ConnectionManager') || Configure::read('debug') < 2) {
+	return false;
+}
+$noLogs = !isset($logs);
+if ($noLogs):
+	$sources = ConnectionManager::sourceList();
+
+	$logs = array();
+	foreach ($sources as $source):
+		$db =& ConnectionManager::getDataSource($source);
+		if (!$db->isInterfaceSupported('getLog')):
+			continue;
+		endif;
+		$logs[$source] = $db->getLog();
+	endforeach;
+endif;
+
+if ($noLogs || isset($_forced_from_dbo_)):
+	foreach ($logs as $source => $logInfo):
+		$text = $logInfo['count'] > 1 ? 'queries' : 'query';
+		printf(
+			'<table class="cake-sql-log" id="cakeSqlLog_%s" summary="Cake SQL Log" cellspacing="0" border = "0">',
+			preg_replace('/[^A-Za-z0-9_]/', '_', uniqid(time(), true))
+		);
+		printf('<caption>(%s) %s %s took %s ms</caption>', $source, $logInfo['count'], $text, $logInfo['time']);
+	?>
+	<thead>
+		<tr><th>Nr</th><th>Query</th><th>Error</th><th>Affected</th><th>Num. rows</th><th>Took (ms)</th></tr>
+	</thead>
+	<tbody>
+	<?php
+		foreach ($logInfo['log'] as $k => $i) :
+			echo "<tr><td>" . ($k + 1) . "</td><td>" . h($i['query']) . "</td><td>{$i['error']}</td><td style = \"text-align: right\">{$i['affected']}</td><td style = \"text-align: right\">{$i['numRows']}</td><td style = \"text-align: right\">{$i['took']}</td></tr>\n";
+		endforeach;
+	?>
+	</tbody></table>
+	<?php 
+	endforeach;
+else:
+	echo '<p>Encountered unexpected $logs cannot generate SQL log</p>';
+endif;
+?>
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error404.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error404.ctp
new file mode 100644
index 000000000..59f16626a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error404.ctp
@@ -0,0 +1,24 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php echo $name; ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The requested address %s was not found on this server.', true), "<strong>'{$message}'</strong>"); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error500.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error500.ctp
new file mode 100644
index 000000000..405e9ddae
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/error500.ctp
@@ -0,0 +1,24 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php echo $name; ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('An Internal Error Has Occurred.', true), "<strong>'{$message}'</strong>"); ?>
+</p>
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_action.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_action.ctp
new file mode 100644
index 000000000..edd29f477
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_action.ctp
@@ -0,0 +1,46 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php printf(__('Missing Method in %s', true), $controller); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The action %1$s is not defined in controller %2$s', true), '<em>' . $action . '</em>', '<em>' . $controller . '</em>'); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create %1$s%2$s in file: %3$s.', true), '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $controller;?> extends AppController {
+
+	var $name = '<?php echo $controllerName;?>';
+
+<strong>
+	function <?php echo $action;?>() {
+
+	}
+</strong>
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_action.ctp'); ?>
+</p>
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_class.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_class.ctp
new file mode 100644
index 000000000..206ec6d97
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_class.ctp
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Behavior Class'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The behavior class <em>%s</em> can not be found or does not exist.', true), $behaviorClass); ?>
+</p>
+<p  class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $behaviorClass;?> extends ModelBehavior {
+
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_class.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_file.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_file.ctp
new file mode 100644
index 000000000..8fae302c4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_behavior_file.ctp
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Behavior File'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The Behavior file %s can not be found or does not exist.', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
+</p>
+<p  class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $behaviorClass;?> extends ModelBehavior {
+
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_file.ctp'); ?>
+</p>
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_class.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_class.ctp
new file mode 100644
index 000000000..d591e118f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_class.ctp
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Component Class'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Component class %1$s in %2$s was not found.', true), '<em>' . $component . 'Component</em>', '<em>' . $controller . 'Controller</em>'); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class %s in file: %s', true), '<em>' . $component . 'Component</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $component;?>Component extends Object {<br />
+
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_class.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_file.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_file.ctp
new file mode 100644
index 000000000..51e57413a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_component_file.ctp
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Component File'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php __('The component file was not found.'); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class %s in file: %s', true), '<em>' . $component . 'Component</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $component;?>Component extends Object {<br />
+
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_file.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_connection.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_connection.ctp
new file mode 100644
index 000000000..d2aeb1963
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_connection.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Database Connection'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('%s requires a database connection', true), $model); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Confirm you have created the file : %s.', true), APP_DIR . DS . 'config' . DS . 'database.php'); ?>
+</p>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s.', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . basename(__FILE__)); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_controller.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_controller.ctp
new file mode 100644
index 000000000..606f2c020
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_controller.ctp
@@ -0,0 +1,40 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Controller'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('%s could not be found.', true), '<em>' . $controller . '</em>'); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class %s below in file: %s', true), '<em>' . $controller . '</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $controller;?> extends AppController {
+
+	var $name = '<?php echo $controllerName;?>';
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_controller.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_class.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_class.ctp
new file mode 100644
index 000000000..35289f7ba
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_class.ctp
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Helper Class'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The helper class <em>%s</em> can not be found or does not exist.', true), $helperClass); ?>
+</p>
+<p  class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $helperClass;?> extends AppHelper {
+
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_class.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_file.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_file.ctp
new file mode 100644
index 000000000..0f331c9a8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_helper_file.ctp
@@ -0,0 +1,39 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Helper File'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The helper file %s can not be found or does not exist.', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
+</p>
+<p  class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class below in file: %s', true), APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $helperClass;?> extends AppHelper {
+
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_file.ctp'); ?>
+</p>
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_layout.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_layout.ctp
new file mode 100644
index 000000000..fe5bbbbf9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_layout.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Layout'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The layout file %s can not be found or does not exist.', true), '<em>' . $file . '</em>'); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Confirm you have created the file: %s', true), '<em>' . $file . '</em>'); ?>
+</p>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_layout.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_model.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_model.ctp
new file mode 100644
index 000000000..f4211f9ca
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_model.ctp
@@ -0,0 +1,41 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Model'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('<em>%s</em> could not be found.', true), $model); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Create the class %s in file: %s', true), '<em>' . $model . '</em>', APP_DIR . DS . 'models' . DS . Inflector::underscore($model) . '.php'); ?>
+</p>
+<pre>
+&lt;?php
+class <?php echo $model;?> extends AppModel {
+
+	var $name = '<?php echo $model;?>';
+
+}
+?&gt;
+</pre>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_model.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_scaffolddb.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_scaffolddb.ctp
new file mode 100644
index 000000000..11848ec3a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_scaffolddb.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Database Connection'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php __('Scaffold requires a database connection'); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Confirm you have created the file: %s', true), APP_DIR . DS . 'config' . DS . 'database.php'); ?>
+</p>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_scaffolddb.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_table.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_table.ctp
new file mode 100644
index 000000000..cd60cee7d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_table.ctp
@@ -0,0 +1,28 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing Database Table'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Database table %1$s for model %2$s was not found.', true), '<em>' . $table . '</em>',  '<em>' . $model . '</em>'); ?>
+</p>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_table.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_view.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_view.ctp
new file mode 100644
index 000000000..e70897eba
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/missing_view.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Missing View'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('The view for %1$s%2$s was not found.', true), '<em>' . $controller . 'Controller::</em>', '<em>' . $action . '()</em>'); ?>
+</p>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('Confirm you have created the file: %s', true), $file); ?>
+</p>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_view.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/private_action.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/private_action.ctp
new file mode 100644
index 000000000..dbad2f0c2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/private_action.ctp
@@ -0,0 +1,28 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php printf(__('Private Method in %s', true), $controller); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php printf(__('%s%s cannot be accessed directly.', true), '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>'); ?>
+</p>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'private_action.ctp'); ?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/scaffold_error.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/scaffold_error.ctp
new file mode 100644
index 000000000..88b3a7a7d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/errors/scaffold_error.ctp
@@ -0,0 +1,35 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.errors
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h2><?php __('Scaffold Error'); ?></h2>
+<p class="error">
+	<strong><?php __('Error'); ?>: </strong>
+	<?php __('Method _scaffoldError in was not found in the controller'); ?>
+</p>
+<p class="notice">
+	<strong><?php __('Notice'); ?>: </strong>
+	<?php printf(__('If you want to customize this error message, create %s', true), APP_DIR . DS . 'views' . DS . 'errors' . DS . 'scaffold_error.ctp'); ?>
+</p>
+<pre>
+&lt;?php
+function _scaffoldError() {<br />
+
+}
+?&gt;
+</pre>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helper.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helper.php
new file mode 100644
index 000000000..b8bc471fe
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helper.php
@@ -0,0 +1,912 @@
+<?php
+/**
+ * Backend for helpers.
+ *
+ * Internal methods for the Helpers.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libs
+ */
+App::import('Core', 'Overloadable');
+
+/**
+ * Abstract base class for all other Helpers in CakePHP.
+ * Provides common methods and features.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view
+ */
+class Helper extends Overloadable {
+
+/**
+ * List of helpers used by this helper
+ *
+ * @var array
+ */
+	var $helpers = null;
+
+/**
+ * Base URL
+ *
+ * @var string
+ */
+	var $base = null;
+
+/**
+ * Webroot path
+ *
+ * @var string
+ */
+	var $webroot = null;
+
+/**
+ * The current theme name if any.
+ *
+ * @var string
+ */
+	var $theme = null;
+
+/**
+ * URL to current action.
+ *
+ * @var string
+ */
+	var $here = null;
+
+/**
+ * Parameter array.
+ *
+ * @var array
+ */
+	var $params = array();
+
+/**
+ * Current action.
+ *
+ * @var string
+ */
+	var $action = null;
+
+/**
+ * Plugin path
+ *
+ * @var string
+ */
+	var $plugin = null;
+
+/**
+ * POST data for models
+ *
+ * @var array
+ */
+	var $data = null;
+
+/**
+ * List of named arguments
+ *
+ * @var array
+ */
+	var $namedArgs = null;
+
+/**
+ * URL argument separator character
+ *
+ * @var string
+ */
+	var $argSeparator = null;
+
+/**
+ * Contains model validation errors of form post-backs
+ *
+ * @access public
+ * @var array
+ */
+	var $validationErrors = null;
+
+/**
+ * Holds tag templates.
+ *
+ * @access public
+ * @var array
+ */
+	var $tags = array();
+
+/**
+ * Holds the content to be cleaned.
+ *
+ * @access private
+ * @var mixed
+ */
+	var $__tainted = null;
+
+/**
+ * Holds the cleaned content.
+ *
+ * @access private
+ * @var mixed
+ */
+	var $__cleaned = null;
+
+/**
+ * Default overload methods
+ *
+ * @access protected
+ */
+	function get__($name) {}
+	function set__($name, $value) {}
+	function call__($method, $params) {
+		trigger_error(sprintf(__('Method %1$s::%2$s does not exist', true), get_class($this), $method), E_USER_WARNING);
+	}
+
+/**
+ * Parses tag templates into $this->tags.
+ *
+ * @param $name file name inside app/config to load.
+ * @return array merged tags from config/$name.php
+ * @access public
+ */
+	function loadConfig($name = 'tags') {
+		if (file_exists(CONFIGS . $name .'.php')) {
+			require(CONFIGS . $name .'.php');
+			if (isset($tags)) {
+				$this->tags = array_merge($this->tags, $tags);
+			}
+		}
+		return $this->tags;
+	}
+
+/**
+ * Finds URL for specified action.
+ *
+ * Returns a URL pointing at the provided parameters.
+ *
+ * @param mixed $url Either a relative string url like `/products/view/23` or
+ *    an array of url parameters.  Using an array for urls will allow you to leverage
+ *    the reverse routing features of CakePHP.
+ * @param boolean $full If true, the full base URL will be prepended to the result
+ * @return string  Full translated URL with base path.
+ * @access public
+ * @link http://book.cakephp.org/view/1448/url
+ */
+	function url($url = null, $full = false) {
+		return h(Router::url($url, $full));
+	}
+
+/**
+ * Checks if a file exists when theme is used, if no file is found default location is returned
+ *
+ * @param string $file The file to create a webroot path to.
+ * @return string Web accessible path to file.
+ * @access public
+ */
+	function webroot($file) {
+		$asset = explode('?', $file);
+		$asset[1] = isset($asset[1]) ? '?' . $asset[1] : null;
+		$webPath = "{$this->webroot}" . $asset[0];
+		$file = $asset[0];
+
+		if (!empty($this->theme)) {
+			$file = trim($file, '/');
+			$theme = $this->theme . '/';
+
+			if (DS === '\\') {
+				$file = str_replace('/', '\\', $file);
+			}
+
+			if (file_exists(Configure::read('App.www_root') . 'theme' . DS . $this->theme . DS  . $file)) {
+				$webPath = "{$this->webroot}theme/" . $theme . $asset[0];
+			} else {
+				$viewPaths = App::path('views');
+
+				foreach ($viewPaths as $viewPath) {
+					$path = $viewPath . 'themed'. DS . $this->theme . DS  . 'webroot' . DS  . $file;
+
+					if (file_exists($path)) {
+						$webPath = "{$this->webroot}theme/" . $theme . $asset[0];
+						break;
+					}
+				}
+			}
+		}
+		if (strpos($webPath, '//') !== false) {
+			return str_replace('//', '/', $webPath . $asset[1]);
+		}
+		return $webPath . $asset[1];
+	}
+
+/**
+ * Adds a timestamp to a file based resource based on the value of `Asset.timestamp` in
+ * Configure.  If Asset.timestamp is true and debug > 0, or Asset.timestamp == 'force'
+ * a timestamp will be added.
+ *
+ * @param string $path The file path to timestamp, the path must be inside WWW_ROOT
+ * @return string Path with a timestamp added, or not.
+ * @access public
+ */
+	function assetTimestamp($path) {
+		$timestampEnabled = (
+			(Configure::read('Asset.timestamp') === true && Configure::read() > 0) ||
+			Configure::read('Asset.timestamp') === 'force'
+		);
+		if (strpos($path, '?') === false && $timestampEnabled) {
+			$filepath = preg_replace('/^' . preg_quote($this->webroot, '/') . '/', '', $path);
+			$webrootPath = WWW_ROOT . str_replace('/', DS, $filepath);
+			if (file_exists($webrootPath)) {
+				return $path . '?' . @filemtime($webrootPath);
+			}
+			$segments = explode('/', ltrim($filepath, '/'));
+			if ($segments[0] === 'theme') {
+				$theme = $segments[1];
+				unset($segments[0], $segments[1]);
+				$themePath = App::themePath($theme) . 'webroot' . DS . implode(DS, $segments);
+				return $path . '?' . @filemtime($themePath);
+			} else {
+				$plugin = $segments[0];
+				unset($segments[0]);
+				$pluginPath = App::pluginPath($plugin) . 'webroot' . DS . implode(DS, $segments);
+				return $path . '?' . @filemtime($pluginPath);
+			}
+		}
+		return $path;
+	}
+
+/**
+ * Used to remove harmful tags from content.  Removes a number of well known XSS attacks
+ * from content.  However, is not guaranteed to remove all possiblities.  Escaping
+ * content is the best way to prevent all possible attacks.
+ *
+ * @param mixed $output Either an array of strings to clean or a single string to clean.
+ * @return cleaned content for output
+ * @access public
+ */
+	function clean($output) {
+		$this->__reset();
+		if (empty($output)) {
+			return null;
+		}
+		if (is_array($output)) {
+			foreach ($output as $key => $value) {
+				$return[$key] = $this->clean($value);
+			}
+			return $return;
+		}
+		$this->__tainted = $output;
+		$this->__clean();
+		return $this->__cleaned;
+	}
+
+/**
+ * Returns a space-delimited string with items of the $options array. If a
+ * key of $options array happens to be one of:
+ *
+ * - 'compact'
+ * - 'checked'
+ * - 'declare'
+ * - 'readonly'
+ * - 'disabled'
+ * - 'selected'
+ * - 'defer'
+ * - 'ismap'
+ * - 'nohref'
+ * - 'noshade'
+ * - 'nowrap'
+ * - 'multiple'
+ * - 'noresize'
+ *
+ * And its value is one of:
+ *
+ * - '1' (string)
+ * - 1 (integer)
+ * - true (boolean)
+ * - 'true' (string)
+ *
+ * Then the value will be reset to be identical with key's name.
+ * If the value is not one of these 3, the parameter is not output.
+ *
+ * 'escape' is a special option in that it controls the conversion of
+ *  attributes to their html-entity encoded equivalents.  Set to false to disable html-encoding.
+ *
+ * If value for any option key is set to `null` or `false`, that option will be excluded from output.
+ *
+ * @param array $options Array of options.
+ * @param array $exclude Array of options to be excluded, the options here will not be part of the return.
+ * @param string $insertBefore String to be inserted before options.
+ * @param string $insertAfter String to be inserted after options.
+ * @return string Composed attributes.
+ * @access public
+ */
+	function _parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
+		if (is_array($options)) {
+			$options = array_merge(array('escape' => true), $options);
+
+			if (!is_array($exclude)) {
+				$exclude = array();
+			}
+			$keys = array_diff(array_keys($options), array_merge($exclude, array('escape')));
+			$values = array_intersect_key(array_values($options), $keys);
+			$escape = $options['escape'];
+			$attributes = array();
+
+			foreach ($keys as $index => $key) {
+				if ($values[$index] !== false && $values[$index] !== null) {
+					$attributes[] = $this->__formatAttribute($key, $values[$index], $escape);
+				}
+			}
+			$out = implode(' ', $attributes);
+		} else {
+			$out = $options;
+		}
+		return $out ? $insertBefore . $out . $insertAfter : '';
+	}
+
+/**
+ * Formats an individual attribute, and returns the string value of the composed attribute.
+ * Works with minimized attributes that have the same value as their name such as 'disabled' and 'checked'
+ *
+ * @param string $key The name of the attribute to create
+ * @param string $value The value of the attribute to create.
+ * @return string The composed attribute.
+ * @access private
+ */
+	function __formatAttribute($key, $value, $escape = true) {
+		$attribute = '';
+		$attributeFormat = '%s="%s"';
+		$minimizedAttributes = array('compact', 'checked', 'declare', 'readonly', 'disabled',
+			'selected', 'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize');
+		if (is_array($value)) {
+			$value = '';
+		}
+
+		if (in_array($key, $minimizedAttributes)) {
+			if ($value === 1 || $value === true || $value === 'true' || $value === '1' || $value == $key) {
+				$attribute = sprintf($attributeFormat, $key, $key);
+			}
+		} else {
+			$attribute = sprintf($attributeFormat, $key, ($escape ? h($value) : $value));
+		}
+		return $attribute;
+	}
+
+/**
+ * Sets this helper's model and field properties to the dot-separated value-pair in $entity.
+ *
+ * @param mixed $entity A field name, like "ModelName.fieldName" or "ModelName.ID.fieldName"
+ * @param boolean $setScope Sets the view scope to the model specified in $tagValue
+ * @return void
+ * @access public
+ */
+	function setEntity($entity, $setScope = false) {
+		$view =& ClassRegistry::getObject('view');
+
+		if ($setScope) {
+			$view->modelScope = false;
+		} elseif (!empty($view->entityPath) && $view->entityPath == $entity) {
+			return;
+		}
+
+		if ($entity === null) {
+			$view->model = null;
+			$view->association = null;
+			$view->modelId = null;
+			$view->modelScope = false;
+			$view->entityPath = null;
+			return;
+		}
+
+		$view->entityPath = $entity;
+		$model = $view->model;
+		$sameScope = $hasField = false;
+		$parts = array_values(Set::filter(explode('.', $entity), true));
+
+		if (empty($parts)) {
+			return;
+		}
+
+		$count = count($parts);
+		if ($count === 1) {
+			$sameScope = true;
+		} else {
+			if (is_numeric($parts[0])) {
+				$sameScope = true;
+			}
+			$reverse = array_reverse($parts);
+			$field = array_shift($reverse);
+			while(!empty($reverse)) {
+				$subject = array_shift($reverse);
+				if (is_numeric($subject)) {
+					continue;
+				}
+				if (ClassRegistry::isKeySet($subject)) {
+					$model = $subject;
+					break;
+				}
+			}
+		}
+
+		if (ClassRegistry::isKeySet($model)) {
+			$ModelObj =& ClassRegistry::getObject($model);
+			for ($i = 0; $i < $count; $i++) {
+				if (
+					is_a($ModelObj, 'Model') && 
+					($ModelObj->hasField($parts[$i]) || 
+					array_key_exists($parts[$i], $ModelObj->validate))
+				) {
+					$hasField = $i;
+					if ($hasField === 0 || ($hasField === 1 && is_numeric($parts[0]))) {
+						$sameScope = true;
+					}
+					break;
+				}
+			}
+
+			if ($sameScope === true && in_array($parts[0], array_keys($ModelObj->hasAndBelongsToMany))) {
+				$sameScope = false;
+			}
+		}
+
+		if (!$view->association && $parts[0] == $view->field && $view->field != $view->model) {
+			array_unshift($parts, $model);
+			$hasField = true;
+		}
+		$view->field = $view->modelId = $view->fieldSuffix = $view->association = null;
+
+		switch (count($parts)) {
+			case 1:
+				if ($view->modelScope === false) {
+					$view->model = $parts[0];
+				} else {
+					$view->field = $parts[0];
+					if ($sameScope === false) {
+						$view->association = $parts[0];
+					}
+				}
+			break;
+			case 2:
+				if ($view->modelScope === false) {
+					list($view->model, $view->field) = $parts;
+				} elseif ($sameScope === true && $hasField === 0) {
+					list($view->field, $view->fieldSuffix) = $parts;
+				} elseif ($sameScope === true && $hasField === 1) {
+					list($view->modelId, $view->field) = $parts;
+				} else {
+					list($view->association, $view->field) = $parts;
+				}
+			break;
+			case 3:
+				if ($sameScope === true && $hasField === 1) {
+					list($view->modelId, $view->field, $view->fieldSuffix) = $parts;
+				} elseif ($hasField === 2) {
+					list($view->association, $view->modelId, $view->field) = $parts;
+				} else {
+					list($view->association, $view->field, $view->fieldSuffix) = $parts;
+				}
+			break;
+			case 4:
+				if ($parts[0] === $view->model) {
+					list($view->model, $view->modelId, $view->field, $view->fieldSuffix) = $parts;
+				} else {
+					list($view->association, $view->modelId, $view->field, $view->fieldSuffix) = $parts;
+				}
+			break;
+			default:
+				$reverse = array_reverse($parts);
+
+				if ($hasField) {
+						$view->field = $field;
+						if (!is_numeric($reverse[1]) && $reverse[1] != $model) {
+							$view->field = $reverse[1];
+							$view->fieldSuffix = $field;
+						}
+				}
+				if (is_numeric($parts[0])) {
+					$view->modelId = $parts[0];
+				} elseif ($view->model == $parts[0] && is_numeric($parts[1])) {
+					$view->modelId = $parts[1];
+				}
+				$view->association = $model;
+			break;
+		}
+
+		if (!isset($view->model) || empty($view->model)) {
+			$view->model = $view->association;
+			$view->association = null;
+		} elseif ($view->model === $view->association) {
+			$view->association = null;
+		}
+
+		if ($setScope) {
+			$view->modelScope = true;
+		}
+	}
+
+/**
+ * Gets the currently-used model of the rendering context.
+ *
+ * @return string
+ * @access public
+ */
+	function model() {
+		$view =& ClassRegistry::getObject('view');
+		if (!empty($view->association)) {
+			return $view->association;
+		} else {
+			return $view->model;
+		}
+	}
+
+/**
+ * Gets the ID of the currently-used model of the rendering context.
+ *
+ * @return mixed
+ * @access public
+ */
+	function modelID() {
+		$view =& ClassRegistry::getObject('view');
+		return $view->modelId;
+	}
+
+/**
+ * Gets the currently-used model field of the rendering context.
+ *
+ * @return string
+ * @access public
+ */
+	function field() {
+		$view =& ClassRegistry::getObject('view');
+		return $view->field;
+	}
+
+/**
+ * Returns false if given FORM field has no errors. Otherwise it returns the constant set in
+ * the array Model->validationErrors.
+ *
+ * @param string $model Model name as a string
+ * @param string $field Fieldname as a string
+ * @param integer $modelID Unique index identifying this record within the form
+ * @return boolean True on errors.
+ */
+	function tagIsInvalid($model = null, $field = null, $modelID = null) {
+		$view =& ClassRegistry::getObject('view');
+		$errors = $this->validationErrors;
+		$entity = $view->entity();
+		if (!empty($entity)) {
+			return Set::extract($errors, join('.', $entity));
+		}
+	}
+
+/**
+ * Generates a DOM ID for the selected element, if one is not set.
+ * Uses the current View::entity() settings to generate a CamelCased id attribute.
+ *
+ * @param mixed $options Either an array of html attributes to add $id into, or a string
+ *   with a view entity path to get a domId for.
+ * @param string $id The name of the 'id' attribute.
+ * @return mixed If $options was an array, an array will be returned with $id set.  If a string
+ *   was supplied, a string will be returned.
+ * @todo Refactor this method to not have as many input/output options.
+ */
+	function domId($options = null, $id = 'id') {
+		$view =& ClassRegistry::getObject('view');
+
+		if (is_array($options) && array_key_exists($id, $options) && $options[$id] === null) {
+			unset($options[$id]);
+			return $options;
+		} elseif (!is_array($options) && $options !== null) {
+			$this->setEntity($options);
+			return $this->domId();
+		}
+
+		$entity = $view->entity();
+		$model = array_shift($entity);
+		$dom = $model . join('', array_map(array('Inflector', 'camelize'), $entity));
+
+		if (is_array($options) && !array_key_exists($id, $options)) {
+			$options[$id] = $dom;
+		} elseif ($options === null) {
+			return $dom;
+		}
+		return $options;
+	}
+
+/**
+ * Gets the input field name for the current tag. Creates input name attributes
+ * using CakePHP's data[Model][field] formatting.
+ *
+ * @param mixed $options If an array, should be an array of attributes that $key needs to be added to.
+ *   If a string or null, will be used as the View entity.
+ * @param string $field
+ * @param string $key The name of the attribute to be set, defaults to 'name'
+ * @return mixed If an array was given for $options, an array with $key set will be returned.
+ *   If a string was supplied a string will be returned.
+ * @access protected
+ * @todo Refactor this method to not have as many input/output options.
+ */
+	function _name($options = array(), $field = null, $key = 'name') {
+		$view =& ClassRegistry::getObject('view');
+		if ($options === null) {
+			$options = array();
+		} elseif (is_string($options)) {
+			$field = $options;
+			$options = 0;
+		}
+
+		if (!empty($field)) {
+			$this->setEntity($field);
+		}
+
+		if (is_array($options) && array_key_exists($key, $options)) {
+			return $options;
+		}
+
+		switch ($field) {
+			case '_method':
+				$name = $field;
+			break;
+			default:
+				$name = 'data[' . implode('][', $view->entity()) . ']';
+			break;
+		}
+
+		if (is_array($options)) {
+			$options[$key] = $name;
+			return $options;
+		} else {
+			return $name;
+		}
+	}
+
+/**
+ * Gets the data for the current tag
+ *
+ * @param mixed $options If an array, should be an array of attributes that $key needs to be added to.
+ *   If a string or null, will be used as the View entity.
+ * @param string $field
+ * @param string $key The name of the attribute to be set, defaults to 'value'
+ * @return mixed If an array was given for $options, an array with $key set will be returned.
+ *   If a string was supplied a string will be returned.
+ * @access public
+ * @todo Refactor this method to not have as many input/output options.
+ */
+	function value($options = array(), $field = null, $key = 'value') {
+		if ($options === null) {
+			$options = array();
+		} elseif (is_string($options)) {
+			$field = $options;
+			$options = 0;
+		}
+
+		if (is_array($options) && isset($options[$key])) {
+			return $options;
+		}
+
+		if (!empty($field)) {
+			$this->setEntity($field);
+		}
+
+		$view =& ClassRegistry::getObject('view');
+		$result = null;
+
+		$entity = $view->entity();
+		if (!empty($this->data) && !empty($entity)) {
+			$result = Set::extract($this->data, join('.', $entity));
+		}
+
+		$habtmKey = $this->field();
+		if (empty($result) && isset($this->data[$habtmKey][$habtmKey]) && is_array($this->data[$habtmKey])) {
+			$result = $this->data[$habtmKey][$habtmKey];
+		} elseif (empty($result) && isset($this->data[$habtmKey]) && is_array($this->data[$habtmKey])) {
+			if (ClassRegistry::isKeySet($habtmKey)) {
+				$model =& ClassRegistry::getObject($habtmKey);
+				$result = $this->__selectedArray($this->data[$habtmKey], $model->primaryKey);
+			}
+		}
+
+		if (is_array($result)) {
+			if (array_key_exists($view->fieldSuffix, $result)) {
+				$result = $result[$view->fieldSuffix];
+			}
+		}
+
+		if (is_array($options)) {
+			if ($result === null && isset($options['default'])) {
+				$result = $options['default'];
+			}
+			unset($options['default']);
+		}
+
+		if (is_array($options)) {
+			$options[$key] = $result;
+			return $options;
+		} else {
+			return $result;
+		}
+	}
+
+/**
+ * Sets the defaults for an input tag.  Will set the
+ * name, value, and id attributes for an array of html attributes. Will also
+ * add a 'form-error' class if the field contains validation errors.
+ *
+ * @param string $field The field name to initialize.
+ * @param array $options Array of options to use while initializing an input field.
+ * @return array Array options for the form input.
+ * @access protected
+ */
+	function _initInputField($field, $options = array()) {
+		if ($field !== null) {
+			$this->setEntity($field);
+		}
+		$options = (array)$options;
+		$options = $this->_name($options);
+		$options = $this->value($options);
+		$options = $this->domId($options);
+		if ($this->tagIsInvalid()) {
+			$options = $this->addClass($options, 'form-error');
+		}
+		return $options;
+	}
+
+/**
+ * Adds the given class to the element options
+ *
+ * @param array $options Array options/attributes to add a class to
+ * @param string $class The classname being added.
+ * @param string $key the key to use for class.
+ * @return array Array of options with $key set.
+ * @access public
+ */
+	function addClass($options = array(), $class = null, $key = 'class') {
+		if (isset($options[$key]) && trim($options[$key]) != '') {
+			$options[$key] .= ' ' . $class;
+		} else {
+			$options[$key] = $class;
+		}
+		return $options;
+	}
+
+/**
+ * Returns a string generated by a helper method
+ *
+ * This method can be overridden in subclasses to do generalized output post-processing
+ *
+ * @param string $str String to be output.
+ * @return string
+ * @deprecated This method will be removed in future versions.
+ */
+	function output($str) {
+		return $str;
+	}
+
+/**
+ * Before render callback. beforeRender is called before the view file is rendered.
+ *
+ * Overridden in subclasses.
+ *
+ * @return void
+ * @access public
+ */
+	function beforeRender() {
+	}
+
+/**
+ * After render callback.  afterRender is called after the view file is rendered
+ * but before the layout has been rendered.
+ *
+ * Overridden in subclasses.
+ *
+ * @return void
+ * @access public
+ */
+	function afterRender() {
+	}
+
+/**
+ * Before layout callback.  beforeLayout is called before the layout is rendered.
+ *
+ * Overridden in subclasses.
+ *
+ * @return void
+ * @access public
+ */
+	function beforeLayout() {
+	}
+
+/**
+ * After layout callback.  afterLayout is called after the layout has rendered.
+ *
+ * Overridden in subclasses.
+ *
+ * @return void
+ * @access public
+ */
+	function afterLayout() {
+	}
+
+/**
+ * Transforms a recordset from a hasAndBelongsToMany association to a list of selected
+ * options for a multiple select element
+ *
+ * @param mixed $data
+ * @param string $key
+ * @return array
+ * @access private
+ */
+	function __selectedArray($data, $key = 'id') {
+		if (!is_array($data)) {
+			$model = $data;
+			if (!empty($this->data[$model][$model])) {
+				return $this->data[$model][$model];
+			}
+			if (!empty($this->data[$model])) {
+				$data = $this->data[$model];
+			}
+		}
+		$array = array();
+		if (!empty($data)) {
+			foreach ($data as $var) {
+				$array[$var[$key]] = $var[$key];
+			}
+		}
+		return $array;
+	}
+
+/**
+ * Resets the vars used by Helper::clean() to null
+ *
+ * @return void
+ * @access private
+ */
+	function __reset() {
+		$this->__tainted = null;
+		$this->__cleaned = null;
+	}
+
+/**
+ * Removes harmful content from output
+ *
+ * @return void
+ * @access private
+ */
+	function __clean() {
+		if (get_magic_quotes_gpc()) {
+			$this->__cleaned = stripslashes($this->__tainted);
+		} else {
+			$this->__cleaned = $this->__tainted;
+		}
+
+		$this->__cleaned = str_replace(array("&amp;", "&lt;", "&gt;"), array("&amp;amp;", "&amp;lt;", "&amp;gt;"), $this->__cleaned);
+		$this->__cleaned = preg_replace('#(&\#*\w+)[\x00-\x20]+;#u', "$1;", $this->__cleaned);
+		$this->__cleaned = preg_replace('#(&\#x*)([0-9A-F]+);*#iu', "$1$2;", $this->__cleaned);
+		$this->__cleaned = html_entity_decode($this->__cleaned, ENT_COMPAT, "UTF-8");
+		$this->__cleaned = preg_replace('#(<[^>]+[\x00-\x20\"\'\/])(on|xmlns)[^>]*>#iUu', "$1>", $this->__cleaned);
+		$this->__cleaned = preg_replace('#([a-z]*)[\x00-\x20]*=[\x00-\x20]*([\`\'\"]*)[\\x00-\x20]*j[\x00-\x20]*a[\x00-\x20]*v[\x00-\x20]*a[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iUu', '$1=$2nojavascript...', $this->__cleaned);
+		$this->__cleaned = preg_replace('#([a-z]*)[\x00-\x20]*=([\'\"]*)[\x00-\x20]*v[\x00-\x20]*b[\x00-\x20]*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:#iUu', '$1=$2novbscript...', $this->__cleaned);
+		$this->__cleaned = preg_replace('#([a-z]*)[\x00-\x20]*=*([\'\"]*)[\x00-\x20]*-moz-binding[\x00-\x20]*:#iUu','$1=$2nomozbinding...', $this->__cleaned);
+		$this->__cleaned = preg_replace('#([a-z]*)[\x00-\x20]*=([\'\"]*)[\x00-\x20]*data[\x00-\x20]*:#Uu', '$1=$2nodata...', $this->__cleaned);
+		$this->__cleaned = preg_replace('#(<[^>]+)style[\x00-\x20]*=[\x00-\x20]*([\`\'\"]*).*expression[\x00-\x20]*\([^>]*>#iU', "$1>", $this->__cleaned);
+		$this->__cleaned = preg_replace('#(<[^>]+)style[\x00-\x20]*=[\x00-\x20]*([\`\'\"]*).*behaviour[\x00-\x20]*\([^>]*>#iU', "$1>", $this->__cleaned);
+		$this->__cleaned = preg_replace('#(<[^>]+)style[\x00-\x20]*=[\x00-\x20]*([\`\'\"]*).*s[\x00-\x20]*c[\x00-\x20]*r[\x00-\x20]*i[\x00-\x20]*p[\x00-\x20]*t[\x00-\x20]*:*[^>]*>#iUu', "$1>", $this->__cleaned);
+		$this->__cleaned = preg_replace('#</*\w+:\w[^>]*>#i', "", $this->__cleaned);
+		do {
+			$oldstring = $this->__cleaned;
+			$this->__cleaned = preg_replace('#</*(applet|meta|xml|blink|link|style|script|embed|object|iframe|frame|frameset|ilayer|layer|bgsound|title|base)[^>]*>#i', "", $this->__cleaned);
+		} while ($oldstring != $this->__cleaned);
+		$this->__cleaned = str_replace(array("&amp;", "&lt;", "&gt;"), array("&amp;amp;", "&amp;lt;", "&amp;gt;"), $this->__cleaned);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/ajax.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/ajax.php
new file mode 100644
index 000000000..251ea7f18
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/ajax.php
@@ -0,0 +1,1036 @@
+<?php
+/**
+ * Helper for AJAX operations.
+ *
+ * Helps doing AJAX using the Prototype library.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * AjaxHelper helper library.
+ *
+ * Helps doing AJAX using the Prototype library.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1358/AJAX
+ */
+class AjaxHelper extends AppHelper {
+
+/**
+ * Included helpers.
+ *
+ * @var array
+ */
+	var $helpers = array('Html', 'Javascript', 'Form');
+
+/**
+ * HtmlHelper instance
+ *
+ * @var HtmlHelper
+ * @access public
+ */
+	var $Html = null;
+
+/**
+ * JavaScriptHelper instance
+ *
+ * @var JavaScriptHelper
+ * @access public
+ */
+	var $Javascript = null;
+
+/**
+ * Names of Javascript callback functions.
+ *
+ * @var array
+ */
+	var $callbacks = array(
+		'complete', 'create', 'exception', 'failure', 'interactive', 'loading',
+		'loaded', 'success', 'uninitialized'
+	);
+
+/**
+ * Names of AJAX options.
+ *
+ * @var array
+ */
+	var $ajaxOptions = array(
+		'after', 'asynchronous', 'before', 'confirm', 'condition', 'contentType', 'encoding',
+		'evalScripts', 'failure', 'fallback', 'form', 'indicator', 'insertion', 'interactive',
+		'loaded', 'loading', 'method', 'onCreate', 'onComplete', 'onException', 'onFailure',
+		'onInteractive', 'onLoaded', 'onLoading', 'onSuccess', 'onUninitialized', 'parameters',
+		'position', 'postBody', 'requestHeaders', 'success', 'type', 'update', 'with'
+	);
+
+/**
+ * Options for draggable.
+ *
+ * @var array
+ */
+	var $dragOptions = array(
+		'handle', 'revert', 'snap', 'zindex', 'constraint', 'change', 'ghosting',
+		'starteffect', 'reverteffect', 'endeffect', 'scroll', 'scrollSensitivity',
+		'onStart', 'onDrag', 'onEnd'
+	);
+
+/**
+ * Options for droppable.
+ *
+ * @var array
+ */
+	var $dropOptions = array(
+		'accept', 'containment', 'greedy', 'hoverclass', 'onHover', 'onDrop', 'overlap'
+	);
+
+/**
+ * Options for sortable.
+ *
+ * @var array
+ */
+	var $sortOptions = array(
+		'constraint', 'containment', 'dropOnEmpty', 'ghosting', 'handle', 'hoverclass', 'onUpdate',
+		'onChange', 'only', 'overlap', 'scroll', 'scrollSensitivity', 'scrollSpeed', 'tag', 'tree',
+		'treeTag', 'update'
+	);
+
+/**
+ * Options for slider.
+ *
+ * @var array
+ */
+	var $sliderOptions = array(
+		'alignX', 'alignY', 'axis', 'disabled', 'handleDisabled', 'handleImage', 'increment',
+		'maximum', 'minimum', 'onChange', 'onSlide', 'range', 'sliderValue', 'values'
+	);
+
+/**
+ * Options for in-place editor.
+ *
+ * @var array
+ */
+	var $editorOptions = array(
+		'okText', 'cancelText', 'savingText', 'formId', 'externalControl', 'rows', 'cols', 'size',
+		'highlightcolor', 'highlightendcolor', 'savingClassName', 'formClassName', 'loadTextURL',
+		'loadingText', 'callback', 'ajaxOptions', 'clickToEditText', 'collection', 'okControl',
+		'cancelControl', 'submitOnBlur'
+	);
+
+/**
+ * Options for auto-complete editor.
+ *
+ * @var array
+ */
+	var $autoCompleteOptions = array(
+		'afterUpdateElement', 'callback', 'frequency', 'indicator', 'minChars', 'onShow', 'onHide',
+		'parameters', 'paramName', 'tokens', 'updateElement'
+	);
+
+/**
+ * Output buffer for Ajax update content
+ *
+ * @var array
+ */
+	var $__ajaxBuffer = array();
+
+/**
+ * Returns link to remote action
+ *
+ * Returns a link to a remote action defined by <i>options[url]</i>
+ * (using the url() format) that's called in the background using
+ * XMLHttpRequest. The result of that request can then be inserted into a
+ * DOM object whose id can be specified with <i>options[update]</i>.
+ *
+ * Examples:
+ * <code>
+ *  link("Delete this post",
+ * array("update" => "posts", "url" => "delete/{$postid->id}"));
+ *  link(imageTag("refresh"),
+ *		array("update" => "emails", "url" => "list_emails" ));
+ * </code>
+ *
+ * By default, these remote requests are processed asynchronous during
+ * which various callbacks can be triggered (for progress indicators and
+ * the likes).
+ *
+ * Example:
+ * <code>
+ *	link (word,
+ *		array("url" => "undo", "n" => word_counter),
+ *		array("complete" => "undoRequestCompleted(request)"));
+ * </code>
+ *
+ * The callbacks that may be specified are:
+ *
+ * - <i>loading</i>::		Called when the remote document is being
+ *							loaded with data by the browser.
+ * - <i>loaded</i>::		Called when the browser has finished loading
+ *							the remote document.
+ * - <i>interactive</i>::	Called when the user can interact with the
+ *							remote document, even though it has not
+ *							finished loading.
+ * - <i>complete</i>:: Called when the XMLHttpRequest is complete.
+ *
+ * If you for some reason or another need synchronous processing (that'll
+ * block the browser while the request is happening), you can specify
+ * <i>options[type] = synchronous</i>.
+ *
+ * You can customize further browser side call logic by passing
+ * in Javascript code snippets via some optional parameters. In
+ * their order of use these are:
+ *
+ * - <i>confirm</i>:: Adds confirmation dialog.
+ * -<i>condition</i>::	Perform remote request conditionally
+ *                      by this expression. Use this to
+ *                      describe browser-side conditions when
+ *                      request should not be initiated.
+ * - <i>before</i>::		Called before request is initiated.
+ * - <i>after</i>::		Called immediately after request was
+ *						initiated and before <i>loading</i>.
+ *
+ * @param string $title Title of link
+ * @param mixed $url Cake-relative URL or array of URL parameters, or external URL (starts with http://)
+ * @param array $options Options for JavaScript function
+ * @param string $confirm Confirmation message. Calls up a JavaScript confirm() message.
+ *
+ * @return string HTML code for link to remote action
+ * @link http://book.cakephp.org/view/1363/link
+ */
+	function link($title, $url = null, $options = array(), $confirm = null) {
+		if (!isset($url)) {
+			$url = $title;
+		}
+		if (!isset($options['url'])) {
+			$options['url'] = $url;
+		}
+
+		if (!empty($confirm)) {
+			$options['confirm'] = $confirm;
+			unset($confirm);
+		}
+		$htmlOptions = $this->__getHtmlOptions($options, array('url'));
+		$options += array('safe' => true);
+
+		unset($options['escape']);
+		if (empty($options['fallback']) || !isset($options['fallback'])) {
+			$options['fallback'] = $url;
+		}
+		$htmlDefaults = array('id' => 'link' . intval(mt_rand()), 'onclick' => '');
+		$htmlOptions = array_merge($htmlDefaults, $htmlOptions);
+
+		$htmlOptions['onclick'] .= ' event.returnValue = false; return false;';
+		$return = $this->Html->link($title, $url, $htmlOptions);
+		$callback = $this->remoteFunction($options);
+		$script = $this->Javascript->event("'{$htmlOptions['id']}'", "click", $callback);
+
+		if (is_string($script)) {
+			$return .= $script;
+		}
+		return $return;
+	}
+
+/**
+ * Creates JavaScript function for remote AJAX call
+ *
+ * This function creates the javascript needed to make a remote call
+ * it is primarily used as a helper for AjaxHelper::link.
+ *
+ * @param array $options options for javascript
+ * @return string html code for link to remote action
+ * @see AjaxHelper::link() for docs on options parameter.
+ * @link http://book.cakephp.org/view/1364/remoteFunction
+ */
+	function remoteFunction($options) {
+		if (isset($options['update'])) {
+			if (!is_array($options['update'])) {
+				$func = "new Ajax.Updater('{$options['update']}',";
+			} else {
+				$func = "new Ajax.Updater(document.createElement('div'),";
+			}
+			if (!isset($options['requestHeaders'])) {
+				$options['requestHeaders'] = array();
+			}
+			if (is_array($options['update'])) {
+				$options['update'] = implode(' ', $options['update']);
+			}
+			$options['requestHeaders']['X-Update'] = $options['update'];
+		} else {
+			$func = "new Ajax.Request(";
+		}
+
+		$url = isset($options['url']) ? $options['url'] : "";
+		if (empty($options['safe'])) {
+			$url = $this->url($url);
+		} else {
+			$url = Router::url($url);
+		}
+
+		$func .= "'" . $url . "'";
+		$func .= ", " . $this->__optionsForAjax($options) . ")";
+
+		if (isset($options['before'])) {
+			$func = "{$options['before']}; $func";
+		}
+		if (isset($options['after'])) {
+			$func = "$func; {$options['after']};";
+		}
+		if (isset($options['condition'])) {
+			$func = "if ({$options['condition']}) { $func; }";
+		}
+
+		if (isset($options['confirm'])) {
+			$func = "if (confirm('" . $this->Javascript->escapeString($options['confirm'])
+				. "')) { $func; } else { event.returnValue = false; return false; }";
+		}
+		return $func;
+	}
+
+/**
+ * Periodically call remote url via AJAX.
+ *
+ * Periodically calls the specified url (<i>options[url]</i>) every <i>options[frequency]</i>
+ * seconds (default is 10).  Usually used to update a specified div (<i>options[update]</i>) with
+ * the results of the remote call.  The options for specifying the target with url and defining
+ * callbacks is the same as AjaxHelper::link().
+ *
+ * @param array $options Callback options
+ * @return string Javascript code
+ * @see AjaxHelper::link()
+ * @link http://book.cakephp.org/view/1365/remoteTimer
+ */
+	function remoteTimer($options = null) {
+		$frequency = (isset($options['frequency'])) ? $options['frequency'] : 10;
+		$callback = $this->remoteFunction($options);
+		$code = "new PeriodicalExecuter(function(pe) {{$callback}}, $frequency)";
+		return $this->Javascript->codeBlock($code);
+	}
+
+/**
+ * Returns form tag that will submit using Ajax.
+ *
+ * Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
+ * reloading POST arrangement. Even though it's using Javascript to serialize the form elements,
+ * the form submission will work just like a regular submission as viewed by the receiving side
+ * (all elements available in params).  The options for defining callbacks is the same
+ * as AjaxHelper::link().
+ *
+ * @param mixed $params Either a string identifying the form target, or an array of method parameters, including:
+ *  - 'params' => Acts as the form target
+ *  - 'type' => 'post' or 'get'
+ *  - 'options' => An array containing all HTML and script options used to
+ *  generate the form tag and Ajax request.
+ * @param array $type How form data is posted: 'get' or 'post'
+ * @param array $options Callback/HTML options
+ * @return string JavaScript/HTML code
+ * @see AjaxHelper::link()
+ * @link http://book.cakephp.org/view/1366/form
+ */
+	function form($params = null, $type = 'post', $options = array()) {
+		$model = false;
+		if (is_array($params)) {
+			extract($params, EXTR_OVERWRITE);
+		}
+
+		if (empty($options['url'])) {
+			$options['url'] = array('action' => $params);
+		}
+
+		$htmlDefaults = array(
+			'id' => 'form' . intval(mt_rand()),
+			'onsubmit'	=> "event.returnValue = false; return false;",
+			'type' => $type
+		);
+		$htmlOptions = $this->__getHtmlOptions($options, array('model', 'with'));
+		$htmlOptions = array_merge($htmlDefaults, $htmlOptions);
+
+		$defaults = array('model' => $model, 'with' => "Form.serialize('{$htmlOptions['id']}')");
+		$options = array_merge($defaults, $options);
+		$callback = $this->remoteFunction($options);
+
+		$form = $this->Form->create($options['model'], $htmlOptions);
+		$script = $this->Javascript->event("'" . $htmlOptions['id']. "'", 'submit', $callback);
+		return $form . $script;
+	}
+
+/**
+ * Returns a button input tag that will submit using Ajax
+ *
+ * Returns a button input tag that will submit form using XMLHttpRequest in the background instead
+ * of regular reloading POST arrangement. <i>options</i> argument is the same as
+ * in AjaxHelper::form().
+ *
+ * @param string $title Input button title
+ * @param array $options Callback options
+ * @return string Ajaxed input button
+ * @see AjaxHelper::form()
+ * @link http://book.cakephp.org/view/1367/submit
+ */
+	function submit($title = 'Submit', $options = array()) {
+		$htmlOptions = $this->__getHtmlOptions($options);
+		$htmlOptions['value'] = $title;
+
+		if (!isset($options['with'])) {
+			$options['with'] = 'Form.serialize(Event.element(event).form)';
+		}
+		if (!isset($htmlOptions['id'])) {
+			$htmlOptions['id'] = 'submit' . intval(mt_rand());
+		}
+
+		$htmlOptions['onclick'] = "event.returnValue = false; return false;";
+		$callback = $this->remoteFunction($options);
+
+		$form = $this->Form->submit($title, $htmlOptions);
+		$script = $this->Javascript->event('"' . $htmlOptions['id'] . '"', 'click', $callback);
+		return $form . $script;
+	}
+
+/**
+ * Observe field and call ajax on change.
+ *
+ * Observes the field with the DOM ID specified by <i>field</i> and makes
+ * an Ajax when its contents have changed.
+ *
+ * Required +options+ are:
+ * - <i>frequency</i>:: The frequency (in seconds) at which changes to
+ *						this field will be detected.
+ * - <i>url</i>::		@see url() -style options for the action to call
+ *						when the field has changed.
+ *
+ * Additional options are:
+ * - <i>update</i>::	Specifies the DOM ID of the element whose
+ *						innerHTML should be updated with the
+ *						XMLHttpRequest response text.
+ * - <i>with</i>:: A Javascript expression specifying the
+ *						parameters for the XMLHttpRequest. This defaults
+ *						to Form.Element.serialize('$field'), which can be
+ *						accessed from params['form']['field_id'].
+ *
+ * Additionally, you may specify any of the options documented in
+ * @see linkToRemote().
+ *
+ * @param string $field DOM ID of field to observe
+ * @param array $options ajax options
+ * @return string ajax script
+ * @link http://book.cakephp.org/view/1368/observeField
+ */
+	function observeField($field, $options = array()) {
+		if (!isset($options['with'])) {
+			$options['with'] = 'Form.Element.serialize(\'' . $field . '\')';
+		}
+		$observer = 'Observer';
+		if (!isset($options['frequency']) || intval($options['frequency']) == 0) {
+			$observer = 'EventObserver';
+		}
+		return $this->Javascript->codeBlock(
+			$this->_buildObserver('Form.Element.' . $observer, $field, $options)
+		);
+	}
+
+/**
+ * Observe entire form and call ajax on change.
+ *
+ * Like @see observeField(), but operates on an entire form identified by the
+ * DOM ID <b>form</b>. <b>options</b> are the same as <b>observeField</b>, except
+ * the default value of the <i>with</i> option evaluates to the
+ * serialized (request string) value of the form.
+ *
+ * @param string $form DOM ID of form to observe
+ * @param array $options ajax options
+ * @return string ajax script
+ * @link http://book.cakephp.org/view/1369/observeForm
+ */
+	function observeForm($form, $options = array()) {
+		if (!isset($options['with'])) {
+			$options['with'] = 'Form.serialize(\'' . $form . '\')';
+		}
+		$observer = 'Observer';
+		if (!isset($options['frequency']) || intval($options['frequency']) == 0) {
+			$observer = 'EventObserver';
+		}
+		return $this->Javascript->codeBlock(
+			$this->_buildObserver('Form.' . $observer, $form, $options)
+		);
+	}
+
+/**
+ * Create a text field with Autocomplete.
+ *
+ * Creates an autocomplete field with the given ID and options.
+ *
+ * options['with'] defaults to "Form.Element.serialize('$field')",
+ * but can be any valid javascript expression defining the additional fields.
+ *
+ * @param string $field DOM ID of field to observe
+ * @param string $url URL for the autocomplete action
+ * @param array $options Ajax options
+ * @return string Ajax script
+ * @link http://book.cakephp.org/view/1370/autoComplete
+ */
+	function autoComplete($field, $url = "", $options = array()) {
+		$var = '';
+		if (isset($options['var'])) {
+			$var = 'var ' . $options['var'] . ' = ';
+			unset($options['var']);
+		}
+
+		if (!isset($options['id'])) {
+			$options['id'] = Inflector::camelize(str_replace(".", "_", $field));
+		}
+
+		$divOptions = array(
+			'id' => $options['id'] . "_autoComplete",
+			'class' => isset($options['class']) ? $options['class'] : 'auto_complete'
+		);
+
+		if (isset($options['div_id'])) {
+			$divOptions['id'] = $options['div_id'];
+			unset($options['div_id']);
+		}
+
+		$htmlOptions = $this->__getHtmlOptions($options);
+		$htmlOptions['autocomplete'] = "off";
+
+		foreach ($this->autoCompleteOptions as $opt) {
+			unset($htmlOptions[$opt]);
+		}
+
+		if (isset($options['tokens'])) {
+			if (is_array($options['tokens'])) {
+				$options['tokens'] = $this->Javascript->object($options['tokens']);
+			} else {
+				$options['tokens'] = '"' . $options['tokens'] . '"';
+			}
+		}
+
+		$options = $this->_optionsToString($options, array('paramName', 'indicator'));
+		$options = $this->_buildOptions($options, $this->autoCompleteOptions);
+
+		$text = $this->Form->text($field, $htmlOptions);
+		$div = $this->Html->div(null, '', $divOptions);
+		$script = "{$var}new Ajax.Autocompleter('{$htmlOptions['id']}', '{$divOptions['id']}', '";
+		$script .= $this->Html->url($url) . "', {$options});";
+
+		return  "{$text}\n{$div}\n" . $this->Javascript->codeBlock($script);
+	}
+
+/**
+ * Creates an Ajax-updateable DIV element
+ *
+ * @param string $id options for javascript
+ * @return string HTML code
+ */
+	function div($id, $options = array()) {
+		if (env('HTTP_X_UPDATE') != null) {
+			$this->Javascript->enabled = false;
+			$divs = explode(' ', env('HTTP_X_UPDATE'));
+
+			if (in_array($id, $divs)) {
+				@ob_end_clean();
+				ob_start();
+				return '';
+			}
+		}
+		$attr = $this->_parseAttributes(array_merge($options, array('id' => $id)));
+		return sprintf($this->Html->tags['blockstart'], $attr);
+	}
+
+/**
+ * Closes an Ajax-updateable DIV element
+ *
+ * @param string $id The DOM ID of the element
+ * @return string HTML code
+ */
+	function divEnd($id) {
+		if (env('HTTP_X_UPDATE') != null) {
+			$divs = explode(' ', env('HTTP_X_UPDATE'));
+			if (in_array($id, $divs)) {
+				$this->__ajaxBuffer[$id] = ob_get_contents();
+				ob_end_clean();
+				ob_start();
+				return '';
+			}
+		}
+		return $this->Html->tags['blockend'];
+	}
+
+/**
+ * Detects Ajax requests
+ *
+ * @return boolean True if the current request is a Prototype Ajax update call
+ * @link http://book.cakephp.org/view/1371/isAjax
+ */
+	function isAjax() {
+		return (isset($this->params['isAjax']) && $this->params['isAjax'] === true);
+	}
+
+/**
+ * Creates a draggable element.  For a reference on the options for this function,
+ * check out http://github.com/madrobby/scriptaculous/wikis/draggable
+ *
+ * @param unknown_type $id
+ * @param array $options
+ * @return unknown
+ * @link http://book.cakephp.org/view/1372/drag-drop
+ */
+	function drag($id, $options = array()) {
+		$var = '';
+		if (isset($options['var'])) {
+			$var = 'var ' . $options['var'] . ' = ';
+			unset($options['var']);
+		}
+		$options = $this->_buildOptions(
+			$this->_optionsToString($options, array('handle', 'constraint')), $this->dragOptions
+		);
+		return $this->Javascript->codeBlock("{$var}new Draggable('$id', " .$options . ");");
+	}
+
+/**
+ * For a reference on the options for this function, check out
+ * http://github.com/madrobby/scriptaculous/wikis/droppables
+ *
+ * @param unknown_type $id
+ * @param array $options
+ * @return string
+ * @link http://book.cakephp.org/view/1372/drag-drop
+ */
+	function drop($id, $options = array()) {
+		$optionsString = array('overlap', 'hoverclass');
+		if (!isset($options['accept']) || !is_array($options['accept'])) {
+			$optionsString[] = 'accept';
+		} else if (isset($options['accept'])) {
+			$options['accept'] = $this->Javascript->object($options['accept']);
+		}
+		$options = $this->_buildOptions(
+			$this->_optionsToString($options, $optionsString), $this->dropOptions
+		);
+		return $this->Javascript->codeBlock("Droppables.add('{$id}', {$options});");
+	}
+
+/**
+ * Make an element with the given $id droppable, and trigger an Ajax call when a draggable is
+ * dropped on it.
+ *
+ * For a reference on the options for this function, check out
+ * http://wiki.script.aculo.us/scriptaculous/show/Droppables.add
+ *
+ * @param string $id
+ * @param array $options
+ * @param array $ajaxOptions
+ * @return string JavaScript block to create a droppable element
+ */
+	function dropRemote($id, $options = array(), $ajaxOptions = array()) {
+		$callback = $this->remoteFunction($ajaxOptions);
+		$options['onDrop'] = "function(element, droppable, event) {{$callback}}";
+		$optionsString = array('overlap', 'hoverclass');
+
+		if (!isset($options['accept']) || !is_array($options['accept'])) {
+			$optionsString[] = 'accept';
+		} else if (isset($options['accept'])) {
+			$options['accept'] = $this->Javascript->object($options['accept']);
+		}
+
+		$options = $this->_buildOptions(
+			$this->_optionsToString($options, $optionsString),
+			$this->dropOptions
+		);
+		return $this->Javascript->codeBlock("Droppables.add('{$id}', {$options});");
+	}
+
+/**
+ * Makes a slider control.
+ *
+ * @param string $id DOM ID of slider handle
+ * @param string $trackId DOM ID of slider track
+ * @param array $options Array of options to control the slider
+ * @link          http://github.com/madrobby/scriptaculous/wikis/slider
+ * @link http://book.cakephp.org/view/1373/slider
+ */
+	function slider($id, $trackId, $options = array()) {
+		if (isset($options['var'])) {
+			$var = 'var ' . $options['var'] . ' = ';
+			unset($options['var']);
+		} else {
+			$var = 'var ' . $id . ' = ';
+		}
+
+		$options = $this->_optionsToString($options, array(
+			'axis', 'handleImage', 'handleDisabled'
+		));
+		$callbacks = array('change', 'slide');
+
+		foreach ($callbacks as $callback) {
+			if (isset($options[$callback])) {
+				$call = $options[$callback];
+				$options['on' . ucfirst($callback)] = "function(value) {{$call}}";
+				unset($options[$callback]);
+			}
+		}
+
+		if (isset($options['values']) && is_array($options['values'])) {
+			$options['values'] = $this->Javascript->object($options['values']);
+		}
+
+		$options = $this->_buildOptions($options, $this->sliderOptions);
+		$script = "{$var}new Control.Slider('$id', '$trackId', $options);";
+		return $this->Javascript->codeBlock($script);
+	}
+
+/**
+ * Makes an Ajax In Place editor control.
+ *
+ * @param string $id DOM ID of input element
+ * @param string $url Postback URL of saved data
+ * @param array $options Array of options to control the editor, including ajaxOptions (see link).
+ * @link          http://github.com/madrobby/scriptaculous/wikis/ajax-inplaceeditor
+ * @link http://book.cakephp.org/view/1374/editor
+ */
+	function editor($id, $url, $options = array()) {
+		$url = $this->url($url);
+		$options['ajaxOptions'] = $this->__optionsForAjax($options);
+
+		foreach ($this->ajaxOptions as $opt) {
+			if (isset($options[$opt])) {
+				unset($options[$opt]);
+			}
+		}
+
+		if (isset($options['callback'])) {
+			$options['callback'] = 'function(form, value) {' . $options['callback'] . '}';
+		}
+
+		$type = 'InPlaceEditor';
+		if (isset($options['collection']) && is_array($options['collection'])) {
+			$options['collection'] = $this->Javascript->object($options['collection']);
+			$type = 'InPlaceCollectionEditor';
+		}
+
+		$var = '';
+		if (isset($options['var'])) {
+			$var = 'var ' . $options['var'] . ' = ';
+			unset($options['var']);
+		}
+
+		$options = $this->_optionsToString($options, array(
+			'okText', 'cancelText', 'savingText', 'formId', 'externalControl', 'highlightcolor',
+			'highlightendcolor', 'savingClassName', 'formClassName', 'loadTextURL', 'loadingText',
+			'clickToEditText', 'okControl', 'cancelControl'
+		));
+		$options = $this->_buildOptions($options, $this->editorOptions);
+		$script = "{$var}new Ajax.{$type}('{$id}', '{$url}', {$options});";
+		return $this->Javascript->codeBlock($script);
+	}
+
+/**
+ * Makes a list or group of floated objects sortable.
+ *
+ * @param string $id DOM ID of parent
+ * @param array $options Array of options to control sort.
+ * @link          http://github.com/madrobby/scriptaculous/wikis/sortable
+ * @link http://book.cakephp.org/view/1375/sortable
+ */
+	function sortable($id, $options = array()) {
+		if (!empty($options['url'])) {
+			if (empty($options['with'])) {
+				$options['with'] = "Sortable.serialize('$id')";
+			}
+			$options['onUpdate'] = 'function(sortable) {' . $this->remoteFunction($options) . '}';
+		}
+		$block = true;
+
+		if (isset($options['block'])) {
+			$block = $options['block'];
+			unset($options['block']);
+		}
+		$strings = array(
+			'tag', 'constraint', 'only', 'handle', 'hoverclass', 'tree',
+			'treeTag', 'update', 'overlap'
+		);
+		$scrollIsObject = (
+			isset($options['scroll']) &&
+			$options['scroll'] != 'window' &&
+			strpos($options['scroll'], '$(') !== 0
+		);
+
+		if ($scrollIsObject) {
+			$strings[] = 'scroll';
+		}
+
+		$options = $this->_optionsToString($options, $strings);
+		$options = array_merge($options, $this->_buildCallbacks($options));
+		$options = $this->_buildOptions($options, $this->sortOptions);
+		$result = "Sortable.create('$id', $options);";
+
+		if (!$block) {
+			return $result;
+		}
+		return $this->Javascript->codeBlock($result);
+	}
+
+/**
+ * Private helper function for Javascript.
+ *
+ * @param array $options Set of options
+ * @access private
+ */
+	function __optionsForAjax($options) {
+		if (isset($options['indicator'])) {
+			if (isset($options['loading'])) {
+				$loading = $options['loading'];
+
+				if (!empty($loading) && substr(trim($loading), -1, 1) != ';') {
+					$options['loading'] .= '; ';
+				}
+				$options['loading'] .= "Element.show('{$options['indicator']}');";
+			} else {
+				$options['loading'] = "Element.show('{$options['indicator']}');";
+			}
+			if (isset($options['complete'])) {
+				$complete = $options['complete'];
+
+				if (!empty($complete) && substr(trim($complete), -1, 1) != ';') {
+					$options['complete'] .= '; ';
+				}
+				$options['complete'] .= "Element.hide('{$options['indicator']}');";
+			} else {
+				$options['complete'] = "Element.hide('{$options['indicator']}');";
+			}
+			unset($options['indicator']);
+		}
+
+		$jsOptions = array_merge(
+			array('asynchronous' => 'true', 'evalScripts'  => 'true'),
+			$this->_buildCallbacks($options)
+		);
+
+		$options = $this->_optionsToString($options, array(
+			'contentType', 'encoding', 'fallback', 'method', 'postBody', 'update', 'url'
+		));
+		$jsOptions = array_merge($jsOptions, array_intersect_key($options, array_flip(array(
+			'contentType', 'encoding', 'method', 'postBody'
+		))));
+
+		foreach ($options as $key => $value) {
+			switch ($key) {
+				case 'type':
+					$jsOptions['asynchronous'] = ($value == 'synchronous') ? 'false' : 'true';
+				break;
+				case 'evalScripts':
+					$jsOptions['evalScripts'] = ($value) ? 'true' : 'false';
+				break;
+				case 'position':
+					$pos = Inflector::camelize($options['position']);
+					$jsOptions['insertion'] = "Insertion.{$pos}";
+				break;
+				case 'with':
+					$jsOptions['parameters'] = $options['with'];
+				break;
+				case 'form':
+					$jsOptions['parameters'] = 'Form.serialize(this)';
+				break;
+				case 'requestHeaders':
+					$keys = array();
+					foreach ($value as $key => $val) {
+						$keys[] = "'" . $key . "'";
+						$keys[] = "'" . $val . "'";
+					}
+					$jsOptions['requestHeaders'] = '[' . implode(', ', $keys) . ']';
+				break;
+			}
+		}
+		return $this->_buildOptions($jsOptions, $this->ajaxOptions);
+	}
+
+/**
+ * Private Method to return a string of html options
+ * option data as a JavaScript options hash.
+ *
+ * @param array $options	Options in the shape of keys and values
+ * @param array $extra	Array of legal keys in this options context
+ * @return array Array of html options
+ * @access private
+ */
+	function __getHtmlOptions($options, $extra = array()) {
+		foreach (array_merge($this->ajaxOptions, $this->callbacks, $extra) as $key) {
+			if (isset($options[$key])) {
+				unset($options[$key]);
+			}
+		}
+		return $options;
+	}
+
+/**
+ * Returns a string of JavaScript with the given option data as a JavaScript options hash.
+ *
+ * @param array $options	Options in the shape of keys and values
+ * @param array $acceptable	Array of legal keys in this options context
+ * @return string	String of Javascript array definition
+ */
+	function _buildOptions($options, $acceptable) {
+		if (is_array($options)) {
+			$out = array();
+
+			foreach ($options as $k => $v) {
+				if (in_array($k, $acceptable)) {
+					if ($v === true) {
+						$v = 'true';
+					} elseif ($v === false) {
+						$v = 'false';
+					}
+					$out[] = "$k:$v";
+				} elseif ($k === 'with' && in_array('parameters', $acceptable)) {
+					$out[] = "parameters:${v}";
+				}
+			}
+
+			$out = implode(', ', $out);
+			$out = '{' . $out . '}';
+			return $out;
+		} else {
+			return false;
+		}
+	}
+
+/**
+ * Return JavaScript text for an observer...
+ *
+ * @param string $klass Name of JavaScript class
+ * @param string $name
+ * @param array $options	Ajax options
+ * @return string Formatted JavaScript
+ */
+	function _buildObserver($klass, $name, $options = null) {
+		if (!isset($options['with']) && isset($options['update'])) {
+			$options['with'] = 'value';
+		}
+
+		$callback = $this->remoteFunction($options);
+		$hasFrequency = !(!isset($options['frequency']) || intval($options['frequency']) == 0);
+		$frequency = $hasFrequency ? $options['frequency'] . ', ' : '';
+
+		return "new $klass('$name', {$frequency}function(element, value) {{$callback}})";
+	}
+
+/**
+ * Return Javascript text for callbacks.
+ *
+ * @param array $options Option array where a callback is specified
+ * @return array Options with their callbacks properly set
+ * @access protected
+ */
+	function _buildCallbacks($options) {
+		$callbacks = array();
+
+		foreach ($this->callbacks as $callback) {
+			if (isset($options[$callback])) {
+				$name = 'on' . ucfirst($callback);
+				$code = $options[$callback];
+				switch ($name) {
+					case 'onComplete':
+						$callbacks[$name] = "function(request, json) {" . $code . "}";
+						break;
+					case 'onCreate':
+						$callbacks[$name] = "function(request, xhr) {" . $code . "}";
+						break;
+					case 'onException':
+						$callbacks[$name] = "function(request, exception) {" . $code . "}";
+						break;
+					default:
+						$callbacks[$name] = "function(request) {" . $code . "}";
+						break;
+				}
+				if (isset($options['bind'])) {
+					$bind = $options['bind'];
+
+					$hasBinding = (
+						(is_array($bind) && in_array($callback, $bind)) ||
+						(is_string($bind) && strpos($bind, $callback) !== false)
+					);
+
+					if ($hasBinding) {
+						$callbacks[$name] .= ".bind(this)";
+					}
+				}
+			}
+		}
+		return $callbacks;
+	}
+
+/**
+ * Returns a string of JavaScript with a string representation of given options array.
+ *
+ * @param array $options	Ajax options array
+ * @param array $stringOpts	Options as strings in an array
+ * @access private
+ * @return array
+ */
+	function _optionsToString($options, $stringOpts = array()) {
+		foreach ($stringOpts as $option) {
+			$hasOption = (
+				isset($options[$option]) && !empty($options[$option]) &&
+				is_string($options[$option]) && $options[$option][0] != "'"
+			);
+
+			if ($hasOption) {
+				if ($options[$option] === true || $options[$option] === 'true') {
+					$options[$option] = 'true';
+				} elseif ($options[$option] === false || $options[$option] === 'false') {
+					$options[$option] = 'false';
+				} else {
+					$options[$option] = "'{$options[$option]}'";
+				}
+			}
+		}
+		return $options;
+	}
+
+/**
+ * Executed after a view has rendered, used to include bufferred code
+ * blocks.
+ *
+ * @access public
+ */
+	function afterRender() {
+		if (env('HTTP_X_UPDATE') != null && !empty($this->__ajaxBuffer)) {
+			@ob_end_clean();
+
+			$data = array();
+			$divs = explode(' ', env('HTTP_X_UPDATE'));
+			$keys = array_keys($this->__ajaxBuffer);
+
+			if (count($divs) == 1 && in_array($divs[0], $keys)) {
+				echo $this->__ajaxBuffer[$divs[0]];
+			} else {
+				foreach ($this->__ajaxBuffer as $key => $val) {
+					if (in_array($key, $divs)) {
+						$data[] = $key . ':"' . rawurlencode($val) . '"';
+					}
+				}
+				$out  = 'var __ajaxUpdater__ = {' . implode(", \n", $data) . '};' . "\n";
+				$out .= 'for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string"';
+				$out .= ' && $(n)) Element.update($(n), unescape(decodeURIComponent(';
+				$out .= '__ajaxUpdater__[n]))); }';
+				echo $this->Javascript->codeBlock($out, false);
+			}
+			$scripts = $this->Javascript->getCache();
+
+			if (!empty($scripts)) {
+				echo $this->Javascript->codeBlock($scripts, false);
+			}
+			$this->_stop();
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/app_helper.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/app_helper.php
new file mode 100644
index 000000000..deed26a02
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/app_helper.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Application level View Helper
+ *
+ * This file is application-wide helper file. You can put all
+ * application-wide helper-related methods here.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('View', 'Helper', false);
+
+/**
+ * This is a placeholder class.
+ * Create the same file in app/app_helper.php
+ *
+ * Add your application-wide methods in the class below, your helpers
+ * will inherit them.
+ *
+ * @package       cake
+ * @subpackage    cake.cake
+ */
+class AppHelper extends Helper {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php
new file mode 100644
index 000000000..65ed53ca2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/cache.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * CacheHelper helps create full page view caching.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 1.0.0.2277
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * CacheHelper helps create full page view caching.
+ *
+ * When using CacheHelper you don't call any of its methods, they are all automatically
+ * called by View, and use the $cacheAction settings set in the controller.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1376/Cache
+ */
+class CacheHelper extends AppHelper {
+
+/**
+ * Array of strings replaced in cached views.
+ * The strings are found between <cake:nocache><cake:nocache> in views
+ *
+ * @var array
+ * @access private
+ */
+	var $__replace = array();
+
+/**
+ * Array of string that are replace with there var replace above.
+ * The strings are any content inside <cake:nocache><cake:nocache> and includes the tags in views
+ *
+ * @var array
+ * @access private
+ */
+	var $__match = array();
+
+/**
+ * cache action time
+ *
+ * @var object
+ * @access public
+ */
+	var $cacheAction;
+
+/**
+ * Main method used to cache a view
+ *
+ * @param string $file File to cache
+ * @param string $out output to cache
+ * @param boolean $cache Whether or not a cache file should be written.
+ * @return string view ouput
+ */
+	function cache($file, $out, $cache = false) {
+		$cacheTime = 0;
+		$useCallbacks = false;
+		if (is_array($this->cacheAction)) {
+			$keys = array_keys($this->cacheAction);
+			$index = null;
+
+			foreach ($keys as $action) {
+				if ($action == $this->params['action']) {
+					$index = $action;
+					break;
+				}
+			}
+
+			if (!isset($index) && $this->action == 'index') {
+				$index = 'index';
+			}
+
+			$options = $this->cacheAction;
+			if (isset($this->cacheAction[$index])) {
+				if (is_array($this->cacheAction[$index])) {
+					$options = array_merge(array('duration' => 0, 'callbacks' => false), $this->cacheAction[$index]);
+				} else {
+					$cacheTime = $this->cacheAction[$index];
+				}
+			}
+			if (isset($options['duration'])) {
+				$cacheTime = $options['duration'];
+			}
+			if (isset($options['callbacks'])) {
+				$useCallbacks = $options['callbacks'];
+			}
+		} else {
+			$cacheTime = $this->cacheAction;
+		}
+
+		if ($cacheTime != '' && $cacheTime > 0) {
+			$this->__parseFile($file, $out);
+			if ($cache === true) {
+				$cached = $this->__parseOutput($out);
+				$this->__writeFile($cached, $cacheTime, $useCallbacks);
+			}
+			return $out;
+		} else {
+			return $out;
+		}
+	}
+
+/**
+ * Parse file searching for no cache tags
+ *
+ * @param string $file The filename that needs to be parsed.
+ * @param string $cache The cached content
+ * @access private
+ */
+	function __parseFile($file, $cache) {
+		if (is_file($file)) {
+			$file = file_get_contents($file);
+		} elseif ($file = fileExistsInPath($file)) {
+			$file = file_get_contents($file);
+		}
+		preg_match_all('/(<cake:nocache>(?<=<cake:nocache>)[\\s\\S]*?(?=<\/cake:nocache>)<\/cake:nocache>)/i', $cache, $outputResult, PREG_PATTERN_ORDER);
+		preg_match_all('/(?<=<cake:nocache>)([\\s\\S]*?)(?=<\/cake:nocache>)/i', $file, $fileResult, PREG_PATTERN_ORDER);
+		$fileResult = $fileResult[0];
+		$outputResult = $outputResult[0];
+
+		if (!empty($this->__replace)) {
+			foreach ($outputResult as $i => $element) {
+				$index = array_search($element, $this->__match);
+				if ($index !== false) {
+					unset($outputResult[$i]);
+				}
+			}
+			$outputResult = array_values($outputResult);
+		}
+
+		if (!empty($fileResult)) {
+			$i = 0;
+			foreach ($fileResult as $cacheBlock) {
+				if (isset($outputResult[$i])) {
+					$this->__replace[] = $cacheBlock;
+					$this->__match[] = $outputResult[$i];
+				}
+				$i++;
+			}
+		}
+	}
+
+/**
+ * Parse the output and replace cache tags
+ *
+ * @param string $cache Output to replace content in.
+ * @return string with all replacements made to <cake:nocache><cake:nocache>
+ * @access private
+ */
+	function __parseOutput($cache) {
+		$count = 0;
+		if (!empty($this->__match)) {
+			foreach ($this->__match as $found) {
+				$original = $cache;
+				$length = strlen($found);
+				$position = 0;
+
+				for ($i = 1; $i <= 1; $i++) {
+					$position = strpos($cache, $found, $position);
+
+					if ($position !== false) {
+						$cache = substr($original, 0, $position);
+						$cache .= $this->__replace[$count];
+						$cache .= substr($original, $position + $length);
+					} else {
+						break;
+					}
+				}
+				$count++;
+			}
+			return $cache;
+		}
+		return $cache;
+	}
+
+/**
+ * Write a cached version of the file
+ *
+ * @param string $content view content to write to a cache file.
+ * @param sting $timestamp Duration to set for cache file.
+ * @return boolean success of caching view.
+ * @access private
+ */
+	function __writeFile($content, $timestamp, $useCallbacks = false) {
+		$now = time();
+
+		if (is_numeric($timestamp)) {
+			$cacheTime = $now + $timestamp;
+		} else {
+			$cacheTime = strtotime($timestamp, $now);
+		}
+		$path = $this->here;
+		if ($this->here == '/') {
+			$path = 'home';
+		}
+		$cache = strtolower(Inflector::slug($path));
+
+		if (empty($cache)) {
+			return;
+		}
+		$cache = $cache . '.php';
+		$file = '<!--cachetime:' . $cacheTime . '--><?php';
+
+		if (empty($this->plugin)) {
+			$file .= '
+			App::import(\'Controller\', \'' . $this->controllerName. '\');
+			';
+		} else {
+			$file .= '
+			App::import(\'Controller\', \'' . $this->plugin . '.' . $this->controllerName. '\');
+			';
+		}
+
+		$file .= '$controller =& new ' . $this->controllerName . 'Controller();
+				$controller->plugin = $this->plugin = \''.$this->plugin.'\';
+				$controller->helpers = $this->helpers = unserialize(\'' . serialize($this->helpers) . '\');
+				$controller->base = $this->base = \'' . $this->base . '\';
+				$controller->layout = $this->layout = \'' . $this->layout. '\';
+				$controller->webroot = $this->webroot = \'' . $this->webroot . '\';
+				$controller->here = $this->here = \'' . $this->here . '\';
+				$controller->params = $this->params = unserialize(stripslashes(\'' . addslashes(serialize($this->params)) . '\'));
+				$controller->action = $this->action = unserialize(\'' . serialize($this->action) . '\');
+				$controller->data = $this->data = unserialize(stripslashes(\'' . addslashes(serialize($this->data)) . '\'));
+				$controller->viewVars = $this->viewVars = unserialize(base64_decode(\'' . base64_encode(serialize($this->viewVars)) . '\'));
+				$controller->theme = $this->theme = \'' . $this->theme . '\';
+				Router::setRequestInfo(array($this->params, array(\'base\' => $this->base, \'webroot\' => $this->webroot)));';
+
+		if ($useCallbacks == true) {
+			$file .= '
+				$controller->constructClasses();
+				$controller->Component->initialize($controller);
+				$controller->beforeFilter();
+				$controller->Component->startup($controller);';
+		}
+
+		$file .= '
+				$loadedHelpers = array();
+				$loadedHelpers = $this->_loadHelpers($loadedHelpers, $this->helpers);
+				foreach (array_keys($loadedHelpers) as $helper) {
+					$camelBackedHelper = Inflector::variable($helper);
+					${$camelBackedHelper} =& $loadedHelpers[$helper];
+					$this->loaded[$camelBackedHelper] =& ${$camelBackedHelper};
+					$this->{$helper} =& $loadedHelpers[$helper];
+				}
+				extract($this->viewVars, EXTR_SKIP);
+		?>';
+		$content = preg_replace("/(<\\?xml)/", "<?php echo '$1';?>",$content);
+		$file .= $content;
+		return cache('views' . DS . $cache, $file, $timestamp);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/form.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/form.php
new file mode 100644
index 000000000..979965564
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/form.php
@@ -0,0 +1,2215 @@
+<?php
+/**
+ * Automatic generation of HTML FORMs from given data.
+ *
+ * Used for scaffolding.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Form helper library.
+ *
+ * Automatic generation of HTML FORMs from given data.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1383/Form
+ */
+class FormHelper extends AppHelper {
+
+/**
+ * Other helpers used by FormHelper
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html');
+
+/**
+ * Holds the fields array('field_name' => array('type'=> 'string', 'length'=> 100),
+ * primaryKey and validates array('field_name')
+ *
+ * @access public
+ */
+	var $fieldset = array();
+
+/**
+ * Options used by DateTime fields
+ *
+ * @var array
+ */
+	var $__options = array(
+		'day' => array(), 'minute' => array(), 'hour' => array(),
+		'month' => array(), 'year' => array(), 'meridian' => array()
+	);
+
+/**
+ * List of fields created, used with secure forms.
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array();
+
+/**
+ * Defines the type of form being created.  Set by FormHelper::create().
+ *
+ * @var string
+ * @access public
+ */
+	var $requestType = null;
+
+/**
+ * The default model being used for the current form.
+ *
+ * @var string
+ * @access public
+ */
+	var $defaultModel = null;
+
+
+/**
+ * Persistent default options used by input(). Set by FormHelper::create().
+ *
+ * @var array
+ * @access protected
+ */
+	var $_inputDefaults = array();
+
+/**
+ * Introspects model information and extracts information related
+ * to validation, field length and field type. Appends information into
+ * $this->fieldset.
+ *
+ * @return Model Returns a model instance
+ * @access protected
+ */
+	function &_introspectModel($model) {
+		$object = null;
+		if (is_string($model) && strpos($model, '.') !== false) {
+			$path = explode('.', $model);
+			$model = end($path);
+		}
+
+		if (ClassRegistry::isKeySet($model)) {
+			$object =& ClassRegistry::getObject($model);
+		}
+
+		if (!empty($object)) {
+			$fields = $object->schema();
+			foreach ($fields as $key => $value) {
+				unset($fields[$key]);
+				$fields[$key] = $value;
+			}
+
+			if (!empty($object->hasAndBelongsToMany)) {
+				foreach ($object->hasAndBelongsToMany as $alias => $assocData) {
+					$fields[$alias] = array('type' => 'multiple');
+				}
+			}
+			$validates = array();
+			if (!empty($object->validate)) {
+				foreach ($object->validate as $validateField => $validateProperties) {
+					if ($this->_isRequiredField($validateProperties)) {
+						$validates[] = $validateField;
+					}
+				}
+			}
+			$defaults = array('fields' => array(), 'key' => 'id', 'validates' => array());
+			$key = $object->primaryKey;
+			$this->fieldset[$model] = array_merge($defaults, compact('fields', 'key', 'validates'));
+		}
+
+		return $object;
+	}
+
+/**
+ * Returns if a field is required to be filled based on validation properties from the validating object
+ *
+ * @return boolean true if field is required to be filled, false otherwise
+ * @access protected
+ */
+	function _isRequiredField($validateProperties) {
+		$required = false;
+		if (is_array($validateProperties)) {
+
+			$dims = Set::countDim($validateProperties);
+			if ($dims == 1 || ($dims == 2 && isset($validateProperties['rule']))) {
+				$validateProperties = array($validateProperties);
+			}
+
+			foreach ($validateProperties as $rule => $validateProp) {
+				if (isset($validateProp['allowEmpty']) && $validateProp['allowEmpty'] === true) {
+					return false;
+				}
+				$rule = isset($validateProp['rule']) ? $validateProp['rule'] : false;
+				$required = $rule || empty($validateProp);
+				if ($required) {
+					break;
+				}
+			}
+		}
+		return $required;
+	}
+
+/**
+ * Returns an HTML FORM element.
+ *
+ * ### Options:
+ *
+ * - `type` Form method defaults to POST
+ * - `action`  The controller action the form submits to, (optional).
+ * - `url`  The url the form submits to. Can be a string or a url array,
+ * - `default`  Allows for the creation of Ajax forms.
+ * - `onsubmit` Used in conjunction with 'default' to create ajax forms.
+ * - `inputDefaults` set the default $options for FormHelper::input(). Any options that would
+ *    be set when using FormHelper::input() can be set here.  Options set with `inputDefaults`
+ *    can be overridden when calling input()
+ * - `encoding` Set the accept-charset encoding for the form.  Defaults to `Configure::read('App.encoding')`
+ *
+ * @access public
+ * @param string $model The model object which the form is being defined for
+ * @param array $options An array of html attributes and options.
+ * @return string An formatted opening FORM tag.
+ * @link http://book.cakephp.org/view/1384/Creating-Forms
+ */
+	function create($model = null, $options = array()) {
+		$created = $id = false;
+		$append = '';
+		$view =& ClassRegistry::getObject('view');
+
+		if (is_array($model) && empty($options)) {
+			$options = $model;
+			$model = null;
+		}
+		if (empty($model) && $model !== false && !empty($this->params['models'])) {
+			$model = $this->params['models'][0];
+			$this->defaultModel = $this->params['models'][0];
+		} elseif (empty($model) && empty($this->params['models'])) {
+			$model = false;
+		}
+
+		$models = ClassRegistry::keys();
+		foreach ($models as $currentModel) {
+			if (ClassRegistry::isKeySet($currentModel)) {
+				$currentObject =& ClassRegistry::getObject($currentModel);
+				if (is_a($currentObject, 'Model') && !empty($currentObject->validationErrors)) {
+					$this->validationErrors[Inflector::camelize($currentModel)] =& $currentObject->validationErrors;
+				}
+			}
+		}
+
+		$object = $this->_introspectModel($model);
+		$this->setEntity($model . '.', true);
+
+		$modelEntity = $this->model();
+		if (isset($this->fieldset[$modelEntity]['key'])) {
+			$data = $this->fieldset[$modelEntity];
+			$recordExists = (
+				isset($this->data[$model]) &&
+				!empty($this->data[$model][$data['key']]) &&
+				!is_array($this->data[$model][$data['key']])
+			);
+
+			if ($recordExists) {
+				$created = true;
+				$id = $this->data[$model][$data['key']];
+			}
+		}
+
+		$options = array_merge(array(
+			'type' => ($created && empty($options['action'])) ? 'put' : 'post',
+			'action' => null,
+			'url' => null,
+			'default' => true,
+			'encoding' => strtolower(Configure::read('App.encoding')),
+			'inputDefaults' => array()),
+		$options);
+		$this->_inputDefaults = $options['inputDefaults'];
+		unset($options['inputDefaults']);
+
+		if (empty($options['url']) || is_array($options['url'])) {
+			if (empty($options['url']['controller'])) {
+				if (!empty($model) && $model != $this->defaultModel) {
+					$options['url']['controller'] = Inflector::underscore(Inflector::pluralize($model));
+				} elseif (!empty($this->params['controller'])) {
+					$options['url']['controller'] = Inflector::underscore($this->params['controller']);
+				}
+			}
+			if (empty($options['action'])) {
+				$options['action'] = $this->params['action'];
+			}
+
+			$actionDefaults = array(
+				'plugin' => $this->plugin,
+				'controller' => $view->viewPath,
+				'action' => $options['action']
+			);
+			if (!empty($options['action']) && !isset($options['id'])) {
+				$options['id'] = $this->domId($options['action'] . 'Form');
+			}
+			$options['action'] = array_merge($actionDefaults, (array)$options['url']);
+			if (empty($options['action'][0])) {
+				$options['action'][0] = $id;
+			}
+		} elseif (is_string($options['url'])) {
+			$options['action'] = $options['url'];
+		}
+		unset($options['url']);
+
+		switch (strtolower($options['type'])) {
+			case 'get':
+				$htmlAttributes['method'] = 'get';
+			break;
+			case 'file':
+				$htmlAttributes['enctype'] = 'multipart/form-data';
+				$options['type'] = ($created) ? 'put' : 'post';
+			case 'post':
+			case 'put':
+			case 'delete':
+				$append .= $this->hidden('_method', array(
+					'name' => '_method', 'value' => strtoupper($options['type']), 'id' => null
+				));
+			default:
+				$htmlAttributes['method'] = 'post';
+			break;
+		}
+		$this->requestType = strtolower($options['type']);
+
+		$htmlAttributes['action'] = $this->url($options['action']);
+		unset($options['type'], $options['action']);
+
+		if ($options['default'] == false) {
+			if (isset($htmlAttributes['onSubmit']) || isset($htmlAttributes['onsubmit'])) {
+				$htmlAttributes['onsubmit'] .= ' event.returnValue = false; return false;';
+			} else {
+				$htmlAttributes['onsubmit'] = 'event.returnValue = false; return false;';
+			}
+		}
+
+		if (!empty($options['encoding'])) {
+			$htmlAttributes['accept-charset'] = $options['encoding'];
+			unset($options['encoding']);
+		}
+
+		unset($options['default']);
+		$htmlAttributes = array_merge($options, $htmlAttributes);
+
+		$this->fields = array();
+		if (isset($this->params['_Token']) && !empty($this->params['_Token'])) {
+			$append .= $this->hidden('_Token.key', array(
+				'value' => $this->params['_Token']['key'], 'id' => 'Token' . mt_rand())
+			);
+		}
+
+		if (!empty($append)) {
+			$append = sprintf($this->Html->tags['block'], ' style="display:none;"', $append);
+		}
+
+		$this->setEntity($model . '.', true);
+		$attributes = $this->_parseAttributes($htmlAttributes, null, '');
+		return sprintf($this->Html->tags['form'], $attributes) . $append;
+	}
+
+/**
+ * Closes an HTML form, cleans up values set by FormHelper::create(), and writes hidden
+ * input fields where appropriate.
+ *
+ * If $options is set a form submit button will be created. Options can be either a string or an array.
+ *
+ * {{{
+ * array usage:
+ *
+ * array('label' => 'save'); value="save"
+ * array('label' => 'save', 'name' => 'Whatever'); value="save" name="Whatever"
+ * array('name' => 'Whatever'); value="Submit" name="Whatever"
+ * array('label' => 'save', 'name' => 'Whatever', 'div' => 'good') <div class="good"> value="save" name="Whatever"
+ * array('label' => 'save', 'name' => 'Whatever', 'div' => array('class' => 'good')); <div class="good"> value="save" name="Whatever"
+ * }}}
+ *
+ * @param mixed $options as a string will use $options as the value of button,
+ * @return string a closing FORM tag optional submit button.
+ * @access public
+ * @link http://book.cakephp.org/view/1389/Closing-the-Form
+ */
+	function end($options = null) {
+		if (!empty($this->params['models'])) {
+			$models = $this->params['models'][0];
+		}
+		$out = null;
+		$submit = null;
+
+		if ($options !== null) {
+			$submitOptions = array();
+			if (is_string($options)) {
+				$submit = $options;
+			} else {
+				if (isset($options['label'])) {
+					$submit = $options['label'];
+					unset($options['label']);
+				}
+				$submitOptions = $options;
+			}
+			$out .= $this->submit($submit, $submitOptions);
+		}
+		if (isset($this->params['_Token']) && !empty($this->params['_Token'])) {
+			$out .= $this->secure($this->fields);
+			$this->fields = array();
+		}
+		$this->setEntity(null);
+		$out .= $this->Html->tags['formend'];
+
+		$view =& ClassRegistry::getObject('view');
+		$view->modelScope = false;
+		return $out;
+	}
+
+/**
+ * Generates a hidden field with a security hash based on the fields used in the form.
+ *
+ * @param array $fields The list of fields to use when generating the hash
+ * @return string A hidden input field with a security hash
+ * @access public
+ */
+	function secure($fields = array()) {
+		if (!isset($this->params['_Token']) || empty($this->params['_Token'])) {
+			return;
+		}
+		$locked = array();
+
+		foreach ($fields as $key => $value) {
+			if (!is_int($key)) {
+				$locked[$key] = $value;
+				unset($fields[$key]);
+			}
+		}
+		sort($fields, SORT_STRING);
+		ksort($locked, SORT_STRING);
+		$fields += $locked;
+
+		$fields = Security::hash(serialize($fields) . Configure::read('Security.salt'));
+		$locked = implode(array_keys($locked), '|');
+
+		$out = $this->hidden('_Token.fields', array(
+			'value' => urlencode($fields . ':' . $locked),
+			'id' => 'TokenFields' . mt_rand()
+		));
+		$out = sprintf($this->Html->tags['block'], ' style="display:none;"', $out);
+		return $out;
+	}
+
+/**
+ * Determine which fields of a form should be used for hash.
+ * Populates $this->fields
+ *
+ * @param mixed $field Reference to field to be secured
+ * @param mixed $value Field value, if value should not be tampered with.
+ * @return void
+ * @access private
+ */
+	function __secure($field = null, $value = null) {
+		if (!$field) {
+			$view =& ClassRegistry::getObject('view');
+			$field = $view->entity();
+		} elseif (is_string($field)) {
+			$field = Set::filter(explode('.', $field), true);
+		}
+
+		if (!empty($this->params['_Token']['disabledFields'])) {
+			foreach ((array)$this->params['_Token']['disabledFields'] as $disabled) {
+				$disabled = explode('.', $disabled);
+				if (array_values(array_intersect($field, $disabled)) === $disabled) {
+					return;
+				}
+			}
+		}
+		$field = implode('.', $field);
+		if (!in_array($field, $this->fields)) {
+			if ($value !== null) {
+				return $this->fields[$field] = $value;
+			}
+			$this->fields[] = $field;
+		}
+	}
+
+/**
+ * Returns true if there is an error for the given field, otherwise false
+ *
+ * @param string $field This should be "Modelname.fieldname"
+ * @return boolean If there are errors this method returns true, else false.
+ * @access public
+ * @link http://book.cakephp.org/view/1426/isFieldError
+ */
+	function isFieldError($field) {
+		$this->setEntity($field);
+		return (bool)$this->tagIsInvalid();
+	}
+
+/**
+ * Returns a formatted error message for given FORM field, NULL if no errors.
+ *
+ * ### Options:
+ *
+ * - `escape`  bool  Whether or not to html escape the contents of the error.
+ * - `wrap`  mixed  Whether or not the error message should be wrapped in a div. If a
+ *   string, will be used as the HTML tag to use.
+ * - `class` string  The classname for the error message
+ *
+ * @param string $field A field name, like "Modelname.fieldname"
+ * @param mixed $text Error message or array of $options. If array, `attributes` key
+ * will get used as html attributes for error container
+ * @param array $options Rendering options for <div /> wrapper tag
+ * @return string If there are errors this method returns an error message, otherwise null.
+ * @access public
+ * @link http://book.cakephp.org/view/1423/error
+ */
+	function error($field, $text = null, $options = array()) {
+		$defaults = array('wrap' => true, 'class' => 'error-message', 'escape' => true);
+		$options = array_merge($defaults, $options);
+		$this->setEntity($field);
+
+		if ($error = $this->tagIsInvalid()) {
+			if (is_array($error)) {
+				list(,,$field) = explode('.', $field);
+				if (isset($error[$field])) {
+					$error = $error[$field];
+				} else {
+					return null;
+				}
+			}
+
+			if (is_array($text) && is_numeric($error) && $error > 0) {
+				$error--;
+			}
+			if (is_array($text)) {
+				$options = array_merge($options, array_intersect_key($text, $defaults));
+				if (isset($text['attributes']) && is_array($text['attributes'])) {
+					$options = array_merge($options, $text['attributes']);
+				}
+				$text = isset($text[$error]) ? $text[$error] : null;
+				unset($options[$error]);
+			}
+
+			if ($text != null) {
+				$error = $text;
+			} elseif (is_numeric($error)) {
+				$error = sprintf(__('Error in field %s', true), Inflector::humanize($this->field()));
+			}
+			if ($options['escape']) {
+				$error = h($error);
+				unset($options['escape']);
+			}
+			if ($options['wrap']) {
+				$tag = is_string($options['wrap']) ? $options['wrap'] : 'div';
+				unset($options['wrap']);
+				return $this->Html->tag($tag, $error, $options);
+			} else {
+				return $error;
+			}
+		} else {
+			return null;
+		}
+	}
+
+/**
+ * Returns a formatted LABEL element for HTML FORMs. Will automatically generate
+ * a for attribute if one is not provided.
+ *
+ * @param string $fieldName This should be "Modelname.fieldname"
+ * @param string $text Text that will appear in the label field.
+ * @param mixed $options An array of HTML attributes, or a string, to be used as a class name.
+ * @return string The formatted LABEL element
+ * @link http://book.cakephp.org/view/1427/label
+ */
+	function label($fieldName = null, $text = null, $options = array()) {
+		if (empty($fieldName)) {
+			$view = ClassRegistry::getObject('view');
+			$fieldName = implode('.', $view->entity());
+		}
+
+		if ($text === null) {
+			if (strpos($fieldName, '.') !== false) {
+				$text = array_pop(explode('.', $fieldName));
+			} else {
+				$text = $fieldName;
+			}
+			if (substr($text, -3) == '_id') {
+				$text = substr($text, 0, strlen($text) - 3);
+			}
+			$text = __(Inflector::humanize(Inflector::underscore($text)), true);
+		}
+
+		if (is_string($options)) {
+			$options = array('class' => $options);
+		}
+
+		if (isset($options['for'])) {
+			$labelFor = $options['for'];
+			unset($options['for']);
+		} else {
+			$labelFor = $this->domId($fieldName);
+		}
+
+		return sprintf(
+			$this->Html->tags['label'],
+			$labelFor,
+			$this->_parseAttributes($options), $text
+		);
+	}
+
+/**
+ * Generate a set of inputs for `$fields`.  If $fields is null the current model
+ * will be used.
+ *
+ * In addition to controller fields output, `$fields` can be used to control legend
+ * and fieldset rendering with the `fieldset` and `legend` keys.
+ * `$form->inputs(array('legend' => 'My legend'));` Would generate an input set with
+ * a custom legend.  You can customize individual inputs through `$fields` as well.
+ *
+ * {{{
+ *	$form->inputs(array(
+ *		'name' => array('label' => 'custom label')
+ *	));
+ * }}}
+ *
+ * In addition to fields control, inputs() allows you to use a few additional options.
+ *
+ * - `fieldset` Set to false to disable the fieldset. If a string is supplied it will be used as
+ *    the classname for the fieldset element.
+ * - `legend` Set to false to disable the legend for the generated input set. Or supply a string
+ *    to customize the legend text.
+ *
+ * @param mixed $fields An array of fields to generate inputs for, or null.
+ * @param array $blacklist a simple array of fields to not create inputs for.
+ * @return string Completed form inputs.
+ * @access public
+ */
+	function inputs($fields = null, $blacklist = null) {
+		$fieldset = $legend = true;
+		$model = $this->model();
+		if (is_array($fields)) {
+			if (array_key_exists('legend', $fields)) {
+				$legend = $fields['legend'];
+				unset($fields['legend']);
+			}
+
+			if (isset($fields['fieldset'])) {
+				$fieldset = $fields['fieldset'];
+				unset($fields['fieldset']);
+			}
+		} elseif ($fields !== null) {
+			$fieldset = $legend = $fields;
+			if (!is_bool($fieldset)) {
+				$fieldset = true;
+			}
+			$fields = array();
+		}
+
+		if (empty($fields)) {
+			$fields = array_keys($this->fieldset[$model]['fields']);
+		}
+
+		if ($legend === true) {
+			$actionName = __('New %s', true);
+			$isEdit = (
+				strpos($this->action, 'update') !== false ||
+				strpos($this->action, 'edit') !== false
+			);
+			if ($isEdit) {
+				$actionName = __('Edit %s', true);
+			}
+			$modelName = Inflector::humanize(Inflector::underscore($model));
+			$legend = sprintf($actionName, __($modelName, true));
+		}
+
+		$out = null;
+		foreach ($fields as $name => $options) {
+			if (is_numeric($name) && !is_array($options)) {
+				$name = $options;
+				$options = array();
+			}
+			$entity = explode('.', $name);
+			$blacklisted = (
+				is_array($blacklist) &&
+				(in_array($name, $blacklist) || in_array(end($entity), $blacklist))
+			);
+			if ($blacklisted) {
+				continue;
+			}
+			$out .= $this->input($name, $options);
+		}
+
+		if (is_string($fieldset)) {
+			$fieldsetClass = sprintf(' class="%s"', $fieldset);
+		} else {
+			$fieldsetClass = '';
+		}
+
+		if ($fieldset && $legend) {
+			return sprintf(
+				$this->Html->tags['fieldset'],
+				$fieldsetClass,
+				sprintf($this->Html->tags['legend'], $legend) . $out
+			);
+		} elseif ($fieldset) {
+			return sprintf($this->Html->tags['fieldset'], $fieldsetClass, $out);
+		} else {
+			return $out;
+		}
+	}
+
+/**
+ * Generates a form input element complete with label and wrapper div
+ *
+ * ### Options
+ *
+ * See each field type method for more information. Any options that are part of
+ * $attributes or $options for the different **type** methods can be included in `$options` for input().i
+ * Additionally, any unknown keys that are not in the list below, or part of the selected type's options
+ * will be treated as a regular html attribute for the generated input.
+ *
+ * - `type` - Force the type of widget you want. e.g. `type => 'select'`
+ * - `label` - Either a string label, or an array of options for the label. See FormHelper::label()
+ * - `div` - Either `false` to disable the div, or an array of options for the div.
+ *    See HtmlHelper::div() for more options.
+ * - `options` - for widgets that take options e.g. radio, select
+ * - `error` - control the error message that is produced
+ * - `empty` - String or boolean to enable empty select box options.
+ * - `before` - Content to place before the label + input.
+ * - `after` - Content to place after the label + input.
+ * - `between` - Content to place between the label + input.
+ * - `format` - format template for element order. Any element that is not in the array, will not be in the output.
+ *    - Default input format order: array('before', 'label', 'between', 'input', 'after', 'error')
+ *    - Default checkbox format order: array('before', 'input', 'between', 'label', 'after', 'error')
+ *    - Hidden input will not be formatted
+ *    - Radio buttons cannot have the order of input and label elements controlled with these settings.
+ *
+ * @param string $fieldName This should be "Modelname.fieldname"
+ * @param array $options Each type of input takes different options.
+ * @return string Completed form widget.
+ * @access public
+ * @link http://book.cakephp.org/view/1390/Automagic-Form-Elements
+ */
+	function input($fieldName, $options = array()) {
+		$this->setEntity($fieldName);
+
+		$options = array_merge(
+			array('before' => null, 'between' => null, 'after' => null, 'format' => null),
+			$this->_inputDefaults,
+			$options
+		);
+
+		$modelKey = $this->model();
+		$fieldKey = $this->field();
+		if (!isset($this->fieldset[$modelKey])) {
+			$this->_introspectModel($modelKey);
+		}
+
+		if (!isset($options['type'])) {
+			$magicType = true;
+			$options['type'] = 'text';
+			if (isset($options['options'])) {
+				$options['type'] = 'select';
+			} elseif (in_array($fieldKey, array('psword', 'passwd', 'password'))) {
+				$options['type'] = 'password';
+			} elseif (isset($this->fieldset[$modelKey]['fields'][$fieldKey])) {
+				$fieldDef = $this->fieldset[$modelKey]['fields'][$fieldKey];
+				$type = $fieldDef['type'];
+				$primaryKey = $this->fieldset[$modelKey]['key'];
+			}
+
+			if (isset($type)) {
+				$map = array(
+					'string'  => 'text',     'datetime'  => 'datetime',
+					'boolean' => 'checkbox', 'timestamp' => 'datetime',
+					'text'    => 'textarea', 'time'      => 'time',
+					'date'    => 'date',     'float'     => 'text'
+				);
+
+				if (isset($this->map[$type])) {
+					$options['type'] = $this->map[$type];
+				} elseif (isset($map[$type])) {
+					$options['type'] = $map[$type];
+				}
+				if ($fieldKey == $primaryKey) {
+					$options['type'] = 'hidden';
+				}
+			}
+			if (preg_match('/_id$/', $fieldKey) && $options['type'] !== 'hidden') {
+				$options['type'] = 'select';
+			}
+
+			if ($modelKey === $fieldKey) {
+				$options['type'] = 'select';
+				if (!isset($options['multiple'])) {
+					$options['multiple'] = 'multiple';
+				}
+			}
+		}
+		$types = array('checkbox', 'radio', 'select');
+
+		if (
+			(!isset($options['options']) && in_array($options['type'], $types)) ||
+			(isset($magicType) && $options['type'] == 'text')
+		) {
+			$view =& ClassRegistry::getObject('view');
+			$varName = Inflector::variable(
+				Inflector::pluralize(preg_replace('/_id$/', '', $fieldKey))
+			);
+			$varOptions = $view->getVar($varName);
+			if (is_array($varOptions)) {
+				if ($options['type'] !== 'radio') {
+					$options['type'] = 'select';
+				}
+				$options['options'] = $varOptions;
+			}
+		}
+
+		$autoLength = (!array_key_exists('maxlength', $options) && isset($fieldDef['length']));
+		if ($autoLength && $options['type'] == 'text') {
+			$options['maxlength'] = $fieldDef['length'];
+		}
+		if ($autoLength && $fieldDef['type'] == 'float') {
+			$options['maxlength'] = array_sum(explode(',', $fieldDef['length']))+1;
+		}
+
+		$divOptions = array();
+		$div = $this->_extractOption('div', $options, true);
+		unset($options['div']);
+
+		if (!empty($div)) {
+			$divOptions['class'] = 'input';
+			$divOptions = $this->addClass($divOptions, $options['type']);
+			if (is_string($div)) {
+				$divOptions['class'] = $div;
+			} elseif (is_array($div)) {
+				$divOptions = array_merge($divOptions, $div);
+			}
+			if (
+				isset($this->fieldset[$modelKey]) &&
+				in_array($fieldKey, $this->fieldset[$modelKey]['validates'])
+			) {
+				$divOptions = $this->addClass($divOptions, 'required');
+			}
+			if (!isset($divOptions['tag'])) {
+				$divOptions['tag'] = 'div';
+			}
+		}
+
+		$label = null;
+		if (isset($options['label']) && $options['type'] !== 'radio') {
+			$label = $options['label'];
+			unset($options['label']);
+		}
+
+		if ($options['type'] === 'radio') {
+			$label = false;
+			if (isset($options['options'])) {
+				$radioOptions = (array)$options['options'];
+				unset($options['options']);
+			}
+		}
+
+		if ($label !== false) {
+			$label = $this->_inputLabel($fieldName, $label, $options);
+		}
+
+		$error = $this->_extractOption('error', $options, null);
+		unset($options['error']);
+
+		$selected = $this->_extractOption('selected', $options, null);
+		unset($options['selected']);
+
+		if (isset($options['rows']) || isset($options['cols'])) {
+			$options['type'] = 'textarea';
+		}
+
+		if ($options['type'] === 'datetime' || $options['type'] === 'date' || $options['type'] === 'time' || $options['type'] === 'select') {
+			$options += array('empty' => false);
+		}
+		if ($options['type'] === 'datetime' || $options['type'] === 'date' || $options['type'] === 'time') {
+			$dateFormat = $this->_extractOption('dateFormat', $options, 'MDY');
+			$timeFormat = $this->_extractOption('timeFormat', $options, 12);
+			unset($options['dateFormat'], $options['timeFormat']);
+		}
+
+		$type = $options['type'];
+		$out = array_merge(
+			array('before' => null, 'label' => null, 'between' => null, 'input' => null, 'after' => null, 'error' => null),
+			array('before' => $options['before'], 'label' => $label, 'between' => $options['between'], 'after' => $options['after'])
+		);
+		$format = null;
+		if (is_array($options['format']) && in_array('input', $options['format'])) {
+			$format = $options['format'];
+		}
+		unset($options['type'], $options['before'], $options['between'], $options['after'], $options['format']);
+
+		switch ($type) {
+			case 'hidden':
+				$input = $this->hidden($fieldName, $options);
+				$format = array('input');
+				unset($divOptions);
+			break;
+			case 'checkbox':
+				$input = $this->checkbox($fieldName, $options);
+				$format = $format ? $format : array('before', 'input', 'between', 'label', 'after', 'error');
+			break;
+			case 'radio':
+				$input = $this->radio($fieldName, $radioOptions, $options);
+			break;
+			case 'text':
+			case 'password':
+			case 'file':
+				$input = $this->{$type}($fieldName, $options);
+			break;
+			case 'select':
+				$options += array('options' => array());
+				$list = $options['options'];
+				unset($options['options']);
+				$input = $this->select($fieldName, $list, $selected, $options);
+			break;
+			case 'time':
+				$input = $this->dateTime($fieldName, null, $timeFormat, $selected, $options);
+			break;
+			case 'date':
+				$input = $this->dateTime($fieldName, $dateFormat, null, $selected, $options);
+			break;
+			case 'datetime':
+				$input = $this->dateTime($fieldName, $dateFormat, $timeFormat, $selected, $options);
+			break;
+			case 'textarea':
+			default:
+				$input = $this->textarea($fieldName, $options + array('cols' => '30', 'rows' => '6'));
+			break;
+		}
+
+		if ($type != 'hidden' && $error !== false) {
+			$errMsg = $this->error($fieldName, $error);
+			if ($errMsg) {
+				$divOptions = $this->addClass($divOptions, 'error');
+				$out['error'] = $errMsg;
+			}
+		}
+
+		$out['input'] = $input;
+		$format = $format ? $format : array('before', 'label', 'between', 'input', 'after', 'error');
+		$output = '';
+		foreach ($format as $element) {
+			$output .= $out[$element];
+			unset($out[$element]);
+		}
+
+		if (!empty($divOptions['tag'])) {
+			$tag = $divOptions['tag'];
+			unset($divOptions['tag']);
+			$output = $this->Html->tag($tag, $output, $divOptions);
+		}
+		return $output;
+	}
+
+/**
+ * Extracts a single option from an options array.
+ *
+ * @param string $name The name of the option to pull out.
+ * @param array $options The array of options you want to extract.
+ * @param mixed $default The default option value
+ * @return the contents of the option or default
+ * @access protected
+ */
+	function _extractOption($name, $options, $default = null) {
+		if (array_key_exists($name, $options)) {
+			return $options[$name];
+		}
+		return $default;
+	}
+
+/**
+ * Generate a label for an input() call.
+ *
+ * @param array $options Options for the label element.
+ * @return string Generated label element
+ * @access protected
+ */
+	function _inputLabel($fieldName, $label, $options) {
+		$labelAttributes = $this->domId(array(), 'for');
+		if ($options['type'] === 'date' || $options['type'] === 'datetime') {
+			if (isset($options['dateFormat']) && $options['dateFormat'] === 'NONE') {
+				$labelAttributes['for'] .= 'Hour';
+				$idKey = 'hour';
+			} else {
+				$labelAttributes['for'] .= 'Month';
+				$idKey = 'month';
+			}
+			if (isset($options['id']) && isset($options['id'][$idKey])) {
+				$labelAttributes['for'] = $options['id'][$idKey];
+			}
+		} elseif ($options['type'] === 'time') {
+			$labelAttributes['for'] .= 'Hour';
+			if (isset($options['id']) && isset($options['id']['hour'])) {
+				$labelAttributes['for'] = $options['id']['hour'];
+			}
+		}
+
+		if (is_array($label)) {
+			$labelText = null;
+			if (isset($label['text'])) {
+				$labelText = $label['text'];
+				unset($label['text']);
+			}
+			$labelAttributes = array_merge($labelAttributes, $label);
+		} else {
+			$labelText = $label;
+		}
+
+		if (isset($options['id']) && is_string($options['id'])) {
+			$labelAttributes = array_merge($labelAttributes, array('for' => $options['id']));
+		}
+		return $this->label($fieldName, $labelText, $labelAttributes);
+	}
+
+/**
+ * Creates a checkbox input widget.
+ *
+ * ### Options:
+ *
+ * - `value` - the value of the checkbox
+ * - `checked` - boolean indicate that this checkbox is checked.
+ * - `hiddenField` - boolean to indicate if you want the results of checkbox() to include
+ *    a hidden input with a value of ''.
+ * - `disabled` - create a disabled input.
+ *
+ * @param string $fieldName Name of a field, like this "Modelname.fieldname"
+ * @param array $options Array of HTML attributes.
+ * @return string An HTML text input element.
+ * @access public
+ * @link http://book.cakephp.org/view/1414/checkbox
+ */
+	function checkbox($fieldName, $options = array()) {
+		$options = $this->_initInputField($fieldName, $options) + array('hiddenField' => true);
+		$value = current($this->value());
+		$output = "";
+
+		if (empty($options['value'])) {
+			$options['value'] = 1;
+		} elseif (
+			(!isset($options['checked']) && !empty($value) && $value === $options['value']) ||
+			!empty($options['checked'])
+		) {
+			$options['checked'] = 'checked';
+		}
+		if ($options['hiddenField']) {
+			$hiddenOptions = array(
+				'id' => $options['id'] . '_', 'name' => $options['name'],
+				'value' => '0', 'secure' => false
+			);
+			if (isset($options['disabled']) && $options['disabled'] == true) {
+				$hiddenOptions['disabled'] = 'disabled';
+			}
+			$output = $this->hidden($fieldName, $hiddenOptions);
+		}
+		unset($options['hiddenField']);
+
+		return $output . sprintf(
+			$this->Html->tags['checkbox'],
+			$options['name'],
+			$this->_parseAttributes($options, array('name'), null, ' ')
+		);
+	}
+
+/**
+ * Creates a set of radio widgets. Will create a legend and fieldset
+ * by default.  Use $options to control this
+ *
+ * ### Attributes:
+ *
+ * - `separator` - define the string in between the radio buttons
+ * - `legend` - control whether or not the widget set has a fieldset & legend
+ * - `value` - indicate a value that is should be checked
+ * - `label` - boolean to indicate whether or not labels for widgets show be displayed
+ * - `hiddenField` - boolean to indicate if you want the results of radio() to include
+ *    a hidden input with a value of ''. This is useful for creating radio sets that non-continuous
+ *
+ * @param string $fieldName Name of a field, like this "Modelname.fieldname"
+ * @param array $options Radio button options array.
+ * @param array $attributes Array of HTML attributes, and special attributes above.
+ * @return string Completed radio widget set.
+ * @access public
+ * @link http://book.cakephp.org/view/1429/radio
+ */
+	function radio($fieldName, $options = array(), $attributes = array()) {
+		$attributes = $this->_initInputField($fieldName, $attributes);
+		$legend = false;
+
+		if (isset($attributes['legend'])) {
+			$legend = $attributes['legend'];
+			unset($attributes['legend']);
+		} elseif (count($options) > 1) {
+			$legend = __(Inflector::humanize($this->field()), true);
+		}
+		$label = true;
+
+		if (isset($attributes['label'])) {
+			$label = $attributes['label'];
+			unset($attributes['label']);
+		}
+		$inbetween = null;
+
+		if (isset($attributes['separator'])) {
+			$inbetween = $attributes['separator'];
+			unset($attributes['separator']);
+		}
+
+		if (isset($attributes['value'])) {
+			$value = $attributes['value'];
+		} else {
+			$value =  $this->value($fieldName);
+		}
+		$out = array();
+
+		$hiddenField = isset($attributes['hiddenField']) ? $attributes['hiddenField'] : true;
+		unset($attributes['hiddenField']);
+
+		foreach ($options as $optValue => $optTitle) {
+			$optionsHere = array('value' => $optValue);
+
+			if (isset($value) && $optValue == $value) {
+				$optionsHere['checked'] = 'checked';
+			}
+			$parsedOptions = $this->_parseAttributes(
+				array_merge($attributes, $optionsHere),
+				array('name', 'type', 'id'), '', ' '
+			);
+			$tagName = Inflector::camelize(
+				$attributes['id'] . '_' . Inflector::slug($optValue)
+			);
+
+			if ($label) {
+				$optTitle =  sprintf($this->Html->tags['label'], $tagName, null, $optTitle);
+			}
+			$out[] =  sprintf(
+				$this->Html->tags['radio'], $attributes['name'],
+				$tagName, $parsedOptions, $optTitle
+			);
+		}
+		$hidden = null;
+
+		if ($hiddenField) {
+			if (!isset($value) || $value === '') {
+				$hidden = $this->hidden($fieldName, array(
+					'id' => $attributes['id'] . '_', 'value' => '', 'name' => $attributes['name']
+				));
+			}
+		}
+		$out = $hidden . implode($inbetween, $out);
+
+		if ($legend) {
+			$out = sprintf(
+				$this->Html->tags['fieldset'], '',
+				sprintf($this->Html->tags['legend'], $legend) . $out
+			);
+		}
+		return $out;
+	}
+
+/**
+ * Creates a text input widget.
+ *
+ * @param string $fieldName Name of a field, in the form "Modelname.fieldname"
+ * @param array $options Array of HTML attributes.
+ * @return string A generated HTML text input element
+ * @access public
+ * @link http://book.cakephp.org/view/1432/text
+ */
+	function text($fieldName, $options = array()) {
+		$options = $this->_initInputField($fieldName, array_merge(
+			array('type' => 'text'), $options
+		));
+		return sprintf(
+			$this->Html->tags['input'],
+			$options['name'],
+			$this->_parseAttributes($options, array('name'), null, ' ')
+		);
+	}
+
+/**
+ * Creates a password input widget.
+ *
+ * @param string $fieldName Name of a field, like in the form "Modelname.fieldname"
+ * @param array $options Array of HTML attributes.
+ * @return string A generated password input.
+ * @access public
+ * @link http://book.cakephp.org/view/1428/password
+ */
+	function password($fieldName, $options = array()) {
+		$options = $this->_initInputField($fieldName, $options);
+		return sprintf(
+			$this->Html->tags['password'],
+			$options['name'],
+			$this->_parseAttributes($options, array('name'), null, ' ')
+		);
+	}
+
+/**
+ * Creates a textarea widget.
+ *
+ * ### Options:
+ *
+ * - `escape` - Whether or not the contents of the textarea should be escaped. Defaults to true.
+ *
+ * @param string $fieldName Name of a field, in the form "Modelname.fieldname"
+ * @param array $options Array of HTML attributes, and special options above.
+ * @return string A generated HTML text input element
+ * @access public
+ * @link http://book.cakephp.org/view/1433/textarea
+ */
+	function textarea($fieldName, $options = array()) {
+		$options = $this->_initInputField($fieldName, $options);
+		$value = null;
+
+		if (array_key_exists('value', $options)) {
+			$value = $options['value'];
+			if (!array_key_exists('escape', $options) || $options['escape'] !== false) {
+				$value = h($value);
+			}
+			unset($options['value']);
+		}
+		return sprintf(
+			$this->Html->tags['textarea'],
+			$options['name'],
+			$this->_parseAttributes($options, array('type', 'name'), null, ' '),
+			$value
+		);
+	}
+
+/**
+ * Creates a hidden input field.
+ *
+ * @param string $fieldName Name of a field, in the form of "Modelname.fieldname"
+ * @param array $options Array of HTML attributes.
+ * @return string A generated hidden input
+ * @access public
+ * @link http://book.cakephp.org/view/1425/hidden
+ */
+	function hidden($fieldName, $options = array()) {
+		$secure = true;
+
+		if (isset($options['secure'])) {
+			$secure = $options['secure'];
+			unset($options['secure']);
+		}
+		$options = $this->_initInputField($fieldName, array_merge(
+			$options, array('secure' => false)
+		));
+		$model = $this->model();
+
+		if ($fieldName !== '_method' && $model !== '_Token' && $secure) {
+			$this->__secure(null, '' . $options['value']);
+		}
+
+		return sprintf(
+			$this->Html->tags['hidden'],
+			$options['name'],
+			$this->_parseAttributes($options, array('name', 'class'), '', ' ')
+		);
+	}
+
+/**
+ * Creates file input widget.
+ *
+ * @param string $fieldName Name of a field, in the form "Modelname.fieldname"
+ * @param array $options Array of HTML attributes.
+ * @return string A generated file input.
+ * @access public
+ * @link http://book.cakephp.org/view/1424/file
+ */
+	function file($fieldName, $options = array()) {
+		$options = array_merge($options, array('secure' => false));
+		$options = $this->_initInputField($fieldName, $options);
+		$view =& ClassRegistry::getObject('view');
+		$field = $view->entity();
+
+		foreach (array('name', 'type', 'tmp_name', 'error', 'size') as $suffix) {
+			$this->__secure(array_merge($field, array($suffix)));
+		}
+
+		$attributes = $this->_parseAttributes($options, array('name'), '', ' ');
+		return sprintf($this->Html->tags['file'], $options['name'], $attributes);
+	}
+
+/**
+ * Creates a `<button>` tag.  The type attribute defaults to `type="submit"`
+ * You can change it to a different value by using `$options['type']`.
+ *
+ * ### Options:
+ *
+ * - `escape` - HTML entity encode the $title of the button. Defaults to false.
+ *
+ * @param string $title The button's caption. Not automatically HTML encoded
+ * @param array $options Array of options and HTML attributes.
+ * @return string A HTML button tag.
+ * @access public
+ * @link http://book.cakephp.org/view/1415/button
+ */
+	function button($title, $options = array()) {
+		$options += array('type' => 'submit', 'escape' => false);
+		if ($options['escape']) {
+			$title = h($title);
+		}
+		return sprintf(
+			$this->Html->tags['button'],
+			$options['type'],
+			$this->_parseAttributes($options, array('type'), ' ', ''),
+			$title
+		);
+	}
+
+/**
+ * Creates a submit button element.  This method will generate `<input />` elements that
+ * can be used to submit, and reset forms by using $options.  image submits can be created by supplying an
+ * image path for $caption.
+ *
+ * ### Options
+ *
+ * - `div` - Include a wrapping div?  Defaults to true.  Accepts sub options similar to
+ *   FormHelper::input().
+ * - `before` - Content to include before the input.
+ * - `after` - Content to include after the input.
+ * - `type` - Set to 'reset' for reset inputs.  Defaults to 'submit'
+ * - Other attributes will be assigned to the input element.
+ *
+ * ### Options
+ *
+ * - `div` - Include a wrapping div?  Defaults to true.  Accepts sub options similar to
+ *   FormHelper::input().
+ * - Other attributes will be assigned to the input element.
+ *
+ * @param string $caption The label appearing on the button OR if string contains :// or the
+ *  extension .jpg, .jpe, .jpeg, .gif, .png use an image if the extension
+ *  exists, AND the first character is /, image is relative to webroot,
+ *  OR if the first character is not /, image is relative to webroot/img.
+ * @param array $options Array of options.  See above.
+ * @return string A HTML submit button
+ * @access public
+ * @link http://book.cakephp.org/view/1431/submit
+ */
+	function submit($caption = null, $options = array()) {
+		if (!is_string($caption) && empty($caption)) {
+			$caption = __('Submit', true);
+		}
+		$out = null;
+		$div = true;
+
+		if (isset($options['div'])) {
+			$div = $options['div'];
+			unset($options['div']);
+		}
+		$options += array('type' => 'submit', 'before' => null, 'after' => null);
+		$divOptions = array('tag' => 'div');
+
+		if ($div === true) {
+			$divOptions['class'] = 'submit';
+		} elseif ($div === false) {
+			unset($divOptions);
+		} elseif (is_string($div)) {
+			$divOptions['class'] = $div;
+		} elseif (is_array($div)) {
+			$divOptions = array_merge(array('class' => 'submit', 'tag' => 'div'), $div);
+		}
+
+		$before = $options['before'];
+		$after = $options['after'];
+		unset($options['before'], $options['after']);
+
+		if (strpos($caption, '://') !== false) {
+			unset($options['type']);
+			$out .=  $before . sprintf(
+				$this->Html->tags['submitimage'],
+				$caption,
+				$this->_parseAttributes($options, null, '', ' ')
+			) . $after;
+		} elseif (preg_match('/\.(jpg|jpe|jpeg|gif|png|ico)$/', $caption)) {
+			unset($options['type']);
+			if ($caption{0} !== '/') {
+				$url = $this->webroot(IMAGES_URL . $caption);
+			} else {
+				$caption = trim($caption, '/');
+				$url = $this->webroot($caption);
+			}
+			$out .= $before . sprintf(
+				$this->Html->tags['submitimage'],
+				$url,
+				$this->_parseAttributes($options, null, '', ' ')
+			) . $after;
+		} else {
+			$options['value'] = $caption;
+			$out .= $before . sprintf(
+				$this->Html->tags['submit'],
+				$this->_parseAttributes($options, null, '', ' ')
+			). $after;
+		}
+
+		if (isset($divOptions)) {
+			$tag = $divOptions['tag'];
+			unset($divOptions['tag']);
+			$out = $this->Html->tag($tag, $out, $divOptions);
+		}
+		return $out;
+	}
+
+/**
+ * Returns a formatted SELECT element.
+ *
+ * ### Attributes:
+ *
+ * - `showParents` - If included in the array and set to true, an additional option element
+ *   will be added for the parent of each option group. You can set an option with the same name
+ *   and it's key will be used for the value of the option.
+ * - `multiple` - show a multiple select box.  If set to 'checkbox' multiple checkboxes will be
+ *   created instead.
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ * - `escape` - If true contents of options will be HTML entity encoded. Defaults to true.
+ * - `class` - When using multiple = checkbox the classname to apply to the divs. Defaults to 'checkbox'.
+ *
+ * ### Using options
+ *
+ * A simple array will create normal options:
+ *
+ * {{{
+ * $options = array(1 => 'one', 2 => 'two);
+ * $this->Form->select('Model.field', $options));
+ * }}}
+ *
+ * While a nested options array will create optgroups with options inside them.
+ * {{{
+ * $options = array(
+ *    1 => 'bill',
+ *    'fred' => array(
+ *        2 => 'fred',
+ *        3 => 'fred jr.'
+ *     )
+ * );
+ * $this->Form->select('Model.field', $options);
+ * }}}
+ *
+ * In the above `2 => 'fred'` will not generate an option element.  You should enable the `showParents`
+ * attribute to show the fred option.
+ *
+ * @param string $fieldName Name attribute of the SELECT
+ * @param array $options Array of the OPTION elements (as 'value'=>'Text' pairs) to be used in the
+ *    SELECT element
+ * @param mixed $selected The option selected by default.  If null, the default value
+ *   from POST data will be used when available.
+ * @param array $attributes The HTML attributes of the select element.
+ * @return string Formatted SELECT element
+ * @access public
+ * @link http://book.cakephp.org/view/1430/select
+ */
+	function select($fieldName, $options = array(), $selected = null, $attributes = array()) {
+		$select = array();
+		$style = null;
+		$tag = null;
+		$attributes += array(
+			'class' => null,
+			'escape' => true,
+			'secure' => null,
+			'empty' => '',
+			'showParents' => false,
+			'hiddenField' => true
+		);
+
+		$escapeOptions = $this->_extractOption('escape', $attributes);
+		$secure = $this->_extractOption('secure', $attributes);
+		$showEmpty = $this->_extractOption('empty', $attributes);
+		$showParents = $this->_extractOption('showParents', $attributes);
+		$hiddenField = $this->_extractOption('hiddenField', $attributes);
+		unset($attributes['escape'], $attributes['secure'], $attributes['empty'], $attributes['showParents'], $attributes['hiddenField']);
+
+		$attributes = $this->_initInputField($fieldName, array_merge(
+			(array)$attributes, array('secure' => false)
+		));
+
+		if (is_string($options) && isset($this->__options[$options])) {
+			$options = $this->__generateOptions($options);
+		} elseif (!is_array($options)) {
+			$options = array();
+		}
+		if (isset($attributes['type'])) {
+			unset($attributes['type']);
+		}
+
+		if (!isset($selected)) {
+			$selected = $attributes['value'];
+		}
+
+		if (!empty($attributes['multiple'])) {
+			$style = ($attributes['multiple'] === 'checkbox') ? 'checkbox' : null;
+			$template = ($style) ? 'checkboxmultiplestart' : 'selectmultiplestart';
+			$tag = $this->Html->tags[$template];
+			if ($hiddenField) {
+				$hiddenAttributes = array(
+					'value' => '',
+					'id' => $attributes['id'] . ($style ? '' : '_'),
+					'secure' => false,
+					'name' => $attributes['name']
+				);
+				$select[] = $this->hidden(null, $hiddenAttributes);
+			}
+		} else {
+			$tag = $this->Html->tags['selectstart'];
+		}
+
+		if (!empty($tag) || isset($template)) {
+			if (!isset($secure) || $secure == true) {
+				$this->__secure();
+			}
+			$select[] = sprintf($tag, $attributes['name'], $this->_parseAttributes(
+				$attributes, array('name', 'value'))
+			);
+		}
+		$emptyMulti = (
+			$showEmpty !== null && $showEmpty !== false && !(
+				empty($showEmpty) && (isset($attributes) &&
+				array_key_exists('multiple', $attributes))
+			)
+		);
+
+		if ($emptyMulti) {
+			$showEmpty = ($showEmpty === true) ? '' : $showEmpty;
+			$options = array_reverse($options, true);
+			$options[''] = $showEmpty;
+			$options = array_reverse($options, true);
+		}
+
+		$select = array_merge($select, $this->__selectOptions(
+			array_reverse($options, true),
+			$selected,
+			array(),
+			$showParents,
+			array('escape' => $escapeOptions, 'style' => $style, 'name' => $attributes['name'], 'class' => $attributes['class'])
+		));
+
+		$template = ($style == 'checkbox') ? 'checkboxmultipleend' : 'selectend';
+		$select[] = $this->Html->tags[$template];
+		return implode("\n", $select);
+	}
+
+/**
+ * Returns a SELECT element for days.
+ *
+ * ### Attributes:
+ *
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ *
+ * @param string $fieldName Prefix name for the SELECT element
+ * @param string $selected Option which is selected.
+ * @param array $attributes HTML attributes for the select element
+ * @return string A generated day select box.
+ * @access public
+ * @link http://book.cakephp.org/view/1419/day
+ */
+	function day($fieldName, $selected = null, $attributes = array()) {
+		$attributes += array('empty' => true);
+		$selected = $this->__dateTimeSelected('day', $fieldName, $selected, $attributes);
+
+		if (strlen($selected) > 2) {
+			$selected = date('d', strtotime($selected));
+		} elseif ($selected === false) {
+			$selected = null;
+		}
+		return $this->select($fieldName . ".day", $this->__generateOptions('day'), $selected, $attributes);
+	}
+
+/**
+ * Returns a SELECT element for years
+ *
+ * ### Attributes:
+ *
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ * - `orderYear` - Ordering of year values in select options.
+ *   Possible values 'asc', 'desc'. Default 'desc'
+ *
+ * @param string $fieldName Prefix name for the SELECT element
+ * @param integer $minYear First year in sequence
+ * @param integer $maxYear Last year in sequence
+ * @param string $selected Option which is selected.
+ * @param array $attributes Attribute array for the select elements.
+ * @return string Completed year select input
+ * @access public
+ * @link http://book.cakephp.org/view/1416/year
+ */
+	function year($fieldName, $minYear = null, $maxYear = null, $selected = null, $attributes = array()) {
+		$attributes += array('empty' => true);
+		if ((empty($selected) || $selected === true) && $value = $this->value($fieldName)) {
+			if (is_array($value)) {
+				extract($value);
+				$selected = $year;
+			} else {
+				if (empty($value)) {
+					if (!$attributes['empty'] && !$maxYear) {
+						$selected = 'now';
+
+					} elseif (!$attributes['empty'] && $maxYear && !$selected) {
+						$selected = $maxYear;
+					}
+				} else {
+					$selected = $value;
+				}
+			}
+		}
+
+		if (strlen($selected) > 4 || $selected === 'now') {
+			$selected = date('Y', strtotime($selected));
+		} elseif ($selected === false) {
+			$selected = null;
+		}
+		$yearOptions = array('min' => $minYear, 'max' => $maxYear, 'order' => 'desc');
+		if (isset($attributes['orderYear'])) {
+			$yearOptions['order'] = $attributes['orderYear'];
+			unset($attributes['orderYear']);
+		}
+		return $this->select(
+			$fieldName . '.year', $this->__generateOptions('year', $yearOptions),
+			$selected, $attributes
+		);
+	}
+
+/**
+ * Returns a SELECT element for months.
+ *
+ * ### Attributes:
+ *
+ * - `monthNames` - If false, 2 digit numbers will be used instead of text.
+ *   If a array, the given array will be used.
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ *
+ * @param string $fieldName Prefix name for the SELECT element
+ * @param string $selected Option which is selected.
+ * @param array $attributes Attributes for the select element
+ * @return string A generated month select dropdown.
+ * @access public
+ * @link http://book.cakephp.org/view/1417/month
+ */
+	function month($fieldName, $selected = null, $attributes = array()) {
+		$attributes += array('empty' => true);
+		$selected = $this->__dateTimeSelected('month', $fieldName, $selected, $attributes);
+
+		if (strlen($selected) > 2) {
+			$selected = date('m', strtotime($selected));
+		} elseif ($selected === false) {
+			$selected = null;
+		}
+		$defaults = array('monthNames' => true);
+		$attributes = array_merge($defaults, (array) $attributes);
+		$monthNames = $attributes['monthNames'];
+		unset($attributes['monthNames']);
+
+		return $this->select(
+			$fieldName . ".month",
+			$this->__generateOptions('month', array('monthNames' => $monthNames)),
+			$selected, $attributes
+		);
+	}
+
+/**
+ * Returns a SELECT element for hours.
+ *
+ * ### Attributes:
+ *
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ *
+ * @param string $fieldName Prefix name for the SELECT element
+ * @param boolean $format24Hours True for 24 hours format
+ * @param string $selected Option which is selected.
+ * @param array $attributes List of HTML attributes
+ * @return string Completed hour select input
+ * @access public
+ * @link http://book.cakephp.org/view/1420/hour
+ */
+	function hour($fieldName, $format24Hours = false, $selected = null, $attributes = array()) {
+		$attributes += array('empty' => true);
+		$selected = $this->__dateTimeSelected('hour', $fieldName, $selected, $attributes);
+
+		if (strlen($selected) > 2) {
+			if ($format24Hours) {
+				$selected = date('H', strtotime($selected));
+			} else {
+				$selected = date('g', strtotime($selected));
+			}
+		} elseif ($selected === false) {
+			$selected = null;
+		}
+		return $this->select(
+			$fieldName . ".hour",
+			$this->__generateOptions($format24Hours ? 'hour24' : 'hour'),
+			$selected, $attributes
+		);
+	}
+
+/**
+ * Returns a SELECT element for minutes.
+ *
+ * ### Attributes:
+ *
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ *
+ * @param string $fieldName Prefix name for the SELECT element
+ * @param string $selected Option which is selected.
+ * @param string $attributes Array of Attributes
+ * @return string Completed minute select input.
+ * @access public
+ * @link http://book.cakephp.org/view/1421/minute
+ */
+	function minute($fieldName, $selected = null, $attributes = array()) {
+		$attributes += array('empty' => true);
+		$selected = $this->__dateTimeSelected('min', $fieldName, $selected, $attributes);
+
+		if (strlen($selected) > 2) {
+			$selected = date('i', strtotime($selected));
+		} elseif ($selected === false) {
+			$selected = null;
+		}
+		$minuteOptions = array();
+
+		if (isset($attributes['interval'])) {
+			$minuteOptions['interval'] = $attributes['interval'];
+			unset($attributes['interval']);
+		}
+		return $this->select(
+			$fieldName . ".min", $this->__generateOptions('minute', $minuteOptions),
+			$selected, $attributes
+		);
+	}
+
+/**
+ * Selects values for dateTime selects.
+ *
+ * @param string $select Name of element field. ex. 'day'
+ * @param string $fieldName Name of fieldName being generated ex. Model.created
+ * @param mixed $selected The current selected value.
+ * @param array $attributes Array of attributes, must contain 'empty' key.
+ * @return string Currently selected value.
+ * @access private
+ */
+	function __dateTimeSelected($select, $fieldName, $selected, $attributes) {
+		if ((empty($selected) || $selected === true) && $value = $this->value($fieldName)) {
+			if (is_array($value) && isset($value[$select])) {
+				$selected = $value[$select];
+			} else {
+				if (empty($value)) {
+					if (!$attributes['empty']) {
+						$selected = 'now';
+					}
+				} else {
+					$selected = $value;
+				}
+			}
+		}
+		return $selected;
+	}
+
+/**
+ * Returns a SELECT element for AM or PM.
+ *
+ * ### Attributes:
+ *
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ *
+ * @param string $fieldName Prefix name for the SELECT element
+ * @param string $selected Option which is selected.
+ * @param string $attributes Array of Attributes
+ * @param bool $showEmpty Show/Hide an empty option
+ * @return string Completed meridian select input
+ * @access public
+ * @link http://book.cakephp.org/view/1422/meridian
+ */
+	function meridian($fieldName, $selected = null, $attributes = array()) {
+		$attributes += array('empty' => true);
+		if ((empty($selected) || $selected === true) && $value = $this->value($fieldName)) {
+			if (is_array($value)) {
+				extract($value);
+				$selected = $meridian;
+			} else {
+				if (empty($value)) {
+					if (!$attribues['empty']) {
+						$selected = date('a');
+					}
+				} else {
+					$selected = date('a', strtotime($value));
+				}
+			}
+		}
+
+		if ($selected === false) {
+			$selected = null;
+		}
+		return $this->select(
+			$fieldName . ".meridian", $this->__generateOptions('meridian'),
+			$selected, $attributes
+		);
+	}
+
+/**
+ * Returns a set of SELECT elements for a full datetime setup: day, month and year, and then time.
+ *
+ * ### Attributes:
+ *
+ * - `monthNames` If false, 2 digit numbers will be used instead of text.
+ *   If a array, the given array will be used.
+ * - `minYear` The lowest year to use in the year select
+ * - `maxYear` The maximum year to use in the year select
+ * - `interval` The interval for the minutes select. Defaults to 1
+ * - `separator` The contents of the string between select elements. Defaults to '-'
+ * - `empty` - If true, the empty select option is shown.  If a string,
+ *   that string is displayed as the empty element.
+ * - `value` | `default` The default value to be used by the input.  A value in `$this->data`
+ *   matching the field name will override this value.  If no default is provided `time()` will be used.
+ *
+ * @param string $fieldName Prefix name for the SELECT element
+ * @param string $dateFormat DMY, MDY, YMD.
+ * @param string $timeFormat 12, 24.
+ * @param string $selected Option which is selected.
+ * @param string $attributes array of Attributes
+ * @return string Generated set of select boxes for the date and time formats chosen.
+ * @access public
+ * @link http://book.cakephp.org/view/1418/dateTime
+ */
+	function dateTime($fieldName, $dateFormat = 'DMY', $timeFormat = '12', $selected = null, $attributes = array()) {
+		$attributes += array('empty' => true);
+		$year = $month = $day = $hour = $min = $meridian = null;
+
+		if (empty($selected)) {
+			$selected = $this->value($attributes, $fieldName);
+			if (isset($selected['value'])) {
+				$selected = $selected['value'];
+			} else {
+				$selected = null;
+			}
+		}
+
+		if ($selected === null && $attributes['empty'] != true) {
+			$selected = time();
+		}
+
+		if (!empty($selected)) {
+			if (is_array($selected)) {
+				extract($selected);
+			} else {
+				if (is_numeric($selected)) {
+					$selected = strftime('%Y-%m-%d %H:%M:%S', $selected);
+				}
+				$meridian = 'am';
+				$pos = strpos($selected, '-');
+				if ($pos !== false) {
+					$date = explode('-', $selected);
+					$days = explode(' ', $date[2]);
+					$day = $days[0];
+					$month = $date[1];
+					$year = $date[0];
+				} else {
+					$days[1] = $selected;
+				}
+
+				if (!empty($timeFormat)) {
+					$time = explode(':', $days[1]);
+
+					if (($time[0] > 12) && $timeFormat == '12') {
+						$time[0] = $time[0] - 12;
+						$meridian = 'pm';
+					} elseif ($time[0] == '00' && $timeFormat == '12') {
+						$time[0] = 12;
+					} elseif ($time[0] > 12) {
+						$meridian = 'pm';
+					}
+					if ($time[0] == 0 && $timeFormat == '12') {
+						$time[0] = 12;
+					}
+					$hour = $min = null;
+					if (isset($time[1])) {
+						$hour = $time[0];
+						$min = $time[1];
+					}
+				}
+			}
+		}
+
+		$elements = array('Day', 'Month', 'Year', 'Hour', 'Minute', 'Meridian');
+		$defaults = array(
+			'minYear' => null, 'maxYear' => null, 'separator' => '-',
+			'interval' => 1, 'monthNames' => true
+		);
+		$attributes = array_merge($defaults, (array) $attributes);
+		if (isset($attributes['minuteInterval'])) {
+			$attributes['interval'] = $attributes['minuteInterval'];
+			unset($attributes['minuteInterval']);
+		}
+		$minYear = $attributes['minYear'];
+		$maxYear = $attributes['maxYear'];
+		$separator = $attributes['separator'];
+		$interval = $attributes['interval'];
+		$monthNames = $attributes['monthNames'];
+		$attributes = array_diff_key($attributes, $defaults);
+
+		if (isset($attributes['id'])) {
+			if (is_string($attributes['id'])) {
+				// build out an array version
+				foreach ($elements as $element) {
+					$selectAttrName = 'select' . $element . 'Attr';
+					${$selectAttrName} = $attributes;
+					${$selectAttrName}['id'] = $attributes['id'] . $element;
+				}
+			} elseif (is_array($attributes['id'])) {
+				// check for missing ones and build selectAttr for each element
+				$attributes['id'] += array(
+					'month' => '', 'year' => '', 'day' => '',
+					'hour' => '', 'minute' => '', 'meridian' => ''
+				);
+				foreach ($elements as $element) {
+					$selectAttrName = 'select' . $element . 'Attr';
+					${$selectAttrName} = $attributes;
+					${$selectAttrName}['id'] = $attributes['id'][strtolower($element)];
+				}
+			}
+		} else {
+			// build the selectAttrName with empty id's to pass
+			foreach ($elements as $element) {
+				$selectAttrName = 'select' . $element . 'Attr';
+				${$selectAttrName} = $attributes;
+			}
+		}
+
+		$selects = array();
+		foreach (preg_split('//', $dateFormat, -1, PREG_SPLIT_NO_EMPTY) as $char) {
+			switch ($char) {
+				case 'Y':
+					$selects[] = $this->year(
+						$fieldName, $minYear, $maxYear, $year, $selectYearAttr
+					);
+				break;
+				case 'M':
+					$selectMonthAttr['monthNames'] = $monthNames;
+					$selects[] = $this->month($fieldName, $month, $selectMonthAttr);
+				break;
+				case 'D':
+					$selects[] = $this->day($fieldName, $day, $selectDayAttr);
+				break;
+			}
+		}
+		$opt = implode($separator, $selects);
+
+		if (!empty($interval) && $interval > 1 && !empty($min)) {
+			$min = round($min * (1 / $interval)) * $interval;
+		}
+		$selectMinuteAttr['interval'] = $interval;
+		switch ($timeFormat) {
+			case '24':
+				$opt .= $this->hour($fieldName, true, $hour, $selectHourAttr) . ':' .
+				$this->minute($fieldName, $min, $selectMinuteAttr);
+			break;
+			case '12':
+				$opt .= $this->hour($fieldName, false, $hour, $selectHourAttr) . ':' .
+				$this->minute($fieldName, $min, $selectMinuteAttr) . ' ' .
+				$this->meridian($fieldName, $meridian, $selectMeridianAttr);
+			break;
+			default:
+				$opt .= '';
+			break;
+		}
+		return $opt;
+	}
+
+/**
+ * Gets the input field name for the current tag
+ *
+ * @param array $options
+ * @param string $key
+ * @return array
+ * @access protected
+ */
+	function _name($options = array(), $field = null, $key = 'name') {
+		if ($this->requestType == 'get') {
+			if ($options === null) {
+				$options = array();
+			} elseif (is_string($options)) {
+				$field = $options;
+				$options = 0;
+			}
+
+			if (!empty($field)) {
+				$this->setEntity($field);
+			}
+
+			if (is_array($options) && isset($options[$key])) {
+				return $options;
+			}
+
+			$view = ClassRegistry::getObject('view');
+			$name = !empty($view->field) ? $view->field : $view->model;
+			if (!empty($view->fieldSuffix)) {
+				$name .= '[' . $view->fieldSuffix . ']';
+			}
+
+			if (is_array($options)) {
+				$options[$key] = $name;
+				return $options;
+			} else {
+				return $name;
+			}
+		}
+		return parent::_name($options, $field, $key);
+	}
+
+/**
+ * Returns an array of formatted OPTION/OPTGROUP elements
+ * @access private
+ * @return array
+ */
+	function __selectOptions($elements = array(), $selected = null, $parents = array(), $showParents = null, $attributes = array()) {
+		$select = array();
+		$attributes = array_merge(array('escape' => true, 'style' => null, 'class' => null), $attributes);
+		$selectedIsEmpty = ($selected === '' || $selected === null);
+		$selectedIsArray = is_array($selected);
+
+		foreach ($elements as $name => $title) {
+			$htmlOptions = array();
+			if (is_array($title) && (!isset($title['name']) || !isset($title['value']))) {
+				if (!empty($name)) {
+					if ($attributes['style'] === 'checkbox') {
+						$select[] = $this->Html->tags['fieldsetend'];
+					} else {
+						$select[] = $this->Html->tags['optiongroupend'];
+					}
+					$parents[] = $name;
+				}
+				$select = array_merge($select, $this->__selectOptions(
+					$title, $selected, $parents, $showParents, $attributes
+				));
+
+				if (!empty($name)) {
+					$name = $attributes['escape'] ? h($name) : $name;
+					if ($attributes['style'] === 'checkbox') {
+						$select[] = sprintf($this->Html->tags['fieldsetstart'], $name);
+					} else {
+						$select[] = sprintf($this->Html->tags['optiongroup'], $name, '');
+					}
+				}
+				$name = null;
+			} elseif (is_array($title)) {
+				$htmlOptions = $title;
+				$name = $title['value'];
+				$title = $title['name'];
+				unset($htmlOptions['name'], $htmlOptions['value']);
+			}
+
+			if ($name !== null) {
+				if (
+					(!$selectedIsArray && !$selectedIsEmpty && (string)$selected == (string)$name) ||
+					($selectedIsArray && in_array($name, $selected))
+				) {
+					if ($attributes['style'] === 'checkbox') {
+						$htmlOptions['checked'] = true;
+					} else {
+						$htmlOptions['selected'] = 'selected';
+					}
+				}
+
+				if ($showParents || (!in_array($title, $parents))) {
+					$title = ($attributes['escape']) ? h($title) : $title;
+
+					if ($attributes['style'] === 'checkbox') {
+						$htmlOptions['value'] = $name;
+
+						$tagName = Inflector::camelize(
+							$this->model() . '_' . $this->field().'_'.Inflector::slug($name)
+						);
+						$htmlOptions['id'] = $tagName;
+						$label = array('for' => $tagName);
+
+						if (isset($htmlOptions['checked']) && $htmlOptions['checked'] === true) {
+							$label['class'] = 'selected';
+						}
+
+						$name = $attributes['name'];
+
+						if (empty($attributes['class'])) {
+							$attributes['class'] = 'checkbox';
+						} elseif ($attributes['class'] === 'form-error') {
+							$attributes['class'] = 'checkbox ' . $attributes['class'];
+						}
+						$label = $this->label(null, $title, $label);
+						$item = sprintf(
+							$this->Html->tags['checkboxmultiple'], $name,
+							$this->_parseAttributes($htmlOptions)
+						);
+						$select[] = $this->Html->div($attributes['class'], $item . $label);
+					} else {
+						$select[] = sprintf(
+							$this->Html->tags['selectoption'],
+							$name, $this->_parseAttributes($htmlOptions), $title
+						);
+					}
+				}
+			}
+		}
+
+		return array_reverse($select, true);
+	}
+
+/**
+ * Generates option lists for common <select /> menus
+ * @access private
+ */
+	function __generateOptions($name, $options = array()) {
+		if (!empty($this->options[$name])) {
+			return $this->options[$name];
+		}
+		$data = array();
+
+		switch ($name) {
+			case 'minute':
+				if (isset($options['interval'])) {
+					$interval = $options['interval'];
+				} else {
+					$interval = 1;
+				}
+				$i = 0;
+				while ($i < 60) {
+					$data[sprintf('%02d', $i)] = sprintf('%02d', $i);
+					$i += $interval;
+				}
+			break;
+			case 'hour':
+				for ($i = 1; $i <= 12; $i++) {
+					$data[sprintf('%02d', $i)] = $i;
+				}
+			break;
+			case 'hour24':
+				for ($i = 0; $i <= 23; $i++) {
+					$data[sprintf('%02d', $i)] = $i;
+				}
+			break;
+			case 'meridian':
+				$data = array('am' => 'am', 'pm' => 'pm');
+			break;
+			case 'day':
+				$min = 1;
+				$max = 31;
+
+				if (isset($options['min'])) {
+					$min = $options['min'];
+				}
+				if (isset($options['max'])) {
+					$max = $options['max'];
+				}
+
+				for ($i = $min; $i <= $max; $i++) {
+					$data[sprintf('%02d', $i)] = $i;
+				}
+			break;
+			case 'month':
+				if ($options['monthNames'] === true) {
+					$data['01'] = __('January', true);
+					$data['02'] = __('February', true);
+					$data['03'] = __('March', true);
+					$data['04'] = __('April', true);
+					$data['05'] = __('May', true);
+					$data['06'] = __('June', true);
+					$data['07'] = __('July', true);
+					$data['08'] = __('August', true);
+					$data['09'] = __('September', true);
+					$data['10'] = __('October', true);
+					$data['11'] = __('November', true);
+					$data['12'] = __('December', true);
+				} else if (is_array($options['monthNames'])) {
+					$data = $options['monthNames'];
+				} else {
+					for ($m = 1; $m <= 12; $m++) {
+						$data[sprintf("%02s", $m)] = strftime("%m", mktime(1, 1, 1, $m, 1, 1999));
+					}
+				}
+			break;
+			case 'year':
+				$current = intval(date('Y'));
+
+				if (!isset($options['min'])) {
+					$min = $current - 20;
+				} else {
+					$min = $options['min'];
+				}
+
+				if (!isset($options['max'])) {
+					$max = $current + 20;
+				} else {
+					$max = $options['max'];
+				}
+				if ($min > $max) {
+					list($min, $max) = array($max, $min);
+				}
+				for ($i = $min; $i <= $max; $i++) {
+					$data[$i] = $i;
+				}
+				if ($options['order'] != 'asc') {
+					$data = array_reverse($data, true);
+				}
+			break;
+		}
+		$this->__options[$name] = $data;
+		return $this->__options[$name];
+	}
+
+/**
+ * Sets field defaults and adds field to form security input hash
+ *
+ * Options
+ *
+ *  - `secure` - boolean whether or not the field should be added to the security fields.
+ *
+ * @param string $field Name of the field to initialize options for.
+ * @param array $options Array of options to append options into.
+ * @return array Array of options for the input.
+ * @access protected
+ */
+	function _initInputField($field, $options = array()) {
+		if (isset($options['secure'])) {
+			$secure = $options['secure'];
+			unset($options['secure']);
+		} else {
+			$secure = (isset($this->params['_Token']) && !empty($this->params['_Token']));
+		}
+
+		$fieldName = null;
+		if ($secure && !empty($options['name'])) {
+			preg_match_all('/\[(.*?)\]/', $options['name'], $matches);
+			if (isset($matches[1])) {
+				$fieldName = $matches[1];
+			}
+		}
+
+		$result = parent::_initInputField($field, $options);
+
+		if ($secure) {
+			$this->__secure($fieldName);
+		}
+		return $result;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/html.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/html.php
new file mode 100644
index 000000000..dee7cc309
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/html.php
@@ -0,0 +1,835 @@
+<?php
+/**
+ * Html Helper class file.
+ *
+ * Simplifies the construction of HTML elements.
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 0.9.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ * Html Helper class for easy use of HTML widgets.
+ *
+ * HtmlHelper encloses all methods needed while working with HTML pages.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1434/HTML
+ */
+class HtmlHelper extends AppHelper {
+/**
+ * html tags used by this helper.
+ *
+ * @var array
+ * @access public
+ */
+	var $tags = array(
+		'meta' => '<meta%s/>',
+		'metalink' => '<link href="%s"%s/>',
+		'link' => '<a href="%s"%s>%s</a>',
+		'mailto' => '<a href="mailto:%s" %s>%s</a>',
+		'form' => '<form %s>',
+		'formend' => '</form>',
+		'input' => '<input name="%s" %s/>',
+		'textarea' => '<textarea name="%s" %s>%s</textarea>',
+		'hidden' => '<input type="hidden" name="%s" %s/>',
+		'checkbox' => '<input type="checkbox" name="%s" %s/>',
+		'checkboxmultiple' => '<input type="checkbox" name="%s[]"%s />',
+		'radio' => '<input type="radio" name="%s" id="%s" %s />%s',
+		'selectstart' => '<select name="%s"%s>',
+		'selectmultiplestart' => '<select name="%s[]"%s>',
+		'selectempty' => '<option value=""%s>&nbsp;</option>',
+		'selectoption' => '<option value="%s"%s>%s</option>',
+		'selectend' => '</select>',
+		'optiongroup' => '<optgroup label="%s"%s>',
+		'optiongroupend' => '</optgroup>',
+		'checkboxmultiplestart' => '',
+		'checkboxmultipleend' => '',
+		'password' => '<input type="password" name="%s" %s/>',
+		'file' => '<input type="file" name="%s" %s/>',
+		'file_no_model' => '<input type="file" name="%s" %s/>',
+		'submit' => '<input %s/>',
+		'submitimage' => '<input type="image" src="%s" %s/>',
+		'button' => '<button type="%s"%s>%s</button>',
+		'image' => '<img src="%s" %s/>',
+		'tableheader' => '<th%s>%s</th>',
+		'tableheaderrow' => '<tr%s>%s</tr>',
+		'tablecell' => '<td%s>%s</td>',
+		'tablerow' => '<tr%s>%s</tr>',
+		'block' => '<div%s>%s</div>',
+		'blockstart' => '<div%s>',
+		'blockend' => '</div>',
+		'tag' => '<%s%s>%s</%s>',
+		'tagstart' => '<%s%s>',
+		'tagend' => '</%s>',
+		'para' => '<p%s>%s</p>',
+		'parastart' => '<p%s>',
+		'label' => '<label for="%s"%s>%s</label>',
+		'fieldset' => '<fieldset%s>%s</fieldset>',
+		'fieldsetstart' => '<fieldset><legend>%s</legend>',
+		'fieldsetend' => '</fieldset>',
+		'legend' => '<legend>%s</legend>',
+		'css' => '<link rel="%s" type="text/css" href="%s" %s/>',
+		'style' => '<style type="text/css"%s>%s</style>',
+		'charset' => '<meta http-equiv="Content-Type" content="text/html; charset=%s" />',
+		'ul' => '<ul%s>%s</ul>',
+		'ol' => '<ol%s>%s</ol>',
+		'li' => '<li%s>%s</li>',
+		'error' => '<div%s>%s</div>',
+		'javascriptblock' => '<script type="text/javascript"%s>%s</script>',
+		'javascriptstart' => '<script type="text/javascript">',
+		'javascriptlink' => '<script type="text/javascript" src="%s"%s></script>',
+		'javascriptend' => '</script>'
+	);
+
+/**
+ * Breadcrumbs.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_crumbs = array();
+
+/**
+ * Names of script files that have been included once
+ *
+ * @var array
+ * @access private
+ */
+	var $__includedScripts = array();
+/**
+ * Options for the currently opened script block buffer if any.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_scriptBlockOptions = array();
+/**
+ * Document type definitions
+ *
+ * @var array
+ * @access private
+ */
+	var $__docTypes = array(
+		'html4-strict'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">',
+		'html4-trans'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">',
+		'html4-frame'  => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">',
+		'xhtml-strict' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
+		'xhtml-trans' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
+		'xhtml-frame' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
+		'xhtml11' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
+	);
+
+/**
+ * Adds a link to the breadcrumbs array.
+ *
+ * @param string $name Text for link
+ * @param string $link URL for link (if empty it won't be a link)
+ * @param mixed $options Link attributes e.g. array('id'=>'selected')
+ * @return void
+ * @see HtmlHelper::link() for details on $options that can be used.
+ * @access public
+ */
+	function addCrumb($name, $link = null, $options = null) {
+		$this->_crumbs[] = array($name, $link, $options);
+	}
+
+/**
+ * Returns a doctype string.
+ *
+ * Possible doctypes:
+ *
+ *  - html4-strict:  HTML4 Strict.
+ *  - html4-trans:  HTML4 Transitional.
+ *  - html4-frame:  HTML4 Frameset.
+ *  - xhtml-strict: XHTML1 Strict.
+ *  - xhtml-trans: XHTML1 Transitional.
+ *  - xhtml-frame: XHTML1 Frameset.
+ *  - xhtml11: XHTML1.1.
+ *
+ * @param string $type Doctype to use.
+ * @return string Doctype string
+ * @access public
+ * @link http://book.cakephp.org/view/1439/docType
+ */
+	function docType($type = 'xhtml-strict') {
+		if (isset($this->__docTypes[$type])) {
+			return $this->__docTypes[$type];
+		}
+		return null;
+	}
+
+/**
+ * Creates a link to an external resource and handles basic meta tags
+ *
+ * ### Options
+ *
+ * - `inline` Whether or not the link element should be output inline, or in scripts_for_layout.
+ *
+ * @param string $type The title of the external resource
+ * @param mixed $url The address of the external resource or string for content attribute
+ * @param array $options Other attributes for the generated tag. If the type attribute is html,
+ *    rss, atom, or icon, the mime-type is returned.
+ * @return string A completed `<link />` element.
+ * @access public
+ * @link http://book.cakephp.org/view/1438/meta
+ */
+	function meta($type, $url = null, $options = array()) {
+		$inline = isset($options['inline']) ? $options['inline'] : true;
+		unset($options['inline']);
+
+		if (!is_array($type)) {
+			$types = array(
+				'rss'	=> array('type' => 'application/rss+xml', 'rel' => 'alternate', 'title' => $type, 'link' => $url),
+				'atom'	=> array('type' => 'application/atom+xml', 'title' => $type, 'link' => $url),
+				'icon'	=> array('type' => 'image/x-icon', 'rel' => 'icon', 'link' => $url),
+				'keywords' => array('name' => 'keywords', 'content' => $url),
+				'description' => array('name' => 'description', 'content' => $url),
+			);
+
+			if ($type === 'icon' && $url === null) {
+				$types['icon']['link'] = $this->webroot('favicon.ico');
+			}
+
+			if (isset($types[$type])) {
+				$type = $types[$type];
+			} elseif (!isset($options['type']) && $url !== null) {
+				if (is_array($url) && isset($url['ext'])) {
+					$type = $types[$url['ext']];
+				} else {
+					$type = $types['rss'];
+				}
+			} elseif (isset($options['type']) && isset($types[$options['type']])) {
+				$type = $types[$options['type']];
+				unset($options['type']);
+			} else {
+				$type = array();
+			}
+		} elseif ($url !== null) {
+			$inline = $url;
+		}
+		$options = array_merge($type, $options);
+		$out = null;
+
+		if (isset($options['link'])) {
+			if (isset($options['rel']) && $options['rel'] === 'icon') {
+				$out = sprintf($this->tags['metalink'], $options['link'], $this->_parseAttributes($options, array('link'), ' ', ' '));
+				$options['rel'] = 'shortcut icon';
+			} else {
+				$options['link'] = $this->url($options['link'], true);
+			}
+			$out .= sprintf($this->tags['metalink'], $options['link'], $this->_parseAttributes($options, array('link'), ' ', ' '));
+		} else {
+			$out = sprintf($this->tags['meta'], $this->_parseAttributes($options, array('type'), ' ', ' '));
+		}
+
+		if ($inline) {
+			return $out;
+		} else {
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript($out);
+		}
+	}
+
+/**
+ * Returns a charset META-tag.
+ *
+ * @param string $charset The character set to be used in the meta tag. If empty,
+ *  The App.encoding value will be used. Example: "utf-8".
+ * @return string A meta tag containing the specified character set.
+ * @access public
+ * @link http://book.cakephp.org/view/1436/charset
+ */
+	function charset($charset = null) {
+		if (empty($charset)) {
+			$charset = strtolower(Configure::read('App.encoding'));
+		}
+		return sprintf($this->tags['charset'], (!empty($charset) ? $charset : 'utf-8'));
+	}
+
+/**
+ * Creates an HTML link.
+ *
+ * If $url starts with "http://" this is treated as an external link. Else,
+ * it is treated as a path to controller/action and parsed with the
+ * HtmlHelper::url() method.
+ *
+ * If the $url is empty, $title is used instead.
+ *
+ * ### Options
+ *
+ * - `escape` Set to false to disable escaping of title and attributes.
+ *
+ * @param string $title The content to be wrapped by <a> tags.
+ * @param mixed $url Cake-relative URL or array of URL parameters, or external URL (starts with http://)
+ * @param array $options Array of HTML attributes.
+ * @param string $confirmMessage JavaScript confirmation message.
+ * @return string An `<a />` element.
+ * @access public
+ * @link http://book.cakephp.org/view/1442/link
+ */
+	function link($title, $url = null, $options = array(), $confirmMessage = false) {
+		$escapeTitle = true;
+		if ($url !== null) {
+			$url = $this->url($url);
+		} else {
+			$url = $this->url($title);
+			$title = $url;
+			$escapeTitle = false;
+		}
+
+		if (isset($options['escape'])) {
+			$escapeTitle = $options['escape'];
+		}
+
+		if ($escapeTitle === true) {
+			$title = h($title);
+		} elseif (is_string($escapeTitle)) {
+			$title = htmlentities($title, ENT_QUOTES, $escapeTitle);
+		}
+
+		if (!empty($options['confirm'])) {
+			$confirmMessage = $options['confirm'];
+			unset($options['confirm']);
+		}
+		if ($confirmMessage) {
+			$confirmMessage = str_replace("'", "\'", $confirmMessage);
+			$confirmMessage = str_replace('"', '\"', $confirmMessage);
+			$options['onclick'] = "return confirm('{$confirmMessage}');";
+		} elseif (isset($options['default']) && $options['default'] == false) {
+			if (isset($options['onclick'])) {
+				$options['onclick'] .= ' event.returnValue = false; return false;';
+			} else {
+				$options['onclick'] = 'event.returnValue = false; return false;';
+			}
+			unset($options['default']);
+		}
+		return sprintf($this->tags['link'], $url, $this->_parseAttributes($options), $title);
+	}
+
+/**
+ * Creates a link element for CSS stylesheets.
+ *
+ * ### Options
+ *
+ * - `inline` If set to false, the generated tag appears in the head tag of the layout. Defaults to true
+ *
+ * @param mixed $path The name of a CSS style sheet or an array containing names of
+ *   CSS stylesheets. If `$path` is prefixed with '/', the path will be relative to the webroot
+ *   of your application. Otherwise, the path will be relative to your CSS path, usually webroot/css.
+ * @param string $rel Rel attribute. Defaults to "stylesheet". If equal to 'import' the stylesheet will be imported.
+ * @param array $options Array of HTML attributes.
+ * @return string CSS <link /> or <style /> tag, depending on the type of link.
+ * @access public
+ * @link http://book.cakephp.org/view/1437/css
+ */
+	function css($path, $rel = null, $options = array()) {
+		$options += array('inline' => true);
+		if (is_array($path)) {
+			$out = '';
+			foreach ($path as $i) {
+				$out .= "\n\t" . $this->css($i, $rel, $options);
+			}
+			if ($options['inline'])  {
+				return $out . "\n";
+			}
+			return;
+		}
+
+		if (strpos($path, '://') !== false) {
+			$url = $path;
+		} else {
+			if ($path[0] !== '/') {
+				$path = CSS_URL . $path;
+			}
+
+			if (strpos($path, '?') === false) {
+				if (substr($path, -4) !== '.css') {
+					$path .= '.css';
+				}
+			}
+			$url = $this->assetTimestamp($this->webroot($path));
+
+			if (Configure::read('Asset.filter.css')) {
+				$pos = strpos($url, CSS_URL);
+				if ($pos !== false) {
+					$url = substr($url, 0, $pos) . 'ccss/' . substr($url, $pos + strlen(CSS_URL));
+				}
+			}
+		}
+
+		if ($rel == 'import') {
+			$out = sprintf($this->tags['style'], $this->_parseAttributes($options, array('inline'), '', ' '), '@import url(' . $url . ');');
+		} else {
+			if ($rel == null) {
+				$rel = 'stylesheet';
+			}
+			$out = sprintf($this->tags['css'], $rel, $url, $this->_parseAttributes($options, array('inline'), '', ' '));
+		}
+
+		if ($options['inline']) {
+			return $out;
+		} else {
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript($out);
+		}
+	}
+
+/**
+ * Returns one or many `<script>` tags depending on the number of scripts given.
+ *
+ * If the filename is prefixed with "/", the path will be relative to the base path of your
+ * application.  Otherwise, the path will be relative to your JavaScript path, usually webroot/js.
+ *
+ * Can include one or many Javascript files.
+ *
+ * ### Options
+ *
+ * - `inline` - Whether script should be output inline or into scripts_for_layout.
+ * - `once` - Whether or not the script should be checked for uniqueness. If true scripts will only be
+ *   included once, use false to allow the same script to be included more than once per request.
+ *
+ * @param mixed $url String or array of javascript files to include
+ * @param mixed $options Array of options, and html attributes see above. If boolean sets $options['inline'] = value
+ * @return mixed String of `<script />` tags or null if $inline is false or if $once is true and the file has been
+ *   included before.
+ * @access public
+ * @link http://book.cakephp.org/view/1589/script
+ */
+	function script($url, $options = array()) {
+		if (is_bool($options)) {
+			list($inline, $options) = array($options, array());
+			$options['inline'] = $inline;
+		}
+		$options = array_merge(array('inline' => true, 'once' => true), $options);
+		if (is_array($url)) {
+			$out = '';
+			foreach ($url as $i) {
+				$out .= "\n\t" . $this->script($i, $options);
+			}
+			if ($options['inline'])  {
+				return $out . "\n";
+			}
+			return null;
+		}
+		if ($options['once'] && isset($this->__includedScripts[$url])) {
+			return null;
+		}
+		$this->__includedScripts[$url] = true;
+
+		if (strpos($url, '://') === false) {
+			if ($url[0] !== '/') {
+				$url = JS_URL . $url;
+			}
+			if (strpos($url, '?') === false && substr($url, -3) !== '.js') {
+				$url .= '.js';
+			}
+			$url = $this->assetTimestamp($this->webroot($url));
+
+			if (Configure::read('Asset.filter.js')) {
+				$url = str_replace(JS_URL, 'cjs/', $url);
+			}
+		}
+		$attributes = $this->_parseAttributes($options, array('inline', 'once'), ' ');
+		$out = sprintf($this->tags['javascriptlink'], $url, $attributes);
+
+		if ($options['inline']) {
+			return $out;
+		} else {
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript($out);
+		}
+	}
+
+/**
+ * Wrap $script in a script tag.
+ *
+ * ### Options
+ *
+ * - `safe` (boolean) Whether or not the $script should be wrapped in <![CDATA[ ]]>
+ * - `inline` (boolean) Whether or not the $script should be added to $scripts_for_layout or output inline
+ *
+ * @param string $script The script to wrap
+ * @param array $options The options to use.
+ * @return mixed string or null depending on the value of `$options['inline']`
+ * @access public
+ * @link http://book.cakephp.org/view/1604/scriptBlock
+ */
+	function scriptBlock($script, $options = array()) {
+		$options += array('safe' => true, 'inline' => true);
+		if ($options['safe']) {
+			$script  = "\n" . '//<![CDATA[' . "\n" . $script . "\n" . '//]]>' . "\n";
+		}
+		$inline = $options['inline'];
+		unset($options['inline'], $options['safe']);
+		$attributes = $this->_parseAttributes($options, ' ', ' ');
+		if ($inline) {
+			return sprintf($this->tags['javascriptblock'], $attributes, $script);
+		} else {
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript(sprintf($this->tags['javascriptblock'], $attributes, $script));
+			return null;
+		}
+	}
+
+/**
+ * Begin a script block that captures output until HtmlHelper::scriptEnd()
+ * is called. This capturing block will capture all output between the methods
+ * and create a scriptBlock from it.
+ *
+ * ### Options
+ *
+ * - `safe` Whether the code block should contain a CDATA
+ * - `inline` Should the generated script tag be output inline or in `$scripts_for_layout`
+ *
+ * @param array $options Options for the code block.
+ * @return void
+ * @access public
+ * @link http://book.cakephp.org/view/1605/scriptStart
+ */
+	function scriptStart($options = array()) {
+		$options += array('safe' => true, 'inline' => true);
+		$this->_scriptBlockOptions = $options;
+		ob_start();
+		return null;
+	}
+
+/**
+ * End a Buffered section of Javascript capturing.
+ * Generates a script tag inline or in `$scripts_for_layout` depending on the settings
+ * used when the scriptBlock was started
+ *
+ * @return mixed depending on the settings of scriptStart() either a script tag or null
+ * @access public
+ * @link http://book.cakephp.org/view/1606/scriptEnd
+ */
+	function scriptEnd() {
+		$buffer = ob_get_clean();
+		$options = $this->_scriptBlockOptions;
+		$this->_scriptBlockOptions = array();
+		return $this->scriptBlock($buffer, $options);
+	}
+
+/**
+ * Builds CSS style data from an array of CSS properties
+ *
+ * ### Usage:
+ *
+ * {{{
+ * echo $html->style(array('margin' => '10px', 'padding' => '10px'), true);
+ *
+ * // creates
+ * 'margin:10px;padding:10px;'
+ * }}}
+ *
+ * @param array $data Style data array, keys will be used as property names, values as property values.
+ * @param boolean $oneline Whether or not the style block should be displayed on one line.
+ * @return string CSS styling data
+ * @access public
+ * @link http://book.cakephp.org/view/1440/style
+ */
+	function style($data, $oneline = true) {
+		if (!is_array($data)) {
+			return $data;
+		}
+		$out = array();
+		foreach ($data as $key=> $value) {
+			$out[] = $key.':'.$value.';';
+		}
+		if ($oneline) {
+			return join(' ', $out);
+		}
+		return implode("\n", $out);
+	}
+
+/**
+ * Returns the breadcrumb trail as a sequence of &raquo;-separated links.
+ *
+ * @param string $separator Text to separate crumbs.
+ * @param string $startText This will be the first crumb, if false it defaults to first crumb in array
+ * @return string Composed bread crumbs
+ * @access public
+ */
+	function getCrumbs($separator = '&raquo;', $startText = false) {
+		if (!empty($this->_crumbs)) {
+			$out = array();
+			if ($startText) {
+				$out[] = $this->link($startText, '/');
+			}
+
+			foreach ($this->_crumbs as $crumb) {
+				if (!empty($crumb[1])) {
+					$out[] = $this->link($crumb[0], $crumb[1], $crumb[2]);
+				} else {
+					$out[] = $crumb[0];
+				}
+			}
+			return join($separator, $out);
+		} else {
+			return null;
+		}
+	}
+
+/**
+ * Creates a formatted IMG element. If `$options['url']` is provided, an image link will be
+ * generated with the link pointed at `$options['url']`.  This method will set an empty
+ * alt attribute if one is not supplied.
+ *
+ * ### Usage
+ *
+ * Create a regular image:
+ *
+ * `echo $html->image('cake_icon.png', array('alt' => 'CakePHP'));`
+ *
+ * Create an image link:
+ *
+ * `echo $html->image('cake_icon.png', array('alt' => 'CakePHP', 'url' => 'http://cakephp.org'));`
+ *
+ * @param string $path Path to the image file, relative to the app/webroot/img/ directory.
+ * @param array $options Array of HTML attributes.
+ * @return string completed img tag
+ * @access public
+ * @link http://book.cakephp.org/view/1441/image
+ */
+	function image($path, $options = array()) {
+		if (is_array($path)) {
+			$path = $this->url($path);
+		} elseif (strpos($path, '://') === false) {
+			if ($path[0] !== '/') {
+				$path = IMAGES_URL . $path;
+			}
+			$path = $this->assetTimestamp($this->webroot($path));
+		}
+
+		if (!isset($options['alt'])) {
+			$options['alt'] = '';
+		}
+
+		$url = false;
+		if (!empty($options['url'])) {
+			$url = $options['url'];
+			unset($options['url']);
+		}
+
+		$image = sprintf($this->tags['image'], $path, $this->_parseAttributes($options, null, '', ' '));
+
+		if ($url) {
+			return sprintf($this->tags['link'], $this->url($url), null, $image);
+		}
+		return $image;
+	}
+
+/**
+ * Returns a row of formatted and named TABLE headers.
+ *
+ * @param array $names Array of tablenames.
+ * @param array $trOptions HTML options for TR elements.
+ * @param array $thOptions HTML options for TH elements.
+ * @return string Completed table headers
+ * @access public
+ * @link http://book.cakephp.org/view/1446/tableHeaders
+ */
+	function tableHeaders($names, $trOptions = null, $thOptions = null) {
+		$out = array();
+		foreach ($names as $arg) {
+			$out[] = sprintf($this->tags['tableheader'], $this->_parseAttributes($thOptions), $arg);
+		}
+		return sprintf($this->tags['tablerow'], $this->_parseAttributes($trOptions), join(' ', $out));
+	}
+
+/**
+ * Returns a formatted string of table rows (TR's with TD's in them).
+ *
+ * @param array $data Array of table data
+ * @param array $oddTrOptions HTML options for odd TR elements if true useCount is used
+ * @param array $evenTrOptions HTML options for even TR elements
+ * @param bool $useCount adds class "column-$i"
+ * @param bool $continueOddEven If false, will use a non-static $count variable,
+ *    so that the odd/even count is reset to zero just for that call.
+ * @return string Formatted HTML
+ * @access public
+ * @link http://book.cakephp.org/view/1447/tableCells
+ */
+	function tableCells($data, $oddTrOptions = null, $evenTrOptions = null, $useCount = false, $continueOddEven = true) {
+		if (empty($data[0]) || !is_array($data[0])) {
+			$data = array($data);
+		}
+
+		if ($oddTrOptions === true) {
+			$useCount = true;
+			$oddTrOptions = null;
+		}
+
+		if ($evenTrOptions === false) {
+			$continueOddEven = false;
+			$evenTrOptions = null;
+		}
+
+		if ($continueOddEven) {
+			static $count = 0;
+		} else {
+			$count = 0;
+		}
+
+		foreach ($data as $line) {
+			$count++;
+			$cellsOut = array();
+			$i = 0;
+			foreach ($line as $cell) {
+				$cellOptions = array();
+
+				if (is_array($cell)) {
+					$cellOptions = $cell[1];
+					$cell = $cell[0];
+				} elseif ($useCount) {
+					$cellOptions['class'] = 'column-' . ++$i;
+				}
+				$cellsOut[] = sprintf($this->tags['tablecell'], $this->_parseAttributes($cellOptions), $cell);
+			}
+			$options = $this->_parseAttributes($count % 2 ? $oddTrOptions : $evenTrOptions);
+			$out[] = sprintf($this->tags['tablerow'], $options, implode(' ', $cellsOut));
+		}
+		return implode("\n", $out);
+	}
+
+/**
+ * Returns a formatted block tag, i.e DIV, SPAN, P.
+ *
+ * ### Options
+ *
+ * - `escape` Whether or not the contents should be html_entity escaped.
+ *
+ * @param string $name Tag name.
+ * @param string $text String content that will appear inside the div element.
+ *   If null, only a start tag will be printed
+ * @param array $options Additional HTML attributes of the DIV tag, see above.
+ * @return string The formatted tag element
+ * @access public
+ * @link http://book.cakephp.org/view/1443/tag
+ */
+	function tag($name, $text = null, $options = array()) {
+		if (is_array($options) && isset($options['escape']) && $options['escape']) {
+			$text = h($text);
+			unset($options['escape']);
+		}
+		if (!is_array($options)) {
+			$options = array('class' => $options);
+		}
+		if ($text === null) {
+			$tag = 'tagstart';
+		} else {
+			$tag = 'tag';
+		}
+		return sprintf($this->tags[$tag], $name, $this->_parseAttributes($options, null, ' ', ''), $text, $name);
+	}
+
+/**
+ * Returns a formatted DIV tag for HTML FORMs.
+ *
+ * ### Options
+ *
+ * - `escape` Whether or not the contents should be html_entity escaped.
+ *
+ * @param string $class CSS class name of the div element.
+ * @param string $text String content that will appear inside the div element.
+ *   If null, only a start tag will be printed
+ * @param array $options Additional HTML attributes of the DIV tag
+ * @return string The formatted DIV element
+ * @access public
+ * @link http://book.cakephp.org/view/1444/div
+ */
+	function div($class = null, $text = null, $options = array()) {
+		if (!empty($class)) {
+			$options['class'] = $class;
+		}
+		return $this->tag('div', $text, $options);
+	}
+
+/**
+ * Returns a formatted P tag.
+ *
+ * ### Options
+ *
+ * - `escape` Whether or not the contents should be html_entity escaped.
+ *
+ * @param string $class CSS class name of the p element.
+ * @param string $text String content that will appear inside the p element.
+ * @param array $options Additional HTML attributes of the P tag
+ * @return string The formatted P element
+ * @access public
+ * @link http://book.cakephp.org/view/1445/para
+ */
+	function para($class, $text, $options = array()) {
+		if (isset($options['escape'])) {
+			$text = h($text);
+		}
+		if ($class != null && !empty($class)) {
+			$options['class'] = $class;
+		}
+		if ($text === null) {
+			$tag = 'parastart';
+		} else {
+			$tag = 'para';
+		}
+		return sprintf($this->tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $text);
+	}
+
+/**
+ * Build a nested list (UL/OL) out of an associative array.
+ *
+ * @param array $list Set of elements to list
+ * @param array $options Additional HTML attributes of the list (ol/ul) tag or if ul/ol use that as tag
+ * @param array $itemOptions Additional HTML attributes of the list item (LI) tag
+ * @param string $tag Type of list tag to use (ol/ul)
+ * @return string The nested list
+ * @access public
+ */
+	function nestedList($list, $options = array(), $itemOptions = array(), $tag = 'ul') {
+		if (is_string($options)) {
+			$tag = $options;
+			$options = array();
+		}
+		$items = $this->__nestedListItem($list, $options, $itemOptions, $tag);
+		return sprintf($this->tags[$tag], $this->_parseAttributes($options, null, ' ', ''), $items);
+	}
+
+/**
+ * Internal function to build a nested list (UL/OL) out of an associative array.
+ *
+ * @param array $items Set of elements to list
+ * @param array $options Additional HTML attributes of the list (ol/ul) tag
+ * @param array $itemOptions Additional HTML attributes of the list item (LI) tag
+ * @param string $tag Type of list tag to use (ol/ul)
+ * @return string The nested list element
+ * @access private
+ * @see HtmlHelper::nestedList()
+ */
+	function __nestedListItem($items, $options, $itemOptions, $tag) {
+		$out = '';
+
+		$index = 1;
+		foreach ($items as $key => $item) {
+			if (is_array($item)) {
+				$item = $key . $this->nestedList($item, $options, $itemOptions, $tag);
+			}
+			if (isset($itemOptions['even']) && $index % 2 == 0) {
+				$itemOptions['class'] = $itemOptions['even'];
+			} else if (isset($itemOptions['odd']) && $index % 2 != 0) {
+				$itemOptions['class'] = $itemOptions['odd'];
+			}
+			$out .= sprintf($this->tags['li'], $this->_parseAttributes($itemOptions, array('even', 'odd'), ' ', ''), $item);
+			$index++;
+		}
+		return $out;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/javascript.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/javascript.php
new file mode 100644
index 000000000..46e8ddd4f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/javascript.php
@@ -0,0 +1,721 @@
+<?php
+/**
+ * Javascript Helper class file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Javascript Helper class for easy use of JavaScript.
+ *
+ * JavascriptHelper encloses all methods needed while working with JavaScript.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1450/Javascript
+ */
+class JavascriptHelper extends AppHelper {
+
+/**
+ * Determines whether native JSON extension is used for encoding.  Set by object constructor.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $useNative = false;
+
+/**
+ * If true, automatically writes events to the end of a script or to an external JavaScript file
+ * at the end of page execution
+ *
+ * @var boolean
+ * @access public
+ */
+	var $enabled = true;
+
+/**
+ * Indicates whether <script /> blocks should be written 'safely,' i.e. wrapped in CDATA blocks
+ *
+ * @var boolean
+ * @access public
+ */
+	var $safe = false;
+
+/**
+ * HTML tags used by this helper.
+ *
+ * @var array
+ * @access public
+ */
+	var $tags = array(
+		'javascriptstart' => '<script type="text/javascript">',
+		'javascriptend' => '</script>',
+		'javascriptblock' => '<script type="text/javascript">%s</script>',
+		'javascriptlink' => '<script type="text/javascript" src="%s"></script>'
+	);
+
+/**
+ * Holds options passed to codeBlock(), saved for when block is dumped to output
+ *
+ * @var array
+ * @access protected
+ * @see JavascriptHelper::codeBlock()
+ */
+	var $_blockOptions = array();
+
+/**
+ * Caches events written by event() for output at the end of page execution
+ *
+ * @var array
+ * @access protected
+ * @see JavascriptHelper::event()
+ */
+	var $_cachedEvents = array();
+
+/**
+ * Indicates whether generated events should be cached for later output (can be written at the
+ * end of the page, in the <head />, or to an external file).
+ *
+ * @var boolean
+ * @access protected
+ * @see JavascriptHelper::event()
+ * @see JavascriptHelper::writeEvents()
+ */
+	var $_cacheEvents = false;
+
+/**
+ * Indicates whether cached events should be written to an external file
+ *
+ * @var boolean
+ * @access protected
+ * @see JavascriptHelper::event()
+ * @see JavascriptHelper::writeEvents()
+ */
+	var $_cacheToFile = false;
+
+/**
+ * Indicates whether *all* generated JavaScript should be cached for later output
+ *
+ * @var boolean
+ * @access protected
+ * @see JavascriptHelper::codeBlock()
+ * @see JavascriptHelper::blockEnd()
+ */
+	var $_cacheAll = false;
+
+/**
+ * Contains event rules attached with CSS selectors.  Used with the event:Selectors JavaScript
+ * library.
+ *
+ * @var array
+ * @access protected
+ * @see JavascriptHelper::event()
+ * @link          http://alternateidea.com/event-selectors/
+ */
+	var $_rules = array();
+
+/**
+ * @var string
+ * @access private
+ */
+	var $__scriptBuffer = null;
+
+/**
+ * Constructor. Checks for presence of native PHP JSON extension to use for object encoding
+ *
+ * @access public
+ */
+	function __construct($options = array()) {
+		if (!empty($options)) {
+			foreach ($options as $key => $val) {
+				if (is_numeric($key)) {
+					$key = $val;
+					$val = true;
+				}
+				switch ($key) {
+					case 'cache':
+
+					break;
+					case 'safe':
+						$this->safe = $val;
+					break;
+				}
+			}
+		}
+		$this->useNative = function_exists('json_encode');
+		return parent::__construct($options);
+	}
+
+/**
+ * Returns a JavaScript script tag.
+ *
+ * Options:
+ *
+ *  - allowCache: boolean, designates whether this block is cacheable using the
+ * current cache settings.
+ *  - safe: boolean, whether this block should be wrapped in CDATA tags.  Defaults
+ * to helper's object configuration.
+ *  - inline: whether the block should be printed inline, or written
+ * to cached for later output (i.e. $scripts_for_layout).
+ *
+ * @param string $script The JavaScript to be wrapped in SCRIPT tags.
+ * @param array $options Set of options:
+ * @return string The full SCRIPT element, with the JavaScript inside it, or null,
+ *   if 'inline' is set to false.
+ */
+	function codeBlock($script = null, $options = array()) {
+		if (!empty($options) && !is_array($options)) {
+			$options = array('allowCache' => $options);
+		} elseif (empty($options)) {
+			$options = array();
+		}
+		$defaultOptions = array('allowCache' => true, 'safe' => true, 'inline' => true);
+		$options = array_merge($defaultOptions, $options);
+
+		if (empty($script)) {
+			$this->__scriptBuffer = @ob_get_contents();
+			$this->_blockOptions = $options;
+			$this->inBlock = true;
+			@ob_end_clean();
+			ob_start();
+			return null;
+		}
+		if ($this->_cacheEvents && $this->_cacheAll && $options['allowCache']) {
+			$this->_cachedEvents[] = $script;
+			return null;
+		}
+		if ($options['safe'] || $this->safe) {
+			$script  = "\n" . '//<![CDATA[' . "\n" . $script . "\n" . '//]]>' . "\n";
+		}
+		if ($options['inline']) {
+			return sprintf($this->tags['javascriptblock'], $script);
+		} else {
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript(sprintf($this->tags['javascriptblock'], $script));
+		}
+	}
+
+/**
+ * Ends a block of cached JavaScript code
+ *
+ * @return mixed
+ */
+	function blockEnd() {
+		if (!isset($this->inBlock) || !$this->inBlock) {
+			return;
+		}
+		$script = @ob_get_contents();
+		@ob_end_clean();
+		ob_start();
+		echo $this->__scriptBuffer;
+		$this->__scriptBuffer = null;
+		$options = $this->_blockOptions;
+		$this->_blockOptions = array();
+		$this->inBlock = false;
+
+		if (empty($script)) {
+			return null;
+		}
+
+		return $this->codeBlock($script, $options);
+	}
+
+/**
+ * Returns a JavaScript include tag (SCRIPT element).  If the filename is prefixed with "/",
+ * the path will be relative to the base path of your application.  Otherwise, the path will
+ * be relative to your JavaScript path, usually webroot/js.
+ *
+ * @param mixed $url String URL to JavaScript file, or an array of URLs.
+ * @param boolean $inline If true, the <script /> tag will be printed inline,
+ *   otherwise it will be printed in the <head />, using $scripts_for_layout
+ * @see JS_URL
+ * @return string
+ */
+	function link($url, $inline = true) {
+		if (is_array($url)) {
+			$out = '';
+			foreach ($url as $i) {
+				$out .= "\n\t" . $this->link($i, $inline);
+			}
+			if ($inline)  {
+				return $out . "\n";
+			}
+			return;
+		}
+
+		if (strpos($url, '://') === false) {
+			if ($url[0] !== '/') {
+				$url = JS_URL . $url;
+			}
+			if (strpos($url, '?') === false) {
+				if (substr($url, -3) !== '.js') {
+					$url .= '.js';
+				}
+			}
+			$url = $this->assetTimestamp($this->webroot($url));
+
+			if (Configure::read('Asset.filter.js')) {
+				$pos = strpos($url, JS_URL);
+				if ($pos !== false) {
+					$url = substr($url, 0, $pos) . 'cjs/' . substr($url, $pos + strlen(JS_URL));
+				}
+			}
+		}
+		$out = sprintf($this->tags['javascriptlink'], $url);
+
+		if ($inline) {
+			return $out;
+		} else {
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript($out);
+		}
+	}
+
+/**
+ * Escape carriage returns and single and double quotes for JavaScript segments.
+ *
+ * @param string $script string that might have javascript elements
+ * @return string escaped string
+ */
+	function escapeScript($script) {
+		$script = str_replace(array("\r\n", "\n", "\r"), '\n', $script);
+		$script = str_replace(array('"', "'"), array('\"', "\\'"), $script);
+		return $script;
+	}
+
+/**
+ * Escape a string to be JavaScript friendly.
+ *
+ * List of escaped ellements:
+ *	+ "\r\n" => '\n'
+ *	+ "\r" => '\n'
+ *	+ "\n" => '\n'
+ *	+ '"' => '\"'
+ *	+ "'" => "\\'"
+ *
+ * @param  string $script String that needs to get escaped.
+ * @return string Escaped string.
+ */
+	function escapeString($string) {
+		App::import('Core', 'Multibyte');
+		$escape = array("\r\n" => "\n", "\r" => "\n");
+		$string = str_replace(array_keys($escape), array_values($escape), $string);
+		return $this->_utf8ToHex($string);
+	}
+
+/**
+ * Encode a string into JSON.  Converts and escapes necessary characters.
+ *
+ * @return void
+ */
+	function _utf8ToHex($string) {
+		$length = strlen($string);
+		$return = '';
+		for ($i = 0; $i < $length; ++$i) {
+			$ord = ord($string{$i});
+			switch (true) {
+				case $ord == 0x08:
+					$return .= '\b';
+					break;
+				case $ord == 0x09:
+					$return .= '\t';
+					break;
+				case $ord == 0x0A:
+					$return .= '\n';
+					break;
+				case $ord == 0x0C:
+					$return .= '\f';
+					break;
+				case $ord == 0x0D:
+					$return .= '\r';
+					break;
+				case $ord == 0x22:
+				case $ord == 0x2F:
+				case $ord == 0x5C:
+				case $ord == 0x27:
+					$return .= '\\' . $string{$i};
+					break;
+				case (($ord >= 0x20) && ($ord <= 0x7F)):
+					$return .= $string{$i};
+					break;
+				case (($ord & 0xE0) == 0xC0):
+					if ($i + 1 >= $length) {
+						$i += 1;
+						$return .= '?';
+						break;
+					}
+					$charbits = $string{$i} . $string{$i + 1};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 1;
+					break;
+				case (($ord & 0xF0) == 0xE0):
+					if ($i + 2 >= $length) {
+						$i += 2;
+						$return .= '?';
+						break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 2;
+					break;
+				case (($ord & 0xF8) == 0xF0):
+					if ($i + 3 >= $length) {
+					   $i += 3;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 3;
+					break;
+				case (($ord & 0xFC) == 0xF8):
+					if ($i + 4 >= $length) {
+					   $i += 4;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 4;
+					break;
+				case (($ord & 0xFE) == 0xFC):
+					if ($i + 5 >= $length) {
+					   $i += 5;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4} . $string{$i + 5};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 5;
+					break;
+			}
+		}
+		return $return;
+	}
+
+/**
+ * Attach an event to an element. Used with the Prototype library.
+ *
+ * @param string $object Object to be observed
+ * @param string $event event to observe
+ * @param string $observer function to call
+ * @param array $options Set options: useCapture, allowCache, safe
+ * @return boolean true on success
+ */
+	function event($object, $event, $observer = null, $options = array()) {
+		if (!empty($options) && !is_array($options)) {
+			$options = array('useCapture' => $options);
+		} else if (empty($options)) {
+			$options = array();
+		}
+
+		$defaultOptions = array('useCapture' => false);
+		$options = array_merge($defaultOptions, $options);
+
+		if ($options['useCapture'] == true) {
+			$options['useCapture'] = 'true';
+		} else {
+			$options['useCapture'] = 'false';
+		}
+		$isObject = (
+			strpos($object, 'window') !== false || strpos($object, 'document') !== false ||
+			strpos($object, '$(') !== false || strpos($object, '"') !== false ||
+			strpos($object, '\'') !== false
+		);
+
+		if ($isObject) {
+			$b = "Event.observe({$object}, '{$event}', function(event) { {$observer} }, ";
+			$b .= "{$options['useCapture']});";
+		} elseif ($object[0] == '\'') {
+			$b = "Event.observe(" . substr($object, 1) . ", '{$event}', function(event) { ";
+			$b .= "{$observer} }, {$options['useCapture']});";
+		} else {
+			$chars = array('#', ' ', ', ', '.', ':');
+			$found = false;
+			foreach ($chars as $char) {
+				if (strpos($object, $char) !== false) {
+					$found = true;
+					break;
+				}
+			}
+			if ($found) {
+				$this->_rules[$object] = $event;
+			} else {
+				$b = "Event.observe(\$('{$object}'), '{$event}', function(event) { ";
+				$b .= "{$observer} }, {$options['useCapture']});";
+			}
+		}
+
+		if (isset($b) && !empty($b)) {
+			if ($this->_cacheEvents === true) {
+				$this->_cachedEvents[] = $b;
+				return;
+			} else {
+				return $this->codeBlock($b, array_diff_key($options, $defaultOptions));
+			}
+		}
+	}
+
+/**
+ * Cache JavaScript events created with event()
+ *
+ * @param boolean $file If true, code will be written to a file
+ * @param boolean $all If true, all code written with JavascriptHelper will be sent to a file
+ * @return null
+ */
+	function cacheEvents($file = false, $all = false) {
+		$this->_cacheEvents = true;
+		$this->_cacheToFile = $file;
+		$this->_cacheAll = $all;
+	}
+
+/**
+ * Gets (and clears) the current JavaScript event cache
+ *
+ * @param boolean $clear
+ * @return string
+ */
+	function getCache($clear = true) {
+		$out = '';
+		$rules = array();
+
+		if (!empty($this->_rules)) {
+			foreach ($this->_rules as $sel => $event) {
+				$rules[] = "\t'{$sel}': function(element, event) {\n\t\t{$event}\n\t}";
+			}
+		}
+		$data = implode("\n", $this->_cachedEvents);
+
+		if (!empty($rules)) {
+			$data .= "\nvar Rules = {\n" . implode(",\n\n", $rules) . "\n}";
+			$data .= "\nEventSelectors.start(Rules);\n";
+		}
+		if ($clear) {
+			$this->_rules = array();
+			$this->_cacheEvents = false;
+			$this->_cachedEvents = array();
+		}
+		return $data;
+	}
+
+/**
+ * Write cached JavaScript events
+ *
+ * @param boolean $inline If true, returns JavaScript event code.  Otherwise it is added to the
+ *                        output of $scripts_for_layout in the layout.
+ * @param array $options Set options for codeBlock
+ * @return string
+ */
+	function writeEvents($inline = true, $options = array()) {
+		$out = '';
+		$rules = array();
+
+		if (!$this->_cacheEvents) {
+			return;
+		}
+		$data = $this->getCache();
+
+		if (empty($data)) {
+			return;
+		}
+
+		if ($this->_cacheToFile) {
+			$filename = md5($data);
+			if (!file_exists(JS . $filename . '.js')) {
+				cache(str_replace(WWW_ROOT, '', JS) . $filename . '.js', $data, '+999 days', 'public');
+			}
+			$out = $this->link($filename);
+		} else {
+			$out = $this->codeBlock("\n" . $data . "\n", $options);
+		}
+
+		if ($inline) {
+			return $out;
+		} else {
+			$view =& ClassRegistry::getObject('view');
+			$view->addScript($out);
+		}
+	}
+
+/**
+ * Includes the Prototype Javascript library (and anything else) inside a single script tag.
+ *
+ * Note: The recommended approach is to copy the contents of
+ * javascripts into your application's
+ * public/javascripts/ directory, and use @see javascriptIncludeTag() to
+ * create remote script links.
+ *
+ * @param string $script Script file to include
+ * @param array $options Set options for codeBlock
+ * @return string script with all javascript in/javascripts folder
+ */
+	function includeScript($script = "", $options = array()) {
+		if ($script == "") {
+			$files = scandir(JS);
+			$javascript = '';
+
+			foreach ($files as $file) {
+				if (substr($file, -3) == '.js') {
+					$javascript .= file_get_contents(JS . "{$file}") . "\n\n";
+				}
+			}
+		} else {
+			$javascript = file_get_contents(JS . "$script.js") . "\n\n";
+		}
+		return $this->codeBlock("\n\n" . $javascript, $options);
+	}
+
+/**
+ * Generates a JavaScript object in JavaScript Object Notation (JSON)
+ * from an array
+ *
+ * ### Options
+ *
+ * - block - Wraps the return value in a script tag if true. Default is false
+ * - prefix - Prepends the string to the returned data. Default is ''
+ * - postfix - Appends the string to the returned data. Default is ''
+ * - stringKeys - A list of array keys to be treated as a string.
+ * - quoteKeys - If false treats $stringKeys as a list of keys **not** to be quoted. Default is true.
+ * - q - The type of quote to use. Default is '"'.  This option only affects the keys, not the values.
+ *
+ * @param array $data Data to be converted
+ * @param array $options Set of options: block, prefix, postfix, stringKeys, quoteKeys, q
+ * @return string A JSON code block
+ */
+	function object($data = array(), $options = array()) {
+		if (!empty($options) && !is_array($options)) {
+			$options = array('block' => $options);
+		} else if (empty($options)) {
+			$options = array();
+		}
+
+		$defaultOptions = array(
+			'block' => false, 'prefix' => '', 'postfix' => '',
+			'stringKeys' => array(), 'quoteKeys' => true, 'q' => '"'
+		);
+		$options = array_merge($defaultOptions, $options, array_filter(compact(array_keys($defaultOptions))));
+
+		if (is_object($data)) {
+			$data = get_object_vars($data);
+		}
+
+		$out = $keys = array();
+		$numeric = true;
+
+		if ($this->useNative) {
+			$rt = json_encode($data);
+		} else {
+			if (is_null($data)) {
+				return 'null';
+			}
+			if (is_bool($data)) {
+				return $data ? 'true' : 'false';
+			}
+
+			if (is_array($data)) {
+				$keys = array_keys($data);
+			}
+
+			if (!empty($keys)) {
+				$numeric = (array_values($keys) === array_keys(array_values($keys)));
+			}
+
+			foreach ($data as $key => $val) {
+				if (is_array($val) || is_object($val)) {
+					$val = $this->object(
+						$val,
+						array_merge($options, array('block' => false, 'prefix' => '', 'postfix' => ''))
+					);
+				} else {
+					$quoteStrings = (
+						!count($options['stringKeys']) ||
+						($options['quoteKeys'] && in_array($key, $options['stringKeys'], true)) ||
+						(!$options['quoteKeys'] && !in_array($key, $options['stringKeys'], true))
+					);
+					$val = $this->value($val, $quoteStrings);
+				}
+				if (!$numeric) {
+					$val = $options['q'] . $this->value($key, false) . $options['q'] . ':' . $val;
+				}
+				$out[] = $val;
+			}
+
+			if (!$numeric) {
+				$rt = '{' . implode(',', $out) . '}';
+			} else {
+				$rt = '[' . implode(',', $out) . ']';
+			}
+		}
+		$rt = $options['prefix'] . $rt . $options['postfix'];
+
+		if ($options['block']) {
+			$rt = $this->codeBlock($rt, array_diff_key($options, $defaultOptions));
+		}
+
+		return $rt;
+	}
+
+/**
+ * Converts a PHP-native variable of any type to a JSON-equivalent representation
+ *
+ * @param mixed $val A PHP variable to be converted to JSON
+ * @param boolean $quoteStrings If false, leaves string values unquoted
+ * @return string a JavaScript-safe/JSON representation of $val
+ */
+	function value($val, $quoteStrings = true) {
+		switch (true) {
+			case (is_array($val) || is_object($val)):
+				$val = $this->object($val);
+			break;
+			case ($val === null):
+				$val = 'null';
+			break;
+			case (is_bool($val)):
+				$val = !empty($val) ? 'true' : 'false';
+			break;
+			case (is_int($val)):
+				$val = $val;
+			break;
+			case (is_float($val)):
+				$val = sprintf("%.11f", $val);
+			break;
+			default:
+				$val = $this->escapeString($val);
+				if ($quoteStrings) {
+					$val = '"' . $val . '"';
+				}
+			break;
+		}
+		return $val;
+	}
+
+/**
+ * AfterRender callback.  Writes any cached events to the view, or to a temp file.
+ *
+ * @return null
+ */
+	function afterRender() {
+		if (!$this->enabled) {
+			return;
+		}
+		echo $this->writeEvents(true);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/jquery_engine.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/jquery_engine.php
new file mode 100644
index 000000000..54e9a7589
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/jquery_engine.php
@@ -0,0 +1,363 @@
+<?php
+/**
+ * jQuery Engine Helper for JsHelper
+ *
+ * Provides jQuery specific Javascript for JsHelper.
+ *
+ * Implements the JsHelper interface for jQuery.  All $options arrays
+ * support all options found in the JsHelper, as well as those in the jQuery
+ * documentation.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link            http://cakephp.org CakePHP Project
+ * @package         cake
+ * @subpackage      cake.view.helpers
+ * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', 'Js');
+
+class JqueryEngineHelper extends JsBaseEngineHelper {
+/**
+ * Option mappings for jQuery
+ *
+ * @var array
+ * @access protected
+ */
+	var $_optionMap = array(
+		'request' => array(
+			'type' => 'dataType',
+			'before' => 'beforeSend',
+			'method' => 'type',
+		),
+		'sortable' => array(
+			'complete' => 'stop',
+		),
+		'drag' => array(
+			'snapGrid' => 'grid',
+			'container' => 'containment',
+		),
+		'drop' => array(
+			'leave' => 'out',
+			'hover' => 'over'
+		),
+		'slider' => array(
+			'complete' => 'stop',
+			'direction' => 'orientation'
+		)
+	);
+
+/**
+ * Callback arguments lists
+ *
+ * @var string
+ * @access protected
+ */
+	var $_callbackArguments = array(
+		'slider' => array(
+			'start' => 'event, ui',
+			'slide' => 'event, ui',
+			'change' => 'event, ui',
+			'stop' => 'event, ui'
+		),
+		'sortable' => array(
+			'start' => 'event, ui',
+			'sort' => 'event, ui',
+			'change' => 'event, ui',
+			'beforeStop' => 'event, ui',
+			'stop' => 'event, ui',
+			'update' => 'event, ui',
+			'receive' => 'event, ui',
+			'remove' => 'event, ui',
+			'over' => 'event, ui',
+			'out' => 'event, ui',
+			'activate' => 'event, ui',
+			'deactivate' => 'event, ui'
+		),
+		'drag' => array(
+			'start' => 'event, ui',
+			'drag' => 'event, ui',
+			'stop' => 'event, ui',
+		),
+		'drop' => array(
+			'activate' => 'event, ui',
+			'deactivate' => 'event, ui',
+			'over' => 'event, ui',
+			'out' => 'event, ui',
+			'drop' => 'event, ui'
+		),
+		'request' => array(
+			'beforeSend' => 'XMLHttpRequest',
+			'error' => 'XMLHttpRequest, textStatus, errorThrown',
+			'success' => 'data, textStatus',
+			'complete' => 'XMLHttpRequest, textStatus',
+			'xhr' => ''
+		)
+	);
+
+/**
+ * The variable name of the jQuery Object, useful
+ * when jQuery is put into noConflict() mode.
+ *
+ * @var string
+ * @access public
+ */
+	 var $jQueryObject = '$';
+
+/**
+ * Helper function to wrap repetitive simple method templating.
+ *
+ * @param string $method The method name being generated.
+ * @param string $template The method template
+ * @param string $selection the selection to apply
+ * @param string $options Array of options for method
+ * @param string $callbacks Array of callback / special options.
+ * @return string Composed method string
+ * @access public
+ */
+	function _methodTemplate($method, $template, $options, $extraSafeKeys = array()) {
+		$options = $this->_mapOptions($method, $options);
+		$options = $this->_prepareCallbacks($method, $options);
+		$callbacks = array_keys($this->_callbackArguments[$method]);
+		if (!empty($extraSafeKeys)) {
+			$callbacks = array_merge($callbacks, $extraSafeKeys);
+		}
+		$options = $this->_parseOptions($options, $callbacks);
+		return sprintf($template, $this->selection, $options);
+	}
+
+/**
+ * Create javascript selector for a CSS rule
+ *
+ * @param string $selector The selector that is targeted
+ * @return object instance of $this. Allows chained methods.
+ * @access public
+ */
+	function get($selector) {
+		if ($selector == 'window' || $selector == 'document') {
+			$this->selection = $this->jQueryObject . '(' . $selector .')';
+		} else {
+			$this->selection = $this->jQueryObject . '("' . $selector . '")';
+		}
+		return $this;
+	}
+
+/**
+ * Add an event to the script cache. Operates on the currently selected elements.
+ *
+ * ### Options
+ *
+ * - 'wrap' - Whether you want the callback wrapped in an anonymous function. (defaults true)
+ * - 'stop' - Whether you want the event to stopped. (defaults true)
+ *
+ * @param string $type Type of event to bind to the current dom id
+ * @param string $callback The Javascript function you wish to trigger or the function literal
+ * @param array $options Options for the event.
+ * @return string completed event handler
+ * @access public
+ */
+	function event($type, $callback, $options = array()) {
+		$defaults = array('wrap' => true, 'stop' => true);
+		$options = array_merge($defaults, $options);
+
+		$function = 'function (event) {%s}';
+		if ($options['wrap'] && $options['stop']) {
+			$callback .= "\nreturn false;";
+		}
+		if ($options['wrap']) {
+			$callback = sprintf($function, $callback);
+		}
+		return sprintf('%s.bind("%s", %s);', $this->selection, $type, $callback);
+	}
+
+/**
+ * Create a domReady event. For jQuery. This method does not 
+ * bind a 'traditional event' as `$(document).bind('ready', fn)`
+ * Works in an entirely different fashion than  `$(document).ready()`
+ * The first will not run the function when eval()'d as part of a response
+ * The second will.  Because of the way that ajax pagination is done
+ * `$().ready()` is used.
+ *
+ * @param string $functionBody The code to run on domReady
+ * @return string completed domReady method
+ * @access public
+ */
+	function domReady($functionBody) {
+		return $this->jQueryObject . '(document).ready(function () {' . $functionBody . '});';
+	}
+
+/**
+ * Create an iteration over the current selection result.
+ *
+ * @param string $method The method you want to apply to the selection
+ * @param string $callback The function body you wish to apply during the iteration.
+ * @return string completed iteration
+ * @access public
+ */
+	function each($callback) {
+		return $this->selection . '.each(function () {' . $callback . '});';
+	}
+
+/**
+ * Trigger an Effect.
+ *
+ * @param string $name The name of the effect to trigger.
+ * @param array $options Array of options for the effect.
+ * @return string completed string with effect.
+ * @access public
+ * @see JsBaseEngineHelper::effect()
+ */
+	function effect($name, $options = array()) {
+		$speed = null;
+		if (isset($options['speed']) && in_array($options['speed'], array('fast', 'slow'))) {
+			$speed = $this->value($options['speed']);
+		}
+		$effect = '';
+		switch ($name) {
+			case 'slideIn':
+			case 'slideOut':
+				$name = ($name == 'slideIn') ? 'slideDown' : 'slideUp';
+			case 'hide':
+			case 'show':
+ 			case 'fadeIn':
+			case 'fadeOut':
+			case 'slideDown':
+			case 'slideUp':
+				$effect = ".$name($speed);";
+			break;
+		}
+		return $this->selection . $effect;
+	}
+
+/**
+ * Create an $.ajax() call.
+ *
+ * If the 'update' key is set, success callback will be overridden.
+ *
+ * @param mixed $url
+ * @param array $options See JsHelper::request() for options.
+ * @return string The completed ajax call.
+ * @access public
+ * @see JsBaseEngineHelper::request() for options list.
+ */
+	function request($url, $options = array()) {
+		$url = $this->url($url);
+		$options = $this->_mapOptions('request', $options);
+		if (isset($options['data']) && is_array($options['data'])) {
+			$options['data'] = $this->_toQuerystring($options['data']);
+		}
+		$options['url'] = $url;
+		if (isset($options['update'])) {
+			$wrapCallbacks = isset($options['wrapCallbacks']) ? $options['wrapCallbacks'] : true;
+			$success = '';
+			if(isset($options['success']) AND !empty($options['success'])) {
+				$success .= $options['success'];
+			}
+			$success .= $this->jQueryObject . '("' . $options['update'] . '").html(data);';
+			if (!$wrapCallbacks) {
+				$success = 'function (data, textStatus) {' . $success . '}';
+			}
+			$options['dataType'] = 'html';
+			$options['success'] = $success;
+			unset($options['update']);
+		}
+		$callbacks = array('success', 'error', 'beforeSend', 'complete');
+		if (!empty($options['dataExpression'])) {
+			$callbacks[] = 'data';
+			unset($options['dataExpression']);
+		}
+		$options = $this->_prepareCallbacks('request', $options);
+		$options = $this->_parseOptions($options, $callbacks);
+		return $this->jQueryObject . '.ajax({' . $options .'});';
+	}
+
+/**
+ * Create a sortable element.
+ *
+ * Requires both Ui.Core and Ui.Sortables to be loaded.
+ *
+ * @param array $options Array of options for the sortable.
+ * @return string Completed sortable script.
+ * @access public
+ * @see JsBaseEngineHelper::sortable() for options list.
+ */
+	function sortable($options = array()) {
+		$template = '%s.sortable({%s});';
+		return $this->_methodTemplate('sortable', $template, $options);
+	}
+
+/**
+ * Create a Draggable element
+ *
+ * Requires both Ui.Core and Ui.Draggable to be loaded.
+ *
+ * @param array $options Array of options for the draggable element.
+ * @return string Completed Draggable script.
+ * @access public
+ * @see JsBaseEngineHelper::drag() for options list.
+ */
+	function drag($options = array()) {
+		$template = '%s.draggable({%s});';
+		return $this->_methodTemplate('drag', $template, $options);
+	}
+
+/**
+ * Create a Droppable element
+ *
+ * Requires both Ui.Core and Ui.Droppable to be loaded.
+ *
+ * @param array $options Array of options for the droppable element.
+ * @return string Completed Droppable script.
+ * @access public
+ * @see JsBaseEngineHelper::drop() for options list.
+ */
+	function drop($options = array()) {
+		$template = '%s.droppable({%s});';
+		return $this->_methodTemplate('drop', $template, $options);
+	}
+
+/**
+ * Create a Slider element
+ *
+ * Requires both Ui.Core and Ui.Slider to be loaded.
+ *
+ * @param array $options Array of options for the droppable element.
+ * @return string Completed Slider script.
+ * @access public
+ * @see JsBaseEngineHelper::slider() for options list.
+ */
+	function slider($options = array()) {
+		$callbacks = array('start', 'change', 'slide', 'stop');
+		$template = '%s.slider({%s});';
+		return $this->_methodTemplate('slider', $template, $options, $callbacks);
+	}
+
+/**
+ * Serialize a form attached to $selector. If the current selection is not an input or
+ * form, errors will be created in the Javascript.
+ *
+ * @param array $options Options for the serialization
+ * @return string completed form serialization script.
+ * @access public
+ * @see JsBaseEngineHelper::serializeForm() for option list.
+ */
+	function serializeForm($options = array()) {
+		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
+		$selector = $this->selection;
+		if (!$options['isForm']) {
+			$selector = $this->selection . '.closest("form")';
+		}
+		$method = '.serialize()';
+		if (!$options['inline']) {
+			$method .= ';';
+		}
+		return $selector . $method;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/js.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/js.php
new file mode 100644
index 000000000..8ecb5c5bc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/js.php
@@ -0,0 +1,1132 @@
+<?php
+/**
+ * Javascript Generator class file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Javascript Generator helper class for easy use of JavaScript.
+ *
+ * JsHelper provides an abstract interface for authoring JavaScript with a
+ * given client-side library.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ */
+class JsHelper extends AppHelper {
+/**
+ * Whether or not you want scripts to be buffered or output.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $bufferScripts = true;
+
+/**
+ * helpers
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html', 'Form');
+
+/**
+ * Variables to pass to Javascript.
+ *
+ * @var array
+ * @see JsHelper::set()
+ * @access private
+ */
+	var $__jsVars = array();
+
+/**
+ * Scripts that are queued for output
+ *
+ * @var array
+ * @see JsHelper::buffer()
+ * @access private
+ */
+	var $__bufferedScripts = array();
+
+/**
+ * Current Javascript Engine that is being used
+ *
+ * @var string
+ * @access private
+ */
+	var $__engineName;
+
+/**
+ * The javascript variable created by set() variables.
+ *
+ * @var string
+ * @access public
+ */
+	var $setVariable = APP_DIR;
+
+/**
+ * Constructor - determines engine helper
+ *
+ * @param array $settings Settings array contains name of engine helper.
+ * @return void
+ * @access public
+ */
+	function __construct($settings = array()) {
+		$className = 'Jquery';
+		if (is_array($settings) && isset($settings[0])) {
+			$className = $settings[0];
+		} elseif (is_string($settings)) {
+			$className = $settings;
+		}
+		$engineName = $className;
+		list($plugin, $className) = pluginSplit($className);
+
+		$this->__engineName = $className . 'Engine';
+		$engineClass = $engineName . 'Engine';
+		$this->helpers[] = $engineClass;
+		parent::__construct();
+	}
+
+/**
+ * call__ Allows for dispatching of methods to the Engine Helper.
+ * methods in the Engines bufferedMethods list will be automatically buffered.
+ * You can control buffering with the buffer param as well. By setting the last parameter to
+ * any engine method to a boolean you can force or disable buffering.
+ *
+ * e.g. `$js->get('#foo')->effect('fadeIn', array('speed' => 'slow'), true);`
+ *
+ * Will force buffering for the effect method. If the method takes an options array you may also add
+ * a 'buffer' param to the options array and control buffering there as well.
+ *
+ * e.g. `$js->get('#foo')->event('click', $functionContents, array('buffer' => true));`
+ *
+ * The buffer parameter will not be passed onto the EngineHelper.
+ *
+ * @param string $method Method to be called
+ * @param array $params Parameters for the method being called.
+ * @return mixed Depends on the return of the dispatched method, or it could be an instance of the EngineHelper
+ * @access public
+ */
+	function call__($method, $params) {
+		if (isset($this->{$this->__engineName}) && method_exists($this->{$this->__engineName}, $method)) {
+			$buffer = false;
+			if (in_array(strtolower($method), $this->{$this->__engineName}->bufferedMethods)) {
+				$buffer = true;
+			}
+			if (count($params) > 0) {
+				$lastParam = $params[count($params) - 1];
+				$hasBufferParam = (is_bool($lastParam) || is_array($lastParam) && isset($lastParam['buffer']));
+				if ($hasBufferParam && is_bool($lastParam)) {
+					$buffer = $lastParam;
+					unset($params[count($params) - 1]);
+				} elseif ($hasBufferParam && is_array($lastParam)) {
+					$buffer = $lastParam['buffer'];
+					unset($params['buffer']);
+				}
+			}
+			$out = $this->{$this->__engineName}->dispatchMethod($method, $params);
+			if ($this->bufferScripts && $buffer && is_string($out)) {
+				$this->buffer($out);
+				return null;
+			}
+			if (is_object($out) && is_a($out, 'JsBaseEngineHelper')) {
+				return $this;
+			}
+			return $out;
+		}
+		if (method_exists($this, $method . '_')) {
+			return $this->dispatchMethod($method . '_', $params);
+		}
+		trigger_error(sprintf(__('JsHelper:: Missing Method %s is undefined', true), $method), E_USER_WARNING);
+	}
+
+/**
+ * Workaround for Object::Object() existing. Since Object::object exists, it does not
+ * fall into call__ and is not passed onto the engine helper. See JsBaseEngineHelper::object() for
+ * more information on this method.
+ *
+ * @param mixed $data Data to convert into JSON
+ * @param array $options Options to use for encoding JSON.  See JsBaseEngineHelper::object() for more details.
+ * @return string encoded JSON
+ * @deprecated Remove when support for PHP4 and Object::object are removed.
+ * @access public
+ */
+	function object($data = array(), $options = array()) {
+		return $this->{$this->__engineName}->object($data, $options);
+	}
+
+/**
+ * Overwrite inherited Helper::value()
+ * See JsBaseEngineHelper::value() for more information on this method.
+ *
+ * @param mixed $val A PHP variable to be converted to JSON
+ * @param boolean $quoteStrings If false, leaves string values unquoted
+ * @return string a JavaScript-safe/JSON representation of $val
+ * @access public
+ **/
+	function value($val, $quoteString = true) {
+		return $this->{$this->__engineName}->value($val, $quoteString);
+	}
+
+/**
+ * Writes all Javascript generated so far to a code block or
+ * caches them to a file and returns a linked script.  If no scripts have been
+ * buffered this method will return null.  If the request is an XHR(ajax) request
+ * onDomReady will be set to false. As the dom is already 'ready'.
+ *
+ * ### Options
+ *
+ * - `inline` - Set to true to have scripts output as a script block inline
+ *   if `cache` is also true, a script link tag will be generated. (default true)
+ * - `cache` - Set to true to have scripts cached to a file and linked in (default false)
+ * - `clear` - Set to false to prevent script cache from being cleared (default true)
+ * - `onDomReady` - wrap cached scripts in domready event (default true)
+ * - `safe` - if an inline block is generated should it be wrapped in <![CDATA[ ... ]]> (default true)
+ *
+ * @param array $options options for the code block
+ * @return mixed Completed javascript tag if there are scripts, if there are no buffered
+ *   scripts null will be returned.
+ * @access public
+ */
+	function writeBuffer($options = array()) {
+		$domReady = isset($this->params['isAjax']) ? !$this->params['isAjax'] : true;
+		$defaults = array(
+			'onDomReady' => $domReady, 'inline' => true, 
+			'cache' => false, 'clear' => true, 'safe' => true
+		);
+		$options = array_merge($defaults, $options);
+		$script = implode("\n", $this->getBuffer($options['clear']));
+
+		if (empty($script)) {
+			return null;
+		}
+
+		if ($options['onDomReady']) {
+			$script = $this->{$this->__engineName}->domReady($script);
+		}
+		$opts = $options;
+		unset($opts['onDomReady'], $opts['cache'], $opts['clear']);
+
+		if (!$options['cache'] && $options['inline']) {
+			return $this->Html->scriptBlock($script, $opts);
+		}
+
+		if ($options['cache'] && $options['inline']) {
+			$filename = md5($script);
+			if (!file_exists(JS . $filename . '.js')) {
+				cache(str_replace(WWW_ROOT, '', JS) . $filename . '.js', $script, '+999 days', 'public');
+			}
+			return $this->Html->script($filename);
+		}
+		$this->Html->scriptBlock($script, $opts);
+		return null;
+	}
+
+/**
+ * Write a script to the buffered scripts.
+ *
+ * @param string $script Script string to add to the buffer.
+ * @param boolean $top If true the script will be added to the top of the 
+ *   buffered scripts array.  If false the bottom.
+ * @return void
+ * @access public
+ */
+	function buffer($script, $top = false) {
+		if ($top) {
+			array_unshift($this->__bufferedScripts, $script);
+		} else {
+			$this->__bufferedScripts[] = $script;
+		}
+	}
+
+/**
+ * Get all the buffered scripts
+ *
+ * @param boolean $clear Whether or not to clear the script caches (default true)
+ * @return array Array of scripts added to the request.
+ * @access public
+ */
+	function getBuffer($clear = true) {
+		$this->_createVars();
+		$scripts = $this->__bufferedScripts;
+		if ($clear) {
+			$this->__bufferedScripts = array();
+			$this->__jsVars = array();
+		}
+		return $scripts;
+	}
+
+/**
+ * Generates the object string for variables passed to javascript.
+ *
+ * @return string Generated JSON object of all set vars
+ * @access protected
+ */
+	function _createVars() {
+		if (!empty($this->__jsVars)) {
+			$setVar = (strpos($this->setVariable, '.')) ? $this->setVariable : 'window.' . $this->setVariable;
+			$this->buffer($setVar . ' = ' . $this->object($this->__jsVars) . ';', true);
+		}
+	}
+
+/**
+ * Generate an 'Ajax' link.  Uses the selected JS engine to create a link
+ * element that is enhanced with Javascript.  Options can include
+ * both those for HtmlHelper::link() and JsBaseEngine::request(), JsBaseEngine::event();
+ *
+ * ### Options
+ *
+ * - `confirm` - Generate a confirm() dialog before sending the event.
+ * - `id` - use a custom id.
+ * - `htmlAttributes` - additional non-standard htmlAttributes.  Standard attributes are class, id,
+ *    rel, title, escape, onblur and onfocus.
+ * - `buffer` - Disable the buffering and return a script tag in addition to the link.
+ *
+ * @param string $title Title for the link.
+ * @param mixed $url Mixed either a string URL or an cake url array.
+ * @param array $options Options for both the HTML element and Js::request()
+ * @return string Completed link. If buffering is disabled a script tag will be returned as well.
+ * @access public
+ */
+	function link($title, $url = null, $options = array()) {
+		if (!isset($options['id'])) {
+			$options['id'] = 'link-' . intval(mt_rand());
+		}
+		list($options, $htmlOptions) = $this->_getHtmlOptions($options);
+		$out = $this->Html->link($title, $url, $htmlOptions);
+		$this->get('#' . $htmlOptions['id']);
+		$requestString = $event = '';
+		if (isset($options['confirm'])) {
+			$requestString = $this->confirmReturn($options['confirm']);
+			unset($options['confirm']);
+		}
+		$buffer = isset($options['buffer']) ? $options['buffer'] : null;
+		$safe = isset($options['safe']) ? $options['safe'] : true;
+		unset($options['buffer'], $options['safe']);
+
+		$requestString .= $this->request($url, $options);
+
+		if (!empty($requestString)) {
+			$event = $this->event('click', $requestString, $options + array('buffer' => $buffer));
+		}
+		if (isset($buffer) && !$buffer) {
+			$opts = array('safe' => $safe);
+			$out .= $this->Html->scriptBlock($event, $opts);
+		}
+		return $out;
+	}
+
+/**
+ * Pass variables into Javascript.  Allows you to set variables that will be
+ * output when the buffer is fetched with `JsHelper::getBuffer()` or `JsHelper::writeBuffer()`
+ * The Javascript variable used to output set variables can be controlled with `JsHelper::$setVariable`
+ *
+ * @param mixed $one Either an array of variables to set, or the name of the variable to set.
+ * @param mixed $two If $one is a string, $two is the value for that key.
+ * @return void
+ * @access public
+ */
+	function set($one, $two = null) {
+		$data = null;
+		if (is_array($one)) {
+			if (is_array($two)) {
+				$data = array_combine($one, $two);
+			} else {
+				$data = $one;
+			}
+		} else {
+			$data = array($one => $two);
+		}
+		if ($data == null) {
+			return false;
+		}
+		$this->__jsVars = array_merge($this->__jsVars, $data);
+	}
+
+/**
+ * Uses the selected JS engine to create a submit input
+ * element that is enhanced with Javascript.  Options can include
+ * both those for FormHelper::submit() and JsBaseEngine::request(), JsBaseEngine::event();
+ *
+ * Forms submitting with this method, cannot send files. Files do not transfer over XmlHttpRequest
+ * and require an iframe or flash.
+ *
+ * ### Options
+ * 
+ * - `url` The url you wish the XHR request to submit to.
+ * - `confirm` A string to use for a confirm() message prior to submitting the request.
+ * - `method` The method you wish the form to send by, defaults to POST
+ * - `buffer` Whether or not you wish the script code to be buffered, defaults to true.
+ * - Also see options for JsHelper::request() and JsHelper::event()
+ *
+ * @param string $title The display text of the submit button.
+ * @param array $options Array of options to use. See the options for the above mentioned methods.
+ * @return string Completed submit button.
+ * @access public
+ */
+	function submit($caption = null, $options = array()) {
+		if (!isset($options['id'])) {
+			$options['id'] = 'submit-' . intval(mt_rand());
+		}
+		$formOptions = array('div');
+		list($options, $htmlOptions) = $this->_getHtmlOptions($options, $formOptions);
+		$out = $this->Form->submit($caption, $htmlOptions);
+
+		$this->get('#' . $htmlOptions['id']);
+
+		$options['data'] = $this->serializeForm(array('isForm' => false, 'inline' => true));
+		$requestString = $url = '';
+		if (isset($options['confirm'])) {
+			$requestString = $this->confirmReturn($options['confirm']);
+			unset($options['confirm']);
+		}
+		if (isset($options['url'])) {
+			$url = $options['url'];
+			unset($options['url']);
+		}
+		if (!isset($options['method'])) {
+			$options['method'] = 'post';
+		}
+		$options['dataExpression'] = true;
+
+		$buffer = isset($options['buffer']) ? $options['buffer'] : null;
+		$safe = isset($options['safe']) ? $options['safe'] : true;
+		unset($options['buffer'], $options['safe']);
+
+		$requestString .= $this->request($url, $options);
+		if (!empty($requestString)) {
+			$event = $this->event('click', $requestString, $options + array('buffer' => $buffer));
+		}
+		if (isset($buffer) && !$buffer) {
+			$opts = array('safe' => $safe);
+			$out .= $this->Html->scriptBlock($event, $opts);
+		}
+		return $out;
+	}
+
+/**
+ * Parse a set of Options and extract the Html options.
+ * Extracted Html Options are removed from the $options param.
+ *
+ * @param array $options Options to filter.
+ * @param array $additional Array of additional keys to extract and include in the return options array.
+ * @return array Array of js options and Htmloptions
+ * @access protected
+ */
+	function _getHtmlOptions($options, $additional = array()) {
+		$htmlKeys = array_merge(
+			array('class', 'id', 'escape', 'onblur', 'onfocus', 'rel', 'title', 'style'), 
+			$additional
+		);
+		$htmlOptions = array();
+		foreach ($htmlKeys as $key) {
+			if (isset($options[$key])) {
+				$htmlOptions[$key] = $options[$key];
+			}
+			unset($options[$key]);
+		}
+		if (isset($options['htmlAttributes'])) {
+			$htmlOptions = array_merge($htmlOptions, $options['htmlAttributes']);
+			unset($options['htmlAttributes']);
+		}
+		return array($options, $htmlOptions);
+	}
+}
+
+/**
+ * JsEngineBaseClass
+ *
+ * Abstract Base Class for All JsEngines to extend. Provides generic methods.
+ *
+ * @package cake.view.helpers
+ */
+class JsBaseEngineHelper extends AppHelper {
+/**
+ * Determines whether native JSON extension is used for encoding.  Set by object constructor.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $useNative = false;
+
+/**
+ * The js snippet for the current selection.
+ *
+ * @var string
+ * @access public
+ */
+	var $selection;
+
+/**
+ * Collection of option maps. Option maps allow other helpers to use generic names for engine
+ * callbacks and options.  Allowing uniform code access for all engine types.  Their use is optional
+ * for end user use though.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_optionMap = array();
+
+/**
+ * An array of lowercase method names in the Engine that are buffered unless otherwise disabled.
+ * This allows specific 'end point' methods to be automatically buffered by the JsHelper.
+ *
+ * @var array
+ * @access public
+ */
+	var $bufferedMethods = array('event', 'sortable', 'drag', 'drop', 'slider');
+
+/**
+ * Contains a list of callback names -> default arguments.
+ *
+ * @var array
+ * @access protected
+ */
+	var $_callbackArguments = array();
+
+/**
+ * Constructor.
+ *
+ * @return void
+ */
+	function __construct() {
+		parent::__construct();
+		$this->useNative = function_exists('json_encode');
+	}
+
+/**
+ * Create an `alert()` message in Javascript
+ *
+ * @param string $message Message you want to alter.
+ * @return string completed alert()
+ * @access public
+ */
+	function alert($message) {
+		return 'alert("' . $this->escape($message) . '");';
+	}
+
+/**
+ * Redirects to a URL.  Creates a window.location modification snippet
+ * that can be used to trigger 'redirects' from Javascript.
+ *
+ * @param mixed $url
+ * @param array  $options
+ * @return string completed redirect in javascript
+ * @access public
+ */
+	function redirect($url = null) {
+		return 'window.location = "' . Router::url($url) . '";';
+	}
+
+/**
+ * Create a `confirm()` message
+ *
+ * @param string $message Message you want confirmed.
+ * @return string completed confirm()
+ * @access public
+ */
+	function confirm($message) {
+		return 'confirm("' . $this->escape($message) . '");';
+	}
+
+/**
+ * Generate a confirm snippet that returns false from the current
+ * function scope.
+ *
+ * @param string $message Message to use in the confirm dialog.
+ * @return string completed confirm with return script
+ * @access public
+ */
+	function confirmReturn($message) {
+		$out = 'var _confirm = ' . $this->confirm($message);
+		$out .= "if (!_confirm) {\n\treturn false;\n}";
+		return $out;
+	}
+
+/**
+ * Create a `prompt()` Javascript function
+ *
+ * @param string $message Message you want to prompt.
+ * @param string $default Default message
+ * @return string completed prompt()
+ * @access public
+ */
+	function prompt($message, $default = '') {
+		return 'prompt("' . $this->escape($message) . '", "' . $this->escape($default) . '");';
+	}
+
+/**
+ * Generates a JavaScript object in JavaScript Object Notation (JSON)
+ * from an array.  Will use native JSON encode method if available, and $useNative == true
+ *
+ * ### Options:
+ *
+ * - `prefix` - String prepended to the returned data.
+ * - `postfix` - String appended to the returned data.
+ *
+ * @param array $data Data to be converted.
+ * @param array $options Set of options, see above.
+ * @return string A JSON code block
+ * @access public
+ */
+	function object($data = array(), $options = array()) {
+		$defaultOptions = array(
+			'prefix' => '', 'postfix' => '',
+		);
+		$options = array_merge($defaultOptions, $options);
+
+		if (is_object($data)) {
+			$data = get_object_vars($data);
+		}
+
+		$out = $keys = array();
+		$numeric = true;
+
+		if ($this->useNative && function_exists('json_encode')) {
+			$rt = json_encode($data);
+		} else {
+			if (is_null($data)) {
+				return 'null';
+			}
+			if (is_bool($data)) {
+				return $data ? 'true' : 'false';
+			}
+			if (is_array($data)) {
+				$keys = array_keys($data);
+			}
+
+			if (!empty($keys)) {
+				$numeric = (array_values($keys) === array_keys(array_values($keys)));
+			}
+
+			foreach ($data as $key => $val) {
+				if (is_array($val) || is_object($val)) {
+					$val = $this->object($val);
+				} else {
+					$val = $this->value($val);
+				}
+				if (!$numeric) {
+					$val = '"' . $this->value($key, false) . '":' . $val;
+				}
+				$out[] = $val;
+			}
+
+			if (!$numeric) {
+				$rt = '{' . join(',', $out) . '}';
+			} else {
+				$rt = '[' . join(',', $out) . ']';
+			}
+		}
+		$rt = $options['prefix'] . $rt . $options['postfix'];
+		return $rt;
+	}
+
+/**
+ * Converts a PHP-native variable of any type to a JSON-equivalent representation
+ *
+ * @param mixed $val A PHP variable to be converted to JSON
+ * @param boolean $quoteStrings If false, leaves string values unquoted
+ * @return string a JavaScript-safe/JSON representation of $val
+ * @access public
+ */
+	function value($val, $quoteString = true) {
+		switch (true) {
+			case (is_array($val) || is_object($val)):
+				$val = $this->object($val);
+			break;
+			case ($val === null):
+				$val = 'null';
+			break;
+			case (is_bool($val)):
+				$val = ($val === true) ? 'true' : 'false';
+			break;
+			case (is_int($val)):
+				$val = $val;
+			break;
+			case (is_float($val)):
+				$val = sprintf("%.11f", $val);
+			break;
+			default:
+				$val = $this->escape($val);
+				if ($quoteString) {
+					$val = '"' . $val . '"';
+				}
+			break;
+		}
+		return $val;
+	}
+
+/**
+ * Escape a string to be JSON friendly.
+ *
+ * List of escaped elements:
+ *
+ * - "\r" => '\n'
+ * - "\n" => '\n'
+ * - '"' => '\"'
+ *
+ * @param  string $script String that needs to get escaped.
+ * @return string Escaped string.
+ * @access public
+ */
+	function escape($string) {
+		App::import('Core', 'Multibyte');
+		return $this->_utf8ToHex($string);
+	}
+
+/**
+ * Encode a string into JSON.  Converts and escapes necessary characters.
+ *
+ * @param string $string The string that needs to be utf8->hex encoded
+ * @return void
+ * @access protected
+ */
+	function _utf8ToHex($string) {
+		$length = strlen($string);
+		$return = '';
+		for ($i = 0; $i < $length; ++$i) {
+			$ord = ord($string{$i});
+			switch (true) {
+				case $ord == 0x08:
+					$return .= '\b';
+					break;
+				case $ord == 0x09:
+					$return .= '\t';
+					break;
+				case $ord == 0x0A:
+					$return .= '\n';
+					break;
+				case $ord == 0x0C:
+					$return .= '\f';
+					break;
+				case $ord == 0x0D:
+					$return .= '\r';
+					break;
+				case $ord == 0x22:
+				case $ord == 0x2F:
+				case $ord == 0x5C:
+					$return .= '\\' . $string{$i};
+					break;
+				case (($ord >= 0x20) && ($ord <= 0x7F)):
+					$return .= $string{$i};
+					break;
+				case (($ord & 0xE0) == 0xC0):
+					if ($i + 1 >= $length) {
+						$i += 1;
+						$return .= '?';
+						break;
+					}
+					$charbits = $string{$i} . $string{$i + 1};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 1;
+					break;
+				case (($ord & 0xF0) == 0xE0):
+					if ($i + 2 >= $length) {
+						$i += 2;
+						$return .= '?';
+						break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 2;
+					break;
+				case (($ord & 0xF8) == 0xF0):
+					if ($i + 3 >= $length) {
+					   $i += 3;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 3;
+					break;
+				case (($ord & 0xFC) == 0xF8):
+					if ($i + 4 >= $length) {
+					   $i += 4;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 4;
+					break;
+				case (($ord & 0xFE) == 0xFC):
+					if ($i + 5 >= $length) {
+					   $i += 5;
+					   $return .= '?';
+					   break;
+					}
+					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4} . $string{$i + 5};
+					$char = Multibyte::utf8($charbits);
+					$return .= sprintf('\u%04s', dechex($char[0]));
+					$i += 5;
+					break;
+			}
+		}
+		return $return;
+	}
+
+/**
+ * Create javascript selector for a CSS rule
+ *
+ * @param string $selector The selector that is targeted
+ * @return object instance of $this. Allows chained methods.
+ * @access public
+ */
+	function get($selector) {
+		trigger_error(sprintf(__('%s does not have get() implemented', true), get_class($this)), E_USER_WARNING);
+		return $this;
+	}
+
+/**
+ * Add an event to the script cache. Operates on the currently selected elements.
+ *
+ * ### Options
+ *
+ * - `wrap` - Whether you want the callback wrapped in an anonymous function. (defaults to true)
+ * - `stop` - Whether you want the event to stopped. (defaults to true)
+ *
+ * @param string $type Type of event to bind to the current dom id
+ * @param string $callback The Javascript function you wish to trigger or the function literal
+ * @param array $options Options for the event.
+ * @return string completed event handler
+ * @access public
+ */
+	function event($type, $callback, $options = array()) {
+		trigger_error(sprintf(__('%s does not have event() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Create a domReady event. This is a special event in many libraries
+ *
+ * @param string $functionBody The code to run on domReady
+ * @return string completed domReady method
+ * @access public
+ */
+	function domReady($functionBody) {
+		trigger_error(sprintf(__('%s does not have domReady() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Create an iteration over the current selection result.
+ *
+ * @param string $callback The function body you wish to apply during the iteration.
+ * @return string completed iteration
+ */
+	function each($callback) {
+		trigger_error(sprintf(__('%s does not have each() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Trigger an Effect.
+ *
+ * ### Supported Effects
+ *
+ * The following effects are supported by all core JsEngines
+ *
+ * - `show` - reveal an element.
+ * - `hide` - hide an element.
+ * - `fadeIn` - Fade in an element.
+ * - `fadeOut` - Fade out an element.
+ * - `slideIn` - Slide an element in.
+ * - `slideOut` - Slide an element out.
+ *
+ * ### Options
+ *
+ * - `speed` - Speed at which the animation should occur. Accepted values are 'slow', 'fast'. Not all effects use
+ *   the speed option.
+ *
+ * @param string $name The name of the effect to trigger.
+ * @param array $options Array of options for the effect.
+ * @return string completed string with effect.
+ * @access public
+ */
+	function effect($name, $options) {
+		trigger_error(sprintf(__('%s does not have effect() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Make an XHR request
+ *
+ * ### Event Options
+ *
+ * - `complete` - Callback to fire on complete.
+ * - `success` - Callback to fire on success.
+ * - `before` - Callback to fire on request initialization.
+ * - `error` - Callback to fire on request failure.
+ *
+ * ### Options
+ *
+ * - `method` - The method to make the request with defaults to GET in more libraries
+ * - `async` - Whether or not you want an asynchronous request.
+ * - `data` - Additional data to send.
+ * - `update` - Dom id to update with the content of the request.
+ * - `type` - Data type for response. 'json' and 'html' are supported. Default is html for most libraries.
+ * - `evalScripts` - Whether or not <script> tags should be eval'ed.
+ * - `dataExpression` - Should the `data` key be treated as a callback.  Useful for supplying `$options['data']` as
+ *    another Javascript expression.
+ *
+ * @param mixed $url Array or String URL to target with the request.
+ * @param array $options Array of options. See above for cross library supported options
+ * @return string XHR request.
+ * @access public
+ */
+	function request($url, $options = array()) {
+		trigger_error(sprintf(__('%s does not have request() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Create a draggable element.  Works on the currently selected element.
+ * Additional options may be supported by the library implementation.
+ *
+ * ### Options
+ *
+ * - `handle` - selector to the handle element.
+ * - `snapGrid` - The pixel grid that movement snaps to, an array(x, y)
+ * - `container` - The element that acts as a bounding box for the draggable element.
+ *
+ * ### Event Options
+ *
+ * - `start` - Event fired when the drag starts
+ * - `drag` - Event fired on every step of the drag
+ * - `stop` - Event fired when dragging stops (mouse release)
+ *
+ * @param array $options Options array see above.
+ * @return string Completed drag script
+ * @access public
+ */
+	function drag($options = array()) {
+		trigger_error(sprintf(__('%s does not have drag() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Create a droppable element. Allows for draggable elements to be dropped on it.
+ * Additional options may be supported by the library implementation.
+ *
+ * ### Options
+ *
+ * - `accept` - Selector for elements this droppable will accept.
+ * - `hoverclass` - Class to add to droppable when a draggable is over.
+ *
+ * ### Event Options
+ *
+ * - `drop` - Event fired when an element is dropped into the drop zone.
+ * - `hover` - Event fired when a drag enters a drop zone.
+ * - `leave` - Event fired when a drag is removed from a drop zone without being dropped.
+ *
+ * @return string Completed drop script
+ * @access public
+ */
+	function drop($options = array()) {
+		trigger_error(sprintf(__('%s does not have drop() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Create a sortable element.
+ * Additional options may be supported by the library implementation.
+ *
+ * ### Options
+ *
+ * - `containment` - Container for move action
+ * - `handle` - Selector to handle element. Only this element will start sort action.
+ * - `revert` - Whether or not to use an effect to move sortable into final position.
+ * - `opacity` - Opacity of the placeholder
+ * - `distance` - Distance a sortable must be dragged before sorting starts.
+ *
+ * ### Event Options
+ *
+ * - `start` - Event fired when sorting starts
+ * - `sort` - Event fired during sorting
+ * - `complete` - Event fired when sorting completes.
+ *
+ * @param array $options Array of options for the sortable. See above.
+ * @return string Completed sortable script.
+ * @access public
+ */
+	function sortable() {
+		trigger_error(sprintf(__('%s does not have sortable() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Create a slider UI widget.  Comprised of a track and knob.
+ * Additional options may be supported by the library implementation.
+ *
+ * ### Options
+ *
+ * - `handle` - The id of the element used in sliding.
+ * - `direction` - The direction of the slider either 'vertical' or 'horizontal'
+ * - `min` - The min value for the slider.
+ * - `max` - The max value for the slider.
+ * - `step` - The number of steps or ticks the slider will have.
+ * - `value` - The initial offset of the slider.
+ *
+ * ### Events
+ *
+ * - `change` - Fired when the slider's value is updated
+ * - `complete` - Fired when the user stops sliding the handle
+ *
+ * @return string Completed slider script
+ * @access public
+ */
+	function slider() {
+		trigger_error(sprintf(__('%s does not have slider() implemented', true), get_class($this)), E_USER_WARNING);
+	}
+
+/**
+ * Serialize the form attached to $selector.
+ * Pass `true` for $isForm if the current selection is a form element.
+ * Converts the form or the form element attached to the current selection into a string/json object
+ * (depending on the library implementation) for use with XHR operations.
+ *
+ * ### Options
+ *
+ * - `isForm` - is the current selection a form, or an input? (defaults to false)
+ * - `inline` - is the rendered statement going to be used inside another JS statement? (defaults to false)
+ *
+ * @param array $options options for serialization generation.
+ * @return string completed form serialization script
+ * @access public
+ */
+	function serializeForm() {
+		trigger_error(
+			sprintf(__('%s does not have serializeForm() implemented', true), get_class($this)), E_USER_WARNING
+		);
+	}
+
+/**
+ * Parse an options assoc array into an Javascript object literal.
+ * Similar to object() but treats any non-integer value as a string,
+ * does not include `{ }`
+ *
+ * @param array $options Options to be converted
+ * @param array $safeKeys Keys that should not be escaped.
+ * @return string Parsed JSON options without enclosing { }.
+ * @access protected
+ */
+	function _parseOptions($options, $safeKeys = array()) {
+		$out = array();
+		$safeKeys = array_flip($safeKeys);
+		foreach ($options as $key => $value) {
+			if (!is_int($value) && !isset($safeKeys[$key])) {
+				$value = $this->value($value);
+			}
+			$out[] = $key . ':' . $value;
+		}
+		sort($out);
+		return join(', ', $out);
+	}
+
+/**
+ * Maps Abstract options to engine specific option names.
+ * If attributes are missing from the map, they are not changed.
+ *
+ * @param string $method Name of method whose options are being worked with.
+ * @param array $options Array of options to map.
+ * @return array Array of mapped options.
+ * @access protected
+ */
+	function _mapOptions($method, $options) {
+		if (!isset($this->_optionMap[$method])) {
+			return $options;
+		}
+		foreach ($this->_optionMap[$method] as $abstract => $concrete) {
+			if (isset($options[$abstract])) {
+				$options[$concrete] = $options[$abstract];
+				unset($options[$abstract]);
+			}
+		}
+		return $options;
+	}
+
+/**
+ * Prepare callbacks and wrap them with function ([args]) { } as defined in
+ * _callbackArgs array.
+ *
+ * @param string $method Name of the method you are preparing callbacks for.
+ * @param array $options Array of options being parsed
+ * @param string $callbacks Additional Keys that contain callbacks
+ * @return array Array of options with callbacks added.
+ * @access protected
+ */
+	function _prepareCallbacks($method, $options, $callbacks = array()) {
+		$wrapCallbacks = true;
+		if (isset($options['wrapCallbacks'])) {
+			$wrapCallbacks = $options['wrapCallbacks'];
+		}
+		unset($options['wrapCallbacks']);
+		if (!$wrapCallbacks) {
+			return $options;
+		}
+		$callbackOptions = array();
+		if (isset($this->_callbackArguments[$method])) {
+			$callbackOptions = $this->_callbackArguments[$method];
+		}
+		$callbacks = array_unique(array_merge(array_keys($callbackOptions), (array)$callbacks));
+
+		foreach ($callbacks as $callback) {
+			if (empty($options[$callback])) {
+				continue;
+			}
+			$args = null;
+			if (!empty($callbackOptions[$callback])) {
+				$args = $callbackOptions[$callback];
+			}
+			$options[$callback] = 'function (' . $args . ') {' . $options[$callback] . '}';
+		}
+		return $options;
+	}
+
+/**
+ * Conveinence wrapper method for all common option processing steps.
+ * Runs _mapOptions, _prepareCallbacks, and _parseOptions in order.
+ *
+ * @param string $method Name of method processing options for.
+ * @param array $options Array of options to process.
+ * @return string Parsed options string.
+ * @access protected
+ */
+	function _processOptions($method, $options) {
+		$options = $this->_mapOptions($method, $options);
+		$options = $this->_prepareCallbacks($method, $options);
+		$options = $this->_parseOptions($options, array_keys($this->_callbackArguments[$method]));
+		return $options;
+	}
+
+/**
+ * Convert an array of data into a query string
+ *
+ * @param array $parameters Array of parameters to convert to a query string
+ * @return string Querystring fragment
+ * @access protected
+ */
+	function _toQuerystring($parameters) {
+		$out = '';
+		$keys = array_keys($parameters);
+		$count = count($parameters);
+		for ($i = 0; $i < $count; $i++) {
+			$out .= $keys[$i] . '=' . $parameters[$keys[$i]];
+			if ($i < $count - 1) {
+				$out .= '&';
+			}
+		}
+		return $out;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/mootools_engine.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/mootools_engine.php
new file mode 100644
index 000000000..693d84597
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/mootools_engine.php
@@ -0,0 +1,374 @@
+<?php
+/**
+ * MooTools Engine Helper for JsHelper
+ *
+ * Provides MooTools specific Javascript for JsHelper.
+ * Assumes that you have the following MooTools packages
+ *
+ * - Remote, Remote.HTML, Remote.JSON
+ * - Fx, Fx.Tween, Fx.Morph
+ * - Selectors, DomReady,
+ * - Drag, Drag.Move
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.libs.view.helpers
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', 'Js');
+
+class MootoolsEngineHelper extends JsBaseEngineHelper {
+/**
+ * Option mappings for MooTools
+ *
+ * @var array
+ */
+	var $_optionMap = array(
+		'request' => array(
+			'complete' => 'onComplete',
+			'success' => 'onSuccess',
+			'before' => 'onRequest',
+			'error' => 'onFailure'
+		),
+		'sortable' => array(
+			'distance' => 'snap',
+			'containment' => 'constrain',
+			'sort' => 'onSort',
+			'complete' => 'onComplete',
+			'start' => 'onStart',
+		),
+		'drag' => array(
+			'snapGrid' => 'snap',
+			'start' => 'onStart',
+			'drag' => 'onDrag',
+			'stop' => 'onComplete',
+		),
+		'drop' => array(
+			'drop' => 'onDrop',
+			'hover' => 'onEnter',
+			'leave' => 'onLeave',
+		),
+		'slider' => array(
+			'complete' => 'onComplete',
+			'change' => 'onChange',
+			'direction' => 'mode',
+			'step' => 'steps'
+		)
+	);
+
+/**
+ * Contains a list of callback names -> default arguments.
+ *
+ * @var array
+ */
+	var $_callbackArguments = array(
+		'slider' => array(
+			'onTick' => 'position',
+			'onChange' => 'step',
+			'onComplete' => 'event'
+		),
+		'request' => array(
+			'onRequest' => '',
+			'onComplete' => '',
+			'onCancel' => '',
+			'onSuccess' => 'responseText, responseXML',
+			'onFailure' => 'xhr',
+			'onException' => 'headerName, value',
+		),
+		'drag' => array(
+			'onBeforeStart' => 'element',
+			'onStart' => 'element',
+			'onSnap' => 'element',
+			'onDrag' => 'element, event',
+			'onComplete' => 'element, event',
+			'onCancel' => 'element',
+		),
+		'drop' => array(
+			'onBeforeStart' => 'element',
+			'onStart' => 'element',
+			'onSnap' => 'element',
+			'onDrag' => 'element, event',
+			'onComplete' => 'element, event',
+			'onCancel' => 'element',
+			'onDrop' => 'element, droppable, event',
+			'onLeave' => 'element, droppable',
+			'onEnter' => 'element, droppable',
+		),
+		'sortable' => array(
+			'onStart' => 'element, clone',
+			'onSort' => 'element, clone',
+			'onComplete' => 'element',
+		)
+	);
+
+/**
+ * Create javascript selector for a CSS rule
+ *
+ * @param string $selector The selector that is targeted
+ * @return object instance of $this. Allows chained methods.
+ */
+	function get($selector) {
+		$this->_multipleSelection = false;
+		if ($selector == 'window' || $selector == 'document') {
+			$this->selection = "$(" . $selector .")";
+			return $this;
+		}
+		if (preg_match('/^#[^\s.]+$/', $selector)) {
+			$this->selection = '$("' . substr($selector, 1) . '")';
+			return $this;
+		}
+		$this->_multipleSelection = true;
+		$this->selection = '$$("' . $selector . '")';
+		return $this;
+	}
+
+/**
+ * Add an event to the script cache. Operates on the currently selected elements.
+ *
+ * ### Options
+ *
+ * - 'wrap' - Whether you want the callback wrapped in an anonymous function. (defaults true)
+ * - 'stop' - Whether you want the event to stopped. (defaults true)
+ *
+ * @param string $type Type of event to bind to the current dom id
+ * @param string $callback The Javascript function you wish to trigger or the function literal
+ * @param array $options Options for the event.
+ * @return string completed event handler
+ */
+	function event($type, $callback, $options = array()) {
+		$defaults = array('wrap' => true, 'stop' => true);
+		$options = array_merge($defaults, $options);
+
+		$function = 'function (event) {%s}';
+		if ($options['wrap'] && $options['stop']) {
+			$callback = "event.stop();\n" . $callback;
+		}
+		if ($options['wrap']) {
+			$callback = sprintf($function, $callback);
+		}
+		$out = $this->selection . ".addEvent(\"{$type}\", $callback);";
+		return $out;
+	}
+
+/**
+ * Create a domReady event. This is a special event in many libraries
+ *
+ * @param string $functionBody The code to run on domReady
+ * @return string completed domReady method
+ */
+	function domReady($functionBody) {
+		$this->selection = 'window';
+		return $this->event('domready', $functionBody, array('stop' => false));
+	}
+
+/**
+ * Create an iteration over the current selection result.
+ *
+ * @param string $method The method you want to apply to the selection
+ * @param string $callback The function body you wish to apply during the iteration.
+ * @return string completed iteration
+ */
+	function each($callback) {
+		return $this->selection . '.each(function (item, index) {' . $callback . '});';
+	}
+
+/**
+ * Trigger an Effect.
+ *
+ * @param string $name The name of the effect to trigger.
+ * @param array $options Array of options for the effect.
+ * @return string completed string with effect.
+ * @see JsBaseEngineHelper::effect()
+ */
+	function effect($name, $options = array()) {
+		$speed = null;
+		if (isset($options['speed']) && in_array($options['speed'], array('fast', 'slow'))) {
+			if ($options['speed'] == 'fast') {
+				$speed = '"short"';
+			} elseif ($options['speed'] == 'slow') {
+				$speed = '"long"';
+			}
+		}
+		$effect = '';
+		switch ($name) {
+			case 'hide':
+				$effect = 'setStyle("display", "none")';
+			break;
+			case 'show':
+				$effect = 'setStyle("display", "")';
+			break;
+			case 'fadeIn':
+			case 'fadeOut':
+			case 'slideIn':
+			case 'slideOut':
+				list($effectName, $direction) = preg_split('/([A-Z][a-z]+)/', $name, -1, PREG_SPLIT_DELIM_CAPTURE);
+				$direction = strtolower($direction);
+				if ($speed) {
+					$effect .= "set(\"$effectName\", {duration:$speed}).";
+				}
+				$effect .= "$effectName(\"$direction\")";
+			break;
+		}
+		return $this->selection . '.' . $effect . ';';
+	}
+
+/**
+ * Create an new Request.
+ *
+ * Requires `Request`.  If you wish to use 'update' key you must have ```Request.HTML```
+ * if you wish to do Json requests you will need ```JSON``` and ```Request.JSON```.
+ *
+ * @param mixed $url
+ * @param array $options
+ * @return string The completed ajax call.
+ */
+	function request($url, $options = array()) {
+		$url = $this->url($url);
+		$options = $this->_mapOptions('request', $options);
+		$type = $data = null;
+		if (isset($options['type']) || isset($options['update'])) {
+			if (isset($options['type']) && strtolower($options['type']) == 'json') {
+				$type = '.JSON';
+			}
+			if (isset($options['update'])) {
+				$options['update'] = str_replace('#', '', $options['update']);
+				$type = '.HTML';
+			}
+			unset($options['type']);
+		}
+		if (!empty($options['data'])) {
+			$data = $options['data'];
+			unset($options['data']);
+		}
+		$options['url'] = $url;
+		$options = $this->_prepareCallbacks('request', $options);
+		if (!empty($options['dataExpression'])) {
+			$callbacks[] = 'data';
+			unset($options['dataExpression']);
+		} elseif (!empty($data)) {
+			$data = $this->object($data);
+		}
+		$options = $this->_parseOptions($options, array_keys($this->_callbackArguments['request']));
+		return "var jsRequest = new Request$type({{$options}}).send($data);";
+	}
+
+/**
+ * Create a sortable element.
+ *
+ * Requires the `Sortables` plugin from MootoolsMore
+ *
+ * @param array $options Array of options for the sortable.
+ * @return string Completed sortable script.
+ * @see JsBaseEngineHelper::sortable() for options list.
+ */
+	function sortable($options = array()) {
+		$options = $this->_processOptions('sortable', $options);
+		return 'var jsSortable = new Sortables(' . $this->selection . ', {' . $options . '});';
+	}
+
+/**
+ * Create a Draggable element.
+ *
+ * Requires the `Drag` plugin from MootoolsMore
+ *
+ * @param array $options Array of options for the draggable.
+ * @return string Completed draggable script.
+ * @see JsHelper::drag() for options list.
+ */
+	function drag($options = array()) {
+		$options = $this->_processOptions('drag', $options);
+		return $this->selection . '.makeDraggable({' . $options . '});';
+	}
+
+/**
+ * Create a Droppable element.
+ *
+ * Requires the `Drag` and `Drag.Move` plugins from MootoolsMore
+ *
+ * Droppables in Mootools function differently from other libraries.  Droppables
+ * are implemented as an extension of Drag.  So in addtion to making a get() selection for
+ * the droppable element. You must also provide a selector rule to the draggable element. Furthermore,
+ * Mootools droppables inherit all options from Drag.
+ *
+ * @param array $options Array of options for the droppable.
+ * @return string Completed droppable script.
+ * @see JsBaseEngineHelper::drop() for options list.
+ */
+	function drop($options = array()) {
+		if (empty($options['drag'])) {
+			trigger_error(
+				__('MootoolsEngine::drop() requires a "drag" option to properly function', true), E_USER_WARNING
+			);
+			return false;
+		}
+		$options['droppables'] = $this->selection;
+
+		$this->get($options['drag']);
+		unset($options['drag']);
+
+		$options = $this->_mapOptions('drag', $this->_mapOptions('drop', $options));
+		$options = $this->_prepareCallbacks('drop', $options);
+		$safe = array_merge(array_keys($this->_callbackArguments['drop']), array('droppables'));
+		$optionString = $this->_parseOptions($options, $safe);
+		$out = $this->selection . '.makeDraggable({' . $optionString . '});';
+		$this->selection = $options['droppables'];
+		return $out;
+	}
+
+/**
+ * Create a slider control
+ *
+ * Requires `Slider` from MootoolsMore
+ *
+ * @param array $options Array of options for the slider.
+ * @return string Completed slider script.
+ * @see JsBaseEngineHelper::slider() for options list.
+ */
+	function slider($options = array()) {
+		$slider = $this->selection;
+		$this->get($options['handle']);
+		unset($options['handle']);
+
+		if (isset($options['min']) && isset($options['max'])) {
+			$options['range'] = array($options['min'], $options['max']);
+			unset($options['min'], $options['max']);
+		}
+		$optionString = $this->_processOptions('slider', $options);
+		if (!empty($optionString)) {
+			$optionString = ', {' . $optionString . '}';
+		}
+		$out = 'var jsSlider = new Slider(' . $slider . ', ' . $this->selection . $optionString . ');';
+		$this->selection = $slider;
+		return $out;
+	}
+
+/**
+ * Serialize the form attached to $selector.
+ *
+ * @param array $options Array of options.
+ * @return string Completed serializeForm() snippet
+ * @see JsBaseEngineHelper::serializeForm()
+ */
+	function serializeForm($options = array()) {
+		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
+		$selection = $this->selection;
+		if (!$options['isForm']) {
+			$selection = '$(' . $this->selection . '.form)';
+		}
+		$method = '.toQueryString()';
+		if (!$options['inline']) {
+			$method .= ';';
+		}
+		return $selection . $method;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/number.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/number.php
new file mode 100644
index 000000000..3abf3517f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/number.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Number Helper.
+ *
+ * Methods to make numbers more readable.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Number helper library.
+ *
+ * Methods to make numbers more readable.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1452/Number
+ */
+class NumberHelper extends AppHelper {
+
+/**
+ * Currencies supported by the helper.  You can add additional currency formats
+ * with NumberHelper::addFormat
+ *
+ * @var array
+ * @access protected
+ */
+	var $_currencies = array(
+		'USD' => array(
+			'before' => '$', 'after' => 'c', 'zero' => 0, 'places' => 2, 'thousands' => ',',
+			'decimals' => '.', 'negative' => '()', 'escape' => true
+		),
+		'GBP' => array(
+			'before'=>'&#163;', 'after' => 'p', 'zero' => 0, 'places' => 2, 'thousands' => ',',
+			'decimals' => '.', 'negative' => '()','escape' => false
+		),
+		'EUR' => array(
+			'before'=>'&#8364;', 'after' => false, 'zero' => 0, 'places' => 2, 'thousands' => '.',
+			'decimals' => ',', 'negative' => '()', 'escape' => false
+		)
+	);
+
+/**
+ * Default options for currency formats
+ *
+ * @var array
+ * @access protected
+ */
+	var $_currencyDefaults = array(
+		'before'=>'', 'after' => '', 'zero' => '0', 'places' => 2, 'thousands' => ',',
+		'decimals' => '.','negative' => '()', 'escape' => true
+	);
+
+/**
+ * Formats a number with a level of precision.
+ *
+ * @param float $number	A floating point number.
+ * @param integer $precision The precision of the returned number.
+ * @return float Formatted float.
+ * @access public
+ * @link http://book.cakephp.org/view/1454/precision
+ */
+	function precision($number, $precision = 3) {
+		return sprintf("%01.{$precision}f", $number);
+	}
+
+/**
+ * Returns a formatted-for-humans file size.
+ *
+ * @param integer $length Size in bytes
+ * @return string Human readable size
+ * @access public
+ * @link http://book.cakephp.org/view/1456/toReadableSize
+ */
+	function toReadableSize($size) {
+		switch (true) {
+			case $size < 1024:
+				return sprintf(__n('%d Byte', '%d Bytes', $size, true), $size);
+			case round($size / 1024) < 1024:
+				return sprintf(__('%d KB', true), $this->precision($size / 1024, 0));
+			case round($size / 1024 / 1024, 2) < 1024:
+				return sprintf(__('%.2f MB', true), $this->precision($size / 1024 / 1024, 2));
+			case round($size / 1024 / 1024 / 1024, 2) < 1024:
+				return sprintf(__('%.2f GB', true), $this->precision($size / 1024 / 1024 / 1024, 2));
+			default:
+				return sprintf(__('%.2f TB', true), $this->precision($size / 1024 / 1024 / 1024 / 1024, 2));
+		}
+	}
+
+/**
+ * Formats a number into a percentage string.
+ *
+ * @param float $number A floating point number
+ * @param integer $precision The precision of the returned number
+ * @return string Percentage string
+ * @access public
+ * @link http://book.cakephp.org/view/1455/toPercentage
+ */
+	function toPercentage($number, $precision = 2) {
+		return $this->precision($number, $precision) . '%';
+	}
+
+/**
+ * Formats a number into a currency format.
+ *
+ * @param float $number A floating point number
+ * @param integer $options if int then places, if string then before, if (,.-) then use it
+ *   or array with places and before keys
+ * @return string formatted number
+ * @access public
+ * @link http://book.cakephp.org/view/1457/format
+ */
+	function format($number, $options = false) {
+		$places = 0;
+		if (is_int($options)) {
+			$places = $options;
+		}
+
+		$separators = array(',', '.', '-', ':');
+
+		$before = $after = null;
+		if (is_string($options) && !in_array($options, $separators)) {
+			$before = $options;
+		}
+		$thousands = ',';
+		if (!is_array($options) && in_array($options, $separators)) {
+			$thousands = $options;
+		}
+		$decimals = '.';
+		if (!is_array($options) && in_array($options, $separators)) {
+			$decimals = $options;
+		}
+
+		$escape = true;
+		if (is_array($options)) {
+			$options = array_merge(array('before'=>'$', 'places' => 2, 'thousands' => ',', 'decimals' => '.'), $options);
+			extract($options);
+		}
+
+		$out = $before . number_format($number, $places, $decimals, $thousands) . $after;
+
+		if ($escape) {
+			return h($out);
+		}
+		return $out;
+	}
+
+/**
+ * Formats a number into a currency format.
+ *
+ * ### Options
+ *
+ * - `before` - The currency symbol to place before whole numbers ie. '$'
+ * - `after` - The currency symbol to place after decimal numbers ie. 'c'. Set to boolean false to 
+ *    use no decimal symbol.  eg. 0.35 => $0.35.
+ * - `zero` - The text to use for zero values, can be a string or a number. ie. 0, 'Free!'
+ * - `places` - Number of decimal places to use. ie. 2
+ * - `thousands` - Thousands separator ie. ','
+ * - `decimals` - Decimal separator symbol ie. '.'
+ * - `negative` - Symbol for negative numbers. If equal to '()', the number will be wrapped with ( and )
+ * - `escape` - Should the output be htmlentity escaped? Defaults to true
+ *
+ * @param float $number
+ * @param string $currency Shortcut to default options. Valid values are 'USD', 'EUR', 'GBP', otherwise
+ *   set at least 'before' and 'after' options.
+ * @param array $options
+ * @return string Number formatted as a currency.
+ * @access public
+ * @link http://book.cakephp.org/view/1453/currency
+ */
+	function currency($number, $currency = 'USD', $options = array()) {
+		$default = $this->_currencyDefaults;
+
+		if (isset($this->_currencies[$currency])) {
+			$default = $this->_currencies[$currency];
+		} elseif (is_string($currency)) {
+			$options['before'] = $currency;
+		}
+
+		$options = array_merge($default, $options);
+
+		$result = null;
+
+		if ($number == 0 ) {
+			if ($options['zero'] !== 0 ) {
+				return $options['zero'];
+			}
+			$options['after'] = null;
+		} elseif ($number < 1 && $number > -1 ) {
+			if ($options['after'] !== false) {
+				$multiply = intval('1' . str_pad('', $options['places'], '0'));
+				$number = $number * $multiply;
+				$options['before'] = null;
+				$options['places'] = null;
+			}
+		} elseif (empty($options['before'])) {
+			$options['before'] = null;
+		} else {
+			$options['after'] = null;
+		}
+
+		$abs = abs($number);
+		$result = $this->format($abs, $options);
+
+		if ($number < 0 ) {
+			if ($options['negative'] == '()') {
+				$result = '(' . $result .')';
+			} else {
+				$result = $options['negative'] . $result;
+			}
+		}
+		return $result;
+	}
+
+/**
+ * Add a currency format to the Number helper.  Makes reusing
+ * currency formats easier.
+ *
+ * {{{ $number->addFormat('NOK', array('before' => 'Kr. ')); }}}
+ * 
+ * You can now use `NOK` as a shortform when formatting currency amounts.
+ *
+ * {{{ $number->currency($value, 'NOK'); }}}
+ *
+ * Added formats are merged with the following defaults.
+ *
+ * {{{
+ *	array(
+ *		'before' => '$', 'after' => 'c', 'zero' => 0, 'places' => 2, 'thousands' => ',',
+ *		'decimals' => '.', 'negative' => '()', 'escape' => true
+ *	)
+ * }}}
+ *
+ * @param string $formatName The format name to be used in the future.
+ * @param array $options The array of options for this format.
+ * @return void
+ * @see NumberHelper::currency()
+ * @access public
+ */
+	function addFormat($formatName, $options) {
+		$this->_currencies[$formatName] = $options + $this->_currencyDefaults;
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/paginator.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/paginator.php
new file mode 100644
index 000000000..363ed6e6c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/paginator.php
@@ -0,0 +1,816 @@
+<?php
+/**
+ * Pagination Helper class file.
+ *
+ * Generates pagination links
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Pagination Helper class for easy generation of pagination links.
+ *
+ * PaginationHelper encloses all methods needed when working with pagination.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1458/Paginator
+ */
+class PaginatorHelper extends AppHelper {
+
+/**
+ * Helper dependencies
+ *
+ * @var array
+ */
+	var $helpers = array('Html');
+
+/**
+ * Holds the default model for paged recordsets
+ *
+ * @var string
+ */
+	var $__defaultModel = null;
+
+/**
+ * The class used for 'Ajax' pagination links.
+ *
+ * @var string
+ */
+	var $_ajaxHelperClass = 'Js';
+
+/**
+ * Holds the default options for pagination links
+ *
+ * The values that may be specified are:
+ *
+ *  - `$options['format']` Format of the counter. Supported formats are 'range' and 'pages'
+ *    and custom (default). In the default mode the supplied string is parsed and constants are replaced
+ *    by their actual values.
+ *    Constants: %page%, %pages%, %current%, %count%, %start%, %end% .
+ *  - `$options['separator']` The separator of the actual page and number of pages (default: ' of ').
+ *  - `$options['url']` Url of the action. See Router::url()
+ *  - `$options['url']['sort']`  the key that the recordset is sorted.
+ *  - `$options['url']['direction']` Direction of the sorting (default: 'asc').
+ *  - `$options['url']['page']` Page # to display.
+ *  - `$options['model']` The name of the model.
+ *  - `$options['escape']` Defines if the title field for the link should be escaped (default: true).
+ *  - `$options['update']` DOM id of the element updated with the results of the AJAX call.
+ *     If this key isn't specified Paginator will use plain HTML links.
+ *  - `$options['indicator']` DOM id of the element that will be shown when doing AJAX requests. **Only supported by
+ *     AjaxHelper**
+ *
+ * @var array
+ * @access public
+ */
+	var $options = array();
+
+/**
+ * Constructor for the helper. Sets up the helper that is used for creating 'AJAX' links.
+ *
+ * Use `var $helpers = array('Paginator' => array('ajax' => 'CustomHelper'));` to set a custom Helper
+ * or choose a non JsHelper Helper.  If you want to use a specific library with JsHelper declare JsHelper and its
+ * adapter before including PaginatorHelper in your helpers array.
+ *
+ * The chosen custom helper must implement a `link()` method.
+ *
+ * @return void
+ */
+	function __construct($config = array()) {
+		parent::__construct($config);
+		$ajaxProvider = isset($config['ajax']) ? $config['ajax'] : 'Js';
+		$this->helpers[] = $ajaxProvider;
+		$this->_ajaxHelperClass = $ajaxProvider;
+
+		App::import('Helper', $ajaxProvider);
+		$classname = $ajaxProvider . 'Helper';
+		if (!is_callable(array($classname, 'link'))) {
+			trigger_error(sprintf(__('%s does not implement a link() method, it is incompatible with PaginatorHelper', true), $classname), E_USER_WARNING);
+		}
+	}
+
+/**
+ * Before render callback. Overridden to merge passed args with url options.
+ *
+ * @return void
+ * @access public
+ */
+	function beforeRender() {
+		$this->options['url'] = array_merge($this->params['pass'], $this->params['named']);
+
+		parent::beforeRender();
+	}
+
+/**
+ * Gets the current paging parameters from the resultset for the given model
+ *
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @return array The array of paging parameters for the paginated resultset.
+ * @access public
+ */
+	function params($model = null) {
+		if (empty($model)) {
+			$model = $this->defaultModel();
+		}
+		if (!isset($this->params['paging']) || empty($this->params['paging'][$model])) {
+			return null;
+		}
+		return $this->params['paging'][$model];
+	}
+
+/**
+ * Sets default options for all pagination links
+ *
+ * @param mixed $options Default options for pagination links. If a string is supplied - it
+ *   is used as the DOM id element to update. See PaginatorHelper::$options for list of keys.
+ * @return void
+ * @access public
+ */
+	function options($options = array()) {
+		if (is_string($options)) {
+			$options = array('update' => $options);
+		}
+
+		if (!empty($options['paging'])) {
+			if (!isset($this->params['paging'])) {
+				$this->params['paging'] = array();
+			}
+			$this->params['paging'] = array_merge($this->params['paging'], $options['paging']);
+			unset($options['paging']);
+		}
+		$model = $this->defaultModel();
+
+		if (!empty($options[$model])) {
+			if (!isset($this->params['paging'][$model])) {
+				$this->params['paging'][$model] = array();
+			}
+			$this->params['paging'][$model] = array_merge(
+				$this->params['paging'][$model], $options[$model]
+			);
+			unset($options[$model]);
+		}
+		$this->options = array_filter(array_merge($this->options, $options));
+	}
+
+/**
+ * Gets the current page of the recordset for the given model
+ *
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @return string The current page number of the recordset.
+ * @access public
+ */
+	function current($model = null) {
+		$params = $this->params($model);
+
+		if (isset($params['page'])) {
+			return $params['page'];
+		}
+		return 1;
+	}
+
+/**
+ * Gets the current key by which the recordset is sorted
+ *
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param mixed $options Options for pagination links. See #options for list of keys.
+ * @return string The name of the key by which the recordset is being sorted, or
+ *  null if the results are not currently sorted.
+ * @access public
+ */
+	function sortKey($model = null, $options = array()) {
+		if (empty($options)) {
+			$params = $this->params($model);
+			$options = array_merge($params['defaults'], $params['options']);
+		}
+
+		if (isset($options['sort']) && !empty($options['sort'])) {
+			return $options['sort'];
+		} elseif (isset($options['order']) && is_array($options['order'])) {
+			return key($options['order']);
+		} elseif (isset($options['order']) && is_string($options['order'])) {
+			return $options['order'];
+		}
+		return null;
+	}
+
+/**
+ * Gets the current direction the recordset is sorted
+ *
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param mixed $options Options for pagination links. See #options for list of keys.
+ * @return string The direction by which the recordset is being sorted, or
+ *  null if the results are not currently sorted.
+ * @access public
+ */
+	function sortDir($model = null, $options = array()) {
+		$dir = null;
+
+		if (empty($options)) {
+			$params = $this->params($model);
+			$options = array_merge($params['defaults'], $params['options']);
+		}
+
+		if (isset($options['direction'])) {
+			$dir = strtolower($options['direction']);
+		} elseif (isset($options['order']) && is_array($options['order'])) {
+			$dir = strtolower(current($options['order']));
+		}
+
+		if ($dir == 'desc') {
+			return 'desc';
+		}
+		return 'asc';
+	}
+
+/**
+ * Generates a "previous" link for a set of paged records
+ *
+ * ### Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param  string $title Title for the link. Defaults to '<< Previous'.
+ * @param  mixed $options Options for pagination link. See #options for list of keys.
+ * @param  string $disabledTitle Title when the link is disabled.
+ * @param  mixed $disabledOptions Options for the disabled pagination link. See #options for list of keys.
+ * @return string A "previous" link or $disabledTitle text if the link is disabled.
+ * @access public
+ */
+	function prev($title = '<< Previous', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
+		return $this->__pagingLink('Prev', $title, $options, $disabledTitle, $disabledOptions);
+	}
+
+/**
+ * Generates a "next" link for a set of paged records
+ *
+ * ### Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param string $title Title for the link. Defaults to 'Next >>'.
+ * @param mixed $options Options for pagination link. See above for list of keys.
+ * @param string $disabledTitle Title when the link is disabled.
+ * @param mixed $disabledOptions Options for the disabled pagination link. See above for list of keys.
+ * @return string A "next" link or or $disabledTitle text if the link is disabled.
+ * @access public
+ */
+	function next($title = 'Next >>', $options = array(), $disabledTitle = null, $disabledOptions = array()) {
+		return $this->__pagingLink('Next', $title, $options, $disabledTitle, $disabledOptions);
+	}
+
+/**
+ * Generates a sorting link. Sets named parameters for the sort and direction.  Handles
+ * direction switching automatically.
+ *
+ * ### Options:
+ *
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param string $title Title for the link.
+ * @param string $key The name of the key that the recordset should be sorted.  If $key is null
+ *   $title will be used for the key, and a title will be generated by inflection.
+ * @param array $options Options for sorting link. See above for list of keys.
+ * @return string A link sorting default by 'asc'. If the resultset is sorted 'asc' by the specified
+ *  key the returned link will sort by 'desc'.
+ * @access public
+ */
+	function sort($title, $key = null, $options = array()) {
+		$options = array_merge(array('url' => array(), 'model' => null), $options);
+		$url = $options['url'];
+		unset($options['url']);
+
+		if (empty($key)) {
+			$key = $title;
+			$title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)), true);
+		}
+		$dir = isset($options['direction']) ? $options['direction'] : 'asc';
+		unset($options['direction']);
+
+		$sortKey = $this->sortKey($options['model']);
+		$defaultModel = $this->defaultModel();
+		$isSorted = (
+			$sortKey === $key || 
+			$sortKey === $defaultModel . '.' . $key ||
+			$key === $defaultModel . '.' . $sortKey
+		);
+
+		if ($isSorted) {
+			$dir = $this->sortDir($options['model']) === 'asc' ? 'desc' : 'asc';
+			$class = $dir === 'asc' ? 'desc' : 'asc';
+			if (!empty($options['class'])) {
+				$options['class'] .= ' ' . $class;
+			} else {
+				$options['class'] = $class;
+			}
+		}
+		if (is_array($title) && array_key_exists($dir, $title)) {
+			$title = $title[$dir];
+		}
+
+		$url = array_merge(array('sort' => $key, 'direction' => $dir), $url, array('order' => null));
+		return $this->link($title, $url, $options);
+	}
+
+/**
+ * Generates a plain or Ajax link with pagination parameters
+ *
+ * ### Options
+ *
+ * - `update` The Id of the DOM element you wish to update.  Creates Ajax enabled links
+ *    with the AjaxHelper.
+ * - `escape` Whether you want the contents html entity encoded, defaults to true
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel()
+ *
+ * @param string $title Title for the link.
+ * @param mixed $url Url for the action. See Router::url()
+ * @param array $options Options for the link. See #options for list of keys.
+ * @return string A link with pagination parameters.
+ * @access public
+ */
+	function link($title, $url = array(), $options = array()) {
+		$options = array_merge(array('model' => null, 'escape' => true), $options);
+		$model = $options['model'];
+		unset($options['model']);
+
+		if (!empty($this->options)) {
+			$options = array_merge($this->options, $options);
+		}
+		if (isset($options['url'])) {
+			$url = array_merge((array)$options['url'], (array)$url);
+			unset($options['url']);
+		}
+		$url = $this->url($url, true, $model);
+
+		$obj = isset($options['update']) ? $this->_ajaxHelperClass : 'Html';
+		$url = array_merge(array('page' => $this->current($model)), $url);
+		$url = array_merge(Set::filter($url, true), array_intersect_key($url, array('plugin' => true)));
+		return $this->{$obj}->link($title, $url, $options);
+	}
+
+/**
+ * Merges passed URL options with current pagination state to generate a pagination URL.
+ *
+ * @param array $options Pagination/URL options array
+ * @param boolean $asArray Return the url as an array, or a URI string
+ * @param string $model Which model to paginate on
+ * @return mixed By default, returns a full pagination URL string for use in non-standard contexts (i.e. JavaScript)
+ * @access public
+ */
+	function url($options = array(), $asArray = false, $model = null) {
+		$paging = $this->params($model);
+		$url = array_merge(array_filter(Set::diff(array_merge(
+			$paging['defaults'], $paging['options']), $paging['defaults'])), $options
+		);
+
+		if (isset($url['order'])) {
+			$sort = $direction = null;
+			if (is_array($url['order'])) {
+				list($sort, $direction) = array($this->sortKey($model, $url), current($url['order']));
+			}
+			unset($url['order']);
+			$url = array_merge($url, compact('sort', 'direction'));
+		}
+
+		if ($asArray) {
+			return $url;
+		}
+		return parent::url($url);
+	}
+
+/**
+ * Protected method for generating prev/next links
+ *
+ * @access protected
+ */
+	function __pagingLink($which, $title = null, $options = array(), $disabledTitle = null, $disabledOptions = array()) {
+		$check = 'has' . $which;
+		$_defaults = array(
+			'url' => array(), 'step' => 1, 'escape' => true,
+			'model' => null, 'tag' => 'span', 'class' => strtolower($which)
+		);
+		$options = array_merge($_defaults, (array)$options);
+		$paging = $this->params($options['model']);
+		if (empty($disabledOptions)) {
+			$disabledOptions = $options;
+		}
+
+		if (!$this->{$check}($options['model']) && (!empty($disabledTitle) || !empty($disabledOptions))) {
+			if (!empty($disabledTitle) && $disabledTitle !== true) {
+				$title = $disabledTitle;
+			}
+			$options = array_merge($_defaults, (array)$disabledOptions);
+		} elseif (!$this->{$check}($options['model'])) {
+			return null;
+		}
+
+		foreach (array_keys($_defaults) as $key) {
+			${$key} = $options[$key];
+			unset($options[$key]);
+		}
+		$url = array_merge(array('page' => $paging['page'] + ($which == 'Prev' ? $step * -1 : $step)), $url);
+
+		if ($this->{$check}($model)) {
+			return $this->Html->tag($tag, $this->link($title, $url, array_merge($options, compact('escape', 'class'))));
+		} else {
+			return $this->Html->tag($tag, $title, array_merge($options, compact('escape', 'class')));
+		}
+	}
+
+/**
+ * Returns true if the given result set is not at the first page
+ *
+ * @param string $model Optional model name. Uses the default if none is specified.
+ * @return boolean True if the result set is not at the first page.
+ * @access public
+ */
+	function hasPrev($model = null) {
+		return $this->__hasPage($model, 'prev');
+	}
+
+/**
+ * Returns true if the given result set is not at the last page
+ *
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @return boolean True if the result set is not at the last page.
+ * @access public
+ */
+	function hasNext($model = null) {
+		return $this->__hasPage($model, 'next');
+	}
+
+/**
+ * Returns true if the given result set has the page number given by $page
+ *
+ * @param string $model Optional model name.  Uses the default if none is specified.
+ * @param int $page The page number - if not set defaults to 1.
+ * @return boolean True if the given result set has the specified page number.
+ * @access public
+ */
+	function hasPage($model = null, $page = 1) {
+		if (is_numeric($model)) {
+			$page = $model;
+			$model = null;
+		}
+		$paging = $this->params($model);
+		return $page <= $paging['pageCount'];
+	}
+
+/**
+ * Does $model have $page in its range?
+ *
+ * @param string $model Model name to get parameters for.
+ * @param integer $page Page number you are checking.
+ * @return boolean Whether model has $page
+ * @access protected
+ */
+	function __hasPage($model, $page) {
+		$params = $this->params($model);
+		if (!empty($params)) {
+			if ($params["{$page}Page"] == true) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+/**
+ * Gets the default model of the paged sets
+ *
+ * @return string Model name or null if the pagination isn't initialized.
+ * @access public
+ */
+	function defaultModel() {
+		if ($this->__defaultModel != null) {
+			return $this->__defaultModel;
+		}
+		if (empty($this->params['paging'])) {
+			return null;
+		}
+		list($this->__defaultModel) = array_keys($this->params['paging']);
+		return $this->__defaultModel;
+	}
+
+/**
+ * Returns a counter string for the paged result set
+ *
+ * ### Options
+ *
+ * - `model` The model to use, defaults to PaginatorHelper::defaultModel();
+ * - `format` The format string you want to use, defaults to 'pages' Which generates output like '1 of 5'
+ *    set to 'range' to generate output like '1 - 3 of 13'.  Can also be set to a custom string, containing
+ *    the following placeholders `%page%`, `%pages%`, `%current%`, `%count%`, `%start%`, `%end%` and any
+ *    custom content you would like.
+ * - `separator` The separator string to use, default to ' of '
+ *
+ * @param mixed $options Options for the counter string. See #options for list of keys.
+ * @return string Counter string.
+ * @access public
+ */
+	function counter($options = array()) {
+		if (is_string($options)) {
+			$options = array('format' => $options);
+		}
+
+		$options = array_merge(
+			array(
+				'model' => $this->defaultModel(),
+				'format' => 'pages',
+				'separator' => __(' of ', true)
+			),
+		$options);
+
+		$paging = $this->params($options['model']);
+//		var_dump($paging['count']);
+		if ($paging['pageCount'] == 0) {
+			$paging['pageCount'] = 1;
+		}
+		$start = 0;
+		if ($paging['count'] >= 1) {
+			$start = (($paging['page'] - 1) * $paging['options']['limit']) + 1;
+		}
+		$end = $start + $paging['options']['limit'] - 1;
+
+		if ($paging['count'] < $end) {
+			$end = $paging['count'];
+		}
+
+		switch ($options['format']) {
+			case 'range':
+				if (!is_array($options['separator'])) {
+					$options['separator'] = array(' - ', $options['separator']);
+				}
+				$out = $start . $options['separator'][0] . $end . $options['separator'][1];
+				$out .= $paging['count'];
+			break;
+			case 'pages':
+				$out = $paging['page'] . $options['separator'] . $paging['pageCount'];
+			break;
+			default:
+				$map = array(
+					'%page%' => $paging['page'],
+					'%pages%' => $paging['pageCount'],
+					'%current%' => $paging['current'],
+					'%count%' => $paging['count'],
+					'%start%' => $start,
+					'%end%' => $end
+				);
+				$out = str_replace(array_keys($map), array_values($map), $options['format']);
+
+				$newKeys = array(
+					'{:page}', '{:pages}', '{:current}', '{:count}', '{:start}', '{:end}'
+				);
+				$out = str_replace($newKeys, array_values($map), $out);
+			break;
+		}
+		return $out;
+	}
+
+/**
+ * Returns a set of numbers for the paged result set
+ * uses a modulus to decide how many numbers to show on each side of the current page (default: 8)
+ *
+ * ### Options
+ *
+ * - `before` Content to be inserted before the numbers
+ * - `after` Content to be inserted after the numbers
+ * - `model` Model to create numbers for, defaults to PaginatorHelper::defaultModel()
+ * - `modulus` how many numbers to include on either side of the current page, defaults to 8.
+ * - `separator` Separator content defaults to ' | '
+ * - `tag` The tag to wrap links in, defaults to 'span'
+ * - `first` Whether you want first links generated, set to an integer to define the number of 'first'
+ *    links to generate
+ * - `last` Whether you want last links generated, set to an integer to define the number of 'last'
+ *    links to generate
+ *
+ * @param mixed $options Options for the numbers, (before, after, model, modulus, separator)
+ * @return string numbers string.
+ * @access public
+ */
+	function numbers($options = array()) {
+		if ($options === true) {
+			$options = array(
+				'before' => ' | ', 'after' => ' | ', 'first' => 'first', 'last' => 'last'
+			);
+		}
+
+		$defaults = array(
+			'tag' => 'span', 'before' => null, 'after' => null, 'model' => $this->defaultModel(),
+			'modulus' => '8', 'separator' => ' | ', 'first' => null, 'last' => null,
+		);
+		$options += $defaults;
+
+		$params = (array)$this->params($options['model']) + array('page'=> 1);
+		unset($options['model']);
+
+		if ($params['pageCount'] <= 1) {
+			return false;
+		}
+
+		extract($options);
+		unset($options['tag'], $options['before'], $options['after'], $options['model'],
+			$options['modulus'], $options['separator'], $options['first'], $options['last']);
+
+		$out = '';
+
+		if ($modulus && $params['pageCount'] > $modulus) {
+			$half = intval($modulus / 2);
+			$end = $params['page'] + $half;
+
+			if ($end > $params['pageCount']) {
+				$end = $params['pageCount'];
+			}
+			$start = $params['page'] - ($modulus - ($end - $params['page']));
+			if ($start <= 1) {
+				$start = 1;
+				$end = $params['page'] + ($modulus  - $params['page']) + 1;
+			}
+
+			if ($first && $start > 1) {
+				$offset = ($start <= (int)$first) ? $start - 1 : $first;
+				if ($offset < $start - 1) {
+					$out .= $this->first($offset, array('tag' => $tag, 'separator' => $separator));
+				} else {
+					$out .= $this->first($offset, array('tag' => $tag, 'after' => $separator, 'separator' => $separator));
+				}
+			}
+
+			$out .= $before;
+
+			for ($i = $start; $i < $params['page']; $i++) {
+				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options))
+					. $separator;
+			}
+
+			$out .= $this->Html->tag($tag, $params['page'], array('class' => 'current'));
+			if ($i != $params['pageCount']) {
+				$out .= $separator;
+			}
+
+			$start = $params['page'] + 1;
+			for ($i = $start; $i < $end; $i++) {
+				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options))
+					. $separator;
+			}
+
+			if ($end != $params['page']) {
+				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $end), $options));
+			}
+
+			$out .= $after;
+
+			if ($last && $end < $params['pageCount']) {
+				$offset = ($params['pageCount'] < $end + (int)$last) ? $params['pageCount'] - $end : $last;
+				if ($offset <= $last && $params['pageCount'] - $end > $offset) {
+					$out .= $this->last($offset, array('tag' => $tag, 'separator' => $separator));
+				} else {
+					$out .= $this->last($offset, array('tag' => $tag, 'before' => $separator, 'separator' => $separator));
+				}
+			}
+
+		} else {
+			$out .= $before;
+
+			for ($i = 1; $i <= $params['pageCount']; $i++) {
+				if ($i == $params['page']) {
+					$out .= $this->Html->tag($tag, $i, array('class' => 'current'));
+				} else {
+					$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options));
+				}
+				if ($i != $params['pageCount']) {
+					$out .= $separator;
+				}
+			}
+
+			$out .= $after;
+		}
+
+		return $out;
+	}
+
+/**
+ * Returns a first or set of numbers for the first pages
+ *
+ * ### Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `after` Content to insert after the link/tag
+ * - `model` The model to use defaults to PaginatorHelper::defaultModel()
+ * - `separator` Content between the generated links, defaults to ' | '
+ *
+ * @param mixed $first if string use as label for the link, if numeric print page numbers
+ * @param mixed $options
+ * @return string numbers string.
+ * @access public
+ */
+	function first($first = '<< first', $options = array()) {
+		$options = array_merge(
+			array(
+				'tag' => 'span',
+				'after'=> null,
+				'model' => $this->defaultModel(),
+				'separator' => ' | ',
+			),
+		(array)$options);
+
+		$params = array_merge(array('page'=> 1), (array)$this->params($options['model']));
+		unset($options['model']);
+
+		if ($params['pageCount'] <= 1) {
+			return false;
+		}
+		extract($options);
+		unset($options['tag'], $options['after'], $options['model'], $options['separator']);
+
+		$out = '';
+
+		if (is_int($first) && $params['page'] > $first) {
+			if ($after === null) {
+				$after = '...';
+			}
+			for ($i = 1; $i <= $first; $i++) {
+				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options));
+				if ($i != $first) {
+					$out .= $separator;
+				}
+			}
+			$out .= $after;
+		} elseif ($params['page'] > 1) {
+			$out = $this->Html->tag($tag, $this->link($first, array('page' => 1), $options))
+				. $after;
+		}
+		return $out;
+	}
+
+/**
+ * Returns a last or set of numbers for the last pages
+ *
+ * ### Options:
+ *
+ * - `tag` The tag wrapping tag you want to use, defaults to 'span'
+ * - `before` Content to insert before the link/tag
+ * - `model` The model to use defaults to PaginatorHelper::defaultModel()
+ * - `separator` Content between the generated links, defaults to ' | '
+ *
+ * @param mixed $last if string use as label for the link, if numeric print page numbers
+ * @param mixed $options Array of options
+ * @return string numbers string.
+ * @access public
+ */
+	function last($last = 'last >>', $options = array()) {
+		$options = array_merge(
+			array(
+				'tag' => 'span',
+				'before'=> null,
+				'model' => $this->defaultModel(),
+				'separator' => ' | ',
+			),
+		(array)$options);
+
+		$params = array_merge(array('page'=> 1), (array)$this->params($options['model']));
+		unset($options['model']);
+
+		if ($params['pageCount'] <= 1) {
+			return false;
+		}
+
+		extract($options);
+		unset($options['tag'], $options['before'], $options['model'], $options['separator']);
+
+		$out = '';
+		$lower = $params['pageCount'] - $last + 1;
+
+		if (is_int($last) && $params['page'] < $lower) {
+			if ($before === null) {
+				$before = '...';
+			}
+			for ($i = $lower; $i <= $params['pageCount']; $i++) {
+				$out .= $this->Html->tag($tag, $this->link($i, array('page' => $i), $options));
+				if ($i != $params['pageCount']) {
+					$out .= $separator;
+				}
+			}
+			$out = $before . $out;
+		} elseif ($params['page'] < $params['pageCount']) {
+			$out = $before . $this->Html->tag(
+				$tag, $this->link($last, array('page' => $params['pageCount']), $options
+			));
+		}
+		return $out;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/prototype_engine.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/prototype_engine.php
new file mode 100644
index 000000000..7d49ae07e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/prototype_engine.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * Prototype Engine Helper for JsHelper
+ *
+ * Provides Prototype specific Javascript for JsHelper. Requires at least
+ * Prototype 1.6
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.libs.view.helpers
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', 'Js');
+
+class PrototypeEngineHelper extends JsBaseEngineHelper {
+/**
+ * Is the current selection a multiple selection? or is it just a single element.
+ *
+ * @var boolean
+ */
+	var $_multiple = false;
+
+/**
+ * Option mappings for Prototype
+ *
+ * @var array
+ */
+	var $_optionMap = array(
+		'request' => array(
+			'async' => 'asynchronous',
+			'data' => 'parameters',
+			'before' => 'onCreate',
+			'success' => 'onSuccess',
+			'complete' => 'onComplete',
+			'error' => 'onFailure'
+		),
+		'sortable' => array(
+			'sort' => 'onChange',
+			'complete' => 'onUpdate',
+		),
+		'drag' => array(
+			'snapGrid' => 'snap',
+			'container' => 'constraint',
+			'stop' => 'onEnd',
+			'start' => 'onStart',
+			'drag' => 'onDrag',
+		),
+		'drop' => array(
+			'hover' => 'onHover',
+			'drop' => 'onDrop',
+			'hoverClass' => 'hoverclass',
+		),
+		'slider' => array(
+			'direction' => 'axis',
+			'change' => 'onSlide',
+			'complete' => 'onChange',
+			'value' => 'sliderValue',
+		)
+	);
+
+/**
+ * Contains a list of callback names -> default arguments.
+ *
+ * @var array
+ */
+	var $_callbackArguments = array(
+		'slider' => array(
+			'onSlide' => 'value',
+			'onChange' => 'value',
+		),
+		'drag' => array(
+			'onStart' => 'event',
+			'onDrag' => 'event',
+			'change' => 'draggable',
+			'onEnd' => 'event',
+		),
+		'drop' => array(
+			'onHover' => 'draggable, droppable, event',
+			'onDrop' => 'draggable, droppable, event',
+		),
+		'request' => array(
+			'onCreate' => 'transport',
+			'onComplete' => 'transport',
+			'onFailure' => 'response, jsonHeader',
+			'onRequest' => 'transport',
+			'onSuccess' => 'response, jsonHeader'
+		),
+		'sortable' => array(
+			'onStart' => 'element',
+			'onChange' => 'element',
+			'onUpdate' => 'element',
+		),
+	);
+
+/**
+ * Create javascript selector for a CSS rule
+ *
+ * @param string $selector The selector that is targeted
+ * @return object instance of $this. Allows chained methods.
+ */
+	function get($selector) {
+		$this->_multiple = false;
+		if ($selector == 'window' || $selector == 'document') {
+			$this->selection = "$(" . $selector .")";
+			return $this;
+		}
+		if (preg_match('/^#[^\s.]+$/', $selector)) {
+			$this->selection = '$("' . substr($selector, 1) . '")';
+			return $this;
+		}
+		$this->_multiple = true;
+		$this->selection = '$$("' . $selector . '")';
+		return $this;
+	}
+
+/**
+ * Add an event to the script cache. Operates on the currently selected elements.
+ *
+ * ### Options
+ *
+ * - `wrap` - Whether you want the callback wrapped in an anonymous function. (defaults true)
+ * - `stop` - Whether you want the event to stopped. (defaults true)
+ *
+ * @param string $type Type of event to bind to the current 946 id
+ * @param string $callback The Javascript function you wish to trigger or the function literal
+ * @param array $options Options for the event.
+ * @return string completed event handler
+ */
+	function event($type, $callback, $options = array()) {
+		$defaults = array('wrap' => true, 'stop' => true);
+		$options = array_merge($defaults, $options);
+
+		$function = 'function (event) {%s}';
+		if ($options['wrap'] && $options['stop']) {
+			$callback = "event.stop();\n" . $callback;
+		}
+		if ($options['wrap']) {
+			$callback = sprintf($function, $callback);
+		}
+		$out = $this->selection . ".observe(\"{$type}\", $callback);";
+		return $out;
+	}
+
+/**
+ * Create a domReady event. This is a special event in many libraries
+ *
+ * @param string $functionBody The code to run on domReady
+ * @return string completed domReady method
+ * @access public
+ */
+	function domReady($functionBody) {
+		$this->selection = 'document';
+		return $this->event('dom:loaded', $functionBody, array('stop' => false));
+	}
+
+/**
+ * Create an iteration over the current selection result.
+ *
+ * @param string $method The method you want to apply to the selection
+ * @param string $callback The function body you wish to apply during the iteration.
+ * @return string completed iteration
+ * @access public
+ */
+	function each($callback) {
+		return $this->selection . '.each(function (item, index) {' . $callback . '});';
+	}
+
+/**
+ * Trigger an Effect.
+ *
+ * ### Note: Effects require Scriptaculous to be loaded.
+ *
+ * @param string $name The name of the effect to trigger.
+ * @param array $options Array of options for the effect.
+ * @return string completed string with effect.
+ * @access public
+ * @see JsBaseEngineHelper::effect()
+ */
+	function effect($name, $options = array()) {
+		$effect = '';
+		$optionString = null;
+		if (isset($options['speed'])) {
+			if ($options['speed'] == 'fast') {
+				$options['duration'] = 0.5;
+			} elseif ($options['speed'] == 'slow') {
+				$options['duration'] = 2;
+			} else {
+				$options['duration'] = 1;
+			}
+			unset($options['speed']);
+		}
+		if (!empty($options)) {
+			$optionString = ', {' . $this->_parseOptions($options) . '}';
+		}
+		switch ($name) {
+			case 'hide':
+			case 'show':
+				$effect = $this->selection . '.' . $name . '();';
+			break;
+			case 'slideIn':
+			case 'slideOut':
+				$name = ($name == 'slideIn') ? 'slideDown' : 'slideUp';
+				$effect = 'Effect.' . $name . '(' . $this->selection . $optionString . ');';
+			break;
+			case 'fadeIn':
+			case 'fadeOut':
+				$name = ($name == 'fadeIn') ? 'appear' : 'fade';
+				$effect = $this->selection . '.' . $name .'(' . substr($optionString, 2) . ');';
+			break;
+		}
+		return $effect;
+	}
+
+/**
+ * Create an Ajax or Ajax.Updater call.
+ *
+ * @param mixed $url
+ * @param array $options
+ * @return string The completed ajax call.
+ * @access public
+ */
+	function request($url, $options = array()) {
+		$url = '"'. $this->url($url) . '"';
+		$options = $this->_mapOptions('request', $options);
+		$type = '.Request';
+		$data = null;
+		if (isset($options['type']) && strtolower($options['type']) == 'json') {
+			unset($options['type']);
+		}
+		if (isset($options['update'])) {
+			$url = '"' . str_replace('#', '', $options['update']) . '", ' . $url;
+			$type = '.Updater';
+			unset($options['update'], $options['type']);
+		}
+		$safe = array_keys($this->_callbackArguments['request']);
+		$options = $this->_prepareCallbacks('request', $options, $safe);
+		if (!empty($options['dataExpression'])) {
+			$safe[] = 'parameters';
+			unset($options['dataExpression']);
+		}
+		$options = $this->_parseOptions($options, $safe);
+		if (!empty($options)) {
+			$options = ', {' . $options . '}';
+		}
+		return "var jsRequest = new Ajax$type($url$options);";
+	}
+
+/**
+ * Create a sortable element.
+ *
+ * #### Note: Requires scriptaculous to be loaded.
+ *
+ * The scriptaculous implementation of sortables does not suppot the 'start'
+ * and 'distance' options.
+ *
+ * @param array $options Array of options for the sortable.
+ * @return string Completed sortable script.
+ * @access public
+ * @see JsBaseEngineHelper::sortable() for options list.
+ */
+	function sortable($options = array()) {
+		$options = $this->_processOptions('sortable', $options);
+		if (!empty($options)) {
+			$options = ', {' . $options . '}';
+		}
+		return 'var jsSortable = Sortable.create(' . $this->selection . $options . ');';
+	}
+
+/**
+ * Create a Draggable element.
+ *
+ * #### Note: Requires scriptaculous to be loaded.
+ *
+ * @param array $options Array of options for the draggable.
+ * @return string Completed draggable script.
+ * @access public
+ * @see JsBaseEngineHelper::draggable() for options list.
+ */
+	function drag($options = array()) {
+		$options = $this->_processOptions('drag', $options);
+		if (!empty($options)) {
+			$options = ', {' . $options . '}';
+		}
+		if ($this->_multiple) {
+			return $this->each('new Draggable(item' . $options . ');');
+		}
+		return 'var jsDrag = new Draggable(' . $this->selection . $options . ');';
+	}
+
+/**
+ * Create a Droppable element.
+ *
+ * #### Note: Requires scriptaculous to be loaded.
+ *
+ * @param array $options Array of options for the droppable.
+ * @return string Completed droppable script.
+ * @access public
+ * @see JsBaseEngineHelper::droppable() for options list.
+ */
+	function drop($options = array()) {
+		$options = $this->_processOptions('drop', $options);
+		if (!empty($options)) {
+			$options = ', {' . $options . '}';
+		}
+		return 'Droppables.add(' . $this->selection . $options . ');';
+	}
+
+/**
+ * Creates a slider control widget.
+ *
+ * ### Note: Requires scriptaculous to be loaded.
+ *
+ * @param array $options Array of options for the slider.
+ * @return string Completed slider script.
+ * @access public
+ * @see JsBaseEngineHelper::slider() for options list.
+ */
+	function slider($options = array()) {
+		$slider = $this->selection;
+		$this->get($options['handle']);
+		unset($options['handle']);
+
+		if (isset($options['min']) && isset($options['max'])) {
+			$options['range'] = sprintf('$R(%s,%s)', $options['min'], $options['max']);
+			unset($options['min'], $options['max']);
+		}
+		$options = $this->_mapOptions('slider', $options);
+		$options = $this->_prepareCallbacks('slider', $options);
+		$optionString = $this->_parseOptions(
+			$options, array_merge(array_keys($this->_callbackArguments['slider']), array('range'))
+		);
+		if (!empty($optionString)) {
+			$optionString = ', {' . $optionString . '}';
+		}
+		$out = 'var jsSlider = new Control.Slider(' . $this->selection . ', ' . $slider . $optionString . ');';
+		$this->selection = $slider;
+		return $out;
+	}
+
+/**
+ * Serialize the form attached to $selector.
+ *
+ * @param array $options Array of options.
+ * @return string Completed serializeForm() snippet
+ * @access public
+ * @see JsBaseEngineHelper::serializeForm()
+ */
+	function serializeForm($options = array()) {
+		$options = array_merge(array('isForm' => false, 'inline' => false), $options);
+		$selection = $this->selection;
+		if (!$options['isForm']) {
+			$selection = '$(' . $this->selection . '.form)';
+		}
+		$method = '.serialize()';
+		if (!$options['inline']) {
+			$method .= ';';
+		}
+		return $selection . $method;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/rss.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/rss.php
new file mode 100644
index 000000000..e4dc78a3d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/rss.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * RSS Helper class file.
+ *
+ * Simplifies the output of RSS feeds.
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', 'Xml');
+
+/**
+ * XML Helper class for easy output of XML structures.
+ *
+ * XmlHelper encloses all methods needed while working with XML documents.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1460/RSS
+ */
+class RssHelper extends XmlHelper {
+
+/**
+ * Helpers used by RSS Helper
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Time');
+
+/**
+ * Base URL
+ *
+ * @access public
+ * @var string
+ */
+	var $base = null;
+
+/**
+ * URL to current action.
+ *
+ * @access public
+ * @var string
+ */
+	var $here = null;
+
+/**
+ * Parameter array.
+ *
+ * @access public
+ * @var array
+ */
+	var $params = array();
+
+/**
+ * Current action.
+ *
+ * @access public
+ * @var string
+ */
+	var $action = null;
+
+/**
+ * POSTed model data
+ *
+ * @access public
+ * @var array
+ */
+	var $data = null;
+
+/**
+ * Name of the current model
+ *
+ * @access public
+ * @var string
+ */
+	var $model = null;
+
+/**
+ * Name of the current field
+ *
+ * @access public
+ * @var string
+ */
+	var $field = null;
+
+/**
+ * Default spec version of generated RSS
+ *
+ * @access public
+ * @var string
+ */
+	var $version = '2.0';
+
+/**
+ * Returns an RSS document wrapped in `<rss />` tags
+ *
+ * @param array $attrib `<rss />` tag attributes
+ * @return string An RSS document
+ * @access public
+ */
+	function document($attrib = array(), $content = null) {
+		if ($content === null) {
+			$content = $attrib;
+			$attrib = array();
+		}
+		if (!isset($attrib['version']) || empty($attrib['version'])) {
+			$attrib['version'] = $this->version;
+		}
+
+		return $this->elem('rss', $attrib, $content);
+	}
+
+/**
+ * Returns an RSS `<channel />` element
+ *
+ * @param array $attrib `<channel />` tag attributes
+ * @param mixed $elements Named array elements which are converted to tags
+ * @param mixed $content Content (`<item />`'s belonging to this channel
+ * @return string An RSS `<channel />`
+ * @access public
+ */
+	function channel($attrib = array(), $elements = array(), $content = null) {
+		$view =& ClassRegistry::getObject('view');
+
+		if (!isset($elements['title']) && !empty($view->pageTitle)) {
+			$elements['title'] = $view->pageTitle;
+		}
+		if (!isset($elements['link'])) {
+			$elements['link'] = '/';
+		}
+		if (!isset($elements['description'])) {
+			$elements['description'] = '';
+		}
+		$elements['link'] = $this->url($elements['link'], true);
+
+		$elems = '';
+		foreach ($elements as $elem => $data) {
+			$attributes = array();
+			if (is_array($data)) {
+				if (strtolower($elem) == 'cloud') {
+					$attributes = $data;
+					$data = array();
+				} elseif (isset($data['attrib']) && is_array($data['attrib'])) {
+					$attributes = $data['attrib'];
+					unset($data['attrib']);
+				} else {
+					$innerElements = '';
+					foreach ($data as $subElement => $value) {
+						$innerElements .= $this->elem($subElement, array(), $value);
+					}
+					$data = $innerElements;
+				}
+			}
+			$elems .= $this->elem($elem, $attributes, $data);
+		}
+		return $this->elem('channel', $attrib, $elems . $content, !($content === null));
+	}
+
+/**
+ * Transforms an array of data using an optional callback, and maps it to a set
+ * of `<item />` tags
+ *
+ * @param array $items The list of items to be mapped
+ * @param mixed $callback A string function name, or array containing an object
+ *     and a string method name
+ * @return string A set of RSS `<item />` elements
+ * @access public
+ */
+	function items($items, $callback = null) {
+		if ($callback != null) {
+			$items = array_map($callback, $items);
+		}
+
+		$out = '';
+		$c = count($items);
+
+		for ($i = 0; $i < $c; $i++) {
+			$out .= $this->item(array(), $items[$i]);
+		}
+		return $out;
+	}
+
+/**
+ * Converts an array into an `<item />` element and its contents
+ *
+ * @param array $attrib The attributes of the `<item />` element
+ * @param array $elements The list of elements contained in this `<item />`
+ * @return string An RSS `<item />` element
+ * @access public
+ */
+	function item($att = array(), $elements = array()) {
+		$content = null;
+
+		if (isset($elements['link']) && !isset($elements['guid'])) {
+			$elements['guid'] = $elements['link'];
+		}
+
+		foreach ($elements as $key => $val) {
+			$attrib = array();
+			
+			$escape = true;
+			if (is_array($val) && isset($val['convertEntities'])) {
+				$escape = $val['convertEntities'];
+				unset($val['convertEntities']);
+			}
+			
+			switch ($key) {
+				case 'pubDate' :
+					$val = $this->time($val);
+				break;
+				case 'category' :
+					if (is_array($val) && !empty($val[0])) {
+						foreach ($val as $category) {
+							$attrib = array();
+							if (isset($category['domain'])) {
+								$attrib['domain'] = $category['domain'];
+								unset($category['domain']);
+							}
+							$categories[] = $this->elem($key, $attrib, $category);
+						}
+						$elements[$key] = implode('', $categories);
+						continue 2;
+					} else if (is_array($val) && isset($val['domain'])) {
+						$attrib['domain'] = $val['domain'];
+					}
+				break;
+				case 'link':
+				case 'guid':
+				case 'comments':
+					if (is_array($val) && isset($val['url'])) {
+						$attrib = $val;
+						unset($attrib['url']);
+						$val = $val['url'];
+					}
+					$val = $this->url($val, true);
+				break;
+				case 'source':
+					if (is_array($val) && isset($val['url'])) {
+						$attrib['url'] = $this->url($val['url'], true);
+						$val = $val['title'];
+					} elseif (is_array($val)) {
+						$attrib['url'] = $this->url($val[0], true);
+						$val = $val[1];
+					}
+				break;
+				case 'enclosure':
+					if (is_string($val['url']) && is_file(WWW_ROOT . $val['url']) && file_exists(WWW_ROOT . $val['url'])) {
+						if (!isset($val['length']) && strpos($val['url'], '://') === false) {
+							$val['length'] = sprintf("%u", filesize(WWW_ROOT . $val['url']));
+						}
+						if (!isset($val['type']) && function_exists('mime_content_type')) {
+							$val['type'] = mime_content_type(WWW_ROOT . $val['url']);
+						}
+					}
+					$val['url'] = $this->url($val['url'], true);
+					$attrib = $val;
+					$val = null;
+				break;
+			}
+			if (!is_null($val) && $escape) {
+				$val = h($val);
+			}
+			$elements[$key] = $this->elem($key, $attrib, $val);
+		}
+		if (!empty($elements)) {
+			$content = implode('', $elements);
+		}
+		return $this->elem('item', $att, $content, !($content === null));
+	}
+
+/**
+ * Converts a time in any format to an RSS time
+ *
+ * @param mixed $time
+ * @return string An RSS-formatted timestamp
+ * @see TimeHelper::toRSS
+ */
+	function time($time) {
+		return $this->Time->toRSS($time);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/session.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/session.php
new file mode 100644
index 000000000..4db0cc205
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/session.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * Session Helper provides access to the Session in the Views.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 1.1.7.3328
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('cakesession')) {
+	require LIBS . 'cake_session.php';
+}
+/**
+ * Session Helper.
+ *
+ * Session reading from the view.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1465/Session
+ */
+class SessionHelper extends CakeSession {
+
+/**
+ * List of helpers used by this helper
+ *
+ * @var array
+ */
+	var $helpers = array();
+
+/**
+ * Used to determine if methods implementation is used, or bypassed
+ *
+ * @var boolean
+ */
+	var $__active = true;
+
+/**
+ * Class constructor
+ *
+ * @param string $base
+ */
+	function __construct($base = null) {
+		if (Configure::read('Session.start') === true) {
+			parent::__construct($base, false);
+			$this->start();
+			$this->__active = true;
+		} else {
+			$this->__active = false;
+		}
+	}
+
+/**
+ * Turn sessions on if 'Session.start' is set to false in core.php
+ *
+ * @param string $base
+ * @access public
+ */
+	function activate($base = null) {
+		$this->__active = true;
+	}
+
+/**
+ * Used to read a session values set in a controller for a key or return values for all keys.
+ *
+ * In your view: `$session->read('Controller.sessKey');`
+ * Calling the method without a param will return all session vars
+ *
+ * @param string $name the name of the session key you want to read
+ * @return values from the session vars
+ * @access public
+ * @link http://book.cakephp.org/view/1466/Methods
+ */
+	function read($name = null) {
+		if ($this->__active === true && $this->__start()) {
+			return parent::read($name);
+		}
+		return false;
+	}
+
+/**
+ * Used to check is a session key has been set
+ *
+ * In your view: `$session->check('Controller.sessKey');`
+ *
+ * @param string $name
+ * @return boolean
+ * @access public
+ * @link http://book.cakephp.org/view/1466/Methods
+ */
+	function check($name) {
+		if ($this->__active === true && $this->__start()) {
+			return parent::check($name);
+		}
+		return false;
+	}
+
+/**
+ * Returns last error encountered in a session
+ *
+ * In your view: `$session->error();`
+ *
+ * @return string last error
+ * @access public
+ * @link http://book.cakephp.org/view/1466/Methods
+ */
+	function error() {
+		if ($this->__active === true && $this->__start()) {
+			return parent::error();
+		}
+		return false;
+	}
+
+/**
+ * Used to render the message set in Controller::Session::setFlash()
+ *
+ * In your view: $session->flash('somekey');
+ * Will default to flash if no param is passed
+ *
+ * @param string $key The [Message.]key you are rendering in the view.
+ * @return boolean|string Will return the value if $key is set, or false if not set.
+ * @access public
+ * @link http://book.cakephp.org/view/1466/Methods
+ * @link http://book.cakephp.org/view/1467/flash
+ */
+	function flash($key = 'flash') {
+		$out = false;
+
+		if ($this->__active === true && $this->__start()) {
+			if (parent::check('Message.' . $key)) {
+				$flash = parent::read('Message.' . $key);
+
+				if ($flash['element'] == 'default') {
+					if (!empty($flash['params']['class'])) {
+						$class = $flash['params']['class'];
+					} else {
+						$class = 'message';
+					}
+					$out = '<div id="' . $key . 'Message" class="' . $class . '">' . $flash['message'] . '</div>';
+				} elseif ($flash['element'] == '' || $flash['element'] == null) {
+					$out = $flash['message'];
+				} else {
+					$view =& ClassRegistry::getObject('view');
+					$tmpVars = $flash['params'];
+					$tmpVars['message'] = $flash['message'];
+					$out = $view->element($flash['element'], $tmpVars);
+				}
+				parent::delete('Message.' . $key);
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Used to check is a session is valid in a view
+ *
+ * @return boolean
+ * @access public
+ */
+	function valid() {
+		if ($this->__active === true && $this->__start()) {
+			return parent::valid();
+		}
+	}
+
+/**
+ * Override CakeSession::write().
+ * This method should not be used in a view
+ *
+ * @return boolean
+ * @access public
+ */
+	function write() {
+		trigger_error(__('You can not write to a Session from the view', true), E_USER_WARNING);
+	}
+
+/**
+ * Determine if Session has been started
+ * and attempt to start it if not
+ *
+ * @return boolean true if Session is already started, false if
+ * Session could not be started
+ * @access private
+ */
+	function __start() {
+		if (!$this->started()) {
+			return $this->start();
+		}
+		return true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/text.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/text.php
new file mode 100644
index 000000000..6aef14f8d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/text.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Text Helper
+ *
+ * Text manipulations: Highlight, excerpt, truncate, strip of links, convert email addresses to mailto: links...
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libraries.
+ *
+ */
+if (!class_exists('HtmlHelper')) {
+	App::import('Helper', 'Html');
+}
+if (!class_exists('Multibyte')) {
+	App::import('Core', 'Multibyte');
+}
+
+/**
+ * Text helper library.
+ *
+ * Text manipulations: Highlight, excerpt, truncate, strip of links, convert email addresses to mailto: links...
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1469/Text
+ */
+class TextHelper extends AppHelper {
+
+/**
+ * Highlights a given phrase in a text. You can specify any expression in highlighter that
+ * may include the \1 expression to include the $phrase found.
+ *
+ * ### Options:
+ *
+ * - `format` The piece of html with that the phrase will be highlighted
+ * - `html` If true, will ignore any HTML tags, ensuring that only the correct text is highlighted
+ *
+ * @param string $text Text to search the phrase in
+ * @param string $phrase The phrase that will be searched
+ * @param array $options An array of html attributes and options.
+ * @return string The highlighted text
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#highlight-1622
+ */
+	function highlight($text, $phrase, $options = array()) {
+		if (empty($phrase)) {
+			return $text;
+		}
+
+		$default = array(
+			'format' => '<span class="highlight">\1</span>',
+			'html' => false
+		);
+		$options = array_merge($default, $options);
+		extract($options);
+
+		if (is_array($phrase)) {
+			$replace = array();
+			$with = array();
+
+			foreach ($phrase as $key => $segment) {
+				$segment = "($segment)";
+				if ($html) {
+					$segment = "(?![^<]+>)$segment(?![^<]+>)";
+				}
+
+				$with[] = (is_array($format)) ? $format[$key] : $format;
+				$replace[] = "|$segment|iu";
+			}
+
+			return preg_replace($replace, $with, $text);
+		} else {
+			$phrase = "($phrase)";
+			if ($html) {
+				$phrase = "(?![^<]+>)$phrase(?![^<]+>)";
+			}
+
+			return preg_replace("|$phrase|iu", $format, $text);
+		}
+	}
+
+/**
+ * Strips given text of all links (<a href=....)
+ *
+ * @param string $text Text
+ * @return string The text without links
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#stripLinks-1623
+ */
+	function stripLinks($text) {
+		return preg_replace('|<a\s+[^>]+>|im', '', preg_replace('|<\/a>|im', '', $text));
+	}
+
+/**
+ * Adds links (<a href=....) to a given text, by finding text that begins with
+ * strings like http:// and ftp://.
+ *
+ * @param string $text Text to add links to
+ * @param array $options Array of HTML options.
+ * @return string The text with links
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#autoLinkUrls-1619
+ */
+	function autoLinkUrls($text, $htmlOptions = array()) {
+		$options = var_export($htmlOptions, true);
+		$text = preg_replace_callback('#(?<!href="|">)((?:https?|ftp|nntp)://[^\s<>()]+)#i', create_function('$matches',
+			'$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], $matches[0],' . $options . ');'), $text);
+
+		return preg_replace_callback('#(?<!href="|">)(?<!http://|https://|ftp://|nntp://)(www\.[^\n\%\ <]+[^<\n\%\,\.\ <])(?<!\))#i',
+			create_function('$matches', '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], "http://" . $matches[0],' . $options . ');'), $text);
+	}
+
+/**
+ * Adds email links (<a href="mailto:....) to a given text.
+ *
+ * @param string $text Text
+ * @param array $options Array of HTML options.
+ * @return string The text with links
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#autoLinkEmails-1618
+ */
+	function autoLinkEmails($text, $options = array()) {
+		$linkOptions = 'array(';
+		foreach ($options as $option => $value) {
+			$value = var_export($value, true);
+			$linkOptions .= "'$option' => $value, ";
+		}
+		$linkOptions .= ')';
+		$atom = '[a-z0-9!#$%&\'*+\/=?^_`{|}~-]';
+
+		return preg_replace_callback(
+			'/(' . $atom . '+(?:\.' . $atom . '+)*@[a-z0-9-]+(?:\.[a-z0-9-]+)+)/i',
+			create_function('$matches', '$Html = new HtmlHelper(); $Html->tags = $Html->loadConfig(); return $Html->link($matches[0], "mailto:" . $matches[0],' . $linkOptions . ');'), $text);
+	}
+
+/**
+ * Convert all links and email adresses to HTML links.
+ *
+ * @param string $text Text
+ * @param array $options Array of HTML options.
+ * @return string The text with links
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#autoLink-1620
+ */
+	function autoLink($text, $options = array()) {
+		return $this->autoLinkEmails($this->autoLinkUrls($text, $options), $options);
+	}
+
+/**
+ * Truncates text.
+ *
+ * Cuts a string to the length of $length and replaces the last characters
+ * with the ending if the text is longer than length.
+ *
+ * ### Options:
+ *
+ * - `ending` Will be used as Ending and appended to the trimmed string
+ * - `exact` If false, $text will not be cut mid-word
+ * - `html` If true, HTML tags would be handled correctly
+ *
+ * @param string  $text String to truncate.
+ * @param integer $length Length of returned string, including ellipsis.
+ * @param array $options An array of html attributes and options.
+ * @return string Trimmed string.
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#truncate-1625
+ */
+	function truncate($text, $length = 100, $options = array()) {
+		$default = array(
+			'ending' => '...', 'exact' => true, 'html' => false
+		);
+		$options = array_merge($default, $options);
+		extract($options);
+
+		if ($html) {
+			if (mb_strlen(preg_replace('/<.*?>/', '', $text)) <= $length) {
+				return $text;
+			}
+			$totalLength = mb_strlen(strip_tags($ending));
+			$openTags = array();
+			$truncate = '';
+
+			preg_match_all('/(<\/?([\w+]+)[^>]*>)?([^<>]*)/', $text, $tags, PREG_SET_ORDER);
+			foreach ($tags as $tag) {
+				if (!preg_match('/img|br|input|hr|area|base|basefont|col|frame|isindex|link|meta|param/s', $tag[2])) {
+					if (preg_match('/<[\w]+[^>]*>/s', $tag[0])) {
+						array_unshift($openTags, $tag[2]);
+					} else if (preg_match('/<\/([\w]+)[^>]*>/s', $tag[0], $closeTag)) {
+						$pos = array_search($closeTag[1], $openTags);
+						if ($pos !== false) {
+							array_splice($openTags, $pos, 1);
+						}
+					}
+				}
+				$truncate .= $tag[1];
+
+				$contentLength = mb_strlen(preg_replace('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', ' ', $tag[3]));
+				if ($contentLength + $totalLength > $length) {
+					$left = $length - $totalLength;
+					$entitiesLength = 0;
+					if (preg_match_all('/&[0-9a-z]{2,8};|&#[0-9]{1,7};|&#x[0-9a-f]{1,6};/i', $tag[3], $entities, PREG_OFFSET_CAPTURE)) {
+						foreach ($entities[0] as $entity) {
+							if ($entity[1] + 1 - $entitiesLength <= $left) {
+								$left--;
+								$entitiesLength += mb_strlen($entity[0]);
+							} else {
+								break;
+							}
+						}
+					}
+
+					$truncate .= mb_substr($tag[3], 0 , $left + $entitiesLength);
+					break;
+				} else {
+					$truncate .= $tag[3];
+					$totalLength += $contentLength;
+				}
+				if ($totalLength >= $length) {
+					break;
+				}
+			}
+		} else {
+			if (mb_strlen($text) <= $length) {
+				return $text;
+			} else {
+				$truncate = mb_substr($text, 0, $length - mb_strlen($ending));
+			}
+		}
+		if (!$exact) {
+			$spacepos = mb_strrpos($truncate, ' ');
+			if (isset($spacepos)) {
+				if ($html) {
+					$bits = mb_substr($truncate, $spacepos);
+					preg_match_all('/<\/([a-z]+)>/', $bits, $droppedTags, PREG_SET_ORDER);
+					if (!empty($droppedTags)) {
+						foreach ($droppedTags as $closingTag) {
+							if (!in_array($closingTag[1], $openTags)) {
+								array_unshift($openTags, $closingTag[1]);
+							}
+						}
+					}
+				}
+				$truncate = mb_substr($truncate, 0, $spacepos);
+			}
+		}
+		$truncate .= $ending;
+
+		if ($html) {
+			foreach ($openTags as $tag) {
+				$truncate .= '</'.$tag.'>';
+			}
+		}
+
+		return $truncate;
+	}
+
+/**
+ * Extracts an excerpt from the text surrounding the phrase with a number of characters on each side
+ * determined by radius.
+ *
+ * @param string $text String to search the phrase in
+ * @param string $phrase Phrase that will be searched for
+ * @param integer $radius The amount of characters that will be returned on each side of the founded phrase
+ * @param string $ending Ending that will be appended
+ * @return string Modified string
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#excerpt-1621
+ */
+	function excerpt($text, $phrase, $radius = 100, $ending = '...') {
+		if (empty($text) or empty($phrase)) {
+			return $this->truncate($text, $radius * 2, array('ending' => $ending));
+		}
+
+		$phraseLen = mb_strlen($phrase);
+		if ($radius < $phraseLen) {
+			$radius = $phraseLen;
+		}
+
+		$pos = mb_strpos(mb_strtolower($text), mb_strtolower($phrase));
+
+		$startPos = 0;
+		if ($pos > $radius) {
+			$startPos = $pos - $radius;
+		}
+
+		$textLen = mb_strlen($text);
+
+		$endPos = $pos + $phraseLen + $radius;
+		if ($endPos >= $textLen) {
+			$endPos = $textLen;
+		}
+
+		$excerpt = mb_substr($text, $startPos, $endPos - $startPos);
+		if ($startPos != 0) {
+			$excerpt = substr_replace($excerpt, $ending, 0, $phraseLen);
+		}
+
+		if ($endPos != $textLen) {
+			$excerpt = substr_replace($excerpt, $ending, -$phraseLen);
+		}
+
+		return $excerpt;
+	}
+
+/**
+ * Creates a comma separated list where the last two items are joined with 'and', forming natural English
+ *
+ * @param array $list The list to be joined
+ * @param string $and The word used to join the last and second last items together with. Defaults to 'and'
+ * @param string $separator The separator used to join all othe other items together. Defaults to ', '
+ * @return string The glued together string.
+ * @access public
+ * @link http://book.cakephp.org/view/1469/Text#toList-1624
+ */
+	function toList($list, $and = 'and', $separator = ', ') {
+		if (count($list) > 1) {
+			return implode($separator, array_slice($list, null, -1)) . ' ' . $and . ' ' . array_pop($list);
+		} else {
+			return array_pop($list);
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/time.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/time.php
new file mode 100644
index 000000000..168844b69
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/time.php
@@ -0,0 +1,744 @@
+<?php
+/**
+ * Time Helper class file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Time Helper class for easy use of time data.
+ *
+ * Manipulation of time data.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1470/Time
+ */
+class TimeHelper extends AppHelper {
+
+/**
+ * Converts a string representing the format for the function strftime and returns a
+ * windows safe and i18n aware format.
+ *
+ * @param string $format Format with specifiers for strftime function.
+ *    Accepts the special specifier %S which mimics th modifier S for date()
+ * @param string UNIX timestamp
+ * @return string windows safe and date() function compatible format for strftime
+ * @access public
+ */
+	function convertSpecifiers($format, $time = null) {
+		if (!$time) {
+			$time = time();
+		}
+		$this->__time = $time;
+		return preg_replace_callback('/\%(\w+)/', array($this, '__translateSpecifier'), $format);
+	}
+
+/**
+ * Auxiliary function to translate a matched specifier element from a regular expresion into
+ * a windows safe and i18n aware specifier
+ *
+ * @param array $specifier match from regular expression
+ * @return string converted element
+ * @access private
+ */
+	function __translateSpecifier($specifier) {
+		switch ($specifier[1]) {
+			case 'a':
+				$abday = __c('abday', 5, true);
+				if (is_array($abday)) {
+					return $abday[date('w', $this->__time)];
+				}
+				break;
+			case 'A':
+				$day = __c('day',5,true);
+				if (is_array($day)) {
+					return $day[date('w', $this->__time)];
+				}
+				break;
+			case 'c':
+				$format = __c('d_t_fmt',5,true);
+				if ($format != 'd_t_fmt') {
+					return $this->convertSpecifiers($format, $this->__time);
+				}
+				break;
+			case 'C':
+				return sprintf("%02d", date('Y', $this->__time) / 100);
+			case 'D':
+				return '%m/%d/%y';
+			case 'e':
+				if (DS === '/') {
+					return '%e';
+				}
+				$day = date('j', $this->__time);
+				if ($day < 10) {
+					$day = ' ' . $day;
+				}
+				return $day;
+			case 'eS' :
+				return date('jS', $this->__time);
+			case 'b':
+			case 'h':
+				$months = __c('abmon', 5, true);
+				if (is_array($months)) {
+					return $months[date('n', $this->__time) -1];
+				}
+				return '%b';
+			case 'B':
+				$months = __c('mon',5,true);
+				if (is_array($months)) {
+					return $months[date('n', $this->__time) -1];
+				}
+				break;
+			case 'n':
+				return "\n";
+			case 'p':
+			case 'P':
+				$default = array('am' => 0, 'pm' => 1);
+				$meridiem = $default[date('a',$this->__time)];
+				$format = __c('am_pm', 5, true);
+				if (is_array($format)) {
+					$meridiem = $format[$meridiem];
+					return ($specifier[1] == 'P') ? strtolower($meridiem) : strtoupper($meridiem);
+				}
+				break;
+			case 'r':
+				$complete = __c('t_fmt_ampm', 5, true);
+				if ($complete != 't_fmt_ampm') {
+					return str_replace('%p',$this->__translateSpecifier(array('%p', 'p')),$complete);
+				}
+				break;
+			case 'R':
+				return date('H:i', $this->__time);
+			case 't':
+				return "\t";
+			case 'T':
+				return '%H:%M:%S';
+			case 'u':
+				return ($weekDay = date('w', $this->__time)) ? $weekDay : 7;
+			case 'x':
+				$format = __c('d_fmt', 5, true);
+				if ($format != 'd_fmt') {
+					return $this->convertSpecifiers($format, $this->__time);
+				}
+				break;
+			case 'X':
+				$format = __c('t_fmt',5,true);
+				if ($format != 't_fmt') {
+					return $this->convertSpecifiers($format, $this->__time);
+				}
+				break;
+		}
+		return $specifier[0];
+	}
+
+/**
+ * Converts given time (in server's time zone) to user's local time, given his/her offset from GMT.
+ *
+ * @param string $serverTime UNIX timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string UNIX timestamp
+ * @access public
+ */
+	function convert($serverTime, $userOffset) {
+		$serverOffset = $this->serverOffset();
+		$gmtTime = $serverTime - $serverOffset;
+		$userTime = $gmtTime + $userOffset * (60*60);
+		return $userTime;
+	}
+
+/**
+ * Returns server's offset from GMT in seconds.
+ *
+ * @return int Offset
+ * @access public
+ */
+	function serverOffset() {
+		return date('Z', time());
+	}
+
+/**
+ * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
+ *
+ * @param string $dateString Datetime string
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Parsed timestamp
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function fromString($dateString, $userOffset = null) {
+		if (empty($dateString)) {
+			return false;
+		}
+		if (is_integer($dateString) || is_numeric($dateString)) {
+			$date = intval($dateString);
+		} else {
+			$date = strtotime($dateString);
+		}
+		if ($userOffset !== null) {
+			return $this->convert($date, $userOffset);
+		}
+		if ($date === -1) {
+			return false;
+		}
+		return $date;
+	}
+
+/**
+ * Returns a nicely formatted date string for given Datetime string.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Formatted date string
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function nice($dateString = null, $userOffset = null) {
+		if ($dateString != null) {
+			$date = $this->fromString($dateString, $userOffset);
+		} else {
+			$date = time();
+		}
+		$format = $this->convertSpecifiers('%a, %b %eS %Y, %H:%M', $date);
+		return strftime($format, $date);
+	}
+
+/**
+ * Returns a formatted descriptive date string for given datetime string.
+ *
+ * If the given date is today, the returned string could be "Today, 16:54".
+ * If the given date was yesterday, the returned string could be "Yesterday, 16:54".
+ * If $dateString's year is the current year, the returned string does not
+ * include mention of the year.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Described, relative date string
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function niceShort($dateString = null, $userOffset = null) {
+		$date = $dateString ? $this->fromString($dateString, $userOffset) : time();
+
+		$y = $this->isThisYear($date) ? '' : ' %Y';
+
+		if ($this->isToday($dateString, $userOffset)) {
+			$ret = sprintf(__('Today, %s',true), strftime("%H:%M", $date));
+		} elseif ($this->wasYesterday($dateString, $userOffset)) {
+			$ret = sprintf(__('Yesterday, %s',true), strftime("%H:%M", $date));
+		} else {
+			$format = $this->convertSpecifiers("%b %eS{$y}, %H:%M", $date);
+			$ret = strftime($format, $date);
+		}
+
+		return $ret;
+	}
+
+/**
+ * Returns a partial SQL string to search for all records between two dates.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param string $end Datetime string or Unix timestamp
+ * @param string $fieldName Name of database field to compare with
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Partial SQL string.
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function daysAsSql($begin, $end, $fieldName, $userOffset = null) {
+		$begin = $this->fromString($begin, $userOffset);
+		$end = $this->fromString($end, $userOffset);
+		$begin = date('Y-m-d', $begin) . ' 00:00:00';
+		$end = date('Y-m-d', $end) . ' 23:59:59';
+
+		return "($fieldName >= '$begin') AND ($fieldName <= '$end')";
+	}
+
+/**
+ * Returns a partial SQL string to search for all records between two times
+ * occurring on the same day.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param string $fieldName Name of database field to compare with
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Partial SQL string.
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function dayAsSql($dateString, $fieldName, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return $this->daysAsSql($dateString, $dateString, $fieldName);
+	}
+
+/**
+ * Returns true if given datetime string is today.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return boolean True if datetime string is today
+ * @access public
+ */
+	function isToday($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return date('Y-m-d', $date) == date('Y-m-d', time());
+	}
+
+/**
+ * Returns true if given datetime string is within this week
+ * @param string $dateString
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return boolean True if datetime string is within current week
+ * @access public
+ * @link http://book.cakephp.org/view/1472/Testing-Time
+ */
+	function isThisWeek($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return date('W Y', $date) == date('W Y', time());
+	}
+
+/**
+ * Returns true if given datetime string is within this month
+ * @param string $dateString
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return boolean True if datetime string is within current month
+ * @access public
+ * @link http://book.cakephp.org/view/1472/Testing-Time
+ */
+	function isThisMonth($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString);
+		return date('m Y',$date) == date('m Y', time());
+	}
+
+/**
+ * Returns true if given datetime string is within current year.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @return boolean True if datetime string is within current year
+ * @access public
+ * @link http://book.cakephp.org/view/1472/Testing-Time
+ */
+	function isThisYear($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return  date('Y', $date) == date('Y', time());
+	}
+
+/**
+ * Returns true if given datetime string was yesterday.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return boolean True if datetime string was yesterday
+ * @access public
+ * @link http://book.cakephp.org/view/1472/Testing-Time
+ *
+ */
+	function wasYesterday($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return date('Y-m-d', $date) == date('Y-m-d', strtotime('yesterday'));
+	}
+
+/**
+ * Returns true if given datetime string is tomorrow.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return boolean True if datetime string was yesterday
+ * @access public
+ * @link http://book.cakephp.org/view/1472/Testing-Time
+ */
+	function isTomorrow($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return date('Y-m-d', $date) == date('Y-m-d', strtotime('tomorrow'));
+	}
+
+/**
+ * Returns the quarter
+ *
+ * @param string $dateString
+ * @param boolean $range if true returns a range in Y-m-d format
+ * @return boolean True if datetime string is within current week
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function toQuarter($dateString, $range = false) {
+		$time = $this->fromString($dateString);
+		$date = ceil(date('m', $time) / 3);
+
+		if ($range === true) {
+			$range = 'Y-m-d';
+		}
+
+		if ($range !== false) {
+			$year = date('Y', $time);
+
+			switch ($date) {
+				case 1:
+					$date = array($year.'-01-01', $year.'-03-31');
+					break;
+				case 2:
+					$date = array($year.'-04-01', $year.'-06-30');
+					break;
+				case 3:
+					$date = array($year.'-07-01', $year.'-09-30');
+					break;
+				case 4:
+					$date = array($year.'-10-01', $year.'-12-31');
+					break;
+			}
+		}
+		return $date;
+	}
+
+/**
+ * Returns a UNIX timestamp from a textual datetime description. Wrapper for PHP function strtotime().
+ *
+ * @param string $dateString Datetime string to be represented as a Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return integer Unix timestamp
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function toUnix($dateString, $userOffset = null) {
+		return $this->fromString($dateString, $userOffset);
+	}
+
+/**
+ * Returns a date formatted for Atom RSS feeds.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Formatted date string
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function toAtom($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return date('Y-m-d\TH:i:s\Z', $date);
+	}
+
+/**
+ * Formats date for RSS feeds
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Formatted date string
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function toRSS($dateString, $userOffset = null) {
+		$date = $this->fromString($dateString, $userOffset);
+		return date("r", $date);
+	}
+
+/**
+ * Returns either a relative date or a formatted date depending
+ * on the difference between the current time and given datetime.
+ * $datetime should be in a <i>strtotime</i> - parsable format, like MySQL's datetime datatype.
+ *
+ * ### Options:
+ *
+ * - `format` => a fall back format if the relative time is longer than the duration specified by end
+ * - `end` => The end of relative time telling
+ * - `userOffset` => Users offset from GMT (in hours)
+ *
+ * Relative dates look something like this:
+ *	3 weeks, 4 days ago
+ *	15 seconds ago
+ *
+ * Default date formatting is d/m/yy e.g: on 18/2/09
+ *
+ * The returned string includes 'ago' or 'on' and assumes you'll properly add a word
+ * like 'Posted ' before the function output.
+ *
+ * @param string $dateString Datetime string or Unix timestamp
+ * @param array $options Default format if timestamp is used in $dateString
+ * @return string Relative time string.
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function timeAgoInWords($dateTime, $options = array()) {
+		$userOffset = null;
+		if (is_array($options) && isset($options['userOffset'])) {
+			$userOffset = $options['userOffset'];
+		}
+		$now = time();
+		if (!is_null($userOffset)) {
+			$now = $this->convert(time(), $userOffset);
+		}
+		$inSeconds = $this->fromString($dateTime, $userOffset);
+		$backwards = ($inSeconds > $now);
+
+		$format = 'j/n/y';
+		$end = '+1 month';
+
+		if (is_array($options)) {
+			if (isset($options['format'])) {
+				$format = $options['format'];
+				unset($options['format']);
+			}
+			if (isset($options['end'])) {
+				$end = $options['end'];
+				unset($options['end']);
+			}
+		} else {
+			$format = $options;
+		}
+
+		if ($backwards) {
+			$futureTime = $inSeconds;
+			$pastTime = $now;
+		} else {
+			$futureTime = $now;
+			$pastTime = $inSeconds;
+		}
+		$diff = $futureTime - $pastTime;
+
+		// If more than a week, then take into account the length of months
+		if ($diff >= 604800) {
+			$current = array();
+			$date = array();
+
+			list($future['H'], $future['i'], $future['s'], $future['d'], $future['m'], $future['Y']) = explode('/', date('H/i/s/d/m/Y', $futureTime));
+
+			list($past['H'], $past['i'], $past['s'], $past['d'], $past['m'], $past['Y']) = explode('/', date('H/i/s/d/m/Y', $pastTime));
+			$years = $months = $weeks = $days = $hours = $minutes = $seconds = 0;
+
+			if ($future['Y'] == $past['Y'] && $future['m'] == $past['m']) {
+				$months = 0;
+				$years = 0;
+			} else {
+				if ($future['Y'] == $past['Y']) {
+					$months = $future['m'] - $past['m'];
+				} else {
+					$years = $future['Y'] - $past['Y'];
+					$months = $future['m'] + ((12 * $years) - $past['m']);
+
+					if ($months >= 12) {
+						$years = floor($months / 12);
+						$months = $months - ($years * 12);
+					}
+
+					if ($future['m'] < $past['m'] && $future['Y'] - $past['Y'] == 1) {
+						$years --;
+					}
+				}
+			}
+
+			if ($future['d'] >= $past['d']) {
+				$days = $future['d'] - $past['d'];
+			} else {
+				$daysInPastMonth = date('t', $pastTime);
+				$daysInFutureMonth = date('t', mktime(0, 0, 0, $future['m'] - 1, 1, $future['Y']));
+
+				if (!$backwards) {
+					$days = ($daysInPastMonth - $past['d']) + $future['d'];
+				} else {
+					$days = ($daysInFutureMonth - $past['d']) + $future['d'];
+				}
+
+				if ($future['m'] != $past['m']) {
+					$months --;
+				}
+			}
+
+			if ($months == 0 && $years >= 1 && $diff < ($years * 31536000)) {
+				$months = 11;
+				$years --;
+			}
+
+			if ($months >= 12) {
+				$years = $years + 1;
+				$months = $months - 12;
+			}
+
+			if ($days >= 7) {
+				$weeks = floor($days / 7);
+				$days = $days - ($weeks * 7);
+			}
+		} else {
+			$years = $months = $weeks = 0;
+			$days = floor($diff / 86400);
+
+			$diff = $diff - ($days * 86400);
+
+			$hours = floor($diff / 3600);
+			$diff = $diff - ($hours * 3600);
+
+			$minutes = floor($diff / 60);
+			$diff = $diff - ($minutes * 60);
+			$seconds = $diff;
+		}
+		$relativeDate = '';
+		$diff = $futureTime - $pastTime;
+
+		if ($diff > abs($now - $this->fromString($end))) {
+			$relativeDate = sprintf(__('on %s',true), date($format, $inSeconds));
+		} else {
+			if ($years > 0) {
+				// years and months and days
+				$relativeDate .= ($relativeDate ? ', ' : '') . sprintf(__n('%d year', '%d years', $years, true), $years);
+				$relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d month', '%d months', $months, true), $months) : '';
+				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d week', '%d weeks', $weeks, true), $weeks) : '';
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d day', '%d days', $days, true), $days) : '';
+			} elseif (abs($months) > 0) {
+				// months, weeks and days
+				$relativeDate .= ($relativeDate ? ', ' : '') . sprintf(__n('%d month', '%d months', $months, true), $months);
+				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d week', '%d weeks', $weeks, true), $weeks) : '';
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d day', '%d days', $days, true), $days) : '';
+			} elseif (abs($weeks) > 0) {
+				// weeks and days
+				$relativeDate .= ($relativeDate ? ', ' : '') . sprintf(__n('%d week', '%d weeks', $weeks, true), $weeks);
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d day', '%d days', $days, true), $days) : '';
+			} elseif (abs($days) > 0) {
+				// days and hours
+				$relativeDate .= ($relativeDate ? ', ' : '') . sprintf(__n('%d day', '%d days', $days, true), $days);
+				$relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d hour', '%d hours', $hours, true), $hours) : '';
+			} elseif (abs($hours) > 0) {
+				// hours and minutes
+				$relativeDate .= ($relativeDate ? ', ' : '') . sprintf(__n('%d hour', '%d hours', $hours, true), $hours);
+				$relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . sprintf(__n('%d minute', '%d minutes', $minutes, true), $minutes) : '';
+			} elseif (abs($minutes) > 0) {
+				// minutes only
+				$relativeDate .= ($relativeDate ? ', ' : '') . sprintf(__n('%d minute', '%d minutes', $minutes, true), $minutes);
+			} else {
+				// seconds only
+				$relativeDate .= ($relativeDate ? ', ' : '') . sprintf(__n('%d second', '%d seconds', $seconds, true), $seconds);
+			}
+
+			if (!$backwards) {
+				$relativeDate = sprintf(__('%s ago', true), $relativeDate);
+			}
+		}
+		return $relativeDate;
+	}
+
+/**
+ * Alias for timeAgoInWords
+ *
+ * @param mixed $dateTime Datetime string (strtotime-compatible) or Unix timestamp
+ * @param mixed $options Default format string, if timestamp is used in $dateTime, or an array of options to be passed
+ *   on to timeAgoInWords().
+ * @return string Relative time string.
+ * @see TimeHelper::timeAgoInWords
+ * @access public
+ * @deprecated This method alias will be removed in future versions.
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function relativeTime($dateTime, $options = array()) {
+		return $this->timeAgoInWords($dateTime, $options);
+	}
+
+/**
+ * Returns true if specified datetime was within the interval specified, else false.
+ *
+ * @param mixed $timeInterval the numeric value with space then time type.
+ *    Example of valid types: 6 hours, 2 days, 1 minute.
+ * @param mixed $dateString the datestring or unix timestamp to compare
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return bool
+ * @access public
+ * @link http://book.cakephp.org/view/1472/Testing-Time
+ */
+	function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
+		$tmp = str_replace(' ', '', $timeInterval);
+		if (is_numeric($tmp)) {
+			$timeInterval = $tmp . ' ' . __('days', true);
+		}
+
+		$date = $this->fromString($dateString, $userOffset);
+		$interval = $this->fromString('-'.$timeInterval);
+
+		if ($date >= $interval && $date <= time()) {
+			return true;
+		}
+
+		return false;
+	}
+
+/**
+ * Returns gmt, given either a UNIX timestamp or a valid strtotime() date string.
+ *
+ * @param string $dateString Datetime string
+ * @return string Formatted date string
+ * @access public
+ * @link http://book.cakephp.org/view/1471/Formatting
+ */
+	function gmt($string = null) {
+		if ($string != null) {
+			$string = $this->fromString($string);
+		} else {
+			$string = time();
+		}
+		$string = $this->fromString($string);
+		$hour = intval(date("G", $string));
+		$minute = intval(date("i", $string));
+		$second = intval(date("s", $string));
+		$month = intval(date("n", $string));
+		$day = intval(date("j", $string));
+		$year = intval(date("Y", $string));
+
+		return gmmktime($hour, $minute, $second, $month, $day, $year);
+	}
+
+/**
+ * Returns a formatted date string, given either a UNIX timestamp or a valid strtotime() date string.
+ * This function also accepts a time string and a format string as first and second parameters.
+ * In that case this function behaves as a wrapper for TimeHelper::i18nFormat()
+ *
+ * @param string $format date format string (or a DateTime string)
+ * @param string $dateString Datetime string (or a date format string)
+ * @param boolean $invalid flag to ignore results of fromString == false
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Formatted date string
+ * @access public
+ */
+	function format($format, $date = null, $invalid = false, $userOffset = null) {
+		$time = $this->fromString($date, $userOffset);
+		$_time = $this->fromString($format, $userOffset);
+
+		if (is_numeric($_time) && $time === false) {
+			$format = $date;
+			return $this->i18nFormat($_time, $format, $invalid, $userOffset);
+		}
+		if ($time === false && $invalid !== false) {
+			return $invalid;
+		}
+		return date($format, $time);
+	}
+
+/**
+ * Returns a formatted date string, given either a UNIX timestamp or a valid strtotime() date string.
+ * It take in account the default date format for the current language if a LC_TIME file is used.
+ *
+ * @param string $dateString Datetime string
+ * @param string $format strftime format string.
+ * @param boolean $invalid flag to ignore results of fromString == false
+ * @param int $userOffset User's offset from GMT (in hours)
+ * @return string Formatted and translated date string @access public
+ * @access public
+ */
+	function i18nFormat($date, $format = null, $invalid = false, $userOffset = null) {
+		$date = $this->fromString($date, $userOffset);
+		if ($date === false && $invalid !== false) {
+			return $invalid;
+		}
+		if (empty($format)) {
+			$format = '%x';
+		}
+		$format = $this->convertSpecifiers($format, $date);
+		return strftime($format, $date);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/xml.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/xml.php
new file mode 100644
index 000000000..7adaac7a2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/helpers/xml.php
@@ -0,0 +1,177 @@
+<?php
+/**
+ * XML Helper class file.
+ *
+ * Simplifies the output of XML documents.
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('Xml', 'Set'));
+
+/**
+ * XML Helper class for easy output of XML structures.
+ *
+ * XmlHelper encloses all methods needed while working with XML documents.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.helpers
+ * @link http://book.cakephp.org/view/1473/XML
+ */
+class XmlHelper extends AppHelper {
+
+/**
+ * Default document encoding
+ *
+ * @access public
+ * @var string
+ */
+	var $encoding = 'UTF-8';
+
+	var $Xml;
+	var $XmlElement;
+/**
+ * Constructor
+ *
+ * @return void
+ */
+	function __construct() {
+		parent::__construct();
+		$this->Xml =& new Xml();
+		$this->Xml->options(array('verifyNs' => false));
+	}
+
+/**
+ * Returns an XML document header
+ *
+ * @param array $attrib Header tag attributes
+ * @return string XML header
+ * @access public
+ * @link http://book.cakephp.org/view/1476/header
+ */
+	function header($attrib = array()) {
+		if (Configure::read('App.encoding') !== null) {
+			$this->encoding = Configure::read('App.encoding');
+		}
+
+		if (is_array($attrib)) {
+			$attrib = array_merge(array('encoding' => $this->encoding), $attrib);
+		}
+		if (is_string($attrib) && strpos($attrib, 'xml') !== 0) {
+			$attrib = 'xml ' . $attrib;
+		}
+
+		return $this->Xml->header($attrib);
+	}
+
+/**
+ * Adds a namespace to any documents generated
+ *
+ * @param string $name The namespace name
+ * @param string $url The namespace URI; can be empty if in the default namespace map
+ * @return boolean False if no URL is specified, and the namespace does not exist
+ *     default namespace map, otherwise true
+ * @deprecated
+ * @see Xml::addNs()
+ */
+	function addNs($name, $url = null) {
+		return $this->Xml->addNamespace($name, $url);
+	}
+
+/**
+ * Removes a namespace added in addNs()
+ *
+ * @param  string  $name The namespace name or URI
+ * @deprecated
+ * @see Xml::removeNs()
+ * @access public
+ */
+	function removeNs($name) {
+		return $this->Xml->removeGlobalNamespace($name);
+	}
+
+/**
+ * Generates an XML element
+ *
+ * @param string $name The name of the XML element
+ * @param array $attrib The attributes of the XML element
+ * @param mixed $content XML element content
+ * @param boolean $endTag Whether the end tag of the element should be printed
+ * @return string XML
+ * @access public
+ * @link http://book.cakephp.org/view/1475/elem
+ */
+	function elem($name, $attrib = array(), $content = null, $endTag = true) {
+		$namespace = null;
+		if (isset($attrib['namespace'])) {
+			$namespace = $attrib['namespace'];
+			unset($attrib['namespace']);
+		}
+		$cdata = false;
+		if (is_array($content) && isset($content['cdata'])) {
+			$cdata = true;
+			unset($content['cdata']);
+		}
+		if (is_array($content) && array_key_exists('value', $content)) {
+			$content = $content['value'];
+		}
+		$children = array();
+		if (is_array($content)) {
+			$children = $content;
+			$content = null;
+		}
+
+		$elem =& $this->Xml->createElement($name, $content, $attrib, $namespace);
+		foreach ($children as $child) {
+			$elem->createElement($child);
+		}
+		$out = $elem->toString(array('cdata' => $cdata, 'leaveOpen' => !$endTag));
+
+		if (!$endTag) {
+			$this->XmlElement =& $elem;
+		}
+		return $out;
+	}
+
+/**
+ * Create closing tag for current element
+ *
+ * @return string
+ * @access public
+ */
+	function closeElem() {
+		$elem = (empty($this->XmlElement)) ? $this->Xml : $this->XmlElement;
+		$name = $elem->name();
+		if ($parent =& $elem->parent()) {
+			$this->XmlElement =& $parent;
+		}
+		return '</' . $name . '>';
+	}
+
+/**
+ * Serializes a model resultset into XML
+ *
+ * @param mixed $data The content to be converted to XML
+ * @param array $options The data formatting options.  For a list of valid options, see
+ *     Xml::__construct().
+ * @return string A copy of $data in XML format
+ * @see Xml::__construct()
+ * @access public
+ * @link http://book.cakephp.org/view/1474/serialize
+ */
+	function serialize($data, $options = array()) {
+		$options += array('attributes' => false, 'format' => 'attributes');
+		$data =& new Xml($data, $options);
+		return $data->toString($options + array('header' => false));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/ajax.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/ajax.ctp
new file mode 100644
index 000000000..6d1bb5a7d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/ajax.ctp
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/default.ctp
new file mode 100644
index 000000000..ba5fa7e98
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/default.ctp
@@ -0,0 +1,59 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<?php echo $this->Html->charset(); ?>
+	<title>
+		<?php __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo $title_for_layout; ?>
+	</title>
+	<?php
+		echo $this->Html->meta('icon');
+
+		echo $this->Html->css('cake.generic');
+
+		echo $scripts_for_layout;
+	?>
+</head>
+<body>
+	<div id="container">
+		<div id="header">
+			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org'); ?></h1>
+		</div>
+		<div id="content">
+
+			<?php echo $this->Session->flash(); ?>
+
+			<?php echo $content_for_layout; ?>
+
+		</div>
+		<div id="footer">
+			<?php echo $this->Html->link(
+					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework', true), 'border' => '0')),
+					'http://www.cakephp.org/',
+					array('target' => '_blank', 'escape' => false)
+				);
+			?>
+		</div>
+	</div>
+	<?php echo $this->element('sql_dump'); ?>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/html/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/html/default.ctp
new file mode 100644
index 000000000..b2025d457
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/html/default.ctp
@@ -0,0 +1,30 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<html>
+<head>
+	<title><?php echo $title_for_layout;?></title>
+</head>
+<body>
+	<?php echo $content_for_layout;?>
+
+	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/text/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/text/default.ctp
new file mode 100644
index 000000000..3362a24cf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/email/text/default.ctp
@@ -0,0 +1,22 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo $content_for_layout;?>
+
+This email was sent using the CakePHP Framework, http://cakephp.org.
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/flash.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/flash.ctp
new file mode 100644
index 000000000..99d9953e7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/flash.ctp
@@ -0,0 +1,38 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<?php echo $this->Html->charset(); ?>
+<title><?php echo $page_title; ?></title>
+
+<?php if (Configure::read() == 0) { ?>
+<meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
+<?php } ?>
+<style><!--
+P { text-align:center; font:bold 1.1em sans-serif }
+A { color:#444; text-decoration:none }
+A:HOVER { text-decoration: underline; color:#44E }
+--></style>
+</head>
+<body>
+<p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/js/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/js/default.ctp
new file mode 100644
index 000000000..d94dc903a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/js/default.ctp
@@ -0,0 +1,2 @@
+<?php echo $scripts_for_layout; ?>
+<script type="text/javascript"><?php echo $content_for_layout; ?></script>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/rss/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/rss/default.ctp
new file mode 100644
index 000000000..70dcb6ff4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/rss/default.ctp
@@ -0,0 +1,16 @@
+<?php
+echo $this->Rss->header();
+
+if (!isset($channel)) {
+	$channel = array();
+}
+if (!isset($channel['title'])) {
+	$channel['title'] = $title_for_layout;
+}
+
+echo $this->Rss->document(
+	$this->Rss->channel(
+		array(), $channel, $content_for_layout
+	)
+);
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/xml/default.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/xml/default.ctp
new file mode 100644
index 000000000..07f603d3a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/layouts/xml/default.ctp
@@ -0,0 +1,2 @@
+<?php echo $this->Xml->header(); ?>
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/media.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/media.php
new file mode 100644
index 000000000..c8bb613a7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/media.php
@@ -0,0 +1,285 @@
+<?php
+/**
+ * Methods to display or download any type of file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view
+ * @since         CakePHP(tm) v 1.2.0.5714
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('View', 'View', false);
+
+class MediaView extends View {
+
+/**
+ * Holds known mime type mappings
+ *
+ * @var array
+ * @access public
+ */
+	var $mimeType = array(
+		'ai' => 'application/postscript', 'bcpio' => 'application/x-bcpio', 'bin' => 'application/octet-stream',
+		'ccad' => 'application/clariscad', 'cdf' => 'application/x-netcdf', 'class' => 'application/octet-stream',
+		'cpio' => 'application/x-cpio', 'cpt' => 'application/mac-compactpro', 'csh' => 'application/x-csh',
+		'csv' => 'application/csv', 'dcr' => 'application/x-director', 'dir' => 'application/x-director',
+		'dms' => 'application/octet-stream', 'doc' => 'application/msword', 'drw' => 'application/drafting',
+		'dvi' => 'application/x-dvi', 'dwg' => 'application/acad', 'dxf' => 'application/dxf',
+		'dxr' => 'application/x-director', 'eot' => 'application/vnd.ms-fontobject', 'eps' => 'application/postscript',
+		'exe' => 'application/octet-stream', 'ez' => 'application/andrew-inset',
+		'flv' => 'video/x-flv', 'gtar' => 'application/x-gtar', 'gz' => 'application/x-gzip',
+		'bz2' => 'application/x-bzip', '7z' => 'application/x-7z-compressed', 'hdf' => 'application/x-hdf',
+		'hqx' => 'application/mac-binhex40', 'ico' => 'image/vnd.microsoft.icon', 'ips' => 'application/x-ipscript',
+		'ipx' => 'application/x-ipix', 'js' => 'application/x-javascript', 'latex' => 'application/x-latex',
+		'lha' => 'application/octet-stream', 'lsp' => 'application/x-lisp', 'lzh' => 'application/octet-stream',
+		'man' => 'application/x-troff-man', 'me' => 'application/x-troff-me', 'mif' => 'application/vnd.mif',
+		'ms' => 'application/x-troff-ms', 'nc' => 'application/x-netcdf', 'oda' => 'application/oda',
+		'otf' => 'font/otf', 'pdf' => 'application/pdf',
+		'pgn' => 'application/x-chess-pgn', 'pot' => 'application/mspowerpoint', 'pps' => 'application/mspowerpoint',
+		'ppt' => 'application/mspowerpoint', 'ppz' => 'application/mspowerpoint', 'pre' => 'application/x-freelance',
+		'prt' => 'application/pro_eng', 'ps' => 'application/postscript', 'roff' => 'application/x-troff',
+		'scm' => 'application/x-lotusscreencam', 'set' => 'application/set', 'sh' => 'application/x-sh',
+		'shar' => 'application/x-shar', 'sit' => 'application/x-stuffit', 'skd' => 'application/x-koan',
+		'skm' => 'application/x-koan', 'skp' => 'application/x-koan', 'skt' => 'application/x-koan',
+		'smi' => 'application/smil', 'smil' => 'application/smil', 'sol' => 'application/solids',
+		'spl' => 'application/x-futuresplash', 'src' => 'application/x-wais-source', 'step' => 'application/STEP',
+		'stl' => 'application/SLA', 'stp' => 'application/STEP', 'sv4cpio' => 'application/x-sv4cpio',
+		'sv4crc' => 'application/x-sv4crc', 'svg' => 'image/svg+xml', 'svgz' => 'image/svg+xml',
+		'swf' => 'application/x-shockwave-flash', 't' => 'application/x-troff',
+		'tar' => 'application/x-tar', 'tcl' => 'application/x-tcl', 'tex' => 'application/x-tex',
+		'texi' => 'application/x-texinfo', 'texinfo' => 'application/x-texinfo', 'tr' => 'application/x-troff',
+		'tsp' => 'application/dsptype', 'ttf' => 'font/ttf',
+		'unv' => 'application/i-deas', 'ustar' => 'application/x-ustar',
+		'vcd' => 'application/x-cdlink', 'vda' => 'application/vda', 'xlc' => 'application/vnd.ms-excel',
+		'xll' => 'application/vnd.ms-excel', 'xlm' => 'application/vnd.ms-excel', 'xls' => 'application/vnd.ms-excel',
+		'xlw' => 'application/vnd.ms-excel', 'zip' => 'application/zip', 'aif' => 'audio/x-aiff', 'aifc' => 'audio/x-aiff',
+		'aiff' => 'audio/x-aiff', 'au' => 'audio/basic', 'kar' => 'audio/midi', 'mid' => 'audio/midi',
+		'midi' => 'audio/midi', 'mp2' => 'audio/mpeg', 'mp3' => 'audio/mpeg', 'mpga' => 'audio/mpeg',
+		'ra' => 'audio/x-realaudio', 'ram' => 'audio/x-pn-realaudio', 'rm' => 'audio/x-pn-realaudio',
+		'rpm' => 'audio/x-pn-realaudio-plugin', 'snd' => 'audio/basic', 'tsi' => 'audio/TSP-audio', 'wav' => 'audio/x-wav',
+		'asc' => 'text/plain', 'c' => 'text/plain', 'cc' => 'text/plain', 'css' => 'text/css', 'etx' => 'text/x-setext',
+		'f' => 'text/plain', 'f90' => 'text/plain', 'h' => 'text/plain', 'hh' => 'text/plain', 'htm' => 'text/html',
+		'html' => 'text/html', 'm' => 'text/plain', 'rtf' => 'text/rtf', 'rtx' => 'text/richtext', 'sgm' => 'text/sgml',
+		'sgml' => 'text/sgml', 'tsv' => 'text/tab-separated-values', 'tpl' => 'text/template', 'txt' => 'text/plain',
+		'xml' => 'text/xml', 'avi' => 'video/x-msvideo', 'fli' => 'video/x-fli', 'mov' => 'video/quicktime',
+		'movie' => 'video/x-sgi-movie', 'mpe' => 'video/mpeg', 'mpeg' => 'video/mpeg', 'mpg' => 'video/mpeg',
+		'qt' => 'video/quicktime', 'viv' => 'video/vnd.vivo', 'vivo' => 'video/vnd.vivo', 'gif' => 'image/gif',
+		'ief' => 'image/ief', 'jpe' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'jpg' => 'image/jpeg',
+		'pbm' => 'image/x-portable-bitmap', 'pgm' => 'image/x-portable-graymap', 'png' => 'image/png',
+		'pnm' => 'image/x-portable-anymap', 'ppm' => 'image/x-portable-pixmap', 'ras' => 'image/cmu-raster',
+		'rgb' => 'image/x-rgb', 'tif' => 'image/tiff', 'tiff' => 'image/tiff', 'xbm' => 'image/x-xbitmap',
+		'xpm' => 'image/x-xpixmap', 'xwd' => 'image/x-xwindowdump', 'ice' => 'x-conference/x-cooltalk',
+		'iges' => 'model/iges', 'igs' => 'model/iges', 'mesh' => 'model/mesh', 'msh' => 'model/mesh',
+		'silo' => 'model/mesh', 'vrml' => 'model/vrml', 'wrl' => 'model/vrml',
+		'mime' => 'www/mime', 'pdb' => 'chemical/x-pdb', 'xyz' => 'chemical/x-pdb');
+
+/**
+ * Holds headers sent to browser before rendering media
+ *
+ * @var array
+ * @access protected
+ */
+	var $_headers = array();
+
+/**
+ * Constructor
+ *
+ * @param object $controller
+ */
+	function __construct(&$controller) {
+		parent::__construct($controller);
+	}
+
+/**
+ * Display or download the given file
+ *
+ * @return unknown
+ */
+	function render() {
+		$name = $download = $extension = $id = $modified = $path = $size = $cache = $mimeType = null;
+		extract($this->viewVars, EXTR_OVERWRITE);
+
+		if ($size) {
+			$id = $id . '_' . $size;
+		}
+
+		if (is_dir($path)) {
+			$path = $path . $id;
+		} else {
+			$path = APP . $path . $id;
+		}
+
+		if (!file_exists($path)) {
+			header('Content-Type: text/html');
+			$this->cakeError('error404');
+		}
+
+		if (is_null($name)) {
+			$name = $id;
+		}
+
+		if (is_array($mimeType)) {
+			$this->mimeType = array_merge($this->mimeType, $mimeType);
+		}
+
+		if (isset($extension) && isset($this->mimeType[$extension]) && connection_status() == 0) {
+			$chunkSize = 8192;
+			$buffer = '';
+			$fileSize = @filesize($path);
+			$handle = fopen($path, 'rb');
+
+			if ($handle === false) {
+				return false;
+			}
+			if (!empty($modified)) {
+				$modified = gmdate('D, d M Y H:i:s', strtotime($modified, time())) . ' GMT';
+			} else {
+				$modified = gmdate('D, d M Y H:i:s') . ' GMT';
+			}
+
+			if ($download) {
+				$contentTypes = array('application/octet-stream');
+				$agent = env('HTTP_USER_AGENT');
+
+				if (preg_match('%Opera(/| )([0-9].[0-9]{1,2})%', $agent)) {
+					$contentTypes[0] = 'application/octetstream';
+				} else if (preg_match('/MSIE ([0-9].[0-9]{1,2})/', $agent)) {
+					$contentTypes[0] = 'application/force-download';
+					array_merge($contentTypes, array(
+						'application/octet-stream',
+						'application/download'
+					));
+				}
+				foreach($contentTypes as $contentType) {
+					$this->_header('Content-Type: ' . $contentType);
+				}
+				$this->_header(array(
+					'Content-Disposition: attachment; filename="' . $name . '.' . $extension . '";',
+					'Expires: 0',
+					'Accept-Ranges: bytes',
+					'Cache-Control: private' => false,
+					'Pragma: private'));
+
+				$httpRange = env('HTTP_RANGE');
+				if (isset($httpRange)) {
+					list($toss, $range) = explode('=', $httpRange);
+
+					$size = $fileSize - 1;
+					$length = $fileSize - $range;
+
+					$this->_header(array(
+						'HTTP/1.1 206 Partial Content',
+						'Content-Length: ' . $length,
+						'Content-Range: bytes ' . $range . $size . '/' . $fileSize));
+
+					fseek($handle, $range);
+				} else {
+					$this->_header('Content-Length: ' . $fileSize);
+				}
+			} else {
+				$this->_header('Date: ' . gmdate('D, d M Y H:i:s', time()) . ' GMT');
+				if ($cache) {
+					if (!is_numeric($cache)) {
+						$cache = strtotime($cache) - time();
+					}
+					$this->_header(array(
+						'Cache-Control: max-age=' . $cache,
+						'Expires: ' . gmdate('D, d M Y H:i:s', time() + $cache) . ' GMT',
+						'Pragma: cache'));
+				} else {
+					$this->_header(array(
+						'Cache-Control: must-revalidate, post-check=0, pre-check=0',
+						'Pragma: no-cache'));
+				}
+				$this->_header(array(
+					'Last-Modified: ' . $modified,
+					'Content-Type: ' . $this->mimeType[$extension],
+					'Content-Length: ' . $fileSize));
+			}
+			$this->_output();
+			$this->_clearBuffer();
+
+			while (!feof($handle)) {
+				if (!$this->_isActive()) {
+					fclose($handle);
+					return false;
+				}
+				set_time_limit(0);
+				$buffer = fread($handle, $chunkSize);
+				echo $buffer;
+				$this->_flushBuffer();
+			}
+			fclose($handle);
+			return;
+		}
+		return false;
+	}
+
+/**
+ * Method to set headers
+ * @param mixed $header
+ * @param boolean $boolean
+ * @access protected
+ */
+	function _header($header, $boolean = true) {
+		if (is_array($header)) {
+			foreach ($header as $string => $boolean) {
+				if (is_numeric($string)) {
+					$this->_headers[] = array($boolean => true);
+				} else {
+					$this->_headers[] = array($string => $boolean);
+				}
+			}
+			return;
+		}
+		$this->_headers[] = array($header => $boolean);
+		return;
+	}
+
+/**
+ * Method to output headers
+ * @access protected
+ */
+	function _output() {
+		foreach ($this->_headers as $key => $value) {
+			$header = key($value);
+			header($header, $value[$header]);
+		}
+	}
+
+/**
+ * Returns true if connection is still active
+ * @return boolean
+ * @access protected
+ */
+	function _isActive() {
+		return connection_status() == 0 && !connection_aborted();
+	}
+
+/**
+ * Clears the contents of the topmost output buffer and discards them
+ * @return boolean
+ * @access protected
+ */
+	function _clearBuffer() {
+		return @ob_end_clean();
+	}
+
+/**
+ * Flushes the contents of the output buffer
+ * @access protected
+ */
+	function _flushBuffer() {
+		@flush();
+		@ob_flush();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/pages/home.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/pages/home.ctp
new file mode 100644
index 000000000..a5ac078af
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/pages/home.ctp
@@ -0,0 +1,170 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.pages
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (Configure::read() == 0):
+	$this->cakeError('error404');
+endif;
+?>
+<h2><?php echo sprintf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
+<a href="http://cakephp.org/changelogs/1.3.9"><?php __('Read the changelog'); ?> </a>
+<?php
+if (Configure::read() > 0):
+	Debugger::checkSecurityKeys();
+endif;
+?>
+<p>
+	<?php
+		if (is_writable(TMP)):
+			echo '<span class="notice success">';
+				__('Your tmp directory is writable.');
+			echo '</span>';
+		else:
+			echo '<span class="notice">';
+				__('Your tmp directory is NOT writable.');
+			echo '</span>';
+		endif;
+	?>
+</p>
+<p>
+	<?php
+		$settings = Cache::settings();
+		if (!empty($settings)):
+			echo '<span class="notice success">';
+					printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. $settings['engine'] . 'Engine</em>');
+			echo '</span>';
+		else:
+			echo '<span class="notice">';
+					__('Your cache is NOT working. Please check the settings in APP/config/core.php');
+			echo '</span>';
+		endif;
+	?>
+</p>
+<p>
+	<?php
+		$filePresent = null;
+		if (file_exists(CONFIGS.'database.php')):
+			echo '<span class="notice success">';
+				__('Your database configuration file is present.');
+				$filePresent = true;
+			echo '</span>';
+		else:
+			echo '<span class="notice">';
+				__('Your database configuration file is NOT present.');
+				echo '<br/>';
+				__('Rename config/database.php.default to config/database.php');
+			echo '</span>';
+		endif;
+	?>
+</p>
+<?php
+	App::import('Core', 'Validation');
+	if (!Validation::alphaNumeric('cakephp')) {
+		echo '<p><span class="notice">';
+		__('PCRE has not been compiled with Unicode support.');
+		echo '<br/>';
+		__('Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
+		echo '</span></p>';
+	}
+?>
+<?php
+if (isset($filePresent)):
+	if (!class_exists('ConnectionManager')) {
+		require LIBS . 'model' . DS . 'connection_manager.php';
+	}
+	$db = ConnectionManager::getInstance();
+	@$connected = $db->getDataSource('default');
+?>
+<p>
+	<?php
+		if ($connected->isConnected()):
+			echo '<span class="notice success">';
+	 			__('Cake is able to connect to the database.');
+			echo '</span>';
+		else:
+			echo '<span class="notice">';
+				__('Cake is NOT able to connect to the database.');
+			echo '</span>';
+		endif;
+	?>
+</p>
+<?php endif;?>
+<h3><?php __('Editing this Page'); ?></h3>
+<p>
+<?php
+__('To change the content of this page, create: APP/views/pages/home.ctp.<br />
+To change its layout, create: APP/views/layouts/default.ctp.<br />
+You can also add some CSS styles for your pages at: APP/webroot/css.');
+?>
+</p>
+
+<h3><?php __('Getting Started'); ?></h3>
+<p>
+	<?php
+		echo $this->Html->link(
+			sprintf('<strong>%s</strong> %s', __('New', true), __('CakePHP 1.3 Docs', true)),
+			'http://book.cakephp.org/view/875/x1-3-Collection',
+			array('target' => '_blank', 'escape' => false)
+		);
+	?>
+</p>
+<p>
+	<?php
+		echo $this->Html->link(
+			__('The 15 min Blog Tutorial', true),
+			'http://book.cakephp.org/view/1528/Blog',
+			array('target' => '_blank', 'escape' => false)
+		);
+	?>
+</p>
+
+<h3><?php __('More about Cake'); ?></h3>
+<p>
+<?php __('CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
+</p>
+<p>
+<?php __('Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
+</p>
+
+<ul>
+	<li><a href="http://cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
+	<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li>
+	<li><a href="http://www.cakephp.org"><?php __('CakePHP'); ?> </a>
+	<ul><li><?php __('The Rapid Development Framework'); ?></li></ul></li>
+	<li><a href="http://book.cakephp.org"><?php __('CakePHP Documentation'); ?> </a>
+	<ul><li><?php __('Your Rapid Development Cookbook'); ?></li></ul></li>
+	<li><a href="http://api.cakephp.org"><?php __('CakePHP API'); ?> </a>
+	<ul><li><?php __('Quick Reference'); ?></li></ul></li>
+	<li><a href="http://bakery.cakephp.org"><?php __('The Bakery'); ?> </a>
+	<ul><li><?php __('Everything CakePHP'); ?></li></ul></li>
+	<li><a href="http://live.cakephp.org"><?php __('The Show'); ?> </a>
+	<ul><li><?php __('The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
+	<li><a href="http://groups.google.com/group/cake-php"><?php __('CakePHP Google Group'); ?> </a>
+	<ul><li><?php __('Community mailing list'); ?></li></ul></li>
+	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
+	<ul><li><?php __('Live chat about CakePHP'); ?></li></ul></li>
+	<li><a href="http://github.com/cakephp/"><?php __('CakePHP Code'); ?> </a>
+	<ul><li><?php __('For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
+	<li><a href="http://cakephp.lighthouseapp.com/"><?php __('CakePHP Lighthouse'); ?> </a>
+	<ul><li><?php __('CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
+	<li><a href="http://www.cakeforge.org"><?php __('CakeForge'); ?> </a>
+	<ul><li><?php __('Open Development for CakePHP'); ?></li></ul></li>
+	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php __('Book Store'); ?> </a>
+	<ul><li><?php __('Recommended Software Books'); ?></li></ul></li>
+	<li><a href="http://www.cafepress.com/cakefoundation"><?php __('CakePHP gear'); ?> </a>
+	<ul><li><?php __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
+</ul>
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/edit.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/edit.ctp
new file mode 100644
index 000000000..34b570631
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/edit.ctp
@@ -0,0 +1,47 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.scaffolds
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> form">
+<?php
+	echo $this->Form->create();
+	echo $this->Form->inputs($scaffoldFields, array('created', 'modified', 'updated'));
+	echo $this->Form->end(__('Submit', true));
+?>
+</div>
+<div class="actions">
+	<h3><?php __('Actions'); ?></h3>
+	<ul>
+<?php if ($this->action != 'add'):?>
+		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value($modelClass.'.'.$primaryKey)), null, __('Are you sure you want to delete', true).' #' . $this->Form->value($modelClass.'.'.$primaryKey)); ?></li>
+<?php endif;?>
+		<li><?php echo $this->Html->link(__('List', true).' '.$pluralHumanName, array('action' => 'index'));?></li>
+<?php
+		$done = array();
+		foreach ($associations as $_type => $_data) {
+			foreach ($_data as $_alias => $_details) {
+				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "</li>\n";
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "</li>\n";
+					$done[] = $_details['controller'];
+				}
+			}
+		}
+?>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/index.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/index.ctp
new file mode 100644
index 000000000..ce4a09a3d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/index.ctp
@@ -0,0 +1,93 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.console.libs.templates.views
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> index">
+<h2><?php echo $pluralHumanName;?></h2>
+<table cellpadding="0" cellspacing="0">
+<tr>
+<?php foreach ($scaffoldFields as $_field):?>
+	<th><?php echo $this->Paginator->sort($_field);?></th>
+<?php endforeach;?>
+	<th><?php __('Actions');?></th>
+</tr>
+<?php
+$i = 0;
+foreach (${$pluralVar} as ${$singularVar}):
+	$class = null;
+	if ($i++ % 2 == 0) {
+		$class = ' class="altrow"';
+	}
+echo "\n";
+	echo "\t<tr{$class}>\n";
+		foreach ($scaffoldFields as $_field) {
+			$isKey = false;
+			if (!empty($associations['belongsTo'])) {
+				foreach ($associations['belongsTo'] as $_alias => $_details) {
+					if ($_field === $_details['foreignKey']) {
+						$isKey = true;
+						echo "\t\t<td>\n\t\t\t" . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t</td>\n";
+						break;
+					}
+				}
+			}
+			if ($isKey !== true) {
+				echo "\t\t<td>\n\t\t\t" . ${$singularVar}[$modelClass][$_field] . " \n\t\t</td>\n";
+			}
+		}
+
+		echo "\t\t<td class=\"actions\">\n";
+		echo "\t\t\t" . $this->Html->link(__('View', true), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
+		echo "\t\t\t" . $this->Html->link(__('Edit', true), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])) . "\n";
+		echo "\t\t\t" . $this->Html->link(__('Delete', true), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete', true).' #' . ${$singularVar}[$modelClass][$primaryKey]) . "\n";
+		echo "\t\t</td>\n";
+	echo "\t</tr>\n";
+
+endforeach;
+echo "\n";
+?>
+</table>
+	<p><?php
+	echo $this->Paginator->counter(array(
+		'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%', true)
+	));
+	?></p>
+	<div class="paging">
+	<?php echo "\t" . $this->Paginator->prev('<< ' . __('previous', true), array(), null, array('class' => 'disabled')) . "\n";?>
+	 | <?php echo $this->Paginator->numbers() . "\n"?>
+	<?php echo "\t ". $this->Paginator->next(__('next', true) .' >>', array(), null, array('class' => 'disabled')) . "\n";?>
+	</div>
+</div>
+<div class="actions">
+	<h3><?php __('Actions'); ?></h3>
+	<ul>
+		<li><?php echo $this->Html->link(sprintf(__('New %s', true), $singularHumanName), array('action' => 'add')); ?></li>
+<?php
+		$done = array();
+		foreach ($associations as $_type => $_data) {
+			foreach ($_data as $_alias => $_details) {
+				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
+					echo "\t\t<li>" . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
+					$done[] = $_details['controller'];
+				}
+			}
+		}
+?>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/view.ctp b/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/view.ctp
new file mode 100644
index 000000000..ba14d3a6f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/scaffolds/view.ctp
@@ -0,0 +1,160 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.scaffolds
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<div class="<?php echo $pluralVar;?> view">
+<h2><?php printf(__("View %s", true), $singularHumanName); ?></h2>
+	<dl>
+<?php
+$i = 0;
+foreach ($scaffoldFields as $_field) {
+	$class = null;
+	if ($i++ % 2 == 0) {
+		$class = ' class="altrow"';
+	}
+	$isKey = false;
+	if (!empty($associations['belongsTo'])) {
+		foreach ($associations['belongsTo'] as $_alias => $_details) {
+			if ($_field === $_details['foreignKey']) {
+				$isKey = true;
+				echo "\t\t<dt{$class}>" . Inflector::humanize($_alias) . "</dt>\n";
+				echo "\t\t<dd{$class}>\n\t\t\t" . $this->Html->link(${$singularVar}[$_alias][$_details['displayField']], array('controller' => $_details['controller'], 'action' => 'view', ${$singularVar}[$_alias][$_details['primaryKey']])) . "\n\t\t&nbsp;</dd>\n";
+				break;
+			}
+		}
+	}
+	if ($isKey !== true) {
+		echo "\t\t<dt{$class}>" . Inflector::humanize($_field) . "</dt>\n";
+		echo "\t\t<dd{$class}>\n\t\t\t{${$singularVar}[$modelClass][$_field]}\n&nbsp;\t\t</dd>\n";
+	}
+}
+?>
+	</dl>
+</div>
+<div class="actions">
+	<h3><?php __('Actions'); ?></h3>
+	<ul>
+<?php
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('Edit %s', true), $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('Delete %s', true), $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete', true).' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('List %s', true), $pluralHumanName), array('action' => 'index')). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(sprintf(__('New %s', true), $singularHumanName), array('action' => 'add')). " </li>\n";
+
+	$done = array();
+	foreach ($associations as $_type => $_data) {
+		foreach ($_data as $_alias => $_details) {
+			if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
+				echo "\t\t<li>" . $this->Html->link(sprintf(__('List %s', true), Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
+				echo "\t\t<li>" . $this->Html->link(sprintf(__('New %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
+				$done[] = $_details['controller'];
+			}
+		}
+	}
+?>
+	</ul>
+</div>
+<?php
+if (!empty($associations['hasOne'])) :
+foreach ($associations['hasOne'] as $_alias => $_details): ?>
+<div class="related">
+	<h3><?php printf(__("Related %s", true), Inflector::humanize($_details['controller'])); ?></h3>
+<?php if (!empty(${$singularVar}[$_alias])):?>
+	<dl>
+<?php
+		$i = 0;
+		$otherFields = array_keys(${$singularVar}[$_alias]);
+		foreach ($otherFields as $_field) {
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+			echo "\t\t<dt{$class}>" . Inflector::humanize($_field) . "</dt>\n";
+			echo "\t\t<dd{$class}>\n\t" . ${$singularVar}[$_alias][$_field] . "\n&nbsp;</dd>\n";
+		}
+?>
+	</dl>
+<?php endif; ?>
+	<div class="actions">
+		<ul>
+			<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."</li>\n";?>
+		</ul>
+	</div>
+</div>
+<?php
+endforeach;
+endif;
+
+if (empty($associations['hasMany'])) {
+	$associations['hasMany'] = array();
+}
+if (empty($associations['hasAndBelongsToMany'])) {
+	$associations['hasAndBelongsToMany'] = array();
+}
+
+$relations = array_merge($associations['hasMany'], $associations['hasAndBelongsToMany']);
+$i = 0;
+foreach ($relations as $_alias => $_details):
+$otherSingularVar = Inflector::variable($_alias);
+?>
+<div class="related">
+	<h3><?php printf(__("Related %s", true), Inflector::humanize($_details['controller'])); ?></h3>
+<?php if (!empty(${$singularVar}[$_alias])):?>
+	<table cellpadding="0" cellspacing="0">
+	<tr>
+<?php
+		$otherFields = array_keys(${$singularVar}[$_alias][0]);
+		if (isset($_details['with'])) {
+			$index = array_search($_details['with'], $otherFields);
+			unset($otherFields[$index]);
+		}
+		foreach ($otherFields as $_field) {
+			echo "\t\t<th>" . Inflector::humanize($_field) . "</th>\n";
+		}
+?>
+		<th class="actions">Actions</th>
+	</tr>
+<?php
+		$i = 0;
+		foreach (${$singularVar}[$_alias] as ${$otherSingularVar}):
+			$class = null;
+			if ($i++ % 2 == 0) {
+				$class = ' class="altrow"';
+			}
+			echo "\t\t<tr{$class}>\n";
+
+			foreach ($otherFields as $_field) {
+				echo "\t\t\t<td>" . ${$otherSingularVar}[$_field] . "</td>\n";
+			}
+
+			echo "\t\t\t<td class=\"actions\">\n";
+			echo "\t\t\t\t" . $this->Html->link(__('View', true), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__('Edit', true), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__('Delete', true), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __('Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n";
+			echo "\t\t\t</td>\n";
+		echo "\t\t</tr>\n";
+		endforeach;
+?>
+	</table>
+<?php endif; ?>
+	<div class="actions">
+		<ul>
+			<li><?php echo $this->Html->link(sprintf(__("New %s", true), Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'));?> </li>
+		</ul>
+	</div>
+</div>
+<?php endforeach;?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/theme.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/theme.php
new file mode 100644
index 000000000..22a06f050
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/theme.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * A custom view class that is used for themeing
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Theme view class
+ *
+ * Allows the creation of multiple themes to be used in an app. Theme views are regular view files
+ * that can provide unique HTML and static assets.  If theme views are not found for the current view
+ * the default app view files will be used. You can set `$this->theme` and `$this->view = 'Theme'` 
+ * in your Controller to use the ThemeView.
+ *
+ * Example of theme path with `$this->theme = 'super_hot';` Would be `app/views/themed/super_hot/posts`
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view
+ */
+class ThemeView extends View {
+/**
+ * Constructor for ThemeView sets $this->theme.
+ *
+ * @param Controller $controller Controller object to be rendered.
+ * @param boolean $register Should the view be registered in the registry.
+ */
+	function __construct(&$controller, $register = true) {
+		parent::__construct($controller, $register);
+		$this->theme =& $controller->theme;
+	}
+
+/**
+ * Return all possible paths to find view files in order
+ *
+ * @param string $plugin The name of the plugin views are being found for.
+ * @param boolean $cached Set to true to force dir scan.
+ * @return array paths
+ * @access protected
+ * @todo Make theme path building respect $cached parameter.
+ */
+	function _paths($plugin = null, $cached = true) {
+		$paths = parent::_paths($plugin, $cached);
+		$themePaths = array();
+
+		if (!empty($this->theme)) {
+			$count = count($paths);
+			for ($i = 0; $i < $count; $i++) {
+				if (strpos($paths[$i], DS . 'plugins' . DS) === false
+					&& strpos($paths[$i], DS . 'libs' . DS . 'view') === false) {
+						if ($plugin) {
+							$themePaths[] = $paths[$i] . 'themed'. DS . $this->theme . DS . 'plugins' . DS . $plugin . DS;
+						}
+						$themePaths[] = $paths[$i] . 'themed'. DS . $this->theme . DS;
+					}
+			}
+			$paths = array_merge($themePaths, $paths);
+		}
+		return $paths;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/view/view.php b/code/ryzom/tools/server/www/webtt/cake/libs/view/view.php
new file mode 100644
index 000000000..c55d5db98
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/view/view.php
@@ -0,0 +1,988 @@
+<?php
+/**
+ * Methods for displaying presentation data in the view.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Included libraries.
+ */
+App::import('Core', 'ClassRegistry');
+App::import('View', 'Helper', false);
+
+/**
+ * View, the V in the MVC triad.
+ *
+ * Class holding methods for displaying presentation data.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs.view
+ */
+class View extends Object {
+
+/**
+ * Path parts for creating links in views.
+ *
+ * @var string Base URL
+ * @access public
+ */
+	var $base = null;
+
+/**
+ * Stores the current URL (for links etc.)
+ *
+ * @var string Current URL
+ */
+	var $here = null;
+
+/**
+ * Name of the plugin.
+ *
+ * @link          http://manual.cakephp.org/chapter/plugins
+ * @var string
+ */
+	var $plugin = null;
+
+/**
+ * Name of the controller.
+ *
+ * @var string Name of controller
+ * @access public
+ */
+	var $name = null;
+
+/**
+ * Action to be performed.
+ *
+ * @var string Name of action
+ * @access public
+ */
+	var $action = null;
+
+/**
+ * Array of parameter data
+ *
+ * @var array Parameter data
+ */
+	var $params = array();
+
+/**
+ * Current passed params
+ *
+ * @var mixed
+ */
+	var $passedArgs = array();
+
+/**
+ * Array of data
+ *
+ * @var array Parameter data
+ */
+	var $data = array();
+
+/**
+ * An array of names of built-in helpers to include.
+ *
+ * @var mixed A single name as a string or a list of names as an array.
+ * @access public
+ */
+	var $helpers = array('Html');
+
+/**
+ * Path to View.
+ *
+ * @var string Path to View
+ */
+	var $viewPath = null;
+
+/**
+ * Variables for the view
+ *
+ * @var array
+ * @access public
+ */
+	var $viewVars = array();
+
+/**
+ * Name of layout to use with this View.
+ *
+ * @var string
+ * @access public
+ */
+	var $layout = 'default';
+
+/**
+ * Path to Layout.
+ *
+ * @var string Path to Layout
+ */
+	var $layoutPath = null;
+
+/**
+ * Turns on or off Cake's conventional mode of rendering views. On by default.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $autoRender = true;
+
+/**
+ * Turns on or off Cake's conventional mode of finding layout files. On by default.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $autoLayout = true;
+
+/**
+ * File extension. Defaults to Cake's template ".ctp".
+ *
+ * @var string
+ * @access public
+ */
+	var $ext = '.ctp';
+
+/**
+ * Sub-directory for this view file.
+ *
+ * @var string
+ * @access public
+ */
+	var $subDir = null;
+	
+/**
+ * Theme name.
+ *
+ * @var string
+ * @access public
+ */
+	var $theme = null;
+
+/**
+ * Used to define methods a controller that will be cached.
+ *
+ * @see Controller::$cacheAction
+ * @var mixed
+ * @access public
+ */
+	var $cacheAction = false;
+
+/**
+ * holds current errors for the model validation
+ *
+ * @var array
+ * @access public
+ */
+	var $validationErrors = array();
+
+/**
+ * True when the view has been rendered.
+ *
+ * @var boolean
+ * @access public
+ */
+	var $hasRendered = false;
+
+/**
+ * Array of loaded view helpers.
+ *
+ * @var array
+ * @access public
+ */
+	var $loaded = array();
+
+/**
+ * True if in scope of model-specific region
+ *
+ * @var boolean
+ * @access public
+ */
+	var $modelScope = false;
+
+/**
+ * Name of current model this view context is attached to
+ *
+ * @var string
+ * @access public
+ */
+	var $model = null;
+
+/**
+ * Name of association model this view context is attached to
+ *
+ * @var string
+ * @access public
+ */
+	var $association = null;
+
+/**
+ * Name of current model field this view context is attached to
+ *
+ * @var string
+ * @access public
+ */
+	var $field = null;
+
+/**
+ * Suffix of current field this view context is attached to
+ *
+ * @var string
+ * @access public
+ */
+	var $fieldSuffix = null;
+
+/**
+ * The current model ID this view context is attached to
+ *
+ * @var mixed
+ * @access public
+ */
+	var $modelId = null;
+
+/**
+ * List of generated DOM UUIDs
+ *
+ * @var array
+ * @access public
+ */
+	var $uuids = array();
+
+/**
+ * Holds View output.
+ *
+ * @var string
+ * @access public
+ */
+	var $output = false;
+
+/**
+ * List of variables to collect from the associated controller
+ *
+ * @var array
+ * @access protected
+ */
+	var $__passedVars = array(
+		'viewVars', 'action', 'autoLayout', 'autoRender', 'ext', 'base', 'webroot',
+		'helpers', 'here', 'layout', 'name', 'layoutPath', 'viewPath',
+		'params', 'data', 'plugin', 'passedArgs', 'cacheAction'
+	);
+
+/**
+ * Scripts (and/or other <head /> tags) for the layout
+ *
+ * @var array
+ * @access private
+ */
+	var $__scripts = array();
+
+/**
+ * Holds an array of paths.
+ *
+ * @var array
+ * @access private
+ */
+	var $__paths = array();
+
+/**
+ * Constructor
+ *
+ * @param Controller $controller A controller object to pull View::__passedArgs from.
+ * @param boolean $register Should the View instance be registered in the ClassRegistry
+ * @return View
+ */
+	function __construct(&$controller, $register = true) {
+		if (is_object($controller)) {
+			$count = count($this->__passedVars);
+			for ($j = 0; $j < $count; $j++) {
+				$var = $this->__passedVars[$j];
+				$this->{$var} = $controller->{$var};
+			}
+		}
+		parent::__construct();
+
+		if ($register) {
+			ClassRegistry::addObject('view', $this);
+		}
+	}
+
+/**
+ * Renders a piece of PHP with provided parameters and returns HTML, XML, or any other string.
+ *
+ * This realizes the concept of Elements, (or "partial layouts")
+ * and the $params array is used to send data to be used in the
+ * Element.  Elements can be cached through use of the cache key.
+ *
+ * ### Special params
+ *
+ * - `cache` - enable caching for this element accepts boolean or strtotime compatible string.
+ *   Can also be an array. If `cache` is an array,
+ *   `time` is used to specify duration of cache.
+ *   `key` can be used to create unique cache files.
+ * - `plugin` - Load an element from a specific plugin.
+ *
+ * @param string $name Name of template file in the/app/views/elements/ folder
+ * @param array $params Array of data to be made available to the for rendered
+ *    view (i.e. the Element)
+ * @return string Rendered Element
+ * @access public
+ */
+	function element($name, $params = array(), $loadHelpers = false) {
+		$file = $plugin = $key = null;
+
+		if (isset($params['plugin'])) {
+			$plugin = $params['plugin'];
+		}
+
+		if (isset($this->plugin) && !$plugin) {
+			$plugin = $this->plugin;
+		}
+
+		if (isset($params['cache'])) {
+			$expires = '+1 day';
+
+			if (is_array($params['cache'])) {
+				$expires = $params['cache']['time'];
+				$key = Inflector::slug($params['cache']['key']);
+			} elseif ($params['cache'] !== true) {
+				$expires = $params['cache'];
+				$key = implode('_', array_keys($params));
+			}
+
+			if ($expires) {
+				$cacheFile = 'element_' . $key . '_' . $plugin . Inflector::slug($name);
+				$cache = cache('views' . DS . $cacheFile, null, $expires);
+
+				if (is_string($cache)) {
+					return $cache;
+				}
+			}
+		}
+		$paths = $this->_paths($plugin);
+		$exts = $this->_getExtensions();
+		foreach ($exts as $ext) {
+			foreach ($paths as $path) {
+				if (file_exists($path . 'elements' . DS . $name . $ext)) {
+					$file = $path . 'elements' . DS . $name . $ext;
+					break;
+				}
+			}
+		}
+
+		if (is_file($file)) {
+			$vars = array_merge($this->viewVars, $params);
+			foreach ($this->loaded as $name => $helper) {
+				if (!isset($vars[$name])) {
+					$vars[$name] =& $this->loaded[$name];
+				}
+			}
+			$element = $this->_render($file, $vars, $loadHelpers);
+			if (isset($params['cache']) && isset($cacheFile) && isset($expires)) {
+				cache('views' . DS . $cacheFile, $element, $expires);
+			}
+			return $element;
+		}
+		$file = $paths[0] . 'elements' . DS . $name . $this->ext;
+
+		if (Configure::read() > 0) {
+			return "Not Found: " . $file;
+		}
+	}
+
+/**
+ * Renders view for given action and layout. If $file is given, that is used
+ * for a view filename (e.g. customFunkyView.ctp).
+ *
+ * @param string $action Name of action to render for
+ * @param string $layout Layout to use
+ * @param string $file Custom filename for view
+ * @return string Rendered Element
+ * @access public
+ */
+	function render($action = null, $layout = null, $file = null) {
+		if ($this->hasRendered) {
+			return true;
+		}
+		$out = null;
+
+		if ($file != null) {
+			$action = $file;
+		}
+
+		if ($action !== false && $viewFileName = $this->_getViewFileName($action)) {
+			$out = $this->_render($viewFileName, $this->viewVars);
+		}
+
+		if ($layout === null) {
+			$layout = $this->layout;
+		}
+
+		if ($out !== false) {
+			if ($layout && $this->autoLayout) {
+				$out = $this->renderLayout($out, $layout);
+				$isCached = (
+					isset($this->loaded['cache']) ||
+					Configure::read('Cache.check') === true
+				);
+
+				if ($isCached) {
+					$replace = array('<cake:nocache>', '</cake:nocache>');
+					$out = str_replace($replace, '', $out);
+				}
+			}
+			$this->hasRendered = true;
+		} else {
+			$out = $this->_render($viewFileName, $this->viewVars);
+			trigger_error(sprintf(__("Error in view %s, got: <blockquote>%s</blockquote>", true), $viewFileName, $out), E_USER_ERROR);
+		}
+		return $out;
+	}
+
+/**
+ * Renders a layout. Returns output from _render(). Returns false on error.
+ * Several variables are created for use in layout.
+ *
+ * - `title_for_layout` - A backwards compatible place holder, you should set this value if you want more control.
+ * - `content_for_layout` - contains rendered view file
+ * - `scripts_for_layout` - contains scripts added to header
+ *
+ * @param string $content_for_layout Content to render in a view, wrapped by the surrounding layout.
+ * @return mixed Rendered output, or false on error
+ * @access public
+ */
+	function renderLayout($content_for_layout, $layout = null) {
+		$layoutFileName = $this->_getLayoutFileName($layout);
+		if (empty($layoutFileName)) {
+			return $this->output;
+		}
+
+		$dataForLayout = array_merge($this->viewVars, array(
+			'content_for_layout' => $content_for_layout,
+			'scripts_for_layout' => implode("\n\t", $this->__scripts),
+		));
+
+		if (!isset($dataForLayout['title_for_layout'])) {
+			$dataForLayout['title_for_layout'] = Inflector::humanize($this->viewPath);
+		}
+
+		if (empty($this->loaded) && !empty($this->helpers)) {
+			$loadHelpers = true;
+		} else {
+			$loadHelpers = false;
+			$dataForLayout = array_merge($dataForLayout, $this->loaded);
+		}
+
+		$this->_triggerHelpers('beforeLayout');
+		$this->output = $this->_render($layoutFileName, $dataForLayout, $loadHelpers, true);
+
+		if ($this->output === false) {
+			$this->output = $this->_render($layoutFileName, $dataForLayout);
+			trigger_error(sprintf(__("Error in layout %s, got: <blockquote>%s</blockquote>", true), $layoutFileName, $this->output), E_USER_ERROR);
+			return false;
+		}
+
+		$this->_triggerHelpers('afterLayout');
+
+		return $this->output;
+	}
+
+/**
+ * Fire a callback on all loaded Helpers. All helpers must implement this method, 
+ * it is not checked before being called.  You can add additional helper callbacks in AppHelper.
+ *
+ * @param string $callback name of callback fire.
+ * @access protected
+ * @return void
+ */
+	function _triggerHelpers($callback) {
+		if (empty($this->loaded)) {
+			return false;
+		}
+		$helpers = array_keys($this->loaded);
+		foreach ($helpers as $helperName) {
+			$helper =& $this->loaded[$helperName];
+			if (is_object($helper)) {
+				if (is_subclass_of($helper, 'Helper')) {
+					$helper->{$callback}();
+				}
+			}
+		}
+	}
+
+/**
+ * Render cached view. Works in concert with CacheHelper and Dispatcher to 
+ * render cached view files.
+ *
+ * @param string $filename the cache file to include
+ * @param string $timeStart the page render start time
+ * @return boolean Success of rendering the cached file.
+ * @access public
+ */
+	function renderCache($filename, $timeStart) {
+		ob_start();
+		include ($filename);
+
+		if (Configure::read() > 0 && $this->layout != 'xml') {
+			echo "<!-- Cached Render Time: " . round(getMicrotime() - $timeStart, 4) . "s -->";
+		}
+		$out = ob_get_clean();
+
+		if (preg_match('/^<!--cachetime:(\\d+)-->/', $out, $match)) {
+			if (time() >= $match['1']) {
+				@unlink($filename);
+				unset ($out);
+				return false;
+			} else {
+				if ($this->layout === 'xml') {
+					header('Content-type: text/xml');
+				}
+				$commentLength = strlen('<!--cachetime:' . $match['1'] . '-->');
+				echo substr($out, $commentLength);
+				return true;
+			}
+		}
+	}
+
+/**
+ * Returns a list of variables available in the current View context
+ *
+ * @return array Array of the set view variable names.
+ * @access public
+ */
+	function getVars() {
+		return array_keys($this->viewVars);
+	}
+
+/**
+ * Returns the contents of the given View variable(s)
+ *
+ * @param string $var The view var you want the contents of.
+ * @return mixed The content of the named var if its set, otherwise null.
+ * @access public
+ */
+	function getVar($var) {
+		if (!isset($this->viewVars[$var])) {
+			return null;
+		} else {
+			return $this->viewVars[$var];
+		}
+	}
+
+/**
+ * Adds a script block or other element to be inserted in $scripts_for_layout in
+ * the `<head />` of a document layout
+ *
+ * @param string $name Either the key name for the script, or the script content. Name can be used to
+ *   update/replace a script element.
+ * @param string $content The content of the script being added, optional.
+ * @return void
+ * @access public
+ */
+	function addScript($name, $content = null) {
+		if (empty($content)) {
+			if (!in_array($name, array_values($this->__scripts))) {
+				$this->__scripts[] = $name;
+			}
+		} else {
+			$this->__scripts[$name] = $content;
+		}
+	}
+
+/**
+ * Generates a unique, non-random DOM ID for an object, based on the object type and the target URL.
+ *
+ * @param string $object Type of object, i.e. 'form' or 'link'
+ * @param string $url The object's target URL
+ * @return string
+ * @access public
+ */
+	function uuid($object, $url) {
+		$c = 1;
+		$url = Router::url($url);
+		$hash = $object . substr(md5($object . $url), 0, 10);
+		while (in_array($hash, $this->uuids)) {
+			$hash = $object . substr(md5($object . $url . $c), 0, 10);
+			$c++;
+		}
+		$this->uuids[] = $hash;
+		return $hash;
+	}
+
+/**
+ * Returns the entity reference of the current context as an array of identity parts
+ *
+ * @return array An array containing the identity elements of an entity
+ * @access public
+ */
+	function entity() {
+		$assoc = ($this->association) ? $this->association : $this->model;
+		if (!empty($this->entityPath)) {
+			$path = explode('.', $this->entityPath);
+			$count = count($path);
+			if (
+				($count == 1 && !empty($this->association)) ||
+				($count == 1 && $this->model != $this->entityPath) ||
+				($count == 1 && empty($this->association) && !empty($this->field)) ||
+				($count  == 2 && !empty($this->fieldSuffix)) ||
+				is_numeric($path[0]) && !empty($assoc)
+			) {
+				array_unshift($path, $assoc);
+			}
+			return Set::filter($path);
+		}
+		return array_values(Set::filter(
+			array($assoc, $this->modelId, $this->field, $this->fieldSuffix)
+		));
+	}
+
+/**
+ * Allows a template or element to set a variable that will be available in
+ * a layout or other element. Analagous to Controller::set.
+ *
+ * @param mixed $one A string or an array of data.
+ * @param mixed $two Value in case $one is a string (which then works as the key).
+ *    Unused if $one is an associative array, otherwise serves as the values to $one's keys.
+ * @return void
+ * @access public
+ */
+	function set($one, $two = null) {
+		$data = null;
+		if (is_array($one)) {
+			if (is_array($two)) {
+				$data = array_combine($one, $two);
+			} else {
+				$data = $one;
+			}
+		} else {
+			$data = array($one => $two);
+		}
+		if ($data == null) {
+			return false;
+		}
+		$this->viewVars = $data + $this->viewVars;
+	}
+
+/**
+ * Displays an error page to the user. Uses layouts/error.ctp to render the page.
+ *
+ * @param integer $code HTTP Error code (for instance: 404)
+ * @param string $name Name of the error (for instance: Not Found)
+ * @param string $message Error message as a web page
+ * @access public
+ */
+	function error($code, $name, $message) {
+		header ("HTTP/1.1 {$code} {$name}");
+		print ($this->_render(
+			$this->_getLayoutFileName('error'),
+			array('code' => $code, 'name' => $name, 'message' => $message)
+		));
+	}
+
+/**
+ * Renders and returns output for given view filename with its
+ * array of data.
+ *
+ * @param string $___viewFn Filename of the view
+ * @param array $___dataForView Data to include in rendered view
+ * @param boolean $loadHelpers Boolean to indicate that helpers should be loaded.
+ * @param boolean $cached Whether or not to trigger the creation of a cache file.
+ * @return string Rendered output
+ * @access protected
+ */
+	function _render($___viewFn, $___dataForView, $loadHelpers = true, $cached = false) {
+		$loadedHelpers = array();
+
+		if ($this->helpers != false && $loadHelpers === true) {
+			$loadedHelpers = $this->_loadHelpers($loadedHelpers, $this->helpers);
+			$helpers = array_keys($loadedHelpers);
+			$helperNames = array_map(array('Inflector', 'variable'), $helpers);
+
+			for ($i = count($helpers) - 1; $i >= 0; $i--) {
+				$name = $helperNames[$i];
+				$helper =& $loadedHelpers[$helpers[$i]];
+
+				if (!isset($___dataForView[$name])) {
+					${$name} =& $helper;
+				}
+				$this->loaded[$helperNames[$i]] =& $helper;
+				$this->{$helpers[$i]} =& $helper;
+			}
+			$this->_triggerHelpers('beforeRender');
+			unset($name, $loadedHelpers, $helpers, $i, $helperNames, $helper);
+		}
+
+		extract($___dataForView, EXTR_SKIP);
+		ob_start();
+
+		if (Configure::read() > 0) {
+			include ($___viewFn);
+		} else {
+			@include ($___viewFn);
+		}
+
+		if ($loadHelpers === true) {
+			$this->_triggerHelpers('afterRender');
+		}
+
+		$out = ob_get_clean();
+		$caching = (
+			isset($this->loaded['cache']) &&
+			(($this->cacheAction != false)) && (Configure::read('Cache.check') === true)
+		);
+
+		if ($caching) {
+			if (is_a($this->loaded['cache'], 'CacheHelper')) {
+				$cache =& $this->loaded['cache'];
+				$cache->base = $this->base;
+				$cache->here = $this->here;
+				$cache->helpers = $this->helpers;
+				$cache->action = $this->action;
+				$cache->controllerName = $this->name;
+				$cache->layout = $this->layout;
+				$cache->cacheAction = $this->cacheAction;
+				$cache->viewVars = $this->viewVars;
+				$cache->cache($___viewFn, $out, $cached);
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Loads helpers, with their dependencies.
+ *
+ * @param array $loaded List of helpers that are already loaded.
+ * @param array $helpers List of helpers to load.
+ * @param string $parent holds name of helper, if loaded helper has helpers
+ * @return array Array containing the loaded helpers.
+ * @access protected
+ */
+	function &_loadHelpers(&$loaded, $helpers, $parent = null) {
+		foreach ($helpers as $i => $helper) {
+			$options = array();
+
+			if (!is_int($i)) {
+				$options = $helper;
+				$helper = $i;
+			}
+			list($plugin, $helper) = pluginSplit($helper, true, $this->plugin);
+			$helperCn = $helper . 'Helper';
+
+			if (!isset($loaded[$helper])) {
+				if (!class_exists($helperCn)) {
+					$isLoaded = false;
+					if (!is_null($plugin)) {
+						$isLoaded = App::import('Helper', $plugin . $helper);
+					}
+					if (!$isLoaded) {
+						if (!App::import('Helper', $helper)) {
+							$this->cakeError('missingHelperFile', array(array(
+								'helper' => $helper,
+								'file' => Inflector::underscore($helper) . '.php',
+								'base' => $this->base
+							)));
+							return false;
+						}
+					}
+					if (!class_exists($helperCn)) {
+						$this->cakeError('missingHelperClass', array(array(
+							'helper' => $helper,
+							'file' => Inflector::underscore($helper) . '.php',
+							'base' => $this->base
+						)));
+						return false;
+					}
+				}
+				$loaded[$helper] =& new $helperCn($options);
+				$vars = array('base', 'webroot', 'here', 'params', 'action', 'data', 'theme', 'plugin');
+				$c = count($vars);
+
+				for ($j = 0; $j < $c; $j++) {
+					$loaded[$helper]->{$vars[$j]} = $this->{$vars[$j]};
+				}
+
+				if (!empty($this->validationErrors)) {
+					$loaded[$helper]->validationErrors = $this->validationErrors;
+				}
+				if (is_array($loaded[$helper]->helpers) && !empty($loaded[$helper]->helpers)) {
+					$loaded =& $this->_loadHelpers($loaded, $loaded[$helper]->helpers, $helper);
+				}
+			}
+			if (isset($loaded[$parent])) {
+				$loaded[$parent]->{$helper} =& $loaded[$helper];
+			}
+		}
+		return $loaded;
+	}
+
+/**
+ * Returns filename of given action's template file (.ctp) as a string.
+ * CamelCased action names will be under_scored! This means that you can have
+ * LongActionNames that refer to long_action_names.ctp views.
+ *
+ * @param string $name Controller action to find template filename for
+ * @return string Template filename
+ * @access protected
+ */
+	function _getViewFileName($name = null) {
+		$subDir = null;
+
+		if (!is_null($this->subDir)) {
+			$subDir = $this->subDir . DS;
+		}
+
+		if ($name === null) {
+			$name = $this->action;
+		}
+		$name = str_replace('/', DS, $name);
+
+		if (strpos($name, DS) === false && $name[0] !== '.') {
+			$name = $this->viewPath . DS . $subDir . Inflector::underscore($name);
+		} elseif (strpos($name, DS) !== false) {
+			if ($name{0} === DS || $name{1} === ':') {
+				if (is_file($name)) {
+					return $name;
+				}
+				$name = trim($name, DS);
+			} else if ($name[0] === '.') {
+				$name = substr($name, 3);
+			} else {
+				$name = $this->viewPath . DS . $subDir . $name;
+			}
+		}
+		$paths = $this->_paths(Inflector::underscore($this->plugin));
+		
+		$exts = $this->_getExtensions();
+		foreach ($exts as $ext) {
+			foreach ($paths as $path) {
+				if (file_exists($path . $name . $ext)) {
+					return $path . $name . $ext;
+				}
+			}
+		}
+		$defaultPath = $paths[0];
+
+		if ($this->plugin) {
+			$pluginPaths = App::path('plugins');
+			foreach ($paths as $path) {
+				if (strpos($path, $pluginPaths[0]) === 0) {
+					$defaultPath = $path;
+					break;
+				}
+			}
+		}
+		return $this->_missingView($defaultPath . $name . $this->ext, 'missingView');
+	}
+
+/**
+ * Returns layout filename for this template as a string.
+ *
+ * @param string $name The name of the layout to find.
+ * @return string Filename for layout file (.ctp).
+ * @access protected
+ */
+	function _getLayoutFileName($name = null) {
+		if ($name === null) {
+			$name = $this->layout;
+		}
+		$subDir = null;
+
+		if (!is_null($this->layoutPath)) {
+			$subDir = $this->layoutPath . DS;
+		}
+		$paths = $this->_paths(Inflector::underscore($this->plugin));
+		$file = 'layouts' . DS . $subDir . $name;
+
+		$exts = $this->_getExtensions();
+		foreach ($exts as $ext) {
+			foreach ($paths as $path) {
+				if (file_exists($path . $file . $ext)) {
+					return $path . $file . $ext;
+				}
+			}
+		}
+		return $this->_missingView($paths[0] . $file . $this->ext, 'missingLayout');
+	}
+
+
+/**
+ * Get the extensions that view files can use.
+ *
+ * @return array Array of extensions view files use.
+ * @access protected
+ */
+	function _getExtensions() {
+		$exts = array($this->ext);
+		if ($this->ext !== '.ctp') {
+			array_push($exts, '.ctp');
+		}
+		return $exts;
+	}
+
+/**
+ * Return a misssing view error message
+ *
+ * @param string $viewFileName the filename that should exist
+ * @return false
+ * @access protected
+ */
+	function _missingView($file, $error = 'missingView') {
+		if ($error === 'missingView') {
+			$this->cakeError('missingView', array(
+				'className' => $this->name,
+				'action' => $this->action,
+				'file' => $file,
+				'base' => $this->base
+			));
+			return false;
+		} elseif ($error === 'missingLayout') {
+			$this->cakeError('missingLayout', array(
+				'layout' => $this->layout,
+				'file' => $file,
+				'base' => $this->base
+			));
+			return false;
+		}
+	}
+
+/**
+ * Return all possible paths to find view files in order
+ *
+ * @param string $plugin Optional plugin name to scan for view files.
+ * @param boolean $cached Set to true to force a refresh of view paths.
+ * @return array paths
+ * @access protected
+ */
+	function _paths($plugin = null, $cached = true) {
+		if ($plugin === null && $cached === true && !empty($this->__paths)) {
+			return $this->__paths;
+		}
+		$paths = array();
+		$viewPaths = App::path('views');
+		$corePaths = array_flip(App::core('views'));
+
+		if (!empty($plugin)) {
+			$count = count($viewPaths);
+			for ($i = 0; $i < $count; $i++) {
+				if (!isset($corePaths[$viewPaths[$i]])) {
+					$paths[] = $viewPaths[$i] . 'plugins' . DS . $plugin . DS;
+				}
+			}
+			$paths[] = App::pluginPath($plugin) . 'views' . DS;
+		}
+		$this->__paths = array_merge($paths, $viewPaths);
+		return $this->__paths;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/libs/xml.php b/code/ryzom/tools/server/www/webtt/cake/libs/xml.php
new file mode 100644
index 000000000..b6798ca21
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/libs/xml.php
@@ -0,0 +1,1457 @@
+<?php
+/**
+ * XML handling for Cake.
+ *
+ * The methods in these classes enable the datasources that use XML to work.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP v .0.10.3.1400
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'Set');
+
+/**
+ * XML node.
+ *
+ * Single XML node in an XML tree.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP v .0.10.3.1400
+ */
+class XmlNode extends Object {
+
+/**
+ * Name of node
+ *
+ * @var string
+ * @access public
+ */
+	var $name = null;
+
+/**
+ * Node namespace
+ *
+ * @var string
+ * @access public
+ */
+	var $namespace = null;
+
+/**
+ * Namespaces defined for this node and all child nodes
+ *
+ * @var array
+ * @access public
+ */
+	var $namespaces = array();
+
+/**
+ * Value of node
+ *
+ * @var string
+ * @access public
+ */
+	var $value;
+
+/**
+ * Attributes on this node
+ *
+ * @var array
+ * @access public
+ */
+	var $attributes = array();
+
+/**
+ * This node's children
+ *
+ * @var array
+ * @access public
+ */
+	var $children = array();
+
+/**
+ * Reference to parent node.
+ *
+ * @var XmlNode
+ * @access private
+ */
+	var $__parent = null;
+
+/**
+ * Constructor.
+ *
+ * @param string $name Node name
+ * @param array $attributes Node attributes
+ * @param mixed $value Node contents (text)
+ * @param array $children Node children
+ */
+	function __construct($name = null, $value = null, $namespace = null) {
+		if (strpos($name, ':') !== false) {
+			list($prefix, $name) = explode(':', $name);
+			if (!$namespace) {
+				$namespace = $prefix;
+			}
+		}
+		$this->name = $name;
+		if ($namespace) {
+			$this->namespace = $namespace;
+		}
+
+		if (is_array($value) || is_object($value)) {
+			$this->normalize($value);
+		} elseif (!empty($value) || $value === 0 || $value === '0') {
+			$this->createTextNode($value);
+		}
+	}
+/**
+ * Adds a namespace to the current node
+ *
+ * @param string $prefix The namespace prefix
+ * @param string $url The namespace DTD URL
+ * @return void
+ */
+	function addNamespace($prefix, $url) {
+		if ($ns = Xml::addGlobalNs($prefix, $url)) {
+			$this->namespaces = array_merge($this->namespaces, $ns);
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Adds a namespace to the current node
+ *
+ * @param string $prefix The namespace prefix
+ * @param string $url The namespace DTD URL
+ * @return void
+ */
+	function removeNamespace($prefix) {
+		if (Xml::removeGlobalNs($prefix)) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Creates an XmlNode object that can be appended to this document or a node in it
+ *
+ * @param string $name Node name
+ * @param string $value Node value
+ * @param string $namespace Node namespace
+ * @return object XmlNode
+ */
+	function &createNode($name = null, $value = null, $namespace = false) {
+		$node =& new XmlNode($name, $value, $namespace);
+		$node->setParent($this);
+		return $node;
+	}
+
+/**
+ * Creates an XmlElement object that can be appended to this document or a node in it
+ *
+ * @param string $name Element name
+ * @param string $value Element value
+ * @param array $attributes Element attributes
+ * @param string $namespace Node namespace
+ * @return object XmlElement
+ */
+	function &createElement($name = null, $value = null, $attributes = array(), $namespace = false) {
+		$element =& new XmlElement($name, $value, $attributes, $namespace);
+		$element->setParent($this);
+		return $element;
+	}
+
+/**
+ * Creates an XmlTextNode object that can be appended to this document or a node in it
+ *
+ * @param string $value Node value
+ * @return object XmlTextNode
+ */
+	function &createTextNode($value = null) {
+		$node = new XmlTextNode($value);
+		$node->setParent($this);
+		return $node;
+	}
+
+/**
+ * Gets the XML element properties from an object.
+ *
+ * @param object $object Object to get properties from
+ * @return array Properties from object
+ * @access public
+ */
+	function normalize($object, $keyName = null, $options = array()) {
+		if (is_a($object, 'XmlNode')) {
+			return $object;
+		}
+		$name = null;
+		$options += array('format' => 'attributes');
+
+		if ($keyName !== null && !is_numeric($keyName)) {
+			$name = $keyName;
+		} elseif (!empty($object->_name_)) {
+			$name = $object->_name_;
+		} elseif (isset($object->name)) {
+			$name = $object->name;
+		} elseif ($options['format'] == 'attributes') {
+			$name = get_class($object);
+		}
+
+		$tagOpts = $this->__tagOptions($name);
+
+		if ($tagOpts === false) {
+			return;
+		}
+
+		if (isset($tagOpts['name'])) {
+			$name = $tagOpts['name'];
+		} elseif ($name != strtolower($name) && $options['slug'] !== false) {
+			$name = Inflector::slug(Inflector::underscore($name));
+		}
+
+		if (!empty($name)) {
+			$node =& $this->createElement($name);
+		} else {
+			$node =& $this;
+		}
+
+		$namespace = array();
+		$attributes = array();
+		$children = array();
+		$chldObjs = array();
+
+		if (is_object($object)) {
+			$chldObjs = get_object_vars($object);
+		} elseif (is_array($object)) {
+			$chldObjs = $object;
+		} elseif (!empty($object) || $object === 0 || $object === '0') {
+			$node->createTextNode($object);
+		}
+		$attr = array();
+
+		if (isset($tagOpts['attributes'])) {
+			$attr = $tagOpts['attributes'];
+		}
+		if (isset($tagOpts['value']) && isset($chldObjs[$tagOpts['value']])) {
+			$node->createTextNode($chldObjs[$tagOpts['value']]);
+			unset($chldObjs[$tagOpts['value']]);
+		}
+
+		$n = $name;
+		if (isset($chldObjs['_name_'])) {
+			$n = null;
+			unset($chldObjs['_name_']);
+		}
+		$c = 0;
+
+		foreach ($chldObjs as $key => $val) {
+			if (in_array($key, $attr) && !is_object($val) && !is_array($val)) {
+				$attributes[$key] = $val;
+			} else {
+				if (!isset($tagOpts['children']) || $tagOpts['children'] === array() || (is_array($tagOpts['children']) && in_array($key, $tagOpts['children']))) {
+					if (!is_numeric($key)) {
+						$n = $key;
+					}
+					if (is_array($val)) {
+						foreach ($val as $n2 => $obj2) {
+							if (is_numeric($n2)) {
+								$n2 = $n;
+							}
+							$node->normalize($obj2, $n2, $options);
+						}
+					} else {
+						if (is_object($val)) {
+
+							$node->normalize($val, $n, $options);
+						} elseif ($options['format'] == 'tags' && $this->__tagOptions($key) !== false) {
+							$tmp =& $node->createElement($key);
+							if (!empty($val) || $val === 0 || $val === '0') {
+								$tmp->createTextNode($val);
+							}
+						} elseif ($options['format'] == 'attributes') {
+							$node->addAttribute($key, $val);
+						}
+					}
+				}
+			}
+			$c++;
+		}
+		if (!empty($name)) {
+			return $node;
+		}
+		return $children;
+	}
+
+/**
+ * Gets the tag-specific options for the given node name
+ *
+ * @param string $name XML tag name
+ * @param string $option The specific option to query.  Omit for all options
+ * @return mixed A specific option value if $option is specified, otherwise an array of all options
+ * @access private
+ */
+	function __tagOptions($name, $option = null) {
+		if (isset($this->__tags[$name])) {
+			$tagOpts = $this->__tags[$name];
+		} elseif (isset($this->__tags[strtolower($name)])) {
+			$tagOpts = $this->__tags[strtolower($name)];
+		} else {
+			return null;
+		}
+		if ($tagOpts === false) {
+			return false;
+		}
+		if (empty($option)) {
+			return $tagOpts;
+		}
+		if (isset($tagOpts[$option])) {
+			return $tagOpts[$option];
+		}
+		return null;
+	}
+
+/**
+ * Returns the fully-qualified XML node name, with namespace
+ *
+ * @access public
+ */
+	function name() {
+		if (!empty($this->namespace)) {
+			$_this =& XmlManager::getInstance();
+			if (!isset($_this->options['verifyNs']) || !$_this->options['verifyNs'] || in_array($this->namespace, array_keys($_this->namespaces))) {
+				return $this->namespace . ':' . $this->name;
+			}
+		}
+		return $this->name;
+	}
+
+/**
+ * Sets the parent node of this XmlNode.
+ *
+ * @access public
+ */
+	function setParent(&$parent) {
+		if (strtolower(get_class($this)) == 'xml') {
+			return;
+		}
+		if (isset($this->__parent) && is_object($this->__parent)) {
+			if ($this->__parent->compare($parent)) {
+				return;
+			}
+			foreach ($this->__parent->children as $i => $child) {
+				if ($this->compare($child)) {
+					array_splice($this->__parent->children, $i, 1);
+					break;
+				}
+			}
+		}
+		if ($parent == null) {
+			unset($this->__parent);
+		} else {
+			$parent->children[] =& $this;
+			$this->__parent =& $parent;
+		}
+	}
+
+/**
+ * Returns a copy of self.
+ *
+ * @return object Cloned instance
+ * @access public
+ */
+	function cloneNode() {
+		return clone($this);
+	}
+
+/**
+ * Compares $node to this XmlNode object
+ *
+ * @param object An XmlNode or subclass instance
+ * @return boolean True if the nodes match, false otherwise
+ * @access public
+ */
+	function compare($node) {
+		$keys = array(get_object_vars($this), get_object_vars($node));
+		return ($keys[0] === $keys[1]);
+	}
+
+/**
+ * Append given node as a child.
+ *
+ * @param object $child XmlNode with appended child
+ * @param array $options XML generator options for objects and arrays
+ * @return object A reference to the appended child node
+ * @access public
+ */
+	function &append(&$child, $options = array()) {
+		if (empty($child)) {
+			$return = false;
+			return $return;
+		}
+
+		if (is_object($child)) {
+			if ($this->compare($child)) {
+				trigger_error(__('Cannot append a node to itself.', true));
+				$return = false;
+				return $return;
+			}
+		} else if (is_array($child)) {
+			$child = Set::map($child);
+			if (is_array($child)) {
+				if (!is_a(current($child), 'XmlNode')) {
+					foreach ($child as $i => $childNode) {
+						$child[$i] = $this->normalize($childNode, null, $options);
+					}
+				} else {
+					foreach ($child as $childNode) {
+						$this->append($childNode, $options);
+					}
+				}
+				return $child;
+			}
+		} else {
+			$attributes = array();
+			if (func_num_args() >= 2) {
+				$attributes = func_get_arg(1);
+			}
+			$child =& $this->createNode($child, null, $attributes);
+		}
+
+		$child = $this->normalize($child, null, $options);
+
+		if (empty($child->namespace) && !empty($this->namespace)) {
+			$child->namespace = $this->namespace;
+		}
+
+		if (is_a($child, 'XmlNode')) {
+			$child->setParent($this);
+		}
+
+		return $child;
+	}
+
+/**
+ * Returns first child node, or null if empty.
+ *
+ * @return object First XmlNode
+ * @access public
+ */
+	function &first() {
+		if (isset($this->children[0])) {
+			return $this->children[0];
+		} else {
+			$return = null;
+			return $return;
+		}
+	}
+
+/**
+ * Returns last child node, or null if empty.
+ *
+ * @return object Last XmlNode
+ * @access public
+ */
+	function &last() {
+		if (count($this->children) > 0) {
+			return $this->children[count($this->children) - 1];
+		} else {
+			$return = null;
+			return $return;
+		}
+	}
+
+/**
+ * Returns child node with given ID.
+ *
+ * @param string $id Name of child node
+ * @return object Child XmlNode
+ * @access public
+ */
+	function &child($id) {
+		$null = null;
+
+		if (is_int($id)) {
+			if (isset($this->children[$id])) {
+				return $this->children[$id];
+			} else {
+				return null;
+			}
+		} elseif (is_string($id)) {
+			for ($i = 0; $i < count($this->children); $i++) {
+				if ($this->children[$i]->name == $id) {
+					return $this->children[$i];
+				}
+			}
+		}
+		return $null;
+	}
+
+/**
+ * Gets a list of childnodes with the given tag name.
+ *
+ * @param string $name Tag name of child nodes
+ * @return array An array of XmlNodes with the given tag name
+ * @access public
+ */
+	function children($name) {
+		$nodes = array();
+		$count = count($this->children);
+		for ($i = 0; $i < $count; $i++) {
+			if ($this->children[$i]->name == $name) {
+				$nodes[] =& $this->children[$i];
+			}
+		}
+		return $nodes;
+	}
+
+/**
+ * Gets a reference to the next child node in the list of this node's parent.
+ *
+ * @return object A reference to the XmlNode object
+ * @access public
+ */
+	function &nextSibling() {
+		$null = null;
+		$count = count($this->__parent->children);
+		for ($i = 0; $i < $count; $i++) {
+			if ($this->__parent->children[$i] == $this) {
+				if ($i >= $count - 1 || !isset($this->__parent->children[$i + 1])) {
+					return $null;
+				}
+				return $this->__parent->children[$i + 1];
+			}
+		}
+		return $null;
+	}
+
+/**
+ * Gets a reference to the previous child node in the list of this node's parent.
+ *
+ * @return object A reference to the XmlNode object
+ * @access public
+ */
+	function &previousSibling() {
+		$null = null;
+		$count = count($this->__parent->children);
+		for ($i = 0; $i < $count; $i++) {
+			if ($this->__parent->children[$i] == $this) {
+				if ($i == 0 || !isset($this->__parent->children[$i - 1])) {
+					return $null;
+				}
+				return $this->__parent->children[$i - 1];
+			}
+		}
+		return $null;
+	}
+
+/**
+ * Returns parent node.
+ *
+ * @return object Parent XmlNode
+ * @access public
+ */
+	function &parent() {
+		return $this->__parent;
+	}
+
+/**
+ * Returns the XML document to which this node belongs
+ *
+ * @return object Parent XML object
+ * @access public
+ */
+	function &document() {
+		$document =& $this;
+		while (true) {
+			if (get_class($document) == 'Xml' || $document == null) {
+				break;
+			}
+			$document =& $document->parent();
+		}
+		return $document;
+	}
+
+/**
+ * Returns true if this structure has child nodes.
+ *
+ * @return bool
+ * @access public
+ */
+	function hasChildren() {
+		if (is_array($this->children) && !empty($this->children)) {
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Returns this XML structure as a string.
+ *
+ * @return string String representation of the XML structure.
+ * @access public
+ */
+	function toString($options = array(), $depth = 0) {
+		if (is_int($options)) {
+			$depth = $options;
+			$options = array();
+		}
+		$defaults = array('cdata' => true, 'whitespace' => false, 'convertEntities' => false, 'showEmpty' => true, 'leaveOpen' => false);
+		$options = array_merge($defaults, Xml::options(), $options);
+		$tag = !(strpos($this->name, '#') === 0);
+		$d = '';
+
+		if ($tag) {
+			if ($options['whitespace']) {
+				$d .= str_repeat("\t", $depth);
+			}
+
+			$d .= '<' . $this->name();
+			if (!empty($this->namespaces) > 0) {
+				foreach ($this->namespaces as $key => $val) {
+					$val = str_replace('"', '\"', $val);
+					$d .= ' xmlns:' . $key . '="' . $val . '"';
+				}
+			}
+
+			$parent =& $this->parent();
+			if ($parent->name === '#document' && !empty($parent->namespaces)) {
+				foreach ($parent->namespaces as $key => $val) {
+					$val = str_replace('"', '\"', $val);
+					$d .= ' xmlns:' . $key . '="' . $val . '"';
+				}
+			}
+
+			if (is_array($this->attributes) && !empty($this->attributes)) {
+				foreach ($this->attributes as $key => $val) {
+					if (is_bool($val) && $val === false) {
+						$val = 0;
+					}
+					$d .= ' ' . $key . '="' . htmlspecialchars($val, ENT_QUOTES, Configure::read('App.encoding')) . '"';
+				}
+			}
+		}
+
+		if (!$this->hasChildren() && empty($this->value) && $this->value !== 0 && $tag) {
+			if (!$options['leaveOpen']) {
+				$d .= ' />';
+			}
+			if ($options['whitespace']) {
+				$d .= "\n";
+			}
+		} elseif ($tag || $this->hasChildren()) {
+			if ($tag) {
+				$d .= '>';
+			}
+			if ($this->hasChildren()) {
+				if ($options['whitespace']) {
+					$d .= "\n";
+				}
+				$count = count($this->children);
+				$cDepth = $depth + 1;
+				for ($i = 0; $i < $count; $i++) {
+					$d .= $this->children[$i]->toString($options, $cDepth);
+				}
+				if ($tag) {
+					if ($options['whitespace'] && $tag) {
+						$d .= str_repeat("\t", $depth);
+					}
+					if (!$options['leaveOpen']) {
+						$d .= '</' . $this->name() . '>';
+					}
+					if ($options['whitespace']) {
+						$d .= "\n";
+					}
+				}
+			}
+		}
+		return $d;
+	}
+
+/**
+ * Return array representation of current object.
+ *
+ * @param boolean $camelize true will camelize child nodes, false will not alter node names
+ * @return array Array representation
+ * @access public
+ */
+	function toArray($camelize = true) {
+		$out = $this->attributes;
+
+		foreach ($this->children as $child) {
+			$key = $camelize ? Inflector::camelize($child->name) : $child->name;
+
+			$leaf = false;
+			if (is_a($child, 'XmlTextNode')) {
+				$out['value'] = $child->value;
+				continue;
+			} elseif (isset($child->children[0]) && is_a($child->children[0], 'XmlTextNode')) {
+				$value = $child->children[0]->value;
+				if ($child->attributes) {
+					$value = array_merge(array('value' => $value), $child->attributes);
+				}
+				if (count($child->children) == 1) {
+					$leaf = true;
+				}
+			} elseif (count($child->children) === 0 && $child->value == '') {
+				$value = $child->attributes;
+				if (empty($value)) {
+					$leaf = true;
+				}
+			} else {
+				$value = $child->toArray($camelize);
+			}
+
+			if (isset($out[$key])) {
+				if(!isset($out[$key][0]) || !is_array($out[$key]) || !is_int(key($out[$key]))) {
+					$out[$key] = array($out[$key]);
+				} 
+				$out[$key][] = $value;
+			} elseif (isset($out[$child->name])) {
+				$t = $out[$child->name];
+				unset($out[$child->name]);
+				$out[$key] = array($t);
+				$out[$key][] = $value;
+			} elseif ($leaf) {
+				$out[$child->name] = $value;
+			} else {
+				$out[$key] = $value;
+			}
+		}
+		return $out;
+	}
+
+/**
+ * Returns data from toString when this object is converted to a string.
+ *
+ * @return string String representation of this structure.
+ * @access private
+ */
+	function __toString() {
+		return $this->toString();
+	}
+
+/**
+ * Debug method. Deletes the parent. Also deletes this node's children,
+ * if given the $recursive parameter.
+ *
+ * @param boolean $recursive Recursively delete elements.
+ * @access protected
+ */
+	function _killParent($recursive = true) {
+		unset($this->__parent, $this->_log);
+		if ($recursive && $this->hasChildren()) {
+			for ($i = 0; $i < count($this->children); $i++) {
+				$this->children[$i]->_killParent(true);
+			}
+		}
+	}
+}
+
+/**
+ * Main XML class.
+ *
+ * Parses and stores XML data, representing the root of an XML document
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP v .0.10.3.1400
+ */
+class Xml extends XmlNode {
+
+/**
+ * Resource handle to XML parser.
+ *
+ * @var resource
+ * @access private
+ */
+	var $__parser;
+
+/**
+ * File handle to XML indata file.
+ *
+ * @var resource
+ * @access private
+ */
+	var $__file;
+
+/**
+ * Raw XML string data (for loading purposes)
+ *
+ * @var string
+ * @access private
+ */
+	var $__rawData = null;
+
+/**
+ * XML document header
+ *
+ * @var string
+ * @access private
+ */
+	var $__header = null;
+
+/**
+ * Default array keys/object properties to use as tag names when converting objects or array
+ * structures to XML. Set by passing $options['tags'] to this object's constructor.
+ *
+ * @var array
+ * @access private
+ */
+	var $__tags = array();
+
+/**
+ * XML document version
+ *
+ * @var string
+ * @access private
+ */
+	var $version = '1.0';
+
+/**
+ * XML document encoding
+ *
+ * @var string
+ * @access private
+ */
+	var $encoding = 'UTF-8';
+
+/**
+ * Constructor.  Sets up the XML parser with options, gives it this object as
+ * its XML object, and sets some variables.
+ *
+ * ### Options
+ * - 'root': The name of the root element, defaults to '#document'
+ * - 'version': The XML version, defaults to '1.0'
+ * - 'encoding': Document encoding, defaults to 'UTF-8'
+ * - 'namespaces': An array of namespaces (as strings) used in this document
+ * - 'format': Specifies the format this document converts to when parsed or
+ *    rendered out as text, either 'attributes' or 'tags', defaults to 'attributes'
+ * - 'tags': An array specifying any tag-specific formatting options, indexed
+ *    by tag name.  See XmlNode::normalize().
+ * - 'slug':  A boolean to indicate whether or not you want the string version of the XML document
+ *   to have its tags run through Inflector::slug().  Defaults to true
+ *
+ * @param mixed $input The content with which this XML document should be initialized.  Can be a
+ *    string, array or object.  If a string is specified, it may be a literal XML
+ *    document, or a URL or file path to read from.
+ * @param array $options Options to set up with, for valid options see above:
+ * @see XmlNode::normalize()
+ */
+	function __construct($input = null, $options = array()) {
+		$defaults = array(
+			'root' => '#document', 'tags' => array(), 'namespaces' => array(),
+			'version' => '1.0', 'encoding' => 'UTF-8', 'format' => 'attributes',
+			'slug' => true
+		);
+		$options = array_merge($defaults, Xml::options(), $options);
+
+		foreach (array('version', 'encoding', 'namespaces') as $key) {
+			$this->{$key} = $options[$key];
+		}
+		$this->__tags = $options['tags'];
+		parent::__construct('#document');
+
+		if ($options['root'] !== '#document') {
+			$Root =& $this->createNode($options['root']);
+		} else {
+			$Root =& $this;
+		}
+
+		if (!empty($input)) {
+			if (is_string($input)) {
+				$Root->load($input);
+			} elseif (is_array($input) || is_object($input)) {
+				$Root->append($input, $options);
+			}
+		}
+	}
+
+/**
+ * Initialize XML object from a given XML string. Returns false on error.
+ *
+ * @param string $input XML string, a path to a file, or an HTTP resource to load
+ * @return boolean Success
+ * @access public
+ */
+	function load($input) {
+		if (!is_string($input)) {
+			return false;
+		}
+		$this->__rawData = null;
+		$this->__header = null;
+
+		if (strstr($input, "<")) {
+			$this->__rawData = $input;
+		} elseif (strpos($input, 'http://') === 0 || strpos($input, 'https://') === 0) {
+			App::import('Core', 'HttpSocket');
+			$socket = new HttpSocket();
+			$this->__rawData = $socket->get($input);
+		} elseif (file_exists($input)) {
+			$this->__rawData = file_get_contents($input);
+		} else {
+			trigger_error(__('XML cannot be read', true));
+			return false;
+		}
+		return $this->parse();
+	}
+
+/**
+ * Parses and creates XML nodes from the __rawData property.
+ *
+ * @return boolean Success
+ * @access public
+ * @see Xml::load()
+ * @todo figure out how to link attributes and namespaces
+ */
+	function parse() {
+		$this->__initParser();
+		$this->__rawData = trim($this->__rawData);
+		$this->__header = trim(str_replace(
+			array('<' . '?', '?' . '>'),
+			array('', ''),
+			substr($this->__rawData, 0, strpos($this->__rawData, '?' . '>'))
+		));
+
+		xml_parse_into_struct($this->__parser, $this->__rawData, $vals);
+		$xml =& $this;
+		$count = count($vals);
+
+		for ($i = 0; $i < $count; $i++) {
+			$data = $vals[$i];
+			$data += array('tag' => null, 'value' => null, 'attributes' => array());
+			switch ($data['type']) {
+				case "open" :
+					$xml =& $xml->createElement($data['tag'], $data['value'], $data['attributes']);
+				break;
+				case "close" :
+					$xml =& $xml->parent();
+				break;
+				case "complete" :
+					$xml->createElement($data['tag'], $data['value'], $data['attributes']);
+				break;
+				case 'cdata':
+					$xml->createTextNode($data['value']);
+				break;
+			}
+		}
+		xml_parser_free($this->__parser);
+		$this->__parser = null;
+		return true;
+	}
+
+/**
+ * Initializes the XML parser resource
+ *
+ * @return void
+ * @access private
+ */
+	function __initParser() {
+		if (empty($this->__parser)) {
+			$this->__parser = xml_parser_create();
+			xml_set_object($this->__parser, $this);
+			xml_parser_set_option($this->__parser, XML_OPTION_CASE_FOLDING, 0);
+			xml_parser_set_option($this->__parser, XML_OPTION_SKIP_WHITE, 1);
+		}
+	}
+
+/**
+ * Returns a string representation of the XML object
+ *
+ * @param mixed $options If boolean: whether to include the XML header with the document
+ *        (defaults to true); if an array, overrides the default XML generation options
+ * @return string XML data
+ * @access public
+ * @deprecated
+ * @see Xml::toString()
+ */
+	function compose($options = array()) {
+		return $this->toString($options);
+	}
+
+/**
+ * If debug mode is on, this method echoes an error message.
+ *
+ * @param string $msg Error message
+ * @param integer $code Error code
+ * @param integer $line Line in file
+ * @access public
+ */
+	function error($msg, $code = 0, $line = 0) {
+		if (Configure::read('debug')) {
+			echo $msg . " " . $code . " " . $line;
+		}
+	}
+
+/**
+ * Returns a string with a textual description of the error code, or FALSE if no description was found.
+ *
+ * @param integer $code Error code
+ * @return string Error message
+ * @access public
+ */
+	function getError($code) {
+		$r = @xml_error_string($code);
+		return $r;
+	}
+
+// Overridden functions from superclass
+
+/**
+ * Get next element. NOT implemented.
+ *
+ * @return object
+ * @access public
+ */
+	function &next() {
+		$return = null;
+		return $return;
+	}
+
+/**
+ * Get previous element. NOT implemented.
+ *
+ * @return object
+ * @access public
+ */
+	function &previous() {
+		$return = null;
+		return $return;
+	}
+
+/**
+ * Get parent element. NOT implemented.
+ *
+ * @return object
+ * @access public
+ */
+	function &parent() {
+		$return = null;
+		return $return;
+	}
+
+/**
+ * Adds a namespace to the current document
+ *
+ * @param string $prefix The namespace prefix
+ * @param string $url The namespace DTD URL
+ * @return void
+ */
+	function addNamespace($prefix, $url) {
+		if ($count = count($this->children)) {
+			for ($i = 0; $i < $count; $i++) {
+				$this->children[$i]->addNamespace($prefix, $url);
+			}
+			return true;
+		}
+		return parent::addNamespace($prefix, $url);
+	}
+
+/**
+ * Removes a namespace to the current document
+ *
+ * @param string $prefix The namespace prefix
+ * @return void
+ */
+	function removeNamespace($prefix) {
+		if ($count = count($this->children)) {
+			for ($i = 0; $i < $count; $i++) {
+				$this->children[$i]->removeNamespace($prefix);
+			}
+			return true;
+		}
+		return parent::removeNamespace($prefix);
+	}
+
+/**
+ * Return string representation of current object.
+ *
+ * @return string String representation
+ * @access public
+ */
+	function toString($options = array()) {
+		if (is_bool($options)) {
+			$options = array('header' => $options);
+		}
+
+		$defaults = array('header' => false, 'encoding' => $this->encoding);
+		$options = array_merge($defaults, Xml::options(), $options);
+		$data = parent::toString($options, 0);
+
+		if ($options['header']) {
+			if (!empty($this->__header)) {
+				return $this->header($this->__header)  . "\n" . $data;
+			}
+			return $this->header()  . "\n" . $data;
+		}
+
+		return $data;
+	}
+
+/**
+ * Return a header used on the first line of the xml file
+ *
+ * @param  mixed  $attrib attributes of the header element
+ * @return string formated header
+ */
+	function header($attrib = array()) {
+		$header = 'xml';
+		if (is_string($attrib)) {
+			$header = $attrib;
+		} else {
+
+			$attrib = array_merge(array('version' => $this->version, 'encoding' => $this->encoding), $attrib);
+			foreach ($attrib as $key=>$val) {
+				$header .= ' ' . $key . '="' . $val . '"';
+			}
+		}
+		return '<' . '?' . $header . ' ?' . '>';
+	}
+
+/**
+ * Destructor, used to free resources.
+ *
+ * @access private
+ */
+	function __destruct() {
+		$this->_killParent(true);
+	}
+
+/**
+ * Adds a namespace to any XML documents generated or parsed
+ *
+ * @param  string  $name The namespace name
+ * @param  string  $url  The namespace URI; can be empty if in the default namespace map
+ * @return boolean False if no URL is specified, and the namespace does not exist
+ *                 default namespace map, otherwise true
+ * @access public
+ * @static
+ */
+	function addGlobalNs($name, $url = null) {
+		$_this =& XmlManager::getInstance();
+		if ($ns = Xml::resolveNamespace($name, $url)) {
+			$_this->namespaces = array_merge($_this->namespaces, $ns);
+			return $ns;
+		}
+		return false;
+	}
+
+/**
+ * Resolves current namespace
+ *
+ * @param  string  $name
+ * @param  string  $url
+ * @return array
+ */
+	function resolveNamespace($name, $url) {
+		$_this =& XmlManager::getInstance();
+		if ($url == null && isset($_this->defaultNamespaceMap[$name])) {
+			$url = $_this->defaultNamespaceMap[$name];
+		} elseif ($url == null) {
+			return false;
+		}
+
+		if (!strpos($url, '://') && isset($_this->defaultNamespaceMap[$name])) {
+			$_url = $_this->defaultNamespaceMap[$name];
+			$name = $url;
+			$url = $_url;
+		}
+		return array($name => $url);
+	}
+
+/**
+ * Alias to Xml::addNs
+ *
+ * @access public
+ * @static
+ */
+	function addGlobalNamespace($name, $url = null) {
+		return Xml::addGlobalNs($name, $url);
+	}
+
+/**
+ * Removes a namespace added in addNs()
+ *
+ * @param  string  $name The namespace name or URI
+ * @access public
+ * @static
+ */
+	function removeGlobalNs($name) {
+		$_this =& XmlManager::getInstance();
+		if (isset($_this->namespaces[$name])) {
+			unset($_this->namespaces[$name]);
+			unset($this->namespaces[$name]);
+			return true;
+		} elseif (in_array($name, $_this->namespaces)) {
+			$keys = array_keys($_this->namespaces);
+			$count = count($keys);
+			for ($i = 0; $i < $count; $i++) {
+				if ($_this->namespaces[$keys[$i]] == $name) {
+					unset($_this->namespaces[$keys[$i]]);
+					unset($this->namespaces[$keys[$i]]);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+/**
+ * Alias to Xml::removeNs
+ *
+ * @access public
+ * @static
+ */
+	function removeGlobalNamespace($name) {
+		return Xml::removeGlobalNs($name);
+	}
+
+/**
+ * Sets/gets global XML options
+ *
+ * @param array $options
+ * @return array
+ * @access public
+ * @static
+ */
+	function options($options = array()) {
+		$_this =& XmlManager::getInstance();
+		$_this->options = array_merge($_this->options, $options);
+		return $_this->options;
+	}
+}
+
+/**
+ * The XML Element
+ *
+ */
+class XmlElement extends XmlNode {
+
+/**
+ * Construct an Xml element
+ *
+ * @param  string  $name name of the node
+ * @param  string  $value value of the node
+ * @param  array  $attributes
+ * @param  string  $namespace
+ * @return string A copy of $data in XML format
+ */
+	function __construct($name = null, $value = null, $attributes = array(), $namespace = false) {
+		parent::__construct($name, $value, $namespace);
+		$this->addAttribute($attributes);
+	}
+
+/**
+ * Get all the attributes for this element
+ *
+ * @return array
+ */
+	function attributes() {
+		return $this->attributes;
+	}
+
+/**
+ * Add attributes to this element
+ *
+ * @param  string  $name name of the node
+ * @param  string  $value value of the node
+ * @return boolean
+ */
+	function addAttribute($name, $val = null) {
+		if (is_object($name)) {
+			$name = get_object_vars($name);
+		}
+		if (is_array($name)) {
+			foreach ($name as $key => $val) {
+				$this->addAttribute($key, $val);
+			}
+			return true;
+		}
+		if (is_numeric($name)) {
+			$name = $val;
+			$val = null;
+		}
+		if (!empty($name)) {
+			if (strpos($name, 'xmlns') === 0) {
+				if ($name == 'xmlns') {
+					$this->namespace = $val;
+				} else {
+					list($pre, $prefix) = explode(':', $name);
+					$this->addNamespace($prefix, $val);
+					return true;
+				}
+			}
+			$this->attributes[$name] = $val;
+			return true;
+		}
+		return false;
+	}
+
+/**
+ * Remove attributes to this element
+ *
+ * @param  string  $name name of the node
+ * @return boolean
+ */
+	function removeAttribute($attr) {
+		if (array_key_exists($attr, $this->attributes)) {
+			unset($this->attributes[$attr]);
+			return true;
+		}
+		return false;
+	}
+}
+
+/**
+ * XML text or CDATA node
+ *
+ * Stores XML text data according to the encoding of the parent document
+ *
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP v .1.2.6000
+ */
+class XmlTextNode extends XmlNode {
+
+/**
+ * Harcoded XML node name, represents this object as a text node
+ *
+ * @var string
+ */
+	var $name = '#text';
+
+/**
+ * The text/data value which this node contains
+ *
+ * @var string
+ */
+	var $value = null;
+
+/**
+ * Construct text node with the given parent object and data
+ *
+ * @param object $parent Parent XmlNode/XmlElement object
+ * @param mixed $value Node value
+ */
+	function __construct($value = null) {
+		$this->value = $value;
+	}
+
+/**
+ * Looks for child nodes in this element
+ *
+ * @return boolean False - not supported
+ */
+	function hasChildren() {
+		return false;
+	}
+
+/**
+ * Append an XML node: XmlTextNode does not support this operation
+ *
+ * @return boolean False - not supported
+ * @todo make convertEntities work without mb support, convert entities to number entities
+ */
+	function append() {
+		return false;
+	}
+
+/**
+ * Return string representation of current text node object.
+ *
+ * @return string String representation
+ * @access public
+ */
+	function toString($options = array(), $depth = 0) {
+		if (is_int($options)) {
+			$depth = $options;
+			$options = array();
+		}
+
+		$defaults = array('cdata' => true, 'whitespace' => false, 'convertEntities'	=> false);
+		$options = array_merge($defaults, Xml::options(), $options);
+		$val = $this->value;
+
+		if ($options['convertEntities'] && function_exists('mb_convert_encoding')) {
+			$val = mb_convert_encoding($val,'UTF-8', 'HTML-ENTITIES');
+		}
+
+		if ($options['cdata'] === true && !is_numeric($val)) {
+			$val = '<![CDATA[' . $val . ']]>';
+		}
+
+		if ($options['whitespace']) {
+			return str_repeat("\t", $depth) . $val . "\n";
+		}
+		return $val;
+	}
+}
+
+/**
+ * Manages application-wide namespaces and XML parsing/generation settings.
+ * Private class, used exclusively within scope of XML class.
+ *
+ * @access private
+ */
+class XmlManager {
+
+/**
+ * Global XML namespaces.  Used in all XML documents processed by this application
+ *
+ * @var array
+ * @access public
+ */
+	var $namespaces = array();
+
+/**
+ * Global XML document parsing/generation settings.
+ *
+ * @var array
+ * @access public
+ */
+	var $options = array();
+
+/**
+ * Map of common namespace URIs
+ *
+ * @access private
+ * @var array
+ */
+	var $defaultNamespaceMap = array(
+		'dc'     => 'http://purl.org/dc/elements/1.1/',					// Dublin Core
+		'dct'    => 'http://purl.org/dc/terms/',						// Dublin Core Terms
+		'g'			=> 'http://base.google.com/ns/1.0',					// Google Base
+		'rc'		=> 'http://purl.org/rss/1.0/modules/content/',		// RSS 1.0 Content Module
+		'wf'		=> 'http://wellformedweb.org/CommentAPI/',			// Well-Formed Web Comment API
+		'fb'		=> 'http://rssnamespace.org/feedburner/ext/1.0',	// FeedBurner extensions
+		'lj'		=> 'http://www.livejournal.org/rss/lj/1.0/',		// Live Journal
+		'itunes'	=> 'http://www.itunes.com/dtds/podcast-1.0.dtd',	// iTunes
+		'xhtml'		=> 'http://www.w3.org/1999/xhtml',					// XHTML,
+		'atom'	 	=> 'http://www.w3.org/2005/Atom'					// Atom
+	);
+
+/**
+ * Returns a reference to the global XML object that manages app-wide XML settings
+ *
+ * @return object
+ * @access public
+ */
+	function &getInstance() {
+		static $instance = array();
+
+		if (!$instance) {
+			$instance[0] =& new XmlManager();
+		}
+		return $instance[0];
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/basics.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/basics.test.php
new file mode 100644
index 000000000..6ba22e6b8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/basics.test.php
@@ -0,0 +1,828 @@
+<?php
+/**
+ * BasicsTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once CAKE . 'basics.php';
+App::import('Core', 'Folder');
+
+/**
+ * BasicsTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class BasicsTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function setUp() {
+		App::build(array(
+			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+		));
+		$this->_language = Configure::read('Config.language');
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function tearDown() {
+		App::build();
+		Configure::write('Config.language', $this->_language);
+	}
+
+/**
+ * test the array_diff_key compatibility function.
+ *
+ * @return void
+ * @access public
+ */
+	function testArrayDiffKey() {
+		$one = array('one' => 1, 'two' => 2, 'three' => 3);
+		$two = array('one' => 'one', 'two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('three' => 3);
+		$this->assertEqual($result, $expected);
+
+		$one = array('one' => array('value', 'value-two'), 'two' => 2, 'three' => 3);
+		$two = array('two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('one' => array('value', 'value-two'), 'three' => 3);
+		$this->assertEqual($result, $expected);
+
+		$one = array('one' => null, 'two' => 2, 'three' => '', 'four' => 0);
+		$two = array('two' => 'two');
+		$result = array_diff_key($one, $two);
+		$expected = array('one' => null, 'three' => '', 'four' => 0);
+		$this->assertEqual($result, $expected);
+
+		$one = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
+		$two = array('minYear' => null, 'maxYear' => null, 'separator' => '-', 'interval' => 1, 'monthNames' => true);
+		$result = array_diff_key($one, $two);
+		$this->assertEqual($result, array());
+
+	}
+/**
+ * testHttpBase method
+ *
+ * @return void
+ * @access public
+ */
+	function testEnv() {
+		$this->skipIf(!function_exists('ini_get') || ini_get('safe_mode') === '1', '%s safe mode is on');
+
+		$__SERVER = $_SERVER;
+		$__ENV = $_ENV;
+
+		$_SERVER['HTTP_HOST'] = 'localhost';
+		$this->assertEqual(env('HTTP_BASE'), '.localhost');
+
+		$_SERVER['HTTP_HOST'] = 'com.ar';
+		$this->assertEqual(env('HTTP_BASE'), '.com.ar');
+
+		$_SERVER['HTTP_HOST'] = 'example.ar';
+		$this->assertEqual(env('HTTP_BASE'), '.example.ar');
+
+		$_SERVER['HTTP_HOST'] = 'example.com';
+		$this->assertEqual(env('HTTP_BASE'), '.example.com');
+
+		$_SERVER['HTTP_HOST'] = 'www.example.com';
+		$this->assertEqual(env('HTTP_BASE'), '.example.com');
+
+		$_SERVER['HTTP_HOST'] = 'subdomain.example.com';
+		$this->assertEqual(env('HTTP_BASE'), '.example.com');
+
+		$_SERVER['HTTP_HOST'] = 'example.com.ar';
+		$this->assertEqual(env('HTTP_BASE'), '.example.com.ar');
+
+		$_SERVER['HTTP_HOST'] = 'www.example.com.ar';
+		$this->assertEqual(env('HTTP_BASE'), '.example.com.ar');
+
+		$_SERVER['HTTP_HOST'] = 'subdomain.example.com.ar';
+		$this->assertEqual(env('HTTP_BASE'), '.example.com.ar');
+
+		$_SERVER['HTTP_HOST'] = 'double.subdomain.example.com';
+		$this->assertEqual(env('HTTP_BASE'), '.subdomain.example.com');
+
+		$_SERVER['HTTP_HOST'] = 'double.subdomain.example.com.ar';
+		$this->assertEqual(env('HTTP_BASE'), '.subdomain.example.com.ar');
+
+		$_SERVER = $_ENV = array();
+
+		$_SERVER['SCRIPT_NAME'] = '/a/test/test.php';
+		$this->assertEqual(env('SCRIPT_NAME'), '/a/test/test.php');
+
+		$_SERVER = $_ENV = array();
+
+		$_ENV['CGI_MODE'] = 'BINARY';
+		$_ENV['SCRIPT_URL'] = '/a/test/test.php';
+		$this->assertEqual(env('SCRIPT_NAME'), '/a/test/test.php');
+
+		$_SERVER = $_ENV = array();
+
+		$this->assertFalse(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 'on';
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = '1';
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 'I am not empty';
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 1;
+		$this->assertTrue(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = 'off';
+		$this->assertFalse(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = false;
+		$this->assertFalse(env('HTTPS'));
+
+		$_SERVER['HTTPS'] = '';
+		$this->assertFalse(env('HTTPS'));
+
+		$_SERVER = array();
+
+		$_ENV['SCRIPT_URI'] = 'https://domain.test/a/test.php';
+		$this->assertTrue(env('HTTPS'));
+
+		$_ENV['SCRIPT_URI'] = 'http://domain.test/a/test.php';
+		$this->assertFalse(env('HTTPS'));
+
+		$_SERVER = $_ENV = array();
+
+		$this->assertFalse(env('TEST_ME'));
+
+		$_ENV['TEST_ME'] = 'a';
+		$this->assertEqual(env('TEST_ME'), 'a');
+
+		$_SERVER['TEST_ME'] = 'b';
+		$this->assertEqual(env('TEST_ME'), 'b');
+
+		unset($_ENV['TEST_ME']);
+		$this->assertEqual(env('TEST_ME'), 'b');
+
+		$_SERVER = $__SERVER;
+		$_ENV = $__ENV;
+	}
+
+/**
+ * test uses()
+ *
+ * @return void
+ * @access public
+ * @deprecated
+ */
+	function testUses() {
+		$this->skipIf(class_exists('Security') || class_exists('Sanitize'), '%s Security and/or Sanitize class already loaded');
+
+		$this->assertFalse(class_exists('Security'));
+		$this->assertFalse(class_exists('Sanitize'));
+
+		uses('Security', 'Sanitize');
+
+		$this->assertTrue(class_exists('Security'));
+		$this->assertTrue(class_exists('Sanitize'));
+	}
+
+/**
+ * Test h()
+ *
+ * @return void
+ * @access public
+ */
+	function testH() {
+		$string = '<foo>';
+		$result = h($string);
+		$this->assertEqual('&lt;foo&gt;', $result);
+
+		$in = array('this & that', '<p>Which one</p>');
+		$result = h($in);
+		$expected = array('this &amp; that', '&lt;p&gt;Which one&lt;/p&gt;');
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * Test a()
+ *
+ * @return void
+ * @access public
+ */
+	function testA() {
+		$result = a('this', 'that', 'bar');
+		$this->assertEqual(array('this', 'that', 'bar'), $result);
+	}
+
+/**
+ * Test aa()
+ *
+ * @return void
+ * @access public
+ */
+	function testAa() {
+		$result = aa('a', 'b', 'c', 'd');
+		$expected = array('a' => 'b', 'c' => 'd');
+		$this->assertEqual($expected, $result);
+
+		$result = aa('a', 'b', 'c', 'd', 'e');
+		$expected = array('a' => 'b', 'c' => 'd', 'e' => null);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test am()
+ *
+ * @return void
+ * @access public
+ */
+	function testAm() {
+		$result = am(array('one', 'two'), 2, 3, 4);
+		$expected = array('one', 'two', 2, 3, 4);
+		$this->assertEqual($result, $expected);
+
+		$result = am(array('one' => array(2, 3), 'two' => array('foo')), array('one' => array(4, 5)));
+		$expected = array('one' => array(4, 5),'two' => array('foo'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test cache()
+ *
+ * @return void
+ * @access public
+ */
+	function testCache() {
+		$_cacheDisable = Configure::read('Cache.disable');
+		if ($this->skipIf($_cacheDisable, 'Cache is disabled, skipping cache() tests. %s')) {
+			return;
+		}
+
+		Configure::write('Cache.disable', true);
+		$result = cache('basics_test', 'simple cache write');
+		$this->assertNull($result);
+
+		$result = cache('basics_test');
+		$this->assertNull($result);
+
+		Configure::write('Cache.disable', false);
+		$result = cache('basics_test', 'simple cache write');
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists(CACHE . 'basics_test'));
+
+		$result = cache('basics_test');
+		$this->assertEqual($result, 'simple cache write');
+		@unlink(CACHE . 'basics_test');
+
+		cache('basics_test', 'expired', '+1 second');
+		sleep(2);
+		$result = cache('basics_test', null, '+1 second');
+		$this->assertNull($result);
+
+		Configure::write('Cache.disable', $_cacheDisable);
+	}
+
+/**
+ * test clearCache()
+ *
+ * @return void
+ * @access public
+ */
+	function testClearCache() {
+		$cacheOff = Configure::read('Cache.disable');
+		if ($this->skipIf($cacheOff, 'Cache is disabled, skipping clearCache() tests. %s')) {
+			return;
+		}
+
+		cache('views' . DS . 'basics_test.cache', 'simple cache write');
+		$this->assertTrue(file_exists(CACHE . 'views' . DS . 'basics_test.cache'));
+
+		cache('views' . DS . 'basics_test_2.cache', 'simple cache write 2');
+		$this->assertTrue(file_exists(CACHE . 'views' . DS . 'basics_test_2.cache'));
+
+		cache('views' . DS . 'basics_test_3.cache', 'simple cache write 3');
+		$this->assertTrue(file_exists(CACHE . 'views' . DS . 'basics_test_3.cache'));
+
+		$result = clearCache(array('basics_test', 'basics_test_2'), 'views', '.cache');
+		$this->assertTrue($result);
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'basics_test.cache'));
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'basics_test.cache'));
+		$this->assertTrue(file_exists(CACHE . 'views' . DS . 'basics_test_3.cache'));
+
+		$result = clearCache(null, 'views', '.cache');
+		$this->assertTrue($result);
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'basics_test_3.cache'));
+
+		// Different path from views and with prefix
+		cache('models' . DS . 'basics_test.cache', 'simple cache write');
+		$this->assertTrue(file_exists(CACHE . 'models' . DS . 'basics_test.cache'));
+
+		cache('models' . DS . 'basics_test_2.cache', 'simple cache write 2');
+		$this->assertTrue(file_exists(CACHE . 'models' . DS . 'basics_test_2.cache'));
+
+		cache('models' . DS . 'basics_test_3.cache', 'simple cache write 3');
+		$this->assertTrue(file_exists(CACHE . 'models' . DS . 'basics_test_3.cache'));
+
+		$result = clearCache('basics', 'models', '.cache');
+		$this->assertTrue($result);
+		$this->assertFalse(file_exists(CACHE . 'models' . DS . 'basics_test.cache'));
+		$this->assertFalse(file_exists(CACHE . 'models' . DS . 'basics_test_2.cache'));
+		$this->assertFalse(file_exists(CACHE . 'models' . DS . 'basics_test_3.cache'));
+
+		// checking if empty files were not removed
+		$emptyExists = file_exists(CACHE . 'views' . DS . 'empty');
+		if (!$emptyExists) {
+			cache('views' . DS . 'empty', '');
+		}
+		cache('views' . DS . 'basics_test.php', 'simple cache write');
+		$this->assertTrue(file_exists(CACHE . 'views' . DS . 'basics_test.php'));
+		$this->assertTrue(file_exists(CACHE . 'views' . DS . 'empty'));
+
+		$result = clearCache();
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists(CACHE . 'views' . DS . 'empty'));
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'basics_test.php'));
+		if (!$emptyExists) {
+			unlink(CACHE . 'views' . DS . 'empty');
+		}
+	}
+
+/**
+ * test __()
+ *
+ * @return void
+ * @access public
+ */
+	function test__() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$result = __('Plural Rule 1', true);
+		$expected = 'Plural Rule 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __('Plural Rule 1 (from core)', true);
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			__('Plural Rule 1 (from core)');
+		$result = ob_get_clean();
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test __n()
+ *
+ * @return void
+ * @access public
+ */
+	function test__n() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$result = __n('%d = 1', '%d = 0 or > 1', 0, true);
+		$expected = '%d = 0 or > 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __n('%d = 1', '%d = 0 or > 1', 1, true);
+		$expected = '%d = 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', 2, true);
+		$expected = '%d = 0 or > 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			__n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', 2);
+		$result = ob_get_clean();
+		$expected = '%d = 0 or > 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test __d()
+ *
+ * @return void
+ * @access public
+ */
+	function test__d() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$result = __d('default', 'Plural Rule 1', true);
+		$expected = 'Plural Rule 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __d('core', 'Plural Rule 1', true);
+		$expected = 'Plural Rule 1';
+		$this->assertEqual($result, $expected);
+
+		$result = __d('core', 'Plural Rule 1 (from core)', true);
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			__d('core', 'Plural Rule 1 (from core)');
+		$result = ob_get_clean();
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test __dn()
+ *
+ * @return void
+ * @access public
+ */
+	function test__dn() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$result = __dn('default', '%d = 1', '%d = 0 or > 1', 0, true);
+		$expected = '%d = 0 or > 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __dn('core', '%d = 1', '%d = 0 or > 1', 0, true);
+		$expected = '%d = 0 or > 1';
+		$this->assertEqual($result, $expected);
+
+		$result = __dn('core', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 0, true);
+		$expected = '%d = 0 or > 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __dn('default', '%d = 1', '%d = 0 or > 1', 1, true);
+		$expected = '%d = 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			__dn('core', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 2);
+		$result = ob_get_clean();
+		$expected = '%d = 0 or > 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test __c()
+ *
+ * @return void
+ * @access public
+ */
+	function test__c() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$result = __c('Plural Rule 1', 6, true);
+		$expected = 'Plural Rule 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __c('Plural Rule 1 (from core)', 6, true);
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			__c('Plural Rule 1 (from core)', 6);
+		$result = ob_get_clean();
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test __dc()
+ *
+ * @return void
+ * @access public
+ */
+	function test__dc() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$result = __dc('default', 'Plural Rule 1', 6, true);
+		$expected = 'Plural Rule 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __dc('default', 'Plural Rule 1 (from core)', 6, true);
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __dc('core', 'Plural Rule 1', 6, true);
+		$expected = 'Plural Rule 1';
+		$this->assertEqual($result, $expected);
+
+		$result = __dc('core', 'Plural Rule 1 (from core)', 6, true);
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			__dc('default', 'Plural Rule 1 (from core)', 6);
+		$result = ob_get_clean();
+		$expected = 'Plural Rule 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test __dcn()
+ *
+ * @return void
+ * @access public
+ */
+	function test__dcn() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$result = __dcn('default', '%d = 1', '%d = 0 or > 1', 0, 6, true);
+		$expected = '%d = 0 or > 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 6, true);
+		$expected = '%d = 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __dcn('core', '%d = 1', '%d = 0 or > 1', 0, 6, true);
+		$expected = '%d = 0 or > 1';
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			__dcn('default', '%d = 1 (from core)', '%d = 0 or > 1 (from core)', 1, 6);
+		$result = ob_get_clean();
+		$expected = '%d = 1 (from core translated)';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test LogError()
+ *
+ * @return void
+ * @access public
+ */
+	function testLogError() {
+		@unlink(LOGS . 'error.log');
+
+		LogError('Testing LogError() basic function');
+		LogError("Testing with\nmulti-line\nstring");
+
+		$result = file_get_contents(LOGS . 'error.log');
+		$this->assertPattern('/Error: Testing LogError\(\) basic function/', $result);
+		$this->assertNoPattern("/Error: Testing with\nmulti-line\nstring/", $result);
+		$this->assertPattern('/Error: Testing with multi-line string/', $result);
+	}
+
+/**
+ * test fileExistsInPath()
+ *
+ * @return void
+ * @access public
+ */
+	function testFileExistsInPath() {
+		$this->skipUnless(function_exists('ini_set'), '%s ini_set function not available');
+
+		$_includePath = ini_get('include_path');
+
+		$path = TMP . 'basics_test';
+		$folder1 = $path . DS . 'folder1';
+		$folder2 = $path . DS . 'folder2';
+		$file1 = $path . DS . 'file1.php';
+		$file2 = $folder1 . DS . 'file2.php';
+		$file3 = $folder1 . DS . 'file3.php';
+		$file4 = $folder2 . DS . 'file4.php';
+
+		new Folder($path, true);
+		new Folder($folder1, true);
+		new Folder($folder2, true);
+		touch($file1);
+		touch($file2);
+		touch($file3);
+		touch($file4);
+
+		ini_set('include_path', $path . PATH_SEPARATOR . $folder1);
+
+		$this->assertEqual(fileExistsInPath('file1.php'), $file1);
+		$this->assertEqual(fileExistsInPath('file2.php'), $file2);
+		$this->assertEqual(fileExistsInPath('folder1' . DS . 'file2.php'), $file2);
+		$this->assertEqual(fileExistsInPath($file2), $file2);
+		$this->assertEqual(fileExistsInPath('file3.php'), $file3);
+		$this->assertEqual(fileExistsInPath($file4), $file4);
+
+		$this->assertFalse(fileExistsInPath('file1'));
+		$this->assertFalse(fileExistsInPath('file4.php'));
+
+		$Folder = new Folder($path);
+		$Folder->delete();
+
+		ini_set('include_path', $_includePath);
+	}
+
+/**
+ * test convertSlash()
+ *
+ * @return void
+ * @access public
+ */
+	function testConvertSlash() {
+		$result = convertSlash('\path\to\location\\');
+		$expected = '\path\to\location\\';
+		$this->assertEqual($result, $expected);
+
+		$result = convertSlash('/path/to/location/');
+		$expected = 'path_to_location';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test debug()
+ *
+ * @return void
+ * @access public
+ */
+	function testDebug() {
+		ob_start();
+			debug('this-is-a-test');
+		$result = ob_get_clean();
+		$pattern = '/.*\>(.+?tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
+		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
+		$pattern .= '.*line.*' . (__LINE__ - 4) . '.*this-is-a-test.*/s';
+		$this->assertPattern($pattern, $result);
+
+		ob_start();
+			debug('<div>this-is-a-test</div>', true);
+		$result = ob_get_clean();
+		$pattern = '/.*\>(.+?tests(\/|\\\)cases(\/|\\\)basics\.test\.php|';
+		$pattern .= preg_quote(substr(__FILE__, 1), '/') . ')';
+		$pattern .=	'.*line.*' . (__LINE__ - 4) . '.*&lt;div&gt;this-is-a-test&lt;\/div&gt;.*/s';
+		$this->assertPattern($pattern, $result);
+	}
+
+/**
+ * test pr()
+ *
+ * @return void
+ * @access public
+ */
+	function testPr() {
+		ob_start();
+			pr('this is a test');
+		$result = ob_get_clean();
+		$expected = "<pre>this is a test</pre>";
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+			pr(array('this' => 'is', 'a' => 'test'));
+		$result = ob_get_clean();
+		$expected = "<pre>Array\n(\n    [this] => is\n    [a] => test\n)\n</pre>";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test params()
+ *
+ * @return void
+ * @access public
+ */
+	function testParams() {
+		$this->assertNull(params('weekend'));
+		$this->assertNull(params(array()));
+		$this->assertEqual(params(array('weekend')), array('weekend'));
+
+		$nested = array(array('weekend'));
+		$this->assertEqual(params($nested), array('weekend'));
+
+		$multiple = array(array('weekend'), 'jean-luc', 'godard');
+		$this->assertEqual(params($multiple), $multiple);
+	}
+
+/**
+ * test stripslashes_deep()
+ *
+ * @return void
+ * @access public
+ */
+	function testStripslashesDeep() {
+		$this->skipIf(ini_get('magic_quotes_sybase') === '1', '%s magic_quotes_sybase is on');
+
+		$this->assertEqual(stripslashes_deep("tes\'t"), "tes't");
+		$this->assertEqual(stripslashes_deep('tes\\' . chr(0) .'t'), 'tes' . chr(0) .'t');
+		$this->assertEqual(stripslashes_deep('tes\"t'), 'tes"t');
+		$this->assertEqual(stripslashes_deep("tes\'t"), "tes't");
+		$this->assertEqual(stripslashes_deep('te\\st'), 'test');
+
+		$nested = array(
+			'a' => "tes\'t",
+			'b' => 'tes\\' . chr(0) .'t',
+			'c' => array(
+				'd' => 'tes\"t',
+				'e' => "te\'s\'t",
+				array('f' => "tes\'t")
+				),
+			'g' => 'te\\st'
+			);
+		$expected = array(
+			'a' => "tes't",
+			'b' => 'tes' . chr(0) .'t',
+			'c' => array(
+				'd' => 'tes"t',
+				'e' => "te's't",
+				array('f' => "tes't")
+				),
+			'g' => 'test'
+			);
+		$this->assertEqual(stripslashes_deep($nested), $expected);
+	}
+
+/**
+ * test stripslashes_deep() with magic_quotes_sybase on
+ *
+ * @return void
+ * @access public
+ */
+	function testStripslashesDeepSybase() {
+		$this->skipUnless(ini_get('magic_quotes_sybase') === '1', '%s magic_quotes_sybase is off');
+
+		$this->assertEqual(stripslashes_deep("tes\'t"), "tes\'t");
+
+		$nested = array(
+			'a' => "tes't",
+			'b' => "tes''t",
+			'c' => array(
+				'd' => "tes'''t",
+				'e' => "tes''''t",
+				array('f' => "tes''t")
+				),
+			'g' => "te'''''st"
+			);
+		$expected = array(
+			'a' => "tes't",
+			'b' => "tes't",
+			'c' => array(
+				'd' => "tes''t",
+				'e' => "tes''t",
+				array('f' => "tes't")
+				),
+			'g' => "te'''st"
+			);
+		$this->assertEqual(stripslashes_deep($nested), $expected);
+	}
+
+/**
+ * test ife()
+ *
+ * @return void
+ * @access public
+ */
+	function testIfe() {
+		$this->assertEqual(ife(true, 'a', 'b'), 'a');
+		$this->assertEqual(ife(' ', 'a', 'b'), 'a');
+		$this->assertEqual(ife('test', 'a', 'b'), 'a');
+		$this->assertEqual(ife(23, 'a', 'b'), 'a');
+		$this->assertEqual(ife(array('t' => 'est'), 'a', 'b'), 'a');
+
+		$this->assertEqual(ife(false, 'a', 'b'), 'b');
+		$this->assertEqual(ife(null, 'a', 'b'), 'b');
+		$this->assertEqual(ife('', 'a', 'b'), 'b');
+		$this->assertEqual(ife(0, 'a', 'b'), 'b');
+		$this->assertEqual(ife(array(), 'a', 'b'), 'b');
+	}
+
+/**
+ * test pluginSplit
+ *
+ * @return void
+ */
+	function testPluginSplit() {
+		$result = pluginSplit('Something.else');
+		$this->assertEqual($result, array('Something', 'else'));
+
+		$result = pluginSplit('Something.else.more.dots');
+		$this->assertEqual($result, array('Something', 'else.more.dots'));
+
+		$result = pluginSplit('Somethingelse');
+		$this->assertEqual($result, array(null, 'Somethingelse'));
+
+		$result = pluginSplit('Something.else', true);
+		$this->assertEqual($result, array('Something.', 'else'));
+
+		$result = pluginSplit('Something.else.more.dots', true);
+		$this->assertEqual($result, array('Something.', 'else.more.dots'));
+
+		$result = pluginSplit('Post', false, 'Blog');
+		$this->assertEqual($result, array('Blog', 'Post'));
+
+		$result = pluginSplit('Blog.Post', false, 'Ultimate');
+		$this->assertEqual($result, array('Blog', 'Post'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/cake.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/cake.test.php
new file mode 100644
index 000000000..3a558655a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/cake.test.php
@@ -0,0 +1,956 @@
+<?php
+/**
+ * ShellDispatcherTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.console
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CONSOLE_LIBS . 'shell.php';
+
+/**
+ * TestShellDispatcher class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console
+ */
+class TestShellDispatcher extends ShellDispatcher {
+
+/**
+ * params property
+ *
+ * @var array
+ * @access public
+ */
+	var $params = array();
+
+/**
+ * stdout property
+ *
+ * @var string
+ * @access public
+ */
+	var $stdout = '';
+
+/**
+ * stderr property
+ *
+ * @var string
+ * @access public
+ */
+	var $stderr = '';
+
+/**
+ * stopped property
+ *
+ * @var string
+ * @access public
+ */
+	var $stopped = null;
+
+/**
+ * TestShell
+ *
+ * @var mixed
+ * @access public
+ */
+	var $TestShell;
+
+/**
+ * _initEnvironment method
+ *
+ * @return void
+ * @access protected
+ */
+	function _initEnvironment() {
+	}
+
+/**
+ * stderr method
+ *
+ * @return void
+ * @access public
+ */
+	function stderr($string) {
+		$this->stderr .= rtrim($string, ' ');
+	}
+
+/**
+ * stdout method
+ *
+ * @return void
+ * @access public
+ */
+	function stdout($string, $newline = true) {
+		if ($newline) {
+			$this->stdout .= rtrim($string, ' ') . "\n";
+		} else {
+			$this->stdout .= rtrim($string, ' ');
+		}
+	}
+
+/**
+ * clear method
+ *
+ * @return void
+ * @access public
+ */
+	function clear() {
+
+	}
+
+/**
+ * _stop method
+ *
+ * @return void
+ * @access protected
+ */
+	function _stop($status = 0) {
+		$this->stopped = 'Stopped with status: ' . $status;
+		return $status;
+	}
+
+/**
+ * getShell
+ *
+ * @param mixed $plugin
+ * @return mixed
+ * @access public
+ */
+	function getShell($plugin = null) {
+		return $this->_getShell($plugin);
+	}
+
+/**
+ * _getShell
+ *
+ * @param mixed $plugin
+ * @return mixed
+ * @access protected
+ */
+	function _getShell($plugin = null) {
+		if (isset($this->TestShell)) {
+			return $this->TestShell;
+		}
+		return parent::_getShell($plugin);
+	}
+}
+
+/**
+ * ShellDispatcherTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ShellDispatcherTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function setUp() {
+		App::build(array(
+			'plugins' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+			),
+			'shells' => array(
+				CORE_PATH ? CONSOLE_LIBS : ROOT . DS . CONSOLE_LIBS,
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS . 'shells' . DS
+			)
+		), true);
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function tearDown() {
+		App::build();
+	}
+
+/**
+ * testParseParams method
+ *
+ * @return void
+ * @access public
+ */
+	function testParseParams() {
+		$Dispatcher =& new TestShellDispatcher();
+
+		$params = array(
+			'/cake/1.2.x.x/cake/console/cake.php',
+			'bake',
+			'-app',
+			'new',
+			'-working',
+			'/var/www/htdocs'
+		);
+		$expected = array(
+			'app' => 'new',
+			'webroot' => 'webroot',
+			'working' => '/var/www/htdocs/new',
+			'root' => '/var/www/htdocs'
+		);
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array('cake.php');
+		$expected = array(
+			'app' => 'app',
+			'webroot' => 'webroot',
+			'working' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH . DS . 'app'),
+			'root' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH),
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'cake.php',
+			'-app',
+			'new',
+		);
+		$expected = array(
+			'app' => 'new',
+			'webroot' => 'webroot',
+			'working' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH . DS . 'new'),
+			'root' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH)
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'./cake.php',
+			'bake',
+			'-app',
+			'new',
+			'-working',
+			'/cake/1.2.x.x/cake/console'
+		);
+
+		$expected = array(
+			'app' => 'new',
+			'webroot' => 'webroot',
+			'working' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH . DS . 'new'),
+			'root' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH)
+		);
+
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'./console/cake.php',
+			'bake',
+			'-app',
+			'new',
+			'-working',
+			'/cake/1.2.x.x/cake'
+		);
+		$expected = array(
+			'app' => 'new',
+			'webroot' => 'webroot',
+			'working' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH . DS . 'new'),
+			'root' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH)
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'./console/cake.php',
+			'bake',
+			'-app',
+			'new',
+			'-dry',
+			'-working',
+			'/cake/1.2.x.x/cake'
+		);
+		$expected = array(
+			'app' => 'new',
+			'webroot' => 'webroot',
+			'working' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH . DS . 'new'),
+			'root' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH),
+			'dry' => 1
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'./console/cake.php',
+			'-working',
+			'/cake/1.2.x.x/cake',
+			'schema',
+			'run',
+			'create',
+			'-dry',
+			'-f',
+			'-name',
+			'DbAcl'
+		);
+		$expected = array(
+			'app' => 'app',
+			'webroot' => 'webroot',
+			'working' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH . DS . 'app'),
+			'root' => str_replace('\\', '/', CAKE_CORE_INCLUDE_PATH),
+			'dry' => 1,
+			'f' => 1,
+			'name' => 'DbAcl'
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$expected = array('./console/cake.php', 'schema', 'run', 'create');
+		$this->assertEqual($expected, $Dispatcher->args);
+
+		$params = array(
+			'/cake/1.2.x.x/cake/console/cake.php',
+			'-working',
+			'/cake/1.2.x.x/app',
+			'schema',
+			'run',
+			'create',
+			'-dry',
+			'-name',
+			'DbAcl'
+		);
+		$expected = array(
+			'app' => 'app',
+			'webroot' => 'webroot',
+			'working' => '/cake/1.2.x.x/app',
+			'root' => '/cake/1.2.x.x',
+			'dry' => 1,
+			'name' => 'DbAcl'
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$expected = array('/cake/1.2.x.x/cake/console/cake.php', 'schema', 'run', 'create');
+		$this->assertEqual($expected, $Dispatcher->args);
+		$params = array(
+			'cake.php',
+			'-working',
+			'C:/wamp/www/cake/app',
+			'bake',
+			'-app',
+			'C:/wamp/www/apps/cake/app',
+		);
+		$expected = array(
+			'app' => 'app',
+			'webroot' => 'webroot',
+			'working' => 'C:\wamp\www\apps\cake\app',
+			'root' => 'C:\wamp\www\apps\cake'
+		);
+
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'cake.php',
+			'-working',
+			'C:\wamp\www\cake\app',
+			'bake',
+			'-app',
+			'C:\wamp\www\apps\cake\app',
+		);
+		$expected = array(
+			'app' => 'app',
+			'webroot' => 'webroot',
+			'working' => 'C:\wamp\www\apps\cake\app',
+			'root' => 'C:\wamp\www\apps\cake'
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'cake.php',
+			'-working',
+			'C:\wamp\www\apps',
+			'bake',
+			'-app',
+			'cake\app',
+			'-url',
+			'http://example.com/some/url/with/a/path'
+		);
+		$expected = array(
+			'app' => 'app',
+			'webroot' => 'webroot',
+			'working' => 'C:\wamp\www\apps\cake\app',
+			'root' => 'C:\wamp\www\apps\cake',
+			'url' => 'http://example.com/some/url/with/a/path'
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'/home/amelo/dev/cake-common/cake/console/cake.php',
+			'-root',
+			'/home/amelo/dev/lsbu-vacancy',
+			'-working',
+			'/home/amelo/dev/lsbu-vacancy',
+			'-app',
+			'app',
+		);
+		$expected = array(
+			'app' => 'app',
+			'webroot' => 'webroot',
+			'working' => '/home/amelo/dev/lsbu-vacancy/app',
+			'root' => '/home/amelo/dev/lsbu-vacancy',
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+
+		$params = array(
+			'cake.php',
+			'-working',
+			'D:\www',
+			'bake',
+			'my_app',
+		);
+		$expected = array(
+			'working' => 'D:\www',
+			'app' => 'www',
+			'root' => 'D:',
+			'webroot' => 'webroot'
+		);
+
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+		
+		$params = array(
+			'cake.php',
+			'-working',
+			'D:\ ',
+			'bake',
+			'my_app',
+		);
+		$expected = array(
+			'working' => '.',
+			'app' => 'D:',
+			'root' => '.',
+			'webroot' => 'webroot'
+		);
+		$Dispatcher->params = $Dispatcher->args = array();
+		$Dispatcher->parseParams($params);
+		$this->assertEqual($expected, $Dispatcher->params);
+	}
+
+/**
+ * testBuildPaths method
+ *
+ * @return void
+ * @access public
+ */
+	function testBuildPaths() {
+		$Dispatcher =& new TestShellDispatcher();
+
+		$result = $Dispatcher->shellPaths;
+
+		$expected = array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'vendors' . DS . 'shells' . DS,
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS . 'vendors' . DS . 'shells' . DS,
+			APP . 'vendors' . DS . 'shells' . DS,
+			VENDORS . 'shells' . DS,
+			CORE_PATH ? CONSOLE_LIBS : ROOT . DS . CONSOLE_LIBS,
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS . 'shells' . DS,
+		);
+		$this->assertIdentical(array_diff($result, $expected), array());
+		$this->assertIdentical(array_diff($expected, $result), array());
+	}
+
+/**
+ * Verify loading of (plugin-) shells
+ *
+ * @return void
+ * @access public
+ */
+	function testGetShell() {
+		$this->skipIf(class_exists('SampleShell'), '%s SampleShell Class already loaded');
+		$this->skipIf(class_exists('ExampleShell'), '%s ExampleShell Class already loaded');
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Dispatcher->shell = 'sample';
+		$Dispatcher->shellName = 'Sample';
+		$Dispatcher->shellClass = 'SampleShell';
+
+		$result = $Dispatcher->getShell();
+		$this->assertIsA($result, 'SampleShell');
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Dispatcher->shell = 'example';
+		$Dispatcher->shellName = 'Example';
+		$Dispatcher->shellClass = 'ExampleShell';
+
+		$result = $Dispatcher->getShell('test_plugin');
+		$this->assertIsA($result, 'ExampleShell');
+	}
+
+/**
+ * Verify correct dispatch of Shell subclasses with a main method
+ *
+ * @return void
+ * @access public
+ */
+	function testDispatchShellWithMain() {
+		Mock::generate('Shell', 'MockWithMainShell', array('main', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('initialize');
+		$Shell->expectOnce('loadTasks');
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('initdb'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('help');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'help');
+		$result = $Dispatcher->dispatch();
+		$this->assertNull($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectNever('hr');
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('hr'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('dispatch'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('idontexist'));
+
+		$Shell = new MockWithMainShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('main');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+
+/**
+ * Verify correct dispatch of Shell subclasses without a main method
+ *
+ * @return void
+ * @access public
+ */
+	function testDispatchShellWithoutMain() {
+		Mock::generate('Shell', 'MockWithoutMainShell', array('initDb', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectOnce('initialize');
+		$Shell->expectOnce('loadTasks');
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('initDb');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Shell->expectNever('hr');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+		$this->assertEqual($Dispatcher->args, array('hr'));
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+
+/**
+ * Verify correct dispatch of custom classes with a main method
+ *
+ * @return void
+ * @access public
+ */
+	function testDispatchNotAShellWithMain() {
+		Mock::generate('Object', 'MockWithMainNotAShell',
+			array('main', 'initialize', 'loadTasks', 'startup', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectNever('initialize');
+		$Shell->expectNever('loadTasks');
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('initdb'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('hr'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('dispatch'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->setReturnValue('main', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('main');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array('idontexist'));
+
+		$Shell = new MockWithMainNotAShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('main');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_with_main_not_a', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+
+/**
+ * Verify correct dispatch of custom classes without a main method
+ *
+ * @return void
+ * @access public
+ */
+	function testDispatchNotAShellWithoutMain() {
+		Mock::generate('Object', 'MockWithoutMainNotAShell',
+			array('initDb', 'initialize', 'loadTasks', 'startup', '_secret'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('initialize');
+		$Shell->expectNever('loadTasks');
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectOnce('startup');
+		$Shell->expectOnce('initDb');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'initdb');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'hr');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->setReturnValue('initDb', true);
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'dispatch');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->expectNever('startup');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', 'idontexist');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+
+		$Shell = new MockWithoutMainNotAShell();
+		$Shell->expectNever('startup');
+		$Shell->expectNever('_secret');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_without_main_not_a', '_secret');
+		$result = $Dispatcher->dispatch();
+		$this->assertFalse($result);
+	}
+
+/**
+ * Verify that a task is called instead of the shell if the first arg equals
+ * the name of the task
+ *
+ * @return void
+ * @access public
+ */
+	function testDispatchTask() {
+		Mock::generate('Shell', 'MockWeekShell', array('main'));
+		Mock::generate('Shell', 'MockOnSundayTask', array('execute'));
+
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Shell = new MockWeekShell();
+		$Shell->expectOnce('initialize');
+		$Shell->expectOnce('loadTasks');
+		$Shell->expectNever('startup');
+		$Shell->expectNever('main');
+
+		$Task = new MockOnSundayTask();
+		$Task->setReturnValue('execute', true);
+		$Task->expectOnce('initialize');
+		$Task->expectOnce('loadTasks');
+		$Task->expectOnce('startup');
+		$Task->expectOnce('execute');
+
+		$Shell->MockOnSunday =& $Task;
+		$Shell->taskNames = array('MockOnSunday');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_week', 'mock_on_sunday');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+		$this->assertEqual($Dispatcher->args, array());
+
+		$Shell = new MockWeekShell();
+		$Task = new MockOnSundayTask();
+		$Task->expectNever('execute');
+		$Task->expectOnce('help');
+
+		$Shell->MockOnSunday =& $Task;
+		$Shell->taskNames = array('MockOnSunday');
+		$Dispatcher->TestShell =& $Shell;
+
+		$Dispatcher->args = array('mock_week', 'mock_on_sunday', 'help');
+		$result = $Dispatcher->dispatch();
+		$this->assertTrue($result);
+	}
+
+/**
+ * Verify shifting of arguments
+ *
+ * @return void
+ * @access public
+ */
+	function testShiftArgs() {
+		$Dispatcher =& new TestShellDispatcher();
+
+		$Dispatcher->args = array('a', 'b', 'c');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
+		$this->assertIdentical($Dispatcher->args, array('b', 'c'));
+
+		$Dispatcher->args = array('a' => 'b', 'c', 'd');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'b');
+		$this->assertIdentical($Dispatcher->args, array('c', 'd'));
+
+		$Dispatcher->args = array('a', 'b' => 'c', 'd');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
+		$this->assertIdentical($Dispatcher->args, array('b' => 'c', 'd'));
+
+		$Dispatcher->args = array(0 => 'a',  2 => 'b', 30 => 'c');
+		$this->assertEqual($Dispatcher->shiftArgs(), 'a');
+		$this->assertIdentical($Dispatcher->args, array(0 => 'b', 1 => 'c'));
+
+		$Dispatcher->args = array();
+		$this->assertNull($Dispatcher->shiftArgs());
+		$this->assertIdentical($Dispatcher->args, array());
+	}
+
+/**
+ * testHelpCommand method
+ *
+ * @return void
+ * @access public
+ */
+	function testHelpCommand() {
+		$Dispatcher =& new TestShellDispatcher();
+
+		$expected = "/example \[.*TestPlugin, TestPluginTwo.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/welcome \[.*TestPluginTwo.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/acl \[.*CORE.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/api \[.*CORE.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/bake \[.*CORE.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/console \[.*CORE.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/i18n \[.*CORE.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/schema \[.*CORE.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/testsuite \[.*CORE.*\]/";
+	 	$this->assertPattern($expected, $Dispatcher->stdout);
+
+		$expected = "/sample \[.*test_app.*\]/";
+		$this->assertPattern($expected, $Dispatcher->stdout);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/acl.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/acl.test.php
new file mode 100644
index 000000000..a7dd1b321
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/acl.test.php
@@ -0,0 +1,346 @@
+<?php
+/**
+ * AclShell Test file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+if (!class_exists('AclShell')) {
+	require CAKE . 'console' .  DS . 'libs' . DS . 'acl.php';
+}
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestAclShellMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment', 'dispatch')
+);
+Mock::generatePartial(
+	'AclShell', 'MockAclShell',
+	array('in', 'out', 'hr', 'createFile', 'error', 'err')
+);
+
+Mock::generate('AclComponent', 'MockAclShellAclComponent');
+
+/**
+ * AclShellTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class AclShellTest extends CakeTestCase {
+
+/**
+ * Fixtures
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.aco', 'core.aro', 'core.aros_aco');
+
+/**
+ * configure Configure for testcase
+ *
+ * @return void
+ * @access public
+ */
+	function startCase() {
+		$this->_aclDb = Configure::read('Acl.database');
+		$this->_aclClass = Configure::read('Acl.classname');
+
+		Configure::write('Acl.database', 'test_suite');
+		Configure::write('Acl.classname', 'DbAcl');
+	}
+
+/**
+ * restore Environment settings
+ *
+ * @return void
+ * @access public
+ */
+	function endCase() {
+		Configure::write('Acl.database', $this->_aclDb);
+		Configure::write('Acl.classname', $this->_aclClass);
+	}
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestAclShellMockShellDispatcher();
+		$this->Task =& new MockAclShell($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->params['datasource'] = 'test_suite';
+		$this->Task->Acl =& new AclComponent();
+		$controller = null;
+		$this->Task->Acl->startup($controller);
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * test that model.foreign_key output works when looking at acl rows
+ *
+ * @return void
+ * @access public
+ */
+	function testViewWithModelForeignKeyOutput() {
+		$this->Task->command = 'view';
+		$this->Task->startup();
+		$data = array(
+			'parent_id' => null,
+			'model' => 'MyModel',
+			'foreign_key' => 2,
+		);
+		$this->Task->Acl->Aro->create($data);
+		$this->Task->Acl->Aro->save();
+		$this->Task->args[0] = 'aro';
+
+		$this->Task->expectAt(0, 'out', array('Aro tree:'));
+		$this->Task->expectAt(1, 'out', array(new PatternExpectation('/\[1\] ROOT/')));
+		$this->Task->expectAt(3, 'out', array(new PatternExpectation('/\[3\] Gandalf/')));
+		$this->Task->expectAt(5, 'out', array(new PatternExpectation('/\[5\] MyModel.2/')));
+
+		$this->Task->view();
+	}
+
+/**
+ * test view with an argument
+ *
+ * @return void
+ * @access public
+ */
+	function testViewWithArgument() {
+		$this->Task->args = array('aro', 'admins');
+		$this->Task->expectAt(0, 'out', array('Aro tree:'));
+		$this->Task->expectAt(1, 'out', array('  [2] admins'));
+		$this->Task->expectAt(2, 'out', array('    [3] Gandalf'));
+		$this->Task->expectAt(3, 'out', array('    [4] Elrond'));
+		$this->Task->view();
+	}
+
+/**
+ * test the method that splits model.foreign key. and that it returns an array.
+ *
+ * @return void
+ * @access public
+ */
+	function testParsingModelAndForeignKey() {
+		$result = $this->Task->parseIdentifier('Model.foreignKey');
+		$expected = array('model' => 'Model', 'foreign_key' => 'foreignKey');
+
+		$result = $this->Task->parseIdentifier('mySuperUser');
+		$this->assertEqual($result, 'mySuperUser');
+
+		$result = $this->Task->parseIdentifier('111234');
+		$this->assertEqual($result, '111234');
+	}
+
+/**
+ * test creating aro/aco nodes
+ *
+ * @return void
+ * @access public
+ */
+	function testCreate() {
+		$this->Task->args = array('aro', 'root', 'User.1');
+		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/created/'), '*'));
+		$this->Task->create();
+
+		$Aro =& ClassRegistry::init('Aro');
+		$Aro->cacheQueries = false;
+		$result = $Aro->read();
+		$this->assertEqual($result['Aro']['model'], 'User');
+		$this->assertEqual($result['Aro']['foreign_key'], 1);
+		$this->assertEqual($result['Aro']['parent_id'], null);
+		$id = $result['Aro']['id'];
+
+		$this->Task->args = array('aro', 'User.1', 'User.3');
+		$this->Task->expectAt(1, 'out', array(new PatternExpectation('/created/'), '*'));
+		$this->Task->create();
+
+		$Aro =& ClassRegistry::init('Aro');
+		$result = $Aro->read();
+		$this->assertEqual($result['Aro']['model'], 'User');
+		$this->assertEqual($result['Aro']['foreign_key'], 3);
+		$this->assertEqual($result['Aro']['parent_id'], $id);
+
+		$this->Task->args = array('aro', 'root', 'somealias');
+		$this->Task->expectAt(2, 'out', array(new PatternExpectation('/created/'), '*'));
+		$this->Task->create();
+
+		$Aro =& ClassRegistry::init('Aro');
+		$result = $Aro->read();
+		$this->assertEqual($result['Aro']['alias'], 'somealias');
+		$this->assertEqual($result['Aro']['model'], null);
+		$this->assertEqual($result['Aro']['foreign_key'], null);
+		$this->assertEqual($result['Aro']['parent_id'], null);
+	}
+
+/**
+ * test the delete method with different node types.
+ *
+ * @return void
+ * @access public
+ */
+	function testDelete() {
+		$this->Task->args = array('aro', 'AuthUser.1');
+		$this->Task->expectAt(0, 'out', array(new NoPatternExpectation('/not/'), true));
+		$this->Task->delete();
+
+		$Aro =& ClassRegistry::init('Aro');
+		$result = $Aro->read(null, 3);
+		$this->assertFalse($result);
+	}
+
+/**
+ * test setParent method.
+ *
+ * @return void
+ * @access public
+ */
+	function testSetParent() {
+		$this->Task->args = array('aro', 'AuthUser.2', 'root');
+		$this->Task->setParent();
+
+		$Aro =& ClassRegistry::init('Aro');
+		$result = $Aro->read(null, 4);
+		$this->assertEqual($result['Aro']['parent_id'], null);
+	}
+
+/**
+ * test grant
+ *
+ * @return void
+ * @access public
+ */
+	function testGrant() {
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
+		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/Permission granted/'), true));
+		$this->Task->grant();
+
+		$node = $this->Task->Acl->Aro->read(null, 4);
+		$this->assertFalse(empty($node['Aco'][0]));
+		$this->assertEqual($node['Aco'][0]['Permission']['_create'], 1);
+	}
+
+/**
+ * test deny
+ *
+ * @return void
+ * @access public
+ */
+	function testDeny() {
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
+		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/Permission denied/'), true));
+		$this->Task->deny();
+
+		$node = $this->Task->Acl->Aro->read(null, 4);
+		$this->assertFalse(empty($node['Aco'][0]));
+		$this->assertEqual($node['Aco'][0]['Permission']['_create'], -1);
+	}
+
+/**
+ * test checking allowed and denied perms
+ *
+ * @return void
+ * @access public
+ */
+	function testCheck() {
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', '*');
+		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/not allowed/'), true));
+		$this->Task->check();
+
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
+		$this->Task->expectAt(1, 'out', array(new PatternExpectation('/Permission granted/'), true));
+		$this->Task->grant();
+
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
+		$this->Task->expectAt(2, 'out', array(new PatternExpectation('/is allowed/'), true));
+		$this->Task->check();
+
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', '*');
+		$this->Task->expectAt(3, 'out', array(new PatternExpectation('/not allowed/'), true));
+		$this->Task->check();
+	}
+
+/**
+ * test inherit and that it 0's the permission fields.
+ *
+ * @return void
+ * @access public
+ */
+	function testInherit() {
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'create');
+		$this->Task->expectAt(0, 'out', array(new PatternExpectation('/Permission granted/'), true));
+		$this->Task->grant();
+
+		$this->Task->args = array('AuthUser.2', 'ROOT/Controller1', 'all');
+		$this->Task->expectAt(1, 'out', array(new PatternExpectation('/permission inherited/i'), true));
+		$this->Task->inherit();
+
+		$node = $this->Task->Acl->Aro->read(null, 4);
+		$this->assertFalse(empty($node['Aco'][0]));
+		$this->assertEqual($node['Aco'][0]['Permission']['_create'], 0);
+	}
+
+/**
+ * test getting the path for an aro/aco
+ *
+ * @return void
+ * @access public
+ */
+	function testGetPath() {
+		$this->Task->args = array('aro', 'AuthUser.2');
+		$this->Task->expectAt(1, 'out', array('[1] ROOT'));
+		$this->Task->expectAt(2, 'out', array('  [2] admins'));
+		$this->Task->expectAt(3, 'out', array('    [4] Elrond'));
+		$this->Task->getPath();
+	}
+
+/**
+ * test that initdb makes the correct call.
+ *
+ * @return void
+ */
+	function testInitDb() {
+		$this->Task->Dispatch->expectOnce('dispatch');
+		$this->Task->initdb();
+
+		$this->assertEqual($this->Task->Dispatch->args, array('schema', 'create', 'DbAcl'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/api.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/api.test.php
new file mode 100644
index 000000000..c290ac3e8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/api.test.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * ApiShellTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+if (!class_exists('ApiShell')) {
+	require CAKE . 'console' .  DS . 'libs' . DS . 'api.php';
+}
+
+Mock::generatePartial(
+	'ShellDispatcher', 'ApiShellMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'ApiShell', 'MockApiShell',
+	array('in', 'out', 'createFile', 'hr', '_stop')
+);
+
+/**
+ * ApiShellTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ApiShellTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new ApiShellMockShellDispatcher();
+		$this->Shell =& new MockApiShell($this->Dispatcher);
+		$this->Shell->Dispatch =& $this->Dispatcher;
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * Test that method names are detected properly including those with no arguments.
+ *
+ * @return void
+ * @access public
+ */
+	function testMethodNameDetection () {
+		$this->Shell->setReturnValueAt(0, 'in', 'q');
+		$this->Shell->expectAt(0, 'out', array('Controller'));
+		$expected = array(
+			array(
+				'1. afterFilter()',
+				'2. beforeFilter()',
+				'3. beforeRender()',
+				'4. constructClasses()',
+				'5. disableCache()',
+				'6. flash($message, $url, $pause = 1, $layout = \'flash\')',
+				'7. header($status)',
+				'8. httpCodes($code = null)',
+				'9. isAuthorized()',
+				'10. loadModel($modelClass = null, $id = null)',
+				'11. paginate($object = null, $scope = array(), $whitelist = array())',
+				'12. postConditions($data = array(), $op = null, $bool = \'AND\', $exclusive = false)',
+				'13. redirect($url, $status = null, $exit = true)',
+				'14. referer($default = null, $local = false)',
+				'15. render($action = null, $layout = null, $file = null)',
+				'16. set($one, $two = null)',
+				'17. setAction($action)',
+				'18. shutdownProcess()', 
+				'19. startupProcess()',
+				'20. validate()',
+				'21. validateErrors()'
+			)
+		);
+		$this->Shell->expectAt(1, 'out', $expected);
+
+		$this->Shell->args = array('controller');
+		$this->Shell->paths['controller'] = CAKE_CORE_INCLUDE_PATH . DS . LIBS . 'controller' . DS;
+		$this->Shell->main();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/bake.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/bake.test.php
new file mode 100644
index 000000000..2771c0269
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/bake.test.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * BakeShell Test Case
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'bake.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'controller.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'db_config.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'BakeShellMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'BakeShell', 'MockBakeShell',
+	array('in', 'hr', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generate('DbConfigTask', 'BakeShellMockDbConfigTask');
+Mock::generate('ModelTask', 'BakeShellMockModelTask');
+Mock::generate('ControllerTask', 'BakeShellMockControllerTask');
+
+if (!class_exists('UsersController')) {
+	class UsersController extends Controller {
+		var $name = 'Users';
+	}
+}
+
+class BakeShellTestCase extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.user');
+
+/**
+ * start test
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatch =& new BakeShellMockShellDispatcher();
+		$this->Shell =& new MockBakeShell();
+		$this->Shell->Dispatch =& $this->Dispatch;
+		$this->Shell->Dispatch->shellPaths = App::path('shells');
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Dispatch, $this->Shell);
+	}
+
+/**
+ * test bake all
+ *
+ * @return void
+ * @access public
+ */
+	function testAllWithModelName() {
+		App::import('Model', 'User');
+		$userExists = class_exists('User');
+		if ($this->skipIf($userExists, 'User class exists, cannot test `bake all [param]`. %s')) {
+			return;
+		}
+		$this->Shell->Model =& new BakeShellMockModelTask();
+		$this->Shell->Controller =& new BakeShellMockControllerTask();
+		$this->Shell->View =& new BakeShellMockModelTask();
+		$this->Shell->DbConfig =& new BakeShellMockDbConfigTask();
+
+		$this->Shell->DbConfig->expectOnce('getConfig');
+		$this->Shell->DbConfig->setReturnValue('getConfig', 'test_suite');
+
+		$this->Shell->Model->setReturnValue('bake', true);
+		$this->Shell->Model->expectNever('getName');
+		$this->Shell->Model->expectOnce('bake');
+
+		$this->Shell->Controller->expectOnce('bake');
+		$this->Shell->Controller->setReturnValue('bake', true);
+
+		$this->Shell->View->expectOnce('execute');
+
+		$this->Shell->expectAt(0, 'out', array('Bake All'));
+		$this->Shell->expectAt(1, 'out', array('User Model was baked.'));
+		$this->Shell->expectAt(2, 'out', array('User Controller was baked.'));
+		$this->Shell->expectAt(3, 'out', array('User Views were baked.'));
+		$this->Shell->expectAt(4, 'out', array('Bake All complete'));
+
+		$this->Shell->params = array();
+		$this->Shell->args = array('User');
+		$this->Shell->all();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/schema.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/schema.test.php
new file mode 100644
index 000000000..0f97950d6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/schema.test.php
@@ -0,0 +1,503 @@
+<?php
+/**
+ * SchemaShellTest Test file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.Shells
+ * @since         CakePHP v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+App::import('Model', 'CakeSchema', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+if (!class_exists('SchemaShell')) {
+	require CAKE . 'console' .  DS . 'libs' . DS . 'schema.php';
+}
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestSchemaShellMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'SchemaShell', 'MockSchemaShell',
+	array('in', 'out', 'hr', 'createFile', 'error', 'err', '_stop')
+);
+
+Mock::generate('CakeSchema', 'MockSchemaCakeSchema');
+
+/**
+ * Test for Schema database management
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class SchemaShellTestSchema extends CakeSchema {
+
+/**
+ * name property
+ *
+ * @var string 'MyApp'
+ * @access public
+ */
+	var $name = 'SchemaShellTest';
+
+/**
+ * connection property
+ *
+ * @var string 'test_suite'
+ * @access public
+ */
+	var $connection = 'test_suite';
+
+/**
+ * comments property
+ *
+ * @var array
+ * @access public
+ */
+	var $comments = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+		'post_id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false, 'length' => 100),
+		'comment' => array('type' => 'text', 'null' => false, 'default' => null),
+		'published' => array('type' => 'string', 'null' => true, 'default' => 'N', 'length' => 1),
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+	);
+
+/**
+ * posts property
+ *
+ * @var array
+ * @access public
+ */
+	var $articles = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+		'user_id' => array('type' => 'integer', 'null' => true, 'default' => ''),
+		'title' => array('type' => 'string', 'null' => false, 'default' => 'Title'),
+		'body' => array('type' => 'text', 'null' => true, 'default' => null),
+		'summary' => array('type' => 'text', 'null' => true),
+		'published' => array('type' => 'string', 'null' => true, 'default' => 'Y', 'length' => 1),
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+	);
+}
+
+/**
+ * SchemaShellTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.Shells
+ */
+class SchemaShellTest extends CakeTestCase {
+
+/**
+ * Fixtures
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.user', 'core.post', 'core.auth_user', 'core.author', 
+		'core.comment', 'core.test_plugin_comment'
+	);
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestSchemaShellMockShellDispatcher();
+		$this->Shell =& new MockSchemaShell($this->Dispatcher);
+		$this->Shell->Dispatch =& $this->Dispatcher;
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * test startup method
+ *
+ * @return void
+ * @access public
+ */
+	function testStartup() {
+		$this->Shell->startup();
+		$this->assertTrue(isset($this->Shell->Schema));
+		$this->assertTrue(is_a($this->Shell->Schema, 'CakeSchema'));
+		$this->assertEqual(strtolower($this->Shell->Schema->name), strtolower(APP_DIR));
+		$this->assertEqual($this->Shell->Schema->file, 'schema.php');
+
+		unset($this->Shell->Schema);
+		$this->Shell->params = array(
+			'name' => 'TestSchema'
+		);
+		$this->Shell->startup();
+		$this->assertEqual($this->Shell->Schema->name, 'TestSchema');
+		$this->assertEqual($this->Shell->Schema->file, 'test_schema.php');
+		$this->assertEqual($this->Shell->Schema->connection, 'default');
+		$this->assertEqual($this->Shell->Schema->path, APP . 'config' . DS . 'schema');
+
+		unset($this->Shell->Schema);
+		$this->Shell->params = array(
+			'file' => 'other_file.php',
+			'connection' => 'test_suite',
+			'path' => '/test/path'
+		);
+		$this->Shell->startup();
+		$this->assertEqual(strtolower($this->Shell->Schema->name), strtolower(APP_DIR));
+		$this->assertEqual($this->Shell->Schema->file, 'other_file.php');
+		$this->assertEqual($this->Shell->Schema->connection, 'test_suite');
+		$this->assertEqual($this->Shell->Schema->path, '/test/path');
+	}
+
+/**
+ * Test View - and that it dumps the schema file to stdout
+ *
+ * @return void
+ * @access public
+ */
+	function testView() {
+		$this->Shell->startup();
+		$this->Shell->Schema->path = APP . 'config' . DS . 'schema';
+		$this->Shell->params['file'] = 'i18n.php';
+		$this->Shell->expectOnce('_stop');
+		$this->Shell->expectOnce('out');
+		$this->Shell->view();
+	}
+
+/**
+ * test that view() can find plugin schema files.
+ *
+ * @return void
+ * @access public
+ */
+	function testViewWithPlugins() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$this->Shell->args = array('TestPlugin.schema');
+		$this->Shell->startup();
+		$this->Shell->expectCallCount('_stop', 2);
+		$this->Shell->expectCallCount('out', 2);
+		$this->Shell->view();
+
+		$this->Shell->args = array();
+		$this->Shell->params = array('plugin' => 'TestPlugin');
+		$this->Shell->startup();
+		$this->Shell->view();
+
+		App::build();
+	}
+
+/**
+ * test dump() with sql file generation
+ *
+ * @return void
+ * @access public
+ */
+	function testDumpWithFileWriting() {
+		$this->Shell->params = array(
+			'name' => 'i18n',
+			'write' => TMP . 'tests' . DS . 'i18n.sql'
+		);
+		$this->Shell->expectOnce('_stop');
+		$this->Shell->startup();
+		$this->Shell->dump();
+
+		$sql =& new File(TMP . 'tests' . DS . 'i18n.sql');
+		$contents = $sql->read();
+		$this->assertPattern('/DROP TABLE/', $contents);
+		$this->assertPattern('/CREATE TABLE `i18n`/', $contents);
+		$this->assertPattern('/id/', $contents);
+		$this->assertPattern('/model/', $contents);
+		$this->assertPattern('/field/', $contents);
+		$this->assertPattern('/locale/', $contents);
+		$this->assertPattern('/foreign_key/', $contents);
+		$this->assertPattern('/content/', $contents);
+
+		$sql->delete();
+	}
+
+/**
+ * test that dump() can find and work with plugin schema files.
+ *
+ * @return void
+ * @access public
+ */
+	function testDumpFileWritingWithPlugins() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$this->Shell->args = array('TestPlugin.TestPluginApp');
+		$this->Shell->params = array(
+			'connection' => 'test_suite',
+			'write' => TMP . 'tests' . DS . 'dump_test.sql'
+		);
+		$this->Shell->startup();
+		$this->Shell->expectOnce('_stop');
+		$this->Shell->dump();
+
+		$file =& new File(TMP . 'tests' . DS . 'dump_test.sql');
+		$contents = $file->read();
+
+		$this->assertPattern('/CREATE TABLE `acos`/', $contents);
+		$this->assertPattern('/id/', $contents);
+		$this->assertPattern('/model/', $contents);
+
+		$file->delete();
+		App::build();
+	}
+
+/**
+ * test generate with snapshot generation
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateSnaphot() {
+		$this->Shell->path = TMP;
+		$this->Shell->params['file'] = 'schema.php';
+		$this->Shell->args = array('snapshot');
+		$this->Shell->Schema =& new MockSchemaCakeSchema();
+		$this->Shell->Schema->setReturnValue('read', array('schema data'));
+		$this->Shell->Schema->setReturnValue('write', true);
+
+		$this->Shell->Schema->expectOnce('read');
+		$this->Shell->Schema->expectOnce('write', array(array('schema data', 'file' => 'schema_1.php')));
+
+		$this->Shell->generate();
+	}
+
+/**
+ * test generate without a snapshot.
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateNoOverwrite() {
+		touch(TMP . 'schema.php');
+		$this->Shell->params['file'] = 'schema.php';
+		$this->Shell->args = array();
+
+		$this->Shell->setReturnValue('in', 'q');
+		$this->Shell->Schema =& new MockSchemaCakeSchema();
+		$this->Shell->Schema->path = TMP;
+		$this->Shell->Schema->expectNever('read');
+
+		$result = $this->Shell->generate();
+		unlink(TMP . 'schema.php');
+	}
+
+/**
+ * test generate with overwriting of the schema files.
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateOverwrite() {
+		touch(TMP . 'schema.php');
+		$this->Shell->params['file'] = 'schema.php';
+		$this->Shell->args = array();
+
+		$this->Shell->setReturnValue('in', 'o');
+		$this->Shell->expectAt(1, 'out', array(new PatternExpectation('/Schema file:\s[a-z\.]+\sgenerated/')));
+		$this->Shell->Schema =& new MockSchemaCakeSchema();
+		$this->Shell->Schema->path = TMP;
+		$this->Shell->Schema->setReturnValue('read', array('schema data'));
+		$this->Shell->Schema->setReturnValue('write', true);
+
+		$this->Shell->Schema->expectOnce('read');
+		$this->Shell->Schema->expectOnce('write', array(array('schema data', 'file' => 'schema.php')));
+
+		$this->Shell->generate();
+		unlink(TMP . 'schema.php');
+	}
+
+/**
+ * test that generate() can read plugin dirs and generate schema files for the models
+ * in a plugin.
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateWithPlugins() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$this->Shell->params = array(
+			'plugin' => 'TestPlugin',
+			'connection' => 'test_suite'
+		);
+		$this->Shell->startup();
+		$this->Shell->Schema->path = TMP . 'tests' . DS;
+
+		$this->Shell->generate();
+		$file =& new File(TMP . 'tests' . DS . 'schema.php');
+		$contents = $file->read();
+
+		$this->assertPattern('/class TestPluginSchema/', $contents);
+		$this->assertPattern('/var \$posts/', $contents);
+		$this->assertPattern('/var \$auth_users/', $contents);
+		$this->assertPattern('/var \$authors/', $contents);
+		$this->assertPattern('/var \$test_plugin_comments/', $contents);
+		$this->assertNoPattern('/var \$users/', $contents);
+		$this->assertNoPattern('/var \$articles/', $contents);
+
+		$file->delete();
+		App::build();
+	}
+
+/**
+ * Test schema run create with no table args.
+ *
+ * @return void
+ * @access public
+ */
+	function testCreateNoArgs() {
+		$this->Shell->params = array(
+			'connection' => 'test_suite',
+			'path' => APP . 'config' . DS . 'sql'
+		);
+		$this->Shell->args = array('i18n');
+		$this->Shell->startup();
+		$this->Shell->setReturnValue('in', 'y');
+		$this->Shell->create();
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$sources = $db->listSources();
+		$this->assertTrue(in_array($db->config['prefix'] . 'i18n', $sources));
+
+		$schema =& new i18nSchema();
+		$db->execute($db->dropSchema($schema));
+	}
+
+/**
+ * Test schema run create with no table args.
+ *
+ * @return void
+ * @access public
+ */
+	function testCreateWithTableArgs() {
+		$this->Shell->params = array(
+			'connection' => 'test_suite',
+			'name' => 'DbAcl',
+			'path' => APP . 'config' . DS . 'schema'
+		);
+		$this->Shell->args = array('DbAcl', 'acos');
+		$this->Shell->startup();
+		$this->Shell->setReturnValue('in', 'y');
+		$this->Shell->create();
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$sources = $db->listSources();
+		$this->assertTrue(in_array($db->config['prefix'] . 'acos', $sources));
+		$this->assertFalse(in_array($db->config['prefix'] . 'aros', $sources));
+		$this->assertFalse(in_array('aros_acos', $sources));
+
+		$db->execute('DROP TABLE ' . $db->config['prefix'] . 'acos');
+	}
+
+/**
+ * test run update with a table arg.
+ *
+ * @return void
+ * @access public
+ */
+	function testUpdateWithTable() {
+		$this->Shell->params = array(
+			'connection' => 'test_suite',
+			'f' => true
+		);
+		$this->Shell->args = array('SchemaShellTest', 'articles');
+		$this->Shell->startup();
+		$this->Shell->setReturnValue('in', 'y');
+		$this->Shell->update();
+
+		$article =& new Model(array('name' => 'Article', 'ds' => 'test_suite'));
+		$fields = $article->schema();
+		$this->assertTrue(isset($fields['summary']));
+
+		$this->_fixtures['core.article']->drop($this->db);
+		$this->_fixtures['core.article']->create($this->db);
+	}
+
+/**
+ * test that the plugin param creates the correct path in the schema object.
+ *
+ * @return void
+ * @access public
+ */
+	function testPluginParam() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$this->Shell->params = array(
+			'plugin' => 'TestPlugin',
+			'connection' => 'test_suite'
+		);
+		$this->Shell->startup();
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'config' . DS . 'schema';
+		$this->assertEqual($this->Shell->Schema->path, $expected);
+		
+		App::build();
+	}
+
+/**
+ * test that using Plugin.name with write.
+ *
+ * @return void
+ * @access public
+ */
+	function testPluginDotSyntaxWithCreate() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$this->Shell->params = array(
+			'connection' => 'test_suite'
+		);
+		$this->Shell->args = array('TestPlugin.TestPluginApp');
+		$this->Shell->startup();
+		$this->Shell->setReturnValue('in', 'y');
+		$this->Shell->create();
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$sources = $db->listSources();
+		$this->assertTrue(in_array($db->config['prefix'] . 'acos', $sources));
+
+		$db->execute('DROP TABLE ' . $db->config['prefix'] . 'acos');
+		App::build();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/shell.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/shell.test.php
new file mode 100644
index 000000000..6ed6dc1e1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/shell.test.php
@@ -0,0 +1,501 @@
+<?php
+/**
+ * ShellTest file
+ *
+ * Test Case for Shell
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'Folder');
+App::import('Shell', 'Shell', false);
+
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+Mock::generatePartial('ShellDispatcher', 'TestShellMockShellDispatcher', array(
+	'getInput', 'stdout', 'stderr', '_stop', '_initEnvironment'
+));
+
+/**
+ * TestShell class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs
+ */
+class TestShell extends Shell {
+
+/**
+ * name property
+ *
+ * @var name
+ * @access public
+ */
+	var $name = 'TestShell';
+/**
+ * stopped property
+ *
+ * @var integer
+ * @access public
+ */
+	var $stopped;
+
+/**
+ * stop method
+ *
+ * @param integer $status
+ * @return void
+ * @access protected
+ */
+	function _stop($status = 0) {
+		$this->stopped = $status;
+	}
+}
+
+/**
+ * TestAppleTask class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs
+ */
+class TestAppleTask extends Shell {
+}
+
+/**
+ * TestBananaTask class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs
+ */
+class TestBananaTask extends Shell {
+}
+
+/**
+ * ShellTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs
+ */
+class ShellTest extends CakeTestCase {
+
+/**
+ * Fixtures used in this test case
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(
+		'core.post', 'core.comment', 'core.article', 'core.user',
+		'core.tag', 'core.articles_tag', 'core.attachment'
+	);
+
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function setUp() {
+		$this->Dispatcher =& new TestShellMockShellDispatcher();
+		$this->Shell =& new TestShell($this->Dispatcher);
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function tearDown() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * testConstruct method
+ *
+ * @return void
+ * @access public
+ */
+	function testConstruct() {
+		$this->assertIsA($this->Shell->Dispatch, 'TestShellMockShellDispatcher');
+		$this->assertEqual($this->Shell->name, 'TestShell');
+		$this->assertEqual($this->Shell->alias, 'TestShell');
+	}
+
+/**
+ * testInitialize method
+ *
+ * @return void
+ * @access public
+ */
+	function testInitialize() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS)
+		), true);
+
+		$this->Shell->uses = array('TestPlugin.TestPluginPost');
+		$this->Shell->initialize();
+
+		$this->assertTrue(isset($this->Shell->TestPluginPost));
+		$this->assertIsA($this->Shell->TestPluginPost, 'TestPluginPost');
+		$this->assertEqual($this->Shell->modelClass, 'TestPluginPost');
+
+		$this->Shell->uses = array('Comment');
+		$this->Shell->initialize();
+		$this->assertTrue(isset($this->Shell->Comment));
+		$this->assertIsA($this->Shell->Comment, 'Comment');
+		$this->assertEqual($this->Shell->modelClass, 'Comment');
+
+		$this->Shell->uses = true;
+		$this->Shell->initialize();
+		$this->assertTrue(isset($this->Shell->AppModel));
+		$this->assertIsA($this->Shell->AppModel, 'AppModel');
+
+		App::build();
+	}
+
+/**
+ * testIn method
+ *
+ * @return void
+ * @access public
+ */
+	function testIn() {
+		$this->Shell->Dispatch->setReturnValueAt(0, 'getInput', 'n');
+		$this->Shell->Dispatch->expectAt(0, 'getInput', array('Just a test?', array('y', 'n'), 'n'));
+		$result = $this->Shell->in('Just a test?', array('y', 'n'), 'n');
+		$this->assertEqual($result, 'n');
+
+		$this->Shell->Dispatch->setReturnValueAt(1, 'getInput', 'Y');
+		$this->Shell->Dispatch->expectAt(1, 'getInput', array('Just a test?', array('y', 'n'), 'n'));
+		$result = $this->Shell->in('Just a test?', array('y', 'n'), 'n');
+		$this->assertEqual($result, 'Y');
+
+		$this->Shell->Dispatch->setReturnValueAt(2, 'getInput', 'y');
+		$this->Shell->Dispatch->expectAt(2, 'getInput', array('Just a test?', 'y,n', 'n'));
+		$result = $this->Shell->in('Just a test?', 'y,n', 'n');
+		$this->assertEqual($result, 'y');
+
+		$this->Shell->Dispatch->setReturnValueAt(3, 'getInput', 'y');
+		$this->Shell->Dispatch->expectAt(3, 'getInput', array('Just a test?', 'y/n', 'n'));
+		$result = $this->Shell->in('Just a test?', 'y/n', 'n');
+		$this->assertEqual($result, 'y');
+
+		$this->Shell->Dispatch->setReturnValueAt(4, 'getInput', 'y');
+		$this->Shell->Dispatch->expectAt(4, 'getInput', array('Just a test?', 'y', 'y'));
+		$result = $this->Shell->in('Just a test?', 'y', 'y');
+		$this->assertEqual($result, 'y');
+
+		$this->Shell->interactive = false;
+
+		$result = $this->Shell->in('Just a test?', 'y/n', 'n');
+		$this->assertEqual($result, 'n');
+	}
+
+/**
+ * testOut method
+ *
+ * @return void
+ * @access public
+ */
+	function testOut() {
+		$this->Shell->Dispatch->expectAt(0, 'stdout', array("Just a test\n", false));
+		$this->Shell->out('Just a test');
+
+		$this->Shell->Dispatch->expectAt(1, 'stdout', array("Just\na\ntest\n", false));
+		$this->Shell->out(array('Just', 'a', 'test'));
+
+		$this->Shell->Dispatch->expectAt(2, 'stdout', array("Just\na\ntest\n\n", false));
+		$this->Shell->out(array('Just', 'a', 'test'), 2);
+
+		$this->Shell->Dispatch->expectAt(3, 'stdout', array("\n", false));
+		$this->Shell->out();
+	}
+
+/**
+ * testErr method
+ *
+ * @return void
+ * @access public
+ */
+	function testErr() {
+		$this->Shell->Dispatch->expectAt(0, 'stderr', array("Just a test\n"));
+		$this->Shell->err('Just a test');
+
+		$this->Shell->Dispatch->expectAt(1, 'stderr', array("Just\na\ntest\n"));
+		$this->Shell->err(array('Just', 'a', 'test'));
+
+		$this->Shell->Dispatch->expectAt(2, 'stderr', array("Just\na\ntest\n\n"));
+		$this->Shell->err(array('Just', 'a', 'test'), 2);
+
+		$this->Shell->Dispatch->expectAt(3, 'stderr', array("\n"));
+		$this->Shell->err();
+	}
+
+/**
+ * testNl
+ *
+ * @return void
+ * @access public
+ */
+	function testNl() {
+		$this->assertEqual($this->Shell->nl(), "\n");
+		$this->assertEqual($this->Shell->nl(true), "\n");
+		$this->assertEqual($this->Shell->nl(false), "");
+		$this->assertEqual($this->Shell->nl(2), "\n\n");
+		$this->assertEqual($this->Shell->nl(1), "\n");
+	}
+
+/**
+ * testHr
+ *
+ * @return void
+ * @access public
+ */
+	function testHr() {
+		$bar = '---------------------------------------------------------------';
+
+		$this->Shell->Dispatch->expectAt(0, 'stdout', array('', false));
+		$this->Shell->Dispatch->expectAt(1, 'stdout', array($bar . "\n", false));
+		$this->Shell->Dispatch->expectAt(2, 'stdout', array('', false));
+		$this->Shell->hr();
+
+		$this->Shell->Dispatch->expectAt(3, 'stdout', array("\n", false));
+		$this->Shell->Dispatch->expectAt(4, 'stdout', array($bar . "\n", false));
+		$this->Shell->Dispatch->expectAt(5, 'stdout', array("\n", false));
+		$this->Shell->hr(true);
+
+		$this->Shell->Dispatch->expectAt(3, 'stdout', array("\n\n", false));
+		$this->Shell->Dispatch->expectAt(4, 'stdout', array($bar . "\n", false));
+		$this->Shell->Dispatch->expectAt(5, 'stdout', array("\n\n", false));
+		$this->Shell->hr(2);
+	}
+
+/**
+ * testError
+ *
+ * @return void
+ * @access public
+ */
+	function testError() {
+		$this->Shell->Dispatch->expectAt(0, 'stderr', array("Error: Foo Not Found\n"));
+		$this->Shell->error('Foo Not Found');
+		$this->assertIdentical($this->Shell->stopped, 1);
+
+		$this->Shell->stopped = null;
+
+		$this->Shell->Dispatch->expectAt(1, 'stderr', array("Error: Foo Not Found\n"));
+		$this->Shell->Dispatch->expectAt(2, 'stderr', array("Searched all...\n"));
+		$this->Shell->error('Foo Not Found', 'Searched all...');
+		$this->assertIdentical($this->Shell->stopped, 1);
+	}
+
+/**
+ * testLoadTasks method
+ *
+ * @return void
+ * @access public
+ */
+	function testLoadTasks() {
+		$this->assertTrue($this->Shell->loadTasks());
+
+		$this->Shell->tasks = null;
+		$this->assertTrue($this->Shell->loadTasks());
+
+		$this->Shell->tasks = false;
+		$this->assertTrue($this->Shell->loadTasks());
+
+		$this->Shell->tasks = true;
+		$this->assertTrue($this->Shell->loadTasks());
+
+		$this->Shell->tasks = array();
+		$this->assertTrue($this->Shell->loadTasks());
+
+		// Fatal Error
+		// $this->Shell->tasks = 'TestIDontExist';
+		// $this->assertFalse($this->Shell->loadTasks());
+		// $this->assertFalse(isset($this->Shell->TestIDontExist));
+
+		$this->Shell->tasks = 'TestApple';
+		$this->assertTrue($this->Shell->loadTasks());
+		$this->assertIsA($this->Shell->TestApple, 'TestAppleTask');
+
+		$this->Shell->tasks = 'TestBanana';
+		$this->assertTrue($this->Shell->loadTasks());
+		$this->assertIsA($this->Shell->TestApple, 'TestAppleTask');
+		$this->assertIsA($this->Shell->TestBanana, 'TestBananaTask');
+
+		unset($this->Shell->ShellTestApple, $this->Shell->TestBanana);
+
+		$this->Shell->tasks = array('TestApple', 'TestBanana');
+		$this->assertTrue($this->Shell->loadTasks());
+		$this->assertIsA($this->Shell->TestApple, 'TestAppleTask');
+		$this->assertIsA($this->Shell->TestBanana, 'TestBananaTask');
+	}
+
+/**
+ * testShortPath method
+ *
+ * @return void
+ * @access public
+ */
+	function testShortPath() {
+		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'cd';
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'cd' . DS ;
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		$path = $expected = DS . 'tmp' . DS . 'ab' . DS . 'index.php';
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		// Shell::shortPath needs Folder::realpath
+		// $path = DS . 'tmp' . DS . 'ab' . DS . '..' . DS . 'cd';
+		// $expected = DS . 'tmp' . DS . 'cd';
+		// $this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		$path = DS . 'tmp' . DS . 'ab' . DS . DS . 'cd';
+		$expected = DS . 'tmp' . DS . 'ab' . DS . 'cd';
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		$path = 'tmp' . DS . 'ab';
+		$expected = 'tmp' . DS . 'ab';
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		$path = 'tmp' . DS . 'ab';
+		$expected = 'tmp' . DS . 'ab';
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		$path = APP;
+		$expected = DS . basename(APP) . DS;
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+
+		$path = APP . 'index.php';
+		$expected = DS . basename(APP) . DS . 'index.php';
+		$this->assertEqual($this->Shell->shortPath($path), $expected);
+	}
+
+/**
+ * testCreateFile method
+ *
+ * @return void
+ * @access public
+ */
+	function testCreateFile() {
+		$this->skipIf(DIRECTORY_SEPARATOR === '\\', '%s Not supported on Windows');
+
+		$path = TMP . 'shell_test';
+		$file = $path . DS . 'file1.php';
+
+		new Folder($path, true);
+
+		$this->Shell->interactive = false;
+
+		$contents = "<?php\necho 'test';\n\$te = 'st';\n?>";
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertEqual(file_get_contents($file), $contents);
+
+		$contents = "<?php\necho 'another test';\n\$te = 'st';\n?>";
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertEqual(file_get_contents($file), $contents);
+
+		$this->Shell->interactive = true;
+
+		$this->Shell->Dispatch->setReturnValueAt(0, 'getInput', 'n');
+		$this->Shell->Dispatch->expectAt(1, 'stdout', array('File exists, overwrite?', '*'));
+
+		$contents = "<?php\necho 'yet another test';\n\$te = 'st';\n?>";
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertFalse($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertNotEqual(file_get_contents($file), $contents);
+
+		$this->Shell->Dispatch->setReturnValueAt(1, 'getInput', 'y');
+		$this->Shell->Dispatch->expectAt(3, 'stdout', array('File exists, overwrite?', '*'));
+
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertEqual(file_get_contents($file), $contents);
+
+		$Folder = new Folder($path);
+		$Folder->delete();
+	}
+
+/**
+ * testCreateFileWindows method
+ *
+ * @return void
+ * @access public
+ */
+	function testCreateFileWindows() {
+		$this->skipUnless(DIRECTORY_SEPARATOR === '\\', 'testCreateFileWindows supported on Windows only');
+
+		$path = TMP . 'shell_test';
+		$file = $path . DS . 'file1.php';
+
+		new Folder($path, true);
+
+		$this->Shell->interactive = false;
+
+		$contents = "<?php\necho 'test';\r\n\$te = 'st';\r\n?>";
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertEqual(file_get_contents($file), $contents);
+
+		$contents = "<?php\necho 'another test';\r\n\$te = 'st';\r\n?>";
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertEqual(file_get_contents($file), $contents);
+
+		$this->Shell->interactive = true;
+
+		$this->Shell->Dispatch->setReturnValueAt(0, 'getInput', 'n');
+		$this->Shell->Dispatch->expectAt(1, 'stdout', array('File exists, overwrite?'));
+
+		$contents = "<?php\necho 'yet another test';\r\n\$te = 'st';\r\n?>";
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertFalse($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertNotEqual(file_get_contents($file), $contents);
+
+		$this->Shell->Dispatch->setReturnValueAt(1, 'getInput', 'y');
+		$this->Shell->Dispatch->expectAt(3, 'stdout', array('File exists, overwrite?'));
+
+		$result = $this->Shell->createFile($file, $contents);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($file));
+		$this->assertEqual(file_get_contents($file), $contents);
+
+		$Folder = new Folder($path);
+		$Folder->delete();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/controller.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/controller.test.php
new file mode 100644
index 000000000..3dc758ac3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/controller.test.php
@@ -0,0 +1,633 @@
+<?php
+/**
+ * ControllerTask Test Case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'ClassRegistry');
+App::import('View', 'Helper', false);
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'project.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'controller.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'test.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestControllerTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'ControllerTask', 'MockControllerTask',
+	array('in', 'hr', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generatePartial(
+	'ModelTask', 'ControllerMockModelTask',
+	array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generatePartial(
+	'ProjectTask', 'ControllerMockProjectTask',
+	array('in', 'out', 'err', 'createFile', '_stop', '_checkUnitTest', 'getPrefix')
+);
+
+Mock::generate('TestTask', 'ControllerMockTestTask');
+
+$imported = App::import('Model', 'Article');
+$imported = $imported || App::import('Model', 'Comment');
+$imported = $imported || App::import('Model', 'Tag');
+
+if (!$imported) {
+	define('ARTICLE_MODEL_CREATED', true);
+	App::import('Core', 'Model');
+
+	class Article extends Model {
+		var $name = 'Article';
+		var $hasMany = array('Comment');
+		var $hasAndBelongsToMany = array('Tag');
+	}
+
+}
+
+/**
+ * ControllerTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ControllerTaskTest extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestControllerTaskMockShellDispatcher();
+		$this->Task =& new MockControllerTask($this->Dispatcher);
+		$this->Task->name = 'ControllerTask';
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+		$this->Task->Template =& new TemplateTask($this->Task->Dispatch);
+		$this->Task->Template->params['theme'] = 'default';
+		$this->Task->Model =& new ControllerMockModelTask($this->Task->Dispatch);
+		$this->Task->Project =& new ControllerMockProjectTask($this->Task->Dispatch);
+		$this->Task->Test =& new ControllerMockTestTask();
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * test ListAll
+ *
+ * @return void
+ * @access public
+ */
+	function testListAll() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->interactive = true;
+		$this->Task->expectAt(1, 'out', array('1. Articles'));
+		$this->Task->expectAt(2, 'out', array('2. ArticlesTags'));
+		$this->Task->expectAt(3, 'out', array('3. Comments'));
+		$this->Task->expectAt(4, 'out', array('4. Tags'));
+
+		$expected = array('Articles', 'ArticlesTags', 'Comments', 'Tags');
+		$result = $this->Task->listAll('test_suite');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->expectAt(6, 'out', array('1. Articles'));
+		$this->Task->expectAt(7, 'out', array('2. ArticlesTags'));
+		$this->Task->expectAt(8, 'out', array('4. Comments'));
+		$this->Task->expectAt(9, 'out', array('5. Tags'));
+
+		$this->Task->interactive = false;
+		$result = $this->Task->listAll();
+
+		$expected = array('articles', 'articles_tags', 'comments', 'tags');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that getName interacts with the user and returns the controller name.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetName() {
+		$this->Task->interactive = true;
+		$this->Task->setReturnValue('in', 1);
+
+		$this->Task->setReturnValueAt(0, 'in', 'q');
+		$this->Task->expectOnce('_stop');
+		$this->Task->getName('test_suite');
+
+		$this->Task->setReturnValueAt(1, 'in', 1);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Articles';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(2, 'in', 3);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Comments';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 10);
+		$result = $this->Task->getName('test_suite');
+		$this->Task->expectOnce('err');
+	}
+
+/**
+ * test helper interactions
+ *
+ * @return void
+ * @access public
+ */
+	function testDoHelpers() {
+		$this->Task->setReturnValue('in', 'n');
+		$result = $this->Task->doHelpers();
+		$this->assertEqual($result, array());
+
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', ' Javascript, Ajax, CustomOne  ');
+		$result = $this->Task->doHelpers();
+		$expected = array('Javascript', 'Ajax', 'CustomOne');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 'y');
+		$this->Task->setReturnValueAt(4, 'in', ' Javascript, Ajax, CustomOne, , ');
+		$result = $this->Task->doHelpers();
+		$expected = array('Javascript', 'Ajax', 'CustomOne');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test component interactions
+ *
+ * @return void
+ * @access public
+ */
+	function testDoComponents() {
+		$this->Task->setReturnValue('in', 'n');
+		$result = $this->Task->doComponents();
+		$this->assertEqual($result, array());
+
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', ' RequestHandler, Security  ');
+		$result = $this->Task->doComponents();
+		$expected = array('RequestHandler', 'Security');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 'y');
+		$this->Task->setReturnValueAt(4, 'in', ' RequestHandler, Security, , ');
+		$result = $this->Task->doComponents();
+		$expected = array('RequestHandler', 'Security');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Confirming controller user interaction
+ *
+ * @return void
+ * @access public
+ */
+	function testConfirmController() {
+		$controller = 'Posts';
+		$scaffold = false;
+		$helpers = array('Ajax', 'Time');
+		$components = array('Acl', 'Auth');
+		$uses = array('Comment', 'User');
+
+		$this->Task->expectAt(2, 'out', array("Controller Name:\n\t$controller"));
+		$this->Task->expectAt(3, 'out', array("Helpers:\n\tAjax, Time"));
+		$this->Task->expectAt(4, 'out', array("Components:\n\tAcl, Auth"));
+		$this->Task->confirmController($controller, $scaffold, $helpers, $components);
+	}
+
+/**
+ * test the bake method
+ *
+ * @return void
+ * @access public
+ */
+	function testBake() {
+		$helpers = array('Ajax', 'Time');
+		$components = array('Acl', 'Auth');
+		$this->Task->setReturnValue('createFile', true);
+
+		$result = $this->Task->bake('Articles', '--actions--', $helpers, $components);
+		$this->assertPattern('/class ArticlesController extends AppController/', $result);
+		$this->assertPattern('/\$components \= array\(\'Acl\', \'Auth\'\)/', $result);
+		$this->assertPattern('/\$helpers \= array\(\'Ajax\', \'Time\'\)/', $result);
+		$this->assertPattern('/\-\-actions\-\-/', $result);
+
+		$result = $this->Task->bake('Articles', 'scaffold', $helpers, $components);
+		$this->assertPattern('/class ArticlesController extends AppController/', $result);
+		$this->assertPattern('/var \$scaffold/', $result);
+		$this->assertNoPattern('/helpers/', $result);
+		$this->assertNoPattern('/components/', $result);
+
+		$result = $this->Task->bake('Articles', '--actions--', array(), array());
+		$this->assertPattern('/class ArticlesController extends AppController/', $result);
+		$this->assertNoPattern('/components/', $result);
+		$this->assertNoPattern('/helpers/', $result);
+		$this->assertPattern('/\-\-actions\-\-/', $result);
+	}
+
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeWithPlugin() {
+		$this->Task->plugin = 'ControllerTest';
+		$helpers = array('Ajax', 'Time');
+		$components = array('Acl', 'Auth');
+		$uses = array('Comment', 'User');
+
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'controllers' . DS . 'articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('Articles', '--actions--', array(), array(), array());
+
+		$this->Task->plugin = 'controllerTest';
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'controllers' . DS . 'articles_controller.php';
+		$this->Task->expectAt(1, 'createFile', array(
+			$path, new PatternExpectation('/ArticlesController extends ControllerTestAppController/')));
+		$this->Task->bake('Articles', '--actions--', array(), array(), array());
+
+		$this->assertEqual($this->Task->Template->templateVars['plugin'], 'ControllerTest');
+	}
+
+/**
+ * test that bakeActions is creating the correct controller Code. (Using sessions)
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeActionsUsingSessions() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Testing bakeActions requires Article, Comment & Tag Model to be undefined. %s');
+		if ($skip) {
+			return;
+		}
+		$result = $this->Task->bakeActions('Articles', null, true);
+
+		$this->assertTrue(strpos($result, 'function index() {') !== false);
+		$this->assertTrue(strpos($result, '$this->Article->recursive = 0;') !== false);
+		$this->assertTrue(strpos($result, "\$this->set('articles', \$this->paginate());") !== false);
+
+		$this->assertTrue(strpos($result, 'function view($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('Invalid article', true));") !== false);
+		$this->assertTrue(strpos($result, "\$this->set('article', \$this->Article->read(null, \$id)") !== false);
+
+		$this->assertTrue(strpos($result, 'function add()') !== false);
+		$this->assertTrue(strpos($result, 'if (!empty($this->data))') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->save($this->data))') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('The article has been saved', true));") !== false);
+
+		$this->assertTrue(strpos($result, 'function edit($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('The article could not be saved. Please, try again.', true));") !== false);
+
+		$this->assertTrue(strpos($result, 'function delete($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->delete($id))') !== false);
+		$this->assertTrue(strpos($result, "\$this->Session->setFlash(__('Article deleted', true));") !== false);
+
+		$result = $this->Task->bakeActions('Articles', 'admin_', true);
+
+		$this->assertTrue(strpos($result, 'function admin_index() {') !== false);
+		$this->assertTrue(strpos($result, 'function admin_add()') !== false);
+		$this->assertTrue(strpos($result, 'function admin_view($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'function admin_edit($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'function admin_delete($id = null)') !== false);
+	}
+
+/**
+ * Test baking with Controller::flash() or no sessions.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeActionsWithNoSessions() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Testing bakeActions requires Article, Tag, Comment Models to be undefined. %s');
+		if ($skip) {
+			return;
+		}
+		$result = $this->Task->bakeActions('Articles', null, false);
+
+		$this->assertTrue(strpos($result, 'function index() {') !== false);
+		$this->assertTrue(strpos($result, '$this->Article->recursive = 0;') !== false);
+		$this->assertTrue(strpos($result, "\$this->set('articles', \$this->paginate());") !== false);
+
+		$this->assertTrue(strpos($result, 'function view($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->flash(__('Invalid article', true), array('action' => 'index'))") !== false);
+		$this->assertTrue(strpos($result, "\$this->set('article', \$this->Article->read(null, \$id)") !== false);
+
+		$this->assertTrue(strpos($result, 'function add()') !== false);
+		$this->assertTrue(strpos($result, 'if (!empty($this->data))') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->save($this->data))') !== false);
+		$this->assertTrue(strpos($result, "\$this->flash(__('The article has been saved.', true), array('action' => 'index'))") !== false);
+
+		$this->assertTrue(strpos($result, 'function edit($id = null)') !== false);
+		$this->assertTrue(strpos($result, "\$this->Article->Tag->find('list')") !== false);
+		$this->assertTrue(strpos($result, "\$this->set(compact('tags'))") !== false);
+
+		$this->assertTrue(strpos($result, 'function delete($id = null)') !== false);
+		$this->assertTrue(strpos($result, 'if ($this->Article->delete($id))') !== false);
+		$this->assertTrue(strpos($result, "\$this->flash(__('Article deleted', true), array('action' => 'index'))") !== false);
+	}
+
+/**
+ * test baking a test
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeTest() {
+		$this->Task->plugin = 'ControllerTest';
+		$this->Task->connection = 'test_suite';
+		$this->Task->interactive = false;
+
+		$this->Task->Test->expectOnce('bake', array('Controller', 'Articles'));
+		$this->Task->bakeTest('Articles');
+
+		$this->assertEqual($this->Task->plugin, $this->Task->Test->plugin);
+		$this->assertEqual($this->Task->connection, $this->Task->Test->connection);
+		$this->assertEqual($this->Task->interactive, $this->Task->Test->interactive);
+	}
+
+/**
+ * test Interactive mode.
+ *
+ * @return void
+ * @access public
+ */
+	function testInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path';
+		$this->Task->setReturnValue('in', '1');
+		$this->Task->setReturnValueAt(1, 'in', 'y'); // build interactive
+		$this->Task->setReturnValueAt(2, 'in', 'n'); // build no scaffolds
+		$this->Task->setReturnValueAt(3, 'in', 'y'); // build normal methods
+		$this->Task->setReturnValueAt(4, 'in', 'n'); // build admin methods
+		$this->Task->setReturnValueAt(5, 'in', 'n'); // helpers?
+		$this->Task->setReturnValueAt(6, 'in', 'n'); // components?
+		$this->Task->setReturnValueAt(7, 'in', 'y'); // use sessions
+		$this->Task->setReturnValueAt(8, 'in', 'y'); // looks good
+
+		$this->Task->execute();
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticlesController/')));
+	}
+
+/**
+ * test Interactive mode.
+ *
+ * @return void
+ * @access public
+ */
+	function testInteractiveAdminMethodsNotInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->interactive = true;
+		$this->Task->path = '/my/path';
+		$this->Task->setReturnValue('in', '1');
+		$this->Task->setReturnValueAt(1, 'in', 'y'); // build interactive
+		$this->Task->setReturnValueAt(2, 'in', 'n'); // build no scaffolds
+		$this->Task->setReturnValueAt(3, 'in', 'y'); // build normal methods
+		$this->Task->setReturnValueAt(4, 'in', 'y'); // build admin methods
+		$this->Task->setReturnValueAt(5, 'in', 'n'); // helpers?
+		$this->Task->setReturnValueAt(6, 'in', 'n'); // components?
+		$this->Task->setReturnValueAt(7, 'in', 'y'); // use sessions
+		$this->Task->setReturnValueAt(8, 'in', 'y'); // looks good
+		$this->Task->setReturnValue('createFile', true);
+		$this->Task->Project->setReturnValue('getPrefix', 'admin_');
+
+		$result = $this->Task->execute();
+		$this->assertPattern('/admin_index/', $result);
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticlesController/')));
+	}
+
+/**
+ * test that execute runs all when the first arg == all
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteIntoAll() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute into all could not be run as an Article, Tag or Comment model was already loaded. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+
+		$this->Task->setReturnValue('createFile', true);
+		$this->Task->setReturnValue('_checkUnitTest', true);
+		$this->Task->Test->expectCallCount('bake', 1);
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticlesController/')));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test that `cake bake controller foos` works.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithController() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('Articles');
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array(
+			$filename, new PatternExpectation('/\$scaffold/')
+		));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test that both plural and singular forms work for controller baking.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithControllerNameVariations() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('Articles');
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array(
+			$filename, new PatternExpectation('/\$scaffold/')
+		));
+
+		$this->Task->execute();
+
+		$this->Task->args = array('Article');
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(1, 'createFile', array(
+			$filename, new PatternExpectation('/class ArticlesController/')
+		));
+		$this->Task->execute();
+
+		$this->Task->args = array('article');
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(2, 'createFile', array(
+			$filename, new PatternExpectation('/class ArticlesController/')
+		));
+
+		$this->Task->args = array('articles');
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(3, 'createFile', array(
+			$filename, new PatternExpectation('/class ArticlesController/')
+		));
+		$this->Task->execute();
+
+		$this->Task->args = array('Articles');
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(4, 'createFile', array(
+			$filename, new PatternExpectation('/class ArticlesController/')
+		));
+		$this->Task->execute();
+		$this->Task->execute();
+	}
+
+/**
+ * test that `cake bake controller foo scaffold` works.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithPublicParam() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('Articles', 'public');
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array(
+			$filename, new NoPatternExpectation('/var \$scaffold/')
+		));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test that `cake bake controller foos both` works.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithControllerAndBoth() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->Project->setReturnValue('getPrefix', 'admin_');
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('Articles', 'public', 'admin');
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array(
+			$filename, new PatternExpectation('/admin_index/')
+		));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test that `cake bake controller foos admin` works.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithControllerAndAdmin() {
+		$skip = $this->skipIf(!defined('ARTICLE_MODEL_CREATED'),
+			'Execute with scaffold param requires no Article, Tag or Comment model to be defined. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->Project->setReturnValue('getPrefix', 'admin_');
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('Articles', 'admin');
+
+		$filename = '/my/path/articles_controller.php';
+		$this->Task->expectAt(0, 'createFile', array(
+			$filename, new PatternExpectation('/admin_index/')
+		));
+
+		$this->Task->execute();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php
new file mode 100644
index 000000000..1fff44a8e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/db_config.test.php
@@ -0,0 +1,155 @@
+<?php
+/**
+ * DBConfigTask Test Case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'db_config.php';
+//require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestDbConfigTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'DbConfigTask', 'MockDbConfigTask',
+	array('in', 'hr', 'out', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+class TEST_DATABASE_CONFIG {
+	var $default = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'database_name',
+		'prefix' => '',
+	);
+
+	var $otherOne = array(
+		'driver' => 'mysql',
+		'persistent' => false,
+		'host' => 'localhost',
+		'login' => 'user',
+		'password' => 'password',
+		'database' => 'other_one',
+		'prefix' => '',
+	);
+}
+
+/**
+ * DbConfigTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class DbConfigTaskTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestDbConfigTaskMockShellDispatcher();
+		$this->Task =& new MockDbConfigTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+
+		$this->Task->params['working'] = rtrim(APP, DS);
+		$this->Task->databaseClassName = 'TEST_DATABASE_CONFIG';
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * Test the getConfig method.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetConfig() {
+		$this->Task->setReturnValueAt(0, 'in', 'otherOne');
+		$result = $this->Task->getConfig();
+		$this->assertEqual($result, 'otherOne');
+	}
+
+/**
+ * test that initialize sets the path up.
+ *
+ * @return void
+ * @access public
+ */
+	function testInitialize() {
+		$this->assertTrue(empty($this->Task->path));
+		$this->Task->initialize();
+		$this->assertFalse(empty($this->Task->path));
+		$this->assertEqual($this->Task->path, APP . 'config' . DS);
+
+	}
+
+/**
+ * test execute and by extension __interactive
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteIntoInteractive() {
+		$this->Task->initialize();
+
+		$this->Task->expectOnce('_stop');
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->setReturnValueAt(0, 'in', 'default');
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->setReturnValueAt(2, 'in', 'localhost');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+		$this->Task->setReturnValueAt(4, 'in', 'root');
+		$this->Task->setReturnValueAt(5, 'in', 'password');
+		$this->Task->setReturnValueAt(6, 'in', 'cake_test');
+		$this->Task->setReturnValueAt(7, 'in', 'n');
+		$this->Task->setReturnValueAt(8, 'in', 'y');
+		$this->Task->setReturnValueAt(9, 'in', 'y');
+		$this->Task->setReturnValueAt(10, 'in', 'y');
+		$this->Task->setReturnValueAt(11, 'in', 'n');
+
+		$result = $this->Task->execute();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/extract.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/extract.test.php
new file mode 100644
index 000000000..f93a9a6a7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/extract.test.php
@@ -0,0 +1,187 @@
+<?php
+/**
+ * ExtractTaskTest file
+ *
+ * Test Case for i18n extraction shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'Folder');
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'extract.php';
+
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestExtractTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+/**
+ * ExtractTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ExtractTaskTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function setUp() {
+		$this->Dispatcher =& new TestExtractTaskMockShellDispatcher();
+		$this->Task =& new ExtractTask($this->Dispatcher);
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function tearDown() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * testExecute method
+ *
+ * @return void
+ * @access public
+ */
+	function testExecute() {
+		$path = TMP . 'tests' . DS . 'extract_task_test';
+		new Folder($path . DS . 'locale', true);
+
+		$this->Task->interactive = false;
+
+		$this->Task->params['paths'] = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages';
+		$this->Task->params['output'] = $path . DS;
+		$this->Task->Dispatch->expectNever('stderr');
+		$this->Task->Dispatch->expectNever('_stop');
+		$this->Task->execute();
+		$this->assertTrue(file_exists($path . DS . 'default.pot'));
+		$result = file_get_contents($path . DS . 'default.pot');
+
+		$pattern = '/"Content-Type\: text\/plain; charset\=utf-8/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/"Content-Transfer-Encoding\: 8bit/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/"Plural-Forms\: nplurals\=INTEGER; plural\=EXPRESSION;/';
+		$this->assertPattern($pattern, $result);
+
+		// home.ctp
+		$pattern = '/msgid "Your tmp directory is writable."\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Your tmp directory is NOT writable."\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "The %s is being used for caching. To change the config edit ';
+		$pattern .= 'APP\/config\/core.php "\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Your cache is NOT working. Please check ';
+		$pattern .= 'the settings in APP\/config\/core.php"\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Your database configuration file is present."\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Your database configuration file is NOT present."\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Rename config\/database.php.default to ';
+		$pattern .= 'config\/database.php"\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Cake is able to connect to the database."\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Cake is NOT able to connect to the database."\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "Editing this Page"\nmsgstr ""\n/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "To change the content of this page, edit: %s.*To change its layout, ';
+		$pattern .= 'edit: %s.*You can also add some CSS styles for your pages at: %s"\nmsgstr ""/s';
+		$this->assertPattern($pattern, $result);
+
+		// extract.ctp
+		$pattern = '/\#: (\\\\|\/)extract\.ctp:6\n';
+		$pattern .= 'msgid "You have %d new message."\nmsgid_plural "You have %d new messages."/';
+		$this->assertPattern($pattern, $result);
+
+		$pattern = '/\#: (\\\\|\/)extract\.ctp:7\n';
+		$pattern .= 'msgid "You deleted %d message."\nmsgid_plural "You deleted %d messages."/';
+		$this->assertPattern($pattern, $result);
+
+		$pattern = '/\#: (\\\\|\/)extract\.ctp:14\n';
+		$pattern .= '\#: (\\\\|\/)home\.ctp:74\n';
+		$pattern .= 'msgid "Editing this Page"\nmsgstr ""/';
+		$this->assertPattern($pattern, $result);
+
+		// extract.ctp - reading the domain.pot
+		$result = file_get_contents($path . DS . 'domain.pot');
+
+		$pattern = '/msgid "You have %d new message."\nmsgid_plural "You have %d new messages."/';
+		$this->assertNoPattern($pattern, $result);
+		$pattern = '/msgid "You deleted %d message."\nmsgid_plural "You deleted %d messages."/';
+		$this->assertNoPattern($pattern, $result);
+
+		$pattern = '/msgid "You have %d new message \(domain\)."\nmsgid_plural "You have %d new messages \(domain\)."/';
+		$this->assertPattern($pattern, $result);
+		$pattern = '/msgid "You deleted %d message \(domain\)."\nmsgid_plural "You deleted %d messages \(domain\)."/';
+		$this->assertPattern($pattern, $result);
+
+		$Folder = new Folder($path);
+		$Folder->delete();
+	}
+	function getTests() {
+		return array('start', 'startCase', 'testExtractMultiplePaths', 'endCase', 'end');
+	}
+
+/**
+ * test extract can read more than one path.
+ *
+ * @return void
+ */
+	function testExtractMultiplePaths() {
+		$path = TMP . 'tests' . DS . 'extract_task_test';
+		new Folder($path . DS . 'locale', true);
+
+		$this->Task->interactive = false;
+
+		$this->Task->params['paths'] = 
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'pages,' .
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'posts';
+	
+		$this->Task->params['output'] = $path . DS;
+		$this->Task->Dispatch->expectNever('stderr');
+		$this->Task->Dispatch->expectNever('_stop');
+		$this->Task->execute();
+
+		$result = file_get_contents($path . DS . 'default.pot');
+
+		$pattern = '/msgid "Add User"/';
+		$this->assertPattern($pattern, $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php
new file mode 100644
index 000000000..45920d393
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/fixture.test.php
@@ -0,0 +1,373 @@
+<?php
+/**
+ * FixtureTask Test case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'fixture.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestFixtureTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'FixtureTask', 'MockFixtureTask',
+	array('in', 'out', 'err', 'createFile', '_stop')
+);
+
+Mock::generatePartial(
+	'Shell', 'MockFixtureModelTask',
+	array('in', 'out', 'err', 'createFile', '_stop', 'getName', 'getTable', 'listAll')
+);
+
+/**
+ * FixtureTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class FixtureTaskTest extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.comment', 'core.datatype', 'core.binary_test');
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestFixtureTaskMockShellDispatcher();
+		$this->Task =& new MockFixtureTask();
+		$this->Task->Model =& new MockFixtureModelTask();
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Template =& new TemplateTask($this->Task->Dispatch);
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+		$this->Task->Template->initialize();
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * test that initialize sets the path
+ *
+ * @return void
+ * @access public
+ */
+	function testConstruct() {
+		$this->Dispatch->params['working'] = DS . 'my' . DS . 'path';
+		$Task =& new FixtureTask($this->Dispatch);
+
+		$expected = DS . 'my' . DS . 'path' . DS . 'tests' . DS . 'fixtures' . DS;
+		$this->assertEqual($Task->path, $expected);
+	}
+
+/**
+ * test import option array generation
+ *
+ * @return void
+ * @access public
+ */
+	function testImportOptions() {
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+
+		$result = $this->Task->importOptions('Article');
+		$expected = array('schema' => 'Article', 'records' => true);
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(2, 'in', 'n');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+		$this->Task->setReturnValueAt(4, 'in', 'n');
+
+		$result = $this->Task->importOptions('Article');
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(5, 'in', 'n');
+		$this->Task->setReturnValueAt(6, 'in', 'n');
+		$this->Task->setReturnValueAt(7, 'in', 'y');
+		$result = $this->Task->importOptions('Article');
+		$expected = array('fromTable' => true);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that connection gets set to the import options when a different connection is used.
+ *
+ * @return void
+ */
+	function testImportOptionsAlternateConnection() {
+		$this->Task->connection = 'test';
+		$result = $this->Task->bake('Article', false, array('schema' => 'Article'));
+		$this->assertPattern("/'connection' => 'test'/", $result);
+	}
+
+/**
+ * test generating a fixture with database conditions.
+ *
+ * @return void
+ * @access public
+ */
+	function testImportRecordsFromDatabaseWithConditions() {
+		$this->Task->interactive = true;
+		$this->Task->setReturnValueAt(0, 'in', 'WHERE 1=1 LIMIT 10');
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$result = $this->Task->bake('Article', false, array('fromTable' => true, 'schema' => 'Article', 'records' => false));
+
+		$this->assertPattern('/class ArticleFixture extends CakeTestFixture/', $result);
+		$this->assertPattern('/var \$records/', $result);
+		$this->assertPattern('/var \$import/', $result);
+		$this->assertPattern("/'title' => 'First Article'/", $result, 'Missing import data %s');
+		$this->assertPattern('/Second Article/', $result, 'Missing import data %s');
+		$this->assertPattern('/Third Article/', $result, 'Missing import data %s');
+	}
+
+/**
+ * test that execute passes runs bake depending with named model.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithNamedModel() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('article');
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+	}
+
+/**
+ * test that execute passes runs bake depending with named model.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithNamedModelVariations() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$this->Task->args = array('article');
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+
+		$this->Task->args = array('articles');
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+
+		$this->Task->args = array('Articles');
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(2, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+
+		$this->Task->args = array('Article');
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(3, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+	}
+
+/**
+ * test that execute runs all() when args[0] = all
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteIntoAll() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+		$this->Task->Model->setReturnValue('listAll', array('articles', 'comments'));
+
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+
+		$filename = '/my/path/comment_fixture.php';
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class CommentFixture/')));
+		$this->Task->execute();
+	}
+
+/**
+ * test using all() with -count and -records
+ *
+ * @return void
+ * @access public
+ */
+	function testAllWithCountAndRecordsFlags() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+		$this->Task->params = array('count' => 10, 'records' => true);
+		$this->Task->Model->setReturnValue('listAll', array('articles', 'comments'));
+
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/title\' => \'Third Article\'/')));
+
+		$filename = '/my/path/comment_fixture.php';
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/comment\' => \'First Comment for First Article/')));
+		$this->Task->expectCallCount('createFile', 2);
+		$this->Task->all();
+	}
+
+/**
+ * test interactive mode of execute
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->Model->setReturnValue('getName', 'Article');
+		$this->Task->Model->setReturnValue('getTable', 'articles', array('Article'));
+
+		$filename = '/my/path/article_fixture.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class ArticleFixture/')));
+		$this->Task->execute();
+	}
+
+/**
+ * Test that bake works
+ *
+ * @return void
+ * @access public
+ */
+	function testBake() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$result = $this->Task->bake('Article');
+		$this->assertPattern('/class ArticleFixture extends CakeTestFixture/', $result);
+		$this->assertPattern('/var \$fields/', $result);
+		$this->assertPattern('/var \$records/', $result);
+		$this->assertNoPattern('/var \$import/', $result);
+
+		$result = $this->Task->bake('Article', 'comments');
+		$this->assertPattern('/class ArticleFixture extends CakeTestFixture/', $result);
+		$this->assertPattern('/var \$name \= \'Article\';/', $result);
+		$this->assertPattern('/var \$table \= \'comments\';/', $result);
+		$this->assertPattern('/var \$fields = array\(/', $result);
+
+		$result = $this->Task->bake('Article', 'comments', array('records' => true));
+		$this->assertPattern(
+			"/var \\\$import \= array\('records' \=\> true, 'connection' => 'test_suite'\);/",
+			$result
+		);
+		$this->assertNoPattern('/var \$records/', $result);
+
+		$result = $this->Task->bake('Article', 'comments', array('schema' => 'Article'));
+		$this->assertPattern(
+			"/var \\\$import \= array\('model' \=\> 'Article', 'connection' => 'test_suite'\);/",
+			$result
+		);
+		$this->assertNoPattern('/var \$fields/', $result);
+
+		$result = $this->Task->bake('Article', 'comments', array('schema' => 'Article', 'records' => true));
+		$this->assertPattern(
+			"/var \\\$import \= array\('model' \=\> 'Article'\, 'records' \=\> true, 'connection' => 'test_suite'\);/",
+			$result
+		);
+		$this->assertNoPattern('/var \$fields/', $result);
+		$this->assertNoPattern('/var \$records/', $result);
+	}
+
+/**
+ * test record generation with float and binary types
+ *
+ * @return void
+ * @access public
+ */
+	function testRecordGenerationForBinaryAndFloat() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$result = $this->Task->bake('Article', 'datatypes');
+		$this->assertPattern("/'float_field' => 1/", $result);
+
+		$result = $this->Task->bake('Article', 'binary_tests');
+		$this->assertPattern("/'data' => 'Lorem ipsum dolor sit amet'/", $result);
+	}
+
+/**
+ * Test that file generation includes headers and correct path for plugins.
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateFixtureFile() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$filename = '/my/path/article_fixture.php';
+
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/Article/')));
+		$result = $this->Task->generateFixtureFile('Article', array());
+
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/\<\?php(.*)\?\>/ms')));
+		$result = $this->Task->generateFixtureFile('Article', array());
+	}
+
+/**
+ * test generating files into plugins.
+ *
+ * @return void
+ * @access public
+ */
+	function testGeneratePluginFixtureFile() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->plugin = 'TestFixture';
+		$filename = APP . 'plugins' . DS . 'test_fixture' . DS . 'tests' . DS . 'fixtures' . DS . 'article_fixture.php';
+
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/Article/')));
+		$result = $this->Task->generateFixtureFile('Article', array());
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/model.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/model.test.php
new file mode 100644
index 000000000..ef8c5b39b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/model.test.php
@@ -0,0 +1,919 @@
+<?php
+/**
+ * ModelTaskTest file
+ *
+ * Test Case for test generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.6
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'fixture.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestModelTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'ModelTask', 'MockModelTask',
+	array('in', 'out', 'hr', 'err', 'createFile', '_stop', '_checkUnitTest')
+);
+
+Mock::generate(
+	'Model', 'MockModelTaskModel'
+);
+
+Mock::generate(
+	'FixtureTask', 'MockModelTaskFixtureTask'
+);
+
+/**
+ * ModelTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ModelTaskTest extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag', 'core.category_thread');
+
+/**
+ * starTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestModelTaskMockShellDispatcher();
+		$this->Task =& new MockModelTask($this->Dispatcher);
+		$this->Task->name = 'ModelTask';
+		$this->Task->interactive = true;
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+		$this->Task->Template =& new TemplateTask($this->Task->Dispatch);
+		$this->Task->Fixture =& new MockModelTaskFixtureTask();
+		$this->Task->Test =& new MockModelTaskFixtureTask();
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * Test that listAll scans the database connection and lists all the tables in it.s
+ *
+ * @return void
+ * @access public
+ */
+	function testListAll() {
+		$this->Task->expectAt(1, 'out', array('1. Article'));
+		$this->Task->expectAt(2, 'out', array('2. ArticlesTag'));
+		$this->Task->expectAt(3, 'out', array('3. CategoryThread'));
+		$this->Task->expectAt(4, 'out', array('4. Comment'));
+		$this->Task->expectAt(5, 'out', array('5. Tag'));
+		$result = $this->Task->listAll('test_suite');
+		$expected = array('articles', 'articles_tags', 'category_threads', 'comments', 'tags');
+		$this->assertEqual($result, $expected);
+
+		$this->Task->expectAt(7, 'out', array('1. Article'));
+		$this->Task->expectAt(8, 'out', array('2. ArticlesTag'));
+		$this->Task->expectAt(9, 'out', array('3. CategoryThread'));
+		$this->Task->expectAt(10, 'out', array('4. Comment'));
+		$this->Task->expectAt(11, 'out', array('5. Tag'));
+
+		$this->Task->connection = 'test_suite';
+		$result = $this->Task->listAll();
+		$expected = array('articles', 'articles_tags', 'category_threads', 'comments', 'tags');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that getName interacts with the user and returns the model name.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetName() {
+		$this->Task->setReturnValue('in', 1);
+
+		$this->Task->setReturnValueAt(0, 'in', 'q');
+		$this->Task->expectOnce('_stop');
+		$this->Task->getName('test_suite');
+
+		$this->Task->setReturnValueAt(1, 'in', 1);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Article';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(2, 'in', 4);
+		$result = $this->Task->getName('test_suite');
+		$expected = 'Comment';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(3, 'in', 10);
+		$result = $this->Task->getName('test_suite');
+		$this->Task->expectOnce('err');
+	}
+
+/**
+ * Test table name interactions
+ *
+ * @return void
+ * @access public
+ */
+	function testGetTableName() {
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$result = $this->Task->getTable('Article', 'test_suite');
+		$expected = 'articles';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->setReturnValueAt(2, 'in', 'my_table');
+		$result = $this->Task->getTable('Article', 'test_suite');
+		$expected = 'my_table';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that initializing the validations works.
+ *
+ * @return void
+ * @access public
+ */
+	function testInitValidations() {
+		$result = $this->Task->initValidations();
+		$this->assertTrue(in_array('notempty', $result));
+	}
+
+/**
+ * test that individual field validation works, with interactive = false
+ * tests the guessing features of validation
+ *
+ * @return void
+ * @access public
+ */
+	function testFieldValidationGuessing() {
+		$this->Task->interactive = false;
+		$this->Task->initValidations();
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('notempty' => 'notempty');
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'date', 'length' => 10, 'null' => false));
+		$expected = array('date' => 'date');
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'time', 'length' => 10, 'null' => false));
+		$expected = array('time' => 'time');
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Task->fieldValidation('email', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('email' => 'email');
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Task->fieldValidation('test', array('type' => 'integer', 'length' => 10, 'null' => false));
+		$expected = array('numeric' => 'numeric');
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Task->fieldValidation('test', array('type' => 'boolean', 'length' => 10, 'null' => false));
+		$expected = array('boolean' => 'boolean');
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Task->fieldValidation('test', array('type' => 'string', 'length' => 36, 'null' => false));
+		$expected = array('uuid' => 'uuid');
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test that interactive field validation works and returns multiple validators.
+ *
+ * @return void
+ * @access public
+ */
+	function testInteractiveFieldValidation() {
+		$this->Task->initValidations();
+		$this->Task->interactive = true;
+		$this->Task->setReturnValueAt(0, 'in', '19');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', '15');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('notempty' => 'notempty', 'maxlength' => 'maxlength');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that a bogus response doesn't cause errors to bubble up.
+ *
+ * @return void
+ */
+	function testInteractiveFieldValidationWithBogusResponse() {
+		$this->Task->initValidations();
+		$this->Task->interactive = true;
+		$this->Task->setReturnValueAt(0, 'in', '999999');
+		$this->Task->setReturnValueAt(1, 'in', '19');
+		$this->Task->setReturnValueAt(2, 'in', 'n');
+		$this->Task->expectAt(4, 'out', array(new PatternExpectation('/make a valid/')));
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('notempty' => 'notempty');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that a regular expression can be used for validation.
+ *
+ * @return void
+ */
+	function testInteractiveFieldValidationWithRegexp() {
+		$this->Task->initValidations();
+		$this->Task->interactive = true;
+		$this->Task->setReturnValueAt(0, 'in', '/^[a-z]{0,9}$/');
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+
+		$result = $this->Task->fieldValidation('text', array('type' => 'string', 'length' => 10, 'null' => false));
+		$expected = array('a_z_0_9' => '/^[a-z]{0,9}$/');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test the validation Generation routine
+ *
+ * @return void
+ * @access public
+ */
+	function testNonInteractiveDoValidation() {
+		$Model =& new MockModelTaskModel();
+		$Model->primaryKey = 'id';
+		$Model->setReturnValue('schema', array(
+			'id' => array(
+				'type' => 'integer',
+				'length' => 11,
+				'null' => false,
+				'key' => 'primary',
+			),
+			'name' => array(
+				'type' => 'string',
+				'length' => 20,
+				'null' => false,
+			),
+			'email' => array(
+				'type' => 'string',
+				'length' => 255,
+				'null' => false,
+			),
+			'some_date' => array(
+				'type' => 'date',
+				'length' => '',
+				'null' => false,
+			),
+			'some_time' => array(
+				'type' => 'time',
+				'length' => '',
+				'null' => false,
+			),
+			'created' => array(
+				'type' => 'datetime',
+				'length' => '',
+				'null' => false,
+			)
+		));
+		$this->Task->interactive = false;
+
+		$result = $this->Task->doValidation($Model);
+		$expected = array(
+			'name' => array(
+				'notempty' => 'notempty'
+			),
+			'email' => array(
+				'email' => 'email',
+			),
+			'some_date' => array(
+				'date' => 'date'
+			),
+			'some_time' => array(
+				'time' => 'time'
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that finding primary key works
+ *
+ * @return void
+ * @access public
+ */
+	function testFindPrimaryKey() {
+		$fields = array(
+			'one' => array(),
+			'two' => array(),
+			'key' => array('key' => 'primary')
+		);
+		$this->Task->expectAt(0, 'in', array('*', null, 'key'));
+		$this->Task->setReturnValue('in', 'my_field');
+		$result = $this->Task->findPrimaryKey($fields);
+		$expected = 'my_field';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test finding Display field
+ *
+ * @return void
+ * @access public
+ */
+	function testFindDisplayField() {
+		$fields = array('id' => array(), 'tagname' => array(), 'body' => array(),
+			'created' => array(), 'modified' => array());
+
+		$this->Task->setReturnValue('in', 'n');
+		$this->Task->setReturnValueAt(0, 'in', 'n');
+		$result = $this->Task->findDisplayField($fields);
+		$this->assertFalse($result);
+
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', 2);
+		$result = $this->Task->findDisplayField($fields);
+		$this->assertEqual($result, 'tagname');
+	}
+
+/**
+ * test that belongsTo generation works.
+ *
+ * @return void
+ * @access public
+ */
+	function testBelongsToGeneration() {
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Comment'));
+		$result = $this->Task->findBelongsTo($model, array());
+		$expected = array(
+			'belongsTo' => array(
+				array(
+					'alias' => 'Article',
+					'className' => 'Article',
+					'foreignKey' => 'article_id',
+				),
+				array(
+					'alias' => 'User',
+					'className' => 'User',
+					'foreignKey' => 'user_id',
+				),
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
+		$result = $this->Task->findBelongsTo($model, array());
+		$expected = array(
+			'belongsTo' => array(
+				array(
+					'alias' => 'ParentCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that hasOne and/or hasMany relations are generated properly.
+ *
+ * @return void
+ * @access public
+ */
+	function testHasManyHasOneGeneration() {
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
+		$this->Task->connection = 'test_suite';
+		$this->Task->listAll();
+		$result = $this->Task->findHasOneAndMany($model, array());
+		$expected = array(
+			'hasMany' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'article_id',
+				),
+			),
+			'hasOne' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'article_id',
+				),
+			),
+		);
+		$this->assertEqual($result, $expected);
+
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
+		$result = $this->Task->findHasOneAndMany($model, array());
+		$expected = array(
+			'hasOne' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'hasMany' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that HABTM generation works
+ *
+ * @return void
+ * @access public
+ */
+	function testHasAndBelongsToManyGeneration() {
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
+		$this->Task->connection = 'test_suite';
+		$this->Task->listAll();
+		$result = $this->Task->findHasAndBelongsToMany($model, array());
+		$expected = array(
+			'hasAndBelongsToMany' => array(
+				array(
+					'alias' => 'Tag',
+					'className' => 'Tag',
+					'foreignKey' => 'article_id',
+					'joinTable' => 'articles_tags',
+					'associationForeignKey' => 'tag_id',
+				),
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test non interactive doAssociations
+ *
+ * @return void
+ * @access public
+ */
+	function testDoAssociationsNonInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->interactive = false;
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'Article'));
+		$result = $this->Task->doAssociations($model);
+		$expected = array(
+			'hasMany' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'article_id',
+				),
+			),
+			'hasAndBelongsToMany' => array(
+				array(
+					'alias' => 'Tag',
+					'className' => 'Tag',
+					'foreignKey' => 'article_id',
+					'joinTable' => 'articles_tags',
+					'associationForeignKey' => 'tag_id',
+				),
+			),
+		);
+	}
+
+/**
+ * Ensure that the fixutre object is correctly called.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeFixture() {
+		$this->Task->plugin = 'test_plugin';
+		$this->Task->interactive = true;
+		$this->Task->Fixture->expectAt(0, 'bake', array('Article', 'articles'));
+		$this->Task->bakeFixture('Article', 'articles');
+
+		$this->assertEqual($this->Task->plugin, $this->Task->Fixture->plugin);
+		$this->assertEqual($this->Task->connection, $this->Task->Fixture->connection);
+		$this->assertEqual($this->Task->interactive, $this->Task->Fixture->interactive);
+	}
+
+/**
+ * Ensure that the test object is correctly called.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeTest() {
+		$this->Task->plugin = 'test_plugin';
+		$this->Task->interactive = true;
+		$this->Task->Test->expectAt(0, 'bake', array('Model', 'Article'));
+		$this->Task->bakeTest('Article');
+
+		$this->assertEqual($this->Task->plugin, $this->Task->Test->plugin);
+		$this->assertEqual($this->Task->connection, $this->Task->Test->connection);
+		$this->assertEqual($this->Task->interactive, $this->Task->Test->interactive);
+	}
+
+/**
+ * test confirming of associations, and that when an association is hasMany
+ * a question for the hasOne is also not asked.
+ *
+ * @return void
+ * @access public
+ */
+	function testConfirmAssociations() {
+		$associations = array(
+			'hasOne' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'hasMany' => array(
+				array(
+					'alias' => 'ChildCategoryThread',
+					'className' => 'CategoryThread',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'belongsTo' => array(
+				array(
+					'alias' => 'User',
+					'className' => 'User',
+					'foreignKey' => 'user_id',
+				),
+			)
+		);
+		$model = new Model(array('ds' => 'test_suite', 'name' => 'CategoryThread'));
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$result = $this->Task->confirmAssociations($model, $associations);
+		$this->assertTrue(empty($result['hasOne']));
+
+		$this->Task->setReturnValue('in', 'n');
+		$result = $this->Task->confirmAssociations($model, $associations);
+		$this->assertTrue(empty($result['hasMany']));
+		$this->assertTrue(empty($result['hasOne']));
+	}
+
+/**
+ * test that inOptions generates questions and only accepts a valid answer
+ *
+ * @return void
+ * @access public
+ */
+	function testInOptions() {
+		$options = array('one', 'two', 'three');
+		$this->Task->expectAt(0, 'out', array('1. one'));
+		$this->Task->expectAt(1, 'out', array('2. two'));
+		$this->Task->expectAt(2, 'out', array('3. three'));
+		$this->Task->setReturnValueAt(0, 'in', 10);
+
+		$this->Task->expectAt(3, 'out', array('1. one'));
+		$this->Task->expectAt(4, 'out', array('2. two'));
+		$this->Task->expectAt(5, 'out', array('3. three'));
+		$this->Task->setReturnValueAt(1, 'in', 2);
+		$result = $this->Task->inOptions($options, 'Pick a number');
+		$this->assertEqual($result, 1);
+	}
+
+/**
+ * test baking validation
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeValidation() {
+		$validate = array(
+			'name' => array(
+				'notempty' => 'notempty'
+			),
+			'email' => array(
+				'email' => 'email',
+			),
+			'some_date' => array(
+				'date' => 'date'
+			),
+			'some_time' => array(
+				'time' => 'time'
+			)
+		);
+		$result = $this->Task->bake('Article', compact('validate'));
+		$this->assertPattern('/class Article extends AppModel \{/', $result);
+		$this->assertPattern('/\$name \= \'Article\'/', $result);
+		$this->assertPattern('/\$validate \= array\(/', $result);
+		$expected = <<< STRINGEND
+array(
+			'notempty' => array(
+				'rule' => array('notempty'),
+				//'message' => 'Your custom message here',
+				//'allowEmpty' => false,
+				//'required' => false,
+				//'last' => false, // Stop validation after this rule
+				//'on' => 'create', // Limit validation to 'create' or 'update' operations
+			),
+STRINGEND;
+		$this->assertPattern('/' . preg_quote(str_replace("\r\n", "\n", $expected), '/') . '/', $result);
+	}
+
+/**
+ * test baking relations
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeRelations() {
+		$associations = array(
+			'belongsTo' => array(
+				array(
+					'alias' => 'SomethingElse',
+					'className' => 'SomethingElse',
+					'foreignKey' => 'something_else_id',
+				),
+				array(
+					'alias' => 'User',
+					'className' => 'User',
+					'foreignKey' => 'user_id',
+				),
+			),
+			'hasOne' => array(
+				array(
+					'alias' => 'OtherModel',
+					'className' => 'OtherModel',
+					'foreignKey' => 'other_model_id',
+				),
+			),
+			'hasMany' => array(
+				array(
+					'alias' => 'Comment',
+					'className' => 'Comment',
+					'foreignKey' => 'parent_id',
+				),
+			),
+			'hasAndBelongsToMany' => array(
+				array(
+					'alias' => 'Tag',
+					'className' => 'Tag',
+					'foreignKey' => 'article_id',
+					'joinTable' => 'articles_tags',
+					'associationForeignKey' => 'tag_id',
+				),
+			)
+		);
+		$result = $this->Task->bake('Article', compact('associations'));
+		$this->assertPattern('/\$hasAndBelongsToMany \= array\(/', $result);
+		$this->assertPattern('/\$hasMany \= array\(/', $result);
+		$this->assertPattern('/\$belongsTo \= array\(/', $result);
+		$this->assertPattern('/\$hasOne \= array\(/', $result);
+		$this->assertPattern('/Tag/', $result);
+		$this->assertPattern('/OtherModel/', $result);
+		$this->assertPattern('/SomethingElse/', $result);
+		$this->assertPattern('/Comment/', $result);
+	}
+
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeWithPlugin() {
+		$this->Task->plugin = 'ControllerTest';
+
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'models' . DS . 'article.php';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('Article', array(), array());
+
+		$this->Task->plugin = 'controllerTest';
+
+		$path = APP . 'plugins' . DS . 'controller_test' . DS . 'models' . DS . 'article.php';
+		$this->Task->expectAt(1, 'createFile', array(
+		$path, new PatternExpectation('/Article extends ControllerTestAppModel/')));
+		$this->Task->bake('Article', array(), array());
+
+		$this->assertEqual(count(ClassRegistry::keys()), 0);
+		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+	}
+
+/**
+ * test that execute passes runs bake depending with named model.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithNamedModel() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('article');
+		$filename = '/my/path/article.php';
+		$this->Task->setReturnValue('_checkUnitTest', 1);
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article extends AppModel/')));
+		$this->Task->execute();
+
+		$this->assertEqual(count(ClassRegistry::keys()), 0);
+		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+	}
+
+/**
+ * test that execute passes with different inflections of the same name.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithNamedModelVariations() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->setReturnValue('_checkUnitTest', 1);
+
+		$this->Task->args = array('article');
+		$filename = '/my/path/article.php';
+
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article extends AppModel/')));
+		$this->Task->execute();
+
+		$this->Task->args = array('Articles');
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class Article extends AppModel/')));
+		$this->Task->execute();
+
+		$this->Task->args = array('articles');
+		$this->Task->expectAt(2, 'createFile', array($filename, new PatternExpectation('/class Article extends AppModel/')));
+		$this->Task->execute();
+	}
+
+/**
+ * test that execute with a model name picks up hasMany associations.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithNamedModelHasManyCreated() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('article');
+		$filename = '/my/path/article.php';
+		$this->Task->setReturnValue('_checkUnitTest', 1);
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation("/'Comment' \=\> array\(/")));
+		$this->Task->execute();
+	}
+
+/**
+ * test that execute runs all() when args[0] = all
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteIntoAll() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+		$this->Task->setReturnValue('_checkUnitTest', true);
+
+		$this->Task->Fixture->expectCallCount('bake', 5);
+		$this->Task->Test->expectCallCount('bake', 5);
+
+		$filename = '/my/path/article.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article/')));
+
+		$filename = '/my/path/articles_tag.php';
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class ArticlesTag/')));
+
+		$filename = '/my/path/category_thread.php';
+		$this->Task->expectAt(2, 'createFile', array($filename, new PatternExpectation('/class CategoryThread/')));
+
+		$filename = '/my/path/comment.php';
+		$this->Task->expectAt(3, 'createFile', array($filename, new PatternExpectation('/class Comment/')));
+
+		$filename = '/my/path/tag.php';
+		$this->Task->expectAt(4, 'createFile', array($filename, new PatternExpectation('/class Tag/')));
+
+		$this->Task->execute();
+
+		$this->assertEqual(count(ClassRegistry::keys()), 0);
+		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+	}
+
+/**
+ * test that skipTables changes how all() works.
+ *
+ * @return void
+ */
+	function testSkipTablesAndAll() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->args = array('all');
+		$this->Task->setReturnValue('_checkUnitTest', true);
+		$this->Task->skipTables = array('tags');
+
+		$this->Task->Fixture->expectCallCount('bake', 4);
+		$this->Task->Test->expectCallCount('bake', 4);
+
+		$filename = '/my/path/article.php';
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article/')));
+
+		$filename = '/my/path/articles_tag.php';
+		$this->Task->expectAt(1, 'createFile', array($filename, new PatternExpectation('/class ArticlesTag/')));
+
+		$filename = '/my/path/category_thread.php';
+		$this->Task->expectAt(2, 'createFile', array($filename, new PatternExpectation('/class CategoryThread/')));
+
+		$filename = '/my/path/comment.php';
+		$this->Task->expectAt(3, 'createFile', array($filename, new PatternExpectation('/class Comment/')));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test the interactive side of bake.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteIntoInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+		$this->Task->interactive = true;
+
+		$this->Task->setReturnValueAt(0, 'in', '1'); //choose article
+		$this->Task->setReturnValueAt(1, 'in', 'n'); //no validation
+		$this->Task->setReturnValueAt(2, 'in', 'y'); //yes to associations
+		$this->Task->setReturnValueAt(3, 'in', 'y'); //yes to comment relation
+		$this->Task->setReturnValueAt(4, 'in', 'y'); //yes to user relation
+		$this->Task->setReturnValueAt(5, 'in', 'y'); //yes to tag relation
+		$this->Task->setReturnValueAt(6, 'in', 'n'); //no to additional assocs
+		$this->Task->setReturnValueAt(7, 'in', 'y'); //yes to looksGood?
+		$this->Task->setReturnValue('_checkUnitTest', true);
+
+		$this->Task->Test->expectOnce('bake');
+		$this->Task->Fixture->expectOnce('bake');
+
+		$filename = '/my/path/article.php';
+		$this->Task->expectOnce('createFile');
+		$this->Task->expectAt(0, 'createFile', array($filename, new PatternExpectation('/class Article/')));
+		$this->Task->execute();
+
+		$this->assertEqual(count(ClassRegistry::keys()), 0);
+		$this->assertEqual(count(ClassRegistry::mapKeys()), 0);
+	}
+
+/**
+ * test using bake interactively with a table that does not exist.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithNonExistantTableName() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->path = '/my/path/';
+
+		$this->Task->expectOnce('_stop');
+		$this->Task->expectOnce('err');
+
+		$this->Task->setReturnValueAt(0, 'in', 'Foobar');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->execute();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php
new file mode 100644
index 000000000..8210a2a38
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/plugin.test.php
@@ -0,0 +1,263 @@
+<?php
+/**
+ * PluginTask Test file
+ *
+ * Test Case for plugin generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.3.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'plugin.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'model.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestPluginTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'PluginTask', 'MockPluginTask',
+	array('in', '_stop', 'err', 'out', 'createFile')
+);
+
+Mock::generate('ModelTask', 'PluginTestMockModelTask');
+
+/**
+ * PluginTaskPlugin class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class PluginTaskTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestPluginTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
+		$this->Task =& new MockPluginTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->path = TMP . 'tests' . DS;
+	}
+
+/**
+ * startCase methods
+ *
+ * @return void
+ * @access public
+ */
+	function startCase() {
+		$this->_paths = $paths = App::path('plugins');
+		$this->_testPath = array_push($paths, TMP . 'tests' . DS);
+		App::build(array('plugins' => $paths));
+	}
+
+/**
+ * endCase
+ *
+ * @return void
+ * @access public
+ */
+	function endCase() {
+		App::build(array('plugins' => $this->_paths));
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * test bake()
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeFoldersAndFiles() {
+		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->bake('BakeTestPlugin');
+
+		$path = $this->Task->path . 'bake_test_plugin';
+		$this->assertTrue(is_dir($path), 'No plugin dir %s');
+
+		$this->assertTrue(is_dir($path . DS . 'config'), 'No config dir %s');
+		$this->assertTrue(is_dir($path . DS . 'config' . DS . 'schema'), 'No schema dir %s');
+		$this->assertTrue(file_exists($path . DS . 'config' . DS . 'schema' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(file_exists($path . DS . 'controllers' . DS . 'components' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(file_exists($path . DS . 'models' . DS . 'behaviors' . DS . 'empty'), 'No empty file %s');
+		$this->assertTrue(is_dir($path . DS . 'models' . DS . 'datasources'), 'No datasources dir %s');
+		$this->assertTrue(file_exists($path . DS . 'models' . DS . 'datasources' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(file_exists($path . DS . 'views' . DS . 'helpers' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+
+		$this->assertTrue(
+			is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'components'), 'No components cases dir %s'
+		);
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'components' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'behaviors'), 'No behaviors cases dir %s');
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'behaviors' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'helpers'), 'No helpers cases dir %s');
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'models'), 'No models cases dir %s');
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(
+			is_dir($path . DS . 'tests' . DS . 'cases' . DS . 'controllers'),
+			'No controllers cases dir %s'
+		);
+		$this->assertTrue(
+			file_exists($path . DS . 'tests' . DS . 'cases' . DS . 'controllers' . DS . 'empty'), 'No empty file %s'
+		);
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(file_exists($path . DS . 'tests' . DS . 'groups' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+		$this->assertTrue(file_exists($path . DS . 'tests' . DS . 'fixtures' . DS . 'empty'), 'No empty file %s');
+
+		$this->assertTrue(is_dir($path . DS . 'vendors'), 'No vendors dir %s');
+	
+		$this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'shells'), 'No vendors shells dir %s');
+		$this->assertTrue(is_dir($path . DS . 'vendors' . DS . 'shells' . DS . 'tasks'), 'No vendors shells tasks dir %s');
+		$this->assertTrue(file_exists($path . DS . 'vendors' . DS . 'shells' . DS . 'tasks' . DS . 'empty'), 'No empty file %s');
+		$this->assertTrue(is_dir($path . DS . 'libs'), 'No libs dir %s');
+		$this->assertTrue(is_dir($path . DS . 'webroot'), 'No webroot dir %s');
+
+		$file = $path . DS . 'bake_test_plugin_app_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($file, '*'), 'No AppController %s');
+
+		$file = $path . DS . 'bake_test_plugin_app_model.php';
+		$this->Task->expectAt(1, 'createFile', array($file, '*'), 'No AppModel %s');
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_plugin');
+		$Folder->delete();
+	}
+
+/**
+ * test execute with no args, flowing into interactive,
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithNoArgs() {
+		$this->Task->setReturnValueAt(0, 'in', 'TestPlugin');
+		$this->Task->setReturnValueAt(1, 'in', '3');
+		$this->Task->setReturnValueAt(2, 'in', 'y');
+		$this->Task->setReturnValueAt(3, 'in', 'n');
+
+		$path = $this->Task->path . 'test_plugin';
+		$file = $path . DS . 'test_plugin_app_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($file, '*'), 'No AppController %s');
+
+		$file = $path . DS . 'test_plugin_app_model.php';
+		$this->Task->expectAt(1, 'createFile', array($file, '*'), 'No AppModel %s');
+
+		$this->Task->args = array();
+		$this->Task->execute();
+
+		$Folder =& new Folder($path);
+		$Folder->delete();
+	}
+
+/**
+ * Test Execute
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithOneArg() {
+		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->Dispatch->args = array('BakeTestPlugin');
+		$this->Task->args =& $this->Task->Dispatch->args;
+
+		$path = $this->Task->path . 'bake_test_plugin';
+		$file = $path . DS . 'bake_test_plugin_app_controller.php';
+		$this->Task->expectAt(0, 'createFile', array($file, '*'), 'No AppController %s');
+
+		$file = $path . DS . 'bake_test_plugin_app_model.php';
+		$this->Task->expectAt(1, 'createFile', array($file, '*'), 'No AppModel %s');
+
+		$this->Task->execute();
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_plugin');
+		$Folder->delete();
+	}
+
+/**
+ * test execute chaining into MVC parts
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithTwoArgs() {
+		$this->Task->Model =& new PluginTestMockModelTask();
+		$this->Task->setReturnValueAt(0, 'in', $this->_testPath);
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_plugin', true);
+
+		$this->Task->Dispatch->args = array('BakeTestPlugin', 'model');
+		$this->Task->args =& $this->Task->Dispatch->args;
+
+		$this->Task->Model->expectOnce('loadTasks');
+		$this->Task->Model->expectOnce('execute');
+		$this->Task->execute();
+		$Folder->delete();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/project.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/project.test.php
new file mode 100644
index 000000000..e6fa38623
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/project.test.php
@@ -0,0 +1,301 @@
+<?php
+/**
+ * ProjectTask Test file
+ *
+ * Test Case for project generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.3.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'project.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestProjectTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'ProjectTask', 'MockProjectTask',
+	array('in', '_stop', 'err', 'out', 'createFile')
+);
+
+/**
+ * ProjectTask Test class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ProjectTaskTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestProjectTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
+		$this->Task =& new MockProjectTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->path = TMP . 'tests' . DS;
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+
+		$Folder =& new Folder($this->Task->path . 'bake_test_app');
+		$Folder->delete();
+	}
+
+/**
+ * creates a test project that is used for testing project task.
+ *
+ * @return void
+ * @access protected
+ */
+	function _setupTestProject() {
+		$skel = CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS . 'templates' . DS . 'skel';
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->bake($this->Task->path . 'bake_test_app', $skel);
+	}
+
+/**
+ * test bake() method and directory creation.
+ *
+ * @return void
+ * @access public
+ */
+	function testBake() {
+		$this->_setupTestProject();
+
+		$path = $this->Task->path . 'bake_test_app';
+		$this->assertTrue(is_dir($path), 'No project dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+	}
+
+/**
+ * test bake() method with -empty flag,  directory creation and empty files.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeEmptyFlag() {
+		$this->Task->params['empty'] = true;
+		$this->_setupTestProject();
+		$path = $this->Task->path . 'bake_test_app';
+		$this->assertTrue(is_dir($path), 'No project dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+
+		$this->assertTrue(is_file($path . DS . 'controllers' . DS .'components' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'locale' . DS . 'eng' . DS . 'LC_MESSAGES' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'models' . DS . 'behaviors' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'models' . DS . 'datasources' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'plugins' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'behaviors' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'components' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'controllers' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'datasources' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'cases' . DS . 'shells' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'fixtures' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'tests' . DS . 'groups' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'vendors' . DS . 'shells' . DS . 'tasks' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'views' . DS . 'errors' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'views' . DS . 'helpers' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'views' . DS . 'scaffolds' . DS . 'empty'), 'No empty file in dir %s');
+		$this->assertTrue(is_file($path . DS . 'webroot' . DS . 'js' . DS . 'empty'), 'No empty file in dir %s');
+	}
+
+/**
+ * test generation of Security.salt
+ *
+ * @return void
+ * @access public
+ */
+	function testSecuritySaltGeneration() {
+		$this->_setupTestProject();
+
+		$path = $this->Task->path . 'bake_test_app' . DS;
+		$result = $this->Task->securitySalt($path);
+		$this->assertTrue($result);
+
+		$file =& new File($path . 'config' . DS . 'core.php');
+		$contents = $file->read();
+		$this->assertNoPattern('/DYhG93b0qyJfIxfs2guVoUubWwvniR2G0FgaC9mi/', $contents, 'Default Salt left behind. %s');
+	}
+
+	/**
+	 * test generation of Security.cipherSeed
+	 *
+	 * @return void
+	 * @access public
+	 */
+		function testSecurityCipherSeedGeneration() {
+			$this->_setupTestProject();
+
+			$path = $this->Task->path . 'bake_test_app' . DS;
+			$result = $this->Task->securityCipherSeed($path);
+			$this->assertTrue($result);
+
+			$file =& new File($path . 'config' . DS . 'core.php');
+			$contents = $file->read();
+			$this->assertNoPattern('/76859309657453542496749683645/', $contents, 'Default CipherSeed left behind. %s');
+		}
+
+/**
+ * Test that index.php is generated correctly.
+ *
+ * @return void
+ * @access public
+ */
+	function testIndexPhpGeneration() {
+		$this->_setupTestProject();
+
+		$path = $this->Task->path . 'bake_test_app' . DS;
+		$this->Task->corePath($path);
+
+		$file =& new File($path . 'webroot' . DS . 'index.php');
+		$contents = $file->read();
+		$this->assertNoPattern('/define\(\'CAKE_CORE_INCLUDE_PATH\', \'ROOT/', $contents);
+
+		$file =& new File($path . 'webroot' . DS . 'test.php');
+		$contents = $file->read();
+		$this->assertNoPattern('/define\(\'CAKE_CORE_INCLUDE_PATH\', \'ROOT/', $contents);
+	}
+
+/**
+ * test getPrefix method, and that it returns Routing.prefix or writes to config file.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetPrefix() {
+		Configure::write('Routing.prefixes', array('admin'));
+		$result = $this->Task->getPrefix();
+		$this->assertEqual($result, 'admin_');
+
+		Configure::write('Routing.prefixes', null);
+		$this->_setupTestProject();
+		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'config' . DS;
+		$this->Task->setReturnValue('in', 'super_duper_admin');
+
+		$result = $this->Task->getPrefix();
+		$this->assertEqual($result, 'super_duper_admin_');
+
+		$file =& new File($this->Task->configPath . 'core.php');
+		$file->delete();
+	}
+
+/**
+ * test cakeAdmin() writing core.php
+ *
+ * @return void
+ * @access public
+ */
+	function testCakeAdmin() {
+		$file =& new File(CONFIGS . 'core.php');
+		$contents = $file->read();;
+		$file =& new File(TMP . 'tests' . DS . 'core.php');
+		$file->write($contents);
+
+		Configure::write('Routing.prefixes', null);
+		$this->Task->configPath = TMP . 'tests' . DS;
+		$result = $this->Task->cakeAdmin('my_prefix');
+		$this->assertTrue($result);
+
+		$this->assertEqual(Configure::read('Routing.prefixes'), array('my_prefix'));
+		$file->delete();
+	}
+
+/**
+ * test getting the prefix with more than one prefix setup
+ *
+ * @return void
+ * @access public
+ */
+	function testGetPrefixWithMultiplePrefixes() {
+		Configure::write('Routing.prefixes', array('admin', 'ninja', 'shinobi'));
+		$this->_setupTestProject();
+		$this->Task->configPath = $this->Task->path . 'bake_test_app' . DS . 'config' . DS;
+		$this->Task->setReturnValue('in', 2);
+
+		$result = $this->Task->getPrefix();
+		$this->assertEqual($result, 'ninja_');
+	}
+
+/**
+ * Test execute method with one param to destination folder.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecute() {
+		$this->Task->params['skel'] = CAKE_CORE_INCLUDE_PATH . DS . CAKE . DS . 'console' . DS. 'templates' . DS . 'skel';
+		$this->Task->params['working'] = TMP . 'tests' . DS;
+
+		$path = $this->Task->path . 'bake_test_app';
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->setReturnValueAt(0, 'in', $path);
+
+		$this->Task->execute();
+		$this->assertTrue(is_dir($path), 'No project dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers'), 'No controllers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'controllers' . DS .'components'), 'No components dir %s');
+		$this->assertTrue(is_dir($path . DS . 'models'), 'No models dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views'), 'No views dir %s');
+		$this->assertTrue(is_dir($path . DS . 'views' . DS . 'helpers'), 'No helpers dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests'), 'No tests dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'cases'), 'No cases dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'groups'), 'No groups dir %s');
+		$this->assertTrue(is_dir($path . DS . 'tests' . DS . 'fixtures'), 'No fixtures dir %s');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/template.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/template.test.php
new file mode 100644
index 000000000..01fc1348e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/template.test.php
@@ -0,0 +1,189 @@
+<?php
+/**
+ * TemplateTask file
+ *
+ * Test Case for TemplateTask generation shell task
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestTemplateTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+
+Mock::generatePartial(
+	'TemplateTask', 'MockTemplateTask',
+	array('in', 'out', 'err', 'createFile', '_stop')
+);
+
+/**
+ * TemplateTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class TemplateTaskTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestTemplateTaskMockShellDispatcher();
+		$this->Task =& new MockTemplateTask($this->Dispatcher);
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Dispatch->shellPaths = App::path('shells');
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		unset($this->Task, $this->Dispatcher);
+		ClassRegistry::flush();
+	}
+
+/**
+ * test that set sets variables
+ *
+ * @return void
+ * @access public
+ */
+	function testSet() {
+		$this->Task->set('one', 'two');
+		$this->assertTrue(isset($this->Task->templateVars['one']));
+		$this->assertEqual($this->Task->templateVars['one'], 'two');
+
+		$this->Task->set(array('one' => 'three', 'four' => 'five'));
+		$this->assertTrue(isset($this->Task->templateVars['one']));
+		$this->assertEqual($this->Task->templateVars['one'], 'three');
+		$this->assertTrue(isset($this->Task->templateVars['four']));
+		$this->assertEqual($this->Task->templateVars['four'], 'five');
+		
+		$this->Task->templateVars = array();
+		$this->Task->set(array(3 => 'three', 4 => 'four'));
+		$this->Task->set(array(1 => 'one', 2 => 'two'));
+		$expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two');
+		$this->assertEqual($this->Task->templateVars, $expected);
+	}
+
+/**
+ * test finding themes installed in
+ *
+ * @return void
+ * @access public
+ */
+	function testFindingInstalledThemesForBake() {
+		$consoleLibs = CAKE_CORE_INCLUDE_PATH . DS . CAKE . 'console' . DS;
+		$this->Task->Dispatch->shellPaths = array($consoleLibs);
+		$this->Task->initialize();
+		$this->assertEqual($this->Task->templatePaths, array('default' => $consoleLibs . 'templates' . DS . 'default' . DS));
+	}
+
+/**
+ * test getting the correct theme name.  Ensure that with only one theme, or a theme param
+ * that the user is not bugged.  If there are more, find and return the correct theme name
+ *
+ * @return void
+ * @access public
+ */
+	function testGetThemePath() {
+		$defaultTheme = CAKE_CORE_INCLUDE_PATH . DS . dirname(CONSOLE_LIBS) . 'templates' . DS . 'default' .DS;
+		$this->Task->templatePaths = array('default' => $defaultTheme);
+		$this->Task->expectCallCount('in', 1);
+
+		$result = $this->Task->getThemePath();
+		$this->assertEqual($result, $defaultTheme);
+
+		$this->Task->templatePaths = array('default' => $defaultTheme, 'other' => '/some/path');
+		$this->Task->params['theme'] = 'other';
+		$result = $this->Task->getThemePath();
+		$this->assertEqual($result, '/some/path');
+
+		$this->Task->params = array();
+		$this->Task->setReturnValueAt(0, 'in', '1');
+		$result = $this->Task->getThemePath();
+		$this->assertEqual($result, $defaultTheme);
+		$this->assertEqual($this->Dispatcher->params['theme'], 'default');
+	}
+
+/**
+ * test generate
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerate() {
+		App::build(array(
+			'shells' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS
+			)
+		));
+		$this->Task->initialize();
+		$this->Task->setReturnValue('in', 1);
+		$result = $this->Task->generate('classes', 'test_object', array('test' => 'foo'));
+		$expected = "I got rendered\nfoo";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test generate with a missing template in the chosen theme.
+ * ensure fallback to default works.
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateWithTemplateFallbacks() {
+		App::build(array(
+			'shells' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS .  'test_app' . DS . 'vendors' . DS . 'shells' . DS,
+				CAKE_CORE_INCLUDE_PATH . DS . 'console' . DS
+			)
+		));
+		$this->Task->initialize();
+		$this->Task->params['theme'] = 'test';
+		$this->Task->set(array(
+			'model' => 'Article',
+			'table' => 'articles',
+			'import' => false,
+			'records' => false,
+			'schema' => ''
+		));
+		$result = $this->Task->generate('classes', 'fixture');
+		$this->assertPattern('/ArticleFixture extends CakeTestFixture/', $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/test.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/test.test.php
new file mode 100644
index 000000000..b6f1e8c2a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/test.test.php
@@ -0,0 +1,646 @@
+<?php
+/**
+ * TestTaskTest file
+ *
+ * Test Case for test generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+App::import('Controller', 'Controller', false);
+App::import('Model', 'Model', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'test.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestTestTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'TestTask', 'MockTestTask',
+	array('in', '_stop', 'err', 'out', 'hr', 'createFile', 'isLoadableClass')
+);
+
+/**
+ * Test Article model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class TestTaskArticle extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'TestTaskArticle';
+
+/**
+ * Table name to use
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'articles';
+
+/**
+ * HasMany Associations
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'Comment' => array(
+			'className' => 'TestTask.TestTaskComment',
+			'foreignKey' => 'article_id',
+		)
+	);
+
+/**
+ * Has and Belongs To Many Associations
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array(
+		'Tag' => array(
+			'className' => 'TestTaskTag',
+			'joinTable' => 'articles_tags',
+			'foreignKey' => 'article_id',
+			'associationForeignKey' => 'tag_id'
+		)
+	);
+
+/**
+ * Example public method
+ *
+ * @return void
+ * @access public
+ */
+	function doSomething() {
+	}
+
+/**
+ * Example Secondary public method
+ *
+ * @return void
+ * @access public
+ */
+	function doSomethingElse() {
+	}
+
+/**
+ * Example protected method
+ *
+ * @return void
+ * @access protected
+ */
+	function _innerMethod() {
+	}
+}
+
+/**
+ * Tag Testing Model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class TestTaskTag extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'TestTaskTag';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'tags';
+
+/**
+ * Has and Belongs To Many Associations
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array(
+		'Article' => array(
+			'className' => 'TestTaskArticle',
+			'joinTable' => 'articles_tags',
+			'foreignKey' => 'tag_id',
+			'associationForeignKey' => 'article_id'
+		)
+	);
+}
+
+/**
+ * Simulated plugin
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class TestTaskAppModel extends Model {
+}
+
+/**
+ * Testing AppMode (TaskComment)
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class TestTaskComment extends TestTaskAppModel {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'TestTaskComment';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * Belongs To Associations
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'Article' => array(
+			'className' => 'TestTaskArticle',
+			'foreignKey' => 'article_id',
+		)
+	);
+}
+
+/**
+ * Test Task Comments Controller
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class TestTaskCommentsController extends Controller {
+
+/**
+ * Controller Name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'TestTaskComments';
+
+/**
+ * Models to use
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array('TestTaskComment', 'TestTaskTag');
+}
+
+/**
+ * TestTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class TestTaskTest extends CakeTestCase {
+
+/**
+ * Fixtures
+ *
+ * @var string
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
+
+/**
+ * startTest method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestTestTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
+		$this->Task =& new MockTestTask($this->Dispatcher);
+		$this->Task->name = 'TestTask';
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Template =& new TemplateTask($this->Dispatcher);
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+		App::build();
+	}
+
+/**
+ * Test that file path generation doesn't continuously append paths.
+ *
+ * @return void
+ * @access public
+ */
+	function testFilePathGeneration() {
+		$file = TESTS . 'cases' . DS . 'models' . DS . 'my_class.test.php';
+
+		$this->Task->Dispatch->expectNever('stderr');
+		$this->Task->Dispatch->expectNever('_stop');
+
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->expectAt(0, 'createFile', array($file, '*'));
+		$this->Task->bake('Model', 'MyClass');
+
+		$this->Task->expectAt(1, 'createFile', array($file, '*'));
+		$this->Task->bake('Model', 'MyClass');
+
+		$file = TESTS . 'cases' . DS . 'controllers' . DS . 'comments_controller.test.php';
+		$this->Task->expectAt(2, 'createFile', array($file, '*'));
+		$this->Task->bake('Controller', 'Comments');
+	}
+
+/**
+ * Test that method introspection pulls all relevant non parent class
+ * methods into the test case.
+ *
+ * @return void
+ */
+	function testMethodIntrospection() {
+		$result = $this->Task->getTestableMethods('TestTaskArticle');
+		$expected = array('dosomething', 'dosomethingelse');
+		$this->assertEqual(array_map('strtolower', $result), $expected);
+	}
+
+/**
+ * test that the generation of fixtures works correctly.
+ *
+ * @return void
+ * @access public
+ */
+	function testFixtureArrayGenerationFromModel() {
+		$subject = ClassRegistry::init('TestTaskArticle');
+		$result = $this->Task->generateFixtureList($subject);
+		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags',
+			'app.test_task_article', 'app.test_task_tag');
+
+		$this->assertEqual(sort($result), sort($expected));
+	}
+
+/**
+ * test that the generation of fixtures works correctly.
+ *
+ * @return void
+ * @access public
+ */
+	function testFixtureArrayGenerationFromController() {
+		$subject = new TestTaskCommentsController();
+		$result = $this->Task->generateFixtureList($subject);
+		$expected = array('plugin.test_task.test_task_comment', 'app.articles_tags',
+			'app.test_task_article', 'app.test_task_tag');
+
+		$this->assertEqual(sort($result), sort($expected));
+	}
+
+/**
+ * test user interaction to get object type
+ *
+ * @return void
+ * @access public
+ */
+	function testGetObjectType() {
+		$this->Task->expectOnce('_stop');
+		$this->Task->setReturnValueAt(0, 'in', 'q');
+		$this->Task->getObjectType();
+
+		$this->Task->setReturnValueAt(1, 'in', 2);
+		$result = $this->Task->getObjectType();
+		$this->assertEqual($result, $this->Task->classTypes[1]);
+	}
+
+/**
+ * creating test subjects should clear the registry so the registry is always fresh
+ *
+ * @return void
+ * @access public
+ */
+	function testRegistryClearWhenBuildingTestObjects() {
+		ClassRegistry::flush();
+		$model = ClassRegistry::init('TestTaskComment');
+		$model->bindModel(array(
+			'belongsTo' => array(
+				'Random' => array(
+					'className' => 'TestTaskArticle',
+					'foreignKey' => 'article_id',
+				)
+			)
+		));
+		$keys = ClassRegistry::keys();
+		$this->assertTrue(in_array('random', $keys));
+		$object =& $this->Task->buildTestSubject('Model', 'TestTaskComment');
+
+		$keys = ClassRegistry::keys();
+		$this->assertFalse(in_array('random', $keys));
+	}
+
+/**
+ * test that getClassName returns the user choice as a classname.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetClassName() {
+		$objects = App::objects('model');
+		$skip = $this->skipIf(empty($objects), 'No models in app, this test will fail. %s');
+		if ($skip) {
+			return;
+		}
+		$this->Task->setReturnValueAt(0, 'in', 'MyCustomClass');
+		$result = $this->Task->getClassName('Model');
+		$this->assertEqual($result, 'MyCustomClass');
+
+		$this->Task->setReturnValueAt(1, 'in', 1);
+		$result = $this->Task->getClassName('Model');
+		$options = App::objects('model');
+		$this->assertEqual($result, $options[0]);
+	}
+
+/**
+ * Test the user interaction for defining additional fixtures.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetUserFixtures() {
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'app.pizza, app.topping, app.side_dish');
+		$result = $this->Task->getUserFixtures();
+		$expected = array('app.pizza', 'app.topping', 'app.side_dish');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that resolving classnames works
+ *
+ * @return void
+ * @access public
+ */
+	function testGetRealClassname() {
+		$result = $this->Task->getRealClassname('Model', 'Post');
+		$this->assertEqual($result, 'Post');
+
+		$result = $this->Task->getRealClassname('Controller', 'Posts');
+		$this->assertEqual($result, 'PostsController');
+
+		$result = $this->Task->getRealClassname('Helper', 'Form');
+		$this->assertEqual($result, 'FormHelper');
+
+		$result = $this->Task->getRealClassname('Behavior', 'Containable');
+		$this->assertEqual($result, 'ContainableBehavior');
+
+		$result = $this->Task->getRealClassname('Component', 'Auth');
+		$this->assertEqual($result, 'AuthComponent');
+	}
+
+/**
+ * test baking files.  The conditionally run tests are known to fail in PHP4
+ * as PHP4 classnames are all lower case, breaking the plugin path inflection.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeModelTest() {
+		$this->Task->setReturnValue('createFile', true);
+		$this->Task->setReturnValue('isLoadableClass', true);
+
+		$result = $this->Task->bake('Model', 'TestTaskArticle');
+
+		$this->assertPattern('/App::import\(\'Model\', \'TestTaskArticle\'\)/', $result);
+		$this->assertPattern('/class TestTaskArticleTestCase extends CakeTestCase/', $result);
+
+		$this->assertPattern('/function startTest\(\)/', $result);
+		$this->assertPattern("/\\\$this->TestTaskArticle \=\& ClassRegistry::init\('TestTaskArticle'\)/", $result);
+
+		$this->assertPattern('/function endTest\(\)/', $result);
+		$this->assertPattern('/unset\(\$this->TestTaskArticle\)/', $result);
+
+		$this->assertPattern('/function testDoSomething\(\)/i', $result);
+		$this->assertPattern('/function testDoSomethingElse\(\)/i', $result);
+
+		$this->assertPattern("/'app\.test_task_article'/", $result);
+		if (PHP5) {
+			$this->assertPattern("/'plugin\.test_task\.test_task_comment'/", $result);
+		}
+		$this->assertPattern("/'app\.test_task_tag'/", $result);
+		$this->assertPattern("/'app\.articles_tag'/", $result);
+	}
+
+/**
+ * test baking controller test files, ensure that the stub class is generated.
+ * Conditional assertion is known to fail on PHP4 as classnames are all lower case
+ * causing issues with inflection of path name from classname.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeControllerTest() {
+		$this->Task->setReturnValue('createFile', true);
+		$this->Task->setReturnValue('isLoadableClass', true);
+
+		$result = $this->Task->bake('Controller', 'TestTaskComments');
+
+		$this->assertPattern('/App::import\(\'Controller\', \'TestTaskComments\'\)/', $result);
+		$this->assertPattern('/class TestTaskCommentsControllerTestCase extends CakeTestCase/', $result);
+
+		$this->assertPattern('/class TestTestTaskCommentsController extends TestTaskCommentsController/', $result);
+		$this->assertPattern('/var \$autoRender = false/', $result);
+		$this->assertPattern('/function redirect\(\$url, \$status = null, \$exit = true\)/', $result);
+
+		$this->assertPattern('/function startTest\(\)/', $result);
+		$this->assertPattern("/\\\$this->TestTaskComments \=\& new TestTestTaskCommentsController\(\)/", $result);
+		$this->assertPattern("/\\\$this->TestTaskComments->constructClasses\(\)/", $result);
+
+		$this->assertPattern('/function endTest\(\)/', $result);
+		$this->assertPattern('/unset\(\$this->TestTaskComments\)/', $result);
+
+		$this->assertPattern("/'app\.test_task_article'/", $result);
+		if (PHP5) {
+			$this->assertPattern("/'plugin\.test_task\.test_task_comment'/", $result);
+		}
+		$this->assertPattern("/'app\.test_task_tag'/", $result);
+		$this->assertPattern("/'app\.articles_tag'/", $result);
+	}
+
+/**
+ * test Constructor generation ensure that constructClasses is called for controllers
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateConstructor() {
+		$result = $this->Task->generateConstructor('controller', 'PostsController');
+		$expected = "new TestPostsController();\n\t\t\$this->Posts->constructClasses();\n";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->generateConstructor('model', 'Post');
+		$expected = "ClassRegistry::init('Post');\n";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->generateConstructor('helper', 'FormHelper');
+		$expected = "new FormHelper();\n";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that mock class generation works for the appropriate classes
+ *
+ * @return void
+ * @access public
+ */
+	function testMockClassGeneration() {
+		$result = $this->Task->hasMockClass('controller');
+		$this->assertTrue($result);
+	}
+
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeWithPlugin() {
+		$this->Task->plugin = 'TestTest';
+
+		$path = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'form.test.php';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('Helper', 'Form');
+	}
+
+/**
+ * test interactive with plugins lists from the plugin
+ *
+ * @return void
+ */
+	function testInteractiveWithPlugin() {
+		$testApp = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS;
+		App::build(array(
+			'plugins' => array($testApp)
+		), true);
+
+		$this->Task->plugin = 'TestPlugin';
+		$path = $testApp . 'test_plugin' . DS . 'tests' . DS . 'cases' . DS . 'helpers' . DS . 'other_helper.test.php';
+		$this->Task->setReturnValueAt(0, 'in', 5); //helper
+		$this->Task->setReturnValueAt(1, 'in', 1); //OtherHelper
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->expectAt(9, 'out', array('1. OtherHelper'));
+		$this->Task->execute();
+	}
+
+/**
+ * Test filename generation for each type + plugins
+ *
+ * @return void
+ * @access public
+ */
+	function testTestCaseFileName() {
+		$this->Task->path = '/my/path/tests/';
+
+		$result = $this->Task->testCaseFileName('Model', 'Post');
+		$expected = $this->Task->path . 'cases' . DS . 'models' . DS . 'post.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Helper', 'Form');
+		$expected = $this->Task->path . 'cases' . DS . 'helpers' . DS . 'form.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Controller', 'Posts');
+		$expected = $this->Task->path . 'cases' . DS . 'controllers' . DS . 'posts_controller.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Behavior', 'Containable');
+		$expected = $this->Task->path . 'cases' . DS . 'behaviors' . DS . 'containable.test.php';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Task->testCaseFileName('Component', 'Auth');
+		$expected = $this->Task->path . 'cases' . DS . 'components' . DS . 'auth.test.php';
+		$this->assertEqual($result, $expected);
+
+		$this->Task->plugin = 'TestTest';
+		$result = $this->Task->testCaseFileName('Model', 'Post');
+		$expected = APP . 'plugins' . DS . 'test_test' . DS . 'tests' . DS . 'cases' . DS . 'models' . DS . 'post.test.php';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test execute with a type defined
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithOneArg() {
+		$this->Task->args[0] = 'Model';
+		$this->Task->setReturnValueAt(0, 'in', 'TestTaskTag');
+		$this->Task->setReturnValue('isLoadableClass', true);
+		$this->Task->expectAt(0, 'createFile', array('*', new PatternExpectation('/class TestTaskTagTestCase extends CakeTestCase/')));
+		$this->Task->execute();
+	}
+
+/**
+ * test execute with type and class name defined
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithTwoArgs() {
+		$this->Task->args = array('Model', 'TestTaskTag');
+		$this->Task->setReturnValueAt(0, 'in', 'TestTaskTag');
+		$this->Task->setReturnValue('isLoadableClass', true);
+		$this->Task->expectAt(0, 'createFile', array('*', new PatternExpectation('/class TestTaskTagTestCase extends CakeTestCase/')));
+		$this->Task->execute();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/view.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/view.test.php
new file mode 100644
index 000000000..0e3b0db7b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/console/libs/tasks/view.test.php
@@ -0,0 +1,677 @@
+<?php
+/**
+ * ViewTask Test file
+ *
+ * Test Case for view generation shell task
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Shell', 'Shell', false);
+
+if (!defined('DISABLE_AUTO_DISPATCH')) {
+	define('DISABLE_AUTO_DISPATCH', true);
+}
+
+if (!class_exists('ShellDispatcher')) {
+	ob_start();
+	$argv = false;
+	require CAKE . 'console' .  DS . 'cake.php';
+	ob_end_clean();
+}
+
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'view.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'controller.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'template.php';
+require_once CAKE . 'console' .  DS . 'libs' . DS . 'tasks' . DS . 'project.php';
+
+Mock::generatePartial(
+	'ShellDispatcher', 'TestViewTaskMockShellDispatcher',
+	array('getInput', 'stdout', 'stderr', '_stop', '_initEnvironment')
+);
+Mock::generatePartial(
+	'ViewTask', 'MockViewTask',
+	array('in', '_stop', 'err', 'out', 'createFile')
+);
+
+Mock::generate('ControllerTask', 'ViewTaskMockControllerTask');
+Mock::generate('ProjectTask', 'ViewTaskMockProjectTask');
+
+/**
+ * Test View Task Comment Model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class ViewTaskComment extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'ViewTaskComment';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * Belongs To Associations
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'Article' => array(
+			'className' => 'ViewTaskArticle',
+			'foreignKey' => 'article_id'
+		)
+	);
+}
+
+/**
+ * Test View Task Article Model
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class ViewTaskArticle extends Model {
+
+/**
+ * Model name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'ViewTaskArticle';
+
+/**
+ * Table name
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'articles';
+}
+
+/**
+ * Test View Task Comments Controller
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class ViewTaskCommentsController extends Controller {
+
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'ViewTaskComments';
+
+/**
+ * Testing public controller action
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+	}
+
+/**
+ * Testing public controller action
+ *
+ * @return void
+ * @access public
+ */
+	function add() {
+	}
+}
+
+/**
+ * Test View Task Articles Controller
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.console.libs.tasks
+ */
+class ViewTaskArticlesController extends Controller {
+
+/**
+ * Controller name
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'ViewTaskArticles';
+
+/**
+ * Test public controller action
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+	}
+
+/**
+ * Test public controller action
+ *
+ * @return void
+ * @access public
+ */
+	function add() {
+	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
+	function admin_index() {
+	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
+	function admin_add() {
+	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
+	function admin_view() {
+	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
+	function admin_edit() {
+	}
+
+/**
+ * Test admin prefixed controller action
+ *
+ * @return void
+ * @access public
+ */
+	function admin_delete() {
+	}
+}
+
+/**
+ * ViewTaskTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.console.libs.tasks
+ */
+class ViewTaskTest extends CakeTestCase {
+
+/**
+ * Fixtures
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.comment', 'core.articles_tag', 'core.tag');
+
+/**
+ * startTest method
+ *
+ * Ensure that the default theme is used
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->Dispatcher =& new TestViewTaskMockShellDispatcher();
+		$this->Dispatcher->shellPaths = App::path('shells');
+		$this->Task =& new MockViewTask($this->Dispatcher);
+		$this->Task->name = 'ViewTask';
+		$this->Task->Dispatch =& $this->Dispatcher;
+		$this->Task->Template =& new TemplateTask($this->Dispatcher);
+		$this->Task->Controller =& new ViewTaskMockControllerTask();
+		$this->Task->Project =& new ViewTaskMockProjectTask();
+		$this->Task->path = TMP;
+		$this->Task->Template->params['theme'] = 'default';
+		
+		$this->_routing = Configure::read('Routing');
+	}
+
+/**
+ * endTest method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		ClassRegistry::flush();
+		Configure::write('Routing', $this->_routing);
+	}
+
+/**
+ * Test getContent and parsing of Templates.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetContent() {
+		$vars = array(
+			'modelClass' => 'TestViewModel',
+			'schema' => array(),
+			'primaryKey' => 'id',
+			'displayField' => 'name',
+			'singularVar' => 'testViewModel',
+			'pluralVar' => 'testViewModels',
+			'singularHumanName' => 'Test View Model',
+			'pluralHumanName' => 'Test View Models',
+			'fields' => array('id', 'name', 'body'),
+			'associations' => array()
+		);
+		$result = $this->Task->getContent('view', $vars);
+
+		$this->assertPattern('/Delete Test View Model/', $result);
+		$this->assertPattern('/Edit Test View Model/', $result);
+		$this->assertPattern('/List Test View Models/', $result);
+		$this->assertPattern('/New Test View Model/', $result);
+
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
+	}
+
+/**
+ * test getContent() using an admin_prefixed action.
+ *
+ * @return void
+ * @access public
+ */
+	function testGetContentWithAdminAction() {
+		$_back = Configure::read('Routing');
+		Configure::write('Routing.prefixes', array('admin'));
+		$vars = array(
+			'modelClass' => 'TestViewModel',
+			'schema' => array(),
+			'primaryKey' => 'id',
+			'displayField' => 'name',
+			'singularVar' => 'testViewModel',
+			'pluralVar' => 'testViewModels',
+			'singularHumanName' => 'Test View Model',
+			'pluralHumanName' => 'Test View Models',
+			'fields' => array('id', 'name', 'body'),
+			'associations' => array()
+		);
+		$result = $this->Task->getContent('admin_view', $vars);
+
+		$this->assertPattern('/Delete Test View Model/', $result);
+		$this->assertPattern('/Edit Test View Model/', $result);
+		$this->assertPattern('/List Test View Models/', $result);
+		$this->assertPattern('/New Test View Model/', $result);
+
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'id\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'name\'\]/', $result);
+		$this->assertPattern('/testViewModel\[\'TestViewModel\'\]\[\'body\'\]/', $result);
+
+		$result = $this->Task->getContent('admin_add', $vars);
+		$this->assertPattern("/input\('name'\)/", $result);
+		$this->assertPattern("/input\('body'\)/", $result);
+		$this->assertPattern('/List Test View Models/', $result);
+
+		Configure::write('Routing', $_back);
+	}
+
+/**
+ * test Bake method
+ *
+ * @return void
+ * @access public
+ */
+	function testBake() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'view.ctp',
+			new PatternExpectation('/View Task Articles/')
+		));
+		$this->Task->bake('view', true);
+
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'edit.ctp', '*'));
+		$this->Task->bake('edit', true);
+
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'index.ctp',
+			new PatternExpectation('/\$viewTaskComment\[\'Article\'\]\[\'title\'\]/')
+		));
+		$this->Task->bake('index', true);
+	}
+
+/**
+ * test that baking a view with no template doesn't make a file.
+ *
+ * @return void
+ */
+	function testBakeWithNoTemplate() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+
+		$this->Task->expectNever('createFile');
+		$this->Task->bake('delete', true);
+	}
+
+/**
+ * test bake() with a -plugin param
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeWithPlugin() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+		$this->Task->plugin = 'TestTest';
+
+		$path = APP . 'plugins' . DS . 'test_test' . DS . 'views' . DS . 'view_task_comments' . DS  . 'view.ctp';
+		$this->Task->expectAt(0, 'createFile', array($path, '*'));
+		$this->Task->bake('view', true);
+	}
+
+/**
+ * test bake actions baking multiple actions.
+ *
+ * @return void
+ * @access public
+ */
+	function testBakeActions() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'view.ctp',
+			new PatternExpectation('/View Task Comments/')
+		));
+		$this->Task->expectAt(1, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'edit.ctp',
+			new PatternExpectation('/Edit View Task Comment/')
+		));
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'index.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+
+		$this->Task->bakeActions(array('view', 'edit', 'index'), array());
+	}
+
+/**
+ * test baking a customAction (non crud)
+ *
+ * @return void
+ * @access public
+ */
+	function testCustomAction() {
+		$this->Task->controllerName = 'ViewTaskComments';
+		$this->Task->controllerPath = 'view_task_comments';
+		$this->Task->params['app'] = APP;
+
+		$this->Task->setReturnValueAt(0, 'in', '');
+		$this->Task->setReturnValueAt(1, 'in', 'my_action');
+		$this->Task->setReturnValueAt(2, 'in', 'y');
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'my_action.ctp', '*'));
+
+		$this->Task->customAction();
+	}
+
+/**
+ * Test all()
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteIntoAll() {
+		$this->Task->args[0] = 'all';
+
+		$this->Task->Controller->setReturnValue('listAll', array('view_task_comments'));
+		$this->Task->Controller->expectOnce('listAll');
+
+		$this->Task->expectCallCount('createFile', 2);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'add.ctp', '*'));
+
+		$this->Task->execute();
+	}
+
+/**
+ * Test all() with action parameter
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteIntoAllWithActionName() {
+		$this->Task->args = array('all', 'index');
+
+		$this->Task->Controller->setReturnValue('listAll', array('view_task_comments'));
+		$this->Task->Controller->expectOnce('listAll');
+
+		$this->Task->expectCallCount('createFile', 1);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'index.ctp', '*'));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test `cake bake view $controller view`
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithActionParam() {
+		$this->Task->args[0] = 'ViewTaskComments';
+		$this->Task->args[1] = 'view';
+
+		$this->Task->expectCallCount('createFile', 1);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'view.ctp', '*'));
+		$this->Task->execute();
+	}
+
+/**
+ * test `cake bake view $controller`
+ * Ensure that views are only baked for actions that exist in the controller.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithController() {
+		$this->Task->args[0] = 'ViewTaskComments';
+
+		$this->Task->expectCallCount('createFile', 2);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'add.ctp', '*'));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test that both plural and singular forms can be used for baking views.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithControllerVariations() {
+		$this->Task->args = array('ViewTaskComments');
+
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'add.ctp', '*'));
+		$this->Task->execute();
+		
+		$this->Task->args = array('ViewTaskComment');
+
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_comments' . DS . 'index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_comments' . DS . 'add.ctp', '*'));
+		$this->Task->execute();
+	}
+
+/**
+ * test `cake bake view $controller -admin`
+ * Which only bakes admin methods, not non-admin methods.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithControllerAndAdminFlag() {
+		$_back = Configure::read('Routing');
+		Configure::write('Routing.prefixes', array('admin'));
+		$this->Task->args[0] = 'ViewTaskArticles';
+		$this->Task->params['admin'] = 1;
+		$this->Task->Project->setReturnValue('getPrefix', 'admin_');
+
+		$this->Task->expectCallCount('createFile', 4);
+		$this->Task->expectAt(0, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_index.ctp', '*'));
+		$this->Task->expectAt(1, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_add.ctp', '*'));
+		$this->Task->expectAt(2, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_view.ctp', '*'));
+		$this->Task->expectAt(3, 'createFile', array(TMP . 'view_task_articles' . DS . 'admin_edit.ctp', '*'));
+
+		$this->Task->execute();
+		Configure::write('Routing', $_back);
+	}
+
+/**
+ * test execute into interactive.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteInteractive() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->args = array();
+		$this->Task->params = array();
+
+		$this->Task->Controller->setReturnValue('getName', 'ViewTaskComments');
+		$this->Task->setReturnValue('in', 'y');
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'y');
+		$this->Task->setReturnValueAt(2, 'in', 'n');
+
+		$this->Task->expectCallCount('createFile', 4);
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'index.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(1, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'view.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'add.ctp',
+			new PatternExpectation('/Add View Task Comment/')
+		));
+		$this->Task->expectAt(3, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'edit.ctp',
+			new PatternExpectation('/Edit View Task Comment/')
+		));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test `cake bake view posts index list`
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteWithAlternateTemplates() {
+		$this->Task->connection = 'test_suite';
+		$this->Task->args = array('ViewTaskComments', 'index', 'list');
+		$this->Task->params = array();
+
+		$this->Task->expectCallCount('createFile', 1);
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'list.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->execute();
+	}
+
+/**
+ * test execute into interactive() with admin methods.
+ *
+ * @return void
+ * @access public
+ */
+	function testExecuteInteractiveWithAdmin() {
+		Configure::write('Routing.prefixes', array('admin'));
+		$this->Task->connection = 'test_suite';
+		$this->Task->args = array();
+
+		$this->Task->Controller->setReturnValue('getName', 'ViewTaskComments');
+		$this->Task->Project->setReturnValue('getPrefix', 'admin_');
+		$this->Task->setReturnValueAt(0, 'in', 'y');
+		$this->Task->setReturnValueAt(1, 'in', 'n');
+		$this->Task->setReturnValueAt(2, 'in', 'y');
+
+		$this->Task->expectCallCount('createFile', 4);
+		$this->Task->expectAt(0, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_index.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(1, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_view.ctp',
+			new PatternExpectation('/ViewTaskComment/')
+		));
+		$this->Task->expectAt(2, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_add.ctp',
+			new PatternExpectation('/Add View Task Comment/')
+		));
+		$this->Task->expectAt(3, 'createFile', array(
+			TMP . 'view_task_comments' . DS . 'admin_edit.ctp',
+			new PatternExpectation('/Edit View Task Comment/')
+		));
+
+		$this->Task->execute();
+	}
+
+/**
+ * test getting templates, make sure noTemplateActions works
+ *
+ * @return void
+ */
+	function testGetTemplate() {
+		$result = $this->Task->getTemplate('delete');
+		$this->assertFalse($result);
+
+		$result = $this->Task->getTemplate('add');
+		$this->assertEqual($result, 'form');
+
+		Configure::write('Routing.prefixes', array('admin'));
+
+		$result = $this->Task->getTemplate('admin_add');
+		$this->assertEqual($result, 'form');
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/dispatcher.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/dispatcher.test.php
new file mode 100644
index 000000000..942e1f757
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/dispatcher.test.php
@@ -0,0 +1,2600 @@
+<?php
+/**
+ * DispatcherTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once CAKE . 'dispatcher.php';
+
+if (!class_exists('AppController')) {
+	require_once LIBS . 'controller' . DS . 'app_controller.php';
+} elseif (!defined('APP_CONTROLLER_EXISTS')){
+	define('APP_CONTROLLER_EXISTS', true);
+}
+
+/**
+ * TestDispatcher class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class TestDispatcher extends Dispatcher {
+
+/**
+ * invoke method
+ *
+ * @param mixed $controller
+ * @param mixed $params
+ * @param mixed $missingAction
+ * @return void
+ * @access protected
+ */
+	function _invoke(&$controller, $params) {
+		restore_error_handler();
+		if ($result = parent::_invoke($controller, $params)) {
+			if ($result[0] === 'missingAction') {
+				return $result;
+			}
+		}
+		set_error_handler('simpleTestErrorHandler');
+
+		return $controller;
+	}
+
+/**
+ * cakeError method
+ *
+ * @param mixed $filename
+ * @return void
+ * @access public
+ */
+	function cakeError($filename, $params) {
+		return array($filename, $params);
+	}
+
+/**
+ * _stop method
+ *
+ * @return void
+ * @access protected
+ */
+	function _stop() {
+		$this->stopped = true;
+		return true;
+	}
+}
+
+/**
+ * MyPluginAppController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class MyPluginAppController extends AppController {
+}
+
+/**
+ * MyPluginController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class MyPluginController extends MyPluginAppController {
+
+/**
+ * name property
+ *
+ * @var string 'MyPlugin'
+ * @access public
+ */
+	var $name = 'MyPlugin';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * index method
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+		return true;
+	}
+
+/**
+ * add method
+ *
+ * @return void
+ * @access public
+ */
+	function add() {
+		return true;
+	}
+
+/**
+ * admin_add method
+ *
+ * @param mixed $id
+ * @return void
+ * @access public
+ */
+	function admin_add($id = null) {
+		return $id;
+	}
+}
+
+/**
+ * SomePagesController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class SomePagesController extends AppController {
+
+/**
+ * name property
+ *
+ * @var string 'SomePages'
+ * @access public
+ */
+	var $name = 'SomePages';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * display method
+ *
+ * @param mixed $page
+ * @return void
+ * @access public
+ */
+	function display($page = null) {
+		return $page;
+	}
+
+/**
+ * index method
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+		return true;
+	}
+
+/**
+ * protected method
+ *
+ * @return void
+ * @access protected
+ */
+	function _protected() {
+		return true;
+	}
+
+/**
+ * redirect method overriding
+ *
+ * @return void
+ * @access public
+ */
+	function redirect() {
+		echo 'this should not be accessible';
+	}
+}
+
+/**
+ * OtherPagesController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class OtherPagesController extends MyPluginAppController {
+
+/**
+ * name property
+ *
+ * @var string 'OtherPages'
+ * @access public
+ */
+	var $name = 'OtherPages';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * display method
+ *
+ * @param mixed $page
+ * @return void
+ * @access public
+ */
+	function display($page = null) {
+		return $page;
+	}
+
+/**
+ * index method
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+		return true;
+	}
+}
+
+/**
+ * TestDispatchPagesController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class TestDispatchPagesController extends AppController {
+
+/**
+ * name property
+ *
+ * @var string 'TestDispatchPages'
+ * @access public
+ */
+	var $name = 'TestDispatchPages';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * admin_index method
+ *
+ * @return void
+ * @access public
+ */
+	function admin_index() {
+		return true;
+	}
+
+/**
+ * camelCased method
+ *
+ * @return void
+ * @access public
+ */
+	function camelCased() {
+		return true;
+	}
+}
+
+/**
+ * ArticlesTestAppController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class ArticlesTestAppController extends AppController {
+}
+
+/**
+ * ArticlesTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class ArticlesTestController extends ArticlesTestAppController {
+
+/**
+ * name property
+ *
+ * @var string 'ArticlesTest'
+ * @access public
+ */
+	var $name = 'ArticlesTest';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * admin_index method
+ *
+ * @return void
+ * @access public
+ */
+	function admin_index() {
+		return true;
+	}
+/**
+ * fake index method.
+ *
+ * @return void
+ */
+	function index() {
+		return true;
+	}
+}
+
+/**
+ * SomePostsController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class SomePostsController extends AppController {
+
+/**
+ * name property
+ *
+ * @var string 'SomePosts'
+ * @access public
+ */
+	var $name = 'SomePosts';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * autoRender property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $autoRender = false;
+
+/**
+ * beforeFilter method
+ *
+ * @return void
+ * @access public
+ */
+	function beforeFilter() {
+		if ($this->params['action'] == 'index') {
+			$this->params['action'] = 'view';
+		} else {
+			$this->params['action'] = 'change';
+		}
+		$this->params['pass'] = array('changed');
+	}
+
+/**
+ * index method
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+		return true;
+	}
+
+/**
+ * change method
+ *
+ * @return void
+ * @access public
+ */
+	function change() {
+		return true;
+	}
+}
+
+/**
+ * TestCachedPagesController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class TestCachedPagesController extends AppController {
+
+/**
+ * name property
+ *
+ * @var string 'TestCachedPages'
+ * @access public
+ */
+	var $name = 'TestCachedPages';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * helpers property
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Cache');
+
+/**
+ * cacheAction property
+ *
+ * @var array
+ * @access public
+ */
+	var $cacheAction = array(
+		'index' => '+2 sec',
+		'test_nocache_tags' => '+2 sec',
+		'view' => '+2 sec'
+	);
+
+/**
+ * viewPath property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $viewPath = 'posts';
+
+/**
+ * index method
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+		$this->render();
+	}
+
+/**
+ * test_nocache_tags method
+ *
+ * @return void
+ * @access public
+ */
+	function test_nocache_tags() {
+		$this->render();
+	}
+
+/**
+ * view method
+ *
+ * @return void
+ * @access public
+ */
+	function view($id = null) {
+		$this->render('index');
+	}
+/**
+ * test cached forms / tests view object being registered
+ *
+ * @return void
+ */
+	function cache_form() {
+		$this->cacheAction = 10;
+		$this->helpers[] = 'Form';
+	}
+}
+
+/**
+ * TimesheetsController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class TimesheetsController extends AppController {
+
+/**
+ * name property
+ *
+ * @var string 'Timesheets'
+ * @access public
+ */
+	var $name = 'Timesheets';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * index method
+ *
+ * @return void
+ * @access public
+ */
+	function index() {
+		return true;
+	}
+}
+
+/**
+ * DispatcherTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases
+ */
+class DispatcherTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		$this->_get = $_GET;
+		$_GET = array();
+		$this->_post = $_POST;
+		$this->_files = $_FILES;
+		$this->_server = $_SERVER;
+
+		$this->_app = Configure::read('App');
+		Configure::write('App.base', false);
+		Configure::write('App.baseUrl', false);
+		Configure::write('App.dir', 'app');
+		Configure::write('App.webroot', 'webroot');
+
+		$this->_cache = Configure::read('Cache');
+		Configure::write('Cache.disable', true);
+
+		$this->_debug = Configure::read('debug');
+
+		App::build(App::core());
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function endTest() {
+		$_GET = $this->_get;
+		$_POST = $this->_post;
+		$_FILES = $this->_files;
+		$_SERVER = $this->_server;
+		App::build();
+		Configure::write('App', $this->_app);
+		Configure::write('Cache', $this->_cache);
+		Configure::write('debug', $this->_debug);
+	}
+
+/**
+ * testParseParamsWithoutZerosAndEmptyPost method
+ *
+ * @return void
+ * @access public
+ */
+	function testParseParamsWithoutZerosAndEmptyPost() {
+		$Dispatcher =& new Dispatcher();
+		$test = $Dispatcher->parseParams("/testcontroller/testaction/params1/params2/params3");
+		$this->assertIdentical($test['controller'], 'testcontroller');
+		$this->assertIdentical($test['action'], 'testaction');
+		$this->assertIdentical($test['pass'][0], 'params1');
+		$this->assertIdentical($test['pass'][1], 'params2');
+		$this->assertIdentical($test['pass'][2], 'params3');
+		$this->assertFalse(!empty($test['form']));
+	}
+
+/**
+ * testParseParamsReturnsPostedData method
+ *
+ * @return void
+ * @access public
+ */
+	function testParseParamsReturnsPostedData() {
+		$_POST['testdata'] = "My Posted Content";
+		$Dispatcher =& new Dispatcher();
+		$test = $Dispatcher->parseParams("/");
+		$this->assertTrue($test['form'], "Parsed URL not returning post data");
+		$this->assertIdentical($test['form']['testdata'], "My Posted Content");
+	}
+
+/**
+ * testParseParamsWithSingleZero method
+ *
+ * @return void
+ * @access public
+ */
+	function testParseParamsWithSingleZero() {
+		$Dispatcher =& new Dispatcher();
+		$test = $Dispatcher->parseParams("/testcontroller/testaction/1/0/23");
+		$this->assertIdentical($test['controller'], 'testcontroller');
+		$this->assertIdentical($test['action'], 'testaction');
+		$this->assertIdentical($test['pass'][0], '1');
+		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][1]);
+		$this->assertIdentical($test['pass'][2], '23');
+	}
+
+/**
+ * testParseParamsWithManySingleZeros method
+ *
+ * @return void
+ * @access public
+ */
+	function testParseParamsWithManySingleZeros() {
+		$Dispatcher =& new Dispatcher();
+		$test = $Dispatcher->parseParams("/testcontroller/testaction/0/0/0/0/0/0");
+		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][0]);
+		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][1]);
+		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][2]);
+		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][3]);
+		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][4]);
+		$this->assertPattern('/\\A(?:0)\\z/', $test['pass'][5]);
+	}
+
+/**
+ * testParseParamsWithManyZerosInEachSectionOfUrl method
+ *
+ * @return void
+ * @access public
+ */
+	function testParseParamsWithManyZerosInEachSectionOfUrl() {
+		$Dispatcher =& new Dispatcher();
+		$test = $Dispatcher->parseParams("/testcontroller/testaction/000/0000/00000/000000/000000/0000000");
+		$this->assertPattern('/\\A(?:000)\\z/', $test['pass'][0]);
+		$this->assertPattern('/\\A(?:0000)\\z/', $test['pass'][1]);
+		$this->assertPattern('/\\A(?:00000)\\z/', $test['pass'][2]);
+		$this->assertPattern('/\\A(?:000000)\\z/', $test['pass'][3]);
+		$this->assertPattern('/\\A(?:000000)\\z/', $test['pass'][4]);
+		$this->assertPattern('/\\A(?:0000000)\\z/', $test['pass'][5]);
+	}
+
+/**
+ * testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl method
+ *
+ * @return void
+ * @access public
+ */
+	function testParseParamsWithMixedOneToManyZerosInEachSectionOfUrl() {
+		$Dispatcher =& new Dispatcher();
+		$test = $Dispatcher->parseParams("/testcontroller/testaction/01/0403/04010/000002/000030/0000400");
+		$this->assertPattern('/\\A(?:01)\\z/', $test['pass'][0]);
+		$this->assertPattern('/\\A(?:0403)\\z/', $test['pass'][1]);
+		$this->assertPattern('/\\A(?:04010)\\z/', $test['pass'][2]);
+		$this->assertPattern('/\\A(?:000002)\\z/', $test['pass'][3]);
+		$this->assertPattern('/\\A(?:000030)\\z/', $test['pass'][4]);
+		$this->assertPattern('/\\A(?:0000400)\\z/', $test['pass'][5]);
+	}
+
+/**
+ * testQueryStringOnRoot method
+ *
+ * @return void
+ * @access public
+ */
+	function testQueryStringOnRoot() {
+		Router::reload();
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+
+		$_GET = array('coffee' => 'life', 'sleep' => 'sissies');
+		$Dispatcher =& new Dispatcher();
+		$uri = 'posts/home/?coffee=life&sleep=sissies';
+		$result = $Dispatcher->parseParams($uri);
+		$this->assertPattern('/posts/', $result['controller']);
+		$this->assertPattern('/home/', $result['action']);
+		$this->assertTrue(isset($result['url']['sleep']));
+		$this->assertTrue(isset($result['url']['coffee']));
+
+		$Dispatcher =& new Dispatcher();
+		$uri = '/?coffee=life&sleep=sissy';
+		$result = $Dispatcher->parseParams($uri);
+		$this->assertPattern('/pages/', $result['controller']);
+		$this->assertPattern('/display/', $result['action']);
+		$this->assertTrue(isset($result['url']['sleep']));
+		$this->assertTrue(isset($result['url']['coffee']));
+		$this->assertEqual($result['url']['coffee'], 'life');
+	}
+
+/**
+ * testFileUploadArrayStructure method
+ *
+ * @return void
+ * @access public
+ */
+	function testFileUploadArrayStructure() {
+		$_FILES = array('data' => array('name' => array(
+			'File' => array(
+				array('data' => 'cake_mssql_patch.patch'),
+					array('data' => 'controller.diff'),
+					array('data' => ''),
+					array('data' => ''),
+				),
+				'Post' => array('attachment' => 'jquery-1.2.1.js'),
+			),
+			'type' => array(
+				'File' => array(
+					array('data' => ''),
+					array('data' => ''),
+					array('data' => ''),
+					array('data' => ''),
+				),
+				'Post' => array('attachment' => 'application/x-javascript'),
+			),
+			'tmp_name' => array(
+				'File' => array(
+					array('data' => '/private/var/tmp/phpy05Ywj'),
+					array('data' => '/private/var/tmp/php7MBztY'),
+					array('data' => ''),
+					array('data' => ''),
+				),
+				'Post' => array('attachment' => '/private/var/tmp/phpEwlrIo'),
+			),
+			'error' => array(
+				'File' => array(
+					array('data' => 0),
+					array('data' => 0),
+					array('data' => 4),
+					array('data' => 4)
+				),
+				'Post' => array('attachment' => 0)
+			),
+			'size' => array(
+				'File' => array(
+					array('data' => 6271),
+					array('data' => 350),
+					array('data' => 0),
+					array('data' => 0),
+				),
+				'Post' => array('attachment' => 80469)
+			),
+		));
+
+		$Dispatcher =& new Dispatcher();
+		$result = $Dispatcher->parseParams('/');
+
+		$expected = array(
+			'File' => array(
+				array('data' => array(
+					'name' => 'cake_mssql_patch.patch',
+					'type' => '',
+					'tmp_name' => '/private/var/tmp/phpy05Ywj',
+					'error' => 0,
+					'size' => 6271,
+				),
+			),
+			array('data' => array(
+				'name' => 'controller.diff',
+				'type' => '',
+				'tmp_name' => '/private/var/tmp/php7MBztY',
+				'error' => 0,
+				'size' => 350,
+			)),
+			array('data' => array(
+				'name' => '',
+				'type' => '',
+				'tmp_name' => '',
+				'error' => 4,
+				'size' => 0,
+			)),
+			array('data' => array(
+				'name' => '',
+				'type' => '',
+				'tmp_name' => '',
+				'error' => 4,
+				'size' => 0,
+			)),
+		),
+		'Post' => array('attachment' => array(
+			'name' => 'jquery-1.2.1.js',
+			'type' => 'application/x-javascript',
+			'tmp_name' => '/private/var/tmp/phpEwlrIo',
+			'error' => 0,
+			'size' => 80469,
+		)));
+		$this->assertEqual($result['data'], $expected);
+
+		$_FILES = array(
+			'data' => array(
+				'name' => array(
+					'Document' => array(
+						1 => array(
+							'birth_cert' => 'born on.txt',
+							'passport' => 'passport.txt',
+							'drivers_license' => 'ugly pic.jpg'
+						),
+						2 => array(
+							'birth_cert' => 'aunt betty.txt',
+							'passport' => 'betty-passport.txt',
+							'drivers_license' => 'betty-photo.jpg'
+						),
+					),
+				),
+				'type' => array(
+					'Document' => array(
+						1 => array(
+							'birth_cert' => 'application/octet-stream',
+							'passport' => 'application/octet-stream',
+							'drivers_license' => 'application/octet-stream',
+						),
+						2 => array(
+							'birth_cert' => 'application/octet-stream',
+							'passport' => 'application/octet-stream',
+							'drivers_license' => 'application/octet-stream',
+						)
+					)
+				),
+				'tmp_name' => array(
+					'Document' => array(
+						1 => array(
+							'birth_cert' => '/private/var/tmp/phpbsUWfH',
+							'passport' => '/private/var/tmp/php7f5zLt',
+ 							'drivers_license' => '/private/var/tmp/phpMXpZgT',
+						),
+						2 => array(
+							'birth_cert' => '/private/var/tmp/php5kHZt0',
+ 							'passport' => '/private/var/tmp/phpnYkOuM',
+ 							'drivers_license' => '/private/var/tmp/php9Rq0P3',
+						)
+					)
+				),
+				'error' => array(
+					'Document' => array(
+						1 => array(
+							'birth_cert' => 0,
+							'passport' => 0,
+ 							'drivers_license' => 0,
+						),
+						2 => array(
+							'birth_cert' => 0,
+ 							'passport' => 0,
+ 							'drivers_license' => 0,
+						)
+					)
+				),
+				'size' => array(
+					'Document' => array(
+						1 => array(
+							'birth_cert' => 123,
+							'passport' => 458,
+ 							'drivers_license' => 875,
+						),
+						2 => array(
+							'birth_cert' => 876,
+ 							'passport' => 976,
+ 							'drivers_license' => 9783,
+						)
+					)
+				)
+			)
+		);
+		$Dispatcher =& new Dispatcher();
+		$result = $Dispatcher->parseParams('/');
+		$expected = array(
+			'Document' => array(
+				1 => array(
+					'birth_cert' => array(
+						'name' => 'born on.txt',
+						'tmp_name' => '/private/var/tmp/phpbsUWfH',
+						'error' => 0,
+						'size' => 123,
+						'type' => 'application/octet-stream',
+					),
+					'passport' => array(
+						'name' => 'passport.txt',
+						'tmp_name' => '/private/var/tmp/php7f5zLt',
+						'error' => 0,
+						'size' => 458,
+						'type' => 'application/octet-stream',
+					),
+					'drivers_license' => array(
+						'name' => 'ugly pic.jpg',
+						'tmp_name' => '/private/var/tmp/phpMXpZgT',
+						'error' => 0,
+						'size' => 875,
+						'type' => 'application/octet-stream',
+					),
+				),
+				2 => array(
+					'birth_cert' => array(
+						'name' => 'aunt betty.txt',
+						'tmp_name' => '/private/var/tmp/php5kHZt0',
+						'error' => 0,
+						'size' => 876,
+						'type' => 'application/octet-stream',
+					),
+					'passport' => array(
+						'name' => 'betty-passport.txt',
+						'tmp_name' => '/private/var/tmp/phpnYkOuM',
+						'error' => 0,
+						'size' => 976,
+						'type' => 'application/octet-stream',
+					),
+					'drivers_license' => array(
+						'name' => 'betty-photo.jpg',
+						'tmp_name' => '/private/var/tmp/php9Rq0P3',
+						'error' => 0,
+						'size' => 9783,
+						'type' => 'application/octet-stream',
+					),
+				),
+			)
+		);
+		$this->assertEqual($result['data'], $expected);
+
+
+		$_FILES = array(
+			'data' => array(
+				'name' => array('birth_cert' => 'born on.txt'),
+				'type' => array('birth_cert' => 'application/octet-stream'),
+				'tmp_name' => array('birth_cert' => '/private/var/tmp/phpbsUWfH'),
+				'error' => array('birth_cert' => 0),
+				'size' => array('birth_cert' => 123)
+			)
+		);
+
+		$Dispatcher =& new Dispatcher();
+		$result = $Dispatcher->parseParams('/');
+
+		$expected = array(
+			'birth_cert' => array(
+				'name' => 'born on.txt',
+				'type' => 'application/octet-stream',
+				'tmp_name' => '/private/var/tmp/phpbsUWfH',
+				'error' => 0,
+				'size' => 123
+			)
+		);
+
+		$this->assertEqual($result['data'], $expected);
+	}
+
+/**
+ * testGetUrl method
+ *
+ * @return void
+ * @access public
+ */
+	function testGetUrl() {
+		$Dispatcher =& new Dispatcher();
+		$Dispatcher->base = '/app/webroot/index.php';
+		$uri = '/app/webroot/index.php/posts/add';
+		$result = $Dispatcher->getUrl($uri);
+		$expected = 'posts/add';
+		$this->assertEqual($expected, $result);
+
+		Configure::write('App.baseUrl', '/app/webroot/index.php');
+
+		$uri = '/posts/add';
+		$result = $Dispatcher->getUrl($uri);
+		$expected = 'posts/add';
+		$this->assertEqual($expected, $result);
+
+		$_GET['url'] = array();
+		Configure::write('App.base', '/control');
+		$Dispatcher =& new Dispatcher();
+		$Dispatcher->baseUrl();
+		$uri = '/control/students/browse';
+		$result = $Dispatcher->getUrl($uri);
+		$expected = 'students/browse';
+		$this->assertEqual($expected, $result);
+
+		$_GET['url'] = array();
+		$Dispatcher =& new Dispatcher();
+		$Dispatcher->base = '';
+		$uri = '/?/home';
+		$result = $Dispatcher->getUrl($uri);
+		$expected = '?/home';
+		$this->assertEqual($expected, $result);
+
+		$_GET['url'] = array();
+		$Dispatcher =& new Dispatcher();
+		$Dispatcher->base = '/shop';
+		$uri = '/shop/fr/pages/shop';
+		$result = $Dispatcher->getUrl($uri);
+		$expected = 'fr/pages/shop';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testBaseUrlAndWebrootWithModRewrite method
+ *
+ * @return void
+ * @access public
+ */
+	function testBaseUrlAndWebrootWithModRewrite() {
+		$Dispatcher =& new Dispatcher();
+
+		$Dispatcher->base = false;
+		$_SERVER['DOCUMENT_ROOT'] = '/cake/repo/branches';
+		$_SERVER['SCRIPT_FILENAME'] = '/cake/repo/branches/1.2.x.x/app/webroot/index.php';
+		$_SERVER['PHP_SELF'] = '/1.2.x.x/app/webroot/index.php';
+		$result = $Dispatcher->baseUrl();
+		$expected = '/1.2.x.x';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/1.2.x.x/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		$Dispatcher->base = false;
+		$_SERVER['DOCUMENT_ROOT'] = '/cake/repo/branches/1.2.x.x/app/webroot';
+		$_SERVER['SCRIPT_FILENAME'] = '/cake/repo/branches/1.2.x.x/app/webroot/index.php';
+		$_SERVER['PHP_SELF'] = '/index.php';
+		$result = $Dispatcher->baseUrl();
+		$expected = '';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		$Dispatcher->base = false;
+		$_SERVER['DOCUMENT_ROOT'] = '/cake/repo/branches/1.2.x.x/test/';
+		$_SERVER['SCRIPT_FILENAME'] = '/cake/repo/branches/1.2.x.x/test/webroot/index.php';
+		$_SERVER['PHP_SELF'] = '/webroot/index.php';
+		$result = $Dispatcher->baseUrl();
+		$expected = '';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		$Dispatcher->base = false;
+		$_SERVER['DOCUMENT_ROOT'] = '/some/apps/where';
+		$_SERVER['SCRIPT_FILENAME'] = '/some/apps/where/app/webroot/index.php';
+		$_SERVER['PHP_SELF'] = '/some/apps/where/app/webroot/index.php';
+		$result = $Dispatcher->baseUrl();
+		$expected = '/some/apps/where';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/some/apps/where/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+
+		Configure::write('App.dir', 'auth');
+
+		$Dispatcher->base = false;
+		$_SERVER['DOCUMENT_ROOT'] = '/cake/repo/branches';
+		$_SERVER['SCRIPT_FILENAME'] = '/cake/repo/branches/demos/auth/webroot/index.php';
+		$_SERVER['PHP_SELF'] = '/demos/auth/webroot/index.php';
+
+		$result = $Dispatcher->baseUrl();
+		$expected = '/demos/auth';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/demos/auth/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.dir', 'code');
+
+		$Dispatcher->base = false;
+		$_SERVER['DOCUMENT_ROOT'] = '/Library/WebServer/Documents';
+		$_SERVER['SCRIPT_FILENAME'] = '/Library/WebServer/Documents/clients/PewterReport/code/webroot/index.php';
+		$_SERVER['PHP_SELF'] = '/clients/PewterReport/code/webroot/index.php';
+		$result = $Dispatcher->baseUrl();
+		$expected = '/clients/PewterReport/code';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/clients/PewterReport/code/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+	}
+
+/**
+ * testBaseUrlwithModRewriteAlias method
+ *
+ * @return void
+ * @access public
+ */
+	function testBaseUrlwithModRewriteAlias() {
+		$_SERVER['DOCUMENT_ROOT'] = '/home/aplusnur/public_html';
+		$_SERVER['SCRIPT_FILENAME'] = '/home/aplusnur/cake2/app/webroot/index.php';
+		$_SERVER['PHP_SELF'] = '/control/index.php';
+
+		Configure::write('App.base', '/control');
+
+		$Dispatcher =& new Dispatcher();
+		$result = $Dispatcher->baseUrl();
+		$expected = '/control';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/control/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.base', false);
+		Configure::write('App.dir', 'affiliate');
+		Configure::write('App.webroot', 'newaffiliate');
+
+		$_SERVER['DOCUMENT_ROOT'] = '/var/www/abtravaff/html';
+		$_SERVER['SCRIPT_FILENAME'] = '/var/www/abtravaff/html/newaffiliate/index.php';
+		$_SERVER['PHP_SELF'] = '/newaffiliate/index.php';
+		$Dispatcher =& new Dispatcher();
+		$result = $Dispatcher->baseUrl();
+		$expected = '/newaffiliate';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/newaffiliate/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+	}
+
+/**
+ * testBaseUrlAndWebrootWithBaseUrl method
+ *
+ * @return void
+ * @access public
+ */
+	function testBaseUrlAndWebrootWithBaseUrl() {
+		$Dispatcher =& new Dispatcher();
+
+		Configure::write('App.dir', 'app');
+
+		Configure::write('App.baseUrl', '/app/webroot/index.php');
+		$result = $Dispatcher->baseUrl();
+		$expected = '/app/webroot/index.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.baseUrl', '/app/webroot/test.php');
+		$result = $Dispatcher->baseUrl();
+		$expected = '/app/webroot/test.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.baseUrl', '/app/index.php');
+		$result = $Dispatcher->baseUrl();
+		$expected = '/app/index.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.baseUrl', '/index.php');
+		$result = $Dispatcher->baseUrl();
+		$expected = '/index.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.baseUrl', '/CakeBB/app/webroot/index.php');
+		$result = $Dispatcher->baseUrl();
+		$expected = '/CakeBB/app/webroot/index.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/CakeBB/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.baseUrl', '/CakeBB/app/index.php');
+		$result = $Dispatcher->baseUrl();
+		$expected = '/CakeBB/app/index.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/CakeBB/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.baseUrl', '/CakeBB/index.php');
+		$result = $Dispatcher->baseUrl();
+		$expected = '/CakeBB/index.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/CakeBB/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.baseUrl', '/dbhauser/index.php');
+		$_SERVER['DOCUMENT_ROOT'] = '/kunden/homepages/4/d181710652/htdocs/joomla';
+		$_SERVER['SCRIPT_FILENAME'] = '/kunden/homepages/4/d181710652/htdocs/joomla/dbhauser/index.php';
+		$result = $Dispatcher->baseUrl();
+		$expected = '/dbhauser/index.php';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/dbhauser/app/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+	}
+
+/**
+ * test baseUrl with no rewrite and using the top level index.php.
+ *
+ * @return void
+ */
+	function testBaseUrlNoRewriteTopLevelIndex() {
+		$Dispatcher =& new Dispatcher();
+
+		Configure::write('App.baseUrl', '/index.php');
+		$_SERVER['DOCUMENT_ROOT'] = '/Users/markstory/Sites/cake_dev';
+		$_SERVER['SCRIPT_FILENAME'] = '/Users/markstory/Sites/cake_dev/index.php';
+
+		$result = $Dispatcher->baseUrl();
+		$this->assertEqual('/index.php', $result);
+		$this->assertEqual('/app/webroot/', $Dispatcher->webroot);
+		$this->assertEqual('', $Dispatcher->base);
+	}
+
+/**
+ * test baseUrl with no rewrite, and using the app/webroot/index.php file as is normal with virtual hosts.
+ *
+ * @return void
+ */
+	function testBaseUrlNoRewriteWebrootIndex() {
+		$Dispatcher =& new Dispatcher();
+
+		Configure::write('App.baseUrl', '/index.php');
+		$_SERVER['DOCUMENT_ROOT'] = '/Users/markstory/Sites/cake_dev/app/webroot';
+		$_SERVER['SCRIPT_FILENAME'] = '/Users/markstory/Sites/cake_dev/app/webroot/index.php';
+
+		$result = $Dispatcher->baseUrl();
+		$this->assertEqual('/index.php', $result);
+		$this->assertEqual('/', $Dispatcher->webroot);
+		$this->assertEqual('', $Dispatcher->base);
+	}
+
+/**
+ * testBaseUrlAndWebrootWithBase method
+ *
+ * @return void
+ * @access public
+ */
+	function testBaseUrlAndWebrootWithBase() {
+		$Dispatcher =& new Dispatcher();
+		$Dispatcher->base = '/app';
+		$result = $Dispatcher->baseUrl();
+		$expected = '/app';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/app/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		$Dispatcher->base = '';
+		$result = $Dispatcher->baseUrl();
+		$expected = '';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+
+		Configure::write('App.dir', 'testbed');
+		$Dispatcher->base = '/cake/testbed/webroot';
+		$result = $Dispatcher->baseUrl();
+		$expected = '/cake/testbed/webroot';
+		$this->assertEqual($expected, $result);
+		$expectedWebroot = '/cake/testbed/webroot/';
+		$this->assertEqual($expectedWebroot, $Dispatcher->webroot);
+	}
+
+/**
+ * testMissingController method
+ *
+ * @return void
+ * @access public
+ */
+	function testMissingController() {
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('App.baseUrl', '/index.php');
+		$url = 'some_controller/home/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$expected = array('missingController', array(array(
+			'className' => 'SomeControllerController',
+			'webroot' => '/app/webroot/',
+			'url' => 'some_controller/home/param:value/param2:value2',
+			'base' => '/index.php'
+		)));
+		$this->assertEqual($expected, $controller);
+	}
+
+/**
+ * testPrivate method
+ *
+ * @return void
+ * @access public
+ */
+	function testPrivate() {
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('App.baseUrl','/index.php');
+		$url = 'some_pages/_protected/param:value/param2:value2';
+
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$expected = array('privateAction', array(array(
+			'className' => 'SomePagesController',
+			'action' => '_protected',
+			'webroot' => '/app/webroot/',
+			'url' => 'some_pages/_protected/param:value/param2:value2',
+			'base' => '/index.php'
+		)));
+		$this->assertEqual($controller, $expected);
+	}
+
+/**
+ * testMissingAction method
+ *
+ * @return void
+ * @access public
+ */
+	function testMissingAction() {
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('App.baseUrl', '/index.php');
+		$url = 'some_pages/home/param:value/param2:value2';
+
+		$controller = $Dispatcher->dispatch($url, array('return'=> 1));
+
+		$expected = array('missingAction', array(array(
+			'className' => 'SomePagesController',
+			'action' => 'home',
+			'webroot' => '/app/webroot/',
+			'url' => '/index.php/some_pages/home/param:value/param2:value2',
+			'base' => '/index.php'
+		)));
+		$this->assertEqual($expected, $controller);
+
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('App.baseUrl','/index.php');
+		$url = 'some_pages/redirect/param:value/param2:value2';
+
+		$controller = $Dispatcher->dispatch($url, array('return'=> 1));
+
+		$expected = array('missingAction', array(array(
+			'className' => 'SomePagesController',
+			'action' => 'redirect',
+			'webroot' => '/app/webroot/',
+			'url' => '/index.php/some_pages/redirect/param:value/param2:value2',
+			'base' => '/index.php'
+		)));
+		$this->assertEqual($expected, $controller);
+	}
+
+/**
+ * testDispatch method
+ *
+ * @return void
+ * @access public
+ */
+	function testDispatch() {
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('App.baseUrl','/index.php');
+		$url = 'pages/home/param:value/param2:value2';
+
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$expected = 'Pages';
+		$this->assertEqual($expected, $controller->name);
+
+		$expected = array('0' => 'home', 'param' => 'value', 'param2' => 'value2');
+		$this->assertIdentical($expected, $controller->passedArgs);
+
+		Configure::write('App.baseUrl','/pages/index.php');
+
+		$url = 'pages/home';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$expected = 'Pages';
+		$this->assertEqual($expected, $controller->name);
+
+		$url = 'pages/home/';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertNull($controller->plugin);
+		$this->assertNull($Dispatcher->params['plugin']);
+
+		$expected = 'Pages';
+		$this->assertEqual($expected, $controller->name);
+
+		unset($Dispatcher);
+
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('App.baseUrl','/timesheets/index.php');
+
+		$url = 'timesheets';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$expected = 'Timesheets';
+		$this->assertEqual($expected, $controller->name);
+
+		$url = 'timesheets/';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$this->assertEqual('Timesheets', $controller->name);
+		$this->assertEqual('/timesheets/index.php', $Dispatcher->base);
+
+
+		$url = 'test_dispatch_pages/camelCased';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertEqual('TestDispatchPages', $controller->name);
+
+		$url = 'test_dispatch_pages/camelCased/something. .';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertEqual($controller->params['pass'][0], 'something. .', 'Period was chopped off. %s');
+
+	}
+
+/**
+ * testDispatchWithArray method
+ *
+ * @return void
+ * @access public
+ */
+	function testDispatchWithArray() {
+		$Dispatcher =& new TestDispatcher();
+		$url = 'pages/home/param:value/param2:value2';
+
+		$url = array('controller' => 'pages', 'action' => 'display');
+		$controller = $Dispatcher->dispatch($url, array(
+			'pass' => array('home'),
+			'named' => array('param' => 'value', 'param2' => 'value2'),
+			'return' => 1
+		));
+		$expected = 'Pages';
+		$this->assertEqual($expected, $controller->name);
+
+		$expected = array('0' => 'home', 'param' => 'value', 'param2' => 'value2');
+		$this->assertIdentical($expected, $controller->passedArgs);
+
+		$this->assertEqual($Dispatcher->base . '/pages/display/home/param:value/param2:value2', $Dispatcher->here);
+	}
+
+/**
+ * test that a garbage url doesn't cause errors.
+ *
+ * @return void
+ */
+	function testDispatchWithGarbageUrl() {
+		Configure::write('App.baseUrl', '/index.php');
+
+		$Dispatcher =& new TestDispatcher();
+		$url = 'http://google.com';
+		$result = $Dispatcher->dispatch($url);
+		$expected = array('missingController', array(array(
+			'className' => 'Controller',
+			'webroot' => '/app/webroot/',
+			'url' => 'http://google.com',
+			'base' => '/index.php'
+		)));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testAdminDispatch method
+ *
+ * @return void
+ * @access public
+ */
+	function testAdminDispatch() {
+		$_POST = array();
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('Routing.prefixes', array('admin'));
+		Configure::write('App.baseUrl','/cake/repo/branches/1.2.x.x/index.php');
+		$url = 'admin/test_dispatch_pages/index/param:value/param2:value2';
+
+		Router::reload();
+		$Router =& Router::getInstance();
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$this->assertEqual($controller->name, 'TestDispatchPages');
+
+		$this->assertIdentical($controller->passedArgs, array('param' => 'value', 'param2' => 'value2'));
+		$this->assertTrue($controller->params['admin']);
+
+		$expected = '/cake/repo/branches/1.2.x.x/index.php/admin/test_dispatch_pages/index/param:value/param2:value2';
+		$this->assertIdentical($expected, $controller->here);
+
+		$expected = '/cake/repo/branches/1.2.x.x/index.php';
+		$this->assertIdentical($expected, $controller->base);
+	}
+
+/**
+ * testPluginDispatch method
+ *
+ * @return void
+ * @access public
+ */
+	function testPluginDispatch() {
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		Router::connect(
+			'/my_plugin/:controller/*',
+			array('plugin' => 'my_plugin', 'controller' => 'pages', 'action' => 'display')
+		);
+
+		$Dispatcher->base = false;
+		$url = 'my_plugin/some_pages/home/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$result = $Dispatcher->parseParams($url);
+		$expected = array(
+			'pass' => array('home'),
+			'named' => array('param'=> 'value', 'param2'=> 'value2'), 'plugin'=> 'my_plugin',
+			'controller'=> 'some_pages', 'action'=> 'display', 'form'=> null,
+			'url'=> array('url'=> 'my_plugin/some_pages/home/param:value/param2:value2'),
+		);
+		ksort($expected);
+		ksort($result);
+
+		$this->assertEqual($expected, $result);
+
+		$this->assertIdentical($controller->plugin, 'my_plugin');
+		$this->assertIdentical($controller->name, 'SomePages');
+		$this->assertIdentical($controller->params['controller'], 'some_pages');
+		$this->assertIdentical($controller->passedArgs, array('0' => 'home', 'param'=>'value', 'param2'=>'value2'));
+
+		$expected = '/cake/repo/branches/1.2.x.x/my_plugin/some_pages/home/param:value/param2:value2';
+		$this->assertIdentical($expected, $controller->here);
+
+		$expected = '/cake/repo/branches/1.2.x.x';
+		$this->assertIdentical($expected, $controller->base);
+	}
+
+/**
+ * testAutomaticPluginDispatch method
+ *
+ * @return void
+ * @access public
+ */
+	function testAutomaticPluginDispatch() {
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		Router::connect(
+			'/my_plugin/:controller/:action/*',
+			array('plugin' => 'my_plugin', 'controller' => 'pages', 'action' => 'display')
+		);
+
+		$Dispatcher->base = false;
+
+		$url = 'my_plugin/other_pages/index/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$this->assertIdentical($controller->plugin, 'my_plugin');
+		$this->assertIdentical($controller->name, 'OtherPages');
+		$this->assertIdentical($controller->action, 'index');
+		$this->assertIdentical($controller->passedArgs, array('param' => 'value', 'param2' => 'value2'));
+
+		$expected = '/cake/repo/branches/1.2.x.x/my_plugin/other_pages/index/param:value/param2:value2';
+		$this->assertIdentical($expected, $controller->here);
+
+		$expected = '/cake/repo/branches/1.2.x.x';
+		$this->assertIdentical($expected, $controller->base);
+	}
+
+/**
+ * testAutomaticPluginControllerDispatch method
+ *
+ * @return void
+ * @access public
+ */
+	function testAutomaticPluginControllerDispatch() {
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+
+		$plugins = App::objects('plugin');
+		$plugins[] = 'MyPlugin';
+		$plugins[] = 'ArticlesTest';
+
+		$app = App::getInstance();
+		$app->__objects['plugin'] = $plugins;
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$url = 'my_plugin/my_plugin/add/param:value/param2:value2';
+
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$this->assertIdentical($controller->plugin, 'my_plugin');
+		$this->assertIdentical($controller->name, 'MyPlugin');
+		$this->assertIdentical($controller->action, 'add');
+		$this->assertEqual($controller->params['named'], array('param' => 'value', 'param2' => 'value2'));
+
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		// Simulates the Route for a real plugin, installed in APP/plugins
+		Router::connect('/my_plugin/:controller/:action/*', array('plugin' => 'my_plugin'));
+
+		$plugin = 'MyPlugin';
+		$pluginUrl = Inflector::underscore($plugin);
+
+		$url = $pluginUrl;
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertIdentical($controller->plugin, 'my_plugin');
+		$this->assertIdentical($controller->name, 'MyPlugin');
+		$this->assertIdentical($controller->action, 'index');
+
+		$expected = $pluginUrl;
+		$this->assertEqual($controller->params['controller'], $expected);
+
+
+		Configure::write('Routing.prefixes', array('admin'));
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$url = 'admin/my_plugin/my_plugin/add/5/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$this->assertEqual($controller->params['plugin'], 'my_plugin');
+		$this->assertEqual($controller->params['controller'], 'my_plugin');
+		$this->assertEqual($controller->params['action'], 'admin_add');
+		$this->assertEqual($controller->params['pass'], array(5));
+		$this->assertEqual($controller->params['named'], array('param' => 'value', 'param2' => 'value2'));
+		$this->assertIdentical($controller->plugin, 'my_plugin');
+		$this->assertIdentical($controller->name, 'MyPlugin');
+		$this->assertIdentical($controller->action, 'admin_add');
+
+		$expected = array(0 => 5, 'param'=>'value', 'param2'=>'value2');
+		$this->assertEqual($controller->passedArgs, $expected);
+
+		Configure::write('Routing.prefixes', array('admin'));
+		Router::reload();
+
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$controller = $Dispatcher->dispatch('admin/articles_test', array('return' => 1));
+		$this->assertIdentical($controller->plugin, 'articles_test');
+		$this->assertIdentical($controller->name, 'ArticlesTest');
+		$this->assertIdentical($controller->action, 'admin_index');
+
+		$expected = array(
+			'pass'=> array(),
+			'named' => array(),
+			'controller' => 'articles_test',
+			'plugin' => 'articles_test',
+			'action' => 'admin_index',
+			'prefix' => 'admin',
+			'admin' =>  true,
+			'form' => array(),
+			'url' => array('url' => 'admin/articles_test'),
+			'return' => 1
+		);
+		$this->assertEqual($controller->params, $expected);
+	}
+
+/**
+ * test Plugin dispatching without controller name and using
+ * plugin short form instead.
+ *
+ * @return void
+ * @access public
+ */
+	function testAutomaticPluginDispatchWithShortAccess() {
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+		$plugins = App::objects('plugin');
+		$plugins[] = 'MyPlugin';
+
+		$app = App::getInstance();
+		$app->__objects['plugin'] = $plugins;
+
+		Router::reload();
+
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$url = 'my_plugin/';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertEqual($controller->params['controller'], 'my_plugin');
+		$this->assertEqual($controller->params['plugin'], 'my_plugin');
+		$this->assertEqual($controller->params['action'], 'index');
+		$this->assertFalse(isset($controller->params['pass'][0]));
+	}
+
+/**
+ * test plugin shortcut urls with controllers that need to be loaded,
+ * the above test uses a controller that has already been included.
+ *
+ * @return void
+ */
+	function testPluginShortCutUrlsWithControllerThatNeedsToBeLoaded() {
+		$loaded = class_exists('TestPluginController', false);
+		if ($this->skipIf($loaded, 'TestPluginController already loaded, this test will always pass, skipping %s')) {
+			return true;
+		}
+		Router::reload();
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+		App::objects('plugin', null, false);
+
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$url = 'test_plugin/';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertEqual($controller->params['controller'], 'test_plugin');
+		$this->assertEqual($controller->params['plugin'], 'test_plugin');
+		$this->assertEqual($controller->params['action'], 'index');
+		$this->assertFalse(isset($controller->params['pass'][0]));
+
+		$url = '/test_plugin/tests/index';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertEqual($controller->params['controller'], 'tests');
+		$this->assertEqual($controller->params['plugin'], 'test_plugin');
+		$this->assertEqual($controller->params['action'], 'index');
+		$this->assertFalse(isset($controller->params['pass'][0]));
+
+		$url = '/test_plugin/tests/index/some_param';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertEqual($controller->params['controller'], 'tests');
+		$this->assertEqual($controller->params['plugin'], 'test_plugin');
+		$this->assertEqual($controller->params['action'], 'index');
+		$this->assertEqual($controller->params['pass'][0], 'some_param');
+
+		App::build();
+	}
+
+/**
+ * testAutomaticPluginControllerMissingActionDispatch method
+ *
+ * @return void
+ * @access public
+ */
+	function testAutomaticPluginControllerMissingActionDispatch() {
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$url = 'my_plugin/not_here/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return'=> 1));
+
+		$expected = array('missingAction', array(array(
+			'className' => 'MyPluginController',
+			'action' => 'not_here',
+			'webroot' => '/cake/repo/branches/1.2.x.x/',
+			'url' => '/cake/repo/branches/1.2.x.x/my_plugin/not_here/param:value/param2:value2',
+			'base' => '/cake/repo/branches/1.2.x.x'
+		)));
+		$this->assertIdentical($expected, $controller);
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$url = 'my_plugin/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return'=> 1));
+
+		$expected = array('missingAction', array(array(
+			'className' => 'MyPluginController',
+			'action' => 'param:value',
+			'webroot' => '/cake/repo/branches/1.2.x.x/',
+			'url' => '/cake/repo/branches/1.2.x.x/my_plugin/param:value/param2:value2',
+			'base' => '/cake/repo/branches/1.2.x.x'
+		)));
+		$this->assertIdentical($expected, $controller);
+	}
+
+/**
+ * testPrefixProtection method
+ *
+ * @return void
+ * @access public
+ */
+	function testPrefixProtection() {
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+
+		Router::reload();
+		Router::connect('/admin/:controller/:action/*', array('prefix'=>'admin'), array('controller', 'action'));
+
+		$Dispatcher =& new TestDispatcher();
+		$Dispatcher->base = false;
+
+		$url = 'test_dispatch_pages/admin_index/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$expected = array('privateAction', array(array(
+			'className' => 'TestDispatchPagesController',
+			'action' => 'admin_index',
+			'webroot' => '/cake/repo/branches/1.2.x.x/',
+			'url' => 'test_dispatch_pages/admin_index/param:value/param2:value2',
+			'base' => '/cake/repo/branches/1.2.x.x'
+		)));
+		$this->assertIdentical($expected, $controller);
+	}
+
+/**
+ * Test dispatching into the TestPlugin in the test_app
+ *
+ * @return void
+ * @access public
+ */
+	function testTestPluginDispatch() {
+		$Dispatcher =& new TestDispatcher();
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		App::objects('plugin', null, false);
+		Router::reload();
+		Router::parse('/');
+
+		$url = '/test_plugin/tests/index';
+		$result = $Dispatcher->dispatch($url, array('return' => 1));
+		$this->assertTrue(class_exists('TestsController'));
+		$this->assertTrue(class_exists('TestPluginAppController'));
+		$this->assertTrue(class_exists('OtherComponentComponent'));
+		$this->assertTrue(class_exists('PluginsComponentComponent'));
+
+		$this->assertEqual($result->params['controller'], 'tests');
+		$this->assertEqual($result->params['plugin'], 'test_plugin');
+		$this->assertEqual($result->params['action'], 'index');
+
+		App::build();
+	}
+
+/**
+ * testChangingParamsFromBeforeFilter method
+ *
+ * @return void
+ * @access public
+ */
+	function testChangingParamsFromBeforeFilter() {
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+		$Dispatcher =& new TestDispatcher();
+		$url = 'some_posts/index/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$expected = array('missingAction', array(array(
+			'className' => 'SomePostsController',
+			'action' => 'view',
+			'webroot' => '/cake/repo/branches/1.2.x.x/',
+			'url' => '/cake/repo/branches/1.2.x.x/some_posts/index/param:value/param2:value2',
+			'base' => '/cake/repo/branches/1.2.x.x'
+		)));
+		$this->assertEqual($expected, $controller);
+
+		$url = 'some_posts/something_else/param:value/param2:value2';
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+
+		$expected = 'SomePosts';
+		$this->assertEqual($expected, $controller->name);
+
+		$expected = 'change';
+		$this->assertEqual($expected, $controller->action);
+
+		$expected = array('changed');
+		$this->assertIdentical($expected, $controller->params['pass']);
+	}
+
+/**
+ * testStaticAssets method
+ *
+ * @return void
+ * @access public
+ */
+	function testAssets() {
+		Router::reload();
+		$Configure =& Configure::getInstance();
+		$Configure->__objects = null;
+
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'vendors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$Dispatcher =& new TestDispatcher();
+		$debug = Configure::read('debug');
+		Configure::write('debug', 0);
+
+		ob_start();
+		$Dispatcher->dispatch('theme/test_theme/../webroot/css/test_asset.css');
+		$result = ob_get_clean();
+		$this->assertFalse($result);
+
+		ob_start();
+		$Dispatcher->dispatch('theme/test_theme/pdfs');
+		$result = ob_get_clean();
+		$this->assertFalse($result);
+
+		ob_start();
+		$Dispatcher->dispatch('theme/test_theme/flash/theme_test.swf');
+		$result = ob_get_clean();
+		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'flash' . DS . 'theme_test.swf');
+		$this->assertEqual($file, $result);
+		$this->assertEqual('this is just a test to load swf file from the theme.', $result);
+
+		ob_start();
+		$Dispatcher->dispatch('theme/test_theme/pdfs/theme_test.pdf');
+		$result = ob_get_clean();
+		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'pdfs' . DS . 'theme_test.pdf');
+		$this->assertEqual($file, $result);
+		$this->assertEqual('this is just a test to load pdf file from the theme.', $result);
+
+		ob_start();
+		$Dispatcher->dispatch('theme/test_theme/img/test.jpg');
+		$result = ob_get_clean();
+		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'webroot' . DS . 'img' . DS . 'test.jpg');
+		$this->assertEqual($file, $result);
+
+		$Dispatcher->params = $Dispatcher->parseParams('theme/test_theme/css/test_asset.css');
+		ob_start();
+		$Dispatcher->asset('theme/test_theme/css/test_asset.css');
+		$result = ob_get_clean();
+		$this->assertEqual('this is the test asset css file', $result);
+
+		$Dispatcher->params = $Dispatcher->parseParams('theme/test_theme/js/theme.js');
+		ob_start();
+		$Dispatcher->asset('theme/test_theme/js/theme.js');
+		$result = ob_get_clean();
+		$this->assertEqual('root theme js file', $result);
+
+		$Dispatcher->params = $Dispatcher->parseParams('theme/test_theme/js/one/theme_one.js');
+		ob_start();
+		$Dispatcher->asset('theme/test_theme/js/one/theme_one.js');
+		$result = ob_get_clean();
+		$this->assertEqual('nested theme js file', $result);
+
+		ob_start();
+		$Dispatcher->asset('test_plugin/root.js');
+		$result = ob_get_clean();
+		$expected = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'root.js');
+		$this->assertEqual($result, $expected);
+
+		ob_start();
+		$Dispatcher->dispatch('test_plugin/flash/plugin_test.swf');
+		$result = ob_get_clean();
+		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'flash' . DS . 'plugin_test.swf');
+		$this->assertEqual($file, $result);
+		$this->assertEqual('this is just a test to load swf file from the plugin.', $result);
+
+		ob_start();
+		$Dispatcher->dispatch('test_plugin/pdfs/plugin_test.pdf');
+		$result = ob_get_clean();
+		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'webroot' . DS . 'pdfs' . DS . 'plugin_test.pdf');
+		$this->assertEqual($file, $result);
+		 $this->assertEqual('this is just a test to load pdf file from the plugin.', $result);
+
+		ob_start();
+		$Dispatcher->asset('test_plugin/js/test_plugin/test.js');
+		$result = ob_get_clean();
+		$this->assertEqual('alert("Test App");', $result);
+
+		$Dispatcher->params = $Dispatcher->parseParams('test_plugin/js/test_plugin/test.js');
+		ob_start();
+		$Dispatcher->asset('test_plugin/js/test_plugin/test.js');
+		$result = ob_get_clean();
+		$this->assertEqual('alert("Test App");', $result);
+
+		$Dispatcher->params = $Dispatcher->parseParams('test_plugin/css/test_plugin_asset.css');
+		ob_start();
+		$Dispatcher->asset('test_plugin/css/test_plugin_asset.css');
+		$result = ob_get_clean();
+		$this->assertEqual('this is the test plugin asset css file', $result);
+
+		$Dispatcher->params = $Dispatcher->parseParams('test_plugin/img/cake.icon.gif');
+		ob_start();
+		$Dispatcher->asset('test_plugin/img/cake.icon.gif');
+		$result = ob_get_clean();
+		$file = file_get_contents(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' .DS . 'webroot' . DS . 'img' . DS . 'cake.icon.gif');
+		$this->assertEqual($file, $result);
+
+		$Dispatcher->params = $Dispatcher->parseParams('plugin_js/js/plugin_js.js');
+		ob_start();
+		$Dispatcher->asset('plugin_js/js/plugin_js.js');
+		$result = ob_get_clean();
+		$expected = "alert('win sauce');";
+		$this->assertEqual($result, $expected);
+
+		$Dispatcher->params = $Dispatcher->parseParams('plugin_js/js/one/plugin_one.js');
+		ob_start();
+		$Dispatcher->asset('plugin_js/js/one/plugin_one.js');
+		$result = ob_get_clean();
+		$expected = "alert('plugin one nested js file');";
+		$this->assertEqual($result, $expected);
+		Configure::write('debug', $debug);
+		//reset the header content-type without page can render as plain text.
+		header('Content-type: text/html');
+
+		$Dispatcher->params = $Dispatcher->parseParams('test_plugin/css/theme_one.htc');
+		ob_start();
+		$Dispatcher->asset('test_plugin/css/unknown.extension');
+		$result = ob_get_clean();
+		$this->assertEqual('Testing a file with unknown extension to mime mapping.', $result);
+		header('Content-type: text/html');
+
+		$Dispatcher->params = $Dispatcher->parseParams('test_plugin/css/theme_one.htc');
+		ob_start();
+		$Dispatcher->asset('test_plugin/css/theme_one.htc');
+		$result = ob_get_clean();
+		$this->assertEqual('htc file', $result);
+		header('Content-type: text/html');
+	}
+
+/**
+ * test that missing asset processors trigger a 404 with no response body.
+ *
+ * @return void
+ */
+	function testMissingAssetProcessor404() {
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('Asset.filter', array(
+			'js' => '',
+			'css' => null
+		));
+		$this->assertNoErrors();
+
+		ob_start();
+		$Dispatcher->asset('ccss/cake.generic.css');
+		$result = ob_get_clean();
+		$this->assertTrue($Dispatcher->stopped);
+
+		header('HTTP/1.1 200 Ok');
+	}
+
+/**
+ * test that asset filters work for theme and plugin assets
+ *
+ * @return void
+ */
+	function testAssetFilterForThemeAndPlugins() {
+		$Dispatcher =& new TestDispatcher();
+		Configure::write('Asset.filter', array(
+			'js' => '',
+			'css' => ''
+		));
+		$Dispatcher->asset('theme/test_theme/ccss/cake.generic.css');
+		$this->assertTrue($Dispatcher->stopped);
+
+		$Dispatcher->stopped = false;
+		$Dispatcher->asset('theme/test_theme/cjs/debug_kit.js');
+		$this->assertTrue($Dispatcher->stopped);
+
+		$Dispatcher->stopped = false;
+		$Dispatcher->asset('test_plugin/ccss/cake.generic.css');
+		$this->assertTrue($Dispatcher->stopped);
+
+		$Dispatcher->stopped = false;
+		$Dispatcher->asset('test_plugin/cjs/debug_kit.js');
+		$this->assertTrue($Dispatcher->stopped);
+
+		$Dispatcher->stopped = false;
+		$Dispatcher->asset('css/ccss/debug_kit.css');
+		$this->assertFalse($Dispatcher->stopped);
+
+		$Dispatcher->stopped = false;
+		$Dispatcher->asset('js/cjs/debug_kit.js');
+		$this->assertFalse($Dispatcher->stopped);
+	}
+/**
+ * testFullPageCachingDispatch method
+ *
+ * @return void
+ * @access public
+ */
+	function testFullPageCachingDispatch() {
+		Configure::write('Cache.disable', false);
+		Configure::write('Cache.check', true);
+		Configure::write('debug', 2);
+
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/';
+
+		Router::reload();
+		Router::connect('/', array('controller' => 'test_cached_pages', 'action' => 'index'));
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+		), true);
+
+		$dispatcher =& new TestDispatcher();
+		$dispatcher->base = false;
+
+		$url = '/';
+
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+
+		$filename = $this->__cachePath($dispatcher->here);
+		unlink($filename);
+
+		$dispatcher->base = false;
+		$url = 'test_cached_pages/index';
+
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+		$filename = $this->__cachePath($dispatcher->here);
+		unlink($filename);
+
+		$url = 'TestCachedPages/index';
+
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+		$filename = $this->__cachePath($dispatcher->here);
+		unlink($filename);
+
+		$url = 'TestCachedPages/test_nocache_tags';
+
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+		$filename = $this->__cachePath($dispatcher->here);
+		unlink($filename);
+
+		$url = 'test_cached_pages/view/param/param';
+
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+		$filename = $this->__cachePath($dispatcher->here);
+		unlink($filename);
+
+		$url = 'test_cached_pages/view/foo:bar/value:goo';
+
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+		$filename = $this->__cachePath($dispatcher->here);
+		$this->assertTrue(file_exists($filename));
+		unlink($filename);
+	}
+
+/**
+ * test that cached() registers a view and un-registers it.  Tests
+ * that helpers using ClassRegistry::getObject('view'); don't fail
+ *
+ * @return void
+ */
+	function testCachedRegisteringViewObject() {
+		Configure::write('Cache.disable', false);
+		Configure::write('Cache.check', true);
+		Configure::write('debug', 2);
+
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/';
+
+		Router::reload();
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$dispatcher =& new TestDispatcher();
+		$dispatcher->base = false;
+
+		$url = 'test_cached_pages/cache_form';
+		ob_start();
+		$dispatcher->dispatch($url);
+		$out = ob_get_clean();
+
+		ClassRegistry::flush();
+
+		ob_start();
+		$dispatcher->cached($url);
+		$cached = ob_get_clean();
+
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $out);
+		$cached = preg_replace('/<!--+[^<>]+-->/', '', $cached);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $cached);
+
+		$this->assertEqual($result, $expected);
+		$filename = $this->__cachePath($dispatcher->here);
+		@unlink($filename);
+		ClassRegistry::flush();
+	}
+
+/**
+ * testHttpMethodOverrides method
+ *
+ * @return void
+ * @access public
+ */
+	function testHttpMethodOverrides() {
+		Router::reload();
+		Router::mapResources('Posts');
+
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$dispatcher =& new Dispatcher();
+		$dispatcher->base = false;
+
+		$result = $dispatcher->parseParams('/posts');
+		$expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'add', '[method]' => 'POST', 'form' => array(), 'url' => array());
+		$this->assertEqual($result, $expected);
+
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] = 'PUT';
+
+		$result = $dispatcher->parseParams('/posts/5');
+		$expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT', 'form' => array(), 'url' => array());
+		$this->assertEqual($result, $expected);
+
+		unset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+
+		$result = $dispatcher->parseParams('/posts/5');
+		$expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'view', '[method]' => 'GET', 'form' => array(), 'url' => array());
+		$this->assertEqual($result, $expected);
+
+		$_POST['_method'] = 'PUT';
+
+		$result = $dispatcher->parseParams('/posts/5');
+		$expected = array('pass' => array('5'), 'named' => array(), 'id' => '5', 'plugin' => null, 'controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT', 'form' => array(), 'url' => array());
+		$this->assertEqual($result, $expected);
+
+		$_POST['_method'] = 'POST';
+		$_POST['data'] = array('Post' => array('title' => 'New Post'));
+		$_POST['extra'] = 'data';
+		$_SERVER = array();
+
+		$result = $dispatcher->parseParams('/posts');
+		$expected = array(
+			'pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'add',
+			'[method]' => 'POST', 'form' => array('extra' => 'data'), 'data' => array('Post' => array('title' => 'New Post')),
+			'url' => array()
+		);
+		$this->assertEqual($result, $expected);
+
+		unset($_POST['_method']);
+	}
+
+/**
+ * Tests that invalid characters cannot be injected into the application base path.
+ *
+ * @return void
+ * @access public
+ */
+	function testBasePathInjection() {
+		$self = $_SERVER['PHP_SELF'];
+		$_SERVER['PHP_SELF'] = urldecode(
+			"/index.php/%22%3E%3Ch1%20onclick=%22alert('xss');%22%3Eheya%3C/h1%3E"
+		);
+
+		$dispatcher =& new Dispatcher();
+		$result = $dispatcher->baseUrl();
+		$expected = '/index.php/h1 onclick=alert(xss);heya';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testEnvironmentDetection method
+ *
+ * @return void
+ * @access public
+ */
+	function testEnvironmentDetection() {
+		$dispatcher =& new Dispatcher();
+
+		$environments = array(
+			'IIS' => array(
+				'No rewrite base path' => array(
+					'App' => array('base' => false, 'baseUrl' => '/index.php?', 'server' => 'IIS'),
+					'SERVER' => array('HTTPS' => 'off', 'SCRIPT_NAME' => '/index.php', 'PATH_TRANSLATED' => 'C:\\Inetpub\\wwwroot', 'QUERY_STRING' => '', 'REMOTE_ADDR' => '127.0.0.1', 'REMOTE_HOST' => '127.0.0.1', 'REQUEST_METHOD' => 'GET', 'SERVER_NAME' => 'localhost', 'SERVER_PORT' => '80', 'SERVER_PROTOCOL' => 'HTTP/1.1', 'APPL_PHYSICAL_PATH' => 'C:\\Inetpub\\wwwroot\\', 'REQUEST_URI' => '/index.php', 'URL' => '/index.php', 'SCRIPT_FILENAME' => 'C:\\Inetpub\\wwwroot\\index.php', 'ORIG_PATH_INFO' => '/index.php', 'PATH_INFO' => '', 'ORIG_PATH_TRANSLATED' => 'C:\\Inetpub\\wwwroot\\index.php', 'DOCUMENT_ROOT' => 'C:\\Inetpub\\wwwroot', 'PHP_SELF' => '/index.php', 'HTTP_HOST' => 'localhost', 'argv' => array(), 'argc' => 0),
+					'reload' => true,
+					'path' => ''
+				),
+				'No rewrite with path' => array(
+					'SERVER' => array('QUERY_STRING' => '/posts/add', 'REQUEST_URI' => '/index.php?/posts/add', 'URL' => '/index.php?/posts/add', 'argv' => array('/posts/add'), 'argc' => 1),
+					'reload' => false,
+					'path' => '/posts/add'
+				),
+				'No rewrite sub dir 1' => array(
+					'GET' => array(),
+					'SERVER' => array('QUERY_STRING' => '',  'REQUEST_URI' => '/index.php', 'URL' => '/index.php', 'SCRIPT_FILENAME' => 'C:\\Inetpub\\wwwroot\\index.php', 'ORIG_PATH_INFO' => '/index.php', 'PATH_INFO' => '', 'ORIG_PATH_TRANSLATED' => 'C:\\Inetpub\\wwwroot\\index.php', 'DOCUMENT_ROOT' => 'C:\\Inetpub\\wwwroot', 'PHP_SELF' => '/index.php', 'argv' => array(), 'argc' => 0),
+					'reload' => false,
+					'path' => ''
+				),
+				'No rewrite sub dir 1 with path' => array(
+					'GET' => array('/posts/add' => ''),
+					'SERVER' => array('QUERY_STRING' => '/posts/add', 'REQUEST_URI' => '/index.php?/posts/add', 'URL' => '/index.php?/posts/add', 'SCRIPT_FILENAME' => 'C:\\Inetpub\\wwwroot\\index.php', 'argv' => array('/posts/add'), 'argc' => 1),
+					'reload' => false,
+					'path' => '/posts/add'
+				),
+				'No rewrite sub dir 2' => array(
+					'App' => array('base' => false, 'baseUrl' => '/site/index.php?', 'dir' => 'app', 'webroot' => 'webroot', 'server' => 'IIS'),
+					'GET' => array(),
+					'POST' => array(),
+					'SERVER' => array('SCRIPT_NAME' => '/site/index.php', 'PATH_TRANSLATED' => 'C:\\Inetpub\\wwwroot', 'QUERY_STRING' => '', 'REQUEST_URI' => '/site/index.php', 'URL' => '/site/index.php', 'SCRIPT_FILENAME' => 'C:\\Inetpub\\wwwroot\\site\\index.php', 'DOCUMENT_ROOT' => 'C:\\Inetpub\\wwwroot', 'PHP_SELF' => '/site/index.php', 'argv' => array(), 'argc' => 0),
+					'reload' => false,
+					'path' => ''
+				),
+				'No rewrite sub dir 2 with path' => array(
+					'GET' => array('/posts/add' => ''),
+					'SERVER' => array('SCRIPT_NAME' => '/site/index.php', 'PATH_TRANSLATED' => 'C:\\Inetpub\\wwwroot', 'QUERY_STRING' => '/posts/add', 'REQUEST_URI' => '/site/index.php?/posts/add', 'URL' => '/site/index.php?/posts/add', 'ORIG_PATH_TRANSLATED' => 'C:\\Inetpub\\wwwroot\\site\\index.php', 'DOCUMENT_ROOT' => 'C:\\Inetpub\\wwwroot', 'PHP_SELF' => '/site/index.php', 'argv' => array('/posts/add'), 'argc' => 1),
+					'reload' => false,
+					'path' => '/posts/add'
+				)
+			),
+			'Apache' => array(
+				'No rewrite base path' => array(
+					'App' => array('base' => false, 'baseUrl' => '/index.php', 'dir' => 'app', 'webroot' => 'webroot'),
+					'SERVER' => array(
+						'SERVER_NAME' => 'localhost',
+						'SERVER_ADDR' => '::1',
+						'SERVER_PORT' => '80',
+						'REMOTE_ADDR' => '::1',
+						'DOCUMENT_ROOT' => '/Library/WebServer/Documents/officespace/app/webroot',
+						'SCRIPT_FILENAME' => '/Library/WebServer/Documents/site/app/webroot/index.php',
+						'QUERY_STRING' => '',
+						'REQUEST_URI' => '/',
+						'SCRIPT_NAME' => '/index.php',
+						'PHP_SELF' => '/index.php',
+						'argv' => array(),
+						'argc' => 0
+					),
+					'reload' => true,
+					'path' => ''
+				),
+				'No rewrite with path' => array(
+					'SERVER' => array(
+						'HTTP_HOST' => 'localhost', 
+						'DOCUMENT_ROOT' => '/Library/WebServer/Documents/officespace/app/webroot',
+						'SCRIPT_FILENAME' => '/Library/WebServer/Documents/officespace/app/webroot/index.php',
+						'QUERY_STRING' => '',
+						'REQUEST_URI' => '/index.php/posts/add',
+						'SCRIPT_NAME' => '/index.php',
+						'PATH_INFO' => '/posts/add',
+						'PHP_SELF' => '/index.php/posts/add', 
+						'argv' => array(),
+						'argc' => 0),
+					'reload' => false,
+					'path' => '/posts/add'
+				),
+				'GET Request at base domain' => array(
+					'App' => array('base' => false, 'baseUrl' => null, 'dir' => 'app', 'webroot' => 'webroot'),
+					'SERVER'	=> array(
+						'HTTP_HOST' => 'cake.1.2',
+						'SERVER_NAME' => 'cake.1.2',
+						'SERVER_ADDR' => '127.0.0.1',
+						'SERVER_PORT' => '80',
+						'REMOTE_ADDR' => '127.0.0.1',
+						'DOCUMENT_ROOT' => '/Volumes/Home/htdocs/cake/repo/branches/1.2.x.x/app/webroot',
+						'SCRIPT_FILENAME' => '/Volumes/Home/htdocs/cake/repo/branches/1.2.x.x/app/webroot/index.php',
+						'REMOTE_PORT' => '53550',
+						'QUERY_STRING' => 'a=b',
+						'REQUEST_URI' => '/?a=b',
+						'SCRIPT_NAME' => '/index.php',
+						'PHP_SELF' => '/index.php'
+					),
+					'GET' => array('a' => 'b'),
+					'POST' => array(),
+					'reload' => true,
+					'path' => '',
+					'urlParams' => array('a' => 'b'),
+					'environment' => array('CGI_MODE' => false)
+				),
+				'New CGI no mod_rewrite' => array(
+					'App' => array('base' => false, 'baseUrl' => '/limesurvey20/index.php', 'dir' => 'app', 'webroot' => 'webroot'),
+					'SERVER' => array(
+						'DOCUMENT_ROOT' => '/home/.sites/110/site313/web',
+						'PATH_INFO' => '/installations',
+						'PATH_TRANSLATED' => '/home/.sites/110/site313/web/limesurvey20/index.php',
+						'PHPRC' => '/home/.sites/110/site313',
+						'QUERY_STRING' => '',
+						'REQUEST_URI' => '/limesurvey20/index.php/installations',
+						'SCRIPT_FILENAME' => '/home/.sites/110/site313/web/limesurvey20/index.php',
+						'SCRIPT_NAME' => '/limesurvey20/index.php',
+						'SCRIPT_URI' => 'http://www.gisdat-umfragen.at/limesurvey20/index.php/installations',
+						'PHP_SELF' => '/limesurvey20/index.php/installations',
+						'CGI_MODE' => true
+					),
+					'GET' => array(),
+					'POST' => array(),
+					'reload' => true,
+					'path' => '/installations',
+					'urlParams' => array(),
+					'environment' => array('CGI_MODE' => true)
+				)
+			)
+		);
+		$backup = $this->__backupEnvironment();
+
+		foreach ($environments as $name => $env) {
+			foreach ($env as $descrip => $settings) {
+				if ($settings['reload']) {
+					$this->__reloadEnvironment();
+				}
+				$this->__loadEnvironment($settings);
+				$this->assertEqual($dispatcher->uri(), $settings['path'], "%s on environment: {$name}, on setting: {$descrip}");
+
+				if (isset($settings['urlParams'])) {
+					$this->assertEqual($_GET, $settings['urlParams'], "%s on environment: {$name}, on setting: {$descrip}");
+				}
+				if (isset($settings['environment'])) {
+					foreach ($settings['environment'] as $key => $val) {
+						$this->assertEqual(env($key), $val, "%s on key {$key} on environment: {$name}, on setting: {$descrip}");
+					}
+				}
+			}
+		}
+		$this->__loadEnvironment(array_merge(array('reload' => true), $backup));
+	}
+
+/**
+ * Tests that the Dispatcher does not return an empty action
+ *
+ * @return void
+ * @access public
+ */
+	function testTrailingSlash() {
+		$_POST = array();
+		$_SERVER['PHP_SELF'] = '/cake/repo/branches/1.2.x.x/index.php';
+
+		Router::reload();
+		$Dispatcher =& new TestDispatcher();
+		Router::connect('/myalias/:action/*', array('controller' => 'my_controller', 'action' => null));
+
+		$Dispatcher->base = false;
+		$url = 'myalias/'; //Fails
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$result = $Dispatcher->parseParams($url);
+		$this->assertEqual('index', $result['action']);
+
+		$url = 'myalias'; //Passes
+		$controller = $Dispatcher->dispatch($url, array('return' => 1));
+		$result = $Dispatcher->parseParams($url);
+		$this->assertEqual('index', $result['action']);
+	}
+
+/**
+ * backupEnvironment method
+ *
+ * @return void
+ * @access private
+ */
+	function __backupEnvironment() {
+		return array(
+			'App'	=> Configure::read('App'),
+			'GET'	=> $_GET,
+			'POST'	=> $_POST,
+			'SERVER'=> $_SERVER
+		);
+	}
+
+/**
+ * reloadEnvironment method
+ *
+ * @return void
+ * @access private
+ */
+	function __reloadEnvironment() {
+		foreach ($_GET as $key => $val) {
+			unset($_GET[$key]);
+		}
+		foreach ($_POST as $key => $val) {
+			unset($_POST[$key]);
+		}
+		foreach ($_SERVER as $key => $val) {
+			unset($_SERVER[$key]);
+		}
+		Configure::write('App', array());
+	}
+
+/**
+ * loadEnvironment method
+ *
+ * @param mixed $env
+ * @return void
+ * @access private
+ */
+	function __loadEnvironment($env) {
+		if ($env['reload']) {
+			$this->__reloadEnvironment();
+		}
+
+		if (isset($env['App'])) {
+			Configure::write('App', $env['App']);
+		}
+
+		if (isset($env['GET'])) {
+			foreach ($env['GET'] as $key => $val) {
+				$_GET[$key] = $val;
+			}
+		}
+
+		if (isset($env['POST'])) {
+			foreach ($env['POST'] as $key => $val) {
+				$_POST[$key] = $val;
+			}
+		}
+
+		if (isset($env['SERVER'])) {
+			foreach ($env['SERVER'] as $key => $val) {
+				$_SERVER[$key] = $val;
+			}
+		}
+	}
+
+/**
+ * cachePath method
+ *
+ * @param mixed $her
+ * @return string
+ * @access private
+ */
+	function __cachePath($here) {
+		$path = $here;
+		if ($here == '/') {
+			$path = 'home';
+		}
+		$path = strtolower(Inflector::slug($path));
+
+		$filename = CACHE . 'views' . DS . $path . '.php';
+
+		if (!file_exists($filename)) {
+			$filename = CACHE . 'views' . DS . $path . '_index.php';
+		}
+		return $filename;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache.test.php
new file mode 100644
index 000000000..149118e9c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache.test.php
@@ -0,0 +1,372 @@
+<?php
+/**
+ * CacheTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('Cache')) {
+	require LIBS . 'cache.php';
+}
+
+/**
+ * CacheTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CacheTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', false);
+
+		$this->_defaultCacheConfig = Cache::config('default');
+		Cache::config('default', array('engine' => 'File', 'path' => TMP . 'tests'));
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('Cache.disable', $this->_cacheDisable);
+		Cache::config('default', $this->_defaultCacheConfig['settings']);
+	}
+
+/**
+ * testConfig method
+ *
+ * @access public
+ * @return void
+ */
+	function testConfig() {
+		$settings = array('engine' => 'File', 'path' => TMP . 'tests', 'prefix' => 'cake_test_');
+		$results = Cache::config('new', $settings);
+		$this->assertEqual($results, Cache::config('new'));
+		$this->assertTrue(isset($results['engine']));
+		$this->assertTrue(isset($results['settings']));
+	}
+
+/**
+ * Check that no fatal errors are issued doing normal things when Cache.disable is true.
+ *
+ * @return void
+ */
+	function testNonFatalErrorsWithCachedisable() {
+		Configure::write('Cache.disable', true);
+		Cache::config('test', array('engine' => 'File', 'path' => TMP, 'prefix' => 'error_test_'));
+
+		Cache::write('no_save', 'Noooo!', 'test');
+		Cache::read('no_save', 'test');
+		Cache::delete('no_save', 'test');
+		Cache::set('duration', '+10 minutes');
+
+		Configure::write('Cache.disable', false);
+	}
+
+/**
+ * test configuring CacheEngines in App/libs
+ *
+ * @return void
+ */
+	function testConfigWithLibAndPluginEngines() {
+		App::build(array(
+			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+
+		$settings = array('engine' => 'TestAppCache', 'path' => TMP, 'prefix' => 'cake_test_');
+		$result = Cache::config('libEngine', $settings);
+		$this->assertEqual($result, Cache::config('libEngine'));
+
+		$settings = array('engine' => 'TestPlugin.TestPluginCache', 'path' => TMP, 'prefix' => 'cake_test_');
+		$result = Cache::config('pluginLibEngine', $settings);
+		$this->assertEqual($result, Cache::config('pluginLibEngine'));
+
+		Cache::drop('libEngine');
+		Cache::drop('pluginLibEngine');
+
+		App::build();
+	}
+
+/**
+ * testInvalidConfig method
+ *
+ * Test that the cache class doesn't cause fatal errors with a partial path
+ *
+ * @access public
+ * @return void
+ */
+	function testInvaidConfig() {
+		$this->expectError();
+		Cache::config('invalid', array(
+			'engine' => 'File',
+			'duration' => '+1 year',
+			'prefix' => 'testing_invalid_',
+			'path' => 'data/',
+			'serialize' => true,
+			'random' => 'wii'
+		));
+		$read = Cache::read('Test', 'invalid');
+		$this->assertEqual($read, null);
+	}
+
+/**
+ * testConfigChange method
+ *
+ * @access public
+ * @return void
+ */
+	function testConfigChange() {
+		$_cacheConfigSessions = Cache::config('sessions');
+		$_cacheConfigTests = Cache::config('tests');
+
+		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
+		$this->assertEqual($result['settings'], Cache::settings('sessions'));
+
+		$result = Cache::config('tests', array('engine'=> 'File', 'path' => TMP . 'tests'));
+		$this->assertEqual($result['settings'], Cache::settings('tests'));
+
+		Cache::config('sessions', $_cacheConfigSessions['settings']);
+		Cache::config('tests', $_cacheConfigTests['settings']);
+	}
+
+/**
+ * test that calling config() sets the 'default' configuration up.
+ *
+ * @return void
+ */
+	function testConfigSettingDefaultConfigKey() {
+		Cache::config('test_name', array('engine' => 'File', 'prefix' => 'test_name_'));
+
+		Cache::config('test_name');
+		Cache::write('value_one', 'I am cached');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, 'I am cached');
+
+		Cache::config('default');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, null);
+
+		Cache::write('value_one', 'I am in default config!');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, 'I am in default config!');
+
+		Cache::config('test_name');
+		$result = Cache::read('value_one');
+		$this->assertEqual($result, 'I am cached');
+
+		Cache::delete('value_one');
+		Cache::config('default');
+		Cache::delete('value_one');
+	}
+
+/**
+ * testWritingWithConfig method
+ *
+ * @access public
+ * @return void
+ */
+	function testWritingWithConfig() {
+		$_cacheConfigSessions = Cache::config('sessions');
+
+		Cache::write('test_somthing', 'this is the test data', 'tests');
+
+		$expected = array(
+			'path' => TMP . 'sessions',
+			'prefix' => 'cake_',
+			'lock' => false,
+			'serialize' => true,
+			'duration' => 3600,
+			'probability' => 100,
+			'engine' => 'File',
+			'isWindows' => DIRECTORY_SEPARATOR == '\\'
+		);
+		$this->assertEqual($expected, Cache::settings('sessions'));
+
+		Cache::config('sessions', $_cacheConfigSessions['settings']);
+	}
+
+/**
+ * test that configured returns an array of the currently configured cache
+ * settings
+ *
+ * @return void
+ */
+	function testConfigured() {
+		$result = Cache::configured();
+		$this->assertTrue(in_array('_cake_core_', $result));
+		$this->assertTrue(in_array('default', $result));
+	}
+
+/**
+ * testInitSettings method
+ *
+ * @access public
+ * @return void
+ */
+	function testInitSettings() {
+		Cache::config('for_test', array('engine' => 'File', 'path' => TMP . 'tests'));
+
+		$settings = Cache::settings();
+		$expecting = array(
+			'engine' => 'File',
+			'duration'=> 3600,
+			'probability' => 100,
+			'path'=> TMP . 'tests',
+			'prefix'=> 'cake_',
+			'lock' => false,
+			'serialize'=> true,
+			'isWindows' => DIRECTORY_SEPARATOR == '\\'
+		);
+		$this->assertEqual($settings, $expecting);
+	}
+
+/**
+ * test that drop removes cache configs, and that further attempts to use that config
+ * do not work.
+ *
+ * @return void
+ */
+	function testDrop() {
+		App::build(array(
+			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+
+		$result = Cache::drop('some_config_that_does_not_exist');
+		$this->assertFalse($result);
+
+		$_testsConfig = Cache::config('tests');
+		$result = Cache::drop('tests');
+		$this->assertTrue($result);
+
+		Cache::config('unconfigTest', array(
+			'engine' => 'TestAppCache'
+		));
+		$this->assertTrue(Cache::isInitialized('unconfigTest'));
+
+		$this->assertTrue(Cache::drop('unconfigTest'));
+		$this->assertFalse(Cache::isInitialized('TestAppCache'));
+
+		Cache::config('tests', $_testsConfig);
+		App::build();
+	}
+
+/**
+ * testWriteEmptyValues method
+ *
+ * @access public
+ * @return void
+ */
+	function testWriteEmptyValues() {
+		Cache::write('App.falseTest', false);
+		$this->assertIdentical(Cache::read('App.falseTest'), false);
+
+		Cache::write('App.trueTest', true);
+		$this->assertIdentical(Cache::read('App.trueTest'), true);
+
+		Cache::write('App.nullTest', null);
+		$this->assertIdentical(Cache::read('App.nullTest'), null);
+
+		Cache::write('App.zeroTest', 0);
+		$this->assertIdentical(Cache::read('App.zeroTest'), 0);
+
+		Cache::write('App.zeroTest2', '0');
+		$this->assertIdentical(Cache::read('App.zeroTest2'), '0');
+	}
+
+/**
+ * testCacheDisable method
+ *
+ * Check that the "Cache.disable" configuration and a change to it
+ * (even after a cache config has been setup) is taken into account.
+ *
+ * @link https://trac.cakephp.org/ticket/6236
+ * @access public
+ * @return void
+ */
+	function testCacheDisable() {
+		Configure::write('Cache.disable', false);
+		Cache::config('test_cache_disable_1', array('engine'=> 'File', 'path' => TMP . 'tests'));
+
+		$this->assertTrue(Cache::write('key_1', 'hello'));
+		$this->assertIdentical(Cache::read('key_1'), 'hello');
+
+		Configure::write('Cache.disable', true);
+
+		$this->assertFalse(Cache::write('key_2', 'hello'));
+		$this->assertFalse(Cache::read('key_2'));
+
+		Configure::write('Cache.disable', false);
+
+		$this->assertTrue(Cache::write('key_3', 'hello'));
+		$this->assertIdentical(Cache::read('key_3'), 'hello');
+
+		Configure::write('Cache.disable', true);
+		Cache::config('test_cache_disable_2', array('engine'=> 'File', 'path' => TMP . 'tests'));
+
+		$this->assertFalse(Cache::write('key_4', 'hello'));
+		$this->assertFalse(Cache::read('key_4'));
+
+		Configure::write('Cache.disable', false);
+
+		$this->assertTrue(Cache::write('key_5', 'hello'));
+		$this->assertIdentical(Cache::read('key_5'), 'hello');
+
+		Configure::write('Cache.disable', true);
+
+		$this->assertFalse(Cache::write('key_6', 'hello'));
+		$this->assertFalse(Cache::read('key_6'));
+	}
+
+/**
+ * testSet method
+ *
+ * @access public
+ * @return void
+ */
+	function testSet() {
+		$_cacheSet = Cache::set();
+
+		Cache::set(array('duration' => '+1 year'));
+		$data = Cache::read('test_cache');
+		$this->assertFalse($data);
+
+		$data = 'this is just a simple test of the cache system';
+		$write = Cache::write('test_cache', $data);
+		$this->assertTrue($write);
+
+		Cache::set(array('duration' => '+1 year'));
+		$data = Cache::read('test_cache');
+		$this->assertEqual($data, 'this is just a simple test of the cache system');
+
+		Cache::delete('test_cache');
+
+		$global = Cache::settings();
+
+		Cache::set($_cacheSet);
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/apc.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/apc.test.php
new file mode 100644
index 000000000..883f9b852
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/apc.test.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * ApcEngineTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.5434
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('Cache')) {
+	require LIBS . 'cache.php';
+}
+
+/**
+ * ApcEngineTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ */
+class ApcEngineTest extends CakeTestCase {
+
+/**
+ * skip method
+ *
+ * @access public
+ * @return void
+ */
+	function skip() {
+		$skip = true;
+		if (function_exists('apc_store')) {
+			$skip = false;
+		}
+		$this->skipIf($skip, '%s Apc is not installed or configured properly');
+	}
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', false);
+		Cache::config('apc', array('engine' => 'Apc', 'prefix' => 'cake_'));
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('Cache.disable', $this->_cacheDisable);
+		Cache::drop('apc');
+		Cache::config('default');
+	}
+
+/**
+ * testReadAndWriteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadAndWriteCache() {
+		Cache::set(array('duration' => 1));
+
+		$result = Cache::read('test');
+		$expecting = '';
+		$this->assertEqual($result, $expecting);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('test', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::read('test');
+		$expecting = $data;
+		$this->assertEqual($result, $expecting);
+
+		Cache::delete('test');
+	}
+
+/**
+ * testExpiry method
+ *
+ * @access public
+ * @return void
+ */
+	function testExpiry() {
+		Cache::set(array('duration' => 1));
+
+		$result = Cache::read('test');
+		$this->assertFalse($result);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+
+		Cache::set(array('duration' =>  1));
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testDeleteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteCache() {
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('delete_test', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::delete('delete_test');
+		$this->assertTrue($result);
+	}
+
+/**
+ * testDecrement method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecrement() {
+		if ($this->skipIf(!function_exists('apc_dec'), 'No apc_dec() function, cannot test decrement() %s')) {
+			return;
+		}
+		$result = Cache::write('test_decrement', 5);
+		$this->assertTrue($result);
+
+		$result = Cache::decrement('test_decrement');
+		$this->assertEqual(4, $result);
+
+		$result = Cache::read('test_decrement');
+		$this->assertEqual(4, $result);
+
+		$result = Cache::decrement('test_decrement', 2);
+		$this->assertEqual(2, $result);
+
+		$result = Cache::read('test_decrement');
+		$this->assertEqual(2, $result);
+		
+	}
+
+/**
+ * testIncrement method
+ *
+ * @access public
+ * @return void
+ */
+	function testIncrement() {
+		if ($this->skipIf(!function_exists('apc_inc'), 'No apc_inc() function, cannot test increment() %s')) {
+			return;
+		}
+		$result = Cache::write('test_increment', 5);
+		$this->assertTrue($result);
+
+		$result = Cache::increment('test_increment');
+		$this->assertEqual(6, $result);
+
+		$result = Cache::read('test_increment');
+		$this->assertEqual(6, $result);
+
+		$result = Cache::increment('test_increment', 2);
+		$this->assertEqual(8, $result);
+
+		$result = Cache::read('test_increment');
+		$this->assertEqual(8, $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/file.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/file.test.php
new file mode 100644
index 000000000..ffb571f73
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/file.test.php
@@ -0,0 +1,404 @@
+<?php
+/**
+ * FileEngineTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.5434
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('Cache')) {
+	require LIBS . 'cache.php';
+}
+
+/**
+ * FileEngineTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ */
+class FileEngineTest extends CakeTestCase {
+
+/**
+ * config property
+ *
+ * @var array
+ * @access public
+ */
+	var $config = array();
+
+/**
+ * startCase method
+ *
+ * @access public
+ * @return void
+ */
+	function startCase() {
+		$this->_cacheDisable = Configure::read('Cache.disable');
+		$this->_cacheConfig = Cache::config('default');
+		Configure::write('Cache.disable', false);
+		Cache::config('default', array('engine' => 'File', 'path' => CACHE));
+	}
+
+/**
+ * endCase method
+ *
+ * @access public
+ * @return void
+ */
+	function endCase() {
+		Configure::write('Cache.disable', $this->_cacheDisable);
+		Cache::config('default', $this->_cacheConfig['settings']);
+	}
+
+/**
+ * testCacheDirChange method
+ *
+ * @access public
+ * @return void
+ */
+	function testCacheDirChange() {
+		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'sessions'));
+		$this->assertEqual($result['settings'], Cache::settings('sessions'));
+
+		$result = Cache::config('sessions', array('engine'=> 'File', 'path' => TMP . 'tests'));
+		$this->assertEqual($result['settings'], Cache::settings('sessions'));
+		$this->assertNotEqual($result['settings'], Cache::settings('default'));
+	}
+
+/**
+ * testReadAndWriteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadAndWriteCache() {
+		Cache::config('default');
+
+		$result = Cache::write(null, 'here');
+		$this->assertFalse($result);
+
+		Cache::set(array('duration' => 1));
+
+		$result = Cache::read('test');
+		$expecting = '';
+		$this->assertEqual($result, $expecting);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('test', $data);
+		$this->assertTrue(file_exists(CACHE . 'cake_test'));
+
+		$result = Cache::read('test');
+		$expecting = $data;
+		$this->assertEqual($result, $expecting);
+
+		Cache::delete('test');
+	}
+
+/**
+ * testExpiry method
+ *
+ * @access public
+ * @return void
+ */
+	function testExpiry() {
+		Cache::set(array('duration' => 1));
+
+		$result = Cache::read('test');
+		$this->assertFalse($result);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+
+		Cache::set(array('duration' =>  "+1 second"));
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testDeleteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteCache() {
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('delete_test', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::delete('delete_test');
+		$this->assertTrue($result);
+		$this->assertFalse(file_exists(TMP . 'tests' . DS . 'delete_test'));
+
+		$result = Cache::delete('delete_test');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testSerialize method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerialize() {
+		Cache::config('default', array('engine' => 'File', 'serialize' => true));
+		$data = 'this is a test of the emergency broadcasting system';
+		$write = Cache::write('serialize_test', $data);
+		$this->assertTrue($write);
+
+		Cache::config('default', array('serialize' => false));
+		$read = Cache::read('serialize_test');
+
+		$newread = Cache::read('serialize_test');
+
+		$delete = Cache::delete('serialize_test');
+
+		$this->assertIdentical($read, serialize($data));
+
+		$this->assertIdentical(unserialize($newread), $data);
+	}
+
+/**
+ * testClear method
+ *
+ * @access public
+ * @return void
+ */
+	function testClear() {
+		Cache::config('default', array('engine' => 'File', 'duration' => 1));
+		$data = 'this is a test of the emergency broadcasting system';
+		$write = Cache::write('serialize_test1', $data);
+		$write = Cache::write('serialize_test2', $data);
+		$write = Cache::write('serialize_test3', $data);
+		$this->assertTrue(file_exists(CACHE . 'cake_serialize_test1'));
+		$this->assertTrue(file_exists(CACHE . 'cake_serialize_test2'));
+		$this->assertTrue(file_exists(CACHE . 'cake_serialize_test3'));
+		sleep(2);
+		$result = Cache::clear(true);
+		$this->assertTrue($result);
+		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test1'));
+		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test2'));
+		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test3'));
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$write = Cache::write('serialize_test1', $data);
+		$write = Cache::write('serialize_test2', $data);
+		$write = Cache::write('serialize_test3', $data);
+		$this->assertTrue(file_exists(CACHE . 'cake_serialize_test1'));
+		$this->assertTrue(file_exists(CACHE . 'cake_serialize_test2'));
+		$this->assertTrue(file_exists(CACHE . 'cake_serialize_test3'));
+
+		$result = Cache::clear();
+		$this->assertTrue($result);
+		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test1'));
+		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test2'));
+		$this->assertFalse(file_exists(CACHE . 'cake_serialize_test3'));
+
+		Cache::config('default', array('engine' => 'File', 'path' => CACHE . 'views'));
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$write = Cache::write('controller_view_1', $data);
+		$write = Cache::write('controller_view_2', $data);
+		$write = Cache::write('controller_view_3', $data);
+		$write = Cache::write('controller_view_10', $data);
+		$write = Cache::write('controller_view_11', $data);
+		$write = Cache::write('controller_view_12', $data);
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_1'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_2'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_3'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_10'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_11'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_12'));
+
+		clearCache('controller_view_1', 'views', '');
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_1'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_2'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_3'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_10'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_11'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_12'));
+
+		clearCache('controller_view', 'views', '');
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_1'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_2'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_3'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_10'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_11'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_12'));
+
+		$write = Cache::write('controller_view_1', $data);
+		$write = Cache::write('controller_view_2', $data);
+		$write = Cache::write('controller_view_3', $data);
+		$write = Cache::write('controller_view_10', $data);
+		$write = Cache::write('controller_view_11', $data);
+		$write = Cache::write('controller_view_12', $data);
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_1'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_2'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_3'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_10'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_11'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_12'));
+
+		clearCache(array('controller_view_2', 'controller_view_11', 'controller_view_12'), 'views', '');
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_1'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_2'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_3'));
+		$this->assertTrue(file_exists(CACHE . 'views'. DS . 'cake_controller_view_10'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_11'));
+		$this->assertFalse(file_exists(CACHE . 'views'. DS . 'cake_controller_view_12'));
+
+		clearCache('controller_view');
+
+		Cache::config('default', array('engine' => 'File', 'path' => CACHE));
+	}
+
+/**
+ * test that clear() doesn't wipe files not in the current engine's prefix.
+ *
+ * @return void
+ */
+	function testClearWithPrefixes() {
+		$FileOne =& new FileEngine();
+		$FileOne->init(array(
+			'prefix' => 'prefix_one_',
+			'duration' => DAY
+		));
+		$FileTwo =& new FileEngine();
+		$FileTwo->init(array(
+			'prefix' => 'prefix_two_',
+			'duration' => DAY
+		));
+
+		$data1 = $data2 = $expected = 'content to cache';
+		$FileOne->write('key_one', $data1, DAY);
+		$FileTwo->write('key_two', $data2, DAY);
+
+		$this->assertEqual($FileOne->read('key_one'), $expected);
+		$this->assertEqual($FileTwo->read('key_two'), $expected);
+
+		$FileOne->clear(false);
+		$this->assertEqual($FileTwo->read('key_two'), $expected, 'secondary config was cleared by accident.');
+	}
+
+/**
+ * testKeyPath method
+ *
+ * @access public
+ * @return void
+ */
+	function testKeyPath() {
+		$result = Cache::write('views.countries.something', 'here');
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists(CACHE . 'cake_views_countries_something'));
+
+		$result = Cache::read('views.countries.something');
+		$this->assertEqual($result, 'here');
+
+		$result = Cache::clear();
+		$this->assertTrue($result);
+	}
+
+/**
+ * testRemoveWindowsSlashesFromCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoveWindowsSlashesFromCache() {
+		Cache::config('windows_test', array('engine' => 'File', 'isWindows' => true, 'prefix' => null, 'path' => TMP));
+
+		$expected = array (
+			'C:\dev\prj2\sites\cake\libs' => array(
+				0 => 'C:\dev\prj2\sites\cake\libs', 1 => 'C:\dev\prj2\sites\cake\libs\view',
+				2 => 'C:\dev\prj2\sites\cake\libs\view\scaffolds', 3 => 'C:\dev\prj2\sites\cake\libs\view\pages',
+				4 => 'C:\dev\prj2\sites\cake\libs\view\layouts', 5 => 'C:\dev\prj2\sites\cake\libs\view\layouts\xml',
+				6 => 'C:\dev\prj2\sites\cake\libs\view\layouts\rss', 7 => 'C:\dev\prj2\sites\cake\libs\view\layouts\js',
+				8 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email', 9 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email\text',
+				10 => 'C:\dev\prj2\sites\cake\libs\view\layouts\email\html', 11 => 'C:\dev\prj2\sites\cake\libs\view\helpers',
+				12 => 'C:\dev\prj2\sites\cake\libs\view\errors', 13 => 'C:\dev\prj2\sites\cake\libs\view\elements',
+				14 => 'C:\dev\prj2\sites\cake\libs\view\elements\email', 15 => 'C:\dev\prj2\sites\cake\libs\view\elements\email\text',
+				16 => 'C:\dev\prj2\sites\cake\libs\view\elements\email\html', 17 => 'C:\dev\prj2\sites\cake\libs\model',
+				18 => 'C:\dev\prj2\sites\cake\libs\model\datasources', 19 => 'C:\dev\prj2\sites\cake\libs\model\datasources\dbo',
+				20 => 'C:\dev\prj2\sites\cake\libs\model\behaviors', 21 => 'C:\dev\prj2\sites\cake\libs\controller',
+				22 => 'C:\dev\prj2\sites\cake\libs\controller\components', 23 => 'C:\dev\prj2\sites\cake\libs\cache'),
+			'C:\dev\prj2\sites\main_site\vendors' => array(
+				0 => 'C:\dev\prj2\sites\main_site\vendors', 1 => 'C:\dev\prj2\sites\main_site\vendors\shells',
+				2 => 'C:\dev\prj2\sites\main_site\vendors\shells\templates', 3 => 'C:\dev\prj2\sites\main_site\vendors\shells\templates\cdc_project',
+				4 => 'C:\dev\prj2\sites\main_site\vendors\shells\tasks', 5 => 'C:\dev\prj2\sites\main_site\vendors\js',
+				6 => 'C:\dev\prj2\sites\main_site\vendors\css'),
+			'C:\dev\prj2\sites\vendors' => array(
+				0 => 'C:\dev\prj2\sites\vendors', 1 => 'C:\dev\prj2\sites\vendors\simpletest',
+				2 => 'C:\dev\prj2\sites\vendors\simpletest\test', 3 => 'C:\dev\prj2\sites\vendors\simpletest\test\support',
+				4 => 'C:\dev\prj2\sites\vendors\simpletest\test\support\collector', 5 => 'C:\dev\prj2\sites\vendors\simpletest\extensions',
+				6 => 'C:\dev\prj2\sites\vendors\simpletest\extensions\testdox', 7 => 'C:\dev\prj2\sites\vendors\simpletest\docs',
+				8 => 'C:\dev\prj2\sites\vendors\simpletest\docs\fr', 9 => 'C:\dev\prj2\sites\vendors\simpletest\docs\en'),
+			'C:\dev\prj2\sites\main_site\views\helpers' => array(
+				0 => 'C:\dev\prj2\sites\main_site\views\helpers')
+		);
+
+		Cache::write('test_dir_map', $expected, 'windows_test');
+		$data = Cache::read('test_dir_map', 'windows_test');
+		Cache::delete('test_dir_map', 'windows_test');
+		$this->assertEqual($expected, $data);
+
+		Cache::drop('windows_test');
+	}
+
+/**
+ * testWriteQuotedString method
+ *
+ * @access public
+ * @return void
+ */
+	function testWriteQuotedString() {
+		Cache::config('default', array('engine' => 'File', 'path' => TMP . 'tests'));
+		Cache::write('App.doubleQuoteTest', '"this is a quoted string"');
+		$this->assertIdentical(Cache::read('App.doubleQuoteTest'), '"this is a quoted string"');
+		Cache::write('App.singleQuoteTest', "'this is a quoted string'");
+		$this->assertIdentical(Cache::read('App.singleQuoteTest'), "'this is a quoted string'");
+
+		Cache::config('default', array('isWindows' => true, 'path' => TMP . 'tests'));
+		$this->assertIdentical(Cache::read('App.doubleQuoteTest'), '"this is a quoted string"');
+		Cache::write('App.singleQuoteTest', "'this is a quoted string'");
+		$this->assertIdentical(Cache::read('App.singleQuoteTest'), "'this is a quoted string'");
+	}
+
+/**
+ * check that FileEngine generates an error when a configured Path does not exist.
+ *
+ * @return void
+ */
+	function testErrorWhenPathDoesNotExist() {
+		if ($this->skipIf(is_dir(TMP . 'tests' . DS . 'file_failure'), 'Cannot run test directory exists. %s')) {
+			return;
+		}
+		$this->expectError();
+		Cache::config('failure', array(
+			'engine' => 'File',
+			'path' => TMP . 'tests' . DS . 'file_failure'
+		));
+
+		Cache::drop('failure');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/memcache.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/memcache.test.php
new file mode 100644
index 000000000..e3553691d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/memcache.test.php
@@ -0,0 +1,390 @@
+<?php
+/**
+ * MemcacheEngineTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.5434
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('Cache')) {
+	require LIBS . 'cache.php';
+}
+App::import('Core', 'cache/Memcache');
+
+
+class TestMemcacheEngine extends MemcacheEngine {
+/**
+ * public accessor to _parseServerString
+ *
+ * @param string $server 
+ * @return array
+ */
+	function parseServerString($server) {
+		return $this->_parseServerString($server);
+	}
+	
+	function setMemcache(&$memcache) {
+		$this->__Memcache = $memcache;
+	}
+}
+
+Mock::generate('Memcache', 'MemcacheMockMemcache');
+
+/**
+ * MemcacheEngineTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ */
+class MemcacheEngineTest extends CakeTestCase {
+
+/**
+ * skip method
+ *
+ * @access public
+ * @return void
+ */
+	function skip() {
+		$skip = true;
+		if (class_exists('Memcache')) {
+			$skip = false;
+		}
+		$this->skipIf($skip, '%s Memcache is not installed or configured properly.');
+	}
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', false);
+		Cache::config('memcache', array(
+			'engine' => 'Memcache',
+			'prefix' => 'cake_',
+			'duration' => 3600
+		));
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('Cache.disable', $this->_cacheDisable);
+		Cache::drop('memcache');
+		Cache::config('default');
+	}
+
+/**
+ * testSettings method
+ *
+ * @access public
+ * @return void
+ */
+	function testSettings() {
+		$settings = Cache::settings();
+		unset($settings['serialize'], $settings['path']);
+		$expecting = array(
+			'prefix' => 'cake_',
+			'duration'=> 3600,
+			'probability' => 100,
+			'servers' => array('127.0.0.1'),
+			'compress' => false,
+			'engine' => 'Memcache',
+			'persistent' => true,
+		);
+		$this->assertEqual($settings, $expecting);
+	}
+
+/**
+ * testSettings method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleServers() {
+		$servers = array('127.0.0.1:11211', '127.0.0.1:11222');
+		$available = true;
+		$Memcache =& new Memcache();
+
+		foreach($servers as $server) {
+			list($host, $port) = explode(':', $server);
+			if (!@$Memcache->connect($host, $port)) {
+				$available = false;
+			}
+		}
+
+		if ($this->skipIf(!$available, '%s Need memcache servers at ' . implode(', ', $servers) . ' to run this test')) {
+			return;
+		}
+		$Memcache =& new MemcacheEngine();
+		$Memcache->init(array('engine' => 'Memcache', 'servers' => $servers));
+
+		$servers = array_keys($Memcache->__Memcache->getExtendedStats());
+		$settings = $Memcache->settings();
+		$this->assertEqual($servers, $settings['servers']);
+		Cache::drop('dual_server');
+	}
+
+/**
+ * testConnect method
+ *
+ * @access public
+ * @return void
+ */
+	function testConnect() {
+		$Memcache =& new MemcacheEngine();
+		$Memcache->init(Cache::settings('memcache'));
+		$result = $Memcache->connect('127.0.0.1');
+		$this->assertTrue($result);
+	}
+
+/**
+ * test connecting to an ipv6 server.
+ *
+ * @return void
+ */
+	function testConnectIpv6() {
+		$Memcache =& new MemcacheEngine();
+		$result = $Memcache->init(array(
+			'prefix' => 'cake_',
+			'duration' => 200,
+			'engine' => 'Memcache',
+			'servers' => array(
+				'[::1]:11211'
+			)
+		));
+		$this->assertTrue($result);
+	}
+
+/**
+ * test non latin domains.
+ *
+ * @return void
+ */
+	function testParseServerStringNonLatin() {
+		$Memcache =& new TestMemcacheEngine();
+		$result = $Memcache->parseServerString('schülervz.net:13211');
+		$this->assertEqual($result, array('schülervz.net', '13211'));
+
+		$result = $Memcache->parseServerString('sülül:1111');
+		$this->assertEqual($result, array('sülül', '1111'));
+	}
+
+/**
+ * testReadAndWriteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadAndWriteCache() {
+		Cache::set(array('duration' => 1));
+
+		$result = Cache::read('test');
+		$expecting = '';
+		$this->assertEqual($result, $expecting);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('test', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::read('test');
+		$expecting = $data;
+		$this->assertEqual($result, $expecting);
+
+		Cache::delete('test');
+	}
+
+/**
+ * testExpiry method
+ *
+ * @access public
+ * @return void
+ */
+	function testExpiry() {
+		Cache::set(array('duration' => 1));
+
+		$result = Cache::read('test');
+		$this->assertFalse($result);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+
+		Cache::set(array('duration' =>  "+1 second"));
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+
+		Cache::config('memcache', array('duration' => '+1 second'));
+		sleep(2);
+
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+
+		Cache::config('memcache', array('duration' => '+29 days'));
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('long_expiry_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('long_expiry_test');
+		$expecting = $data;
+		$this->assertEqual($result, $expecting);
+
+		Cache::config('memcache', array('duration' => 3600));
+	}
+
+/**
+ * testDeleteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteCache() {
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('delete_test', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::delete('delete_test');
+		$this->assertTrue($result);
+	}
+
+/**
+ * testDecrement method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecrement() {
+		$result = Cache::write('test_decrement', 5);
+		$this->assertTrue($result);
+
+		$result = Cache::decrement('test_decrement');
+		$this->assertEqual(4, $result);
+
+		$result = Cache::read('test_decrement');
+		$this->assertEqual(4, $result);
+
+		$result = Cache::decrement('test_decrement', 2);
+		$this->assertEqual(2, $result);
+
+		$result = Cache::read('test_decrement');
+		$this->assertEqual(2, $result);
+	}
+
+/**
+ * testIncrement method
+ *
+ * @access public
+ * @return void
+ */
+	function testIncrement() {
+		$result = Cache::write('test_increment', 5);
+		$this->assertTrue($result);
+
+		$result = Cache::increment('test_increment');
+		$this->assertEqual(6, $result);
+
+		$result = Cache::read('test_increment');
+		$this->assertEqual(6, $result);
+
+		$result = Cache::increment('test_increment', 2);
+		$this->assertEqual(8, $result);
+
+		$result = Cache::read('test_increment');
+		$this->assertEqual(8, $result);
+	}
+
+/**
+ * test that configurations don't conflict, when a file engine is declared after a memcache one.
+ *
+ * @return void
+ */
+	function testConfigurationConflict() {
+		Cache::config('long_memcache', array(
+		  'engine' => 'Memcache',
+		  'duration'=> '+2 seconds',
+		  'servers' => array('127.0.0.1:11211'),
+		));
+		Cache::config('short_memcache', array(
+		  'engine' => 'Memcache',
+		  'duration'=> '+1 seconds',
+		  'servers' => array('127.0.0.1:11211'),
+		));
+		Cache::config('some_file', array('engine' => 'File'));
+
+		$this->assertTrue(Cache::write('duration_test', 'yay', 'long_memcache'));
+		$this->assertTrue(Cache::write('short_duration_test', 'boo', 'short_memcache'));
+
+		$this->assertEqual(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
+		$this->assertEqual(Cache::read('short_duration_test', 'short_memcache'), 'boo', 'Value was not read %s');
+
+		sleep(1);
+		$this->assertEqual(Cache::read('duration_test', 'long_memcache'), 'yay', 'Value was not read %s');
+
+		sleep(2);
+		$this->assertFalse(Cache::read('short_duration_test', 'short_memcache'), 'Cache was not invalidated %s');
+		$this->assertFalse(Cache::read('duration_test', 'long_memcache'), 'Value did not expire %s');
+
+		Cache::delete('duration_test', 'long_memcache');
+		Cache::delete('short_duration_test', 'short_memcache');
+	}
+
+/**
+ * test that a 0 duration can succesfully write.
+ *
+ * @return void
+ */
+	function testZeroDuration() {
+		Cache::config('memcache', array('duration' => 0));
+		$result = Cache::write('test_key', 'written!', 'memcache');
+
+		$this->assertTrue($result, 'Could not write with duration 0');
+		$result = Cache::read('test_key', 'memcache');
+		$this->assertEqual($result, 'written!');
+	}
+
+/**
+ * test that durations greater than 30 days never expire
+ *
+ * @return void
+ */
+	function testLongDurationEqualToZero() {
+		$memcache =& new TestMemcacheEngine();
+		$memcache->settings['compress'] = false;
+
+		$mock = new MemcacheMockMemcache();
+		$memcache->setMemcache($mock);
+		$mock->expectAt(0, 'set', array('key', 'value', false, 0));
+
+		$value = 'value';
+		$memcache->write('key', $value, 50 * DAY);
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/xcache.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/xcache.test.php
new file mode 100644
index 000000000..b104c9564
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cache/xcache.test.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * XcacheEngineTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ * @since         CakePHP(tm) v 1.2.0.5434
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('Cache')) {
+	require LIBS . 'cache.php';
+}
+
+/**
+ * XcacheEngineTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.cache
+ */
+class XcacheEngineTest extends UnitTestCase {
+
+/**
+ * skip method
+ *
+ * @access public
+ * @return void
+ */
+	function skip() {
+		$skip = true;
+		if (function_exists('xcache_set')) {
+			$skip = false;
+		}
+		$this->skipIf($skip, '%s Xcache is not installed or configured properly');
+	}
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', false);
+		Cache::config('xcache', array('engine' => 'Xcache', 'prefix' => 'cake_'));
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('Cache.disable', $this->_cacheDisable);
+		Cache::config('default');
+	}
+
+/**
+ * testSettings method
+ *
+ * @access public
+ * @return void
+ */
+	function testSettings() {
+		$settings = Cache::settings();
+		$expecting = array(
+			'prefix' => 'cake_',
+			'duration'=> 3600,
+			'probability' => 100,
+			'engine' => 'Xcache',
+		);
+		$this->assertTrue(isset($settings['PHP_AUTH_USER']));
+		$this->assertTrue(isset($settings['PHP_AUTH_PW']));
+
+		unset($settings['PHP_AUTH_USER'], $settings['PHP_AUTH_PW']);
+		$this->assertEqual($settings, $expecting);
+	}
+
+/**
+ * testReadAndWriteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadAndWriteCache() {
+		Cache::set(array('duration' => 1));
+
+		$result = Cache::read('test');
+		$expecting = '';
+		$this->assertEqual($result, $expecting);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('test', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::read('test');
+		$expecting = $data;
+		$this->assertEqual($result, $expecting);
+
+		Cache::delete('test');
+	}
+
+/**
+ * testExpiry method
+ *
+ * @access public
+ * @return void
+ */
+	function testExpiry() {
+		Cache::set(array('duration' => 1));
+		$result = Cache::read('test');
+		$this->assertFalse($result);
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+
+		Cache::set(array('duration' =>  "+1 second"));
+
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('other_test', $data);
+		$this->assertTrue($result);
+
+		sleep(2);
+		$result = Cache::read('other_test');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testDeleteCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteCache() {
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('delete_test', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::delete('delete_test');
+		$this->assertTrue($result);
+	}
+
+/**
+ * testClearCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testClearCache() {
+		$data = 'this is a test of the emergency broadcasting system';
+		$result = Cache::write('clear_test_1', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::write('clear_test_2', $data);
+		$this->assertTrue($result);
+
+		$result = Cache::clear();
+		$this->assertTrue($result);
+	}
+
+/**
+ * testDecrement method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecrement() {
+		$result = Cache::write('test_decrement', 5);
+		$this->assertTrue($result);
+
+		$result = Cache::decrement('test_decrement');
+		$this->assertEqual(4, $result);
+
+		$result = Cache::read('test_decrement');
+		$this->assertEqual(4, $result);
+
+		$result = Cache::decrement('test_decrement', 2);
+		$this->assertEqual(2, $result);
+
+		$result = Cache::read('test_decrement');
+		$this->assertEqual(2, $result);
+	}
+
+/**
+ * testIncrement method
+ *
+ * @access public
+ * @return void
+ */
+	function testIncrement() {
+		$result = Cache::write('test_increment', 5);
+		$this->assertTrue($result);
+
+		$result = Cache::increment('test_increment');
+		$this->assertEqual(6, $result);
+
+		$result = Cache::read('test_increment');
+		$this->assertEqual(6, $result);
+
+		$result = Cache::increment('test_increment', 2);
+		$this->assertEqual(8, $result);
+
+		$result = Cache::read('test_increment');
+		$this->assertEqual(8, $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_log.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_log.test.php
new file mode 100644
index 000000000..7394eddf5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_log.test.php
@@ -0,0 +1,183 @@
+<?php
+/**
+ * CakeLogTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Log');
+App::import('Core', 'log/FileLog');
+
+/**
+ * CakeLogTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CakeLogTest extends CakeTestCase {
+
+/**
+ * Start test callback, clears all streams enabled.
+ *
+ * @return void
+ */
+	function startTest() {
+		$streams = CakeLog::configured();
+		foreach ($streams as $stream) {
+			CakeLog::drop($stream);
+		}
+	}
+
+/**
+ * test importing loggers from app/libs and plugins.
+ *
+ * @return void
+ */
+	function testImportingLoggers() {
+		App::build(array(
+			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+
+		$result = CakeLog::config('libtest', array(
+			'engine' => 'TestAppLog'
+		));
+		$this->assertTrue($result);
+		$this->assertEqual(CakeLog::configured(), array('libtest'));
+
+		$result = CakeLog::config('plugintest', array(
+			'engine' => 'TestPlugin.TestPluginLog'
+		));
+		$this->assertTrue($result);
+		$this->assertEqual(CakeLog::configured(), array('libtest', 'plugintest'));
+
+		App::build();
+	}
+
+/**
+ * test all the errors from failed logger imports
+ *
+ * @return void
+ */
+	function testImportingLoggerFailure() {
+		$this->expectError('Missing logger classname');
+		CakeLog::config('fail', array());
+
+		$this->expectError('Could not load logger class born to fail');
+		CakeLog::config('fail', array('engine' => 'born to fail'));
+
+		$this->expectError('logger class stdClass does not implement a write method.');
+		CakeLog::config('fail', array('engine' => 'stdClass'));
+	}
+
+/**
+ * Test that CakeLog autoconfigures itself to use a FileLogger with the LOGS dir.
+ * When no streams are there.
+ *
+ * @return void
+ */
+	function testAutoConfig() {
+		@unlink(LOGS . 'error.log');
+		CakeLog::write(LOG_WARNING, 'Test warning');
+		$this->assertTrue(file_exists(LOGS . 'error.log'));
+
+		$result = CakeLog::configured();
+		$this->assertEqual($result, array('default'));
+		unlink(LOGS . 'error.log');
+	}
+
+/**
+ * test configuring log streams
+ *
+ * @return void
+ */
+	function testConfig() {
+		CakeLog::config('file', array(
+			'engine' => 'FileLog',
+			'path' => LOGS
+		));
+		$result = CakeLog::configured();
+		$this->assertEqual($result, array('file'));
+
+		@unlink(LOGS . 'error.log');
+		CakeLog::write(LOG_WARNING, 'Test warning');
+		$this->assertTrue(file_exists(LOGS . 'error.log'));
+
+		$result = file_get_contents(LOGS . 'error.log');
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning/', $result);
+		unlink(LOGS . 'error.log');
+	}
+
+/**
+ * explict tests for drop()
+ *
+ * @return void
+ **/
+	function testDrop() {
+		CakeLog::config('file', array(
+			'engine' => 'FileLog',
+			'path' => LOGS
+		));
+		$result = CakeLog::configured();
+		$this->assertEqual($result, array('file'));
+
+		CakeLog::drop('file');
+		$result = CakeLog::configured();
+		$this->assertEqual($result, array());
+	}
+
+/**
+ * testLogFileWriting method
+ *
+ * @access public
+ * @return void
+ */
+	function testLogFileWriting() {
+		@unlink(LOGS . 'error.log');
+		$result = CakeLog::write(LOG_WARNING, 'Test warning');
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists(LOGS . 'error.log'));
+		unlink(LOGS . 'error.log');
+
+		CakeLog::write(LOG_WARNING, 'Test warning 1');
+		CakeLog::write(LOG_WARNING, 'Test warning 2');
+		$result = file_get_contents(LOGS . 'error.log');
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 1/', $result);
+		$this->assertPattern('/2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 2$/', $result);
+		unlink(LOGS . 'error.log');
+	}
+
+/**
+ * Test logging with the error handler.
+ *
+ * @return void
+ */
+	function testLoggingWithErrorHandling() {
+		@unlink(LOGS . 'debug.log');
+		Configure::write('log', E_ALL & ~E_DEPRECATED);
+		Configure::write('debug', 0);
+
+		set_error_handler(array('CakeLog', 'handleError'));
+		$out .= '';
+
+		$result = file(LOGS . 'debug.log');
+		$this->assertEqual(count($result), 1);
+		$this->assertPattern(
+			'/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} Notice: Notice \(8\): Undefined variable:\s+out in \[.+ line \d+\]$/',
+			$result[0]
+		);
+		@unlink(LOGS . 'debug.log');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_session.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_session.test.php
new file mode 100644
index 000000000..b6bc12248
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_session.test.php
@@ -0,0 +1,508 @@
+<?php
+/**
+ * SessionTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('CakeSession')) {
+	App::import('Core', 'CakeSession');
+}
+
+/**
+ * CakeSessionTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CakeSessionTest extends CakeTestCase {
+
+/**
+ * Fixtures used in the SessionTest
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.session');
+
+/**
+ * startCase method
+ *
+ * @access public
+ * @return void
+ */
+	function startCase() {
+		// Make sure garbage colector will be called
+		$this->__gc_divisor = ini_get('session.gc_divisor');
+		ini_set('session.gc_divisor', '1');
+	}
+
+/**
+ * endCase method
+ *
+ * @access public
+ * @return void
+ */
+	function endCase() {
+		// Revert to the default setting
+		ini_set('session.gc_divisor', $this->__gc_divisor);
+	}
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Session =& new CakeSession();
+		$this->Session->start();
+		$this->Session->_checkValid();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+    function tearDown() {
+        unset($_SESSION);
+		session_destroy();
+    }
+
+/**
+ * testSessionPath
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionPath() {
+		$Session = new CakeSession('/index.php');
+		$this->assertEqual('/', $Session->path);
+
+		$Session = new CakeSession('/sub_dir/index.php');
+		$this->assertEqual('/sub_dir/', $Session->path);
+
+		$Session = new CakeSession('');
+		$this->assertEqual('/', $Session->path, 'Session path is empty, with "" as $base needs to be / %s');
+	}
+
+/**
+ * testCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testCheck() {
+		$this->Session->write('SessionTestCase', 'value');
+		$this->assertTrue($this->Session->check('SessionTestCase'));
+
+		$this->assertFalse($this->Session->check('NotExistingSessionTestCase'), false);
+	}
+
+/**
+ * testSimpleRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testSimpleRead() {
+		$this->Session->write('testing', '1,2,3');
+		$result = $this->Session->read('testing');
+		$this->assertEqual($result, '1,2,3');
+
+		$this->Session->write('testing', array('1' => 'one', '2' => 'two','3' => 'three'));
+		$result = $this->Session->read('testing.1');
+		$this->assertEqual($result, 'one');
+
+		$result = $this->Session->read('testing');
+		$this->assertEqual($result, array('1' => 'one', '2' => 'two', '3' => 'three'));
+
+		$result = $this->Session->read();
+		$this->assertTrue(isset($result['testing']));
+		$this->assertTrue(isset($result['Config']));
+		$this->assertTrue(isset($result['Config']['userAgent']));
+
+		$this->Session->write('This.is.a.deep.array.my.friend', 'value');
+		$result = $this->Session->read('This.is.a.deep.array.my.friend');
+		$this->assertEqual('value', $result);
+	}
+
+/**
+ * testId method
+ *
+ * @access public
+ * @return void
+ */
+	function testId() {
+		$expected = session_id();
+		$result = $this->Session->id();
+		$this->assertEqual($result, $expected);
+
+		$this->Session->id('MySessionId');
+		$result = $this->Session->id();
+		$this->assertEqual($result, 'MySessionId');
+	}
+
+/**
+ * testStarted method
+ *
+ * @access public
+ * @return void
+ */
+	function testStarted() {
+		$this->assertTrue($this->Session->started());
+
+		unset($_SESSION);
+		$_SESSION = null;
+		$this->assertFalse($this->Session->started());
+		$this->assertTrue($this->Session->start());
+
+		$session = new CakeSession(null, false);
+		$this->assertTrue($session->started());
+		unset($session);
+	}
+
+/**
+ * testError method
+ *
+ * @access public
+ * @return void
+ */
+	function testError() {
+		$this->Session->read('Does.not.exist');
+		$result = $this->Session->error();
+		$this->assertEqual($result, "Does.not.exist doesn't exist");
+
+		$this->Session->delete('Failing.delete');
+		$result = $this->Session->error();
+		$this->assertEqual($result, "Failing.delete doesn't exist");
+	}
+
+/**
+ * testDel method
+ *
+ * @access public
+ * @return void
+ */
+	function testDelete() {
+		$this->assertTrue($this->Session->write('Delete.me', 'Clearing out'));
+		$this->assertTrue($this->Session->delete('Delete.me'));
+		$this->assertFalse($this->Session->check('Delete.me'));
+		$this->assertTrue($this->Session->check('Delete'));
+
+		$this->assertTrue($this->Session->write('Clearing.sale', 'everything must go'));
+		$this->assertTrue($this->Session->delete('Clearing'));
+		$this->assertFalse($this->Session->check('Clearing.sale'));
+		$this->assertFalse($this->Session->check('Clearing'));
+	}
+
+/**
+ * testWatchVar method
+ *
+ * @access public
+ * @return void
+ */
+	function testWatchVar() {
+		$this->assertFalse($this->Session->watch(null));
+
+		$this->Session->write('Watching', "I'm watching you");
+		$this->Session->watch('Watching');
+		$this->expectError('Writing session key {Watching}: "They found us!"');
+		$this->Session->write('Watching', 'They found us!');
+
+		$this->expectError('Deleting session key {Watching}');
+		$this->Session->delete('Watching');
+
+		$this->assertFalse($this->Session->watch('Invalid.key'));
+	}
+
+/**
+ * testIgnore method
+ *
+ * @access public
+ * @return void
+ */
+	function testIgnore() {
+		$this->Session->write('Watching', "I'm watching you");
+		$this->Session->watch('Watching');
+		$this->Session->ignore('Watching');
+		$this->assertTrue($this->Session->write('Watching', 'They found us!'));
+	}
+
+/**
+ * testDestroy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDestroy() {
+		$this->Session->write('bulletProof', 'invicible');
+		$id = $this->Session->id();
+		$this->Session->destroy();
+		$this->assertFalse($this->Session->check('bulletProof'));
+		$this->assertNotEqual($id, $this->Session->id());
+		$this->assertTrue($this->Session->started());
+
+		$this->Session->cookieLifeTime = 'test';
+		$this->Session->destroy();
+		$this->assertNotEqual('test', $this->Session->cookieLifeTime);
+	}
+
+/**
+ * testCheckingSavedEmpty method
+ *
+ * @access public
+ * @return void
+ */
+	function testCheckingSavedEmpty() {
+		$this->assertTrue($this->Session->write('SessionTestCase', 0));
+		$this->assertTrue($this->Session->check('SessionTestCase'));
+
+		$this->assertTrue($this->Session->write('SessionTestCase', '0'));
+		$this->assertTrue($this->Session->check('SessionTestCase'));
+
+		$this->assertTrue($this->Session->write('SessionTestCase', false));
+		$this->assertTrue($this->Session->check('SessionTestCase'));
+
+		$this->assertTrue($this->Session->write('SessionTestCase', null));
+		$this->assertFalse($this->Session->check('SessionTestCase'));
+	}
+
+/**
+ * testCheckKeyWithSpaces method
+ *
+ * @access public
+ * @return void
+ */
+	function testCheckKeyWithSpaces() {
+		$this->assertTrue($this->Session->write('Session Test', "test"));
+		$this->assertEqual($this->Session->check('Session Test'), 'test');
+		$this->Session->delete('Session Test');
+
+		$this->assertTrue($this->Session->write('Session Test.Test Case', "test"));
+		$this->assertTrue($this->Session->check('Session Test.Test Case'));
+	}
+
+/**
+ * test key exploitation
+ *
+ * @return void
+ */
+	function testKeyExploit() {
+		$key = "a'] = 1; phpinfo(); \$_SESSION['a";
+		$result = $this->Session->write($key, 'haxored');
+		$this->assertTrue($result);
+
+		$result = $this->Session->read($key);
+		$this->assertEqual($result, 'haxored');
+	}
+
+/**
+ * testReadingSavedEmpty method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadingSavedEmpty() {
+		$this->Session->write('SessionTestCase', 0);
+		$this->assertEqual($this->Session->read('SessionTestCase'), 0);
+
+		$this->Session->write('SessionTestCase', '0');
+		$this->assertEqual($this->Session->read('SessionTestCase'), '0');
+		$this->assertFalse($this->Session->read('SessionTestCase') === 0);
+
+		$this->Session->write('SessionTestCase', false);
+		$this->assertFalse($this->Session->read('SessionTestCase'));
+
+		$this->Session->write('SessionTestCase', null);
+		$this->assertEqual($this->Session->read('SessionTestCase'), null);
+	}
+
+/**
+ * testCheckUserAgentFalse method
+ *
+ * @access public
+ * @return void
+ */
+	function testCheckUserAgentFalse() {
+		Configure::write('Session.checkAgent', false);
+		$this->Session->_userAgent = md5('http://randomdomainname.com' . Configure::read('Security.salt'));
+		$this->assertTrue($this->Session->valid());
+	}
+
+/**
+ * testCheckUserAgentTrue method
+ *
+ * @access public
+ * @return void
+ */
+	function testCheckUserAgentTrue() {
+		Configure::write('Session.checkAgent', true);
+		$this->Session->_userAgent = md5('http://randomdomainname.com' . Configure::read('Security.salt'));
+		$this->assertFalse($this->Session->valid());
+	}
+
+/**
+ * testReadAndWriteWithDatabaseStorage method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadAndWriteWithCakeStorage() {
+		unset($_SESSION);
+		session_destroy();
+		ini_set('session.save_handler', 'files');
+		Configure::write('Session.save', 'cake');
+		$this->setUp();
+
+		$this->Session->write('SessionTestCase', 0);
+		$this->assertEqual($this->Session->read('SessionTestCase'), 0);
+
+		$this->Session->write('SessionTestCase', '0');
+		$this->assertEqual($this->Session->read('SessionTestCase'), '0');
+		$this->assertFalse($this->Session->read('SessionTestCase') === 0);
+
+		$this->Session->write('SessionTestCase', false);
+		$this->assertFalse($this->Session->read('SessionTestCase'));
+
+		$this->Session->write('SessionTestCase', null);
+		$this->assertEqual($this->Session->read('SessionTestCase'), null);
+
+		$this->Session->write('SessionTestCase', 'This is a Test');
+		$this->assertEqual($this->Session->read('SessionTestCase'), 'This is a Test');
+
+		$this->Session->write('SessionTestCase', 'This is a Test');
+		$this->Session->write('SessionTestCase', 'This was updated');
+		$this->assertEqual($this->Session->read('SessionTestCase'), 'This was updated');
+
+		$this->Session->destroy();
+		$this->assertFalse($this->Session->read('SessionTestCase'));
+	}
+
+/**
+ * testReadAndWriteWithDatabaseStorage method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadAndWriteWithCacheStorage() {
+		unset($_SESSION);
+		session_destroy();
+		ini_set('session.save_handler', 'files');
+		Configure::write('Session.save', 'cache');
+		$this->setUp();
+
+		$this->Session->write('SessionTestCase', 0);
+		$this->assertEqual($this->Session->read('SessionTestCase'), 0);
+
+		$this->Session->write('SessionTestCase', '0');
+		$this->assertEqual($this->Session->read('SessionTestCase'), '0');
+		$this->assertFalse($this->Session->read('SessionTestCase') === 0);
+
+		$this->Session->write('SessionTestCase', false);
+		$this->assertFalse($this->Session->read('SessionTestCase'));
+
+		$this->Session->write('SessionTestCase', null);
+		$this->assertEqual($this->Session->read('SessionTestCase'), null);
+
+		$this->Session->write('SessionTestCase', 'This is a Test');
+		$this->assertEqual($this->Session->read('SessionTestCase'), 'This is a Test');
+
+		$this->Session->write('SessionTestCase', 'This is a Test');
+		$this->Session->write('SessionTestCase', 'This was updated');
+		$this->assertEqual($this->Session->read('SessionTestCase'), 'This was updated');
+
+		$this->Session->destroy();
+		$this->assertFalse($this->Session->read('SessionTestCase'));
+	}
+
+/**
+ * testReadAndWriteWithDatabaseStorage method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadAndWriteWithDatabaseStorage() {
+		unset($_SESSION);
+		session_destroy();
+		Configure::write('Session.table', 'sessions');
+		Configure::write('Session.model', 'Session');
+		Configure::write('Session.database', 'test_suite');
+		Configure::write('Session.save', 'database');
+		$this->setUp();
+
+		$this->Session->write('SessionTestCase', 0);
+		$this->assertEqual($this->Session->read('SessionTestCase'), 0);
+
+		$this->Session->write('SessionTestCase', '0');
+		$this->assertEqual($this->Session->read('SessionTestCase'), '0');
+		$this->assertFalse($this->Session->read('SessionTestCase') === 0);
+
+		$this->Session->write('SessionTestCase', false);
+		$this->assertFalse($this->Session->read('SessionTestCase'));
+
+		$this->Session->write('SessionTestCase', null);
+		$this->assertEqual($this->Session->read('SessionTestCase'), null);
+
+		$this->Session->write('SessionTestCase', 'This is a Test');
+		$this->assertEqual($this->Session->read('SessionTestCase'), 'This is a Test');
+
+        $this->Session->write('SessionTestCase', 'Some additional data');
+        $this->assertEqual($this->Session->read('SessionTestCase'), 'Some additional data');
+
+		$this->Session->destroy();
+		$this->assertFalse($this->Session->read('SessionTestCase'));
+		session_write_close();
+
+		unset($_SESSION);
+		ini_set('session.save_handler', 'files');
+		Configure::write('Session.save', 'php');
+		$this->setUp();
+	}
+
+/**
+ * testReadAndWriteWithDatabaseStorage method
+ *
+ * @access public
+ * @return void
+ */
+	function testDatabaseStorageEmptySessionId() {
+		unset($_SESSION);
+		session_destroy();
+		Configure::write('Session.table', 'sessions');
+		Configure::write('Session.model', 'Session');
+		Configure::write('Session.database', 'test_suite');
+		Configure::write('Session.save', 'database');
+		$this->setUp();
+		$id = $this->Session->id();
+
+		$this->Session->id = '';
+		session_id('');
+
+		$this->Session->write('SessionTestCase', 'This is a Test');
+		$this->assertEqual($this->Session->read('SessionTestCase'), 'This is a Test');
+
+		session_write_close();
+
+		unset($_SESSION);
+		ini_set('session.save_handler', 'files');
+		Configure::write('Session.save', 'php');
+		session_id($id);
+		$this->setUp();
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_socket.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_socket.test.php
new file mode 100644
index 000000000..152c9e0fd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_socket.test.php
@@ -0,0 +1,192 @@
+<?php
+/**
+ * SocketTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'CakeSocket');
+
+/**
+ * SocketTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CakeSocketTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Socket = new CakeSocket();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Socket);
+	}
+
+/**
+ * testConstruct method
+ *
+ * @access public
+ * @return void
+ */
+	function testConstruct() {
+		$this->Socket->__construct();
+		$baseConfig = $this->Socket->_baseConfig;
+		$this->assertIdentical($baseConfig, array(
+			'persistent'	=> false,
+			'host'			=> 'localhost',
+			'protocol'		=> 'tcp',
+			'port'			=> 80,
+			'timeout'		=> 30
+		));
+
+		$this->Socket->reset();
+		$this->Socket->__construct(array('host' => 'foo-bar'));
+		$baseConfig['host'] = 'foo-bar';
+		$baseConfig['protocol'] = getprotobyname($baseConfig['protocol']);
+		$this->assertIdentical($this->Socket->config, $baseConfig);
+
+		$this->Socket = new CakeSocket(array('host' => 'www.cakephp.org', 'port' => 23, 'protocol' => 'udp'));
+		$baseConfig = $this->Socket->_baseConfig;
+
+		$baseConfig['host'] = 'www.cakephp.org';
+		$baseConfig['port'] = 23;
+		$baseConfig['protocol'] = 17;
+
+		$this->assertIdentical($this->Socket->config, $baseConfig);
+	}
+
+/**
+ * testSocketConnection method
+ *
+ * @access public
+ * @return void
+ */
+	function testSocketConnection() {
+		$this->assertFalse($this->Socket->connected);
+		$this->Socket->disconnect();
+		$this->assertFalse($this->Socket->connected);
+		$this->Socket->connect();
+		$this->assertTrue($this->Socket->connected);
+		$this->Socket->connect();
+		$this->assertTrue($this->Socket->connected);
+
+		$this->Socket->disconnect();
+		$config = array('persistent' => true);
+		$this->Socket = new CakeSocket($config);
+		$this->Socket->connect();
+		$this->assertTrue($this->Socket->connected);
+	}
+
+/**
+ * testSocketHost method
+ *
+ * @access public
+ * @return void
+ */
+	function testSocketHost() {
+		$this->Socket = new CakeSocket();
+		$this->Socket->connect();
+		$this->assertEqual($this->Socket->address(), '127.0.0.1');
+		$this->assertEqual(gethostbyaddr('127.0.0.1'), $this->Socket->host());
+		$this->assertEqual($this->Socket->lastError(), null);
+		$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
+
+		$this->Socket = new CakeSocket(array('host' => '127.0.0.1'));
+		$this->Socket->connect();
+		$this->assertEqual($this->Socket->address(), '127.0.0.1');
+		$this->assertEqual(gethostbyaddr('127.0.0.1'), $this->Socket->host());
+		$this->assertEqual($this->Socket->lastError(), null);
+		$this->assertTrue(in_array('127.0.0.1', $this->Socket->addresses()));
+	}
+
+/**
+ * testSocketWriting method
+ *
+ * @access public
+ * @return void
+ */
+	function testSocketWriting() {
+		$request = "GET / HTTP/1.1\r\nConnection: close\r\n\r\n";
+		$this->assertTrue($this->Socket->write($request));
+	}
+
+/**
+ * testSocketReading method
+ *
+ * @access public
+ * @return void
+ */
+	function testSocketReading() {
+		$this->Socket = new CakeSocket(array('timeout' => 5));
+		$this->Socket->connect();
+		$this->assertEqual($this->Socket->read(26), null);
+
+		$config = array('host' => 'www.cakephp.org', 'timeout' => 1);
+		$this->Socket = new CakeSocket($config);
+		$this->assertTrue($this->Socket->connect());
+		$this->assertFalse($this->Socket->read(1024 * 1024));
+		$this->assertEqual($this->Socket->lastError(), '2: ' . __('Connection timed out', true));
+
+		$config = array('host' => 'www.cakephp.org', 'timeout' => 30);
+		$this->Socket = new CakeSocket($config);
+		$this->assertTrue($this->Socket->connect());
+		$this->assertEqual($this->Socket->read(26), null);
+		$this->assertEqual($this->Socket->lastError(), null);
+	}
+
+/**
+ * testLastError method
+ *
+ * @access public
+ * @return void
+ */
+	function testLastError() {
+		$this->Socket = new CakeSocket();
+		$this->Socket->setLastError(4, 'some error here');
+		$this->assertEqual($this->Socket->lastError(), '4: some error here');
+	}
+
+/**
+ * testReset method
+ *
+ * @access public
+ * @return void
+ */
+	function testReset() {
+		$config = array(
+			'persistent'	=> true,
+			'host'			=> '127.0.0.1',
+			'protocol'		=> 'udp',
+			'port'			=> 80,
+			'timeout'		=> 20
+		);
+		$anotherSocket = new CakeSocket($config);
+		$anotherSocket->reset();
+		$this->assertEqual(array(), $anotherSocket->config);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_case.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_case.test.php
new file mode 100644
index 000000000..e9f885fab
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_case.test.php
@@ -0,0 +1,502 @@
+<?php
+/**
+ * CakeTestCaseTest file
+ *
+ * Test Case for CakeTestCase class
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.4487
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'CakeTestCase');
+
+if (!class_exists('AppController')) {
+	require_once LIBS . 'controller' . DS . 'app_controller.php';
+} elseif (!defined('APP_CONTROLLER_EXISTS')) {
+	define('APP_CONTROLLER_EXISTS', true);
+}
+
+Mock::generate('CakeHtmlReporter');
+Mock::generate('CakeTestCase', 'CakeDispatcherMockTestCase');
+
+SimpleTest::ignore('SubjectCakeTestCase');
+SimpleTest::ignore('CakeDispatcherMockTestCase');
+
+/**
+ * SubjectCakeTestCase
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class SubjectCakeTestCase extends CakeTestCase {
+
+/**
+ * Feed a Mocked Reporter to the subject case
+ * prevents its pass/fails from affecting the real test
+ *
+ * @param string $reporter
+ * @access public
+ * @return void
+ */
+	function setReporter(&$reporter) {
+		$this->_reporter = &$reporter;
+	}
+
+/**
+ * testDummy method
+ *
+ * @return void
+ * @access public
+ */
+	function testDummy() {
+	}
+}
+
+/**
+ * CakeTestCaseTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CakeTestCaseTest extends CakeTestCase {
+
+/**
+ * setUp
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_debug = Configure::read('debug');
+		$this->Case =& new SubjectCakeTestCase();
+		$reporter =& new MockCakeHtmlReporter();
+		$this->Case->setReporter($reporter);
+		$this->Reporter = $reporter;
+	}
+
+/**
+ * tearDown
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('debug', $this->_debug);
+		unset($this->Case);
+		unset($this->Reporter);
+	}
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * testAssertGoodTags
+ *
+ * @access public
+ * @return void
+ */
+	function testAssertGoodTags() {
+		$this->Reporter->expectAtLeastOnce('paintPass');
+		$this->Reporter->expectNever('paintFail');
+
+		$input = '<p>Text</p>';
+		$pattern = array(
+			'<p',
+			'Text',
+			'/p',
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern));
+
+		$input = '<a href="/test.html" class="active">My link</a>';
+		$pattern = array(
+			'a' => array('href' => '/test.html', 'class' => 'active'),
+			'My link',
+			'/a'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern));
+
+		$pattern = array(
+			'a' => array('class' => 'active', 'href' => '/test.html'),
+			'My link',
+			'/a'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern), 'Attributes in wrong order. %s');
+
+		$input = "<a    href=\"/test.html\"\t\n\tclass=\"active\"\tid=\"primary\">\t<span>My link</span></a>";
+		$pattern = array(
+			'a' => array('id' => 'primary', 'href' => '/test.html', 'class' => 'active'),
+			'<span',
+			'My link',
+			'/span',
+			'/a'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern), 'Whitespace consumption %s');
+
+		$input = '<p class="info"><a href="/test.html" class="active"><strong onClick="alert(\'hey\');">My link</strong></a></p>';
+		$pattern = array(
+			'p' => array('class' => 'info'),
+			'a' => array('class' => 'active', 'href' => '/test.html' ),
+			'strong' => array('onClick' => 'alert(\'hey\');'),
+			'My link',
+			'/strong',
+			'/a',
+			'/p'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern));
+	}
+
+/**
+ * test that assertTags knows how to handle correct quoting.
+ *
+ * @return void
+ */
+	function testAssertTagsQuotes() {
+		$input = '<a href="/test.html" class="active">My link</a>';
+		$pattern = array(
+			'a' => array('href' => '/test.html', 'class' => 'active'),
+			'My link',
+			'/a'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern), 'Double quoted attributes %s');
+
+		$input = "<a href='/test.html' class='active'>My link</a>";
+		$pattern = array(
+			'a' => array('href' => '/test.html', 'class' => 'active'),
+			'My link',
+			'/a'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern), 'Single quoted attributes %s');
+
+		$input = "<a href='/test.html' class='active'>My link</a>";
+		$pattern = array(
+			'a' => array('href' => 'preg:/.*\.html/', 'class' => 'active'),
+			'My link',
+			'/a'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern), 'Single quoted attributes %s');
+	}
+
+/**
+ * testNumericValuesInExpectationForAssertTags
+ *
+ * @access public
+ * @return void
+ */
+	function testNumericValuesInExpectationForAssertTags() {
+		$value = 220985;
+
+		$input = '<p><strong>' . $value . '</strong></p>';
+		$pattern = array(
+			'<p',
+				'<strong',
+					$value,
+				'/strong',
+			'/p'
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern));
+
+		$input = '<p><strong>' . $value . '</strong></p><p><strong>' . $value . '</strong></p>';
+		$pattern = array(
+			'<p',
+				'<strong',
+					$value,
+				'/strong',
+			'/p',
+			'<p',
+				'<strong',
+					$value,
+				'/strong',
+			'/p',
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern));
+
+		$input = '<p><strong>' . $value . '</strong></p><p id="' . $value . '"><strong>' . $value . '</strong></p>';
+		$pattern = array(
+			'<p',
+				'<strong',
+					$value,
+				'/strong',
+			'/p',
+			'p' => array('id' => $value),
+				'<strong',
+					$value,
+				'/strong',
+			'/p',
+		);
+		$this->assertTrue($this->Case->assertTags($input, $pattern));
+	}
+
+ /**
+ * testBadAssertTags
+ *
+ * @access public
+ * @return void
+ */
+	function testBadAssertTags() {
+		$this->Reporter->expectAtLeastOnce('paintFail');
+		$this->Reporter->expectNever('paintPass');
+
+		$input = '<a href="/test.html" class="active">My link</a>';
+		$pattern = array(
+			'a' => array('hRef' => '/test.html', 'clAss' => 'active'),
+			'My link',
+			'/a'
+		);
+		$this->assertFalse($this->Case->assertTags($input, $pattern));
+
+		$input = '<a href="/test.html" class="active">My link</a>';
+		$pattern = array(
+			'<a' => array('href' => '/test.html', 'class' => 'active'),
+			'My link',
+			'/a'
+		);
+		$this->assertFalse($this->Case->assertTags($input, $pattern));
+	}
+
+/**
+ * testBefore
+ *
+ * @access public
+ * @return void
+ */
+	function testBefore() {
+		$this->Case->before('testDummy');
+		$this->assertFalse(isset($this->Case->db));
+
+		$this->Case->fixtures = array('core.post');
+		$this->Case->before('start');
+		$this->assertTrue(isset($this->Case->db));
+		$this->assertTrue(isset($this->Case->_fixtures['core.post']));
+		$this->assertTrue(is_a($this->Case->_fixtures['core.post'], 'CakeTestFixture'));
+		$this->assertEqual($this->Case->_fixtureClassMap['Post'], 'core.post');
+	}
+
+/**
+ * testAfter
+ *
+ * @access public
+ * @return void
+ */
+	function testAfter() {
+		$this->Case->after('testDummy');
+		$this->assertFalse($this->Case->__truncated);
+
+		$this->Case->fixtures = array('core.post');
+		$this->Case->before('start');
+		$this->Case->start();
+		$this->Case->after('testDummy');
+		$this->assertTrue($this->Case->__truncated);
+	}
+
+/**
+ * testLoadFixtures
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadFixtures() {
+		$this->Case->fixtures = array('core.post');
+		$this->Case->autoFixtures = false;
+		$this->Case->before('start');
+		$this->expectError();
+		$this->Case->loadFixtures('Wrong!');
+		$this->Case->end();
+	}
+
+/**
+ * testGetTests Method
+ *
+ * @return void
+ * @access public
+ */
+	function testGetTests() {
+		$result = $this->Case->getTests();
+		$this->assertEqual(array_slice($result, 0, 2), array('start', 'startCase'));
+		$this->assertEqual(array_slice($result, -2), array('endCase', 'end'));
+	}
+
+/**
+ * TestTestAction
+ *
+ * @access public
+ * @return void
+ */
+	function testTestAction() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+		), true);
+
+		$result = $this->Case->testAction('/tests_apps/index', array('return' => 'view'));
+		$this->assertPattern('/^\s*This is the TestsAppsController index view\s*$/i', $result);
+
+		$result = $this->Case->testAction('/tests_apps/index', array('return' => 'contents'));
+		$this->assertPattern('/\bThis is the TestsAppsController index view\b/i', $result);
+		$this->assertPattern('/<html/', $result);
+		$this->assertPattern('/<\/html>/', $result);
+
+		$result = $this->Case->testAction('/tests_apps/some_method', array('return' => 'result'));
+		$this->assertEqual($result, 5);
+
+		$result = $this->Case->testAction('/tests_apps/set_action', array('return' => 'vars'));
+		$this->assertEqual($result, array('var' => 'string'));
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$fixture =& new PostFixture();
+		$fixture->create($db);
+
+		$result = $this->Case->testAction('/tests_apps_posts/add', array('return' => 'vars'));
+		$this->assertTrue(array_key_exists('posts', $result));
+		$this->assertEqual(count($result['posts']), 1);
+
+		$result = $this->Case->testAction('/tests_apps_posts/url_var/var1:value1/var2:val2', array(
+			'return' => 'vars',
+			'method' => 'get',
+		));
+		$this->assertTrue(isset($result['params']['url']['url']));
+		$this->assertEqual(array_keys($result['params']['named']), array('var1', 'var2'));
+
+		$result = $this->Case->testAction('/tests_apps_posts/url_var/gogo/val2', array(
+			'return' => 'vars',
+			'method' => 'get',
+		));
+		$this->assertEqual($result['params']['pass'], array('gogo', 'val2'));
+
+
+		$result = $this->Case->testAction('/tests_apps_posts/url_var', array(
+			'return' => 'vars',
+			'method' => 'get',
+			'data' => array(
+				'red' => 'health',
+				'blue' => 'mana'
+			)
+		));
+		$this->assertTrue(isset($result['params']['url']['red']));
+		$this->assertTrue(isset($result['params']['url']['blue']));
+		$this->assertTrue(isset($result['params']['url']['url']));
+
+		$result = $this->Case->testAction('/tests_apps_posts/post_var', array(
+			'return' => 'vars',
+			'method' => 'post',
+			'data' => array(
+				'name' => 'is jonas',
+				'pork' => 'and beans',
+			)
+		));
+		$this->assertEqual(array_keys($result['data']), array('name', 'pork'));
+		$fixture->drop($db);
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$_backPrefix = $db->config['prefix'];
+		$db->config['prefix'] = 'cake_testaction_test_suite_';
+
+		$config = $db->config;
+		$config['prefix'] = 'cake_testcase_test_';
+
+		ConnectionManager::create('cake_test_case', $config);
+		$db2 =& ConnectionManager::getDataSource('cake_test_case');
+
+		$fixture =& new PostFixture($db2);
+		$fixture->create($db2);
+		$fixture->insert($db2);
+
+		$result = $this->Case->testAction('/tests_apps_posts/fixtured', array(
+			'return' => 'vars',
+			'fixturize' => true,
+			'connection' => 'cake_test_case',
+		));
+		$this->assertTrue(isset($result['posts']));
+		$this->assertEqual(count($result['posts']), 3);
+		$tables = $db2->listSources();
+		$this->assertFalse(in_array('cake_testaction_test_suite_posts', $tables));
+
+		$fixture->drop($db2);
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+
+		//test that drop tables behaves as exepected with testAction
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$_backPrefix = $db->config['prefix'];
+		$db->config['prefix'] = 'cake_testaction_test_suite_';
+
+		$config = $db->config;
+		$config['prefix'] = 'cake_testcase_test_';
+
+		ConnectionManager::create('cake_test_case', $config);
+		$db =& ConnectionManager::getDataSource('cake_test_case');
+		$fixture =& new PostFixture($db);
+		$fixture->create($db);
+		$fixture->insert($db);
+
+		$this->Case->dropTables = false;
+		$result = $this->Case->testAction('/tests_apps_posts/fixtured', array(
+			'return' => 'vars',
+			'fixturize' => true,
+			'connection' => 'cake_test_case',
+		));
+
+		$tables = $db->listSources();
+		$this->assertTrue(in_array('cake_testaction_test_suite_posts', $tables));
+
+		$fixture->drop($db);
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$db->config['prefix'] = $_backPrefix;
+		$fixture->drop($db);
+	}
+
+/**
+ * testSkipIf
+ *
+ * @return void
+ */
+	function testSkipIf() {
+		$this->assertTrue($this->Case->skipIf(true));
+		$this->assertFalse($this->Case->skipIf(false));
+	}
+
+/**
+ * testTestDispatcher
+ *
+ * @access public
+ * @return void
+ */
+	function testTestDispatcher() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+		), true);
+
+		$Dispatcher =& new CakeTestDispatcher();
+		$Case =& new CakeDispatcherMockTestCase();
+
+		$Case->expectOnce('startController');
+		$Case->expectOnce('endController');
+
+		$Dispatcher->testCase($Case);
+		$this->assertTrue(isset($Dispatcher->testCase));
+
+		$return = $Dispatcher->dispatch('/tests_apps/index', array('autoRender' => 0, 'return' => 1, 'requested' => 1));
+	}
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_fixture.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_fixture.test.php
new file mode 100644
index 000000000..40bacc56c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/cake_test_fixture.test.php
@@ -0,0 +1,504 @@
+<?php
+/**
+ * CakeTestFixture file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Datasource', 'DboSource', false);
+
+/**
+ * CakeTestFixtureTestFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.cases.libs
+ */
+class CakeTestFixtureTestFixture extends CakeTestFixture {
+
+/**
+ * name Property
+ *
+ * @var string
+ */
+	var $name = 'FixtureTest';
+
+/**
+ * table property
+ *
+ * @var string
+ */
+	var $table = 'fixture_tests';
+
+/**
+ * Fields array
+ *
+ * @var array
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer',  'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => '255'),
+		'created' => array('type' => 'datetime')
+	);
+
+/**
+ * Records property
+ *
+ * @var array
+ */
+	var $records = array(
+		array('name' => 'Gandalf', 'created' => '2009-04-28 19:20:00'),
+		array('name' => 'Captain Picard', 'created' => '2009-04-28 19:20:00'),
+		array('name' => 'Chewbacca', 'created' => '2009-04-28 19:20:00')
+	);
+}
+
+/**
+ * StringFieldsTestFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.cases.libs
+ */
+class StringsTestFixture extends CakeTestFixture {
+
+/**
+ * name Property
+ *
+ * @var string
+ */
+	var $name = 'Strings';
+
+/**
+ * table property
+ *
+ * @var string
+ */
+	var $table = 'strings';
+
+/**
+ * Fields array
+ *
+ * @var array
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer',  'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => '255'),
+		'email' => array('type' => 'string', 'length' => '255'),
+        'age' => array('type' => 'integer', 'default' => 10)
+	);
+
+/**
+ * Records property
+ *
+ * @var array
+ */
+	var $records = array(
+        array('name' => 'John Doe', 'email' => 'john.doe@email.com', 'age' => 20),
+        array('email' => 'jane.doe@email.com', 'name' => 'Jane Doe', 'age' => 30),
+        array('name' => 'Mark Doe', 'email' => 'mark.doe@email.com')
+	);
+}
+
+
+/**
+ * CakeTestFixtureImportFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.cases.libs
+ */
+class CakeTestFixtureImportFixture extends CakeTestFixture {
+
+/**
+ * Name property
+ *
+ * @var string
+ */
+	var $name = 'ImportFixture';
+
+/**
+ * Import property
+ *
+ * @var mixed
+ */
+	var $import = array('table' => 'fixture_tests', 'connection' => 'test_suite');
+}
+
+/**
+ * CakeTestFixtureDefaultImportFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.cases.libs
+ */
+class CakeTestFixtureDefaultImportFixture extends CakeTestFixture {
+
+/**
+ * Name property
+ *
+ * @var string
+ */
+	var $name = 'ImportFixture';
+}
+
+/**
+ * FixtureImportTestModel class
+ *
+ * @package       default
+ * @subpackage    cake.cake.tests.cases.libs.
+ */
+class FixtureImportTestModel extends Model {
+	var $name = 'FixtureImport';
+	var $useTable = 'fixture_tests';
+	var $useDbConfig = 'test_suite';
+}
+
+class FixturePrefixTest extends Model {
+	var $name = 'FixturePrefix';
+	var $useTable = '_tests';
+	var $tablePrefix = 'fixture';
+	var $useDbConfig = 'test_suite';
+}
+
+Mock::generate('DboSource', 'BaseFixtureMockDboSource');
+
+class FixtureMockDboSource extends BaseFixtureMockDboSource {
+	var $insertMulti;
+
+	function value($string) {
+		return is_string($string) ? '\'' . $string . '\'' : $string;
+	}
+
+	function insertMulti($table, $fields, $values) {
+		$this->insertMulti = compact('table', 'fields', 'values');
+		return true;
+	}
+}
+
+/**
+ * Test case for CakeTestFixture
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.cases.libs
+ */
+class CakeTestFixtureTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->criticDb =& new FixtureMockDboSource();
+		$this->criticDb->fullDebug = true;
+	}
+
+/**
+ * tearDown
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->criticDb);
+	}
+
+/**
+ * testInit
+ *
+ * @access public
+ * @return void
+ */
+	function testInit() {
+		$Fixture =& new CakeTestFixtureTestFixture();
+		unset($Fixture->table);
+		$Fixture->init();
+		$this->assertEqual($Fixture->table, 'fixture_tests');
+		$this->assertEqual($Fixture->primaryKey, 'id');
+
+		$Fixture =& new CakeTestFixtureTestFixture();
+		$Fixture->primaryKey = 'my_random_key';
+		$Fixture->init();
+		$this->assertEqual($Fixture->primaryKey, 'my_random_key');
+	}
+
+/**
+ * test that init() correctly sets the fixture table when the connection or model have prefixes defined.
+ *
+ * @return void
+ */
+	function testInitDbPrefix() {
+		$this->_initDb();
+		$Source =& new CakeTestFixtureTestFixture();
+		$Source->create($this->db);
+		$Source->insert($this->db);
+
+		$Fixture =& new CakeTestFixtureImportFixture();
+		$expected = array('id', 'name', 'created');
+		$this->assertEqual(array_keys($Fixture->fields), $expected);
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$config = $db->config;
+		$config['prefix'] = 'fixture_test_suite_';
+		ConnectionManager::create('fixture_test_suite', $config);
+
+		$Fixture->fields = $Fixture->records = null;
+		$Fixture->import = array('table' => 'fixture_tests', 'connection' => 'test_suite', 'records' => true);
+		$Fixture->init();
+		$this->assertEqual(count($Fixture->records), count($Source->records));
+
+		$Fixture =& new CakeTestFixtureImportFixture();
+		$Fixture->fields = $Fixture->records = $Fixture->table = null;
+		$Fixture->import = array('model' => 'FixtureImportTestModel', 'connection' => 'test_suite');
+		$Fixture->init();
+		$this->assertEqual(array_keys($Fixture->fields), array('id', 'name', 'created'));
+		$this->assertEqual($Fixture->table, 'fixture_tests');
+
+		$keys = array_flip(ClassRegistry::keys());
+		$this->assertFalse(array_key_exists('fixtureimporttestmodel', $keys));
+
+		$Source->drop($this->db);
+	}
+
+/**
+ * test that fixtures don't duplicate the test db prefix.
+ *
+ * @return void
+ */
+	function testInitDbPrefixDuplication() {
+		$this->_initDb();
+		$backPrefix = $this->db->config['prefix'];
+		$this->db->config['prefix'] = 'cake_fixture_test_';
+
+		$Source =& new CakeTestFixtureTestFixture();
+		$Source->create($this->db);
+		$Source->insert($this->db);
+
+		$Fixture =& new CakeTestFixtureImportFixture();
+		$Fixture->fields = $Fixture->records = $Fixture->table = null;
+		$Fixture->import = array('model' => 'FixtureImportTestModel', 'connection' => 'test_suite');
+
+		$Fixture->init();
+		$this->assertEqual(array_keys($Fixture->fields), array('id', 'name', 'created'));
+		$this->assertEqual($Fixture->table, 'fixture_tests');
+
+		$Source->drop($this->db);
+		$this->db->config['prefix'] = $backPrefix;
+	}
+
+/**
+ * test init with a model that has a tablePrefix declared.
+ *
+ * @return void
+ */
+	function testInitModelTablePrefix() {
+		$this->_initDb();
+		$hasPrefix = !empty($this->db->config['prefix']);
+		if ($this->skipIf($hasPrefix, 'Cannot run this test, you have a database connection prefix.')) {
+			return;
+		}
+		$Source =& new CakeTestFixtureTestFixture();
+		$Source->create($this->db);
+		$Source->insert($this->db);
+
+		$Fixture =& new CakeTestFixtureImportFixture();
+		unset($Fixture->table);
+		$Fixture->fields = $Fixture->records = null;
+		$Fixture->import = array('model' => 'FixturePrefixTest', 'connection' => 'test_suite', 'records' => false);
+		$Fixture->init();
+		$this->assertEqual($Fixture->table, 'fixture_tests');
+
+		$keys = array_flip(ClassRegistry::keys());
+		$this->assertFalse(array_key_exists('fixtureimporttestmodel', $keys));
+
+		$Source->drop($this->db);
+	}
+
+/**
+ * testImport
+ *
+ * @access public
+ * @return void
+ */
+	function testImport() {
+		$this->_initDb();
+
+		$defaultDb =& ConnectionManager::getDataSource('default');
+		$testSuiteDb =& ConnectionManager::getDataSource('test_suite');
+		$defaultConfig = $defaultDb->config;
+		$testSuiteConfig = $testSuiteDb->config;
+		ConnectionManager::create('new_test_suite', array_merge($testSuiteConfig, array('prefix' => 'new_' . $testSuiteConfig['prefix'])));
+		$newTestSuiteDb =& ConnectionManager::getDataSource('new_test_suite');
+
+		$Source =& new CakeTestFixtureTestFixture();
+		$Source->create($newTestSuiteDb);
+		$Source->insert($newTestSuiteDb);
+
+		$defaultDb->config = $newTestSuiteDb->config;
+
+		$Fixture =& new CakeTestFixtureDefaultImportFixture();
+		$Fixture->fields = $Fixture->records = null;
+		$Fixture->import = array('model' => 'FixtureImportTestModel', 'connection' => 'new_test_suite');
+		$Fixture->init();
+		$this->assertEqual(array_keys($Fixture->fields), array('id', 'name', 'created'));
+
+		$defaultDb->config = $defaultConfig;
+
+		$keys = array_flip(ClassRegistry::keys());
+		$this->assertFalse(array_key_exists('fixtureimporttestmodel', $keys));
+
+		$Source->drop($newTestSuiteDb);
+	}
+
+/**
+ * test that importing with records works.  Make sure to try with postgres as its
+ * handling of aliases is a workaround at best.
+ *
+ * @return void
+ */
+	function testImportWithRecords() {
+		$this->_initDb();
+
+		$defaultDb =& ConnectionManager::getDataSource('default');
+		$testSuiteDb =& ConnectionManager::getDataSource('test_suite');
+		$defaultConfig = $defaultDb->config;
+		$testSuiteConfig = $testSuiteDb->config;
+		ConnectionManager::create('new_test_suite', array_merge($testSuiteConfig, array('prefix' => 'new_' . $testSuiteConfig['prefix'])));
+		$newTestSuiteDb =& ConnectionManager::getDataSource('new_test_suite');
+
+		$Source =& new CakeTestFixtureTestFixture();
+		$Source->create($newTestSuiteDb);
+		$Source->insert($newTestSuiteDb);
+
+		$defaultDb->config = $newTestSuiteDb->config;
+
+		$Fixture =& new CakeTestFixtureDefaultImportFixture();
+		$Fixture->fields = $Fixture->records = null;
+		$Fixture->import = array(
+			'model' => 'FixtureImportTestModel', 'connection' => 'new_test_suite', 'records' => true
+		);
+		$Fixture->init();
+		$this->assertEqual(array_keys($Fixture->fields), array('id', 'name', 'created'));
+		$this->assertFalse(empty($Fixture->records[0]), 'No records loaded on importing fixture.');
+		$this->assertTrue(isset($Fixture->records[0]['name']), 'No name loaded for first record');
+
+		$defaultDb->config = $defaultConfig;
+
+		$Source->drop($newTestSuiteDb);
+	}
+
+/**
+ * test create method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreate() {
+		$Fixture =& new CakeTestFixtureTestFixture();
+		$this->criticDb->expectAtLeastOnce('execute');
+		$this->criticDb->expectAtLeastOnce('createSchema');
+		$return = $Fixture->create($this->criticDb);
+		$this->assertTrue($this->criticDb->fullDebug);
+		$this->assertTrue($return);
+
+		unset($Fixture->fields);
+		$return = $Fixture->create($this->criticDb);
+		$this->assertFalse($return);
+	}
+
+/**
+ * test the insert method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsert() {
+		$Fixture =& new CakeTestFixtureTestFixture();
+
+		$this->criticDb->insertMulti = array();
+		$return = $Fixture->insert($this->criticDb);
+		$this->assertTrue(!empty($this->criticDb->insertMulti));
+		$this->assertTrue($this->criticDb->fullDebug);
+		$this->assertTrue($return);
+		$this->assertEqual('fixture_tests', $this->criticDb->insertMulti['table']);
+		$this->assertEqual(array('name', 'created'), $this->criticDb->insertMulti['fields']);
+		$expected = array(
+			'(\'Gandalf\', \'2009-04-28 19:20:00\')',
+			'(\'Captain Picard\', \'2009-04-28 19:20:00\')',
+			'(\'Chewbacca\', \'2009-04-28 19:20:00\')'
+		);
+		$this->assertEqual($expected, $this->criticDb->insertMulti['values']);
+	}
+
+/**
+ * test the insert method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsertStrings() {
+		$Fixture =& new StringsTestFixture();
+
+		$this->criticDb->insertMulti = array();
+		$return = $Fixture->insert($this->criticDb);
+		$this->assertTrue(!empty($this->criticDb->insertMulti));
+		$this->assertTrue($this->criticDb->fullDebug);
+		$this->assertTrue($return);
+		$this->assertEqual('strings', $this->criticDb->insertMulti['table']);
+		$this->assertEqual(array('name', 'email', 'age'), $this->criticDb->insertMulti['fields']);
+		$expected = array(
+			'(\'John Doe\', \'john.doe@email.com\', 20)',
+			'(\'Jane Doe\', \'jane.doe@email.com\', 30)',
+			'(\'Mark Doe\', \'mark.doe@email.com\', NULL)',
+		);
+		$this->assertEqual($expected, $this->criticDb->insertMulti['values']);
+	}
+
+/**
+ * Test the drop method
+ *
+ * @access public
+ * @return void
+ */
+	function testDrop() {
+		$Fixture =& new CakeTestFixtureTestFixture();
+		$this->criticDb->setReturnValueAt(0, 'execute', true);
+		$this->criticDb->expectAtLeastOnce('execute');
+		$this->criticDb->expectAtLeastOnce('dropSchema');
+
+		$return = $Fixture->drop($this->criticDb);
+		$this->assertTrue($this->criticDb->fullDebug);
+		$this->assertTrue($return);
+
+		$this->criticDb->setReturnValueAt(1, 'execute', false);
+		$return = $Fixture->drop($this->criticDb);
+		$this->assertFalse($return);
+
+		unset($Fixture->fields);
+		$return = $Fixture->drop($this->criticDb);
+		$this->assertFalse($return);
+	}
+
+/**
+ * Test the truncate method.
+ *
+ * @access public
+ * @return void
+ */
+	function testTruncate() {
+		$Fixture =& new CakeTestFixtureTestFixture();
+		$this->criticDb->expectAtLeastOnce('truncate');
+		$Fixture->truncate($this->criticDb);
+		$this->assertTrue($this->criticDb->fullDebug);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/class_registry.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/class_registry.test.php
new file mode 100644
index 000000000..252c840e8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/class_registry.test.php
@@ -0,0 +1,325 @@
+<?php
+/**
+ * ClassRegistryTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'ClassRegistry');
+
+/**
+ * ClassRegisterModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ClassRegisterModel extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+}
+
+/**
+ * RegisterArticle class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RegisterArticle extends ClassRegisterModel {
+
+/**
+ * name property
+ *
+ * @var string 'RegisterArticle'
+ * @access public
+ */
+	var $name = 'RegisterArticle';
+}
+
+/**
+ * RegisterArticleFeatured class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RegisterArticleFeatured extends ClassRegisterModel {
+
+/**
+ * name property
+ *
+ * @var string 'RegisterArticleFeatured'
+ * @access public
+ */
+	var $name = 'RegisterArticleFeatured';
+}
+
+/**
+ * RegisterArticleTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RegisterArticleTag extends ClassRegisterModel {
+
+/**
+ * name property
+ *
+ * @var string 'RegisterArticleTag'
+ * @access public
+ */
+	var $name = 'RegisterArticleTag';
+}
+
+/**
+ * RegistryPluginAppModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RegistryPluginAppModel extends ClassRegisterModel {
+
+/**
+ * tablePrefix property
+ *
+ * @var string 'something_'
+ * @access public
+ */
+	var $tablePrefix = 'something_';
+}
+
+/**
+ * TestRegistryPluginModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class TestRegistryPluginModel extends RegistryPluginAppModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestRegistryPluginModel'
+ * @access public
+ */
+	var $name = 'TestRegistryPluginModel';
+}
+
+/**
+ * RegisterCategory class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RegisterCategory extends ClassRegisterModel {
+
+/**
+ * name property
+ *
+ * @var string 'RegisterCategory'
+ * @access public
+ */
+	var $name = 'RegisterCategory';
+}
+
+/**
+ * ClassRegistryTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ClassRegistryTest extends CakeTestCase {
+
+/**
+ * testAddModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddModel() {
+		if (PHP5) {
+			$Tag = ClassRegistry::init('RegisterArticleTag');
+		} else {
+			$Tag =& ClassRegistry::init('RegisterArticleTag');
+		}
+		$this->assertTrue(is_a($Tag, 'RegisterArticleTag'));
+
+		$TagCopy = ClassRegistry::isKeySet('RegisterArticleTag');
+		$this->assertTrue($TagCopy);
+
+		$Tag->name = 'SomeNewName';
+
+		if (PHP5) {
+			$TagCopy = ClassRegistry::getObject('RegisterArticleTag');
+		} else {
+			$TagCopy =& ClassRegistry::getObject('RegisterArticleTag');
+		}
+
+		$this->assertTrue(is_a($TagCopy, 'RegisterArticleTag'));
+		$this->assertIdentical($Tag, $TagCopy);
+
+		if (PHP5) {
+			$NewTag = ClassRegistry::init(array('class' => 'RegisterArticleTag', 'alias' => 'NewTag'));
+		} else {
+			$NewTag =& ClassRegistry::init(array('class' => 'RegisterArticleTag', 'alias' => 'NewTag'));
+		}
+		$this->assertTrue(is_a($Tag, 'RegisterArticleTag'));
+
+		if (PHP5) {
+			$NewTagCopy = ClassRegistry::init(array('class' => 'RegisterArticleTag', 'alias' => 'NewTag'));
+		} else {
+			$NewTagCopy =& ClassRegistry::init(array('class' => 'RegisterArticleTag', 'alias' => 'NewTag'));
+		}
+
+		$this->assertNotIdentical($Tag, $NewTag);
+		$this->assertIdentical($NewTag, $NewTagCopy);
+
+		$NewTag->name = 'SomeOtherName';
+		$this->assertNotIdentical($Tag, $NewTag);
+		$this->assertIdentical($NewTag, $NewTagCopy);
+
+		$Tag->name = 'SomeOtherName';
+		$this->assertNotIdentical($Tag, $NewTag);
+
+		$this->assertTrue($TagCopy->name === 'SomeOtherName');
+
+		if (PHP5) {
+			$User = ClassRegistry::init(array('class' => 'RegisterUser', 'alias' => 'User', 'table' => false));
+		} else {
+			$User =& ClassRegistry::init(array('class' => 'RegisterUser', 'alias' => 'User', 'table' => false));
+		}
+		$this->assertTrue(is_a($User, 'AppModel'));
+
+		if (PHP5) {
+			$UserCopy = ClassRegistry::init(array('class' => 'RegisterUser', 'alias' => 'User', 'table' => false));
+		} else {
+			$UserCopy =& ClassRegistry::init(array('class' => 'RegisterUser', 'alias' => 'User', 'table' => false));
+		}
+		$this->assertTrue(is_a($UserCopy, 'AppModel'));
+		$this->assertIdentical($User, $UserCopy);
+
+		if (PHP5) {
+			$Category = ClassRegistry::init(array('class' => 'RegisterCategory'));
+		} else {
+			$Category =& ClassRegistry::init(array('class' => 'RegisterCategory'));
+		}
+		$this->assertTrue(is_a($Category, 'RegisterCategory'));
+
+		if (PHP5) {
+			$ParentCategory = ClassRegistry::init(array('class' => 'RegisterCategory', 'alias' => 'ParentCategory'));
+		} else {
+			$ParentCategory =& ClassRegistry::init(array('class' => 'RegisterCategory', 'alias' => 'ParentCategory'));
+		}
+		$this->assertTrue(is_a($ParentCategory, 'RegisterCategory'));
+		$this->assertNotIdentical($Category, $ParentCategory);
+
+		$this->assertNotEqual($Category->alias, $ParentCategory->alias);
+		$this->assertEqual('RegisterCategory', $Category->alias);
+		$this->assertEqual('ParentCategory', $ParentCategory->alias);
+	}
+
+/**
+ * testClassRegistryFlush method
+ *
+ * @access public
+ * @return void
+ */
+	function testClassRegistryFlush() {
+		$ArticleTag = ClassRegistry::getObject('RegisterArticleTag');
+		$this->assertTrue(is_a($ArticleTag, 'RegisterArticleTag'));
+		ClassRegistry::flush();
+
+		$NoArticleTag = ClassRegistry::isKeySet('RegisterArticleTag');
+		$this->assertFalse($NoArticleTag);
+		$this->assertTrue(is_a($ArticleTag, 'RegisterArticleTag'));
+	}
+
+/**
+ * testAddMultipleModels method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddMultipleModels() {
+		$Article = ClassRegistry::isKeySet('Article');
+		$this->assertFalse($Article);
+
+		$Featured = ClassRegistry::isKeySet('Featured');
+		$this->assertFalse($Featured);
+
+		$Tag = ClassRegistry::isKeySet('Tag');
+		$this->assertFalse($Tag);
+
+		$models = array(array('class' => 'RegisterArticle', 'alias' => 'Article'),
+				array('class' => 'RegisterArticleFeatured', 'alias' => 'Featured'),
+				array('class' => 'RegisterArticleTag', 'alias' => 'Tag'));
+
+		$added = ClassRegistry::init($models);
+		$this->assertTrue($added);
+
+		$Article = ClassRegistry::isKeySet('Article');
+		$this->assertTrue($Article);
+
+		$Featured = ClassRegistry::isKeySet('Featured');
+		$this->assertTrue($Featured);
+
+		$Tag = ClassRegistry::isKeySet('Tag');
+		$this->assertTrue($Tag);
+
+		$Article = ClassRegistry::getObject('Article');
+		$this->assertTrue(is_a($Article, 'RegisterArticle'));
+
+		$Featured = ClassRegistry::getObject('Featured');
+		$this->assertTrue(is_a($Featured, 'RegisterArticleFeatured'));
+
+		$Tag = ClassRegistry::getObject('Tag');
+		$this->assertTrue(is_a($Tag, 'RegisterArticleTag'));
+	}
+
+/**
+ * testPluginAppModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginAppModel() {
+		$TestRegistryPluginModel = ClassRegistry::isKeySet('TestRegistryPluginModel');
+		$this->assertFalse($TestRegistryPluginModel);
+
+		$TestRegistryPluginModel = ClassRegistry::init('RegistryPlugin.TestRegistryPluginModel');
+		$this->assertTrue(is_a($TestRegistryPluginModel, 'TestRegistryPluginModel'));
+
+		$this->assertEqual($TestRegistryPluginModel->tablePrefix, 'something_');
+
+		if (PHP5) {
+			$PluginUser = ClassRegistry::init(array('class' => 'RegistryPlugin.RegisterUser', 'alias' => 'RegistryPluginUser', 'table' => false));
+		} else {
+			$PluginUser =& ClassRegistry::init(array('class' => 'RegistryPlugin.RegisterUser', 'alias' => 'RegistryPluginUser', 'table' => false));
+		}
+		$this->assertTrue(is_a($PluginUser, 'RegistryPluginAppModel'));
+
+		if (PHP5) {
+			$PluginUserCopy = ClassRegistry::getObject('RegistryPluginUser');
+		} else {
+			$PluginUserCopy =& ClassRegistry::getObject('RegistryPluginUser');
+		}
+		$this->assertTrue(is_a($PluginUserCopy, 'RegistryPluginAppModel'));
+		$this->assertIdentical($PluginUser, $PluginUserCopy);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/code_coverage_manager.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/code_coverage_manager.test.php
new file mode 100644
index 000000000..d0b5cf2c5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/code_coverage_manager.test.php
@@ -0,0 +1,516 @@
+<?php
+/**
+ * CodeCoverageManagerTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once CAKE . 'tests' . DS . 'lib' . DS . 'code_coverage_manager.php';
+require_once CAKE . 'tests' . DS . 'lib' . DS . 'reporter' . DS . 'cake_cli_reporter.php';
+
+/**
+ * CodeCoverageManagerTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CodeCoverageManagerTest extends CakeTestCase {
+
+/**
+ * Skip if XDebug not installed
+ *
+ * @access public
+ */
+	function skip() {
+		$this->skipIf(!extension_loaded('xdebug'), '%s XDebug not installed');
+	}
+
+/**
+ * startTest Method
+ * Store reference of $_GET to restore later.
+ *
+ * @return void
+ */
+	function startCase() {
+		$this->_get = $_GET;
+	}
+
+/**
+ * End Case - restore GET vars.
+ *
+ * @return void
+ */
+	function endCase() {
+		$_GET = $this->_get;
+	}
+
+/**
+ * testNoTestCaseSupplied method
+ *
+ * @access public
+ * @return void
+ */
+	function testNoTestCaseSupplied() {
+		if ($this->skipIf(PHP_SAPI == 'cli', 'Is cli, cannot run this test %s')) {
+			return;
+		}
+		$reporter =& new CakeHtmlReporter(null, array('group' => false, 'app' => false, 'plugin' => false));
+
+		CodeCoverageManager::init(substr(md5(microtime()), 0, 5), $reporter);
+		CodeCoverageManager::report(false);
+		$this->assertError();
+
+		CodeCoverageManager::init('tests' . DS . 'lib' . DS . basename(__FILE__), $reporter);
+		CodeCoverageManager::report(false);
+		$this->assertError();
+	}
+
+/**
+ * Test that test cases don't cause errors
+ *
+ * @return void
+ */
+	function testNoTestCaseSuppliedNoErrors() {
+		if ($this->skipIf(PHP_SAPI == 'cli', 'Is cli, cannot run this test %s')) {
+			return;
+		}
+		$reporter =& new CakeHtmlReporter(null, array('group' => false, 'app' => false, 'plugin' => false));
+		$path = LIBS;
+		if (strpos(LIBS, ROOT) === false) {
+			$path = ROOT.DS.LIBS;
+		}
+		App::import('Core', 'Folder');
+		$folder = new Folder();
+		$folder->cd($path);
+		$contents = $folder->read();
+
+		$contents[1] = array_filter($contents[1], array(&$this, '_basenameFilter'));
+
+		foreach ($contents[1] as $file) {
+			CodeCoverageManager::init('libs' . DS . $file, $reporter);
+			CodeCoverageManager::report(false);
+			$this->assertNoErrors('libs' . DS . $file);
+		}
+	}
+
+/**
+ * Remove file names that don't share a basename with the current file.
+ *
+ * @return void
+ */
+	function _basenameFilter($var) {
+		return ($var != basename(__FILE__));
+	}
+
+/**
+ * testGetTestObjectFileNameFromTestCaseFile method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetTestObjectFileNameFromTestCaseFile() {
+		$manager =& CodeCoverageManager::getInstance();
+		$manager->reporter = new CakeHtmlReporter();
+
+		$expected = $manager->__testObjectFileFromCaseFile('models/some_file.test.php', true);
+		$this->assertIdentical(APP.'models'.DS.'some_file.php', $expected);
+
+		$expected = $manager->__testObjectFileFromCaseFile('models/datasources/some_file.test.php', true);
+		$this->assertIdentical(APP.'models'.DS.'datasources'.DS.'some_file.php', $expected);
+
+		$expected = $manager->__testObjectFileFromCaseFile('controllers/some_file.test.php', true);
+		$this->assertIdentical(APP.'controllers'.DS.'some_file.php', $expected);
+
+		$expected = $manager->__testObjectFileFromCaseFile('views/some_file.test.php', true);
+		$this->assertIdentical(APP.'views'.DS.'some_file.php', $expected);
+
+		$expected = $manager->__testObjectFileFromCaseFile('behaviors/some_file.test.php', true);
+		$this->assertIdentical(APP.'models'.DS.'behaviors'.DS.'some_file.php', $expected);
+
+		$expected = $manager->__testObjectFileFromCaseFile('components/some_file.test.php', true);
+		$this->assertIdentical(APP.'controllers'.DS.'components'.DS.'some_file.php', $expected);
+
+		$expected = $manager->__testObjectFileFromCaseFile('helpers/some_file.test.php', true);
+		$this->assertIdentical(APP.'views'.DS.'helpers'.DS.'some_file.php', $expected);
+
+		$manager->pluginTest = 'bugs';
+		$expected = $manager->__testObjectFileFromCaseFile('models/some_file.test.php', false);
+		$this->assertIdentical(APP.'plugins'.DS.'bugs'.DS.'models'.DS.'some_file.php', $expected);
+
+		$manager->pluginTest = false;
+		$manager->reporter = new CakeCliReporter;
+		$expected = $manager->__testObjectFileFromCaseFile('libs/set.test.php', false);
+		$this->assertIdentical(ROOT.DS.'cake'.DS.'libs'.DS.'set.php', $expected);
+	}
+
+/**
+ * testOfHtmlDiffReport method
+ *
+ * @access public
+ * @return void
+ */
+	function testOfHtmlDiffReport() {
+		$manager =& CodeCoverageManager::getInstance();
+		$code = <<<PHP
+/**
+ * Set class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+		class Set extends Object {
+
+/**
+		 * Value of the Set object.
+		 *
+		 * @var array
+		 * @access public
+		 */
+			var \$value = array();
+
+/**
+		 * Constructor. Defaults to an empty array.
+		 *
+		 * @access public
+		 */
+			function __construct() {
+				if (func_num_args() == 1 && is_array(func_get_arg(0))) {
+					\$this->value = func_get_arg(0);
+				} else {
+					\$this->value = func_get_args();
+				}
+			}
+
+/**
+		 * Returns the contents of the Set object
+		 *
+		 * @return array
+		 * @access public
+		 */
+			function &get() {
+				return \$this->value;
+			}
+
+/**
+		 * This function can be thought of as a hybrid between PHP's array_merge and array_merge_recursive. The difference
+		 * to the two is that if an array key contains another array then the function behaves recursive (unlike array_merge)
+		 * but does not do if for keys containing strings (unlike array_merge_recursive). See the unit test for more information.
+		 *
+		 * Note: This function will work with an unlimited amount of arguments and typecasts non-array parameters into arrays.
+		 *
+		 * @param array \$arr1 Array to be merged
+		 * @param array \$arr2 Array to merge with
+		 * @return array Merged array
+		 * @access public
+		 */
+			function merge(\$arr1, \$arr2 = null) {
+				\$args = func_get_args();
+
+				if (isset(\$this) && is_a(\$this, 'set')) {
+					\$backtrace = debug_backtrace();
+					\$previousCall = strtolower(\$backtrace[1]['class'].'::'.\$backtrace[1]['function']);
+					if (\$previousCall != 'set::merge') {
+						\$r =& \$this->value;
+						array_unshift(\$args, null);
+					}
+				}
+				if (!isset(\$r)) {
+					\$r = (array)current(\$args);
+				}
+
+				while ((\$arg = next(\$args)) !== false) {
+					if (is_a(\$arg, 'set')) {
+						\$arg = \$arg->get();
+					}
+
+					foreach ((array)\$arg as \$key => \$val)	 {
+						if (is_array(\$val) && isset(\$r[\$key]) && is_array(\$r[\$key])) {
+							\$r[\$key] = Set::merge(\$r[\$key], \$val);
+						} elseif (is_int(\$key)) {
+
+						} else {
+							\$r[\$key] = \$val;
+						}
+					}
+				}
+				return \$r;
+			}
+PHP;
+
+		$testObjectFile = explode("\n", $code);
+		$coverageData = array(
+			0 => 1,
+			1 => 1,
+			2 => -2,
+			3 => -2,
+			4 => -2,
+			5 => -2,
+			6 => -2,
+			7 => -2,
+			8 => -1,
+			9 => -2,
+			10 => -2,
+			11 => -2,
+			12 => -2,
+			13 => -2,
+			14 => 1,
+			15 => 1,
+			16 => -1,
+			17 => 1,
+			18 => 1,
+			19 => -1,
+			20 => 1,
+			21 => -2,
+			22 => -2,
+			23 => -2,
+			24 => -2,
+			25 => -2,
+			26 => -2,
+			27 => 1,
+			28 => -1,
+			29 => 1,
+			30 => 1,
+			31 => -2,
+			32 => -2,
+			33 => -2,
+			34 => -2,
+			35 => -2,
+			36 => -2,
+			37 => -2,
+			38 => -2,
+			39 => -2,
+			40 => -2,
+			41 => -2,
+			42 => -2,
+			43 => -1,
+			44 => -2,
+			45 => -2,
+			46 => -2,
+			47 => -2,
+			48 => 1,
+			49 => 1,
+			50 => -1,
+			51 => 1,
+			52 => 1,
+			53 => -2,
+			54 => -2,
+			55 => 1,
+			56 => 1,
+			57 => 1,
+			58 => 1,
+			59 => -1,
+			60 => 1,
+			61 => 1,
+			62 => -2,
+			63 => -2,
+			64 => 1,
+			65 => -2,
+			66 => 1,
+			67 => -1,
+			68 => -2,
+			69 => -1,
+			70 => -1,
+			71 => 1,
+			72 => -2,
+		);
+		$expected = array(
+			0 => 'ignored',
+			1 => 'ignored',
+			2 => 'ignored',
+			3 => 'ignored',
+			4 => 'ignored',
+			5 => 'ignored show start realstart',
+			6 => 'ignored show',
+			7 => 'ignored show',
+			8 => 'uncovered show',
+			9 => 'ignored show',
+			10 => 'ignored show',
+			11 => 'ignored show end',
+			12 => 'ignored',
+			13 => 'ignored show start',
+			14 => 'covered show',
+			15 => 'covered show',
+			16 => 'uncovered show',
+			17 => 'covered show show',
+			18 => 'covered show show',
+			19 => 'uncovered show',
+			20 => 'covered show',
+			21 => 'ignored show',
+			22 => 'ignored show end',
+			23 => 'ignored',
+			24 => 'ignored',
+			25 => 'ignored show start',
+			26 => 'ignored show',
+			27 => 'covered show',
+			28 => 'uncovered show',
+			29 => 'covered show',
+			30 => 'covered show',
+			31 => 'ignored show end',
+			32 => 'ignored',
+			33 => 'ignored',
+			34 => 'ignored',
+			35 => 'ignored',
+			36 => 'ignored',
+			37 => 'ignored',
+			38 => 'ignored',
+			39 => 'ignored',
+			40 => 'ignored show start',
+			41 => 'ignored show',
+			42 => 'ignored show',
+			43 => 'uncovered show',
+			41 => 'ignored show',
+			42 => 'ignored show',
+			43 => 'uncovered show',
+			44 => 'ignored show',
+			45 => 'ignored show',
+			46 => 'ignored show',
+			47 => 'ignored show',
+			48 => 'covered show',
+			49 => 'covered show',
+			50 => 'uncovered show',
+			51 => 'covered show',
+			52 => 'covered show',
+			53 => 'ignored show end',
+			54 => 'ignored',
+			55 => 'covered',
+			56 => 'covered show start',
+			57 => 'covered show',
+			58 => 'covered show',
+			59 => 'uncovered show',
+			60 => 'covered show',
+			61 => 'covered show',
+			62 => 'ignored show end',
+			63 => 'ignored',
+			64 => 'covered show start',
+			65 => 'ignored show',
+			66 => 'covered show show',
+			67 => 'uncovered show',
+			68 => 'ignored show',
+			69 => 'uncovered show',
+			70 => 'uncovered show',
+			71 => 'covered show',
+			72 => 'ignored show',
+			73 => 'ignored show end end',
+		);
+		$execCodeLines = range(0, 72);
+		$result = explode("</div>", $report = $manager->reportCaseHtmlDiff($testObjectFile, $coverageData, $execCodeLines, 3));
+
+		foreach ($result as $line) {
+			preg_match('/<span class="line-num">(.*?)<\/span>/', $line, $matches);
+			if (!isset($matches[1])) {
+				continue;
+			}
+
+			$num = $matches[1];
+			$class = $expected[$num];
+			$pattern = '/<div class="code-line '.$class.'">/';
+			$this->assertPattern($pattern, $line, $num.': '.$line." fails");
+		}
+	}
+
+/**
+ * testArrayStrrpos method
+ *
+ * @access public
+ * @return void
+ */
+	function testArrayStrrpos() {
+		$manager =& CodeCoverageManager::getInstance();
+
+		$a = array(
+			'apples',
+			'bananas',
+			'oranges'
+		);
+		$this->assertEqual(1, $manager->__array_strpos($a, 'ba', true));
+		$this->assertEqual(2, $manager->__array_strpos($a, 'range', true));
+		$this->assertEqual(0, $manager->__array_strpos($a, 'pp', true));
+		$this->assertFalse($manager->__array_strpos('', 'ba', true));
+		$this->assertFalse($manager->__array_strpos(false, 'ba', true));
+		$this->assertFalse($manager->__array_strpos(array(), 'ba', true));
+
+		$a = array(
+			'rang',
+			'orange',
+			'oranges'
+		);
+		$this->assertEqual(0, $manager->__array_strpos($a, 'rang'));
+		$this->assertEqual(2, $manager->__array_strpos($a, 'rang', true));
+		$this->assertEqual(1, $manager->__array_strpos($a, 'orange', false));
+		$this->assertEqual(1, $manager->__array_strpos($a, 'orange'));
+		$this->assertEqual(2, $manager->__array_strpos($a, 'orange', true));
+	}
+
+/**
+ * testGetExecutableLines method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetExecutableLines() {
+		$manager =& CodeCoverageManager::getInstance();
+		$code = <<<HTML
+			\$manager =& CodeCoverageManager::getInstance();
+HTML;
+		$result = $manager->__getExecutableLines($code);
+		foreach ($result as $line) {
+			$this->assertNotIdentical($line, '');
+		}
+
+		$code = <<<HTML
+		{
+		}
+		<?php?>
+		?>
+		<?
+}
+{{}}
+(())
+		@codeCoverageIgnoreStart
+		some
+		more
+		code
+		here
+		@codeCoverageIgnoreEnd
+HTML;
+		$result = $manager->__getExecutableLines($code);
+		foreach ($result as $line) {
+			$this->assertIdentical(trim($line), '');
+		}
+	}
+
+/**
+ * testCalculateCodeCoverage method
+ *
+ * @access public
+ * @return void
+ */
+	function testCalculateCodeCoverage() {
+		$manager =& CodeCoverageManager::getInstance();
+		$data = array(
+			'25' => array(100, 25),
+			'50' => array(100, 50),
+			'0' => array(0, 0),
+			'0' => array(100, 0),
+			'100' => array(100, 100),
+		);
+		foreach ($data as $coverage => $lines) {
+			$this->assertEqual($coverage, $manager->__calcCoverage($lines[0], $lines[1]));
+		}
+
+		$manager->__calcCoverage(100, 1000);
+		$this->assertError();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/configure.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/configure.test.php
new file mode 100644
index 000000000..d1b36754d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/configure.test.php
@@ -0,0 +1,833 @@
+<?php
+/**
+ * ConfigureTest file
+ *
+ * Holds several tests
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Configure');
+
+/**
+ * ConfigureTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ConfigureTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_cacheDisable = Configure::read('Cache.disable');
+		$this->_debug = Configure::read('debug');
+
+		Configure::write('Cache.disable', true);
+	}
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		if (file_exists(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_core_paths')) {
+			unlink(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_core_paths');
+		}
+		if (file_exists(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_dir_map')) {
+			unlink(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_dir_map');
+		}
+		if (file_exists(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_file_map')) {
+			unlink(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_file_map');
+		}
+		if (file_exists(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_object_map')) {
+			unlink(TMP . 'cache' . DS . 'persistent' . DS . 'cake_core_object_map');
+		}
+		if (file_exists(TMP . 'cache' . DS . 'persistent' . DS . 'test.config.php')) {
+			unlink(TMP . 'cache' . DS . 'persistent' . DS . 'test.config.php');
+		}
+		if (file_exists(TMP . 'cache' . DS . 'persistent' . DS . 'test.php')) {
+			unlink(TMP . 'cache' . DS . 'persistent' . DS . 'test.php');
+		}
+		Configure::write('debug', $this->_debug);
+		Configure::write('Cache.disable', $this->_cacheDisable);
+	}
+
+/**
+ * testRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRead() {
+		$expected = 'ok';
+		Configure::write('level1.level2.level3_1', $expected);
+		Configure::write('level1.level2.level3_2', 'something_else');
+		$result = Configure::read('level1.level2.level3_1');
+		$this->assertEqual($expected, $result);
+
+		$result = Configure::read('level1.level2.level3_2');
+		$this->assertEqual($result, 'something_else');
+
+		$result = Configure::read('debug');
+		$this->assertTrue($result >= 0);
+	}
+
+/**
+ * testWrite method
+ *
+ * @access public
+ * @return void
+ */
+	function testWrite() {
+		$writeResult = Configure::write('SomeName.someKey', 'myvalue');
+		$this->assertTrue($writeResult);
+		$result = Configure::read('SomeName.someKey');
+		$this->assertEqual($result, 'myvalue');
+
+		$writeResult = Configure::write('SomeName.someKey', null);
+		$this->assertTrue($writeResult);
+		$result = Configure::read('SomeName.someKey');
+		$this->assertEqual($result, null);
+
+		$expected = array('One' => array('Two' => array('Three' => array('Four' => array('Five' => 'cool')))));
+		$writeResult = Configure::write('Key', $expected);
+		$this->assertTrue($writeResult);
+
+		$result = Configure::read('Key');
+		$this->assertEqual($expected, $result);
+
+		$result = Configure::read('Key.One');
+		$this->assertEqual($expected['One'], $result);
+
+		$result = Configure::read('Key.One.Two');
+		$this->assertEqual($expected['One']['Two'], $result);
+
+		$result = Configure::read('Key.One.Two.Three.Four.Five');
+		$this->assertEqual('cool', $result);
+	}
+
+/**
+ * testSetErrorReporting Level
+ *
+ * @return void
+ */
+	function testSetErrorReportingLevel() {
+		Configure::write('log', false);
+
+		Configure::write('debug', 0);
+		$result = ini_get('error_reporting');
+		$this->assertEqual($result, 0);
+
+		Configure::write('debug', 2);
+		$result = ini_get('error_reporting');
+		$this->assertEqual($result, E_ALL & ~E_DEPRECATED);
+
+		$result = ini_get('display_errors');
+		$this->assertEqual($result, 1);
+
+		Configure::write('debug', 0);
+		$result = ini_get('error_reporting');
+		$this->assertEqual($result, 0);
+	}
+
+/**
+ * test that log and debug configure values interact well.
+ *
+ * @return void
+ */
+	function testInteractionOfDebugAndLog() {
+		Configure::write('log', false);
+
+		Configure::write('debug', 0);
+		$this->assertEqual(ini_get('error_reporting'), 0);
+		$this->assertEqual(ini_get('display_errors'), 0);
+
+		Configure::write('log', E_WARNING);
+		Configure::write('debug', 0);
+		$this->assertEqual(ini_get('error_reporting'), E_WARNING);
+		$this->assertEqual(ini_get('display_errors'), 0);
+
+		Configure::write('debug', 2);
+		$this->assertEqual(ini_get('error_reporting'), E_ALL & ~E_DEPRECATED);
+		$this->assertEqual(ini_get('display_errors'), 1);
+
+		Configure::write('debug', 0);
+		Configure::write('log', false);
+		$this->assertEqual(ini_get('error_reporting'), 0);
+		$this->assertEqual(ini_get('display_errors'), 0);
+	}
+
+/**
+ * testDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testDelete() {
+		Configure::write('SomeName.someKey', 'myvalue');
+		$result = Configure::read('SomeName.someKey');
+		$this->assertEqual($result, 'myvalue');
+
+		Configure::delete('SomeName.someKey');
+		$result = Configure::read('SomeName.someKey');
+		$this->assertTrue($result === null);
+
+		Configure::write('SomeName', array('someKey' => 'myvalue', 'otherKey' => 'otherValue'));
+
+		$result = Configure::read('SomeName.someKey');
+		$this->assertEqual($result, 'myvalue');
+
+		$result = Configure::read('SomeName.otherKey');
+		$this->assertEqual($result, 'otherValue');
+
+		Configure::delete('SomeName');
+
+		$result = Configure::read('SomeName.someKey');
+		$this->assertTrue($result === null);
+
+		$result = Configure::read('SomeName.otherKey');
+		$this->assertTrue($result === null);
+	}
+
+/**
+ * testLoad method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoad() {
+		$result = Configure::load('non_existing_configuration_file');
+		$this->assertFalse($result);
+
+		$result = Configure::load('config');
+		$this->assertTrue($result);
+
+		$result = Configure::load('../../index');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testLoad method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadPlugin() {
+		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)), true);
+		$result = Configure::load('test_plugin.load');
+		$this->assertTrue($result);
+		$expected = '/test_app/plugins/test_plugin/config/load.php';
+		$config = Configure::read('plugin_load');
+		$this->assertEqual($config, $expected);
+
+		$result = Configure::load('test_plugin.more.load');
+		$this->assertTrue($result);
+		$expected = '/test_app/plugins/test_plugin/config/more.load.php';
+		$config = Configure::read('plugin_more_load');
+		$this->assertEqual($config, $expected);
+	}
+
+/**
+ * testStore method
+ *
+ * @access public
+ * @return void
+ */
+	function testStoreAndLoad() {
+		Configure::write('Cache.disable', false);
+
+		$expected = array('data' => 'value with backslash \, \'singlequote\' and "doublequotes"');
+		Configure::store('SomeExample', 'test', $expected);
+
+		Configure::load('test');
+		$config = Configure::read('SomeExample');
+		$this->assertEqual($config, $expected);
+
+		$expected = array(
+			'data' => array('first' => 'value with backslash \, \'singlequote\' and "doublequotes"', 'second' => 'value2'),
+			'data2' => 'value'
+		);
+		Configure::store('AnotherExample', 'test_config', $expected);
+
+		Configure::load('test_config');
+		$config = Configure::read('AnotherExample');
+		$this->assertEqual($config, $expected);
+	}
+
+/**
+ * testVersion method
+ *
+ * @access public
+ * @return void
+ */
+	function testVersion() {
+		$result = Configure::version();
+		$this->assertTrue(version_compare($result, '1.2', '>='));
+	}
+}
+
+/**
+ * AppImportTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class AppImportTest extends CakeTestCase {
+
+/**
+ * testBuild method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuild() {
+		$old = App::path('models');
+		$expected = array(
+			APP . 'models' . DS,
+			APP,
+			ROOT . DS . LIBS . 'model' . DS
+		);
+		$this->assertEqual($expected, $old);
+
+		App::build(array('models' => array('/path/to/models/')));
+
+		$new = App::path('models');
+
+		$expected = array(
+			'/path/to/models/',
+			APP . 'models' . DS,
+			APP,
+			ROOT . DS . LIBS . 'model' . DS
+		);
+		$this->assertEqual($expected, $new);
+
+		App::build(); //reset defaults
+		$defaults = App::path('models');
+		$this->assertEqual($old, $defaults);
+	}
+
+/**
+ * testBuildWithReset method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildWithReset() {
+		$old = App::path('models');
+		$expected = array(
+			APP . 'models' . DS,
+			APP,
+			ROOT . DS . LIBS . 'model' . DS
+		);
+		$this->assertEqual($expected, $old);
+
+		App::build(array('models' => array('/path/to/models/')), true);
+
+		$new = App::path('models');
+
+		$expected = array(
+			'/path/to/models/'
+		);
+		$this->assertEqual($expected, $new);
+
+		App::build(); //reset defaults
+		$defaults = App::path('models');
+		$this->assertEqual($old, $defaults);
+	}
+
+/**
+ * testCore method
+ *
+ * @access public
+ * @return void
+ */
+	function testCore() {
+		$model = App::core('models');
+		$this->assertEqual(array(ROOT . DS . LIBS . 'model' . DS), $model);
+
+		$view = App::core('views');
+		$this->assertEqual(array(ROOT . DS . LIBS . 'view' . DS), $view);
+
+		$controller = App::core('controllers');
+		$this->assertEqual(array(ROOT . DS . LIBS . 'controller' . DS), $controller);
+
+	}
+
+/**
+ * testListObjects method
+ *
+ * @access public
+ * @return void
+ */
+	function testListObjects() {
+		$result = App::objects('class', TEST_CAKE_CORE_INCLUDE_PATH . 'libs');
+		$this->assertTrue(in_array('Xml', $result));
+		$this->assertTrue(in_array('Cache', $result));
+		$this->assertTrue(in_array('HttpSocket', $result));
+
+		$result = App::objects('behavior');
+		$this->assertTrue(in_array('Tree', $result));
+
+		$result = App::objects('controller');
+		$this->assertTrue(in_array('Pages', $result));
+
+		$result = App::objects('component');
+		$this->assertTrue(in_array('Auth', $result));
+
+		$result = App::objects('view');
+		$this->assertTrue(in_array('Media', $result));
+
+		$result = App::objects('helper');
+		$this->assertTrue(in_array('Html', $result));
+
+		$result = App::objects('model');
+		$notExpected = array('AppModel', 'ModelBehavior', 'ConnectionManager',  'DbAcl', 'Model', 'CakeSchema');
+		foreach ($notExpected as $class) {
+			$this->assertFalse(in_array($class, $result));
+		}
+
+		$result = App::objects('file');
+		$this->assertFalse($result);
+
+		$result = App::objects('file', 'non_existing_configure');
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = App::objects('NonExistingType');
+		$this->assertFalse($result);
+
+		App::build(array(
+			'plugins' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS
+			)
+		));
+		$result = App::objects('plugin', null, false);
+		$this->assertTrue(in_array('Cache', $result));
+		$this->assertTrue(in_array('Log', $result));
+
+		App::build();
+	}
+
+/**
+ * test that pluginPath can find paths for plugins.
+ *
+ * @return void
+ */
+	function testPluginPath() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$path = App::pluginPath('test_plugin');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::pluginPath('TestPlugin');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::pluginPath('TestPluginTwo');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin_two' . DS;
+		$this->assertEqual($path, $expected);
+		App::build();
+	}
+
+/**
+ * test that pluginPath can find paths for plugins.
+ *
+ * @return void
+ */
+	function testThemePath() {
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS)
+		));
+		$path = App::themePath('test_theme');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS;
+		$this->assertEqual($path, $expected);
+
+		$path = App::themePath('TestTheme');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS;
+		$this->assertEqual($path, $expected);
+
+		App::build();
+	}
+
+/**
+ * testClassLoading method
+ *
+ * @access public
+ * @return void
+ */
+	function testClassLoading() {
+		$file = App::import();
+		$this->assertTrue($file);
+
+		$file = App::import('Model', 'Model', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('Model'));
+
+		$file = App::import('Controller', 'Controller', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('Controller'));
+
+		$file = App::import('Component', 'Component', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('Component'));
+
+		$file = App::import('Shell', 'Shell', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('Shell'));
+
+		$file = App::import('Model', 'SomeRandomModelThatDoesNotExist', false);
+		$this->assertFalse($file);
+
+		$file = App::import('Model', 'AppModel', false);
+		$this->assertTrue($file);
+		$this->assertTrue(class_exists('AppModel'));
+
+		$file = App::import('WrongType', null, true, array(), '');
+		$this->assertTrue($file);
+
+		$file = App::import('Model', 'NonExistingPlugin.NonExistingModel', false);
+		$this->assertFalse($file);
+
+		$file = App::import('Core', 'NonExistingPlugin.NonExistingModel', false);
+		$this->assertFalse($file);
+
+		$file = App::import('Model', array('NonExistingPlugin.NonExistingModel'), false);
+		$this->assertFalse($file);
+
+		$file = App::import('Core', array('NonExistingPlugin.NonExistingModel'), false);
+		$this->assertFalse($file);
+
+		$file = App::import('Core', array('NonExistingPlugin.NonExistingModel.AnotherChild'), false);
+		$this->assertFalse($file);
+
+		if (!class_exists('AppController')) {
+			$classes = array_flip(get_declared_classes());
+
+			if (PHP5) {
+				$this->assertFalse(isset($classes['PagesController']));
+				$this->assertFalse(isset($classes['AppController']));
+			} else {
+				$this->assertFalse(isset($classes['pagescontroller']));
+				$this->assertFalse(isset($classes['appcontroller']));
+			}
+
+			$file = App::import('Controller', 'Pages');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('PagesController'));
+
+			$classes = array_flip(get_declared_classes());
+
+			if (PHP5) {
+				$this->assertTrue(isset($classes['PagesController']));
+				$this->assertTrue(isset($classes['AppController']));
+			} else {
+				$this->assertTrue(isset($classes['pagescontroller']));
+				$this->assertTrue(isset($classes['appcontroller']));
+			}
+
+			$file = App::import('Behavior', 'Containable');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('ContainableBehavior'));
+
+			$file = App::import('Component', 'RequestHandler');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('RequestHandlerComponent'));
+
+			$file = App::import('Helper', 'Form');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('FormHelper'));
+
+			$file = App::import('Model', 'NonExistingModel');
+			$this->assertFalse($file);
+
+			$file = App::import('Datasource', 'DboSource');
+			$this->assertTrue($file);
+			$this->assertTrue(class_exists('DboSource'));
+		}
+		App::build();
+	}
+
+/**
+ * test import() with plugins
+ *
+ * @return void
+ */
+	function testPluginImporting() {
+		App::build(array(
+			'libs' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'libs' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		$result = App::import('Controller', 'TestPlugin.Tests');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestPluginAppController'));
+		$this->assertTrue(class_exists('TestsController'));
+
+		$result = App::import('Lib', 'TestPlugin.TestPluginLibrary');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestPluginLibrary'));
+
+		$result = App::import('Lib', 'Library');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('Library'));
+
+		$result = App::import('Helper', 'TestPlugin.OtherHelper');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('OtherHelperHelper'));
+		
+		$result = App::import('Helper', 'TestPlugin.TestPluginApp');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestPluginAppHelper'));
+
+		$result = App::import('Datasource', 'TestPlugin.TestSource');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('TestSource'));
+		
+		App::build();
+	}
+
+/**
+ * test that building helper paths actually works.
+ *
+ * @return void
+ * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/410
+ */
+	function testImportingHelpersFromAlternatePaths() {
+		App::build();
+		$this->assertFalse(class_exists('BananaHelper'), 'BananaHelper exists, cannot test importing it.');
+		App::import('Helper', 'Banana');
+		$this->assertFalse(class_exists('BananaHelper'), 'BananaHelper was not found because the path does not exist.');
+
+		App::build(array(
+			'helpers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'helpers' . DS)
+		));
+		App::build(array('vendors' => array(TEST_CAKE_CORE_INCLUDE_PATH)));
+		$this->assertFalse(class_exists('BananaHelper'), 'BananaHelper exists, cannot test importing it.');
+		App::import('Helper', 'Banana');
+		$this->assertTrue(class_exists('BananaHelper'), 'BananaHelper was not loaded.');
+
+		App::build();
+	}
+
+/**
+ * testFileLoading method
+ *
+ * @access public
+ * @return void
+ */
+	function testFileLoading () {
+		$file = App::import('File', 'RealFile', false, array(), TEST_CAKE_CORE_INCLUDE_PATH  . 'config' . DS . 'config.php');
+		$this->assertTrue($file);
+
+		$file = App::import('File', 'NoFile', false, array(), TEST_CAKE_CORE_INCLUDE_PATH  . 'config' . DS . 'cake' . DS . 'config.php');
+		$this->assertFalse($file);
+	}
+	// import($type = null, $name = null, $parent = true, $file = null, $search = array(), $return = false) {
+
+/**
+ * testFileLoadingWithArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testFileLoadingWithArray() {
+		$type = array('type' => 'File', 'name' => 'SomeName', 'parent' => false,
+				'file' => TEST_CAKE_CORE_INCLUDE_PATH  . DS . 'config' . DS . 'config.php');
+		$file = App::import($type);
+		$this->assertTrue($file);
+
+		$type = array('type' => 'File', 'name' => 'NoFile', 'parent' => false,
+				'file' => TEST_CAKE_CORE_INCLUDE_PATH  . 'config' . DS . 'cake' . DS . 'config.php');
+		$file = App::import($type);
+		$this->assertFalse($file);
+	}
+
+/**
+ * testFileLoadingReturnValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testFileLoadingReturnValue () {
+		$file = App::import('File', 'Name', false, array(), TEST_CAKE_CORE_INCLUDE_PATH  . 'config' . DS . 'config.php', true);
+		$this->assertTrue($file);
+
+		$this->assertTrue(isset($file['Cake.version']));
+
+		$type = array('type' => 'File', 'name' => 'OtherName', 'parent' => false,
+				'file' => TEST_CAKE_CORE_INCLUDE_PATH  . 'config' . DS . 'config.php', 'return' => true);
+		$file = App::import($type);
+		$this->assertTrue($file);
+
+		$this->assertTrue(isset($file['Cake.version']));
+	}
+
+/**
+ * testLoadingWithSearch method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadingWithSearch () {
+		$file = App::import('File', 'NewName', false, array(TEST_CAKE_CORE_INCLUDE_PATH ), 'config.php');
+		$this->assertTrue($file);
+
+		$file = App::import('File', 'AnotherNewName', false, array(LIBS), 'config.php');
+		$this->assertFalse($file);
+	}
+
+/**
+ * testLoadingWithSearchArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadingWithSearchArray () {
+		$type = array('type' => 'File', 'name' => 'RandomName', 'parent' => false, 'file' => 'config.php', 'search' => array(TEST_CAKE_CORE_INCLUDE_PATH ));
+		$file = App::import($type);
+		$this->assertTrue($file);
+
+		$type = array('type' => 'File', 'name' => 'AnotherRandomName', 'parent' => false, 'file' => 'config.php', 'search' => array(LIBS));
+		$file = App::import($type);
+		$this->assertFalse($file);
+	}
+
+/**
+ * testMultipleLoading method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleLoading() {
+		$toLoad = array('I18n', 'CakeSocket');
+
+		$classes = array_flip(get_declared_classes());
+		$this->assertFalse(isset($classes['i18n']));
+		$this->assertFalse(isset($classes['CakeSocket']));
+
+		$load = App::import($toLoad);
+		$this->assertTrue($load);
+
+		$classes = array_flip(get_declared_classes());
+
+		if (PHP5) {
+			$this->assertTrue(isset($classes['I18n']));
+		} else {
+			$this->assertTrue(isset($classes['i18n']));
+		}
+
+		$load = App::import(array('I18n', 'SomeNotFoundClass', 'CakeSocket'));
+		$this->assertFalse($load);
+
+		$load = App::import($toLoad);
+		$this->assertTrue($load);
+	}
+
+/**
+ * This test only works if you have plugins/my_plugin set up.
+ * plugins/my_plugin/models/my_plugin.php and other_model.php
+ */
+
+/*
+	function testMultipleLoadingByType() {
+		$classes = array_flip(get_declared_classes());
+		$this->assertFalse(isset($classes['OtherPlugin']));
+		$this->assertFalse(isset($classes['MyPlugin']));
+
+
+		$load = App::import('Model', array('MyPlugin.OtherPlugin', 'MyPlugin.MyPlugin'));
+		$this->assertTrue($load);
+
+		$classes = array_flip(get_declared_classes());
+		$this->assertTrue(isset($classes['OtherPlugin']));
+		$this->assertTrue(isset($classes['MyPlugin']));
+	}
+*/
+	function testLoadingVendor() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'vendors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors'. DS),
+		), true);
+
+		ob_start();
+		$result = App::import('Vendor', 'TestPlugin.TestPluginAsset', array('ext' => 'css'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'this is the test plugin asset css file');
+
+		ob_start();
+		$result = App::import('Vendor', 'TestAsset', array('ext' => 'css'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'this is the test asset css file');
+
+		$result = App::import('Vendor', 'TestPlugin.SamplePlugin');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('SamplePluginClassTestName'));
+
+		$result = App::import('Vendor', 'ConfigureTestVendorSample');
+		$this->assertTrue($result);
+		$this->assertTrue(class_exists('ConfigureTestVendorSample'));
+
+		ob_start();
+		$result = App::import('Vendor', 'SomeName', array('file' => 'some.name.php'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is a file with dot in file name');
+
+		ob_start();
+		$result = App::import('Vendor', 'TestHello', array('file' => 'Test'.DS.'hello.php'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the hello.php file in Test directory');
+
+		ob_start();
+		$result = App::import('Vendor', 'MyTest', array('file' => 'Test'.DS.'MyTest.php'));
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the MyTest.php file');
+
+		ob_start();
+		$result = App::import('Vendor', 'Welcome');
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the welcome.php file in vendors directory');
+
+		ob_start();
+		$result = App::import('Vendor', 'TestPlugin.Welcome');
+		$text = ob_get_clean();
+		$this->assertTrue($result);
+		$this->assertEqual($text, 'This is the welcome.php file in test_plugin/vendors directory');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/component.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/component.test.php
new file mode 100644
index 000000000..770aacc2c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/component.test.php
@@ -0,0 +1,587 @@
+<?php
+/**
+ * ComponentTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ * @since         CakePHP(tm) v 1.2.0.5436
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Controller', 'Controller', false);
+App::import('Controller', 'Component', false);
+
+if (!class_exists('AppController')) {
+
+/**
+ * AppController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+	class AppController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'App'
+ * @access public
+ */
+		var $name = 'App';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+		var $uses = array();
+
+/**
+ * helpers property
+ *
+ * @var array
+ * @access public
+ */
+		var $helpers = array();
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+		var $components = array('Orange' => array('colour' => 'blood orange'));
+	}
+} elseif (!defined('APP_CONTROLLER_EXISTS')){
+	define('APP_CONTROLLER_EXISTS', true);
+}
+
+/**
+ * ParamTestComponent
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ParamTestComponent extends Object {
+
+/**
+ * name property
+ *
+ * @var string 'ParamTest'
+ * @access public
+ */
+	var $name = 'ParamTest';
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Banana' => array('config' => 'value'));
+
+/**
+ * initialize method
+ *
+ * @param mixed $controller
+ * @param mixed $settings
+ * @access public
+ * @return void
+ */
+	function initialize(&$controller, $settings) {
+		foreach ($settings as $key => $value) {
+			if (is_numeric($key)) {
+				$this->{$value} = true;
+			} else {
+				$this->{$key} = $value;
+			}
+		}
+	}
+}
+
+/**
+ * ComponentTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ComponentTestController extends AppController {
+
+/**
+ * name property
+ *
+ * @var string 'ComponentTest'
+ * @access public
+ */
+	var $name = 'ComponentTest';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+}
+
+/**
+ * AppleComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class AppleComponent extends Object {
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Orange');
+
+/**
+ * testName property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $testName = null;
+
+/**
+ * startup method
+ *
+ * @param mixed $controller
+ * @access public
+ * @return void
+ */
+	function startup(&$controller) {
+		$this->testName = $controller->name;
+	}
+}
+
+/**
+ * OrangeComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class OrangeComponent extends Object {
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Banana');
+
+/**
+ * initialize method
+ *
+ * @param mixed $controller
+ * @access public
+ * @return void
+ */
+	function initialize(&$controller, $settings) {
+		$this->Controller = $controller;
+		$this->Banana->testField = 'OrangeField';
+		$this->settings = $settings;
+	}
+
+/**
+ * startup method
+ *
+ * @param Controller $controller
+ * @return string
+ * @access public
+ */
+	function startup(&$controller) {
+		$controller->foo = 'pass';
+	}
+}
+
+/**
+ * BananaComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class BananaComponent extends Object {
+
+/**
+ * testField property
+ *
+ * @var string 'BananaField'
+ * @access public
+ */
+	var $testField = 'BananaField';
+
+/**
+ * startup method
+ *
+ * @param Controller $controller
+ * @return string
+ * @access public
+ */
+	function startup(&$controller) {
+		$controller->bar = 'fail';
+	}
+}
+
+/**
+ * MutuallyReferencingOneComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class MutuallyReferencingOneComponent extends Object {
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('MutuallyReferencingTwo');
+}
+
+/**
+ * MutuallyReferencingTwoComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class MutuallyReferencingTwoComponent extends Object {
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('MutuallyReferencingOne');
+}
+
+/**
+ * SomethingWithEmailComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class SomethingWithEmailComponent extends Object {
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Email');
+}
+
+Mock::generate('Object', 'ComponentMockComponent', array('startup', 'beforeFilter', 'beforeRender', 'other'));
+
+/**
+ * ComponentTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ComponentTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_pluginPaths = App::path('plugins');
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		App::build();
+		ClassRegistry::flush();
+	}
+
+/**
+ * testLoadComponents method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadComponents() {
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('RequestHandler');
+
+		$Component =& new Component();
+		$Component->init($Controller);
+
+		$this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent'));
+
+		$Controller =& new ComponentTestController();
+		$Controller->plugin = 'test_plugin';
+		$Controller->components = array('RequestHandler', 'TestPluginComponent');
+
+		$Component =& new Component();
+		$Component->init($Controller);
+
+		$this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent'));
+		$this->assertTrue(is_a($Controller->TestPluginComponent, 'TestPluginComponentComponent'));
+		$this->assertTrue(is_a(
+			$Controller->TestPluginComponent->TestPluginOtherComponent,
+			'TestPluginOtherComponentComponent'
+		));
+		$this->assertFalse(isset($Controller->TestPluginOtherComponent));
+
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('Security');
+
+		$Component =& new Component();
+		$Component->init($Controller);
+
+		$this->assertTrue(is_a($Controller->Security, 'SecurityComponent'));
+		$this->assertTrue(is_a($Controller->Security->Session, 'SessionComponent'));
+
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('Security', 'Cookie', 'RequestHandler');
+
+		$Component =& new Component();
+		$Component->init($Controller);
+
+		$this->assertTrue(is_a($Controller->Security, 'SecurityComponent'));
+		$this->assertTrue(is_a($Controller->Security->RequestHandler, 'RequestHandlerComponent'));
+		$this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent'));
+		$this->assertTrue(is_a($Controller->Cookie, 'CookieComponent'));
+	}
+
+/**
+ * test component loading
+ *
+ * @return void
+ */
+	function testNestedComponentLoading() {
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('Apple');
+		$Controller->uses = false;
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+
+		$this->assertTrue(is_a($Controller->Apple, 'AppleComponent'));
+		$this->assertTrue(is_a($Controller->Apple->Orange, 'OrangeComponent'));
+		$this->assertTrue(is_a($Controller->Apple->Orange->Banana, 'BananaComponent'));
+		$this->assertTrue(is_a($Controller->Apple->Orange->Controller, 'ComponentTestController'));
+		$this->assertTrue(empty($Controller->Apple->Session));
+		$this->assertTrue(empty($Controller->Apple->Orange->Session));
+	}
+
+/**
+ * Tests Component::startup() and only running callbacks for components directly attached to
+ * the controller.
+ *
+ * @return void
+ */
+	function testComponentStartup() {
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('Apple');
+		$Controller->uses = false;
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+		$Controller->beforeFilter();
+		$Controller->Component->startup($Controller);
+
+		$this->assertTrue(is_a($Controller->Apple, 'AppleComponent'));
+		$this->assertEqual($Controller->Apple->testName, 'ComponentTest');
+
+		$expected = !(defined('APP_CONTROLLER_EXISTS') && APP_CONTROLLER_EXISTS);
+		$this->assertEqual(isset($Controller->foo), $expected);
+		$this->assertFalse(isset($Controller->bar));
+	}
+
+/**
+ * test that triggerCallbacks fires methods on all the components, and can trigger any method.
+ *
+ * @return void
+ */
+	function testTriggerCallback() {
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('ComponentMock');
+		$Controller->uses = null;
+		$Controller->constructClasses();
+
+		$Controller->ComponentMock->expectOnce('beforeRender');
+		$Controller->Component->triggerCallback('beforeRender', $Controller);
+
+		$Controller->ComponentMock->expectNever('beforeFilter');
+		$Controller->ComponentMock->enabled = false;
+		$Controller->Component->triggerCallback('beforeFilter', $Controller);
+	}
+
+/**
+ * test a component being used more than once.
+ *
+ * @return void
+ */
+	function testMultipleComponentInitialize() {
+		$Controller =& new ComponentTestController();
+		$Controller->uses = false;
+		$Controller->components = array('Orange', 'Banana');
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+
+		$this->assertEqual($Controller->Banana->testField, 'OrangeField');
+		$this->assertEqual($Controller->Orange->Banana->testField, 'OrangeField');
+	}
+
+/**
+ * Test Component declarations with Parameters
+ * tests merging of component parameters and merging / construction of components.
+ *
+ * @return void
+ */
+	function testComponentsWithParams() {
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
+
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('ParamTest' => array('test' => 'value', 'flag'), 'Apple');
+		$Controller->uses = false;
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+
+		$this->assertTrue(is_a($Controller->ParamTest, 'ParamTestComponent'));
+		$this->assertTrue(is_a($Controller->ParamTest->Banana, 'BananaComponent'));
+		$this->assertTrue(is_a($Controller->Orange, 'OrangeComponent'));
+		$this->assertFalse(isset($Controller->Session));
+		$this->assertEqual($Controller->Orange->settings, array('colour' => 'blood orange'));
+		$this->assertEqual($Controller->ParamTest->test, 'value');
+		$this->assertEqual($Controller->ParamTest->flag, true);
+
+		//Settings are merged from app controller and current controller.
+		$Controller =& new ComponentTestController();
+		$Controller->components = array(
+			'ParamTest' => array('test' => 'value'),
+			'Orange' => array('ripeness' => 'perfect')
+		);
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+
+		$expected = array('colour' => 'blood orange', 'ripeness' => 'perfect');
+		$this->assertEqual($Controller->Orange->settings, $expected);
+		$this->assertEqual($Controller->ParamTest->test, 'value');
+	}
+
+/**
+ * Ensure that settings are not duplicated when passed into component initialize.
+ *
+ * @return void
+ */
+	function testComponentParamsNoDuplication() {
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('Orange' => array('setting' => array('itemx')));
+		$Controller->uses = false;
+
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+		$expected = array('setting' => array('itemx'), 'colour' => 'blood orange');
+		$this->assertEqual($Controller->Orange->settings, $expected, 'Params duplication has occured %s');
+	}
+
+/**
+ * Test mutually referencing components.
+ *
+ * @return void
+ */
+	function testMutuallyReferencingComponents() {
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('MutuallyReferencingOne');
+		$Controller->uses = false;
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+
+		$this->assertTrue(is_a(
+			$Controller->MutuallyReferencingOne,
+			'MutuallyReferencingOneComponent'
+		));
+		$this->assertTrue(is_a(
+			$Controller->MutuallyReferencingOne->MutuallyReferencingTwo,
+			'MutuallyReferencingTwoComponent'
+		));
+		$this->assertTrue(is_a(
+			$Controller->MutuallyReferencingOne->MutuallyReferencingTwo->MutuallyReferencingOne,
+			'MutuallyReferencingOneComponent'
+		));
+	}
+
+/**
+ * Test mutually referencing components.
+ *
+ * @return void
+ */
+	function testSomethingReferencingEmailComponent() {
+		$Controller =& new ComponentTestController();
+		$Controller->components = array('SomethingWithEmail');
+		$Controller->uses = false;
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+		$Controller->beforeFilter();
+		$Controller->Component->startup($Controller);
+
+		$this->assertTrue(is_a(
+			$Controller->SomethingWithEmail,
+			'SomethingWithEmailComponent'
+		));
+		$this->assertTrue(is_a(
+			$Controller->SomethingWithEmail->Email,
+			'EmailComponent'
+		));
+		$this->assertTrue(is_a(
+			$Controller->SomethingWithEmail->Email->Controller,
+			'ComponentTestController'
+		));
+	}
+
+/**
+ * Test that SessionComponent doesn't get added if its already in the components array.
+ *
+ * @return void
+ * @access public
+ */
+	function testDoubleLoadingOfSessionComponent() {
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
+
+		$Controller =& new ComponentTestController();
+		$Controller->uses = false;
+		$Controller->components = array('Session');
+		$Controller->constructClasses();
+
+		$this->assertEqual($Controller->components, array('Session' => '', 'Orange' => array('colour' => 'blood orange')));
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/acl.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/acl.test.php
new file mode 100644
index 000000000..a1f12c6df
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/acl.test.php
@@ -0,0 +1,646 @@
+<?php
+/**
+ * AclComponentTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.5435
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import(array('controller' .DS . 'components' . DS . 'acl', 'model' . DS . 'db_acl'));
+
+/**
+ * AclNodeTwoTestBase class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class AclNodeTwoTestBase extends AclNode {
+
+/**
+ * useDbConfig property
+ *
+ * @var string 'test_suite'
+ * @access public
+ */
+	var $useDbConfig = 'test_suite';
+
+/**
+ * cacheSources property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheSources = false;
+}
+
+/**
+ * AroTwoTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class AroTwoTest extends AclNodeTwoTestBase {
+
+/**
+ * name property
+ *
+ * @var string 'AroTwoTest'
+ * @access public
+ */
+	var $name = 'AroTwoTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'aro_twos'
+ * @access public
+ */
+	var $useTable = 'aro_twos';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('AcoTwoTest' => array('with' => 'PermissionTwoTest'));
+}
+
+/**
+ * AcoTwoTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class AcoTwoTest extends AclNodeTwoTestBase {
+
+/**
+ * name property
+ *
+ * @var string 'AcoTwoTest'
+ * @access public
+ */
+	var $name = 'AcoTwoTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'aco_twos'
+ * @access public
+ */
+	var $useTable = 'aco_twos';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('AroTwoTest' => array('with' => 'PermissionTwoTest'));
+}
+
+/**
+ * PermissionTwoTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class PermissionTwoTest extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'PermissionTwoTest'
+ * @access public
+ */
+	var $name = 'PermissionTwoTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'aros_aco_twos'
+ * @access public
+ */
+	var $useTable = 'aros_aco_twos';
+
+/**
+ * cacheQueries property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheQueries = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('AroTwoTest' => array('foreignKey' => 'aro_id'), 'AcoTwoTest' => array('foreignKey' => 'aco_id'));
+
+/**
+ * actsAs property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $actsAs = null;
+}
+
+/**
+ * DbAclTwoTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbAclTwoTest extends DbAcl {
+
+/**
+ * construct method
+ *
+ * @access private
+ * @return void
+ */
+	function __construct() {
+		$this->Aro =& new AroTwoTest();
+		$this->Aro->Permission =& new PermissionTwoTest();
+		$this->Aco =& new AcoTwoTest();
+		$this->Aro->Permission =& new PermissionTwoTest();
+	}
+}
+
+/**
+ * IniAclTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class IniAclTest extends IniAcl {
+}
+
+/**
+ * ACL Component Text case
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class AclComponentTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.aro_two', 'core.aco_two', 'core.aros_aco_two');
+
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Acl =& new AclComponent();
+	}
+
+/**
+ * before method
+ *
+ * @param mixed $method
+ * @access public
+ * @return void
+ */
+	function before($method) {
+		Configure::write('Acl.classname', 'DbAclTwoTest');
+		Configure::write('Acl.database', 'test_suite');
+		parent::before($method);
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Acl);
+	}
+
+/**
+ * testAclCreate method
+ *
+ * @access public
+ * @return void
+ */
+	function testAclCreate() {
+		$this->Acl->Aro->create(array('alias' => 'Chotchkey'));
+		$this->assertTrue($this->Acl->Aro->save());
+
+		$parent = $this->Acl->Aro->id;
+
+		$this->Acl->Aro->create(array('parent_id' => $parent, 'alias' => 'Joanna'));
+		$this->assertTrue($this->Acl->Aro->save());
+
+		$this->Acl->Aro->create(array('parent_id' => $parent, 'alias' => 'Stapler'));
+		$this->assertTrue($this->Acl->Aro->save());
+
+		$root = $this->Acl->Aco->node('ROOT');
+		$parent = $root[0]['AcoTwoTest']['id'];
+
+		$this->Acl->Aco->create(array('parent_id' => $parent, 'alias' => 'Drinks'));
+		$this->assertTrue($this->Acl->Aco->save());
+
+		$this->Acl->Aco->create(array('parent_id' => $parent, 'alias' => 'PiecesOfFlair'));
+		$this->assertTrue($this->Acl->Aco->save());
+	}
+
+/**
+ * testAclCreateWithParent method
+ *
+ * @access public
+ * @return void
+ */
+	function testAclCreateWithParent() {
+		$parent = $this->Acl->Aro->findByAlias('Peter', null, null, -1);
+		$this->Acl->Aro->create();
+		$this->Acl->Aro->save(array(
+			'alias' => 'Subordinate',
+			'model' => 'User',
+			'foreign_key' => 7,
+			'parent_id' => $parent['AroTwoTest']['id']
+		));
+		$result = $this->Acl->Aro->findByAlias('Subordinate', null, null, -1);
+		$this->assertEqual($result['AroTwoTest']['lft'], 16);
+		$this->assertEqual($result['AroTwoTest']['rght'], 17);
+	}
+
+/**
+ * testDbAclAllow method
+ *
+ * @access public
+ * @return void
+ */
+	function testDbAclAllow() {
+		$this->assertFalse($this->Acl->check('Micheal', 'tpsReports', 'read'));
+		$this->assertTrue($this->Acl->allow('Micheal', 'tpsReports', array('read', 'delete', 'update')));
+		$this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'update'));
+		$this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'read'));
+		$this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'delete'));
+
+		$this->assertFalse($this->Acl->check('Micheal', 'tpsReports', 'create'));
+		$this->assertTrue($this->Acl->allow('Micheal', 'ROOT/tpsReports', 'create'));
+		$this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'create'));
+		$this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'delete'));
+		$this->assertTrue($this->Acl->allow('Micheal', 'printers', 'create'));
+		// Michael no longer has his delete permission for tpsReports!
+		$this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'delete'));
+		$this->assertTrue($this->Acl->check('Micheal', 'printers', 'create'));
+
+		$this->assertFalse($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/view'));
+		$this->assertTrue($this->Acl->allow('root/users/Samir', 'ROOT/tpsReports/view', '*'));
+		$this->assertTrue($this->Acl->check('Samir', 'view', 'read'));
+		$this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/view', 'update'));
+
+		$this->assertFalse($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/update','*'));
+		$this->assertTrue($this->Acl->allow('root/users/Samir', 'ROOT/tpsReports/update', '*'));
+		$this->assertTrue($this->Acl->check('Samir', 'update', 'read'));
+		$this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/update', 'update'));
+		// Samir should still have his tpsReports/view permissions, but does not
+		$this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/view', 'update'));
+
+		$this->expectError('DbAcl::allow() - Invalid node');
+		$this->assertFalse($this->Acl->allow('Lumbergh', 'ROOT/tpsReports/DoesNotExist', 'create'));
+
+		$this->expectError('DbAcl::allow() - Invalid node');
+		$this->assertFalse($this->Acl->allow('Homer', 'tpsReports', 'create'));
+	}
+
+/**
+ * testDbAclCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testDbAclCheck() {
+		$this->assertTrue($this->Acl->check('Samir', 'print', 'read'));
+		$this->assertTrue($this->Acl->check('Lumbergh', 'current', 'read'));
+		$this->assertFalse($this->Acl->check('Milton', 'smash', 'read'));
+		$this->assertFalse($this->Acl->check('Milton', 'current', 'update'));
+
+		$this->expectError("DbAcl::check() - Failed ARO/ACO node lookup in permissions check.  Node references:\nAro: WRONG\nAco: tpsReports");
+		$this->assertFalse($this->Acl->check('WRONG', 'tpsReports', 'read'));
+
+		$this->expectError("ACO permissions key foobar does not exist in DbAcl::check()");
+		$this->assertFalse($this->Acl->check('Lumbergh', 'smash', 'foobar'));
+
+		$this->expectError("DbAcl::check() - Failed ARO/ACO node lookup in permissions check.  Node references:\nAro: users\nAco: NonExistant");
+		$this->assertFalse($this->Acl->check('users', 'NonExistant', 'read'));
+
+		$this->assertFalse($this->Acl->check(null, 'printers', 'create'));
+		$this->assertFalse($this->Acl->check('managers', null, 'read'));
+
+		$this->assertTrue($this->Acl->check('Bobs', 'ROOT/tpsReports/view/current', 'read'));
+		$this->assertFalse($this->Acl->check('Samir', 'ROOT/tpsReports/update', 'read'));
+
+		$this->assertFalse($this->Acl->check('root/users/Milton', 'smash', 'delete'));
+	}
+
+/**
+ * testDbAclCascadingDeny function
+ *
+ * Setup the acl permissions such that Bobs inherits from admin.
+ * deny Admin delete access to a specific resource, check the permisssions are inherited.
+ *
+ * @access public
+ * @return void
+ */
+	function testDbAclCascadingDeny() {
+		$this->Acl->inherit('Bobs', 'ROOT', '*');
+		$this->assertTrue($this->Acl->check('admin', 'tpsReports', 'delete'));
+		$this->assertTrue($this->Acl->check('Bobs', 'tpsReports', 'delete'));
+		$this->Acl->deny('admin', 'tpsReports', 'delete');
+		$this->assertFalse($this->Acl->check('admin', 'tpsReports', 'delete'));
+		$this->assertFalse($this->Acl->check('Bobs', 'tpsReports', 'delete'));
+	}
+
+/**
+ * testDbAclDeny method
+ *
+ * @access public
+ * @return void
+ */
+	function testDbAclDeny() {
+		$this->assertTrue($this->Acl->check('Micheal', 'smash', 'delete'));
+		$this->Acl->deny('Micheal', 'smash', 'delete');
+		$this->assertFalse($this->Acl->check('Micheal', 'smash', 'delete'));
+		$this->assertTrue($this->Acl->check('Micheal', 'smash', 'read'));
+		$this->assertTrue($this->Acl->check('Micheal', 'smash', 'create'));
+		$this->assertTrue($this->Acl->check('Micheal', 'smash', 'update'));
+		$this->assertFalse($this->Acl->check('Micheal', 'smash', '*'));
+
+		$this->assertTrue($this->Acl->check('Samir', 'refill', '*'));
+		$this->Acl->deny('Samir', 'refill', '*');
+		$this->assertFalse($this->Acl->check('Samir', 'refill', 'create'));
+		$this->assertFalse($this->Acl->check('Samir', 'refill', 'update'));
+		$this->assertFalse($this->Acl->check('Samir', 'refill', 'read'));
+		$this->assertFalse($this->Acl->check('Samir', 'refill', 'delete'));
+
+		$result = $this->Acl->Aro->Permission->find('all', array('conditions' => array('AroTwoTest.alias' => 'Samir')));
+		$expected = '-1';
+		$this->assertEqual($result[0]['PermissionTwoTest']['_delete'], $expected);
+
+		$this->expectError('DbAcl::allow() - Invalid node');
+		$this->assertFalse($this->Acl->deny('Lumbergh', 'ROOT/tpsReports/DoesNotExist', 'create'));
+	}
+
+/**
+ * testAclNodeLookup method
+ *
+ * @access public
+ * @return void
+ */
+	function testAclNodeLookup() {
+		$result = $this->Acl->Aro->node('root/users/Samir');
+		$expected = array(
+			array('AroTwoTest' => array('id' => '7', 'parent_id' => '4', 'model' => 'User', 'foreign_key' => 3, 'alias' => 'Samir')),
+			array('AroTwoTest' => array('id' => '4', 'parent_id' => '1', 'model' => 'Group', 'foreign_key' => 3, 'alias' => 'users')),
+			array('AroTwoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'root'))
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Acl->Aco->node('ROOT/tpsReports/view/current');
+		$expected = array(
+			array('AcoTwoTest' => array('id' => '4', 'parent_id' => '3', 'model' => null, 'foreign_key' => null, 'alias' => 'current')),
+			array('AcoTwoTest' => array('id' => '3', 'parent_id' => '2', 'model' => null, 'foreign_key' => null, 'alias' => 'view')),
+			array('AcoTwoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports')),
+			array('AcoTwoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT')),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDbInherit method
+ *
+ * @access public
+ * @return void
+ */
+	function testDbInherit() {
+		//parent doesn't have access inherit should still deny
+		$this->assertFalse($this->Acl->check('Milton', 'smash', 'delete'));
+		$this->Acl->inherit('Milton', 'smash', 'delete');
+		$this->assertFalse($this->Acl->check('Milton', 'smash', 'delete'));
+
+		//inherit parent
+		$this->assertFalse($this->Acl->check('Milton', 'smash', 'read'));
+		$this->Acl->inherit('Milton', 'smash', 'read');
+		$this->assertTrue($this->Acl->check('Milton', 'smash', 'read'));
+	}
+
+/**
+ * testDbGrant method
+ *
+ * @access public
+ * @return void
+ */
+	function testDbGrant() {
+		$this->assertFalse($this->Acl->check('Samir', 'tpsReports', 'create'));
+		$this->Acl->grant('Samir', 'tpsReports', 'create');
+		$this->assertTrue($this->Acl->check('Samir', 'tpsReports', 'create'));
+
+		$this->assertFalse($this->Acl->check('Micheal', 'view', 'read'));
+		$this->Acl->grant('Micheal', 'view', array('read', 'create', 'update'));
+		$this->assertTrue($this->Acl->check('Micheal', 'view', 'read'));
+		$this->assertTrue($this->Acl->check('Micheal', 'view', 'create'));
+		$this->assertTrue($this->Acl->check('Micheal', 'view', 'update'));
+		$this->assertFalse($this->Acl->check('Micheal', 'view', 'delete'));
+
+		$this->expectError('DbAcl::allow() - Invalid node');
+		$this->assertFalse($this->Acl->grant('Peter', 'ROOT/tpsReports/DoesNotExist', 'create'));
+	}
+
+/**
+ * testDbRevoke method
+ *
+ * @access public
+ * @return void
+ */
+	function testDbRevoke() {
+		$this->assertTrue($this->Acl->check('Bobs', 'tpsReports', 'read'));
+		$this->Acl->revoke('Bobs', 'tpsReports', 'read');
+		$this->assertFalse($this->Acl->check('Bobs', 'tpsReports', 'read'));
+
+		$this->assertTrue($this->Acl->check('users', 'printers', 'read'));
+		$this->Acl->revoke('users', 'printers', 'read');
+		$this->assertFalse($this->Acl->check('users', 'printers', 'read'));
+		$this->assertFalse($this->Acl->check('Samir', 'printers', 'read'));
+		$this->assertFalse($this->Acl->check('Peter', 'printers', 'read'));
+
+		$this->expectError('DbAcl::allow() - Invalid node');
+		$this->assertFalse($this->Acl->deny('Bobs', 'ROOT/printers/DoesNotExist', 'create'));
+	}
+
+/**
+ * testStartup method
+ *
+ * @access public
+ * @return void
+ */
+	function testStartup() {
+		$controller = new Controller();
+		$this->assertTrue($this->Acl->startup($controller));
+	}
+
+/**
+ * testIniReadConfigFile
+ *
+ * @access public
+ * @return void
+ */
+	function testIniReadConfigFile() {
+		Configure::write('Acl.classname', 'IniAclTest');
+		unset($this->Acl);
+		$this->Acl = new AclComponent();
+		$iniFile = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
+		$result = $this->Acl->_Instance->readConfigFile($iniFile);
+		$expected = array(
+			'admin' => array(
+				'groups' => 'administrators',
+				'allow' => '',
+				'deny' => 'ads',
+			),
+			'paul' => array(
+				'groups' => 'users',
+				'allow' =>'',
+				'deny' => '',
+			),
+			'jenny' => array(
+				'groups' => 'users',
+				'allow' => 'ads',
+				'deny' => 'images, files',
+			),
+			'nobody' => array(
+				'groups' => 'anonymous',
+				'allow' => '',
+				'deny' => '',
+			),
+			'administrators' => array(
+				'deny' => '',
+				'allow' => 'posts, comments, images, files, stats, ads',
+			),
+			'users' => array(
+				'allow' => 'posts, comments, images, files',
+				'deny' => 'stats, ads',
+			),
+			'anonymous' => array(
+				'allow' => '',
+				'deny' => 'posts, comments, images, files, stats, ads',
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testIniCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testIniCheck() {
+		Configure::write('Acl.classname', 'IniAclTest');
+		unset($this->Acl);
+		$iniFile = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'config'. DS . 'acl.ini.php';
+
+		$this->Acl = new AclComponent();
+		$this->Acl->_Instance->config= $this->Acl->_Instance->readConfigFile($iniFile);
+
+		$this->assertFalse($this->Acl->check('admin', 'ads'));
+		$this->assertTrue($this->Acl->check('admin', 'posts'));
+
+		$this->assertTrue($this->Acl->check('jenny', 'posts'));
+		$this->assertTrue($this->Acl->check('jenny', 'ads'));
+
+		$this->assertTrue($this->Acl->check('paul', 'posts'));
+		$this->assertFalse($this->Acl->check('paul', 'ads'));
+
+		$this->assertFalse($this->Acl->check('nobody', 'comments'));
+	}
+
+/**
+ * debug function - to help editing/creating test cases for the ACL component
+ *
+ * To check the overal ACL status at any time call $this->__debug();
+ * Generates a list of the current aro and aco structures and a grid dump of the permissions that are defined
+ * Only designed to work with the db based ACL
+ *
+ * @param bool $treesToo
+ * @access private
+ * @return void
+ */
+	function __debug ($printTreesToo = false) {
+		$this->Acl->Aro->displayField = 'alias';
+		$this->Acl->Aco->displayField = 'alias';
+		$aros = $this->Acl->Aro->find('list', array('order' => 'lft'));
+		$acos = $this->Acl->Aco->find('list', array('order' => 'lft'));
+		$rights = array('*', 'create', 'read', 'update', 'delete');
+		$permissions['Aros v Acos >'] = $acos;
+		foreach ($aros as $aro) {
+			$row = array();
+			foreach ($acos as $aco) {
+				$perms = '';
+				foreach ($rights as $right) {
+					if ($this->Acl->check($aro, $aco, $right)) {
+						if ($right == '*') {
+							$perms .= '****';
+							break;
+						}
+						$perms .= $right[0];
+					} elseif ($right != '*') {
+						$perms .= ' ';
+					}
+				}
+				$row[] = $perms;
+			}
+			$permissions[$aro] = $row;
+		}
+		foreach ($permissions as $key => $values) {
+			array_unshift($values, $key);
+			$values = array_map(array(&$this, '__pad'), $values);
+			$permissions[$key] = implode (' ', $values);
+		}
+		$permisssions = array_map(array(&$this, '__pad'), $permissions);
+		array_unshift($permissions, 'Current Permissions :');
+		if ($printTreesToo) {
+			debug (array('aros' => $this->Acl->Aro->generateTreeList(), 'acos' => $this->Acl->Aco->generateTreeList()));
+		}
+		debug (implode("\r\n", $permissions));
+	}
+
+/**
+ * pad function
+ * Used by debug to format strings used in the data dump
+ *
+ * @param string $string
+ * @param int $len
+ * @access private
+ * @return void
+ */
+	function __pad($string = '', $len = 14) {
+		return str_pad($string, $len);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/auth.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/auth.test.php
new file mode 100644
index 000000000..c626d2ccf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/auth.test.php
@@ -0,0 +1,1657 @@
+<?php
+/**
+ * AuthComponentTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.cases.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.5347
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Component', array('Auth', 'Acl'));
+App::import('Model', 'DbAcl');
+App::import('Core', 'Xml');
+
+Mock::generate('AclComponent', 'AuthTestMockAclComponent');
+
+/**
+* TestAuthComponent class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class TestAuthComponent extends AuthComponent {
+
+/**
+ * testStop property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $testStop = false;
+
+/**
+ * Sets default login state
+ *
+ * @var bool true
+ * @access protected
+ */
+	var $_loggedIn = true;
+
+/**
+ * stop method
+ *
+ * @access public
+ * @return void
+ */
+	function _stop() {
+		$this->testStop = true;
+	}
+}
+
+/**
+* AuthUser class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class AuthUser extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'AuthUser'
+ * @access public
+ */
+	var $name = 'AuthUser';
+
+/**
+ * useDbConfig property
+ *
+ * @var string 'test_suite'
+ * @access public
+ */
+	var $useDbConfig = 'test_suite';
+
+/**
+ * parentNode method
+ *
+ * @access public
+ * @return void
+ */
+	function parentNode() {
+		return true;
+	}
+
+/**
+ * bindNode method
+ *
+ * @param mixed $object
+ * @access public
+ * @return void
+ */
+	function bindNode($object) {
+		return 'Roles/Admin';
+	}
+
+/**
+ * isAuthorized method
+ *
+ * @param mixed $user
+ * @param mixed $controller
+ * @param mixed $action
+ * @access public
+ * @return void
+ */
+	function isAuthorized($user, $controller = null, $action = null) {
+		if (!empty($user)) {
+			return true;
+		}
+		return false;
+	}
+}
+
+/**
+ * AuthUserCustomField class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class AuthUserCustomField extends AuthUser {
+
+/**
+ * name property
+ *
+ * @var string 'AuthUser'
+ * @access public
+ */
+	var $name = 'AuthUserCustomField';
+}
+
+/**
+* UuidUser class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class UuidUser extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'AuthUser'
+ * @access public
+ */
+	var $name = 'UuidUser';
+
+/**
+ * useDbConfig property
+ *
+ * @var string 'test_suite'
+ * @access public
+ */
+	var $useDbConfig = 'test_suite';
+
+/**
+ * useTable property
+ *
+ * @var string 'uuid'
+ * @access public
+ */
+	var $useTable = 'uuids';
+
+/**
+ * parentNode method
+ *
+ * @access public
+ * @return void
+ */
+	function parentNode() {
+		return true;
+	}
+
+/**
+ * bindNode method
+ *
+ * @param mixed $object
+ * @access public
+ * @return void
+ */
+	function bindNode($object) {
+		return 'Roles/Admin';
+	}
+
+/**
+ * isAuthorized method
+ *
+ * @param mixed $user
+ * @param mixed $controller
+ * @param mixed $action
+ * @access public
+ * @return void
+ */
+	function isAuthorized($user, $controller = null, $action = null) {
+		if (!empty($user)) {
+			return true;
+		}
+		return false;
+	}
+}
+
+/**
+* AuthTestController class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class AuthTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'AuthTest'
+ * @access public
+ */
+	var $name = 'AuthTest';
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array('AuthUser');
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Session', 'Auth', 'Acl');
+
+/**
+ * testUrl property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $testUrl = null;
+
+/**
+ * construct method
+ *
+ * @access private
+ * @return void
+ */
+	function __construct() {
+		$this->params = Router::parse('/auth_test');
+		Router::setRequestInfo(array($this->params, array('base' => null, 'here' => '/auth_test', 'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())));
+		parent::__construct();
+	}
+
+/**
+ * beforeFilter method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeFilter() {
+		$this->Auth->userModel = 'AuthUser';
+	}
+
+/**
+ * login method
+ *
+ * @access public
+ * @return void
+ */
+	function login() {
+	}
+
+/**
+ * admin_login method
+ *
+ * @access public
+ * @return void
+ */
+	function admin_login() {
+	}
+
+/**
+ * logout method
+ *
+ * @access public
+ * @return void
+ */
+	function logout() {
+		// $this->redirect($this->Auth->logout());
+	}
+
+/**
+ * add method
+ *
+ * @access public
+ * @return void
+ */
+	function add() {
+		echo "add";
+	}
+
+/**
+ * add method
+ *
+ * @access public
+ * @return void
+ */
+	function camelCase() {
+		echo "camelCase";
+	}
+
+/**
+ * redirect method
+ *
+ * @param mixed $url
+ * @param mixed $status
+ * @param mixed $exit
+ * @access public
+ * @return void
+ */
+	function redirect($url, $status = null, $exit = true) {
+		$this->testUrl = Router::url($url);
+		return false;
+	}
+
+/**
+ * isAuthorized method
+ *
+ * @access public
+ * @return void
+ */
+	function isAuthorized() {
+		if (isset($this->params['testControllerAuth'])) {
+			return false;
+		}
+		return true;
+	}
+
+/**
+ * Mock delete method
+ *
+ * @param mixed $url
+ * @param mixed $status
+ * @param mixed $exit
+ * @access public
+ * @return void
+ */
+	function delete($id = null) {
+		if ($this->TestAuth->testStop !== true && $id !== null) {
+			echo 'Deleted Record: ' . var_export($id, true);
+		}
+	}
+}
+
+/**
+ * AjaxAuthController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class AjaxAuthController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'AjaxAuth'
+ * @access public
+ */
+	var $name = 'AjaxAuth';
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Session', 'TestAuth');
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * testUrl property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $testUrl = null;
+
+/**
+ * beforeFilter method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeFilter() {
+		$this->TestAuth->ajaxLogin = 'test_element';
+		$this->TestAuth->userModel = 'AuthUser';
+		$this->TestAuth->RequestHandler->ajaxLayout = 'ajax2';
+	}
+
+/**
+ * add method
+ *
+ * @access public
+ * @return void
+ */
+	function add() {
+		if ($this->TestAuth->testStop !== true) {
+			echo 'Added Record';
+		}
+	}
+
+/**
+ * redirect method
+ *
+ * @param mixed $url
+ * @param mixed $status
+ * @param mixed $exit
+ * @access public
+ * @return void
+ */
+	function redirect($url, $status = null, $exit = true) {
+		$this->testUrl = Router::url($url);
+		return false;
+	}
+}
+
+/**
+* AuthTest class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class AuthTest extends CakeTestCase {
+
+/**
+ * name property
+ *
+ * @var string 'Auth'
+ * @access public
+ */
+	var $name = 'Auth';
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.uuid', 'core.auth_user', 'core.auth_user_custom_field', 'core.aro', 'core.aco', 'core.aros_aco', 'core.aco_action');
+
+/**
+ * initialized property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $initialized = false;
+
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->_server = $_SERVER;
+		$this->_env = $_ENV;
+
+		$this->_securitySalt = Configure::read('Security.salt');
+		Configure::write('Security.salt', 'JfIxfs2guVoUubWDYhG93b0qyJfIxfs2guwvniR2G0FgaC9mi');
+
+		$this->_acl = Configure::read('Acl');
+		Configure::write('Acl.database', 'test_suite');
+		Configure::write('Acl.classname', 'DbAcl');
+
+		$this->Controller =& new AuthTestController();
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->beforeFilter();
+
+		ClassRegistry::addObject('view', new View($this->Controller));
+
+		$this->Controller->Session->delete('Auth');
+		$this->Controller->Session->delete('Message.auth');
+
+		Router::reload();
+
+		$this->initialized = true;
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		$_SERVER = $this->_server;
+		$_ENV = $this->_env;
+		Configure::write('Acl', $this->_acl);
+		Configure::write('Security.salt', $this->_securitySalt);
+
+		$this->Controller->Session->delete('Auth');
+		$this->Controller->Session->delete('Message.auth');
+		ClassRegistry::flush();
+		unset($this->Controller, $this->AuthUser);
+	}
+
+/**
+ * testNoAuth method
+ *
+ * @access public
+ * @return void
+ */
+	function testNoAuth() {
+		$this->assertFalse($this->Controller->Auth->isAuthorized());
+	}
+
+/**
+ * testIsErrorOrTests
+ *
+ * @access public
+ * @return void
+ */
+	function testIsErrorOrTests() {
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->name = 'CakeError';
+		$this->assertTrue($this->Controller->Auth->startup($this->Controller));
+
+		$this->Controller->name = 'Post';
+		$this->Controller->params['action'] = 'thisdoesnotexist';
+		$this->assertTrue($this->Controller->Auth->startup($this->Controller));
+
+		$this->Controller->scaffold = null;
+		$this->Controller->params['action'] = 'index';
+		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
+	}
+
+/**
+ * testIdentify method
+ *
+ * @access public
+ * @return void
+ */
+	function testIdentify() {
+		$this->AuthUser =& new AuthUser();
+		$user['id'] = 1;
+		$user['username'] = 'mariano';
+		$user['password'] = Security::hash(Configure::read('Security.salt') . 'cake');
+		$this->AuthUser->save($user, false);
+
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($this->Controller->Auth->identify($user));
+	}
+
+/**
+ * testIdentifyWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testIdentifyWithConditions() {
+		$this->AuthUser =& new AuthUser();
+		$user['id'] = 1;
+		$user['username'] = 'mariano';
+		$user['password'] = Security::hash(Configure::read('Security.salt') . 'cake');
+		$this->AuthUser->save($user, false);
+
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->startup($this->Controller);
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->assertFalse($this->Controller->Auth->identify($user, array('AuthUser.id >' => 2)));
+
+		$this->Controller->Auth->userScope = array('id >' => 2);
+		$this->assertFalse($this->Controller->Auth->identify($user));
+		$this->assertTrue($this->Controller->Auth->identify($user, false));
+	}
+
+/**
+ * testLogin method
+ *
+ * @access public
+ * @return void
+ */
+	function testLogin() {
+		$this->AuthUser =& new AuthUser();
+		$user['id'] = 1;
+		$user['username'] = 'mariano';
+		$user['password'] = Security::hash(Configure::read('Security.salt') . 'cake');
+		$this->AuthUser->save($user, false);
+
+		$authUser = $this->AuthUser->find();
+
+		$this->Controller->data['AuthUser']['username'] = $authUser['AuthUser']['username'];
+		$this->Controller->data['AuthUser']['password'] = 'cake';
+
+		$this->Controller->params = Router::parse('auth_test/login');
+		$this->Controller->params['url']['url'] = 'auth_test/login';
+
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->loginAction = 'auth_test/login';
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$user = $this->Controller->Auth->user();
+		$expected = array('AuthUser' => array(
+			'id' => 1, 'username' => 'mariano', 'created' => '2007-03-17 01:16:23', 'updated' => date('Y-m-d H:i:s')
+		));
+		$this->assertEqual($user, $expected);
+		$this->Controller->Session->delete('Auth');
+
+		$this->Controller->data['AuthUser']['username'] = 'blah';
+		$this->Controller->data['AuthUser']['password'] = '';
+
+		$this->Controller->Auth->startup($this->Controller);
+
+		$user = $this->Controller->Auth->user();
+		$this->assertFalse($user);
+		$this->Controller->Session->delete('Auth');
+
+		$this->Controller->data['AuthUser']['username'] = 'now() or 1=1 --';
+		$this->Controller->data['AuthUser']['password'] = '';
+
+		$this->Controller->Auth->startup($this->Controller);
+
+		$user = $this->Controller->Auth->user();
+		$this->assertFalse($user);
+		$this->Controller->Session->delete('Auth');
+
+		$this->Controller->data['AuthUser']['username'] = 'now() or 1=1 # something';
+		$this->Controller->data['AuthUser']['password'] = '';
+
+		$this->Controller->Auth->startup($this->Controller);
+
+		$user = $this->Controller->Auth->user();
+		$this->assertFalse($user);
+		$this->Controller->Session->delete('Auth');
+
+		$this->Controller->Auth->userModel = 'UuidUser';
+		$this->Controller->Auth->login('47c36f9c-bc00-4d17-9626-4e183ca6822b');
+
+		$user = $this->Controller->Auth->user();
+		$expected = array('UuidUser' => array(
+			'id' => '47c36f9c-bc00-4d17-9626-4e183ca6822b', 'title' => 'Unique record 1', 'count' => 2, 'created' => '2008-03-13 01:16:23', 'updated' => '2008-03-13 01:18:31'
+		));
+		$this->assertEqual($user, $expected);
+		$this->Controller->Session->delete('Auth');
+	}
+
+/**
+ * test that being redirected to the login page, with no post data does
+ * not set the session value.  Saving the session value in this circumstance
+ * can cause the user to be redirected to an already public page.
+ *
+ * @return void
+ */
+	function testLoginActionNotSettingAuthRedirect() {
+		$_referer = $_SERVER['HTTP_REFERER'];
+		$_SERVER['HTTP_REFERER'] = '/pages/display/about';
+
+		$this->Controller->data = array();
+		$this->Controller->params = Router::parse('auth_test/login');
+		$this->Controller->params['url']['url'] = 'auth_test/login';
+		$this->Controller->Session->delete('Auth');
+
+		$this->Controller->Auth->loginRedirect = '/users/dashboard';
+		$this->Controller->Auth->loginAction = 'auth_test/login';
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$redirect = $this->Controller->Session->read('Auth.redirect');
+		$this->assertNull($redirect);
+	}
+
+/**
+ * testAuthorizeFalse method
+ *
+ * @access public
+ * @return void
+ */
+	function testAuthorizeFalse() {
+		$this->AuthUser =& new AuthUser();
+		$user = $this->AuthUser->find();
+		$this->Controller->Session->write('Auth', $user);
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->authorize = false;
+		$this->Controller->params = Router::parse('auth_test/add');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result);
+
+		$this->Controller->Session->delete('Auth');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertFalse($result);
+		$this->assertTrue($this->Controller->Session->check('Message.auth'));
+
+		$this->Controller->params = Router::parse('auth_test/camelCase');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertFalse($result);
+	}
+
+/**
+ * testAuthorizeController method
+ *
+ * @access public
+ * @return void
+ */
+	function testAuthorizeController() {
+		$this->AuthUser =& new AuthUser();
+		$user = $this->AuthUser->find();
+		$this->Controller->Session->write('Auth', $user);
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->authorize = 'controller';
+		$this->Controller->params = Router::parse('auth_test/add');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result);
+
+		$this->Controller->params['testControllerAuth'] = 1;
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($this->Controller->Session->check('Message.auth'));
+		$this->assertFalse($result);
+
+		$this->Controller->Session->delete('Auth');
+	}
+
+/**
+ * testAuthorizeModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testAuthorizeModel() {
+		$this->AuthUser =& new AuthUser();
+		$user = $this->AuthUser->find();
+		$this->Controller->Session->write('Auth', $user);
+
+		$this->Controller->params['controller'] = 'auth_test';
+		$this->Controller->params['action'] = 'add';
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->authorize = array('model'=>'AuthUser');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result);
+
+		$this->Controller->Session->delete('Auth');
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($this->Controller->Session->check('Message.auth'));
+		$result = $this->Controller->Auth->isAuthorized();
+		$this->assertFalse($result);
+	}
+
+/**
+ * testAuthorizeCrud method
+ *
+ * @access public
+ * @return void
+ */
+	function testAuthorizeCrud() {
+		$this->AuthUser =& new AuthUser();
+		$user = $this->AuthUser->find();
+		$this->Controller->Session->write('Auth', $user);
+
+		$this->Controller->params['controller'] = 'auth_test';
+		$this->Controller->params['action'] = 'add';
+
+		$this->Controller->Acl->name = 'DbAclTest';
+
+		$this->Controller->Acl->Aro->id = null;
+		$this->Controller->Acl->Aro->create(array('alias' => 'Roles'));
+		$result = $this->Controller->Acl->Aro->save();
+		$this->assertTrue($result);
+
+		$parent = $this->Controller->Acl->Aro->id;
+
+		$this->Controller->Acl->Aro->create(array('parent_id' => $parent, 'alias' => 'Admin'));
+		$result = $this->Controller->Acl->Aro->save();
+		$this->assertTrue($result);
+
+		$parent = $this->Controller->Acl->Aro->id;
+
+		$this->Controller->Acl->Aro->create(array(
+			'model' => 'AuthUser', 'parent_id' => $parent, 'foreign_key' => 1, 'alias'=> 'mariano'
+		));
+		$result = $this->Controller->Acl->Aro->save();
+		$this->assertTrue($result);
+
+		$this->Controller->Acl->Aco->create(array('alias' => 'Root'));
+		$result = $this->Controller->Acl->Aco->save();
+		$this->assertTrue($result);
+
+		$parent = $this->Controller->Acl->Aco->id;
+
+		$this->Controller->Acl->Aco->create(array('parent_id' => $parent, 'alias' => 'AuthTest'));
+		$result = $this->Controller->Acl->Aco->save();
+		$this->assertTrue($result);
+
+		$this->Controller->Acl->allow('Roles/Admin', 'Root');
+		$this->Controller->Acl->allow('Roles/Admin', 'Root/AuthTest');
+
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->authorize = 'crud';
+		$this->Controller->Auth->actionPath = 'Root/';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($this->Controller->Auth->isAuthorized());
+
+		$this->Controller->Session->delete('Auth');
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($this->Controller->Session->check('Message.auth'));
+	}
+
+/**
+ * test authorize = 'actions' setting.
+ *
+ * @return void
+ */
+	function testAuthorizeActions() {
+		$this->AuthUser =& new AuthUser();
+		$user = $this->AuthUser->find();
+		$this->Controller->Session->write('Auth', $user);
+		$this->Controller->params['controller'] = 'auth_test';
+		$this->Controller->params['action'] = 'add';
+
+		$this->Controller->Acl =& new AuthTestMockAclComponent();
+		$this->Controller->Acl->setReturnValue('check', true);
+
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->authorize = 'actions';
+		$this->Controller->Auth->actionPath = 'Root/';
+
+		$this->Controller->Acl->expectAt(0, 'check', array(
+			$user, 'Root/AuthTest/add'
+		));
+
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($this->Controller->Auth->isAuthorized());
+	}
+
+/**
+ * Tests that deny always takes precedence over allow
+ *
+ * @access public
+ * @return void
+ */
+	function testAllowDenyAll() {
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->allow('*');
+		$this->Controller->Auth->deny('add', 'camelcase');
+
+		$this->Controller->params['action'] = 'delete';
+		$this->assertTrue($this->Controller->Auth->startup($this->Controller));
+
+		$this->Controller->params['action'] = 'add';
+		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
+
+		$this->Controller->params['action'] = 'Add';
+		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
+
+		$this->Controller->params['action'] = 'camelCase';
+		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
+
+		$this->Controller->Auth->allow('*');
+		$this->Controller->Auth->deny(array('add', 'camelcase'));
+
+		$this->Controller->params['action'] = 'camelCase';
+		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
+	}
+
+/**
+ * test the action() method
+ *
+ * @return void
+ */
+	function testActionMethod() {
+		$this->Controller->params['controller'] = 'auth_test';
+		$this->Controller->params['action'] = 'add';
+
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->actionPath = 'ROOT/';
+
+		$result = $this->Controller->Auth->action();
+		$this->assertEqual($result, 'ROOT/AuthTest/add');
+
+		$result = $this->Controller->Auth->action(':controller');
+		$this->assertEqual($result, 'ROOT/AuthTest');
+
+		$result = $this->Controller->Auth->action(':controller');
+		$this->assertEqual($result, 'ROOT/AuthTest');
+
+		$this->Controller->params['plugin'] = 'test_plugin';
+		$this->Controller->params['controller'] = 'auth_test';
+		$this->Controller->params['action'] = 'add';
+		$this->Controller->Auth->initialize($this->Controller);
+		$result = $this->Controller->Auth->action();
+		$this->assertEqual($result, 'ROOT/TestPlugin/AuthTest/add');
+	}
+
+/**
+ * test that deny() converts camel case inputs to lowercase.
+ *
+ * @return void
+ */
+	function testDenyWithCamelCaseMethods() {
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->allow('*');
+		$this->Controller->Auth->deny('add', 'camelCase');
+
+		$url = '/auth_test/camelCase';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+
+		$this->assertFalse($this->Controller->Auth->startup($this->Controller));
+	}
+
+/**
+ * test that allow() and allowedActions work with camelCase method names.
+ *
+ * @return void
+ */
+	function testAllowedActionsWithCamelCaseMethods() {
+		$url = '/auth_test/camelCase';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->allow('*');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result, 'startup() should return true, as action is allowed. %s');
+
+		$url = '/auth_test/camelCase';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->allowedActions = array('delete', 'camelCase', 'add');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result, 'startup() should return true, as action is allowed. %s');
+
+		$this->Controller->Auth->allowedActions = array('delete', 'add');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertFalse($result, 'startup() should return false, as action is not allowed. %s');
+
+		$url = '/auth_test/delete';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->allow(array('delete', 'add'));
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result, 'startup() should return true, as action is allowed. %s');
+	}
+
+	function testAllowedActionsSetWithAllowMethod() {
+		$url = '/auth_test/action_name';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->allow('action_name', 'anotherAction');
+		$this->assertEqual($this->Controller->Auth->allowedActions, array('action_name', 'anotheraction'));
+	}
+
+/**
+ * testLoginRedirect method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoginRedirect() {
+		if (isset($_SERVER['HTTP_REFERER'])) {
+			$backup = $_SERVER['HTTP_REFERER'];
+		} else {
+			$backup = null;
+		}
+
+		$_SERVER['HTTP_REFERER'] = false;
+
+		$this->Controller->Session->write('Auth', array(
+			'AuthUser' => array('id' => '1', 'username' => 'nate')
+		));
+
+		$this->Controller->params = Router::parse('users/login');
+		$this->Controller->params['url']['url'] = 'users/login';
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->loginRedirect = array(
+			'controller' => 'pages', 'action' => 'display', 'welcome'
+		);
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize($this->Controller->Auth->loginRedirect);
+		$this->assertEqual($expected, $this->Controller->Auth->redirect());
+
+		$this->Controller->Session->delete('Auth');
+
+		$this->Controller->params['url']['url'] = 'admin/';
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->loginRedirect = null;
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('admin/');
+		$this->assertTrue($this->Controller->Session->check('Message.auth'));
+		$this->assertEqual($expected, $this->Controller->Auth->redirect());
+
+		$this->Controller->Session->delete('Auth');
+
+		//empty referer no session
+		$_SERVER['HTTP_REFERER'] = false;
+		$_ENV['HTTP_REFERER'] = false;
+		putenv('HTTP_REFERER=');
+		$url = '/posts/view/1';
+
+		$this->Controller->Session->write('Auth', array(
+			'AuthUser' => array('id' => '1', 'username' => 'nate'))
+		);
+		$this->Controller->testUrl = null;
+		$this->Controller->params = Router::parse($url);
+		array_push($this->Controller->methods, 'view', 'edit', 'index');
+
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->authorize = 'controller';
+		$this->Controller->params['testControllerAuth'] = true;
+
+		$this->Controller->Auth->loginAction = array(
+			'controller' => 'AuthTest', 'action' => 'login'
+		);
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('/');
+		$this->assertEqual($expected, $this->Controller->testUrl);
+
+
+		$this->Controller->Session->delete('Auth');
+		$_SERVER['HTTP_REFERER'] = Router::url('/admin/', true);
+
+		$this->Controller->Session->write('Auth', array(
+			'AuthUser' => array('id'=>'1', 'username'=>'nate'))
+		);
+		$this->Controller->params['url']['url'] = 'auth_test/login';
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = 'auth_test/login';
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->loginRedirect = false;
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('/admin');
+		$this->assertEqual($expected, $this->Controller->Auth->redirect());
+
+		//Ticket #4750
+		//named params
+		$this->Controller->Session->delete('Auth');
+		$url = '/posts/index/year:2008/month:feb';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('posts/index/year:2008/month:feb');
+		$this->assertEqual($expected, $this->Controller->Session->read('Auth.redirect'));
+
+		//passed args
+		$this->Controller->Session->delete('Auth');
+		$url = '/posts/view/1';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('posts/view/1');
+		$this->assertEqual($expected, $this->Controller->Session->read('Auth.redirect'));
+
+        // QueryString parameters
+		$_back = $_GET;
+		$_GET = array(
+			'url' => '/posts/index/29',
+			'print' => 'true',
+			'refer' => 'menu'
+		);
+		$this->Controller->Session->delete('Auth');
+		$url = '/posts/index/29?print=true&refer=menu';
+		$this->Controller->params = Dispatcher::parseParams($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('posts/index/29?print=true&refer=menu');
+		$this->assertEqual($expected, $this->Controller->Session->read('Auth.redirect'));
+
+		$_GET = array(
+			'url' => '/posts/index/29',
+			'print' => 'true',
+			'refer' => 'menu',
+			'ext' => 'html'
+		);
+		$this->Controller->Session->delete('Auth');
+		$url = '/posts/index/29?print=true&refer=menu';
+		$this->Controller->params = Dispatcher::parseParams($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('posts/index/29?print=true&refer=menu');
+		$this->assertEqual($expected, $this->Controller->Session->read('Auth.redirect'));
+		$_GET = $_back;
+
+		//external authed action
+		$_SERVER['HTTP_REFERER'] = 'http://webmail.example.com/view/message';
+		$this->Controller->Session->delete('Auth');
+		$url = '/posts/edit/1';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('/posts/edit/1');
+		$this->assertEqual($expected, $this->Controller->Session->read('Auth.redirect'));
+
+		//external direct login link
+		$_SERVER['HTTP_REFERER'] = 'http://webmail.example.com/view/message';
+		$this->Controller->Session->delete('Auth');
+		$url = '/AuthTest/login';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = Router::normalize($url);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'AuthTest', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$expected = Router::normalize('/');
+		$this->assertEqual($expected, $this->Controller->Session->read('Auth.redirect'));
+
+		$_SERVER['HTTP_REFERER'] = $backup;
+		$this->Controller->Session->delete('Auth');
+	}
+
+/**
+ * Ensure that no redirect is performed when a 404 is reached
+ * And the user doesn't have a session.
+ *
+ * @return void
+ */
+	function testNoRedirectOn404() {
+		$this->Controller->Session->delete('Auth');
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->params = Router::parse('auth_test/something_totally_wrong');
+		$result = $this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue($result, 'Auth redirected a missing action %s');
+	}
+
+/**
+ * testEmptyUsernameOrPassword method
+ *
+ * @access public
+ * @return void
+ */
+	function testEmptyUsernameOrPassword() {
+		$this->AuthUser =& new AuthUser();
+		$user['id'] = 1;
+		$user['username'] = 'mariano';
+		$user['password'] = Security::hash(Configure::read('Security.salt') . 'cake');
+		$this->AuthUser->save($user, false);
+
+		$authUser = $this->AuthUser->find();
+
+		$this->Controller->data['AuthUser']['username'] = '';
+		$this->Controller->data['AuthUser']['password'] = '';
+
+		$this->Controller->params = Router::parse('auth_test/login');
+		$this->Controller->params['url']['url'] = 'auth_test/login';
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = 'auth_test/login';
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$user = $this->Controller->Auth->user();
+		$this->assertTrue($this->Controller->Session->check('Message.auth'));
+		$this->assertEqual($user, false);
+		$this->Controller->Session->delete('Auth');
+	}
+
+/**
+ * testInjection method
+ *
+ * @access public
+ * @return void
+ */
+	function testInjection() {
+		$this->AuthUser =& new AuthUser();
+		$this->AuthUser->id = 2;
+		$this->AuthUser->saveField('password', Security::hash(Configure::read('Security.salt') . 'cake'));
+
+		$this->Controller->data['AuthUser']['username'] = 'nate';
+		$this->Controller->data['AuthUser']['password'] = 'cake';
+		$this->Controller->params = Router::parse('auth_test/login');
+		$this->Controller->params['url']['url'] = 'auth_test/login';
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->loginAction = 'auth_test/login';
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue(is_array($this->Controller->Auth->user()));
+
+		$this->Controller->Session->delete($this->Controller->Auth->sessionKey);
+
+		$this->Controller->data['AuthUser']['username'] = 'nate';
+		$this->Controller->data['AuthUser']['password'] = 'cake1';
+		$this->Controller->params['url']['url'] = 'auth_test/login';
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->loginAction = 'auth_test/login';
+		$this->Controller->Auth->userModel = 'AuthUser';
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue(is_null($this->Controller->Auth->user()));
+
+		$this->Controller->Session->delete($this->Controller->Auth->sessionKey);
+
+		$this->Controller->data['AuthUser']['username'] = '> n';
+		$this->Controller->data['AuthUser']['password'] = 'cake';
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue(is_null($this->Controller->Auth->user()));
+
+		unset($this->Controller->data['AuthUser']['password']);
+		$this->Controller->data['AuthUser']['username'] = "1'1";
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue(is_null($this->Controller->Auth->user()));
+
+		unset($this->Controller->data['AuthUser']['username']);
+		$this->Controller->data['AuthUser']['password'] = "1'1";
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertTrue(is_null($this->Controller->Auth->user()));
+	}
+
+/**
+ * test Hashing of passwords
+ *
+ * @return void
+ */
+	function testHashPasswords() {
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$data['AuthUser']['password'] = 'superSecret';
+		$data['AuthUser']['username'] = 'superman@dailyplanet.com';
+		$return = $this->Controller->Auth->hashPasswords($data);
+		$expected = $data;
+		$expected['AuthUser']['password'] = Security::hash($expected['AuthUser']['password'], null, true);
+		$this->assertEqual($return, $expected);
+
+		$data['Wrong']['password'] = 'superSecret';
+		$data['Wrong']['username'] = 'superman@dailyplanet.com';
+		$data['AuthUser']['password'] = 'IcantTellYou';
+		$return = $this->Controller->Auth->hashPasswords($data);
+		$expected = $data;
+		$expected['AuthUser']['password'] = Security::hash($expected['AuthUser']['password'], null, true);
+		$this->assertEqual($return, $expected);
+
+		if (PHP5) {
+			$xml = array(
+				'User' => array(
+					'username' => 'batman@batcave.com',
+					'password' => 'bruceWayne',
+				)
+			);
+			$data =& new Xml($xml);
+			$return = $this->Controller->Auth->hashPasswords($data);
+			$expected = $data;
+			$this->assertEqual($return, $expected);
+		}
+	}
+
+/**
+ * testCustomRoute method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomRoute() {
+		Router::reload();
+		Router::connect(
+			'/:lang/:controller/:action/*',
+			array('lang' => null),
+			array('lang' => '[a-z]{2,3}')
+		);
+
+		$url = '/en/users/login';
+		$this->Controller->params = Router::parse($url);
+		Router::setRequestInfo(array($this->Controller->passedArgs, array(
+			'base' => null, 'here' => $url, 'webroot' => '/', 'passedArgs' => array(),
+			'argSeparator' => ':', 'namedArgs' => array()
+		)));
+
+		$this->AuthUser =& new AuthUser();
+		$user = array(
+			'id' => 1, 'username' => 'felix',
+			'password' => Security::hash(Configure::read('Security.salt') . 'cake'
+		));
+		$user = $this->AuthUser->save($user, false);
+
+		$this->Controller->data['AuthUser'] = array('username' => 'felix', 'password' => 'cake');
+		$this->Controller->params['url']['url'] = substr($url, 1);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('lang' => 'en', 'controller' => 'users', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$user = $this->Controller->Auth->user();
+		$this->assertTrue(!!$user);
+
+		$this->Controller->Session->delete('Auth');
+		Router::reload();
+		Router::connect('/', array('controller' => 'people', 'action' => 'login'));
+		$url = '/';
+		$this->Controller->params = Router::parse($url);
+		Router::setRequestInfo(array($this->Controller->passedArgs, array(
+			'base' => null, 'here' => $url, 'webroot' => '/', 'passedArgs' => array(),
+			'argSeparator' => ':', 'namedArgs' => array()
+		)));
+		$this->Controller->data['AuthUser'] = array('username' => 'felix', 'password' => 'cake');
+		$this->Controller->params['url']['url'] = substr($url, 1);
+		$this->Controller->Auth->initialize($this->Controller);
+		$this->Controller->Auth->loginAction = array('controller' => 'people', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$user = $this->Controller->Auth->user();
+		$this->assertTrue(!!$user);
+	}
+
+/**
+ * testCustomField method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomField() {
+		Router::reload();
+
+		$this->AuthUserCustomField =& new AuthUserCustomField();
+		$user = array(
+			'id' => 1, 'email' => 'harking@example.com',
+			'password' => Security::hash(Configure::read('Security.salt') . 'cake'
+		));
+		$user = $this->AuthUserCustomField->save($user, false);
+
+		Router::connect('/', array('controller' => 'people', 'action' => 'login'));
+		$url = '/';
+		$this->Controller->params = Router::parse($url);
+		Router::setRequestInfo(array($this->Controller->passedArgs, array(
+			'base' => null, 'here' => $url, 'webroot' => '/', 'passedArgs' => array(),
+			'argSeparator' => ':', 'namedArgs' => array()
+		)));
+		$this->Controller->data['AuthUserCustomField'] = array('email' => 'harking@example.com', 'password' => 'cake');
+		$this->Controller->params['url']['url'] = substr($url, 1);
+		$this->Controller->Auth->initialize($this->Controller);
+        $this->Controller->Auth->fields = array('username' => 'email', 'password' => 'password');
+		$this->Controller->Auth->loginAction = array('controller' => 'people', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUserCustomField';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$user = $this->Controller->Auth->user();
+		$this->assertTrue(!!$user);
+    }
+
+/**
+ * testAdminRoute method
+ *
+ * @access public
+ * @return void
+ */
+	function testAdminRoute() {
+		$prefixes = Configure::read('Routing.prefixes');
+		Configure::write('Routing.prefixes', array('admin'));
+		Router::reload();
+
+		$url = '/admin/auth_test/add';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = ltrim($url, '/');
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(), 'action' => 'add', 'plugin' => null,
+				'controller' => 'auth_test', 'admin' => true,
+				'url' => array('url' => $this->Controller->params['url']['url'])
+			),
+			array(
+				'base' => null, 'here' => $url,
+				'webroot' => '/', 'passedArgs' => array(),
+			)
+		));
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->loginAction = array(
+			'admin' => true, 'controller' => 'auth_test', 'action' => 'login'
+		);
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$this->assertEqual($this->Controller->testUrl, '/admin/auth_test/login');
+
+		Configure::write('Routing.prefixes', $prefixes);
+	}
+
+/**
+ * testPluginModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginModel() {
+		// Adding plugins
+		Cache::delete('object_map', '_cake_core_');
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS)
+		), true);
+		App::objects('plugin', null, false);
+
+		$PluginModel =& ClassRegistry::init('TestPlugin.TestPluginAuthUser');
+		$user['id'] = 1;
+		$user['username'] = 'gwoo';
+		$user['password'] = Security::hash(Configure::read('Security.salt') . 'cake');
+		$PluginModel->save($user, false);
+
+		$authUser = $PluginModel->find();
+
+		$this->Controller->data['TestPluginAuthUser']['username'] = $authUser['TestPluginAuthUser']['username'];
+		$this->Controller->data['TestPluginAuthUser']['password'] = 'cake';
+
+		$this->Controller->params = Router::parse('auth_test/login');
+		$this->Controller->params['url']['url'] = 'auth_test/login';
+
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->loginAction = 'auth_test/login';
+		$this->Controller->Auth->userModel = 'TestPlugin.TestPluginAuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+		$user = $this->Controller->Auth->user();
+		$expected = array('TestPluginAuthUser' => array(
+			'id' => 1, 'username' => 'gwoo', 'created' => '2007-03-17 01:16:23', 'updated' => date('Y-m-d H:i:s')
+		));
+		$this->assertEqual($user, $expected);
+		$sessionKey = $this->Controller->Auth->sessionKey;
+		$this->assertEqual('Auth.TestPluginAuthUser', $sessionKey);
+		
+		$this->Controller->Auth->loginAction = null;
+		$this->Controller->Auth->__setDefaults();
+		$loginAction = $this->Controller->Auth->loginAction;
+		$expected = array(
+		    'controller'	=> 'test_plugin_auth_users',
+		    'action'		=> 'login',
+		    'plugin'		=> 'test_plugin'
+		);
+		$this->assertEqual($loginAction, $expected);
+
+		// Reverting changes
+		Cache::delete('object_map', '_cake_core_');
+		App::build();
+		App::objects('plugin', null, false);
+	}
+
+/**
+ * testAjaxLogin method
+ *
+ * @access public
+ * @return void
+ */
+	function testAjaxLogin() {
+		App::build(array('views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)));
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = "XMLHttpRequest";
+
+		if (!class_exists('dispatcher')) {
+			require CAKE . 'dispatcher.php';
+		}
+
+		ob_start();
+		$Dispatcher =& new Dispatcher();
+		$Dispatcher->dispatch('/ajax_auth/add', array('return' => 1));
+		$result = ob_get_clean();
+		$this->assertEqual("Ajax!\nthis is the test element", str_replace("\r\n", "\n", $result));
+		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
+	}
+
+/**
+ * testLoginActionRedirect method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoginActionRedirect() {
+		$admin = Configure::read('Routing.admin');
+		Configure::write('Routing.admin', 'admin');
+		Router::reload();
+
+		$url = '/admin/auth_test/login';
+		$this->Controller->params = Router::parse($url);
+		$this->Controller->params['url']['url'] = ltrim($url, '/');
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(), 'action' => 'admin_login', 'plugin' => null, 'controller' => 'auth_test',
+				'admin' => true, 'url' => array('url' => $this->Controller->params['url']['url']),
+			),
+			array(
+				'base' => null, 'here' => $url,
+				'webroot' => '/', 'passedArgs' => array(),
+			)
+		));
+
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->Controller->Auth->loginAction = array('admin' => true, 'controller' => 'auth_test', 'action' => 'login');
+		$this->Controller->Auth->userModel = 'AuthUser';
+
+		$this->Controller->Auth->startup($this->Controller);
+
+		$this->assertNull($this->Controller->testUrl);
+
+		Configure::write('Routing.admin', $admin);
+	}
+
+/**
+ * Tests that shutdown destroys the redirect session var
+ *
+ * @access public
+ * @return void
+ */
+	function testShutDown() {
+		$this->Controller->Session->write('Auth.redirect', 'foo');
+		$this->Controller->Auth->_loggedIn = true;
+		$this->Controller->Auth->shutdown($this->Controller);
+		$this->assertFalse($this->Controller->Session->read('Auth.redirect'));
+	}
+
+/**
+ * test the initialize callback and its interactions with Router::prefixes()
+ *
+ * @return void
+ */
+	function testInitializeAndRoutingPrefixes() {
+		$restore = Configure::read('Routing');
+		Configure::write('Routing.prefixes', array('admin', 'super_user'));
+		Router::reload();
+		$this->Controller->Auth->initialize($this->Controller);
+
+		$this->assertTrue(isset($this->Controller->Auth->actionMap['delete']));
+		$this->assertTrue(isset($this->Controller->Auth->actionMap['view']));
+		$this->assertTrue(isset($this->Controller->Auth->actionMap['add']));
+		$this->assertTrue(isset($this->Controller->Auth->actionMap['admin_view']));
+		$this->assertTrue(isset($this->Controller->Auth->actionMap['super_user_delete']));
+
+		Configure::write('Routing', $restore);
+	}
+
+/**
+ * test $settings in Controller::$components
+ *
+ * @access public
+ * @return void
+ */
+	function testComponentSettings() {
+		$this->Controller =& new AuthTestController();
+		$this->Controller->components = array(
+			'Auth' => array(
+				'fields' => array('username' => 'email', 'password' => 'password'),
+				'loginAction' => array('controller' => 'people', 'action' => 'login'),
+				'userModel' => 'AuthUserCustomField',
+				'sessionKey' => 'AltAuth.AuthUserCustomField'
+			),
+			'Session'
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		Router::reload();
+
+		$this->AuthUserCustomField =& new AuthUserCustomField();
+		$user = array(
+			'id' => 1, 'email' => 'harking@example.com',
+			'password' => Security::hash(Configure::read('Security.salt') . 'cake'
+		));
+		$user = $this->AuthUserCustomField->save($user, false);
+
+		Router::connect('/', array('controller' => 'people', 'action' => 'login'));
+		$url = '/';
+		$this->Controller->params = Router::parse($url);
+		Router::setRequestInfo(array($this->Controller->passedArgs, array(
+			'base' => null, 'here' => $url, 'webroot' => '/', 'passedArgs' => array(),
+			'argSeparator' => ':', 'namedArgs' => array()
+		)));
+		$this->Controller->data['AuthUserCustomField'] = array('email' => 'harking@example.com', 'password' => 'cake');
+		$this->Controller->params['url']['url'] = substr($url, 1);
+		$this->Controller->Auth->startup($this->Controller);
+
+		$user = $this->Controller->Auth->user();
+		$this->assertTrue(!!$user);
+
+		$expected = array(
+			'fields' => array('username' => 'email', 'password' => 'password'),
+			'loginAction' => array('controller' => 'people', 'action' => 'login'),
+			'logoutRedirect' => array('controller' => 'people', 'action' => 'login'),
+			'userModel' => 'AuthUserCustomField',
+			'sessionKey' => 'AltAuth.AuthUserCustomField'
+		);
+		$this->assertEqual($expected['fields'], $this->Controller->Auth->fields);
+		$this->assertEqual($expected['loginAction'], $this->Controller->Auth->loginAction);
+		$this->assertEqual($expected['logoutRedirect'], $this->Controller->Auth->logoutRedirect);
+		$this->assertEqual($expected['userModel'], $this->Controller->Auth->userModel);
+		$this->assertEqual($expected['sessionKey'], $this->Controller->Auth->sessionKey);
+	}
+
+/**
+ * test that logout deletes the session variables. and returns the correct url
+ *
+ * @return void
+ */
+	function testLogout() {
+		$this->Controller->Session->write('Auth.User.id', '1');
+		$this->Controller->Session->write('Auth.redirect', '/users/login');
+		$this->Controller->Auth->logoutRedirect = '/';
+		$result = $this->Controller->Auth->logout();
+
+		$this->assertEqual($result, '/');
+		$this->assertNull($this->Controller->Session->read('Auth.AuthUser'));
+		$this->assertNull($this->Controller->Session->read('Auth.redirect'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/cookie.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/cookie.test.php
new file mode 100644
index 000000000..868eee124
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/cookie.test.php
@@ -0,0 +1,499 @@
+<?php
+/**
+ * CookieComponentTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.5435
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Controller', array('Component', 'Controller'), false);
+App::import('Component', 'Cookie');
+
+/**
+ * CookieComponentTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class CookieComponentTestController extends Controller {
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Cookie');
+
+/**
+ * beforeFilter method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeFilter() {
+		$this->Cookie->name = 'CakeTestCookie';
+		$this->Cookie->time = 10;
+		$this->Cookie->path = '/';
+		$this->Cookie->domain = '';
+		$this->Cookie->secure = false;
+		$this->Cookie->key = 'somerandomhaskey';
+	}
+}
+
+/**
+ * CookieComponentTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class CookieComponentTest extends CakeTestCase {
+
+/**
+ * Controller property
+ *
+ * @var CookieComponentTestController
+ * @access public
+ */
+	var $Controller;
+
+/**
+ * start
+ *
+ * @access public
+ * @return void
+ */
+	function start() {
+		$this->Controller = new CookieComponentTestController();
+		$this->Controller->constructClasses();
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->beforeFilter();
+		$this->Controller->Component->startup($this->Controller);
+		$this->Controller->Cookie->destroy();
+	}
+
+/**
+ * end
+ *
+ * @access public
+ * @return void
+ */
+	function end() {
+		$this->Controller->Cookie->destroy();
+	}
+
+/**
+ * test that initialize sets settings from components array
+ *
+ * @return void
+ */
+	function testInitialize() {
+		$settings = array(
+			'time' => '5 days',
+			'path' => '/'
+		);
+		$this->Controller->Cookie->initialize($this->Controller, $settings);
+		$this->assertEqual($this->Controller->Cookie->time, $settings['time']);
+		$this->assertEqual($this->Controller->Cookie->path, $settings['path']);
+	}
+
+/**
+ * testCookieName
+ *
+ * @access public
+ * @return void
+ */
+	function testCookieName() {
+		$this->assertEqual($this->Controller->Cookie->name, 'CakeTestCookie');
+	}
+
+/**
+ * testSettingEncryptedCookieData
+ *
+ * @access public
+ * @return void
+ */
+	function testSettingEncryptedCookieData() {
+		$this->Controller->Cookie->write('Encrytped_array', array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!'));
+		$this->Controller->Cookie->write('Encrytped_multi_cookies.name', 'CakePHP');
+		$this->Controller->Cookie->write('Encrytped_multi_cookies.version', '1.2.0.x');
+		$this->Controller->Cookie->write('Encrytped_multi_cookies.tag', 'CakePHP Rocks!');
+	}
+
+/**
+ * testReadEncryptedCookieData
+ *
+ * @access public
+ * @return void
+ */
+	function testReadEncryptedCookieData() {
+		$data = $this->Controller->Cookie->read('Encrytped_array');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+	}
+
+/**
+ * testSettingPlainCookieData
+ *
+ * @access public
+ * @return void
+ */
+	function testSettingPlainCookieData() {
+		$this->Controller->Cookie->write('Plain_array', array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!'), false);
+		$this->Controller->Cookie->write('Plain_multi_cookies.name', 'CakePHP', false);
+		$this->Controller->Cookie->write('Plain_multi_cookies.version', '1.2.0.x', false);
+		$this->Controller->Cookie->write('Plain_multi_cookies.tag', 'CakePHP Rocks!', false);
+	}
+
+/**
+ * testReadPlainCookieData
+ *
+ * @access public
+ * @return void
+ */
+	function testReadPlainCookieData() {
+		$data = $this->Controller->Cookie->read('Plain_array');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+	}
+
+/**
+ * testWritePlainCookieArray
+ *
+ * @access public
+ * @return void
+ */
+	function testWritePlainCookieArray() {
+		$this->Controller->Cookie->write(array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' => 'CakePHP Rocks!'), null, false);
+
+		$this->assertEqual($this->Controller->Cookie->read('name'), 'CakePHP');
+		$this->assertEqual($this->Controller->Cookie->read('version'), '1.2.0.x');
+		$this->assertEqual($this->Controller->Cookie->read('tag'), 'CakePHP Rocks!');
+
+		$this->Controller->Cookie->delete('name');
+		$this->Controller->Cookie->delete('version');
+		$this->Controller->Cookie->delete('tag');
+	}
+
+/**
+ * testReadingCookieValue
+ *
+ * @access public
+ * @return void
+ */
+	function testReadingCookieValue() {
+		$data = $this->Controller->Cookie->read();
+		$expected = array(
+			'Encrytped_array' => array(
+				'name' => 'CakePHP',
+				'version' => '1.2.0.x',
+				'tag' => 'CakePHP Rocks!'),
+			'Encrytped_multi_cookies' => array(
+				'name' => 'CakePHP',
+				'version' => '1.2.0.x',
+				'tag' => 'CakePHP Rocks!'),
+			'Plain_array' => array(
+				'name' => 'CakePHP',
+				'version' => '1.2.0.x',
+				'tag' => 'CakePHP Rocks!'),
+			'Plain_multi_cookies' => array(
+				'name' => 'CakePHP',
+				'version' => '1.2.0.x',
+				'tag' => 'CakePHP Rocks!'));
+		$this->assertEqual($data, $expected);
+	}
+
+/**
+ * testDeleteCookieValue
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteCookieValue() {
+		$this->Controller->Cookie->delete('Encrytped_multi_cookies.name');
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies');
+		$expected = array('version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$this->Controller->Cookie->delete('Encrytped_array');
+		$data = $this->Controller->Cookie->read('Encrytped_array');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$this->Controller->Cookie->delete('Plain_multi_cookies.name');
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies');
+		$expected = array('version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$this->Controller->Cookie->delete('Plain_array');
+		$data = $this->Controller->Cookie->read('Plain_array');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+	}
+
+/**
+ * testSettingCookiesWithArray
+ *
+ * @access public
+ * @return void
+ */
+	function testSettingCookiesWithArray() {
+		$this->Controller->Cookie->destroy();
+
+		$this->Controller->Cookie->write(array('Encrytped_array' => array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!')));
+		$this->Controller->Cookie->write(array('Encrytped_multi_cookies.name' => 'CakePHP'));
+		$this->Controller->Cookie->write(array('Encrytped_multi_cookies.version' => '1.2.0.x'));
+		$this->Controller->Cookie->write(array('Encrytped_multi_cookies.tag' => 'CakePHP Rocks!'));
+
+		$this->Controller->Cookie->write(array('Plain_array' => array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!')), null, false);
+		$this->Controller->Cookie->write(array('Plain_multi_cookies.name' => 'CakePHP'), null, false);
+		$this->Controller->Cookie->write(array('Plain_multi_cookies.version' => '1.2.0.x'), null, false);
+		$this->Controller->Cookie->write(array('Plain_multi_cookies.tag' => 'CakePHP Rocks!'), null, false);
+	}
+
+/**
+ * testReadingCookieArray
+ *
+ * @access public
+ * @return void
+ */
+	function testReadingCookieArray() {
+		$data = $this->Controller->Cookie->read('Encrytped_array.name');
+		$expected = 'CakePHP';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_array.version');
+		$expected = '1.2.0.x';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_array.tag');
+		$expected = 'CakePHP Rocks!';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies.name');
+		$expected = 'CakePHP';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies.version');
+		$expected = '1.2.0.x';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies.tag');
+		$expected = 'CakePHP Rocks!';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_array.name');
+		$expected = 'CakePHP';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_array.version');
+		$expected = '1.2.0.x';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_array.tag');
+		$expected = 'CakePHP Rocks!';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies.name');
+		$expected = 'CakePHP';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies.version');
+		$expected = '1.2.0.x';
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies.tag');
+		$expected = 'CakePHP Rocks!';
+		$this->assertEqual($data, $expected);
+	}
+
+/**
+ * testReadingCookieDataOnStartup
+ *
+ * @access public
+ * @return void
+ */
+	function testReadingCookieDataOnStartup() {
+		$this->Controller->Cookie->destroy();
+
+		$data = $this->Controller->Cookie->read('Encrytped_array');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_array');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$_COOKIE['CakeTestCookie'] = array(
+				'Encrytped_array' => $this->__encrypt(array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!')),
+				'Encrytped_multi_cookies' => array(
+						'name' => $this->__encrypt('CakePHP'),
+						'version' => $this->__encrypt('1.2.0.x'),
+						'tag' => $this->__encrypt('CakePHP Rocks!')),
+				'Plain_array' => 'name|CakePHP,version|1.2.0.x,tag|CakePHP Rocks!',
+				'Plain_multi_cookies' => array(
+						'name' => 'CakePHP',
+						'version' => '1.2.0.x',
+						'tag' => 'CakePHP Rocks!'));
+		$this->Controller->Cookie->startup();
+
+		$data = $this->Controller->Cookie->read('Encrytped_array');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_array');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+		$this->Controller->Cookie->destroy();
+		unset($_COOKIE['CakeTestCookie']);
+	}
+
+/**
+ * testReadingCookieDataWithoutStartup
+ *
+ * @access public
+ * @return void
+ */
+	function testReadingCookieDataWithoutStartup() {
+		$data = $this->Controller->Cookie->read('Encrytped_array');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_array');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies');
+		$expected = array();
+		$this->assertEqual($data, $expected);
+
+		$_COOKIE['CakeTestCookie'] = array(
+				'Encrytped_array' => $this->__encrypt(array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!')),
+				'Encrytped_multi_cookies' => array(
+						'name' => $this->__encrypt('CakePHP'),
+						'version' => $this->__encrypt('1.2.0.x'),
+						'tag' => $this->__encrypt('CakePHP Rocks!')),
+				'Plain_array' => 'name|CakePHP,version|1.2.0.x,tag|CakePHP Rocks!',
+				'Plain_multi_cookies' => array(
+						'name' => 'CakePHP',
+						'version' => '1.2.0.x',
+						'tag' => 'CakePHP Rocks!'));
+
+		$data = $this->Controller->Cookie->read('Encrytped_array');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Encrytped_multi_cookies');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_array');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+
+		$data = $this->Controller->Cookie->read('Plain_multi_cookies');
+		$expected = array('name' => 'CakePHP', 'version' => '1.2.0.x', 'tag' =>'CakePHP Rocks!');
+		$this->assertEqual($data, $expected);
+		$this->Controller->Cookie->destroy();
+		unset($_COOKIE['CakeTestCookie']);
+	}
+
+
+/**
+ * test that no error is issued for non array data.
+ *
+ * @return void
+ */
+	function testNoErrorOnNonArrayData() {
+		$this->Controller->Cookie->destroy();
+		$_COOKIE['CakeTestCookie'] = 'kaboom';
+
+		$this->assertNull($this->Controller->Cookie->read('value'));
+	}
+
+/**
+ * test that deleting a top level keys kills the child elements too.
+ *
+ * @return void
+ */
+	function testDeleteRemovesChildren() {
+		$_COOKIE['CakeTestCookie'] = array(
+			'User' => array('email' => 'example@example.com', 'name' => 'mark'),
+			'other' => 'value'
+		);
+		$this->Controller->Cookie->startup();
+		$this->assertEqual('mark', $this->Controller->Cookie->read('User.name'));
+
+		$this->Controller->Cookie->delete('User');
+		$this->assertFalse($this->Controller->Cookie->read('User.email'));
+		$this->Controller->Cookie->destroy();
+	}
+
+/**
+ * encrypt method
+ *
+ * @param mixed $value
+ * @return string
+ * @access private
+ */
+	function __encrypt($value) {
+		if (is_array($value)) {
+			$value = $this->__implode($value);
+		}
+		return "Q2FrZQ==." . base64_encode(Security::cipher($value, $this->Controller->Cookie->key));
+	}
+
+/**
+ * implode method
+ *
+ * @param array $value
+ * @return string
+ * @access private
+ */
+	function __implode($array) {
+		$string = '';
+		foreach ($array as $key => $value) {
+			$string .= ',' . $key . '|' . $value;
+		}
+		return substr($string, 1);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/email.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/email.test.php
new file mode 100755
index 000000000..78fb7b45c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/email.test.php
@@ -0,0 +1,1310 @@
+<?php
+/**
+ * EmailComponentTest file
+ *
+ * Series of tests for email component.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.cases.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.5347
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Component', 'Email');
+App::import('Core', 'CakeSocket');
+
+Mock::generate('CakeSocket', 'MockEmailSocket');
+
+/**
+ * EmailTestComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class EmailTestComponent extends EmailComponent {
+
+	var $smtpSend = '';
+/**
+ * smtpSend method override for testing
+ *
+ * @access public
+ * @return mixed
+ */
+	function smtpSend($data, $code = '250') {
+		return parent::_smtpSend($data, $code);
+	}
+
+/**
+ * undocumented function
+ *
+ * @return void
+ */
+	function _smtpSend($data, $code = '250') {
+		if ($this->_debug) {
+			$this->smtpSend .= $data . "\n";
+			return true;
+		}
+		return parent::_smtpSend($data, $code);
+	}
+
+/**
+ * Convenience setter method for testing.
+ *
+ * @access public
+ * @return void
+ */
+	function setConnectionSocket(&$socket) {
+		$this->__smtpConnection = $socket;
+	}
+
+/**
+ * Allows mocks to be used with tests.
+ *
+ * @param array $config 
+ * @return void
+ */
+	function _getSocket($config) {
+		if (empty($this->__smtpConnection)) {
+			parent::_getSocket($config);
+		}
+	}
+
+/**
+ * Convenience getter method for testing.
+ *
+ * @access public
+ * @return mixed
+ */
+	function getConnectionSocket() {
+		return $this->__smtpConnection;
+	}
+
+/**
+ * Convenience setter for testing.
+ *
+ * @access public
+ * @return void
+ */
+	function setHeaders($headers) {
+		$this->__header += $headers;
+	}
+
+/**
+ * Convenience getter for testing.
+ *
+ * @access public
+ * @return array
+ */
+	function getHeaders() {
+		return $this->__header;
+	}
+
+/**
+ * Convenience setter for testing.
+ *
+ * @access public
+ * @return void
+ */
+	function setBoundary() {
+		$this->__createBoundary();
+	}
+
+/**
+ * Convenience getter for testing.
+ *
+ * @access public
+ * @return string
+ */
+	function getBoundary() {
+		return $this->__boundary;
+	}
+
+/**
+ * Convenience getter for testing.
+ *
+ * @access public
+ * @return string
+ */
+	function getMessage() {
+		return $this->__message;
+	}
+
+/**
+ * Convenience getter for testing.
+ *
+ * @access protected
+ * @return string
+ */
+	function _getMessage() {
+		return $this->__message;
+	}
+
+/**
+ * Convenience method for testing.
+ *
+ * @access public
+ * @return string
+ */
+	function strip($content, $message = false) {
+		return parent::_strip($content, $message);
+	}
+
+/**
+ * Wrapper for testing.
+ *
+ * @return void
+ */
+	function formatAddress($string, $smtp = false) {
+		return parent::_formatAddress($string, $smtp);
+	}
+}
+
+/**
+ * EmailTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class EmailTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'EmailTest'
+ * @access public
+ */
+	var $name = 'EmailTest';
+
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Session', 'EmailTest');
+
+/**
+ * pageTitle property
+ *
+ * @var string
+ * @access public
+ */
+	var $pageTitle = 'EmailTest';
+}
+
+/**
+ * EmailTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class EmailComponentTest extends CakeTestCase {
+
+/**
+ * Controller property
+ *
+ * @var EmailTestController
+ * @access public
+ */
+	var $Controller;
+
+/**
+ * name property
+ *
+ * @var string 'Email'
+ * @access public
+ */
+	var $name = 'Email';
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_appEncoding = Configure::read('App.encoding');
+		Configure::write('App.encoding', 'UTF-8');
+
+		$this->Controller =& new EmailTestController();
+
+		restore_error_handler();
+		@$this->Controller->Component->init($this->Controller);
+		set_error_handler('simpleTestErrorHandler');
+
+		$this->Controller->EmailTest->initialize($this->Controller, array());
+		ClassRegistry::addObject('view', new View($this->Controller));
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('App.encoding', $this->_appEncoding);
+		App::build();
+		$this->Controller->Session->delete('Message');
+		restore_error_handler();
+		ClassRegistry::flush();
+	}
+
+/**
+ * osFix method
+ *
+ * @param string $string
+ * @access private
+ * @return string
+ */
+	function __osFix($string) {
+		return str_replace(array("\r\n", "\r"), "\n", $string);
+	}
+
+/**
+ * testSmtpConfig method
+ *
+ * @access public
+ * @return void
+ */
+	function testSmtpConfig() {
+		if ($this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$this->Controller->EmailTest->smtpOptions = array();
+		$this->Controller->EmailTest->send('anything');
+		$config = array(
+			'host' => 'localhost',
+			'port' => 25,
+			'protocol' => 'smtp',
+			'timeout' => 30
+		);
+		$this->assertEqual($config, $this->Controller->EmailTest->smtpOptions);
+
+		$this->Controller->EmailTest->smtpOptions = array('port' => 80);
+		$this->Controller->EmailTest->send('anything');
+		$config['port'] = 80;
+		$this->assertEqual($config, $this->Controller->EmailTest->smtpOptions);
+	}
+
+/**
+ * testBadSmtpSend method
+ *
+ * @access public
+ * @return void
+ */
+	function testBadSmtpSend() {
+		if ($this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+		$this->Controller->EmailTest->smtpOptions['host'] = 'blah';
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$this->assertFalse($this->Controller->EmailTest->send('Should not work'));
+	}
+
+/**
+ * testSmtpSend method
+ *
+ * @access public
+ * @return void
+ */
+	function testSmtpSend() {
+		if ($this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+
+		$this->Controller->EmailTest->_debug = true;
+		$this->Controller->EmailTest->sendAs = 'text';
+		$expect = <<<TEMPDOC
+<pre>Host: localhost
+Port: 25
+Timeout: 30
+To: postmaster@localhost
+From: noreply@example.com
+Subject: Cake SMTP test
+Header:
+
+To: postmaster@localhost
+From: noreply@example.com
+Reply-To: noreply@example.com
+Subject: Cake SMTP test
+X-Mailer: CakePHP Email Component
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 7bitParameters:
+
+Message:
+
+This is the body of the message
+
+</pre>
+TEMPDOC;
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+	}
+
+/**
+ * testSmtpEhlo method
+ *
+ * @access public
+ * @return void
+ */
+	function testSmtpEhlo() {
+		if ($this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+
+		$connection =& new CakeSocket(array('protocol'=>'smtp', 'host' => 'localhost', 'port' => 25));
+		$this->Controller->EmailTest->setConnectionSocket($connection);
+		$this->Controller->EmailTest->smtpOptions['timeout'] = 10;
+		$this->assertTrue($connection->connect());
+		$this->assertTrue($this->Controller->EmailTest->smtpSend(null, '220') !== false);
+		$this->skipIf($this->Controller->EmailTest->smtpSend('EHLO locahost', '250') === false, '%s do not support EHLO.');
+		$connection->disconnect();
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+
+		$this->Controller->EmailTest->_debug = true;
+		$this->Controller->EmailTest->sendAs = 'text';
+		$expect = <<<TEMPDOC
+<pre>Host: localhost
+Port: 25
+Timeout: 30
+To: postmaster@localhost
+From: noreply@example.com
+Subject: Cake SMTP test
+Header:
+
+To: postmaster@localhost
+From: noreply@example.com
+Reply-To: noreply@example.com
+Subject: Cake SMTP test
+X-Mailer: CakePHP Email Component
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 7bitParameters:
+
+Message:
+
+This is the body of the message
+
+</pre>
+TEMPDOC;
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+	}
+
+/**
+ * testSmtpSendMultipleTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testSmtpSendMultipleTo() {
+		if ($this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+		$this->Controller->EmailTest->reset();
+		$this->Controller->EmailTest->to = array('postmaster@localhost', 'root@localhost');
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP multiple To test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->_debug = true;
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->Controller->EmailTest->delivery = 'smtp';
+		
+		$socket = new MockEmailSocket();
+		$socket->setReturnValue('connect', true);
+		$this->Controller->EmailTest->setConnectionSocket($socket);
+
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+
+		$this->assertPattern('/EHLO localhost\n/', $this->Controller->EmailTest->smtpSend);
+		$this->assertPattern('/MAIL FROM: <noreply@example\.com>\n/', $this->Controller->EmailTest->smtpSend);
+		$this->assertPattern('/RCPT TO: <postmaster@localhost>\n/', $this->Controller->EmailTest->smtpSend);
+		$this->assertPattern('/RCPT TO: <root@localhost>\n/', $this->Controller->EmailTest->smtpSend);
+		$this->assertPattern(
+			'/To: postmaster@localhost, root@localhost[\n\r]/', 
+			$this->Controller->EmailTest->smtpSend
+		);
+	}
+
+/**
+ * test sending smtp from a host using a port.
+ *
+ * @return void
+ */
+	function testSmtpSendHostWithPort() {
+		$bkp = env('HTTP_HOST');
+		$_SERVER['HTTP_HOST'] = 'localhost:8080';
+
+		$this->Controller->EmailTest->reset();
+		$this->Controller->EmailTest->to = array('root@localhost');
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP host test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->Controller->EmailTest->_debug = true;
+
+		$socket = new MockEmailSocket();
+		$socket->setReturnValue('connect', true);
+
+		$this->Controller->EmailTest->setConnectionSocket($socket);
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+
+		$this->assertPattern('/EHLO localhost\n/', $this->Controller->EmailTest->smtpSend);
+
+		$_SERVER['HTTP_HOST'] = $bkp;
+	}
+
+/**
+ * testAuthenticatedSmtpSend method
+ *
+ * @access public
+ * @return void
+ */
+	function testAuthenticatedSmtpSend() {
+		if ($this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->smtpOptions['username'] = 'test';
+		$this->Controller->EmailTest->smtpOptions['password'] = 'testing';
+
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$result = $this->Controller->EmailTest->send('This is the body of the message');
+		$code = substr($this->Controller->EmailTest->smtpError, 0, 3);
+		$this->skipIf(!$code, '%s Authentication not enabled on server');
+
+		$this->assertFalse($result);
+		$this->assertEqual($code, '535');
+	}
+
+/**
+ * testSendFormats method
+ *
+ * @access public
+ * @return void
+ */
+	function testSendFormats() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->Controller->EmailTest->messageId = false;
+
+		$date = date(DATE_RFC2822);
+		$message = <<<MSGBLOC
+<pre>To: postmaster@localhost
+From: noreply@example.com
+Subject: Cake SMTP test
+Header:
+
+From: noreply@example.com
+Reply-To: noreply@example.com
+Date: $date
+X-Mailer: CakePHP Email Component
+Content-Type: {CONTENTTYPE}
+Content-Transfer-Encoding: 7bitParameters:
+
+Message:
+
+This is the body of the message
+
+</pre>
+MSGBLOC;
+		$this->Controller->EmailTest->sendAs = 'text';
+		$expect = str_replace('{CONTENTTYPE}', 'text/plain; charset=UTF-8', $message);
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$expect = str_replace('{CONTENTTYPE}', 'text/html; charset=UTF-8', $message);
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+
+		// TODO: better test for format of message sent?
+		$this->Controller->EmailTest->sendAs = 'both';
+		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $message);
+
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+	}
+
+/**
+ * testTemplates method
+ *
+ * @access public
+ * @return void
+ */
+	function testTemplates() {
+		ClassRegistry::flush();
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->Controller->EmailTest->messageId = false;
+
+		$date = date(DATE_RFC2822);
+		$header = <<<HEADBLOC
+To: postmaster@localhost
+From: noreply@example.com
+Subject: Cake SMTP test
+Header:
+
+From: noreply@example.com
+Reply-To: noreply@example.com
+Date: $date
+X-Mailer: CakePHP Email Component
+Content-Type: {CONTENTTYPE}
+Content-Transfer-Encoding: 7bitParameters:
+
+Message:
+
+
+HEADBLOC;
+
+		$this->Controller->EmailTest->layout = 'default';
+		$this->Controller->EmailTest->template = 'default';
+
+		$text = <<<TEXTBLOC
+
+This is the body of the message
+
+This email was sent using the CakePHP Framework, http://cakephp.org.
+TEXTBLOC;
+
+		$html = <<<HTMLBLOC
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+
+<html>
+<head>
+	<title>Email Test</title>
+</head>
+
+<body>
+	<p> This is the body of the message</p><p> </p>
+	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
+</body>
+</html>
+HTMLBLOC;
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$expect = '<pre>' . str_replace('{CONTENTTYPE}', 'text/plain; charset=UTF-8', $header) . $text . "\n" . '</pre>';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$expect = '<pre>' . str_replace('{CONTENTTYPE}', 'text/html; charset=UTF-8', $header) . $html . "\n" . '</pre>';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$expect = str_replace('{CONTENTTYPE}', 'multipart/alternative; boundary="alt-"', $header);
+		$expect .= '--alt-' . "\n" . 'Content-Type: text/plain; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 7bit' . "\n\n" . $text . "\n\n";
+		$expect .= '--alt-' . "\n" . 'Content-Type: text/html; charset=UTF-8' . "\n" . 'Content-Transfer-Encoding: 7bit' . "\n\n" . $html . "\n\n";
+		$expect = '<pre>' . $expect . '--alt---' . "\n\n" . '</pre>';
+
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+
+		$html = <<<HTMLBLOC
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+
+<html>
+<head>
+	<title>Email Test</title>
+</head>
+
+<body>
+	<p> This is the body of the message</p><p> </p>
+	<p>This email was sent using the CakePHP Framework</p>
+</body>
+</html>
+
+HTMLBLOC;
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$expect = '<pre>' . str_replace('{CONTENTTYPE}', 'text/html; charset=UTF-8', $header) . $html . '</pre>';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message', 'default', 'thin'));
+		$this->assertEqual($this->Controller->Session->read('Message.email.message'), $this->__osFix($expect));
+		
+		$result = ClassRegistry::getObject('view');
+		$this->assertFalse($result);
+	}
+
+/**
+ * test that elements used in email templates get helpers.
+ *
+ * @return void
+ */
+	function testTemplateNestedElements() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake SMTP test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->Controller->EmailTest->messageId = false;
+		$this->Controller->EmailTest->layout = 'default';
+		$this->Controller->EmailTest->template = 'nested_element';
+		$this->Controller->EmailTest->sendAs = 'html';
+		$this->Controller->helpers = array('Html');
+
+		$this->Controller->EmailTest->send();
+		$result = $this->Controller->Session->read('Message.email.message');
+		$this->assertPattern('/Test/', $result);
+		$this->assertPattern('/http\:\/\/example\.com/', $result);
+	}
+
+/**
+ * testSmtpSendSocket method
+ *
+ * @access public
+ * @return void
+ */
+	function testSmtpSendSocket() {
+		if ($this->skipIf(!@fsockopen('localhost', 25), '%s No SMTP server running on localhost')) {
+			return;
+		}
+
+		$this->Controller->EmailTest->smtpOptions['timeout'] = 10;
+		$socket =& new CakeSocket(array_merge(array('protocol'=>'smtp'), $this->Controller->EmailTest->smtpOptions));
+		$this->Controller->EmailTest->setConnectionSocket($socket);
+
+		$this->assertTrue($this->Controller->EmailTest->getConnectionSocket());
+
+		$response = $this->Controller->EmailTest->smtpSend('HELO', '250');
+		$this->assertPattern('/501 Syntax: HELO hostname/', $this->Controller->EmailTest->smtpError);
+
+		$this->Controller->EmailTest->reset();
+		$response = $this->Controller->EmailTest->smtpSend('HELO somehostname', '250');
+		$this->assertNoPattern('/501 Syntax: HELO hostname/', $this->Controller->EmailTest->smtpError);
+	}
+
+/**
+ * testSendDebug method
+ *
+ * @access public
+ * @return void
+ */
+	function testSendDebug() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->cc = 'cc@example.com';
+		$this->Controller->EmailTest->bcc = 'bcc@example.com';
+		$this->Controller->EmailTest->subject = 'Cake Debug Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$result = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertPattern('/To: postmaster@localhost\n/', $result);
+		$this->assertPattern('/Subject: Cake Debug Test\n/', $result);
+		$this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
+		$this->assertPattern('/From: noreply@example.com\n/', $result);
+		$this->assertPattern('/Cc: cc@example.com\n/', $result);
+		$this->assertPattern('/Bcc: bcc@example.com\n/', $result);
+		$this->assertPattern('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result);
+		$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
+		$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
+		$this->assertPattern('/Content-Transfer-Encoding: 7bitParameters:\n/', $result);
+		$this->assertPattern('/This is the body of the message/', $result);
+	}
+
+/**
+ * test send with delivery = debug and not using sessions.
+ *
+ * @return void
+ */
+	function testSendDebugWithNoSessions() {
+		$session =& $this->Controller->Session;
+		unset($this->Controller->Session);
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake Debug Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'debug';
+		$result = $this->Controller->EmailTest->send('This is the body of the message');
+
+		$this->assertPattern('/To: postmaster@localhost\n/', $result);
+		$this->assertPattern('/Subject: Cake Debug Test\n/', $result);
+		$this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
+		$this->assertPattern('/From: noreply@example.com\n/', $result);
+		$this->assertPattern('/Date: ' . preg_quote(date(DATE_RFC2822)) . '\n/', $result);
+		$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
+		$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
+		$this->assertPattern('/Content-Transfer-Encoding: 7bitParameters:\n/', $result);
+		$this->assertPattern('/This is the body of the message/', $result);
+		$this->Controller->Session = $session;
+	}
+
+/**
+ * testMessageRetrievalWithoutTemplate method
+ *
+ * @access public
+ * @return void
+ */
+	function testMessageRetrievalWithoutTemplate() {
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake Debug Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->layout = 'default';
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'debug';
+
+		$text = $html = 'This is the body of the message';
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertNull($this->Controller->EmailTest->htmlMessage);
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$this->assertNull($this->Controller->EmailTest->textMessage);
+		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+	}
+
+/**
+ * testMessageRetrievalWithTemplate method
+ *
+ * @access public
+ * @return void
+ */
+	function testMessageRetrievalWithTemplate() {
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$this->Controller->set('value', 22091985);
+		$this->Controller->set('title_for_layout', 'EmailTest');
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake Debug Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->layout = 'default';
+		$this->Controller->EmailTest->template = 'custom';
+
+		$this->Controller->EmailTest->delivery = 'debug';
+
+		$text = <<<TEXTBLOC
+
+Here is your value: 22091985
+This email was sent using the CakePHP Framework, http://cakephp.org.
+TEXTBLOC;
+
+		$html = <<<HTMLBLOC
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+
+<html>
+<head>
+	<title>EmailTest</title>
+</head>
+
+<body>
+	<p>Here is your value: <b>22091985</b></p>
+	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
+</body>
+</html>
+HTMLBLOC;
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send());
+		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send());
+		$this->assertEqual($this->Controller->EmailTest->textMessage, $this->__osFix($text));
+		$this->assertNull($this->Controller->EmailTest->htmlMessage);
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$this->assertTrue($this->Controller->EmailTest->send());
+		$this->assertNull($this->Controller->EmailTest->textMessage);
+		$this->assertEqual($this->Controller->EmailTest->htmlMessage, $this->__osFix($html));
+	}
+
+/**
+ * testContentArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testSendContentArray() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake Debug Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+
+		$content = array('First line', 'Second line', 'Third line');
+		$this->assertTrue($this->Controller->EmailTest->send($content));
+		$result = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertPattern('/To: postmaster@localhost\n/', $result);
+		$this->assertPattern('/Subject: Cake Debug Test\n/', $result);
+		$this->assertPattern('/Reply-To: noreply@example.com\n/', $result);
+		$this->assertPattern('/From: noreply@example.com\n/', $result);
+		$this->assertPattern('/X-Mailer: CakePHP Email Component\n/', $result);
+		$this->assertPattern('/Content-Type: text\/plain; charset=UTF-8\n/', $result);
+		$this->assertPattern('/Content-Transfer-Encoding: 7bitParameters:\n/', $result);
+		$this->assertPattern('/First line\n/', $result);
+		$this->assertPattern('/Second line\n/', $result);
+		$this->assertPattern('/Third line\n/', $result);
+	}
+
+/**
+ * test setting a custom date.
+ *
+ * @return void
+ */
+	function testDateProperty() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake Debug Test';
+		$this->Controller->EmailTest->date = 'Today!';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+
+		$this->assertTrue($this->Controller->EmailTest->send('test message'));
+		$result = $this->Controller->Session->read('Message.email.message');
+		$this->assertPattern('/Date: Today!\n/', $result);
+	}
+
+/**
+ * testContentStripping method
+ *
+ * @access public
+ * @return void
+ */
+	function testContentStripping() {
+		$content = "Previous content\n--alt-\nContent-TypeContent-Type:: text/html; charsetcharset==utf-8\nContent-Transfer-Encoding: 7bit";
+		$content .= "\n\n<p>My own html content</p>";
+
+		$result = $this->Controller->EmailTest->strip($content, true);
+		$expected = "Previous content\n--alt-\n text/html; utf-8\n 7bit\n\n<p>My own html content</p>";
+		$this->assertEqual($result, $expected);
+
+		$content = '<p>Some HTML content with an <a href="mailto:test@example.com">email link</a>';
+		$result  = $this->Controller->EmailTest->strip($content, true);
+		$expected = $content;
+		$this->assertEqual($result, $expected);
+
+		$content  = '<p>Some HTML content with an ';
+		$content .= '<a href="mailto:test@example.com,test2@example.com">email link</a>';
+		$result  = $this->Controller->EmailTest->strip($content, true);
+		$expected = $content;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that the _encode() will set mb_internal_encoding.
+ *
+ * @return void
+ */
+	function test_encodeSettingInternalCharset() {
+		$skip = !function_exists('mb_internal_encoding');
+		if ($this->skipIf($skip, 'Missing mb_* functions, cannot run test.')) {
+			return;
+		}
+		mb_internal_encoding('ISO-8859-1');
+
+		$this->Controller->charset = 'UTF-8';
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'هذه رسالة بعنوان طويل مرسل للمستلم';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+
+		$subject = '=?UTF-8?B?2YfYsNmHINix2LPYp9mE2Kkg2KjYudmG2YjYp9mGINi32YjZitmEINmF2LE=?=' . "\r\n" . ' =?UTF-8?B?2LPZhCDZhNmE2YXYs9iq2YTZhQ==?=';
+
+		preg_match('/Subject: (.*)Header:/s', $this->Controller->Session->read('Message.email.message'), $matches);
+		$this->assertEqual(trim($matches[1]), $subject);
+
+		$result = mb_internal_encoding();
+		$this->assertEqual($result, 'ISO-8859-1');
+	}
+
+/**
+ * testMultibyte method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyte() {
+		$this->Controller->charset = 'UTF-8';
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'هذه رسالة بعنوان طويل مرسل للمستلم';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+
+		$subject = '=?UTF-8?B?2YfYsNmHINix2LPYp9mE2Kkg2KjYudmG2YjYp9mGINi32YjZitmEINmF2LE=?=' . "\r\n" . ' =?UTF-8?B?2LPZhCDZhNmE2YXYs9iq2YTZhQ==?=';
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		preg_match('/Subject: (.*)Header:/s', $this->Controller->Session->read('Message.email.message'), $matches);
+		$this->assertEqual(trim($matches[1]), $subject);
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		preg_match('/Subject: (.*)Header:/s', $this->Controller->Session->read('Message.email.message'), $matches);
+		$this->assertEqual(trim($matches[1]), $subject);
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		preg_match('/Subject: (.*)Header:/s', $this->Controller->Session->read('Message.email.message'), $matches);
+		$this->assertEqual(trim($matches[1]), $subject);
+	}
+
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testSendWithAttachments() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Attachment Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->Controller->EmailTest->attachments = array(
+			__FILE__,
+			'some-name.php' => __FILE__
+		);
+		$body = '<p>This is the body of the message</p>';
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+		$this->assertPattern('/' . preg_quote('Content-Disposition: attachment; filename="email.test.php"') . '/', $msg);
+		$this->assertPattern('/' . preg_quote('Content-Disposition: attachment; filename="some-name.php"') . '/', $msg);
+	}
+
+/**
+ * testSendAsIsNotIgnoredIfAttachmentsPresent method
+ *
+ * @return void
+ * @access public
+ */
+	function testSendAsIsNotIgnoredIfAttachmentsPresent() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Attachment Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->Controller->EmailTest->attachments = array(__FILE__);
+		$body = '<p>This is the body of the message</p>';
+
+		$this->Controller->EmailTest->sendAs = 'html';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+		$this->assertNoPattern('/text\/plain/', $msg);
+		$this->assertPattern('/text\/html/', $msg);
+
+		$this->Controller->EmailTest->sendAs = 'text';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+		$this->assertPattern('/text\/plain/', $msg);
+		$this->assertNoPattern('/text\/html/', $msg);
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertNoPattern('/text\/plain/', $msg);
+		$this->assertNoPattern('/text\/html/', $msg);
+		$this->assertPattern('/multipart\/alternative/', $msg);
+	}
+
+/**
+ * testNoDoubleNewlinesInHeaders function
+ *
+ * @return void
+ * @access public
+ */
+	function testNoDoubleNewlinesInHeaders() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Attachment Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+		$this->Controller->EmailTest->delivery = 'debug';
+		$body = '<p>This is the body of the message</p>';
+
+		$this->Controller->EmailTest->sendAs = 'both';
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$msg = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertNoPattern('/\n\nContent-Transfer-Encoding/', $msg);
+		$this->assertPattern('/\nContent-Transfer-Encoding/', $msg);
+	}
+
+/**
+ * testReset method
+ *
+ * @access public
+ * @return void
+ */
+	function testReset() {
+		$this->Controller->EmailTest->template = 'test_template';
+		$this->Controller->EmailTest->to = 'test.recipient@example.com';
+		$this->Controller->EmailTest->from = 'test.sender@example.com';
+		$this->Controller->EmailTest->replyTo = 'test.replyto@example.com';
+		$this->Controller->EmailTest->return = 'test.return@example.com';
+		$this->Controller->EmailTest->cc = array('cc1@example.com', 'cc2@example.com');
+		$this->Controller->EmailTest->bcc = array('bcc1@example.com', 'bcc2@example.com');
+		$this->Controller->EmailTest->date = 'Today!';
+		$this->Controller->EmailTest->subject = 'Test subject';
+		$this->Controller->EmailTest->additionalParams = 'X-additional-header';
+		$this->Controller->EmailTest->delivery = 'smtp';
+		$this->Controller->EmailTest->smtpOptions['host'] = 'blah';
+		$this->Controller->EmailTest->smtpOptions['timeout'] = 0.5;
+		$this->Controller->EmailTest->attachments = array('attachment1', 'attachment2');
+		$this->Controller->EmailTest->textMessage = 'This is the body of the message';
+		$this->Controller->EmailTest->htmlMessage = 'This is the body of the message';
+		$this->Controller->EmailTest->messageId = false;
+
+		$this->assertFalse($this->Controller->EmailTest->send('Should not work'));
+
+		$this->Controller->EmailTest->reset();
+
+		$this->assertNull($this->Controller->EmailTest->template);
+		$this->assertIdentical($this->Controller->EmailTest->to, array());
+		$this->assertNull($this->Controller->EmailTest->from);
+		$this->assertNull($this->Controller->EmailTest->replyTo);
+		$this->assertNull($this->Controller->EmailTest->return);
+		$this->assertIdentical($this->Controller->EmailTest->cc, array());
+		$this->assertIdentical($this->Controller->EmailTest->bcc, array());
+		$this->assertNull($this->Controller->EmailTest->date);
+		$this->assertNull($this->Controller->EmailTest->subject);
+		$this->assertNull($this->Controller->EmailTest->additionalParams);
+		$this->assertIdentical($this->Controller->EmailTest->getHeaders(), array());
+		$this->assertNull($this->Controller->EmailTest->getBoundary());
+		$this->assertIdentical($this->Controller->EmailTest->getMessage(), array());
+		$this->assertNull($this->Controller->EmailTest->smtpError);
+		$this->assertIdentical($this->Controller->EmailTest->attachments, array());
+		$this->assertNull($this->Controller->EmailTest->textMessage);
+		$this->assertTrue($this->Controller->EmailTest->messageId);
+	}
+
+	function testPluginCustomViewClass() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$this->Controller->view = 'TestPlugin.Email';
+
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'CustomViewClass test';
+		$this->Controller->EmailTest->delivery = 'debug';
+		$body = 'Body of message';
+
+		$this->assertTrue($this->Controller->EmailTest->send($body));
+		$result = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertPattern('/Body of message/', $result);
+
+	}
+
+/**
+ * testStartup method
+ *
+ * @access public
+ * @return void
+ */
+	function testStartup() {
+		$this->assertNull($this->Controller->EmailTest->startup($this->Controller));
+	}
+
+/**
+ * testMessageId method
+ *
+ * @access public
+ * @return void
+ */
+	function testMessageId() {
+		$this->Controller->EmailTest->to = 'postmaster@localhost';
+		$this->Controller->EmailTest->from = 'noreply@example.com';
+		$this->Controller->EmailTest->subject = 'Cake Debug Test';
+		$this->Controller->EmailTest->replyTo = 'noreply@example.com';
+		$this->Controller->EmailTest->template = null;
+
+		$this->Controller->EmailTest->delivery = 'debug';
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$result = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertPattern('/Message-ID: \<[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}@' . env('HTTP_HOST') . '\>\n/', $result);
+
+		$this->Controller->EmailTest->messageId = '<22091985.998877@localhost>';
+
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$result = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertPattern('/Message-ID: <22091985.998877@localhost>\n/', $result);
+
+		$this->Controller->EmailTest->messageId = false;
+
+		$this->assertTrue($this->Controller->EmailTest->send('This is the body of the message'));
+		$result = $this->Controller->Session->read('Message.email.message');
+
+		$this->assertNoPattern('/Message-ID:/', $result);
+	}
+
+/**
+ * testSendMessage method
+ *
+ * @access public
+ * @return void
+ */
+	function testSendMessage() {
+		$this->Controller->EmailTest->delivery = 'getMessage';
+		$this->Controller->EmailTest->lineLength = 70;
+
+		$text = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.';
+		$this->Controller->EmailTest->sendAs = 'text';
+		$result = $this->Controller->EmailTest->send($text);
+		$expected = array(
+			'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do',
+			'eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+			'',
+			''
+		);
+		$this->assertEqual($expected, $result);
+
+		$text = 'Lorem ipsum dolor sit amet, <b>consectetur</b> adipisicing elit, sed do <span>eiusmod tempor</span> incididunt ut labore et dolore magna aliqua.';
+		$this->Controller->EmailTest->sendAs = 'html';
+		$result = $this->Controller->EmailTest->send($text);
+		$expected = array(
+			$text,
+			'',
+			''
+		);
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * Test that _formatName doesn't jack up email addresses with alias parts.
+ *
+ * @return void
+ */
+	function testFormatAddressAliases() {
+		$result = $this->Controller->EmailTest->formatAddress('email@example.com');
+		$this->assertEqual($result, 'email@example.com');
+
+		$result = $this->Controller->EmailTest->formatAddress('alias <email@example.com>');
+		$this->assertEqual($result, 'alias <email@example.com>');
+		
+		$result = $this->Controller->EmailTest->formatAddress('alias<email@example.com>');
+		$this->assertEqual($result, 'alias <email@example.com>');
+
+		$result = $this->Controller->EmailTest->formatAddress('email@example.com');
+		$this->assertEqual($result, 'email@example.com');
+
+		$result = $this->Controller->EmailTest->formatAddress('<email@example.com>');
+		$this->assertEqual($result, '<email@example.com>');
+
+		$result = $this->Controller->EmailTest->formatAddress('email@example.com', true);
+		$this->assertEqual($result, '<email@example.com>');
+
+		$result = $this->Controller->EmailTest->formatAddress('<email@example.com>', true);
+		$this->assertEqual($result, '<email@example.com>');
+
+		$result = $this->Controller->EmailTest->formatAddress('alias name <email@example.com>', true);
+		$this->assertEqual($result, '<email@example.com>');
+	}
+
+/**
+ * test formatting addresses with multibyte chars
+ *
+ * @return void
+ */
+	function testFormatAddressMultibyte() {
+		$this->Controller->EmailTest->charset = 'UTF-8';
+		$result = $this->Controller->EmailTest->formatAddress('ÄÖÜTest <email@domain.de>');
+		$this->assertEqual($result, '=?UTF-8?B?w4TDlsOcVGVzdCA=?= <email@domain.de>');
+		
+		$result = $this->Controller->EmailTest->formatAddress('ÄÖÜTest<email@domain.de>');
+		$this->assertEqual($result, '=?UTF-8?B?w4TDlsOcVGVzdA==?= <email@domain.de>');
+
+		$result = $this->Controller->EmailTest->formatAddress('ÄÖÜTest <email@domain.de>', true);
+		$this->assertEqual($result, '<email@domain.de>');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php
new file mode 100644
index 000000000..8851dc58b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/request_handler.test.php
@@ -0,0 +1,731 @@
+<?php
+/**
+ * RequestHandlerComponentTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.5435
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Controller', 'Controller', false);
+App::import('Component', array('RequestHandler'));
+
+Mock::generatePartial('RequestHandlerComponent', 'NoStopRequestHandler', array('_stop', '_header'));
+Mock::generatePartial('Controller', 'RequestHandlerMockController', array('header'));
+
+/**
+ * RequestHandlerTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class RequestHandlerTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'RequestHandlerTest';
+
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+
+/**
+ * construct method
+ *
+ * @param array $params
+ * @access private
+ * @return void
+ */
+	function __construct($params = array()) {
+		foreach ($params as $key => $val) {
+			$this->{$key} = $val;
+		}
+		parent::__construct();
+	}
+
+/**
+ * test method for ajax redirection
+ *
+ * @return void
+ */
+	function destination() {
+		$this->viewPath = 'posts';
+		$this->render('index');
+	}
+/**
+ * test method for ajax redirection + parameter parsing
+ *
+ * @return void
+ */
+	function param_method($one = null, $two = null) {
+		echo "one: $one two: $two";
+		$this->autoRender = false;
+	}
+
+/**
+ * test method for testing layout rendering when isAjax()
+ *
+ * @return void
+ */
+	function ajax2_layout() {
+		if ($this->autoLayout) {
+			$this->layout = 'ajax2';
+		}
+		$this->destination();
+	}
+}
+
+/**
+ * RequestHandlerTestDisabledController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class RequestHandlerTestDisabledController extends Controller {
+
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+
+/**
+ * construct method
+ *
+ * @param array $params
+ * @access private
+ * @return void
+ */
+	function __construct($params = array()) {
+		foreach ($params as $key => $val) {
+			$this->{$key} = $val;
+		}
+		parent::__construct();
+	}
+
+/**
+ * beforeFilter method
+ *
+ * @return void
+ * @access public
+ */
+	function beforeFilter() {
+		$this->RequestHandler->enabled = false;
+	}
+}
+
+/**
+ * RequestHandlerComponentTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class RequestHandlerComponentTest extends CakeTestCase {
+
+/**
+ * Controller property
+ *
+ * @var RequestHandlerTestController
+ * @access public
+ */
+	var $Controller;
+
+/**
+ * RequestHandler property
+ *
+ * @var RequestHandlerComponent
+ * @access public
+ */
+	var $RequestHandler;
+
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->_init();
+	}
+
+/**
+ * init method
+ *
+ * @access protected
+ * @return void
+ */
+	function _init() {
+		$this->Controller = new RequestHandlerTestController(array('components' => array('RequestHandler')));
+		$this->Controller->constructClasses();
+		$this->RequestHandler =& $this->Controller->RequestHandler;
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->RequestHandler);
+		unset($this->Controller);
+		if (!headers_sent()) {
+			header('Content-type: text/html'); //reset content type.
+		}
+		App::build();
+	}
+
+/**
+ * testInitializeCallback method
+ *
+ * @access public
+ * @return void
+ */
+	function testInitializeCallback() {
+		$this->assertNull($this->RequestHandler->ext);
+
+		$this->_init();
+		$this->Controller->params['url']['ext'] = 'rss';
+		$this->RequestHandler->initialize($this->Controller);
+		$this->assertEqual($this->RequestHandler->ext, 'rss');
+
+		$settings = array(
+			'ajaxLayout' => 'test_ajax'
+		);
+		$this->RequestHandler->initialize($this->Controller, $settings);
+		$this->assertEqual($this->RequestHandler->ajaxLayout, 'test_ajax');
+	}
+
+/**
+ * testDisabling method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisabling() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$this->_init();
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->beforeFilter();
+		$this->Controller->Component->startup($this->Controller);
+		$this->assertEqual($this->Controller->params, array('isAjax' => true));
+
+		$this->Controller = new RequestHandlerTestDisabledController(array('components' => array('RequestHandler')));
+		$this->Controller->constructClasses();
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->beforeFilter();
+		$this->Controller->Component->startup($this->Controller);
+		$this->assertEqual($this->Controller->params, array());
+		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
+	}
+
+/**
+ * testAutoResponseType method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoResponseType() {
+		$this->Controller->ext = '.thtml';
+		$this->Controller->params['url']['ext'] = 'rss';
+		$this->RequestHandler->initialize($this->Controller);
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertEqual($this->Controller->ext, '.ctp');
+	}
+
+
+/**
+ * testAutoAjaxLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoAjaxLayout() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertTrue($this->Controller->layout, $this->RequestHandler->ajaxLayout);
+
+		$this->_init();
+		$this->Controller->params['url']['ext'] = 'js';
+		$this->RequestHandler->initialize($this->Controller);
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertNotEqual($this->Controller->layout, 'ajax');
+
+		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
+	}
+
+/**
+ * testStartupCallback method
+ *
+ * @access public
+ * @return void
+ */
+	function testStartupCallback() {
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$_SERVER['CONTENT_TYPE'] = 'application/xml';
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertTrue(is_array($this->Controller->data));
+		$this->assertFalse(is_object($this->Controller->data));
+	}
+
+/**
+ * testStartupCallback with charset.
+ *
+ * @return void
+ */
+	function testStartupCallbackCharset() {
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$_SERVER['CONTENT_TYPE'] = 'application/xml; charset=UTF-8';
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertTrue(is_array($this->Controller->data));
+		$this->assertFalse(is_object($this->Controller->data));
+	}
+
+/**
+ * testNonAjaxRedirect method
+ *
+ * @access public
+ * @return void
+ */
+	function testNonAjaxRedirect() {
+		$this->RequestHandler->initialize($this->Controller);
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertNull($this->RequestHandler->beforeRedirect($this->Controller, '/'));
+	}
+
+/**
+ * testRenderAs method
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderAs() {
+		$this->assertFalse(in_array('Xml', $this->Controller->helpers));
+		$this->RequestHandler->renderAs($this->Controller, 'xml');
+		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
+
+		$this->Controller->viewPath = 'request_handler_test\\xml';
+		$this->RequestHandler->renderAs($this->Controller, 'js');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'js');
+	}
+
+/**
+ * test that respondAs works as expected.
+ *
+ * @return void
+ */
+	function testRespondAs() {
+		$RequestHandler = new NoStopRequestHandler();
+		$RequestHandler->expectAt(0, '_header', array('Content-Type: application/json'));
+		$RequestHandler->expectAt(1, '_header', array('Content-Type: text/xml'));
+
+		$result = $RequestHandler->respondAs('json');
+		$this->assertTrue($result);
+
+		$result = $RequestHandler->respondAs('text/xml');
+		$this->assertTrue($result);
+	}
+
+/**
+ * test that attachment headers work with respondAs
+ *
+ * @return void
+ */
+	function testRespondAsWithAttachment() {
+		$RequestHandler = new NoStopRequestHandler();
+		$RequestHandler->expectAt(0, '_header', array('Content-Disposition: attachment; filename="myfile.xml"'));
+		$RequestHandler->expectAt(1, '_header', array('Content-Type: text/xml'));
+
+		$result = $RequestHandler->respondAs('xml', array('attachment' => 'myfile.xml'));
+		$this->assertTrue($result);
+	}
+
+/**
+ * test that calling renderAs() more than once continues to work.
+ *
+ * @link #6466
+ * @return void
+ */
+	function testRenderAsCalledTwice() {
+		$this->RequestHandler->renderAs($this->Controller, 'xml');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'xml');
+		$this->assertEqual($this->Controller->layoutPath, 'xml');
+
+		$this->assertTrue(in_array('Xml', $this->Controller->helpers));
+
+		$this->RequestHandler->renderAs($this->Controller, 'js');
+		$this->assertEqual($this->Controller->viewPath, 'request_handler_test' . DS . 'js');
+		$this->assertEqual($this->Controller->layoutPath, 'js');
+		$this->assertTrue(in_array('Js', $this->Controller->helpers));
+	}
+
+/**
+ * testRequestClientTypes method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestClientTypes() {
+		$this->assertFalse($this->RequestHandler->isFlash());
+		$_SERVER['HTTP_USER_AGENT'] = 'Shockwave Flash';
+		$this->assertTrue($this->RequestHandler->isFlash());
+		unset($_SERVER['HTTP_USER_AGENT'], $_SERVER['HTTP_X_REQUESTED_WITH']);
+
+		$this->assertFalse($this->RequestHandler->isAjax());
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$_SERVER['HTTP_X_PROTOTYPE_VERSION'] = '1.5';
+		$this->assertTrue($this->RequestHandler->isAjax());
+		$this->assertEqual($this->RequestHandler->getAjaxVersion(), '1.5');
+
+		unset($_SERVER['HTTP_X_REQUESTED_WITH'], $_SERVER['HTTP_X_PROTOTYPE_VERSION']);
+		$this->assertFalse($this->RequestHandler->isAjax());
+		$this->assertFalse($this->RequestHandler->getAjaxVersion());
+	}
+
+/**
+ * Tests the detection of various Flash versions
+ *
+ * @access public
+ * @return void
+ */
+	function testFlashDetection() {
+		$_agent = env('HTTP_USER_AGENT');
+		$_SERVER['HTTP_USER_AGENT'] = 'Shockwave Flash';
+		$this->assertTrue($this->RequestHandler->isFlash());
+
+		$_SERVER['HTTP_USER_AGENT'] = 'Adobe Flash';
+		$this->assertTrue($this->RequestHandler->isFlash());
+
+		$_SERVER['HTTP_USER_AGENT'] = 'Adobe Flash Player 9';
+		$this->assertTrue($this->RequestHandler->isFlash());
+
+		$_SERVER['HTTP_USER_AGENT'] = 'Adobe Flash Player 10';
+		$this->assertTrue($this->RequestHandler->isFlash());
+
+		$_SERVER['HTTP_USER_AGENT'] = 'Shock Flash';
+		$this->assertFalse($this->RequestHandler->isFlash());
+
+		$_SERVER['HTTP_USER_AGENT'] = $_agent;
+	}
+
+/**
+ * testRequestContentTypes method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestContentTypes() {
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$this->assertNull($this->RequestHandler->requestedWith());
+
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+		$this->assertEqual($this->RequestHandler->requestedWith(), 'json');
+
+		$result = $this->RequestHandler->requestedWith(array('json', 'xml'));
+		$this->assertEqual($result, 'json');
+
+		$result =$this->RequestHandler->requestedWith(array('rss', 'atom'));
+		$this->assertFalse($result);
+
+		$_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
+		$this->_init();
+		$this->assertTrue($this->RequestHandler->isXml());
+		$this->assertFalse($this->RequestHandler->isAtom());
+		$this->assertFalse($this->RequestHandler->isRSS());
+
+		$_SERVER['HTTP_ACCEPT'] = 'application/atom+xml,text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
+		$this->_init();
+		$this->assertTrue($this->RequestHandler->isAtom());
+		$this->assertFalse($this->RequestHandler->isRSS());
+
+		$_SERVER['HTTP_ACCEPT'] = 'application/rss+xml,text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
+		$this->_init();
+		$this->assertFalse($this->RequestHandler->isAtom());
+		$this->assertTrue($this->RequestHandler->isRSS());
+
+		$this->assertFalse($this->RequestHandler->isWap());
+		$_SERVER['HTTP_ACCEPT'] = 'text/vnd.wap.wml,text/html,text/plain,image/png,*/*';
+		$this->_init();
+		$this->assertTrue($this->RequestHandler->isWap());
+
+		$_SERVER['HTTP_ACCEPT'] = 'application/rss+xml,text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
+	}
+
+/**
+ * testResponseContentType method
+ *
+ * @access public
+ * @return void
+ */
+	function testResponseContentType() {
+		$this->assertNull($this->RequestHandler->responseType());
+		$this->assertTrue($this->RequestHandler->respondAs('atom'));
+		$this->assertEqual($this->RequestHandler->responseType(), 'atom');
+	}
+
+/**
+ * testMobileDeviceDetection method
+ *
+ * @access public
+ * @return void
+ */
+	function testMobileDeviceDetection() {
+		$this->assertFalse($this->RequestHandler->isMobile());
+
+		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420+ (KHTML, like Gecko) Version/3.0 Mobile/1A543a Safari/419.3';
+		$this->assertTrue($this->RequestHandler->isMobile());
+
+		$_SERVER['HTTP_USER_AGENT'] = 'Some imaginary UA';
+		$this->RequestHandler->mobileUA []= 'imaginary';
+		$this->assertTrue($this->RequestHandler->isMobile());
+		array_pop($this->RequestHandler->mobileUA);
+	}
+
+/**
+ * testRequestProperties method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestProperties() {
+		$_SERVER['HTTPS'] = 'on';
+		$this->assertTrue($this->RequestHandler->isSSL());
+
+		unset($_SERVER['HTTPS']);
+		$this->assertFalse($this->RequestHandler->isSSL());
+
+		$_ENV['SCRIPT_URI'] = 'https://localhost/';
+		$s = $_SERVER;
+		$_SERVER = array();
+		$this->assertTrue($this->RequestHandler->isSSL());
+		$_SERVER = $s;
+	}
+
+/**
+ * testRequestMethod method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestMethod() {
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$this->assertTrue($this->RequestHandler->isGet());
+		$this->assertFalse($this->RequestHandler->isPost());
+		$this->assertFalse($this->RequestHandler->isPut());
+		$this->assertFalse($this->RequestHandler->isDelete());
+
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->assertFalse($this->RequestHandler->isGet());
+		$this->assertTrue($this->RequestHandler->isPost());
+		$this->assertFalse($this->RequestHandler->isPut());
+		$this->assertFalse($this->RequestHandler->isDelete());
+
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$this->assertFalse($this->RequestHandler->isGet());
+		$this->assertFalse($this->RequestHandler->isPost());
+		$this->assertTrue($this->RequestHandler->isPut());
+		$this->assertFalse($this->RequestHandler->isDelete());
+
+		$_SERVER['REQUEST_METHOD'] = 'DELETE';
+		$this->assertFalse($this->RequestHandler->isGet());
+		$this->assertFalse($this->RequestHandler->isPost());
+		$this->assertFalse($this->RequestHandler->isPut());
+		$this->assertTrue($this->RequestHandler->isDelete());
+	}
+
+/**
+ * testClientContentPreference method
+ *
+ * @access public
+ * @return void
+ */
+	function testClientContentPreference() {
+		$_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xml,application/xhtml+xml,text/html,text/plain,image/png,*/*';
+		$this->_init();
+		$this->assertNotEqual($this->RequestHandler->prefers(), 'rss');
+		$this->RequestHandler->ext = 'rss';
+		$this->assertEqual($this->RequestHandler->prefers(), 'rss');
+		$this->assertFalse($this->RequestHandler->prefers('xml'));
+		$this->assertEqual($this->RequestHandler->prefers(array('js', 'xml', 'xhtml')), 'xml');
+		$this->assertTrue($this->RequestHandler->accepts('xml'));
+
+		$_SERVER['HTTP_ACCEPT'] = 'text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5';
+		$this->_init();
+		$this->assertEqual($this->RequestHandler->prefers(), 'xml');
+		$this->assertEqual($this->RequestHandler->accepts(array('js', 'xml', 'html')), 'xml');
+		$this->assertFalse($this->RequestHandler->accepts(array('gif', 'jpeg', 'foo')));
+
+		$_SERVER['HTTP_ACCEPT'] = '*/*;q=0.5';
+		$this->_init();
+		$this->assertEqual($this->RequestHandler->prefers(), 'html');
+		$this->assertFalse($this->RequestHandler->prefers('rss'));
+		$this->assertFalse($this->RequestHandler->accepts('rss'));
+	}
+
+/**
+ * testCustomContent method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomContent() {
+		$_SERVER['HTTP_ACCEPT'] = 'text/x-mobile,text/html;q=0.9,text/plain;q=0.8,*/*;q=0.5';
+		$this->_init();
+		$this->RequestHandler->setContent('mobile', 'text/x-mobile');
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertEqual($this->RequestHandler->prefers(), 'mobile');
+
+		$this->_init();
+		$this->RequestHandler->setContent(array('mobile' => 'text/x-mobile'));
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertEqual($this->RequestHandler->prefers(), 'mobile');
+	}
+
+/**
+ * testClientProperties method
+ *
+ * @access public
+ * @return void
+ */
+	function testClientProperties() {
+		$_SERVER['HTTP_HOST'] = 'localhost:80';
+		$this->assertEqual($this->RequestHandler->getReferer(), 'localhost');
+		$_SERVER['HTTP_HOST'] = null;
+		$_SERVER['HTTP_X_FORWARDED_HOST'] = 'cakephp.org';
+		$this->assertEqual($this->RequestHandler->getReferer(), 'cakephp.org');
+
+		$_SERVER['HTTP_X_FORWARDED_FOR'] = '192.168.1.5, 10.0.1.1, proxy.com';
+		$_SERVER['HTTP_CLIENT_IP'] = '192.168.1.2';
+		$_SERVER['REMOTE_ADDR'] = '192.168.1.3';
+		$this->assertEqual($this->RequestHandler->getClientIP(false), '192.168.1.5');
+		$this->assertEqual($this->RequestHandler->getClientIP(), '192.168.1.2');
+
+		unset($_SERVER['HTTP_X_FORWARDED_FOR']);
+		$this->assertEqual($this->RequestHandler->getClientIP(), '192.168.1.2');
+
+		unset($_SERVER['HTTP_CLIENT_IP']);
+		$this->assertEqual($this->RequestHandler->getClientIP(), '192.168.1.3');
+
+		$_SERVER['HTTP_CLIENTADDRESS'] = '10.0.1.2, 10.0.1.1';
+		$this->assertEqual($this->RequestHandler->getClientIP(), '10.0.1.2');
+	}
+
+/**
+ * test that ajax requests involving redirects trigger requestAction instead.
+ *
+ * @return void
+ */
+	function testAjaxRedirectAsRequestAction() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$this->_init();
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		), true);
+
+		$this->Controller->RequestHandler = new NoStopRequestHandler($this);
+		$this->Controller->RequestHandler->expectOnce('_stop');
+
+		ob_start();
+		$this->Controller->RequestHandler->beforeRedirect(
+			$this->Controller, array('controller' => 'request_handler_test', 'action' => 'destination')
+		);
+		$result = ob_get_clean();
+		$this->assertPattern('/posts index/', $result, 'RequestAction redirect failed.');
+
+		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
+		App::build();
+	}
+
+/**
+ * test that ajax requests involving redirects don't force no layout
+ * this would cause the ajax layout to not be rendered.
+ *
+ * @return void
+ */
+	function testAjaxRedirectAsRequestActionStillRenderingLayout() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$this->_init();
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		), true);
+
+		$this->Controller->RequestHandler = new NoStopRequestHandler($this);
+		$this->Controller->RequestHandler->expectOnce('_stop');
+
+		ob_start();
+		$this->Controller->RequestHandler->beforeRedirect(
+			$this->Controller, array('controller' => 'request_handler_test', 'action' => 'ajax2_layout')
+		);
+		$result = ob_get_clean();
+		$this->assertPattern('/posts index/', $result, 'RequestAction redirect failed.');
+		$this->assertPattern('/Ajax!/', $result, 'Layout was not rendered.');
+
+		unset($_SERVER['HTTP_X_REQUESTED_WITH']);
+		App::build();
+	}
+
+/**
+ * test that the beforeRedirect callback properly converts
+ * array urls into their correct string ones, and adds base => false so
+ * the correct urls are generated.
+ *
+ * @link http://cakephp.lighthouseapp.com/projects/42648-cakephp-1x/tickets/276
+ * @return void
+ */
+	function testBeforeRedirectCallbackWithArrayUrl() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'named' => array(), 'form' => array(), 'url' => array('url' => 'accounts/')),
+			array('base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/')
+		));
+
+		$RequestHandler =& new NoStopRequestHandler();
+
+		ob_start();
+		$RequestHandler->beforeRedirect(
+			$this->Controller,
+			array('controller' => 'request_handler_test', 'action' => 'param_method', 'first', 'second')
+		);
+		$result = ob_get_clean();
+		$this->assertEqual($result, 'one: first two: second');
+	}
+
+/**
+ * assure that beforeRedirect with a status code will correctly set the status header
+ *
+ * @return void
+ */
+	function testBeforeRedirectCallingHeader() {
+		$controller =& new RequestHandlerMockController();
+		$RequestHandler =& new NoStopRequestHandler();
+
+		$controller->expectOnce('header', array('HTTP/1.1 403 Forbidden'));
+
+		ob_start();
+		$RequestHandler->beforeRedirect($controller, 'request_handler_test/param_method/first/second', 403);
+		$result = ob_get_clean();
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/security.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/security.test.php
new file mode 100644
index 000000000..66cff58ba
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/security.test.php
@@ -0,0 +1,1286 @@
+<?php
+/**
+ * SecurityComponentTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.5435
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Component', 'Security');
+
+/**
+* TestSecurityComponent
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class TestSecurityComponent extends SecurityComponent {
+
+/**
+ * validatePost method
+ *
+ * @param Controller $controller
+ * @return unknown
+ */
+	function validatePost(&$controller) {
+		return $this->_validatePost($controller);
+	}
+}
+
+/**
+* SecurityTestController
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class SecurityTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'SecurityTest'
+ * @access public
+ */
+	var $name = 'SecurityTest';
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Session', 'TestSecurity');
+
+/**
+ * failed property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $failed = false;
+
+/**
+ * Used for keeping track of headers in test
+ *
+ * @var array
+ * @access public
+ */
+	var $testHeaders = array();
+
+/**
+ * fail method
+ *
+ * @access public
+ * @return void
+ */
+	function fail() {
+		$this->failed = true;
+	}
+
+/**
+ * redirect method
+ *
+ * @param mixed $option
+ * @param mixed $code
+ * @param mixed $exit
+ * @access public
+ * @return void
+ */
+	function redirect($option, $code, $exit) {
+		return $code;
+	}
+
+/**
+ * Conveinence method for header()
+ *
+ * @param string $status
+ * @return void
+ * @access public
+ */
+	function header($status) {
+		$this->testHeaders[] = $status;
+	}
+}
+
+/**
+ * SecurityComponentTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class SecurityComponentTest extends CakeTestCase {
+
+/**
+ * Controller property
+ *
+ * @var SecurityTestController
+ * @access public
+ */
+	var $Controller;
+
+/**
+ * oldSalt property
+ *
+ * @var string
+ * @access public
+ */
+	var $oldSalt;
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Controller =& new SecurityTestController();
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Security =& $this->Controller->TestSecurity;
+		$this->Controller->Security->blackHoleCallback = 'fail';
+		$this->oldSalt = Configure::read('Security.salt');
+		Configure::write('Security.salt', 'foo!');
+	}
+
+/**
+ * Tear-down method. Resets environment state.
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		Configure::write('Security.salt', $this->oldSalt);
+		$this->Controller->Session->delete('_Token');
+		unset($this->Controller->Security);
+		unset($this->Controller->Component);
+		unset($this->Controller);
+	}
+
+/**
+ * test that initalize can set properties.
+ *
+ * @return void
+ */
+	function testInitialize() {
+		$settings = array(
+			'requirePost' => array('edit', 'update'),
+			'requireSecure' => array('update_account'),
+			'requireGet' => array('index'),
+			'validatePost' => false,
+			'loginUsers' => array(
+				'mark' => 'password'
+			),
+			'requireLogin' => array('login'),
+		);
+		$this->Controller->Security->initialize($this->Controller, $settings);
+		$this->assertEqual($this->Controller->Security->requirePost, $settings['requirePost']);
+		$this->assertEqual($this->Controller->Security->requireSecure, $settings['requireSecure']);
+		$this->assertEqual($this->Controller->Security->requireGet, $settings['requireGet']);
+		$this->assertEqual($this->Controller->Security->validatePost, $settings['validatePost']);
+		$this->assertEqual($this->Controller->Security->loginUsers, $settings['loginUsers']);
+		$this->assertEqual($this->Controller->Security->requireLogin, $settings['requireLogin']);
+	}
+
+/**
+ * testStartup method
+ *
+ * @access public
+ * @return void
+ */
+	function testStartup() {
+		$this->Controller->Security->startup($this->Controller);
+		$result = $this->Controller->params['_Token']['key'];
+		$this->assertNotNull($result);
+		$this->assertTrue($this->Controller->Session->check('_Token'));
+	}
+
+/**
+ * testRequirePostFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequirePostFail() {
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requirePost(array('posted'));
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+	}
+
+/**
+ * testRequirePostSucceed method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequirePostSucceed() {
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requirePost('posted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireSecureFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireSecureFail() {
+		$_SERVER['HTTPS'] = 'off';
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireSecure(array('posted'));
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+	}
+
+/**
+ * testRequireSecureSucceed method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireSecureSucceed() {
+		$_SERVER['REQUEST_METHOD'] = 'Secure';
+		$this->Controller->action = 'posted';
+		$_SERVER['HTTPS'] = 'on';
+		$this->Controller->Security->requireSecure('posted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireAuthFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireAuthFail() {
+		$_SERVER['REQUEST_METHOD'] = 'AUTH';
+		$this->Controller->action = 'posted';
+		$this->Controller->data = array('username' => 'willy', 'password' => 'somePass');
+		$this->Controller->Security->requireAuth(array('posted'));
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+
+		$this->Controller->Session->write('_Token', serialize(array('allowedControllers' => array())));
+		$this->Controller->data = array('username' => 'willy', 'password' => 'somePass');
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireAuth('posted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+
+		$this->Controller->Session->write('_Token', serialize(array(
+			'allowedControllers' => array('SecurityTest'), 'allowedActions' => array('posted2')
+		)));
+		$this->Controller->data = array('username' => 'willy', 'password' => 'somePass');
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireAuth('posted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+	}
+
+/**
+ * testRequireAuthSucceed method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireAuthSucceed() {
+		$_SERVER['REQUEST_METHOD'] = 'AUTH';
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireAuth('posted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+
+		$this->Controller->Security->Session->write('_Token', serialize(array(
+			'allowedControllers' => array('SecurityTest'), 'allowedActions' => array('posted')
+		)));
+		$this->Controller->params['controller'] = 'SecurityTest';
+		$this->Controller->params['action'] = 'posted';
+
+		$this->Controller->data = array(
+			'username' => 'willy', 'password' => 'somePass', '_Token' => ''
+		);
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireAuth('posted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequirePostSucceedWrongMethod method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequirePostSucceedWrongMethod() {
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$this->Controller->action = 'getted';
+		$this->Controller->Security->requirePost('posted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireGetFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireGetFail() {
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'getted';
+		$this->Controller->Security->requireGet(array('getted'));
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+	}
+
+/**
+ * testRequireGetSucceed method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireGetSucceed() {
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$this->Controller->action = 'getted';
+		$this->Controller->Security->requireGet('getted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireLogin method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireLogin() {
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireLogin(
+			'posted',
+			array('type' => 'basic', 'users' => array('admin' => 'password'))
+		);
+		$_SERVER['PHP_AUTH_USER'] = 'admin';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+
+
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireLogin(
+			array('posted'),
+			array('type' => 'basic', 'users' => array('admin' => 'password'))
+		);
+		$_SERVER['PHP_AUTH_USER'] = 'admin2';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireLogin(
+			'posted',
+			array('type' => 'basic', 'users' => array('admin' => 'password'))
+		);
+		$_SERVER['PHP_AUTH_USER'] = 'admin';
+		$_SERVER['PHP_AUTH_PW'] = 'password2';
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+	}
+
+/**
+ * testDigestAuth method
+ *
+ * @access public
+ * @return void
+ */
+	function testDigestAuth() {
+		$skip = $this->skipIf((version_compare(PHP_VERSION, '5.1') == -1) XOR (!function_exists('apache_request_headers')),
+			"%s Cannot run Digest Auth test for PHP versions < 5.1"
+		);
+
+		if ($skip) {
+			return;
+		}
+
+		$this->Controller->action = 'posted';
+		$_SERVER['PHP_AUTH_DIGEST'] = $digest = <<<DIGEST
+		Digest username="Mufasa",
+		realm="testrealm@host.com",
+		nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",
+		uri="/dir/index.html",
+		qop=auth,
+		nc=00000001,
+		cnonce="0a4f113b",
+		response="460d0d3c6867c2f1ab85b1ada1aece48",
+		opaque="5ccc069c403ebaf9f0171e9517f40e41"
+DIGEST;
+		$this->Controller->Security->requireLogin('posted', array(
+			'type' => 'digest', 'users' => array('Mufasa' => 'password'),
+			'realm' => 'testrealm@host.com'
+		));
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireGetSucceedWrongMethod method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireGetSucceedWrongMethod() {
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireGet('getted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequirePutFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequirePutFail() {
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'putted';
+		$this->Controller->Security->requirePut(array('putted'));
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+	}
+
+/**
+ * testRequirePutSucceed method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequirePutSucceed() {
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$this->Controller->action = 'putted';
+		$this->Controller->Security->requirePut('putted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequirePutSucceedWrongMethod method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequirePutSucceedWrongMethod() {
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requirePut('putted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireDeleteFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireDeleteFail() {
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'deleted';
+		$this->Controller->Security->requireDelete(array('deleted', 'other_method'));
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertTrue($this->Controller->failed);
+	}
+
+/**
+ * testRequireDeleteSucceed method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireDeleteSucceed() {
+		$_SERVER['REQUEST_METHOD'] = 'DELETE';
+		$this->Controller->action = 'deleted';
+		$this->Controller->Security->requireDelete('deleted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireDeleteSucceedWrongMethod method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireDeleteSucceedWrongMethod() {
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$this->Controller->action = 'posted';
+		$this->Controller->Security->requireDelete('deleted');
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertFalse($this->Controller->failed);
+	}
+
+/**
+ * testRequireLoginSettings method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireLoginSettings() {
+		$this->Controller->Security->requireLogin(
+			'add', 'edit',
+			array('type' => 'basic', 'users' => array('admin' => 'password'))
+		);
+		$this->assertEqual($this->Controller->Security->requireLogin, array('add', 'edit'));
+		$this->assertEqual($this->Controller->Security->loginUsers, array('admin' => 'password'));
+	}
+
+/**
+ * testRequireLoginAllActions method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequireLoginAllActions() {
+		$this->Controller->Security->requireLogin(
+			array('type' => 'basic', 'users' => array('admin' => 'password'))
+		);
+		$this->assertEqual($this->Controller->Security->requireLogin, array('*'));
+		$this->assertEqual($this->Controller->Security->loginUsers, array('admin' => 'password'));
+	}
+
+/**
+ * Simple hash validation test
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePost() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3AModel.valid';
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('key', 'fields')
+		);
+		$this->assertTrue($this->Controller->Security->validatePost($this->Controller));
+	}
+
+/**
+ * test that validatePost fails if any of its required fields are missing.
+ *
+ * @return void
+ */
+	function testValidatePostFormHacking() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3AModel.valid';
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('key')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result, 'validatePost passed when fields were missing. %s');
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'nate', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result, 'validatePost passed when key was missing. %s');
+	}
+
+/**
+ * Test that objects can't be passed into the serialized string. This was a vector for RFI and LFI 
+ * attacks. Thanks to Felix Wilhelm
+ *
+ * @return void
+ */
+	function testValidatePostObjectDeserialize() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877';
+
+		// a corrupted serialized object, so we can see if it ever gets to deserialize
+		$attack = 'O:3:"App":1:{s:5:"__map";a:1:{s:3:"foo";s:7:"Hacked!";s:1:"fail"}}';
+		$fields .= urlencode(':' . str_rot13($attack));
+
+		$this->Controller->data = array(
+			'Model' => array('username' => 'mark', 'password' => 'foo', 'valid' => '0'),
+			'_Token' => compact('key', 'fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result, 'validatePost passed when key was missing. %s');
+	}
+
+/**
+ * Tests validation of checkbox arrays
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePostArray() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'f7d573650a295b94e0938d32b323fde775e5f32b%3A';
+
+		$this->Controller->data = array(
+			'Model' => array('multi_field' => array('1', '3')),
+			'_Token' => compact('key', 'fields')
+		);
+		$this->assertTrue($this->Controller->Security->validatePost($this->Controller));
+	}
+
+/**
+ * testValidatePostNoModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePostNoModel() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '540ac9c60d323c22bafe997b72c0790f39a8bdef%3A';
+
+		$this->Controller->data = array(
+			'anything' => 'some_data',
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testValidatePostSimple method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePostSimple() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '69f493434187b867ea14b901fdf58b55d27c935d%3A';
+
+		$this->Controller->data = $data = array(
+			'Model' => array('username' => '', 'password' => ''),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * Tests hash validation for multiple records, including locked fields
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePostComplex() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'c9118120e680a7201b543f562e5301006ccfcbe2%3AAddresses.0.id%7CAddresses.1.id';
+
+		$this->Controller->data = array(
+			'Addresses' => array(
+				'0' => array(
+					'id' => '123456', 'title' => '', 'first_name' => '', 'last_name' => '',
+					'address' => '', 'city' => '', 'phone' => '', 'primary' => ''
+				),
+				'1' => array(
+					'id' => '654321', 'title' => '', 'first_name' => '', 'last_name' => '',
+					'address' => '', 'city' => '', 'phone' => '', 'primary' => ''
+				)
+			),
+			'_Token' => compact('key', 'fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * test ValidatePost with multiple select elements.
+ *
+ * @return void
+ */
+	function testValidatePostMultipleSelect() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '422cde416475abc171568be690a98cad20e66079%3A';
+
+		$this->Controller->data = array(
+			'Tag' => array('Tag' => array(1, 2)),
+			'_Token' => compact('key', 'fields'),
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+
+		$this->Controller->data = array(
+			'Tag' => array('Tag' => array(1, 2, 3)),
+			'_Token' => compact('key', 'fields'),
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+
+		$this->Controller->data = array(
+			'Tag' => array('Tag' => array(1, 2, 3, 4)),
+			'_Token' => compact('key', 'fields'),
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+
+		$fields = '19464422eafe977ee729c59222af07f983010c5f%3A';
+		$this->Controller->data = array(
+			'User.password' => 'bar', 'User.name' => 'foo', 'User.is_valid' => '1',
+			'Tag' => array('Tag' => array(1)), '_Token' => compact('key', 'fields'),
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testValidatePostCheckbox method
+ *
+ * First block tests un-checked checkbox
+ * Second block tests checked checkbox
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePostCheckbox() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'a5475372b40f6e3ccbf9f8af191f20e1642fd877%3AModel.valid';
+
+		$this->Controller->data = array(
+			'Model' => array('username' => '', 'password' => '', 'valid' => '0'),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+
+		$fields = '874439ca69f89b4c4a5f50fb9c36ff56a28f5d42%3A';
+
+		$this->Controller->data = array(
+			'Model' => array('username' => '', 'password' => '', 'valid' => '0'),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+
+
+		$this->Controller->data = array();
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+
+		$this->Controller->data = $data = array(
+			'Model' => array('username' => '', 'password' => '', 'valid' => '0'),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testValidatePostHidden method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePostHidden() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '51ccd8cb0997c7b3d4523ecde5a109318405ef8c%3AModel.hidden%7CModel.other_hidden';
+		$fields .= '';
+
+		$this->Controller->data = array(
+			'Model' => array(
+				'username' => '', 'password' => '', 'hidden' => '0',
+				'other_hidden' => 'some hidden value'
+			),
+			'_Token' => compact('key', 'fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testValidatePostWithDisabledFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidatePostWithDisabledFields() {
+		$this->Controller->Security->disabledFields = array('Model.username', 'Model.password');
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'ef1082968c449397bcd849f963636864383278b1%3AModel.hidden';
+
+		$this->Controller->data = array(
+			'Model' => array(
+				'username' => '', 'password' => '', 'hidden' => '0'
+			),
+			'_Token' => compact('fields', 'key')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testValidateHiddenMultipleModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidateHiddenMultipleModel() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = 'a2d01072dc4660eea9d15007025f35a7a5b58e18%3AModel.valid%7CModel2.valid%7CModel3.valid';
+
+		$this->Controller->data = array(
+			'Model' => array('username' => '', 'password' => '', 'valid' => '0'),
+			'Model2' => array('valid' => '0'),
+			'Model3' => array('valid' => '0'),
+			'_Token' => compact('key', 'fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testLoginValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoginValidation() {
+
+	}
+
+/**
+ * testValidateHasManyModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidateHasManyModel() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '51e3b55a6edd82020b3f29c9ae200e14bbeb7ee5%3AModel.0.hidden%7CModel.0.valid';
+		$fields .= '%7CModel.1.hidden%7CModel.1.valid';
+
+		$this->Controller->data = array(
+			'Model' => array(
+				array(
+					'username' => 'username', 'password' => 'password',
+					'hidden' => 'value', 'valid' => '0'
+				),
+				array(
+					'username' => 'username', 'password' => 'password',
+					'hidden' => 'value', 'valid' => '0'
+				)
+			),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testValidateHasManyRecordsPass method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidateHasManyRecordsPass() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '7a203edb3d345bbf38fe0dccae960da8842e11d7%3AAddress.0.id%7CAddress.0.primary%7C';
+		$fields .= 'Address.1.id%7CAddress.1.primary';
+
+		$this->Controller->data = array(
+			'Address' => array(
+				0 => array(
+					'id' => '123',
+					'title' => 'home',
+					'first_name' => 'Bilbo',
+					'last_name' => 'Baggins',
+					'address' => '23 Bag end way',
+					'city' => 'the shire',
+					'phone' => 'N/A',
+					'primary' => '1',
+				),
+				1 => array(
+					'id' => '124',
+					'title' => 'home',
+					'first_name' => 'Frodo',
+					'last_name' => 'Baggins',
+					'address' => '50 Bag end way',
+					'city' => 'the shire',
+					'phone' => 'N/A',
+					'primary' => '1'
+				)
+			),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testValidateHasManyRecords method
+ *
+ * validatePost should fail, hidden fields have been changed.
+ *
+ * @access public
+ * @return void
+ */
+	function testValidateHasManyRecordsFail() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '7a203edb3d345bbf38fe0dccae960da8842e11d7%3AAddress.0.id%7CAddress.0.primary%7C';
+		$fields .= 'Address.1.id%7CAddress.1.primary';
+
+		$this->Controller->data = array(
+			'Address' => array(
+				0 => array(
+					'id' => '123',
+					'title' => 'home',
+					'first_name' => 'Bilbo',
+					'last_name' => 'Baggins',
+					'address' => '23 Bag end way',
+					'city' => 'the shire',
+					'phone' => 'N/A',
+					'primary' => '5',
+				),
+				1 => array(
+					'id' => '124',
+					'title' => 'home',
+					'first_name' => 'Frodo',
+					'last_name' => 'Baggins',
+					'address' => '50 Bag end way',
+					'city' => 'the shire',
+					'phone' => 'N/A',
+					'primary' => '1'
+				)
+			),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result);
+	}
+
+/**
+ * testLoginRequest method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoginRequest() {
+		$this->Controller->Security->startup($this->Controller);
+		$realm = 'cakephp.org';
+		$options = array('realm' => $realm, 'type' => 'basic');
+		$result = $this->Controller->Security->loginRequest($options);
+		$expected = 'WWW-Authenticate: Basic realm="'.$realm.'"';
+		$this->assertEqual($result, $expected);
+
+		$this->Controller->Security->startup($this->Controller);
+		$options = array('realm' => $realm, 'type' => 'digest');
+		$result = $this->Controller->Security->loginRequest($options);
+		$this->assertPattern('/realm="'.$realm.'"/', $result);
+		$this->assertPattern('/qop="auth"/', $result);
+	}
+
+/**
+ * testGenerateDigestResponseHash method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateDigestResponseHash() {
+		$this->Controller->Security->startup($this->Controller);
+		$realm = 'cakephp.org';
+		$loginData = array('realm' => $realm, 'users' => array('Willy Smith' => 'password'));
+		$this->Controller->Security->requireLogin($loginData);
+
+		$data = array(
+			'username' => 'Willy Smith',
+			'password' => 'password',
+			'nonce' => String::uuid(),
+			'nc' => 1,
+			'cnonce' => 1,
+			'realm' => $realm,
+			'uri' => 'path_to_identifier',
+			'qop' => 'testme'
+		);
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+
+		$result = $this->Controller->Security->generateDigestResponseHash($data);
+		$expected = md5(
+			md5($data['username'] . ':' . $loginData['realm'] . ':' . $data['password']) . ':' .
+			$data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' .
+			md5(env('REQUEST_METHOD') . ':' . $data['uri'])
+		);
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testLoginCredentials method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoginCredentials() {
+		$this->Controller->Security->startup($this->Controller);
+		$_SERVER['PHP_AUTH_USER'] = $user = 'Willy Test';
+		$_SERVER['PHP_AUTH_PW'] = $pw = 'some password for the nice test';
+
+		$result = $this->Controller->Security->loginCredentials('basic');
+		$expected = array('username' => $user, 'password' => $pw);
+		$this->assertIdentical($result, $expected);
+
+		if (version_compare(PHP_VERSION, '5.1') != -1) {
+			$_SERVER['PHP_AUTH_DIGEST'] = $digest = <<<DIGEST
+				Digest username="Mufasa",
+				realm="testrealm@host.com",
+				nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",
+				uri="/dir/index.html",
+				qop=auth,
+				nc=00000001,
+				cnonce="0a4f113b",
+				response="6629fae49393a05397450978507c4ef1",
+				opaque="5ccc069c403ebaf9f0171e9517f40e41"
+DIGEST;
+			$expected = array(
+				'username' => 'Mufasa',
+				'realm' => 'testrealm@host.com',
+				'nonce' => 'dcd98b7102dd2f0e8b11d0f600bfb0c093',
+				'uri' => '/dir/index.html',
+				'qop' => 'auth',
+				'nc' => '00000001',
+				'cnonce' => '0a4f113b',
+				'response' => '6629fae49393a05397450978507c4ef1',
+				'opaque' => '5ccc069c403ebaf9f0171e9517f40e41'
+			);
+			$result = $this->Controller->Security->loginCredentials('digest');
+			$this->assertIdentical($result, $expected);
+		}
+	}
+
+/**
+ * testParseDigestAuthData method
+ *
+ * @access public
+ * @return void
+ */
+	function testParseDigestAuthData() {
+		$this->Controller->Security->startup($this->Controller);
+		$digest = <<<DIGEST
+			Digest username="Mufasa",
+			realm="testrealm@host.com",
+			nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",
+			uri="/dir/index.html",
+			qop=auth,
+			nc=00000001,
+			cnonce="0a4f113b",
+			response="6629fae49393a05397450978507c4ef1",
+			opaque="5ccc069c403ebaf9f0171e9517f40e41"
+DIGEST;
+		$expected = array(
+			'username' => 'Mufasa',
+			'realm' => 'testrealm@host.com',
+			'nonce' => 'dcd98b7102dd2f0e8b11d0f600bfb0c093',
+			'uri' => '/dir/index.html',
+			'qop' => 'auth',
+			'nc' => '00000001',
+			'cnonce' => '0a4f113b',
+			'response' => '6629fae49393a05397450978507c4ef1',
+			'opaque' => '5ccc069c403ebaf9f0171e9517f40e41'
+		);
+		$result = $this->Controller->Security->parseDigestAuthData($digest);
+		$this->assertIdentical($result, $expected);
+
+		$result = $this->Controller->Security->parseDigestAuthData('');
+		$this->assertNull($result);
+	}
+
+/**
+ * test parsing digest information with email addresses
+ *
+ * @return void
+ */
+	function testParseDigestAuthEmailAddress() {
+		$this->Controller->Security->startup($this->Controller);
+		$digest = <<<DIGEST
+			Digest username="mark@example.com",
+			realm="testrealm@host.com",
+			nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093",
+			uri="/dir/index.html",
+			qop=auth,
+			nc=00000001,
+			cnonce="0a4f113b",
+			response="6629fae49393a05397450978507c4ef1",
+			opaque="5ccc069c403ebaf9f0171e9517f40e41"
+DIGEST;
+		$expected = array(
+			'username' => 'mark@example.com',
+			'realm' => 'testrealm@host.com',
+			'nonce' => 'dcd98b7102dd2f0e8b11d0f600bfb0c093',
+			'uri' => '/dir/index.html',
+			'qop' => 'auth',
+			'nc' => '00000001',
+			'cnonce' => '0a4f113b',
+			'response' => '6629fae49393a05397450978507c4ef1',
+			'opaque' => '5ccc069c403ebaf9f0171e9517f40e41'
+		);
+		$result = $this->Controller->Security->parseDigestAuthData($digest);
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testFormDisabledFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormDisabledFields() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '11842060341b9d0fc3808b90ba29fdea7054d6ad%3An%3A0%3A%7B%7D';
+
+		$this->Controller->data = array(
+			'MyModel' => array('name' => 'some data'),
+			'_Token' => compact('key', 'fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result);
+
+		$this->Controller->Security->startup($this->Controller);
+		$this->Controller->Security->disabledFields = array('MyModel.name');
+		$key = $this->Controller->params['_Token']['key'];
+
+		$this->Controller->data = array(
+			'MyModel' => array('name' => 'some data'),
+			'_Token' => compact('key', 'fields')
+		);
+
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testRadio method
+ *
+ * @access public
+ * @return void
+ */
+	function testRadio() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+		$fields = '575ef54ca4fc8cab468d6d898e9acd3a9671c17e%3An%3A0%3A%7B%7D';
+
+		$this->Controller->data = array(
+			'_Token' => compact('key', 'fields')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertFalse($result);
+
+		$this->Controller->data = array(
+			'_Token' => compact('key', 'fields'),
+			'Test' => array('test' => '')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+
+		$this->Controller->data = array(
+			'_Token' => compact('key', 'fields'),
+			'Test' => array('test' => '1')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+
+		$this->Controller->data = array(
+			'_Token' => compact('key', 'fields'),
+			'Test' => array('test' => '2')
+		);
+		$result = $this->Controller->Security->validatePost($this->Controller);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testInvalidAuthHeaders method
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidAuthHeaders() {
+		$this->Controller->Security->blackHoleCallback = null;
+		$_SERVER['PHP_AUTH_USER'] = 'admin';
+		$_SERVER['PHP_AUTH_PW'] = 'password';
+		$realm = 'cakephp.org';
+		$loginData = array('type' => 'basic', 'realm' => $realm);
+		$this->Controller->Security->requireLogin($loginData);
+		$this->Controller->Security->startup($this->Controller);
+
+		$expected = 'WWW-Authenticate: Basic realm="'.$realm.'"';
+		$this->assertEqual(count($this->Controller->testHeaders), 1);
+		$this->assertEqual(current($this->Controller->testHeaders), $expected);
+	}
+
+/**
+ * test that a requestAction's controller will have the _Token appended to
+ * the params.
+ *
+ * @return void
+ * @see http://cakephp.lighthouseapp.com/projects/42648/tickets/68
+ */
+	function testSettingTokenForRequestAction() {
+		$this->Controller->Security->startup($this->Controller);
+		$key = $this->Controller->params['_Token']['key'];
+
+		$this->Controller->params['requested'] = 1;
+		unset($this->Controller->params['_Token']);
+
+		$this->Controller->Security->startup($this->Controller);
+		$this->assertEqual($this->Controller->params['_Token']['key'], $key);
+	}
+
+/**
+ * test that blackhole doesn't delete the _Token session key so repeat data submissions
+ * stay blackholed.
+ *
+ * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/214
+ * @return void
+ */
+	function testBlackHoleNotDeletingSessionInformation() {
+		$this->Controller->Security->startup($this->Controller);
+
+		$this->Controller->Security->blackHole($this->Controller, 'auth');
+		$this->assertTrue($this->Controller->Security->Session->check('_Token'), '_Token was deleted by blackHole %s');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/session.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/session.test.php
new file mode 100644
index 000000000..78fe1ad10
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/components/session.test.php
@@ -0,0 +1,385 @@
+<?php
+/**
+ * SessionComponentTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ * @since         CakePHP(tm) v 1.2.0.5436
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Controller', 'Controller', false);
+App::import('Component', 'Session');
+
+/**
+ * SessionTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class SessionTestController extends Controller {
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * session_id method
+ *
+ * @return string
+ * @access public
+ */
+	function session_id() {
+		return $this->Session->id();
+	}
+}
+
+/**
+ * OrangeSessionTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class OrangeSessionTestController extends Controller {
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * session_id method
+ *
+ * @return string
+ * @access public
+ */
+	function session_id() {
+		return $this->Session->id();
+	}
+}
+
+/**
+ * SessionComponentTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class SessionComponentTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_session = Configure::read('Session');
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('Session', $this->_session);
+	}
+
+/**
+ * testSessionAutoStart method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionAutoStart() {
+		Configure::write('Session.start', false);
+		$Session =& new SessionComponent();
+		$this->assertFalse($Session->__active);
+		$this->assertFalse($Session->started());
+		$Session->startup(new SessionTestController());
+
+		Configure::write('Session.start', true);
+		$Session =& new SessionComponent();
+		$this->assertTrue($Session->__active);
+		$this->assertFalse($Session->started());
+		$Session->startup(new SessionTestController());
+		$this->assertTrue(isset($_SESSION));
+
+		$Object = new Object();
+		$Session =& new SessionComponent();
+		$Session->start();
+		$expected = $Session->id();
+
+		$result = $Object->requestAction('/session_test/session_id');
+		$this->assertEqual($result, $expected);
+
+		$result = $Object->requestAction('/orange_session_test/session_id');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSessionActivate method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionActivate() {
+		$Session =& new SessionComponent();
+
+		$this->assertTrue($Session->__active);
+		$this->assertNull($Session->activate());
+		$this->assertTrue($Session->__active);
+
+		Configure::write('Session.start', false);
+		$Session =& new SessionComponent();
+		$this->assertFalse($Session->__active);
+		$this->assertNull($Session->activate());
+		$this->assertTrue($Session->__active);
+		Configure::write('Session.start', true);
+		$Session->destroy();
+	}
+
+/**
+ * testSessionValid method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionValid() {
+		$Session =& new SessionComponent();
+
+		$this->assertTrue($Session->valid());
+
+		$Session->_userAgent = 'rweerw';
+		$this->assertFalse($Session->valid());
+
+		Configure::write('Session.start', false);
+		$Session =& new SessionComponent();
+		$this->assertFalse($Session->__active);
+		$this->assertFalse($Session->valid());
+		Configure::write('Session.start', true);
+
+		$Session =& new SessionComponent();
+		$Session->time = $Session->read('Config.time') + 1;
+		$this->assertFalse($Session->valid());
+
+		Configure::write('Session.checkAgent', false);
+		$Session =& new SessionComponent();
+		$Session->time = $Session->read('Config.time') + 1;
+		$this->assertFalse($Session->valid());
+		Configure::write('Session.checkAgent', true);
+	}
+
+/**
+ * testSessionError method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionError() {
+		$Session =& new SessionComponent();
+
+		$this->assertFalse($Session->error());
+
+		Configure::write('Session.start', false);
+		$Session =& new SessionComponent();
+		$this->assertFalse($Session->__active);
+		$this->assertFalse($Session->error());
+		Configure::write('Session.start', true);
+	}
+
+/**
+ * testSessionReadWrite method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionReadWrite() {
+		$Session =& new SessionComponent();
+
+		$this->assertFalse($Session->read('Test'));
+
+		$this->assertTrue($Session->write('Test', 'some value'));
+		$this->assertEqual($Session->read('Test'), 'some value');
+		$this->assertFalse($Session->write('Test.key', 'some value'));
+		$Session->delete('Test');
+
+		$this->assertTrue($Session->write('Test.key.path', 'some value'));
+		$this->assertEqual($Session->read('Test.key.path'), 'some value');
+		$this->assertEqual($Session->read('Test.key'), array('path' => 'some value'));
+		$this->assertTrue($Session->write('Test.key.path2', 'another value'));
+		$this->assertEqual($Session->read('Test.key'), array('path' => 'some value', 'path2' => 'another value'));
+		$Session->delete('Test');
+
+		$array = array('key1' => 'val1', 'key2' => 'val2', 'key3' => 'val3');
+		$this->assertTrue($Session->write('Test', $array));
+		$this->assertEqual($Session->read('Test'), $array);
+		$Session->delete('Test');
+
+		$this->assertFalse($Session->write(array('Test'), 'some value'));
+		$this->assertTrue($Session->write(array('Test' => 'some value')));
+		$this->assertEqual($Session->read('Test'), 'some value');
+		$Session->delete('Test');
+
+		Configure::write('Session.start', false);
+		$Session =& new SessionComponent();
+		$this->assertFalse($Session->write('Test', 'some value'));
+		$Session->write('Test', 'some value');
+		$this->assertFalse($Session->read('Test'));
+		Configure::write('Session.start', true);
+	}
+
+/**
+ * testSessionDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionDelete() {
+		$Session =& new SessionComponent();
+
+		$this->assertFalse($Session->delete('Test'));
+
+		$Session->write('Test', 'some value');
+		$this->assertTrue($Session->delete('Test'));
+
+		Configure::write('Session.start', false);
+		$Session =& new SessionComponent();
+		$Session->write('Test', 'some value');
+		$this->assertFalse($Session->delete('Test'));
+		Configure::write('Session.start', true);
+	}
+
+/**
+ * testSessionCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionCheck() {
+		$Session =& new SessionComponent();
+
+		$this->assertFalse($Session->check('Test'));
+
+		$Session->write('Test', 'some value');
+		$this->assertTrue($Session->check('Test'));
+		$Session->delete('Test');
+
+		Configure::write('Session.start', false);
+		$Session =& new SessionComponent();
+		$Session->write('Test', 'some value');
+		$this->assertFalse($Session->check('Test'));
+		Configure::write('Session.start', true);
+	}
+
+/**
+ * testSessionFlash method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionFlash() {
+		$Session =& new SessionComponent();
+
+		$this->assertNull($Session->read('Message.flash'));
+
+		$Session->setFlash('This is a test message');
+		$this->assertEqual($Session->read('Message.flash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
+
+		$Session->setFlash('This is a test message', 'test', array('name' => 'Joel Moss'));
+		$this->assertEqual($Session->read('Message.flash'), array('message' => 'This is a test message', 'element' => 'test', 'params' => array('name' => 'Joel Moss')));
+
+		$Session->setFlash('This is a test message', 'default', array(), 'myFlash');
+		$this->assertEqual($Session->read('Message.myFlash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
+
+		$Session->setFlash('This is a test message', 'non_existing_layout');
+		$this->assertEqual($Session->read('Message.myFlash'), array('message' => 'This is a test message', 'element' => 'default', 'params' => array()));
+
+		$Session->delete('Message');
+	}
+
+/**
+ * testSessionId method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionId() {
+		unset($_SESSION);
+		$Session =& new SessionComponent();
+		$this->assertNull($Session->id());
+	}
+
+/**
+ * testSessionDestroy method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionDestroy() {
+		$Session =& new SessionComponent();
+
+		$Session->write('Test', 'some value');
+		$this->assertEqual($Session->read('Test'), 'some value');
+		$Session->destroy('Test');
+		$this->assertNull($Session->read('Test'));
+	}
+
+/**
+ * testSessionTimeout method
+ *
+ * @access public
+ * @return void
+ */
+	function testSessionTimeout() {
+		Configure::write('debug', 2);
+		Configure::write('Security.level', 'low');
+
+		session_destroy();
+		$Session =& new SessionComponent();
+		$Session->destroy();
+		$Session->write('Test', 'some value');
+		$this->assertEqual($Session->sessionTime, time() + (300 * Configure::read('Session.timeout')));
+		$this->assertEqual($_SESSION['Config']['timeout'], 10);
+		$this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime);
+		$this->assertEqual($Session->time, time());
+		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (300 * Configure::read('Session.timeout')));
+
+		Configure::write('Security.level', 'medium');
+		$Session =& new SessionComponent();
+		$Session->destroy();
+		$Session->write('Test', 'some value');
+		$this->assertEqual($Session->sessionTime, mktime() + (100 * Configure::read('Session.timeout')));
+		$this->assertEqual($_SESSION['Config']['timeout'], 10);
+		$this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime);
+		$this->assertEqual($Session->time, time());
+		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() *  Configure::read('Session.timeout')));
+
+		Configure::write('Security.level', 'high');
+		$Session =& new SessionComponent();
+		$Session->destroy();
+		$Session->write('Test', 'some value');
+		$this->assertEqual($Session->sessionTime, time() + (10 * Configure::read('Session.timeout')));
+		$this->assertEqual($_SESSION['Config']['timeout'], 10);
+		$this->assertEqual($_SESSION['Config']['time'], $Session->sessionTime);
+		$this->assertEqual($Session->time, time());
+		$this->assertEqual($_SESSION['Config']['time'], $Session->time + (Security::inactiveMins() * Configure::read('Session.timeout')));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller.test.php
new file mode 100644
index 000000000..55a9e53cd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller.test.php
@@ -0,0 +1,1498 @@
+<?php
+/**
+ * ControllerTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ * @since         CakePHP(tm) v 1.2.0.5436
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Controller', 'Controller', false);
+App::import('Component', 'Security');
+App::import('Component', 'Cookie');
+
+/**
+ * AppController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+if (!class_exists('AppController')) {
+	/**
+	 * AppController class
+	 *
+	 * @package       cake
+	 * @subpackage    cake.tests.cases.libs.controller
+	 */
+	class AppController extends Controller {
+	/**
+	 * helpers property
+	 *
+	 * @var array
+	 * @access public
+	 */
+		var $helpers = array('Html', 'Javascript');
+	/**
+	 * uses property
+	 *
+	 * @var array
+	 * @access public
+	 */
+		var $uses = array('ControllerPost');
+	/**
+	 * components property
+	 *
+	 * @var array
+	 * @access public
+	 */
+		var $components = array('Cookie');
+	}
+} elseif (!defined('APP_CONTROLLER_EXISTS')) {
+	define('APP_CONTROLLER_EXISTS', true);
+}
+
+/**
+ * ControllerPost class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ControllerPost extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ControllerPost'
+ * @access public
+ */
+	var $name = 'ControllerPost';
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'posts';
+
+/**
+ * invalidFields property
+ *
+ * @var array
+ * @access public
+ */
+	var $invalidFields = array('name' => 'error_msg');
+
+/**
+ * lastQuery property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $lastQuery = null;
+
+/**
+ * beforeFind method
+ *
+ * @param mixed $query
+ * @access public
+ * @return void
+ */
+	function beforeFind($query) {
+		$this->lastQuery = $query;
+	}
+
+/**
+ * find method
+ *
+ * @param mixed $type
+ * @param array $options
+ * @access public
+ * @return void
+ */
+	function find($type, $options = array()) {
+		if ($type == 'popular') {
+			$conditions = array($this->name . '.' . $this->primaryKey .' > ' => '1');
+			$options = Set::merge($options, compact('conditions'));
+			return parent::find('all', $options);
+		}
+		return parent::find($type, $options);
+	}
+}
+
+/**
+ * ControllerPostsController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ControllerCommentsController extends AppController {
+
+/**
+ * name property
+ *
+ * @var string 'ControllerPost'
+ * @access public
+ */
+	var $name = 'ControllerComments';
+}
+
+/**
+ * ControllerComment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ControllerComment extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ControllerComment'
+ * @access public
+ */
+	var $name = 'Comment';
+
+/**
+ * useTable property
+ *
+ * @var string 'comments'
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * data property
+ *
+ * @var array
+ * @access public
+ */
+	var $data = array('name' => 'Some Name');
+
+/**
+ * alias property
+ *
+ * @var string 'ControllerComment'
+ * @access public
+ */
+	var $alias = 'ControllerComment';
+}
+
+/**
+ * ControllerAlias class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ControllerAlias extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ControllerAlias'
+ * @access public
+ */
+	var $name = 'ControllerAlias';
+
+/**
+ * alias property
+ *
+ * @var string 'ControllerSomeAlias'
+ * @access public
+ */
+	var $alias = 'ControllerSomeAlias';
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'posts';
+}
+
+/**
+ * ControllerPaginateModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ControllerPaginateModel extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'ControllerPaginateModel';
+
+/**
+ * useTable property
+ *
+ * @var string'
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * paginate method
+ *
+ * @return void
+ * @access public
+ */
+	function paginate($conditions, $fields, $order, $limit, $page, $recursive, $extra) {
+		$this->extra = $extra;
+	}
+
+/**
+ * paginateCount
+ *
+ * @access public
+ * @return void
+ */
+	function paginateCount($conditions, $recursive, $extra) {
+		$this->extraCount = $extra;
+	}
+}
+
+/**
+ * NameTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class NameTest extends CakeTestModel {
+
+/**
+ * name property
+ * @var string 'Name'
+ * @access public
+ */
+	var $name = 'Name';
+
+/**
+ * useTable property
+ * @var string 'names'
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * alias property
+ *
+ * @var string 'ControllerComment'
+ * @access public
+ */
+	var $alias = 'Name';
+}
+
+/**
+ * TestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class TestController extends AppController {
+
+/**
+ * name property
+ * @var string 'Name'
+ * @access public
+ */
+	var $name = 'TestController';
+
+/**
+ * helpers property
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Session', 'Xml');
+
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	var $components = array('Security');
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array('ControllerComment', 'ControllerAlias');
+
+/**
+ * index method
+ *
+ * @param mixed $testId
+ * @param mixed $test2Id
+ * @access public
+ * @return void
+ */
+	function index($testId, $test2Id) {
+		$this->data['testId'] = $testId;
+		$this->data['test2Id'] = $test2Id;
+	}
+}
+
+/**
+ * TestComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class TestComponent extends Object {
+
+/**
+ * beforeRedirect method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeRedirect() {
+	}
+/**
+ * initialize method
+ *
+ * @access public
+ * @return void
+ */
+	function initialize(&$controller) {
+	}
+
+/**
+ * startup method
+ *
+ * @access public
+ * @return void
+ */
+	function startup(&$controller) {
+	}
+/**
+ * shutdown method
+ *
+ * @access public
+ * @return void
+ */
+	function shutdown(&$controller) {
+	}
+/**
+ * beforeRender callback
+ *
+ * @return void
+ */
+	function beforeRender(&$controller) {
+		if ($this->viewclass) {
+			$controller->view = $this->viewclass;
+		}
+	}
+}
+
+/**
+ * AnotherTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class AnotherTestController extends AppController {
+
+/**
+ * name property
+ * @var string 'Name'
+ * @access public
+ */
+	var $name = 'AnotherTest';
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = null;
+}
+
+/**
+ * ControllerTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ControllerTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.post', 'core.comment', 'core.name');
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * testLoadModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadModel() {
+		$Controller =& new Controller();
+
+		$this->assertFalse(isset($Controller->ControllerPost));
+
+		$result = $Controller->loadModel('ControllerPost');
+		$this->assertTrue($result);
+		$this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost'));
+		$this->assertTrue(in_array('ControllerPost', $Controller->modelNames));
+
+		ClassRegistry::flush();
+		unset($Controller);
+	}
+
+/**
+ * testConstructClasses method
+ *
+ * @access public
+ * @return void
+ */
+	function testConstructClasses() {
+		$Controller =& new Controller();
+		$Controller->modelClass = 'ControllerPost';
+		$Controller->passedArgs[] = '1';
+		$Controller->constructClasses();
+		$this->assertEqual($Controller->ControllerPost->id, 1);
+
+		unset($Controller);
+
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPost', 'ControllerComment');
+		$Controller->passedArgs[] = '1';
+		$Controller->constructClasses();
+		$this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost'));
+		$this->assertTrue(is_a($Controller->ControllerComment, 'ControllerComment'));
+
+		$this->assertEqual($Controller->ControllerComment->name, 'Comment');
+
+		unset($Controller);
+
+		App::build(array('plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)));
+
+		$Controller =& new Controller();
+		$Controller->uses = array('TestPlugin.TestPluginPost');
+		$Controller->constructClasses();
+
+		$this->assertEqual($Controller->modelClass, 'TestPluginPost');
+		$this->assertTrue(isset($Controller->TestPluginPost));
+		$this->assertTrue(is_a($Controller->TestPluginPost, 'TestPluginPost'));
+
+		unset($Controller);
+	}
+
+/**
+ * testAliasName method
+ *
+ * @access public
+ * @return void
+ */
+	function testAliasName() {
+		$Controller =& new Controller();
+		$Controller->uses = array('NameTest');
+		$Controller->constructClasses();
+
+		$this->assertEqual($Controller->NameTest->name, 'Name');
+		$this->assertEqual($Controller->NameTest->alias, 'Name');
+
+		unset($Controller);
+	}
+
+/**
+ * testPersistent method
+ *
+ * @access public
+ * @return void
+ */
+	function testPersistent() {
+		Configure::write('Cache.disable', false);
+		$Controller =& new Controller();
+		$Controller->modelClass = 'ControllerPost';
+		$Controller->persistModel = true;
+		$Controller->constructClasses();
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS .'controllerpost.php'));
+		$this->assertTrue(is_a($Controller->ControllerPost, 'ControllerPost'));
+		@unlink(CACHE . 'persistent' . DS . 'controllerpost.php');
+		@unlink(CACHE . 'persistent' . DS . 'controllerpostregistry.php');
+
+		unset($Controller);
+		Configure::write('Cache.disable', true);
+	}
+
+/**
+ * testPaginate method
+ *
+ * @access public
+ * @return void
+ */
+	function testPaginate() {
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPost', 'ControllerComment');
+		$Controller->passedArgs[] = '1';
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($results, array(1, 2, 3));
+
+		$results = Set::extract($Controller->paginate('ControllerComment'), '{n}.ControllerComment.id');
+		$this->assertEqual($results, array(1, 2, 3, 4, 5, 6));
+
+		$Controller->modelClass = null;
+
+		$Controller->uses[0] = 'Plugin.ControllerPost';
+		$results = Set::extract($Controller->paginate(), '{n}.ControllerPost.id');
+		$this->assertEqual($results, array(1, 2, 3));
+
+		$Controller->passedArgs = array('page' => '-1');
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertEqual($results, array(1, 2, 3));
+
+		$Controller->passedArgs = array('sort' => 'ControllerPost.id', 'direction' => 'asc');
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertEqual($results, array(1, 2, 3));
+
+		$Controller->passedArgs = array('sort' => 'ControllerPost.id', 'direction' => 'desc');
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertEqual($results, array(3, 2, 1));
+
+		$Controller->passedArgs = array('sort' => 'id', 'direction' => 'desc');
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertEqual($results, array(3, 2, 1));
+
+		$Controller->passedArgs = array('sort' => 'NotExisting.field', 'direction' => 'desc');
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1, 'Invalid field in query %s');
+		$this->assertEqual($results, array(1, 2, 3));
+
+		$Controller->passedArgs = array('sort' => 'ControllerPost.author_id', 'direction' => 'allYourBase');
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($Controller->ControllerPost->lastQuery['order'][0], array('ControllerPost.author_id' => 'asc'));
+		$this->assertEqual($results, array(1, 3, 2));
+
+		$Controller->passedArgs = array('page' => '1 " onclick="alert(\'xss\');">');
+		$Controller->paginate = array('limit' => 1);
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1, 'XSS exploit opened %s');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['options']['page'], 1, 'XSS exploit opened %s');
+
+		$Controller->passedArgs = array();
+		$Controller->paginate = array('limit' => 0);
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
+
+		$Controller->passedArgs = array();
+		$Controller->paginate = array('limit' => 'garbage!');
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
+
+		$Controller->passedArgs = array();
+		$Controller->paginate = array('limit' => '-1');
+		$Controller->paginate('ControllerPost');
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['pageCount'], 3);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['prevPage'], false);
+		$this->assertIdentical($Controller->params['paging']['ControllerPost']['nextPage'], true);
+	}
+
+/**
+ * testPaginateExtraParams method
+ *
+ * @access public
+ * @return void
+ */
+	function testPaginateExtraParams() {
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPost', 'ControllerComment');
+		$Controller->passedArgs[] = '1';
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+
+		$Controller->passedArgs = array('page' => '-1', 'contain' => array('ControllerComment'));
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertEqual(Set::extract($result, '{n}.ControllerPost.id'), array(1, 2, 3));
+		$this->assertTrue(!isset($Controller->ControllerPost->lastQuery['contain']));
+
+		$Controller->passedArgs = array('page' => '-1');
+		$Controller->paginate = array('ControllerPost' => array('contain' => array('ControllerComment')));
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['page'], 1);
+		$this->assertEqual(Set::extract($result, '{n}.ControllerPost.id'), array(1, 2, 3));
+		$this->assertTrue(isset($Controller->ControllerPost->lastQuery['contain']));
+
+		$Controller->paginate = array('ControllerPost' => array('popular', 'fields' => array('id', 'title')));
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual(Set::extract($result, '{n}.ControllerPost.id'), array(2, 3));
+		$this->assertEqual($Controller->ControllerPost->lastQuery['conditions'], array('ControllerPost.id > ' => '1'));
+
+		$Controller->passedArgs = array('limit' => 12);
+		$Controller->paginate = array('limit' => 30);
+		$result = $Controller->paginate('ControllerPost');
+		$paging = $Controller->params['paging']['ControllerPost'];
+
+		$this->assertEqual($Controller->ControllerPost->lastQuery['limit'], 12);
+		$this->assertEqual($paging['options']['limit'], 12);
+
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPaginateModel');
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+		$Controller->paginate = array(
+			'ControllerPaginateModel' => array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id')
+		);
+		$result = $Controller->paginate('ControllerPaginateModel');
+		$expected = array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id');
+		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
+		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
+
+		$Controller->paginate = array(
+			'ControllerPaginateModel' => array('foo', 'contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id')
+		);
+		$Controller->paginate('ControllerPaginateModel');
+		$expected = array('contain' => array('ControllerPaginateModel'), 'group' => 'Comment.author_id', 'type' => 'foo');
+		$this->assertEqual($Controller->ControllerPaginateModel->extra, $expected);
+		$this->assertEqual($Controller->ControllerPaginateModel->extraCount, $expected);
+	}
+
+/**
+ * testPaginateFieldsDouble method
+ *
+ * @return void
+ * @access public
+ */
+	function testPaginateFieldsDouble(){
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPost');
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+
+		$Controller->paginate = array(
+			'fields' => array(
+				'ControllerPost.id',
+				'radians(180.0) as floatvalue'
+			),
+			'order' => array('ControllerPost.created'=>'DESC'),
+			'limit' => 1,
+			'page' => 1,
+			'recursive' => -1
+		);
+		$conditions = array();
+		$result = $Controller->paginate('ControllerPost',$conditions);
+		$expected = array(
+			array(
+				'ControllerPost' => array(
+					'id' => 3,
+				),
+				0 => array(
+					'floatvalue' => '3.14159265358979',
+				),
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+
+/**
+ * testPaginatePassedArgs method
+ *
+ * @return void
+ * @access public
+ */
+	function testPaginatePassedArgs() {
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPost');
+		$Controller->passedArgs[] = array('1', '2', '3');
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+
+		$Controller->paginate = array(
+			'fields' => array(),
+			'order' => '',
+			'limit' => 5,
+			'page' => 1,
+			'recursive' => -1
+		);
+		$conditions = array();
+		$Controller->paginate('ControllerPost',$conditions);
+
+		$expected = array(
+			'fields' => array(),
+			'order' => '',
+			'limit' => 5,
+			'page' => 1,
+			'recursive' => -1,
+			'conditions' => array()
+		);
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['options'],$expected);
+	}
+
+/**
+ * Test that special paginate types are called and that the type param doesn't leak out into defaults or options.
+ *
+ * @return void
+ */
+	function testPaginateSpecialType() {
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPost', 'ControllerComment');
+		$Controller->passedArgs[] = '1';
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+
+		$Controller->paginate = array('ControllerPost' => array('popular', 'fields' => array('id', 'title')));
+		$result = $Controller->paginate('ControllerPost');
+
+		$this->assertEqual(Set::extract($result, '{n}.ControllerPost.id'), array(2, 3));
+		$this->assertEqual($Controller->ControllerPost->lastQuery['conditions'], array('ControllerPost.id > ' => '1'));
+		$this->assertFalse(isset($Controller->params['paging']['ControllerPost']['defaults'][0]));
+		$this->assertFalse(isset($Controller->params['paging']['ControllerPost']['options'][0]));
+	}
+
+/**
+ * testDefaultPaginateParams method
+ *
+ * @access public
+ * @return void
+ */
+	function testDefaultPaginateParams() {
+		$Controller =& new Controller();
+		$Controller->modelClass = 'ControllerPost';
+		$Controller->params['url'] = array();
+		$Controller->paginate = array('order' => 'ControllerPost.id DESC');
+		$Controller->constructClasses();
+		$results = Set::extract($Controller->paginate('ControllerPost'), '{n}.ControllerPost.id');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['defaults']['order'], 'ControllerPost.id DESC');
+		$this->assertEqual($Controller->params['paging']['ControllerPost']['options']['order'], 'ControllerPost.id DESC');
+		$this->assertEqual($results, array(3, 2, 1));
+	}
+
+/**
+ * test paginate() and virtualField interactions
+ *
+ * @return void
+ */
+	function testPaginateOrderVirtualField() {
+		$Controller =& new Controller();
+		$Controller->uses = array('ControllerPost', 'ControllerComment');
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+		$Controller->ControllerPost->virtualFields = array(
+			'offset_test' => 'ControllerPost.id + 1'
+		);
+
+		$Controller->paginate = array(
+			'fields' => array('id', 'title', 'offset_test'),
+			'order' => array('offset_test' => 'DESC')
+		);
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual(Set::extract($result, '{n}.ControllerPost.offset_test'), array(4, 3, 2));
+
+		$Controller->passedArgs = array('sort' => 'offset_test', 'direction' => 'asc');
+		$result = $Controller->paginate('ControllerPost');
+		$this->assertEqual(Set::extract($result, '{n}.ControllerPost.offset_test'), array(2, 3, 4));
+	}
+
+/**
+ * testFlash method
+ *
+ * @access public
+ * @return void
+ */
+	function testFlash() {
+		$Controller =& new Controller();
+		$Controller->flash('this should work', '/flash');
+		$result = $Controller->output;
+
+		$expected = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+		<html xmlns="http://www.w3.org/1999/xhtml">
+		<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<title>this should work</title>
+		<style><!--
+		P { text-align:center; font:bold 1.1em sans-serif }
+		A { color:#444; text-decoration:none }
+		A:HOVER { text-decoration: underline; color:#44E }
+		--></style>
+		</head>
+		<body>
+		<p><a href="/flash">this should work</a></p>
+		</body>
+		</html>';
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $result);
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", $expected);
+		$this->assertEqual($result, $expected);
+
+		App::build(array('views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)));
+		$Controller =& new Controller();
+		$Controller->flash('this should work', '/flash', 1, 'ajax2');
+		$result = $Controller->output;
+		$this->assertPattern('/Ajax!/', $result);
+		App::build();
+	}
+
+/**
+ * testControllerSet method
+ *
+ * @access public
+ * @return void
+ */
+	function testControllerSet() {
+		$Controller =& new Controller();
+		$Controller->set('variable_with_underscores', null);
+		$this->assertTrue(array_key_exists('variable_with_underscores', $Controller->viewVars));
+
+		$Controller->viewVars = array();
+		$viewVars = array('ModelName' => array('id' => 1, 'name' => 'value'));
+		$Controller->set($viewVars);
+		$this->assertTrue(array_key_exists('ModelName', $Controller->viewVars));
+
+		$Controller->viewVars = array();
+		$Controller->set('variable_with_underscores', 'value');
+		$this->assertTrue(array_key_exists('variable_with_underscores', $Controller->viewVars));
+
+		$Controller->viewVars = array();
+		$viewVars = array('ModelName' => 'name');
+		$Controller->set($viewVars);
+		$this->assertTrue(array_key_exists('ModelName', $Controller->viewVars));
+
+		$Controller->set('title', 'someTitle');
+		$this->assertIdentical($Controller->viewVars['title'], 'someTitle');
+		$this->assertTrue(empty($Controller->pageTitle));
+
+		$Controller->viewVars = array();
+		$expected = array('ModelName' => 'name', 'ModelName2' => 'name2');
+		$Controller->set(array('ModelName', 'ModelName2'), array('name', 'name2'));
+		$this->assertIdentical($Controller->viewVars, $expected);
+
+		$Controller->viewVars = array();
+		$Controller->set(array(3 => 'three', 4 => 'four'));
+		$Controller->set(array(1 => 'one', 2 => 'two'));
+		$expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two');
+		$this->assertEqual($Controller->viewVars, $expected);
+		
+	}
+
+/**
+ * testRender method
+ *
+ * @access public
+ * @return void
+ */
+	function testRender() {
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		), true);
+
+		$Controller =& new Controller();
+		$Controller->viewPath = 'posts';
+
+		$result = $Controller->render('index');
+		$this->assertPattern('/posts index/', $result);
+
+		$result = $Controller->render('/elements/test_element');
+		$this->assertPattern('/this is the test element/', $result);
+
+		$Controller = new TestController();
+		$Controller->constructClasses();
+		$Controller->ControllerComment->validationErrors = array('title' => 'tooShort');
+		$expected = $Controller->ControllerComment->validationErrors;
+
+		ClassRegistry::flush();
+		$Controller->viewPath = 'posts';
+		$result = $Controller->render('index');
+		$View = ClassRegistry::getObject('view');
+		$this->assertTrue(isset($View->validationErrors['ControllerComment']));
+		$this->assertEqual($expected, $View->validationErrors['ControllerComment']);
+
+		$Controller->ControllerComment->validationErrors = array();
+		ClassRegistry::flush();
+		App::build();
+	}
+
+/**
+ * test that a component beforeRender can change the controller view class.
+ *
+ * @return void
+ */
+	function testComponentBeforeRenderChangingViewClass() {
+		$core = App::core('views');
+		App::build(array(
+			'views' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+				$core[0]
+			)
+		), true);
+		$Controller =& new Controller();
+		$Controller->uses = array();
+		$Controller->components = array('Test');
+		$Controller->constructClasses();
+		$Controller->Test->viewclass = 'Theme';
+		$Controller->viewPath = 'posts';
+		$Controller->theme = 'test_theme';
+		$result = $Controller->render('index');
+		$this->assertPattern('/default test_theme layout/', $result);
+		App::build();
+	}
+
+/**
+ * testToBeInheritedGuardmethods method
+ *
+ * @access public
+ * @return void
+ */
+	function testToBeInheritedGuardmethods() {
+		$Controller =& new Controller();
+		$this->assertTrue($Controller->_beforeScaffold(''));
+		$this->assertTrue($Controller->_afterScaffoldSave(''));
+		$this->assertTrue($Controller->_afterScaffoldSaveError(''));
+		$this->assertFalse($Controller->_scaffoldError(''));
+	}
+
+/**
+ * testRedirect method
+ *
+ * @access public
+ * @return void
+ */
+	function testRedirect() {
+		$codes = array(
+			100 => "Continue",
+			101 => "Switching Protocols",
+			200 => "OK",
+			201 => "Created",
+			202 => "Accepted",
+			203 => "Non-Authoritative Information",
+			204 => "No Content",
+			205 => "Reset Content",
+			206 => "Partial Content",
+			300 => "Multiple Choices",
+			301 => "Moved Permanently",
+			302 => "Found",
+			303 => "See Other",
+			304 => "Not Modified",
+			305 => "Use Proxy",
+			307 => "Temporary Redirect",
+			400 => "Bad Request",
+			401 => "Unauthorized",
+			402 => "Payment Required",
+			403 => "Forbidden",
+			404 => "Not Found",
+			405 => "Method Not Allowed",
+			406 => "Not Acceptable",
+			407 => "Proxy Authentication Required",
+			408 => "Request Time-out",
+			409 => "Conflict",
+			410 => "Gone",
+			411 => "Length Required",
+			412 => "Precondition Failed",
+			413 => "Request Entity Too Large",
+			414 => "Request-URI Too Large",
+			415 => "Unsupported Media Type",
+			416 => "Requested range not satisfiable",
+			417 => "Expectation Failed",
+			500 => "Internal Server Error",
+			501 => "Not Implemented",
+			502 => "Bad Gateway",
+			503 => "Service Unavailable",
+			504 => "Gateway Time-out"
+		);
+
+		Mock::generatePartial('Controller', 'MockController', array('header'));
+		Mock::generate('TestComponent', 'MockTestComponent');
+		Mock::generate('TestComponent', 'MockTestBComponent');
+
+		App::import('Helper', 'Cache');
+
+		foreach ($codes as $code => $msg) {
+			$MockController =& new MockController();
+			$MockController->Component =& new Component();
+			$MockController->Component->init($MockController);
+			$MockController->expectAt(0, 'header', array("HTTP/1.1 {$code} {$msg}"));
+			$MockController->expectAt(1, 'header', array('Location: http://cakephp.org'));
+			$MockController->expectCallCount('header', 2);
+			$MockController->redirect('http://cakephp.org', (int)$code, false);
+			$this->assertFalse($MockController->autoRender);
+		}
+		foreach ($codes as $code => $msg) {
+			$MockController =& new MockController();
+			$MockController->Component =& new Component();
+			$MockController->Component->init($MockController);
+			$MockController->expectAt(0, 'header', array("HTTP/1.1 {$code} {$msg}"));
+			$MockController->expectAt(1, 'header', array('Location: http://cakephp.org'));
+			$MockController->expectCallCount('header', 2);
+			$MockController->redirect('http://cakephp.org', $msg, false);
+			$this->assertFalse($MockController->autoRender);
+		}
+
+		$MockController =& new MockController();
+		$MockController->Component =& new Component();
+		$MockController->Component->init($MockController);
+		$MockController->expectAt(0, 'header', array('Location: http://www.example.org/users/login'));
+		$MockController->expectCallCount('header', 1);
+		$MockController->redirect('http://www.example.org/users/login', null, false);
+
+		$MockController =& new MockController();
+		$MockController->Component =& new Component();
+		$MockController->Component->init($MockController);
+		$MockController->expectAt(0, 'header', array('HTTP/1.1 301 Moved Permanently'));
+		$MockController->expectAt(1, 'header', array('Location: http://www.example.org/users/login'));
+		$MockController->expectCallCount('header', 2);
+		$MockController->redirect('http://www.example.org/users/login', 301, false);
+
+		$MockController =& new MockController();
+		$MockController->components = array('MockTest');
+		$MockController->Component =& new Component();
+		$MockController->Component->init($MockController);
+		$MockController->MockTest->setReturnValue('beforeRedirect', null);
+		$MockController->expectAt(0, 'header', array('HTTP/1.1 301 Moved Permanently'));
+		$MockController->expectAt(1, 'header', array('Location: http://cakephp.org'));
+		$MockController->expectCallCount('header', 2);
+		$MockController->redirect('http://cakephp.org', 301, false);
+
+		$MockController =& new MockController();
+		$MockController->components = array('MockTest');
+		$MockController->Component =& new Component();
+		$MockController->Component->init($MockController);
+		$MockController->MockTest->setReturnValue('beforeRedirect', 'http://book.cakephp.org');
+		$MockController->expectAt(0, 'header', array('HTTP/1.1 301 Moved Permanently'));
+		$MockController->expectAt(1, 'header', array('Location: http://book.cakephp.org'));
+		$MockController->expectCallCount('header', 2);
+		$MockController->redirect('http://cakephp.org', 301, false);
+
+		$MockController =& new MockController();
+		$MockController->components = array('MockTest');
+		$MockController->Component =& new Component();
+		$MockController->Component->init($MockController);
+		$MockController->MockTest->setReturnValue('beforeRedirect', false);
+		$MockController->expectNever('header');
+		$MockController->redirect('http://cakephp.org', 301, false);
+
+		$MockController =& new MockController();
+		$MockController->components = array('MockTest', 'MockTestB');
+		$MockController->Component =& new Component();
+		$MockController->Component->init($MockController);
+		$MockController->MockTest->setReturnValue('beforeRedirect', 'http://book.cakephp.org');
+		$MockController->MockTestB->setReturnValue('beforeRedirect', 'http://bakery.cakephp.org');
+		$MockController->expectAt(0, 'header', array('HTTP/1.1 301 Moved Permanently'));
+		$MockController->expectAt(1, 'header', array('Location: http://bakery.cakephp.org'));
+		$MockController->expectCallCount('header', 2);
+		$MockController->redirect('http://cakephp.org', 301, false);
+	}
+
+/**
+ * testMergeVars method
+ *
+ * @access public
+ * @return void
+ */
+	function testMergeVars() {
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
+
+		$TestController =& new TestController();
+		$TestController->constructClasses();
+
+		$testVars = get_class_vars('TestController');
+		$appVars = get_class_vars('AppController');
+
+		$components = is_array($appVars['components'])
+						? array_merge($appVars['components'], $testVars['components'])
+						: $testVars['components'];
+		if (!in_array('Session', $components)) {
+			$components[] = 'Session';
+		}
+		$helpers = is_array($appVars['helpers'])
+					? array_merge($appVars['helpers'], $testVars['helpers'])
+					: $testVars['helpers'];
+		$uses = is_array($appVars['uses'])
+					? array_merge($appVars['uses'], $testVars['uses'])
+					: $testVars['uses'];
+
+		$this->assertEqual(count(array_diff_assoc(Set::normalize($TestController->helpers), Set::normalize($helpers))), 0);
+		$this->assertEqual(count(array_diff($TestController->uses, $uses)), 0);
+		$this->assertEqual(count(array_diff_assoc(Set::normalize($TestController->components), Set::normalize($components))), 0);
+
+		$expected = array('ControllerComment', 'ControllerAlias', 'ControllerPost');
+		$this->assertEqual($expected, $TestController->uses, '$uses was merged incorrectly, AppController models should be last.');
+		
+
+		$TestController =& new AnotherTestController();
+		$TestController->constructClasses();
+
+		$appVars = get_class_vars('AppController');
+		$testVars = get_class_vars('AnotherTestController');
+
+
+		$this->assertTrue(in_array('ControllerPost', $appVars['uses']));
+		$this->assertNull($testVars['uses']);
+
+		$this->assertFalse(isset($TestController->ControllerPost));
+
+
+		$TestController =& new ControllerCommentsController();
+		$TestController->constructClasses();
+
+		$appVars = get_class_vars('AppController');
+		$testVars = get_class_vars('ControllerCommentsController');
+
+
+		$this->assertTrue(in_array('ControllerPost', $appVars['uses']));
+		$this->assertEqual(array('ControllerPost'), $testVars['uses']);
+
+		$this->assertTrue(isset($TestController->ControllerPost));
+		$this->assertTrue(isset($TestController->ControllerComment));
+	}
+
+/**
+ * test that options from child classes replace those in the parent classes.
+ *
+ * @access public
+ * @return void
+ */
+	function testChildComponentOptionsSupercedeParents() {
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
+		$TestController =& new TestController();
+		$expected = array('foo');
+		$TestController->components = array('Cookie' => $expected);
+		$TestController->constructClasses();
+		$this->assertEqual($TestController->components['Cookie'], $expected);
+	}
+
+/**
+ * Ensure that __mergeVars is not being greedy and merging with
+ * AppController when you make an instance of Controller
+ *
+ * @return void
+ */
+	function testMergeVarsNotGreedy() {
+		$Controller =& new Controller();
+		$Controller->components = array();
+		$Controller->uses = array();
+		$Controller->constructClasses();
+
+		$this->assertFalse(isset($Controller->Session));
+	}
+
+/**
+ * testReferer method
+ *
+ * @access public
+ * @return void
+ */
+	function testReferer() {
+		$Controller =& new Controller();
+		$_SERVER['HTTP_REFERER'] = 'http://cakephp.org';
+		$result = $Controller->referer(null, false);
+		$expected = 'http://cakephp.org';
+		$this->assertIdentical($result, $expected);
+
+		$_SERVER['HTTP_REFERER'] = '';
+		$result = $Controller->referer('http://cakephp.org', false);
+		$expected = 'http://cakephp.org';
+		$this->assertIdentical($result, $expected);
+
+		$_SERVER['HTTP_REFERER'] = '';
+		$referer = array(
+			'controller' => 'pages',
+			'action' => 'display',
+			'home'
+		);
+		$result = $Controller->referer($referer, false);
+		$expected = 'http://' . env('HTTP_HOST') . '/pages/display/home';
+		$this->assertIdentical($result, $expected);
+
+		$_SERVER['HTTP_REFERER'] = '';
+		$result = $Controller->referer(null, false);
+		$expected = '/';
+		$this->assertIdentical($result, $expected);
+
+		$_SERVER['HTTP_REFERER'] = FULL_BASE_URL.$Controller->webroot.'/some/path';
+		$result = $Controller->referer(null, false);
+		$expected = '/some/path';
+		$this->assertIdentical($result, $expected);
+
+		$Controller->webroot .= '/';
+		$_SERVER['HTTP_REFERER'] = FULL_BASE_URL.$Controller->webroot.'/some/path';
+		$result = $Controller->referer(null, false);
+		$expected = '/some/path';
+		$this->assertIdentical($result, $expected);
+
+		$_SERVER['HTTP_REFERER'] = FULL_BASE_URL.$Controller->webroot.'some/path';
+		$result = $Controller->referer(null, false);
+		$expected = '/some/path';
+		$this->assertIdentical($result, $expected);
+
+		$Controller->webroot = '/recipe/';
+
+		$_SERVER['HTTP_REFERER'] = FULL_BASE_URL.$Controller->webroot.'recipes/add';
+		$result = $Controller->referer();
+		$expected = '/recipes/add';
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testSetAction method
+ *
+ * @access public
+ * @return void
+ */
+	function testSetAction() {
+		$TestController =& new TestController();
+		$TestController->setAction('index', 1, 2);
+		$expected = array('testId' => 1, 'test2Id' => 2);
+		$this->assertidentical($TestController->data, $expected);
+	}
+
+/**
+ * testUnimplementedIsAuthorized method
+ *
+ * @access public
+ * @return void
+ */
+	function testUnimplementedIsAuthorized() {
+		$TestController =& new TestController();
+		$TestController->isAuthorized();
+		$this->assertError();
+	}
+
+/**
+ * testValidateErrors method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidateErrors() {
+		$TestController =& new TestController();
+		$TestController->constructClasses();
+		$this->assertFalse($TestController->validateErrors());
+		$this->assertEqual($TestController->validate(), 0);
+
+		$TestController->ControllerComment->invalidate('some_field', 'error_message');
+		$TestController->ControllerComment->invalidate('some_field2', 'error_message2');
+		$comment =& new ControllerComment();
+		$comment->set('someVar', 'data');
+		$result = $TestController->validateErrors($comment);
+		$expected = array('some_field' => 'error_message', 'some_field2' => 'error_message2');
+		$this->assertIdentical($result, $expected);
+		$this->assertEqual($TestController->validate($comment), 2);
+	}
+
+/**
+ * test that validateErrors works with any old model.
+ *
+ * @return void
+ */
+	function testValidateErrorsOnArbitraryModels() {
+		$TestController =& new TestController();
+
+		$Post = new ControllerPost();
+		$Post->validate = array('title' => 'notEmpty');
+		$Post->set('title', '');
+		$result = $TestController->validateErrors($Post);
+
+		$expected = array('title' => 'This field cannot be left blank');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testPostConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testPostConditions() {
+		$Controller =& new Controller();
+
+
+		$data = array(
+			'Model1' => array('field1' => '23'),
+			'Model2' => array('field2' => 'string'),
+			'Model3' => array('field3' => '23'),
+		);
+		$expected = array(
+			'Model1.field1' => '23',
+			'Model2.field2' => 'string',
+			'Model3.field3' => '23',
+		);
+		$result = $Controller->postConditions($data);
+		$this->assertIdentical($result, $expected);
+
+
+		$data = array();
+		$Controller->data = array(
+			'Model1' => array('field1' => '23'),
+			'Model2' => array('field2' => 'string'),
+			'Model3' => array('field3' => '23'),
+		);
+		$expected = array(
+			'Model1.field1' => '23',
+			'Model2.field2' => 'string',
+			'Model3.field3' => '23',
+		);
+		$result = $Controller->postConditions($data);
+		$this->assertIdentical($result, $expected);
+
+
+		$data = array();
+		$Controller->data = array();
+		$result = $Controller->postConditions($data);
+		$this->assertNull($result);
+
+
+		$data = array();
+		$Controller->data = array(
+			'Model1' => array('field1' => '23'),
+			'Model2' => array('field2' => 'string'),
+			'Model3' => array('field3' => '23'),
+		);
+		$ops = array(
+			'Model1.field1' => '>',
+			'Model2.field2' => 'LIKE',
+			'Model3.field3' => '<=',
+		);
+		$expected = array(
+			'Model1.field1 >' => '23',
+			'Model2.field2 LIKE' => "%string%",
+			'Model3.field3 <=' => '23',
+		);
+		$result = $Controller->postConditions($data, $ops);
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testRequestHandlerPrefers method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestHandlerPrefers(){
+		Configure::write('debug', 2);
+		$Controller =& new Controller();
+		$Controller->components = array("RequestHandler");
+		$Controller->modelClass='ControllerPost';
+		$Controller->params['url']['ext'] = 'rss';
+		$Controller->constructClasses();
+		$Controller->Component->initialize($Controller);
+		$Controller->beforeFilter();
+		$Controller->Component->startup($Controller);
+
+		$this->assertEqual($Controller->RequestHandler->prefers(), 'rss');
+		unset($Controller);
+	}
+
+/**
+ * testControllerHttpCodes method
+ *
+ * @access public
+ * @return void
+ */
+	function testControllerHttpCodes() {
+		$Controller =& new Controller();
+		$result = $Controller->httpCodes();
+		$this->assertEqual(count($result), 39);
+
+		$result = $Controller->httpCodes(100);
+		$expected = array(100 => 'Continue');
+		$this->assertEqual($result, $expected);
+
+		$codes = array(
+			1337 => 'Undefined Unicorn',
+			1729 => 'Hardy-Ramanujan Located'
+		);
+
+		$result = $Controller->httpCodes($codes);
+		$this->assertTrue($result);
+		$this->assertEqual(count($Controller->httpCodes()), 41);
+
+		$result = $Controller->httpCodes(1337);
+		$expected = array(1337 => 'Undefined Unicorn');
+		$this->assertEqual($result, $expected);
+
+		$codes = array(404 => 'Sorry Bro');
+		$result = $Controller->httpCodes($codes);
+		$this->assertTrue($result);
+		$this->assertEqual(count($Controller->httpCodes()), 41);
+
+		$result = $Controller->httpCodes(404);
+		$expected = array(404 => 'Sorry Bro');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Tests that the startup process calls the correct functions
+ *
+ * @access public
+ * @return void
+ */
+	function testStartupProcess() {
+		Mock::generatePartial('AnotherTestController','MockedController', array('beforeFilter', 'afterFilter'));
+		Mock::generate('TestComponent', 'MockTestComponent', array('startup', 'initialize'));
+		$MockedController =& new MockedController();
+		$MockedController->components = array('MockTest');
+		$MockedController->Component =& new Component();
+		$MockedController->Component->init($MockedController);
+		$MockedController->expectCallCount('beforeFilter', 1);
+		$MockedController->MockTest->expectCallCount('initialize', 1);
+		$MockedController->MockTest->expectCallCount('startup', 1);
+		$MockedController->startupProcess();
+	}
+/**
+ * Tests that the shutdown process calls the correct functions
+ *
+ * @access public
+ * @return void
+ */
+	function testShutdownProcess() {
+		Mock::generate('TestComponent', 'MockTestComponent', array('shutdown'));
+		$MockedController =& new MockedController();
+		$MockedController->components = array('MockTest');
+		$MockedController->Component =& new Component();
+		$MockedController->Component->init($MockedController);
+		$MockedController->expectCallCount('afterFilter', 1);
+		$MockedController->MockTest->expectCallCount('shutdown', 1);
+		$MockedController->shutdownProcess();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php
new file mode 100644
index 000000000..b98aff1ff
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/controller_merge_vars.test.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * Controller Merge vars Test file
+ *
+ * Isolated from the Controller and Component test as to not pollute their AppController class
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ * @since         CakePHP(tm) v 1.2.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('AppController')) {
+
+/**
+ * Test case AppController
+ *
+ * @package cake
+ * @subpackage cake.tests.cases.libs.controller
+ */
+	class AppController extends Controller {
+
+/**
+ * components
+ *
+ * @var array
+ */
+		var $components = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
+/**
+ * helpers
+ *
+ * @var array
+ */
+		var $helpers = array('MergeVar' => array('format' => 'html', 'terse'));
+	}
+} elseif (!defined('APP_CONTROLLER_EXISTS')) {
+	define('APP_CONTROLLER_EXISTS', true);
+}
+
+/**
+ * MergeVar Component
+ *
+ * @package cake.tests.cases.libs.controller
+ */
+class MergeVarComponent extends Object {
+
+}
+
+/**
+ * Additional controller for testing
+ *
+ * @package cake.tests.cases.libs.controller
+ */
+class MergeVariablesController extends AppController {
+
+/**
+ * name
+ *
+ * @var string
+ */
+	var $name = 'MergeVariables';
+
+/**
+ * uses
+ *
+ * @var arrays
+ */
+	var $uses = array();
+}
+
+/**
+ * MergeVarPlugin App Controller
+ *
+ * @package cake.tests.cases.libs.controller
+ */
+class MergeVarPluginAppController extends AppController {
+
+/**
+ * components
+ *
+ * @var array
+ */
+	var $components = array('Auth' => array('setting' => 'val', 'otherVal'));
+
+/**
+ * helpers
+ *
+ * @var array
+ */
+	var $helpers = array('Javascript');
+}
+
+/**
+ * MergePostsController
+ *
+ * @package cake.tests.cases.libs.controller
+ */
+class MergePostsController extends MergeVarPluginAppController {
+
+/**
+ * name
+ *
+ * @var string
+ */
+	var $name = 'MergePosts';
+
+/**
+ * uses
+ *
+ * @var array
+ */
+	var $uses = array();
+}
+
+
+/**
+ * Test Case for Controller Merging of Vars.
+ *
+ * @package cake.tests.cases.libs.controller
+ */
+class ControllerMergeVarsTestCase extends CakeTestCase {
+/**
+ * Skips the case if APP_CONTROLLER_EXISTS is defined
+ *
+ * @return void
+ */
+	function skip() {
+		$this->skipIf(defined('APP_CONTROLLER_EXISTS'), 'APP_CONTROLLER_EXISTS cannot run. %s');
+	}
+/**
+ * end test
+ *
+ * @return void
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * test that component settings are not duplicated when merging component settings
+ *
+ * @return void
+ */
+	function testComponentParamMergingNoDuplication() {
+		$Controller =& new MergeVariablesController();
+		$Controller->constructClasses();
+
+		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => false));
+		$this->assertEqual($Controller->components, $expected, 'Duplication of settings occured. %s');
+	}
+
+/**
+ * test component merges with redeclared components
+ *
+ * @return void
+ */
+	function testComponentMergingWithRedeclarations() {
+		$Controller =& new MergeVariablesController();
+		$Controller->components['MergeVar'] = array('remote', 'redirect' => true);
+		$Controller->constructClasses();
+
+		$expected = array('MergeVar' => array('flag', 'otherFlag', 'redirect' => true, 'remote'));
+		$this->assertEqual($Controller->components, $expected, 'Merging of settings is wrong. %s');
+	}
+
+/**
+ * test merging of helpers array, ensure no duplication occurs
+ *
+ * @return void
+ */
+	function testHelperSettingMergingNoDuplication() {
+		$Controller =& new MergeVariablesController();
+		$Controller->constructClasses();
+
+		$expected = array('MergeVar' => array('format' => 'html', 'terse'));
+		$this->assertEqual($Controller->helpers, $expected, 'Duplication of settings occured. %s');
+	}
+
+/**
+ * Test that helpers declared in appcontroller come before those in the subclass
+ * orderwise
+ *
+ * @return void
+ */
+	function testHelperOrderPrecedence() {
+		$Controller =& new MergeVariablesController();
+		$Controller->helpers = array('Custom', 'Foo' => array('something'));
+		$Controller->constructClasses();
+
+		$expected = array(
+			'MergeVar' => array('format' => 'html', 'terse'),
+			'Custom' => null,
+			'Foo' => array('something')
+		);
+		$this->assertIdentical($Controller->helpers, $expected, 'Order is incorrect. %s');
+	}
+
+/**
+ * test merging of vars with plugin
+ *
+ * @return void
+ */
+	function testMergeVarsWithPlugin() {
+		$Controller =& new MergePostsController();
+		$Controller->components = array('Email' => array('ports' => 'open'));
+		$Controller->plugin = 'MergeVarPlugin';
+		$Controller->constructClasses();
+
+		$expected = array(
+			'MergeVar' => array('flag', 'otherFlag', 'redirect' => false),
+			'Auth' => array('setting' => 'val', 'otherVal'),
+			'Email' => array('ports' => 'open')
+		);
+		$this->assertEqual($Controller->components, $expected, 'Components are unexpected %s');
+
+		$expected = array(
+			'MergeVar' => array('format' => 'html', 'terse'),
+			'Javascript' => null
+		);
+		$this->assertEqual($Controller->helpers, $expected, 'Helpers are unexpected %s');
+
+		$Controller =& new MergePostsController();
+		$Controller->components = array();
+		$Controller->plugin = 'MergeVarPlugin';
+		$Controller->constructClasses();
+
+		$expected = array(
+			'MergeVar' => array('flag', 'otherFlag', 'redirect' => false),
+			'Auth' => array('setting' => 'val', 'otherVal'),
+		);
+		$this->assertEqual($Controller->components, $expected, 'Components are unexpected %s');
+	}
+
+/**
+ * Ensure that __mergeVars is not being greedy and merging with
+ * AppController when you make an instance of Controller
+ *
+ * @return void
+ */
+	function testMergeVarsNotGreedy() {
+		$Controller =& new Controller();
+		$Controller->components = array();
+		$Controller->uses = array();
+		$Controller->constructClasses();
+
+		$this->assertFalse(isset($Controller->Session));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/pages_controller.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/pages_controller.test.php
new file mode 100644
index 000000000..a80cf56ed
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/pages_controller.test.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * PagesControllerTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ * @since         CakePHP(tm) v 1.2.0.5436
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('AppController')) {
+	require_once LIBS . 'controller' . DS . 'app_controller.php';
+} elseif (!defined('APP_CONTROLLER_EXISTS')) {
+	define('APP_CONTROLLER_EXISTS', true);
+}
+App::import('Controller', 'Pages');
+
+/**
+ * PagesControllerTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class PagesControllerTest extends CakeTestCase {
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * testDisplay method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisplay() {
+		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
+			return;
+		}
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS, TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS)
+		));
+		$Pages =& new PagesController();
+
+		$Pages->viewPath = 'posts';
+		$Pages->display('index');
+		$this->assertPattern('/posts index/', $Pages->output);
+		$this->assertEqual($Pages->viewVars['page'], 'index');
+
+		$Pages->viewPath = 'themed';
+		$Pages->display('test_theme', 'posts', 'index');
+		$this->assertPattern('/posts index themed view/', $Pages->output);
+		$this->assertEqual($Pages->viewVars['page'], 'test_theme');
+		$this->assertEqual($Pages->viewVars['subpage'], 'posts');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/scaffold.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/scaffold.test.php
new file mode 100644
index 000000000..808fa1caa
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/controller/scaffold.test.php
@@ -0,0 +1,897 @@
+<?php
+/**
+ * ScaffoldTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ * @since         CakePHP(tm) v 1.2.0.5436
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Scaffold');
+
+/**
+ * ScaffoldMockController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldMockController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'ScaffoldMock'
+ * @access public
+ */
+	var $name = 'ScaffoldMock';
+
+/**
+ * scaffold property
+ *
+ * @var mixed
+ * @access public
+ */
+	var $scaffold;
+}
+
+/**
+ * ScaffoldMockControllerWithFields class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldMockControllerWithFields extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'ScaffoldMock'
+ * @access public
+ */
+	var $name = 'ScaffoldMock';
+
+/**
+ * scaffold property
+ *
+ * @var mixed
+ * @access public
+ */
+	var $scaffold;
+
+/**
+ * function _beforeScaffold
+ *
+ * @param string method
+ */
+	function _beforeScaffold($method) {
+		$this->set('scaffoldFields', array('title'));
+		return true;
+	}
+}
+
+/**
+ * TestScaffoldMock class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class TestScaffoldMock extends Scaffold {
+
+/**
+ * Overload __scaffold
+ *
+ * @param unknown_type $params
+ */
+    function __scaffold($params) {
+        $this->_params = $params;
+    }
+
+/**
+ * Get Params from the Controller.
+ *
+ * @return unknown
+ */
+    function getParams() {
+        return $this->_params;
+    }
+}
+
+/**
+ * ScaffoldMock class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldMock extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'articles';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'User' => array(
+			'className' => 'ScaffoldUser',
+			'foreignKey' => 'user_id',
+		)
+	);
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'Comment' => array(
+			'className' => 'ScaffoldComment',
+			'foreignKey' => 'article_id',
+		)
+	);
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var string
+ */
+	var $hasAndBelongsToMany = array(
+		'ScaffoldTag' => array(
+			'className' => 'ScaffoldTag',
+			'foreignKey' => 'something_id',
+			'associationForeignKey' => 'something_else_id',
+			'joinTable' => 'join_things'
+		)
+	);
+}
+
+/**
+ * ScaffoldUser class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldUser extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'users';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'Article' => array(
+			'className' => 'ScaffoldMock',
+			'foreignKey' => 'article_id',
+		)
+	);
+}
+
+/**
+ * ScaffoldComment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldComment extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'Article' => array(
+			'className' => 'ScaffoldMock',
+			'foreignKey' => 'article_id',
+		)
+	);
+}
+
+/**
+ * ScaffoldTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldTag extends CakeTestModel {
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'tags';
+}
+/**
+ * TestScaffoldView class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class TestScaffoldView extends ScaffoldView {
+
+/**
+ * testGetFilename method
+ *
+ * @param mixed $action
+ * @access public
+ * @return void
+ */
+	function testGetFilename($action) {
+		return $this->_getViewFileName($action);
+	}
+}
+
+/**
+ * ScaffoldViewTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldViewTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.user', 'core.comment', 'core.join_thing', 'core.tag');
+
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Controller =& new ScaffoldMockController();
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->Controller);
+
+		App::build();
+	}
+
+/**
+ * testGetViewFilename method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetViewFilename() {
+		$_admin = Configure::read('Routing.prefixes');
+		Configure::write('Routing.prefixes', array('admin'));
+
+		$this->Controller->action = 'index';
+		$ScaffoldView =& new TestScaffoldView($this->Controller);
+		$result = $ScaffoldView->testGetFilename('index');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'index.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('edit');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('add');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('view');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'view.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('admin_index');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'index.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('admin_view');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'view.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('admin_edit');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('admin_add');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS . 'scaffolds' . DS . 'edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('error');
+		$expected = 'cake' . DS . 'libs' . DS . 'view' . DS . 'errors' . DS . 'scaffold_error.ctp';
+		$this->assertEqual($result, $expected);
+
+		$Controller =& new ScaffoldMockController();
+		$Controller->scaffold = 'admin';
+		$Controller->viewPath = 'posts';
+		$Controller->action = 'admin_edit';
+		$ScaffoldView =& new TestScaffoldView($Controller);
+		$result = $ScaffoldView->testGetFilename('admin_edit');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' .DS . 'views' . DS . 'posts' . DS . 'scaffold.edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('edit');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' .DS . 'views' . DS . 'posts' . DS . 'scaffold.edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		$Controller =& new ScaffoldMockController();
+		$Controller->scaffold = 'admin';
+		$Controller->viewPath = 'tests';
+		$Controller->plugin = 'test_plugin';
+		$Controller->action = 'admin_add';
+		$ScaffoldView =& new TestScaffoldView($Controller);
+		$result = $ScaffoldView->testGetFilename('admin_add');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'
+			. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		$result = $ScaffoldView->testGetFilename('add');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'
+			. DS .'test_plugin' . DS . 'views' . DS . 'tests' . DS . 'scaffold.edit.ctp';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.prefixes', $_admin);
+	}
+
+/**
+ * test getting the view file name for themed scaffolds.
+ *
+ * @return void
+ */
+	function testGetViewFileNameWithTheme() {
+		$this->Controller->action = 'index';
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->theme = 'test_theme';
+		$ScaffoldView =& new TestScaffoldView($this->Controller);
+
+		$result = $ScaffoldView->testGetFilename('index');
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS 
+			. 'themed' . DS . 'test_theme' . DS . 'posts' . DS . 'scaffold.index.ctp';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test default index scaffold generation
+ *
+ * @access public
+ * @return void
+ */
+	function testIndexScaffold() {
+		$this->Controller->action = 'index';
+		$this->Controller->here = '/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'index',
+		);
+		//set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+		ob_start();
+		new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertPattern('#<h2>Scaffold Mock</h2>#', $result);
+		$this->assertPattern('#<table cellpadding="0" cellspacing="0">#', $result);
+
+		$this->assertPattern('#<a href="/scaffold_users/view/1">1</a>#', $result); //belongsTo links
+		$this->assertPattern('#<li><a href="/scaffold_mock/add">New Scaffold Mock</a></li>#', $result);
+		$this->assertPattern('#<li><a href="/scaffold_users">List Scaffold Users</a></li>#', $result);
+		$this->assertPattern('#<li><a href="/scaffold_comments/add">New Comment</a></li>#', $result);
+	}
+
+/**
+ * test default view scaffold generation
+ *
+ * @access public
+ * @return void
+ */
+	function testViewScaffold() {
+		$this->Controller->action = 'view';
+		$this->Controller->here = '/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(1),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'view',
+		);
+		//set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+
+		ob_start();
+		new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertPattern('/<h2>View Scaffold Mock<\/h2>/', $result);
+		$this->assertPattern('/<dl>/', $result);
+		//TODO: add specific tests for fields.
+		$this->assertPattern('/<a href="\/scaffold_users\/view\/1">1<\/a>/', $result); //belongsTo links
+		$this->assertPattern('/<li><a href="\/scaffold_mock\/edit\/1">Edit Scaffold Mock<\/a>\s<\/li>/', $result);
+		$this->assertPattern('/<li><a href="\/scaffold_mock\/delete\/1"[^>]*>Delete Scaffold Mock<\/a>\s*<\/li>/', $result);
+		//check related table
+		$this->assertPattern('/<div class="related">\s*<h3>Related Scaffold Comments<\/h3>\s*<table cellpadding="0" cellspacing="0">/', $result);
+		$this->assertPattern('/<li><a href="\/scaffold_comments\/add">New Comment<\/a><\/li>/', $result);
+		$this->assertNoPattern('/<th>JoinThing<\/th>/', $result);
+	}
+
+/**
+ * test default view scaffold generation
+ *
+ * @access public
+ * @return void
+ */
+	function testEditScaffold() {
+		$this->Controller->action = 'edit';
+		$this->Controller->here = '/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(1),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'edit',
+		);
+		//set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+		ob_start();
+		new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertPattern('/<form id="ScaffoldMockEditForm" method="post" action="\/scaffold_mock\/edit\/1"/', $result);
+		$this->assertPattern('/<legend>Edit Scaffold Mock<\/legend>/', $result);
+
+		$this->assertPattern('/input type="hidden" name="data\[ScaffoldMock\]\[id\]" value="1" id="ScaffoldMockId"/', $result);
+		$this->assertPattern('/select name="data\[ScaffoldMock\]\[user_id\]" id="ScaffoldMockUserId"/', $result);
+		$this->assertPattern('/input name="data\[ScaffoldMock\]\[title\]" type="text" maxlength="255" value="First Article" id="ScaffoldMockTitle"/', $result);
+		$this->assertPattern('/input name="data\[ScaffoldMock\]\[published\]" type="text" maxlength="1" value="Y" id="ScaffoldMockPublished"/', $result);
+		$this->assertPattern('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
+		$this->assertPattern('/<li><a href="\/scaffold_mock\/delete\/1"[^>]*>Delete<\/a>\s*<\/li>/', $result);
+	}
+
+/**
+ * Test Admin Index Scaffolding.
+ *
+ * @access public
+ * @return void
+ */
+	function testAdminIndexScaffold() {
+		$_backAdmin = Configure::read('Routing.prefixes');
+
+		Configure::write('Routing.prefixes', array('admin'));
+		$params = array(
+			'plugin' => null,
+			'pass' => array(),
+			'form' => array(),
+			'named' => array(),
+			'prefix' => 'admin',
+			'url' => array('url' =>'admin/scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'admin_index',
+			'admin' => 1,
+		);
+		//reset, and set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/admin/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->action = 'admin_index';
+		$this->Controller->here = '/tests/admin/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$this->Controller->scaffold = 'admin';
+		$this->Controller->constructClasses();
+
+		ob_start();
+		$Scaffold = new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertPattern('/<h2>Scaffold Mock<\/h2>/', $result);
+		$this->assertPattern('/<table cellpadding="0" cellspacing="0">/', $result);
+		//TODO: add testing for table generation
+		$this->assertPattern('/<li><a href="\/admin\/scaffold_mock\/add">New Scaffold Mock<\/a><\/li>/', $result);
+
+		Configure::write('Routing.prefixes', $_backAdmin);
+	}
+
+/**
+ * Test Admin Index Scaffolding.
+ *
+ * @access public
+ * @return void
+ */
+	function testAdminEditScaffold() {
+		$_backAdmin = Configure::read('Routing.prefixes');
+
+		Configure::write('Routing.prefixes', array('admin'));
+		$params = array(
+			'plugin' => null,
+			'pass' => array(),
+			'form' => array(),
+			'named' => array(),
+			'prefix' => 'admin',
+			'url' => array('url' =>'admin/scaffold_mock/edit'),
+			'controller' => 'scaffold_mock',
+			'action' => 'admin_edit',
+			'admin' => 1,
+		);
+		//reset, and set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/admin/scaffold_mock/edit', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->action = 'admin_index';
+		$this->Controller->here = '/tests/admin/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$this->Controller->scaffold = 'admin';
+		$this->Controller->constructClasses();
+
+		ob_start();
+		$Scaffold = new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertPattern('#admin/scaffold_mock/edit/1#', $result);
+		$this->assertPattern('#Scaffold Mock#', $result);
+
+		Configure::write('Routing.prefixes', $_backAdmin);
+	}
+
+/**
+ * Test Admin Index Scaffolding.
+ *
+ * @access public
+ * @return void
+ */
+	function testMultiplePrefixScaffold() {
+		$_backAdmin = Configure::read('Routing.prefixes');
+
+		Configure::write('Routing.prefixes', array('admin', 'member'));
+		$params = array(
+			'plugin' => null,
+			'pass' => array(),
+			'form' => array(),
+			'named' => array(),
+			'prefix' => 'member',
+			'url' => array('url' =>'member/scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'member_index',
+			'member' => 1,
+		);
+		//reset, and set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/member/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->action = 'member_index';
+		$this->Controller->here = '/tests/member/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$this->Controller->scaffold = 'member';
+		$this->Controller->constructClasses();
+
+		ob_start();
+		$Scaffold = new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertPattern('/<h2>Scaffold Mock<\/h2>/', $result);
+		$this->assertPattern('/<table cellpadding="0" cellspacing="0">/', $result);
+		//TODO: add testing for table generation
+		$this->assertPattern('/<li><a href="\/member\/scaffold_mock\/add">New Scaffold Mock<\/a><\/li>/', $result);
+
+		Configure::write('Routing.prefixes', $_backAdmin);
+	}
+
+}
+
+/**
+ * Scaffold Test class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller
+ */
+class ScaffoldTest extends CakeTestCase {
+
+/**
+ * Controller property
+ *
+ * @var SecurityTestController
+ * @access public
+ */
+	var $Controller;
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.article', 'core.user', 'core.comment', 'core.join_thing', 'core.tag');
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Controller =& new ScaffoldMockController();
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->Controller);
+	}
+
+/**
+ * Test the correct Generation of Scaffold Params.
+ * This ensures that the correct action and view will be generated
+ *
+ * @access public
+ * @return void
+ */
+	function testScaffoldParams() {
+		$this->Controller->action = 'admin_edit';
+		$this->Controller->here = '/admin/scaffold_mock/edit';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'admin/scaffold_mock/edit'),
+			'controller' => 'scaffold_mock',
+			'action' => 'admin_edit',
+			'admin' => true,
+		);
+		//set router.
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => 'admin/scaffold_mock', 'webroot' => '/')));
+
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+		$Scaffold =& new TestScaffoldMock($this->Controller, $params);
+		$result = $Scaffold->getParams();
+		$this->assertEqual($result['action'], 'admin_edit');
+	}
+
+/**
+ * test that the proper names and variable values are set by Scaffold
+ *
+ * @return void
+ */
+	function testScaffoldVariableSetting() {
+		$this->Controller->action = 'admin_edit';
+		$this->Controller->here = '/admin/scaffold_mock/edit';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'admin/scaffold_mock/edit'),
+			'controller' => 'scaffold_mock',
+			'action' => 'admin_edit',
+			'admin' => true,
+		);
+		//set router.
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => 'admin/scaffold_mock', 'webroot' => '/')));
+
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+		$Scaffold =& new TestScaffoldMock($this->Controller, $params);
+		$result = $Scaffold->controller->viewVars;
+
+		$this->assertEqual($result['title_for_layout'], 'Scaffold :: Admin Edit :: Scaffold Mock');
+		$this->assertEqual($result['singularHumanName'], 'Scaffold Mock');
+		$this->assertEqual($result['pluralHumanName'], 'Scaffold Mock');
+		$this->assertEqual($result['modelClass'], 'ScaffoldMock');
+		$this->assertEqual($result['primaryKey'], 'id');
+		$this->assertEqual($result['displayField'], 'title');
+		$this->assertEqual($result['singularVar'], 'scaffoldMock');
+		$this->assertEqual($result['pluralVar'], 'scaffoldMock');
+		$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated'));
+	}
+	function getTests() {
+		return array('start', 'startCase', 'testScaffoldChangingViewProperty', 'endCase', 'end');
+	}
+
+/**
+ * test that Scaffold overrides the view property even if its set to 'Theme'
+ *
+ * @return void
+ */
+	function testScaffoldChangingViewProperty() {
+		$this->Controller->action = 'edit';
+		$this->Controller->theme = 'test_theme';
+		$this->Controller->view = 'Theme';
+		$this->Controller->constructClasses();
+		$Scaffold =& new TestScaffoldMock($this->Controller, array());
+
+		$this->assertEqual($this->Controller->view, 'Scaffold');
+	}
+
+/**
+ * test that scaffold outputs flash messages when sessions are unset.
+ *
+ * @return void
+ */
+	function testScaffoldFlashMessages() {
+		$this->Controller->action = 'edit';
+		$this->Controller->here = '/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(1),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'edit',
+		);
+		//set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->data = array(
+			'ScaffoldMock' => array(
+				'id' => 1,
+				'title' => 'New title',
+				'body' => 'new body'
+			)
+		);
+		$this->Controller->constructClasses();
+		unset($this->Controller->Session);
+
+		ob_start();
+		new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+		$this->assertPattern('/Scaffold Mock has been updated/', $result);
+	}
+/**
+ * test that habtm relationship keys get added to scaffoldFields.
+ *
+ * @see http://code.cakephp.org/tickets/view/48
+ * @return void
+ */
+	function testHabtmFieldAdditionWithScaffoldForm() {
+		$this->Controller->action = 'edit';
+		$this->Controller->here = '/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(1),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'edit',
+		);
+		//set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+		ob_start();
+		$Scaffold = new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+		$this->assertPattern('/name="data\[ScaffoldTag\]\[ScaffoldTag\]"/', $result);
+
+		$result = $Scaffold->controller->viewVars;
+		$this->assertEqual($result['scaffoldFields'], array('id', 'user_id', 'title', 'body', 'published', 'created', 'updated', 'ScaffoldTag'));
+	}
+/**
+ * test that the proper names and variable values are set by Scaffold
+ *
+ * @return void
+ */
+	function testEditScaffoldWithScaffoldFields() {
+		$this->Controller = new ScaffoldMockControllerWithFields();
+		$this->Controller->action = 'edit';
+		$this->Controller->here = '/scaffold_mock';
+		$this->Controller->webroot = '/';
+		$params = array(
+			'plugin' => null,
+			'pass' => array(1),
+			'form' => array(),
+			'named' => array(),
+			'url' => array('url' =>'scaffold_mock'),
+			'controller' => 'scaffold_mock',
+			'action' => 'edit',
+		);
+		//set router.
+		Router::reload();
+		Router::setRequestInfo(array($params, array('base' => '/', 'here' => '/scaffold_mock', 'webroot' => '/')));
+		$this->Controller->params = $params;
+		$this->Controller->controller = 'scaffold_mock';
+		$this->Controller->base = '/';
+		$this->Controller->constructClasses();
+		ob_start();
+		new Scaffold($this->Controller, $params);
+		$result = ob_get_clean();
+
+		$this->assertNoPattern('/textarea name="data\[ScaffoldMock\]\[body\]" cols="30" rows="6" id="ScaffoldMockBody"/', $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/debugger.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/debugger.test.php
new file mode 100644
index 000000000..ad8596305
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/debugger.test.php
@@ -0,0 +1,336 @@
+<?php
+/**
+ * DebuggerTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'Debugger');
+
+/**
+ * DebugggerTestCaseDebuggger class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class DebuggerTestCaseDebugger extends Debugger {
+}
+
+/**
+ * DebuggerTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class DebuggerTest extends CakeTestCase {
+// !!!
+// !!! Be careful with changing code below as it may
+// !!! change line numbers which are used in the tests
+// !!!
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		Configure::write('log', false);
+		if (!defined('SIMPLETESTVENDORPATH')) {
+			if (file_exists(APP . DS . 'vendors' . DS . 'simpletest' . DS . 'reporter.php')) {
+				define('SIMPLETESTVENDORPATH', 'APP' . DS . 'vendors');
+			} else {
+				define('SIMPLETESTVENDORPATH', 'CORE' . DS . 'vendors');
+			}
+		}
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('log', true);
+	}
+
+/**
+ * testDocRef method
+ *
+ * @access public
+ * @return void
+ */
+	function testDocRef() {
+		ini_set('docref_root', '');
+		$this->assertEqual(ini_get('docref_root'), '');
+		$debugger = new Debugger();
+		$this->assertEqual(ini_get('docref_root'), 'http://php.net/');
+	}
+
+/**
+ * test Excerpt writing
+ *
+ * @access public
+ * @return void
+ */
+	function testExcerpt() {
+		$result = Debugger::excerpt(__FILE__, __LINE__, 2);
+		$this->assertTrue(is_array($result));
+		$this->assertEqual(count($result), 5);
+		$this->assertPattern('/function(.+)testExcerpt/', $result[1]);
+
+		$result = Debugger::excerpt(__FILE__, 2, 2);
+		$this->assertTrue(is_array($result));
+		$this->assertEqual(count($result), 4);
+
+		$expected = '<code><span style="color: #000000">&lt;?php';
+		$expected .= '</span></code>';
+		$this->assertEqual($result[0], $expected);
+
+		$return = Debugger::excerpt('[internal]', 2, 2);
+		$this->assertTrue(empty($return));
+	}
+
+/**
+ * testOutput method
+ *
+ * @access public
+ * @return void
+ */
+	function testOutput() {
+		Debugger::invoke(Debugger::getInstance());
+		$result = Debugger::output(false);
+		$this->assertEqual($result, '');
+		$out .= '';
+		$result = Debugger::output(true);
+
+		$this->assertEqual($result[0]['error'], 'Notice');
+		$this->assertPattern('/Undefined variable\:\s+out/', $result[0]['description']);
+		$this->assertPattern('/DebuggerTest::testOutput/i', $result[0]['trace']);
+		$this->assertPattern('/SimpleInvoker::invoke/i', $result[0]['trace']);
+
+		ob_start();
+		Debugger::output('txt');
+		$other .= '';
+		$result = ob_get_clean();
+
+		$this->assertPattern('/Undefined variable:\s+other/', $result);
+		$this->assertPattern('/Context:/', $result);
+		$this->assertPattern('/DebuggerTest::testOutput/i', $result);
+		$this->assertPattern('/SimpleInvoker::invoke/i', $result);
+
+		ob_start();
+		Debugger::output('html');
+		$wrong .= '';
+		$result = ob_get_clean();
+		$this->assertPattern('/<pre class="cake-debug">.+<\/pre>/', $result);
+		$this->assertPattern('/<b>Notice<\/b>/', $result);
+		$this->assertPattern('/variable:\s+wrong/', $result);
+
+		ob_start();
+		Debugger::output('js');
+		$buzz .= '';
+		$result = explode('</a>', ob_get_clean());
+		$this->assertTags($result[0], array(
+			'pre' => array('class' => 'cake-debug'),
+			'a' => array(
+				'href' => "javascript:void(0);",
+				'onclick' => "document.getElementById('cakeErr4-trace').style.display = " .
+				             "(document.getElementById('cakeErr4-trace').style.display == 'none'" .
+				             " ? '' : 'none');"
+			),
+			'b' => array(), 'Notice', '/b', ' (8)',
+		));
+
+		$this->assertPattern('/Undefined variable:\s+buzz/', $result[1]);
+		$this->assertPattern('/<a[^>]+>Code/', $result[1]);
+		$this->assertPattern('/<a[^>]+>Context/', $result[2]);
+		set_error_handler('simpleTestErrorHandler');
+	}
+
+/**
+ * Tests that changes in output formats using Debugger::output() change the templates used.
+ *
+ * @return void
+ */
+	function testChangeOutputFormats() {
+		Debugger::invoke(Debugger::getInstance());
+		Debugger::output('js', array(
+			'traceLine' => '{:reference} - <a href="txmt://open?url=file://{:file}' .
+			               '&line={:line}">{:path}</a>, line {:line}'
+		));
+		$result = Debugger::trace();
+		$this->assertPattern('/' . preg_quote('txmt://open?url=file:///', '/') . '/', $result);
+
+		Debugger::output('xml', array(
+			'error' => '<error><code>{:code}</code><file>{:file}</file><line>{:line}</line>' .
+			           '{:description}</error>',
+			'context' => "<context>{:context}</context>",
+			'trace' => "<stack>{:trace}</stack>",
+		));
+		Debugger::output('xml');
+
+		ob_start();
+		$foo .= '';
+		$result = ob_get_clean();
+		set_error_handler('SimpleTestErrorHandler');
+
+		$data = array(
+			'error' => array(),
+			'code' => array(), '8', '/code',
+			'file' => array(), 'preg:/[^<]+/', '/file',
+			'line' => array(), '' . (intval(__LINE__) + -8), '/line',
+			'preg:/Undefined variable:\s+foo/',
+			'/error'
+		);
+		$this->assertTags($result, $data, true);
+	}
+
+/**
+ * testTrimPath method
+ *
+ * @access public
+ * @return void
+ */
+	function testTrimPath() {
+		$this->assertEqual(Debugger::trimPath(APP), 'APP' . DS);
+		$this->assertEqual(Debugger::trimPath(CAKE_CORE_INCLUDE_PATH), 'CORE');
+	}
+
+/**
+ * testExportVar method
+ *
+ * @access public
+ * @return void
+ */
+	function testExportVar() {
+		App::import('Controller');
+		$Controller = new Controller();
+		$Controller->helpers = array('Html', 'Form');
+		$View = new View($Controller);
+		$result = Debugger::exportVar($View);
+		$expected = 'ViewView::$base = NULL
+		View::$here = NULL
+		View::$plugin = NULL
+		View::$name = ""
+		View::$action = NULL
+		View::$params = array
+		View::$passedArgs = array
+		View::$data = array
+		View::$helpers = array
+		View::$viewPath = ""
+		View::$viewVars = array
+		View::$layout = "default"
+		View::$layoutPath = NULL
+		View::$autoRender = true
+		View::$autoLayout = true
+		View::$ext = ".ctp"
+		View::$subDir = NULL
+		View::$theme = NULL
+		View::$cacheAction = false
+		View::$validationErrors = array
+		View::$hasRendered = false
+		View::$loaded = array
+		View::$modelScope = false
+		View::$model = NULL
+		View::$association = NULL
+		View::$field = NULL
+		View::$fieldSuffix = NULL
+		View::$modelId = NULL
+		View::$uuids = array
+		View::$output = false
+		View::$__passedVars = array
+		View::$__scripts = array
+		View::$__paths = array
+		View::$webroot = NULL';
+		$result = str_replace(array("\t", "\r\n", "\n"), "", strtolower($result));
+		$expected =  str_replace(array("\t", "\r\n", "\n"), "", strtolower($expected));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testLog method
+ *
+ * @access public
+ * @return void
+ */
+	function testLog() {
+		if (file_exists(LOGS . 'debug.log')) {
+			unlink(LOGS . 'debug.log');
+		}
+
+		Debugger::log('cool');
+		$result = file_get_contents(LOGS . 'debug.log');
+		$this->assertPattern('/DebuggerTest\:\:testLog/i', $result);
+		$this->assertPattern('/"cool"/', $result);
+
+		unlink(TMP . 'logs' . DS . 'debug.log');
+
+		Debugger::log(array('whatever', 'here'));
+		$result = file_get_contents(TMP . 'logs' . DS . 'debug.log');
+		$this->assertPattern('/DebuggerTest\:\:testLog/i', $result);
+		$this->assertPattern('/\[main\]/', $result);
+		$this->assertPattern('/array/', $result);
+		$this->assertPattern('/"whatever",/', $result);
+		$this->assertPattern('/"here"/', $result);
+	}
+
+/**
+ * testDump method
+ *
+ * @access public
+ * @return void
+ */
+	function testDump() {
+		$var = array('People' => array(
+					array(
+					'name' => 'joeseph',
+					'coat' => 'technicolor',
+					'hair_color' => 'brown'
+					),
+					array(
+					'name' => 'Shaft',
+					'coat' => 'black',
+					'hair' => 'black'
+					)
+				)
+			);
+		ob_start();
+		Debugger::dump($var);
+		$result = ob_get_clean();
+		$expected = "<pre>array(\n\t\"People\" => array()\n)</pre>";
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test getInstance.
+ *
+ * @access public
+ * @return void
+ */
+	function testGetInstance() {
+		$result =& Debugger::getInstance();
+		$this->assertIsA($result, 'Debugger');
+
+		$result =& Debugger::getInstance('DebuggerTestCaseDebugger');
+		$this->assertIsA($result, 'DebuggerTestCaseDebugger');
+
+		$result =& Debugger::getInstance();
+		$this->assertIsA($result, 'DebuggerTestCaseDebugger');
+
+		$result =& Debugger::getInstance('Debugger');
+		$this->assertIsA($result, 'Debugger');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/error.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/error.test.php
new file mode 100644
index 000000000..ec90a57e2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/error.test.php
@@ -0,0 +1,630 @@
+<?php
+/**
+ * ErrorHandlerTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (class_exists('TestErrorHandler')) {
+	return;
+}
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+
+/**
+ * BlueberryComponent class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class BlueberryComponent extends Object {
+
+/**
+ * testName property
+ *
+ * @access public
+ * @return void
+ */
+	var $testName = null;
+
+/**
+ * initialize method
+ *
+ * @access public
+ * @return void
+ */
+	function initialize(&$controller) {
+		$this->testName = 'BlueberryComponent';
+	}
+}
+
+/**
+ * BlueberryDispatcher class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class BlueberryDispatcher extends Dispatcher {
+
+/**
+ * cakeError method
+ *
+ * @access public
+ * @return void
+ */
+	function cakeError($method, $messages = array()) {
+		$error = new TestErrorHandler($method, $messages);
+		return $error;
+	}
+}
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class AuthBlueberryUser extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'AuthBlueberryUser'
+ * @access public
+ */
+	var $name = 'AuthBlueberryUser';
+
+/**
+ * useTable property
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = false;
+}
+if (!class_exists('AppController')) {
+	/**
+	 * AppController class
+	 *
+	 * @package       cake
+	 * @subpackage    cake.tests.cases.libs
+	 */
+	class AppController extends Controller {
+	/**
+	 * components property
+	 *
+	 * @access public
+	 * @return void
+	 */
+		var $components = array('Blueberry');
+	/**
+	 * beforeRender method
+	 *
+	 * @access public
+	 * @return void
+	 */
+		function beforeRender() {
+			echo $this->Blueberry->testName;
+		}
+	/**
+	 * header method
+	 *
+	 * @access public
+	 * @return void
+	 */
+		function header($header) {
+			echo $header;
+		}
+	/**
+	 * _stop method
+	 *
+	 * @access public
+	 * @return void
+	 */
+		function _stop($status = 0) {
+			echo 'Stopped with status: ' . $status;
+		}
+	}
+} elseif (!defined('APP_CONTROLLER_EXISTS')){
+	define('APP_CONTROLLER_EXISTS', true);
+}
+App::import('Core', array('Error', 'Controller'));
+
+/**
+ * TestErrorController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class TestErrorController extends AppController {
+
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	var $uses = array();
+
+/**
+ * index method
+ *
+ * @access public
+ * @return void
+ */
+	function index() {
+		$this->autoRender = false;
+		return 'what up';
+	}
+}
+
+/**
+ * BlueberryController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class BlueberryController extends AppController {
+
+/**
+ * name property
+ *
+ * @access public
+ * @return void
+ */
+	var $name = 'BlueberryController';
+
+/**
+ * uses property
+ *
+ * @access public
+ * @return void
+ */
+	var $uses = array('AuthBlueberryUser');
+
+/**
+ * components property
+ *
+ * @access public
+ * @return void
+ */
+	var $components = array('Auth');
+}
+
+/**
+ * MyCustomErrorHandler class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class MyCustomErrorHandler extends ErrorHandler {
+
+/**
+ * custom error message type.
+ *
+ * @return void
+ */
+	function missingWidgetThing() {
+		echo 'widget thing is missing';
+	}
+
+/**
+ * stop method
+ *
+ * @access public
+ * @return void
+ */
+	function _stop() {
+		return;
+	}
+}
+
+/**
+ * TestErrorHandler class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class TestErrorHandler extends ErrorHandler {
+
+/**
+ * stop method
+ *
+ * @access public
+ * @return void
+ */
+	function _stop() {
+		return;
+	}
+}
+
+/**
+ * ErrorHandlerTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ErrorHandlerTest extends CakeTestCase {
+
+/**
+ * skip method
+ *
+ * @access public
+ * @return void
+ */
+	function skip() {
+		$this->skipIf(PHP_SAPI === 'cli', '%s Cannot be run from console');
+	}
+
+/**
+ * test that methods declared in an ErrorHandler subclass are not converted
+ * into error404 when debug == 0
+ *
+ * @return void
+ */
+	function testSubclassMethodsNotBeingConvertedToError() {
+		$back = Configure::read('debug');
+		Configure::write('debug', 2);
+		ob_start();
+		$ErrorHandler =& new MyCustomErrorHandler('missingWidgetThing', array('message' => 'doh!'));
+		$result = ob_get_clean();
+		$this->assertEqual($result, 'widget thing is missing');
+
+		Configure::write('debug', 0);
+		ob_start();
+		$ErrorHandler =& new MyCustomErrorHandler('missingWidgetThing', array('message' => 'doh!'));
+		$result = ob_get_clean();
+		$this->assertEqual($result, 'widget thing is missing', 'Method declared in subclass converted to error404. %s');
+
+		Configure::write('debug', 0);
+		ob_start();
+		$ErrorHandler =& new MyCustomErrorHandler('missingController', array(
+			'className' => 'Missing', 'message' => 'Page not found'
+		));
+		$result = ob_get_clean();
+		$this->assertPattern('/Not Found/', $result, 'Method declared in error handler not converted to error404. %s');
+
+		Configure::write('debug', $back);
+	}
+
+/**
+ * testError method
+ *
+ * @access public
+ * @return void
+ */
+	function testError() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('error404', array('message' => 'Page not found'));
+		ob_clean();
+		ob_start();
+		$TestErrorHandler->error(array(
+			'code' => 404,
+			'message' => 'Page not Found',
+			'name' => "Couldn't find what you were looking for"
+		));
+		$result = ob_get_clean();
+		$this->assertPattern("/<h2>Couldn't find what you were looking for<\/h2>/", $result);
+		$this->assertPattern('/Page not Found/', $result);
+	}
+
+/**
+ * testError404 method
+ *
+ * @access public
+ * @return void
+ */
+	function testError404() {
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS)
+		), true);
+
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('error404', array('message' => 'Page not found', 'url' => '/test_error'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Not Found<\/h2>/', $result);
+	 	$this->assertPattern("/<strong>'\/test_error'<\/strong>/", $result);
+
+		ob_start();
+		$TestErrorHandler =& new TestErrorHandler('error404', array('message' => 'Page not found'));
+		ob_get_clean();
+		ob_start();
+		$TestErrorHandler->error404(array(
+			'url' => 'pages/<span id=333>pink</span></id><script>document.body.style.background = t=document.getElementById(333).innerHTML;window.alert(t);</script>',
+			'message' => 'Page not found'
+		));
+		$result = ob_get_clean();
+		$this->assertNoPattern('#<script>#', $result);
+		$this->assertNoPattern('#</script>#', $result);
+
+		App::build();
+	}
+
+/**
+ * testError500 method
+ *
+ * @access public
+ * @return void
+ */
+	function testError500() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('error500', array(
+			'message' => 'An Internal Error Has Occurred'
+		));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>An Internal Error Has Occurred<\/h2>/', $result);
+
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('error500', array(
+			'message' => 'An Internal Error Has Occurred',
+			'code' => '500'
+		));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>An Internal Error Has Occurred<\/h2>/', $result);
+	}
+
+/**
+ * testMissingController method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingController() {
+		$this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController');
+
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingController', array('className' => 'PostsController'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Controller<\/h2>/', $result);
+		$this->assertPattern('/<em>PostsController<\/em>/', $result);
+		$this->assertPattern('/BlueberryComponent/', $result);
+	}
+
+/**
+ * testMissingAction method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingAction() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingAction', array('className' => 'PostsController', 'action' => 'index'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Method in PostsController<\/h2>/', $result);
+		$this->assertPattern('/<em>PostsController::<\/em><em>index\(\)<\/em>/', $result);
+
+		ob_start();
+		$dispatcher = new BlueberryDispatcher('/blueberry/inexistent');
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Method in BlueberryController<\/h2>/', $result);
+		$this->assertPattern('/<em>BlueberryController::<\/em><em>inexistent\(\)<\/em>/', $result);
+		$this->assertNoPattern('/Location: (.*)\/users\/login/', $result);
+		$this->assertNoPattern('/Stopped with status: 0/', $result);
+	}
+
+/**
+ * testPrivateAction method
+ *
+ * @access public
+ * @return void
+ */
+	function testPrivateAction() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('privateAction', array('className' => 'PostsController', 'action' => '_secretSauce'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Private Method in PostsController<\/h2>/', $result);
+		$this->assertPattern('/<em>PostsController::<\/em><em>_secretSauce\(\)<\/em>/', $result);
+	}
+
+/**
+ * testMissingTable method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingTable() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingTable', array('className' => 'Article', 'table' => 'articles'));
+		$result = ob_get_clean();
+		$this->assertPattern('/HTTP\/1\.0 500 Internal Server Error/', $result);
+		$this->assertPattern('/<h2>Missing Database Table<\/h2>/', $result);
+		$this->assertPattern('/table <em>articles<\/em> for model <em>Article<\/em>/', $result);
+	}
+
+/**
+ * testMissingDatabase method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingDatabase() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingDatabase', array());
+		$result = ob_get_clean();
+		$this->assertPattern('/HTTP\/1\.0 500 Internal Server Error/', $result);
+		$this->assertPattern('/<h2>Missing Database Connection<\/h2>/', $result);
+		$this->assertPattern('/Confirm you have created the file/', $result);
+	}
+
+/**
+ * testMissingView method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingView() {
+		restore_error_handler();
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingView', array('className' => 'Pages', 'action' => 'display', 'file' => 'pages/about.ctp', 'base' => ''));
+		$expected = ob_get_clean();
+		set_error_handler('simpleTestErrorHandler');
+		$this->assertPattern("/PagesController::/", $expected);
+		$this->assertPattern("/pages\/about.ctp/", $expected);
+	}
+
+/**
+ * testMissingLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingLayout() {
+		restore_error_handler();
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingLayout', array( 'layout' => 'my_layout', 'file' => 'layouts/my_layout.ctp', 'base' => ''));
+		$expected = ob_get_clean();
+		set_error_handler('simpleTestErrorHandler');
+		$this->assertPattern("/Missing Layout/", $expected);
+		$this->assertPattern("/layouts\/my_layout.ctp/", $expected);
+	}
+
+/**
+ * testMissingConnection method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingConnection() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingConnection', array('className' => 'Article'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Database Connection<\/h2>/', $result);
+		$this->assertPattern('/Article requires a database connection/', $result);
+	}
+
+/**
+ * testMissingHelperFile method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingHelperFile() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingHelperFile', array('helper' => 'MyCustom', 'file' => 'my_custom.php'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Helper File<\/h2>/', $result);
+		$this->assertPattern('/Create the class below in file:/', $result);
+		$this->assertPattern('/(\/|\\\)my_custom.php/', $result);
+	}
+
+/**
+ * testMissingHelperClass method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingHelperClass() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingHelperClass', array('helper' => 'MyCustom', 'file' => 'my_custom.php'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Helper Class<\/h2>/', $result);
+		$this->assertPattern('/The helper class <em>MyCustomHelper<\/em> can not be found or does not exist./', $result);
+		$this->assertPattern('/(\/|\\\)my_custom.php/', $result);
+	}
+
+/**
+ * test missingBehaviorFile method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingBehaviorFile() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingBehaviorFile', array('behavior' => 'MyCustom', 'file' => 'my_custom.php'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Behavior File<\/h2>/', $result);
+		$this->assertPattern('/Create the class below in file:/', $result);
+		$this->assertPattern('/(\/|\\\)my_custom.php/', $result);
+	}
+
+/**
+ * test MissingBehaviorClass method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingBehaviorClass() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingBehaviorClass', array('behavior' => 'MyCustom', 'file' => 'my_custom.php'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Behavior Class<\/h2>/', $result);
+		$this->assertPattern('/The behavior class <em>MyCustomBehavior<\/em> can not be found or does not exist./', $result);
+		$this->assertPattern('/(\/|\\\)my_custom.php/', $result);
+	}
+
+/**
+ * testMissingComponentFile method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingComponentFile() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingComponentFile', array('className' => 'PostsController', 'component' => 'Sidebox', 'file' => 'sidebox.php'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Component File<\/h2>/', $result);
+		$this->assertPattern('/Create the class <em>SideboxComponent<\/em> in file:/', $result);
+		$this->assertPattern('/(\/|\\\)sidebox.php/', $result);
+	}
+
+/**
+ * testMissingComponentClass method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingComponentClass() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingComponentClass', array('className' => 'PostsController', 'component' => 'Sidebox', 'file' => 'sidebox.php'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Component Class<\/h2>/', $result);
+		$this->assertPattern('/Create the class <em>SideboxComponent<\/em> in file:/', $result);
+		$this->assertPattern('/(\/|\\\)sidebox.php/', $result);
+	}
+
+/**
+ * testMissingModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingModel() {
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingModel', array('className' => 'Article', 'file' => 'article.php'));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>Missing Model<\/h2>/', $result);
+		$this->assertPattern('/<em>Article<\/em> could not be found./', $result);
+		$this->assertPattern('/(\/|\\\)article.php/', $result);
+	}
+
+/**
+ * testing that having a code => 500 in the cakeError call makes an 
+ * internal server error.
+ *
+ * @return void
+ */
+	function testThatCode500Works() {
+		Configure::write('debug', 0);
+		ob_start();
+		$TestErrorHandler = new TestErrorHandler('missingTable', array(
+			'className' => 'Article',
+			'table' => 'articles',
+			'code' => 500
+		));
+		$result = ob_get_clean();
+		$this->assertPattern('/<h2>An Internal Error Has Occurred<\/h2>/', $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/file.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/file.test.php
new file mode 100644
index 000000000..978c68c43
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/file.test.php
@@ -0,0 +1,472 @@
+<?php
+/**
+ * FileTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'File');
+
+/**
+ * FileTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class FileTest extends CakeTestCase {
+
+/**
+ * File property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $File = null;
+
+/**
+ * testBasic method
+ *
+ * @access public
+ * @return void
+ */
+	function testBasic() {
+		$file = __FILE__;
+		$this->File =& new File($file);
+
+		$result = $this->File->pwd();
+		$expecting = $file;
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->name;
+		$expecting = basename(__FILE__);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->info();
+		$expecting = array(
+			'dirname' => dirname(__FILE__), 'basename' => basename(__FILE__),
+			'extension' => 'php', 'filename' =>'file.test'
+		);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->ext();
+		$expecting = 'php';
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->name();
+		$expecting = 'file.test';
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->md5();
+		$expecting = md5_file($file);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->md5(true);
+		$expecting = md5_file($file);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->size();
+		$expecting = filesize($file);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->owner();
+		$expecting = fileowner($file);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->group();
+		$expecting = filegroup($file);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->Folder();
+		$this->assertIsA($result, 'Folder');
+
+		$this->skipIf(DIRECTORY_SEPARATOR === '\\', '%s File permissions tests not supported on Windows');
+		$result = $this->File->perms();
+		$expecting = '0644';
+		$this->assertEqual($result, $expecting);
+	}
+
+/**
+ * testRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRead() {
+		$file = __FILE__;
+		$this->File =& new File($file);
+
+		$result = $this->File->read();
+		$expecting = file_get_contents(__FILE__);
+		$this->assertEqual($result, $expecting);
+		$this->assertTrue(!is_resource($this->File->handle));
+
+		$this->File->lock = true;
+		$result = $this->File->read();
+		$expecting = file_get_contents(__FILE__);
+		$this->assertEqual($result, trim($expecting));
+		$this->File->lock = null;
+
+		$data = $expecting;
+		$expecting = substr($data, 0, 3);
+		$result = $this->File->read(3);
+		$this->assertEqual($result, $expecting);
+		$this->assertTrue(is_resource($this->File->handle));
+
+		$expecting = substr($data, 3, 3);
+		$result = $this->File->read(3);
+		$this->assertEqual($result, $expecting);
+	}
+
+/**
+ * testOffset method
+ *
+ * @access public
+ * @return void
+ */
+	function testOffset() {
+		$this->File->close();
+
+		$result = $this->File->offset();
+		$this->assertFalse($result);
+
+		$this->assertFalse(is_resource($this->File->handle));
+		$success = $this->File->offset(0);
+		$this->assertTrue($success);
+		$this->assertTrue(is_resource($this->File->handle));
+
+		$result = $this->File->offset();
+		$expecting = 0;
+		$this->assertIdentical($result, $expecting);
+
+		$data = file_get_contents(__FILE__);
+		$success = $this->File->offset(5);
+		$expecting = substr($data, 5, 3);
+		$result = $this->File->read(3);
+		$this->assertTrue($success);
+		$this->assertEqual($result, $expecting);
+
+		$result = $this->File->offset();
+		$expecting = 5+3;
+		$this->assertIdentical($result, $expecting);
+	}
+
+/**
+ * testOpen method
+ *
+ * @access public
+ * @return void
+ */
+	function testOpen() {
+		$this->File->handle = null;
+
+		$r = $this->File->open();
+		$this->assertTrue(is_resource($this->File->handle));
+		$this->assertTrue($r);
+
+		$handle = $this->File->handle;
+		$r = $this->File->open();
+		$this->assertTrue($r);
+		$this->assertTrue($handle === $this->File->handle);
+		$this->assertTrue(is_resource($this->File->handle));
+
+		$r = $this->File->open('r', true);
+		$this->assertTrue($r);
+		$this->assertFalse($handle === $this->File->handle);
+		$this->assertTrue(is_resource($this->File->handle));
+	}
+
+/**
+ * testClose method
+ *
+ * @access public
+ * @return void
+ */
+	function testClose() {
+		$this->File->handle = null;
+		$this->assertFalse(is_resource($this->File->handle));
+		$this->assertTrue($this->File->close());
+		$this->assertFalse(is_resource($this->File->handle));
+
+		$this->File->handle = fopen(__FILE__, 'r');
+		$this->assertTrue(is_resource($this->File->handle));
+		$this->assertTrue($this->File->close());
+		$this->assertFalse(is_resource($this->File->handle));
+	}
+
+/**
+ * testCreate method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreate() {
+		$tmpFile = TMP.'tests'.DS.'cakephp.file.test.tmp';
+		$File =& new File($tmpFile, true, 0777);
+		$this->assertTrue($File->exists());
+	}
+
+/**
+ * testOpeningNonExistantFileCreatesIt method
+ *
+ * @access public
+ * @return void
+ */
+	function testOpeningNonExistantFileCreatesIt() {
+		$someFile =& new File(TMP . 'some_file.txt', false);
+		$this->assertTrue($someFile->open());
+		$this->assertEqual($someFile->read(), '');
+		$someFile->close();
+		$someFile->delete();
+	}
+
+/**
+ * testPrepare method
+ *
+ * @access public
+ * @return void
+ */
+	function testPrepare() {
+		$string = "some\nvery\ncool\r\nteststring here\n\n\nfor\r\r\n\n\r\n\nhere";
+		if (DS == '\\') {
+			$expected = "some\r\nvery\r\ncool\r\nteststring here\r\n\r\n\r\n";
+			$expected .= "for\r\n\r\n\r\n\r\n\r\nhere";
+		} else {
+			$expected = "some\nvery\ncool\nteststring here\n\n\nfor\n\n\n\n\nhere";
+		}
+		$this->assertIdentical(File::prepare($string), $expected);
+
+		$expected = "some\r\nvery\r\ncool\r\nteststring here\r\n\r\n\r\n";
+		$expected .= "for\r\n\r\n\r\n\r\n\r\nhere";
+		$this->assertIdentical(File::prepare($string, true), $expected);
+	}
+
+/**
+ * testReadable method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadable() {
+		$someFile =& new File(TMP . 'some_file.txt', false);
+		$this->assertTrue($someFile->open());
+		$this->assertTrue($someFile->readable());
+		$someFile->close();
+		$someFile->delete();
+	}
+
+/**
+ * testWritable method
+ *
+ * @access public
+ * @return void
+ */
+	function testWritable() {
+		$someFile =& new File(TMP . 'some_file.txt', false);
+		$this->assertTrue($someFile->open());
+		$this->assertTrue($someFile->writable());
+		$someFile->close();
+		$someFile->delete();
+	}
+
+/**
+ * testExecutable method
+ *
+ * @access public
+ * @return void
+ */
+	function testExecutable() {
+		$someFile =& new File(TMP . 'some_file.txt', false);
+		$this->assertTrue($someFile->open());
+		$this->assertFalse($someFile->executable());
+		$someFile->close();
+		$someFile->delete();
+	}
+
+/**
+ * testLastAccess method
+ *
+ * @access public
+ * @return void
+ */
+	function testLastAccess() {
+		$someFile =& new File(TMP . 'some_file.txt', false);
+		$this->assertFalse($someFile->lastAccess());
+		$this->assertTrue($someFile->open());
+		$this->assertEqual($someFile->lastAccess(), time());
+		$someFile->close();
+		$someFile->delete();
+	}
+
+/**
+ * testLastChange method
+ *
+ * @access public
+ * @return void
+ */
+	function testLastChange() {
+		$someFile =& new File(TMP . 'some_file.txt', false);
+		$this->assertFalse($someFile->lastChange());
+		$this->assertTrue($someFile->open('r+'));
+		$this->assertEqual($someFile->lastChange(), time());
+		$someFile->write('something');
+		$this->assertEqual($someFile->lastChange(), time());
+		$someFile->close();
+		$someFile->delete();
+	}
+
+/**
+ * testWrite method
+ *
+ * @access public
+ * @return void
+ */
+	function testWrite() {
+		if (!$tmpFile = $this->_getTmpFile()) {
+			return false;
+		};
+		if (file_exists($tmpFile)) {
+			unlink($tmpFile);
+		}
+
+		$TmpFile =& new File($tmpFile);
+		$this->assertFalse(file_exists($tmpFile));
+		$this->assertFalse(is_resource($TmpFile->handle));
+
+		$testData = array('CakePHP\'s', ' test suite', ' was here ...', '');
+		foreach ($testData as $data) {
+			$r = $TmpFile->write($data);
+			$this->assertTrue($r);
+			$this->assertTrue(file_exists($tmpFile));
+			$this->assertEqual($data, file_get_contents($tmpFile));
+			$this->assertTrue(is_resource($TmpFile->handle));
+			$TmpFile->close();
+
+		}
+		unlink($tmpFile);
+	}
+
+/**
+ * testAppend method
+ *
+ * @access public
+ * @return void
+ */
+	function testAppend() {
+		if (!$tmpFile = $this->_getTmpFile()) {
+			return false;
+		};
+		if (file_exists($tmpFile)) {
+			unlink($tmpFile);
+		}
+
+		$TmpFile =& new File($tmpFile);
+		$this->assertFalse(file_exists($tmpFile));
+
+		$fragments = array('CakePHP\'s', ' test suite', ' was here ...', '');
+		$data = null;
+		foreach ($fragments as $fragment) {
+			$r = $TmpFile->append($fragment);
+			$this->assertTrue($r);
+			$this->assertTrue(file_exists($tmpFile));
+			$data = $data.$fragment;
+			$this->assertEqual($data, file_get_contents($tmpFile));
+			$TmpFile->close();
+		}
+	}
+
+/**
+ * testDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testDelete() {
+		if (!$tmpFile = $this->_getTmpFile()) {
+			return false;
+		};
+
+		if (!file_exists($tmpFile)) {
+			touch($tmpFile);
+		}
+		$TmpFile =& new File($tmpFile);
+		$this->assertTrue(file_exists($tmpFile));
+		$result = $TmpFile->delete();
+		$this->assertTrue($result);
+		$this->assertFalse(file_exists($tmpFile));
+
+		$TmpFile =& new File('/this/does/not/exist');
+		$result = $TmpFile->delete();
+		$this->assertFalse($result);
+	}
+
+/**
+ * testCopy method
+ *
+ * @access public
+ * @return void
+ */
+	function testCopy() {
+		$dest = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
+		$file = __FILE__;
+		$this->File =& new File($file);
+		$result = $this->File->copy($dest);
+		$this->assertTrue($result);
+
+		$result = $this->File->copy($dest, true);
+		$this->assertTrue($result);
+
+		$result = $this->File->copy($dest, false);
+		$this->assertFalse($result);
+
+		$this->File->close();
+		unlink($dest);
+
+		$TmpFile =& new File('/this/does/not/exist');
+		$result = $TmpFile->copy($dest);
+		$this->assertFalse($result);
+
+		$TmpFile->close();
+	}
+
+/**
+ * getTmpFile method
+ *
+ * @param bool $paintSkip
+ * @access protected
+ * @return void
+ */
+	function _getTmpFile($paintSkip = true) {
+		$tmpFile = TMP . 'tests' . DS . 'cakephp.file.test.tmp';
+		if (is_writable(dirname($tmpFile)) && (!file_exists($tmpFile) || is_writable($tmpFile))) {
+			return $tmpFile;
+		};
+
+		if ($paintSkip) {
+			$caller = 'test';
+			if (function_exists('debug_backtrace')) {
+				$trace = debug_backtrace();
+				$caller = $trace[1]['function'] . '()';
+			}
+			$assertLine = new SimpleStackTrace(array(__FUNCTION__));
+			$assertLine = $assertLine->traceMethod();
+			$shortPath = substr($tmpFile, strlen(ROOT));
+
+			$message = '[FileTest] Skipping %s because "%s" not writeable!';
+			$message = sprintf(__($message, true), $caller, $shortPath) . $assertLine;
+			$this->_reporter->paintSkip($message);
+		}
+		return false;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/folder.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/folder.test.php
new file mode 100644
index 000000000..3b214642a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/folder.test.php
@@ -0,0 +1,794 @@
+<?php
+/**
+ * FolderTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'File');
+
+/**
+ * FolderTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class FolderTest extends CakeTestCase {
+
+/**
+ * testBasic method
+ *
+ * @access public
+ * @return void
+ */
+	function testBasic() {
+		$path = dirname(__FILE__);
+		$Folder =& new Folder($path);
+
+		$result = $Folder->pwd();
+		$this->assertEqual($result, $path);
+
+		$result = Folder::addPathElement($path, 'test');
+		$expected = $path . DS . 'test';
+		$this->assertEqual($result, $expected);
+
+		$result = $Folder->cd(ROOT);
+		$expected = ROOT;
+		$this->assertEqual($result, $expected);
+
+		$result = $Folder->cd(ROOT . DS . 'non-existent');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testInPath method
+ *
+ * @access public
+ * @return void
+ */
+	function testInPath() {
+		$path = dirname(dirname(__FILE__));
+		$inside = dirname($path) . DS;
+
+		$Folder =& new Folder($path);
+
+		$result = $Folder->pwd();
+		$this->assertEqual($result, $path);
+
+		$result = Folder::isSlashTerm($inside);
+		$this->assertTrue($result);
+
+		$result = $Folder->realpath('tests/');
+		$this->assertEqual($result, $path . DS .'tests' . DS);
+
+		$result = $Folder->inPath('tests' . DS);
+		$this->assertTrue($result);
+
+		$result = $Folder->inPath(DS . 'non-existing' . $inside);
+		$this->assertFalse($result);
+	}
+
+/**
+ * test creation of single and mulitple paths.
+ *
+ * @return void
+ */
+	function testCreation() {
+		$folder =& new Folder(TMP . 'tests');
+		$result = $folder->create(TMP . 'tests' . DS . 'first' . DS . 'second' . DS . 'third');
+		$this->assertTrue($result);
+
+		rmdir(TMP . 'tests' . DS . 'first' . DS . 'second' . DS . 'third');
+		rmdir(TMP . 'tests' . DS . 'first' . DS . 'second');
+		rmdir(TMP . 'tests' . DS . 'first');
+
+		$folder =& new Folder(TMP . 'tests');
+		$result = $folder->create(TMP . 'tests' . DS . 'first');
+		$this->assertTrue($result);
+		rmdir(TMP . 'tests' . DS . 'first');
+	}
+
+/**
+ * test that creation of folders with trailing ds works
+ *
+ * @return void
+ */
+	function testCreateWithTrailingDs() {
+		$folder =& new Folder(TMP);
+		$path = TMP . 'tests' . DS . 'trailing' . DS . 'dir' . DS;
+		$result = $folder->create($path);
+		$this->assertTrue($result);
+
+		$this->assertTrue(is_dir($path), 'Folder was not made');
+
+		$folder =& new Folder(TMP . 'tests' . DS . 'trailing');
+		$this->assertTrue($folder->delete());
+	}
+
+/**
+ * test recurisve directory create failure.
+ *
+ * @return void
+ */
+	function testRecursiveCreateFailure() {
+		if ($this->skipIf(DS == '\\', 'Cant perform operations using permissions on windows. %s')) {
+			return;
+		}
+		$path = TMP . 'tests' . DS . 'one';
+		mkdir($path);
+		chmod($path, '0444');
+
+		$this->expectError();
+
+		$folder =& new Folder($path);
+		$result = $folder->create($path . DS . 'two' . DS . 'three');
+		$this->assertFalse($result);
+
+		chmod($path, '0777');
+		rmdir($path);
+	}
+/**
+ * testOperations method
+ *
+ * @access public
+ * @return void
+ */
+	function testOperations() {
+		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'console' . DS . 'templates' . DS . 'skel';
+		$Folder =& new Folder($path);
+
+		$result = is_dir($Folder->pwd());
+		$this->assertTrue($result);
+
+		$new = TMP . 'test_folder_new';
+		$result = $Folder->create($new);
+		$this->assertTrue($result);
+
+		$copy = TMP . 'test_folder_copy';
+		$result = $Folder->copy($copy);
+		$this->assertTrue($result);
+
+		$copy = TMP . 'test_folder_copy';
+		$result = $Folder->copy($copy);
+		$this->assertTrue($result);
+
+		$copy = TMP . 'test_folder_copy';
+		$result = $Folder->chmod($copy, 0755, false);
+		$this->assertTrue($result);
+
+		$result = $Folder->cd($copy);
+		$this->assertTrue($result);
+
+		$mv = TMP . 'test_folder_mv';
+		$result = $Folder->move($mv);
+		$this->assertTrue($result);
+
+		$mv = TMP . 'test_folder_mv_2';
+		$result = $Folder->move($mv);
+		$this->assertTrue($result);
+
+		$result = $Folder->delete($new);
+		$this->assertTrue($result);
+
+		$result = $Folder->delete($mv);
+		$this->assertTrue($result);
+
+		$result = $Folder->delete($mv);
+		$this->assertTrue($result);
+
+		$new = APP . 'index.php';
+		$result = $Folder->create($new);
+		$this->assertFalse($result);
+
+		$expected = $new . ' is a file';
+		$result = array_pop($Folder->errors());
+		$this->assertEqual($result, $expected);
+
+		$new = TMP . 'test_folder_new';
+		$result = $Folder->create($new);
+		$this->assertTrue($result);
+
+		$result = $Folder->cd($new);
+		$this->assertTrue($result);
+
+		$result = $Folder->delete();
+		$this->assertTrue($result);
+
+		$Folder =& new Folder('non-existent');
+		$result = $Folder->pwd();
+		$this->assertNull($result);
+	}
+
+/**
+ * testChmod method
+ *
+ * @return void
+ * @access public
+ */
+	function testChmod() {
+		$this->skipIf(DIRECTORY_SEPARATOR === '\\', '%s Folder permissions tests not supported on Windows');
+
+		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'console' . DS . 'templates' . DS . 'skel';
+		$Folder =& new Folder($path);
+
+		$subdir = 'test_folder_new';
+		$new = TMP . $subdir;
+
+		$this->assertTrue($Folder->create($new));
+		$this->assertTrue($Folder->create($new . DS . 'test1'));
+		$this->assertTrue($Folder->create($new . DS . 'test2'));
+
+		$filePath = $new . DS . 'test1.php';
+		$File =& new File($filePath);
+		$this->assertTrue($File->create());
+		$copy = TMP . 'test_folder_copy';
+
+		$this->assertTrue($Folder->chmod($new, 0777, true));
+		$this->assertEqual($File->perms(), '0777');
+
+		$Folder->delete($new);
+	}
+
+/**
+ * testRealPathForWebroot method
+ *
+ * @access public
+ * @return void
+ */
+	function testRealPathForWebroot() {
+		$Folder = new Folder('files/');
+		$this->assertEqual(realpath('files/'), $Folder->path);
+	}
+
+/**
+ * testZeroAsDirectory method
+ *
+ * @access public
+ * @return void
+ */
+	function testZeroAsDirectory() {
+		$Folder =& new Folder(TMP);
+		$new = TMP . '0';
+		$this->assertTrue($Folder->create($new));
+
+		$result = $Folder->read(true, true);
+		$expected = array('0', 'cache', 'logs', 'sessions', 'tests');
+		$this->assertEqual($expected, $result[0]);
+
+		$result = $Folder->read(true, array('.', '..', 'logs', '.svn'));
+		$expected = array('0', 'cache', 'sessions', 'tests');
+		$this->assertEqual($expected, $result[0]);
+
+		$result = $Folder->delete($new);
+		$this->assertTrue($result);
+	}
+
+/**
+ * test Adding path elements to a path
+ *
+ * @return void
+ */
+	function testAddPathElement() {
+		$result = Folder::addPathElement(DS . 'some' . DS . 'dir', 'another_path');
+		$this->assertEqual($result, DS . 'some' . DS . 'dir' . DS . 'another_path');
+
+		$result = Folder::addPathElement(DS . 'some' . DS . 'dir' . DS, 'another_path');
+		$this->assertEqual($result, DS . 'some' . DS . 'dir' . DS . 'another_path');
+	}
+/**
+ * testFolderRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testFolderRead() {
+		$Folder =& new Folder(TMP);
+
+		$expected = array('cache', 'logs', 'sessions', 'tests');
+		$result = $Folder->read(true, true);
+		$this->assertEqual($result[0], $expected);
+
+		$Folder->path = TMP . DS . 'non-existent';
+		$expected = array(array(), array());
+		$result = $Folder->read(true, true);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFolderTree method
+ *
+ * @access public
+ * @return void
+ */
+	function testFolderTree() {
+		$Folder =& new Folder();
+		$expected = array(
+			array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding'
+			),
+			array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0080_00ff.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0100_017f.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0180_024F.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0250_02af.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0370_03ff.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0400_04ff.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0500_052f.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '0530_058f.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1e00_1eff.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '1f00_1fff.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2100_214f.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2150_218f.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2460_24ff.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c00_2c5f.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c60_2c7f.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . '2c80_2cff.php',
+				TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'unicode' .  DS . 'casefolding' . DS . 'ff00_ffef.php'
+			)
+		);
+
+		$result = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false);
+		$this->assertIdentical(array_diff($expected[0], $result[0]), array());
+		$this->assertIdentical(array_diff($result[0], $expected[0]), array());
+
+		$result = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false, 'dir');
+		$this->assertIdentical(array_diff($expected[0], $result), array());
+		$this->assertIdentical(array_diff($result, $expected[0]), array());
+
+		$result = $Folder->tree(TEST_CAKE_CORE_INCLUDE_PATH . 'config', false, 'files');
+		$this->assertIdentical(array_diff($expected[1], $result), array());
+		$this->assertIdentical(array_diff($result, $expected[1]), array());
+	}
+
+/**
+ * testWindowsPath method
+ *
+ * @access public
+ * @return void
+ */
+	function testWindowsPath() {
+		$this->assertFalse(Folder::isWindowsPath('0:\\cake\\is\\awesome'));
+		$this->assertTrue(Folder::isWindowsPath('C:\\cake\\is\\awesome'));
+		$this->assertTrue(Folder::isWindowsPath('d:\\cake\\is\\awesome'));
+		$this->assertTrue(Folder::isWindowsPath('\\\\vmware-host\\Shared Folders\\file'));
+	}
+
+/**
+ * testIsAbsolute method
+ *
+ * @access public
+ * @return void
+ */
+	function testIsAbsolute() {
+		$this->assertFalse(Folder::isAbsolute('path/to/file'));
+		$this->assertFalse(Folder::isAbsolute('cake/'));
+		$this->assertFalse(Folder::isAbsolute('path\\to\\file'));
+		$this->assertFalse(Folder::isAbsolute('0:\\path\\to\\file'));
+		$this->assertFalse(Folder::isAbsolute('\\path/to/file'));
+		$this->assertFalse(Folder::isAbsolute('\\path\\to\\file'));
+
+		$this->assertTrue(Folder::isAbsolute('/usr/local'));
+		$this->assertTrue(Folder::isAbsolute('//path/to/file'));
+		$this->assertTrue(Folder::isAbsolute('C:\\cake'));
+		$this->assertTrue(Folder::isAbsolute('C:\\path\\to\\file'));
+		$this->assertTrue(Folder::isAbsolute('d:\\path\\to\\file'));
+		$this->assertTrue(Folder::isAbsolute('\\\\vmware-host\\Shared Folders\\file'));
+	}
+
+/**
+ * testIsSlashTerm method
+ *
+ * @access public
+ * @return void
+ */
+	function testIsSlashTerm() {
+		$this->assertFalse(Folder::isSlashTerm('cake'));
+
+		$this->assertTrue(Folder::isSlashTerm('C:\\cake\\'));
+		$this->assertTrue(Folder::isSlashTerm('/usr/local/'));
+	}
+
+/**
+ * testStatic method
+ *
+ * @access public
+ * @return void
+ */
+	function testSlashTerm() {
+		$result = Folder::slashTerm('/path/to/file');
+		$this->assertEqual($result, '/path/to/file/');
+	}
+
+/**
+ * testNormalizePath method
+ *
+ * @access public
+ * @return void
+ */
+	function testNormalizePath() {
+		$path = '/path/to/file';
+		$result = Folder::normalizePath($path);
+		$this->assertEqual($result, '/');
+
+		$path = '\\path\\\to\\\file';
+		$result = Folder::normalizePath($path);
+		$this->assertEqual($result, '/');
+
+		$path = 'C:\\path\\to\\file';
+		$result = Folder::normalizePath($path);
+		$this->assertEqual($result, '\\');
+	}
+
+/**
+ * correctSlashFor method
+ *
+ * @access public
+ * @return void
+ */
+	function testCorrectSlashFor() {
+		$path = '/path/to/file';
+		$result = Folder::correctSlashFor($path);
+		$this->assertEqual($result, '/');
+
+		$path = '\\path\\to\\file';
+		$result = Folder::correctSlashFor($path);
+		$this->assertEqual($result, '/');
+
+		$path = 'C:\\path\to\\file';
+		$result = Folder::correctSlashFor($path);
+		$this->assertEqual($result, '\\');
+	}
+
+/**
+ * testInCakePath method
+ *
+ * @access public
+ * @return void
+ */
+	function testInCakePath() {
+		$Folder =& new Folder();
+		$Folder->cd(ROOT);
+		$path = 'C:\\path\\to\\file';
+		$result = $Folder->inCakePath($path);
+		$this->assertFalse($result);
+
+		$path = ROOT;
+		$Folder->cd(ROOT);
+		$result = $Folder->inCakePath($path);
+		$this->assertFalse($result);
+
+		// WHY DOES THIS FAIL ??
+		$path = DS . 'cake' . DS . 'config';
+		$Folder->cd(ROOT . DS . 'cake' . DS . 'config');
+		$result = $Folder->inCakePath($path);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testFind() {
+		$Folder =& new Folder();
+		$Folder->cd(TEST_CAKE_CORE_INCLUDE_PATH . 'config');
+		$result = $Folder->find();
+		$expected = array('config.php', 'paths.php');
+		$this->assertIdentical(array_diff($expected, $result), array());
+		$this->assertIdentical(array_diff($result, $expected), array());
+
+		$result = $Folder->find('.*', true);
+		$expected = array('config.php', 'paths.php');
+		$this->assertIdentical($result, $expected);
+
+		$result = $Folder->find('.*\.php');
+		$expected = array('config.php', 'paths.php');
+		$this->assertIdentical(array_diff($expected, $result), array());
+		$this->assertIdentical(array_diff($result, $expected), array());
+
+		$result = $Folder->find('.*\.php', true);
+		$expected = array('config.php', 'paths.php');
+		$this->assertIdentical($result, $expected);
+
+		$result = $Folder->find('.*ig\.php');
+		$expected = array('config.php');
+		$this->assertIdentical($result, $expected);
+
+		$result = $Folder->find('paths\.php');
+		$expected = array('paths.php');
+		$this->assertIdentical($result, $expected);
+
+		$Folder->cd(TMP);
+		$file = new File($Folder->pwd() . DS . 'paths.php', true);
+		$Folder->create($Folder->pwd() . DS . 'testme');
+		$Folder->cd('testme');
+		$result = $Folder->find('paths\.php');
+		$expected = array();
+		$this->assertIdentical($result, $expected);
+
+		$Folder->cd($Folder->pwd() . '/..');
+		$result = $Folder->find('paths\.php');
+		$expected = array('paths.php');
+		$this->assertIdentical($result, $expected);
+
+		$Folder->cd(TMP);
+		$Folder->delete($Folder->pwd() . DS . 'testme');
+		$file->delete();
+	}
+
+/**
+ * testFindRecursive method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindRecursive() {
+		$Folder =& new Folder();
+		$Folder->cd(TEST_CAKE_CORE_INCLUDE_PATH);
+		$result = $Folder->findRecursive('(config|paths)\.php');
+		$expected = array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php',
+			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php'
+		);
+		$this->assertIdentical(array_diff($expected, $result), array());
+		$this->assertIdentical(array_diff($result, $expected), array());
+
+		$result = $Folder->findRecursive('(config|paths)\.php', true);
+		$expected = array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'config.php',
+			TEST_CAKE_CORE_INCLUDE_PATH . 'config' . DS . 'paths.php'
+		);
+		$this->assertIdentical($result, $expected);
+
+		$Folder->cd(TMP);
+		$Folder->create($Folder->pwd() . DS . 'testme');
+		$Folder->cd('testme');
+		$File =& new File($Folder->pwd() . DS . 'paths.php');
+		$File->create();
+		$Folder->cd(TMP . 'sessions');
+		$result = $Folder->findRecursive('paths\.php');
+		$expected = array();
+		$this->assertIdentical($result, $expected);
+
+		$Folder->cd(TMP . 'testme');
+		$File =& new File($Folder->pwd() . DS . 'my.php');
+		$File->create();
+		$Folder->cd($Folder->pwd() . '/../..');
+
+		$result = $Folder->findRecursive('(paths|my)\.php');
+		$expected = array(
+			TMP . 'testme' . DS . 'my.php',
+			TMP . 'testme' . DS . 'paths.php'
+		);
+		$this->assertIdentical(array_diff($expected, $result), array());
+		$this->assertIdentical(array_diff($result, $expected), array());
+
+		$result = $Folder->findRecursive('(paths|my)\.php', true);
+		$expected = array(
+			TMP . 'testme' . DS . 'my.php',
+			TMP . 'testme' . DS . 'paths.php'
+		);
+		$this->assertIdentical($result, $expected);
+
+		$Folder->cd(TEST_CAKE_CORE_INCLUDE_PATH . 'config');
+		$Folder->cd(TMP);
+		$Folder->delete($Folder->pwd() . DS . 'testme');
+		$File->delete();
+	}
+
+/**
+ * testConstructWithNonExistantPath method
+ *
+ * @access public
+ * @return void
+ */
+	function testConstructWithNonExistantPath() {
+		$Folder =& new Folder(TMP . 'config_non_existant', true);
+		$this->assertTrue(is_dir(TMP . 'config_non_existant'));
+		$Folder->cd(TMP);
+		$Folder->delete($Folder->pwd() . 'config_non_existant');
+	}
+
+/**
+ * testDirSize method
+ *
+ * @access public
+ * @return void
+ */
+	function testDirSize() {
+		$Folder =& new Folder(TMP . 'config_non_existant', true);
+		$this->assertEqual($Folder->dirSize(), 0);
+
+		$File =& new File($Folder->pwd() . DS . 'my.php', true, 0777);
+		$File->create();
+		$File->write('something here');
+		$File->close();
+		$this->assertEqual($Folder->dirSize(), 14);
+
+		$Folder->cd(TMP);
+		$Folder->delete($Folder->pwd() . 'config_non_existant');
+	}
+
+/**
+ * testDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testDelete() {
+		$path = TMP . 'folder_delete_test';
+		$Folder =& new Folder($path, true);
+		touch(TMP . 'folder_delete_test' . DS . 'file1');
+		touch(TMP . 'folder_delete_test' . DS . 'file2');
+
+		$return = $Folder->delete();
+		$this->assertTrue($return);
+
+		$messages = $Folder->messages();
+		$errors = $Folder->errors();
+		$this->assertEqual($errors, array());
+
+		$expected = array(
+			$path . ' created',
+			$path . DS . 'file1 removed',
+			$path . DS . 'file2 removed',
+			$path . ' removed'
+		);
+		$this->assertEqual($expected, $messages);
+	}
+
+/**
+ * testCopy method
+ *
+ * Verify that directories and files are copied recursively
+ * even if the destination directory already exists.
+ * Subdirectories existing in both destination and source directory
+ * are skipped and not merged or overwritten.
+ *
+ * @return void
+ * @access public
+ * @link   https://trac.cakephp.org/ticket/6259
+ */
+	function testCopy() {
+		$path = TMP . 'folder_test';
+		$folder1 = $path . DS . 'folder1';
+		$folder2 = $folder1 . DS . 'folder2';
+		$folder3 = $path . DS . 'folder3';
+		$file1 = $folder1 . DS . 'file1.php';
+		$file2 = $folder2 . DS . 'file2.php';
+
+		new Folder($path, true);
+		new Folder($folder1, true);
+		new Folder($folder2, true);
+		new Folder($folder3, true);
+		touch($file1);
+		touch($file2);
+
+		$Folder =& new Folder($folder1);
+		$result = $Folder->copy($folder3);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($folder3 . DS . 'file1.php'));
+		$this->assertTrue(file_exists($folder3 . DS . 'folder2' . DS . 'file2.php'));
+
+		$Folder =& new Folder($folder3);
+		$Folder->delete();
+
+		$Folder =& new Folder($folder1);
+		$result = $Folder->copy($folder3);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($folder3 . DS . 'file1.php'));
+		$this->assertTrue(file_exists($folder3 . DS . 'folder2' . DS . 'file2.php'));
+
+		$Folder =& new Folder($folder3);
+		$Folder->delete();
+
+		new Folder($folder3, true);
+		new Folder($folder3 . DS . 'folder2', true);
+		file_put_contents($folder3 . DS . 'folder2' . DS . 'file2.php', 'untouched');
+
+		$Folder =& new Folder($folder1);
+		$result = $Folder->copy($folder3);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($folder3 . DS . 'file1.php'));
+		$this->assertEqual(file_get_contents($folder3 . DS . 'folder2' . DS . 'file2.php'), 'untouched');
+
+		$Folder =& new Folder($path);
+		$Folder->delete();
+	}
+
+/**
+ * testMove method
+ *
+ * Verify that directories and files are moved recursively
+ * even if the destination directory already exists.
+ * Subdirectories existing in both destination and source directory
+ * are skipped and not merged or overwritten.
+ *
+ * @return void
+ * @access public
+ * @link   https://trac.cakephp.org/ticket/6259
+ */
+	function testMove() {
+		$path = TMP . 'folder_test';
+		$folder1 = $path . DS . 'folder1';
+		$folder2 = $folder1 . DS . 'folder2';
+		$folder3 = $path . DS . 'folder3';
+		$file1 = $folder1 . DS . 'file1.php';
+		$file2 = $folder2 . DS . 'file2.php';
+
+		new Folder($path, true);
+		new Folder($folder1, true);
+		new Folder($folder2, true);
+		new Folder($folder3, true);
+		touch($file1);
+		touch($file2);
+
+		$Folder =& new Folder($folder1);
+		$result = $Folder->move($folder3);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($folder3 . DS . 'file1.php'));
+		$this->assertTrue(is_dir($folder3 . DS . 'folder2'));
+		$this->assertTrue(file_exists($folder3 . DS . 'folder2' . DS . 'file2.php'));
+		$this->assertFalse(file_exists($file1));
+		$this->assertFalse(file_exists($folder2));
+		$this->assertFalse(file_exists($file2));
+
+		$Folder =& new Folder($folder3);
+		$Folder->delete();
+
+		new Folder($folder1, true);
+		new Folder($folder2, true);
+		touch($file1);
+		touch($file2);
+
+		$Folder =& new Folder($folder1);
+		$result = $Folder->move($folder3);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($folder3 . DS . 'file1.php'));
+		$this->assertTrue(is_dir($folder3 . DS . 'folder2'));
+		$this->assertTrue(file_exists($folder3 . DS . 'folder2' . DS . 'file2.php'));
+		$this->assertFalse(file_exists($file1));
+		$this->assertFalse(file_exists($folder2));
+		$this->assertFalse(file_exists($file2));
+
+		$Folder =& new Folder($folder3);
+		$Folder->delete();
+
+		new Folder($folder1, true);
+		new Folder($folder2, true);
+		new Folder($folder3, true);
+		new Folder($folder3 . DS . 'folder2', true);
+		touch($file1);
+		touch($file2);
+		file_put_contents($folder3 . DS . 'folder2' . DS . 'file2.php', 'untouched');
+
+		$Folder =& new Folder($folder1);
+		$result = $Folder->move($folder3);
+		$this->assertTrue($result);
+		$this->assertTrue(file_exists($folder3 . DS . 'file1.php'));
+		$this->assertEqual(file_get_contents($folder3 . DS . 'folder2' . DS . 'file2.php'), 'untouched');
+		$this->assertFalse(file_exists($file1));
+		$this->assertFalse(file_exists($folder2));
+		$this->assertFalse(file_exists($file2));
+
+		$Folder =& new Folder($path);
+		$Folder->delete();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/http_socket.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/http_socket.test.php
new file mode 100644
index 000000000..ec024bc76
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/http_socket.test.php
@@ -0,0 +1,1558 @@
+<?php
+/**
+ * HttpSocketTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'HttpSocket');
+
+class TestHttpSocket extends HttpSocket {
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param mixed $uri URI (see {@link _parseUri()})
+ * @return array Current configuration settings
+ */
+	function configUri($uri = null) {
+		return parent::_configUri($uri);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param string $uri URI to parse
+ * @param mixed $base If true use default URI config, otherwise indexed array to set 'scheme', 'host', 'port', etc.
+ * @return array Parsed URI
+ */
+	function parseUri($uri = null, $base = array()) {
+		return parent::_parseUri($uri, $base);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param array $uri A $uri array, or uses $this->config if left empty
+ * @param string $uriTemplate The Uri template/format to use
+ * @return string A fully qualified URL formated according to $uriTemplate
+ */
+	function buildUri($uri = array(), $uriTemplate = '%scheme://%user:%pass@%host:%port/%path?%query#%fragment') {
+		return parent::_buildUri($uri, $uriTemplate);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param array $header Header to build
+ * @return string Header built from array
+ */
+	function buildHeader($header, $mode = 'standard') {
+		return parent::_buildHeader($header, $mode);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param string $message Message to parse
+ * @return array Parsed message (with indexed elements such as raw, status, header, body)
+ */
+	function parseResponse($message) {
+		return parent::_parseResponse($message);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param array $header Header as an indexed array (field => value)
+ * @return array Parsed header
+ */
+	function parseHeader($header) {
+		return parent::_parseHeader($header);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param mixed $query A query string to parse into an array or an array to return directly "as is"
+ * @return array The $query parsed into a possibly multi-level array. If an empty $query is given, an empty array is returned.
+ */
+	function parseQuery($query) {
+		return parent::_parseQuery($query);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param string $body A string continaing the body to decode
+ * @param mixed $encoding Can be false in case no encoding is being used, or a string representing the encoding
+ * @return mixed Array or false
+ */
+	function decodeBody($body, $encoding = 'chunked') {
+		return parent::_decodeBody($body, $encoding);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param string $body A string continaing the chunked body to decode
+ * @return mixed Array or false
+ */
+	function decodeChunkedBody($body) {
+		return parent::_decodeChunkedBody($body);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param array $request Needs to contain a 'uri' key. Should also contain a 'method' key, otherwise defaults to GET.
+ * @param string $versionToken The version token to use, defaults to HTTP/1.1
+ * @return string Request line
+ */
+	function buildRequestLine($request = array(), $versionToken = 'HTTP/1.1') {
+		return parent::_buildRequestLine($request, $versionToken);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param boolean $hex true to get them as HEX values, false otherwise
+ * @return array Escape chars
+ */
+	function tokenEscapeChars($hex = true, $chars = null) {
+		return parent::_tokenEscapeChars($hex, $chars);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param string $token Token to escape
+ * @return string Escaped token
+ */
+	function EscapeToken($token, $chars = null) {
+		return parent::_escapeToken($token, $chars);
+	}
+
+/**
+ * Convenience method for testing protected method
+ *
+ * @param string $token Token to unescape
+ * @return string Unescaped token
+ */
+	function unescapeToken($token, $chars = null) {
+		return parent::_unescapeToken($token, $chars);
+	}
+}
+
+/**
+ * HttpSocketTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class HttpSocketTest extends CakeTestCase {
+
+/**
+ * Socket property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $Socket = null;
+
+/**
+ * RequestSocket property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $RequestSocket = null;
+
+/**
+ * This function sets up a TestHttpSocket instance we are going to use for testing
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		if (!class_exists('MockHttpSocket')) {
+			Mock::generatePartial('TestHttpSocket', 'MockHttpSocket', array('read', 'write', 'connect'));
+			Mock::generatePartial('TestHttpSocket', 'MockHttpSocketRequests', array('read', 'write', 'connect', 'request'));
+		}
+
+		$this->Socket =& new MockHttpSocket();
+		$this->RequestSocket =& new MockHttpSocketRequests();
+	}
+
+/**
+ * We use this function to clean up after the test case was executed
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Socket, $this->RequestSocket);
+	}
+
+/**
+ * Test that HttpSocket::__construct does what one would expect it to do
+ *
+ * @access public
+ * @return void
+ */
+	function testConstruct() {
+		$this->Socket->reset();
+		$baseConfig = $this->Socket->config;
+		$this->Socket->expectNever('connect');
+		$this->Socket->__construct(array('host' => 'foo-bar'));
+		$baseConfig['host']	 = 'foo-bar';
+		$baseConfig['protocol'] = getprotobyname($baseConfig['protocol']);
+		$this->assertIdentical($this->Socket->config, $baseConfig);
+		$this->Socket->reset();
+		$baseConfig = $this->Socket->config;
+		$this->Socket->__construct('http://www.cakephp.org:23/');
+		$baseConfig['host']	 = 'www.cakephp.org';
+		$baseConfig['request']['uri']['host'] = 'www.cakephp.org';
+		$baseConfig['port']	 = 23;
+		$baseConfig['request']['uri']['port'] = 23;
+		$baseConfig['protocol'] = getprotobyname($baseConfig['protocol']);
+		$this->assertIdentical($this->Socket->config, $baseConfig);
+
+		$this->Socket->reset();
+		$this->Socket->__construct(array('request' => array('uri' => 'http://www.cakephp.org:23/')));
+		$this->assertIdentical($this->Socket->config, $baseConfig);
+	}
+
+/**
+ * Test that HttpSocket::configUri works properly with different types of arguments
+ *
+ * @access public
+ * @return void
+ */
+	function testConfigUri() {
+		$this->Socket->reset();
+		$r = $this->Socket->configUri('https://bob:secret@www.cakephp.org:23/?query=foo');
+		$expected = array(
+			'persistent' => false,
+			'host' 		 => 'www.cakephp.org',
+			'protocol'   => 'tcp',
+			'port' 		 => 23,
+			'timeout' 	 =>	30,
+			'request' => array(
+				'uri' => array(
+					'scheme' => 'https'
+					, 'host' => 'www.cakephp.org'
+					, 'port' => 23
+				),
+				'auth' => array(
+					'method' => 'Basic'
+					, 'user' => 'bob'
+					, 'pass' => 'secret'
+				),
+				'cookies' => array(),
+			)
+		);
+		$this->assertIdentical($this->Socket->config, $expected);
+		$this->assertIdentical($r, $expected);
+		$r = $this->Socket->configUri(array('host' => 'www.foo-bar.org'));
+		$expected['host'] = 'www.foo-bar.org';
+		$expected['request']['uri']['host'] = 'www.foo-bar.org';
+		$this->assertIdentical($this->Socket->config, $expected);
+		$this->assertIdentical($r, $expected);
+
+		$r = $this->Socket->configUri('http://www.foo.com');
+		$expected = array(
+			'persistent' => false,
+			'host' 		 => 'www.foo.com',
+			'protocol'   => 'tcp',
+			'port' 		 => 80,
+			'timeout' 	 =>	30,
+			'request' => array(
+				'uri' => array(
+					'scheme' => 'http'
+					, 'host' => 'www.foo.com'
+					, 'port' => 80
+				),
+				'auth' => array(
+					'method' => 'Basic'
+					, 'user' => null
+					, 'pass' => null
+				),
+				'cookies' => array()
+			)
+		);
+		$this->assertIdentical($this->Socket->config, $expected);
+		$this->assertIdentical($r, $expected);
+		$r = $this->Socket->configUri('/this-is-broken');
+		$this->assertIdentical($this->Socket->config, $expected);
+		$this->assertIdentical($r, false);
+		$r = $this->Socket->configUri(false);
+		$this->assertIdentical($this->Socket->config, $expected);
+		$this->assertIdentical($r, false);
+	}
+
+/**
+ * Tests that HttpSocket::request (the heart of the HttpSocket) is working properly.
+ *
+ * @access public
+ * @return void
+ */
+	function testRequest() {
+		$this->Socket->reset();
+
+		$this->Socket->reset();
+		$response = $this->Socket->request(true);
+		$this->assertFalse($response);
+
+		$tests = array(
+			0 => array(
+				'request' => 'http://www.cakephp.org/?foo=bar'
+				, 'expectation' => array(
+					'config' => array(
+						'persistent' => false
+						, 'host' => 'www.cakephp.org'
+						, 'protocol' => 'tcp'
+						, 'port' => 80
+						, 'timeout' => 30
+						, 'request' => array(
+							'uri' => array (
+								'scheme' => 'http'
+								, 'host' => 'www.cakephp.org'
+								, 'port' => 80,
+							)
+							, 'auth' => array(
+								'method' => 'Basic'
+								,'user' => null
+								,'pass' => null
+							),
+							'cookies' => array(),
+						),
+					)
+					, 'request' => array(
+						'method' => 'GET'
+						, 'uri' => array(
+							'scheme' => 'http'
+							, 'host' => 'www.cakephp.org'
+							, 'port' => 80
+							, 'user' => null
+							, 'pass' => null
+							, 'path' => '/'
+							, 'query' => array('foo' => 'bar')
+							, 'fragment' => null
+						)
+						, 'auth' => array(
+							'method' => 'Basic'
+							, 'user' => null
+							, 'pass' => null
+						)
+						, 'version' => '1.1'
+						, 'body' => ''
+						, 'line' => "GET /?foo=bar HTTP/1.1\r\n"
+						, 'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n"
+						, 'raw' => ""
+						, 'cookies' => array(),
+					)
+				)
+			)
+			, 1 => array(
+				'request' => array(
+					'uri' => array(
+						'host' => 'www.cakephp.org'
+						, 'query' => '?foo=bar'
+					)
+				)
+			)
+			, 2 => array(
+				'request' => 'www.cakephp.org/?foo=bar'
+			)
+			, 3 => array(
+				'request' => array('host' => '192.168.0.1', 'uri' => 'http://www.cakephp.org/?foo=bar')
+				, 'expectation' => array(
+					'request' => array(
+						'uri' => array('host' => 'www.cakephp.org')
+					)
+					, 'config' => array(
+						'request' => array(
+							'uri' => array('host' => 'www.cakephp.org')
+						)
+						, 'host' => '192.168.0.1'
+					)
+				)
+			)
+			, 'reset4' => array(
+				'request.uri.query' => array()
+			)
+			, 4 => array(
+				'request' => array('header' => array('Foo@woo' => 'bar-value'))
+				, 'expectation' => array(
+					'request' => array(
+						'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nFoo\"@\"woo: bar-value\r\n"
+						, 'line' => "GET / HTTP/1.1\r\n"
+					)
+				)
+			)
+			, 5 => array(
+				'request' => array('header' => array('Foo@woo' => 'bar-value', 'host' => 'foo.com'), 'uri' => 'http://www.cakephp.org/')
+				, 'expectation' => array(
+					'request' => array(
+						'header' => "Host: foo.com\r\nConnection: close\r\nUser-Agent: CakePHP\r\nFoo\"@\"woo: bar-value\r\n"
+					)
+					, 'config' => array(
+						'host' => 'www.cakephp.org'
+					)
+				)
+			)
+			, 6 => array(
+				'request' => array('header' => "Foo: bar\r\n")
+				, 'expectation' => array(
+					'request' => array(
+						'header' => "Foo: bar\r\n"
+					)
+				)
+			)
+			, 7 => array(
+				'request' => array('header' => "Foo: bar\r\n", 'uri' => 'http://www.cakephp.org/search?q=http_socket#ignore-me')
+				, 'expectation' => array(
+					'request' => array(
+						'uri' => array(
+							'path' => '/search'
+							, 'query' => array('q' => 'http_socket')
+							, 'fragment' => 'ignore-me'
+						)
+						, 'line' => "GET /search?q=http_socket HTTP/1.1\r\n"
+					)
+				)
+			)
+			, 'reset8' => array(
+				'request.uri.query' => array()
+			)
+			, 8 => array(
+				'request' => array('method' => 'POST', 'uri' => 'http://www.cakephp.org/posts/add', 'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'))
+				, 'expectation' => array(
+					'request' => array(
+						'method' => 'POST'
+						, 'uri' => array(
+							'path' => '/posts/add'
+							, 'fragment' => null
+						)
+						, 'body' => "name=HttpSocket-is-released&date=today"
+						, 'line' => "POST /posts/add HTTP/1.1\r\n"
+						, 'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 38\r\n"
+						, 'raw' => "name=HttpSocket-is-released&date=today"
+					)
+				)
+			)
+			, 9 => array(
+				'request' => array('method' => 'POST', 'uri' => 'http://www.cakephp.org:8080/posts/add', 'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'))
+				, 'expectation' => array(
+					'config' => array(
+						'port' => 8080
+						, 'request' => array(
+							'uri' => array(
+								'port' => 8080
+							)
+						)
+					)
+					, 'request' => array(
+						'uri' => array(
+							'port' => 8080
+						)
+						, 'header' => "Host: www.cakephp.org:8080\r\nConnection: close\r\nUser-Agent: CakePHP\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 38\r\n"
+					)
+				)
+			)
+			, 10 => array(
+				'request' => array('method' => 'POST', 'uri' => 'https://www.cakephp.org/posts/add', 'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'))
+				, 'expectation' => array(
+					'config' => array(
+						'port' => 443
+						, 'request' => array(
+							'uri' => array(
+								'scheme' => 'https'
+								, 'port' => 443
+							)
+						)
+					)
+					, 'request' => array(
+						'uri' => array(
+							'scheme' => 'https'
+							, 'port' => 443
+						)
+						, 'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 38\r\n"
+					)
+				)
+			)
+			, 11 => array(
+				'request' => array(
+						'method' => 'POST',
+						'uri' => 'https://www.cakephp.org/posts/add',
+						'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'),
+						'cookies' => array('foo' => array('value' => 'bar'))
+				)
+				, 'expectation' => array(
+					'request' => array(
+						'header' => "Host: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\nContent-Type: application/x-www-form-urlencoded\r\nContent-Length: 38\r\nCookie: foo=bar\r\n",
+						'cookies' => array(
+							'foo' => array('value' => 'bar'),
+						)
+					)
+				)
+			)
+		);
+
+		$expectation = array();
+		foreach ($tests as $i => $test) {
+			if (strpos($i, 'reset') === 0) {
+				foreach ($test as $path => $val) {
+					$expectation = Set::insert($expectation, $path, $val);
+				}
+				continue;
+			}
+
+			if (isset($test['expectation'])) {
+				$expectation = Set::merge($expectation, $test['expectation']);
+			}
+			$this->Socket->request($test['request']);
+
+			$raw = $expectation['request']['raw'];
+			$expectation['request']['raw'] = $expectation['request']['line'].$expectation['request']['header']."\r\n".$raw;
+
+			$r = array('config' => $this->Socket->config, 'request' => $this->Socket->request);
+			$v = $this->assertIdentical($r, $expectation, '%s in test #'.$i.' ');
+			$expectation['request']['raw'] = $raw;
+		}
+
+		$this->Socket->reset();
+		$request = array('method' => 'POST', 'uri' => 'http://www.cakephp.org/posts/add', 'body' => array('name' => 'HttpSocket-is-released', 'date' => 'today'));
+		$response = $this->Socket->request($request);
+		$this->assertIdentical($this->Socket->request['body'], "name=HttpSocket-is-released&date=today");
+
+		$request = array('uri' => '*', 'method' => 'GET');
+		$this->expectError(new PatternExpectation('/activate quirks mode/i'));
+		$response = $this->Socket->request($request);
+		$this->assertFalse($response);
+		$this->assertFalse($this->Socket->response);
+
+		$this->Socket->reset();
+		$request = array('uri' => 'htpp://www.cakephp.org/');
+		$this->Socket->setReturnValue('connect', true);
+		$this->Socket->setReturnValue('read', false);
+		$this->Socket->_mock->_call_counts['read'] = 0;
+		$number = mt_rand(0, 9999999);
+		$serverResponse = "HTTP/1.x 200 OK\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>Hello, your lucky number is " . $number . "</h1>";
+		$this->Socket->setReturnValueAt(0, 'read', $serverResponse);
+		$this->Socket->expect('write', array("GET / HTTP/1.1\r\nHost: www.cakephp.org\r\nConnection: close\r\nUser-Agent: CakePHP\r\n\r\n"));
+		$this->Socket->expectCallCount('read', 2);
+		$response = $this->Socket->request($request);
+		$this->assertIdentical($response, "<h1>Hello, your lucky number is " . $number . "</h1>");
+
+		$this->Socket->reset();
+		$serverResponse = "HTTP/1.x 200 OK\r\nSet-Cookie: foo=bar\r\nDate: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\nContent-Type: text/html\r\n\r\n<h1>This is a cookie test!</h1>";
+		unset($this->Socket->_mock->_actions->_at['read']);
+		unset($this->Socket->_mock->_return_sequence['read']);
+		$this->Socket->_mock->_call_counts['read'] = 0;
+		$this->Socket->setReturnValueAt(0, 'read', $serverResponse);
+
+		$this->Socket->connected = true;
+		$this->Socket->request($request);
+		$result = $this->Socket->response['cookies'];
+		$expect = array(
+			'foo' => array(
+				'value' => 'bar'
+			)
+		);
+		$this->assertEqual($result, $expect);
+		$this->assertEqual($this->Socket->config['request']['cookies'], $expect);
+		$this->assertFalse($this->Socket->connected);
+	}
+
+/**
+ * testUrl method
+ *
+ * @access public
+ * @return void
+ */
+	function testUrl() {
+		$this->Socket->reset(true);
+
+		$this->assertIdentical($this->Socket->url(true), false);
+
+		$url = $this->Socket->url('www.cakephp.org');
+		$this->assertIdentical($url, 'http://www.cakephp.org/');
+
+		$url = $this->Socket->url('https://www.cakephp.org/posts/add');
+		$this->assertIdentical($url, 'https://www.cakephp.org/posts/add');
+		$url = $this->Socket->url('http://www.cakephp/search?q=socket', '/%path?%query');
+		$this->assertIdentical($url, '/search?q=socket');
+
+		$this->Socket->config['request']['uri']['host'] = 'bakery.cakephp.org';
+		$url = $this->Socket->url();
+		$this->assertIdentical($url, 'http://bakery.cakephp.org/');
+
+		$this->Socket->configUri('http://www.cakephp.org');
+		$url = $this->Socket->url('/search?q=bar');
+		$this->assertIdentical($url, 'http://www.cakephp.org/search?q=bar');
+
+		$url = $this->Socket->url(array('host' => 'www.foobar.org', 'query' => array('q' => 'bar')));
+		$this->assertIdentical($url, 'http://www.foobar.org/?q=bar');
+
+		$url = $this->Socket->url(array('path' => '/supersearch', 'query' => array('q' => 'bar')));
+		$this->assertIdentical($url, 'http://www.cakephp.org/supersearch?q=bar');
+
+		$this->Socket->configUri('http://www.google.com');
+		$url = $this->Socket->url('/search?q=socket');
+		$this->assertIdentical($url, 'http://www.google.com/search?q=socket');
+
+		$url = $this->Socket->url();
+		$this->assertIdentical($url, 'http://www.google.com/');
+
+		$this->Socket->configUri('https://www.google.com');
+		$url = $this->Socket->url('/search?q=socket');
+		$this->assertIdentical($url, 'https://www.google.com/search?q=socket');
+
+		$this->Socket->reset();
+		$this->Socket->configUri('www.google.com:443');
+		$url = $this->Socket->url('/search?q=socket');
+		$this->assertIdentical($url, 'https://www.google.com/search?q=socket');
+
+		$this->Socket->reset();
+		$this->Socket->configUri('www.google.com:8080');
+		$url = $this->Socket->url('/search?q=socket');
+		$this->assertIdentical($url, 'http://www.google.com:8080/search?q=socket');
+	}
+
+/**
+ * testGet method
+ *
+ * @access public
+ * @return void
+ */
+	function testGet() {
+		$this->RequestSocket->reset();
+
+		$this->RequestSocket->expect('request', a(array('method' => 'GET', 'uri' => 'http://www.google.com/')));
+		$this->RequestSocket->get('http://www.google.com/');
+
+		$this->RequestSocket->expect('request', a(array('method' => 'GET', 'uri' => 'http://www.google.com/?foo=bar')));
+		$this->RequestSocket->get('http://www.google.com/', array('foo' => 'bar'));
+
+		$this->RequestSocket->expect('request', a(array('method' => 'GET', 'uri' => 'http://www.google.com/?foo=bar')));
+		$this->RequestSocket->get('http://www.google.com/', 'foo=bar');
+
+		$this->RequestSocket->expect('request', a(array('method' => 'GET', 'uri' => 'http://www.google.com/?foo=23&foobar=42')));
+		$this->RequestSocket->get('http://www.google.com/?foo=bar', array('foobar' => '42', 'foo' => '23'));
+
+		$this->RequestSocket->expect('request', a(array('method' => 'GET', 'uri' => 'http://www.google.com/', 'auth' => array('user' => 'foo', 'pass' => 'bar'))));
+		$this->RequestSocket->get('http://www.google.com/', null, array('auth' => array('user' => 'foo', 'pass' => 'bar')));
+	}
+
+/**
+ * test that two consecutive get() calls reset the authentication credentials.
+ *
+ * @return void
+ */
+	function testConsecutiveGetResetsAuthCredentials() {
+		$socket = new MockHttpSocket();
+		$socket->config['request']['auth'] = array(
+			'method' => 'Basic',
+			'user' => 'mark',
+			'pass' => 'secret'
+		);
+		$socket->get('http://mark:secret@example.com/test');
+		$this->assertEqual($socket->request['uri']['user'], 'mark');
+		$this->assertEqual($socket->request['uri']['pass'], 'secret');
+
+		$socket->get('/test2');
+		$this->assertEqual($socket->request['auth']['user'], 'mark');
+		$this->assertEqual($socket->request['auth']['pass'], 'secret');
+
+		$socket->get('/test3');
+		$this->assertEqual($socket->request['auth']['user'], 'mark');
+		$this->assertEqual($socket->request['auth']['pass'], 'secret');
+	}
+
+/**
+ * testPostPutDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testPostPutDelete() {
+		$this->RequestSocket->reset();
+
+		foreach (array('POST', 'PUT', 'DELETE') as $method) {
+			$this->RequestSocket->expect('request', a(array('method' => $method, 'uri' => 'http://www.google.com/', 'body' => array())));
+			$this->RequestSocket->{low($method)}('http://www.google.com/');
+
+			$this->RequestSocket->expect('request', a(array('method' => $method, 'uri' => 'http://www.google.com/', 'body' => array('Foo' => 'bar'))));
+			$this->RequestSocket->{low($method)}('http://www.google.com/', array('Foo' => 'bar'));
+
+			$this->RequestSocket->expect('request', a(array('method' => $method, 'uri' => 'http://www.google.com/', 'body' => null, 'line' => 'Hey Server')));
+			$this->RequestSocket->{low($method)}('http://www.google.com/', null, array('line' => 'Hey Server'));
+		}
+	}
+
+/**
+ * testParseResponse method
+ *
+ * @access public
+ * @return void
+ */
+	function testParseResponse() {
+		$this->Socket->reset();
+
+		$r = $this->Socket->parseResponse(array('foo' => 'bar'));
+		$this->assertIdentical($r, array('foo' => 'bar'));
+
+		$r = $this->Socket->parseResponse(true);
+		$this->assertIdentical($r, false);
+
+		$r = $this->Socket->parseResponse("HTTP Foo\r\nBar: La");
+		$this->assertIdentical($r, false);
+
+		$tests = array(
+			'simple-request' => array(
+				'response' => array(
+					'status-line' => "HTTP/1.x 200 OK\r\n",
+					'header' => "Date: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\n",
+					'body' => "<h1>Hello World</h1>\r\n<p>It's good to be html</p>"
+				)
+				, 'expectations' => array(
+					'status.http-version' => 'HTTP/1.x',
+					'status.code' => 200,
+					'status.reason-phrase' => 'OK',
+					'header' => $this->Socket->parseHeader("Date: Mon, 16 Apr 2007 04:14:16 GMT\r\nServer: CakeHttp Server\r\n"),
+					'body' => "<h1>Hello World</h1>\r\n<p>It's good to be html</p>"
+				)
+			),
+			'no-header' => array(
+				'response' => array(
+					'status-line' => "HTTP/1.x 404 OK\r\n",
+					'header' => null,
+				)
+				, 'expectations' => array(
+					'status.code' => 404,
+					'header' => array()
+				)
+			),
+			'chunked' => array(
+				'response' => array(
+					'header' => "Transfer-Encoding: chunked\r\n",
+					'body' => "19\r\nThis is a chunked message\r\n0\r\n"
+				),
+				'expectations' => array(
+					'body' => "This is a chunked message",
+					'header' => $this->Socket->parseHeader("Transfer-Encoding: chunked\r\n")
+				)
+			),
+			'enitity-header' => array(
+				'response' => array(
+					'body' => "19\r\nThis is a chunked message\r\n0\r\nFoo: Bar\r\n"
+				),
+				'expectations' => array(
+					'header' => $this->Socket->parseHeader("Transfer-Encoding: chunked\r\nFoo: Bar\r\n")
+				)
+			),
+			'enitity-header-combine' => array(
+				'response' => array(
+					'header' => "Transfer-Encoding: chunked\r\nFoo: Foobar\r\n"
+				),
+				'expectations' => array(
+					'header' => $this->Socket->parseHeader("Transfer-Encoding: chunked\r\nFoo: Foobar\r\nFoo: Bar\r\n")
+				)
+			)
+		);
+
+		$testResponse = array();
+		$expectations = array();
+
+		foreach ($tests as $name => $test) {
+
+			$testResponse = array_merge($testResponse, $test['response']);
+			$testResponse['response'] = $testResponse['status-line'].$testResponse['header']."\r\n".$testResponse['body'];
+			$r = $this->Socket->parseResponse($testResponse['response']);
+			$expectations = array_merge($expectations, $test['expectations']);
+
+			foreach ($expectations as $property => $expectedVal) {
+				$val = Set::extract($r, $property);
+				$this->assertIdentical($val, $expectedVal, 'Test "'.$name.'": response.'.$property.' - %s');
+			}
+
+			foreach (array('status-line', 'header', 'body', 'response') as $field) {
+				$this->assertIdentical($r['raw'][$field], $testResponse[$field], 'Test response.raw.'.$field.': %s');
+			}
+		}
+	}
+
+/**
+ * testDecodeBody method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecodeBody() {
+		$this->Socket->reset();
+
+		$r = $this->Socket->decodeBody(true);
+		$this->assertIdentical($r, false);
+
+		$r = $this->Socket->decodeBody('Foobar', false);
+		$this->assertIdentical($r, array('body' => 'Foobar', 'header' => false));
+
+		$encodings = array(
+			'chunked' => array(
+				'encoded' => "19\r\nThis is a chunked message\r\n0\r\n",
+				'decoded' => array('body' => "This is a chunked message", 'header' => false)
+			),
+			'foo-coded' => array(
+				'encoded' => '!Foobar!',
+				'decoded' => array('body' => '!Foobar!', 'header' => false),
+				'error' => new PatternExpectation('/unknown encoding: foo-coded/i')
+			)
+		);
+
+		foreach ($encodings as $encoding => $sample) {
+			if (isset($sample['error'])) {
+				$this->expectError($sample['error']);
+			}
+
+			$r = $this->Socket->decodeBody($sample['encoded'], $encoding);
+			$this->assertIdentical($r, $sample['decoded']);
+
+			if (isset($sample['error'])) {
+				$this->Socket->quirksMode = true;
+				$r = $this->Socket->decodeBody($sample['encoded'], $encoding);
+				$this->assertIdentical($r, $sample['decoded']);
+				$this->Socket->quirksMode = false;
+			}
+		}
+	}
+
+/**
+ * testDecodeChunkedBody method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecodeChunkedBody() {
+		$this->Socket->reset();
+
+		$r = $this->Socket->decodeChunkedBody(true);
+		$this->assertIdentical($r, false);
+
+		$encoded = "19\r\nThis is a chunked message\r\n0\r\n";
+		$decoded = "This is a chunked message";
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r['body'], $decoded);
+		$this->assertIdentical($r['header'], false);
+
+		$encoded = "19 \r\nThis is a chunked message\r\n0\r\n";
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r['body'], $decoded);
+
+		$encoded = "19\r\nThis is a chunked message\r\nE\r\n\nThat is cool\n\r\n0\r\n";
+		$decoded = "This is a chunked message\nThat is cool\n";
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r['body'], $decoded);
+		$this->assertIdentical($r['header'], false);
+
+		$encoded = "19\r\nThis is a chunked message\r\nE;foo-chunk=5\r\n\nThat is cool\n\r\n0\r\n";
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r['body'], $decoded);
+		$this->assertIdentical($r['header'], false);
+
+		$encoded = "19\r\nThis is a chunked message\r\nE\r\n\nThat is cool\n\r\n0\r\nfoo-header: bar\r\ncake: PHP\r\n\r\n";
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r['body'], $decoded);
+		$this->assertIdentical($r['header'], array('Foo-Header' => 'bar', 'Cake' => 'PHP'));
+
+		$encoded = "19\r\nThis is a chunked message\r\nE\r\n\nThat is cool\n\r\n";
+		$this->expectError(new PatternExpectation('/activate quirks mode/i'));
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r, false);
+
+		$this->Socket->quirksMode = true;
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r['body'], $decoded);
+		$this->assertIdentical($r['header'], false);
+
+		$encoded = "19\r\nThis is a chunked message\r\nE\r\n\nThat is cool\n\r\nfoo-header: bar\r\ncake: PHP\r\n\r\n";
+		$r = $this->Socket->decodeChunkedBody($encoded);
+		$this->assertIdentical($r['body'], $decoded);
+		$this->assertIdentical($r['header'], array('Foo-Header' => 'bar', 'Cake' => 'PHP'));
+	}
+
+/**
+ * testBuildRequestLine method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildRequestLine() {
+		$this->Socket->reset();
+
+		$this->expectError(new PatternExpectation('/activate quirks mode/i'));
+		$r = $this->Socket->buildRequestLine('Foo');
+		$this->assertIdentical($r, false);
+
+		$this->Socket->quirksMode = true;
+		$r = $this->Socket->buildRequestLine('Foo');
+		$this->assertIdentical($r, 'Foo');
+		$this->Socket->quirksMode = false;
+
+		$r = $this->Socket->buildRequestLine(true);
+		$this->assertIdentical($r, false);
+
+		$r = $this->Socket->buildRequestLine(array('foo' => 'bar', 'method' => 'foo'));
+		$this->assertIdentical($r, false);
+
+		$r = $this->Socket->buildRequestLine(array('method' => 'GET', 'uri' => 'http://www.cakephp.org/search?q=socket'));
+		$this->assertIdentical($r, "GET /search?q=socket HTTP/1.1\r\n");
+
+		$request = array(
+			'method' => 'GET',
+			'uri' => array(
+				'path' => '/search',
+				'query' => array('q' => 'socket')
+			)
+		);
+		$r = $this->Socket->buildRequestLine($request);
+		$this->assertIdentical($r, "GET /search?q=socket HTTP/1.1\r\n");
+
+		unset($request['method']);
+		$r = $this->Socket->buildRequestLine($request);
+		$this->assertIdentical($r, "GET /search?q=socket HTTP/1.1\r\n");
+
+		$r = $this->Socket->buildRequestLine($request, 'CAKE-HTTP/0.1');
+		$this->assertIdentical($r, "GET /search?q=socket CAKE-HTTP/0.1\r\n");
+
+		$request = array('method' => 'OPTIONS', 'uri' => '*');
+		$r = $this->Socket->buildRequestLine($request);
+		$this->assertIdentical($r, "OPTIONS * HTTP/1.1\r\n");
+
+		$request['method'] = 'GET';
+		$this->expectError(new PatternExpectation('/activate quirks mode/i'));
+		$r = $this->Socket->buildRequestLine($request);
+		$this->assertIdentical($r, false);
+
+		$this->expectError(new PatternExpectation('/activate quirks mode/i'));
+		$r = $this->Socket->buildRequestLine("GET * HTTP/1.1\r\n");
+		$this->assertIdentical($r, false);
+
+		$this->Socket->quirksMode = true;
+		$r = $this->Socket->buildRequestLine($request);
+		$this->assertIdentical($r,  "GET * HTTP/1.1\r\n");
+
+		$r = $this->Socket->buildRequestLine("GET * HTTP/1.1\r\n");
+		$this->assertIdentical($r, "GET * HTTP/1.1\r\n");
+	}
+
+/**
+ * Asserts that HttpSocket::parseUri is working properly
+ *
+ * @access public
+ * @return void
+ */
+	function testParseUri() {
+		$this->Socket->reset();
+
+		$uri = $this->Socket->parseUri(array('invalid' => 'uri-string'));
+		$this->assertIdentical($uri, false);
+
+		$uri = $this->Socket->parseUri(array('invalid' => 'uri-string'), array('host' => 'somehost'));
+		$this->assertIdentical($uri, array('host' => 'somehost', 'invalid' => 'uri-string'));
+
+		$uri = $this->Socket->parseUri(false);
+		$this->assertIdentical($uri, false);
+
+		$uri = $this->Socket->parseUri('/my-cool-path');
+		$this->assertIdentical($uri, array('path' => '/my-cool-path'));
+
+		$uri = $this->Socket->parseUri('http://bob:foo123@www.cakephp.org:40/search?q=dessert#results');
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.cakephp.org',
+			'port' => 40,
+			'user' => 'bob',
+			'pass' => 'foo123',
+			'path' => '/search',
+			'query' => array('q' => 'dessert'),
+			'fragment' => 'results'
+		));
+
+		$uri = $this->Socket->parseUri('http://www.cakephp.org/');
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.cakephp.org',
+			'path' => '/',
+		));
+
+		$uri = $this->Socket->parseUri('http://www.cakephp.org', true);
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.cakephp.org',
+			'port' => 80,
+			'user' => null,
+			'pass' => null,
+			'path' => '/',
+			'query' => array(),
+			'fragment' => null
+		));
+
+		$uri = $this->Socket->parseUri('https://www.cakephp.org', true);
+		$this->assertIdentical($uri, array(
+			'scheme' => 'https',
+			'host' => 'www.cakephp.org',
+			'port' => 443,
+			'user' => null,
+			'pass' => null,
+			'path' => '/',
+			'query' => array(),
+			'fragment' => null
+		));
+
+		$uri = $this->Socket->parseUri('www.cakephp.org:443/query?foo', true);
+		$this->assertIdentical($uri, array(
+			'scheme' => 'https',
+			'host' => 'www.cakephp.org',
+			'port' => 443,
+			'user' => null,
+			'pass' => null,
+			'path' => '/query',
+			'query' => array('foo' => ""),
+			'fragment' => null
+		));
+
+		$uri = $this->Socket->parseUri('http://www.cakephp.org', array('host' => 'piephp.org', 'user' => 'bob', 'fragment' => 'results'));
+		$this->assertIdentical($uri, array(
+			'host' => 'www.cakephp.org',
+			'user' => 'bob',
+			'fragment' => 'results',
+			'scheme' => 'http'
+		));
+
+		$uri = $this->Socket->parseUri('https://www.cakephp.org', array('scheme' => 'http', 'port' => 23));
+		$this->assertIdentical($uri, array(
+			'scheme' => 'https',
+			'port' => 23,
+			'host' => 'www.cakephp.org'
+		));
+
+		$uri = $this->Socket->parseUri('www.cakephp.org:59', array('scheme' => array('http', 'https'), 'port' => 80));
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'port' => 59,
+			'host' => 'www.cakephp.org'
+		));
+
+		$uri = $this->Socket->parseUri(array('scheme' => 'http', 'host' => 'www.google.com', 'port' => 8080), array('scheme' => array('http', 'https'), 'host' => 'www.google.com', 'port' => array(80, 443)));
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.google.com',
+			'port' => 8080,
+		));
+
+		$uri = $this->Socket->parseUri('http://www.cakephp.org/?param1=value1&param2=value2%3Dvalue3');
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.cakephp.org',
+			'path' => '/',
+			'query' => array(
+				'param1' => 'value1',
+				'param2' => 'value2=value3'
+			)
+		));
+
+		$uri = $this->Socket->parseUri('http://www.cakephp.org/?param1=value1&param2=value2=value3');
+		$this->assertIdentical($uri, array(
+			'scheme' => 'http',
+			'host' => 'www.cakephp.org',
+			'path' => '/',
+			'query' => array(
+				'param1' => 'value1',
+				'param2' => 'value2=value3'
+			)
+		));
+	}
+
+/**
+ * Tests that HttpSocket::buildUri can turn all kinds of uri arrays (and strings) into fully or partially qualified URI's
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildUri() {
+		$this->Socket->reset();
+
+		$r = $this->Socket->buildUri(true);
+		$this->assertIdentical($r, false);
+
+		$r = $this->Socket->buildUri('foo.com');
+		$this->assertIdentical($r, 'http://foo.com/');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org'));
+		$this->assertIdentical($r, 'http://www.cakephp.org/');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'scheme' => 'https'));
+		$this->assertIdentical($r, 'https://www.cakephp.org/');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'port' => 23));
+		$this->assertIdentical($r, 'http://www.cakephp.org:23/');
+
+		$r = $this->Socket->buildUri(array('path' => 'www.google.com/search', 'query' => 'q=cakephp'));
+		$this->assertIdentical($r, 'http://www.google.com/search?q=cakephp');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'scheme' => 'https', 'port' => 79));
+		$this->assertIdentical($r, 'https://www.cakephp.org:79/');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'path' => 'foo'));
+		$this->assertIdentical($r, 'http://www.cakephp.org/foo');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'path' => '/foo'));
+		$this->assertIdentical($r, 'http://www.cakephp.org/foo');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'path' => '/search', 'query' => array('q' => 'HttpSocket')));
+		$this->assertIdentical($r, 'http://www.cakephp.org/search?q=HttpSocket');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'fragment' => 'bar'));
+		$this->assertIdentical($r, 'http://www.cakephp.org/#bar');
+
+		$r = $this->Socket->buildUri(array(
+			'scheme' => 'https',
+			'host' => 'www.cakephp.org',
+			'port' => 25,
+			'user' => 'bob',
+			'pass' => 'secret',
+			'path' => '/cool',
+			'query' => array('foo' => 'bar'),
+			'fragment' => 'comment'
+		));
+		$this->assertIdentical($r, 'https://bob:secret@www.cakephp.org:25/cool?foo=bar#comment');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org', 'fragment' => 'bar'), '%fragment?%host');
+		$this->assertIdentical($r, 'bar?www.cakephp.org');
+
+		$r = $this->Socket->buildUri(array('host' => 'www.cakephp.org'), '%fragment???%host');
+		$this->assertIdentical($r, '???www.cakephp.org');
+
+		$r = $this->Socket->buildUri(array('path' => '*'), '/%path?%query');
+		$this->assertIdentical($r, '*');
+
+		$r = $this->Socket->buildUri(array('scheme' => 'foo', 'host' => 'www.cakephp.org'));
+		$this->assertIdentical($r, 'foo://www.cakephp.org:80/');
+	}
+
+/**
+ * Asserts that HttpSocket::parseQuery is working properly
+ *
+ * @access public
+ * @return void
+ */
+	function testParseQuery() {
+		$this->Socket->reset();
+
+		$query = $this->Socket->parseQuery(array('framework' => 'cakephp'));
+		$this->assertIdentical($query, array('framework' => 'cakephp'));
+
+		$query = $this->Socket->parseQuery('');
+		$this->assertIdentical($query, array());
+
+		$query = $this->Socket->parseQuery('framework=cakephp');
+		$this->assertIdentical($query, array('framework' => 'cakephp'));
+
+		$query = $this->Socket->parseQuery('?framework=cakephp');
+		$this->assertIdentical($query, array('framework' => 'cakephp'));
+
+		$query = $this->Socket->parseQuery('a&b&c');
+		$this->assertIdentical($query, array('a' => '', 'b' => '', 'c' => ''));
+
+		$query = $this->Socket->parseQuery('value=12345');
+		$this->assertIdentical($query, array('value' => '12345'));
+
+		$query = $this->Socket->parseQuery('a[0]=foo&a[1]=bar&a[2]=cake');
+		$this->assertIdentical($query, array('a' => array(0 => 'foo', 1 => 'bar', 2 => 'cake')));
+
+		$query = $this->Socket->parseQuery('a[]=foo&a[]=bar&a[]=cake');
+		$this->assertIdentical($query, array('a' => array(0 => 'foo', 1 => 'bar', 2 => 'cake')));
+
+		$query = $this->Socket->parseQuery('a]][[=foo&[]=bar&]]][]=cake');
+		$this->assertIdentical($query, array('a]][[' => 'foo', 0 => 'bar', ']]]' => array('cake')));
+
+		$query = $this->Socket->parseQuery('a[][]=foo&a[][]=bar&a[][]=cake');
+		$expectedQuery = array(
+			'a' => array(
+				0 => array(
+					0 => 'foo'
+				),
+				1 => array(
+					0 => 'bar'
+				),
+				array(
+					0 => 'cake'
+				)
+			)
+		);
+		$this->assertIdentical($query, $expectedQuery);
+
+		$query = $this->Socket->parseQuery('a[][]=foo&a[bar]=php&a[][]=bar&a[][]=cake');
+		$expectedQuery = array(
+			'a' => array(
+				0 => array(
+					0 => 'foo'
+				),
+				'bar' => 'php',
+				1 => array(
+					0 => 'bar'
+				),
+				array(
+					0 => 'cake'
+				)
+			)
+		);
+		$this->assertIdentical($query, $expectedQuery);
+
+		$query = $this->Socket->parseQuery('user[]=jim&user[3]=tom&user[]=bob');
+		$expectedQuery = array(
+			'user' => array(
+				0 => 'jim',
+				3 => 'tom',
+				4 => 'bob'
+			)
+		);
+		$this->assertIdentical($query, $expectedQuery);
+
+		$queryStr = 'user[0]=foo&user[0][items][]=foo&user[0][items][]=bar&user[][name]=jim&user[1][items][personal][]=book&user[1][items][personal][]=pen&user[1][items][]=ball&user[count]=2&empty';
+		$query = $this->Socket->parseQuery($queryStr);
+		$expectedQuery = array(
+			'user' => array(
+				0 => array(
+					'items' => array(
+						'foo',
+						'bar'
+					)
+				),
+				1 => array(
+					'name' => 'jim',
+					'items' => array(
+						'personal' => array(
+							'book'
+							, 'pen'
+						),
+						'ball'
+					)
+				),
+				'count' => '2'
+			),
+			'empty' => ''
+		);
+		$this->assertIdentical($query, $expectedQuery);
+	}
+
+/**
+ * Tests that HttpSocket::buildHeader can turn a given $header array into a proper header string according to
+ * HTTP 1.1 specs.
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildHeader() {
+		$this->Socket->reset();
+
+		$r = $this->Socket->buildHeader(true);
+		$this->assertIdentical($r, false);
+
+		$r = $this->Socket->buildHeader('My raw header');
+		$this->assertIdentical($r, 'My raw header');
+
+		$r = $this->Socket->buildHeader(array('Host' => 'www.cakephp.org'));
+		$this->assertIdentical($r, "Host: www.cakephp.org\r\n");
+
+		$r = $this->Socket->buildHeader(array('Host' => 'www.cakephp.org', 'Connection' => 'Close'));
+		$this->assertIdentical($r, "Host: www.cakephp.org\r\nConnection: Close\r\n");
+
+		$r = $this->Socket->buildHeader(array('People' => array('Bob', 'Jim', 'John')));
+		$this->assertIdentical($r, "People: Bob,Jim,John\r\n");
+
+		$r = $this->Socket->buildHeader(array('Multi-Line-Field' => "This is my\r\nMulti Line field"));
+		$this->assertIdentical($r, "Multi-Line-Field: This is my\r\n Multi Line field\r\n");
+
+		$r = $this->Socket->buildHeader(array('Multi-Line-Field' => "This is my\r\n Multi Line field"));
+		$this->assertIdentical($r, "Multi-Line-Field: This is my\r\n Multi Line field\r\n");
+
+		$r = $this->Socket->buildHeader(array('Multi-Line-Field' => "This is my\r\n\tMulti Line field"));
+		$this->assertIdentical($r, "Multi-Line-Field: This is my\r\n\tMulti Line field\r\n");
+
+		$r = $this->Socket->buildHeader(array('Test@Field' => "My value"));
+		$this->assertIdentical($r, "Test\"@\"Field: My value\r\n");
+
+	}
+
+/**
+ * Test that HttpSocket::parseHeader can take apart a given (and valid) $header string and turn it into an array.
+ *
+ * @access public
+ * @return void
+ */
+	function testParseHeader() {
+		$this->Socket->reset();
+
+		$r = $this->Socket->parseHeader(array('foo' => 'Bar', 'fOO-bAr' => 'quux'));
+		$this->assertIdentical($r, array('Foo' => 'Bar', 'Foo-Bar' => 'quux'));
+
+		$r = $this->Socket->parseHeader(true);
+		$this->assertIdentical($r, false);
+
+		$header = "Host: cakephp.org\t\r\n";
+		$r = $this->Socket->parseHeader($header);
+		$expected = array(
+			'Host' => 'cakephp.org'
+		);
+		$this->assertIdentical($r, $expected);
+
+		$header = "Date:Sat, 07 Apr 2007 10:10:25 GMT\r\nX-Powered-By: PHP/5.1.2\r\n";
+		$r = $this->Socket->parseHeader($header);
+		$expected = array(
+			'Date' => 'Sat, 07 Apr 2007 10:10:25 GMT'
+			, 'X-Powered-By' =>  'PHP/5.1.2'
+		);
+		$this->assertIdentical($r, $expected);
+
+		$header = "people: Jim,John\r\nfoo-LAND: Bar\r\ncAKe-PHP: rocks\r\n";
+		$r = $this->Socket->parseHeader($header);
+		$expected = array(
+			'People' => 'Jim,John'
+			, 'Foo-Land' => 'Bar'
+			, 'Cake-Php' =>  'rocks'
+		);
+		$this->assertIdentical($r, $expected);
+
+		$header = "People: Jim,John,Tim\r\nPeople: Lisa,Tina,Chelsea\r\n";
+		$r = $this->Socket->parseHeader($header);
+		$expected = array(
+			'People' =>  array('Jim,John,Tim', 'Lisa,Tina,Chelsea')
+		);
+		$this->assertIdentical($r, $expected);
+
+		$header = "Multi-Line: I am a \r\nmulti line\t\r\nfield value.\r\nSingle-Line: I am not\r\n";
+		$r = $this->Socket->parseHeader($header);
+		$expected = array(
+			'Multi-Line' => "I am a\r\nmulti line\r\nfield value."
+			, 'Single-Line' => 'I am not'
+		);
+		$this->assertIdentical($r, $expected);
+
+		$header = "Esc\"@\"ped: value\r\n";
+		$r = $this->Socket->parseHeader($header);
+		$expected = array(
+			'Esc@ped' => 'value'
+		);
+		$this->assertIdentical($r, $expected);
+	}
+
+/**
+ * testParseCookies method
+ *
+ * @access public
+ * @return void
+ */
+	function testParseCookies() {
+		$header = array(
+			'Set-Cookie' => array(
+				'foo=bar',
+				'people=jim,jack,johnny";";Path=/accounts',
+				'google=not=nice'
+			),
+			'Transfer-Encoding' => 'chunked',
+			'Date' => 'Sun, 18 Nov 2007 18:57:42 GMT',
+		);
+		$cookies = $this->Socket->parseCookies($header);
+		$expected = array(
+			'foo' => array(
+				'value' => 'bar'
+			),
+			'people' => array(
+				'value' => 'jim,jack,johnny";"',
+				'path' => '/accounts',
+			),
+			'google' => array(
+				'value' => 'not=nice',
+			)
+		);
+		$this->assertEqual($cookies, $expected);
+
+		$header['Set-Cookie'][] = 'cakephp=great; Secure';
+		$expected['cakephp'] = array('value' => 'great', 'secure' => true);
+		$cookies = $this->Socket->parseCookies($header);
+		$this->assertEqual($cookies, $expected);
+
+		$header['Set-Cookie'] = 'foo=bar';
+		unset($expected['people'], $expected['cakephp'], $expected['google']);
+		$cookies = $this->Socket->parseCookies($header);
+		$this->assertEqual($cookies, $expected);
+	}
+
+/**
+ * testBuildCookies method
+ *
+ * @return void
+ * @access public
+ * @todo Test more scenarios
+ */
+	function testBuildCookies() {
+		$cookies = array(
+			'foo' => array(
+				'value' => 'bar'
+			),
+			'people' => array(
+				'value' => 'jim,jack,johnny;',
+				'path' => '/accounts'
+			)
+		);
+		$expect = "Cookie: foo=bar; people=jim,jack,johnny\";\"\r\n";
+		$result = $this->Socket->buildCookies($cookies);
+		$this->assertEqual($result, $expect);
+	}
+
+/**
+ * Tests that HttpSocket::_tokenEscapeChars() returns the right characters.
+ *
+ * @access public
+ * @return void
+ */
+	function testTokenEscapeChars() {
+		$this->Socket->reset();
+
+		$expected = array(
+			'\x22','\x28','\x29','\x3c','\x3e','\x40','\x2c','\x3b','\x3a','\x5c','\x2f','\x5b','\x5d','\x3f','\x3d','\x7b',
+			'\x7d','\x20','\x00','\x01','\x02','\x03','\x04','\x05','\x06','\x07','\x08','\x09','\x0a','\x0b','\x0c','\x0d',
+			'\x0e','\x0f','\x10','\x11','\x12','\x13','\x14','\x15','\x16','\x17','\x18','\x19','\x1a','\x1b','\x1c','\x1d',
+			'\x1e','\x1f','\x7f'
+		);
+		$r = $this->Socket->tokenEscapeChars();
+		$this->assertEqual($r, $expected);
+
+		foreach ($expected as $key => $char) {
+			$expected[$key] = chr(hexdec(substr($char, 2)));
+		}
+
+		$r = $this->Socket->tokenEscapeChars(false);
+		$this->assertEqual($r, $expected);
+	}
+
+/**
+ * Test that HttpSocket::escapeToken is escaping all characters as descriped in RFC 2616 (HTTP 1.1 specs)
+ *
+ * @access public
+ * @return void
+ */
+	function testEscapeToken() {
+		$this->Socket->reset();
+
+		$this->assertIdentical($this->Socket->escapeToken('Foo'), 'Foo');
+
+		$escape = $this->Socket->tokenEscapeChars(false);
+		foreach ($escape as $char) {
+			$token = 'My-special-'.$char.'-Token';
+			$escapedToken = $this->Socket->escapeToken($token);
+			$expectedToken = 'My-special-"'.$char.'"-Token';
+
+			$this->assertIdentical($escapedToken, $expectedToken, 'Test token escaping for ASCII '.ord($char));
+		}
+
+		$token = 'Extreme-:Token-	-"@-test';
+		$escapedToken = $this->Socket->escapeToken($token);
+		$expectedToken = 'Extreme-":"Token-"	"-""""@"-test';
+		$this->assertIdentical($expectedToken, $escapedToken);
+	}
+
+/**
+ * Test that escaped token strings are properly unescaped by HttpSocket::unescapeToken
+ *
+ * @access public
+ * @return void
+ */
+	function testUnescapeToken() {
+		$this->Socket->reset();
+
+		$this->assertIdentical($this->Socket->unescapeToken('Foo'), 'Foo');
+
+		$escape = $this->Socket->tokenEscapeChars(false);
+		foreach ($escape as $char) {
+			$token = 'My-special-"'.$char.'"-Token';
+			$unescapedToken = $this->Socket->unescapeToken($token);
+			$expectedToken = 'My-special-'.$char.'-Token';
+
+			$this->assertIdentical($unescapedToken, $expectedToken, 'Test token unescaping for ASCII '.ord($char));
+		}
+
+		$token = 'Extreme-":"Token-"	"-""""@"-test';
+		$escapedToken = $this->Socket->unescapeToken($token);
+		$expectedToken = 'Extreme-:Token-	-"@-test';
+		$this->assertIdentical($expectedToken, $escapedToken);
+	}
+
+/**
+ * This tests asserts HttpSocket::reset() resets a HttpSocket instance to it's initial state (before Object::__construct
+ * got executed)
+ *
+ * @access public
+ * @return void
+ */
+	function testReset() {
+		$this->Socket->reset();
+
+		$initialState = get_class_vars('HttpSocket');
+		foreach ($initialState as $property => $value) {
+			$this->Socket->{$property} = 'Overwritten';
+		}
+
+		$return = $this->Socket->reset();
+
+		foreach ($initialState as $property => $value) {
+			$this->assertIdentical($this->Socket->{$property}, $value);
+		}
+
+		$this->assertIdentical($return, true);
+	}
+
+/**
+ * This tests asserts HttpSocket::reset(false) resets certain HttpSocket properties to their initial state (before
+ * Object::__construct got executed).
+ *
+ * @access public
+ * @return void
+ */
+	function testPartialReset() {
+		$this->Socket->reset();
+
+		$partialResetProperties = array('request', 'response');
+		$initialState = get_class_vars('HttpSocket');
+
+		foreach ($initialState as $property => $value) {
+			$this->Socket->{$property} = 'Overwritten';
+		}
+
+		$return = $this->Socket->reset(false);
+
+		foreach ($initialState as $property => $originalValue) {
+			if (in_array($property, $partialResetProperties)) {
+				$this->assertIdentical($this->Socket->{$property}, $originalValue);
+			} else {
+				$this->assertIdentical($this->Socket->{$property}, 'Overwritten');
+			}
+		}
+		$this->assertIdentical($return, true);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/i18n.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/i18n.test.php
new file mode 100644
index 000000000..31b58e901
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/i18n.test.php
@@ -0,0 +1,2777 @@
+<?php
+/**
+ * I18nTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'i18n');
+
+/**
+ * I18nTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class I18nTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		Cache::delete('object_map', '_cake_core_');
+		App::build(array(
+			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		), true);
+		App::objects('plugin', null, false);
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Cache::delete('object_map', '_cake_core_');
+		App::build();
+		App::objects('plugin', null, false);
+	}
+
+
+	function testTranslationCaching() {
+		Configure::write('Config.language', 'cache_test_po');
+		$i18n =& i18n::getInstance();
+
+		// reset internally stored entries
+		I18n::clear();
+
+		Cache::clear(false, '_cake_core_');
+		$lang = Configure::read('Config.language');#$i18n->l10n->locale;
+
+		Cache::config('_cake_core_', Cache::config('default'));
+
+		// make some calls to translate using different domains
+		$this->assertEqual(I18n::translate('dom1.foo', false, 'dom1'), 'Dom 1 Foo');
+		$this->assertEqual(I18n::translate('dom1.bar', false, 'dom1'), 'Dom 1 Bar');
+		$this->assertEqual($i18n->__domains['dom1']['cache_test_po']['LC_MESSAGES']['dom1.foo'], 'Dom 1 Foo');
+
+		// reset internally stored entries
+		I18n::clear();
+
+		// now only dom1 should be in cache
+		$cachedDom1 = Cache::read('dom1_' . $lang, '_cake_core_');
+		$this->assertEqual($cachedDom1['LC_MESSAGES']['dom1.foo'], 'Dom 1 Foo');
+		$this->assertEqual($cachedDom1['LC_MESSAGES']['dom1.bar'], 'Dom 1 Bar');
+		// dom2 not in cache
+		$this->assertFalse(Cache::read('dom2_' . $lang, '_cake_core_'));
+
+		// translate a item of dom2 (adds dom2 to cache)
+		$this->assertEqual(I18n::translate('dom2.foo', false, 'dom2'), 'Dom 2 Foo');
+
+		// verify dom2 was cached through manual read from cache
+		$cachedDom2 = Cache::read('dom2_' . $lang, '_cake_core_');
+		$this->assertEqual($cachedDom2['LC_MESSAGES']['dom2.foo'], 'Dom 2 Foo');
+		$this->assertEqual($cachedDom2['LC_MESSAGES']['dom2.bar'], 'Dom 2 Bar');
+
+		// modify cache entry manually to verify that dom1 entries now will be read from cache 
+		$cachedDom1['LC_MESSAGES']['dom1.foo'] = 'FOO';
+		Cache::write('dom1_' . $lang, $cachedDom1, '_cake_core_');
+		$this->assertEqual(I18n::translate('dom1.foo', false, 'dom1'), 'FOO');
+	}
+
+
+/**
+ * testDefaultStrings method
+ *
+ * @access public
+ * @return void
+ */
+	function testDefaultStrings() {
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 1', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('1 = 1', $plurals));
+		$this->assertTrue(in_array('2 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('3 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('4 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('5 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('6 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('7 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('8 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('9 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('10 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('11 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('12 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('13 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('14 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('15 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('16 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('17 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('18 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('19 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('20 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('21 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('22 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('23 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('24 = 0 or > 1', $plurals));
+		$this->assertTrue(in_array('25 = 0 or > 1', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 1 (from core)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('1 = 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('2 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('3 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('4 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('5 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('6 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('7 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('8 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('9 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('10 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('11 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('12 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('13 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('14 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('15 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('16 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('17 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('18 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('19 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('20 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('21 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('22 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('23 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('24 = 0 or > 1 (from core)', $corePlurals));
+		$this->assertTrue(in_array('25 = 0 or > 1 (from core)', $corePlurals));
+	}
+
+/**
+ * testPoRulesZero method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesZero() {
+		Configure::write('Config.language', 'rule_0_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 0 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('5 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('6 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('7 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('8 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('9 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('10 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('13 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('14 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('15 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('16 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('17 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('18 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('19 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('20 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('23 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('24 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('25 ends with any # (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 0 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 ends with any # (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesZero method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesZero() {
+		Configure::write('Config.language', 'rule_0_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 0 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('5 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('6 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('7 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('8 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('9 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('10 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('13 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('14 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('15 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('16 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('17 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('18 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('19 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('20 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('23 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('24 ends with any # (translated)', $plurals));
+		$this->assertTrue(in_array('25 ends with any # (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 0 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 ends with any # (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 ends with any # (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesOne method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesOne() {
+		Configure::write('Config.language', 'rule_1_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 1 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('3 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('4 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('5 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('6 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('7 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('8 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('9 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('10 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('11 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('12 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('13 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('14 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('15 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('16 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('17 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('18 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('19 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('20 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('21 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('22 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('23 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('24 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('25 = 0 or > 1 (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 1 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 = 0 or > 1 (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesOne method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesOne() {
+		Configure::write('Config.language', 'rule_1_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 1 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('3 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('4 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('5 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('6 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('7 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('8 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('9 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('10 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('11 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('12 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('13 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('14 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('15 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('16 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('17 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('18 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('19 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('20 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('21 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('22 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('23 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('24 = 0 or > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('25 = 0 or > 1 (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 1 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 = 0 or > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 = 0 or > 1 (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesTwo method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesTwo() {
+		Configure::write('Config.language', 'rule_2_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 2 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 or 1 (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 0 or 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('3 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('4 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('5 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('6 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('7 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('8 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('9 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('10 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('11 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('12 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('13 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('14 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('15 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('16 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('17 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('18 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('19 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('20 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('21 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('22 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('23 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('24 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('25 > 1 (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 2 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 or 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 0 or 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 > 1 (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesTwo method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesTwo() {
+		Configure::write('Config.language', 'rule_2_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 2 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 or 1 (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 0 or 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('3 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('4 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('5 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('6 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('7 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('8 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('9 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('10 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('11 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('12 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('13 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('14 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('15 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('16 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('17 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('18 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('19 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('20 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('21 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('22 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('23 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('24 > 1 (translated)', $plurals));
+		$this->assertTrue(in_array('25 > 1 (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 2 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 or 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 0 or 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 > 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 > 1 (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesThree method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesThree() {
+		Configure::write('Config.language', 'rule_3_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 3 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends 1 but not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('2 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends 1 but not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 3 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends 1 but not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends 1 but not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesThree method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesThree() {
+		Configure::write('Config.language', 'rule_3_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 3 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends 1 but not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('2 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends 1 but not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 3 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends 1 but not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends 1 but not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesFour method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesFour() {
+		Configure::write('Config.language', 'rule_4_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 4 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 = 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 4 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 = 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesFour method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesFour() {
+		Configure::write('Config.language', 'rule_4_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 4 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 = 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 4 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 = 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesFive method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesFive() {
+		Configure::write('Config.language', 'rule_5_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 5 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('3 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('4 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('5 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('6 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('7 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('8 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('9 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('10 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('11 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('12 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('13 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('14 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('15 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('16 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('17 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('18 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('19 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 5 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesFive method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesFive() {
+		Configure::write('Config.language', 'rule_5_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 5 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('1 = 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('3 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('4 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('5 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('6 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('7 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('8 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('9 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('10 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('11 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('12 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('13 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('14 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('15 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('16 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('17 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('18 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('19 = 0 or ends in 01-19 (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 5 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 = 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 = 0 or ends in 01-19 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesSix method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesSix() {
+		Configure::write('Config.language', 'rule_6_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 6 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('2 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('13 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('14 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('15 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('16 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('17 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('18 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('19 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('20 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 6 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesSix method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesSix() {
+		Configure::write('Config.language', 'rule_6_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 6 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('2 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('13 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('14 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('15 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('16 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('17 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('18 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('19 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('20 ends in 0 or ends in 10-20 (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 6 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 ends in 0 or ends in 10-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesSeven method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesSeven() {
+		Configure::write('Config.language', 'rule_7_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 7 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 7 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesSeven method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesSeven() {
+		Configure::write('Config.language', 'rule_7_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 7 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 7 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends in 1, not 11 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesEight method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesEight() {
+		Configure::write('Config.language', 'rule_8_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 8 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2-4 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 2-4 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 2-4 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 8 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 2-4 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 2-4 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 2-4 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesEight method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesEight() {
+		Configure::write('Config.language', 'rule_8_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 8 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2-4 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 2-4 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 2-4 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 8 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 2-4 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 2-4 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 2-4 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesNine method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesNine() {
+		Configure::write('Config.language', 'rule_9_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 9 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 9 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesNine method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesNine() {
+		Configure::write('Config.language', 'rule_9_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 9 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 9 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 ends in 2-4, not 12-14 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesTen method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesTen() {
+		Configure::write('Config.language', 'rule_10_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 10 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends in 03-04 (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends in 03-04 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 10 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends in 03-04 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends in 03-04 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesTen method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesTen() {
+		Configure::write('Config.language', 'rule_10_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 10 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 ends in 03-04 (translated)', $plurals));
+		$this->assertTrue(in_array('4 ends in 03-04 (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 10 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 ends in 03-04 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 ends in 03-04 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesEleven method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesEleven() {
+		Configure::write('Config.language', 'rule_11_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 11 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('5 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('6 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('7 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('8 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('9 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('10 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 11 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesEleven method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesEleven() {
+		Configure::write('Config.language', 'rule_11_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 11 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('5 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('6 is 3-6 (translated)', $plurals));
+		$this->assertTrue(in_array('7 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('8 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('9 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('10 is 7-10 (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 11 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 is 3-6 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 is 7-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesTwelve method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesTwelve() {
+		Configure::write('Config.language', 'rule_12_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 12 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('5 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('6 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('7 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('8 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('9 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('10 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 12 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesTwelve method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesTwelve() {
+		Configure::write('Config.language', 'rule_12_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 12 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('5 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('6 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('7 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('8 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('9 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('10 is 0 or 3-10 (translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 12 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 is 0 or 3-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesThirteen method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesThirteen() {
+		Configure::write('Config.language', 'rule_13_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 13 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('5 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('6 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('7 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('8 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('9 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('10 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('13 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('14 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('15 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('16 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('17 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('18 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('19 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('20 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 13 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesThirteen method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesThirteen() {
+		Configure::write('Config.language', 'rule_13_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 13 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('3 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('4 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('5 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('6 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('7 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('8 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('9 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('10 is 0 or ends in 01-10 (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('13 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('14 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('15 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('16 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('17 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('18 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('19 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('20 ends in 11-20 (translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 13 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 is 0 or ends in 01-10 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 ends in 11-20 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPoRulesFourteen method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoRulesFourteen() {
+		Configure::write('Config.language', 'rule_14_po');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 14 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 14 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testMoRulesFourteen method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoRulesFourteen() {
+		Configure::write('Config.language', 'rule_14_mo');
+
+		$singular = $this->__singular();
+		$this->assertEqual('Plural Rule 14 (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('1 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('2 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('3 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('4 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('11 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('12 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('21 ends in 1 (translated)', $plurals));
+		$this->assertTrue(in_array('22 ends in 2 (translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (translated)', $plurals));
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertEqual('Plural Rule 14 (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertTrue(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('1 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('2 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('3 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('4 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('11 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('12 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('21 ends in 1 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('22 ends in 2 (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertTrue(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testSetLanguageWithSession method
+ *
+ * @access public
+ * @return void
+ */
+	function testSetLanguageWithSession () {
+		$_SESSION['Config']['language'] = 'po';
+		$singular = $this->__singular();
+		$this->assertEqual('Po (translated)', $singular);
+
+		$plurals = $this->__plural();
+		$this->assertTrue(in_array('0 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('1 is 1 (po translated)', $plurals));
+		$this->assertTrue(in_array('2 is 2-4 (po translated)', $plurals));
+		$this->assertTrue(in_array('3 is 2-4 (po translated)', $plurals));
+		$this->assertTrue(in_array('4 is 2-4 (po translated)', $plurals));
+		$this->assertTrue(in_array('5 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('6 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('7 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('8 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('9 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('10 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('11 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('12 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('13 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('14 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('15 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('16 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('17 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('18 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('19 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('20 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('21 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('22 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('23 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('24 everything else (po translated)', $plurals));
+		$this->assertTrue(in_array('25 everything else (po translated)', $plurals));
+		unset($_SESSION['Config']['language']);
+	}
+
+/**
+ * testNoCoreTranslation method
+ *
+ * @access public
+ * @return void
+ */
+	function testNoCoreTranslation () {
+		Configure::write('Config.language', 'po');
+		$singular = $this->__singular();
+		$this->assertEqual('Po (translated)', $singular);
+
+		$coreSingular = $this->__singularFromCore();
+		$this->assertNotEqual('Po (from core translated)', $coreSingular);
+
+		$corePlurals = $this->__pluralFromCore();
+		$this->assertFalse(in_array('0 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('1 is 1 (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('2 is 2-4 (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('3 is 2-4 (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('4 is 2-4 (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('5 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('6 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('7 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('8 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('9 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('10 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('11 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('12 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('13 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('14 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('15 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('16 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('17 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('18 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('19 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('20 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('21 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('22 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('23 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('24 everything else (from core translated)', $corePlurals));
+		$this->assertFalse(in_array('25 everything else (from core translated)', $corePlurals));
+	}
+
+/**
+ * testPluginTranslation method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginTranslation() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		Configure::write('Config.language', 'po');
+		$singular = $this->__domainSingular();
+		$this->assertEqual('Plural Rule 1 (from plugin)', $singular);
+
+		$plurals = $this->__domainPlural();
+		$this->assertTrue(in_array('0 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('1 = 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('2 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('3 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('4 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('5 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('6 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('7 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('8 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('9 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('10 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('11 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('12 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('13 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('14 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('15 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('16 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('17 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('18 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('19 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('20 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('21 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('22 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('23 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('24 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('25 = 0 or > 1 (from plugin)', $plurals));
+	}
+
+/**
+ * testPoMultipleLineTranslation method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoMultipleLineTranslation () {
+		Configure::write('Config.language', 'po');
+
+		$string = "This is a multiline translation\n";
+		$string .= "broken up over multiple lines.\n";
+		$string .= "This is the third line.\n";
+		$string .= "This is the forth line.";
+		$result = __($string, true);
+
+		$expected = "This is a multiline translation\n";
+		$expected .= "broken up over multiple lines.\n";
+		$expected .= "This is the third line.\n";
+		$expected .= "This is the forth line. (translated)";
+		$this->assertEqual($result, $expected);
+
+		// Windows Newline is \r\n
+		$string = "This is a multiline translation\r\n";
+		$string .= "broken up over multiple lines.\r\n";
+		$string .= "This is the third line.\r\n";
+		$string .= "This is the forth line.";
+		$result = __($string, true);
+		$this->assertEqual($result, $expected);
+
+		$singular = "valid\nsecond line";
+		$plural = "valids\nsecond line";
+
+		$result = __n($singular, $plural, 1, true);
+		$expected = "v\nsecond line";
+		$this->assertEqual($result, $expected);
+
+		$result = __n($singular, $plural, 2, true);
+		$expected = "vs\nsecond line";
+		$this->assertEqual($result, $expected);
+
+		$string = "This is a multiline translation\n";
+		$string .= "broken up over multiple lines.\n";
+		$string .= "This is the third line.\n";
+		$string .= "This is the forth line.";
+
+		$singular = "%d = 1\n" . $string;
+		$plural = "%d = 0 or > 1\n" . $string;
+
+		$result = __n($singular, $plural, 1, true);
+		$expected = "%d is 1\n" . $string;
+		$this->assertEqual($result, $expected);
+
+		$result = __n($singular, $plural, 2, true);
+		$expected = "%d is 2-4\n" . $string;
+		$this->assertEqual($result, $expected);
+
+		// Windows Newline is \r\n
+		$string = "This is a multiline translation\r\n";
+		$string .= "broken up over multiple lines.\r\n";
+		$string .= "This is the third line.\r\n";
+		$string .= "This is the forth line.";
+
+		$singular = "%d = 1\r\n" . $string;
+		$plural = "%d = 0 or > 1\r\n" . $string;
+
+		$result = __n($singular, $plural, 1, true);
+		$expected = "%d is 1\n" . str_replace("\r\n", "\n", $string);
+		$this->assertEqual($result, $expected);
+
+		$result = __n($singular, $plural, 2, true);
+		$expected = "%d is 2-4\n" . str_replace("\r\n", "\n", $string);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testPoNoTranslationNeeded method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoNoTranslationNeeded () {
+		Configure::write('Config.language', 'po');
+		$result = __('No Translation needed', true);
+		$this->assertEqual($result, 'No Translation needed');
+	}
+
+/**
+ * testPoQuotedString method
+ *
+ * @access public
+ * @return void
+ */
+	function testPoQuotedString () {
+		$expected = 'this is a "quoted string" (translated)';
+		$this->assertEqual(__('this is a "quoted string"', true), $expected);
+	}
+
+/**
+ * testFloatValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testFloatValue() {
+		Configure::write('Config.language', 'rule_9_po');
+
+		$result = __n('%d = 1', '%d = 0 or > 1', (float)1, true);
+		$expected = '%d is 1 (translated)';
+		$this->assertEqual($result, $expected);
+
+		$result = __n('%d = 1', '%d = 0 or > 1', (float)2, true);
+		$expected = "%d ends in 2-4, not 12-14 (translated)";
+		$this->assertEqual($result, $expected);
+
+		$result = __n('%d = 1', '%d = 0 or > 1', (float)5, true);
+		$expected = "%d everything else (translated)";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testCategory method
+ *
+ * @access public
+ * @return void
+ */
+	function testCategory() {
+		Configure::write('Config.language', 'po');
+		$category = $this->__category();
+		$this->assertEqual('Monetary Po (translated)', $category);
+	}
+
+/**
+ * testPluginCategory method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginCategory() {
+		Configure::write('Config.language', 'po');
+
+		$singular = $this->__domainCategorySingular();
+		$this->assertEqual('Monetary Plural Rule 1 (from plugin)', $singular);
+
+		$plurals = $this->__domainCategoryPlural();
+		$this->assertTrue(in_array('Monetary 0 = 0 or > 1 (from plugin)', $plurals));
+		$this->assertTrue(in_array('Monetary 1 = 1 (from plugin)', $plurals));
+	}
+
+/**
+ * testCategoryThenSingular method
+ *
+ * @access public
+ * @return void
+ */
+	function testCategoryThenSingular() {
+		Configure::write('Config.language', 'po');
+		$category = $this->__category();
+		$this->assertEqual('Monetary Po (translated)', $category);
+
+		$singular = $this->__singular();
+		$this->assertEqual('Po (translated)', $singular);
+	}
+
+	function testTimeDefinition() {
+		Configure::write('Config.language', 'po');
+		$result = __c('d_fmt', 5, true);
+		$expected = '%m/%d/%Y';
+		$this->assertEqual($result, $expected);
+
+		$result = __c('am_pm', 5, true);
+		$expected = array('AM', 'PM');
+		$this->assertEqual($result, $expected);
+
+		$result = __c('abmon', 5, true);
+		$expected = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
+		$this->assertEqual($result, $expected);
+	}
+
+	function testTimeDefinitionJapanese(){
+		Configure::write('Config.language', 'ja_jp');
+		$result = __c('d_fmt', 5, true);
+		
+		$expected = "%Y年%m月%d日";
+		
+		$this->assertEqual($result, $expected);
+
+		$result = __c('am_pm', 5, true);
+		$expected = array("��", "�後");
+		$this->assertEqual($result, $expected);
+
+		$result = __c('abmon', 5, true);
+		$expected = array(" 1月", " 2月", " 3月", " 4月", " 5月", " 6月", " 7月", " 8月", " 9月", "10月", "11月", "12月");
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Singular method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainCategorySingular($domain = 'test_plugin', $category = 3) {
+		$singular = __dc($domain, 'Plural Rule 1', $category, true);
+		return $singular;
+	}
+
+/**
+ * Plural method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainCategoryPlural($domain = 'test_plugin', $category = 3) {
+		$plurals = array();
+		for ($number = 0; $number <= 25; $number++) {
+			$plurals[] =  sprintf(__dcn($domain, '%d = 1', '%d = 0 or > 1', (float)$number, $category, true), (float)$number);
+		}
+		return $plurals;
+	}
+
+/**
+ * Singular method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainSingular($domain = 'test_plugin') {
+		$singular = __d($domain, 'Plural Rule 1', true);
+		return $singular;
+	}
+
+/**
+ * Plural method
+ *
+ * @access private
+ * @return void
+ */
+	function __domainPlural($domain = 'test_plugin') {
+		$plurals = array();
+		for ($number = 0; $number <= 25; $number++) {
+			$plurals[] =  sprintf(__dn($domain, '%d = 1', '%d = 0 or > 1', (float)$number, true), (float)$number );
+		}
+		return $plurals;
+	}
+
+/**
+ * category method
+ *
+ * @access private
+ * @return void
+ */
+	function __category($category = 3) {
+		$singular = __c('Plural Rule 1', $category, true);
+		return $singular;
+	}
+
+/**
+ * Singular method
+ *
+ * @access private
+ * @return void
+ */
+	function __singular() {
+		$singular = __('Plural Rule 1', true);
+		return $singular;
+	}
+
+/**
+ * Plural method
+ *
+ * @access private
+ * @return void
+ */
+	function __plural() {
+		$plurals = array();
+		for ($number = 0; $number <= 25; $number++) {
+			$plurals[] =  sprintf(__n('%d = 1', '%d = 0 or > 1', (float)$number, true), (float)$number );
+		}
+		return $plurals;
+	}
+
+/**
+ * singularFromCore method
+ *
+ * @access private
+ * @return void
+ */
+	function __singularFromCore() {
+		$singular = __('Plural Rule 1 (from core)', true);
+		return $singular;
+	}
+
+/**
+ * pluralFromCore method
+ *
+ * @access private
+ * @return void
+ */
+	function __pluralFromCore() {
+		$plurals = array();
+		for ($number = 0; $number <= 25; $number++) {
+			$plurals[] =  sprintf(__n('%d = 1 (from core)', '%d = 0 or > 1 (from core)', (float)$number, true), (float)$number );
+		}
+		return $plurals;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/inflector.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/inflector.test.php
new file mode 100644
index 000000000..3cec57e12
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/inflector.test.php
@@ -0,0 +1,465 @@
+<?php
+/**
+ * InflectorTest
+ *
+ * InflectorTest is used to test cases on the Inflector class
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The Open Group Test Suite License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing
+ * @package       cake.tests
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       Open Group Test Suite License (http://www.opensource.org/licenses/opengroup.php)
+ */
+
+/**
+ * Included libraries.
+ *
+ */
+App::import('Core', 'Inflector');
+
+/**
+ * Short description for class.
+ *
+ * @package		  cake.tests
+ * @subpackage	  cake.tests.cases.libs
+ */
+class InflectorTest extends CakeTestCase {
+
+/**
+ * Inflector property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $Inflector = null;
+
+/**
+ * testInstantiation method
+ *
+ * @access public
+ * @return void
+ */
+	function testInstantiation() {
+		$Inflector =& Inflector::getInstance();
+		$this->assertEqual(Inflector::getInstance(), $Inflector);
+	}
+
+/**
+ * testInflectingSingulars method
+ *
+ * @access public
+ * @return void
+ */
+	function testInflectingSingulars() {
+		$this->assertEqual(Inflector::singularize('categorias'), 'categoria');
+		$this->assertEqual(Inflector::singularize('menus'), 'menu');
+		$this->assertEqual(Inflector::singularize('news'), 'news');
+		$this->assertEqual(Inflector::singularize('food_menus'), 'food_menu');
+		$this->assertEqual(Inflector::singularize('Menus'), 'Menu');
+		$this->assertEqual(Inflector::singularize('FoodMenus'), 'FoodMenu');
+		$this->assertEqual(Inflector::singularize('houses'), 'house');
+		$this->assertEqual(Inflector::singularize('powerhouses'), 'powerhouse');
+		$this->assertEqual(Inflector::singularize('quizzes'), 'quiz');
+		$this->assertEqual(Inflector::singularize('Buses'), 'Bus');
+		$this->assertEqual(Inflector::singularize('buses'), 'bus');
+		$this->assertEqual(Inflector::singularize('matrix_rows'), 'matrix_row');
+		$this->assertEqual(Inflector::singularize('matrices'), 'matrix');
+		$this->assertEqual(Inflector::singularize('vertices'), 'vertex');
+		$this->assertEqual(Inflector::singularize('indices'), 'index');
+		$this->assertEqual(Inflector::singularize('Aliases'), 'Alias');
+		$this->assertEqual(Inflector::singularize('Alias'), 'Alias');
+		$this->assertEqual(Inflector::singularize('Media'), 'Media');
+		$this->assertEqual(Inflector::singularize('alumni'), 'alumnus');
+		$this->assertEqual(Inflector::singularize('bacilli'), 'bacillus');
+		$this->assertEqual(Inflector::singularize('cacti'), 'cactus');
+		$this->assertEqual(Inflector::singularize('foci'), 'focus');
+		$this->assertEqual(Inflector::singularize('fungi'), 'fungus');
+		$this->assertEqual(Inflector::singularize('nuclei'), 'nucleus');
+		$this->assertEqual(Inflector::singularize('octopuses'), 'octopus');
+		$this->assertEqual(Inflector::singularize('radii'), 'radius');
+		$this->assertEqual(Inflector::singularize('stimuli'), 'stimulus');
+		$this->assertEqual(Inflector::singularize('syllabi'), 'syllabus');
+		$this->assertEqual(Inflector::singularize('termini'), 'terminus');
+		$this->assertEqual(Inflector::singularize('viri'), 'virus');
+		$this->assertEqual(Inflector::singularize('people'), 'person');
+		$this->assertEqual(Inflector::singularize('gloves'), 'glove');
+		$this->assertEqual(Inflector::singularize('doves'), 'dove');
+		$this->assertEqual(Inflector::singularize('lives'), 'life');
+		$this->assertEqual(Inflector::singularize('knives'), 'knife');
+		$this->assertEqual(Inflector::singularize('wolves'), 'wolf');
+		$this->assertEqual(Inflector::singularize('slaves'), 'slave');
+		$this->assertEqual(Inflector::singularize('shelves'), 'shelf');
+		$this->assertEqual(Inflector::singularize('taxis'), 'taxi');
+		$this->assertEqual(Inflector::singularize('taxes'), 'tax');
+		$this->assertEqual(Inflector::singularize('Taxes'), 'Tax');
+		$this->assertEqual(Inflector::singularize('AwesomeTaxes'), 'AwesomeTax');
+		$this->assertEqual(Inflector::singularize('faxes'), 'fax');
+		$this->assertEqual(Inflector::singularize('waxes'), 'wax');
+		$this->assertEqual(Inflector::singularize('niches'), 'niche');
+		$this->assertEqual(Inflector::singularize('waves'), 'wave');
+		$this->assertEqual(Inflector::singularize('bureaus'), 'bureau');
+		$this->assertEqual(Inflector::singularize('genetic_analyses'), 'genetic_analysis');
+		$this->assertEqual(Inflector::singularize('doctor_diagnoses'), 'doctor_diagnosis');
+		$this->assertEqual(Inflector::singularize('parantheses'), 'paranthesis');
+		$this->assertEqual(Inflector::singularize('Causes'), 'Cause');
+		$this->assertEqual(Inflector::singularize('colossuses'), 'colossus');
+		$this->assertEqual(Inflector::singularize('diagnoses'), 'diagnosis');
+		$this->assertEqual(Inflector::singularize('bases'), 'basis');
+		$this->assertEqual(Inflector::singularize('analyses'), 'analysis');
+
+		$this->assertEqual(Inflector::singularize(''), '');
+	}
+
+/**
+ * testInflectingPlurals method
+ *
+ * @access public
+ * @return void
+ */
+	function testInflectingPlurals() {
+		$this->assertEqual(Inflector::pluralize('categoria'), 'categorias');
+		$this->assertEqual(Inflector::pluralize('house'), 'houses');
+		$this->assertEqual(Inflector::pluralize('powerhouse'), 'powerhouses');
+		$this->assertEqual(Inflector::pluralize('Bus'), 'Buses');
+		$this->assertEqual(Inflector::pluralize('bus'), 'buses');
+		$this->assertEqual(Inflector::pluralize('menu'), 'menus');
+		$this->assertEqual(Inflector::pluralize('news'), 'news');
+		$this->assertEqual(Inflector::pluralize('food_menu'), 'food_menus');
+		$this->assertEqual(Inflector::pluralize('Menu'), 'Menus');
+		$this->assertEqual(Inflector::pluralize('FoodMenu'), 'FoodMenus');
+		$this->assertEqual(Inflector::pluralize('quiz'), 'quizzes');
+		$this->assertEqual(Inflector::pluralize('matrix_row'), 'matrix_rows');
+		$this->assertEqual(Inflector::pluralize('matrix'), 'matrices');
+		$this->assertEqual(Inflector::pluralize('vertex'), 'vertices');
+		$this->assertEqual(Inflector::pluralize('index'), 'indices');
+		$this->assertEqual(Inflector::pluralize('Alias'), 'Aliases');
+		$this->assertEqual(Inflector::pluralize('Aliases'), 'Aliases');
+		$this->assertEqual(Inflector::pluralize('Media'), 'Media');
+		$this->assertEqual(Inflector::pluralize('alumnus'), 'alumni');
+		$this->assertEqual(Inflector::pluralize('bacillus'), 'bacilli');
+		$this->assertEqual(Inflector::pluralize('cactus'), 'cacti');
+		$this->assertEqual(Inflector::pluralize('focus'), 'foci');
+		$this->assertEqual(Inflector::pluralize('fungus'), 'fungi');
+		$this->assertEqual(Inflector::pluralize('nucleus'), 'nuclei');
+		$this->assertEqual(Inflector::pluralize('octopus'), 'octopuses');
+		$this->assertEqual(Inflector::pluralize('radius'), 'radii');
+		$this->assertEqual(Inflector::pluralize('stimulus'), 'stimuli');
+		$this->assertEqual(Inflector::pluralize('syllabus'), 'syllabi');
+		$this->assertEqual(Inflector::pluralize('terminus'), 'termini');
+		$this->assertEqual(Inflector::pluralize('virus'), 'viri');
+		$this->assertEqual(Inflector::pluralize('person'), 'people');
+		$this->assertEqual(Inflector::pluralize('people'), 'people');
+		$this->assertEqual(Inflector::pluralize('glove'), 'gloves');
+		$this->assertEqual(Inflector::pluralize('crisis'), 'crises');
+		$this->assertEqual(Inflector::pluralize('tax'), 'taxes');
+		$this->assertEqual(Inflector::pluralize('wave'), 'waves');
+		$this->assertEqual(Inflector::pluralize('bureau'), 'bureaus');
+		$this->assertEqual(Inflector::pluralize(''), '');
+	}
+
+/**
+ * testInflectorSlug method
+ *
+ * @access public
+ * @return void
+ */
+	function testInflectorSlug() {
+		$result = Inflector::slug('Foo Bar: Not just for breakfast any-more');
+		$expected = 'Foo_Bar_Not_just_for_breakfast_any_more';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('this/is/a/path');
+		$expected = 'this_is_a_path';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('Foo Bar: Not just for breakfast any-more', "-");
+		$expected = 'Foo-Bar-Not-just-for-breakfast-any-more';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('Foo Bar: Not just for breakfast any-more', "+");
+		$expected = 'Foo+Bar+Not+just+for+breakfast+any+more';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('Äpfel Über Öl grün ärgert groß öko', '-');
+		$expected = 'Aepfel-Ueber-Oel-gruen-aergert-gross-oeko';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('The truth - and- more- news', '-');
+		$expected = 'The-truth-and-more-news';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('The truth: and more news', '-');
+		$expected = 'The-truth-and-more-news';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('La langue française est un attribut de souveraineté en France', '-');
+		$expected = 'La-langue-francaise-est-un-attribut-de-souverainete-en-France';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('!@$#exciting stuff! - what !@-# was that?', '-');
+		$expected = 'exciting-stuff-what-was-that';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('20% of profits went to me!', '-');
+		$expected = '20-of-profits-went-to-me';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('#this melts your face1#2#3', '-');
+		$expected = 'this-melts-your-face1-2-3';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('controller/action/りん�/1');
+		$expected = 'controller_action_りん�_1';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('�話�出���大丈夫����');
+		$expected = '�話�出���大丈夫����';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('posts/view/한국어/page:1/sort:asc');
+		$expected = 'posts_view_한국어_page_1_sort_asc';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testInflectorSlugWithMap method
+ *
+ * @access public
+ * @return void
+ */
+	function testInflectorSlugWithMap() {
+		$result = Inflector::slug('replace every r', array('/r/' => '1'));
+		$expected = '1eplace_eve1y_1';
+		$this->assertEqual($result, $expected);
+
+		$result = Inflector::slug('replace every r', '_', array('/r/' => '1'));
+		$expected = '1eplace_eve1y_1';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testInflectorSlugWithMapOverridingDefault method
+ *
+ * @access public
+ * @return void
+ */
+	function testInflectorSlugWithMapOverridingDefault() {
+		$result = Inflector::slug('Testing æ ø å', '-', array('/å/' => 'aa', '/ø/' => 'oe'));
+		$expected = 'Testing-ae-oe-aa';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testInflectorUnderscore method
+ *
+ * @return void
+ * @access public
+ */
+	function testInflectorUnderscore() {
+		$this->assertIdentical(Inflector::underscore('TestThing'), 'test_thing');
+		$this->assertIdentical(Inflector::underscore('testThing'), 'test_thing');
+		$this->assertIdentical(Inflector::underscore('TestThingExtra'), 'test_thing_extra');
+		$this->assertIdentical(Inflector::underscore('testThingExtra'), 'test_thing_extra');
+
+		// Identical checks test the cache code path.
+		$this->assertIdentical(Inflector::underscore('TestThing'), 'test_thing');
+		$this->assertIdentical(Inflector::underscore('testThing'), 'test_thing');
+		$this->assertIdentical(Inflector::underscore('TestThingExtra'), 'test_thing_extra');
+		$this->assertIdentical(Inflector::underscore('testThingExtra'), 'test_thing_extra');
+
+		// Test stupid values
+		$this->assertIdentical(Inflector::underscore(''), '');
+		$this->assertIdentical(Inflector::underscore(0), '0');
+		$this->assertIdentical(Inflector::underscore(false), '');
+	}
+
+/**
+ * testVariableNaming method
+ *
+ * @access public
+ * @return void
+ */
+	function testVariableNaming() {
+		$this->assertEqual(Inflector::variable('test_field'), 'testField');
+		$this->assertEqual(Inflector::variable('test_fieLd'), 'testFieLd');
+		$this->assertEqual(Inflector::variable('test field'), 'testField');
+		$this->assertEqual(Inflector::variable('Test_field'), 'testField');
+	}
+
+/**
+ * testClassNaming method
+ *
+ * @access public
+ * @return void
+ */
+	function testClassNaming() {
+		$this->assertEqual(Inflector::classify('artists_genres'), 'ArtistsGenre');
+		$this->assertEqual(Inflector::classify('file_systems'), 'FileSystem');
+		$this->assertEqual(Inflector::classify('news'), 'News');
+		$this->assertEqual(Inflector::classify('bureaus'), 'Bureau');
+	}
+
+/**
+ * testTableNaming method
+ *
+ * @access public
+ * @return void
+ */
+	function testTableNaming() {
+		$this->assertEqual(Inflector::tableize('ArtistsGenre'), 'artists_genres');
+		$this->assertEqual(Inflector::tableize('FileSystem'), 'file_systems');
+		$this->assertEqual(Inflector::tableize('News'), 'news');
+		$this->assertEqual(Inflector::tableize('Bureau'), 'bureaus');
+	}
+
+/**
+ * testHumanization method
+ *
+ * @access public
+ * @return void
+ */
+	function testHumanization() {
+		$this->assertEqual(Inflector::humanize('posts'), 'Posts');
+		$this->assertEqual(Inflector::humanize('posts_tags'), 'Posts Tags');
+		$this->assertEqual(Inflector::humanize('file_systems'), 'File Systems');
+	}
+
+/**
+ * This test if run in isolation should not cause errors in PHP4.
+ *
+ * @return void
+ */
+	function testRulesNoErrorPHP4() {
+		Inflector::rules('plural', array(
+			'rules' => array(),
+			'irregular' => array(),
+			'uninflected' => array('pays')
+		));
+	}
+
+/**
+ * testCustomPluralRule method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomPluralRule() {
+		Inflector::rules('plural', array('/^(custom)$/i' => '\1izables'));
+		$this->assertEqual(Inflector::pluralize('custom'), 'customizables');
+
+		Inflector::rules('plural', array('uninflected' => array('uninflectable')));
+		$this->assertEqual(Inflector::pluralize('uninflectable'), 'uninflectable');
+
+		Inflector::rules('plural', array(
+			'rules' => array('/^(alert)$/i' => '\1ables'),
+			'uninflected' => array('noflect', 'abtuse'),
+			'irregular' => array('amaze' => 'amazable', 'phone' => 'phonezes')
+		));
+		$this->assertEqual(Inflector::pluralize('noflect'), 'noflect');
+		$this->assertEqual(Inflector::pluralize('abtuse'), 'abtuse');
+		$this->assertEqual(Inflector::pluralize('alert'), 'alertables');
+		$this->assertEqual(Inflector::pluralize('amaze'), 'amazable');
+		$this->assertEqual(Inflector::pluralize('phone'), 'phonezes');
+	}
+
+/**
+ * testCustomSingularRule method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomSingularRule() {
+		Inflector::rules('singular', array('/(eple)r$/i' => '\1', '/(jente)r$/i' => '\1'));
+
+		$this->assertEqual(Inflector::singularize('epler'), 'eple');
+		$this->assertEqual(Inflector::singularize('jenter'), 'jente');
+
+		Inflector::rules('singular', array(
+			'rules' => array('/^(bil)er$/i' => '\1', '/^(inflec|contribu)tors$/i' => '\1ta'),
+			'uninflected' => array('singulars'),
+			'irregular' => array('spins' => 'spinor')
+		));
+
+		$this->assertEqual(Inflector::singularize('inflectors'), 'inflecta');
+		$this->assertEqual(Inflector::singularize('contributors'), 'contributa');
+		$this->assertEqual(Inflector::singularize('spins'), 'spinor');
+		$this->assertEqual(Inflector::singularize('singulars'), 'singulars');
+	}
+
+/**
+ * testCustomTransliterationRule method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomTransliterationRule() {
+		$this->assertEqual(Inflector::slug('Testing æ ø å'), 'Testing_ae_o_a');
+
+		Inflector::rules('transliteration', array('/å/' => 'aa', '/ø/' => 'oe'));
+		$this->assertEqual(Inflector::slug('Testing æ ø å'), 'Testing_ae_oe_aa');
+
+		Inflector::rules('transliteration', array('/ä|æ/' => 'ae', '/å/' => 'aa'), true);
+		$this->assertEqual(Inflector::slug('Testing æ ø å'), 'Testing_ae_ø_aa');
+
+		$this->assertEqual(Inflector::slug('Testing æ ø å', '-', array('/ø/' => 'oe')), 'Testing-ae-oe-aa');
+	}
+
+/**
+ * test that setting new rules clears the inflector caches.
+ *
+ * @return void
+ */
+	function testRulesClearsCaches() {
+		$this->assertEqual(Inflector::singularize('Bananas'), 'Banana');
+		$this->assertEqual(Inflector::tableize('Banana'), 'bananas');
+		$this->assertEqual(Inflector::pluralize('Banana'), 'Bananas');
+
+		Inflector::rules('singular', array(
+			'rules' => array('/(.*)nas$/i' => '\1zzz')
+		));
+		$this->assertEqual(Inflector::singularize('Bananas'), 'Banazzz', 'Was inflected with old rules. %s');
+
+		Inflector::rules('plural', array(
+			'rules' => array('/(.*)na$/i' => '\1zzz')
+		));
+		$this->assertEqual(Inflector::pluralize('Banana'), 'Banazzz', 'Was inflected with old rules. %s');
+	}
+
+/**
+ * Test resetting inflection rules.
+ *
+ * @return void
+ */
+	function testCustomRuleWithReset() {
+		$uninflected = array('atlas', 'lapis', 'onibus', 'pires', 'virus', '.*x');
+		$pluralIrregular = array('as' => 'ases');
+
+		Inflector::rules('singular', array(
+			'rules' => array('/^(.*)(a|e|o|u)is$/i' => '\1\2l'),
+			'uninflected' => $uninflected,
+		), true);
+
+		Inflector::rules('plural', array(
+			'rules' => array(
+				'/^(.*)(a|e|o|u)l$/i' => '\1\2is',
+			),
+			'uninflected' => $uninflected,
+			'irregular' => $pluralIrregular
+		), true);
+
+		$this->assertEqual(Inflector::pluralize('Alcool'), 'Alcoois');
+		$this->assertEqual(Inflector::pluralize('Atlas'), 'Atlas');
+		$this->assertEqual(Inflector::singularize('Alcoois'), 'Alcool');
+		$this->assertEqual(Inflector::singularize('Atlas'), 'Atlas');
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/l10n.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/l10n.test.php
new file mode 100644
index 000000000..4b8483d4b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/l10n.test.php
@@ -0,0 +1,958 @@
+<?php
+/**
+ * L10nTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'l10n');
+
+/**
+ * L10nTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class L10nTest extends CakeTestCase {
+
+/**
+ * testGet method
+ *
+ * @access public
+ * @return void
+ */
+	function testGet() {
+		$l10n =& new L10n();
+
+		// Catalog Entry
+		$l10n->get('en');
+
+		$this->assertEqual($l10n->language, 'English');
+		$this->assertEqual($l10n->languagePath, array('eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'eng');
+
+		// Map Entry
+		$l10n->get('eng');
+
+		$this->assertEqual($l10n->language, 'English');
+		$this->assertEqual($l10n->languagePath, array('eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'eng');
+
+		// Catalog Entry
+		$l10n->get('en-ca');
+
+		$this->assertEqual($l10n->language, 'English (Canadian)');
+		$this->assertEqual($l10n->languagePath, array('en_ca', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_ca');
+
+		// Default Entry
+		define('DEFAULT_LANGUAGE', 'en-us');
+
+		$l10n->get('use_default');
+
+		$this->assertEqual($l10n->language, 'English (United States)');
+		$this->assertEqual($l10n->languagePath, array('en_us', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_us');
+
+		$l10n->get('es');
+		$l10n->get('');
+		$this->assertEqual($l10n->lang, 'en-us');
+
+
+		// Using $this->default
+		$l10n = new L10n();
+
+		$l10n->get('use_default');
+		$this->assertEqual($l10n->language, 'English (United States)');
+		$this->assertEqual($l10n->languagePath, array('en_us', 'eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_us');
+	}
+
+/**
+ * testGetAutoLanguage method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetAutoLanguage() {
+		$__SERVER = $_SERVER;
+		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'inexistent,en-ca';
+
+		$l10n =& new L10n();
+		$l10n->get();
+
+		$this->assertEqual($l10n->language, 'English (Canadian)');
+		$this->assertEqual($l10n->languagePath, array('en_ca', 'eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'en_ca');
+
+		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'es_mx';
+		$l10n->get();
+
+		$this->assertEqual($l10n->language, 'Spanish (Mexican)');
+		$this->assertEqual($l10n->languagePath, array('es_mx', 'spa', 'eng'));
+		$this->assertEqual($l10n->locale, 'es_mx');
+
+		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en_xy,en_ca';
+		$l10n->get();
+
+		$this->assertEqual($l10n->language, 'English');
+		$this->assertEqual($l10n->languagePath, array('eng', 'eng', 'eng'));
+		$this->assertEqual($l10n->locale, 'eng');
+
+		$_SERVER = $__SERVER;
+	}
+
+/**
+ * testMap method
+ *
+ * @access public
+ * @return void
+ */
+	function testMap() {
+		$l10n =& new L10n();
+
+		$result = $l10n->map(array('afr', 'af'));
+		$expected = array('afr' => 'af', 'af' => 'afr');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('alb', 'sq'));
+		$expected = array('alb' => 'sq', 'sq' => 'alb');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ara', 'ar'));
+		$expected = array('ara' => 'ar', 'ar' => 'ara');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('hye', 'hy'));
+		$expected = array('hye' => 'hy', 'hy' => 'hye');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('baq', 'eu'));
+		$expected = array('baq' => 'eu', 'eu' => 'baq');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('baq', 'eu'));
+		$expected = array('baq' => 'eu', 'eu' => 'baq');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('bos', 'bs'));
+		$expected = array('bos' => 'bs', 'bs' => 'bos');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('bul', 'bg'));
+		$expected = array('bul' => 'bg', 'bg' => 'bul');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('bel', 'be'));
+		$expected = array('bel' => 'be', 'be' => 'bel');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('cat', 'ca'));
+		$expected = array('cat' => 'ca', 'ca' => 'cat');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('chi', 'zh'));
+		$expected = array('chi' => 'zh', 'zh' => 'chi');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('zho', 'zh'));
+		$expected = array('zho' => 'zh', 'zh' => 'chi');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('hrv', 'hr'));
+		$expected = array('hrv' => 'hr', 'hr' => 'hrv');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ces', 'cs'));
+		$expected = array('ces' => 'cs', 'cs' => 'cze');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('cze', 'cs'));
+		$expected = array('cze' => 'cs', 'cs' => 'cze');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('dan', 'da'));
+		$expected = array('dan' => 'da', 'da' => 'dan');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('dut', 'nl'));
+		$expected = array('dut' => 'nl', 'nl' => 'dut');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('nld', 'nl'));
+		$expected = array('nld' => 'nl', 'nl' => 'dut');
+		$this->assertEqual($result, $expected);
+		
+		$result = $l10n->map(array('nld'));
+		$expected = array('nld' => 'nl');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('eng', 'en'));
+		$expected = array('eng' => 'en', 'en' => 'eng');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('est', 'et'));
+		$expected = array('est' => 'et', 'et' => 'est');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('fao', 'fo'));
+		$expected = array('fao' => 'fo', 'fo' => 'fao');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('fas', 'fa'));
+		$expected = array('fas' => 'fa', 'fa' => 'fas');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('per', 'fa'));
+		$expected = array('per' => 'fa', 'fa' => 'fas');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('fin', 'fi'));
+		$expected = array('fin' => 'fi', 'fi' => 'fin');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('fra', 'fr'));
+		$expected = array('fra' => 'fr', 'fr' => 'fre');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('fre', 'fr'));
+		$expected = array('fre' => 'fr', 'fr' => 'fre');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('gla', 'gd'));
+		$expected = array('gla' => 'gd', 'gd' => 'gla');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('glg', 'gl'));
+		$expected = array('glg' => 'gl', 'gl' => 'glg');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('deu', 'de'));
+		$expected = array('deu' => 'de', 'de' => 'deu');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ger', 'de'));
+		$expected = array('ger' => 'de', 'de' => 'deu');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ell', 'el'));
+		$expected = array('ell' => 'el', 'el' => 'gre');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('gre', 'el'));
+		$expected = array('gre' => 'el', 'el' => 'gre');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('heb', 'he'));
+		$expected = array('heb' => 'he', 'he' => 'heb');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('hin', 'hi'));
+		$expected = array('hin' => 'hi', 'hi' => 'hin');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('hun', 'hu'));
+		$expected = array('hun' => 'hu', 'hu' => 'hun');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ice', 'is'));
+		$expected = array('ice' => 'is', 'is' => 'ice');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('isl', 'is'));
+		$expected = array('isl' => 'is', 'is' => 'ice');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ind', 'id'));
+		$expected = array('ind' => 'id', 'id' => 'ind');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('gle', 'ga'));
+		$expected = array('gle' => 'ga', 'ga' => 'gle');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ita', 'it'));
+		$expected = array('ita' => 'it', 'it' => 'ita');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('jpn', 'ja'));
+		$expected = array('jpn' => 'ja', 'ja' => 'jpn');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('kor', 'ko'));
+		$expected = array('kor' => 'ko', 'ko' => 'kor');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('lav', 'lv'));
+		$expected = array('lav' => 'lv', 'lv' => 'lav');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('lit', 'lt'));
+		$expected = array('lit' => 'lt', 'lt' => 'lit');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('mac', 'mk'));
+		$expected = array('mac' => 'mk', 'mk' => 'mac');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('mkd', 'mk'));
+		$expected = array('mkd' => 'mk', 'mk' => 'mac');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('may', 'ms'));
+		$expected = array('may' => 'ms', 'ms' => 'may');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('msa', 'ms'));
+		$expected = array('msa' => 'ms', 'ms' => 'may');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('mlt', 'mt'));
+		$expected = array('mlt' => 'mt', 'mt' => 'mlt');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('nor', 'no'));
+		$expected = array('nor' => 'no', 'no' => 'nor');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('nob', 'nb'));
+		$expected = array('nob' => 'nb', 'nb' => 'nob');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('nno', 'nn'));
+		$expected = array('nno' => 'nn', 'nn' => 'nno');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('pol', 'pl'));
+		$expected = array('pol' => 'pl', 'pl' => 'pol');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('por', 'pt'));
+		$expected = array('por' => 'pt', 'pt' => 'por');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('roh', 'rm'));
+		$expected = array('roh' => 'rm', 'rm' => 'roh');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ron', 'ro'));
+		$expected = array('ron' => 'ro', 'ro' => 'rum');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('rum', 'ro'));
+		$expected = array('rum' => 'ro', 'ro' => 'rum');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('rus', 'ru'));
+		$expected = array('rus' => 'ru', 'ru' => 'rus');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('smi', 'sz'));
+		$expected = array('smi' => 'sz', 'sz' => 'smi');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('scc', 'sr'));
+		$expected = array('scc' => 'sr', 'sr' => 'scc');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('srp', 'sr'));
+		$expected = array('srp' => 'sr', 'sr' => 'scc');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('slk', 'sk'));
+		$expected = array('slk' => 'sk', 'sk' => 'slo');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('slo', 'sk'));
+		$expected = array('slo' => 'sk', 'sk' => 'slo');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('slv', 'sl'));
+		$expected = array('slv' => 'sl', 'sl' => 'slv');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('wen', 'sb'));
+		$expected = array('wen' => 'sb', 'sb' => 'wen');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('spa', 'es'));
+		$expected = array('spa' => 'es', 'es' => 'spa');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('swe', 'sv'));
+		$expected = array('swe' => 'sv', 'sv' => 'swe');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('tha', 'th'));
+		$expected = array('tha' => 'th', 'th' => 'tha');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('tso', 'ts'));
+		$expected = array('tso' => 'ts', 'ts' => 'tso');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('tsn', 'tn'));
+		$expected = array('tsn' => 'tn', 'tn' => 'tsn');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('tur', 'tr'));
+		$expected = array('tur' => 'tr', 'tr' => 'tur');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ukr', 'uk'));
+		$expected = array('ukr' => 'uk', 'uk' => 'ukr');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('urd', 'ur'));
+		$expected = array('urd' => 'ur', 'ur' => 'urd');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('ven', 've'));
+		$expected = array('ven' => 've', 've' => 'ven');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('vie', 'vi'));
+		$expected = array('vie' => 'vi', 'vi' => 'vie');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('xho', 'xh'));
+		$expected = array('xho' => 'xh', 'xh' => 'xho');
+		$this->assertEqual($result, $expected);
+	
+		$result = $l10n->map(array('cy', 'cym'));
+		$expected = array('cym' => 'cy', 'cy' => 'cym');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('yid', 'yi'));
+		$expected = array('yid' => 'yi', 'yi' => 'yid');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->map(array('zul', 'zu'));
+		$expected = array('zul' => 'zu', 'zu' => 'zul');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testCatalog method
+ *
+ * @access public
+ * @return void
+ */
+	function testCatalog() {
+		$l10n =& new L10n();
+
+		$result = $l10n->catalog(array('af'));
+		$expected = array(
+			'af' => array('language' => 'Afrikaans', 'locale' => 'afr', 'localeFallback' => 'afr', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ar', 'ar-ae', 'ar-bh', 'ar-dz', 'ar-eg', 'ar-iq', 'ar-jo', 'ar-kw', 'ar-lb', 'ar-ly', 'ar-ma',
+			'ar-om', 'ar-qa', 'ar-sa', 'ar-sy', 'ar-tn', 'ar-ye'));
+		$expected = array(
+			'ar' => array('language' => 'Arabic', 'locale' => 'ara', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-ae' => array('language' => 'Arabic (U.A.E.)', 'locale' => 'ar_ae', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-bh' => array('language' => 'Arabic (Bahrain)', 'locale' => 'ar_bh', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-dz' => array('language' => 'Arabic (Algeria)', 'locale' => 'ar_dz', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-eg' => array('language' => 'Arabic (Egypt)', 'locale' => 'ar_eg', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-iq' => array('language' => 'Arabic (Iraq)', 'locale' => 'ar_iq', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-jo' => array('language' => 'Arabic (Jordan)', 'locale' => 'ar_jo', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-kw' => array('language' => 'Arabic (Kuwait)', 'locale' => 'ar_kw', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-lb' => array('language' => 'Arabic (Lebanon)', 'locale' => 'ar_lb', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-ly' => array('language' => 'Arabic (Libya)', 'locale' => 'ar_ly', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-ma' => array('language' => 'Arabic (Morocco)', 'locale' => 'ar_ma', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-om' => array('language' => 'Arabic (Oman)', 'locale' => 'ar_om', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-qa' => array('language' => 'Arabic (Qatar)', 'locale' => 'ar_qa', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-sa' => array('language' => 'Arabic (Saudi Arabia)', 'locale' => 'ar_sa', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-sy' => array('language' => 'Arabic (Syria)', 'locale' => 'ar_sy', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-tn' => array('language' => 'Arabic (Tunisia)', 'locale' => 'ar_tn', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'ar-ye' => array('language' => 'Arabic (Yemen)', 'locale' => 'ar_ye', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('be'));
+		$expected = array(
+			'be' => array('language' => 'Byelorussian', 'locale' => 'bel', 'localeFallback' => 'bel', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('bg'));
+		$expected = array(
+			'bg' => array('language' => 'Bulgarian', 'locale' => 'bul', 'localeFallback' => 'bul', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('bs'));
+		$expected = array(
+			'bs' => array('language' => 'Bosnian', 'locale' => 'bos', 'localeFallback' => 'bos', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ca'));
+		$expected = array(
+			'ca' => array('language' => 'Catalan', 'locale' => 'cat', 'localeFallback' => 'cat', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('cs'));
+		$expected = array(
+			'cs' => array('language' => 'Czech', 'locale' => 'cze', 'localeFallback' => 'cze', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('da'));
+		$expected = array(
+			'da' => array('language' => 'Danish', 'locale' => 'dan', 'localeFallback' => 'dan', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('de', 'de-at', 'de-ch', 'de-de', 'de-li', 'de-lu'));
+		$expected = array(
+			'de' => array('language' => 'German (Standard)', 'locale' => 'deu', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'de-at' => array('language' => 'German (Austria)', 'locale' => 'de_at', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'de-ch' => array('language' => 'German (Swiss)', 'locale' => 'de_ch', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'de-de' => array('language' => 'German (Germany)', 'locale' => 'de_de', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'de-li' => array('language' => 'German (Liechtenstein)', 'locale' => 'de_li', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'de-lu' => array('language' => 'German (Luxembourg)', 'locale' => 'de_lu', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('e', 'el'));
+		$expected = array(
+			'e' => array('language' => 'Greek', 'locale' => 'gre', 'localeFallback' => 'gre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'el' => array('language' => 'Greek', 'locale' => 'gre', 'localeFallback' => 'gre', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('en', 'en-au', 'en-bz', 'en-ca', 'en-gb', 'en-ie', 'en-jm', 'en-nz', 'en-tt', 'en-us', 'en-za'));
+		$expected = array(
+			'en' => array('language' => 'English', 'locale' => 'eng', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-au' => array('language' => 'English (Australian)', 'locale' => 'en_au', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-bz' => array('language' => 'English (Belize)', 'locale' => 'en_bz', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-ca' => array('language' => 'English (Canadian)', 'locale' => 'en_ca', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-gb' => array('language' => 'English (British)', 'locale' => 'en_gb', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-ie' => array('language' => 'English (Ireland)', 'locale' => 'en_ie', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-jm' => array('language' => 'English (Jamaica)', 'locale' => 'en_jm', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-nz' => array('language' => 'English (New Zealand)', 'locale' => 'en_nz', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-tt' => array('language' => 'English (Trinidad)', 'locale' => 'en_tt', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-us' => array('language' => 'English (United States)', 'locale' => 'en_us', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'en-za' => array('language' => 'English (South Africa)', 'locale' => 'en_za', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('es', 'es-ar', 'es-bo', 'es-cl', 'es-co', 'es-cr', 'es-do', 'es-ec', 'es-es', 'es-gt', 'es-hn',
+			'es-mx', 'es-ni', 'es-pa', 'es-pe', 'es-pr', 'es-py', 'es-sv', 'es-uy', 'es-ve'));
+		$expected = array(
+			'es' => array('language' => 'Spanish (Spain - Traditional)', 'locale' => 'spa', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-ar' => array('language' => 'Spanish (Argentina)', 'locale' => 'es_ar', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-bo' => array('language' => 'Spanish (Bolivia)', 'locale' => 'es_bo', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-cl' => array('language' => 'Spanish (Chile)', 'locale' => 'es_cl', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-co' => array('language' => 'Spanish (Colombia)', 'locale' => 'es_co', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-cr' => array('language' => 'Spanish (Costa Rica)', 'locale' => 'es_cr', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-do' => array('language' => 'Spanish (Dominican Republic)', 'locale' => 'es_do', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-ec' => array('language' => 'Spanish (Ecuador)', 'locale' => 'es_ec', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-es' => array('language' => 'Spanish (Spain)', 'locale' => 'es_es', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-gt' => array('language' => 'Spanish (Guatemala)', 'locale' => 'es_gt', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-hn' => array('language' => 'Spanish (Honduras)', 'locale' => 'es_hn', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-mx' => array('language' => 'Spanish (Mexican)', 'locale' => 'es_mx', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-ni' => array('language' => 'Spanish (Nicaragua)', 'locale' => 'es_ni', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-pa' => array('language' => 'Spanish (Panama)', 'locale' => 'es_pa', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-pe' => array('language' => 'Spanish (Peru)', 'locale' => 'es_pe', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-pr' => array('language' => 'Spanish (Puerto Rico)', 'locale' => 'es_pr', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-py' => array('language' => 'Spanish (Paraguay)', 'locale' => 'es_py', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-sv' => array('language' => 'Spanish (El Salvador)', 'locale' => 'es_sv', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-uy' => array('language' => 'Spanish (Uruguay)', 'locale' => 'es_uy', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-ve' => array('language' => 'Spanish (Venezuela)', 'locale' => 'es_ve', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('et'));
+		$expected = array(
+			'et' => array('language' => 'Estonian', 'locale' => 'est', 'localeFallback' => 'est', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('eu'));
+		$expected = array(
+			'eu' => array('language' => 'Basque', 'locale' => 'baq', 'localeFallback' => 'baq', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('fa'));
+		$expected = array(
+			'fa' => array('language' => 'Farsi', 'locale' => 'per', 'localeFallback' => 'per', 'charset' => 'utf-8', 'direction' => 'rtl')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('fi'));
+		$expected = array(
+			'fi' => array('language' => 'Finnish', 'locale' => 'fin', 'localeFallback' => 'fin', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('fo'));
+		$expected = array(
+			'fo' => array('language' => 'Faeroese', 'locale' => 'fao', 'localeFallback' => 'fao', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('fr', 'fr-be', 'fr-ca', 'fr-ch', 'fr-fr', 'fr-lu'));
+		$expected = array(
+			'fr' => array('language' => 'French (Standard)', 'locale' => 'fre', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'fr-be' => array('language' => 'French (Belgium)', 'locale' => 'fr_be', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'fr-ca' => array('language' => 'French (Canadian)', 'locale' => 'fr_ca', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'fr-ch' => array('language' => 'French (Swiss)', 'locale' => 'fr_ch', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'fr-fr' => array('language' => 'French (France)', 'locale' => 'fr_fr', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'fr-lu' => array('language' => 'French (Luxembourg)', 'locale' => 'fr_lu', 'localeFallback' => 'fre', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ga'));
+		$expected = array(
+			'ga' => array('language' => 'Irish', 'locale' => 'gle', 'localeFallback' => 'gle', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('gd', 'gd-ie'));
+		$expected = array(
+			'gd' => array('language' => 'Gaelic (Scots)', 'locale' => 'gla', 'localeFallback' => 'gla', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'gd-ie' => array('language' => 'Gaelic (Irish)', 'locale' => 'gd_ie', 'localeFallback' => 'gla', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('gl'));
+		$expected = array(
+			'gl' => array('language' => 'Galician', 'locale' => 'glg', 'localeFallback' => 'glg', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('he'));
+		$expected = array(
+			'he' => array('language' => 'Hebrew', 'locale' => 'heb', 'localeFallback' => 'heb', 'charset' => 'utf-8', 'direction' => 'rtl')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('hi'));
+		$expected = array(
+			'hi' => array('language' => 'Hindi', 'locale' => 'hin', 'localeFallback' => 'hin', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('hr'));
+		$expected = array(
+			'hr' => array('language' => 'Croatian', 'locale' => 'hrv', 'localeFallback' => 'hrv', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('hu'));
+		$expected = array(
+			'hu' => array('language' => 'Hungarian', 'locale' => 'hun', 'localeFallback' => 'hun', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('hy'));
+		$expected = array(
+			'hy' => array('language' => 'Armenian - Armenia', 'locale' => 'hye', 'localeFallback' => 'hye', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('id', 'in'));
+		$expected = array(
+			'id' => array('language' => 'Indonesian', 'locale' => 'ind', 'localeFallback' => 'ind', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'in' => array('language' => 'Indonesian', 'locale' => 'ind', 'localeFallback' => 'ind', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('is'));
+		$expected = array(
+			'is' => array('language' => 'Icelandic', 'locale' => 'ice', 'localeFallback' => 'ice', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('it', 'it-ch'));
+		$expected = array(
+			'it' => array('language' => 'Italian', 'locale' => 'ita', 'localeFallback' => 'ita', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'it-ch' => array('language' => 'Italian (Swiss) ', 'locale' => 'it_ch', 'localeFallback' => 'ita', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ja'));
+		$expected = array(
+			'ja' => array('language' => 'Japanese', 'locale' => 'jpn', 'localeFallback' => 'jpn', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ko', 'ko-kp', 'ko-kr'));
+		$expected = array(
+			'ko' => array('language' => 'Korean', 'locale' => 'kor', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
+			'ko-kp' => array('language' => 'Korea (North)', 'locale' => 'ko_kp', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
+			'ko-kr' => array('language' => 'Korea (South)', 'locale' => 'ko_kr', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('koi8-r', 'ru', 'ru-mo'));
+		$expected = array(
+			'koi8-r' => array('language' => 'Russian', 'locale' => 'koi8_r', 'localeFallback' => 'rus', 'charset' => 'koi8-r', 'direction' => 'ltr'),
+			'ru' => array('language' => 'Russian', 'locale' => 'rus', 'localeFallback' => 'rus', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'ru-mo' => array('language' => 'Russian (Moldavia)', 'locale' => 'ru_mo', 'localeFallback' => 'rus', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('lt'));
+		$expected = array(
+			'lt' => array('language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('lv'));
+		$expected = array(
+			'lv' => array('language' => 'Latvian', 'locale' => 'lav', 'localeFallback' => 'lav', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('mk', 'mk-mk'));
+		$expected = array(
+			'mk' => array('language' => 'FYRO Macedonian', 'locale' => 'mk', 'localeFallback' => 'mac', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'mk-mk' => array('language' => 'Macedonian', 'locale' => 'mk_mk', 'localeFallback' => 'mac', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ms'));
+		$expected = array(
+			'ms' => array('language' => 'Malaysian', 'locale' => 'may', 'localeFallback' => 'may', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('mt'));
+		$expected = array(
+			'mt' => array('language' => 'Maltese', 'locale' => 'mlt', 'localeFallback' => 'mlt', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('n', 'nl', 'nl-be'));
+		$expected = array(
+			'n' => array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'nl' => array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'nl-be' => array('language' => 'Dutch (Belgium)', 'locale' => 'nl_be', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog('nl');
+		$expected = array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog('nld');
+		$expected = array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog('dut');
+		$expected = array('language' => 'Dutch (Standard)', 'locale' => 'dut', 'localeFallback' => 'dut', 'charset' => 'utf-8', 'direction' => 'ltr');
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('nb'));
+		$expected = array(
+			'nb' => array('language' => 'Norwegian Bokmal', 'locale' => 'nob', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('nn', 'no'));
+		$expected = array(
+			'nn' => array('language' => 'Norwegian Nynorsk', 'locale' => 'nno', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'no' => array('language' => 'Norwegian', 'locale' => 'nor', 'localeFallback' => 'nor', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('p', 'pl'));
+		$expected = array(
+			'p' => array('language' => 'Polish', 'locale' => 'pol', 'localeFallback' => 'pol', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'pl' => array('language' => 'Polish', 'locale' => 'pol', 'localeFallback' => 'pol', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('pt', 'pt-br'));
+		$expected = array(
+			'pt' => array('language' => 'Portuguese (Portugal)', 'locale' => 'por', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'pt-br' => array('language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('rm'));
+		$expected = array(
+			'rm' => array('language' => 'Rhaeto-Romanic', 'locale' => 'roh', 'localeFallback' => 'roh', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ro', 'ro-mo'));
+		$expected = array(
+			'ro' => array('language' => 'Romanian', 'locale' => 'rum', 'localeFallback' => 'rum', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'ro-mo' => array('language' => 'Romanian (Moldavia)', 'locale' => 'ro_mo', 'localeFallback' => 'rum', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sb'));
+		$expected = array(
+			'sb' => array('language' => 'Sorbian', 'locale' => 'wen', 'localeFallback' => 'wen', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sk'));
+		$expected = array(
+			'sk' => array('language' => 'Slovak', 'locale' => 'slo', 'localeFallback' => 'slo', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sl'));
+		$expected = array(
+			'sl' => array('language' => 'Slovenian', 'locale' => 'slv', 'localeFallback' => 'slv', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sq'));
+		$expected = array(
+			'sq' => array('language' => 'Albanian', 'locale' => 'alb', 'localeFallback' => 'alb', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sr'));
+		$expected = array(
+			'sr' => array('language' => 'Serbian', 'locale' => 'scc', 'localeFallback' => 'scc', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sv', 'sv-fi'));
+		$expected = array(
+			'sv' => array('language' => 'Swedish', 'locale' => 'swe', 'localeFallback' => 'swe', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'sv-fi' => array('language' => 'Swedish (Finland)', 'locale' => 'sv_fi', 'localeFallback' => 'swe', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sx'));
+		$expected = array(
+			'sx' => array('language' => 'Sutu', 'locale' => 'sx', 'localeFallback' => 'sx', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('sz'));
+		$expected = array(
+			'sz' => array('language' => 'Sami (Lappish)', 'locale' => 'smi', 'localeFallback' => 'smi', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('th'));
+		$expected = array(
+			'th' => array('language' => 'Thai', 'locale' => 'tha', 'localeFallback' => 'tha', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('tn'));
+		$expected = array(
+			'tn' => array('language' => 'Tswana', 'locale' => 'tsn', 'localeFallback' => 'tsn', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('tr'));
+		$expected = array(
+			'tr' => array('language' => 'Turkish', 'locale' => 'tur', 'localeFallback' => 'tur', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ts'));
+		$expected = array(
+			'ts' => array('language' => 'Tsonga', 'locale' => 'tso', 'localeFallback' => 'tso', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('uk'));
+		$expected = array(
+			'uk' => array('language' => 'Ukrainian', 'locale' => 'ukr', 'localeFallback' => 'ukr', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ur'));
+		$expected = array(
+			'ur' => array('language' => 'Urdu', 'locale' => 'urd', 'localeFallback' => 'urd', 'charset' => 'utf-8', 'direction' => 'rtl')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('ve'));
+		$expected = array(
+			've' => array('language' => 'Venda', 'locale' => 'ven', 'localeFallback' => 'ven', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('vi'));
+		$expected = array(
+			'vi' => array('language' => 'Vietnamese', 'locale' => 'vie', 'localeFallback' => 'vie', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('cy'));
+		$expected = array(
+			'cy' => array('language' => 'Welsh', 'locale' => 'cym', 'localeFallback' => 'cym', 'charset' => 'utf-8',
+'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('xh'));
+		$expected = array(
+			'xh' => array('language' => 'Xhosa', 'locale' => 'xho', 'localeFallback' => 'xho', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('yi'));
+		$expected = array(
+			'yi' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('zh', 'zh-cn', 'zh-hk', 'zh-sg', 'zh-tw'));
+		$expected = array(
+			'zh' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'zh-cn' => array('language' => 'Chinese (PRC)', 'locale' => 'zh_cn', 'localeFallback' => 'chi', 'charset' => 'GB2312', 'direction' => 'ltr'),
+			'zh-hk' => array('language' => 'Chinese (Hong Kong)', 'locale' => 'zh_hk', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'zh-sg' => array('language' => 'Chinese (Singapore)', 'locale' => 'zh_sg', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'zh-tw' => array('language' => 'Chinese (Taiwan)', 'locale' => 'zh_tw', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('zu'));
+		$expected = array(
+			'zu' => array('language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $l10n->catalog(array('en-nz', 'es-do', 'sz', 'ar-lb', 'zh-hk', 'pt-br'));
+		$expected = array(
+			'en-nz' => array('language' => 'English (New Zealand)', 'locale' => 'en_nz', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'es-do' => array('language' => 'Spanish (Dominican Republic)', 'locale' => 'es_do', 'localeFallback' => 'spa', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'sz' => array('language' => 'Sami (Lappish)', 'locale' => 'smi', 'localeFallback' => 'smi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'ar-lb' => array('language' => 'Arabic (Lebanon)', 'locale' => 'ar_lb', 'localeFallback' => 'ara', 'charset' => 'utf-8', 'direction' => 'rtl'),
+			'zh-hk' => array('language' => 'Chinese (Hong Kong)', 'locale' => 'zh_hk', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'pt-br' => array('language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+		
+		$result = $l10n->catalog(array('eng', 'deu', 'zho', 'rum', 'zul', 'yid'));
+		$expected = array(
+			'eng' => array('language' => 'English', 'locale' => 'eng', 'localeFallback' => 'eng', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'deu' => array('language' => 'German (Standard)', 'locale' => 'deu', 'localeFallback' => 'deu', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'zho' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'rum' => array('language' => 'Romanian', 'locale' => 'rum', 'localeFallback' => 'rum', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'zul' => array('language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8', 'direction' => 'ltr'),
+			'yid' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8', 'direction' => 'ltr')
+		);
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/log/file_log.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/log/file_log.test.php
new file mode 100644
index 000000000..d14eee9b9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/log/file_log.test.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * FileLogTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.log
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once LIBS . 'log' . DS . 'file_log.php';
+
+/**
+ * CakeLogTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class FileLogTest extends CakeTestCase {
+
+/**
+ * testLogFileWriting method
+ *
+ * @access public
+ * @return void
+ */
+	function testLogFileWriting() {
+		@unlink(LOGS . 'error.log');
+		$log =& new FileLog();
+		$log->write('warning', 'Test warning');
+		$this->assertTrue(file_exists(LOGS . 'error.log'));
+
+		$result = file_get_contents(LOGS . 'error.log');
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning/', $result);
+		unlink(LOGS . 'error.log');
+
+		@unlink(LOGS . 'debug.log');
+		$log->write('debug', 'Test warning');
+		$this->assertTrue(file_exists(LOGS . 'debug.log'));
+
+		$result = file_get_contents(LOGS . 'debug.log');
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Debug: Test warning/', $result);
+		unlink(LOGS . 'debug.log');
+
+		@unlink(LOGS . 'random.log');
+		$log->write('random', 'Test warning');
+		$this->assertTrue(file_exists(LOGS . 'random.log'));
+
+		$result = file_get_contents(LOGS . 'random.log');
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Random: Test warning/', $result);
+		unlink(LOGS . 'random.log');
+	}
+
+/**
+ * test using the path setting to write logs in other places.
+ *
+ * @return void
+ */
+	function testPathSetting() {
+		$path = TMP . 'tests' . DS;
+		@unlink($path . 'error.log');
+
+		$log =& new FileLog(compact('path'));
+		$log->write('warning', 'Test warning');
+		$this->assertTrue(file_exists($path . 'error.log'));
+		unlink($path . 'error.log');
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/magic_db.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/magic_db.test.php
new file mode 100644
index 000000000..c25ee3c63
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/magic_db.test.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * MagicDbTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!class_exists('MagicDb')) {
+	require LIBS . 'magic_db.php';
+}
+/**
+ * The test class for the MagicDb class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class MagicDbTest extends UnitTestCase {
+/**
+ * The MagicDb instance to be tested
+ *
+ * @var MagicDb
+ * @access public
+ */
+	var $Db = null;
+/**
+ * Sets up a MagicDb class instance for testing
+ *
+ * @access public
+ */
+	function setUp() {
+		$this->Db =& new MagicDb();
+	}
+/**
+ * MagicDb::analyze should properly detect the file type and output additional info as requested.
+ *
+ * @access public
+ */
+	function testAnalyze() {
+		$r = $this->Db->read(MagicDbTestData::get('magic.db'));
+		$this->assertTrue($r === true);
+
+		$r = $this->Db->analyze(array());
+		$this->assertTrue($r === false);
+
+		$r = $this->Db->analyze(WWW_ROOT.'img'.DS.'cake.icon.gif');
+		// TODO: Check several serialized file samples for accurate detection
+	}
+/**
+ * MagicDb::read should properly read MagicDb databases from .php-/.db-files and plain data arguments passed in and return false if the file wasn't found or
+ * if the readed data did not validate.
+ *
+ * @access public
+ */
+	function testRead() {
+		$this->Db->db = array();
+
+		$r = $this->Db->read(true);
+		$this->assertTrue($r === false);
+		$r = $this->Db->read(5);
+		$this->assertTrue($r === false);
+
+		$this->Db->db = array('a');
+		$r = $this->Db->read(array('foo' => 'bar'));
+		$this->assertTrue($r === false);
+		$this->assertTrue($this->Db->db === array('a'));
+
+		$magicDb = array('header' => array(), 'database' => array());
+		$r = $this->Db->read($magicDb);
+		$this->assertTrue($r === true);
+		$this->assertTrue($this->Db->db === $magicDb);
+
+		// @TODO: Test parsing an actual magic.db file
+
+		$r = $this->Db->read('does-not-exist.db');
+		$this->assertTrue($r === false);
+		$this->assertTrue($this->Db->db === $magicDb);
+
+		if (file_exists(VENDORS.'magic.php')) {
+			$r = $this->Db->read(VENDORS.'magic.php');
+			$this->assertTrue($r === true);
+			$this->assertTrue($this->Db->db === array('header' => array(), 'database' => array()));
+		}
+
+		$r = $this->Db->read(MagicDbTestData::get('magic.snippet.db'));
+		$this->assertTrue($r === true);
+	}
+/**
+ * MagicDb::toArray should either return the MagicDb::db property, or the parsed array data if a magic.db dump is passed in as the first argument
+ *
+ * @access public
+ */
+	function testToArray() {
+		$this->Db->db = array();
+
+		$r = $this->Db->toArray();
+		$this->assertTrue($r === array());
+		$this->Db->db = array('foo' => 'bar');
+		$r = $this->Db->toArray();
+		$this->assertTrue($r === array('foo' => 'bar'));
+
+		$r = $this->Db->toArray(array('yeah'));
+		$this->assertTrue($r === array('yeah'));
+
+		$r = $this->Db->toArray("# FILE_ID DB\r\n# Date:2009-10-10\r\n# Source:xxx.php");
+		$this->assertTrue($r === array());
+
+		$r = $this->Db->toArray('foo');
+		$this->assertTrue($r === array());
+
+		$r = $this->Db->toArray(MagicDbTestData::get('magic.snippet.db'));
+		$this->assertTrue($r === MagicDbTestData::get('magic.snippet.db.result'));
+	}
+/**
+ * The MagicDb::validates function should return if the array passed to it or the local db property contains a valid MagicDb record set
+ *
+ * @access public
+ */
+	function testValidates() {
+		$r = $this->Db->validates(array());
+		$this->assertTrue($r === false);
+
+		$r = $this->Db->validates(array('header' => true, 'database' => true));
+		$this->assertTrue($r === false);
+		$magicDb = array('header' => array(), 'database' => array());
+		$r = $this->Db->validates($magicDb);
+		$this->assertTrue($r === true);
+
+		$this->Db->db = array();
+		$r = $this->Db->validates();
+		$this->assertTrue($r === false);
+
+		$this->Db->db = $magicDb;
+		$r = $this->Db->validates();
+		$this->assertTrue($r === true);
+	}
+}
+/**
+ * Test data holding object for MagicDb tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+/**
+ * MagicDbTestData class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class MagicDbTestData extends Object {
+/**
+ * Base64 encoded data
+ *
+ * @var array
+ * @access public
+ */
+	var $data = array(
+		'magic.snippet.db' => 'IyBGSUxFX0lEIERCDQojIERhdGU6MjAwNS0wMy0yOQ0KIyBTb3VyY2U6aHR0cDovL3d3dy5tYWdpY2RiLm9yZw0KDQojIE1hZ2ljIElEIGZvciBXb3JkcGVyZmVjdCBmaWxlcy4NCiMgU3VibWl0dGVkIG9uIDIwMDQtMDItMTQgYnkgQ2FybA0KMAlzdHJpbmcJXFx4RkZXUEMJW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBoZWxwIGZpbGUNCiY5CWJ5dGUJMHgwMgkNCj4xMCBieXRlCXgJLCB2ZXJzaW9uICVkDQo+MTEJYnl0ZQl4CS4lZA0KDQojIE1hZ2ljIElEIGZvciBXb3JkcGVyZmVjdCBmaWxlcy4NCiMgU3VibWl0dGVkIG9uIDIwMDQtMDItMTQgYnkgQ2FybA0KMAlzdHJpbmcJXFx4RkZXUEMJW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBhcHBsaWNhdGlvbiByZXNvdXJjZSBsaWJyYXJ5DQomOQlieXRlCTUxCQ0KPjEwCWJ5dGUJeAksIHZlcnNpb24gJWQNCj4xMQlieXRlCXgJLiVkDQoNCiMgTWFnaWMgSUQgZm9yIFdvcmRwZXJmZWN0IGZpbGVzLg0KIyBTdWJtaXR0ZWQgb24gMjAwNC0wMi0xNCBieSBDYXJsDQowCXN0cmluZwlcXHhGRldQQwlbZmlkPTAwMDAwMTAwOC0wMC0wMDAwMDAxO2V4dD07bWltZT07XVdvcmRwZXJmZWN0IGJsb2NrIGZpbGUNCiY5CWJ5dGUJMTMJDQo+MTAJYnl0ZQl4CSwgdmVyc2lvbiAlZA0KPjExCWJ5dGUJeAkuJWQ=',
+		'magic.snippet.db.result' => 'YToyOntzOjY6ImhlYWRlciI7YToyOntzOjQ6IkRhdGUiO3M6MTA6IjIwMDUtMDMtMjkiO3M6NjoiU291cmNlIjtzOjIyOiJodHRwOi8vd3d3Lm1hZ2ljZGIub3JnIjt9czo4OiJkYXRhYmFzZSI7YToyOntpOjA7YTo0OntpOjA7YTo0OntpOjA7czoxOiIwIjtpOjE7czo2OiJzdHJpbmciO2k6MjtzOjg6IlxceEZGV1BDIjtpOjM7czo1OToiW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBoZWxwIGZpbGUiO31pOjE7YTo0OntpOjA7czoyOiImOSI7aToxO3M6NDoiYnl0ZSI7aToyO3M6NDoiMHgwMiI7aTozO3M6MDoiIjt9aToyO2E6Mzp7aTowO3M6ODoiPjEwIGJ5dGUiO2k6MTtzOjE6IngiO2k6MjtzOjEyOiIsIHZlcnNpb24gJWQiO31pOjM7YTo0OntpOjA7czozOiI+MTEiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjM6Ii4lZCI7fX1pOjE7YTo0OntpOjA7YTo0OntpOjA7czoxOiIwIjtpOjE7czo2OiJzdHJpbmciO2k6MjtzOjg6IlxceEZGV1BDIjtpOjM7czo3ODoiW2ZpZD0wMDAwMDEwMDgtMDAtMDAwMDAwMTtleHQ9O21pbWU9O11Xb3JkcGVyZmVjdCBhcHBsaWNhdGlvbiByZXNvdXJjZSBsaWJyYXJ5Ijt9aToxO2E6NDp7aTowO3M6MjoiJjkiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjI6IjUxIjtpOjM7czowOiIiO31pOjI7YTo0OntpOjA7czozOiI+MTAiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjEyOiIsIHZlcnNpb24gJWQiO31pOjM7YTo0OntpOjA7czozOiI+MTEiO2k6MTtzOjQ6ImJ5dGUiO2k6MjtzOjE6IngiO2k6MztzOjM6Ii4lZCI7fX19fQ==',
+		'magic.db' => '# FILE_ID DB
# Date:2005-03-29
# Source:http://www.magicdb.org

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect help file
&9	byte	0x02	
>10 byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect application resource library
&9	byte	51	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect block file
&9	byte	13	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect column block
&9	byte	15	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect dictionary file
&9	byte	0x0B	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect dictionary rules file
&9	byte	34	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect external spell code module file
&9	byte	46	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect external spell dictionary file
&9	byte	47	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect Graphics screen driver file
&9	byte	26	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation code module file
&9	byte	23	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation data module file
&9	byte	24	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect hyphenation lex module
&9	byte	27	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect installation information file
&9	byte	41	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect keyboard definition file
&9	byte	0x03	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect macro data file
&9	byte	0x01	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect macro resource file
&9	byte	25	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect printer Q codes (used by VAX/DG)
&9	byte	28	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect rectangular block file
&9	byte	14	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect spell code module rules file
&9	byte	33	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect spell code module word list
&9	byte	29	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect thesarus file
&9	byte	12	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000001;ext=;mime=;]Wordperfect VAX keyboard definition file
&9	byte	0x04	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000ALL;ext=all;mime=;]Wordperfect printer resource file
&9	byte	19	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001001-00-0000CON;ext=con;mime=;]Microsoft Animated cursor, little-endian
&8	string	ACON	

# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001001-00-0000CON;ext=con;mime=;]Microsoft Animated cursor, big-endian
&8	string	ACON	

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DOC;ext=doc;mime=;]Macintosh Wordperfect document file
&9	byte	44	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DOC;ext=doc;mime=;]VAX Wordperfect document file
&9	byte	45	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000DRS;ext=drs;mime=;]Wordperfect display resource file
&9	byte	20	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000FIL;ext=fil;mime=;]Wordperfect overlay file
&9	byte	21	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-14 by Carl
0	string	PMCC	[fid=000001001-00-0000GRP;ext=grp;mime=;]Microsoft windows group file

# Submitted on 2004-02-14 by Carl
0	beshort	0xE310	[fid=000001007-00-000INFO;ext=info;mime=;]Amiga shortcut / icon file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000INS;ext=ins;mime=;]Wordperfect installation information file
&9	byte	43	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-14 by Carl
0	lelong	0x0000004C	[fid=000001001-00-0000LNK;ext=lnk;mime=;]Microsoft Windows shortcut file
&4	string	\\x01\\x14\\x02	

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000PRS;ext=prs;mime=;]Wordperfect printer resource file
&9	byte	16	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000QRS;ext=qrs;mime=;]Wordperfect 5.1 equation resource file
&9	byte	30	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Wordperfect files.
# Submitted on 2004-02-14 by Carl
0	string	\\xFFWPC	[fid=000001008-00-0000SET;ext=set;mime=;]Wordperfect setup data
&9	byte	17	
>10	byte	x	, version %d
>11	byte	x	.%d

# Submitted on 2004-02-08 by Carl
0	string	RIFF	[fid=000001001-0E-0000PAL;ext=pal,riff;mime=;]Microsoft Palette, little-endian
&8	string	PAL	

# Submitted on 2004-02-08 by Carl
0	string	RIFX	[fid=000001001-0E-0000PAL;ext=pal,rifx;mime=;]Microsoft Palette, big-endian
&8	string	PAL	

# Submitted on 2004-03-04 by Carl
0	string	DOS	[fid=000001007-0F-0000ADF;ext=adf;mime=;]AmigaOS File system
&3	byte&0xf8	0	
>3	byte&1	0	, OFS
>3	byte&1	1	, FFS

# Submitted on 2004-05-11 by Carl
0	belong	0x03F3	[fid=000001007-10-LIBRARY;ext=,library;mime=;]Amiga Classic executable file (680x0 family)

# Submitted on 2004-02-11 by Carl
0	string	\\x7fELF	[fid=000000003-10-000000O;ext=,o,so,out;mime=;]Executable linkable file (ELF)
&4	byte	=1	, 32-bit

# Submitted on 2004-02-11 by Carl
0	string	\\x7fELF	[fid=000000003-10-000000O;ext=,o,so,out;mime=;]Executable linkable file (ELF)
&4	byte	=2	, 64-bit

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]New executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]New executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows 3.x New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x02	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows 3.x New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x02	

# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001009-10-0000EXE;ext=exe,dll;mime=;]IBM OS/2 New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x01	

# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001009-10-0000EXE;ext=exe,dll;mime=;]IBM OS/2 New Executable file
&0x18	leshort	>0x3F	
&(60.l)	string	NE	
&(60.l+54)	byte	0x01	

# Magic ID for Microsoft Windows files.
# Submitted on 2004-04-13 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows NT Portable Executable file
&0x18	leshort	0x40	
&(60.l)	string	PE\\x00\\x00	

# Magic ID for Microsoft Windows files.
# Submitted on 2004-04-13 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll;mime=;]Microsoft Windows NT Portable Executable file
&0x18	leshort	0x40	
&(60.l)	string	PE\\x00\\x00	

# Magic ID for Microsoft Windows,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001001-10-0000EXE;ext=exe,dll,drv;mime=;]Microsoft Windows Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LE	

# Magic ID for Microsoft Windows,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001001-10-0000EXE;ext=exe,dll,drv;mime=;]Microsoft Windows Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LE	

# Magic ID for OS/2,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	MZ	[fid=000001009-10-0000EXE;ext=exe,dll,drv;mime=;]OS/2 Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LX	

# Magic ID for OS/2,DOS4GW files.
# Submitted on 2004-04-14 by Carl
0	string	ZM	[fid=000001009-10-0000EXE;ext=exe,dll,drv;mime=;]OS/2 Linear executable
&0x18	leshort	>0x3F	
&(60.l)	string	LX	

# Submitted on 2004-07-30 by Carl
0	string	MSFT	[fid=000001001-10-0000TLB;ext=tlb;mime=;]Microsoft component type library

# Submitted on 2004-05-11 by Carl
0	beshort	0x601A	[fid=000001006-10-0000TTP;ext=ttp,gem,prg;mime=;]Atari MiNT executable/object file
&0x12	string	MiNT	

# Submitted on 2004-05-11 by Carl
0	beshort	0x601A	[fid=000001006-10-0000TTP;ext=ttp,gem,prg;mime=;]Atari TOS executable/object file
&0x12	belong	0x0000	

# Magic ID for Virtual Pascal files.
# Submitted on 2004-07-30 by Carl
0	string	VPI	[fid=000000000-10-0000VPI;ext=vpi;mime=;]Virtual pascal unit file
&0x03	byte	>47	
&0x03	byte	<58	

# Magic ID for Java compiler files.
# Submitted on 2004-05-11 by Carl
0	belong	0xCAFEBABE	[fid=000001011-11-00CLASS;ext=class;mime=;]Javal virtual machine class file
>6	beshort	x	, version %d
>4	beshort	x	.%d

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
0	string	PKG	[fid=000001005-11-0000DCP;ext=dcp;mime=;]Borland Delphi compiled package code file
&0x03	byte	>47	
&0x03	byte	<58	

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
0	string	\\xDF\\x00\\x00\\x0F	[fid=000001005-11-0000DCU;ext=dcu;mime=;]Borland Delphi code unit file

# Magic ID for Turbo Pascal files.
# Submitted on 2004-07-29 by Carl
0	string	TPU9	[fid=000001005-11-0000TPU;ext=tpu;mime=;]Turbo Pascal 6.0 code unit file

# Magic ID for Turbo Pascal, Borland Pascal files.
# Submitted on 2004-07-29 by Carl
0	string	TPUQ	[fid=000001005-11-0000TPU;ext=tpu,tpp,tpw;mime=;]Borland Pascal 7.0 code unit file

# Submitted on 2004-02-15 by Carl
2	string	ADLIB-	[fid=000001016-20-0000BNK;ext=bnk;mime=;]Adlib FM instrument bank file
>0	byte	x	, version %d
>1	byte	x	.%d

# Submitted on 2004-02-16 by Carl
0	string	IBK\\x1A	[fid=000001013-20-0000IBK;ext=ibk;mime=;]Creative Labs FM instrument bank file

# Magic ID for Microsoft Instrument Definition file files.
# Submitted on 2004-03-04 by Carl
0	string	RIFF	[fid=000001001-20-0000IDF;ext=idf;mime=;]Microsoft instrument definition file, little-endian
&8	string	IDF\\ 	

# Magic ID for Microsoft Instrument Definition file files.
# Submitted on 2004-03-04 by Carl
0	string	RIFX	[fid=000001001-20-0000IDF;ext=idf;mime=;]Microsoft instrument definition file, big-endian
&8	string	IDF\\ 	

# Magic ID for Digitrakker files.
# Submitted on 2004-03-04 by Carl
0	string	DIST	[fid=000100088-20-0000IST;ext=ist;mime=;]Digitrakker Instrument file
&4	byte	<2	

# Magic ID for Impulse tracker files.
# Submitted on 2004-03-04 by Carl
0	string	IMPI	[fid=000100032-20-0000ITI;ext=iti;mime=;]Impulse tracker instrument file
>0x20	string	x	[title=%.26s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MI21	[fid=000100091-20-0000MTI;ext=mti;mime=;]Madtracker instrument file

# Magic ID for Gravis Ultrasound files.
# Submitted on 2004-02-15 by Carl
0	string	GF1PATCH100\\0ID#000002\\0	[fid=000001018-20-0000PAT;ext=pat;mime=;]Gravis Ultrasound Patch (old instrument data)

# Magic ID for Gravis Ultrasound files.
# Submitted on 2004-02-15 by Carl
0	string	GF1PATCH110\\0ID#000002\\0	[fid=000001018-20-0000PAT;ext=pat;mime=;]Gravis Ultrasound Patch (instrument data)

# Submitted on 2004-02-15 by Carl
0	string	SBI\\x1A	[fid=000001013-20-0000SBI;ext=sbi;mime=;]Creative Labs FM instrument data file
>4	string	>0	[title=%.32s]

# Magic ID for Sidplay files.
# Submitted on 2004-03-05 by Carl
0	string	SIDPLAY\\ INFOFILE	[fid=000000000-20-0000SID;ext=sid;mime=;]SIDPlayer music file

# Magic ID for Fasttracker 2.0 files.
# Submitted on 2004-02-15 by Carl
0	string	Extended\\ Instrument:\\ 	[fid=000100026-20-00000XI;ext=xi;mime=;]FastTracker II instrument file

# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000001001-21-0000000;ext=;mime=;]MIDI music file, little-endian
&8	string	RMID	

# Submitted on 2004-02-15 by Carl
0	string	RIFX	[fid=000001001-21-0000000;ext=;mime=;]MIDI music file, big-endian
&8	string	RMID	

# Magic ID for Abyss\'s highest experience (AHX) files.
# Submitted on 2004-02-15 by Carl
0	string	THX	[fid=000100029-21-0000AHX;ext=ahx;mime=;]AHX module music file

# Magic ID for Amusic files.
# Submitted on 2004-02-15 by Carl
1062	string	\\x3c\\x6f\\xef\\x51\\x55\\xEE\\x52\\x6F\\x52	[fid=000100034-21-0000AMD;ext=amd;mime=;]Amusic Adlib tracker music file
>0	string	>\\x00	[title=%.23s]
>24	string	>\\0	[creator=%.24s]

# Magic ID for Velvet Studio files.
# Submitted on 2004-02-15 by Carl
0	string	AMShdr\\x1a	[fid=000001276-21-0000AMS;ext=ams;mime=;]Velvet Studio module music file

# Magic ID for Audio visual research files.
# Submitted on 2004-03-04 by Carl
0	string	2BIT	[fid=000001301-21-0000AVR;ext=avr;mime=;]Audio visual research audio file
>4	string	x	[title=%.8s]

# Magic ID for Soundmon files.
# Submitted on 2004-02-15 by Carl
26	string	V.2	[fid=000100028-21-00000BP;ext=bp;mime=;]Soundmon module music file, version 2.x
>0	string	>\\0	[title=%.26s]

# Magic ID for Soundmon files.
# Submitted on 2004-02-15 by Carl
26	string	V.3	[fid=000100028-21-0000BP3;ext=bp3;mime=;]Soundmon module music file, version 3.x
>0	string	>\\0	[title=%.26s]

# Submitted on 2004-02-15 by Carl
0	string	CTMF	[fid=000001013-21-0000CMF;ext=cmf;mime=;]Creative Labs music file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Digibooster files.
# Submitted on 2004-03-04 by Carl
0	string	DIGI Booster module\\0	[fid=000001302-21-000DIGI;ext=digi;mime=;]Digibooster music file
>610	string	x	[title=%.32s]

# Magic ID for Delusion Xtracker files.
# Submitted on 2004-02-15 by Carl
0	string	DDMF	[fid=000000000-21-0000DMF;ext=dmf;mime=;]Delusion tracker module music file
>4	byte	x	, version %d.0
>13	string	>\\0	[title=%.30s]
>43	string	>\\0	[creator=%.20s]

# Magic ID for DOS Sound interface kit (DSIK) files.
# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000000000-21-0000DSM;ext=dsm;mime=;]DOS Sound interface kit module music file
&8	string	DSMF	

# Magic ID for Edlib files.
# Submitted on 2004-03-07 by Carl
0	string	\\x00\\x06\\xFE\\xFD	[fid=000100027-21-0000EDL;ext=edl;mime=;]Edlib FM tracker music file

# Magic ID for Quadra Composer files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000100085-21-0000EMD;ext=emd;mime=;]Enhanced module music file (IFF)
&8	string	EMOD	

# Magic ID for Farandole composer files.
# Submitted on 2004-02-15 by Carl
0	string	FAR\\xFE	[fid=000100087-21-0000FAR;ext=far;mime=;]Farandole composer module music file
>4	string	>\\0	[title=%.40s]

# Magic ID for Funktracker Gold files.
# Submitted on 2004-03-04 by Carl
0	string	Funk	[fid=000100086-21-0000FNK;ext=fnk;mime=;]Funktracker Gold music file

# Magic ID for Bells, Whistles, and Sound Boards files.
# Submitted on 2004-02-16 by Carl
0	string	GDM\\xFE	[fid=000001280-21-0000GDM;ext=gdm;mime=;]General DigiMusic module music file
>4	string	>\\x00	[title=%.32s]

# Magic ID for Graoumf Tracker 2 files.
# Submitted on 2004-02-15 by Carl
0	string	GT2	[fid=000100031-21-0000GT2;ext=gt2;mime=;]Graoumf Tracker module music file

# Magic ID for Imago Morpheus files.
# Submitted on 2004-03-04 by Carl
0x3C	string	IM10	[fid=000001279-21-0000IMF;ext=imf;mime=;]Imago morpheus music file, 32 channels
>0	string	x	[title=%.31s]

# Magic ID for Impulse tracker files.
# Submitted on 2004-02-15 by Carl
0	string	IMPM	[fid=000100032-21-00000IT;ext=it;mime=;]Impulse Tracker module music file
>4	string	>\\x00	[title=%.26s]

# Magic ID for Jamcracker files.
# Submitted on 2004-03-04 by Carl
0	string	BeEp	[fid=000000000-21-0000JAM;ext=jam;mime=;]Jamcracker tracker module music file

# Magic ID for Liquid tracker files.
# Submitted on 2004-03-04 by Carl
0	string	Liquid Module:	[fid=000100090-21-0000LIQ;ext=liq;mime=;]Liquid tracker module music file
&0x40	byte	0x1A	
>0x0E	string	>\\0	[title=%.30s]
>0x2c	string	>\\0	[creator=%.20s]

# Magic ID for Digitrakker files.
# Submitted on 2004-03-04 by Carl
0	string	DMDL	[fid=000100088-21-0000MDL;ext=mdl;mime=;]Digitrakker module music file
&4	byte	<0x12	

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD0	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD1	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Pro Tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD2	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Pro Tracker module music file

# Magic ID for MED Soundstudio / OctaMED files.
# Submitted on 2004-02-15 by Carl
0	string	MMD3	[fid=000001278-21-0000MED;ext=med;mime=;]Octamed Sound Studio module music file

# Magic ID for Musicline files.
# Submitted on 2004-03-05 by Carl
0	string	MLEDMODL	[fid=000001304-21-00000ML;ext=ml;mime=;]Musicline module music file

# Magic ID for Protracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M!K!	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker 2.3 module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Protracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M.K.	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Protracker files.
# Submitted on 2004-03-05 by Carl
0	string	FORM	[fid=000100022-21-0000MOD;ext=mod;mime=;]Protracker module music file, version 3.x
&8	string	MODL	

# Magic ID for Startrekker files.
# Submitted on 2004-02-15 by Carl
1080	string	FLT4	[fid=000100024-21-0000MOD;ext=mod;mime=;]Startrekker module music file, 4 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Startrekker files.
# Submitted on 2004-02-15 by Carl
1080	string	FLT8	[fid=000100024-21-0000MOD;ext=mod;mime=;]Startrekker module music file, 8 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Fasttracker files.
# Submitted on 2004-02-15 by Carl
1080	string	6CHN	[fid=000001275-21-0000MOD;ext=mod;mime=;]Fasttracker module music file, 6 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Fasttracker files.
# Submitted on 2004-02-15 by Carl
1080	string	8CHN	[fid=000001275-21-0000MOD;ext=mod;mime=;]Fasttracker module music file, 6 channels
>0	string	>\\0	[title=%.20s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MT20	[fid=000100091-21-0000MT2;ext=mt2;mime=;]Madtracker module music file
>42	string	x	[title=%.64s]
>112	leshort	x	[chn=%d]

# Magic ID for Multitracker Module editor files.
# Submitted on 2004-02-15 by Carl
0	string	MTM	[fid=000100089-21-0000MTM;ext=mtm;mime=;]MultiTracker module music file
>4	string	>\\x00	[title=%.20s]

# Magic ID for Madtracker files.
# Submitted on 2004-03-05 by Carl
0	string	MTP2	[fid=000100091-21-0000MTP;ext=mtp;mime=;]Madtracker pattern file

# Magic ID for A/NES files.
# Submitted on 2004-03-07 by Carl
0	string	NESA	[fid=000100094-21-0000NSA;ext=nsa;mime=;]A/NES ripped audio file

# Submitted on 2004-03-07 by Carl
0	string	NESM\\x1A	[fid=000100093-21-0000NSF;ext=nsf;mime=;]NES ripped audio file
>5	byte	x	, version %d.0
>0x0E	string	x	[title=%.32s]
>0x2E	string	x	[creator=%.32s]

# Magic ID for Noisetracker files.
# Submitted on 2004-02-15 by Carl
1080	string	M&K!	[fid=000100023-21-0000NST;ext=nst;mime=;]Noisetracker module music file
>0	string	>\\0	[title=%.20s]

# Magic ID for Oktalyzer tracker files.
# Submitted on 2004-02-15 by Carl
0	string	OKTASONG	[fid=000100030-21-0000OKT;ext=okt;mime=;]Oktalyzer module music file

# Magic ID for SBStudio sound files.
# Submitted on 2004-03-05 by Carl
0	string	PACG	[fid=000100020-21-0000PAC;ext=pac;mime=;]SBStudio module music file

# Magic ID for Polytracker files.
# Submitted on 2004-02-15 by Carl
44	string	PTMF	[fid=000000000-21-0000PTM;ext=ptm;mime=;]Poly Tracker module music file
>38	leshort	>0	[chn=%d]
>0	string	>\\0	[title=%.28s]

# Magic ID for Reality Adlib tracker files.
# Submitted on 2004-02-15 by Carl
0	string	RAD\\ by	[fid=000000000-21-0000RAD;ext=rad;mime=;]Reality Adlib tracker music file

# Submitted on 2004-02-15 by Carl
0	string	RIFF	[fid=000000000-21-0000RMI;ext=rmi;mime=application/vnd.music-niff;]Song notation data file, little-endian
&8	string	NIFF	

# Submitted on 2004-02-15 by Carl
0	string	RIFX	[fid=000000000-21-0000RMI;ext=rmi;mime=application/vnd.music-niff;]Song notation data file, big-endian
&8	string	NIFF	

# Magic ID for Adlib Visual Composer files.
# Submitted on 2004-02-15 by Carl
0	leshort	0x0000	[fid=000001016-21-0000ROL;ext=rol;mime=;]Adlib music file
&2	leshort	0x0004	

# Magic ID for Screamtracker 3 files.
# Submitted on 2004-02-15 by Carl
0x2C	string	SCRM	[fid=000100025-21-0000S3M;ext=s3m;mime=;]Scream tracker module music file
>0x2A	leshort	>0	, version %d.0
>0	string	>\\0	[title=%.28s]

# Magic ID for Surprise! Adlib Tracker files.
# Submitted on 2004-02-15 by Carl
0	string	SAdT	[fid=000100021-21-0000SA2;ext=sa2;mime=;]Surprise Productions Adlib tracker music file
>4	byte	x	, version 0.%d

# Magic ID for SoundFX files.
# Submitted on 2004-02-15 by Carl
60	string	SONG	[fid=000001277-21-0000SFX;ext=sfx;mime=;]SoundFX Tracker module music file

# Magic ID for PlaySID, Sidplay files.
# Submitted on 2004-03-05 by Carl
0	string	PSID	[fid=000000000-21-0000SID;ext=sid;mime=;]PlaySID music file
>16	string	x	[title=%.20s]
>36	string	x	[creator=%.20s]

# Submitted on 2004-02-15 by Carl
0	string	MThd	[fid=000001017-21-0000SMF;ext=smf,midi;mime=;]Standard MIDI music file
>10	beshort	>0	[chn=%d]

# Submitted on 2004-03-05 by Carl
0	string	FORM	[fid=000001010-21-000SMUS;ext=smus,mus;mime=;]IFF Simple Musical Score file
&8	string	SMUS	

# Magic ID for Sndtool2,nezplay files.
# Submitted on 2004-03-05 by Carl
0	string	SND\\x1A	[fid=000000000-21-0000SND;ext=snd;mime=;]Nintendo Entertainment System audio file (NES)
&4	byte	3	, version %3.0
>5	byte	x	[chn=%d]

# Magic ID for iNES files.
# Submitted on 2004-03-05 by Carl
0	string	SND\\x1A	[fid=000100092-21-0000SND;ext=snd;mime=;]iNES emulator audio file
&4	byte	1	, version %1.0
>5	byte	x	[chn=%d]

# Magic ID for STMIK files.
# Submitted on 2004-02-15 by Carl
0x15	string	Scream!	[fid=000100025-21-0000STX;ext=stx;mime=;]STMIK module music file

# Magic ID for The Final Musicsystem eXtended (TFMX) files.
# Submitted on 2004-03-07 by Carl
0	string	TFMX-SONG\\ 	[fid=000100096-21-0000TFX;ext=tfx,tfmx;mime=;]TFMX tracker module music file

# Magic ID for Ultra Tracker files.
# Submitted on 2004-03-07 by Carl
0	string	MAS_UTrack_V00	[fid=000100097-21-0000ULT;ext=ult;mime=;]Ultra Tracker module music file
>15	string	x	[title=%.32s]

# Magic ID for APlayer files.
# Submitted on 2004-02-15 by Carl
0	string	APUN\\x01	[fid=000000000-21-0000UNI;ext=uni;mime=;]APlayer module music file

# Magic ID for Mikmod files.
# Submitted on 2004-02-15 by Carl
0	string	UN0	[fid=000000000-21-0000UNI;ext=uni;mime=;]Mikmod module music file
>4	byte	x	[chn=%d]

# Magic ID for Fasttracker 2.0 files.
# Submitted on 2004-02-15 by Carl
0	string	Extended\\ Module:\\ 	[fid=000100026-21-00000XM;ext=xm;mime=;]FastTracker II module music file
>59	byte	x	, version %d
>58	byte	x	.0%d
>17	string	x	[title=%.20s]

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001010-22-0008SVX;ext=8svx;mime=;]Amiga Sampled audio file
&8	string	8SVX	

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001002-22-000AIFC;ext=aifc,aif;mime=;]Audio Compressed Interchange File Format
&8	string	AIFC	

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000001002-22-000AIFF;ext=aiff,aif;mime=;]Audio Interchange File Format
&8	string	AIFF	

# Magic ID for MonkeyAudio software files.
# Submitted on 2004-05-20 by Carl
0	string	MAC\\ 	[fid=000100120-22-0000APE;ext=ape;mime=;]MonkeyAudio compressed audio file

# Submitted on 2004-02-11 by Carl
0	string	.snd	[fid=000001011-22-00000AU;ext=au,snd;mime=;]Sun / NeXt sampled audio file
>16	belong	>0	[freq=%d]

# Magic ID for Sppack files.
# Submitted on 2004-03-04 by Carl
252	beshort	0x40C3	[fid=000001019-22-000000D;ext=d;mime=;]Sppack audio sample file
&254	beshort	0xFC0E	

# Magic ID for Flac files.
# Submitted on 2004-03-08 by Carl
0	string	fLaC	[fid=000100098-22-000FLAC;ext=flac;mime=;]Free Lossless Audio Codec raw audio file

# Magic ID for Farandole Composer files.
# Submitted on 2004-03-04 by Carl
0	string	FSM\\xFE	[fid=000100087-22-0000FSM;ext=fsm;mime=;]Farandole composer audio sample file
>4	string	x	[title=%.32s]

# Magic ID for MAUD files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000000000-22-000MAUD;ext=maud;mime=;]MAUD audio sample file
&4	string	MAUD	

# Submitted on 2004-05-04 by Carl
0	beshort&0xFFE0	0xffe0	[fid=000000001-22-0011172;ext=mp1,mp2,mp3;mime=audio/mpeg;]MP3 Audio stream file
&Z128	string	TAG	
>Z125	string	x	[title=%.30s]
>Z95	string	x	[creator=%.30s]

# Submitted on 2004-05-04 by Carl
0	string	ID3	[fid=000000001-22-0011172;ext=mp1,mp2,mp3;mime=audio/mpeg;]MP3 Audio stream file

# Submitted on 2004-02-11 by Carl
0	string	\\0\\001\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file

# Submitted on 2004-02-11 by Carl
0	string	\\0\\002\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, little-endian

# Submitted on 2004-02-11 by Carl
0	string	\\0\\003\\243\\144	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\001\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\002\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\003\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, little-endian

# Submitted on 2004-02-11 by Carl
0	string	\\144\\243\\004\\0	[fid=000001014-22-00000SF;ext=sf;mime=;]IRCAM audio sample file, big-endian

# Magic ID for Screamtracker files.
# Submitted on 2004-03-05 by Carl
0x4C	string	SCRS	[fid=000100025-22-0000SMP;ext=smp;mime=;]Screamtracker audio sample
>0x30	string	x	[title=%.30s]

# Magic ID for SoundTool files.
# Submitted on 2004-03-07 by Carl
0	string	SOUND\\x1A	[fid=000100095-22-0000SND;ext=snd;mime=;]Sound tool audio data file
>14	leshort	x	[freq=%d]

# Magic ID for SBStudio files.
# Submitted on 2004-02-11 by Carl
0	string	SND\\ 	[fid=000100020-22-0000SOU;ext=sou;mime=;]SBStudio sampled audio file

# Submitted on 2004-05-18 by Carl
0	string	Speex	[fid=000000000-22-00SPEEX;ext=speex;mime=;]Speex Lossy Audio Codec raw audio file

# Magic ID for Sound Blaster SDK files.
# Submitted on 2004-02-11 by Carl
0	string	Creative\\ Voice\\ File\\x1A	[fid=000001013-22-0000VOC;ext=voc;mime=;]Creative Voice audio file

# Submitted on 2004-05-18 by Carl
0	string	vorbis	[fid=000000000-22-0VORBIS;ext=vorbis;mime=;]Vorbis Lossy Audio Codec raw audio file

# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001001-22-0000WAV;ext=wav;mime=;]Microsoft Waveform Audio file, little-endian
&8	string	WAVE	
>24	lelong	>0	[freq=%d]

# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001001-22-0000WAV;ext=wav;mime=;]Microsoft Waveform Audio file, big-endian
&8	string	WAVE	
>24	belong	>0	[freq=%d]

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	FOR4	[fid=000001312-31-0000000;ext=;mime=;]Maya image file
&8	string	CIMG	

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	FOR8	[fid=000001312-31-0000000;ext=;mime=;]Maya image file
&8	string	CIMG	

# Magic ID for AOL files.
# Submitted on 2004-04-02 by Carl
0	string	JG\\x04\\x0E	[fid=000001023-31-0000ART;ext=art;mime=;]AOL/Johnson-Grace image file, version 2.0
>0x0D	leshort	x	[res=%dx
>0x0F	leshort	x	%d]

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A0	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A2	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Magic ID for BMF image compressor files.
# Submitted on 2004-02-27 by Carl
0	string	\\x81\\x8A1	[fid=000100048-31-0000BMF;ext=bmf;mime=;]BMF image file
>2	string	x	, version %.1s
>3	string	x	.%.1s

# Submitted on 2004-02-14 by Carl
0	string	BM	[fid=000001001-31-0000BMP;ext=bmp;mime=;]Windows or OS/2 Bitmap image file
&6	lelong	0	

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x9119	[fid=000001254-31-0000CEL;ext=cel,pic;mime=;]Autodesk animator image file
&10	byte	8	
&11	byte	0	
>2	leshort	x	[res=%d
>4	leshort	x	x%dx8bpp]

# Magic ID for Andrew User Interface System files.
# Submitted on 2004-04-02 by Carl
1	string	begindata{raster	[fid=000001315-31-0000CMU;ext=cmu;mime=;]Andrew toolkit raster image file

# Magic ID for Anivga toolkit files.
# Submitted on 2004-04-02 by Carl
38	string	KR\\x01\\x00	[fid=000100104-31-0000COD;ext=cod;mime=;]Anivga sprite image file

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	0	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx8bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	16	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx4bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	2	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx1bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	32	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx5bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	64	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx6bpp]

# Magic ID for Windows Cursor files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x02\\x00	[fid=000001001-31-0000CUR;ext=cur;mime=;]Microsoft windows cursor image file
&0x08	byte	8	
>4	leshort	x	, %d cursor(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx3bpp]

# Submitted on 2004-04-13 by Carl
128	string	DICM	[fid=000000004-31-000DICM;ext=dicm,dcm;mime=;]Digital imaging and communication in medecine img.

# Submitted on 2004-04-01 by Carl
0	string	SDPX	[fid=000001309-31-0000DPX;ext=dpx;mime=;]Digital Moving-Picture Exchange image file
>160	string	>\\x00	[creator=%.100s]
>260	string	>\\x00	[title=%.200s]

# Submitted on 2004-04-01 by Carl
0	string	XPDS	[fid=000001309-31-0000DPX;ext=dpx;mime=;]Digital Moving-Picture Exchange image file
>160	string	>\\x00	[creator=%.100s]
>260	string	>\\x00	[title=%.200s]

# Magic ID for Lightwave 3D files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000001251-31-000FPBM;ext=fpbm;mime=;]Flexible Precision Buffer Map image file
&8	string	FPBM	

# Submitted on 2004-02-14 by Carl
0	string	GIF8	[fid=000001274-31-0000GIF;ext=gif;mime=image/gif;]GIF image file
&10	byte&0x70	!0x70	
>4	string	x	, version 8%.2s
>6	leshort	>0	[res=%dx
>8	leshort	>0	%d]

# Submitted on 2004-02-14 by Carl
0	string	GIF8	[fid=000001274-31-0000GIF;ext=gif;mime=image/gif;]GIF image file
&10	byte&0x70	0x70	
>4	string	x	, version 8%.2s
>6	leshort	>0	[res=%dx
>8	leshort	>0	%dx8bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	0	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx8bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	16	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx4bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	2	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx1bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	32	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx5bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	64	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx6bpp]

# Magic ID for Windows Icon files.
# Submitted on 2004-04-01 by Carl
0	string	\\x00\\x00\\x01\\x00	[fid=000001001-31-0000ICO;ext=ico;mime=image/vnd.microsoft.icon;]Microsoft windows Icon image file
&0x08	byte	8	
>4	leshort	x	, %d icon(s)
>6	byte	x	[res=%dx
>7	byte	x	%dx3bpp]

# Magic ID for SunOS Icon files.
# Submitted on 2004-04-02 by Carl
0	string	/*\\ Format_version=1,\\ 	[fid=000001011-31-000ICON;ext=icon;mime=;]SunOS icon image file

# Submitted on 2004-03-31 by Carl
0	beshort	0x01	[fid=000001273-31-0000IMG;ext=img;mime=;]GEM Bit Image
&2	beshort	0x08	
>12	beshort	>0	[res=%dx
>14	beshort	>0	%d
>4	beshort	>0	x%dbpp]

# Submitted on 2004-04-02 by Carl
0	string	\\x8bJNG\\x0d\\x0a\\x1a\\x0a	[fid=000000000-31-0000JNG;ext=jng;mime=;]JPEG Network graphics image file
&12	string	JHDR	
>16	belong	x	[res=%d
>20	belong	x	x%d]

# Submitted on 2004-04-13 by Carl
0	string	\\x00\\x00\\x00\\x0cjP\\x20\\x20	[fid=000000001-31-0015444;ext=jp2;mime=image/jp2;]JPEG 2000 image file

# Submitted on 2004-04-13 by Carl
0	string	\\xff\\x4f\\xff\\x51	[fid=000000001-31-0015444;ext=jpc;mime=;]JPEG 2000 code stream image file
&Z2	beshort	0xFFD9	
>8	belong	x	[res=%dx
>12	belong	x	%d]

# Submitted on 2004-03-31 by Carl
0	belong	0xffd8ffe0	[fid=000001305-31-000JPEG;ext=jpeg,jpg;mime=image/jpeg;]Joint Photographic Experts Group JFIF image file
&6	string	JFIF\\x00	
>11	byte	x	, version %d
>12	byte	x	.0%d

# Submitted on 2004-04-13 by Carl
0	string	\\xff\\xd8\\xff\\xe1	[fid=000000005-31-000JPEG;ext=jpg,jpeg;mime=image/jpeg;]Digital still camera image file
&6	string	Exif	

# Magic ID for Deluxe Paint files.
# Submitted on 2004-03-31 by Carl
0	string	FORM	[fid=000001010-31-0000LBM;ext=lbm;mime=;]Interleaved bitmap image file
&8	string	ILBM	

# Submitted on 2004-04-13 by Carl
0	string	This\\ is\\ a\\ BitMap\\ file	[fid=000000000-31-000LISP;ext=lisp;mime=;]Lisp machine format image file

# Magic ID for Microdesign2, Microdesign3 files.
# Submitted on 2004-04-02 by Carl
0	string	.MDA	[fid=000001316-31-0000MDA;ext=mda;mime=;]Microdesign Area image file

# Magic ID for Microdesign2, Microdesign3 files.
# Submitted on 2004-04-02 by Carl
0	string	.MDP	[fid=000001316-31-0000MDP;ext=mdp;mime=;]Microdesign page image file

# Magic ID for Imagemagick files.
# Submitted on 2004-04-01 by Carl
0	string	id=ImageMagick	[fid=000100101-31-000MIFF;ext=miff,mif;mime=;]Imagemagick image file

# Magic ID for Netpbm files.
# Submitted on 2004-04-02 by Carl
0	string	MRF1	[fid=000100105-31-0000MRF;ext=mrf;mime=;]Monochrome recursive format image file
>4	belong	x	[res=%dx
>8	belong	x	%dx1bpp]

# Magic ID for Microsoft Paint files.
# Submitted on 2004-04-02 by Carl
0	leshort	0x6144	[fid=000001001-31-0000MSP;ext=msp;mime=;]Microsoft paint image file, version 1.0
&2	leshort	0x4d6e	
>4	leshort	x	[res=%dx
>6	leshort	x	%dx1bpp]

# Magic ID for Microsoft Paint files.
# Submitted on 2004-04-02 by Carl
0	leshort	0x694c	[fid=000001001-31-0000MSP;ext=msp;mime=;]Microsoft paint image file, version 2.0
&2	leshort	0x536e	
>4	leshort	x	[res=%dx
>6	leshort	x	%dx1bpp]

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P7\\x0A	[fid=000100100-31-0000PAM;ext=pam;mime=;]Portable arbitrary map image file

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P1	[fid=000100100-31-0000PBM;ext=pbm;mime=;]Portable bitmap image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P4	[fid=000100100-31-0000PBM;ext=pbm;mime=;]Portable bitmap image file, binary

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A00	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.5
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A02	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.8
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A03	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 2.8
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A04	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush for windows image file
&2	byte	1	

# Magic ID for PC-Paintbrush files.
# Submitted on 2004-03-31 by Carl
0	beshort	0x0A05	[fid=000001257-31-0000PCX;ext=pcx;mime=;]PC-Paintbrush image file, version 3.0
&2	byte	1	

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P2	[fid=000100100-31-0000PGM;ext=pgm;mime=;]Portable gray map image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P5	[fid=000100100-31-0000PGM;ext=pgm;mime=;]Portable gray map image file, binary

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x02	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x08	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for PC Paint files.
# Submitted on 2004-04-08 by Carl
0	leshort	0x1234	[fid=000001318-31-0000PIC;ext=pic;mime=;]Pictor PC Paint image file
&11	byte	0xFF	
&10	byte	0x31	
>2	leshort	x	[res=%d
>4	leshort	x	x%d]

# Magic ID for Softimage 3D files.
# Submitted on 2004-04-08 by Carl
0	belong	0x5380f634	[fid=000001321-31-0000PIC;ext=pic;mime=;]Softimage 3D image file
&88	string	PICT	
>8	string	>\\x00	[title=%.80s]
>92	beshort	x	[res=%d
>94	beshort	x	x%d]

# Magic ID for Bio-rad microscope files.
# Submitted on 2004-04-08 by Carl
54	leshort	12345	[fid=000001322-31-0000PIC;ext=pic;mime=;]Bio-rad confocal microscope image file
&16	leshort	0	
>0	leshort	>0	[res=%d
>2	leshort	>0	x%d]

# Submitted on 2004-02-06 by Carl
0	string	\\x89PNG\\x0d\\x0a\\x1a\\x0a	[fid=000000001-31-0015948;ext=png;mime=image/png;]Portable Network Graphic file
&12	string	IHDR	
>16	belong	>0	[res=%d
>20	belong	>0	x%d
>24	byte	x	x%dbpp]

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P3	[fid=000100100-31-0000PPM;ext=ppm;mime=;]Portable pixel map image file, ascii

# Magic ID for Netpbm files.
# Submitted on 2004-03-31 by Carl
0	string	P6	[fid=000100100-31-0000PPM;ext=ppm;mime=;]Portable pixel map image file, binary

# Magic ID for Photoshop files.
# Submitted on 2004-04-01 by Carl
0	string	8BPS\\x00\\x01	[fid=000001003-31-0000PSD;ext=psd;mime=;]Adobe Photoshop image file
>18	belong	>0	[res=%dx
>14	belong	>0	%d]

# Magic ID for Paint shop pro files.
# Submitted on 2004-04-01 by Carl
0	string	Paint Shop Pro Image File\\x0a\\x1a	[fid=000001310-31-0000PSP;ext=psp;mime=;]Paintshop pro image file
>50	lelong	>0	[res=%dx
>54	lelong	>0	%d
>69	leshort	>0	x%dbpp]

# Submitted on 2004-02-08 by Carl
0	belong	0x59a66a95	[fid=000001011-31-0000RAS;ext=ras;mime=;]Sun raster image
>4	belong	>0	[res=%dx
>8	belong	>0	%d
>12	belong	>0	x%dbpp]

# Submitted on 2004-03-31 by Carl
0	string	\\0x01\\xDA	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
>24	string	>\\x00	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	1	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx8bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	3	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x00\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file
&10	beshort	4	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	1	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx8bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	3	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Submitted on 2004-03-31 by Carl
0	string	\\x01\\xDA\\x01\\x01	[fid=000001004-31-0000RGB;ext=rgb;mime=;]SGI Image file, compressed
&10	beshort	4	
>6	beshort	x	[res=%dx
>8	beshort	x	%dx24bpp]
>24	string	>\\x0	[title=%.80s]

# Magic ID for Turbo Silver files.
# Submitted on 2004-04-13 by Carl
0	string	FORM	[fid=000001252-31-000RGB8;ext=rgb8,rgb;mime=;]Turbo Silver 24-bit RGB image file
&8	string	RGB8	

# Magic ID for Turbo Silver files.
# Submitted on 2004-04-13 by Carl
0	string	FORM	[fid=000001252-31-000RGBN;ext=rgbn,rgb;mime=;]Turbo Silver 12-bit RGB image file
&8	string	RGBN	

# Magic ID for ColoRIX VGA Paint files.
# Submitted on 2004-04-08 by Carl
0	string	RIX3	[fid=000001320-31-0000SCZ;ext=scz;mime=;]ColorRIX VGA Paint image file
>4	leshort	x	[res=%d
>6	leshort	x	x%d]

# Submitted on 2004-04-13 by Bryan Henderson
0	string	\\117\\072	[fid=000000000-31-0000SIR;ext=sir;mime=;]Solitaire image recorder image file, MGI type 11
&4	string	\\013	

# Submitted on 2004-04-13 by Bryan Henderson
0	string	\\117\\072	[fid=000000000-31-0000SIR;ext=sir;mime=;]Solitaire image recorder image file, MGI type 17
&4	string	\\021	

# Submitted on 2004-04-01 by Carl
Z18	string	TRUEVISION-XFILE	[fid=000001306-31-0000TGA;ext=tga;mime=;]Truevision Targa image file
>12	leshort	x	[res=%dx
>14	leshort	x	%d
>16	byte	x	x%dbpp]

# Magic ID for Graphics Workshop files.
# Submitted on 2004-04-01 by Carl
0	string	THNL	[fid=000001258-31-0000THN;ext=thn;mime=;]Graphics workshop thumbnail image file

# Submitted on 2004-03-31 by Carl
0	string	II	[fid=000001003-31-0000TIF;ext=tif,tiff,dng;mime=image/tiff;]Tagged image file format image file, little-endian
&2	leshort	42	

# Submitted on 2004-03-31 by Carl
0	string	MM	[fid=000001003-31-0000TIF;ext=tif,tiff,dng;mime=image/tiff;]Tagged image file format image file, big-endian
&2	leshort		

# Magic ID for VICAR files.
# Submitted on 2004-04-01 by Carl
0	string	LBLSIZE=	[fid=000001022-31-0000VIC;ext=vic,vicar;mime=;]Vicar image file

# Magic ID for Khoros files.
# Submitted on 2004-04-01 by Carl
0	string	\\xAB\\x01\\x01\\x03	[fid=000001308-31-0000VIF;ext=vif,viff;mime=;]Khoros Visualization/Image File Format, version 1.3
&4	byte	2	
>520	belong	>0	[res=%dx
>524	belong	>0	%d]

# Submitted on 2004-04-02 by Carl
0	string	FIASCO	[fid=000100107-31-0000WFA;ext=wfa;mime=;]Fractal Image And Sequence Codec image file

# Magic ID for X-Windows files.
# Submitted on 2004-04-01 by Carl
0	string	/* XPM */	[fid=000001020-31-0000XPM;ext=xpm;mime=;]X-Windows pixel map image file

# Magic ID for XV files.
# Submitted on 2004-04-01 by Carl
0	string	P7\\ 332	[fid=000100103-31-00000XV;ext=xv;mime=;]XV Thumbnail image file

# Magic ID for XWindows files.
# Submitted on 2004-04-02 by Carl
0	belong	0x40	[fid=000001020-31-0000XWD;ext=xwd;mime=;]X10 XWindows dump image file
&4	belong	0x06	
>24	belong	x	[res=%d
>28	belong	x	x%d]

# Magic ID for XWindows files.
# Submitted on 2004-04-02 by Carl
0	lelong	0x40	[fid=000001020-31-0000XWD;ext=xwd;mime=;]X10 XWindows dump image file
&4	lelong	0x06	
>24	lelong	x	[res=%d
>28	lelong	x	x%d]

# Magic ID for Provector files.
# Submitted on 2004-04-08 by Carl
0	string	FORM	[fid=000001319-32-000DR2D;ext=dr2d;mime=;]Provector 2D image file
&8	string	DR2D	

# Magic ID for XFig, WinFig, jFig files.
# Submitted on 2004-02-08 by Carl
0	string	#FIG	[fid=000100011-32-0000FIG;ext=fig;mime=;]Facility for Interactive Generation file
>5	string	x	, version %.1s.
>7	string	x	%.1s

# Magic ID for Lotus 1-2-3 files.
# Submitted on 2004-04-02 by Carl
0	string	\\x01\\x00\\x00\\x00\\x01\\x00\\x08\\x00\\x44	[fid=000001009-32-0000PIC;ext=pic;mime=;]Lotus 1-2-3 image file

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AutoCAD Slide	[fid=000001254-32-0000SLD;ext=sld;mime=;]Autocad slide image file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-08 by Carl
0	string	\\xffWPC	[fid=000001008-32-0000WPG;ext=wpg;mime=;]Wordperfect Graphics vectors
&8	byte	1	
&9	byte	0x16	
>10	byte	x	, version %d.
>11	byte	x	%d

# Submitted on 2004-02-11 by Carl
0	string	FORM	[fid=000100019-33-000AMFF;ext=amff;mime=;]Amiga metafile
&8	string	AMFF	

# Submitted on 2004-02-11 by Carl
0	lelong	0x9AC6CDD7	[fid=000001003-33-0000APM;ext=apm;mime=;]Aldus placeable Windows metafile
&4	leshort	0	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001008-33-0000CDR;ext=cdr;mime=;]Coreldraw  little-endian metafile
&8	string	CDR	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001008-33-0000CDR;ext=cdr;mime=;]Coreldraw  big-endian metafile
&8	string	CDR	

# Submitted on 2004-04-08 by Carl
0	beshort&0xFF20	0x0020	[fid=000000001-33-0008632;ext=cgm;mime=image/cgm;]Computer graphics metafile, binary encoded
&Z0x02	beshort&0xFF40	0x0040	

# Submitted on 2004-04-08 by Carl
0	string	BEGMF	[fid=000000001-33-0008632;ext=cgm;mime=image/cgm;]Computer graphics metafile, ascii encoded

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFF	[fid=000001008-33-0000CMX;ext=cmx;mime=;]Corel little-endian metafile
&8	string	CMX1	

# Magic ID for CorelDRAW files.
# Submitted on 2004-02-11 by Carl
0	string	RIFX	[fid=000001008-33-0000CMX;ext=cmx;mime=;]Corel big-endian metafile
&8	string	CMX1	

# Submitted on 2004-02-11 by Carl
0	lelong	0x00000001	[fid=000001001-33-0000EMF;ext=emf;mime=;]Microsoft Windows Enhanced metafile
&40	lelong	0x464D4520	

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-2.0\\ EPSF-1.2	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 2, version 1.2

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-2.0\\ EPSF-2.0	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 2, version 2.0

# Submitted on 2004-02-11 by Carl
0	string	%!PS-Adobe-3.0\\ EPSF-3.0	[fid=000001003-33-000EPSF;ext=epsf;mime=application/postscript;]Adobe Encapsulated Postscript Level 3, version 3.0

# Submitted on 2004-02-11 by Carl
0	string	\\xC5\\xD0\\xD3\\xC6	[fid=000001003-33-000EPSF;ext=epsf,ai;mime=application/postscript;]Adobe Encapsulated Postscript, version 3.0, binary

# Magic ID for GEM Paint files.
# Submitted on 2004-03-31 by Carl
0	beshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Motorola Metafile, version 1.01
&4	beshort	101	

# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Metafile
&4	leshort	0	

# Magic ID for Artline files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 4.00
&4	leshort	400	

# Magic ID for Deskpress files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 3.10
&4	leshort	310	

# Magic ID for GEM Paint files.
# Submitted on 2004-02-11 by http://www.seasip.info/Gem/ff_gem.html
0	leshort	0xFFFF	[fid=000001273-33-0000GEM;ext=gem;mime=;]GemDOS Intel Metafile, version 1.01
&4	leshort	101	

# Magic ID for Quickdraw files.
# Submitted on 2004-04-01 by Carl
0x20A	belong	0x001102FF	[fid=000001002-33-0000PCT;ext=pct;mime=;]Macintosh Quickdraw metafile \'PICT\', version 2.0

# Submitted on 2004-02-11 by Carl
0	leshort	0x0001	[fid=000001001-33-0000WMF;ext=wmf;mime=;]Microsoft Windows metafile
&2	leshort	9	

# Magic ID for Cinema 4D Version 5.x files.
# Submitted on 2004-02-06 by Carl
0	string	MC50	[fid=000001255-40-0000000;ext=;mime=;]Maxon Cinema 4D version 5 3D data

# Magic ID for Quickdraw 3D files.
# Submitted on 2004-02-06 by Carl
0	string	3DMF	[fid=000001002-40-0003DMF;ext=3dmf;mime=;]Apple Quickdraw 3D metafile

# Magic ID for Rhino 3d files.
# Submitted on 2004-04-12 by Carl
0	string	3D Geometry File Format	[fid=000001330-40-0003DMF;ext=3dmf;mime=;]Rhino3d / OpenNurbs 3d model

# Magic ID for Quickdraw 3D files.
# Submitted on 2004-04-11 by Carl
0	string	3DMetafile	[fid=000001002-40-0003DMF;ext=3dmf,a3d;mime=;]Apple Quickdraw 3D metafile

# Magic ID for AC3d files.
# Submitted on 2004-04-12 by Carl
0	string	AC3D	[fid=000000000-40-00000AC;ext=ac;mime=;]Ac3d 3d model

# Magic ID for 3dStudio Max files.
# Submitted on 2004-04-12 by Carl
0	string	*3DSMAX_ASCIIEXPORT	[fid=000001326-40-0000ASE;ext=ase;mime=;]3d studio max ascii export 3D model

# Magic ID for Caligari Truespace Modeler files.
# Submitted on 2004-02-06 by Carl
0	string	Caligari\\ V	[fid=000001256-40-0000COB;ext=cob,scn;mime=;]Caligari Truespace2 3D model

# Magic ID for Tachyon parallel raytracer files.
# Submitted on 2004-04-12 by Carl
0	string	BEGIN_SCENE	[fid=000100116-40-0000DAT;ext=dat;mime=;]Tachyon ray-tracer 3d model

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AC10	[fid=000001254-40-0000DWG;ext=dwg;mime=image/vnd.dwg;]Autocad drawing format 3d model

# Magic ID for Autocad files.
# Submitted on 2004-04-12 by Carl
0	string	AutoCAD Binary DXF	[fid=000001254-40-0000DXF;ext=dxf;mime=image/vnd.dxf;]Autocad drawing interchange 3d model, binary

# Magic ID for Multigen creator files.
# Submitted on 2004-04-12 by Carl
0	beshort	1	[fid=000001332-40-0000FLT;ext=flt;mime=;]Openflight scene description 3d model
&4	string	db	

# Magic ID for Videoscape 3D files.
# Submitted on 2004-04-12 by Carl
0	string	GOUR	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with colored vertices

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG1	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with colored faces

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG2	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model light source

# Magic ID for Videoscape 3D, Blender files.
# Submitted on 2004-04-12 by Carl
0	string	3DG3	[fid=000001328-40-0000GEO;ext=geo;mime=;]Videoscape 3d model with gouraud curves

# Magic ID for Softimage 4D Creative environment files.
# Submitted on 2004-04-12 by Carl
0	string	HRCH:	[fid=000001321-40-0000HRC;ext=hrc;mime=;]Softimage 4d model, ascii encoded

# Magic ID for Open Inventor Toolkit files.
# Submitted on 2004-02-06 by Carl
0	string	#Inventor	[fid=000001004-40-00000IV;ext=iv;mime=;]Open Inventor 3d model
>11	string	x	, version %.1s.
>13	string	x	%.1s
>15	string	binary	, binary encoded
>15	string	ascii	, ascii encoded

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	LIST	[fid=000100118-40-000LIST;ext=list;mime=;]Geomview list of 3D models and objects

# Magic ID for Lightwave 3D files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000001251-40-0000LWO;ext=lwo,lwob;mime=;]Lightwave 3D object
&8	string	LWO2	

# Magic ID for Lightwave 3D files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001251-40-0000LWO;ext=lwob,lwo;mime=;]Lightwave 3D object
&8	string	LWOB	

# Magic ID for Lightwave 3D files.
# Submitted on 2004-02-06 by Carl
0	string	LWSC	[fid=000001251-40-0000LWS;ext=lwsc,lws;mime=;]Lightwave 3D scene

# Magic ID for Maya files.
# Submitted on 2004-04-12 by Carl
0	string	//Maya	[fid=000001312-40-00000MA;ext=ma;mime=;]Maya 3d model, ascii encoded

# Magic ID for Cinema 4D Version 4.x and earlier files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001255-40-000MC4D;ext=mc4d;mime=;]Maxon Cinema 4D v4.x 3D data
&8	string	MC4D	

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	CMESH	[fid=000100118-40-000MESH;ext=mesh;mime=;]Geomview polygon

# Magic ID for Geomview files.
# Submitted on 2004-04-12 by Carl
0	string	MESH	[fid=000100118-40-000MESH;ext=mesh;mime=;]Geomview polygon

# Magic ID for Milshape 3d files.
# Submitted on 2004-04-12 by Carl
0	string	MS3D000000	[fid=000100117-40-000MS3D;ext=ms3d;mime=;]Milkshape 3d model, binary encoded

# Magic ID for Worldtoolkit files.
# Submitted on 2004-02-06 by Carl
0	string	nff	[fid=000001253-40-0000NFF;ext=nff;mime=;]Sense8 Worldtoolkit 3D object

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-12 by Carl
2	lelong	0x0000	[fid=000001254-40-0000PLY;ext=ply;mime=;]Autodesk animator polygon file
&6	byte	0	
&7	byte	0x99	

# Magic ID for Autodesk Animator files.
# Submitted on 2004-04-12 by Carl
2	lelong	0x0000	[fid=000001254-40-0000PLY;ext=ply;mime=;]Autodesk animator polygon file
&6	byte	1	
&7	byte	0x99	

# Magic ID for Quick3d files.
# Submitted on 2004-04-12 by Carl
0	string	quick3Do	[fid=000001334-40-0000Q3O;ext=q3o;mime=;]Quick3d 3D object

# Magic ID for Quick3d files.
# Submitted on 2004-04-12 by Carl
0	string	quick3Ds	[fid=000001334-40-0000Q3S;ext=q3s;mime=;]Quick3d 3D scene

# Magic ID for Renderman files.
# Submitted on 2004-04-12 by Carl
0	string	##RenderMan\\ RIB-Structure	[fid=000001323-40-0000RIB;ext=rib;mime=;]Renderman bytestream 3D model

# Magic ID for Sculpt 3d files.
# Submitted on 2004-04-12 by Carl
0	string	FORM	[fid=000000000-40-00SCENE;ext=scene;mime=;]Sculpt 3d scene model
&8	string	SC3D	

# Magic ID for Imagine 3D Studio, Turbo Silver files.
# Submitted on 2004-02-06 by Carl
0	string	FORM	[fid=000001252-40-000TDDD;ext=tddd,obj;mime=;]Imagine 3D object
&8	string	TDDD	

# Magic ID for Macromedia Director files.
# Submitted on 2004-04-12 by Carl
0	string	IFX	[fid=000001259-40-0000W3D;ext=w3d;mime=;]Shockwave 3D model

# Submitted on 2004-02-06 by Carl
0	string	#VRML	[fid=000000001-40-0014772;ext=wrl;mime=model/vrml;]Virtual Reality modeling language
>7	string	x	, version %.1s.
>9	string	x	%.1s

# Submitted on 2004-04-12 by Carl
0	string	<WORLD>	[fid=000000000-40-0000XGL;ext=xgl;mime=;]XGL 3d model

# Magic ID for Direct3D files.
# Submitted on 2004-04-11 by Carl
0	string	xof\\ 	[fid=000001001-40-0000XIE;ext=xie;mime=;]Microsoft direct3d 3D model

# Magic ID for Softimage XSI files.
# Submitted on 2004-04-12 by Carl
0	string	xsi\\ 	[fid=000001321-40-0000XSI;ext=xsi;mime=;]Softimage 3d model

# Magic ID for Kaboom files.
# Submitted on 2004-02-08 by Carl
0	string	\\xA8MP\\xA8	[fid=000000000-50-0000000;ext=;mime=;]Kboom archive file

# Magic ID for CTW files.
# Submitted on 2004-03-04 by Carl
0	leshort	12	[fid=000100077-50-0000000;ext=;mime=;]Context tree weighing (CTW) archive file
&2	leshort	0	

# Magic ID for Microsoft Compress files.
# Submitted on 2004-03-04 by Carl
0	string	SZDD\\x88\\xF0\\x27\\x33	[fid=000001001-50-0000000;ext=;mime=;]Microsoft LZSS compressed file

# Magic ID for AAX files.
# Submitted on 2004-02-18 by Carl
0	string	\\x40\\xFE\\x00\\x00	[fid=000001281-50-0000AAX;ext=aax;mime=;]AAX archive file

# Magic ID for ABComp files.
# Submitted on 2004-02-18 by Carl
0	string	\\x03AB2	[fid=000001282-50-0000ABP;ext=abp;mime=;]ABComp archive file

# Magic ID for Ace / WinAce files.
# Submitted on 2004-02-08 by Carl
7	string	**ACE**	[fid=000001265-50-0000ACE;ext=ace;mime=;]Ace / WinACE archive file

# Magic ID for Ai Archiver files.
# Submitted on 2004-02-18 by Carl
0	string	Ai	[fid=000000000-50-00000AI;ext=ai;mime=;]Ai archive file

# Magic ID for Akt archiver files.
# Submitted on 2004-02-18 by Carl
0	string	AKT\\x0A	[fid=000000000-50-0000AKT;ext=akt;mime=;]AKT archive file

# Magic ID for AMG Archiver files.
# Submitted on 2004-02-18 by Carl
0	string	\\xAD\\x36	[fid=000001284-50-0000AMG;ext=amg;mime=;]AMG archive file
>2	byte	x	, version %bh.
>2	byte	x	%bl
&3	byte	0	

# Magic ID for ar files.
# Submitted on 2004-03-04 by Carl
0	string	\\x21<arch>\\x0A	[fid=000000003-50-00000AR;ext=ar;mime=;]UNIX archive file (ar)

# Magic ID for AR7 files.
# Submitted on 2004-02-18 by Carl
0	string	,AR7 e-mailable archive:	[fid=000100036-50-0000AR7;ext=ar7;mime=;]AR7 archive file

# Magic ID for Squash files.
# Submitted on 2004-02-18 by Carl
3	string	OctSqu	[fid=000100038-50-0000ARH;ext=arh;mime=;]Squash archive file

# Magic ID for Arj files.
# Submitted on 2004-02-18 by Carl
0	string	\\x60\\xEA	[fid=000001285-50-0000ARJ;ext=arj;mime=;]ARJ archive file
&10	byte	2	

# Magic ID for ASD files.
# Submitted on 2004-02-18 by Carl
0	string	ASD01\\x1A	[fid=000001287-50-0000ASD;ext=asd;mime=;]ASD archive file

# Magic ID for Boa constrictor files.
# Submitted on 2004-02-18 by Carl
0	string	BOA\\x00	[fid=000100040-50-0000B58;ext=b58;mime=;]BOA constrictor archive file

# Magic ID for BWC files.
# Submitted on 2004-02-18 by Carl
0	string	BWC	[fid=000100042-50-00000BC;ext=bc;mime=;]BWC archive file

# Magic ID for Bix files.
# Submitted on 2004-02-18 by Carl
0	string	BIX0	[fid=000100037-50-0000BIX;ext=bix;mime=;]BIX archive file

# Magic ID for Btoa files.
# Submitted on 2004-02-18 by Carl
0	string	xbtoa5	[fid=000100043-50-0000BOO;ext=boo;mime=;]Btoa encoded file

# Magic ID for Bsa files.
# Submitted on 2004-02-18 by Carl
0	string	\\xFFBSG\\x00\\x00\\xFFBSA	[fid=000001289-50-0000BSN;ext=bsn;mime=;]Bsa archive file

# Magic ID for BTPC files.
# Submitted on 2004-03-03 by Carl
0	string	btpc\\ 	[fid=000100074-50-000BTPC;ext=btpc;mime=;]BTPC compressed image file

# Magic ID for BTS files.
# Submitted on 2004-02-18 by Carl
0	string	\\x1A\\x03Descript	[fid=000100044-50-0000BTS;ext=bts;mime=;]BTSpk archive file
&0x521	string	BTSPK!	

# Magic ID for Bzip files.
# Submitted on 2004-02-18 by Carl
0	string	BZ0	[fid=000100008-50-00000BZ;ext=bz;mime=;]Bzip archive file

# Magic ID for Bzip2 files.
# Submitted on 2004-02-08 by Carl
0	string	BZh	[fid=000100008-50-0000BZ2;ext=bz2;mime=;]Bzip2 archive file

# Submitted on 2004-02-08 by Carl
0	string	MSCF	[fid=000001001-50-0000CAB;ext=cab;mime=;]Microsoft Cabinet file
>25	byte	x	, version %d.
>24	byte	x	%d

# Magic ID for Crush files.
# Submitted on 2004-02-23 by Carl
0	string	CRUSH\\ v1.8	[fid=000001290-50-0000CRU;ext=cru;mime=;]Crush archive file

# Magic ID for Ctxf files.
# Submitted on 2004-02-23 by Carl
0	string	CXF\\x1A	[fid=000100045-50-0000CXF;ext=cxf;mime=;]Ctx archive file

# Magic ID for DAXWav files.
# Submitted on 2004-03-04 by Carl
0	string	FORM	[fid=000000000-50-0000DAX;ext=dax;mime=;]DAX audio archive file
&8	string	daxA	

# Magic ID for Diskmasher files.
# Submitted on 2004-02-23 by Carl
0	string	DMS!	[fid=000000000-50-0000DMS;ext=dms;mime=;]Diskmasher archive file

# Magic ID for Dpae files.
# Submitted on 2004-02-23 by Carl
0	string	Dirk\\ Paehl(c)	[fid=000100046-50-0000DPA;ext=dpa;mime=;]Dpae archive file

# Magic ID for Disintegrator files.
# Submitted on 2004-02-23 by Carl
0	string	DSTb	[fid=000100047-50-0000DST;ext=dst;mime=;]Disintegrator archive file

# Magic ID for Enhanced compressor (ENC) files.
# Submitted on 2004-02-23 by Carl
0	string	Ench	[fid=000100051-50-0000ENC;ext=enc;mime=;]Enhanced compressor archive file

# Magic ID for ESP files.
# Submitted on 2004-02-08 by Carl
0	string	ESP>	[fid=000100002-50-0000ESP;ext=esp;mime=;]ESP archive file

# Magic ID for ESP files.
# Submitted on 2004-02-08 by Carl
0x53f	string	ESP	[fid=000100002-50-0000EXE;ext=exe;mime=;]ESP Self-extracting archivew (MS-DOS)

# Magic ID for Freeze files.
# Submitted on 2004-02-11 by Carl
0	string	\\x1F\\x9E	[fid=000000000-50-000000F;ext=f;mime=;]Freeze archive file, version 1.0

# Magic ID for Freeze files.
# Submitted on 2004-02-11 by Carl
0	string	\\x1F\\x9F	[fid=000000000-50-000000F;ext=f;mime=;]Freeze archive file, version 2.0

# Magic ID for Qlfc files.
# Submitted on 2004-02-23 by Carl
0	string	\\x47\\x68\\x69\\x64\\x6f	[fid=000100055-50-00000GQ;ext=gq;mime=;]Qlfc archive file

# Magic ID for Gzip files.
# Submitted on 2004-02-08 by Carl
0	string	\\x1F\\x8B	[fid=000000002-50-0001952;ext=gz;mime=;]Gzip archive file

# Magic ID for Ha files.
# Submitted on 2004-02-10 by Carl
0	string	HA	[fid=000100013-50-00000HA;ext=ha;mime=;]HA archive file

# Magic ID for HAP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x913HF	[fid=000001291-50-0000HAP;ext=hap;mime=;]HAP archive file

# Magic ID for Hpack files.
# Submitted on 2004-02-11 by Carl
0	string	HPAK	[fid=000100016-50-0000HPK;ext=hpk;mime=;]Hpack archive file
&Z4	string	HPAK	

# Submitted on 2004-02-10 by Carl
11	string	must\\ be\\ converted\\ with\\ BinHex	[fid=000001002-50-0000HQX;ext=hqx;mime=;]BinHex archive

# Magic ID for HYP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x1AHP\\x25	[fid=000100056-50-0000HYP;ext=hyp;mime=;]HYP archive file

# Magic ID for HYP files.
# Submitted on 2004-02-23 by Carl
0	string	\\x1AST\\x25	[fid=000100056-50-0000HYP;ext=hyp;mime=;]HYP archive file

# Magic ID for Winimp files.
# Submitted on 2004-02-08 by Carl
0	lelong	0xA504D49	[fid=000001270-50-0000IMP;ext=imp;mime=;]Winimp archive file

# Magic ID for JRchive files.
# Submitted on 2004-02-08 by Carl
0	string	JRchive	[fid=000001263-50-0000JRC;ext=jrc;mime=;]JRchive archive file

# Magic ID for Archive Handler files.
# Submitted on 2004-02-08 by Carl
0	string	LG	[fid=000100001-50-00000LG;ext=lg;mime=;]Arhangel archive file

# Magic ID for Limit files.
# Submitted on 2004-02-08 by Carl
0	string	LM\\x1A	[fid=000100003-50-0000LIM;ext=lim;mime=;]Limit archive file

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lz4-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lz5-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive file

# Magic ID for Larc files.
# Submitted on 2004-02-11 by Carl
2	string	-lzs-	[fid=000100017-50-0000LZH;ext=lzh;mime=;]Larc archive file

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh\\ -	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh0-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 1.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh1-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 1.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh2-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh3-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh4-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh5-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh6-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lh7-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lha files.
# Submitted on 2004-02-11 by Carl
2	string	-lhd-	[fid=000100017-50-0000LZH;ext=lzh,lha;mime=;]LHarc archive file, version 2.x

# Magic ID for lzo files.
# Submitted on 2004-02-11 by Carl
0	string	\\x89\\x4c\\x5a\\x4f\\x00\\x0d\\x0a\\x1a\\x0a	[fid=000100018-50-0000LZO;ext=lzo;mime=;]LZOP archive file

# Magic ID for Lzx files.
# Submitted on 2004-02-23 by Carl
0	string	LZX	[fid=000100058-50-0000LZX;ext=lzx;mime=;]LZX archive file

# Magic ID for Mdcd (Mike Davenport compressor) files.
# Submitted on 2004-02-08 by Carl
0	string	MDmd	[fid=000100004-50-00000MD;ext=md;mime=;]Mike Davenport archive file
>4	byte	x	, version %d
&5	byte	1	

# Magic ID for Nashrink files.
# Submitted on 2004-02-23 by Carl
0	string	NSK	[fid=000001292-50-0000NSK;ext=nsk;mime=;]NaShrink archive file

# Magic ID for Semone archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SEMh	[fid=000100068-50-0000ONE;ext=one;mime=;]Semone archive file

# Magic ID for Lpac files.
# Submitted on 2004-03-04 by Carl
0	string	LPAC	[fid=000100084-50-0000PAC;ext=pac;mime=;]LPAC audio archive file

# Magic ID for CrossePAC files.
# Submitted on 2004-02-08 by Carl
0	string	DSIGDCC	[fid=000001262-50-0000PAC;ext=pac;mime=;]CrossePAC archive file

# Magic ID for High Compression Markov Predictive Coder files.
# Submitted on 2004-02-23 by Carl
0	string	PPZ2	[fid=000100061-50-0000PMZ;ext=pmz;mime=;]PPMZ2 archive file

# Magic ID for Powerpacker files.
# Submitted on 2004-02-27 by Carl
0	string	PP20	[fid=000100062-50-00000PP;ext=pp;mime=;]Powerpacker archive file

# Magic ID for PAQ1 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ1\\x0D\\x0A	[fid=000100064-50-0000PQ1;ext=pq1;mime=;]PAQ1 archive file

# Magic ID for PAQ3 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ3\\x0D\\x0A	[fid=000100064-50-0000PQ3;ext=pq3;mime=;]PAQ3 archive file

# Magic ID for PAQ6 files.
# Submitted on 2004-02-27 by Carl
0	string	PAQ6	[fid=000100064-50-0000PQ6;ext=pq6;mime=;]PAQ6 archive file

# Magic ID for Pretty simple archiver files.
# Submitted on 2004-02-27 by Carl
0	string	PSA\\x01\\x03	[fid=000100065-50-0000PSA;ext=psa;mime=;]Pretty simple archiver archive file

# Magic ID for Quantum compressor files.
# Submitted on 2004-02-27 by Carl
0	string	DS	[fid=000001294-50-000000Q;ext=q;mime=;]Quantum archive file
&2	byte	<2	
>2	byte	x	, version %d
>3	byte	x	.%d

# Magic ID for Rar files.
# Submitted on 2004-02-08 by Carl
0	string	\\x52\\x61\\x72\\x21\\x1a\\x07\\x00	[fid=000001267-50-0000RAR;ext=rar;mime=;]RAR archive file

# Magic ID for Romanian archiver eXpert (RAX) files.
# Submitted on 2004-02-27 by Carl
0	string	ULEB	[fid=000001295-50-0000RAX;ext=rax;mime=;]RAX archive file

# Magic ID for Reduq files.
# Submitted on 2004-02-27 by Carl
0	string	rdqx	[fid=000100066-50-0000RDQ;ext=rdq;mime=;]Reduq archive file

# Magic ID for RPM files.
# Submitted on 2004-03-04 by Carl
0	string	\\xed\\xab\\xee\\xdb	[fid=000000000-50-0000RPM;ext=rpm;mime=;]RPM archive
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for rzip files.
# Submitted on 2004-03-04 by Carl
0	string	RZIP	[fid=000100076-50-00000RZ;ext=rz;mime=;]Rzip archive file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH0	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH4	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for Streamline Archival Utility files.
# Submitted on 2004-02-08 by Carl
3	string	LH5	[fid=000001264-50-0000SAR;ext=sar;mime=;]Streaming Archiver Utility archive file

# Magic ID for SBX Archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SB1\\x00	[fid=000001297-50-00000SB;ext=sb;mime=;]SBX archive file

# Magic ID for SBC Archiver files.
# Submitted on 2004-02-27 by Carl
0	string	SBC\\x1E	[fid=000100067-50-0000SBC;ext=sbc;mime=;]SBC archive file

# Submitted on 2004-02-10 by Carl
10	string	#\\ This\\ is\\ a\\ shell\\ archive	[fid=000000000-50-000SHAR;ext=shar;mime=;]UNIX shell archive

# Submitted on 2004-02-10 by Carl
11	string	#\\ This\\ is\\ a\\ shell\\ archive	[fid=000000000-50-000SHAR;ext=shar;mime=;]UNIX shell archive

# Magic ID for Nulib files.
# Submitted on 2004-02-08 by Carl
0	string	\\x4e\\xf5\\x46\\xd8	[fid=000100005-50-0000SHK;ext=shk;mime=;]Shrinkit/Nulib archive file

# Magic ID for Nulib files.
# Submitted on 2004-02-08 by Carl
0	string	\\x4e\\xf5\\x46\\xe9\\x6c\\xe5	[fid=000100005-50-0000SHK;ext=shk;mime=;]Shrinkit/Nulib archive file

# Magic ID for Stuffit files.
# Submitted on 2004-03-04 by Carl
0	string	StuffIt\\ 	[fid=000001272-50-0000SIT;ext=sit;mime=;]Stuffit archive file

# Magic ID for Stuffit files.
# Submitted on 2004-02-11 by Carl
0	string	SIT!	[fid=000001272-50-0000SIT;ext=sit;mime=;]Stuffit archive file
&10	string	rLau	
>14	byte	x	, version %d.0

# Magic ID for Stuffit Extended files.
# Submitted on 2004-03-04 by Carl
0	string	StuffIt!	[fid=000001272-50-000SITX;ext=sitx;mime=;]Stuffit extended archive file

# Magic ID for Sof files.
# Submitted on 2004-03-04 by Carl
0	string	PK\\x03\\x06	[fid=000000000-50-0000SOF;ext=sof;mime=;]SOF archive file

# Magic ID for Splint files.
# Submitted on 2004-02-08 by Carl
0	string	\\x93\\xB9\\x06	[fid=000100006-50-0000SPL;ext=spl;mime=;]Splint archive file

# Magic ID for Sqweez files.
# Submitted on 2004-02-10 by Carl
0	string	SQWEZ\\ 	[fid=000100014-50-0000SQZ;ext=sqz;mime=;]Sqwez archive file

# Magic ID for Sqz files.
# Submitted on 2004-02-10 by Carl
0	string	HLSQZ	[fid=000100015-50-0000SQZ;ext=sqz;mime=;]Squeeze archive file
>5	string	x	, version %.1s.0

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S401	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S401	, version 4.01

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S403	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S403	, version 4.03

# Magic ID for Stonecracker files.
# Submitted on 2004-02-27 by Carl
0	string	S404	[fid=000100063-50-0000STC;ext=stc;mime=;]Stonecracker archive file
>0	string	S404	, version 4.04

# Magic ID for Szip files.
# Submitted on 2004-02-08 by Carl
0	string	SZ\\x0A\\x04	[fid=000100009-50-00000SZ;ext=sz;mime=;]SZIP archive file
>4	byte	x	, version %d
>5	byte	x	.%d

# Magic ID for Tar,pax files.
# Submitted on 2004-02-10 by Carl
257	string	ustar\\040\\040\\0	[fid=000000000-50-0000TAR;ext=tar;mime=;]GNU tar archive

# Magic ID for Tar,pax files.
# Submitted on 2004-02-10 by Carl
257	string	ustar\\0\\x06	[fid=000000003-50-0001003;ext=tar;mime=;]Opengroup/POSIX tar archive

# Magic ID for uc2 files.
# Submitted on 2004-02-10 by Carl
0	string	UC2\\x1a	[fid=000001271-50-0000UC2;ext=uc2;mime=;]Ultra Compressor archive file

# Magic ID for Uharc files.
# Submitted on 2004-03-04 by Carl
0	string	UHA	[fid=000100083-50-0000UHA;ext=uha;mime=;]UHArc archive file

# Magic ID for YBS archiver files.
# Submitted on 2004-02-27 by Carl
0	string	YBS3	[fid=000100071-50-0000YBS;ext=ybs;mime=;]YBS archive file

# Submitted on 2004-02-11 by Carl
0	string	\\037\\235	[fid=000000000-50-000000Z;ext=z;mime=;]UNIX archive file

# Magic ID for Pkunzip, Info-zip Unzip files.
# Submitted on 2004-02-08 by Carl
0	lelong	0x04034b50	[fid=000001266-50-0000ZIP;ext=zip;mime=application/zip;]Pkzip archive file

# Magic ID for zoo files.
# Submitted on 2004-02-10 by Carl
0	string	ZOO	[fid=000100012-50-0000ZOO;ext=zoo;mime=;]Zoo archive file
&0x14	lelong	0x0FDC4A7DC	
>32	byte	x	, version %d
>33	byte	x	.%d

# Magic ID for Zzip files.
# Submitted on 2004-02-08 by Carl
0	string	ZZ	[fid=000100007-50-00000ZZ;ext=zz;mime=;]ZZip archive file
>2	byte	x	, version %d.0

# Magic ID for 624 files.
# Submitted on 2004-03-03 by Carl
0	string	[ESP]\\xB5\\x78	[fid=000100002-51-0000COM;ext=com;mime=;]624 executable compressed file (MS-DOS)

# Magic ID for 624 files.
# Submitted on 2004-03-03 by Carl
0	string	PULP\\x83	[fid=000100002-51-0000COM;ext=com;mime=;]624 executable compressed file (MS-DOS)

# Magic ID for Lzexe files.
# Submitted on 2004-02-23 by Carl
0x1C	string	LZ91	[fid=000100053-51-0000EXE;ext=exe;mime=;]Lzexe compressed executable file (MS-DOS)

# Magic ID for HTML Help Workshop files.
# Submitted on 2004-02-08 by Carl
0	string	ITSF	[fid=000001001-60-0000CHM;ext=chm;mime=;]Microsoft compiled hypertext document

# Magic ID for Borland Delphi files.
# Submitted on 2004-07-30 by Carl
2	string	DELPHI.DIAGRAM.PORTFOLIO	[fid=000001005-60-0000DDP;ext=ddp;mime=;]Delphi Diagram Portfolio file

# Magic ID for Pagestream files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001268-60-0000DOC;ext=doc;mime=;]Pagestream document
&8	string	DOC\\ 	

# Submitted on 2004-02-08 by Carl
0	string	CAT\\ 	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	LIST	[fid=000001010-60-000FTXT;ext=ftxt;mime=;]Formatted text interchange file
&8	string	FTXT	

# Submitted on 2004-02-08 by Carl
0	string	@database	[fid=000001007-60-00GUIDE;ext=guide;mime=;]AmigaGuide hypertext document

# Submitted on 2004-02-14 by Carl
0	lelong	0x00035F3F	[fid=000001001-60-0000HLP;ext=hlp;mime=;]Microsoft Windows Help file

# Submitted on 2004-10-08 by Carl
0	string	<!DOCTYPE\\ 	[fid=000000001-60-0015445;ext=html,htm;mime=text/html;]HyperText Markup Language document (HTML)
&10	string/c	html	

# Submitted on 2004-02-08 by Carl
0	string	HDOC	[fid=000001006-60-0000HYP;ext=hyp;mime=;]Atari ST-Guide hypertext document

# Magic ID for OS/2 files.
# Submitted on 2004-02-08 by Carl
0	string	HSP	[fid=000001009-60-0000INF;ext=inf;mime=;]OS/2 Guide hypertext document

# Submitted on 2004-02-08 by Carl
0	string	This\\ is\\ Info\\ file	[fid=000100010-60-000INFO;ext=info;mime=;]GNU Info hypertext document

# Magic ID for Adobe Acrobat files.
# Submitted on 2004-10-08 by Carl
0	string	%PDF-	[fid=000000001-60-0015930;ext=pdf;mime=application/pdf;]Portable document format document file (PDF)
>5	string	x	, version %.1s
>7	string	x	.%.1s

# Magic ID for Microsoft Wordpad files.
# Submitted on 2004-02-08 by Carl
0	string	{\\\\rtf	[fid=000001001-60-0000RTF;ext=rtf;mime=text/rtf;]Rich Text Format document
>5	string	x	, version %.1s.x

# Magic ID for DocBook files.
# Submitted on 2004-10-08 by Carl
0	string	<!DOCTYPE\\ 	[fid=000000001-60-0008879;ext=sgml,sgm;mime=text/sgml;]Standard general markup language document (SGML)

# Magic ID for Turbo C files.
# Submitted on 2004-02-14 by Carl
0	string	TURBO\\ C\\ HELP\\ FILE\\x00	[fid=000001005-60-0000TCH;ext=tch;mime=;]Turbo C help file

# Magic ID for Turbo Pascal files.
# Submitted on 2004-02-08 by Carl
0	string	TURBO\\ PASCAL\\ HELP\\ FILE\\x00	[fid=000001005-60-0000TPH;ext=tph;mime=;]Borland Pascal help file

# Magic ID for Turbo Vision files.
# Submitted on 2004-02-08 by Carl
0	lelong	0x46484246	[fid=000001005-60-0000TVH;ext=tvh;mime=;]Borland Turbo Vision help file

# Magic ID for Wordperfect files.
# Submitted on 2004-02-08 by Carl
0	string	\\xFFWPC	[fid=000001008-60-0000WPD;ext=wpd,doc;mime=application/vnd.wordperfect;]Wordperfect document
&9	byte	0x0A	
>10	byte	x	, version %d
>11	byte	x	.%d

# Magic ID for Microsoft Write files.
# Submitted on 2004-02-08 by Carl
0	leshort	0137061	[fid=000001001-60-0000WRI;ext=wri;mime=;]Microsoft Write document
&2	leshort	0x0000	

# Magic ID for Microsoft Write files.
# Submitted on 2004-02-08 by Carl
0	leshort	0137062	[fid=000001001-60-0000WRI;ext=wri;mime=;]Microsoft Write document
&2	leshort	0x0000	

# Magic ID for X-Windows files.
# Submitted on 2004-09-01 by Carl
0	string	STARTFONT\\ 	[fid=000001003-70-0000BDF;ext=bdf;mime=;]Adobe glyph bitmap distribution format font file

# Magic ID for Deluxe Paint files.
# Submitted on 2004-09-01 by Carl
0	string	CF\\x01\\x00	[fid=000001010-70-000000C;ext=c;mime=;]Deluxe paint multi-colour font file

# Magic ID for Figlet files.
# Submitted on 2004-09-01 by Carl
0	string	flf2	[fid=000100122-70-0000FLF;ext=flf;mime=;]Figlet font file

# Magic ID for PCL 5 files.
# Submitted on 2004-09-01 by Carl
0	string	\\x00\\x44\\x00\\x01\\x00\\x00\\x00\\x1A	[fid=000001336-70-0000LIB;ext=lib,type;mime=;]Intellifont Scalable Typeface Format  file

# Magic ID for Deluxe Paint files.
# Submitted on 2004-09-01 by Carl
0	string	\\x1B\\x29\\x73\\x36\\x34\\x57\\x00\\x40	[fid=000001010-70-000000M;ext=m;mime=;]Deluxe paint mono colour font file

# Submitted on 2004-05-20 by Carl
0	belong	0x00010000	[fid=000001001-70-0000TTF;ext=otf,ttf;mime=;]Opentype font file

# Submitted on 2004-05-20 by Carl
0	string	OTTO	[fid=000001001-70-0000TTF;ext=otf,ttf;mime=;]Opentype font file, CFF type

# Magic ID for X-Windows files.
# Submitted on 2004-09-01 by Carl
0	belong	0x01666370	[fid=000000000-70-0000PCF;ext=pcf;mime=;]Portable compiled format (PCF) font file

# Submitted on 2004-05-20 by Carl
0	string	%!FontType1	[fid=000000001-70-0009541;ext=pfa;mime=;]Type 1 font file

# Submitted on 2004-05-20 by Carl
0	string	%!PS-AdobeFont-1.0	[fid=000000001-70-0009541;ext=pfa;mime=;]Type 1 font file

# Submitted on 2004-05-20 by Carl
6	string	%!FontType1	[fid=000001003-70-0000PFB;ext=pfb;mime=;]Type 1 printer font binary file
&0	byte	0x80	

# Submitted on 2004-05-20 by Carl
6	string	%!PS-AdobeFont-1.0	[fid=000001003-70-0000PFB;ext=pfb;mime=;]Type 1 printer font binary file
&0	byte	0x80	

# Magic ID for X-Windows, GemDOS files.
# Submitted on 2004-09-01 by Carl
2	string	\\x2E\\x30\\x0D\\x0A\\x00\\x00	[fid=000001337-70-0000SPD;ext=spd;mime=;]Bitstream Speedo font file
&0	string	D	
>24	string	x	[title=%.70s]
>1	string	x	,version %.1s.0

# Submitted on 2004-05-20 by Carl
0	string	true	[fid=000001002-70-0000TTF;ext=ttf;mime=;]Truetype font file

# Submitted on 2004-05-20 by Carl
0	string	typ1	[fid=000001002-70-0000TTF;ext=ttf;mime=;]Truetype font file

# Submitted on 2004-05-20 by Carl
0	string	StartCompFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe composite font metrics file

# Submitted on 2004-05-20 by Carl
0	string	StartFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe font metrics file

# Submitted on 2004-05-20 by Carl
0	string	StartMasterFontMetrics	[fid=000001003-70-0000AFM;ext=afm;mime=;]Adobe master font metrics file

# Submitted on 2004-05-20 by Carl
0	leshort	0x0100	[fid=000001001-70-0000PFM;ext=pfm;mime=;]Printer Font Metrics file for Type 1 fonts
&66	leshort	0x0081	

# Submitted on 2004-02-08 by Carl
0	lelong	0x75B22630	[fid=000001001-81-0000ASF;ext=asf,wma,wmv;mime=;]Microsoft Advanced Streaming format multimedia file
&6	leshort	0x11CF	

# Submitted on 2004-02-08 by Carl
0	string	RIFF	[fid=000001001-81-0000AVI;ext=avi;mime=;]Audio-video interleaved movie, little-endian
&8	string	AVI\\ 	

# Submitted on 2004-02-13 by Carl
0	string	RIFX	[fid=000001001-81-0000AVI;ext=avi;mime=;]Audio-video interleaved movie, big-endian
&8	string	AVI\\ 	

# Magic ID for Quicktime files.
# Submitted on 2004-02-08 by Carl
4	string	mdat	[fid=000001002-81-0000MOV;ext=mov,qt;mime=video/quicktime;]Apple QuickTime movie data (mdat)

# Magic ID for Quicktime files.
# Submitted on 2004-02-08 by Carl
4	string	moov	[fid=000001002-81-0000MOV;ext=mov,qt;mime=video/quicktime;]Apple QuickTime movie resource (moov)

# Submitted on 2004-05-20 by Carl
0	belong	0x1B3	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Submitted on 2004-05-20 by Carl
0	belong	0x1BA	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Submitted on 2004-05-20 by Carl
0	belong	0x1E0	[fid=000000001-81-000MPEG;ext=mpe,mpeg,mpg;mime=video/mpeg;]MPEG multimedia (audio/video) stream file
&Z4	belong	0x01B9	

# Magic ID for Alias/Wavefront files.
# Submitted on 2004-02-08 by Carl
0	string	MOVI	[fid=000001004-81-00000MV;ext=mv;mime=;]Alias/Wavefront movie file

# Submitted on 2004-05-18 by Carl
0	string	OggS	[fid=000000000-81-0000OGG;ext=ogg;mime=application/ogg;]OGG Multimedia container stream file

# Magic ID for Realplayer files.
# Submitted on 2004-05-19 by Carl
0	string	.RMF	[fid=000001027-81-00000RM;ext=rm,ra,rt,rp,rpa;mime=;]RealMedia multimedia container stream file

# Magic ID for Macromedia Flash files.
# Submitted on 2004-02-08 by Carl
0	string	FWS	[fid=000001259-81-0000SWF;ext=swf;mime=;]Shockwave Macromedia animation
>3	byte	x	, version %d.0

# Magic ID for Vivo player files.
# Submitted on 2004-05-20 by Carl
5	string	Version:Vivo	[fid=000000000-81-000VIVO;ext=viv,vivo;mime=video/vnd.vivo;]Vivo multimedia stream file

# Magic ID for Aegis Animator files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001261-82-000ANIM;ext=anim;mime=;]Amiga / Sparta software animation
&8	string	ANIM	

# Magic ID for Fantavision movie maker files.
# Submitted on 2004-02-08 by Carl
0	string	FORM	[fid=000001260-82-000FANT;ext=fant;mime=;]Fantavision movie
&8	string	FANT	

# Magic ID for Autodesk Animator Pro files.
# Submitted on 2004-02-08 by Carl
4	leshort	0xAF12	[fid=000001254-82-0000FLC;ext=flc;mime=;]Autodesk Animator Pro animation
&12	leshort	0x08	
>8	leshort	x	[res=%dx
>10	leshort	x	%d
>12	leshort	x	x8bpp]

# Magic ID for Autodesk Animator files.
# Submitted on 2004-02-08 by Carl
4	leshort	0xAF11	[fid=000001254-82-0000FLI;ext=fli;mime=;]Autodesk Animator animation
&12	leshort	0x08	
>8	leshort	x	[res=%dx
>10	leshort	x	%d
>12	leshort	x	x8bpp]

# Submitted on 2004-04-13 by Carl
0	string	\\x8AMNG\\x0d\\x0A\\x1A\\x0A	[fid=000000000-82-0000MNG;ext=mng;mime=;]Multi-image network graphics animation file
>0x10	belong	x	[res=%dx
>0x14	belong	x	%d]

# Magic ID for Cyberpaint files.
# Submitted on 2004-02-08 by Carl
0	beshort	0xFEDB	[fid=000000000-82-0000SEQ;ext=seq;mime=;]Cyberpaint Animation Sequence
&2	beshort	0x0000	

# Magic ID for Quicken,Money files.
# Submitted on 2004-08-01 by Carl
0	string	OFXHEADER:	[fid=000000008-91-0000QFX;ext=qfx;mime=;]Open financial exchange file (SGML)

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Account	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Bank	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Cash	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Cat	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:CCard	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Class	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Invst	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Memorized	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Oth A	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Magic ID for Quicken files.
# Submitted on 2004-08-01 by Carl
1	string	Type:Oth L	[fid=000001335-91-0000QIF;ext=qif;mime=;]Quicken interchange file
&0	byte	33	

# Submitted on 2004-02-11 by Carl
0	string	RRG	[fid=000001001-B0-0000CRD;ext=crd;mime=;]Windows 3.x cardfile

# Submitted on 2004-02-11 by Carl
0	string	MGC	[fid=000001001-B0-0000CRD;ext=crd;mime=;]Windows NT 3.51 card file

# Submitted on 2004-02-14 by Carl
0	string	BEGIN:VCARD	[fid=000001015-B0-0000VCF;ext=vcf;mime=;]vCard Business Card file

# Submitted on 2004-02-14 by Carl
0	string	\\xb5\\xa2\\xb0\\xb3\\xb3\\xb0\\xa2\\xb5	[fid=000001001-B1-0000CAL;ext=cal;mime=;]Microsoft windows calendar file

# Submitted on 2004-02-14 by Carl
0	string	BEGIN:VCALENDAR	[fid=000001016-B1-0000VCS;ext=vcs;mime=;]vCalendar/iCalendar Agenda file

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x00\\x00\\x3C\\x00\\x00\\x00\\x3F	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32BE encoded
&8	belong	0x00000078	
&12	belong	0x0000006d	

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x00\\xfe\\xff\\x00\\x00\\x00\\x3C	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32BE encoded
&8	belong	0x0000003F	
&12	belong	0x00000078	

# Submitted on 2004-05-17 by Carl
0	string	\\x00\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00\\x6c	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16BE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\x3C\\x00\\x00\\x00\\x3F\\x00\\x00\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32LE encoded
&8	beshort	0x00000078	
&12	beshort	0x0000006d	

# Submitted on 2004-05-17 by Carl
0	string	\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00\\x6c\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16LE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xef\\xbb\\xbf<?xml	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-8 encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xfe\\xff\\x00\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16BE encoded

# Submitted on 2004-05-17 by Carl
0	string	\\xff\\xfe\\x00\\x00\\x3C\\x00\\x00\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-32LE encoded
&8	beshort	0x3F000000	
&12	beshort	0x78000000	

# Submitted on 2004-05-17 by Carl
0	string	\\xff\\xfe\\x3C\\x00\\x3F\\x00\\x78\\x00\\x6D\\x00	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file, UTF-16LE encoded

# Submitted on 2004-05-17 by Carl
0	string	<?xml	[fid=000000007-F3-0000XML;ext=xml;mime=text/xml;]Extensible Markup language (XML) file

# Submitted on 2004-04-20 by Carl
0	string	\\xd0\\xcf\\x11\\xe0\\xa1\\xb1\\x1a\\xe1	[fid=000001001-F4-0000OLE;ext=ole;mime=;]Microsoft OLE Compound file, big-endian
&0x1C	leshort	!0xFFFE	

# Submitted on 2004-04-20 by Carl
0	string	\\xd0\\xcf\\x11\\xe0\\xa1\\xb1\\x1a\\xe1	[fid=000001001-F4-0000OLE;ext=ole;mime=;]Microsoft OLE Compound file, little-endian
&0x1C	leshort	0xFFFE	
>0x1A	leshort	x	, version %d
>0x18	leshort	x	.%d

# Magic ID for Freepascal compiler files.
# Submitted on 2004-10-24 by Carl
0	string	PPU0	[fid=000100120-11-0000PPU;ext=ppu,ppl,ppo,ppw,ppa,ppt;mime=;]Freepascal unit file
>0x04	string	x	, version %.2s

# Magic ID for Smartcards files.
# Submitted on 2004-10-29 by Carl
0	belong	0x00FACADE	[fid=000001011-10-0000EXP;ext=exp;mime=;]Javacard API export file
>0x05	byte	x	, version %d
>4	byte	x	.%d

# Submitted on 2004-10-29 by Carl
0	string	-rom1fs-	[fid=000100121-0F-0000IMG;ext=img;mime=;]Simple ROM filesystem (ROMFS)
>16	string	x	[title=%s]

# Magic ID for Virtual PC files.
# Submitted on 2004-10-29 by Carl
0	string	conectix	[fid=000001001-0F-0000VHD;ext=vhd;mime=;]Virtual PC Hard drive

# Submitted on 2004-11-12 by Carl Eric Codere
0	string	%!PS-Adobe-	[fid=000001003-33-00000PS;ext=ps,eps;mime=application/postscript;]Postscript file
>11	string	x	, level %.1s
>13	string	x	.%.1s

# Submitted on 2004-11-12 by Carl Eric Codere
0	lelong	0x526f6d2e	[fid=000001338-0F-0000ROM;ext=rom,fs;mime=;]eCos ROM Filesystem image (ROMFS)
>16	string	x	[title=%.16s]

# Magic ID for PADGen files.
# Submitted on 2004-11-26 by Carl Eric Codere
0x29	string	<XML_DIZ_INFO>	[fid=000001339-A0-0000XML;ext=xml;mime=text/xml;]Portable application description file (XML)
&0	string	<?xml	

# Magic ID for PADGen files.
# Submitted on 2004-11-26 by Carl Eric Codere
0x28	string	<XML_DIZ_INFO>	[fid=000001339-A0-0000XML;ext=xml;mime=text/xml;]Portable application description file (XML)
&0	string	<?xml	

# Submitted on 2004-11-26 by Carl Eric Codere
0x29	string	<x:xmpmeta\\ 	[fid=000001003-A0-0000XMP;ext=xml,xmp;mime=text/xml;]Extensible metadata platform sidecar file (XML)
&0	string	<?xml	

# Submitted on 2004-11-26 by Carl Eric Codere
0x28	string	<x:xmpmeta\\ 	[fid=000001003-A0-0000XMP;ext=xml,xmp;mime=text/xml;]Extensible metadata platform sidecar file (XML)
&0	string	<?xml	

# Magic ID for Texinfo files.
# Submitted on 2004-11-26 by Carl Eric Codere
1	string	input texinfo	[fid=000001340-00-000TEXI;ext=texi;mime=;]Texinfo source file

# Magic ID for MS-DOS files.
# Submitted on 2004-11-26 by Carl Eric Codere
0	string	\\xFFFONT	[fid=000001001-70-0000CPI;ext=cpi;mime=;]MS-DOS code page raster font

# Magic ID for UNIX files.
# Submitted on 2004-11-26 by Carl Eric Codere
0	string	TZif	[fid=000000000-90-0000000;ext=;mime=;]Timezone information database file (compiled)

# Magic ID for Telix files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	lelong	0x2e2b291a	[fid=000100126-B0-0000FON;ext=fon;mime=;]Telix phone book
&4	leshort	1	

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	VCPCH0\\x00\\x00	[fid=000001001-90-0000PCH;ext=pch;mime=;]Microsoft Visual C++ pre-compiled header(s)

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	Microsoft\\ C/C++\\ program\\ database	[fid=000001001-90-0000PDB;ext=pdb;mime=;]Microsoft Visual C++ debug information database
&0x25	string	\\x0D\\x0A\\x1A	
&0x28	string	JG\\x00	

# Magic ID for Microsoft Visual C++ files.
# Submitted on 2005-03-04 by Carl Eric Codere
0	string	Microsoft\\ Linker\\ Database\\x0A\\x07\\x1A	[fid=000001001-90-0000ILK;ext=ilk;mime=;]Microsoft Visual C++ linker database


# CRC32:8BC3BA46
'
+	);
+/**
+ * Returns the test data for a given key
+ *
+ * @param string $key
+ * @access public
+ */
+	function get($key) {
+/**
+ * data property
+ *
+ * @var array
+ * @access public
+ */
+		static $data = array();
+
+		if (empty($data)) {
+			$vars = get_class_vars(__CLASS__);
+			foreach ($vars['data'] as $k => $v) {
+				$data[$k] = base64_decode($v);
+				if (preg_match('/^[ais]:[0-9]+/', $data[$k])) {
+					$data[$k] = unserialize($data[$k]);
+				}
+			}
+		}
+
+		if (!isset($data[$key])) {
+			return false;
+		}
+		return $data[$key];
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php
new file mode 100644
index 000000000..a2469b051
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/acl.test.php
@@ -0,0 +1,462 @@
+<?php
+/**
+ * AclBehaviorTest file
+ *
+ * Test the Acl Behavior
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.tests.model.behaviors.acl
+ * @since         CakePHP v 1.2.0.4487
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Behavior', 'Acl');
+App::import('Core', 'db_acl');
+
+/**
+* Test Person class - self joined model
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.model.behaviors
+*/
+class AclPerson extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'AclPerson';
+
+/**
+ * useTable property
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'people';
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Acl' => 'requester');
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'Mother' => array(
+			'className' => 'AclPerson',
+			'foreignKey' => 'mother_id',
+		)
+	);
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'Child' => array(
+			'className' => 'AclPerson',
+			'foreignKey' => 'mother_id'
+		)
+	);
+
+/**
+ * parentNode method
+ *
+ * @return void
+ * @access public
+ */
+	function parentNode() {
+		if (!$this->id && empty($this->data)) {
+			return null;
+		}
+		if (isset($this->data['AclPerson']['mother_id'])) {
+			$motherId = $this->data['AclPerson']['mother_id'];
+		} else {
+			$motherId = $this->field('mother_id');
+		}
+		if (!$motherId) {
+			return null;
+		} else {
+			return array('AclPerson' => array('id' => $motherId));
+		}
+	}
+}
+
+/**
+* AclUser class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.model.behaviors
+*/
+class AclUser extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'User';
+
+/**
+ * useTable property
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'users';
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Acl');
+
+/**
+ * parentNode
+ *
+ * @access public
+ */
+	function parentNode() {
+		return null;
+	}
+}
+
+/**
+* AclPost class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.model.behaviors
+*/
+class AclPost extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'Post';
+
+/**
+ * useTable property
+ *
+ * @var string
+ * @access public
+ */
+	var $useTable = 'posts';
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Acl' => 'Controlled');
+
+/**
+ * parentNode
+ *
+ * @access public
+ */
+	function parentNode() {
+		return null;
+	}
+}
+
+/**
+* AclBehaviorTest class
+*
+* @package       cake
+* @subpackage    cake.tests.cases.libs.controller.components
+*/
+class AclBehaviorTestCase extends CakeTestCase {
+
+/**
+ * Aco property
+ *
+ * @var Aco
+ * @access public
+ */
+	var $Aco;
+
+/**
+ * Aro property
+ *
+ * @var Aro
+ * @access public
+ */
+	var $Aro;
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.person', 'core.user', 'core.post', 'core.aco', 'core.aro', 'core.aros_aco');
+
+/**
+ * Set up the test
+ *
+ * @return void
+ * @access public
+ */
+	function startTest() {
+		Configure::write('Acl.database', 'test_suite');
+
+		$this->Aco =& new Aco();
+		$this->Aro =& new Aro();
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ * @access public
+ */
+	function tearDown() {
+		ClassRegistry::flush();
+		unset($this->Aro, $this->Aco);
+	}
+
+/**
+ * Test Setup of AclBehavior
+ *
+ * @return void
+ * @access public
+ */
+	function testSetup() {
+		$User =& new AclUser();
+		$this->assertTrue(isset($User->Behaviors->Acl->settings['User']));
+		$this->assertEqual($User->Behaviors->Acl->settings['User']['type'], 'requester');
+		$this->assertTrue(is_object($User->Aro));
+
+		$Post =& new AclPost();
+		$this->assertTrue(isset($Post->Behaviors->Acl->settings['Post']));
+		$this->assertEqual($Post->Behaviors->Acl->settings['Post']['type'], 'controlled');
+		$this->assertTrue(is_object($Post->Aco));
+	}
+
+/**
+ * test After Save
+ *
+ * @return void
+ * @access public
+ */
+	function testAfterSave() {
+		$Post =& new AclPost();
+		$data = array(
+			'Post' => array(
+				'author_id' => 1,
+				'title' => 'Acl Post',
+				'body' => 'post body',
+				'published' => 1
+			),
+		);
+		$Post->save($data);
+		$result = $this->Aco->find('first', array(
+			'conditions' => array('Aco.model' => 'Post', 'Aco.foreign_key' => $Post->id)
+		));
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result['Aco']['model'], 'Post');
+		$this->assertEqual($result['Aco']['foreign_key'], $Post->id);
+
+		$aroData = array(
+			'Aro' => array(
+				'model' => 'AclPerson',
+				'foreign_key' => 2,
+				'parent_id' => null
+			)
+		);
+		$this->Aro->save($aroData);
+
+		$Person =& new AclPerson();
+		$data = array(
+			'AclPerson' => array(
+				'name' => 'Trent',
+				'mother_id' => 2,
+				'father_id' => 3,
+			),
+		);
+		$Person->save($data);
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
+		));
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result['Aro']['parent_id'], 5);
+
+		$node = $Person->node(array('model' => 'AclPerson', 'foreign_key' => 8));
+		$this->assertEqual(count($node), 2);
+		$this->assertEqual($node[0]['Aro']['parent_id'], 5);
+		$this->assertEqual($node[1]['Aro']['parent_id'], null);
+
+		$aroData = array(
+			'Aro' => array(
+			'model' => 'AclPerson',
+				'foreign_key' => 1,
+				'parent_id' => null
+			)
+		);
+		$this->Aro->create();
+		$this->Aro->save($aroData);
+ 
+		$Person->read(null, 8);
+		$Person->set('mother_id', 1);
+		$Person->save();
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
+		));
+		 $this->assertTrue(is_array($result));
+		 $this->assertEqual($result['Aro']['parent_id'], 7);
+ 
+		$node = $Person->node(array('model' => 'AclPerson', 'foreign_key' => 8));
+		$this->assertEqual(sizeof($node), 2);
+		$this->assertEqual($node[0]['Aro']['parent_id'], 7);
+		$this->assertEqual($node[1]['Aro']['parent_id'], null);
+	}
+
+/**
+ * test that an afterSave on an update does not cause parent_id to become null.
+ *
+ * @return void
+ */
+	function testAfterSaveUpdateParentIdNotNull() {
+		$aroData = array(
+			'Aro' => array(
+				'model' => 'AclPerson',
+				'foreign_key' => 2,
+				'parent_id' => null
+			)
+		);
+		$this->Aro->save($aroData);
+
+		$Person =& new AclPerson();
+		$data = array(
+			'AclPerson' => array(
+				'name' => 'Trent',
+				'mother_id' => 2,
+				'father_id' => 3,
+			),
+		);
+		$Person->save($data);
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
+		));
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result['Aro']['parent_id'], 5);
+
+		$Person->save(array('id' => $Person->id, 'name' => 'Bruce'));
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $Person->id)
+		));
+		$this->assertEqual($result['Aro']['parent_id'], 5);
+	}
+
+/**
+ * Test After Delete
+ *
+ * @return void
+ * @access public
+ */
+	function testAfterDelete() {
+		$aroData = array(
+			'Aro' => array(
+				'model' => 'AclPerson',
+				'foreign_key' => 2,
+				'parent_id' => null
+			)
+		);
+		$this->Aro->save($aroData);
+		$Person =& new AclPerson();
+		$data = array(
+			'AclPerson' => array(
+				'name' => 'Trent',
+				'mother_id' => 2,
+				'father_id' => 3,
+			),
+		);
+		$Person->save($data);
+		$id = $Person->id;
+		$node = $Person->node();
+		$this->assertEqual(count($node), 2);
+		$this->assertEqual($node[0]['Aro']['parent_id'], 5);
+		$this->assertEqual($node[1]['Aro']['parent_id'], null);
+
+		$Person->delete($id);
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $id)
+		));
+		$this->assertTrue(empty($result));
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => 2)
+		));
+		$this->assertFalse(empty($result));
+
+		$data = array(
+			'AclPerson' => array(
+				'name' => 'Trent',
+				'mother_id' => 2,
+				'father_id' => 3,
+			),
+		);
+		$Person->save($data);
+		$id = $Person->id;
+		$Person->delete(2);
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => $id)
+		));
+		$this->assertTrue(empty($result));
+
+		$result = $this->Aro->find('first', array(
+			'conditions' => array('Aro.model' => 'AclPerson', 'Aro.foreign_key' => 2)
+		));
+		$this->assertTrue(empty($result));
+	}
+
+/**
+ * Test Node()
+ *
+ * @return void
+ * @access public
+ */
+	function testNode() {
+		$Person =& new AclPerson();
+		$aroData = array(
+			'Aro' => array(
+				'model' => 'AclPerson',
+				'foreign_key' => 2,
+				'parent_id' => null
+			)
+		);
+		$this->Aro->save($aroData);
+
+		$Person->id = 2;
+		$result = $Person->node();
+		$this->assertTrue(is_array($result));
+		$this->assertEqual(count($result), 1);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php
new file mode 100644
index 000000000..ad73e33ed
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/containable.test.php
@@ -0,0 +1,3731 @@
+<?php
+/**
+ * ContainableBehaviorTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('AppModel', 'Model'));
+require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
+
+/**
+ * ContainableTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ */
+class ContainableBehaviorTest extends CakeTestCase {
+
+/**
+ * Fixtures associated with this test case
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(
+		'core.article', 'core.article_featured', 'core.article_featureds_tags', 'core.articles_tag', 'core.attachment', 'core.category',
+		'core.comment', 'core.featured', 'core.tag', 'core.user'
+	);
+
+/**
+ * Method executed before each test
+ *
+ * @access public
+ */
+	function startTest() {
+		$this->User =& ClassRegistry::init('User');
+		$this->Article =& ClassRegistry::init('Article');
+		$this->Tag =& ClassRegistry::init('Tag');
+
+		$this->User->bindModel(array(
+			'hasMany' => array('Article', 'ArticleFeatured', 'Comment')
+		), false);
+		$this->User->ArticleFeatured->unbindModel(array('belongsTo' => array('Category')), false);
+		$this->User->ArticleFeatured->hasMany['Comment']['foreignKey'] = 'article_id';
+
+		$this->Tag->bindModel(array(
+			'hasAndBelongsToMany' => array('Article')
+		), false);
+
+		$this->User->Behaviors->attach('Containable');
+		$this->Article->Behaviors->attach('Containable');
+		$this->Tag->Behaviors->attach('Containable');
+	}
+
+/**
+ * Method executed after each test
+ *
+ * @access public
+ */
+	function endTest() {
+		unset($this->Article);
+		unset($this->User);
+		unset($this->Tag);
+
+		ClassRegistry::flush();
+	}
+
+/**
+ * testContainments method
+ *
+ * @access public
+ * @return void
+ */
+	function testContainments() {
+		$r = $this->__containments($this->Article, array('Comment' => array('conditions' => array('Comment.user_id' => 2))));
+		$this->assertTrue(Set::matches('/Article/keep/Comment/conditions[Comment.user_id=2]', $r));
+
+		$r = $this->__containments($this->User, array(
+			'ArticleFeatured' => array(
+				'Featured' => array(
+					'id',
+					'Category' => 'name'
+				)
+		)));
+		$this->assertEqual(Set::extract('/ArticleFeatured/keep/Featured/fields', $r), array('id'));
+
+		$r = $this->__containments($this->Article, array(
+			'Comment' => array(
+				'User',
+				'conditions' => array('Comment' => array('user_id' => 2)),
+			),
+		));
+		$this->assertTrue(Set::matches('/User', $r));
+		$this->assertTrue(Set::matches('/Comment', $r));
+		$this->assertTrue(Set::matches('/Article/keep/Comment/conditions/Comment[user_id=2]', $r));
+
+		$r = $this->__containments($this->Article, array('Comment(comment, published)' => 'Attachment(attachment)', 'User(user)'));
+		$this->assertTrue(Set::matches('/Comment', $r));
+		$this->assertTrue(Set::matches('/User', $r));
+		$this->assertTrue(Set::matches('/Article/keep/Comment', $r));
+		$this->assertTrue(Set::matches('/Article/keep/User', $r));
+		$this->assertEqual(Set::extract('/Article/keep/Comment/fields', $r), array('comment', 'published'));
+		$this->assertEqual(Set::extract('/Article/keep/User/fields', $r), array('user'));
+		$this->assertTrue(Set::matches('/Comment/keep/Attachment', $r));
+		$this->assertEqual(Set::extract('/Comment/keep/Attachment/fields', $r), array('attachment'));
+
+		$r = $this->__containments($this->Article, array('Comment' => array('limit' => 1)));
+		$this->assertEqual(array_keys($r), array('Comment', 'Article'));
+		$this->assertEqual(array_shift(Set::extract('/Comment/keep', $r)), array('keep' => array()));
+		$this->assertTrue(Set::matches('/Article/keep/Comment', $r));
+		$this->assertEqual(array_shift(Set::extract('/Article/keep/Comment/.', $r)), array('limit' => 1));
+
+		$r = $this->__containments($this->Article, array('Comment.User'));
+		$this->assertEqual(array_keys($r), array('User', 'Comment', 'Article'));
+		$this->assertEqual(array_shift(Set::extract('/User/keep', $r)), array('keep' => array()));
+		$this->assertEqual(array_shift(Set::extract('/Comment/keep', $r)), array('keep' => array('User' => array())));
+		$this->assertEqual(array_shift(Set::extract('/Article/keep', $r)), array('keep' => array('Comment' => array())));
+
+		$r = $this->__containments($this->Tag, array('Article' => array('User' => array('Comment' => array(
+			'Attachment' => array('conditions' => array('Attachment.id >' => 1))
+		)))));
+		$this->assertTrue(Set::matches('/Attachment', $r));
+		$this->assertTrue(Set::matches('/Comment/keep/Attachment/conditions', $r));
+		$this->assertEqual($r['Comment']['keep']['Attachment']['conditions'], array('Attachment.id >' => 1));
+		$this->assertTrue(Set::matches('/User/keep/Comment', $r));
+		$this->assertTrue(Set::matches('/Article/keep/User', $r));
+		$this->assertTrue(Set::matches('/Tag/keep/Article', $r));
+	}
+
+/**
+ * testInvalidContainments method
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidContainments() {
+		$this->expectError();
+		$r = $this->__containments($this->Article, array('Comment', 'InvalidBinding'));
+
+		$this->Article->Behaviors->attach('Containable', array('notices' => false));
+		$r = $this->__containments($this->Article, array('Comment', 'InvalidBinding'));
+	}
+
+/**
+ * testBeforeFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testBeforeFind() {
+		$r = $this->Article->find('all', array('contain' => array('Comment')));
+		$this->assertFalse(Set::matches('/User', $r));
+		$this->assertTrue(Set::matches('/Comment', $r));
+		$this->assertFalse(Set::matches('/Comment/User', $r));
+
+		$r = $this->Article->find('all', array('contain' => 'Comment.User'));
+		$this->assertTrue(Set::matches('/Comment/User', $r));
+		$this->assertFalse(Set::matches('/Comment/Article', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('Comment' => array('User', 'Article'))));
+		$this->assertTrue(Set::matches('/Comment/User', $r));
+		$this->assertTrue(Set::matches('/Comment/Article', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('Comment' => array('conditions' => array('Comment.user_id' => 2)))));
+		$this->assertFalse(Set::matches('/Comment[user_id!=2]', $r));
+		$this->assertTrue(Set::matches('/Comment[user_id=2]', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('Comment.user_id = 2')));
+		$this->assertFalse(Set::matches('/Comment[user_id!=2]', $r));
+
+		$r = $this->Article->find('all', array('contain' => 'Comment.id DESC'));
+		$ids = $descIds = Set::extract('/Comment[1]/id', $r);
+		rsort($descIds);
+		$this->assertEqual($ids, $descIds);
+
+		$r = $this->Article->find('all', array('contain' => 'Comment'));
+		$this->assertTrue(Set::matches('/Comment[user_id!=2]', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('Comment' => array('fields' => 'comment'))));
+		$this->assertFalse(Set::matches('/Comment/created', $r));
+		$this->assertTrue(Set::matches('/Comment/comment', $r));
+		$this->assertFalse(Set::matches('/Comment/updated', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('Comment' => array('fields' => array('comment', 'updated')))));
+		$this->assertFalse(Set::matches('/Comment/created', $r));
+		$this->assertTrue(Set::matches('/Comment/comment', $r));
+		$this->assertTrue(Set::matches('/Comment/updated', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('Comment' => array('comment', 'updated'))));
+		$this->assertFalse(Set::matches('/Comment/created', $r));
+		$this->assertTrue(Set::matches('/Comment/comment', $r));
+		$this->assertTrue(Set::matches('/Comment/updated', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('Comment(comment,updated)')));
+		$this->assertFalse(Set::matches('/Comment/created', $r));
+		$this->assertTrue(Set::matches('/Comment/comment', $r));
+		$this->assertTrue(Set::matches('/Comment/updated', $r));
+
+		$r = $this->Article->find('all', array('contain' => 'Comment.created'));
+		$this->assertTrue(Set::matches('/Comment/created', $r));
+		$this->assertFalse(Set::matches('/Comment/comment', $r));
+
+		$r = $this->Article->find('all', array('contain' => array('User.Article(title)', 'Comment(comment)')));
+		$this->assertFalse(Set::matches('/Comment/Article', $r));
+		$this->assertFalse(Set::matches('/Comment/User', $r));
+		$this->assertTrue(Set::matches('/Comment/comment', $r));
+		$this->assertFalse(Set::matches('/Comment/created', $r));
+		$this->assertTrue(Set::matches('/User/Article/title', $r));
+		$this->assertFalse(Set::matches('/User/Article/created', $r));
+
+		$r = $this->Article->find('all', array('contain' => array()));
+		$this->assertFalse(Set::matches('/User', $r));
+		$this->assertFalse(Set::matches('/Comment', $r));
+
+		$this->expectError();
+		$r = $this->Article->find('all', array('contain' => array('Comment' => 'NonExistingBinding')));
+	}
+
+/**
+ * testContain method
+ *
+ * @access public
+ * @return void
+ */
+	function testContain() {
+		$this->Article->contain('Comment.User');
+		$r = $this->Article->find('all');
+		$this->assertTrue(Set::matches('/Comment/User', $r));
+		$this->assertFalse(Set::matches('/Comment/Article', $r));
+
+		$r = $this->Article->find('all');
+		$this->assertFalse(Set::matches('/Comment/User', $r));
+	}
+
+/**
+ * testFindEmbeddedNoBindings method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindEmbeddedNoBindings() {
+		$result = $this->Article->find('all', array('contain' => false));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+				'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			)),
+			array('Article' => array(
+				'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+				'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+			)),
+			array('Article' => array(
+				'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+				'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+			))
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindFirstLevel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindFirstLevel() {
+		$this->Article->contain('User');
+		$result = $this->Article->find('all', array('recursive' => 1));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain('User', 'Comment');
+		$result = $this->Article->find('all', array('recursive' => 1));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+						'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'
+					),
+					array(
+						'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindEmbeddedFirstLevel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindEmbeddedFirstLevel() {
+		$result = $this->Article->find('all', array('contain' => array('User')));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array('contain' => array('User', 'Comment')));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+						'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'
+					),
+					array(
+						'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31'
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindSecondLevel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindSecondLevel() {
+		$this->Article->contain(array('Comment' => 'User'));
+		$result = $this->Article->find('all', array('recursive' => 2));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+						'User' => array(
+							'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+						)
+					),
+					array(
+						'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+						'User' => array(
+							'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+						)
+					),
+					array(
+						'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+						'User' => array(
+							'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+						)
+					),
+					array(
+						'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+						'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+						'User' => array(
+							'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+						'User' => array(
+							'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+						)
+					),
+					array(
+						'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+						'User' => array(
+							'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'Comment' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(array('User' => 'ArticleFeatured'));
+		$result = $this->Article->find('all', array('recursive' => 2));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31',
+					'ArticleFeatured' => array(
+						array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(array('User' => array('ArticleFeatured', 'Comment')));
+		$result = $this->Article->find('all', array('recursive' => 2));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					),
+					'Comment' => array(
+						array(
+							'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'
+						),
+						array(
+							'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+							'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+						),
+						array(
+							'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31',
+					'ArticleFeatured' => array(
+						array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+						)
+					),
+					'Comment' => array()
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					),
+					'Comment' => array(
+						array(
+							'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'
+						),
+						array(
+							'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+							'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+						),
+						array(
+							'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'
+						)
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(array('User' => array('ArticleFeatured')), 'Tag', array('Comment' => 'Attachment'));
+		$result = $this->Article->find('all', array('recursive' => 2));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				),
+				'Comment' => array(
+					array(
+						'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+						'Attachment' => array()
+					),
+					array(
+						'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+						'Attachment' => array()
+					),
+					array(
+						'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+						'Attachment' => array()
+					),
+					array(
+						'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+						'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+						'Attachment' => array()
+					)
+				),
+				'Tag' => array(
+					array('id' => 1, 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
+					array('id' => 2, 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31',
+					'ArticleFeatured' => array(
+						array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+						)
+					)
+				),
+				'Comment' => array(
+					array(
+						'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+						'Attachment' => array(
+							'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+						)
+					),
+					array(
+						'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+						'Attachment' => array()
+					)
+				),
+				'Tag' => array(
+					array('id' => 1, 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
+					array('id' => 3, 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindEmbeddedSecondLevel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindEmbeddedSecondLevel() {
+		$result = $this->Article->find('all', array('contain' => array('Comment' => 'User')));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+						'User' => array(
+							'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+						)
+					),
+					array(
+						'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+						'User' => array(
+							'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+						)
+					),
+					array(
+						'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+						'User' => array(
+							'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+						)
+					),
+					array(
+						'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+						'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+						'User' => array(
+							'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+						'User' => array(
+							'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+						)
+					),
+					array(
+						'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+						'User' => array(
+							'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'Comment' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array('contain' => array('User' => 'ArticleFeatured')));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31',
+					'ArticleFeatured' => array(
+						array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array('contain' => array('User' => array('ArticleFeatured', 'Comment'))));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					),
+					'Comment' => array(
+						array(
+							'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'
+						),
+						array(
+							'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+							'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+						),
+						array(
+							'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31',
+					'ArticleFeatured' => array(
+						array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+						)
+					),
+					'Comment' => array()
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					),
+					'Comment' => array(
+						array(
+							'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'
+						),
+						array(
+							'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+							'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+						),
+						array(
+							'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+							'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'
+						)
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array('contain' => array('User' => 'ArticleFeatured', 'Tag', 'Comment' => 'Attachment')));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				),
+				'Comment' => array(
+					array(
+						'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+						'Attachment' => array()
+					),
+					array(
+						'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+						'Attachment' => array()
+					),
+					array(
+						'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+						'Attachment' => array()
+					),
+					array(
+						'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+						'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+						'Attachment' => array()
+					)
+				),
+				'Tag' => array(
+					array('id' => 1, 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
+					array('id' => 2, 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31',
+					'ArticleFeatured' => array(
+						array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+						)
+					)
+				),
+				'Comment' => array(
+					array(
+						'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+						'Attachment' => array(
+							'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+						)
+					),
+					array(
+						'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+						'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+						'Attachment' => array()
+					)
+				),
+				'Tag' => array(
+					array('id' => 1, 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
+					array('id' => 3, 'tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+					'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'ArticleFeatured' => array(
+						array(
+							'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+							'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+						)
+					)
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindThirdLevel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindThirdLevel() {
+		$this->User->contain(array('ArticleFeatured' => array('Featured' => 'Category')));
+		$result = $this->User->find('all', array('recursive' => 3));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->User->contain(array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => array('Article', 'Attachment'))));
+		$result = $this->User->find('all', array('recursive' => 3));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->User->contain(array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => 'Attachment'), 'Article'));
+		$result = $this->User->find('all', array('recursive' => 3));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindEmbeddedThirdLevel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindEmbeddedThirdLevel() {
+		$result = $this->User->find('all', array('contain' => array('ArticleFeatured' => array('Featured' => 'Category'))));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->User->find('all', array('contain' => array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => array('Article', 'Attachment')))));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->User->find('all', array('contain' => array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => 'Attachment'), 'Article')));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSettingsThirdLevel method
+ *
+ * @access public
+ * @return void
+ */
+	function testSettingsThirdLevel() {
+		$result = $this->User->find('all', array('contain' => array('ArticleFeatured' => array('Featured' => array('Category' => array('id', 'name'))))));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'name' => 'Category 1'
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'name' => 'Category 1'
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$r = $this->User->find('all', array('contain' => array(
+			'ArticleFeatured' => array(
+				'id', 'title',
+				'Featured' => array(
+					'id', 'category_id',
+					'Category' => array('id', 'name')
+				)
+			)
+		)));
+
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertFalse(Set::matches('/Article', $r) || Set::matches('/Comment', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured', $r));
+		$this->assertFalse(Set::matches('/ArticleFeatured/User', $r) || Set::matches('/ArticleFeatured/Comment', $r) || Set::matches('/ArticleFeatured/Tag', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured', $r));
+		$this->assertFalse(Set::matches('/ArticleFeatured/Featured/ArticleFeatured', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured/Category', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured[id=1]', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured[id=1]/Category[id=1]', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured[id=1]/Category[name=Category 1]', $r));
+
+		$r = $this->User->find('all', array('contain' => array(
+			'ArticleFeatured' => array(
+				'title',
+				'Featured' => array(
+					'id',
+					'Category' => 'name'
+				)
+			)
+		)));
+
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertFalse(Set::matches('/Article', $r) || Set::matches('/Comment', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured', $r));
+		$this->assertFalse(Set::matches('/ArticleFeatured/User', $r) || Set::matches('/ArticleFeatured/Comment', $r) || Set::matches('/ArticleFeatured/Tag', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured', $r));
+		$this->assertFalse(Set::matches('/ArticleFeatured/Featured/ArticleFeatured', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured/Category', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured[id=1]', $r));
+		$this->assertTrue(Set::matches('/ArticleFeatured/Featured[id=1]/Category[name=Category 1]', $r));
+
+		$result = $this->User->find('all', array('contain' => array(
+			'ArticleFeatured' => array(
+				'title',
+				'Featured' => array(
+					'category_id',
+					'Category' => 'name'
+				)
+			)
+		)));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'title' => 'First Article', 'id' => 1, 'user_id' => 1,
+						'Featured' => array(
+							'category_id' => 1, 'id' => 1,
+							'Category' => array(
+								'name' => 'Category 1'
+							)
+						)
+					),
+					array(
+						'title' => 'Third Article', 'id' => 3, 'user_id' => 1,
+						'Featured' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'title' => 'Second Article', 'id' => 2, 'user_id' => 3,
+						'Featured' => array(
+							'category_id' => 1, 'id' => 2,
+							'Category' => array(
+								'name' => 'Category 1'
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$orders = array(
+			'title DESC', 'title DESC, published DESC',
+			array('title' => 'DESC'), array('title' => 'DESC', 'published' => 'DESC'),
+		);
+		foreach ($orders as $order) {
+			$result = $this->User->find('all', array('contain' => array(
+				'ArticleFeatured' => array(
+					'title', 'order' => $order,
+					'Featured' => array(
+						'category_id',
+						'Category' => 'name'
+					)
+				)
+			)));
+			$expected = array(
+				array(
+					'User' => array(
+						'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+					),
+					'ArticleFeatured' => array(
+						array(
+							'title' => 'Third Article', 'id' => 3, 'user_id' => 1,
+							'Featured' => array()
+						),
+						array(
+							'title' => 'First Article', 'id' => 1, 'user_id' => 1,
+							'Featured' => array(
+								'category_id' => 1, 'id' => 1,
+								'Category' => array(
+									'name' => 'Category 1'
+								)
+							)
+						)
+					)
+				),
+				array(
+					'User' => array(
+						'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+					),
+					'ArticleFeatured' => array()
+				),
+				array(
+					'User' => array(
+						'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+					),
+					'ArticleFeatured' => array(
+						array(
+							'title' => 'Second Article', 'id' => 2, 'user_id' => 3,
+							'Featured' => array(
+								'category_id' => 1, 'id' => 2,
+								'Category' => array(
+									'name' => 'Category 1'
+								)
+							)
+						)
+					)
+				),
+				array(
+					'User' => array(
+						'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+					),
+					'ArticleFeatured' => array()
+				)
+			);
+			$this->assertEqual($result, $expected);
+		}
+	}
+
+/**
+ * testFindThirdLevelNonReset method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindThirdLevelNonReset() {
+		$this->User->contain(false, array('ArticleFeatured' => array('Featured' => 'Category')));
+		$result = $this->User->find('all', array('recursive' => 3));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->User->resetBindings();
+
+		$this->User->contain(false, array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => array('Article', 'Attachment'))));
+		$result = $this->User->find('all', array('recursive' => 3));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->User->resetBindings();
+
+		$this->User->contain(false, array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => 'Attachment'), 'Article'));
+		$result = $this->User->find('all', array('recursive' => 3));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindEmbeddedThirdLevelNonReset method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindEmbeddedThirdLevelNonReset() {
+		$result = $this->User->find('all', array('reset' => false, 'contain' => array('ArticleFeatured' => array('Featured' => 'Category'))));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->__assertBindings($this->User, array('hasMany' => array('ArticleFeatured')));
+		$this->__assertBindings($this->User->ArticleFeatured, array('hasOne' => array('Featured')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('Category')));
+
+		$this->User->resetBindings();
+
+		$this->__assertBindings($this->User, array('hasMany' => array('Article', 'ArticleFeatured', 'Comment')));
+		$this->__assertBindings($this->User->ArticleFeatured, array('belongsTo' => array('User'), 'hasOne' => array('Featured'), 'hasMany' => array('Comment'), 'hasAndBelongsToMany' => array('Tag')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('ArticleFeatured', 'Category')));
+		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('belongsTo' => array('Article', 'User'), 'hasOne' => array('Attachment')));
+
+		$result = $this->User->find('all', array('reset' => false, 'contain' => array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => array('Article', 'Attachment')))));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->__assertBindings($this->User, array('hasMany' => array('ArticleFeatured')));
+		$this->__assertBindings($this->User->ArticleFeatured, array('hasOne' => array('Featured'), 'hasMany' => array('Comment')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('Category')));
+		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('belongsTo' => array('Article'), 'hasOne' => array('Attachment')));
+
+		$this->User->resetBindings();
+		$this->__assertBindings($this->User, array('hasMany' => array('Article', 'ArticleFeatured', 'Comment')));
+		$this->__assertBindings($this->User->ArticleFeatured, array('belongsTo' => array('User'), 'hasOne' => array('Featured'), 'hasMany' => array('Comment'), 'hasAndBelongsToMany' => array('Tag')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('ArticleFeatured', 'Category')));
+		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('belongsTo' => array('Article', 'User'), 'hasOne' => array('Attachment')));
+
+		$result = $this->User->find('all', array('contain' => array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => array('Article', 'Attachment')), false)));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Article' => array(
+									'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Article' => array(
+									'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+									'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+								),
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->__assertBindings($this->User, array('hasMany' => array('ArticleFeatured')));
+		$this->__assertBindings($this->User->ArticleFeatured, array('hasOne' => array('Featured'), 'hasMany' => array('Comment')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('Category')));
+		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('belongsTo' => array('Article'), 'hasOne' => array('Attachment')));
+
+		$this->User->resetBindings();
+		$this->__assertBindings($this->User, array('hasMany' => array('Article', 'ArticleFeatured', 'Comment')));
+		$this->__assertBindings($this->User->ArticleFeatured, array('belongsTo' => array('User'), 'hasOne' => array('Featured'), 'hasMany' => array('Comment'), 'hasAndBelongsToMany' => array('Tag')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('ArticleFeatured', 'Category')));
+		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('belongsTo' => array('Article', 'User'), 'hasOne' => array('Attachment')));
+
+		$result = $this->User->find('all', array('reset' => false, 'contain' => array('ArticleFeatured' => array('Featured' => 'Category', 'Comment' => 'Attachment'), 'Article')));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => 1, 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 1, 'user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+						'Featured' => array(
+							'id' => 1, 'article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31',
+								'Attachment' => array()
+							),
+							array(
+								'id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article',
+								'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31',
+								'Attachment' => array()
+							)
+						)
+					),
+					array(
+						'id' => 3, 'user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31',
+						'Featured' => array(),
+						'Comment' => array()
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 2, 'user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			),
+			array(
+				'User' => array(
+					'id' => 3, 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'
+				),
+				'Article' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'
+					)
+				),
+				'ArticleFeatured' => array(
+					array(
+						'id' => 2, 'user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body',
+						'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31',
+						'Featured' => array(
+							'id' => 2, 'article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23',
+							'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31',
+							'Category' => array(
+								'id' => 1, 'parent_id' => 0, 'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'
+							)
+						),
+						'Comment' => array(
+							array(
+								'id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31',
+								'Attachment' => array(
+									'id' => 1, 'comment_id' => 5, 'attachment' => 'attachment.zip',
+									'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'
+								)
+							),
+							array(
+								'id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article',
+								'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31',
+								'Attachment' => array()
+							)
+						)
+					)
+				)
+			),
+			array(
+				'User' => array(
+					'id' => 4, 'user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'
+				),
+				'Article' => array(),
+				'ArticleFeatured' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->__assertBindings($this->User, array('hasMany' => array('Article', 'ArticleFeatured')));
+		$this->__assertBindings($this->User->Article);
+		$this->__assertBindings($this->User->ArticleFeatured, array('hasOne' => array('Featured'), 'hasMany' => array('Comment')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('Category')));
+		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('hasOne' => array('Attachment')));
+
+		$this->User->resetBindings();
+		$this->__assertBindings($this->User, array('hasMany' => array('Article', 'ArticleFeatured', 'Comment')));
+		$this->__assertBindings($this->User->Article, array('belongsTo' => array('User'), 'hasMany' => array('Comment'), 'hasAndBelongsToMany' => array('Tag')));
+		$this->__assertBindings($this->User->ArticleFeatured, array('belongsTo' => array('User'), 'hasOne' => array('Featured'), 'hasMany' => array('Comment'), 'hasAndBelongsToMany' => array('Tag')));
+		$this->__assertBindings($this->User->ArticleFeatured->Featured, array('belongsTo' => array('ArticleFeatured', 'Category')));
+		$this->__assertBindings($this->User->ArticleFeatured->Comment, array('belongsTo' => array('Article', 'User'), 'hasOne' => array('Attachment')));
+	}
+
+/**
+ * testEmbeddedFindFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testEmbeddedFindFields() {
+		$result = $this->Article->find('all', array(
+			'contain' => array('User(user)'),
+			'fields' => array('title')
+		));
+		$expected = array(
+			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
+			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
+			array('Article' => array('title' => 'Third Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array(
+			'contain' => array('User(id, user)'),
+			'fields' => array('title')
+		));
+		$expected = array(
+			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
+			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
+			array('Article' => array('title' => 'Third Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array(
+			'contain' => array(
+				'Comment(comment, published)' => 'Attachment(attachment)', 'User(user)'
+			),
+			'fields' => array('title')
+		));
+		if (!empty($result)) {
+			foreach($result as $i=>$article) {
+				foreach($article['Comment'] as $j=>$comment) {
+					$result[$i]['Comment'][$j] = array_diff_key($comment, array('id'=>true));
+				}
+			}
+		}
+		$expected = array(
+			array(
+				'Article' => array('title' => 'First Article', 'id' => 1),
+				'User' => array('user' => 'mariano', 'id' => 1),
+				'Comment' => array(
+					array('comment' => 'First Comment for First Article', 'published' => 'Y', 'article_id' => 1, 'Attachment' => array()),
+					array('comment' => 'Second Comment for First Article', 'published' => 'Y', 'article_id' => 1, 'Attachment' => array()),
+					array('comment' => 'Third Comment for First Article', 'published' => 'Y', 'article_id' => 1, 'Attachment' => array()),
+					array('comment' => 'Fourth Comment for First Article', 'published' => 'N', 'article_id' => 1, 'Attachment' => array()),
+				)
+			),
+			array(
+				'Article' => array('title' => 'Second Article', 'id' => 2),
+				'User' => array('user' => 'larry', 'id' => 3),
+				'Comment' => array(
+					array('comment' => 'First Comment for Second Article', 'published' => 'Y', 'article_id' => 2, 'Attachment' => array(
+						'attachment' => 'attachment.zip', 'id' => 1
+					)),
+					array('comment' => 'Second Comment for Second Article', 'published' => 'Y', 'article_id' => 2, 'Attachment' => array())
+				)
+			),
+			array(
+				'Article' => array('title' => 'Third Article', 'id' => 3),
+				'User' => array('user' => 'mariano', 'id' => 1),
+				'Comment' => array()
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that hasOne and belongsTo fields act the same in a contain array.
+ *
+ * @return void
+ */
+	function testHasOneFieldsInContain() {
+		$this->Article->unbindModel(array(
+			'hasMany' => array('Comment')
+		), true);
+		unset($this->Article->Comment);
+		$this->Article->bindModel(array(
+			'hasOne' => array('Comment')
+		));
+
+		$result = $this->Article->find('all', array(
+			'fields' => array('title', 'body'),
+			'contain' => array(
+				'Comment' => array(
+					'fields' => array('comment')
+				),
+				'User' => array(
+					'fields' => array('user')
+				)
+			)
+		));
+		$this->assertTrue(isset($result[0]['Article']['title']), 'title missing %s');
+		$this->assertTrue(isset($result[0]['Article']['body']), 'body missing %s');
+		$this->assertTrue(isset($result[0]['Comment']['comment']), 'comment missing %s');
+		$this->assertTrue(isset($result[0]['User']['user']), 'body missing %s');
+		$this->assertFalse(isset($result[0]['Comment']['published']), 'published found %s');
+		$this->assertFalse(isset($result[0]['User']['password']), 'password found %s');
+	}
+/**
+ * testFindConditionalBinding method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindConditionalBinding() {
+		$this->Article->contain(array(
+			'User(user)',
+			'Tag' => array(
+				'fields' => array('tag', 'created'),
+				'conditions' => array('created >=' => '2007-03-18 12:24')
+			)
+		));
+		$result = $this->Article->find('all', array('fields' => array('title')));
+		$expected = array(
+			array(
+				'Article' => array('id' => 1, 'title' => 'First Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array(array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23'))
+			),
+			array(
+				'Article' => array('id' => 2, 'title' => 'Second Article'),
+				'User' => array('id' => 3, 'user' => 'larry'),
+				'Tag' => array(array('tag' => 'tag3', 'created' => '2007-03-18 12:26:23'))
+			),
+			array(
+				'Article' => array('id' => 3, 'title' => 'Third Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'))));
+		$result = $this->Article->find('all', array('fields' => array('title')));
+		$expected = array(
+			array(
+				'Article' => array('id' => 1, 'title' => 'First Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array(
+					array('tag' => 'tag1', 'created' => '2007-03-18 12:22:23'),
+					array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23')
+				)
+			),
+			array(
+				'Article' => array('id' => 2, 'title' => 'Second Article'),
+				'User' => array('id' => 3, 'user' => 'larry'),
+				'Tag' => array(
+					array('tag' => 'tag1', 'created' => '2007-03-18 12:22:23'),
+					array('tag' => 'tag3', 'created' => '2007-03-18 12:26:23')
+				)
+			),
+			array(
+				'Article' => array('id' => 3, 'title' => 'Third Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array(
+			'fields' => array('title'),
+			'contain' => array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created')))
+		));
+		$expected = array(
+			array(
+				'Article' => array('id' => 1, 'title' => 'First Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array(
+					array('tag' => 'tag1', 'created' => '2007-03-18 12:22:23'),
+					array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23')
+				)
+			),
+			array(
+				'Article' => array('id' => 2, 'title' => 'Second Article'),
+				'User' => array('id' => 3, 'user' => 'larry'),
+				'Tag' => array(
+					array('tag' => 'tag1', 'created' => '2007-03-18 12:22:23'),
+					array('tag' => 'tag3', 'created' => '2007-03-18 12:26:23')
+				)
+			),
+			array(
+				'Article' => array('id' => 3, 'title' => 'Third Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(array(
+			'User(id,user)',
+			'Tag' => array(
+				'fields' => array('tag', 'created'),
+				'conditions' => array('created >=' => '2007-03-18 12:24')
+			)
+		));
+		$result = $this->Article->find('all', array('fields' => array('title')));
+		$expected = array(
+			array(
+				'Article' => array('id' => 1, 'title' => 'First Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array(array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23'))
+			),
+			array(
+				'Article' => array('id' => 2, 'title' => 'Second Article'),
+				'User' => array('id' => 3, 'user' => 'larry'),
+				'Tag' => array(array('tag' => 'tag3', 'created' => '2007-03-18 12:26:23'))
+			),
+			array(
+				'Article' => array('id' => 3, 'title' => 'Third Article'),
+				'User' => array('id' => 1, 'user' => 'mariano'),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->assertTrue(empty($this->User->Article->hasAndBelongsToMany['Tag']['conditions']));
+
+		$result = $this->User->find('all', array('contain' => array(
+			'Article.Tag' => array('conditions' => array('created >=' => '2007-03-18 12:24'))
+		)));
+
+		$this->assertTrue(Set::matches('/User[id=1]', $result));
+		$this->assertFalse(Set::matches('/Article[id=1]/Tag[id=1]', $result));
+		$this->assertTrue(Set::matches('/Article[id=1]/Tag[id=2]', $result));
+		$this->assertTrue(empty($this->User->Article->hasAndBelongsToMany['Tag']['conditions']));
+
+		$this->assertTrue(empty($this->User->Article->hasAndBelongsToMany['Tag']['order']));
+
+		$result = $this->User->find('all', array('contain' => array(
+			'Article.Tag' => array('order' => 'created DESC')
+		)));
+
+		$this->assertTrue(Set::matches('/User[id=1]', $result));
+		$this->assertTrue(Set::matches('/Article[id=1]/Tag[id=1]', $result));
+		$this->assertTrue(Set::matches('/Article[id=1]/Tag[id=2]', $result));
+		$this->assertTrue(empty($this->User->Article->hasAndBelongsToMany['Tag']['order']));
+	}
+
+/**
+ * testOtherFinds method
+ *
+ * @access public
+ * @return void
+ */
+	function testOtherFinds() {
+		$result = $this->Article->find('count');
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('count', array('conditions' => array('Article.id >' => '1')));
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('count', array('contain' => array()));
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'), 'conditions' => array('created >=' => '2007-03-18 12:24'))));
+		$result = $this->Article->find('first', array('fields' => array('title')));
+		$expected = array(
+			'Article' => array('id' => 1, 'title' => 'First Article'),
+			'User' => array('id' => 1, 'user' => 'mariano'),
+			'Tag' => array(array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23'))
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created'))));
+		$result = $this->Article->find('first', array('fields' => array('title')));
+		$expected = array(
+			'Article' => array('id' => 1, 'title' => 'First Article'),
+			'User' => array('id' => 1, 'user' => 'mariano'),
+			'Tag' => array(
+				array('tag' => 'tag1', 'created' => '2007-03-18 12:22:23'),
+				array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23')
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('first', array(
+			'fields' => array('title'),
+			'order' => 'Article.id DESC',
+			'contain' => array('User(id,user)', 'Tag' => array('fields' => array('tag', 'created')))
+		));
+		$expected = array(
+			'Article' => array('id' => 3, 'title' => 'Third Article'),
+			'User' => array('id' => 1, 'user' => 'mariano'),
+			'Tag' => array()
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('list', array(
+			'contain' => array('User(id,user)'),
+			'fields' => array('Article.id', 'Article.title')
+		));
+		$expected = array(
+			1 => 'First Article',
+			2 => 'Second Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testPaginate method
+ *
+ * @access public
+ * @return void
+ */
+	function testPaginate() {
+		$Controller =& new Controller();
+		$Controller->uses = array('Article');
+		$Controller->passedArgs[] = '1';
+		$Controller->params['url'] = array();
+		$Controller->constructClasses();
+
+		$Controller->paginate = array('Article' => array('fields' => array('title'), 'contain' => array('User(user)')));
+		$result = $Controller->paginate('Article');
+		$expected = array(
+			array('Article' => array('title' => 'First Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
+			array('Article' => array('title' => 'Second Article'), 'User' => array('user' => 'larry', 'id' => 3)),
+			array('Article' => array('title' => 'Third Article'), 'User' => array('user' => 'mariano', 'id' => 1)),
+		);
+		$this->assertEqual($result, $expected);
+
+		$r = $Controller->Article->find('all');
+		$this->assertTrue(Set::matches('/Article[id=1]', $r));
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertTrue(Set::matches('/Tag[id=1]', $r));
+
+		$Controller->paginate = array('Article' => array('contain' => array('Comment(comment)' => 'User(user)'), 'fields' => array('title')));
+		$result = $Controller->paginate('Article');
+		$expected = array(
+			array(
+				'Article' => array('title' => 'First Article', 'id' => 1),
+				'Comment' => array(
+					array(
+						'comment' => 'First Comment for First Article',
+						'user_id' => 2,
+						'article_id' => 1,
+						'User' => array('user' => 'nate')
+					),
+					array(
+						'comment' => 'Second Comment for First Article',
+						'user_id' => 4,
+						'article_id' => 1,
+						'User' => array('user' => 'garrett')
+					),
+					array(
+						'comment' => 'Third Comment for First Article',
+						'user_id' => 1,
+						'article_id' => 1,
+						'User' => array('user' => 'mariano')
+					),
+					array(
+						'comment' => 'Fourth Comment for First Article',
+						'user_id' => 1,
+						'article_id' => 1,
+						'User' => array('user' => 'mariano')
+					)
+				)
+			),
+			array(
+				'Article' => array('title' => 'Second Article', 'id' => 2),
+				'Comment' => array(
+					array(
+						'comment' => 'First Comment for Second Article',
+						'user_id' => 1,
+						'article_id' => 2,
+						'User' => array('user' => 'mariano')
+					),
+					array(
+						'comment' => 'Second Comment for Second Article',
+						'user_id' => 2,
+						'article_id' => 2,
+						'User' => array('user' => 'nate')
+					)
+				)
+			),
+			array(
+				'Article' => array('title' => 'Third Article', 'id' => 3),
+				'Comment' => array()
+			),
+		);
+		$this->assertEqual($result, $expected);
+
+		$r = $Controller->Article->find('all');
+		$this->assertTrue(Set::matches('/Article[id=1]', $r));
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertTrue(Set::matches('/Tag[id=1]', $r));
+
+		$Controller->Article->unbindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User'), 'hasAndBelongsToMany' => array('Tag')), false);
+		$Controller->Article->bindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User')), false);
+
+		$Controller->paginate = array('Article' => array('contain' => array('Comment(comment)', 'User(user)'), 'fields' => array('title')));
+		$r = $Controller->paginate('Article');
+		$this->assertTrue(Set::matches('/Article[id=1]', $r));
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertTrue(Set::matches('/Comment[article_id=1]', $r));
+		$this->assertFalse(Set::matches('/Comment[id=1]', $r));
+
+		$r = $this->Article->find('all');
+		$this->assertTrue(Set::matches('/Article[id=1]', $r));
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertTrue(Set::matches('/Comment[article_id=1]', $r));
+		$this->assertTrue(Set::matches('/Comment[id=1]', $r));
+	}
+
+/**
+ * testOriginalAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testOriginalAssociations() {
+		$this->Article->Comment->Behaviors->attach('Containable');
+
+		$options = array(
+			'conditions' => array(
+				'Comment.published' => 'Y',
+			),
+			'contain' => 'User',
+			'recursive' => 1
+		);
+
+		$firstResult = $this->Article->Comment->find('all', $options);
+
+		$dummyResult = $this->Article->Comment->find('all', array(
+			'conditions' => array(
+				'User.user' => 'mariano'
+			),
+			'fields' => array('User.password'),
+			'contain' => array('User.password'),
+		));
+
+		$result = $this->Article->Comment->find('all', $options);
+		$this->assertEqual($result, $firstResult);
+
+		$this->Article->unbindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User'), 'hasAndBelongsToMany' => array('Tag')), false);
+		$this->Article->bindModel(array('hasMany' => array('Comment'), 'belongsTo' => array('User')), false);
+
+		$r = $this->Article->find('all', array('contain' => array('Comment(comment)', 'User(user)'), 'fields' => array('title')));
+		$this->assertTrue(Set::matches('/Article[id=1]', $r));
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertTrue(Set::matches('/Comment[article_id=1]', $r));
+		$this->assertFalse(Set::matches('/Comment[id=1]', $r));
+
+		$r = $this->Article->find('all');
+		$this->assertTrue(Set::matches('/Article[id=1]', $r));
+		$this->assertTrue(Set::matches('/User[id=1]', $r));
+		$this->assertTrue(Set::matches('/Comment[article_id=1]', $r));
+		$this->assertTrue(Set::matches('/Comment[id=1]', $r));
+
+		$this->Article->bindModel(array('hasAndBelongsToMany' => array('Tag')), false);
+
+		$this->Article->contain(false, array('User(id,user)', 'Comment' => array('fields' => array('comment'), 'conditions' => array('created >=' => '2007-03-18 10:49'))));
+		$result = $this->Article->find('all', array('fields' => array('title'), 'limit' => 1, 'page' => 1, 'order' => 'Article.id ASC'));
+		$expected = array(array(
+			'Article' => array('id' => 1, 'title' => 'First Article'),
+			'User' => array('id' => 1, 'user' => 'mariano'),
+			'Comment' => array(
+				array('comment' => 'Third Comment for First Article', 'article_id' => 1),
+				array('comment' => 'Fourth Comment for First Article', 'article_id' => 1)
+			)
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array('fields' => array('title', 'User.id', 'User.user'), 'limit' => 1, 'page' => 2, 'order' => 'Article.id ASC'));
+		$expected = array(array(
+			'Article' => array('id' => 2, 'title' => 'Second Article'),
+			'User' => array('id' => 3, 'user' => 'larry'),
+			'Comment' => array(
+				array('comment' => 'First Comment for Second Article', 'article_id' => 2),
+				array('comment' => 'Second Comment for Second Article', 'article_id' => 2)
+			)
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Article->find('all', array('fields' => array('title', 'User.id', 'User.user'), 'limit' => 1, 'page' => 3, 'order' => 'Article.id ASC'));
+		$expected = array(array(
+			'Article' => array('id' => 3, 'title' => 'Third Article'),
+			'User' => array('id' => 1, 'user' => 'mariano'),
+			'Comment' => array()
+		));
+		$this->assertEqual($result, $expected);
+
+		$this->Article->contain(false, array('User' => array('fields' => 'user'), 'Comment'));
+		$result = $this->Article->find('all');
+		$this->assertTrue(Set::matches('/Article[id=1]', $result));
+		$this->assertTrue(Set::matches('/User[user=mariano]', $result));
+		$this->assertTrue(Set::matches('/Comment[article_id=1]', $result));
+		$this->Article->resetBindings();
+
+		$this->Article->contain(false, array('User' => array('fields' => array('user')), 'Comment'));
+		$result = $this->Article->find('all');
+		$this->assertTrue(Set::matches('/Article[id=1]', $result));
+		$this->assertTrue(Set::matches('/User[user=mariano]', $result));
+		$this->assertTrue(Set::matches('/Comment[article_id=1]', $result));
+		$this->Article->resetBindings();
+	}
+
+/**
+ * testResetAddedAssociation method
+ *
+ * @access public
+ */
+	function testResetAddedAssociation() {
+		$this->assertTrue(empty($this->Article->hasMany['ArticlesTag']));
+
+		$this->Article->bindModel(array(
+			'hasMany' => array('ArticlesTag')
+		));
+		$this->assertTrue(!empty($this->Article->hasMany['ArticlesTag']));
+
+		$result = $this->Article->find('first', array(
+			'conditions' => array('Article.id' => 1),
+			'contain' => array('ArticlesTag')
+		));
+		$expected = array('Article', 'ArticlesTag');
+		$this->assertTrue(!empty($result));
+		$this->assertEqual('First Article', $result['Article']['title']);
+		$this->assertTrue(!empty($result['ArticlesTag']));
+		$this->assertEqual($expected, array_keys($result));
+
+		$this->assertTrue(empty($this->Article->hasMany['ArticlesTag']));
+	}
+
+/**
+ * testResetAssociation method
+ *
+ * @access public
+ */
+	function testResetAssociation() {
+		$this->Article->Behaviors->attach('Containable');
+		$this->Article->Comment->Behaviors->attach('Containable');
+		$this->Article->User->Behaviors->attach('Containable');
+
+		$initialOptions = array(
+			'conditions' => array(
+				'Comment.published' => 'Y',
+			),
+			'contain' => 'User',
+			'recursive' => 1,
+		);
+
+		$initialModels = $this->Article->Comment->find('all', $initialOptions);
+
+		$findOptions = array(
+			'conditions' => array(
+				'User.user' => 'mariano',
+			),
+			'fields' => array('User.password'),
+			'contain' => array('User.password')
+		);
+		$result = $this->Article->Comment->find('all', $findOptions);
+		$result = $this->Article->Comment->find('all', $initialOptions);
+		$this->assertEqual($result, $initialModels);
+	}
+
+/**
+ * testResetDeeperHasOneAssociations method
+ *
+ * @access public
+ */
+	function testResetDeeperHasOneAssociations() {
+		$this->Article->User->unbindModel(array(
+			'hasMany' => array('ArticleFeatured', 'Comment')
+		), false);
+		$userHasOne = array('hasOne' => array('ArticleFeatured', 'Comment'));
+
+		$this->Article->User->bindModel($userHasOne, false);
+		$expected = $this->Article->User->hasOne;
+		$this->Article->find('all');
+		$this->assertEqual($expected, $this->Article->User->hasOne);
+
+		$this->Article->User->bindModel($userHasOne, false);
+		$expected = $this->Article->User->hasOne;
+		$this->Article->find('all', array(
+			'contain' => array(
+				'User' => array('ArticleFeatured', 'Comment')
+			)
+		));
+		$this->assertEqual($expected, $this->Article->User->hasOne);
+
+		$this->Article->User->bindModel($userHasOne, false);
+		$expected = $this->Article->User->hasOne;
+		$this->Article->find('all', array(
+			'contain' => array(
+				'User' => array(
+					'ArticleFeatured',
+					'Comment' => array('fields' => array('created'))
+				)
+			)
+		));
+		$this->assertEqual($expected, $this->Article->User->hasOne);
+
+		$this->Article->User->bindModel($userHasOne, false);
+		$expected = $this->Article->User->hasOne;
+		$this->Article->find('all', array(
+			'contain' => array(
+				'User' => array(
+					'Comment' => array('fields' => array('created'))
+				)
+			)
+		));
+		$this->assertEqual($expected, $this->Article->User->hasOne);
+
+		$this->Article->User->bindModel($userHasOne, false);
+		$expected = $this->Article->User->hasOne;
+		$this->Article->find('all', array(
+			'contain' => array(
+				'User.ArticleFeatured' => array(
+					'conditions' => array('ArticleFeatured.published' => 'Y')
+				),
+				'User.Comment'
+			)
+		));
+		$this->assertEqual($expected, $this->Article->User->hasOne);
+	}
+
+/**
+ * testResetMultipleHabtmAssociations method
+ *
+ * @access public
+ */
+	function testResetMultipleHabtmAssociations() {
+		$articleHabtm = array(
+			'hasAndBelongsToMany' => array(
+				'Tag' => array(
+					'className'				=> 'Tag',
+					'joinTable'				=> 'articles_tags',
+					'foreignKey'			=> 'article_id',
+					'associationForeignKey' => 'tag_id'
+				),
+				'ShortTag' => array(
+					'className'				=> 'Tag',
+					'joinTable'				=> 'articles_tags',
+					'foreignKey'			=> 'article_id',
+					'associationForeignKey' => 'tag_id',
+					// LENGHT function mysql-only, using LIKE does almost the same
+					'conditions' 			=> 'ShortTag.tag LIKE "???"'
+				)
+			)
+		);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all');
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => 'Tag.tag'));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => 'Tag'));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => array('Tag' => array('fields' => array(null)))));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => array('Tag' => array('fields' => array('Tag.tag')))));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => array('Tag' => array('fields' => array('Tag.tag', 'Tag.created')))));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => 'ShortTag.tag'));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => 'ShortTag'));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array(null)))));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array('ShortTag.tag')))));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+
+		$this->Article->resetBindings();
+		$this->Article->bindModel($articleHabtm, false);
+		$expected = $this->Article->hasAndBelongsToMany;
+		$this->Article->find('all', array('contain' => array('ShortTag' => array('fields' => array('ShortTag.tag', 'ShortTag.created')))));
+		$this->assertEqual($expected, $this->Article->hasAndBelongsToMany);
+	}
+
+/**
+ * test that autoFields doesn't splice in fields from other databases.
+ *
+ * @return void
+ */
+	function testAutoFieldsWithMultipleDatabases() {
+		$config = new DATABASE_CONFIG();
+
+		$skip = $this->skipIf(
+			!isset($config->test) || !isset($config->test2),
+			 '%s Primary and secondary test databases not configured, skipping cross-database '
+			.'join tests.'
+			.' To run these tests, you must define $test and $test2 in your database configuration.'
+		);
+		if ($skip) {
+			return;
+		}
+
+		$db =& ConnectionManager::getDataSource('test2');
+		$this->_fixtures[$this->_fixtureClassMap['User']]->create($db);
+		$this->_fixtures[$this->_fixtureClassMap['User']]->insert($db);
+
+		$this->Article->User->setDataSource('test2');
+
+		$result = $this->Article->find('all', array(
+			'fields' => array('Article.title'),
+			'contain' => array('User')
+		));
+		$this->assertTrue(isset($result[0]['Article']));
+		$this->assertTrue(isset($result[0]['User']));
+
+		$this->_fixtures[$this->_fixtureClassMap['User']]->drop($db);
+	}
+/**
+ * test that autoFields doesn't splice in columns that aren't part of the join.
+ *
+ * @return void
+ */
+	function testAutoFieldsWithRecursiveNegativeOne() {
+		$this->Article->recursive = -1;
+		$result = $this->Article->field('title', array('Article.title' => 'First Article'));
+		$this->assertNoErrors();
+		$this->assertEqual($result, 'First Article', 'Field is wrong');
+	}
+
+/**
+ * test that find(all) doesn't return incorrect values when mixed with containable.
+ *
+ * @return void
+ */
+	function testFindAllReturn() {
+		$result = $this->Article->find('all', array(
+			'conditions' => array('Article.id' => 999999999)
+		));
+		$this->assertEqual($result, array(), 'Should be empty.');
+	}
+
+/**
+ * containments method
+ *
+ * @param mixed $Model
+ * @param array $contain
+ * @access private
+ * @return void
+ */
+	function __containments(&$Model, $contain = array()) {
+		if (!is_array($Model)) {
+			$result = $Model->containments($contain);
+			return $this->__containments($result['models']);
+		} else {
+			$result = $Model;
+			foreach($result as $i => $containment) {
+				$result[$i] = array_diff_key($containment, array('instance' => true));
+			}
+		}
+
+		return $result;
+	}
+
+/**
+ * assertBindings method
+ *
+ * @param mixed $Model
+ * @param array $expected
+ * @access private
+ * @return void
+ */
+	function __assertBindings(&$Model, $expected = array()) {
+		$expected = array_merge(array('belongsTo' => array(), 'hasOne' => array(), 'hasMany' => array(), 'hasAndBelongsToMany' => array()), $expected);
+
+		foreach($expected as $binding => $expect) {
+			$this->assertEqual(array_keys($Model->$binding), $expect);
+		}
+	}
+
+/**
+ * bindings method
+ *
+ * @param mixed $Model
+ * @param array $extra
+ * @param bool $output
+ * @access private
+ * @return void
+ */
+	function __bindings(&$Model, $extra = array(), $output = true) {
+		$relationTypes = array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany');
+
+		$debug = '[';
+		$lines = array();
+		foreach($relationTypes as $binding) {
+			if (!empty($Model->$binding)) {
+				$models = array_keys($Model->$binding);
+				foreach($models as $linkedModel) {
+					$line = $linkedModel;
+					if (!empty($extra) && !empty($Model->{$binding}[$linkedModel])) {
+						$extraData = array();
+						foreach(array_intersect_key($Model->{$binding}[$linkedModel], array_flip($extra)) as $key => $value) {
+							$extraData[] = $key . ': ' . (is_array($value) ? '(' . implode(', ', $value) . ')' : $value);
+						}
+						$line .= ' {' . implode(' - ', $extraData) . '}';
+					}
+					$lines[] = $line;
+				}
+			}
+		}
+		$debug .= implode(' | ' , $lines);
+		$debug .=  ']';
+		$debug = '<strong>' . $Model->alias . '</strong>: ' . $debug . '<br />';
+
+		if ($output) {
+			echo $debug;
+		}
+
+		return $debug;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php
new file mode 100644
index 000000000..c5c293bc5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/translate.test.php
@@ -0,0 +1,898 @@
+<?php
+/**
+ * TranslateBehaviorTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+
+App::import('Core', array('AppModel', 'Model'));
+require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
+
+/**
+ * TranslateBehaviorTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ */
+class TranslateBehaviorTest extends CakeTestCase {
+
+/**
+ * autoFixtures property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $autoFixtures = false;
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(
+		'core.translated_item', 'core.translate', 'core.translate_table',
+		'core.translated_article', 'core.translate_article', 'core.user', 'core.comment', 'core.tag', 'core.articles_tag',
+		'core.translate_with_prefix'
+	);
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * testTranslateModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testTranslateModel() {
+		$TestModel =& new Tag();
+		$TestModel->translateTable = 'another_i18n';
+		$TestModel->Behaviors->attach('Translate', array('title'));
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'I18nModel');
+		$this->assertEqual($translateModel->useTable, 'another_i18n');
+
+		$TestModel =& new User();
+		$TestModel->Behaviors->attach('Translate', array('title'));
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'I18nModel');
+		$this->assertEqual($translateModel->useTable, 'i18n');
+
+		$TestModel =& new TranslatedArticle();
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'TranslateArticleModel');
+		$this->assertEqual($translateModel->useTable, 'article_i18n');
+
+		$TestModel =& new TranslatedItem();
+		$translateModel =& $TestModel->Behaviors->Translate->translateModel($TestModel);
+		$this->assertEqual($translateModel->name, 'TranslateTestModel');
+		$this->assertEqual($translateModel->useTable, 'i18n');
+	}
+
+/**
+ * testLocaleFalsePlain method
+ *
+ * @access public
+ * @return void
+ */
+	function testLocaleFalsePlain() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = false;
+
+		$result = $TestModel->read(null, 1);
+		$expected = array('TranslatedItem' => array('id' => 1, 'slug' => 'first_translated'));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => array('slug')));
+		$expected = array(
+			array('TranslatedItem' => array('slug' => 'first_translated')),
+			array('TranslatedItem' => array('slug' => 'second_translated')),
+			array('TranslatedItem' => array('slug' => 'third_translated'))
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testLocaleFalseAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testLocaleFalseAssociations() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = false;
+		$TestModel->unbindTranslation();
+		$translations = array('title' => 'Title', 'content' => 'Content');
+		$TestModel->bindTranslation($translations, false);
+
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItem' => array('id' => 1, 'slug' => 'first_translated'),
+			'Title' => array(
+				array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title #1'),
+				array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'),
+				array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1')
+			),
+			'Content' => array(
+				array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'),
+				array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'),
+				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1')
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasMany['Title']['fields'] = $TestModel->hasMany['Content']['fields'] = array('content');
+		$TestModel->hasMany['Title']['conditions']['locale'] = $TestModel->hasMany['Content']['conditions']['locale'] = 'eng';
+
+		$result = $TestModel->find('all', array('fields' => array('TranslatedItem.slug')));
+		$expected = array(
+			array(
+				'TranslatedItem' => array('id' => 1, 'slug' => 'first_translated'),
+				'Title' => array(array('foreign_key' => 1, 'content' => 'Title #1')),
+				'Content' => array(array('foreign_key' => 1, 'content' => 'Content #1'))
+			),
+			array(
+				'TranslatedItem' => array('id' => 2, 'slug' => 'second_translated'),
+				'Title' => array(array('foreign_key' => 2, 'content' => 'Title #2')),
+				'Content' => array(array('foreign_key' => 2, 'content' => 'Content #2'))
+			),
+			array(
+				'TranslatedItem' => array('id' => 3, 'slug' => 'third_translated'),
+				'Title' => array(array('foreign_key' => 3, 'content' => 'Title #3')),
+				'Content' => array(array('foreign_key' => 3, 'content' => 'Content #3'))
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testLocaleSingle method
+ *
+ * @access public
+ * @return void
+ */
+	function testLocaleSingle() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'eng';
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItem' => array(
+				'id' => 1,
+				'slug' => 'first_translated',
+				'locale' => 'eng',
+				'title' => 'Title #1',
+				'content' => 'Content #1'
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'TranslatedItem' => array(
+					'id' => 1,
+					'slug' => 'first_translated',
+					'locale' => 'eng',
+					'title' => 'Title #1',
+					'content' => 'Content #1'
+				)
+			),
+			array(
+				'TranslatedItem' => array(
+					'id' => 2,
+					'slug' => 'second_translated',
+					'locale' => 'eng',
+					'title' => 'Title #2',
+					'content' => 'Content #2'
+				)
+			),
+			array(
+				'TranslatedItem' => array(
+					'id' => 3,
+					'slug' => 'third_translated',
+					'locale' => 'eng',
+					'title' => 'Title #3',
+					'content' => 'Content #3'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testLocaleSingleWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testLocaleSingleWithConditions() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'eng';
+		$result = $TestModel->find('all', array('conditions' => array('slug' => 'first_translated')));
+		$expected = array(
+			array(
+				'TranslatedItem' => array(
+					'id' => 1,
+					'slug' => 'first_translated',
+					'locale' => 'eng',
+					'title' => 'Title #1',
+					'content' => 'Content #1'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('conditions' => "TranslatedItem.slug = 'first_translated'"));
+		$expected = array(
+			array(
+				'TranslatedItem' => array(
+					'id' => 1,
+					'slug' => 'first_translated',
+					'locale' => 'eng',
+					'title' => 'Title #1',
+					'content' => 'Content #1'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testLocaleSingleAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testLocaleSingleAssociations() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'eng';
+		$TestModel->unbindTranslation();
+		$translations = array('title' => 'Title', 'content' => 'Content');
+		$TestModel->bindTranslation($translations, false);
+
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItem' => array(
+				'id' => 1,
+				'slug' => 'first_translated',
+				'locale' => 'eng',
+				'title' => 'Title #1',
+				'content' => 'Content #1'
+			),
+			'Title' => array(
+				array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title #1'),
+				array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'),
+				array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1')
+			),
+			'Content' => array(
+				array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'),
+				array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'),
+				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1')
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasMany['Title']['fields'] = $TestModel->hasMany['Content']['fields'] = array('content');
+		$TestModel->hasMany['Title']['conditions']['locale'] = $TestModel->hasMany['Content']['conditions']['locale'] = 'eng';
+
+		$result = $TestModel->find('all', array('fields' => array('TranslatedItem.title')));
+		$expected = array(
+			array(
+				'TranslatedItem' => array('id' => 1, 'locale' => 'eng', 'title' => 'Title #1'),
+				'Title' => array(array('foreign_key' => 1, 'content' => 'Title #1')),
+				'Content' => array(array('foreign_key' => 1, 'content' => 'Content #1'))
+			),
+			array(
+				'TranslatedItem' => array('id' => 2, 'locale' => 'eng', 'title' => 'Title #2'),
+				'Title' => array(array('foreign_key' => 2, 'content' => 'Title #2')),
+				'Content' => array(array('foreign_key' => 2, 'content' => 'Content #2'))
+			),
+			array(
+				'TranslatedItem' => array('id' => 3, 'locale' => 'eng', 'title' => 'Title #3'),
+				'Title' => array(array('foreign_key' => 3, 'content' => 'Title #3')),
+				'Content' => array(array('foreign_key' => 3, 'content' => 'Content #3'))
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testLocaleMultiple method
+ *
+ * @access public
+ * @return void
+ */
+	function testLocaleMultiple() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = array('deu', 'eng', 'cze');
+		$delete = array(
+			array('locale' => 'deu'),
+			array('foreign_key' => 1, 'field' => 'title', 'locale' => 'eng'),
+			array('foreign_key' => 1, 'field' => 'content', 'locale' => 'cze'),
+			array('foreign_key' => 2, 'field' => 'title', 'locale' => 'cze'),
+			array('foreign_key' => 2, 'field' => 'content', 'locale' => 'eng'),
+			array('foreign_key' => 3, 'field' => 'title')
+		);
+		$I18nModel =& ClassRegistry::getObject('TranslateTestModel');
+		$I18nModel->deleteAll(array('or' => $delete));
+
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItem' => array(
+				'id' => 1,
+				'slug' => 'first_translated',
+				'locale' => 'deu',
+				'title' => 'Titulek #1',
+				'content' => 'Content #1'
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => array('slug', 'title', 'content')));
+		$expected = array(
+			array(
+				'TranslatedItem' => array(
+					'slug' => 'first_translated',
+					'locale' => 'deu',
+					'title' => 'Titulek #1',
+					'content' => 'Content #1'
+				)
+			),
+			array(
+				'TranslatedItem' => array(
+					'slug' => 'second_translated',
+					'locale' => 'deu',
+					'title' => 'Title #2',
+					'content' => 'Obsah #2'
+				)
+			),
+			array(
+				'TranslatedItem' => array(
+					'slug' => 'third_translated',
+					'locale' => 'deu',
+					'title' => '',
+					'content' => 'Content #3'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMissingTranslation method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingTranslation() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'rus';
+		$result = $TestModel->read(null, 1);
+		$this->assertFalse($result);
+
+		$TestModel->locale = array('rus');
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItem' => array(
+				'id' => 1,
+				'slug' => 'first_translated',
+				'locale' => 'rus',
+				'title' => '',
+				'content' => ''
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testTranslatedFindList method
+ *
+ * @access public
+ * @return void
+ */
+	function testTranslatedFindList() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'deu';
+		$TestModel->displayField = 'title';
+		$result = $TestModel->find('list', array('recursive' => 1));
+		$expected = array(1 => 'Titel #1', 2 => 'Titel #2', 3 => 'Titel #3');
+		$this->assertEqual($result, $expected);
+
+		// MSSQL trigger an error and stops the page even if the debug = 0
+		if ($this->db->config['driver'] != 'mssql') {
+			$debug = Configure::read('debug');
+			Configure::write('debug', 0);
+
+			$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => false));
+			$this->assertEqual($result, array());
+
+			$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => 'after'));
+			$this->assertEqual($result, array());
+			Configure::write('debug', $debug);
+		}
+
+		$result = $TestModel->find('list', array('recursive' => 1, 'callbacks' => 'before'));
+		$expected = array(1 => null, 2 => null, 3 => null);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testReadSelectedFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadSelectedFields() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'eng';
+		$result = $TestModel->find('all', array('fields' => array('slug', 'TranslatedItem.content')));
+		$expected = array(
+			array('TranslatedItem' => array('slug' => 'first_translated', 'locale' => 'eng', 'content' => 'Content #1')),
+			array('TranslatedItem' => array('slug' => 'second_translated', 'locale' => 'eng', 'content' => 'Content #2')),
+			array('TranslatedItem' => array('slug' => 'third_translated', 'locale' => 'eng', 'content' => 'Content #3'))
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => array('TranslatedItem.slug', 'content')));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->locale = array('eng', 'deu', 'cze');
+		$delete = array(array('locale' => 'deu'), array('field' => 'content', 'locale' => 'eng'));
+		$I18nModel =& ClassRegistry::getObject('TranslateTestModel');
+		$I18nModel->deleteAll(array('or' => $delete));
+
+		$result = $TestModel->find('all', array('fields' => array('title', 'content')));
+		$expected = array(
+			array('TranslatedItem' => array('locale' => 'eng', 'title' => 'Title #1', 'content' => 'Obsah #1')),
+			array('TranslatedItem' => array('locale' => 'eng', 'title' => 'Title #2', 'content' => 'Obsah #2')),
+			array('TranslatedItem' => array('locale' => 'eng', 'title' => 'Title #3', 'content' => 'Obsah #3'))
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveCreate method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveCreate() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'spa';
+		$data = array('slug' => 'fourth_translated', 'title' => 'Leyenda #4', 'content' => 'Contenido #4');
+		$TestModel->create($data);
+		$TestModel->save();
+		$result = $TestModel->read();
+		$expected = array('TranslatedItem' => array_merge($data, array('id' => $TestModel->id, 'locale' => 'spa')));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveUpdate method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveUpdate() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'spa';
+		$oldData = array('slug' => 'fourth_translated', 'title' => 'Leyenda #4');
+		$TestModel->create($oldData);
+		$TestModel->save();
+		$id = $TestModel->id;
+		$newData = array('id' => $id, 'content' => 'Contenido #4');
+		$TestModel->create($newData);
+		$TestModel->save();
+		$result = $TestModel->read(null, $id);
+		$expected = array('TranslatedItem' => array_merge($oldData, $newData, array('locale' => 'spa')));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultipleCreate method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleCreate() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'deu';
+		$data = array(
+			'slug' => 'new_translated',
+			'title' => array('eng' => 'New title', 'spa' => 'Nuevo leyenda'),
+			'content' => array('eng' => 'New content', 'spa' => 'Nuevo contenido')
+		);
+		$TestModel->create($data);
+		$TestModel->save();
+
+		$TestModel->unbindTranslation();
+		$translations = array('title' => 'Title', 'content' => 'Content');
+		$TestModel->bindTranslation($translations, false);
+		$TestModel->locale = array('eng', 'spa');
+
+		$result = $TestModel->read();
+		$expected = array(
+			'TranslatedItem' => array('id' => 4, 'slug' => 'new_translated', 'locale' => 'eng', 'title' => 'New title', 'content' => 'New content'),
+			'Title' => array(
+				array('id' => 21, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 4, 'field' => 'title', 'content' => 'New title'),
+				array('id' => 22, 'locale' => 'spa', 'model' => 'TranslatedItem', 'foreign_key' => 4, 'field' => 'title', 'content' => 'Nuevo leyenda')
+			),
+			'Content' => array(
+				array('id' => 19, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 4, 'field' => 'content', 'content' => 'New content'),
+				array('id' => 20, 'locale' => 'spa', 'model' => 'TranslatedItem', 'foreign_key' => 4, 'field' => 'content', 'content' => 'Nuevo contenido')
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultipleUpdate method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleUpdate() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'eng';
+		$TestModel->validate['title'] = 'notEmpty';
+		$data = array('TranslatedItem' => array(
+			'id' => 1,
+			'title' => array('eng' => 'New Title #1', 'deu' => 'Neue Titel #1', 'cze' => 'Novy Titulek #1'),
+			'content' => array('eng' => 'New Content #1', 'deu' => 'Neue Inhalt #1', 'cze' => 'Novy Obsah #1')
+		));
+		$TestModel->create();
+		$TestModel->save($data);
+
+		$TestModel->unbindTranslation();
+		$translations = array('title' => 'Title', 'content' => 'Content');
+		$TestModel->bindTranslation($translations, false);
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItem' => array('id' => '1', 'slug' => 'first_translated', 'locale' => 'eng', 'title' => 'New Title #1', 'content' => 'New Content #1'),
+			'Title' => array(
+				array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'New Title #1'),
+				array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Neue Titel #1'),
+				array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Novy Titulek #1')
+			),
+			'Content' => array(
+				array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'New Content #1'),
+				array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Neue Inhalt #1'),
+				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Novy Obsah #1')
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->unbindTranslation($translations);
+		$TestModel->bindTranslation(array('title', 'content'), false);
+	}
+
+/**
+ * testMixedCreateUpdateWithArrayLocale method
+ *
+ * @access public
+ * @return void
+ */
+	function testMixedCreateUpdateWithArrayLocale() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = array('cze', 'deu');
+		$data = array('TranslatedItem' => array(
+			'id' => 1,
+			'title' => array('eng' => 'Updated Title #1', 'spa' => 'Nuevo leyenda #1'),
+			'content' => 'Upraveny obsah #1'
+		));
+		$TestModel->create();
+		$TestModel->save($data);
+
+		$TestModel->unbindTranslation();
+		$translations = array('title' => 'Title', 'content' => 'Content');
+		$TestModel->bindTranslation($translations, false);
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItem' => array('id' => 1, 'slug' => 'first_translated', 'locale' => 'cze', 'title' => 'Titulek #1', 'content' => 'Upraveny obsah #1'),
+			'Title' => array(
+				array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Updated Title #1'),
+				array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'),
+				array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1'),
+				array('id' => 19, 'locale' => 'spa', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Nuevo leyenda #1')
+			),
+			'Content' => array(
+				array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'),
+				array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'),
+				array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Upraveny obsah #1')
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidation() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->locale = 'eng';
+		$TestModel->validate['title'] = '/Only this title/';
+		$data = array('TranslatedItem' => array(
+			'id' => 1,
+			'title' => array('eng' => 'New Title #1', 'deu' => 'Neue Titel #1', 'cze' => 'Novy Titulek #1'),
+			'content' => array('eng' => 'New Content #1', 'deu' => 'Neue Inhalt #1', 'cze' => 'Novy Obsah #1')
+		));
+		$TestModel->create();
+		$this->assertFalse($TestModel->save($data));
+		$this->assertEqual($TestModel->validationErrors['title'], 'This field cannot be left blank');
+
+		$TestModel->locale = 'eng';
+		$TestModel->validate['title'] = '/Only this title/';
+		$data = array('TranslatedItem' => array(
+			'id' => 1,
+			'title' => array('eng' => 'Only this title', 'deu' => 'Neue Titel #1', 'cze' => 'Novy Titulek #1'),
+			'content' => array('eng' => 'New Content #1', 'deu' => 'Neue Inhalt #1', 'cze' => 'Novy Obsah #1')
+		));
+		$TestModel->create();
+		$this->assertTrue($TestModel->save($data));
+	}
+
+/**
+ * testAttachDetach method
+ *
+ * @access public
+ * @return void
+ */
+	function testAttachDetach() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$Behavior =& $this->Model->Behaviors->Translate;
+
+		$TestModel->unbindTranslation();
+		$translations = array('title' => 'Title', 'content' => 'Content');
+		$TestModel->bindTranslation($translations, false);
+
+		$result = array_keys($TestModel->hasMany);
+		$expected = array('Title', 'Content');
+		$this->assertEqual($result, $expected);
+
+		$TestModel->Behaviors->detach('Translate');
+		$result = array_keys($TestModel->hasMany);
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = isset($TestModel->Behaviors->Translate);
+		$this->assertFalse($result);
+
+		$result = isset($Behavior->settings[$TestModel->alias]);
+		$this->assertFalse($result);
+
+		$result = isset($Behavior->runtime[$TestModel->alias]);
+		$this->assertFalse($result);
+
+		$TestModel->Behaviors->attach('Translate', array('title' => 'Title', 'content' => 'Content'));
+		$result = array_keys($TestModel->hasMany);
+		$expected = array('Title', 'Content');
+		$this->assertEqual($result, $expected);
+
+		$result = isset($TestModel->Behaviors->Translate);
+		$this->assertTrue($result);
+
+		$Behavior = $TestModel->Behaviors->Translate;
+
+		$result = isset($Behavior->settings[$TestModel->alias]);
+		$this->assertTrue($result);
+
+		$result = isset($Behavior->runtime[$TestModel->alias]);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testAnotherTranslateTable method
+ *
+ * @access public
+ * @return void
+ */
+	function testAnotherTranslateTable() {
+		$this->loadFixtures('Translate', 'TranslatedItem', 'TranslateTable');
+
+		$TestModel =& new TranslatedItemWithTable();
+		$TestModel->locale = 'eng';
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedItemWithTable' => array(
+				'id' => 1,
+				'slug' => 'first_translated',
+				'locale' => 'eng',
+				'title' => 'Another Title #1',
+				'content' => 'Another Content #1'
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testTranslateWithAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testTranslateWithAssociations() {
+		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User', 'Comment', 'ArticlesTag', 'Tag');
+
+		$TestModel =& new TranslatedArticle();
+		$TestModel->locale = 'eng';
+		$recursive = $TestModel->recursive;
+
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedArticle' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31',
+				'locale' => 'eng',
+				'title' => 'Title (eng) #1',
+				'body' => 'Body (eng) #1'
+			),
+			'User' => array(
+				'id' => 1,
+				'user' => 'mariano',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:16:23',
+            	'updated' => '2007-03-17 01:18:31'
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('recursive' => -1));
+		$expected = array(
+			array(
+				'TranslatedArticle' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'locale' => 'eng',
+					'title' => 'Title (eng) #1',
+					'body' => 'Body (eng) #1'
+				)
+			),
+			array(
+				'TranslatedArticle' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'locale' => 'eng',
+					'title' => 'Title (eng) #2',
+					'body' => 'Body (eng) #2'
+				)
+			),
+			array(
+				'TranslatedArticle' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31',
+					'locale' => 'eng',
+					'title' => 'Title (eng) #3',
+					'body' => 'Body (eng) #3'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->recursive, $recursive);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'TranslatedArticle' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31',
+				'locale' => 'eng',
+				'title' => 'Title (eng) #1',
+				'body' => 'Body (eng) #1'
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testTranslateTableWithPrefix method
+ * Tests that is possible to have a translation model with a custom tablePrefix
+ *
+ * @access public
+ * @return void
+ */
+	function testTranslateTableWithPrefix() {
+		$this->loadFixtures('TranslateWithPrefix', 'TranslatedItem');
+		$TestModel =& new TranslatedItem2;
+		$TestModel->locale = 'eng';
+		$result = $TestModel->read(null, 1);
+		$expected = array('TranslatedItem' => array(
+			'id' => 1,
+			'slug' => 'first_translated',
+			'locale' => 'eng',
+			'content' => 'Content #1',
+			'title' => 'Title #1'
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test infinite loops not occuring with unbindTranslation()
+ *
+ * @return void
+ */
+	function testUnbindTranslationInfinteLoop() {
+		$this->loadFixtures('Translate', 'TranslatedItem');
+
+		$TestModel =& new TranslatedItem();
+		$TestModel->Behaviors->detach('Translate');
+		$TestModel->actsAs = array();
+		$TestModel->Behaviors->attach('Translate');
+		$TestModel->bindTranslation(array('title', 'content'), true);
+		$result = $TestModel->unbindTranslation();
+
+		$this->assertFalse($result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php
new file mode 100644
index 000000000..39475cd60
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/behaviors/tree.test.php
@@ -0,0 +1,1876 @@
+<?php
+/**
+ * TreeBehaviorTest file
+ *
+ * Holds several Test Cases
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ * @since         CakePHP(tm) v 1.2.0.5330
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('AppModel', 'Model'));
+require_once(dirname(dirname(__FILE__)) . DS . 'models.php');
+
+/**
+ * NumberTreeTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ */
+class NumberTreeTest extends CakeTestCase {
+
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array(
+		'modelClass' => 'NumberTree',
+		'leftField' => 'lft',
+		'rightField' => 'rght',
+		'parentField' => 'parent_id'
+	);
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.number_tree');
+
+/**
+ * testInitialize method
+ *
+ * @access public
+ * @return void
+ */
+	function testInitialize() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->find('count');
+		$this->assertEqual($result, 7);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testDetectInvalidLeft method
+ *
+ * @access public
+ * @return void
+ */
+	function testDetectInvalidLeft() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->findByName('1.1');
+
+		$save[$modelClass]['id'] = $result[$modelClass]['id'];
+		$save[$modelClass][$leftField] = 0;
+
+		$this->Tree->save($save);
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$result = $this->Tree->recover();
+		$this->assertIdentical($result, true);
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+	}
+
+/**
+ * testDetectInvalidRight method
+ *
+ * @access public
+ * @return void
+ */
+	function testDetectInvalidRight() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->findByName('1.1');
+
+		$save[$modelClass]['id'] = $result[$modelClass]['id'];
+		$save[$modelClass][$rightField] = 0;
+
+		$this->Tree->save($save);
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$result = $this->Tree->recover();
+		$this->assertIdentical($result, true);
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+	}
+
+/**
+ * testDetectInvalidParent method
+ *
+ * @access public
+ * @return void
+ */
+	function testDetectInvalidParent() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->findByName('1.1');
+
+		// Bypass behavior and any other logic
+		$this->Tree->updateAll(array($parentField => null), array('id' => $result[$modelClass]['id']));
+
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$result = $this->Tree->recover();
+		$this->assertIdentical($result, true);
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+	}
+
+/**
+ * testDetectNoneExistantParent method
+ *
+ * @access public
+ * @return void
+ */
+	function testDetectNoneExistantParent() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->findByName('1.1');
+		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id']));
+
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$result = $this->Tree->recover('MPTT');
+		$this->assertIdentical($result, true);
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+	}
+
+/**
+ * testRecoverFromMissingParent method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecoverFromMissingParent() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->findByName('1.1');
+		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id']));
+
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$result = $this->Tree->recover();
+		$this->assertIdentical($result, true);
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+	}
+
+/**
+ * testDetectInvalidParents method
+ *
+ * @access public
+ * @return void
+ */
+	function testDetectInvalidParents() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$this->Tree->updateAll(array($parentField => null));
+
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$result = $this->Tree->recover();
+		$this->assertIdentical($result, true);
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+	}
+
+/**
+ * testDetectInvalidLftsRghts method
+ *
+ * @access public
+ * @return void
+ */
+	function testDetectInvalidLftsRghts() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$this->Tree->updateAll(array($leftField => 0, $rightField => 0));
+
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$this->Tree->recover();
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+	}
+
+/**
+ * Reproduces a situation where a single node has lft= rght, and all other lft and rght fields follow sequentially
+ *
+ * @access public
+ * @return void
+ */
+	function testDetectEqualLftsRghts() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(1, 3);
+
+		$result = $this->Tree->findByName('1.1');
+		$this->Tree->updateAll(array($rightField => $result[$modelClass][$leftField]), array('id' => $result[$modelClass]['id']));
+		$this->Tree->updateAll(array($leftField => $this->Tree->escapeField($leftField) . ' -1'),
+			array($leftField . ' >' => $result[$modelClass][$leftField]));
+		$this->Tree->updateAll(array($rightField => $this->Tree->escapeField($rightField) . ' -1'),
+			array($rightField . ' >' => $result[$modelClass][$leftField]));
+
+		$result = $this->Tree->verify();
+		$this->assertNotIdentical($result, true);
+
+		$result = $this->Tree->recover();
+		$this->assertTrue($result);
+
+		$result = $this->Tree->verify();
+		$this->assertTrue($result);
+	}
+
+/**
+ * testAddOrphan method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddOrphan() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$this->Tree->save(array($modelClass => array('name' => 'testAddOrphan', $parentField => null)));
+		$result = $this->Tree->find(null, array('name', $parentField), $modelClass . '.' . $leftField . ' desc');
+		$expected = array($modelClass => array('name' => 'testAddOrphan', $parentField => null));
+		$this->assertEqual($result, $expected);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testAddMiddle method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddMiddle() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data= $this->Tree->find(array($modelClass . '.name' => '1.1'), array('id'));
+		$initialCount = $this->Tree->find('count');
+
+		$this->Tree->create();
+		$result = $this->Tree->save(array($modelClass => array('name' => 'testAddMiddle', $parentField => $data[$modelClass]['id'])));
+		$expected = array_merge(array($modelClass => array('name' => 'testAddMiddle', $parentField => '2')), $result);
+		$this->assertIdentical($result, $expected);
+
+		$laterCount = $this->Tree->find('count');
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount + 1, $laterCount);
+
+		$children = $this->Tree->children($data[$modelClass]['id'], true, array('name'));
+		$expects = array(array($modelClass => array('name' => '1.1.1')),
+			array($modelClass => array('name' => '1.1.2')),
+			array($modelClass => array('name' => 'testAddMiddle')));
+		$this->assertIdentical($children, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testAddInvalid method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddInvalid() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$initialCount = $this->Tree->find('count');
+		//$this->expectError('Trying to save a node under a none-existant node in TreeBehavior::beforeSave');
+
+		$saveSuccess = $this->Tree->save(array($modelClass => array('name' => 'testAddInvalid', $parentField => 99999)));
+		$this->assertIdentical($saveSuccess, false);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertIdentical($initialCount, $laterCount);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testAddNotIndexedByModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddNotIndexedByModel() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$this->Tree->save(array('name' => 'testAddNotIndexed', $parentField => null));
+		$result = $this->Tree->find(null, array('name', $parentField), $modelClass . '.' . $leftField . ' desc');
+		$expected = array($modelClass => array('name' => 'testAddNotIndexed', $parentField => null));
+		$this->assertEqual($result, $expected);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+}
+
+/**
+ * testMovePromote method
+ *
+ * @access public
+ * @return void
+ */
+	function testMovePromote() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$parent = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$parent_id = $parent[$modelClass]['id'];
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1.1'), array('id'));
+		$this->Tree->id= $data[$modelClass]['id'];
+		$this->Tree->saveField($parentField, $parent_id);
+		$direct = $this->Tree->children($parent_id, true, array('id', 'name', $parentField, $leftField, $rightField));
+		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 5)),
+			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 6, $rightField => 11)),
+			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 1, $leftField => 12, $rightField => 13)));
+		$this->assertEqual($direct, $expects);
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testMoveWithWhitelist method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveWithWhitelist() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$parent = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$parent_id = $parent[$modelClass]['id'];
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1.1'), array('id'));
+		$this->Tree->id = $data[$modelClass]['id'];
+		$this->Tree->whitelist = array($parentField, 'name', 'description');
+		$this->Tree->saveField($parentField, $parent_id);
+
+		$result = $this->Tree->children($parent_id, true, array('id', 'name', $parentField, $leftField, $rightField));
+		$expected = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 5)),
+			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 6, $rightField => 11)),
+			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 1, $leftField => 12, $rightField => 13)));
+		$this->assertEqual($result, $expected);
+		$this->assertTrue($this->Tree->verify());
+	}
+
+/**
+ * testInsertWithWhitelist method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsertWithWhitelist() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$this->Tree->whitelist = array('name', $parentField);
+		$this->Tree->save(array($modelClass => array('name' => 'testAddOrphan', $parentField => null)));
+		$result = $this->Tree->findByName('testAddOrphan', array('name', $parentField, $leftField, $rightField));
+		$expected = array('name' => 'testAddOrphan', $parentField => null, $leftField => '15', $rightField => 16);
+		$this->assertEqual($result[$modelClass], $expected);
+		$this->assertIdentical($this->Tree->verify(), true);
+	}
+
+/**
+ * testMoveBefore method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveBefore() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$parent = $this->Tree->find(array($modelClass . '.name' => '1.1'));
+		$parent_id = $parent[$modelClass]['id'];
+
+		$data= $this->Tree->find(array($modelClass . '.name' => '1.2'), array('id'));
+		$this->Tree->id = $data[$modelClass]['id'];
+		$this->Tree->saveField($parentField, $parent_id);
+
+		$result = $this->Tree->children($parent_id, true, array('name'));
+		$expects = array(array($modelClass => array('name' => '1.1.1')),
+			array($modelClass => array('name' => '1.1.2')),
+			array($modelClass => array('name' => '1.2')));
+		$this->assertEqual($result, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testMoveAfter method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveAfter() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$parent = $this->Tree->find(array($modelClass . '.name' => '1.2'));
+		$parent_id = $parent[$modelClass]['id'];
+
+		$data= $this->Tree->find(array($modelClass . '.name' => '1.1'), array('id'));
+		$this->Tree->id = $data[$modelClass]['id'];
+		$this->Tree->saveField($parentField, $parent_id);
+
+		$result = $this->Tree->children($parent_id, true, array('name'));
+		$expects = array(array($modelClass => array('name' => '1.2.1')),
+			array($modelClass => array('name' => '1.2.2')),
+			array($modelClass => array('name' => '1.1')));
+		$this->assertEqual($result, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testMoveDemoteInvalid method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveDemoteInvalid() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$parent = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$parent_id = $parent[$modelClass]['id'];
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1.1'), array('id'));
+
+		$expects = $this->Tree->find('all');
+		$before = $this->Tree->read(null, $data[$modelClass]['id']);
+
+		$this->Tree->id = $parent_id;
+		//$this->expectError('Trying to save a node under itself in TreeBehavior::beforeSave');
+		$this->Tree->saveField($parentField, $data[$modelClass]['id']);
+
+		$results = $this->Tree->find('all');
+		$after = $this->Tree->read(null, $data[$modelClass]['id']);
+
+		$this->assertEqual($results, $expects);
+		$this->assertEqual($before, $after);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testMoveInvalid method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveInvalid() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$initialCount = $this->Tree->find('count');
+		$data= $this->Tree->findByName('1.1');
+
+		//$this->expectError('Trying to save a node under a none-existant node in TreeBehavior::beforeSave');
+		$this->Tree->id = $data[$modelClass]['id'];
+		$this->Tree->saveField($parentField, 999999);
+
+		//$this->assertIdentical($saveSuccess, false);
+		$laterCount = $this->Tree->find('count');
+		$this->assertIdentical($initialCount, $laterCount);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testMoveSelfInvalid method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveSelfInvalid() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$initialCount = $this->Tree->find('count');
+		$data= $this->Tree->findByName('1.1');
+
+		//$this->expectError('Trying to set a node to be the parent of itself in TreeBehavior::beforeSave');
+		$this->Tree->id = $data[$modelClass]['id'];
+		$saveSuccess = $this->Tree->saveField($parentField, $this->Tree->id);
+
+		$this->assertIdentical($saveSuccess, false);
+		$laterCount = $this->Tree->find('count');
+		$this->assertIdentical($initialCount, $laterCount);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testMoveUpSuccess method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveUpSuccess() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.2'), array('id'));
+		$this->Tree->moveUp($data[$modelClass]['id']);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(array($modelClass => array('name' => '1.2', )),
+			array($modelClass => array('name' => '1.1', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveUpFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveUpFail() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1'));
+
+		$this->Tree->moveUp($data[$modelClass]['id']);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(array($modelClass => array('name' => '1.1', )),
+			array($modelClass => array('name' => '1.2', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveUp2 method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveUp2() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(1, 10);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.5'), array('id'));
+		$this->Tree->moveUp($data[$modelClass]['id'], 2);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(
+			array($modelClass => array('name' => '1.1', )),
+			array($modelClass => array('name' => '1.2', )),
+			array($modelClass => array('name' => '1.5', )),
+			array($modelClass => array('name' => '1.3', )),
+			array($modelClass => array('name' => '1.4', )),
+			array($modelClass => array('name' => '1.6', )),
+			array($modelClass => array('name' => '1.7', )),
+			array($modelClass => array('name' => '1.8', )),
+			array($modelClass => array('name' => '1.9', )),
+			array($modelClass => array('name' => '1.10', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveUpFirst method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveUpFirst() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(1, 10);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.5'), array('id'));
+		$this->Tree->moveUp($data[$modelClass]['id'], true);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(
+			array($modelClass => array('name' => '1.5', )),
+			array($modelClass => array('name' => '1.1', )),
+			array($modelClass => array('name' => '1.2', )),
+			array($modelClass => array('name' => '1.3', )),
+			array($modelClass => array('name' => '1.4', )),
+			array($modelClass => array('name' => '1.6', )),
+			array($modelClass => array('name' => '1.7', )),
+			array($modelClass => array('name' => '1.8', )),
+			array($modelClass => array('name' => '1.9', )),
+			array($modelClass => array('name' => '1.10', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveDownSuccess method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveDownSuccess() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1'), array('id'));
+		$this->Tree->moveDown($data[$modelClass]['id']);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(array($modelClass => array('name' => '1.2', )),
+			array($modelClass => array('name' => '1.1', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveDownFail method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveDownFail() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.2'));
+		$this->Tree->moveDown($data[$modelClass]['id']);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(array($modelClass => array('name' => '1.1', )),
+			array($modelClass => array('name' => '1.2', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveDownLast method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveDownLast() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(1, 10);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.5'), array('id'));
+		$this->Tree->moveDown($data[$modelClass]['id'], true);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(
+			array($modelClass => array('name' => '1.1', )),
+			array($modelClass => array('name' => '1.2', )),
+			array($modelClass => array('name' => '1.3', )),
+			array($modelClass => array('name' => '1.4', )),
+			array($modelClass => array('name' => '1.6', )),
+			array($modelClass => array('name' => '1.7', )),
+			array($modelClass => array('name' => '1.8', )),
+			array($modelClass => array('name' => '1.9', )),
+			array($modelClass => array('name' => '1.10', )),
+			array($modelClass => array('name' => '1.5', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveDown2 method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveDown2() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(1, 10);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.5'), array('id'));
+		$this->Tree->moveDown($data[$modelClass]['id'], 2);
+
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(
+			array($modelClass => array('name' => '1.1', )),
+			array($modelClass => array('name' => '1.2', )),
+			array($modelClass => array('name' => '1.3', )),
+			array($modelClass => array('name' => '1.4', )),
+			array($modelClass => array('name' => '1.6', )),
+			array($modelClass => array('name' => '1.7', )),
+			array($modelClass => array('name' => '1.5', )),
+			array($modelClass => array('name' => '1.8', )),
+			array($modelClass => array('name' => '1.9', )),
+			array($modelClass => array('name' => '1.10', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testSaveNoMove method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveNoMove() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(1, 10);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.5'), array('id'));
+		$this->Tree->id = $data[$modelClass]['id'];
+		$this->Tree->saveField('name', 'renamed');
+		$parent = $this->Tree->findByName('1. Root', array('id'));
+		$this->Tree->id = $parent[$modelClass]['id'];
+		$result = $this->Tree->children(null, true, array('name'));
+		$expected = array(
+			array($modelClass => array('name' => '1.1', )),
+			array($modelClass => array('name' => '1.2', )),
+			array($modelClass => array('name' => '1.3', )),
+			array($modelClass => array('name' => '1.4', )),
+			array($modelClass => array('name' => 'renamed', )),
+			array($modelClass => array('name' => '1.6', )),
+			array($modelClass => array('name' => '1.7', )),
+			array($modelClass => array('name' => '1.8', )),
+			array($modelClass => array('name' => '1.9', )),
+			array($modelClass => array('name' => '1.10', )));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testMoveToRootAndMoveUp method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveToRootAndMoveUp() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(1, 1);
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1'), array('id'));
+		$this->Tree->id = $data[$modelClass]['id'];
+		$this->Tree->save(array($parentField => null));
+
+		$result = $this->Tree->verify();
+		$this->assertIdentical($result, true);
+
+		$this->Tree->moveup();
+
+		$result = $this->Tree->find('all', array('fields' => 'name', 'order' => $modelClass . '.' . $leftField . ' ASC'));
+		$expected = array(array($modelClass => array('name' => '1.1')),
+			array($modelClass => array('name' => '1. Root')));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testDelete() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$initialCount = $this->Tree->find('count');
+		$result = $this->Tree->findByName('1.1.1');
+
+		$return = $this->Tree->delete($result[$modelClass]['id']);
+		$this->assertEqual($return, true);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount - 1, $laterCount);
+
+		$validTree= $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+
+		$initialCount = $this->Tree->find('count');
+		$result= $this->Tree->findByName('1.1');
+
+		$return = $this->Tree->delete($result[$modelClass]['id']);
+		$this->assertEqual($return, true);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount - 2, $laterCount);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testRemove method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemove() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$initialCount = $this->Tree->find('count');
+		$result = $this->Tree->findByName('1.1');
+
+		$this->Tree->removeFromTree($result[$modelClass]['id']);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount, $laterCount);
+
+		$children = $this->Tree->children($result[$modelClass][$parentField], true, array('name'));
+		$expects = array(array($modelClass => array('name' => '1.1.1')),
+			array($modelClass => array('name' => '1.1.2')),
+			array($modelClass => array('name' => '1.2')));
+		$this->assertEqual($children, $expects);
+
+		$topNodes = $this->Tree->children(false, true,array('name'));
+		$expects = array(array($modelClass => array('name' => '1. Root')),
+			array($modelClass => array('name' => '1.1')));
+		$this->assertEqual($topNodes, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testRemoveLastTopParent method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoveLastTopParent() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$initialCount = $this->Tree->find('count');
+		$initialTopNodes = $this->Tree->childCount(false);
+
+		$result = $this->Tree->findByName('1. Root');
+		$this->Tree->removeFromTree($result[$modelClass]['id']);
+
+		$laterCount = $this->Tree->find('count');
+		$laterTopNodes = $this->Tree->childCount(false);
+
+		$this->assertEqual($initialCount, $laterCount);
+		$this->assertEqual($initialTopNodes, $laterTopNodes);
+
+		$topNodes = $this->Tree->children(false, true,array('name'));
+		$expects = array(array($modelClass => array('name' => '1.1')),
+			array($modelClass => array('name' => '1.2')),
+			array($modelClass => array('name' => '1. Root')));
+
+		$this->assertEqual($topNodes, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testRemoveNoChildren method
+ *
+ * @return void
+ * @access public
+ */
+	function testRemoveNoChildren() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$initialCount = $this->Tree->find('count');
+
+		$result = $this->Tree->findByName('1.1.1');
+		$this->Tree->removeFromTree($result[$modelClass]['id']);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount, $laterCount);
+
+		$nodes = $this->Tree->find('list', array('order' => $leftField));
+		$expects = array(
+			1 => '1. Root',
+			2 => '1.1',
+			4 => '1.1.2',
+			5 => '1.2',
+			6 => '1.2.1',
+			7 => '1.2.2',
+			3 => '1.1.1',
+		);
+
+		$this->assertEqual($nodes, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testRemoveAndDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoveAndDelete() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$initialCount = $this->Tree->find('count');
+		$result = $this->Tree->findByName('1.1');
+
+		$this->Tree->removeFromTree($result[$modelClass]['id'], true);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount-1, $laterCount);
+
+		$children = $this->Tree->children($result[$modelClass][$parentField], true, array('name'), $leftField . ' asc');
+		$expects= array(array($modelClass => array('name' => '1.1.1')),
+			array($modelClass => array('name' => '1.1.2')),
+			array($modelClass => array('name' => '1.2')));
+		$this->assertEqual($children, $expects);
+
+		$topNodes = $this->Tree->children(false, true,array('name'));
+		$expects = array(array($modelClass => array('name' => '1. Root')));
+		$this->assertEqual($topNodes, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testRemoveAndDeleteNoChildren method
+ *
+ * @return void
+ * @access public
+ */
+	function testRemoveAndDeleteNoChildren() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$initialCount = $this->Tree->find('count');
+
+		$result = $this->Tree->findByName('1.1.1');
+		$this->Tree->removeFromTree($result[$modelClass]['id'], true);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount - 1, $laterCount);
+
+		$nodes = $this->Tree->find('list', array('order' => $leftField));
+		$expects = array(
+			1 => '1. Root',
+			2 => '1.1',
+			4 => '1.1.2',
+			5 => '1.2',
+			6 => '1.2.1',
+			7 => '1.2.2',
+		);
+		$this->assertEqual($nodes, $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testChildren method
+ *
+ * @access public
+ * @return void
+ */
+	function testChildren() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$this->Tree->id= $data[$modelClass]['id'];
+
+		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField));
+		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
+			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)));
+		$this->assertEqual($direct, $expects);
+
+		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField));
+		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
+			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 2, $leftField => 3, $rightField => 4)),
+			array($modelClass => array('id' => 4, 'name' => '1.1.2', $parentField => 2, $leftField => 5, $rightField => 6)),
+			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)),
+			array($modelClass => array( 'id' => 6, 'name' => '1.2.1', $parentField => 5, $leftField => 9, $rightField => 10)),
+			array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12)));
+		$this->assertEqual($total, $expects);
+
+		$this->assertEqual(array(), $this->Tree->children(10000));
+	}
+
+/**
+ * testCountChildren method
+ *
+ * @access public
+ * @return void
+ */
+	function testCountChildren() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$this->Tree->id = $data[$modelClass]['id'];
+
+		$direct = $this->Tree->childCount(null, true);
+		$this->assertEqual($direct, 2);
+
+		$total = $this->Tree->childCount();
+		$this->assertEqual($total, 6);
+	}
+
+/**
+ * testGetParentNode method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetParentNode() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.2.2'));
+		$this->Tree->id= $data[$modelClass]['id'];
+
+		$result = $this->Tree->getparentNode(null, array('name'));
+		$expects = array($modelClass => array('name' => '1.2'));
+		$this->assertIdentical($result, $expects);
+	}
+
+/**
+ * testGetPath method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetPath() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.2.2'));
+		$this->Tree->id= $data[$modelClass]['id'];
+
+		$result = $this->Tree->getPath(null, array('name'));
+		$expects = array(array($modelClass => array('name' => '1. Root')),
+			array($modelClass => array('name' => '1.2')),
+			array($modelClass => array('name' => '1.2.2')));
+		$this->assertIdentical($result, $expects);
+	}
+
+/**
+ * testNoAmbiguousColumn method
+ *
+ * @access public
+ * @return void
+ */
+	function testNoAmbiguousColumn() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
+			array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$this->Tree->id= $data[$modelClass]['id'];
+
+		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField));
+		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
+			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)));
+		$this->assertEqual($direct, $expects);
+
+		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField));
+		$expects = array(
+			array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)),
+			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 2, $leftField => 3, $rightField => 4)),
+			array($modelClass => array('id' => 4, 'name' => '1.1.2', $parentField => 2, $leftField => 5, $rightField => 6)),
+			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)),
+			array($modelClass => array( 'id' => 6, 'name' => '1.2.1', $parentField => 5, $leftField => 9, $rightField => 10)),
+			array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12))
+		);
+		$this->assertEqual($total, $expects);
+	}
+
+/**
+ * testReorderTree method
+ *
+ * @access public
+ * @return void
+ */
+	function testReorderTree() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(3, 3);
+		$nodes = $this->Tree->find('list', array('order' => $leftField));
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1'), array('id'));
+		$this->Tree->moveDown($data[$modelClass]['id']);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.2.1'), array('id'));
+		$this->Tree->moveDown($data[$modelClass]['id']);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.3.2.2'), array('id'));
+		$this->Tree->moveDown($data[$modelClass]['id']);
+
+		$unsortedNodes = $this->Tree->find('list', array('order' => $leftField));
+		$this->assertNotIdentical($nodes, $unsortedNodes);
+
+		$this->Tree->reorder();
+		$sortedNodes = $this->Tree->find('list', array('order' => $leftField));
+		$this->assertIdentical($nodes, $sortedNodes);
+	}
+
+/**
+ * test reordering large-ish trees with cacheQueries = true.
+ * This caused infinite loops when moving down elements as stale data is returned
+ * from the memory cache
+ *
+ * @access public
+ * @return void
+ */
+	function testReorderBigTreeWithQueryCaching() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 10);
+
+		$original = $this->Tree->cacheQueries;
+		$this->Tree->cacheQueries = true;
+		$this->Tree->reorder(array('field' => 'name', 'direction' => 'DESC'));
+		$this->assertTrue($this->Tree->cacheQueries, 'cacheQueries was not restored after reorder(). %s');
+		$this->Tree->cacheQueries = $original;
+	}
+/**
+ * testGenerateTreeListWithSelfJoin method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateTreeListWithSelfJoin() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
+			array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->generateTreeList();
+		$expected = array(1 => '1. Root', 2 => '_1.1', 3 => '__1.1.1', 4 => '__1.1.2', 5 => '_1.2', 6 => '__1.2.1', 7 => '__1.2.2');
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testArraySyntax method
+ *
+ * @access public
+ * @return void
+ */
+	function testArraySyntax() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(3, 3);
+		$this->assertIdentical($this->Tree->childCount(2), $this->Tree->childCount(array('id' => 2)));
+		$this->assertIdentical($this->Tree->getParentNode(2), $this->Tree->getParentNode(array('id' => 2)));
+		$this->assertIdentical($this->Tree->getPath(4), $this->Tree->getPath(array('id' => 4)));
+	}
+}
+
+/**
+ * ScopedTreeTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ */
+class ScopedTreeTest extends NumberTreeTest {
+
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array(
+		'modelClass' => 'FlagTree',
+		'leftField' => 'lft',
+		'rightField' => 'rght',
+		'parentField' => 'parent_id'
+	);
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.flag_tree', 'core.ad', 'core.campaign', 'core.translate', 'core.number_tree_two');
+
+/**
+ * testStringScope method
+ *
+ * @access public
+ * @return void
+ */
+	function testStringScope() {
+		$this->Tree =& new FlagTree();
+		$this->Tree->initialize(2, 3);
+
+		$this->Tree->id = 1;
+		$this->Tree->saveField('flag', 1);
+		$this->Tree->id = 2;
+		$this->Tree->saveField('flag', 1);
+
+		$result = $this->Tree->children();
+		$expected = array(
+			array('FlagTree' => array('id' => '3', 'name' => '1.1.1', 'parent_id' => '2', 'lft' => '3', 'rght' => '4', 'flag' => '0')),
+			array('FlagTree' => array('id' => '4', 'name' => '1.1.2', 'parent_id' => '2', 'lft' => '5', 'rght' => '6', 'flag' => '0')),
+			array('FlagTree' => array('id' => '5', 'name' => '1.1.3', 'parent_id' => '2', 'lft' => '7', 'rght' => '8', 'flag' => '0'))
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Tree->Behaviors->attach('Tree', array('scope' => 'FlagTree.flag = 1'));
+		$this->assertEqual($this->Tree->children(), array());
+
+		$this->Tree->id = 1;
+		$this->Tree->Behaviors->attach('Tree', array('scope' => 'FlagTree.flag = 1'));
+
+		$result = $this->Tree->children();
+		$expected = array(array('FlagTree' => array('id' => '2', 'name' => '1.1', 'parent_id' => '1', 'lft' => '2', 'rght' => '9', 'flag' => '1')));
+		$this->assertEqual($result, $expected);
+
+		$this->assertTrue($this->Tree->delete());
+		$this->assertEqual($this->Tree->find('count'), 11);
+	}
+
+/**
+ * testArrayScope method
+ *
+ * @access public
+ * @return void
+ */
+	function testArrayScope() {
+		$this->Tree =& new FlagTree();
+		$this->Tree->initialize(2, 3);
+
+		$this->Tree->id = 1;
+		$this->Tree->saveField('flag', 1);
+		$this->Tree->id = 2;
+		$this->Tree->saveField('flag', 1);
+
+		$result = $this->Tree->children();
+		$expected = array(
+			array('FlagTree' => array('id' => '3', 'name' => '1.1.1', 'parent_id' => '2', 'lft' => '3', 'rght' => '4', 'flag' => '0')),
+			array('FlagTree' => array('id' => '4', 'name' => '1.1.2', 'parent_id' => '2', 'lft' => '5', 'rght' => '6', 'flag' => '0')),
+			array('FlagTree' => array('id' => '5', 'name' => '1.1.3', 'parent_id' => '2', 'lft' => '7', 'rght' => '8', 'flag' => '0'))
+		);
+		$this->assertEqual($result, $expected);
+
+		$this->Tree->Behaviors->attach('Tree', array('scope' => array('FlagTree.flag' => 1)));
+		$this->assertEqual($this->Tree->children(), array());
+
+		$this->Tree->id = 1;
+		$this->Tree->Behaviors->attach('Tree', array('scope' => array('FlagTree.flag' => 1)));
+
+		$result = $this->Tree->children();
+		$expected = array(array('FlagTree' => array('id' => '2', 'name' => '1.1', 'parent_id' => '1', 'lft' => '2', 'rght' => '9', 'flag' => '1')));
+		$this->assertEqual($result, $expected);
+
+		$this->assertTrue($this->Tree->delete());
+		$this->assertEqual($this->Tree->find('count'), 11);
+	}
+
+/**
+ * testMoveUpWithScope method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveUpWithScope() {
+		$this->Ad =& new Ad();
+		$this->Ad->Behaviors->attach('Tree', array('scope'=>'Campaign'));
+		$this->Ad->moveUp(6);
+
+		$this->Ad->id = 4;
+		$result = $this->Ad->children();
+		$this->assertEqual(Set::extract('/Ad/id', $result), array(6, 5));
+		$this->assertEqual(Set::extract('/Campaign/id', $result), array(2, 2));
+	}
+
+/**
+ * testMoveDownWithScope method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoveDownWithScope() {
+		$this->Ad =& new Ad();
+		$this->Ad->Behaviors->attach('Tree', array('scope' => 'Campaign'));
+		$this->Ad->moveDown(6);
+
+		$this->Ad->id = 4;
+		$result = $this->Ad->children();
+		$this->assertEqual(Set::extract('/Ad/id', $result), array(5, 6));
+		$this->assertEqual(Set::extract('/Campaign/id', $result), array(2, 2));
+	}
+
+/**
+ * Tests the interaction (non-interference) between TreeBehavior and other behaviors with respect
+ * to callback hooks
+ *
+ * @access public
+ * @return void
+ */
+	function testTranslatingTree() {
+		$this->Tree =& new FlagTree();
+		$this->Tree->cacheQueries = false;
+		$this->Tree->translateModel = 'TranslateTreeTestModel';
+		$this->Tree->Behaviors->attach('Translate', array('name'));
+
+		//Save
+		$this->Tree->locale = 'eng';
+		$data = array('FlagTree' => array(
+			'name' => 'name #1',
+			'locale' => 'eng',
+			'parent_id' => null,
+		));
+		$this->Tree->save($data);
+		$result = $this->Tree->find('all');
+		$expected = array(array('FlagTree' => array(
+			'id' => 1,
+			'name' => 'name #1',
+			'parent_id' => null,
+			'lft' => 1,
+			'rght' => 2,
+			'flag' => 0,
+			'locale' => 'eng',
+		)));
+		$this->assertEqual($result, $expected);
+
+		//update existing record, same locale
+		$this->Tree->create();
+		$data['FlagTree']['name'] = 'Named 2';
+		$this->Tree->id = 1;
+		$this->Tree->save($data);
+		$result = $this->Tree->find('all');
+		$expected = array(array('FlagTree' => array(
+			'id' => 1,
+			'name' => 'Named 2',
+			'parent_id' => null,
+			'lft' => 1,
+			'rght' => 2,
+			'flag' => 0,
+			'locale' => 'eng',
+		)));
+		$this->assertEqual($result, $expected);
+
+		//update different locale, same record
+		$this->Tree->create();
+		$this->Tree->locale = 'deu';
+		$this->Tree->id = 1;
+		$data = array('FlagTree' => array(
+			'id' => 1,
+			'parent_id' => null,
+			'name' => 'namen #1',
+			'locale' => 'deu',
+		));
+		$this->Tree->save($data);
+
+		$this->Tree->locale = 'deu';
+		$result = $this->Tree->find('all');
+		$expected = array(array('FlagTree' => array(
+			'id' => 1,
+			'name' => 'namen #1',
+			'parent_id' => null,
+			'lft' => 1,
+			'rght' => 2,
+			'flag' => 0,
+			'locale' => 'deu',
+		)));
+		$this->assertEqual($result, $expected);
+
+		//Save with bindTranslation
+		$this->Tree->locale = 'eng';
+		$data = array(
+			'name' => array('eng' => 'New title', 'spa' => 'Nuevo leyenda'),
+			'parent_id' => null
+		);
+		$this->Tree->create($data);
+		$this->Tree->save();
+
+		$this->Tree->unbindTranslation();
+		$translations = array('name' => 'Name');
+		$this->Tree->bindTranslation($translations, false);
+		$this->Tree->locale = array('eng', 'spa');
+
+		$result = $this->Tree->read();
+		$expected = array(
+			'FlagTree' => array('id' => 2, 'parent_id' => null, 'locale' => 'eng', 'name' => 'New title', 'flag' => 0, 'lft' => 3, 'rght' => 4),
+			'Name' => array(
+			array('id' => 21, 'locale' => 'eng', 'model' => 'FlagTree', 'foreign_key' => 2, 'field' => 'name', 'content' => 'New title'),
+			array('id' => 22, 'locale' => 'spa', 'model' => 'FlagTree', 'foreign_key' => 2, 'field' => 'name', 'content' => 'Nuevo leyenda')
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testGenerateTreeListWithSelfJoin method
+ *
+ * @return void
+ * @access public
+ */
+	function testAliasesWithScopeInTwoTreeAssociations() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$this->TreeTwo =& new NumberTreeTwo();
+
+		$record = $this->Tree->find('first');
+
+		$this->Tree->bindModel(array(
+			'hasMany' => array(
+				'SecondTree' => array(
+					'className' => 'NumberTreeTwo',
+					'foreignKey' => 'number_tree_id'
+				)
+			)
+		));
+		$this->TreeTwo->bindModel(array(
+			'belongsTo' => array(
+				'FirstTree' => array(
+					'className' => $modelClass,
+					'foreignKey' => 'number_tree_id'
+				)
+			)
+		));
+		$this->TreeTwo->Behaviors->attach('Tree', array(
+			'scope' => 'FirstTree'
+		));
+
+		$data = array(
+			'NumberTreeTwo' => array(
+				'name' => 'First',
+				'number_tree_id' => $record['FlagTree']['id']
+			)
+		);
+		$this->TreeTwo->create();
+		$this->assertTrue($this->TreeTwo->save($data));
+
+		$result = $this->TreeTwo->find('first');
+		$expected = array('NumberTreeTwo' => array(
+			'id' => 1,
+			'name' => 'First',
+			'number_tree_id' => $record['FlagTree']['id'],
+			'parent_id' => null,
+			'lft' => 1,
+			'rght' => 2
+		));
+		$this->assertEqual($result, $expected);
+	}
+}
+
+/**
+ * AfterTreeTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ */
+class AfterTreeTest extends NumberTreeTest {
+
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array(
+		'modelClass' => 'AfterTree',
+		'leftField' => 'lft',
+		'rightField' => 'rght',
+		'parentField' => 'parent_id'
+	);
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.after_tree');
+
+/**
+ * Tests the afterSave callback in the model
+ *
+ * @access public
+ * @return void
+ */
+	function testAftersaveCallback() {
+		$this->Tree =& new AfterTree();
+
+		$expected = array('AfterTree' => array('name' => 'Six and One Half Changed in AfterTree::afterSave() but not in database', 'parent_id' => 6, 'lft' => 11, 'rght' => 12));
+		$result = $this->Tree->save(array('AfterTree' => array('name' => 'Six and One Half', 'parent_id' => 6)));
+		$this->assertEqual($result, $expected);
+
+		$expected = array('AfterTree' => array('name' => 'Six and One Half', 'parent_id' => 6, 'lft' => 11, 'rght' => 12, 'id' => 8));
+		$result = $this->Tree->find('all');
+		$this->assertEqual($result[7], $expected);
+	}
+}
+
+/**
+ * UnconventionalTreeTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ */
+class UnconventionalTreeTest extends NumberTreeTest {
+
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array(
+		'modelClass' => 'UnconventionalTree',
+		'leftField' => 'left',
+		'rightField' => 'right',
+		'parentField' => 'join'
+	);
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.unconventional_tree');
+}
+
+/**
+ * UuidTreeTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.behaviors
+ */
+class UuidTreeTest extends NumberTreeTest {
+
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array(
+		'modelClass' => 'UuidTree',
+		'leftField' => 'lft',
+		'rightField' => 'rght',
+		'parentField' => 'parent_id'
+	);
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.uuid_tree');
+
+/**
+ * testMovePromote method
+ *
+ * @return void
+ * @access public
+ */
+	function testMovePromote() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$parent = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$parent_id = $parent[$modelClass]['id'];
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1.1'), array('id'));
+		$this->Tree->id= $data[$modelClass]['id'];
+		$this->Tree->saveField($parentField, $parent_id);
+		$direct = $this->Tree->children($parent_id, true, array('name', $leftField, $rightField));
+		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 5)),
+			array($modelClass => array('name' => '1.2', $leftField => 6, $rightField => 11)),
+			array($modelClass => array('name' => '1.1.1', $leftField => 12, $rightField => 13)));
+		$this->assertEqual($direct, $expects);
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testMoveWithWhitelist method
+ *
+ * @return void
+ * @access public
+ */
+	function testMoveWithWhitelist() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$this->Tree->id = null;
+
+		$parent = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$parent_id = $parent[$modelClass]['id'];
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1.1.1'), array('id'));
+		$this->Tree->id = $data[$modelClass]['id'];
+		$this->Tree->whitelist = array($parentField, 'name', 'description');
+		$this->Tree->saveField($parentField, $parent_id);
+
+		$result = $this->Tree->children($parent_id, true, array('name', $leftField, $rightField));
+		$expected = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 5)),
+			array($modelClass => array('name' => '1.2', $leftField => 6, $rightField => 11)),
+			array($modelClass => array('name' => '1.1.1', $leftField => 12, $rightField => 13)));
+		$this->assertEqual($result, $expected);
+		$this->assertTrue($this->Tree->verify());
+	}
+
+/**
+ * testRemoveNoChildren method
+ *
+ * @return void
+ * @access public
+ */
+	function testRemoveNoChildren() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$initialCount = $this->Tree->find('count');
+
+		$result = $this->Tree->findByName('1.1.1');
+		$this->Tree->removeFromTree($result[$modelClass]['id']);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount, $laterCount);
+
+		$nodes = $this->Tree->find('list', array('order' => $leftField));
+		$expects = array(
+			'1. Root',
+			'1.1',
+			'1.1.2',
+			'1.2',
+			'1.2.1',
+			'1.2.2',
+			'1.1.1',
+		);
+
+		$this->assertEqual(array_values($nodes), $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testRemoveAndDeleteNoChildren method
+ *
+ * @return void
+ * @access public
+ */
+	function testRemoveAndDeleteNoChildren() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+		$initialCount = $this->Tree->find('count');
+
+		$result = $this->Tree->findByName('1.1.1');
+		$this->Tree->removeFromTree($result[$modelClass]['id'], true);
+
+		$laterCount = $this->Tree->find('count');
+		$this->assertEqual($initialCount - 1, $laterCount);
+
+		$nodes = $this->Tree->find('list', array('order' => $leftField));
+		$expects = array(
+			'1. Root',
+			'1.1',
+			'1.1.2',
+			'1.2',
+			'1.2.1',
+			'1.2.2',
+		);
+		$this->assertEqual(array_values($nodes), $expects);
+
+		$validTree = $this->Tree->verify();
+		$this->assertIdentical($validTree, true);
+	}
+
+/**
+ * testChildren method
+ *
+ * @return void
+ * @access public
+ */
+	function testChildren() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$this->Tree->id = $data[$modelClass]['id'];
+
+		$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
+		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
+			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)));
+		$this->assertEqual($direct, $expects);
+
+		$total = $this->Tree->children(null, null, array('name', $leftField, $rightField));
+		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
+			array($modelClass => array('name' => '1.1.1', $leftField => 3, $rightField => 4)),
+			array($modelClass => array('name' => '1.1.2', $leftField => 5, $rightField => 6)),
+			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)),
+			array($modelClass => array('name' => '1.2.1', $leftField => 9, $rightField => 10)),
+			array($modelClass => array('name' => '1.2.2', $leftField => 11, $rightField => 12)));
+		$this->assertEqual($total, $expects);
+	}
+
+/**
+ * testNoAmbiguousColumn method
+ *
+ * @return void
+ * @access public
+ */
+	function testNoAmbiguousColumn() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->initialize(2, 2);
+
+		$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
+			array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
+
+		$data = $this->Tree->find(array($modelClass . '.name' => '1. Root'));
+		$this->Tree->id = $data[$modelClass]['id'];
+
+		$direct = $this->Tree->children(null, true, array('name', $leftField, $rightField));
+		$expects = array(array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
+			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)));
+		$this->assertEqual($direct, $expects);
+
+		$total = $this->Tree->children(null, null, array('name', $leftField, $rightField));
+		$expects = array(
+			array($modelClass => array('name' => '1.1', $leftField => 2, $rightField => 7)),
+			array($modelClass => array('name' => '1.1.1', $leftField => 3, $rightField => 4)),
+			array($modelClass => array('name' => '1.1.2', $leftField => 5, $rightField => 6)),
+			array($modelClass => array('name' => '1.2', $leftField => 8, $rightField => 13)),
+			array($modelClass => array('name' => '1.2.1', $leftField => 9, $rightField => 10)),
+			array($modelClass => array('name' => '1.2.2', $leftField => 11, $rightField => 12))
+		);
+		$this->assertEqual($total, $expects);
+	}
+
+/**
+ * testGenerateTreeListWithSelfJoin method
+ *
+ * @return void
+ * @access public
+ */
+	function testGenerateTreeListWithSelfJoin() {
+		extract($this->settings);
+		$this->Tree =& new $modelClass();
+		$this->Tree->bindModel(array('belongsTo' => array('Dummy' =>
+			array('className' => $modelClass, 'foreignKey' => $parentField, 'conditions' => array('Dummy.id' => null)))), false);
+		$this->Tree->initialize(2, 2);
+
+		$result = $this->Tree->generateTreeList();
+		$expected = array('1. Root', '_1.1', '__1.1.1', '__1.1.2', '_1.2', '__1.2.1', '__1.2.2');
+		$this->assertIdentical(array_values($result), $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/cake_schema.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/cake_schema.test.php
new file mode 100644
index 000000000..2b3abcc8b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/cake_schema.test.php
@@ -0,0 +1,980 @@
+<?php
+/**
+ * Test for Schema database management
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5550
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Model', 'CakeSchema', false);
+
+/**
+ * Test for Schema database management
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class MyAppSchema extends CakeSchema {
+
+/**
+ * name property
+ *
+ * @var string 'MyApp'
+ * @access public
+ */
+	var $name = 'MyApp';
+
+/**
+ * connection property
+ *
+ * @var string 'test_suite'
+ * @access public
+ */
+	var $connection = 'test_suite';
+
+/**
+ * comments property
+ *
+ * @var array
+ * @access public
+ */
+	var $comments = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+		'post_id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false, 'length' => 100),
+		'comment' => array('type' => 'text', 'null' => false, 'default' => null),
+		'published' => array('type' => 'string', 'null' => true, 'default' => 'N', 'length' => 1),
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+	);
+
+/**
+ * posts property
+ *
+ * @var array
+ * @access public
+ */
+	var $posts = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+		'author_id' => array('type' => 'integer', 'null' => true, 'default' => ''),
+		'title' => array('type' => 'string', 'null' => false, 'default' => 'Title'),
+		'body' => array('type' => 'text', 'null' => true, 'default' => null),
+		'summary' => array('type' => 'text', 'null' => true),
+		'published' => array('type' => 'string', 'null' => true, 'default' => 'Y', 'length' => 1),
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+	);
+
+/**
+ * setup method
+ *
+ * @param mixed $version
+ * @access public
+ * @return void
+ */
+	function setup($version) {
+	}
+
+/**
+ * teardown method
+ *
+ * @param mixed $version
+ * @access public
+ * @return void
+ */
+	function teardown($version) {
+	}
+}
+
+/**
+ * TestAppSchema class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TestAppSchema extends CakeSchema {
+
+/**
+ * name property
+ *
+ * @var string 'MyApp'
+ * @access public
+ */
+	var $name = 'MyApp';
+
+/**
+ * comments property
+ *
+ * @var array
+ * @access public
+ */
+	var $comments = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0,'key' => 'primary'),
+		'article_id' => array('type' => 'integer', 'null' => false),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'comment' => array('type' => 'text', 'null' => true, 'default' => null),
+		'published' => array('type' => 'string', 'null' => true, 'default' => 'N', 'length' => 1),
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+		'tableParameters' => array(),
+	);
+
+/**
+ * posts property
+ *
+ * @var array
+ * @access public
+ */
+	var $posts = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+		'author_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false),
+		'body' => array('type' => 'text', 'null' => true, 'default' => null),
+		'published' => array('type' => 'string', 'null' => true, 'default' => 'N', 'length' => 1),
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+		'tableParameters' => array(),
+	);
+
+/**
+ * posts_tags property
+ *
+ * @var array
+ * @access public
+ */
+	var $posts_tags = array(
+		'post_id' => array('type' => 'integer', 'null' => false, 'key' => 'primary'),
+		'tag_id' => array('type' => 'string', 'null' => false, 'key' => 'primary'),
+		'indexes' => array('posts_tag' => array('column' => array('tag_id', 'post_id'), 'unique' => 1)),
+		'tableParameters' => array()
+	);
+
+/**
+ * tags property
+ *
+ * @var array
+ * @access public
+ */
+	var $tags = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+		'tag' => array('type' => 'string', 'null' => false),
+		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+		'tableParameters' => array()
+	);
+
+/**
+ * datatypes property
+ *
+ * @var array
+ * @access public
+ */
+	var $datatypes = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+		'float_field' => array('type' => 'float', 'null' => false, 'length' => '5,2', 'default' => ''),
+		'bool' => array('type' => 'boolean', 'null' => false, 'default' => false),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+		'tableParameters' => array()
+	);
+
+/**
+ * setup method
+ *
+ * @param mixed $version
+ * @access public
+ * @return void
+ */
+	function setup($version) {
+	}
+
+/**
+ * teardown method
+ *
+ * @param mixed $version
+ * @access public
+ * @return void
+ */
+	function teardown($version) {
+	}
+}
+
+/**
+ * SchmeaPost class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SchemaPost extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SchemaPost'
+ * @access public
+ */
+	var $name = 'SchemaPost';
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'posts';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('SchemaComment');
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('SchemaTag');
+}
+
+/**
+ * SchemaComment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SchemaComment extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SchemaComment'
+ * @access public
+ */
+	var $name = 'SchemaComment';
+
+/**
+ * useTable property
+ *
+ * @var string 'comments'
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('SchemaPost');
+}
+
+/**
+ * SchemaTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SchemaTag extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SchemaTag'
+ * @access public
+ */
+	var $name = 'SchemaTag';
+
+/**
+ * useTable property
+ *
+ * @var string 'tags'
+ * @access public
+ */
+	var $useTable = 'tags';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('SchemaPost');
+}
+
+/**
+ * SchemaDatatype class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SchemaDatatype extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SchemaDatatype'
+ * @access public
+ */
+	var $name = 'SchemaDatatype';
+
+/**
+ * useTable property
+ *
+ * @var string 'datatypes'
+ * @access public
+ */
+	var $useTable = 'datatypes';
+}
+
+/**
+ * Testdescribe class
+ *
+ * This class is defined purely to inherit the cacheSources variable otherwise
+ * testSchemaCreatTable will fail if listSources has already been called and
+ * its source cache populated - I.e. if the test is run within a group
+ *
+ * @uses          CakeTestModel
+ * @package
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Testdescribe extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Testdescribe'
+ * @access public
+ */
+	var $name = 'Testdescribe';
+}
+
+/**
+ * SchemaCrossDatabase class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SchemaCrossDatabase extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SchemaCrossDatabase'
+ * @access public
+ */
+	var $name = 'SchemaCrossDatabase';
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'cross_database';
+
+/**
+ * useDbConfig property
+ *
+ * @var string 'test2'
+ * @access public
+ */
+	var $useDbConfig = 'test2';
+}
+
+/**
+ * SchemaCrossDatabaseFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SchemaCrossDatabaseFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'CrossDatabase'
+ * @access public
+ */
+	var $name = 'CrossDatabase';
+
+/**
+ * table property
+ *
+ * @access public
+ */
+	var $table = 'cross_database';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => 'string'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'name' => 'First'),
+		array('id' => 2, 'name' => 'Second'),
+	);
+}
+
+/**
+ * SchemaPrefixAuthUser class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SchemaPrefixAuthUser extends CakeTestModel {
+/**
+ * name property
+ *
+ * @var string
+ */
+	var $name = 'SchemaPrefixAuthUser';
+/**
+ * table prefix
+ *
+ * @var string
+ */
+	var $tablePrefix = 'auth_';
+/**
+ * useTable
+ *
+ * @var string
+ */
+	var $useTable = 'users';
+}
+
+/**
+ * CakeSchemaTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CakeSchemaTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(
+		'core.post', 'core.tag', 'core.posts_tag', 'core.test_plugin_comment',
+		'core.datatype', 'core.auth_user', 'core.author',
+		'core.test_plugin_article', 'core.user', 'core.comment'
+	);
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Schema = new TestAppSchema();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		@unlink(TMP . 'tests' . DS .'schema.php');
+		unset($this->Schema);
+		ClassRegistry::flush();
+	}
+
+/**
+ * testSchemaName method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaName() {
+		$Schema = new CakeSchema();
+		$this->assertEqual(strtolower($Schema->name), strtolower(APP_DIR));
+
+		Configure::write('App.dir', 'Some.name.with.dots');
+		$Schema = new CakeSchema();
+		$this->assertEqual($Schema->name, 'SomeNameWithDots');
+
+		Configure::write('App.dir', 'app');
+	}
+
+/**
+ * testSchemaRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaRead() {
+		$read = $this->Schema->read(array(
+			'connection' => 'test_suite',
+			'name' => 'TestApp',
+			'models' => array('SchemaPost', 'SchemaComment', 'SchemaTag', 'SchemaDatatype')
+		));
+		unset($read['tables']['missing']);
+
+		$expected = array('comments', 'datatypes', 'posts', 'posts_tags', 'tags');
+		$this->assertEqual(array_keys($read['tables']), $expected);
+		foreach ($read['tables'] as $table => $fields) {
+			$this->assertEqual(array_keys($fields), array_keys($this->Schema->tables[$table]));
+		}
+
+		$this->assertEqual(
+			$read['tables']['datatypes']['float_field'],
+			$this->Schema->tables['datatypes']['float_field']
+		);
+
+		$SchemaPost =& ClassRegistry::init('SchemaPost');
+		$SchemaPost->table = 'sts';
+		$SchemaPost->tablePrefix = 'po';
+		$read = $this->Schema->read(array(
+			'connection' => 'test_suite',
+			'name' => 'TestApp',
+			'models' => array('SchemaPost')
+		));
+		$this->assertFalse(isset($read['tables']['missing']['posts']), 'Posts table was not read from tablePrefix %s');
+
+		$read = $this->Schema->read(array(
+			'connection' => 'test_suite',
+			'name' => 'TestApp',
+			'models' => array('SchemaComment', 'SchemaTag', 'SchemaPost')
+		));
+		$this->assertFalse(isset($read['tables']['missing']['posts_tags']), 'Join table marked as missing %s');
+	}
+
+/**
+ * test read() with tablePrefix properties.
+ *
+ * @return void
+ */
+	function testSchemaReadWithTablePrefix() {
+		$model =& new SchemaPrefixAuthUser();
+
+		$Schema =& new CakeSchema();
+		$read = $Schema->read(array(
+			'connection' => 'test_suite',
+			'name' => 'TestApp',
+			'models' => array('SchemaPrefixAuthUser')
+		));
+		unset($read['tables']['missing']);
+		$this->assertTrue(isset($read['tables']['auth_users']), 'auth_users key missing %s');
+
+	}
+
+/**
+ * test reading schema with config prefix.
+ *
+ * @return void
+ */
+	function testSchemaReadWithConfigPrefix() {
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$config = $db->config;
+		$config['prefix'] = 'schema_test_prefix_';
+		ConnectionManager::create('schema_prefix', $config);
+		$read = $this->Schema->read(array('connection' => 'schema_prefix', 'models' => false));
+		$this->assertTrue(empty($read['tables']));
+	}
+
+/**
+ * test reading schema from plugins.
+ *
+ * @return void
+ */
+	function testSchemaReadWithPlugins() {
+		App::objects('model', null, false);
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		$Schema =& new CakeSchema();
+		$Schema->plugin = 'TestPlugin';
+		$read = $Schema->read(array(
+			'connection' => 'test_suite',
+			'name' => 'TestApp',
+			'models' => true
+		));
+		unset($read['tables']['missing']);
+		$this->assertTrue(isset($read['tables']['auth_users']));
+		$this->assertTrue(isset($read['tables']['authors']));
+		$this->assertTrue(isset($read['tables']['test_plugin_comments']));
+		$this->assertTrue(isset($read['tables']['posts']));
+		$this->assertEqual(count($read['tables']), 4);
+
+		App::build();
+	}
+
+/**
+ * test reading schema with tables from another database.
+ *
+ * @return void
+ */
+	function testSchemaReadWithCrossDatabase() {
+		$config = new DATABASE_CONFIG();
+		$skip = $this->skipIf(
+			!isset($config->test) || !isset($config->test2),
+			 '%s Primary and secondary test databases not configured, skipping cross-database '
+			.'join tests.'
+			.' To run these tests, you must define $test and $test2 in your database configuration.'
+		);
+		if ($skip) {
+			return;
+		}
+
+		$db2 =& ConnectionManager::getDataSource('test2');
+		$fixture = new SchemaCrossDatabaseFixture();
+		$fixture->create($db2);
+		$fixture->insert($db2);
+
+		$read = $this->Schema->read(array(
+			'connection' => 'test_suite',
+			'name' => 'TestApp',
+			'models' => array('SchemaCrossDatabase', 'SchemaPost')
+		));
+		$this->assertTrue(isset($read['tables']['posts']));
+		$this->assertFalse(isset($read['tables']['cross_database']), 'Cross database should not appear');
+		$this->assertFalse(isset($read['tables']['missing']['cross_database']), 'Cross database should not appear');
+
+		$read = $this->Schema->read(array(
+			'connection' => 'test2',
+			'name' => 'TestApp',
+			'models' => array('SchemaCrossDatabase', 'SchemaPost')
+		));
+		$this->assertFalse(isset($read['tables']['posts']), 'Posts should not appear');
+		$this->assertFalse(isset($read['tables']['posts']), 'Posts should not appear');
+		$this->assertTrue(isset($read['tables']['cross_database']));
+
+		$fixture->drop($db2);
+	}
+
+/**
+ * test that tables are generated correctly
+ *
+ * @return void
+ */
+	function testGenerateTable() {
+		$fields = array(
+			'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+			'author_id' => array('type' => 'integer', 'null' => false),
+			'title' => array('type' => 'string', 'null' => false),
+			'body' => array('type' => 'text', 'null' => true, 'default' => null),
+			'published' => array('type' => 'string', 'null' => true, 'default' => 'N', 'length' => 1),
+			'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
+			'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+			'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
+		);
+		$result = $this->Schema->generateTable('posts', $fields);
+		$this->assertPattern('/var \$posts/', $result);
+
+		eval(substr($result, 4));
+		$this->assertEqual($posts, $fields);
+	}
+/**
+ * testSchemaWrite method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaWrite() {
+		$write = $this->Schema->write(array('name' => 'MyOtherApp', 'tables' => $this->Schema->tables, 'path' => TMP . 'tests'));
+		$file = file_get_contents(TMP . 'tests' . DS .'schema.php');
+		$this->assertEqual($write, $file);
+
+		require_once( TMP . 'tests' . DS .'schema.php');
+		$OtherSchema = new MyOtherAppSchema();
+		$this->assertEqual($this->Schema->tables, $OtherSchema->tables);
+	}
+
+/**
+ * testSchemaComparison method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaComparison() {
+		$New = new MyAppSchema();
+		$compare = $New->compare($this->Schema);
+		$expected = array(
+			'comments' => array(
+				'add' => array(
+					'post_id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+					'title' => array('type' => 'string', 'null' => false, 'length' => 100),
+				),
+				'drop' => array(
+					'article_id' => array('type' => 'integer', 'null' => false),
+					'tableParameters' => array(),
+				),
+				'change' => array(
+					'comment' => array('type' => 'text', 'null' => false, 'default' => null),
+				)
+			),
+			'posts' => array(
+				'add' => array(
+					'summary' => array('type' => 'text', 'null' => 1),
+				),
+				'drop' => array(
+					'tableParameters' => array(),
+				),
+				'change' => array(
+					'author_id' => array('type' => 'integer', 'null' => true, 'default' => ''),
+					'title' => array('type' => 'string', 'null' => false, 'default' => 'Title'),
+					'published' => array('type' => 'string', 'null' => true, 'default' => 'Y', 'length' => '1')
+				)
+			),
+		);
+		$this->assertEqual($expected, $compare);
+
+		$tables = array(
+			'missing' => array(
+				'categories' => array(
+					'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
+					'created' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+					'modified' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+					'name' => array('type' => 'string', 'null' => false, 'default' => NULL, 'length' => 100),
+					'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
+					'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'MyISAM')
+				)
+			),
+			'ratings' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
+				'foreign_key' => array('type' => 'integer', 'null' => false, 'default' => NULL),
+				'model' => array('type' => 'varchar', 'null' => false, 'default' => NULL),
+				'value' => array('type' => 'float', 'null' => false, 'length' => '5,2', 'default' => NULL),
+				'created' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+				'modified' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+				'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
+				'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'MyISAM')
+			)
+		);
+		$compare = $New->compare($this->Schema, $tables);
+		$expected = array(
+			'ratings' => array(
+				'add' => array(
+					'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
+					'foreign_key' => array('type' => 'integer', 'null' => false, 'default' => NULL),
+					'model' => array('type' => 'varchar', 'null' => false, 'default' => NULL),
+					'value' => array('type' => 'float', 'null' => false, 'length' => '5,2', 'default' => NULL),
+					'created' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+					'modified' => array('type' => 'datetime', 'null' => false, 'default' => NULL),
+					'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
+					'tableParameters' => array('charset' => 'latin1', 'collate' => 'latin1_swedish_ci', 'engine' => 'MyISAM')
+				)
+			)
+		);
+		$this->assertEqual($expected, $compare);
+	}
+
+/**
+ * test comparing '' and null and making sure they are different.
+ *
+ * @return void
+ */
+	function testCompareEmptyStringAndNull() {
+		$One =& new CakeSchema(array(
+			'posts' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
+				'name' => array('type' => 'string', 'null' => false, 'default' => '')
+			)
+		));
+		$Two =& new CakeSchema(array(
+			'posts' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
+				'name' => array('type' => 'string', 'null' => false, 'default' => null)
+			)
+		));
+		$compare = $One->compare($Two);
+		$expected = array(
+			'posts' => array(
+				'change' => array(
+					'name' => array('type' => 'string', 'null' => false, 'default' => null)
+				)
+			)
+		);
+		$this->assertEqual($expected, $compare);
+	}
+
+/**
+ * Test comparing tableParameters and indexes.
+ *
+ * @return void
+ */
+	function testTableParametersAndIndexComparison() {
+		$old = array(
+			'posts' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+				'author_id' => array('type' => 'integer', 'null' => false),
+				'title' => array('type' => 'string', 'null' => false),
+				'indexes' => array(
+					'PRIMARY' => array('column' => 'id', 'unique' => true)
+				),
+				'tableParameters' => array(
+					'charset' => 'latin1',
+					'collate' => 'latin1_general_ci'
+				)
+			),
+			'comments' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+				'post_id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'comment' => array('type' => 'text'),
+				'indexes' => array(
+					'PRIMARY' => array('column' => 'id', 'unique' => true),
+					'post_id' => array('column' => 'post_id'),
+				),
+				'tableParameters' => array(
+					'engine' => 'InnoDB',
+					'charset' => 'latin1',
+					'collate' => 'latin1_general_ci'
+				)
+			)
+		);
+		$new = array(
+			'posts' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+				'author_id' => array('type' => 'integer', 'null' => false),
+				'title' => array('type' => 'string', 'null' => false),
+				'indexes' => array(
+					'PRIMARY' => array('column' => 'id', 'unique' => true),
+					'author_id' => array('column' => 'author_id'),
+				),
+				'tableParameters' => array(
+					'charset' => 'utf8',
+					'collate' => 'utf8_general_ci',
+					'engine' => 'MyISAM'
+				)
+			),
+			'comments' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0, 'key' => 'primary'),
+				'post_id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'comment' => array('type' => 'text'),
+				'indexes' => array(
+					'PRIMARY' => array('column' => 'id', 'unique' => true),
+				),
+				'tableParameters' => array(
+					'charset' => 'utf8',
+					'collate' => 'utf8_general_ci'
+				)
+			)
+		);
+		$compare = $this->Schema->compare($old, $new);
+		$expected = array(
+			'posts' => array(
+				'add' => array(
+					'indexes' => array('author_id' => array('column' => 'author_id')),
+				),
+				'change' => array(
+					'tableParameters' => array(
+						'charset' => 'utf8',
+						'collate' => 'utf8_general_ci',
+						'engine' => 'MyISAM'
+					)
+				)
+			),
+			'comments' => array(
+				'drop' => array(
+					'indexes' => array('post_id' => array('column' => 'post_id')),
+				),
+				'change' => array(
+					'tableParameters' => array(
+						'charset' => 'utf8',
+						'collate' => 'utf8_general_ci',
+					)
+				)
+			)
+		);
+		$this->assertEqual($compare, $expected);
+	}
+
+/**
+ * testSchemaLoading method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaLoading() {
+		$Other =& $this->Schema->load(array('name' => 'MyOtherApp', 'path' => TMP . 'tests'));
+		$this->assertEqual($Other->name, 'MyOtherApp');
+		$this->assertEqual($Other->tables, $this->Schema->tables);
+	}
+
+/**
+ * test loading schema files inside of plugins.
+ *
+ * @return void
+ */
+	function testSchemaLoadingFromPlugin() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+		$Other =& $this->Schema->load(array('name' => 'TestPluginApp', 'plugin' => 'TestPlugin'));
+		$this->assertEqual($Other->name, 'TestPluginApp');
+		$this->assertEqual(array_keys($Other->tables), array('acos'));
+
+		App::build();
+	}
+
+/**
+ * testSchemaCreateTable method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaCreateTable() {
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$db->cacheSources = false;
+
+		$Schema =& new CakeSchema(array(
+			'connection' => 'test_suite',
+			'testdescribes' => array(
+				'id' => array('type' => 'integer', 'key' => 'primary'),
+				'int_null' => array('type' => 'integer', 'null' => true),
+				'int_not_null' => array('type' => 'integer', 'null' => false),
+			),
+		));
+		$sql = $db->createSchema($Schema);
+
+		$col = $Schema->tables['testdescribes']['int_null'];
+		$col['name'] = 'int_null';
+		$column = $this->db->buildColumn($col);
+		$this->assertPattern('/' . preg_quote($column, '/') . '/', $sql);
+
+		$col = $Schema->tables['testdescribes']['int_not_null'];
+		$col['name'] = 'int_not_null';
+		$column = $this->db->buildColumn($col);
+		$this->assertPattern('/' . preg_quote($column, '/') . '/', $sql);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/connection_manager.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/connection_manager.test.php
new file mode 100644
index 000000000..e100a7bf3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/connection_manager.test.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * Connection Manager tests
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5550
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'ConnectionManager');
+
+/**
+ * ConnectionManagerTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.models
+ */
+class ConnectionManagerTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->ConnectionManager =& ConnectionManager::getInstance();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->ConnectionManager);
+	}
+
+/**
+ * testInstantiation method
+ *
+ * @access public
+ * @return void
+ */
+	function testInstantiation() {
+		$this->assertTrue(is_a($this->ConnectionManager, 'ConnectionManager'));
+	}
+
+/**
+ * testEnumConnectionObjects method
+ *
+ * @access public
+ * @return void
+ */
+	function testEnumConnectionObjects() {
+		$sources = ConnectionManager::enumConnectionObjects();
+		$this->assertTrue(count($sources) >= 1);
+
+		$connections = array('default', 'test', 'test_suite');
+		$this->assertTrue(count(array_intersect(array_keys($sources), $connections)) >= 1);
+	}
+
+/**
+ * testGetDataSource method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetDataSource() {
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertTrue(count(array_keys($connections) >= 1));
+
+		$source = ConnectionManager::getDataSource(key($connections));
+		$this->assertTrue(is_object($source));
+
+		$this->expectError(new PatternExpectation('/Non-existent data source/i'));
+
+		$source = ConnectionManager::getDataSource('non_existent_source');
+		$this->assertEqual($source, null);
+
+	}
+
+/**
+ * testGetPluginDataSource method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetPluginDataSource() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		$name = 'test_source';
+		$config = array('datasource' => 'TestPlugin.TestSource');
+		$connection = ConnectionManager::create($name, $config);
+
+		$this->assertTrue(class_exists('TestSource'));
+		$this->assertEqual($connection->configKeyName, $name);
+		$this->assertEqual($connection->config, $config);
+
+		App::build();
+	}
+
+/**
+ * testGetPluginDataSourceAndPluginDriver method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetPluginDataSourceAndPluginDriver() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		$name = 'test_plugin_source_and_driver';
+		$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'TestPlugin.TestDriver');
+
+		$connection = ConnectionManager::create($name, $config);
+
+		$this->assertTrue(class_exists('TestSource'));
+		$this->assertTrue(class_exists('TestDriver'));
+		$this->assertEqual($connection->configKeyName, $name);
+		$this->assertEqual($connection->config, $config);
+
+		App::build();
+	}
+
+/**
+ * testGetLocalDataSourceAndPluginDriver method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetLocalDataSourceAndPluginDriver() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS)
+		));
+
+		$name = 'test_local_source_and_plugin_driver';
+		$config = array('datasource' => 'dbo', 'driver' => 'TestPlugin.DboDummy');
+
+		$connection = ConnectionManager::create($name, $config);
+
+		$this->assertTrue(class_exists('DboSource'));
+		$this->assertTrue(class_exists('DboDummy'));
+		$this->assertEqual($connection->configKeyName, $name);
+
+		App::build();
+	}
+
+/**
+ * testGetPluginDataSourceAndLocalDriver method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetPluginDataSourceAndLocalDriver() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'datasources' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+		));
+
+		$name = 'test_plugin_source_and_local_driver';
+		$config = array('datasource' => 'TestPlugin.TestSource', 'driver' => 'local_driver');
+
+		$connection = ConnectionManager::create($name, $config);
+
+		$this->assertTrue(class_exists('TestSource'));
+		$this->assertTrue(class_exists('TestLocalDriver'));
+		$this->assertEqual($connection->configKeyName, $name);
+		$this->assertEqual($connection->config, $config);
+		App::build();
+	}
+
+/**
+ * testSourceList method
+ *
+ * @access public
+ * @return void
+ */
+	function testSourceList() {
+		$sources = ConnectionManager::sourceList();
+		$this->assertTrue(count($sources) >= 1);
+
+		$connections = array('default', 'test', 'test_suite');
+		$this->assertTrue(count(array_intersect($sources, $connections)) >= 1);
+	}
+
+/**
+ * testGetSourceName method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetSourceName() {
+		$connections = ConnectionManager::enumConnectionObjects();
+		$name = key($connections);
+		$source = ConnectionManager::getDataSource($name);
+		$result = ConnectionManager::getSourceName($source);
+
+		$this->assertEqual($result, $name);
+
+		$source =& new StdClass();
+		$result = ConnectionManager::getSourceName($source);
+		$this->assertEqual($result, null);
+	}
+
+/**
+ * testLoadDataSource method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadDataSource() {
+		$connections = array(
+			array('classname' => 'DboMysql', 'filename' => 'dbo' . DS . 'dbo_mysql'),
+			array('classname' => 'DboMysqli', 'filename' => 'dbo' . DS . 'dbo_mysqli'),
+			array('classname' => 'DboMssql', 'filename' => 'dbo' . DS . 'dbo_mssql'),
+			array('classname' => 'DboOracle', 'filename' => 'dbo' . DS . 'dbo_oracle'),
+		);
+
+		foreach ($connections as $connection) {
+			$exists = class_exists($connection['classname']);
+			$loaded = ConnectionManager::loadDataSource($connection);
+			$this->assertEqual($loaded, !$exists, "%s Failed loading the {$connection['classname']} datasource");
+		}
+
+		$connection = array('classname' => 'NonExistentDataSource', 'filename' => 'non_existent');
+		$this->expectError(new PatternExpectation('/Unable to import DataSource class/i'));
+
+		$loaded = ConnectionManager::loadDataSource($connection);
+		$this->assertEqual($loaded, null);
+	}
+
+/**
+ * testCreateDataSource method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreateDataSourceWithIntegrationTests() {
+		$name = 'test_created_connection';
+
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertTrue(count(array_keys($connections) >= 1));
+
+		$source = ConnectionManager::getDataSource(key($connections));
+		$this->assertTrue(is_object($source));
+
+		$config = $source->config;
+		$connection = ConnectionManager::create($name, $config);
+
+		$this->assertTrue(is_object($connection));
+		$this->assertEqual($name, $connection->configKeyName);
+		$this->assertEqual($name, ConnectionManager::getSourceName($connection));
+
+		$source = ConnectionManager::create(null, array());
+		$this->assertEqual($source, null);
+
+		$source = ConnectionManager::create('another_test', array());
+		$this->assertEqual($source, null);
+
+		$config = array('classname' => 'DboMysql', 'filename' => 'dbo' . DS . 'dbo_mysql');
+		$source = ConnectionManager::create(null, $config);
+		$this->assertEqual($source, null);
+	}
+
+/**
+ * testConnectionData method
+ *
+ * @access public
+ * @return void
+ */
+	function testConnectionData() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'datasources' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS . 'datasources' . DS)
+		));
+
+		$expected = array(
+		    'filename' => 'test2_source',
+		    'classname' => 'Test2Source',
+		    'parent' => '',
+		    'plugin' => ''
+		);
+
+		ConnectionManager::create('connection1', array('datasource' => 'Test2'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertEqual($expected, $connections['connection1']);
+
+		ConnectionManager::create('connection2', array('datasource' => 'Test2Source'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertEqual($expected, $connections['connection2']);
+
+		ConnectionManager::create('connection3', array('datasource' => 'TestPlugin.Test'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$expected['filename'] = 'test_source';
+		$expected['classname'] = 'TestSource';
+		$expected['plugin'] = 'TestPlugin';
+		$this->assertEqual($expected, $connections['connection3']);
+
+		ConnectionManager::create('connection4', array('datasource' => 'TestPlugin.TestSource'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertEqual($expected, $connections['connection4']);
+
+		ConnectionManager::create('connection5', array('datasource' => 'Test2Other'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$expected['filename'] = 'test2_other_source';
+		$expected['classname'] = 'Test2OtherSource';
+		$expected['plugin'] = '';
+		$this->assertEqual($expected, $connections['connection5']);
+
+		ConnectionManager::create('connection6', array('datasource' => 'Test2OtherSource'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertEqual($expected, $connections['connection6']);
+
+		ConnectionManager::create('connection7', array('datasource' => 'TestPlugin.TestOther'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$expected['filename'] = 'test_other_source';
+		$expected['classname'] = 'TestOtherSource';
+		$expected['plugin'] = 'TestPlugin';
+		$this->assertEqual($expected, $connections['connection7']);
+
+		ConnectionManager::create('connection8', array('datasource' => 'TestPlugin.TestOtherSource'));
+		$connections = ConnectionManager::enumConnectionObjects();
+		$this->assertEqual($expected, $connections['connection8']);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
new file mode 100644
index 000000000..dffd1aa53
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mssql.test.php
@@ -0,0 +1,677 @@
+<?php
+/**
+ * DboMssqlTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+require_once LIBS.'model'.DS.'model.php';
+require_once LIBS.'model'.DS.'datasources'.DS.'datasource.php';
+require_once LIBS.'model'.DS.'datasources'.DS.'dbo_source.php';
+require_once LIBS.'model'.DS.'datasources'.DS.'dbo'.DS.'dbo_mssql.php';
+
+/**
+ * DboMssqlTestDb class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboMssqlTestDb extends DboMssql {
+
+/**
+ * simulated property
+ *
+ * @var array
+ * @access public
+ */
+	var $simulated = array();
+
+/**
+ * simalate property
+ *
+ * @var array
+ * @access public
+ */
+	var $simulate = true;
+/**
+ * fetchAllResultsStack
+ *
+ * @var array
+ * @access public
+ */
+	var $fetchAllResultsStack = array();
+
+/**
+ * execute method
+ *
+ * @param mixed $sql
+ * @access protected
+ * @return void
+ */
+	function _execute($sql) {
+		if ($this->simulate) {
+			$this->simulated[] = $sql;
+			return null;
+		} else {
+			return parent::_execute($sql);
+		}
+	}
+
+/**
+ * fetchAll method
+ *
+ * @param mixed $sql
+ * @access protected
+ * @return void
+ */
+	function _matchRecords(&$model, $conditions = null) {
+		return $this->conditions(array('id' => array(1, 2)));
+	}
+
+/**
+ * fetchAll method
+ *
+ * @param mixed $sql
+ * @access protected
+ * @return void
+ */
+	function fetchAll($sql, $cache = true, $modelName = null) {
+		$result = parent::fetchAll($sql, $cache, $modelName);
+		if (!empty($this->fetchAllResultsStack)) {
+    		return array_pop($this->fetchAllResultsStack);
+		}
+		return $result;
+	}
+
+/**
+ * getLastQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function getLastQuery() {
+		return $this->simulated[count($this->simulated) - 1];
+	}
+
+/**
+ * getPrimaryKey method
+ *
+ * @param mixed $model
+ * @access public
+ * @return void
+ */
+	function getPrimaryKey($model) {
+		return parent::_getPrimaryKey($model);
+	}
+/**
+ * clearFieldMappings method
+ *
+ * @access public
+ * @return void
+ */
+	function clearFieldMappings() {
+		$this->__fieldMappings = array();
+	}
+}
+
+/**
+ * MssqlTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class MssqlTestModel extends Model {
+
+/**
+ * name property
+ *
+ * @var string 'MssqlTestModel'
+ * @access public
+ */
+	var $name = 'MssqlTestModel';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * _schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary'),
+		'client_id'	=> array('type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11'),
+		'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'login'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'passwd'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+		'addr_1'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+		'addr_2'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '25'),
+		'zip_code'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'city'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'country'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'phone'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'fax'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'url'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+		'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'comments'	=> array('type' => 'text', 'null' => '1', 'default' => '', 'length' => ''),
+		'last_login'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+		'created'	=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'MssqlClientTestModel' => array(
+			'foreignKey' => 'client_id'
+		)
+	);
+/**
+ * find method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+/**
+ * findAll method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+/**
+ * setSchema method
+ *
+ * @param array $schema
+ * @access public
+ * @return void
+ */
+	function setSchema($schema) {
+		$this->_schema = $schema;
+	}
+}
+
+/**
+ * MssqlClientTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class MssqlClientTestModel extends Model {
+/**
+ * name property
+ *
+ * @var string 'MssqlAssociatedTestModel'
+ * @access public
+ */
+	var $name = 'MssqlClientTestModel';
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+/**
+ * _schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary'),
+		'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'created'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+}
+/**
+ * DboMssqlTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboMssqlTest extends CakeTestCase {
+
+/**
+ * The Dbo instance to be tested
+ *
+ * @var DboSource
+ * @access public
+ */
+	var $db = null;
+
+/**
+ * autoFixtures property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $autoFixtures = false;
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.category');
+/**
+ * Skip if cannot connect to mssql
+ *
+ * @access public
+ */
+	function skip() {
+		$this->_initDb();
+		$this->skipUnless($this->db->config['driver'] == 'mssql', '%s SQL Server connection not available');
+	}
+
+/**
+ * Make sure all fixtures tables are being created
+ *
+ * @access public
+ */
+	function start() {
+		$this->db->simulate = false;
+		parent::start();
+		$this->db->simulate = true;
+	}
+/**
+ * Make sure all fixtures tables are being dropped
+ *
+ * @access public
+ */
+	function end() {
+		$this->db->simulate = false;
+		parent::end();
+		$this->db->simulate = true;
+	}
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function setUp() {
+		$db = ConnectionManager::getDataSource('test_suite');
+		$this->db = new DboMssqlTestDb($db->config);
+		$this->model = new MssqlTestModel();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->model);
+	}
+
+/**
+ * testQuoting method
+ *
+ * @access public
+ * @return void
+ */
+	function testQuoting() {
+		$expected = "1.2";
+		$result = $this->db->value(1.2, 'float');
+		$this->assertIdentical($expected, $result);
+
+		$expected = "'1,2'";
+		$result = $this->db->value('1,2', 'float');
+		$this->assertIdentical($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'integer');
+		$this->assertIdentical($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'float');
+		$this->assertIdentical($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'binary');
+		$this->assertIdentical($expected, $result);
+	}
+/**
+ * testFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testFields() {
+		$fields = array(
+			'[MssqlTestModel].[id] AS [MssqlTestModel__0]',
+			'[MssqlTestModel].[client_id] AS [MssqlTestModel__1]',
+			'[MssqlTestModel].[name] AS [MssqlTestModel__2]',
+			'[MssqlTestModel].[login] AS [MssqlTestModel__3]',
+			'[MssqlTestModel].[passwd] AS [MssqlTestModel__4]',
+			'[MssqlTestModel].[addr_1] AS [MssqlTestModel__5]',
+			'[MssqlTestModel].[addr_2] AS [MssqlTestModel__6]',
+			'[MssqlTestModel].[zip_code] AS [MssqlTestModel__7]',
+			'[MssqlTestModel].[city] AS [MssqlTestModel__8]',
+			'[MssqlTestModel].[country] AS [MssqlTestModel__9]',
+			'[MssqlTestModel].[phone] AS [MssqlTestModel__10]',
+			'[MssqlTestModel].[fax] AS [MssqlTestModel__11]',
+			'[MssqlTestModel].[url] AS [MssqlTestModel__12]',
+			'[MssqlTestModel].[email] AS [MssqlTestModel__13]',
+			'[MssqlTestModel].[comments] AS [MssqlTestModel__14]',
+			'CONVERT(VARCHAR(20), [MssqlTestModel].[last_login], 20) AS [MssqlTestModel__15]',
+			'[MssqlTestModel].[created] AS [MssqlTestModel__16]',
+			'CONVERT(VARCHAR(20), [MssqlTestModel].[updated], 20) AS [MssqlTestModel__17]'
+		);
+
+		$result = $this->db->fields($this->model);
+		$expected = $fields;
+		$this->assertEqual($result, $expected);
+
+		$this->db->clearFieldMappings();
+		$result = $this->db->fields($this->model, null, 'MssqlTestModel.*');
+		$expected = $fields;
+		$this->assertEqual($result, $expected);
+
+		$this->db->clearFieldMappings();
+		$result = $this->db->fields($this->model, null, array('*', 'AnotherModel.id', 'AnotherModel.name'));
+		$expected = array_merge($fields, array(
+			'[AnotherModel].[id] AS [AnotherModel__18]',
+			'[AnotherModel].[name] AS [AnotherModel__19]'));
+		$this->assertEqual($result, $expected);
+
+		$this->db->clearFieldMappings();
+		$result = $this->db->fields($this->model, null, array('*', 'MssqlClientTestModel.*'));
+		$expected = array_merge($fields, array(
+			'[MssqlClientTestModel].[id] AS [MssqlClientTestModel__18]',
+			'[MssqlClientTestModel].[name] AS [MssqlClientTestModel__19]',
+			'[MssqlClientTestModel].[email] AS [MssqlClientTestModel__20]',
+			'CONVERT(VARCHAR(20), [MssqlClientTestModel].[created], 20) AS [MssqlClientTestModel__21]',
+			'CONVERT(VARCHAR(20), [MssqlClientTestModel].[updated], 20) AS [MssqlClientTestModel__22]'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDistinctFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testDistinctFields() {
+		$result = $this->db->fields($this->model, null, array('DISTINCT Car.country_code'));
+		$expected = array('DISTINCT [Car].[country_code] AS [Car__0]');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->fields($this->model, null, 'DISTINCT Car.country_code');
+		$expected = array('DISTINCT [Car].[country_code] AS [Car__1]');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDistinctWithLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testDistinctWithLimit() {
+		$this->db->read($this->model, array(
+			'fields' => array('DISTINCT MssqlTestModel.city', 'MssqlTestModel.country'),
+			'limit' => 5
+		));
+		$result = $this->db->getLastQuery();
+		$this->assertPattern('/^SELECT DISTINCT TOP 5/', $result);
+	}
+
+/**
+ * testDescribe method
+ *
+ * @access public
+ * @return void
+ */
+	function testDescribe() {
+		$MssqlTableDescription = array(
+			0 => array(
+				0 => array(
+					'Default' => '((0))',
+					'Field' => 'count',
+					'Key' => 0,
+					'Length' => '4',
+					'Null' => 'NO',
+					'Type' => 'integer',
+				)
+			)
+		);
+		$this->db->fetchAllResultsStack = array($MssqlTableDescription);
+		$dummyModel = $this->model;
+		$result = $this->db->describe($dummyModel);
+		$expected = array(
+			'count' => array(
+				'type' => 'integer',
+				'null' => false,
+				'default' => '0',
+				'length' => 4
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testBuildColumn
+ *
+ * @return unknown_type
+ * @access public
+ */
+	function testBuildColumn() {
+		$column = array('name' => 'id', 'type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary');
+		$result = $this->db->buildColumn($column);
+		$expected = '[id] int IDENTITY (1, 1) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'client_id', 'type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11');
+		$result = $this->db->buildColumn($column);
+		$expected = '[client_id] int DEFAULT 0 NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'client_id', 'type' => 'integer', 'null' => true);
+		$result = $this->db->buildColumn($column);
+		$expected = '[client_id] int NULL';
+		$this->assertEqual($result, $expected);
+
+		// 'name' => 'type' format for columns
+		$column = array('type' => 'integer', 'name' => 'client_id');
+		$result = $this->db->buildColumn($column);
+		$expected = '[client_id] int NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('type' => 'string', 'name' => 'name');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => '', 'default' => '', 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) DEFAULT \'\' NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => false, 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => false, 'default' => null, 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => true, 'default' => null, 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) NULL';
+		$this->assertEqual($result, $expected);
+
+		$column = array('name' => 'name', 'type' => 'string', 'null' => true, 'default' => '', 'length' => '255');
+		$result = $this->db->buildColumn($column);
+		$expected = '[name] varchar(255) DEFAULT \'\'';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testBuildIndex method
+ *
+ * @return void
+ * @access public
+ */
+	function testBuildIndex() {
+		$indexes = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'client_id' => array('column' => 'client_id', 'unique' => 1)
+		);
+		$result = $this->db->buildIndex($indexes, 'items');
+		$expected = array(
+			'PRIMARY KEY ([id])',
+			'ALTER TABLE items ADD CONSTRAINT client_id UNIQUE([client_id]);'
+		);
+		$this->assertEqual($result, $expected);
+
+		$indexes = array('client_id' => array('column' => 'client_id'));
+		$result = $this->db->buildIndex($indexes, 'items');
+		$this->assertEqual($result, array());
+
+		$indexes = array('client_id' => array('column' => array('client_id', 'period_id'), 'unique' => 1));
+		$result = $this->db->buildIndex($indexes, 'items');
+		$expected = array('ALTER TABLE items ADD CONSTRAINT client_id UNIQUE([client_id], [period_id]);');
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testUpdateAllSyntax method
+ *
+ * @return void
+ * @access public
+ */
+	function testUpdateAllSyntax() {
+		$fields = array('MssqlTestModel.client_id' => '[MssqlTestModel].[client_id] + 1');
+		$conditions = array('MssqlTestModel.updated <' => date('2009-01-01 00:00:00'));
+		$this->db->update($this->model, $fields, null, $conditions);
+
+		$result = $this->db->getLastQuery();
+		$this->assertNoPattern('/MssqlTestModel/', $result);
+		$this->assertPattern('/^UPDATE \[mssql_test_models\]/', $result);
+		$this->assertPattern('/SET \[client_id\] = \[client_id\] \+ 1/', $result);
+	}
+
+/**
+ * testGetPrimaryKey method
+ *
+ * @return void
+ * @access public
+ */
+	function testGetPrimaryKey() {
+		// When param is a model
+		$result = $this->db->getPrimaryKey($this->model);
+		$this->assertEqual($result, 'id');
+
+		$schema = $this->model->schema();
+		unset($schema['id']['key']);
+		$this->model->setSchema($schema);
+		$result = $this->db->getPrimaryKey($this->model);
+		$this->assertNull($result);
+
+		// When param is a table name
+		$this->db->simulate = false;
+		$this->loadFixtures('Category');
+		$result = $this->db->getPrimaryKey('categories');
+		$this->assertEqual($result, 'id');
+	}
+
+/**
+ * testInsertMulti
+ *
+ * @return void
+ * @access public
+ */
+	function testInsertMulti() {
+		$fields = array('id', 'name', 'login');
+		$values = array('(1, \'Larry\', \'PhpNut\')', '(2, \'Renan\', \'renan.saddam\')');
+		$this->db->simulated = array();
+		$this->db->insertMulti($this->model, $fields, $values);
+		$result = $this->db->simulated;
+		$expected = array(
+			'SET IDENTITY_INSERT [mssql_test_models] ON',
+			'INSERT INTO [mssql_test_models] ([id], [name], [login]) VALUES (1, \'Larry\', \'PhpNut\')',
+    		'INSERT INTO [mssql_test_models] ([id], [name], [login]) VALUES (2, \'Renan\', \'renan.saddam\')',
+			'SET IDENTITY_INSERT [mssql_test_models] OFF'
+		);
+		$this->assertEqual($result, $expected);
+
+		$fields = array('name', 'login');
+		$values = array('(\'Larry\', \'PhpNut\')', '(\'Renan\', \'renan.saddam\')');
+		$this->db->simulated = array();
+		$this->db->insertMulti($this->model, $fields, $values);
+		$result = $this->db->simulated;
+		$expected = array(
+			'INSERT INTO [mssql_test_models] ([name], [login]) VALUES (\'Larry\', \'PhpNut\')',
+    		'INSERT INTO [mssql_test_models] ([name], [login]) VALUES (\'Renan\', \'renan.saddam\')'
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testLastError
+ *
+ * @return void
+ * @access public
+ */
+	function testLastError() {
+		$debug = Configure::read('debug');
+		Configure::write('debug', 0);
+
+		$this->db->simulate = false;
+		$query = 'SELECT [name] FROM [categories]';
+		$this->assertTrue($this->db->execute($query) !== false);
+		$this->assertNull($this->db->lastError());
+
+		$query = 'SELECT [inexistent_field] FROM [categories]';
+		$this->assertFalse($this->db->execute($query));
+		$this->assertNotNull($this->db->lastError());
+
+		$query = 'SELECT [name] FROM [categories]';
+		$this->assertTrue($this->db->execute($query) !== false);
+		$this->assertNull($this->db->lastError());
+
+		Configure::write('debug', $debug);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
new file mode 100644
index 000000000..c90d585ca
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
@@ -0,0 +1,861 @@
+<?php
+/**
+ * DboMysqlTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysql'));
+App::import('Core', array('AppModel', 'Model'));
+require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
+
+Mock::generatePartial('DboMysql', 'QueryMockDboMysql', array('query', 'execute'));
+
+/**
+ * MysqlTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class MysqlTestModel extends Model {
+
+/**
+ * name property
+ *
+ * @var string 'MysqlTestModel'
+ * @access public
+ */
+	var $name = 'MysqlTestModel';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * find method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+/**
+ * findAll method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		return array(
+			'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+			'client_id'	=> array('type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11'),
+			'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'login'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'passwd'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_1'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_2'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '25'),
+			'zip_code'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'city'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'country'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'phone'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'fax'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'url'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'comments'	=> array('type' => 'text', 'null' => '1', 'default' => '', 'length' => ''),
+			'last_login'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+			'created'	=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+			'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+		);
+	}
+}
+
+/**
+ * DboMysqlTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboMysqlTest extends CakeTestCase {
+	var $fixtures = array('core.binary_test', 'core.post', 'core.author');
+/**
+ * The Dbo instance to be tested
+ *
+ * @var DboSource
+ * @access public
+ */
+	var $Db = null;
+
+/**
+ * Skip if cannot connect to mysql
+ *
+ * @access public
+ */
+	function skip() {
+		$this->_initDb();
+		$this->skipUnless($this->db->config['driver'] == 'mysql', '%s MySQL connection not available');
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function startTest() {
+		$db = ConnectionManager::getDataSource('test_suite');
+		$this->model = new MysqlTestModel();
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function tearDown() {
+		unset($this->model);
+		ClassRegistry::flush();
+	}
+
+/**
+ * startCase
+ *
+ * @return void
+ */
+	function startCase() {
+		$this->_debug = Configure::read('debug');
+		Configure::write('debug', 1);
+	}
+
+/**
+ * endCase
+ *
+ * @return void
+ */
+	function endCase() {
+		Configure::write('debug', $this->_debug);
+	}
+
+/**
+ * Test Dbo value method
+ *
+ * @access public
+ */
+	function testQuoting() {
+		$result = $this->db->fields($this->model);
+		$expected = array(
+			'`MysqlTestModel`.`id`',
+			'`MysqlTestModel`.`client_id`',
+			'`MysqlTestModel`.`name`',
+			'`MysqlTestModel`.`login`',
+			'`MysqlTestModel`.`passwd`',
+			'`MysqlTestModel`.`addr_1`',
+			'`MysqlTestModel`.`addr_2`',
+			'`MysqlTestModel`.`zip_code`',
+			'`MysqlTestModel`.`city`',
+			'`MysqlTestModel`.`country`',
+			'`MysqlTestModel`.`phone`',
+			'`MysqlTestModel`.`fax`',
+			'`MysqlTestModel`.`url`',
+			'`MysqlTestModel`.`email`',
+			'`MysqlTestModel`.`comments`',
+			'`MysqlTestModel`.`last_login`',
+			'`MysqlTestModel`.`created`',
+			'`MysqlTestModel`.`updated`'
+		);
+		$this->assertEqual($result, $expected);
+
+		$expected = 1.2;
+		$result = $this->db->value(1.2, 'float');
+		$this->assertEqual($expected, $result);
+
+		$expected = "'1,2'";
+		$result = $this->db->value('1,2', 'float');
+		$this->assertEqual($expected, $result);
+
+		$expected = "'4713e29446'";
+		$result = $this->db->value('4713e29446');
+
+		$this->assertEqual($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'integer');
+		$this->assertEqual($expected, $result);
+
+		$expected = 'NULL';
+		$result = $this->db->value('', 'boolean');
+		$this->assertEqual($expected, $result);
+
+		$expected = 10010001;
+		$result = $this->db->value(10010001);
+		$this->assertEqual($expected, $result);
+
+		$expected = "'00010010001'";
+		$result = $this->db->value('00010010001');
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test that localized floats don't cause trouble.
+ *
+ * @return void
+ */
+	function testLocalizedFloats() {
+		$restore = setlocale(LC_ALL, null);
+		setlocale(LC_ALL, 'de_DE');
+
+		$result = $this->db->value(3.141593, 'float');
+		$this->assertEqual((string)$result, '3.141593');
+		
+		$result = $this->db->value(3.141593);
+		$this->assertEqual((string)$result, '3.141593');
+
+		setlocale(LC_ALL, $restore);
+	}
+
+/**
+ * testTinyintCasting method
+ *
+ * @access public
+ * @return void
+ */
+	function testTinyintCasting() {
+		$this->db->cacheSources = false;
+		$this->db->query('CREATE TABLE ' . $this->db->fullTableName('tinyint') . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
+
+		$this->model = new CakeTestModel(array(
+			'name' => 'Tinyint', 'table' => 'tinyint', 'ds' => 'test_suite'
+		));
+
+		$result = $this->model->schema();
+		$this->assertEqual($result['bool']['type'], 'boolean');
+		$this->assertEqual($result['small_int']['type'], 'integer');
+
+		$this->assertTrue($this->model->save(array('bool' => 5, 'small_int' => 5)));
+		$result = $this->model->find('first');
+		$this->assertIdentical($result['Tinyint']['bool'], '1');
+		$this->assertIdentical($result['Tinyint']['small_int'], '5');
+		$this->model->deleteAll(true);
+
+		$this->assertTrue($this->model->save(array('bool' => 0, 'small_int' => 100)));
+		$result = $this->model->find('first');
+		$this->assertIdentical($result['Tinyint']['bool'], '0');
+		$this->assertIdentical($result['Tinyint']['small_int'], '100');
+		$this->model->deleteAll(true);
+
+		$this->assertTrue($this->model->save(array('bool' => true, 'small_int' => 0)));
+		$result = $this->model->find('first');
+		$this->assertIdentical($result['Tinyint']['bool'], '1');
+		$this->assertIdentical($result['Tinyint']['small_int'], '0');
+		$this->model->deleteAll(true);
+
+		$this->db->query('DROP TABLE ' . $this->db->fullTableName('tinyint'));
+	}
+
+/**
+ * testIndexDetection method
+ *
+ * @return void
+ * @access public
+ */
+	function testIndexDetection() {
+		$this->db->cacheSources = false;
+
+		$name = $this->db->fullTableName('simple');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
+		$expected = array('PRIMARY' => array('column' => 'id', 'unique' => 1));
+		$result = $this->db->index('simple', false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_a_key');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+		);
+		$result = $this->db->index('with_a_key', false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_two_keys');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ), KEY `pointless_small_int` ( `small_int` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
+		);
+		$result = $this->db->index('with_two_keys', false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_compound_keys');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ), KEY `pointless_small_int` ( `small_int` ), KEY `one_way` ( `bool`, `small_int` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
+			'one_way' => array('column' => array('bool', 'small_int'), 'unique' => 0),
+		);
+		$result = $this->db->index('with_compound_keys', false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_multiple_compound_keys');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ), KEY `pointless_small_int` ( `small_int` ), KEY `one_way` ( `bool`, `small_int` ), KEY `other_way` ( `small_int`, `bool` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
+			'one_way' => array('column' => array('bool', 'small_int'), 'unique' => 0),
+			'other_way' => array('column' => array('small_int', 'bool'), 'unique' => 0),
+		);
+		$result = $this->db->index('with_multiple_compound_keys', false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+	}
+
+/**
+ * testBuildColumn method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildColumn() {
+		$restore = $this->db->columns;
+		$this->db->columns = array('varchar(255)' => 1);
+		$data = array(
+			'name' => 'testName',
+			'type' => 'varchar(255)',
+			'default',
+			'null' => true,
+			'key',
+			'comment' => 'test'
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '`testName`  DEFAULT NULL COMMENT \'test\'';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'testName',
+			'type' => 'varchar(255)',
+			'default',
+			'null' => true,
+			'key',
+			'charset' => 'utf8',
+			'collate' => 'utf8_unicode_ci'
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '`testName`  CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL';
+		$this->assertEqual($result, $expected);
+		$this->db->columns = $restore;
+	}
+
+/**
+ * MySQL 4.x returns index data in a different format,
+ * Using a mock ensure that MySQL 4.x output is properly parsed.
+ *
+ * @return void
+ */
+	function testIndexOnMySQL4Output() {
+		$name = $this->db->fullTableName('simple');
+
+		$mockDbo =& new QueryMockDboMysql($this);
+		$columnData = array(
+			array('0' => array(
+				'Table' => 'with_compound_keys',
+				'Non_unique' => '0',
+				'Key_name' => 'PRIMARY',
+				'Seq_in_index' => '1',
+				'Column_name' => 'id',
+				'Collation' => 'A',
+				'Cardinality' => '0',
+				'Sub_part' => NULL,
+				'Packed' => NULL,
+				'Null' => '',
+				'Index_type' => 'BTREE',
+				'Comment' => ''
+			)),
+			array('0' => array(
+				'Table' => 'with_compound_keys',
+				'Non_unique' => '1',
+				'Key_name' => 'pointless_bool',
+				'Seq_in_index' => '1',
+				'Column_name' => 'bool',
+				'Collation' => 'A',
+				'Cardinality' => NULL,
+				'Sub_part' => NULL,
+				'Packed' => NULL,
+				'Null' => 'YES',
+				'Index_type' => 'BTREE',
+				'Comment' => ''
+			)),
+			array('0' => array(
+				'Table' => 'with_compound_keys',
+				'Non_unique' => '1',
+				'Key_name' => 'pointless_small_int',
+				'Seq_in_index' => '1',
+				'Column_name' => 'small_int',
+				'Collation' => 'A',
+				'Cardinality' => NULL,
+				'Sub_part' => NULL,
+				'Packed' => NULL,
+				'Null' => 'YES',
+				'Index_type' => 'BTREE',
+				'Comment' => ''
+			)),
+			array('0' => array(
+				'Table' => 'with_compound_keys',
+				'Non_unique' => '1',
+				'Key_name' => 'one_way',
+				'Seq_in_index' => '1',
+				'Column_name' => 'bool',
+				'Collation' => 'A',
+				'Cardinality' => NULL,
+				'Sub_part' => NULL,
+				'Packed' => NULL,
+				'Null' => 'YES',
+				'Index_type' => 'BTREE',
+				'Comment' => ''
+			)),
+			array('0' => array(
+				'Table' => 'with_compound_keys',
+				'Non_unique' => '1',
+				'Key_name' => 'one_way',
+				'Seq_in_index' => '2',
+				'Column_name' => 'small_int',
+				'Collation' => 'A',
+				'Cardinality' => NULL,
+				'Sub_part' => NULL,
+				'Packed' => NULL,
+				'Null' => 'YES',
+				'Index_type' => 'BTREE',
+				'Comment' => ''
+			))
+		);
+		$mockDbo->setReturnValue('query', $columnData, array('SHOW INDEX FROM ' . $name));
+
+		$result = $mockDbo->index($name, false);
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
+			'one_way' => array('column' => array('bool', 'small_int'), 'unique' => 0),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testColumn method
+ *
+ * @return void
+ * @access public
+ */
+	function testColumn() {
+		$result = $this->db->column('varchar(50)');
+		$expected = 'string';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('text');
+		$expected = 'text';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('int(11)');
+		$expected = 'integer';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('int(11) unsigned');
+		$expected = 'integer';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('tinyint(1)');
+		$expected = 'boolean';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('boolean');
+		$expected = 'boolean';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('float');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('float unsigned');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('double unsigned');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('decimal(14,7) unsigned');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testAlterSchemaIndexes method
+ *
+ * @access public
+ * @return void
+ */
+	function testAlterSchemaIndexes() {
+		App::import('Model', 'CakeSchema');
+		$this->db->cacheSources = false;
+
+		$schema1 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true)
+		)));
+		$this->db->query($this->db->createSchema($schema1));
+
+		$schema2 =& new CakeSchema(array(
+			'name' => 'AlterTest2',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true),
+				'indexes' => array(
+					'name_idx' => array('column' => 'name', 'unique' => 0),
+					'group_idx' => array('column' => 'group1', 'unique' => 0),
+					'compound_idx' => array('column' => array('group1', 'group2'), 'unique' => 0),
+					'PRIMARY' => array('column' => 'id', 'unique' => 1))
+		)));
+		$this->db->query($this->db->alterSchema($schema2->compare($schema1)));
+
+		$indexes = $this->db->index('altertest');
+		$this->assertEqual($schema2->tables['altertest']['indexes'], $indexes);
+
+		// Change three indexes, delete one and add another one
+		$schema3 =& new CakeSchema(array(
+			'name' => 'AlterTest3',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true),
+				'indexes' => array(
+					'name_idx' => array('column' => 'name', 'unique' => 1),
+					'group_idx' => array('column' => 'group2', 'unique' => 0),
+					'compound_idx' => array('column' => array('group2', 'group1'), 'unique' => 0),
+					'id_name_idx' => array('column' => array('id', 'name'), 'unique' => 0))
+		)));
+
+		$this->db->query($this->db->alterSchema($schema3->compare($schema2)));
+
+		$indexes = $this->db->index('altertest');
+		$this->assertEqual($schema3->tables['altertest']['indexes'], $indexes);
+
+		// Compare us to ourself.
+		$this->assertEqual($schema3->compare($schema3), array());
+
+		// Drop the indexes
+		$this->db->query($this->db->alterSchema($schema1->compare($schema3)));
+
+		$indexes = $this->db->index('altertest');
+		$this->assertEqual(array(), $indexes);
+
+		$this->db->query($this->db->dropSchema($schema1));
+	}
+/**
+ * test saving and retrieval of blobs
+ *
+ * @return void
+ */
+	function testBlobSaving() {
+		$this->db->cacheSources = false;
+		$data = "GIF87ab
+		Ò4A¿¿¿ˇˇˇ,b
+		¢îè©ÀÌ#¥�ã≥�:¯Ü‚Héá¶jV∂ÓúÎL≥çÀóËıÎ…>ï≈ vFE%ÒâLFI<†µw�±≈£7˘ç^H“≤«>Éâ*∑ÇnÖA•Ù|flêèj£:=ÿ6óUàµ5'∂®àA¬ñ∆ˆGE(gt’≈àÚy�ó«7	‚VìöÇ√˙Ç™
+		k�:;kÀAõ{*¡€Î˚˚[;;";
+
+		$model =& new AppModel(array('name' => 'BinaryTest', 'ds' => 'test_suite'));
+		$model->save(compact('data'));
+
+		$result = $model->find('first');
+		$this->assertEqual($result['BinaryTest']['data'], $data);
+	}
+
+/**
+ * test altering the table settings with schema.
+ *
+ * @return void
+ */
+	function testAlteringTableParameters() {
+		App::import('Model', 'CakeSchema');
+		$this->db->cacheSources = false;
+
+		$schema1 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'tableParameters' => array(
+					'charset' => 'latin1',
+					'collate' => 'latin1_general_ci',
+					'engine' => 'MyISAM'
+				)
+			)
+		));
+		$this->db->query($this->db->createSchema($schema1));
+		$schema2 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'tableParameters' => array(
+					'charset' => 'utf8',
+					'collate' => 'utf8_general_ci',
+					'engine' => 'InnoDB'
+				)
+			)
+		));
+		$result = $this->db->alterSchema($schema2->compare($schema1));
+		$this->assertPattern('/DEFAULT CHARSET=utf8/', $result);
+		$this->assertPattern('/ENGINE=InnoDB/', $result);
+		$this->assertPattern('/COLLATE=utf8_general_ci/', $result);
+
+		$this->db->query($result);
+		$result = $this->db->listDetailedSources('altertest');
+		$this->assertEqual($result['Collation'], 'utf8_general_ci');
+		$this->assertEqual($result['Engine'], 'InnoDB');
+		$this->assertEqual($result['charset'], 'utf8');
+
+		$this->db->query($this->db->dropSchema($schema1));
+	}
+
+/**
+ * test alterSchema on two tables.
+ *
+ * @return void
+ */
+	function testAlteringTwoTables() {
+		$schema1 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+			),
+			'other_table' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+			)
+		));
+		$schema2 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'field_two' => array('type' => 'string', 'null' => false, 'length' => 50),
+			),
+			'other_table' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'field_two' => array('type' => 'string', 'null' => false, 'length' => 50),
+			)
+		));
+		$result = $this->db->alterSchema($schema2->compare($schema1));
+		$this->assertEqual(2, substr_count($result, 'field_two'), 'Too many fields');
+	}
+
+/**
+ * testReadTableParameters method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadTableParameters() {
+		$this->db->cacheSources = false;
+		$this->db->query('CREATE TABLE ' . $this->db->fullTableName('tinyint') . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;');
+		$result = $this->db->readTableParameters('tinyint');
+		$expected = array(
+			'charset' => 'utf8',
+			'collate' => 'utf8_unicode_ci',
+			'engine' => 'InnoDB');
+		$this->assertEqual($result, $expected);
+
+		$this->db->query('DROP TABLE ' . $this->db->fullTableName('tinyint'));
+		$this->db->query('CREATE TABLE ' . $this->db->fullTableName('tinyint') . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id)) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_general_ci;');
+		$result = $this->db->readTableParameters('tinyint');
+		$expected = array(
+			'charset' => 'cp1250',
+			'collate' => 'cp1250_general_ci',
+			'engine' => 'MyISAM');
+		$this->assertEqual($result, $expected);
+		$this->db->query('DROP TABLE ' . $this->db->fullTableName('tinyint'));
+	}
+
+/**
+ * testBuildTableParameters method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildTableParameters() {
+		$this->db->cacheSources = false;
+		$data = array(
+			'charset' => 'utf8',
+			'collate' => 'utf8_unicode_ci',
+			'engine' => 'InnoDB');
+		$result = $this->db->buildTableParameters($data);
+		$expected = array(
+			'DEFAULT CHARSET=utf8',
+			'COLLATE=utf8_unicode_ci',
+			'ENGINE=InnoDB');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testBuildTableParameters method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetCharsetName() {
+		$this->db->cacheSources = false;
+		$result = $this->db->getCharsetName('utf8_unicode_ci');
+		$this->assertEqual($result, 'utf8');
+		$result = $this->db->getCharsetName('cp1250_general_ci');
+		$this->assertEqual($result, 'cp1250');
+	}
+
+/**
+ * test that changing the virtualFieldSeparator allows for __ fields.
+ *
+ * @return void
+ */
+	function testVirtualFieldSeparators() {
+		$model =& new CakeTestModel(array('table' => 'binary_tests', 'ds' => 'test_suite', 'name' => 'BinaryTest'));
+		$model->virtualFields = array(
+			'other__field' => 'SUM(id)'
+		);
+		
+		$this->db->virtualFieldSeparator = '_$_';
+		$result = $this->db->fields($model, null, array('data', 'other__field'));
+		$expected = array('`BinaryTest`.`data`', '(SUM(id)) AS  `BinaryTest_$_other__field`');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that a describe() gets additional fieldParameters
+ *
+ * @return void
+ */
+	function testDescribeGettingFieldParameters() {
+		$schema =& new CakeSchema(array(
+			'connection' => 'test_suite',
+			'testdescribes' => array(
+				'id' => array('type' => 'integer', 'key' => 'primary'),
+				'stringy' => array(
+					'type' => 'string',
+					'null' => true,
+					'charset' => 'cp1250',
+					'collate' => 'cp1250_general_ci',
+				),
+				'other_col' => array(
+					'type' => 'string',
+					'null' => false,
+					'charset' => 'latin1',
+					'comment' => 'Test Comment'
+				)
+			)
+		));
+		$this->db->execute($this->db->createSchema($schema));
+
+		$model =& new CakeTestModel(array('table' => 'testdescribes', 'name' => 'Testdescribes'));
+		$result = $this->db->describe($model);
+		$this->assertEqual($result['stringy']['collate'], 'cp1250_general_ci');
+		$this->assertEqual($result['stringy']['charset'], 'cp1250');
+		$this->assertEqual($result['other_col']['comment'], 'Test Comment');
+
+		$this->db->execute($this->db->dropSchema($schema));
+	}
+
+/**
+ * test that simple delete conditions don't create joins using a mock.
+ *
+ * @return void
+ */
+	function testSimpleDeleteConditionsNoJoins() {
+		$model =& new Post();
+		$mockDbo =& new QueryMockDboMysql($this);
+		$mockDbo->expectAt(0, 'execute', array(new PatternExpectation('/AS\s+`Post`\s+WHERE\s+`Post/')));
+		$mockDbo->setReturnValue('execute', true);
+
+		$mockDbo->delete($model, array('Post.id' => 1));
+	}
+
+/**
+ * test deleting with joins, a MySQL specific feature.
+ *
+ * @return void
+ */
+	function testDeleteWithJoins() {
+		$model =& new Post();
+		$mockDbo =& new QueryMockDboMysql($this);
+		$mockDbo->expectAt(0, 'execute', array(new PatternExpectation('/LEFT JOIN `authors`/')));
+		$mockDbo->setReturnValue('execute', true);
+
+		$mockDbo->delete($model, array('Author.id' => 1));
+	}
+
+/**
+ * test joins on delete with multiple conditions.
+ *
+ * @return void
+ */
+	function testDeleteWithJoinsAndMultipleConditions() {
+		$model =& new Post();
+		$mockDbo =& new QueryMockDboMysql($this);
+		$mockDbo->expectAt(0, 'execute', array(new PatternExpectation('/LEFT JOIN `authors`/')));
+		$mockDbo->expectAt(1, 'execute', array(new PatternExpectation('/LEFT JOIN `authors`/')));
+		$mockDbo->setReturnValue('execute', true);
+
+		$mockDbo->delete($model, array('Author.id' => 1, 'Post.id' => 2));
+		$mockDbo->delete($model, array('Post.id' => 2, 'Author.id' => 1));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
new file mode 100644
index 000000000..e3a94512b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_mysqli.test.php
@@ -0,0 +1,339 @@
+<?php
+/**
+ * DboMysqliTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboMysqli'));
+
+/**
+ * DboMysqliTestDb class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class DboMysqliTestDb extends DboMysqli {
+
+/**
+ * simulated property
+ *
+ * @var array
+ * @access public
+ */
+	var $simulated = array();
+
+/**
+ * testing property
+ *
+ * @var bool true
+ * @access public
+ */
+	var $testing = true;
+
+/**
+ * execute method
+ *
+ * @param mixed $sql
+ * @access protected
+ * @return void
+ */
+	function _execute($sql) {
+		if ($this->testing) {
+			$this->simulated[] = $sql;
+			return null;
+		}
+		return parent::_execute($sql);
+	}
+
+/**
+ * getLastQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function getLastQuery() {
+		return $this->simulated[count($this->simulated) - 1];
+	}
+}
+
+/**
+ * MysqliTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class MysqliTestModel extends Model {
+
+/**
+ * name property
+ *
+ * @var string 'MysqlTestModel'
+ * @access public
+ */
+	var $name = 'MysqliTestModel';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		return array(
+			'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+			'client_id'	=> array('type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11'),
+			'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'login'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'passwd'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_1'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_2'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '25'),
+			'zip_code'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'city'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'country'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'phone'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'fax'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'url'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'comments'	=> array('type' => 'text', 'null' => '1', 'default' => '', 'length' => ''),
+			'last_login'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+			'created'	=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+			'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+		);
+	}
+}
+
+/**
+ * DboMysqliTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboMysqliTest extends CakeTestCase {
+	var $fixtures = array('core.datatype');
+/**
+ * The Dbo instance to be tested
+ *
+ * @var DboSource
+ * @access public
+ */
+	var $Db = null;
+
+/**
+ * Skip if cannot connect to mysqli
+ *
+ * @access public
+ */
+	function skip() {
+		$this->_initDb();
+		$this->skipUnless($this->db->config['driver'] == 'mysqli', '%s MySQLi connection not available');
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function setUp() {
+		$this->model = new MysqliTestModel();
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function tearDown() {
+		unset($this->model);
+		ClassRegistry::flush();
+	}
+
+/**
+ * testIndexDetection method
+ *
+ * @return void
+ * @access public
+ */
+	function testIndexDetection() {
+		$this->db->cacheSources = false;
+
+		$name = $this->db->fullTableName('simple');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id));');
+		$expected = array('PRIMARY' => array('column' => 'id', 'unique' => 1));
+		$result = $this->db->index($name, false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_a_key');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+		);
+		$result = $this->db->index($name, false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_two_keys');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ), KEY `pointless_small_int` ( `small_int` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
+		);
+		$result = $this->db->index($name, false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_compound_keys');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ), KEY `pointless_small_int` ( `small_int` ), KEY `one_way` ( `bool`, `small_int` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
+			'one_way' => array('column' => array('bool', 'small_int'), 'unique' => 0),
+		);
+		$result = $this->db->index($name, false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$name = $this->db->fullTableName('with_multiple_compound_keys');
+		$this->db->query('CREATE TABLE ' . $name . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id), KEY `pointless_bool` ( `bool` ), KEY `pointless_small_int` ( `small_int` ), KEY `one_way` ( `bool`, `small_int` ), KEY `other_way` ( `small_int`, `bool` ));');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'pointless_small_int' => array('column' => 'small_int', 'unique' => 0),
+			'one_way' => array('column' => array('bool', 'small_int'), 'unique' => 0),
+			'other_way' => array('column' => array('small_int', 'bool'), 'unique' => 0),
+		);
+		$result = $this->db->index($name, false);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+	}
+
+/**
+ * testColumn method
+ *
+ * @return void
+ * @access public
+ */
+	function testColumn() {
+		$result = $this->db->column('varchar(50)');
+		$expected = 'string';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('text');
+		$expected = 'text';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('int(11)');
+		$expected = 'integer';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('int(11) unsigned');
+		$expected = 'integer';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('tinyint(1)');
+		$expected = 'boolean';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('boolean');
+		$expected = 'boolean';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('float');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('float unsigned');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('double unsigned');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->column('decimal(14,7) unsigned');
+		$expected = 'float';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test transaction commands.
+ *
+ * @return void
+ * @access public
+ */
+	function testTransactions() {
+		$this->db->testing = false;
+		$result = $this->db->begin($this->model);
+		$this->assertTrue($result);
+
+		$beginSqlCalls = Set::extract('/.[query=START TRANSACTION]', $this->db->_queriesLog);
+		$this->assertEqual(1, count($beginSqlCalls));
+
+		$result = $this->db->commit($this->model);
+		$this->assertTrue($result);
+	}
+/**
+ * test that float values are correctly identified
+ *
+ * @return void
+ */
+	function testFloatParsing() {
+		$model =& new Model(array('ds' => 'test_suite', 'table' => 'datatypes', 'name' => 'Datatype'));
+		$result = $this->db->describe($model);
+		$this->assertEqual((string)$result['float_field']['length'], '5,2');
+	}
+
+/**
+ * test that tableParameters like collation, charset and engine are functioning.
+ *
+ * @access public
+ * @return void
+ */
+	function testReadTableParameters() {
+		$this->db->cacheSources = $this->db->testing = false;
+		$this->db->query('CREATE TABLE ' . $this->db->fullTableName('tinyint') . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id)) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;');
+		$result = $this->db->readTableParameters('tinyint');
+		$expected = array(
+			'charset' => 'utf8',
+			'collate' => 'utf8_unicode_ci',
+			'engine' => 'InnoDB');
+		$this->assertEqual($result, $expected);
+
+		$this->db->query('DROP TABLE ' . $this->db->fullTableName('tinyint'));
+		$this->db->query('CREATE TABLE ' . $this->db->fullTableName('tinyint') . ' (id int(11) AUTO_INCREMENT, bool tinyint(1), small_int tinyint(2), primary key(id)) ENGINE=MyISAM DEFAULT CHARSET=cp1250 COLLATE=cp1250_general_ci;');
+		$result = $this->db->readTableParameters('tinyint');
+		$expected = array(
+			'charset' => 'cp1250',
+			'collate' => 'cp1250_general_ci',
+			'engine' => 'MyISAM');
+		$this->assertEqual($result, $expected);
+		$this->db->query('DROP TABLE ' . $this->db->fullTableName('tinyint'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
new file mode 100644
index 000000000..00f014451
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_oracle.test.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * DboOracleTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo_source.php';
+require_once LIBS . 'model' . DS . 'datasources' . DS . 'dbo' . DS . 'dbo_oracle.php';
+
+/**
+ * DboOracleTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboOracleTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ */
+	var $fixtures = array('core.oracle_user');
+
+/**
+ * setup method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_initDb();
+	}
+
+/**
+ * skip method
+ *
+ * @access public
+ * @return void
+ */
+    function skip() {
+    	$this->_initDb();
+    	$this->skipUnless($this->db->config['driver'] == 'oracle', '%s Oracle connection not available');
+    }
+
+/**
+ * testLastErrorStatement method
+ *
+ * @access public
+ * @return void
+ */
+	function testLastErrorStatement() {
+		if ($this->skip('testLastErrorStatement')) {
+			return;
+		}
+
+		$this->expectError();
+		$this->db->execute("SELECT ' FROM dual");
+		$e = $this->db->lastError();
+		$r = 'ORA-01756: quoted string not properly terminated';
+		$this->assertEqual($e, $r);
+	}
+
+/**
+ * testLastErrorConnect method
+ *
+ * @access public
+ * @return void
+ */
+	function testLastErrorConnect() {
+		if ($this->skip('testLastErrorConnect')) {
+			return;
+		}
+
+		$config = $this->db->config;
+		$old_pw = $this->db->config['password'];
+		$this->db->config['password'] = 'keepmeout';
+		$this->db->connect();
+		$e = $this->db->lastError();
+		$r = 'ORA-01017: invalid username/password; logon denied';
+		$this->assertEqual($e, $r);
+		$this->db->config['password'] = $old_pw;
+		$this->db->connect();
+	}
+
+/**
+ * testName method
+ *
+ * @access public
+ * @return void
+ */
+	function testName() {
+		$Db = $this->db;
+		#$Db =& new DboOracle($config = null, $autoConnect = false);
+
+		$r = $Db->name($Db->name($Db->name('foo.last_update_date')));
+		$e = 'foo.last_update_date';
+		$this->assertEqual($e, $r);
+
+		$r = $Db->name($Db->name($Db->name('foo._update')));
+		$e = 'foo."_update"';
+		$this->assertEqual($e, $r);
+
+		$r = $Db->name($Db->name($Db->name('foo.last_update_date')));
+		$e = 'foo.last_update_date';
+		$this->assertEqual($e, $r);
+
+		$r = $Db->name($Db->name($Db->name('last_update_date')));
+		$e = 'last_update_date';
+		$this->assertEqual($e, $r);
+
+		$r = $Db->name($Db->name($Db->name('_update')));
+		$e = '"_update"';
+		$this->assertEqual($e, $r);
+
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
new file mode 100644
index 000000000..d9c6d023c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_postgres.test.php
@@ -0,0 +1,883 @@
+<?php
+/**
+ * DboPostgresTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboPostgres'));
+App::import('Model', 'App');
+require_once dirname(dirname(dirname(__FILE__))) . DS . 'models.php';
+
+/**
+ * DboPostgresTestDb class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class DboPostgresTestDb extends DboPostgres {
+
+/**
+ * simulated property
+ *
+ * @var array
+ * @access public
+ */
+	var $simulated = array();
+
+/**
+ * execute method
+ *
+ * @param mixed $sql
+ * @access protected
+ * @return void
+ */
+	function _execute($sql) {
+		$this->simulated[] = $sql;
+		return null;
+	}
+
+/**
+ * getLastQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function getLastQuery() {
+		return $this->simulated[count($this->simulated) - 1];
+	}
+}
+
+/**
+ * PostgresTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class PostgresTestModel extends Model {
+
+/**
+ * name property
+ *
+ * @var string 'PostgresTestModel'
+ * @access public
+ */
+	var $name = 'PostgresTestModel';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'PostgresClientTestModel' => array(
+			'foreignKey' => 'client_id'
+		)
+	);
+
+/**
+ * find method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+/**
+ * findAll method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		return array(
+			'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+			'client_id' => array('type' => 'integer', 'null' => '', 'default' => '0', 'length' => '11'),
+			'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'login'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'passwd'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_1'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'addr_2'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '25'),
+			'zip_code'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'city'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'country'	=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'phone'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'fax'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'url'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+			'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'comments'	=> array('type' => 'text', 'null' => '1', 'default' => '', 'length' => ''),
+			'last_login'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+			'created'	=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+			'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+		);
+	}
+}
+
+/**
+ * PostgresClientTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class PostgresClientTestModel extends Model {
+
+/**
+ * name property
+ *
+ * @var string 'PostgresClientTestModel'
+ * @access public
+ */
+	var $name = 'PostgresClientTestModel';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		return array(
+			'id'		=> array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8', 'key' => 'primary'),
+			'name'		=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'email'		=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+			'created'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+			'updated'	=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+		);
+	}
+}
+
+/**
+ * DboPostgresTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboPostgresTest extends CakeTestCase {
+
+/**
+ * Do not automatically load fixtures for each test, they will be loaded manually
+ * using CakeTestCase::loadFixtures
+ *
+ * @var boolean
+ * @access public
+ */
+	var $autoFixtures = false;
+
+/**
+ * Fixtures
+ *
+ * @var object
+ * @access public
+ */
+	var $fixtures = array('core.user', 'core.binary_test', 'core.comment', 'core.article',
+		'core.tag', 'core.articles_tag', 'core.attachment', 'core.person', 'core.post', 'core.author',
+		'core.datatype',
+	);
+/**
+ * Actual DB connection used in testing
+ *
+ * @var DboSource
+ * @access public
+ */
+	var $db = null;
+
+/**
+ * Simulated DB connection used in testing
+ *
+ * @var DboSource
+ * @access public
+ */
+	var $db2 = null;
+
+/**
+ * Skip if cannot connect to postgres
+ *
+ * @access public
+ */
+	function skip() {
+		$this->_initDb();
+		$this->skipUnless($this->db->config['driver'] == 'postgres', '%s PostgreSQL connection not available');
+	}
+
+/**
+ * Set up test suite database connection
+ *
+ * @access public
+ */
+	function startTest() {
+		$this->_initDb();
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function setUp() {
+		Configure::write('Cache.disable', true);
+		$this->startTest();
+		$this->db =& ConnectionManager::getDataSource('test_suite');
+		$this->db2 = new DboPostgresTestDb($this->db->config, false);
+		$this->model = new PostgresTestModel();
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function tearDown() {
+		Configure::write('Cache.disable', false);
+		unset($this->db2);
+	}
+
+/**
+ * Test field quoting method
+ *
+ * @access public
+ */
+	function testFieldQuoting() {
+		$fields = array(
+			'"PostgresTestModel"."id" AS "PostgresTestModel__id"',
+			'"PostgresTestModel"."client_id" AS "PostgresTestModel__client_id"',
+			'"PostgresTestModel"."name" AS "PostgresTestModel__name"',
+			'"PostgresTestModel"."login" AS "PostgresTestModel__login"',
+			'"PostgresTestModel"."passwd" AS "PostgresTestModel__passwd"',
+			'"PostgresTestModel"."addr_1" AS "PostgresTestModel__addr_1"',
+			'"PostgresTestModel"."addr_2" AS "PostgresTestModel__addr_2"',
+			'"PostgresTestModel"."zip_code" AS "PostgresTestModel__zip_code"',
+			'"PostgresTestModel"."city" AS "PostgresTestModel__city"',
+			'"PostgresTestModel"."country" AS "PostgresTestModel__country"',
+			'"PostgresTestModel"."phone" AS "PostgresTestModel__phone"',
+			'"PostgresTestModel"."fax" AS "PostgresTestModel__fax"',
+			'"PostgresTestModel"."url" AS "PostgresTestModel__url"',
+			'"PostgresTestModel"."email" AS "PostgresTestModel__email"',
+			'"PostgresTestModel"."comments" AS "PostgresTestModel__comments"',
+			'"PostgresTestModel"."last_login" AS "PostgresTestModel__last_login"',
+			'"PostgresTestModel"."created" AS "PostgresTestModel__created"',
+			'"PostgresTestModel"."updated" AS "PostgresTestModel__updated"'
+		);
+
+		$result = $this->db->fields($this->model);
+		$expected = $fields;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->fields($this->model, null, 'PostgresTestModel.*');
+		$expected = $fields;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->fields($this->model, null, array('*', 'AnotherModel.id', 'AnotherModel.name'));
+		$expected = array_merge($fields, array(
+			'"AnotherModel"."id" AS "AnotherModel__id"',
+			'"AnotherModel"."name" AS "AnotherModel__name"'));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->fields($this->model, null, array('*', 'PostgresClientTestModel.*'));
+		$expected = array_merge($fields, array(
+			'"PostgresClientTestModel"."id" AS "PostgresClientTestModel__id"',
+    		'"PostgresClientTestModel"."name" AS "PostgresClientTestModel__name"',
+    		'"PostgresClientTestModel"."email" AS "PostgresClientTestModel__email"',
+    		'"PostgresClientTestModel"."created" AS "PostgresClientTestModel__created"',
+    		'"PostgresClientTestModel"."updated" AS "PostgresClientTestModel__updated"'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testColumnParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testColumnParsing() {
+		$this->assertEqual($this->db2->column('text'), 'text');
+		$this->assertEqual($this->db2->column('date'), 'date');
+		$this->assertEqual($this->db2->column('boolean'), 'boolean');
+		$this->assertEqual($this->db2->column('character varying'), 'string');
+		$this->assertEqual($this->db2->column('time without time zone'), 'time');
+		$this->assertEqual($this->db2->column('timestamp without time zone'), 'datetime');
+	}
+
+/**
+ * testValueQuoting method
+ *
+ * @access public
+ * @return void
+ */
+	function testValueQuoting() {
+		$this->assertIdentical($this->db2->value(1.2, 'float'), "'1.200000'");
+		$this->assertEqual($this->db2->value('1,2', 'float'), "'1,2'");
+
+		$this->assertEqual($this->db2->value('0', 'integer'), "'0'");
+		$this->assertEqual($this->db2->value('', 'integer'), 'NULL');
+		$this->assertEqual($this->db2->value('', 'float'), 'NULL');
+		$this->assertEqual($this->db2->value('', 'integer', false), "DEFAULT");
+		$this->assertEqual($this->db2->value('', 'float', false), "DEFAULT");
+		$this->assertEqual($this->db2->value('0.0', 'float'), "'0.0'");
+
+		$this->assertEqual($this->db2->value('t', 'boolean'), "TRUE");
+		$this->assertEqual($this->db2->value('f', 'boolean'), "FALSE");
+		$this->assertEqual($this->db2->value(true), "TRUE");
+		$this->assertEqual($this->db2->value(false), "FALSE");
+		$this->assertEqual($this->db2->value('t'), "'t'");
+		$this->assertEqual($this->db2->value('f'), "'f'");
+		$this->assertEqual($this->db2->value('true', 'boolean'), 'TRUE');
+		$this->assertEqual($this->db2->value('false', 'boolean'), 'FALSE');
+		$this->assertEqual($this->db2->value('', 'boolean'), 'FALSE');
+		$this->assertEqual($this->db2->value(0, 'boolean'), 'FALSE');
+		$this->assertEqual($this->db2->value(1, 'boolean'), 'TRUE');
+		$this->assertEqual($this->db2->value('1', 'boolean'), 'TRUE');
+		$this->assertEqual($this->db2->value(null, 'boolean'), "NULL");
+		$this->assertEqual($this->db2->value(array()), "NULL");
+	}
+
+/**
+ * test that localized floats don't cause trouble.
+ *
+ * @return void
+ */
+	function testLocalizedFloats() {
+		$restore = setlocale(LC_ALL, null);
+		setlocale(LC_ALL, 'de_DE');
+
+		$result = $this->db->value(3.141593, 'float');
+		$this->assertEqual((string)$result, "'3.141593'");
+
+		$result = $this->db->value(3.14);
+		$this->assertEqual((string)$result, "'3.140000'");
+
+		setlocale(LC_ALL, $restore);
+	}
+
+/**
+ * test that date and time columns do not generate errors with null and nullish values.
+ *
+ * @return void
+ */
+	function testDateAndTimeAsNull() {
+		$this->assertEqual($this->db2->value(null, 'date'), 'NULL');
+		$this->assertEqual($this->db2->value('', 'date'), 'NULL');
+
+		$this->assertEqual($this->db2->value('', 'datetime'), 'NULL');
+		$this->assertEqual($this->db2->value(null, 'datetime'), 'NULL');
+
+		$this->assertEqual($this->db2->value('', 'timestamp'), 'NULL');
+		$this->assertEqual($this->db2->value(null, 'timestamp'), 'NULL');
+
+		$this->assertEqual($this->db2->value('', 'time'), 'NULL');
+		$this->assertEqual($this->db2->value(null, 'time'), 'NULL');
+	}
+
+/**
+ * Tests that different Postgres boolean 'flavors' are properly returned as native PHP booleans
+ *
+ * @access public
+ * @return void
+ */
+	function testBooleanNormalization() {
+		$this->assertTrue($this->db2->boolean('t'));
+		$this->assertTrue($this->db2->boolean('true'));
+		$this->assertTrue($this->db2->boolean('TRUE'));
+		$this->assertTrue($this->db2->boolean(true));
+		$this->assertTrue($this->db2->boolean(1));
+		$this->assertTrue($this->db2->boolean(" "));
+
+		$this->assertFalse($this->db2->boolean('f'));
+		$this->assertFalse($this->db2->boolean('false'));
+		$this->assertFalse($this->db2->boolean('FALSE'));
+		$this->assertFalse($this->db2->boolean(false));
+		$this->assertFalse($this->db2->boolean(0));
+		$this->assertFalse($this->db2->boolean(''));
+	}
+
+/**
+ * test that default -> false in schemas works correctly.
+ *
+ * @return void
+ */
+	function testBooleanDefaultFalseInSchema() {
+		$model = new Model(array('name' => 'Datatype', 'table' => 'datatypes', 'ds' => 'test_suite'));
+		$model->create();
+		$this->assertIdentical(false, $model->data['Datatype']['bool']);
+	}
+
+/**
+ * testLastInsertIdMultipleInsert method
+ *
+ * @access public
+ * @return void
+ */
+	function testLastInsertIdMultipleInsert() {
+		$db1 = ConnectionManager::getDataSource('test_suite');
+
+		$table = $db1->fullTableName('users', false);
+		$password = '5f4dcc3b5aa765d61d8327deb882cf99';
+		$db1->execute(
+			"INSERT INTO {$table} (\"user\", password) VALUES ('mariano', '{$password}')"
+		);
+		$this->assertEqual($db1->lastInsertId($table), 1);
+
+		$db1->execute("INSERT INTO {$table} (\"user\", password) VALUES ('hoge', '{$password}')");
+		$this->assertEqual($db1->lastInsertId($table), 2);
+	}
+
+/**
+ * Tests that table lists and descriptions are scoped to the proper Postgres schema
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaScoping() {
+		$db1 =& ConnectionManager::getDataSource('test_suite');
+		$db1->cacheSources = false;
+		$db1->reconnect(array('persistent' => false));
+		$db1->query('CREATE SCHEMA _scope_test');
+
+		$db2 =& ConnectionManager::create(
+			'test_suite_2',
+			array_merge($db1->config, array('driver' => 'postgres', 'schema' => '_scope_test'))
+		);
+		$db2->cacheSources = false;
+
+		$db2->query('DROP SCHEMA _scope_test');
+	}
+
+/**
+ * Tests that column types without default lengths in $columns do not have length values
+ * applied when generating schemas.
+ *
+ * @access public
+ * @return void
+ */
+	function testColumnUseLength() {
+		$result = array('name' => 'foo', 'type' => 'string', 'length' => 100, 'default' => 'FOO');
+		$expected = '"foo" varchar(100) DEFAULT \'FOO\'';
+		$this->assertEqual($this->db->buildColumn($result), $expected);
+
+		$result = array('name' => 'foo', 'type' => 'text', 'length' => 100, 'default' => 'FOO');
+		$expected = '"foo" text DEFAULT \'FOO\'';
+		$this->assertEqual($this->db->buildColumn($result), $expected);
+	}
+
+/**
+ * Tests that binary data is escaped/unescaped properly on reads and writes
+ *
+ * @access public
+ * @return void
+ */
+	function testBinaryDataIntegrity() {
+		$data = '%PDF-1.3
+		%ƒÂÚÂÎßÛ†–ƒ∆
+		4 0 obj
+		<< /Length 5 0 R /Filter /FlateDecode >>
+		stream
+		x
µYMì€∆Ω„WÃ%)nï0¯îâ-«é]Q"πXµáÿ•Ip	-	P V,]Ú#c˚ˇ‰ut¥†�Ti9 Ü=�›Ø_˜4>à∑‚Épcé¢Pxæ®2q\'
+		1UªbUᡒ+ö«√[ıµ�ão"R∑"HiGæä€(å≠≈^Ãøsm?YlƒÃõª�‹âEÚB&‚Î◊7bÒ^¸m°÷˛?2±Øs“�u#®U√ˇú÷g¥C;ä")n})JºIÔ3ËSnÑÎ¥≤ıD∆¢∂Msx1üèG˚±Œ™�>¶ySïufØ �¸?UπÃã√6flÌÚC=øK?�…s
+		˛§¯ˇ:-˜ò7€ÓFæ∂∑Õ˛∆“V’>ılflëÅd«ÜQdI›ÎB%W¿ΩıÉn~h
vêCS>«é˛(ØôK!€¡zB!√
+		[œÜ"ûß ·iH¸[Àºæ∑¯¡L,ÀÚAlS∫ˆ=∫Œ≤cÄr&ˆÈ:√ÿ£˚È«4fl•À]vc›bÅôÿî=siXe4/¡p]ã]ôÆIœ™ Ωflà_ƒ‚G?«7	ùÿ ı¯K4ïIpV◊÷·\'éµóªÚæ>î
+		;›sú!2fl¬F•/f∑j£
+		dw"IÊÜπ<ôÿˆ%IG1ytÛDflXg|Éòa§˜}C˛¿ÿe°G´Ú±j�m~¿/∂hã<#-¥•ıùe87€t˜õ6w}´{æ
+		m‹ê–	∆¡ 6�\
+		rAÀBùZ3aË‚r$G·$ó0ÑüâUY4È™¡%C∑Ÿ2rc<Iõ-cï.
+		[ŒöâFA†É‡+QglMÉîÉÄúÌ
|¸»#x7¥«MgVÎ-GGÚ• I?�‘�Lzw∞pHů◊nefqCî.nÕeè∆ÿÛy¡
˙fb≤üŒHÜAëÕNq=´@	’cQdÖúAÉIqñŸ˘+2&�  Àù.gÅ‚ƒœ3EPƒOi—‰:>�Cäı
+		=Õec=ëR��eñ=<V$ì˙+x+¢ïÒÕ<àeWå»–˚∫Õd§&£àf ]fPA´âtënöå�◊ó„Ë@∆≠K´÷˘}a_CI˚©yòHg,ôSSVìBƒl4 L.ÈY…á,2∂íäÙ.$ó¸CäŸ*€óy
+		Ï€?G,_√·ÆÎç=^Vkvo±ó{§Æ’2»±¨Ã�üoȑD-ãé ï¬�ó¥cVÙ\'â„¢G~\'p¢%* ã˚÷
+		ªºnh˚ºO^�…®[Ó“‚ÅfıÌ≥∫F!Eœ(π∑T6`¬tΩÆ0ì»rTÎ`»Ñ«
+		]≈åp�)=¿Ô0∆öVÂmˇˆ„ø~¯�Ô�b*fc»‡Îı„Ú}∆tœs∂Y∫ÜaÆ˙X�~<ÿ·Ùvé1‹p¿TD∆ÔîÄ“úhˆ*Ú€îe)K–p¨ÚJ3Ÿ∞ã>ÊuNê
°“√Ü ‹Ê9iÙ0Ë™AAEÃ� Ë™`∂£\'ûce•åƒX›ŸÃ�´1SK{qdá"tÃ�[wQ#SµBe∞∑µó…ÃŒV`B"Ñ≥„!è_ÓÃ�†-º*ºú¿Ë0ˆeê∂´ë+HFj…‡zvHÓN|ÔL÷ûñ3õÃœ$z%sá…pÎóV38âs	Çoµ•ß3†<9B·¨û~¢3)ÂxóÿÃ�CÕòÆ∫Ã�=»ÿSÏ€S;∆~±êÆTEp∑óÈ÷ÀuìDHÈ$ÉõæÜjû§"≤ÃONM®RËíRr{õS	âˆ�Êâ„¢op±W;ÂUÔ P∫kÔˇflTæ∑óflËâ€�ÆC©Ô[≥◊HÃ�˚¨hê"ÆbF?ú%hË™ˇ4xèÕ(ó2ÙáíM])Ñd|=fë-cI0ñL¢kÖêk‰Rƒ«ıÄWñ8mO3âˆ�&√æËX¯Hó—ì]yF2»–˜ádàà‡‹Çο„≥7mªHAS∑¶.;Å’x(1} _kd©.ï¬�dç48M\'àáªCp^Krí<ɉXÓıïl!ÃŒ$N<ı∞B»G]…∂Ó¯>˛ÔbõÒπÀ•:ôO<j∂™œ%âÃ�—>@È$pÖu‹Ê´-QqV ?V≥JÆÃ�qÛX8(lπï@zgÖ}Fe<ˇ‡Sñ“ÿ˜ê?6‡L∫Oß~µ –?ËeäÚ®YîÕ=Ãœ=¢DÃ�u*GvBk;)L¬N«î:flö∂≠ÇΩq„Ñm하Ë∂‚"û≥§:±≤i^ΩÑ!)Wıyŧô á„RÄ÷Òôc’≠—sâ„¢rı‚Pdêãh˘ßHVç5ï¬�ï¬�ÈF€çÌÛuçÖ/M=gëµ±ÿGû1coÔuñæ‘z®. õ∑7ÉÃ�ÜÆ,°’H†Ã�ÉÌ∂7e	º® íˆ
â�„◊øNWKâ€�ÂYµ‚ñé;µ¶gV-fl>µtË¥áßN2 ¯¶BaP-)eW.àôt^âˆ�1›C∑Ö?L„&â€�5’4jvã–ªZ	÷+4% ´0l…»ú^°´© ûiÏ€∑é®óܱÒÿ‰ïˆÌ–dˆ◊Æ19rQ=Ã�|ı•rMæ¬;ò‰Y‰é9.â€�‹Ë�V«ã¯âˆ�,+ë®j*¡·/';
+
+		$model =& new AppModel(array('name' => 'BinaryTest', 'ds' => 'test_suite'));
+		$model->save(compact('data'));
+
+		$result = $model->find('first');
+		$this->assertEqual($result['BinaryTest']['data'], $data);
+	}
+
+/**
+ * Tests the syntax of generated schema indexes
+ *
+ * @access public
+ * @return void
+ */
+	function testSchemaIndexSyntax() {
+		$schema = new CakeSchema();
+		$schema->tables = array('i18n' => array(
+			'id' => array(
+			    'type' => 'integer', 'null' => false, 'default' => null,
+			    'length' => 10, 'key' => 'primary'
+			),
+			'locale' => array('type'=>'string', 'null' => false, 'length' => 6, 'key' => 'index'),
+			'model' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+			'foreign_key' => array(
+			    'type'=>'integer', 'null' => false, 'length' => 10, 'key' => 'index'
+			),
+			'field' => array('type'=>'string', 'null' => false, 'key' => 'index'),
+			'content' => array('type'=>'text', 'null' => true, 'default' => null),
+			'indexes' => array(
+			    'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			    'locale' => array('column' => 'locale', 'unique' => 0),
+			    'model' => array('column' => 'model', 'unique' => 0),
+			    'row_id' => array('column' => 'foreign_key', 'unique' => 0),
+			    'field' => array('column' => 'field', 'unique' => 0)
+			)
+		));
+
+		$result = $this->db->createSchema($schema);
+		$this->assertNoPattern('/^CREATE INDEX(.+);,$/', $result);
+	}
+
+/**
+ * testCakeSchema method
+ *
+ * Test that schema generated postgresql queries are valid. ref #5696
+ * Check that the create statement for a schema generated table is the same as the original sql
+ *
+ * @return void
+ * @access public
+ */
+	function testCakeSchema() {
+		$db1 =& ConnectionManager::getDataSource('test_suite');
+		$db1->cacheSources = false;
+		$db1->reconnect(array('persistent' => false));
+		$db1->query('CREATE TABLE ' .  $db1->fullTableName('datatype_tests') . ' (
+			id serial NOT NULL,
+			"varchar" character varying(40) NOT NULL,
+			"full_length" character varying NOT NULL,
+			"timestamp" timestamp without time zone,
+			date date,
+			CONSTRAINT test_suite_data_types_pkey PRIMARY KEY (id)
+		)');
+		$model = new Model(array('name' => 'DatatypeTest', 'ds' => 'test_suite'));
+		$schema = new CakeSchema(array('connection' => 'test_suite'));
+		$result = $schema->read(array(
+			'connection' => 'test_suite',
+		));
+		$schema->tables = array('datatype_tests' => $result['tables']['missing']['datatype_tests']);
+		$result = $db1->createSchema($schema, 'datatype_tests');
+
+		$this->assertNoPattern('/timestamp DEFAULT/', $result);
+		$this->assertPattern('/\"full_length\"\s*text\s.*,/', $result);
+		$this->assertPattern('/timestamp\s*,/', $result);
+
+		$db1->query('DROP TABLE ' . $db1->fullTableName('datatype_tests'));
+
+		$db1->query($result);
+		$result2 = $schema->read(array(
+			'connection' => 'test_suite',
+			'models' => array('DatatypeTest')
+		));
+		$schema->tables = array('datatype_tests' => $result2['tables']['missing']['datatype_tests']);
+		$result2 = $db1->createSchema($schema, 'datatype_tests');
+		$this->assertEqual($result, $result2);
+
+		$db1->query('DROP TABLE ' . $db1->fullTableName('datatype_tests'));
+	}
+
+/**
+ * Test index generation from table info.
+ *
+ * @return void
+ */
+	function testIndexGeneration() {
+		$name = $this->db->fullTableName('index_test', false);
+		$this->db->query('CREATE TABLE ' . $name . ' ("id" serial NOT NULL PRIMARY KEY, "bool" integer, "small_char" varchar(50), "description" varchar(40) )');
+		$this->db->query('CREATE INDEX pointless_bool ON ' . $name . '("bool")');
+		$this->db->query('CREATE UNIQUE INDEX char_index ON ' . $name . '("small_char")');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'char_index' => array('column' => 'small_char', 'unique' => 1),
+
+		);
+		$result = $this->db->index($name);
+		$this->assertEqual($expected, $result);
+
+		$this->db->query('DROP TABLE ' . $name);
+		$name = $this->db->fullTableName('index_test_2', false);
+		$this->db->query('CREATE TABLE ' . $name . ' ("id" serial NOT NULL PRIMARY KEY, "bool" integer, "small_char" varchar(50), "description" varchar(40) )');
+		$this->db->query('CREATE UNIQUE INDEX multi_col ON ' . $name . '("small_char", "bool")');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'multi_col' => array('column' => array('small_char', 'bool'), 'unique' => 1),
+		);
+		$result = $this->db->index($name);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+	}
+
+/**
+ * Test the alterSchema capabilities of postgres
+ *
+ * @access public
+ * @return void
+ */
+	function testAlterSchema() {
+		$Old =& new CakeSchema(array(
+			'connection' => 'test_suite',
+			'name' => 'AlterPosts',
+			'alter_posts' => array(
+				'id' => array('type' => 'integer', 'key' => 'primary'),
+				'author_id' => array('type' => 'integer', 'null' => false),
+				'title' => array('type' => 'string', 'null' => true),
+				'body' => array('type' => 'text'),
+				'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+				'created' => array('type' => 'datetime'),
+				'updated' => array('type' => 'datetime'),
+			)
+		));
+		$this->db->query($this->db->createSchema($Old));
+
+		$New =& new CakeSchema(array(
+			'connection' => 'test_suite',
+			'name' => 'AlterPosts',
+			'alter_posts' => array(
+				'id' => array('type' => 'integer', 'key' => 'primary'),
+				'author_id' => array('type' => 'integer', 'null' => true),
+				'title' => array('type' => 'string', 'null' => false, 'default' => 'my title'),
+				'body' => array('type' => 'string', 'length' => 500),
+				'status' => array('type' => 'integer', 'length' => 3, 'default' => 1),
+				'created' => array('type' => 'datetime'),
+				'updated' => array('type' => 'datetime'),
+			)
+		));
+		$this->db->query($this->db->alterSchema($New->compare($Old), 'alter_posts'));
+
+		$model = new CakeTestModel(array('table' => 'alter_posts', 'ds' => 'test_suite'));
+		$result = $model->schema();
+		$this->assertTrue(isset($result['status']));
+		$this->assertFalse(isset($result['published']));
+		$this->assertEqual($result['body']['type'], 'string');
+		$this->assertEqual($result['status']['default'], 1);
+		$this->assertEqual($result['author_id']['null'], true);
+		$this->assertEqual($result['title']['null'], false);
+
+		$this->db->query($this->db->dropSchema($New));
+	}
+
+/**
+ * Test the alter index capabilities of postgres
+ *
+ * @access public
+ * @return void
+ */
+	function testAlterIndexes() {
+		$this->db->cacheSources = false;
+
+		$schema1 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true)
+			)
+		));
+		$this->db->query($this->db->createSchema($schema1));
+
+		$schema2 =& new CakeSchema(array(
+			'name' => 'AlterTest2',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true),
+				'indexes' => array(
+					'name_idx' => array('column' => 'name', 'unique' => 0),
+					'group_idx' => array('column' => 'group1', 'unique' => 0),
+					'compound_idx' => array('column' => array('group1', 'group2'), 'unique' => 0),
+					'PRIMARY' => array('column' => 'id', 'unique' => 1)
+				)
+			)
+		));
+		$this->db->query($this->db->alterSchema($schema2->compare($schema1)));
+
+		$indexes = $this->db->index('altertest');
+		$this->assertEqual($schema2->tables['altertest']['indexes'], $indexes);
+
+		// Change three indexes, delete one and add another one
+		$schema3 =& new CakeSchema(array(
+			'name' => 'AlterTest3',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+				'group1' => array('type' => 'integer', 'null' => true),
+				'group2' => array('type' => 'integer', 'null' => true),
+				'indexes' => array(
+					'name_idx' => array('column' => 'name', 'unique' => 1),
+					'group_idx' => array('column' => 'group2', 'unique' => 0),
+					'compound_idx' => array('column' => array('group2', 'group1'), 'unique' => 0),
+					'another_idx' => array('column' => array('group1', 'name'), 'unique' => 0))
+		)));
+
+		$this->db->query($this->db->alterSchema($schema3->compare($schema2)));
+
+		$indexes = $this->db->index('altertest');
+		$this->assertEqual($schema3->tables['altertest']['indexes'], $indexes);
+
+		// Compare us to ourself.
+		$this->assertEqual($schema3->compare($schema3), array());
+
+		// Drop the indexes
+		$this->db->query($this->db->alterSchema($schema1->compare($schema3)));
+
+		$indexes = $this->db->index('altertest');
+		$this->assertEqual(array(), $indexes);
+
+		$this->db->query($this->db->dropSchema($schema1));
+	}
+
+/*
+ * Test it is possible to use virtual field with postgresql
+ *
+ * @access public
+ * @return void
+ */
+	function testVirtualFields() {
+		$this->loadFixtures('Article', 'Comment');
+		$Article = new Article;
+		$Article->virtualFields = array(
+			'next_id' => 'Article.id + 1',
+			'complex' => 'Article.title || Article.body',
+			'functional' => 'COALESCE(User.user, Article.title)',
+			'subquery' => 'SELECT count(*) FROM ' . $Article->Comment->table
+		);
+		$result = $Article->find('first');
+		$this->assertEqual($result['Article']['next_id'], 2);
+		$this->assertEqual($result['Article']['complex'], $result['Article']['title'] . $result['Article']['body']);
+		$this->assertEqual($result['Article']['functional'], $result['Article']['title']);
+		$this->assertEqual($result['Article']['subquery'], 6);
+	}
+
+/**
+ * Tests additional order options for postgres
+ *
+ * @access public
+ * @return void
+ */
+	function testOrderAdditionalParams() {
+		$result = $this->db->order(array('title' => 'DESC NULLS FIRST', 'body' => 'DESC'));
+		$expected = ' ORDER BY "title" DESC NULLS FIRST, "body" DESC';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+* Test it is possible to do a SELECT COUNT(DISTINCT Model.field) query in postgres and it gets correctly quoted
+*/
+	function testQuoteDistinctInFunction() {
+		$this->loadFixtures('Article');
+		$Article = new Article;
+		$result = $this->db->fields($Article, null, array('COUNT(DISTINCT Article.id)'));
+		$expected = array('COUNT(DISTINCT "Article"."id")');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->fields($Article, null, array('COUNT(DISTINCT id)'));
+		$expected = array('COUNT(DISTINCT "id")');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->fields($Article, null, array('COUNT(DISTINCT FUNC(id))'));
+		$expected = array('COUNT(DISTINCT FUNC("id"))');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that saveAll works even with conditions that lack a model name.
+ *
+ * @return void
+ */
+	function testUpdateAllWithNonQualifiedConditions() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$result = $Article->updateAll(array('title' => "'Awesome'"), array('title' => 'Third Article'));
+		$this->assertTrue($result);
+
+		$result = $Article->find('count', array(
+			'conditions' => array('Article.title' => 'Awesome')
+		));
+		$this->assertEqual($result, 1, 'Article count is wrong or fixture has changed.');
+	}
+
+/**
+ * test alterSchema on two tables.
+ *
+ * @return void
+ */
+	function testAlteringTwoTables() {
+		$schema1 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+			),
+			'other_table' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'name' => array('type' => 'string', 'null' => false, 'length' => 50),
+			)
+		));
+		$schema2 =& new CakeSchema(array(
+			'name' => 'AlterTest1',
+			'connection' => 'test_suite',
+			'altertest' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'field_two' => array('type' => 'string', 'null' => false, 'length' => 50),
+			),
+			'other_table' => array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => 0),
+				'field_two' => array('type' => 'string', 'null' => false, 'length' => 50),
+			)
+		));
+		$result = $this->db->alterSchema($schema2->compare($schema1));
+		$this->assertEqual(2, substr_count($result, 'field_two'), 'Too many fields');
+		$this->assertFalse(strpos(';ALTER', $result), 'Too many semi colons');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
new file mode 100644
index 000000000..cd5886e0e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo/dbo_sqlite.test.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * DboSqliteTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs
+ * @since         CakePHP(tm) v 1.2.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', array('Model', 'DataSource', 'DboSource', 'DboSqlite'));
+
+/**
+ * DboSqliteTestDb class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class DboSqliteTestDb extends DboSqlite {
+
+/**
+ * simulated property
+ *
+ * @var array
+ * @access public
+ */
+	var $simulated = array();
+
+/**
+ * execute method
+ *
+ * @param mixed $sql
+ * @access protected
+ * @return void
+ */
+	function _execute($sql) {
+		$this->simulated[] = $sql;
+		return null;
+	}
+
+/**
+ * getLastQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function getLastQuery() {
+		return $this->simulated[count($this->simulated) - 1];
+	}
+}
+
+/**
+ * DboSqliteTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources.dbo
+ */
+class DboSqliteTest extends CakeTestCase {
+
+/**
+ * Do not automatically load fixtures for each test, they will be loaded manually using CakeTestCase::loadFixtures
+ *
+ * @var boolean
+ * @access public
+ */
+	var $autoFixtures = false;
+
+/**
+ * Fixtures
+ *
+ * @var object
+ * @access public
+ */
+	var $fixtures = array('core.user');
+
+/**
+ * Actual DB connection used in testing
+ *
+ * @var DboSource
+ * @access public
+ */
+	var $db = null;
+
+/**
+ * Simulated DB connection used in testing
+ *
+ * @var DboSource
+ * @access public
+ */
+	var $db2 = null;
+
+/**
+ * Skip if cannot connect to SQLite
+ *
+ * @access public
+ */
+	function skip() {
+		$this->_initDb();
+		$this->skipUnless($this->db->config['driver'] == 'sqlite', '%s SQLite connection not available');
+	}
+
+/**
+ * Set up test suite database connection
+ *
+ * @access public
+ */
+	function startTest() {
+		$this->_initDb();
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function setUp() {
+		Configure::write('Cache.disable', true);
+		$this->startTest();
+		$this->db =& ConnectionManager::getDataSource('test_suite');
+		$this->db2 = new DboSqliteTestDb($this->db->config, false);
+	}
+
+/**
+ * Sets up a Dbo class instance for testing
+ *
+ * @access public
+ */
+	function tearDown() {
+		Configure::write('Cache.disable', false);
+		unset($this->db2);
+	}
+
+/**
+ * Tests that SELECT queries from DboSqlite::listSources() are not cached
+ *
+ * @access public
+ */
+	function testTableListCacheDisabling() {
+		$this->assertFalse(in_array('foo_test', $this->db->listSources()));
+
+		$this->db->query('CREATE TABLE foo_test (test VARCHAR(255));');
+		$this->assertTrue(in_array('foo_test', $this->db->listSources()));
+
+		$this->db->query('DROP TABLE foo_test;');
+		$this->assertFalse(in_array('foo_test', $this->db->listSources()));
+	}
+
+/**
+ * test Index introspection.
+ *
+ * @access public
+ * @return void
+ */
+	function testIndex() {
+		$name = $this->db->fullTableName('with_a_key');
+		$this->db->query('CREATE TABLE ' . $name . ' ("id" int(11) PRIMARY KEY, "bool" int(1), "small_char" varchar(50), "description" varchar(40) );');
+		$this->db->query('CREATE INDEX pointless_bool ON ' . $name . '("bool")');
+		$this->db->query('CREATE UNIQUE INDEX char_index ON ' . $name . '("small_char")');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'pointless_bool' => array('column' => 'bool', 'unique' => 0),
+			'char_index' => array('column' => 'small_char', 'unique' => 1),
+
+		);
+		$result = $this->db->index($name);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+
+		$this->db->query('CREATE TABLE ' . $name . ' ("id" int(11) PRIMARY KEY, "bool" int(1), "small_char" varchar(50), "description" varchar(40) );');
+		$this->db->query('CREATE UNIQUE INDEX multi_col ON ' . $name . '("small_char", "bool")');
+		$expected = array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'multi_col' => array('column' => array('small_char', 'bool'), 'unique' => 1),
+		);
+		$result = $this->db->index($name);
+		$this->assertEqual($expected, $result);
+		$this->db->query('DROP TABLE ' . $name);
+	}
+
+/**
+ * Tests that cached table descriptions are saved under the sanitized key name
+ *
+ * @access public
+ */
+	function testCacheKeyName() {
+		Configure::write('Cache.disable', false);
+
+		$dbName = 'db' . rand() . '$(*%&).db';
+		$this->assertFalse(file_exists(TMP . $dbName));
+
+		$config = $this->db->config;
+		$db = new DboSqlite(array_merge($this->db->config, array('database' => TMP . $dbName)));
+		$this->assertTrue(file_exists(TMP . $dbName));
+
+		$db->execute("CREATE TABLE test_list (id VARCHAR(255));");
+
+		$db->cacheSources = true;
+		$this->assertEqual($db->listSources(), array('test_list'));
+		$db->cacheSources = false;
+
+		$fileName = '_' . preg_replace('/[^A-Za-z0-9_\-+]/', '_', TMP . $dbName) . '_list';
+
+		$result = Cache::read($fileName, '_cake_model_');
+		$this->assertEqual($result, array('test_list'));
+
+		Cache::delete($fileName, '_cake_model_');
+		Configure::write('Cache.disable', true);
+	}
+
+/**
+ * test building columns with SQLite
+ *
+ * @return void
+ */
+	function testBuildColumn() {
+		$data = array(
+			'name' => 'int_field',
+			'type' => 'integer',
+			'null' => false,
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '"int_field" integer(11) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'name',
+			'type' => 'string',
+			'length' => 20,
+			'null' => false,
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '"name" varchar(20) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'testName',
+			'type' => 'string',
+			'length' => 20,
+			'default' => null,
+			'null' => true,
+			'collate' => 'NOCASE'
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '"testName" varchar(20) DEFAULT NULL COLLATE NOCASE';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'testName',
+			'type' => 'string',
+			'length' => 20,
+			'default' => 'test-value',
+			'null' => false,
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '"testName" varchar(20) DEFAULT \'test-value\' NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'testName',
+			'type' => 'integer',
+			'length' => 10,
+			'default' => 10,
+			'null' => false,
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '"testName" integer(10) DEFAULT \'10\' NOT NULL';
+		$this->assertEqual($result, $expected);
+		
+		$data = array(
+			'name' => 'testName',
+			'type' => 'integer',
+			'length' => 10,
+			'default' => 10,
+			'null' => false,
+			'collate' => 'BADVALUE'
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '"testName" integer(10) DEFAULT \'10\' NOT NULL';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test describe() and normal results.
+ *
+ * @return void
+ */
+	function testDescribe() {
+		$Model =& new Model(array('name' => 'User', 'ds' => 'test_suite', 'table' => 'users'));
+		$result = $this->db->describe($Model);
+		$expected = array(
+			'id' => array(
+				'type' => 'integer',
+				'key' => 'primary',
+				'null' => false,
+				'default' => null,
+				'length' => 11
+			),
+			'user' => array(
+				'type' => 'string',
+				'length' => 255,
+				'null' => false,
+				'default' => null
+			),
+			'password' => array(
+				'type' => 'string',
+				'length' => 255,
+				'null' => false,
+				'default' => null
+			),
+			'created' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null,
+			),
+			'updated' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null,
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that describe does not corrupt UUID primary keys
+ *
+ * @return void
+ */
+	function testDescribeWithUuidPrimaryKey() {
+		$tableName = 'uuid_tests';
+		$this->db->query("CREATE TABLE {$tableName} (id VARCHAR(36) PRIMARY KEY, name VARCHAR, created DATETIME, modified DATETIME)");
+		$Model =& new Model(array('name' => 'UuidTest', 'ds' => 'test_suite', 'table' => 'uuid_tests'));
+		$result = $this->db->describe($Model);
+		$expected = array(
+			'type' => 'string',
+			'length' => 36,
+			'null' => false,
+			'default' => null,
+			'key' => 'primary',
+		);
+		$this->assertEqual($result['id'], $expected);
+		$this->db->query('DROP TABLE ' . $tableName);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php
new file mode 100644
index 000000000..1e913ccef
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/datasources/dbo_source.test.php
@@ -0,0 +1,4616 @@
+<?php
+/**
+ * DboSourceTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *	Licensed under The Open Group Test Suite License
+ *	Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import('Model', array('Model', 'DataSource', 'DboSource', 'DboMysql', 'App'));
+require_once dirname(dirname(__FILE__)) . DS . 'models.php';
+
+/**
+ * TestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel'
+ * @access public
+ */
+	var $name = 'TestModel';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'client_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '11'),
+		'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'login' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'passwd' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+		'addr_1' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+		'addr_2' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '25'),
+		'zip_code' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'city' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'country' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'phone' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'fax' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'url' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '255'),
+		'email' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'comments' => array('type' => 'text', 'null' => '1', 'default' => '', 'length' => '155'),
+		'last_login' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => ''),
+		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+
+/**
+ * find method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function find($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return array($conditions, $fields);
+	}
+
+/**
+ * findAll method
+ *
+ * @param mixed $conditions
+ * @param mixed $fields
+ * @param mixed $order
+ * @param mixed $recursive
+ * @access public
+ * @return void
+ */
+	function findAll($conditions = null, $fields = null, $order = null, $recursive = null) {
+		return $conditions;
+	}
+}
+
+/**
+ * TestModel2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel2'
+ * @access public
+ */
+	var $name = 'TestModel2';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+}
+
+/**
+ * TestModel4 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel3 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel3'
+ * @access public
+ */
+	var $name = 'TestModel3';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+}
+
+/**
+ * TestModel4 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel4 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel4'
+ * @access public
+ */
+	var $name = 'TestModel4';
+
+/**
+ * table property
+ *
+ * @var string 'test_model4'
+ * @access public
+ */
+	var $table = 'test_model4';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'TestModel4Parent' => array(
+			'className' => 'TestModel4',
+			'foreignKey' => 'parent_id'
+		)
+	);
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array(
+		'TestModel5' => array(
+			'className' => 'TestModel5',
+			'foreignKey' => 'test_model4_id'
+		)
+	);
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('TestModel7' => array(
+		'className' => 'TestModel7',
+		'joinTable' => 'test_model4_test_model7',
+		'foreignKey' => 'test_model4_id',
+		'associationForeignKey' => 'test_model7_id',
+		'with' => 'TestModel4TestModel7'
+	));
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+				'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+				'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * TestModel4TestModel7 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel4TestModel7 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel4TestModel7'
+ * @access public
+ */
+	var $name = 'TestModel4TestModel7';
+
+/**
+ * table property
+ *
+ * @var string 'test_model4_test_model7'
+ * @access public
+ */
+	var $table = 'test_model4_test_model7';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'test_model4_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'test_model7_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8')
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * TestModel5 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel5 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel5'
+ * @access public
+ */
+	var $name = 'TestModel5';
+
+/**
+ * table property
+ *
+ * @var string 'test_model5'
+ * @access public
+ */
+	var $table = 'test_model5';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('TestModel4' => array(
+		'className' => 'TestModel4',
+		'foreignKey' => 'test_model4_id'
+	));
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('TestModel6' => array(
+		'className' => 'TestModel6',
+		'foreignKey' => 'test_model5_id'
+	));
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'test_model4_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+				'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+				'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * TestModel6 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel6 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel6'
+ * @access public
+ */
+	var $name = 'TestModel6';
+
+/**
+ * table property
+ *
+ * @var string 'test_model6'
+ * @access public
+ */
+	var $table = 'test_model6';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('TestModel5' => array(
+		'className' => 'TestModel5',
+		'foreignKey' => 'test_model5_id'
+	));
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'test_model5_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+				'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+				'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * TestModel7 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel7 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel7'
+ * @access public
+ */
+	var $name = 'TestModel7';
+
+/**
+ * table property
+ *
+ * @var string 'test_model7'
+ * @access public
+ */
+	var $table = 'test_model7';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+				'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+				'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * TestModel8 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel8 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel8'
+ * @access public
+ */
+	var $name = 'TestModel8';
+
+/**
+ * table property
+ *
+ * @var string 'test_model8'
+ * @access public
+ */
+	var $table = 'test_model8';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array(
+		'TestModel9' => array(
+			'className' => 'TestModel9',
+			'foreignKey' => 'test_model8_id',
+			'conditions' => 'TestModel9.name != \'mariano\''
+		)
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'test_model9_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+				'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+				'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * TestModel9 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class TestModel9 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestModel9'
+ * @access public
+ */
+	var $name = 'TestModel9';
+
+/**
+ * table property
+ *
+ * @var string 'test_model9'
+ * @access public
+ */
+	var $table = 'test_model9';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('TestModel8' => array(
+		'className' => 'TestModel8',
+		'foreignKey' => 'test_model8_id',
+		'conditions' => 'TestModel8.name != \'larry\''
+	));
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+				'test_model8_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '11'),
+				'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+				'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+				'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * Level class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class Level extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Level'
+ * @access public
+ */
+	var $name = 'Level';
+
+/**
+ * table property
+ *
+ * @var string 'level'
+ * @access public
+ */
+	var $table = 'level';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'Group'=> array(
+			'className' => 'Group'
+		),
+		'User2' => array(
+			'className' => 'User2'
+		)
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => '20'),
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * Group class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class Group extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Group'
+ * @access public
+ */
+	var $name = 'Group';
+
+/**
+ * table property
+ *
+ * @var string 'group'
+ * @access public
+ */
+	var $table = 'group';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Level');
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Category2', 'User2');
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'level_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => '20'),
+			);
+		}
+		return $this->_schema;
+	}
+
+}
+
+/**
+ * User2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class User2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'User2'
+ * @access public
+ */
+	var $name = 'User2';
+
+/**
+ * table property
+ *
+ * @var string 'user'
+ * @access public
+ */
+	var $table = 'user';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'Group' => array(
+			'className' => 'Group'
+		),
+		'Level' => array(
+			'className' => 'Level'
+		)
+	);
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'Article2' => array(
+			'className' => 'Article2'
+		),
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'group_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'level_id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => '20'),
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * Category2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class Category2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Category2'
+ * @access public
+ */
+	var $name = 'Category2';
+
+/**
+ * table property
+ *
+ * @var string 'category'
+ * @access public
+ */
+	var $table = 'category';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'Group' => array(
+			'className' => 'Group',
+			'foreignKey' => 'group_id'
+		),
+		'ParentCat' => array(
+			'className' => 'Category2',
+			'foreignKey' => 'parent_id'
+		)
+	);
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'ChildCat' => array(
+			'className' => 'Category2',
+			'foreignKey' => 'parent_id'
+		),
+		'Article2' => array(
+			'className' => 'Article2',
+			'order'=>'Article2.published_date DESC',
+			'foreignKey' => 'category_id',
+			'limit'=>'3')
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
+				'group_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
+				'parent_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
+				'name' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+				'icon' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+				'description' => array('type' => 'text', 'null' => false, 'default' => '', 'length' => null),
+
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * Article2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class Article2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Article2'
+ * @access public
+ */
+	var $name = 'Article2';
+
+/**
+ * table property
+ *
+ * @var string 'article'
+ * @access public
+ */
+	var $table = 'article';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'Category2' => array('className' => 'Category2'),
+		'User2' => array('className' => 'User2')
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
+				'category_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'user_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'rate_count' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'rate_sum' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'viewed' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'version' => array('type' => 'string', 'null' => true, 'default' => '', 'length' => '45'),
+				'title' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '200'),
+				'intro' => array('text' => 'string', 'null' => true, 'default' => '', 'length' => null),
+				'comments' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '4'),
+				'body' => array('text' => 'string', 'null' => true, 'default' => '', 'length' => null),
+				'isdraft' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'length' => '1'),
+				'allow_comments' => array('type' => 'boolean', 'null' => false, 'default' => '1', 'length' => '1'),
+				'moderate_comments' => array('type' => 'boolean', 'null' => false, 'default' => '1', 'length' => '1'),
+				'published' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'length' => '1'),
+				'multipage' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'length' => '1'),
+				'published_date' => array('type' => 'datetime', 'null' => true, 'default' => '', 'length' => null),
+				'created' => array('type' => 'datetime', 'null' => false, 'default' => '0000-00-00 00:00:00', 'length' => null),
+				'modified' => array('type' => 'datetime', 'null' => false, 'default' => '0000-00-00 00:00:00', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * CategoryFeatured2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class CategoryFeatured2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'CategoryFeatured2'
+ * @access public
+ */
+	var $name = 'CategoryFeatured2';
+
+/**
+ * table property
+ *
+ * @var string 'category_featured'
+ * @access public
+ */
+	var $table = 'category_featured';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
+				'parent_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '10'),
+				'name' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+				'icon' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+				'description' => array('text' => 'string', 'null' => false, 'default' => '', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * Featured2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class Featured2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Featured2'
+ * @access public
+ */
+	var $name = 'Featured2';
+
+/**
+ * table property
+ *
+ * @var string 'featured2'
+ * @access public
+ */
+	var $table = 'featured2';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'CategoryFeatured2' => array(
+			'className' => 'CategoryFeatured2'
+		)
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'article_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'category_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => '20')
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * Comment2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class Comment2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Comment2'
+ * @access public
+ */
+	var $name = 'Comment2';
+
+/**
+ * table property
+ *
+ * @var string 'comment'
+ * @access public
+ */
+	var $table = 'comment';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('ArticleFeatured2', 'User2');
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'article_featured_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'user_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'name' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => '20')
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * ArticleFeatured2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class ArticleFeatured2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ArticleFeatured2'
+ * @access public
+ */
+	var $name = 'ArticleFeatured2';
+
+/**
+ * table property
+ *
+ * @var string 'article_featured'
+ * @access public
+ */
+	var $table = 'article_featured';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'CategoryFeatured2' => array('className' => 'CategoryFeatured2'),
+		'User2' => array('className' => 'User2')
+	);
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array(
+		'Featured2' => array('className' => 'Featured2')
+	);
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'Comment2' => array('className'=>'Comment2', 'dependent' => true)
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		if (!isset($this->_schema)) {
+			$this->_schema = array(
+				'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => '10'),
+				'category_featured_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'user_id' => array('type' => 'integer', 'null' => false, 'default' => '0', 'length' => '10'),
+				'title' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => '20'),
+				'body' => array('text' => 'string', 'null' => true, 'default' => '', 'length' => null),
+				'published' => array('type' => 'boolean', 'null' => false, 'default' => '0', 'length' => '1'),
+				'published_date' => array('type' => 'datetime', 'null' => true, 'default' => '', 'length' => null),
+				'created' => array('type' => 'datetime', 'null' => false, 'default' => '0000-00-00 00:00:00', 'length' => null),
+				'modified' => array('type' => 'datetime', 'null' => false, 'default' => '0000-00-00 00:00:00', 'length' => null)
+			);
+		}
+		return $this->_schema;
+	}
+}
+
+/**
+ * DboSourceTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.datasources
+ */
+class DboSourceTest extends CakeTestCase {
+
+/**
+ * debug property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $debug = null;
+
+/**
+ * autoFixtures property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $autoFixtures = false;
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(
+		'core.apple', 'core.article', 'core.articles_tag', 'core.attachment', 'core.comment',
+		'core.sample', 'core.tag', 'core.user', 'core.post', 'core.author', 'core.data_test'
+	);
+
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->__config = $this->db->config;
+
+		if (!class_exists('DboTest')) {
+			$db = ConnectionManager::getDataSource('test_suite');
+			$class = get_class($db);
+			eval("class DboTest extends $class {
+				var \$simulated = array();
+
+/**
+ * execute method
+ *
+ * @param \$sql
+ * @access protected
+ * @return void
+ */
+				function _execute(\$sql) {
+					\$this->simulated[] = \$sql;
+					return null;
+				}
+
+/**
+ * getLastQuery method
+ *
+ * @access public
+ * @return void
+ */
+				function getLastQuery() {
+					return \$this->simulated[count(\$this->simulated) - 1];
+				}
+			}");
+		}
+
+		$this->testDb =& new DboTest($this->__config);
+		$this->testDb->cacheSources = false;
+		$this->testDb->startQuote = '`';
+		$this->testDb->endQuote = '`';
+		Configure::write('debug', 1);
+		$this->debug = Configure::read('debug');
+		$this->Model =& new TestModel();
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->Model);
+		Configure::write('debug', $this->debug);
+		ClassRegistry::flush();
+		unset($this->debug);
+	}
+
+/**
+ * testFieldDoubleEscaping method
+ *
+ * @access public
+ * @return void
+ */
+	function testFieldDoubleEscaping() {
+		$config = array_merge($this->__config, array('driver' => 'test'));
+		$test =& ConnectionManager::create('quoteTest', $config);
+		$test->simulated = array();
+
+		$this->Model =& new Article2(array('alias' => 'Article', 'ds' => 'quoteTest'));
+		$this->Model->setDataSource('quoteTest');
+
+		$this->assertEqual($this->Model->escapeField(), '`Article`.`id`');
+		$result = $test->fields($this->Model, null, $this->Model->escapeField());
+		$this->assertEqual($result, array('`Article`.`id`'));
+
+		$result = $test->read($this->Model, array(
+			'fields' => $this->Model->escapeField(),
+			'conditions' => null,
+			'recursive' => -1
+		));
+		$this->assertEqual(trim($test->simulated[0]), 'SELECT `Article`.`id` FROM `' . $this->testDb->fullTableName('article', false) . '` AS `Article`   WHERE 1 = 1');
+
+		$test->startQuote = '[';
+		$test->endQuote = ']';
+		$this->assertEqual($this->Model->escapeField(), '[Article].[id]');
+
+		$result = $test->fields($this->Model, null, $this->Model->escapeField());
+		$this->assertEqual($result, array('[Article].[id]'));
+
+		$result = $test->read($this->Model, array(
+			'fields' => $this->Model->escapeField(),
+			'conditions' => null,
+			'recursive' => -1
+		));
+		$this->assertEqual(trim($test->simulated[1]), 'SELECT [Article].[id] FROM [' . $this->testDb->fullTableName('article', false) . '] AS [Article]   WHERE 1 = 1');
+
+		ClassRegistry::removeObject('Article');
+	}
+
+/**
+ * testGenerateAssociationQuerySelfJoin method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQuerySelfJoin() {
+		$this->startTime = microtime(true);
+		$this->Model =& new Article2();
+		$this->_buildRelatedModels($this->Model);
+		$this->_buildRelatedModels($this->Model->Category2);
+		$this->Model->Category2->ChildCat =& new Category2();
+		$this->Model->Category2->ParentCat =& new Category2();
+
+		$queryData = array();
+
+		foreach ($this->Model->Category2->__associations as $type) {
+			foreach ($this->Model->Category2->{$type} as $assoc => $assocData) {
+				$linkModel =& $this->Model->Category2->{$assoc};
+				$external = isset($assocData['external']);
+
+				if ($this->Model->Category2->alias == $linkModel->alias && $type != 'hasAndBelongsToMany' && $type != 'hasMany') {
+					$result = $this->testDb->generateAssociationQuery($this->Model->Category2, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null);
+					$this->assertTrue($result);
+				} else {
+					if ($this->Model->Category2->useDbConfig == $linkModel->useDbConfig) {
+						$result = $this->testDb->generateAssociationQuery($this->Model->Category2, $linkModel, $type, $assoc, $assocData, $queryData, $external, $null);
+						$this->assertTrue($result);
+					}
+				}
+			}
+		}
+
+		$query = $this->testDb->generateAssociationQuery($this->Model->Category2, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+(.+)FROM(.+)`Category2`\.`group_id`\s+=\s+`Group`\.`id`\)\s+LEFT JOIN(.+)WHERE\s+1 = 1\s*$/', $query);
+
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'belongsTo', 'model' => 'TestModel4Parent');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$_queryData = $queryData;
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$expected = array(
+			'fields' => array(
+				'`TestModel4`.`id`',
+				'`TestModel4`.`name`',
+				'`TestModel4`.`created`',
+				'`TestModel4`.`updated`',
+				'`TestModel4Parent`.`id`',
+				'`TestModel4Parent`.`name`',
+				'`TestModel4Parent`.`created`',
+				'`TestModel4Parent`.`updated`'
+			),
+			'joins' => array(
+				array(
+					'table' => '`test_model4`',
+					'alias' => 'TestModel4Parent',
+					'type' => 'LEFT',
+					'conditions' => '`TestModel4`.`parent_id` = `TestModel4Parent`.`id`'
+				)
+			),
+			'limit' => array(),
+			'offset' => array(),
+			'conditions' => array(),
+			'order' => array(),
+			'group' => null
+		);
+		$this->assertEqual($queryData, $expected);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`, `TestModel4Parent`\.`id`, `TestModel4Parent`\.`name`, `TestModel4Parent`\.`created`, `TestModel4Parent`\.`updated`\s+/', $result);
+		$this->assertPattern('/FROM\s+`test_model4` AS `TestModel4`\s+LEFT JOIN\s+`test_model4` AS `TestModel4Parent`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel4`.`parent_id` = `TestModel4Parent`.`id`\)\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+1 = 1\s+$/', $result);
+
+		$params['assocData']['type'] = 'INNER';
+		$this->Model->belongsTo['TestModel4Parent']['type'] = 'INNER';
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $_queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+		$this->assertEqual($_queryData['joins'][0]['type'], 'INNER');
+	}
+
+/**
+ * testGenerateInnerJoinAssociationQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateInnerJoinAssociationQuery() {
+		$this->Model =& new TestModel9();
+		$test =& ConnectionManager::create('test2', $this->__config);
+		$this->Model->setDataSource('test2');
+		$this->Model->TestModel8 =& new TestModel8();
+		$this->Model->TestModel8->setDataSource('test2');
+
+		$this->testDb->read($this->Model, array('recursive' => 1));
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/`TestModel9` LEFT JOIN `' . $this->testDb->fullTableName('test_model8', false) . '`/', $result);
+
+		$this->Model->belongsTo['TestModel8']['type'] = 'INNER';
+		$this->testDb->read($this->Model, array('recursive' => 1));
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/`TestModel9` INNER JOIN `' . $this->testDb->fullTableName('test_model8', false) . '`/', $result);
+
+	}
+
+/**
+ * testGenerateAssociationQuerySelfJoinWithConditionsInHasOneBinding method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQuerySelfJoinWithConditionsInHasOneBinding() {
+		$this->Model =& new TestModel8();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasOne', 'model' => 'TestModel9');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+		$_queryData = $queryData;
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel8`\.`id`, `TestModel8`\.`test_model9_id`, `TestModel8`\.`name`, `TestModel8`\.`created`, `TestModel8`\.`updated`, `TestModel9`\.`id`, `TestModel9`\.`test_model8_id`, `TestModel9`\.`name`, `TestModel9`\.`created`, `TestModel9`\.`updated`\s+/', $result);
+		$this->assertPattern('/FROM\s+`test_model8` AS `TestModel8`\s+LEFT JOIN\s+`test_model9` AS `TestModel9`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel9`\.`name` != \'mariano\'\s+AND\s+`TestModel9`.`test_model8_id` = `TestModel8`.`id`\)\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQuerySelfJoinWithConditionsInBelongsToBinding method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQuerySelfJoinWithConditionsInBelongsToBinding() {
+		$this->Model =& new TestModel9();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'belongsTo', 'model' => 'TestModel8');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel9`\.`id`, `TestModel9`\.`test_model8_id`, `TestModel9`\.`name`, `TestModel9`\.`created`, `TestModel9`\.`updated`, `TestModel8`\.`id`, `TestModel8`\.`test_model9_id`, `TestModel8`\.`name`, `TestModel8`\.`created`, `TestModel8`\.`updated`\s+/', $result);
+		$this->assertPattern('/FROM\s+`test_model9` AS `TestModel9`\s+LEFT JOIN\s+`test_model8` AS `TestModel8`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel8`\.`name` != \'larry\'\s+AND\s+`TestModel9`.`test_model8_id` = `TestModel8`.`id`\)\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQuerySelfJoinWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQuerySelfJoinWithConditions() {
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'belongsTo', 'model' => 'TestModel4Parent');
+		$queryData = array('conditions' => array('TestModel4Parent.name !=' => 'mariano'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`, `TestModel4Parent`\.`id`, `TestModel4Parent`\.`name`, `TestModel4Parent`\.`created`, `TestModel4Parent`\.`updated`\s+/', $result);
+		$this->assertPattern('/FROM\s+`test_model4` AS `TestModel4`\s+LEFT JOIN\s+`test_model4` AS `TestModel4Parent`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel4`.`parent_id` = `TestModel4Parent`.`id`\)\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?`TestModel4Parent`.`name`\s+!=\s+\'mariano\'(?:\))?\s*$/', $result);
+
+		$this->Featured2 =& new Featured2();
+		$this->Featured2->schema();
+
+		$this->Featured2->bindModel(array(
+			'belongsTo' => array(
+				'ArticleFeatured2' => array(
+					'conditions' => 'ArticleFeatured2.published = \'Y\'',
+					'fields' => 'id, title, user_id, published'
+				)
+			)
+		));
+
+		$this->_buildRelatedModels($this->Featured2);
+
+		$binding = array('type' => 'belongsTo', 'model' => 'ArticleFeatured2');
+		$queryData = array('conditions' => array());
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Featured2, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Featured2, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+		$result = $this->testDb->generateAssociationQuery($this->Featured2, $null, null, null, null, $queryData, false, $null);
+
+		$this->assertPattern(
+			'/^SELECT\s+`Featured2`\.`id`, `Featured2`\.`article_id`, `Featured2`\.`category_id`, `Featured2`\.`name`,\s+'.
+			'`ArticleFeatured2`\.`id`, `ArticleFeatured2`\.`title`, `ArticleFeatured2`\.`user_id`, `ArticleFeatured2`\.`published`\s+' .
+			'FROM\s+`featured2` AS `Featured2`\s+LEFT JOIN\s+`article_featured` AS `ArticleFeatured2`' .
+			'\s+ON\s+\(`ArticleFeatured2`.`published` = \'Y\'\s+AND\s+`Featured2`\.`article_featured2_id` = `ArticleFeatured2`\.`id`\)' .
+			'\s+WHERE\s+1\s+=\s+1\s*$/',
+			$result
+		);
+	}
+
+/**
+ * testGenerateAssociationQueryHasOne method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasOne() {
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasOne', 'model' => 'TestModel5');
+
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$result = $this->testDb->buildJoinStatement($queryData['joins'][0]);
+		$expected = ' LEFT JOIN `test_model5` AS `TestModel5` ON (`TestModel5`.`test_model4_id` = `TestModel4`.`id`)';
+		$this->assertEqual(trim($result), trim($expected));
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`, `TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+LEFT JOIN\s+/', $result);
+		$this->assertPattern('/`test_model5` AS `TestModel5`\s+ON\s+\(`TestModel5`.`test_model4_id` = `TestModel4`.`id`\)\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*1 = 1\s*(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryHasOneWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasOneWithConditions() {
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasOne', 'model' => 'TestModel5');
+
+		$queryData = array('conditions' => array('TestModel5.name !=' => 'mariano'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`, `TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+LEFT JOIN\s+`test_model5` AS `TestModel5`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel5`.`test_model4_id`\s+=\s+`TestModel4`.`id`\)\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*`TestModel5`.`name`\s+!=\s+\'mariano\'\s*(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryBelongsTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryBelongsTo() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type'=>'belongsTo', 'model'=>'TestModel4');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$result = $this->testDb->buildJoinStatement($queryData['joins'][0]);
+		$expected = ' LEFT JOIN `test_model4` AS `TestModel4` ON (`TestModel5`.`test_model4_id` = `TestModel4`.`id`)';
+		$this->assertEqual(trim($result), trim($expected));
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`, `TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+LEFT JOIN\s+`test_model4` AS `TestModel4`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel5`.`test_model4_id` = `TestModel4`.`id`\)\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*1 = 1\s*(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryBelongsToWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryBelongsToWithConditions() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'belongsTo', 'model' => 'TestModel4');
+		$queryData = array('conditions' => array('TestModel5.name !=' => 'mariano'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertTrue($result);
+
+		$result = $this->testDb->buildJoinStatement($queryData['joins'][0]);
+		$expected = ' LEFT JOIN `test_model4` AS `TestModel4` ON (`TestModel5`.`test_model4_id` = `TestModel4`.`id`)';
+		$this->assertEqual(trim($result), trim($expected));
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`, `TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+LEFT JOIN\s+`test_model4` AS `TestModel4`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel5`.`test_model4_id` = `TestModel4`.`id`\)\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+`TestModel5`.`name` != \'mariano\'\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryHasMany method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasMany() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+`TestModel6`.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?\s*1 = 1\s*(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryHasManyWithLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasManyWithLimit() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$this->Model->hasMany['TestModel6']['limit'] = 2;
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern(
+			'/^SELECT\s+' .
+			'`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+'.
+			'FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+' .
+			'`TestModel6`.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)\s*'.
+			'LIMIT \d*'.
+			'\s*$/', $result
+		);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern(
+			'/^SELECT\s+'.
+			'`TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`\s+'.
+			'FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+'.
+			'(?:\()?\s*1 = 1\s*(?:\))?'.
+			'\s*$/', $result
+		);
+	}
+
+/**
+ * testGenerateAssociationQueryHasManyWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasManyWithConditions() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('conditions' => array('TestModel5.name !=' => 'mariano'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?`TestModel5`.`name`\s+!=\s+\'mariano\'(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryHasManyWithOffsetAndLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasManyWithOffsetAndLimit() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$__backup = $this->Model->hasMany['TestModel6'];
+
+		$this->Model->hasMany['TestModel6']['offset'] = 2;
+		$this->Model->hasMany['TestModel6']['limit'] = 5;
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+		$this->assertPattern('/\s+LIMIT 2,\s*5\s*$/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		$this->Model->hasMany['TestModel6'] = $__backup;
+	}
+
+/**
+ * testGenerateAssociationQueryHasManyWithPageAndLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasManyWithPageAndLimit() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$__backup = $this->Model->hasMany['TestModel6'];
+
+		$this->Model->hasMany['TestModel6']['page'] = 2;
+		$this->Model->hasMany['TestModel6']['limit'] = 5;
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+		$this->assertPattern('/\s+LIMIT 5,\s*5\s*$/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`test_model4_id`, `TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		$this->Model->hasMany['TestModel6'] = $__backup;
+	}
+
+/**
+ * testGenerateAssociationQueryHasManyWithFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasManyWithFields() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('fields' => array('`TestModel5`.`name`'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`name`, `TestModel5`\.`id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('fields' => array('`TestModel5`.`id`, `TestModel5`.`name`'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`name`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('fields' => array('`TestModel5`.`name`', '`TestModel5`.`created`'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`test_model5_id`, `TestModel6`\.`name`, `TestModel6`\.`created`, `TestModel6`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`name`, `TestModel5`\.`created`, `TestModel5`\.`id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		$this->Model->hasMany['TestModel6']['fields'] = array('name');
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('fields' => array('`TestModel5`.`id`', '`TestModel5`.`name`'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`name`, `TestModel6`\.`test_model5_id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`name`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		unset($this->Model->hasMany['TestModel6']['fields']);
+
+		$this->Model->hasMany['TestModel6']['fields'] = array('id', 'name');
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('fields' => array('`TestModel5`.`id`', '`TestModel5`.`name`'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`id`, `TestModel6`\.`name`, `TestModel6`\.`test_model5_id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`name`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		unset($this->Model->hasMany['TestModel6']['fields']);
+
+		$this->Model->hasMany['TestModel6']['fields'] = array('test_model5_id', 'name');
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('fields' => array('`TestModel5`.`id`', '`TestModel5`.`name`'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel6`\.`test_model5_id`, `TestModel6`\.`name`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model6` AS `TestModel6`\s+WHERE\s+/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?`TestModel6`\.`test_model5_id`\s+=\s+\({\$__cakeID__\$}\)(?:\))?/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel5`\.`id`, `TestModel5`\.`name`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model5` AS `TestModel5`\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		unset($this->Model->hasMany['TestModel6']['fields']);
+	}
+
+/**
+ * test generateAssociationQuery with a hasMany and an aggregate function.
+ *
+ * @return void
+ */
+	function testGenerateAssociationQueryHasManyAndAggregateFunction() {
+		$this->Model =& new TestModel5();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasMany', 'model' => 'TestModel6');
+		$queryData = array('fields' => array('MIN(TestModel5.test_model4_id)'));
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+		$this->Model->recursive = 0;
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, $params['type'], $params['assoc'], $params['assocData'], $queryData, false, $resultSet);
+		$this->assertPattern('/^SELECT\s+MIN\(`TestModel5`\.`test_model4_id`\)\s+FROM/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryHasAndBelongsToMany method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasAndBelongsToMany() {
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type' => 'hasAndBelongsToMany', 'model' => 'TestModel7');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params =& $this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel7`\.`id`, `TestModel7`\.`name`, `TestModel7`\.`created`, `TestModel7`\.`updated`, `TestModel4TestModel7`\.`test_model4_id`, `TestModel4TestModel7`\.`test_model7_id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model7` AS `TestModel7`\s+JOIN\s+`' . $this->testDb->fullTableName('test_model4_test_model7', false) . '`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel4TestModel7`\.`test_model4_id`\s+=\s+{\$__cakeID__\$}\s+AND/', $result);
+		$this->assertPattern('/\s+AND\s+`TestModel4TestModel7`\.`test_model7_id`\s+=\s+`TestModel7`\.`id`\)/', $result);
+		$this->assertPattern('/WHERE\s+(?:\()?1 = 1(?:\))?\s*$/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+WHERE/', $result);
+		$this->assertPattern('/\s+WHERE\s+(?:\()?1 = 1(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryHasAndBelongsToManyWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasAndBelongsToManyWithConditions() {
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$binding = array('type'=>'hasAndBelongsToMany', 'model'=>'TestModel7');
+		$queryData = array('conditions' => array('TestModel4.name !=' => 'mariano'));
+		$resultSet = null;
+		$null = null;
+
+		$params =& $this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel7`\.`id`, `TestModel7`\.`name`, `TestModel7`\.`created`, `TestModel7`\.`updated`, `TestModel4TestModel7`\.`test_model4_id`, `TestModel4TestModel7`\.`test_model7_id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model7`\s+AS\s+`TestModel7`\s+JOIN\s+`test_model4_test_model7`\s+AS\s+`TestModel4TestModel7`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel4TestModel7`\.`test_model4_id`\s+=\s+{\$__cakeID__\$}/', $result);
+		$this->assertPattern('/\s+AND\s+`TestModel4TestModel7`\.`test_model7_id`\s+=\s+`TestModel7`\.`id`\)\s+WHERE\s+/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+WHERE\s+(?:\()?`TestModel4`.`name`\s+!=\s+\'mariano\'(?:\))?\s*$/', $result);
+	}
+
+/**
+ * testGenerateAssociationQueryHasAndBelongsToManyWithOffsetAndLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasAndBelongsToManyWithOffsetAndLimit() {
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$__backup = $this->Model->hasAndBelongsToMany['TestModel7'];
+
+		$this->Model->hasAndBelongsToMany['TestModel7']['offset'] = 2;
+		$this->Model->hasAndBelongsToMany['TestModel7']['limit'] = 5;
+
+		$binding = array('type'=>'hasAndBelongsToMany', 'model'=>'TestModel7');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel7`\.`id`, `TestModel7`\.`name`, `TestModel7`\.`created`, `TestModel7`\.`updated`, `TestModel4TestModel7`\.`test_model4_id`, `TestModel4TestModel7`\.`test_model7_id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model7`\s+AS\s+`TestModel7`\s+JOIN\s+`test_model4_test_model7`\s+AS\s+`TestModel4TestModel7`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel4TestModel7`\.`test_model4_id`\s+=\s+{\$__cakeID__\$}\s+/', $result);
+		$this->assertPattern('/\s+AND\s+`TestModel4TestModel7`\.`test_model7_id`\s+=\s+`TestModel7`\.`id`\)\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+(?:\()?1\s+=\s+1(?:\))?\s*\s+LIMIT 2,\s*5\s*$/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		$this->Model->hasAndBelongsToMany['TestModel7'] = $__backup;
+	}
+
+/**
+ * testGenerateAssociationQueryHasAndBelongsToManyWithPageAndLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAssociationQueryHasAndBelongsToManyWithPageAndLimit() {
+		$this->Model =& new TestModel4();
+		$this->Model->schema();
+		$this->_buildRelatedModels($this->Model);
+
+		$__backup = $this->Model->hasAndBelongsToMany['TestModel7'];
+
+		$this->Model->hasAndBelongsToMany['TestModel7']['page'] = 2;
+		$this->Model->hasAndBelongsToMany['TestModel7']['limit'] = 5;
+
+		$binding = array('type'=>'hasAndBelongsToMany', 'model'=>'TestModel7');
+		$queryData = array();
+		$resultSet = null;
+		$null = null;
+
+		$params = &$this->_prepareAssociationQuery($this->Model, $queryData, $binding);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $params['linkModel'], $params['type'], $params['assoc'], $params['assocData'], $queryData, $params['external'], $resultSet);
+		$this->assertPattern('/^SELECT\s+`TestModel7`\.`id`, `TestModel7`\.`name`, `TestModel7`\.`created`, `TestModel7`\.`updated`, `TestModel4TestModel7`\.`test_model4_id`, `TestModel4TestModel7`\.`test_model7_id`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model7`\s+AS\s+`TestModel7`\s+JOIN\s+`test_model4_test_model7`\s+AS\s+`TestModel4TestModel7`/', $result);
+		$this->assertPattern('/\s+ON\s+\(`TestModel4TestModel7`\.`test_model4_id`\s+=\s+{\$__cakeID__\$}/', $result);
+		$this->assertPattern('/\s+AND\s+`TestModel4TestModel7`\.`test_model7_id`\s+=\s+`TestModel7`\.`id`\)\s+WHERE\s+/', $result);
+		$this->assertPattern('/\s+(?:\()?1\s+=\s+1(?:\))?\s*\s+LIMIT 5,\s*5\s*$/', $result);
+
+		$result = $this->testDb->generateAssociationQuery($this->Model, $null, null, null, null, $queryData, false, $null);
+		$this->assertPattern('/^SELECT\s+`TestModel4`\.`id`, `TestModel4`\.`name`, `TestModel4`\.`created`, `TestModel4`\.`updated`\s+/', $result);
+		$this->assertPattern('/\s+FROM\s+`test_model4` AS `TestModel4`\s+WHERE\s+(?:\()?1\s+=\s+1(?:\))?\s*$/', $result);
+
+		$this->Model->hasAndBelongsToMany['TestModel7'] = $__backup;
+	}
+
+/**
+ * buildRelatedModels method
+ *
+ * @param mixed $model
+ * @access protected
+ * @return void
+ */
+	function _buildRelatedModels(&$model) {
+		foreach ($model->__associations as $type) {
+			foreach ($model->{$type} as $assoc => $assocData) {
+				if (is_string($assocData)) {
+					$className = $assocData;
+				} elseif (isset($assocData['className'])) {
+					$className = $assocData['className'];
+				}
+				$model->$className =& new $className();
+				$model->$className->schema();
+			}
+		}
+	}
+
+/**
+ * &_prepareAssociationQuery method
+ *
+ * @param mixed $model
+ * @param mixed $queryData
+ * @param mixed $binding
+ * @access public
+ * @return void
+ */
+	function &_prepareAssociationQuery(&$model, &$queryData, $binding) {
+		$type = $binding['type'];
+		$assoc = $binding['model'];
+		$assocData = $model->{$type}[$assoc];
+		$className = $assocData['className'];
+
+		$linkModel =& $model->{$className};
+		$external = isset($assocData['external']);
+		$queryData = $this->testDb->__scrubQueryData($queryData);
+
+		$result = array_merge(array('linkModel' => &$linkModel), compact('type', 'assoc', 'assocData', 'external'));
+		return $result;
+	}
+
+/**
+ * testSelectDistict method
+ *
+ * @access public
+ * @return void
+ */
+	function testSelectDistict() {
+		$result = $this->testDb->fields($this->Model, 'Vendor', "DISTINCT Vendor.id, Vendor.name");
+		$expected = array('DISTINCT `Vendor`.`id`', '`Vendor`.`name`');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that booleans and null make logical condition strings.
+ *
+ * @return void
+ */
+	function testBooleanNullConditionsParsing() {
+		$result = $this->testDb->conditions(true);
+		$this->assertEqual($result, ' WHERE 1 = 1', 'true conditions failed %s');
+
+		$result = $this->testDb->conditions(false);
+		$this->assertEqual($result, ' WHERE 0 = 1', 'false conditions failed %s');
+
+		$result = $this->testDb->conditions(null);
+		$this->assertEqual($result, ' WHERE 1 = 1', 'null conditions failed %s');
+
+		$result = $this->testDb->conditions(array());
+		$this->assertEqual($result, ' WHERE 1 = 1', 'array() conditions failed %s');
+
+		$result = $this->testDb->conditions('');
+		$this->assertEqual($result, ' WHERE 1 = 1', '"" conditions failed %s');
+
+		$result = $this->testDb->conditions(' ', '"  " conditions failed %s');
+		$this->assertEqual($result, ' WHERE 1 = 1');
+	}
+/**
+ * testStringConditionsParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testStringConditionsParsing() {
+		$result = $this->testDb->conditions("ProjectBid.project_id = Project.id");
+		$expected = " WHERE `ProjectBid`.`project_id` = `Project`.`id`";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("Candy.name LIKE 'a' AND HardCandy.name LIKE 'c'");
+		$expected = " WHERE `Candy`.`name` LIKE 'a' AND `HardCandy`.`name` LIKE 'c'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("HardCandy.name LIKE 'a' AND Candy.name LIKE 'c'");
+		$expected = " WHERE `HardCandy`.`name` LIKE 'a' AND `Candy`.`name` LIKE 'c'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("Post.title = '1.1'");
+		$expected = " WHERE `Post`.`title` = '1.1'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("User.id != 0 AND User.user LIKE '%arr%'");
+		$expected = " WHERE `User`.`id` != 0 AND `User`.`user` LIKE '%arr%'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("SUM(Post.comments_count) > 500");
+		$expected = " WHERE SUM(`Post`.`comments_count`) > 500";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("(Post.created < '" . date('Y-m-d H:i:s') . "') GROUP BY YEAR(Post.created), MONTH(Post.created)");
+		$expected = " WHERE (`Post`.`created` < '" . date('Y-m-d H:i:s') . "') GROUP BY YEAR(`Post`.`created`), MONTH(`Post`.`created`)";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("score BETWEEN 90.1 AND 95.7");
+		$expected = " WHERE score BETWEEN 90.1 AND 95.7";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('score' => array(2=>1, 2, 10)));
+		$expected = " WHERE score IN (1, 2, 10)";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("Aro.rght = Aro.lft + 1.1");
+		$expected = " WHERE `Aro`.`rght` = `Aro`.`lft` + 1.1";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("(Post.created < '" . date('Y-m-d H:i:s') . "') GROUP BY YEAR(Post.created), MONTH(Post.created)");
+		$expected = " WHERE (`Post`.`created` < '" . date('Y-m-d H:i:s') . "') GROUP BY YEAR(`Post`.`created`), MONTH(`Post`.`created`)";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('Sportstaette.sportstaette LIKE "%ru%" AND Sportstaette.sportstaettenart_id = 2');
+		$expected = ' WHERE `Sportstaette`.`sportstaette` LIKE "%ru%" AND `Sportstaette`.`sportstaettenart_id` = 2';
+		$this->assertPattern('/\s*WHERE\s+`Sportstaette`\.`sportstaette`\s+LIKE\s+"%ru%"\s+AND\s+`Sports/', $result);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('Sportstaette.sportstaettenart_id = 2 AND Sportstaette.sportstaette LIKE "%ru%"');
+		$expected = ' WHERE `Sportstaette`.`sportstaettenart_id` = 2 AND `Sportstaette`.`sportstaette` LIKE "%ru%"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('SUM(Post.comments_count) > 500 AND NOT Post.title IS NULL AND NOT Post.extended_title IS NULL');
+		$expected = ' WHERE SUM(`Post`.`comments_count`) > 500 AND NOT `Post`.`title` IS NULL AND NOT `Post`.`extended_title` IS NULL';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('NOT Post.title IS NULL AND NOT Post.extended_title IS NULL AND SUM(Post.comments_count) > 500');
+		$expected = ' WHERE NOT `Post`.`title` IS NULL AND NOT `Post`.`extended_title` IS NULL AND SUM(`Post`.`comments_count`) > 500';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('NOT Post.extended_title IS NULL AND NOT Post.title IS NULL AND Post.title != "" AND SPOON(SUM(Post.comments_count) + 1.1) > 500');
+		$expected = ' WHERE NOT `Post`.`extended_title` IS NULL AND NOT `Post`.`title` IS NULL AND `Post`.`title` != "" AND SPOON(SUM(`Post`.`comments_count`) + 1.1) > 500';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('NOT Post.title_extended IS NULL AND NOT Post.title IS NULL AND Post.title_extended != Post.title');
+		$expected = ' WHERE NOT `Post`.`title_extended` IS NULL AND NOT `Post`.`title` IS NULL AND `Post`.`title_extended` != `Post`.`title`';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("Comment.id = 'a'");
+		$expected = " WHERE `Comment`.`id` = 'a'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("lower(Article.title) LIKE 'a%'");
+		$expected = " WHERE lower(`Article`.`title`) LIKE 'a%'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('((MATCH(Video.title) AGAINST(\'My Search*\' IN BOOLEAN MODE) * 2) + (MATCH(Video.description) AGAINST(\'My Search*\' IN BOOLEAN MODE) * 0.4) + (MATCH(Video.tags) AGAINST(\'My Search*\' IN BOOLEAN MODE) * 1.5))');
+		$expected = ' WHERE ((MATCH(`Video`.`title`) AGAINST(\'My Search*\' IN BOOLEAN MODE) * 2) + (MATCH(`Video`.`description`) AGAINST(\'My Search*\' IN BOOLEAN MODE) * 0.4) + (MATCH(`Video`.`tags`) AGAINST(\'My Search*\' IN BOOLEAN MODE) * 1.5))';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('DATEDIFF(NOW(),Article.published) < 1 && Article.live=1');
+		$expected = " WHERE DATEDIFF(NOW(),`Article`.`published`) < 1 && `Article`.`live`=1";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('file = "index.html"');
+		$expected = ' WHERE file = "index.html"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions("file = 'index.html'");
+		$expected = " WHERE file = 'index.html'";
+		$this->assertEqual($result, $expected);
+
+		$letter = $letter = 'd.a';
+		$conditions = array('Company.name like ' => $letter . '%');
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE `Company`.`name` like 'd.a%'";
+		$this->assertEqual($result, $expected);
+
+		$conditions = array('Artist.name' => 'JUDY and MARY');
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE `Artist`.`name` = 'JUDY and MARY'";
+		$this->assertEqual($result, $expected);
+
+		$conditions = array('Artist.name' => 'JUDY AND MARY');
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE `Artist`.`name` = 'JUDY AND MARY'";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testQuotesInStringConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testQuotesInStringConditions() {
+		$result = $this->testDb->conditions('Member.email = \'mariano@cricava.com\'');
+		$expected = ' WHERE `Member`.`email` = \'mariano@cricava.com\'';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('Member.email = "mariano@cricava.com"');
+		$expected = ' WHERE `Member`.`email` = "mariano@cricava.com"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions('Member.email = \'mariano@cricava.com\' AND Member.user LIKE \'mariano.iglesias%\'');
+		$expected = ' WHERE `Member`.`email` = \'mariano@cricava.com\' AND `Member`.`user` LIKE \'mariano.iglesias%\'';
+		$this->assertEqual($result, $expected);
+
+
+		$result = $this->testDb->conditions('Member.email = "mariano@cricava.com" AND Member.user LIKE "mariano.iglesias%"');
+		$expected = ' WHERE `Member`.`email` = "mariano@cricava.com" AND `Member`.`user` LIKE "mariano.iglesias%"';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testParenthesisInStringConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testParenthesisInStringConditions() {
+		$result = $this->testDb->conditions('Member.name = \'(lu\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(lu\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \')lu\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\)lu\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'va(lu\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\(lu\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'va)lu\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\)lu\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'va(lu)\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\(lu\)\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'va(lu)e\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\(lu\)e\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'(mariano)\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano\)\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'(mariano)iglesias\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano\)iglesias\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'(mariano) iglesias\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano\) iglesias\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'(mariano word) iglesias\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano word\) iglesias\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'(mariano.iglesias)\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano.iglesias\)\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'Mariano Iglesias (mariano.iglesias)\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'Mariano Iglesias \(mariano.iglesias\)\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'Mariano Iglesias (mariano.iglesias) CakePHP\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'Mariano Iglesias \(mariano.iglesias\) CakePHP\'$/', $result);
+
+		$result = $this->testDb->conditions('Member.name = \'(mariano.iglesias) CakePHP\'');
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano.iglesias\) CakePHP\'$/', $result);
+	}
+
+/**
+ * testParenthesisInArrayConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testParenthesisInArrayConditions() {
+		$result = $this->testDb->conditions(array('Member.name' => '(lu'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(lu\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => ')lu'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\)lu\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => 'va(lu'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\(lu\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => 'va)lu'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\)lu\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => 'va(lu)'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\(lu\)\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => 'va(lu)e'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'va\(lu\)e\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => '(mariano)'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano\)\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => '(mariano)iglesias'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano\)iglesias\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => '(mariano) iglesias'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano\) iglesias\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => '(mariano word) iglesias'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano word\) iglesias\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => '(mariano.iglesias)'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano.iglesias\)\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => 'Mariano Iglesias (mariano.iglesias)'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'Mariano Iglesias \(mariano.iglesias\)\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => 'Mariano Iglesias (mariano.iglesias) CakePHP'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'Mariano Iglesias \(mariano.iglesias\) CakePHP\'$/', $result);
+
+		$result = $this->testDb->conditions(array('Member.name' => '(mariano.iglesias) CakePHP'));
+		$this->assertPattern('/^\s+WHERE\s+`Member`.`name`\s+=\s+\'\(mariano.iglesias\) CakePHP\'$/', $result);
+	}
+
+/**
+ * testArrayConditionsParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testArrayConditionsParsing() {
+		$result = $this->testDb->conditions(array('Stereo.type' => 'in dash speakers'));
+		$this->assertPattern("/^\s+WHERE\s+`Stereo`.`type`\s+=\s+'in dash speakers'/", $result);
+
+		$result = $this->testDb->conditions(array('Candy.name LIKE' => 'a', 'HardCandy.name LIKE' => 'c'));
+		$this->assertPattern("/^\s+WHERE\s+`Candy`.`name` LIKE\s+'a'\s+AND\s+`HardCandy`.`name`\s+LIKE\s+'c'/", $result);
+
+		$result = $this->testDb->conditions(array('HardCandy.name LIKE' => 'a', 'Candy.name LIKE' => 'c'));
+		$expected = " WHERE `HardCandy`.`name` LIKE 'a' AND `Candy`.`name` LIKE 'c'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('HardCandy.name LIKE' => 'a%', 'Candy.name LIKE' => '%c%'));
+		$expected = " WHERE `HardCandy`.`name` LIKE 'a%' AND `Candy`.`name` LIKE '%c%'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('HardCandy.name LIKE' => 'to be or%', 'Candy.name LIKE' => '%not to be%'));
+		$expected = " WHERE `HardCandy`.`name` LIKE 'to be or%' AND `Candy`.`name` LIKE '%not to be%'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('score BETWEEN ? AND ?' => array(90.1, 95.7)));
+		$expected = " WHERE `score` BETWEEN 90.100000 AND 95.700000";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Post.title' => 1.1));
+		$expected = " WHERE `Post`.`title` = 1.100000";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Post.title' => 1.1), true, true, new Post());
+		$expected = " WHERE `Post`.`title` = '1.1'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('SUM(Post.comments_count) >' => '500'));
+		$expected = " WHERE SUM(`Post`.`comments_count`) > '500'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('MAX(Post.rating) >' => '50'));
+		$expected = " WHERE MAX(`Post`.`rating`) > '50'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('title LIKE' => '%hello'));
+		$expected = " WHERE `title` LIKE '%hello'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Post.name' => 'mad(g)ik'));
+		$expected = " WHERE `Post`.`name` = 'mad(g)ik'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('score' => array(1, 2, 10)));
+		$expected = " WHERE score IN (1, 2, 10)";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('score' => array()));
+		$expected = " WHERE `score` IS NULL";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('score !=' => array()));
+		$expected = " WHERE `score` IS NOT NULL";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('score !=' => '20'));
+		$expected = " WHERE `score` != '20'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('score >' => '20'));
+		$expected = " WHERE `score` > '20'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('client_id >' => '20'), true, true, new TestModel());
+		$expected = " WHERE `client_id` > 20";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('OR' => array(
+			array('User.user' => 'mariano'),
+			array('User.user' => 'nate')
+		)));
+
+		$expected = " WHERE ((`User`.`user` = 'mariano') OR (`User`.`user` = 'nate'))";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('or' => array(
+			'score BETWEEN ? AND ?' => array('4', '5'), 'rating >' => '20'
+		)));
+		$expected = " WHERE ((`score` BETWEEN '4' AND '5') OR (`rating` > '20'))";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('or' => array(
+			'score BETWEEN ? AND ?' => array('4', '5'), array('score >' => '20')
+		)));
+		$expected = " WHERE ((`score` BETWEEN '4' AND '5') OR (`score` > '20'))";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('and' => array(
+			'score BETWEEN ? AND ?' => array('4', '5'), array('score >' => '20')
+		)));
+		$expected = " WHERE ((`score` BETWEEN '4' AND '5') AND (`score` > '20'))";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(
+			'published' => 1, 'or' => array('score >' => '2', array('score >' => '20'))
+		));
+		$expected = " WHERE `published` = 1 AND ((`score` > '2') OR (`score` > '20'))";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(array('Project.removed' => false)));
+		$expected = " WHERE `Project`.`removed` = 0";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(array('Project.removed' => true)));
+		$expected = " WHERE `Project`.`removed` = 1";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(array('Project.removed' => null)));
+		$expected = " WHERE `Project`.`removed` IS NULL";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(array('Project.removed !=' => null)));
+		$expected = " WHERE `Project`.`removed` IS NOT NULL";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('(Usergroup.permissions) & 4' => 4));
+		$expected = " WHERE (`Usergroup`.`permissions`) & 4 = 4";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('((Usergroup.permissions) & 4)' => 4));
+		$expected = " WHERE ((`Usergroup`.`permissions`) & 4) = 4";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Post.modified >=' => 'DATE_SUB(NOW(), INTERVAL 7 DAY)'));
+		$expected = " WHERE `Post`.`modified` >= 'DATE_SUB(NOW(), INTERVAL 7 DAY)'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Post.modified >= DATE_SUB(NOW(), INTERVAL 7 DAY)'));
+		$expected = " WHERE `Post`.`modified` >= DATE_SUB(NOW(), INTERVAL 7 DAY)";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(
+			'NOT' => array('Course.id' => null, 'Course.vet' => 'N', 'level_of_education_id' => array(912,999)),
+			'Enrollment.yearcompleted >' => '0')
+		);
+		$this->assertPattern('/^\s*WHERE\s+\(NOT\s+\(`Course`\.`id` IS NULL\)\s+AND NOT\s+\(`Course`\.`vet`\s+=\s+\'N\'\)\s+AND NOT\s+\(level_of_education_id IN \(912, 999\)\)\)\s+AND\s+`Enrollment`\.`yearcompleted`\s+>\s+\'0\'\s*$/', $result);
+
+		$result = $this->testDb->conditions(array('id <>' => '8'));
+		$this->assertPattern('/^\s*WHERE\s+`id`\s+<>\s+\'8\'\s*$/', $result);
+
+		$result = $this->testDb->conditions(array('TestModel.field =' => 'gribe$@()lu'));
+		$expected = " WHERE `TestModel`.`field` = 'gribe$@()lu'";
+		$this->assertEqual($result, $expected);
+
+		$conditions['NOT'] = array('Listing.expiration BETWEEN ? AND ?' => array("1", "100"));
+		$conditions[0]['OR'] = array(
+			"Listing.title LIKE" => "%term%",
+			"Listing.description LIKE" => "%term%"
+		);
+		$conditions[1]['OR'] = array(
+			"Listing.title LIKE" => "%term_2%",
+			"Listing.description LIKE" => "%term_2%"
+		);
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE NOT (`Listing`.`expiration` BETWEEN '1' AND '100') AND" .
+		" ((`Listing`.`title` LIKE '%term%') OR (`Listing`.`description` LIKE '%term%')) AND" .
+		" ((`Listing`.`title` LIKE '%term_2%') OR (`Listing`.`description` LIKE '%term_2%'))";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('MD5(CONCAT(Reg.email,Reg.id))' => 'blah'));
+		$expected = " WHERE MD5(CONCAT(`Reg`.`email`,`Reg`.`id`)) = 'blah'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(
+			'MD5(CONCAT(Reg.email,Reg.id))' => array('blah', 'blahblah')
+		));
+		$expected = " WHERE MD5(CONCAT(`Reg`.`email`,`Reg`.`id`)) IN ('blah', 'blahblah')";
+		$this->assertEqual($result, $expected);
+
+		$conditions = array('id' => array(2, 5, 6, 9, 12, 45, 78, 43, 76));
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE id IN (2, 5, 6, 9, 12, 45, 78, 43, 76)";
+		$this->assertEqual($result, $expected);
+
+		$conditions = array('title' => 'user(s)');
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE `title` = 'user(s)'";
+		$this->assertEqual($result, $expected);
+
+		$conditions = array('title' => 'user(s) data');
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE `title` = 'user(s) data'";
+		$this->assertEqual($result, $expected);
+
+		$conditions = array('title' => 'user(s,arg) data');
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE `title` = 'user(s,arg) data'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array("Book.book_name" => 'Java(TM)'));
+		$expected = " WHERE `Book`.`book_name` = 'Java(TM)'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array("Book.book_name" => 'Java(TM) '));
+		$expected = " WHERE `Book`.`book_name` = 'Java(TM) '";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array("Book.id" => 0));
+		$expected = " WHERE `Book`.`id` = 0";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array("Book.id" => NULL));
+		$expected = " WHERE `Book`.`id` IS NULL";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Listing.beds >=' => 0));
+		$expected = " WHERE `Listing`.`beds` >= 0";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(
+			'ASCII(SUBSTRING(keyword, 1, 1)) BETWEEN ? AND ?' => array(65, 90)
+		));
+		$expected = ' WHERE ASCII(SUBSTRING(keyword, 1, 1)) BETWEEN 65 AND 90';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('or' => array(
+			'? BETWEEN Model.field1 AND Model.field2' => '2009-03-04'
+		)));
+		$expected = " WHERE '2009-03-04' BETWEEN Model.field1 AND Model.field2";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testArrayConditionsParsingComplexKeys method
+ *
+ * @access public
+ * @return void
+ */
+	function testArrayConditionsParsingComplexKeys() {
+		$result = $this->testDb->conditions(array(
+			'CAST(Book.created AS DATE)' => '2008-08-02'
+		));
+		$expected = " WHERE CAST(`Book`.`created` AS DATE) = '2008-08-02'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(
+			'CAST(Book.created AS DATE) <=' => '2008-08-02'
+		));
+		$expected = " WHERE CAST(`Book`.`created` AS DATE) <= '2008-08-02'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array(
+			'(Stats.clicks * 100) / Stats.views >' => 50
+		));
+		$expected = " WHERE (`Stats`.`clicks` * 100) / `Stats`.`views` > 50";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMixedConditionsParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testMixedConditionsParsing() {
+		$conditions[] = 'User.first_name = \'Firstname\'';
+		$conditions[] = array('User.last_name' => 'Lastname');
+		$result = $this->testDb->conditions($conditions);
+		$expected = " WHERE `User`.`first_name` = 'Firstname' AND `User`.`last_name` = 'Lastname'";
+		$this->assertEqual($result, $expected);
+
+		$conditions = array(
+			'Thread.project_id' => 5,
+			'Thread.buyer_id' => 14,
+			'1=1 GROUP BY Thread.project_id'
+		);
+		$result = $this->testDb->conditions($conditions);
+		$this->assertPattern('/^\s*WHERE\s+`Thread`.`project_id`\s*=\s*5\s+AND\s+`Thread`.`buyer_id`\s*=\s*14\s+AND\s+1\s*=\s*1\s+GROUP BY `Thread`.`project_id`$/', $result);
+	}
+
+/**
+ * testConditionsOptionalArguments method
+ *
+ * @access public
+ * @return void
+ */
+	function testConditionsOptionalArguments() {
+		$result = $this->testDb->conditions( array('Member.name' => 'Mariano'), true, false);
+		$this->assertPattern('/^\s*`Member`.`name`\s*=\s*\'Mariano\'\s*$/', $result);
+
+		$result = $this->testDb->conditions( array(), true, false);
+		$this->assertPattern('/^\s*1\s*=\s*1\s*$/', $result);
+	}
+
+/**
+ * testConditionsWithModel
+ *
+ * @access public
+ * @return void
+ */
+	function testConditionsWithModel() {
+		$this->Model =& new Article2();
+
+		$result = $this->testDb->conditions(array('Article2.viewed >=' => 0), true, true, $this->Model);
+		$expected = " WHERE `Article2`.`viewed` >= 0";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Article2.viewed >=' => '0'), true, true, $this->Model);
+		$expected = " WHERE `Article2`.`viewed` >= 0";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Article2.viewed >=' => '1'), true, true, $this->Model);
+		$expected = " WHERE `Article2`.`viewed` >= 1";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Article2.rate_sum BETWEEN ? AND ?' => array(0, 10)), true, true, $this->Model);
+		$expected = " WHERE `Article2`.`rate_sum` BETWEEN 0 AND 10";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Article2.rate_sum BETWEEN ? AND ?' => array('0', '10')), true, true, $this->Model);
+		$expected = " WHERE `Article2`.`rate_sum` BETWEEN 0 AND 10";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->conditions(array('Article2.rate_sum BETWEEN ? AND ?' => array('1', '10')), true, true, $this->Model);
+		$expected = " WHERE `Article2`.`rate_sum` BETWEEN 1 AND 10";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFieldParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testFieldParsing() {
+		$result = $this->testDb->fields($this->Model, 'Vendor', "Vendor.id, COUNT(Model.vendor_id) AS `Vendor`.`count`");
+		$expected = array('`Vendor`.`id`', 'COUNT(`Model`.`vendor_id`) AS `Vendor`.`count`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, 'Vendor', "`Vendor`.`id`, COUNT(`Model`.`vendor_id`) AS `Vendor`.`count`");
+		$expected = array('`Vendor`.`id`', 'COUNT(`Model`.`vendor_id`) AS `Vendor`.`count`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, 'Post', "CONCAT(REPEAT(' ', COUNT(Parent.name) - 1), Node.name) AS name, Node.created");
+		$expected = array("CONCAT(REPEAT(' ', COUNT(`Parent`.`name`) - 1), Node.name) AS name", "`Node`.`created`");
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, 'round( (3.55441 * fooField), 3 ) AS test');
+		$this->assertEqual($result, array('round( (3.55441 * fooField), 3 ) AS test'));
+
+		$result = $this->testDb->fields($this->Model, null, 'ROUND(`Rating`.`rate_total` / `Rating`.`rate_count`,2) AS rating');
+		$this->assertEqual($result, array('ROUND(`Rating`.`rate_total` / `Rating`.`rate_count`,2) AS rating'));
+
+		$result = $this->testDb->fields($this->Model, null, 'ROUND(Rating.rate_total / Rating.rate_count,2) AS rating');
+		$this->assertEqual($result, array('ROUND(Rating.rate_total / Rating.rate_count,2) AS rating'));
+
+		$result = $this->testDb->fields($this->Model, 'Post', "Node.created, CONCAT(REPEAT(' ', COUNT(Parent.name) - 1), Node.name) AS name");
+		$expected = array("`Node`.`created`", "CONCAT(REPEAT(' ', COUNT(`Parent`.`name`) - 1), Node.name) AS name");
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, 'Post', "2.2,COUNT(*), SUM(Something.else) as sum, Node.created, CONCAT(REPEAT(' ', COUNT(Parent.name) - 1), Node.name) AS name,Post.title,Post.1,1.1");
+		$expected = array(
+			'2.2', 'COUNT(*)', 'SUM(`Something`.`else`) as sum', '`Node`.`created`',
+			"CONCAT(REPEAT(' ', COUNT(`Parent`.`name`) - 1), Node.name) AS name", '`Post`.`title`', '`Post`.`1`', '1.1'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, "(`Provider`.`star_total` / `Provider`.`total_ratings`) as `rating`");
+		$expected = array("(`Provider`.`star_total` / `Provider`.`total_ratings`) as `rating`");
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, 'Post');
+		$expected = array(
+			'`Post`.`id`', '`Post`.`client_id`', '`Post`.`name`', '`Post`.`login`',
+			'`Post`.`passwd`', '`Post`.`addr_1`', '`Post`.`addr_2`', '`Post`.`zip_code`',
+			'`Post`.`city`', '`Post`.`country`', '`Post`.`phone`', '`Post`.`fax`',
+			'`Post`.`url`', '`Post`.`email`', '`Post`.`comments`', '`Post`.`last_login`',
+			'`Post`.`created`', '`Post`.`updated`'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, 'Other');
+		$expected = array(
+			'`Other`.`id`', '`Other`.`client_id`', '`Other`.`name`', '`Other`.`login`',
+			'`Other`.`passwd`', '`Other`.`addr_1`', '`Other`.`addr_2`', '`Other`.`zip_code`',
+			'`Other`.`city`', '`Other`.`country`', '`Other`.`phone`', '`Other`.`fax`',
+			'`Other`.`url`', '`Other`.`email`', '`Other`.`comments`', '`Other`.`last_login`',
+			'`Other`.`created`', '`Other`.`updated`'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, array(), false);
+		$expected = array('id', 'client_id', 'name', 'login', 'passwd', 'addr_1', 'addr_2', 'zip_code', 'city', 'country', 'phone', 'fax', 'url', 'email', 'comments', 'last_login', 'created', 'updated');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, 'COUNT(*)');
+		$expected = array('COUNT(*)');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, 'SUM(Thread.unread_buyer) AS ' . $this->testDb->name('sum_unread_buyer'));
+		$expected = array('SUM(`Thread`.`unread_buyer`) AS `sum_unread_buyer`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, 'name, count(*)');
+		$expected = array('`TestModel`.`name`', 'count(*)');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, 'count(*), name');
+		$expected = array('count(*)', '`TestModel`.`name`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields(
+			$this->Model, null, 'field1, field2, field3, count(*), name'
+		);
+		$expected = array(
+			'`TestModel`.`field1`', '`TestModel`.`field2`',
+			'`TestModel`.`field3`', 'count(*)', '`TestModel`.`name`'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, array('dayofyear(now())'));
+		$expected = array('dayofyear(now())');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, array('MAX(Model.field) As Max'));
+		$expected = array('MAX(`Model`.`field`) As Max');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, array('Model.field AS AnotherName'));
+		$expected = array('`Model`.`field` AS `AnotherName`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, array('field AS AnotherName'));
+		$expected = array('`field` AS `AnotherName`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, null, array(
+			'TestModel.field AS AnotherName'
+		));
+		$expected = array('`TestModel`.`field` AS `AnotherName`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->fields($this->Model, 'Foo', array(
+			'id', 'title', '(user_count + discussion_count + post_count) AS score'
+		));
+		$expected = array(
+			'`Foo`.`id`',
+			'`Foo`.`title`',
+			'(user_count + discussion_count + post_count) AS score'
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that fields() will accept objects made from DboSource::expression
+ *
+ * @return void
+ */
+	function testFieldsWithExpression() {
+		$expression = $this->testDb->expression("CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col");
+		$result = $this->testDb->fields($this->Model, null, array("id", $expression));
+		$expected = array(
+			'`TestModel`.`id`',
+			"CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col"
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that order() will accept objects made from DboSource::expression
+ *
+ * @return void
+ */
+	function testOrderWithExpression() {
+		$expression = $this->testDb->expression("CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col");
+		$result = $this->testDb->order($expression);
+		$expected = " ORDER BY CASE Sample.id WHEN 1 THEN 'Id One' ELSE 'Other Id' END AS case_col";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMergeAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testMergeAssociations() {
+		$data = array('Article2' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article',
+				'body' => 'First Article Body', 'published' => 'Y',
+				'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+		));
+		$merge = array('Topic' => array(array(
+			'id' => '1', 'topic' => 'Topic', 'created' => '2007-03-17 01:16:23',
+			'updated' => '2007-03-17 01:18:31'
+		)));
+		$expected = array(
+			'Article2' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article',
+				'body' => 'First Article Body', 'published' => 'Y',
+				'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Topic' => array(
+				'id' => '1', 'topic' => 'Topic', 'created' => '2007-03-17 01:16:23',
+				'updated' => '2007-03-17 01:18:31'
+			)
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'Topic', 'hasOne');
+		$this->assertEqual($data, $expected);
+
+		$data = array('Article2' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article',
+				'body' => 'First Article Body', 'published' => 'Y',
+				'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+		));
+		$merge = array('User2' => array(array(
+			'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+		)));
+
+		$expected = array(
+			'Article2' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article',
+				'body' => 'First Article Body', 'published' => 'Y',
+				'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'User2' => array(
+				'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+			)
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'User2', 'belongsTo');
+		$this->assertEqual($data, $expected);
+
+		$data = array(
+			'Article2' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$merge = array(array('Comment' => false));
+		$expected = array(
+			'Article2' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Comment' => array()
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'Comment', 'hasMany');
+		$this->assertEqual($data, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$merge = array(
+			array(
+				'Comment' => array(
+					'id' => '1', 'comment' => 'Comment 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Comment' => array(
+					'id' => '2', 'comment' => 'Comment 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$expected = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '1', 'comment' => 'Comment 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				array(
+					'id' => '2', 'comment' => 'Comment 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'Comment', 'hasMany');
+		$this->assertEqual($data, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$merge = array(
+			array(
+				'Comment' => array(
+					'id' => '1', 'comment' => 'Comment 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'User2' => array(
+					'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Comment' => array(
+					'id' => '2', 'comment' => 'Comment 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'User2' => array(
+					'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$expected = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '1', 'comment' => 'Comment 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'User2' => array(
+						'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+					)
+				),
+				array(
+					'id' => '2', 'comment' => 'Comment 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'User2' => array(
+						'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+					)
+				)
+			)
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'Comment', 'hasMany');
+		$this->assertEqual($data, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$merge = array(
+			array(
+				'Comment' => array(
+					'id' => '1', 'comment' => 'Comment 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'User2' => array(
+					'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Tag' => array(
+					array('id' => 1, 'tag' => 'Tag 1'),
+					array('id' => 2, 'tag' => 'Tag 2')
+				)
+			),
+			array(
+				'Comment' => array(
+					'id' => '2', 'comment' => 'Comment 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'User2' => array(
+					'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				'Tag' => array()
+			)
+		);
+		$expected = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '1', 'comment' => 'Comment 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'User2' => array(
+						'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+					),
+					'Tag' => array(
+						array('id' => 1, 'tag' => 'Tag 1'),
+						array('id' => 2, 'tag' => 'Tag 2')
+					)
+				),
+				array(
+					'id' => '2', 'comment' => 'Comment 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31',
+					'User2' => array(
+						'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+					),
+					'Tag' => array()
+				)
+			)
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'Comment', 'hasMany');
+		$this->assertEqual($data, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$merge = array(
+			array(
+				'Tag' => array(
+					'id' => '1', 'tag' => 'Tag 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Tag' => array(
+					'id' => '2', 'tag' => 'Tag 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Tag' => array(
+					'id' => '3', 'tag' => 'Tag 3', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$expected = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1', 'tag' => 'Tag 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				array(
+					'id' => '2', 'tag' => 'Tag 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				),
+				array(
+					'id' => '3', 'tag' => 'Tag 3', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'Tag', 'hasAndBelongsToMany');
+		$this->assertEqual($data, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			)
+		);
+		$merge = array(
+			array(
+				'Tag' => array(
+					'id' => '1', 'tag' => 'Tag 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Tag' => array(
+					'id' => '2', 'tag' => 'Tag 2', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			),
+			array(
+				'Tag' => array(
+					'id' => '3', 'tag' => 'Tag 3', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'
+				)
+			)
+		);
+		$expected = array(
+			'Article' => array(
+				'id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Tag' => array('id' => '1', 'tag' => 'Tag 1', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31')
+		);
+		$this->testDb->__mergeAssociation($data, $merge, 'Tag', 'hasOne');
+		$this->assertEqual($data, $expected);
+	}
+
+/**
+ * testRenderStatement method
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderStatement() {
+		$result = $this->testDb->renderStatement('select', array(
+			'fields' => 'id', 'table' => 'table', 'conditions' => 'WHERE 1=1',
+			'alias' => '', 'joins' => '', 'order' => '', 'limit' => '', 'group' => ''
+		));
+		$this->assertPattern('/^\s*SELECT\s+id\s+FROM\s+table\s+WHERE\s+1=1\s*$/', $result);
+
+		$result = $this->testDb->renderStatement('update', array('fields' => 'value=2', 'table' => 'table', 'conditions' => 'WHERE 1=1', 'alias' => ''));
+		$this->assertPattern('/^\s*UPDATE\s+table\s+SET\s+value=2\s+WHERE\s+1=1\s*$/', $result);
+
+		$result = $this->testDb->renderStatement('update', array('fields' => 'value=2', 'table' => 'table', 'conditions' => 'WHERE 1=1', 'alias' => 'alias', 'joins' => ''));
+		$this->assertPattern('/^\s*UPDATE\s+table\s+AS\s+alias\s+SET\s+value=2\s+WHERE\s+1=1\s*$/', $result);
+
+		$result = $this->testDb->renderStatement('delete', array('fields' => 'value=2', 'table' => 'table', 'conditions' => 'WHERE 1=1', 'alias' => ''));
+		$this->assertPattern('/^\s*DELETE\s+FROM\s+table\s+WHERE\s+1=1\s*$/', $result);
+
+		$result = $this->testDb->renderStatement('delete', array('fields' => 'value=2', 'table' => 'table', 'conditions' => 'WHERE 1=1', 'alias' => 'alias', 'joins' => ''));
+		$this->assertPattern('/^\s*DELETE\s+alias\s+FROM\s+table\s+AS\s+alias\s+WHERE\s+1=1\s*$/', $result);
+	}
+
+/**
+ * testStatements method
+ *
+ * @access public
+ * @return void
+ */
+	function testStatements() {
+		$Article =& ClassRegistry::init('Article');
+
+		$result = $this->testDb->update($Article, array('field1'), array('value1'));
+		$this->assertFalse($result);
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/^\s*UPDATE\s+' . $this->testDb->fullTableName('articles') . '\s+SET\s+`field1`\s*=\s*\'value1\'\s+WHERE\s+1 = 1\s*$/', $result);
+
+		$result = $this->testDb->update($Article, array('field1'), array('2'), '2=2');
+		$this->assertFalse($result);
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/^\s*UPDATE\s+' . $this->testDb->fullTableName('articles') . ' AS `Article`\s+LEFT JOIN\s+' . $this->testDb->fullTableName('users') . ' AS `User` ON \(`Article`.`user_id` = `User`.`id`\)\s+SET\s+`Article`\.`field1`\s*=\s*2\s+WHERE\s+2\s*=\s*2\s*$/', $result);
+
+		$result = $this->testDb->delete($Article);
+		$this->assertTrue($result);
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/^\s*DELETE\s+FROM\s+' . $this->testDb->fullTableName('articles') . '\s+WHERE\s+1 = 1\s*$/', $result);
+
+		$result = $this->testDb->delete($Article, true);
+		$this->assertTrue($result);
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/^\s*DELETE\s+`Article`\s+FROM\s+' . $this->testDb->fullTableName('articles') . '\s+AS `Article`\s+LEFT JOIN\s+' . $this->testDb->fullTableName('users') . ' AS `User` ON \(`Article`.`user_id` = `User`.`id`\)\s+WHERE\s+1\s*=\s*1\s*$/', $result);
+
+		$result = $this->testDb->delete($Article, '2=2');
+		$this->assertTrue($result);
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/^\s*DELETE\s+`Article`\s+FROM\s+' . $this->testDb->fullTableName('articles') . '\s+AS `Article`\s+LEFT JOIN\s+' . $this->testDb->fullTableName('users') . ' AS `User` ON \(`Article`.`user_id` = `User`.`id`\)\s+WHERE\s+2\s*=\s*2\s*$/', $result);
+
+		$result = $this->testDb->hasAny($Article, '1=2');
+		$this->assertFalse($result);
+
+		$result = $this->testDb->insertMulti('articles', array('field'), array('(1)', '(2)'));
+		$this->assertFalse($result);
+		$result = $this->testDb->getLastQuery();
+		$this->assertPattern('/^\s*INSERT INTO\s+' . $this->testDb->fullTableName('articles') . '\s+\(`field`\)\s+VALUES\s+\(1\),\s*\(2\)\s*$/', $result);
+	}
+
+/**
+ * testSchema method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchema() {
+		$Schema =& new CakeSchema();
+		$Schema->tables = array('table' => array(), 'anotherTable' => array());
+
+		$this->expectError();
+		$result = $this->testDb->dropSchema(null);
+		$this->assertTrue($result === null);
+
+		$result = $this->testDb->dropSchema($Schema, 'non_existing');
+		$this->assertTrue(empty($result));
+
+		$result = $this->testDb->dropSchema($Schema, 'table');
+		$this->assertPattern('/^\s*DROP TABLE IF EXISTS\s+' . $this->testDb->fullTableName('table') . ';\s*$/s', $result);
+	}
+
+/**
+ * testMagicMethodQuerying method
+ *
+ * @access public
+ * @return void
+ */
+	function testMagicMethodQuerying() {
+		$result = $this->testDb->query('findByFieldName', array('value'), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_name' => 'value'),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('findByFindBy', array('value'), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.find_by' => 'value'),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('findAllByFieldName', array('value'), $this->Model);
+		$expected = array('all', array(
+			'conditions' => array('TestModel.field_name' => 'value'),
+			'fields' => null, 'order' => null, 'limit' => null,
+			'page' => null, 'recursive' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('findAllById', array('a'), $this->Model);
+		$expected = array('all', array(
+			'conditions' => array('TestModel.id' => 'a'),
+			'fields' => null, 'order' => null, 'limit' => null,
+			'page' => null, 'recursive' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('findByFieldName', array(array('value1', 'value2', 'value3')), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_name' => array('value1', 'value2', 'value3')),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('findByFieldName', array(null), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_name' => null),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('findByFieldName', array('= a'), $this->Model);
+		$expected = array('first', array(
+			'conditions' => array('TestModel.field_name' => '= a'),
+			'fields' => null, 'order' => null, 'recursive' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('findByFieldName', array(), $this->Model);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->query('directCall', array(), $this->Model);
+		$this->assertFalse($result);
+
+		$result = $this->testDb->query('directCall', true, $this->Model);
+		$this->assertFalse($result);
+
+		$result = $this->testDb->query('directCall', false, $this->Model);
+		$this->assertFalse($result);
+	}
+
+/**
+ * testOrderParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testOrderParsing() {
+		$result = $this->testDb->order("ADDTIME(Event.time_begin, '-06:00:00') ASC");
+		$expected = " ORDER BY ADDTIME(`Event`.`time_begin`, '-06:00:00') ASC";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->order("title, id");
+		$this->assertPattern('/^\s*ORDER BY\s+`title`\s+ASC,\s+`id`\s+ASC\s*$/', $result);
+
+		$result = $this->testDb->order("title desc, id desc");
+		$this->assertPattern('/^\s*ORDER BY\s+`title`\s+desc,\s+`id`\s+desc\s*$/', $result);
+
+		$result = $this->testDb->order(array("title desc, id desc"));
+		$this->assertPattern('/^\s*ORDER BY\s+`title`\s+desc,\s+`id`\s+desc\s*$/', $result);
+
+		$result = $this->testDb->order(array("title", "id"));
+		$this->assertPattern('/^\s*ORDER BY\s+`title`\s+ASC,\s+`id`\s+ASC\s*$/', $result);
+
+		$result = $this->testDb->order(array(array('title'), array('id')));
+		$this->assertPattern('/^\s*ORDER BY\s+`title`\s+ASC,\s+`id`\s+ASC\s*$/', $result);
+
+		$result = $this->testDb->order(array("Post.title" => 'asc', "Post.id" => 'desc'));
+		$this->assertPattern('/^\s*ORDER BY\s+`Post`.`title`\s+asc,\s+`Post`.`id`\s+desc\s*$/', $result);
+
+		$result = $this->testDb->order(array(array("Post.title" => 'asc', "Post.id" => 'desc')));
+		$this->assertPattern('/^\s*ORDER BY\s+`Post`.`title`\s+asc,\s+`Post`.`id`\s+desc\s*$/', $result);
+
+		$result = $this->testDb->order(array("title"));
+		$this->assertPattern('/^\s*ORDER BY\s+`title`\s+ASC\s*$/', $result);
+
+		$result = $this->testDb->order(array(array("title")));
+		$this->assertPattern('/^\s*ORDER BY\s+`title`\s+ASC\s*$/', $result);
+
+		$result = $this->testDb->order("Dealer.id = 7 desc, Dealer.id = 3 desc, Dealer.title asc");
+		$expected = " ORDER BY `Dealer`.`id` = 7 desc, `Dealer`.`id` = 3 desc, `Dealer`.`title` asc";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->order(array("Page.name" => "='test' DESC"));
+		$this->assertPattern("/^\s*ORDER BY\s+`Page`\.`name`\s*='test'\s+DESC\s*$/", $result);
+
+		$result = $this->testDb->order("Page.name = 'view' DESC");
+		$this->assertPattern("/^\s*ORDER BY\s+`Page`\.`name`\s*=\s*'view'\s+DESC\s*$/", $result);
+
+		$result = $this->testDb->order("(Post.views)");
+		$this->assertPattern("/^\s*ORDER BY\s+\(`Post`\.`views`\)\s+ASC\s*$/", $result);
+
+		$result = $this->testDb->order("(Post.views)*Post.views");
+		$this->assertPattern("/^\s*ORDER BY\s+\(`Post`\.`views`\)\*`Post`\.`views`\s+ASC\s*$/", $result);
+
+		$result = $this->testDb->order("(Post.views) * Post.views");
+		$this->assertPattern("/^\s*ORDER BY\s+\(`Post`\.`views`\) \* `Post`\.`views`\s+ASC\s*$/", $result);
+
+		$result = $this->testDb->order("(Model.field1 + Model.field2) * Model.field3");
+		$this->assertPattern("/^\s*ORDER BY\s+\(`Model`\.`field1` \+ `Model`\.`field2`\) \* `Model`\.`field3`\s+ASC\s*$/", $result);
+
+		$result = $this->testDb->order("Model.name+0 ASC");
+		$this->assertPattern("/^\s*ORDER BY\s+`Model`\.`name`\+0\s+ASC\s*$/", $result);
+
+		$result = $this->testDb->order("Anuncio.destaque & 2 DESC");
+		$expected = ' ORDER BY `Anuncio`.`destaque` & 2 DESC';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->order("3963.191 * id");
+		$expected = ' ORDER BY 3963.191 * id ASC';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->order(array('Property.sale_price IS NULL'));
+		$expected = ' ORDER BY `Property`.`sale_price` IS NULL ASC';
+		$this->assertEqual($result, $expected);
+		
+		$result = $this->testDb->order(array('Export.column-name' => 'ASC'));
+		$expected = ' ORDER BY `Export`.`column-name` ASC';
+		$this->assertEqual($result, $expected, 'Columns with -s are not working with order()');
+	}
+
+/**
+ * testComplexSortExpression method
+ *
+ * @return void
+ * @access public
+ */
+	function testComplexSortExpression() {
+		$result = $this->testDb->order(array('(Model.field > 100) DESC', 'Model.field ASC'));
+		$this->assertPattern("/^\s*ORDER BY\s+\(`Model`\.`field`\s+>\s+100\)\s+DESC,\s+`Model`\.`field`\s+ASC\s*$/", $result);
+	}
+
+/**
+ * testCalculations method
+ *
+ * @access public
+ * @return void
+ */
+	function testCalculations() {
+		$result = $this->testDb->calculate($this->Model, 'count');
+		$this->assertEqual($result, 'COUNT(*) AS `count`');
+
+		$result = $this->testDb->calculate($this->Model, 'count', array('id'));
+		$this->assertEqual($result, 'COUNT(`id`) AS `count`');
+
+		$result = $this->testDb->calculate(
+			$this->Model,
+			'count',
+			array($this->testDb->expression('DISTINCT id'))
+		);
+		$this->assertEqual($result, 'COUNT(DISTINCT id) AS `count`');
+
+		$result = $this->testDb->calculate($this->Model, 'count', array('id', 'id_count'));
+		$this->assertEqual($result, 'COUNT(`id`) AS `id_count`');
+
+		$result = $this->testDb->calculate($this->Model, 'count', array('Model.id', 'id_count'));
+		$this->assertEqual($result, 'COUNT(`Model`.`id`) AS `id_count`');
+
+		$result = $this->testDb->calculate($this->Model, 'max', array('id'));
+		$this->assertEqual($result, 'MAX(`id`) AS `id`');
+
+		$result = $this->testDb->calculate($this->Model, 'max', array('Model.id', 'id'));
+		$this->assertEqual($result, 'MAX(`Model`.`id`) AS `id`');
+
+		$result = $this->testDb->calculate($this->Model, 'max', array('`Model`.`id`', 'id'));
+		$this->assertEqual($result, 'MAX(`Model`.`id`) AS `id`');
+
+		$result = $this->testDb->calculate($this->Model, 'min', array('`Model`.`id`', 'id'));
+		$this->assertEqual($result, 'MIN(`Model`.`id`) AS `id`');
+
+		$result = $this->testDb->calculate($this->Model, 'min', 'left');
+		$this->assertEqual($result, 'MIN(`left`) AS `left`');
+	}
+
+/**
+ * testLength method
+ *
+ * @access public
+ * @return void
+ */
+	function testLength() {
+		$result = $this->testDb->length('varchar(255)');
+		$expected = 255;
+		$this->assertIdentical($result, $expected);
+
+		$result = $this->testDb->length('int(11)');
+		$expected = 11;
+		$this->assertIdentical($result, $expected);
+
+		$result = $this->testDb->length('float(5,3)');
+		$expected = '5,3';
+		$this->assertIdentical($result, $expected);
+
+		$result = $this->testDb->length('decimal(5,2)');
+		$expected = '5,2';
+		$this->assertIdentical($result, $expected);
+
+		$result = $this->testDb->length("enum('test','me','now')");
+		$expected = 4;
+		$this->assertIdentical($result, $expected);
+
+		$result = $this->testDb->length("set('a','b','cd')");
+		$expected = 2;
+		$this->assertIdentical($result, $expected);
+
+		$this->expectError();
+		$result = $this->testDb->length(false);
+		$this->assertTrue($result === null);
+
+		$result = $this->testDb->length('datetime');
+		$expected = null;
+		$this->assertIdentical($result, $expected);
+
+		$result = $this->testDb->length('text');
+		$expected = null;
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testBuildIndex method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildIndex() {
+		$data = array(
+			'PRIMARY' => array('column' => 'id')
+		);
+		$result = $this->testDb->buildIndex($data);
+		$expected = array('PRIMARY KEY  (`id`)');
+		$this->assertIdentical($result, $expected);
+
+		$data = array(
+			'MyIndex' => array('column' => 'id', 'unique' => true)
+		);
+		$result = $this->testDb->buildIndex($data);
+		$expected = array('UNIQUE KEY `MyIndex` (`id`)');
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'MyIndex' => array('column' => array('id', 'name'), 'unique' => true)
+		);
+		$result = $this->testDb->buildIndex($data);
+		$expected = array('UNIQUE KEY `MyIndex` (`id`, `name`)');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testBuildColumn method
+ *
+ * @access public
+ * @return void
+ */
+	function testBuildColumn() {
+		$this->expectError();
+		$data = array(
+			'name' => 'testName',
+			'type' => 'varchar(255)',
+			'default',
+			'null' => true,
+			'key'
+		);
+		$this->testDb->buildColumn($data);
+
+		$data = array(
+			'name' => 'testName',
+			'type' => 'string',
+			'length' => 255,
+			'default',
+			'null' => true,
+			'key'
+		);
+		$result = $this->testDb->buildColumn($data);
+		$expected = '`testName` varchar(255) DEFAULT NULL';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'int_field',
+			'type' => 'integer',
+			'default' => '',
+			'null' => false,
+		);
+		$restore = $this->testDb->columns;
+
+		$this->testDb->columns = array('integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'), );
+		$result = $this->testDb->buildColumn($data);
+		$expected = '`int_field` int(11) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$this->testDb->fieldParameters['param'] = array(
+			'value' => 'COLLATE',
+			'quote' => false,
+			'join' => ' ',
+			'column' => 'Collate',
+			'position' => 'beforeDefault',
+			'options' => array('GOOD', 'OK')
+		);
+		$data = array(
+			'name' => 'int_field',
+			'type' => 'integer',
+			'default' => '',
+			'null' => false,
+			'param' => 'BAD'
+		);
+		$result = $this->testDb->buildColumn($data);
+		$expected = '`int_field` int(11) NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'int_field',
+			'type' => 'integer',
+			'default' => '',
+			'null' => false,
+			'param' => 'GOOD'
+		);
+		$result = $this->testDb->buildColumn($data);
+		$expected = '`int_field` int(11) COLLATE GOOD NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$this->testDb->columns = $restore;
+
+		$data = array(
+			'name' => 'created',
+			'type' => 'timestamp',
+			'default' => 'current_timestamp',
+			'null' => false,
+ 		);
+		$result = $this->db->buildColumn($data);
+		$expected = '`created` timestamp DEFAULT CURRENT_TIMESTAMP NOT NULL';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'created',
+			'type' => 'timestamp',
+			'default' => 'CURRENT_TIMESTAMP',
+			'null' => true,
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '`created` timestamp DEFAULT CURRENT_TIMESTAMP';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'modified',
+			'type' => 'timestamp',
+			'null' => true,
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '`modified` timestamp NULL';
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'name' => 'modified',
+			'type' => 'timestamp',
+			'default' => null,
+			'null' => true,
+		);
+		$result = $this->db->buildColumn($data);
+		$expected = '`modified` timestamp NULL';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test hasAny()
+ *
+ * @return void
+ */
+	function testHasAny() {
+		$this->testDb->hasAny($this->Model, array());
+		$expected = 'SELECT COUNT(`TestModel`.`id`) AS count FROM `test_models` AS `TestModel` WHERE 1 = 1';
+		$this->assertEqual(end($this->testDb->simulated), $expected);
+
+		$this->testDb->hasAny($this->Model, array('TestModel.name' => 'harry'));
+		$expected = "SELECT COUNT(`TestModel`.`id`) AS count FROM `test_models` AS `TestModel` WHERE `TestModel`.`name` = 'harry'";
+		$this->assertEqual(end($this->testDb->simulated), $expected);
+	}
+
+/**
+ * testIntrospectType method
+ *
+ * @access public
+ * @return void
+ */
+	function testIntrospectType() {
+		$this->assertEqual($this->testDb->introspectType(0), 'integer');
+		$this->assertEqual($this->testDb->introspectType(2), 'integer');
+		$this->assertEqual($this->testDb->introspectType('2'), 'string');
+		$this->assertEqual($this->testDb->introspectType('2.2'), 'string');
+		$this->assertEqual($this->testDb->introspectType(2.2), 'float');
+		$this->assertEqual($this->testDb->introspectType('stringme'), 'string');
+		$this->assertEqual($this->testDb->introspectType('0stringme'), 'string');
+
+		$data = array(2.2);
+		$this->assertEqual($this->testDb->introspectType($data), 'float');
+
+		$data = array('2.2');
+		$this->assertEqual($this->testDb->introspectType($data), 'float');
+
+		$data = array(2);
+		$this->assertEqual($this->testDb->introspectType($data), 'integer');
+
+		$data = array('2');
+		$this->assertEqual($this->testDb->introspectType($data), 'integer');
+
+		$data = array('string');
+		$this->assertEqual($this->testDb->introspectType($data), 'string');
+
+		$data = array(2.2, '2.2');
+		$this->assertEqual($this->testDb->introspectType($data), 'float');
+
+		$data = array(2, '2');
+		$this->assertEqual($this->testDb->introspectType($data), 'integer');
+
+		$data = array('string one', 'string two');
+		$this->assertEqual($this->testDb->introspectType($data), 'string');
+
+		$data = array('2.2', 3);
+		$this->assertEqual($this->testDb->introspectType($data), 'integer');
+
+		$data = array('2.2', '0stringme');
+		$this->assertEqual($this->testDb->introspectType($data), 'string');
+
+		$data = array(2.2, 3);
+		$this->assertEqual($this->testDb->introspectType($data), 'integer');
+
+		$data = array(2.2, '0stringme');
+		$this->assertEqual($this->testDb->introspectType($data), 'string');
+
+		$data = array(2, 'stringme');
+		$this->assertEqual($this->testDb->introspectType($data), 'string');
+
+		$data = array(2, '2.2', 'stringgme');
+		$this->assertEqual($this->testDb->introspectType($data), 'string');
+
+		$data = array(2, '2.2');
+		$this->assertEqual($this->testDb->introspectType($data), 'integer');
+
+		$data = array(2, 2.2);
+		$this->assertEqual($this->testDb->introspectType($data), 'integer');
+
+
+		// NULL
+		$result = $this->testDb->value(null, 'boolean');
+		$this->assertEqual($result, 'NULL');
+
+		// EMPTY STRING
+		$result = $this->testDb->value('', 'boolean');
+		$this->assertEqual($result, "NULL");
+
+
+		// BOOLEAN
+		$result = $this->testDb->value('true', 'boolean');
+		$this->assertEqual($result, 1);
+
+		$result = $this->testDb->value('false', 'boolean');
+		$this->assertEqual($result, 1);
+
+		$result = $this->testDb->value(true, 'boolean');
+		$this->assertEqual($result, 1);
+
+		$result = $this->testDb->value(false, 'boolean');
+		$this->assertEqual($result, 0);
+
+		$result = $this->testDb->value(1, 'boolean');
+		$this->assertEqual($result, 1);
+
+		$result = $this->testDb->value(0, 'boolean');
+		$this->assertEqual($result, 0);
+
+		$result = $this->testDb->value('abc', 'boolean');
+		$this->assertEqual($result, 1);
+
+		$result = $this->testDb->value(1.234, 'boolean');
+		$this->assertEqual($result, 1);
+
+		$result = $this->testDb->value('1.234e05', 'boolean');
+		$this->assertEqual($result, 1);
+
+		// NUMBERS
+		$result = $this->testDb->value(123, 'integer');
+		$this->assertEqual($result, 123);
+
+		$result = $this->testDb->value('123', 'integer');
+		$this->assertEqual($result, '123');
+
+		$result = $this->testDb->value('0123', 'integer');
+		$this->assertEqual($result, "'0123'");
+
+		$result = $this->testDb->value('0x123ABC', 'integer');
+		$this->assertEqual($result, "'0x123ABC'");
+
+		$result = $this->testDb->value('0x123', 'integer');
+		$this->assertEqual($result, "'0x123'");
+
+		$result = $this->testDb->value(1.234, 'float');
+		$this->assertEqual($result, 1.234);
+
+		$result = $this->testDb->value('1.234', 'float');
+		$this->assertEqual($result, '1.234');
+
+		$result = $this->testDb->value(' 1.234 ', 'float');
+		$this->assertEqual($result, "' 1.234 '");
+
+		$result = $this->testDb->value('1.234e05', 'float');
+		$this->assertEqual($result, "'1.234e05'");
+
+		$result = $this->testDb->value('1.234e+5', 'float');
+		$this->assertEqual($result, "'1.234e+5'");
+
+		$result = $this->testDb->value('1,234', 'float');
+		$this->assertEqual($result, "'1,234'");
+
+		$result = $this->testDb->value('FFF', 'integer');
+		$this->assertEqual($result, "'FFF'");
+
+		$result = $this->testDb->value('abc', 'integer');
+		$this->assertEqual($result, "'abc'");
+
+		// STRINGS
+		$result = $this->testDb->value('123', 'string');
+		$this->assertEqual($result, "'123'");
+
+		$result = $this->testDb->value(123, 'string');
+		$this->assertEqual($result, "'123'");
+
+		$result = $this->testDb->value(1.234, 'string');
+		$this->assertEqual($result, "'1.234'");
+
+		$result = $this->testDb->value('abc', 'string');
+		$this->assertEqual($result, "'abc'");
+
+		$result = $this->testDb->value(' abc ', 'string');
+		$this->assertEqual($result, "' abc '");
+
+		$result = $this->testDb->value('a bc', 'string');
+		$this->assertEqual($result, "'a bc'");
+	}
+
+/**
+ * testValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testValue() {
+		$result = $this->testDb->value('{$__cakeForeignKey__$}');
+		$this->assertEqual($result, '{$__cakeForeignKey__$}');
+
+		$result = $this->testDb->value(array('first', 2, 'third'));
+		$expected = array('\'first\'', 2, '\'third\'');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testReconnect method
+ *
+ * @access public
+ * @return void
+ */
+	function testReconnect() {
+		$this->testDb->reconnect(array('prefix' => 'foo'));
+		$this->assertTrue($this->testDb->connected);
+		$this->assertEqual($this->testDb->config['prefix'], 'foo');
+	}
+
+/**
+ * testRealQueries method
+ *
+ * @access public
+ * @return void
+ */
+	function testRealQueries() {
+		$this->loadFixtures('Apple', 'Article', 'User', 'Comment', 'Tag');
+
+		$Apple =& ClassRegistry::init('Apple');
+		$Article =& ClassRegistry::init('Article');
+
+		$result = $this->db->rawQuery('SELECT color, name FROM ' . $this->db->fullTableName('apples'));
+		$this->assertTrue(!empty($result));
+
+		$result = $this->db->fetchRow($result);
+		$expected = array($this->db->fullTableName('apples', false) => array(
+			'color' => 'Red 1',
+			'name' => 'Red Apple 1'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->fetchAll('SELECT name FROM ' . $this->testDb->fullTableName('apples') . ' ORDER BY id');
+		$expected = array(
+			array($this->db->fullTableName('apples', false) => array('name' => 'Red Apple 1')),
+			array($this->db->fullTableName('apples', false) => array('name' => 'Bright Red Apple')),
+			array($this->db->fullTableName('apples', false) => array('name' => 'green blue')),
+			array($this->db->fullTableName('apples', false) => array('name' => 'Test Name')),
+			array($this->db->fullTableName('apples', false) => array('name' => 'Blue Green')),
+			array($this->db->fullTableName('apples', false) => array('name' => 'My new apple')),
+			array($this->db->fullTableName('apples', false) => array('name' => 'Some odd color'))
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->field($this->testDb->fullTableName('apples', false), 'SELECT color, name FROM ' . $this->testDb->fullTableName('apples') . ' ORDER BY id');
+		$expected = array(
+			'color' => 'Red 1',
+			'name' => 'Red Apple 1'
+		);
+		$this->assertEqual($result, $expected);
+
+		$Apple->unbindModel(array(), false);
+		$result = $this->db->read($Apple, array(
+			'fields' => array($Apple->escapeField('name')),
+			'conditions' => null,
+			'recursive' => -1
+		));
+		$expected = array(
+			array('Apple' => array('name' => 'Red Apple 1')),
+			array('Apple' => array('name' => 'Bright Red Apple')),
+			array('Apple' => array('name' => 'green blue')),
+			array('Apple' => array('name' => 'Test Name')),
+			array('Apple' => array('name' => 'Blue Green')),
+			array('Apple' => array('name' => 'My new apple')),
+			array('Apple' => array('name' => 'Some odd color'))
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->db->read($Article, array(
+			'fields' => array('id', 'user_id', 'title'),
+			'conditions' => null,
+			'recursive' => 1
+		));
+
+		$this->assertTrue(Set::matches('/Article[id=1]', $result));
+		$this->assertTrue(Set::matches('/Comment[id=1]', $result));
+		$this->assertTrue(Set::matches('/Comment[id=2]', $result));
+		$this->assertFalse(Set::matches('/Comment[id=10]', $result));
+	}
+
+/**
+ * testName method
+ *
+ * @access public
+ * @return void
+ */
+	function testName() {
+		$result = $this->testDb->name('name');
+		$expected = '`name`';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name(array('name', 'Model.*'));
+		$expected = array('`name`', '`Model`.*');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('MTD()');
+		$expected = 'MTD()';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('(sm)');
+		$expected = '(sm)';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('name AS x');
+		$expected = '`name` AS `x`';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('Model.name AS x');
+		$expected = '`Model`.`name` AS `x`';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('Function(Something.foo)');
+		$expected = 'Function(`Something`.`foo`)';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('Function(SubFunction(Something.foo))');
+		$expected = 'Function(SubFunction(`Something`.`foo`))';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('Function(Something.foo) AS x');
+		$expected = 'Function(`Something`.`foo`) AS `x`';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('name-with-minus');
+		$expected = '`name-with-minus`';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name(array('my-name', 'Foo-Model.*'));
+		$expected = array('`my-name`', '`Foo-Model`.*');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name(array('Team.P%', 'Team.G/G'));
+		$expected = array('`Team`.`P%`', '`Team`.`G/G`');
+		$this->assertEqual($result, $expected);
+
+		$result = $this->testDb->name('Model.name as y');
+		$expected = '`Model`.`name` AS `y`';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that cacheMethod works as exepected
+ *
+ * @return void
+ */
+	function testCacheMethod() {
+		$this->testDb->cacheMethods = true;
+		$result = $this->testDb->cacheMethod('name', 'some-key', 'stuff');
+		$this->assertEqual($result, 'stuff');
+
+		$result = $this->testDb->cacheMethod('name', 'some-key');
+		$this->assertEqual($result, 'stuff');
+
+		$result = $this->testDb->cacheMethod('conditions', 'some-key');
+		$this->assertNull($result);
+
+		$result = $this->testDb->cacheMethod('name', 'other-key');
+		$this->assertNull($result);
+
+		$this->testDb->cacheMethods = false;
+		$result = $this->testDb->cacheMethod('name', 'some-key', 'stuff');
+		$this->assertEqual($result, 'stuff');
+
+		$result = $this->testDb->cacheMethod('name', 'some-key');
+		$this->assertNull($result);
+	}
+
+/**
+ * testLog method
+ *
+ * @access public
+ * @return void
+ */
+	function testLog() {
+		$this->testDb->logQuery('Query 1');
+		$this->testDb->logQuery('Query 2');
+
+		$log = $this->testDb->getLog(false, false);
+		$result = Set::extract($log['log'], '/query');
+		$expected = array('Query 1', 'Query 2');
+		$this->assertEqual($result, $expected);
+
+		$oldError = $this->testDb->error;
+		$this->testDb->error = true;
+		$result = $this->testDb->logQuery('Error 1');
+		$this->assertFalse($result);
+		$this->testDb->error = $oldError;
+
+		$log = $this->testDb->getLog(false, false);
+		$result = Set::combine($log['log'], '/query', '/error');
+		$expected = array('Query 1' => false, 'Query 2' => false, 'Error 1' => true);
+		$this->assertEqual($result, $expected);
+
+		Configure::write('debug', 2);
+		ob_start();
+		$this->testDb->showLog();
+		$contents = ob_get_clean();
+
+		$this->assertPattern('/Query 1/s', $contents);
+		$this->assertPattern('/Query 2/s', $contents);
+		$this->assertPattern('/Error 1/s', $contents);
+
+		ob_start();
+		$this->testDb->showLog(true);
+		$contents = ob_get_clean();
+
+		$this->assertPattern('/Query 1/s', $contents);
+		$this->assertPattern('/Query 2/s', $contents);
+		$this->assertPattern('/Error 1/s', $contents);
+
+		$oldError = $this->testDb->error;
+		$oldDebug = Configure::read('debug');
+		Configure::write('debug', 2);
+
+		$this->testDb->error = true;
+		$this->expectError();
+		ob_start();
+		$this->testDb->showQuery('Error 2');
+		$contents = ob_get_clean();
+
+		$this->assertPattern('/Error 2/s', $contents);
+
+		$this->testDb->error = $oldError;
+		Configure::write('debug', $oldDebug);
+	}
+
+/**
+ * test getting the query log as an array.
+ *
+ * @return void
+ */
+	function testGetLog() {
+		$this->testDb->logQuery('Query 1');
+		$this->testDb->logQuery('Query 2');
+
+		$oldError = $this->testDb->error;
+		$this->testDb->error = true;
+		$result = $this->testDb->logQuery('Error 1');
+		$this->assertFalse($result);
+		$this->testDb->error = $oldError;
+
+		$log = $this->testDb->getLog();
+		$expected = array('query' => 'Query 1', 'error' => '', 'affected' => '', 'numRows' => '', 'took' => '');
+		$this->assertEqual($log['log'][0], $expected);
+		$expected = array('query' => 'Query 2', 'error' => '', 'affected' => '', 'numRows' => '', 'took' => '');
+		$this->assertEqual($log['log'][1], $expected);
+		$expected = array('query' => 'Error 1', 'error' => true, 'affected' => '', 'numRows' => '', 'took' => '');
+		$this->assertEqual($log['log'][2], $expected);
+	}
+
+/**
+ * test that execute runs queries.
+ *
+ * @return void
+ */
+	function testExecute() {
+		$query = 'SELECT * FROM ' . $this->testDb->fullTableName('articles') . ' WHERE 1 = 1';
+
+		$this->db->_result = null;
+		$this->db->took = null;
+		$this->db->affected = null;
+		$result = $this->db->execute($query, array('stats' => false));
+		$this->assertNotNull($result, 'No query performed! %s');
+		$this->assertNull($this->db->took, 'Stats were set %s');
+		$this->assertNull($this->db->affected, 'Stats were set %s');
+
+		$result = $this->db->execute($query);
+		$this->assertNotNull($result, 'No query performed! %s');
+		$this->assertNotNull($this->db->took, 'Stats were not set %s');
+		$this->assertNotNull($this->db->affected, 'Stats were not set %s');
+	}
+
+/**
+ * test that query() returns boolean values from operations like CREATE TABLE
+ *
+ * @return void
+ */
+	function testFetchAllBooleanReturns() {
+		$name = $this->db->fullTableName('test_query');
+		$query = "CREATE TABLE {$name} (name varchar(10));";
+		$result = $this->db->query($query);
+		$this->assertTrue($result, 'Query did not return a boolean. %s');
+
+		$query = "DROP TABLE {$name};";
+		$result = $this->db->fetchAll($query);
+		$this->assertTrue($result, 'Query did not return a boolean. %s');
+	}
+
+/**
+ * test ShowQuery generation of regular and error messages
+ *
+ * @return void
+ */
+	function testShowQuery() {
+		$this->testDb->error = false;
+		ob_start();
+		$this->testDb->showQuery('Some Query');
+		$contents = ob_get_clean();
+		$this->assertPattern('/Some Query/s', $contents);
+		$this->assertPattern('/Aff:/s', $contents);
+		$this->assertPattern('/Num:/s', $contents);
+		$this->assertPattern('/Took:/s', $contents);
+
+		$this->expectError();
+		$this->testDb->error = true;
+		ob_start();
+		$this->testDb->showQuery('Another Query');
+		$contents = ob_get_clean();
+		$this->assertPattern('/Another Query/s', $contents);
+		$this->assertNoPattern('/Aff:/s', $contents);
+		$this->assertNoPattern('/Num:/s', $contents);
+		$this->assertNoPattern('/Took:/s', $contents);
+	}
+
+/**
+ * test fields generating usable virtual fields to use in query
+ *
+ * @return void
+ */
+	function testVirtualFields() {
+		$this->loadFixtures('Article');
+
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'this_moment' => 'NOW()',
+			'two' => '1 + 1',
+			'comment_count' => 'SELECT COUNT(*) FROM ' . $this->db->fullTableName('comments') .
+				' WHERE Article.id = ' . $this->db->fullTableName('comments') . '.article_id'
+		);
+		$result = $this->db->fields($Article);
+		$expected = array(
+			'`Article`.`id`',
+			'`Article`.`user_id`',
+			'`Article`.`title`',
+			'`Article`.`body`',
+			'`Article`.`published`',
+			'`Article`.`created`',
+			'`Article`.`updated`',
+			'(NOW()) AS  `Article__this_moment`',
+			'(1 + 1) AS  `Article__two`',
+			'(SELECT COUNT(*) FROM comments WHERE `Article`.`id` = `comments`.`article_id`) AS  `Article__comment_count`'
+		);
+		$this->assertEqual($expected, $result);
+
+		$result = $this->db->fields($Article, null, array('this_moment', 'title'));
+		$expected = array(
+			'`Article`.`title`',
+			'(NOW()) AS  `Article__this_moment`',
+		);
+		$this->assertEqual($expected, $result);
+
+		$result = $this->db->fields($Article, null, array('Article.title', 'Article.this_moment'));
+		$expected = array(
+			'`Article`.`title`',
+			'(NOW()) AS  `Article__this_moment`',
+		);
+		$this->assertEqual($expected, $result);
+
+		$result = $this->db->fields($Article, null, array('Article.this_moment', 'Article.title'));
+		$expected = array(
+			'`Article`.`title`',
+			'(NOW()) AS  `Article__this_moment`',
+		);
+		$this->assertEqual($expected, $result);
+
+		$result = $this->db->fields($Article, null, array('Article.*'));
+		$expected = array(
+			'`Article`.*',
+			'(NOW()) AS  `Article__this_moment`',
+			'(1 + 1) AS  `Article__two`',
+			'(SELECT COUNT(*) FROM comments WHERE `Article`.`id` = `comments`.`article_id`) AS  `Article__comment_count`'
+		);
+		$this->assertEqual($expected, $result);
+
+		$result = $this->db->fields($Article, null, array('*'));
+		$expected = array(
+			'*',
+			'(NOW()) AS  `Article__this_moment`',
+			'(1 + 1) AS  `Article__two`',
+			'(SELECT COUNT(*) FROM comments WHERE `Article`.`id` = `comments`.`article_id`) AS  `Article__comment_count`'
+		);
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test conditions to generate query conditions for virtual fields
+ *
+ * @return void
+ */
+	function testVirtualFieldsInConditions() {
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'this_moment' => 'NOW()',
+			'two' => '1 + 1',
+			'comment_count' => 'SELECT COUNT(*) FROM ' . $this->db->fullTableName('comments') .
+				' WHERE Article.id = ' . $this->db->fullTableName('comments') . '.article_id'
+		);
+		$conditions = array('two' => 2);
+		$result = $this->db->conditions($conditions, true, false, $Article);
+		$expected = '(1 + 1) = 2';
+		$this->assertEqual($expected, $result);
+
+		$conditions = array('this_moment BETWEEN ? AND ?' => array(1,2));
+		$expected = 'NOW() BETWEEN 1 AND 2';
+		$result = $this->db->conditions($conditions, true, false, $Article);
+		$this->assertEqual($expected, $result);
+
+		$conditions = array('comment_count >' => 5);
+		$expected = '(SELECT COUNT(*) FROM comments WHERE `Article`.`id` = `comments`.`article_id`) > 5';
+		$result = $this->db->conditions($conditions, true, false, $Article);
+		$this->assertEqual($expected, $result);
+
+		$conditions = array('NOT' => array('two' => 2));
+		$result = $this->db->conditions($conditions, true, false, $Article);
+		$expected = 'NOT ((1 + 1) = 2)';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test that virtualFields with complex functions and aliases work.
+ *
+ * @return void
+ */
+	function testConditionsWithComplexVirtualFields() {
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'distance' => 'ACOS(SIN(20 * PI() / 180)
+					* SIN(Article.latitude * PI() / 180)
+					+ COS(20 * PI() / 180)
+					* COS(Article.latitude * PI() / 180)
+					* COS((50 - Article.longitude) * PI() / 180)
+				) * 180 / PI() * 60 * 1.1515 * 1.609344'
+		);
+		$conditions = array('distance >=' => 20);
+		$result = $this->db->conditions($conditions, true, true, $Article);
+
+		$this->assertPattern('/\) >= 20/', $result);
+		$this->assertPattern('/[`\'"]Article[`\'"].[`\'"]latitude[`\'"]/', $result);
+		$this->assertPattern('/[`\'"]Article[`\'"].[`\'"]longitude[`\'"]/', $result);
+	}
+
+/**
+ * test order to generate query order clause for virtual fields
+ *
+ * @return void
+ */
+	function testVirtualFieldsInOrder() {
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'this_moment' => 'NOW()',
+			'two' => '1 + 1',
+		);
+		$order = array('two', 'this_moment');
+		$result = $this->db->order($order, 'ASC', $Article);
+		$expected = ' ORDER BY (1 + 1) ASC, (NOW()) ASC';
+		$this->assertEqual($expected, $result);
+
+		$order = array('Article.two', 'Article.this_moment');
+		$result = $this->db->order($order, 'ASC', $Article);
+		$expected = ' ORDER BY (1 + 1) ASC, (NOW()) ASC';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test calculate to generate claculate statements on virtual fields
+ *
+ * @return void
+ */
+	function testVirtualFieldsInCalculate() {
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'this_moment' => 'NOW()',
+			'two' => '1 + 1',
+			'comment_count' => 'SELECT COUNT(*) FROM ' . $this->db->fullTableName('comments') .
+				' WHERE Article.id = ' . $this->db->fullTableName('comments'). '.article_id'
+		);
+
+		$result = $this->db->calculate($Article, 'count', array('this_moment'));
+		$expected = 'COUNT(NOW()) AS `count`';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->db->calculate($Article, 'max', array('comment_count'));
+		$expected = 'MAX(SELECT COUNT(*) FROM comments WHERE `Article`.`id` = `comments`.`article_id`) AS `comment_count`';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test a full example of using virtual fields
+ *
+ * @return void
+ */
+	function testVirtualFieldsFetch() {
+		$this->loadFixtures('Article', 'Comment');
+
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'comment_count' => 'SELECT COUNT(*) FROM ' . $this->db->fullTableName('comments') .
+				' WHERE Article.id = ' . $this->db->fullTableName('comments') . '.article_id'
+		);
+
+		$conditions = array('comment_count >' => 2);
+		$query = 'SELECT ' . join(',',$this->db->fields($Article, null, array('id', 'comment_count'))) .
+				' FROM ' .  $this->db->fullTableName($Article) . ' Article ' . $this->db->conditions($conditions, true, true, $Article);
+		$result = $this->db->fetchAll($query);
+		$expected = array(array(
+			'Article' => array('id' => 1, 'comment_count' => 4)
+		));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test reading complex virtualFields with subqueries.
+ *
+ * @return void
+ */
+	function testVirtualFieldsComplexRead() {
+		$this->loadFixtures('DataTest', 'Article', 'Comment');
+		
+		$Article =& ClassRegistry::init('Article');
+		$commentTable = $this->db->fullTableName('comments');
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'comment_count' => 'SELECT COUNT(*) FROM ' . $commentTable . 
+				' AS Comment WHERE Article.id = Comment.article_id'
+		);
+		$result = $Article->find('all');
+		$this->assertTrue(count($result) > 0);
+		$this->assertTrue($result[0]['Article']['comment_count'] > 0);
+
+		$DataTest =& ClassRegistry::init('DataTest');
+		$DataTest->virtualFields = array(
+			'complicated' => 'ACOS(SIN(20 * PI() / 180)
+				* SIN(DataTest.float * PI() / 180)
+				+ COS(20 * PI() / 180)
+				* COS(DataTest.count * PI() / 180)
+				* COS((50 - DataTest.float) * PI() / 180)
+				) * 180 / PI() * 60 * 1.1515 * 1.609344'
+		);
+		$result = $DataTest->find('all');
+		$this->assertTrue(count($result) > 0);
+		$this->assertTrue($result[0]['DataTest']['complicated'] > 0);
+	}
+
+/**
+ * test that virtualFields with complex functions and aliases work.
+ *
+ * @return void
+ */
+	function testFieldsWithComplexVirtualFields() {
+		$Article =& new Article();
+		$Article->virtualFields = array(
+			'distance' => 'ACOS(SIN(20 * PI() / 180)
+					* SIN(Article.latitude * PI() / 180)
+					+ COS(20 * PI() / 180)
+					* COS(Article.latitude * PI() / 180)
+					* COS((50 - Article.longitude) * PI() / 180)
+				) * 180 / PI() * 60 * 1.1515 * 1.609344'
+		);
+
+		$fields = array('id', 'distance');
+		$result = $this->db->fields($Article, null, $fields);
+		$qs = $this->db->startQuote;
+		$qe = $this->db->endQuote;
+
+		$this->assertEqual($result[0], "{$qs}Article{$qe}.{$qs}id{$qe}");
+		$this->assertPattern('/Article__distance/', $result[1]);
+		$this->assertPattern('/[`\'"]Article[`\'"].[`\'"]latitude[`\'"]/', $result[1]);
+		$this->assertPattern('/[`\'"]Article[`\'"].[`\'"]longitude[`\'"]/', $result[1]);
+	}
+
+/**
+ * test reading virtual fields containing newlines when recursive > 0
+ *
+ * @return void
+ */
+	function testReadVirtualFieldsWithNewLines() {
+		$Article =& new Article();
+		$Article->recursive = 1;
+		$Article->virtualFields = array(
+			'test' => '
+			User.id + User.id
+			'
+		);
+		$result = $this->db->fields($Article, null, array());
+		$result = $this->db->fields($Article, $Article->alias, $result);
+		$this->assertPattern('/[`\"]User[`\"]\.[`\"]id[`\"] \+ [`\"]User[`\"]\.[`\"]id[`\"]/', $result[7]);
+	}
+
+/**
+ * test group to generate GROUP BY statements on virtual fields
+ *
+ * @return void
+ */
+	function testVirtualFieldsInGroup() {
+		$Article =& ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'this_year' => 'YEAR(Article.created)'
+		);
+
+		$result = $this->db->group('this_year',$Article);
+		$expected = " GROUP BY (YEAR(`Article`.`created`))";
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * Test that group works without a model
+ *
+ * @return void
+ */
+	function testGroupNoModel() {
+		$result = $this->db->group('created');
+		$this->assertEqual(' GROUP BY created', $result);
+	}
+
+/**
+ * test the permutations of fullTableName()
+ *
+ * @return void
+ */
+	function testFullTablePermutations() {
+		$Article =& ClassRegistry::init('Article');
+		$result = $this->testDb->fullTableName($Article, false);
+		$this->assertEqual($result, 'articles');
+
+		$Article->tablePrefix = 'tbl_';
+		$result = $this->testDb->fullTableName($Article, false);
+		$this->assertEqual($result, 'tbl_articles');
+		
+		$Article->useTable = $Article->table = 'with spaces';
+		$Article->tablePrefix = '';
+		$result = $this->testDb->fullTableName($Article);
+		$this->assertEqual($result, '`with spaces`');
+	}
+
+/**
+ * test that read() only calls queryAssociation on db objects when the method is defined.
+ *
+ * @return void
+ */
+	function testReadOnlyCallingQueryAssociationWhenDefined() {
+		ConnectionManager::create('test_no_queryAssociation', array(
+			'datasource' => 'data'
+		));
+		$Article =& ClassRegistry::init('Article');
+		$Article->Comment->useDbConfig = 'test_no_queryAssociation';
+		$result = $Article->find('all');
+		$this->assertTrue(is_array($result));
+	}
+
+/**
+ * test that fields() is using methodCache()
+ *
+ * @return void
+ */
+	function testFieldsUsingMethodCache() {
+		$this->testDb->cacheMethods = false;
+		$this->assertTrue(empty($this->testDb->methodCache['fields']), 'Cache not empty');
+
+		$Article =& ClassRegistry::init('Article');
+		$this->testDb->fields($Article, null, array('title', 'body', 'published'));
+		$this->assertTrue(empty($this->testDb->methodCache['fields']), 'Cache not empty');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/db_acl.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/db_acl.test.php
new file mode 100644
index 000000000..b970d2332
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/db_acl.test.php
@@ -0,0 +1,397 @@
+<?php
+/**
+ * DbAclTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components.dbacl.models
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import('Component', 'Acl');
+App::import('Core', 'db_acl');
+
+/**
+ * DB ACL wrapper test class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbAclNodeTestBase extends AclNode {
+
+/**
+ * useDbConfig property
+ *
+ * @var string 'test_suite'
+ * @access public
+ */
+	var $useDbConfig = 'test_suite';
+
+/**
+ * cacheSources property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheSources = false;
+}
+
+/**
+ * Aro Test Wrapper
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbAroTest extends DbAclNodeTestBase {
+
+/**
+ * name property
+ *
+ * @var string 'DbAroTest'
+ * @access public
+ */
+	var $name = 'DbAroTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'aros'
+ * @access public
+ */
+	var $useTable = 'aros';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('DbAcoTest' => array('with' => 'DbPermissionTest'));
+}
+
+/**
+ * Aco Test Wrapper
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbAcoTest extends DbAclNodeTestBase {
+
+/**
+ * name property
+ *
+ * @var string 'DbAcoTest'
+ * @access public
+ */
+	var $name = 'DbAcoTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'acos'
+ * @access public
+ */
+	var $useTable = 'acos';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('DbAroTest' => array('with' => 'DbPermissionTest'));
+}
+
+/**
+ * Permission Test Wrapper
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbPermissionTest extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'DbPermissionTest'
+ * @access public
+ */
+	var $name = 'DbPermissionTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'aros_acos'
+ * @access public
+ */
+	var $useTable = 'aros_acos';
+
+/**
+ * cacheQueries property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheQueries = false;
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('DbAroTest' => array('foreignKey' => 'aro_id'), 'DbAcoTest' => array('foreignKey' => 'aco_id'));
+}
+
+/**
+ * DboActionTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbAcoActionTest extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'DbAcoActionTest'
+ * @access public
+ */
+	var $name = 'DbAcoActionTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'aco_actions'
+ * @access public
+ */
+	var $useTable = 'aco_actions';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('DbAcoTest' => array('foreignKey' => 'aco_id'));
+}
+
+/**
+ * DbAroUserTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbAroUserTest extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'AuthUser'
+ * @access public
+ */
+	var $name = 'AuthUser';
+
+/**
+ * useTable property
+ *
+ * @var string 'auth_users'
+ * @access public
+ */
+	var $useTable = 'auth_users';
+
+/**
+ * bindNode method
+ *
+ * @param mixed $ref
+ * @access public
+ * @return void
+ */
+	function bindNode($ref = null) {
+		if (Configure::read('DbAclbindMode') == 'string') {
+			return 'ROOT/admins/Gandalf';
+		} elseif (Configure::read('DbAclbindMode') == 'array') {
+			return array('DbAroTest' => array('DbAroTest.model' => 'AuthUser', 'DbAroTest.foreign_key' => 2));
+		}
+	}
+}
+
+/**
+ * DbAclTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components
+ */
+class DbAclTest extends DbAcl {
+
+/**
+ * construct method
+ *
+ * @access private
+ * @return void
+ */
+	function __construct() {
+		$this->Aro =& new DbAroTest();
+		$this->Aro->Permission =& new DbPermissionTest();
+		$this->Aco =& new DbAcoTest();
+		$this->Aro->Permission =& new DbPermissionTest();
+	}
+}
+
+/**
+ * AclNodeTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.controller.components.dbacl.models
+ */
+class AclNodeTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.aro', 'core.aco', 'core.aros_aco', 'core.aco_action', 'core.auth_user');
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		Configure::write('Acl.classname', 'DbAclTest');
+		Configure::write('Acl.database', 'test_suite');
+	}
+
+/**
+ * testNode method
+ *
+ * @access public
+ * @return void
+ */
+	function testNode() {
+		$Aco =& new DbAcoTest();
+		$result = Set::extract($Aco->node('Controller1'), '{n}.DbAcoTest.id');
+		$expected = array(2, 1);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($Aco->node('Controller1/action1'), '{n}.DbAcoTest.id');
+		$expected = array(3, 2, 1);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($Aco->node('Controller2/action1'), '{n}.DbAcoTest.id');
+		$expected = array(7, 6, 1);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($Aco->node('Controller1/action2'), '{n}.DbAcoTest.id');
+		$expected = array(5, 2, 1);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($Aco->node('Controller1/action1/record1'), '{n}.DbAcoTest.id');
+		$expected = array(4, 3, 2, 1);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($Aco->node('Controller2/action1/record1'), '{n}.DbAcoTest.id');
+		$expected = array(8, 7, 6, 1);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($Aco->node('Controller2/action3'), '{n}.DbAcoTest.id');
+		$this->assertFalse($result);
+
+		$result = Set::extract($Aco->node('Controller2/action3/record5'), '{n}.DbAcoTest.id');
+		$this->assertFalse($result);
+
+		$result = $Aco->node('');
+		$this->assertEqual($result, null);
+	}
+
+/**
+ * test that node() doesn't dig deeper than it should.
+ *
+ * @return void
+ */
+	function testNodeWithDuplicatePathSegments() {
+		$Aco =& new DbAcoTest();
+		$nodes = $Aco->node('ROOT/Users');
+		$this->assertEqual($nodes[0]['DbAcoTest']['parent_id'], 1, 'Parent id does not point at ROOT. %s');
+	}
+
+/**
+ * testNodeArrayFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testNodeArrayFind() {
+		$Aro = new DbAroTest();
+		Configure::write('DbAclbindMode', 'string');
+		$result = Set::extract($Aro->node(array('DbAroUserTest' => array('id' => '1', 'foreign_key' => '1'))), '{n}.DbAroTest.id');
+		$expected = array(3, 2, 1);
+		$this->assertEqual($result, $expected);
+
+		Configure::write('DbAclbindMode', 'array');
+		$result = Set::extract($Aro->node(array('DbAroUserTest' => array('id' => 4, 'foreign_key' => 2))), '{n}.DbAroTest.id');
+		$expected = array(4);
+		$this->assertEqual($result, $expected);
+	}
+	/**
+ * testNodeObjectFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testNodeObjectFind() {
+		$Aro = new DbAroTest();
+		$Model = new DbAroUserTest();
+		$Model->id = 1;
+		$result = Set::extract($Aro->node($Model), '{n}.DbAroTest.id');
+		$expected = array(3, 2, 1);
+		$this->assertEqual($result, $expected);
+
+		$Model->id = 2;
+		$result = Set::extract($Aro->node($Model), '{n}.DbAroTest.id');
+		$expected = array(4, 2, 1);
+		$this->assertEqual($result, $expected);
+
+	}
+
+/**
+ * testNodeAliasParenting method
+ *
+ * @access public
+ * @return void
+ */
+	function testNodeAliasParenting() {
+		$Aco = new DbAcoTest();
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$db->truncate($Aco);
+		$db->_queriesLog = array();
+
+		$Aco->create(array('model' => null, 'foreign_key' => null, 'parent_id' => null, 'alias' => 'Application'));
+		$Aco->save();
+
+		$Aco->create(array('model' => null, 'foreign_key' => null, 'parent_id' => $Aco->id, 'alias' => 'Pages'));
+		$Aco->save();
+
+		$result = $Aco->find('all');
+		$expected = array(
+			array('DbAcoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'Application', 'lft' => '1', 'rght' => '4'), 'DbAroTest' => array()),
+			array('DbAcoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'Pages', 'lft' => '2', 'rght' => '3', ), 'DbAroTest' => array())
+		);
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model.test.php
new file mode 100644
index 000000000..14d57f9ab
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model.test.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * ModelTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('AppModel', 'Model'));
+require_once dirname(__FILE__) . DS . 'models.php';
+
+SimpleTest::ignore('BaseModelTest');
+
+/**
+ * ModelBaseTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class BaseModelTest extends CakeTestCase {
+
+/**
+ * autoFixtures property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $autoFixtures = false;
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(
+		'core.category', 'core.category_thread', 'core.user', 'core.my_category', 'core.my_product',
+		'core.my_user', 'core.my_categories_my_users', 'core.my_categories_my_products',
+		'core.article', 'core.featured', 'core.article_featureds_tags', 'core.article_featured',
+		'core.articles', 'core.numeric_article', 'core.tag', 'core.articles_tag', 'core.comment',
+		'core.attachment', 'core.apple', 'core.sample', 'core.another_article', 'core.item',
+		'core.advertisement', 'core.home', 'core.post', 'core.author', 'core.bid', 'core.portfolio',
+		'core.product', 'core.project', 'core.thread', 'core.message', 'core.items_portfolio',
+		'core.syfile', 'core.image', 'core.device_type', 'core.device_type_category',
+		'core.feature_set', 'core.exterior_type_category', 'core.document', 'core.device',
+		'core.document_directory', 'core.primary_model', 'core.secondary_model', 'core.something',
+		'core.something_else', 'core.join_thing', 'core.join_a', 'core.join_b', 'core.join_c',
+		'core.join_a_b', 'core.join_a_c', 'core.uuid', 'core.data_test', 'core.posts_tag',
+		'core.the_paper_monkies', 'core.person', 'core.underscore_field', 'core.node',
+		'core.dependency', 'core.story', 'core.stories_tag', 'core.cd', 'core.book', 'core.basket',
+		'core.overall_favorite', 'core.account', 'core.content', 'core.content_account',
+		'core.film_file', 'core.test_plugin_article', 'core.test_plugin_comment', 'core.uuiditem',
+		'core.counter_cache_user', 'core.counter_cache_post',
+		'core.counter_cache_user_nonstandard_primary_key',
+		'core.counter_cache_post_nonstandard_primary_key', 'core.uuidportfolio',
+		'core.uuiditems_uuidportfolio', 'core.uuiditems_uuidportfolio_numericid', 'core.fruit',
+		'core.fruits_uuid_tag', 'core.uuid_tag', 'core.product_update_all', 'core.group_update_all'
+	);
+
+/**
+ * start method
+ *
+ * @access public
+ * @return void
+ */
+	function start() {
+		parent::start();
+		$this->debug = Configure::read('debug');
+		Configure::write('debug', 2);
+	}
+
+/**
+ * end method
+ *
+ * @access public
+ * @return void
+ */
+	function end() {
+		parent::end();
+		Configure::write('debug', $this->debug);
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_behavior.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_behavior.test.php
new file mode 100644
index 000000000..ee139877b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_behavior.test.php
@@ -0,0 +1,1138 @@
+<?php
+/**
+ * BehaviorTest file
+ *
+ * Long description for behavior.test.php
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Model', 'AppModel');
+require_once dirname(__FILE__) . DS . 'models.php';
+
+Mock::generatePartial('BehaviorCollection', 'MockModelBehaviorCollection', array('cakeError', '_stop'));
+
+/**
+ * TestBehavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TestBehavior extends ModelBehavior {
+
+/**
+ * mapMethods property
+ *
+ * @var array
+ * @access public
+ */
+	var $mapMethods = array('/test(\w+)/' => 'testMethod', '/look for\s+(.+)/' => 'speakEnglish');
+
+/**
+ * setup method
+ *
+ * @param mixed $model
+ * @param array $config
+ * @access public
+ * @return void
+ */
+	function setup(&$model, $config = array()) {
+		parent::setup($model, $config);
+		if (isset($config['mangle'])) {
+			$config['mangle'] .= ' mangled';
+		}
+		$this->settings[$model->alias] = array_merge(array('beforeFind' => 'on', 'afterFind' => 'off'), $config);
+	}
+
+/**
+ * beforeFind method
+ *
+ * @param mixed $model
+ * @param mixed $query
+ * @access public
+ * @return void
+ */
+	function beforeFind(&$model, $query) {
+		$settings = $this->settings[$model->alias];
+		if (!isset($settings['beforeFind']) || $settings['beforeFind'] == 'off') {
+			return parent::beforeFind($model, $query);
+		}
+		switch ($settings['beforeFind']) {
+			case 'on':
+				return false;
+			break;
+			case 'test':
+				return null;
+			break;
+			case 'modify':
+				$query['fields'] = array($model->alias . '.id', $model->alias . '.name', $model->alias . '.mytime');
+				$query['recursive'] = -1;
+				return $query;
+			break;
+		}
+	}
+
+/**
+ * afterFind method
+ *
+ * @param mixed $model
+ * @param mixed $results
+ * @param mixed $primary
+ * @access public
+ * @return void
+ */
+	function afterFind(&$model, $results, $primary) {
+		$settings = $this->settings[$model->alias];
+		if (!isset($settings['afterFind']) || $settings['afterFind'] == 'off') {
+			return parent::afterFind($model, $results, $primary);
+		}
+		switch ($settings['afterFind']) {
+			case 'on':
+				return array();
+			break;
+			case 'test':
+				return true;
+			break;
+			case 'test2':
+				return null;
+			break;
+			case 'modify':
+				return Set::extract($results, "{n}.{$model->alias}");
+			break;
+		}
+	}
+
+/**
+ * beforeSave method
+ *
+ * @param mixed $model
+ * @access public
+ * @return void
+ */
+	function beforeSave(&$model) {
+		$settings = $this->settings[$model->alias];
+		if (!isset($settings['beforeSave']) || $settings['beforeSave'] == 'off') {
+			return parent::beforeSave($model);
+		}
+		switch ($settings['beforeSave']) {
+			case 'on':
+				return false;
+			break;
+			case 'test':
+				return null;
+			break;
+			case 'modify':
+				$model->data[$model->alias]['name'] .= ' modified before';
+				return true;
+			break;
+		}
+	}
+
+/**
+ * afterSave method
+ *
+ * @param mixed $model
+ * @param mixed $created
+ * @access public
+ * @return void
+ */
+	function afterSave(&$model, $created) {
+		$settings = $this->settings[$model->alias];
+		if (!isset($settings['afterSave']) || $settings['afterSave'] == 'off') {
+			return parent::afterSave($model, $created);
+		}
+		$string = 'modified after';
+		if ($created) {
+			$string .= ' on create';
+		}
+		switch ($settings['afterSave']) {
+			case 'on':
+				$model->data[$model->alias]['aftersave'] = $string;
+			break;
+			case 'test':
+				unset($model->data[$model->alias]['name']);
+			break;
+			case 'test2':
+				return false;
+			break;
+			case 'modify':
+				$model->data[$model->alias]['name'] .= ' ' . $string;
+			break;
+		}
+	}
+
+/**
+ * beforeValidate method
+ *
+ * @param mixed $model
+ * @access public
+ * @return void
+ */
+	function beforeValidate(&$model) {
+		$settings = $this->settings[$model->alias];
+		if (!isset($settings['validate']) || $settings['validate'] == 'off') {
+			return parent::beforeValidate($model);
+		}
+		switch ($settings['validate']) {
+			case 'on':
+				$model->invalidate('name');
+				return true;
+			break;
+			case 'test':
+				return null;
+			break;
+			case 'whitelist':
+				$this->_addToWhitelist($model, array('name'));
+				return true;
+			break;
+			case 'stop':
+				$model->invalidate('name');
+				return false;
+			break;
+		}
+	}
+
+/**
+ * beforeDelete method
+ *
+ * @param mixed $model
+ * @param bool $cascade
+ * @access public
+ * @return void
+ */
+	function beforeDelete(&$model, $cascade = true) {
+		$settings =& $this->settings[$model->alias];
+		if (!isset($settings['beforeDelete']) || $settings['beforeDelete'] == 'off') {
+			return parent::beforeDelete($model, $cascade);
+		}
+		switch ($settings['beforeDelete']) {
+			case 'on':
+				return false;
+			break;
+			case 'test':
+				return null;
+			break;
+			case 'test2':
+				echo 'beforeDelete success';
+				if ($cascade) {
+					echo ' (cascading) ';
+				}
+			break;
+		}
+	}
+
+/**
+ * afterDelete method
+ *
+ * @param mixed $model
+ * @access public
+ * @return void
+ */
+	function afterDelete(&$model) {
+		$settings =& $this->settings[$model->alias];
+		if (!isset($settings['afterDelete']) || $settings['afterDelete'] == 'off') {
+			return parent::afterDelete($model);
+		}
+		switch ($settings['afterDelete']) {
+			case 'on':
+				echo 'afterDelete success';
+			break;
+		}
+	}
+
+/**
+ * onError method
+ *
+ * @param mixed $model
+ * @access public
+ * @return void
+ */
+	function onError(&$model) {
+		$settings = $this->settings[$model->alias];
+		if (!isset($settings['onError']) || $settings['onError'] == 'off') {
+			return parent::onError($model, $cascade);
+		}
+		echo "onError trigger success";
+	}
+/**
+ * beforeTest method
+ *
+ * @param mixed $model
+ * @access public
+ * @return void
+ */
+	function beforeTest(&$model) {
+		$model->beforeTestResult[] = strtolower(get_class($this));
+		return strtolower(get_class($this));
+	}
+
+/**
+ * testMethod method
+ *
+ * @param mixed $model
+ * @param bool $param
+ * @access public
+ * @return void
+ */
+	function testMethod(&$model, $param = true) {
+		if ($param === true) {
+			return 'working';
+		}
+	}
+
+/**
+ * testData method
+ *
+ * @param mixed $model
+ * @access public
+ * @return void
+ */
+	function testData(&$model) {
+		if (!isset($model->data['Apple']['field'])) {
+			return false;
+		}
+		$model->data['Apple']['field_2'] = true;
+		return true;
+	}
+
+/**
+ * validateField method
+ *
+ * @param mixed $model
+ * @param mixed $field
+ * @access public
+ * @return void
+ */
+	function validateField(&$model, $field) {
+		return current($field) === 'Orange';
+	}
+
+/**
+ * speakEnglish method
+ *
+ * @param mixed $model
+ * @param mixed $method
+ * @param mixed $query
+ * @access public
+ * @return void
+ */
+	function speakEnglish(&$model, $method, $query) {
+		$method = preg_replace('/look for\s+/', 'Item.name = \'', $method);
+		$query = preg_replace('/^in\s+/', 'Location.name = \'', $query);
+		return $method . '\' AND ' . $query . '\'';
+	}
+}
+
+/**
+ * Test2Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test2Behavior extends TestBehavior{
+}
+
+/**
+ * Test3Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test3Behavior extends TestBehavior{
+}
+
+/**
+ * Test4Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test4Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasMany' => array('Comment'))
+		);
+	}
+}
+
+/**
+ * Test5Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test5Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('belongsTo' => array('User'))
+		);
+	}
+}
+
+/**
+ * Test6Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test6Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasAndBelongsToMany' => array('Tag'))
+		);
+	}
+}
+
+/**
+ * Test7Behavior class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test7Behavior extends ModelBehavior{
+	function setup(&$model, $config = null) {
+		$model->bindModel(
+			array('hasOne' => array('Attachment'))
+		);
+	}
+}
+
+/**
+ * BehaviorTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class BehaviorTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(
+		'core.apple', 'core.sample', 'core.article', 'core.user', 'core.comment',
+		'core.attachment', 'core.tag', 'core.articles_tag'
+	);
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		ClassRegistry::flush();
+	}
+
+/**
+ * testBehaviorBinding method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorBinding() {
+		$Apple = new Apple();
+		$this->assertIdentical($Apple->Behaviors->attached(), array());
+
+		$Apple->Behaviors->attach('Test', array('key' => 'value'));
+		$this->assertIdentical($Apple->Behaviors->attached(), array('Test'));
+		$this->assertEqual(strtolower(get_class($Apple->Behaviors->Test)), 'testbehavior');
+		$expected = array('beforeFind' => 'on', 'afterFind' => 'off', 'key' => 'value');
+		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+		$this->assertEqual(array_keys($Apple->Behaviors->Test->settings), array('Apple'));
+
+		$this->assertIdentical($Apple->Sample->Behaviors->attached(), array());
+		$Apple->Sample->Behaviors->attach('Test', array('key2' => 'value2'));
+		$this->assertIdentical($Apple->Sample->Behaviors->attached(), array('Test'));
+		$this->assertEqual($Apple->Sample->Behaviors->Test->settings['Sample'], array('beforeFind' => 'on', 'afterFind' => 'off', 'key2' => 'value2'));
+
+		$this->assertEqual(array_keys($Apple->Behaviors->Test->settings), array('Apple', 'Sample'));
+		$this->assertIdentical(
+			$Apple->Sample->Behaviors->Test->settings,
+			$Apple->Behaviors->Test->settings
+		);
+		$this->assertNotIdentical($Apple->Behaviors->Test->settings['Apple'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+
+		$Apple->Behaviors->attach('Test', array('key2' => 'value2', 'key3' => 'value3', 'beforeFind' => 'off'));
+		$Apple->Sample->Behaviors->attach('Test', array('key' => 'value', 'key3' => 'value3', 'beforeFind' => 'off'));
+		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], array('beforeFind' => 'off', 'afterFind' => 'off', 'key' => 'value', 'key2' => 'value2', 'key3' => 'value3'));
+		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+
+		$this->assertFalse(isset($Apple->Child->Behaviors->Test));
+		$Apple->Child->Behaviors->attach('Test', array('key' => 'value', 'key2' => 'value2', 'key3' => 'value3', 'beforeFind' => 'off'));
+		$this->assertEqual($Apple->Child->Behaviors->Test->settings['Child'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+
+		$this->assertFalse(isset($Apple->Parent->Behaviors->Test));
+		$Apple->Parent->Behaviors->attach('Test', array('key' => 'value', 'key2' => 'value2', 'key3' => 'value3', 'beforeFind' => 'off'));
+		$this->assertEqual($Apple->Parent->Behaviors->Test->settings['Parent'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+
+		$Apple->Parent->Behaviors->attach('Test', array('key' => 'value', 'key2' => 'value', 'key3' => 'value', 'beforeFind' => 'off'));
+		$this->assertNotEqual($Apple->Parent->Behaviors->Test->settings['Parent'], $Apple->Sample->Behaviors->Test->settings['Sample']);
+
+		$Apple->Behaviors->attach('Plugin.Test', array('key' => 'new value'));
+		$expected = array(
+			'beforeFind' => 'off', 'afterFind' => 'off', 'key' => 'new value',
+			'key2' => 'value2', 'key3' => 'value3'
+		);
+		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+
+		$current = $Apple->Behaviors->Test->settings['Apple'];
+		$expected = array_merge($current, array('mangle' => 'trigger mangled'));
+		$Apple->Behaviors->attach('Test', array('mangle' => 'trigger'));
+		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+
+		$Apple->Behaviors->attach('Test');
+		$expected = array_merge($current, array('mangle' => 'trigger mangled mangled'));
+
+		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+		$Apple->Behaviors->attach('Test', array('mangle' => 'trigger'));
+		$expected = array_merge($current, array('mangle' => 'trigger mangled'));
+		$this->assertEqual($Apple->Behaviors->Test->settings['Apple'], $expected);
+	}
+
+/**
+ * test that attach()/detach() works with plugin.banana
+ *
+ * @return void
+ */
+	function testDetachWithPluginNames() {
+		$Apple = new Apple();
+		$Apple->Behaviors->attach('Plugin.Test');
+		$this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior');
+		$this->assertEqual($Apple->Behaviors->attached(), array('Test'));
+
+		$Apple->Behaviors->detach('Plugin.Test');
+		$this->assertEqual($Apple->Behaviors->attached(), array());
+
+		$Apple->Behaviors->attach('Plugin.Test');
+		$this->assertTrue(isset($Apple->Behaviors->Test), 'Missing behavior');
+		$this->assertEqual($Apple->Behaviors->attached(), array('Test'));
+
+		$Apple->Behaviors->detach('Test');
+		$this->assertEqual($Apple->Behaviors->attached(), array());
+	}
+
+/**
+ * test that attaching a non existant Behavior triggers a cake error.
+ *
+ * @return void
+ */
+	function testInvalidBehaviorCausingCakeError() {
+		$Apple =& new Apple();
+		$Apple->Behaviors =& new MockModelBehaviorCollection();
+		$Apple->Behaviors->expectOnce('cakeError');
+		$Apple->Behaviors->expectAt(0, 'cakeError', array('missingBehaviorFile', '*'));
+		$this->assertFalse($Apple->Behaviors->attach('NoSuchBehavior'));
+	}
+
+/**
+ * testBehaviorToggling method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorToggling() {
+		$Apple = new Apple();
+		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+
+		$Apple->Behaviors->init('Apple', array('Test' => array('key' => 'value')));
+		$this->assertIdentical($Apple->Behaviors->enabled(), array('Test'));
+
+		$Apple->Behaviors->disable('Test');
+		$this->assertIdentical($Apple->Behaviors->attached(), array('Test'));
+		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+
+		$Apple->Sample->Behaviors->attach('Test');
+		$this->assertIdentical($Apple->Sample->Behaviors->enabled('Test'), true);
+		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+
+		$Apple->Behaviors->enable('Test');
+		$this->assertIdentical($Apple->Behaviors->attached('Test'), true);
+		$this->assertIdentical($Apple->Behaviors->enabled(), array('Test'));
+
+		$Apple->Behaviors->disable('Test');
+		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$Apple->Behaviors->attach('Test', array('enabled' => true));
+		$this->assertIdentical($Apple->Behaviors->enabled(), array('Test'));
+		$Apple->Behaviors->attach('Test', array('enabled' => false));
+		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+		$Apple->Behaviors->detach('Test');
+		$this->assertIdentical($Apple->Behaviors->enabled(), array());
+	}
+
+/**
+ * testBehaviorFindCallbacks method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorFindCallbacks() {
+		$Apple = new Apple();
+		$expected = $Apple->find('all');
+
+		$Apple->Behaviors->attach('Test');
+		$this->assertIdentical($Apple->find('all'), null);
+
+		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$Apple->Behaviors->attach('Test', array('beforeFind' => 'test'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$Apple->Behaviors->attach('Test', array('beforeFind' => 'modify'));
+		$expected2 = array(
+			array('Apple' => array('id' => '1', 'name' => 'Red Apple 1', 'mytime' => '22:57:17')),
+			array('Apple' => array('id' => '2', 'name' => 'Bright Red Apple', 'mytime' => '22:57:17')),
+			array('Apple' => array('id' => '3', 'name' => 'green blue', 'mytime' => '22:57:17'))
+		);
+		$result = $Apple->find('all', array('conditions' => array('Apple.id <' => '4')));
+		$this->assertEqual($result, $expected2);
+
+		$Apple->Behaviors->disable('Test');
+		$result = $Apple->find('all');
+		$this->assertEqual($result, $expected);
+
+		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off', 'afterFind' => 'on'));
+		$this->assertIdentical($Apple->find('all'), array());
+
+		$Apple->Behaviors->attach('Test', array('afterFind' => 'off'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Behaviors->attach('Test', array('afterFind' => 'test'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Behaviors->attach('Test', array('afterFind' => 'test2'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Behaviors->attach('Test', array('afterFind' => 'modify'));
+		$expected = array(
+			array('id' => '1', 'apple_id' => '2', 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+			array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
+			array('id' => '3', 'apple_id' => '2', 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
+			array('id' => '4', 'apple_id' => '2', 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
+			array('id' => '5', 'apple_id' => '5', 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
+			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
+			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
+		);
+		$this->assertEqual($Apple->find('all'), $expected);
+	}
+
+/**
+ * testBehaviorHasManyFindCallbacks method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorHasManyFindCallbacks() {
+		$Apple = new Apple();
+		$Apple->unbindModel(array('hasOne' => array('Sample'), 'belongsTo' => array('Parent')), false);
+		$expected = $Apple->find('all');
+
+		$Apple->unbindModel(array('hasMany' => array('Child')));
+		$wellBehaved = $Apple->find('all');
+		$Apple->Child->Behaviors->attach('Test', array('afterFind' => 'modify'));
+		$Apple->unbindModel(array('hasMany' => array('Child')));
+		$this->assertIdentical($Apple->find('all'), $wellBehaved);
+
+		$Apple->Child->Behaviors->attach('Test', array('before' => 'off'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$Apple->Child->Behaviors->attach('Test', array('before' => 'test'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$expected2 = array(
+			array(
+				'Apple' => array('id' => 1),
+				'Child' => array(
+					array('id' => 2,'name' => 'Bright Red Apple', 'mytime' => '22:57:17'))),
+			array(
+				'Apple' => array('id' => 2),
+				'Child' => array(
+					array('id' => 1, 'name' => 'Red Apple 1', 'mytime' => '22:57:17'),
+					array('id' => 3, 'name' => 'green blue', 'mytime' => '22:57:17'),
+					array('id' => 4, 'name' => 'Test Name', 'mytime' => '22:57:17'))),
+			array(
+				'Apple' => array('id' => 3),
+				'Child' => array())
+		);
+
+		$Apple->Child->Behaviors->attach('Test', array('before' => 'modify'));
+		$result = $Apple->find('all', array('fields' => array('Apple.id'), 'conditions' => array('Apple.id <' => '4')));
+		//$this->assertEqual($result, $expected2);
+
+		$Apple->Child->Behaviors->disable('Test');
+		$result = $Apple->find('all');
+		$this->assertEqual($result, $expected);
+
+		$Apple->Child->Behaviors->attach('Test', array('before' => 'off', 'after' => 'on'));
+		//$this->assertIdentical($Apple->find('all'), array());
+
+		$Apple->Child->Behaviors->attach('Test', array('after' => 'off'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Child->Behaviors->attach('Test', array('after' => 'test'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Child->Behaviors->attach('Test', array('after' => 'test2'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Child->Behaviors->attach('Test', array('after' => 'modify'));
+		$expected = array(
+			array('id' => '1', 'apple_id' => '2', 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+			array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
+			array('id' => '3', 'apple_id' => '2', 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
+			array('id' => '4', 'apple_id' => '2', 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
+			array('id' => '5', 'apple_id' => '5', 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
+			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
+			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
+		);
+		//$this->assertEqual($Apple->find('all'), $expected);
+
+	}
+	/**
+ * testBehaviorHasOneFindCallbacks method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorHasOneFindCallbacks() {
+		$Apple = new Apple();
+		$Apple->unbindModel(array('hasMany' => array('Child'), 'belongsTo' => array('Parent')), false);
+		$expected = $Apple->find('all');
+
+		$Apple->unbindModel(array('hasOne' => array('Sample')));
+		$wellBehaved = $Apple->find('all');
+		$Apple->Sample->Behaviors->attach('Test');
+		$Apple->unbindModel(array('hasOne' => array('Sample')));
+		$this->assertIdentical($Apple->find('all'), $wellBehaved);
+
+		$Apple->Sample->Behaviors->attach('Test', array('before' => 'off'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$Apple->Sample->Behaviors->attach('Test', array('before' => 'test'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$Apple->Sample->Behaviors->attach('Test', array('before' => 'modify'));
+		$expected2 = array(
+			array(
+				'Apple' => array('id' => 1),
+				'Child' => array(
+					array('id' => 2,'name' => 'Bright Red Apple', 'mytime' => '22:57:17'))),
+			array(
+				'Apple' => array('id' => 2),
+				'Child' => array(
+					array('id' => 1, 'name' => 'Red Apple 1', 'mytime' => '22:57:17'),
+					array('id' => 3, 'name' => 'green blue', 'mytime' => '22:57:17'),
+					array('id' => 4, 'name' => 'Test Name', 'mytime' => '22:57:17'))),
+			array(
+				'Apple' => array('id' => 3),
+				'Child' => array())
+		);
+		$result = $Apple->find('all', array('fields' => array('Apple.id'), 'conditions' => array('Apple.id <' => '4')));
+		//$this->assertEqual($result, $expected2);
+
+		$Apple->Sample->Behaviors->disable('Test');
+		$result = $Apple->find('all');
+		$this->assertEqual($result, $expected);
+
+		$Apple->Sample->Behaviors->attach('Test', array('before' => 'off', 'after' => 'on'));
+		//$this->assertIdentical($Apple->find('all'), array());
+
+		$Apple->Sample->Behaviors->attach('Test', array('after' => 'off'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Sample->Behaviors->attach('Test', array('after' => 'test'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Sample->Behaviors->attach('Test', array('after' => 'test2'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Sample->Behaviors->attach('Test', array('after' => 'modify'));
+		$expected = array(
+			array('id' => '1', 'apple_id' => '2', 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+			array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
+			array('id' => '3', 'apple_id' => '2', 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
+			array('id' => '4', 'apple_id' => '2', 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
+			array('id' => '5', 'apple_id' => '5', 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
+			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
+			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
+		);
+		//$this->assertEqual($Apple->find('all'), $expected);
+	}
+	/**
+ * testBehaviorBelongsToFindCallbacks method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorBelongsToFindCallbacks() {
+		$Apple = new Apple();
+		$Apple->unbindModel(array('hasMany' => array('Child'), 'hasOne' => array('Sample')), false);
+		$expected = $Apple->find('all');
+
+		$Apple->unbindModel(array('belongsTo' => array('Parent')));
+		$wellBehaved = $Apple->find('all');
+		$Apple->Parent->Behaviors->attach('Test');
+		$Apple->unbindModel(array('belongsTo' => array('Parent')));
+		$this->assertIdentical($Apple->find('all'), $wellBehaved);
+
+		$Apple->Parent->Behaviors->attach('Test', array('before' => 'off'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$Apple->Parent->Behaviors->attach('Test', array('before' => 'test'));
+		$this->assertIdentical($Apple->find('all'), $expected);
+
+		$Apple->Parent->Behaviors->attach('Test', array('before' => 'modify'));
+		$expected2 = array(
+			array(
+				'Apple' => array('id' => 1),
+				'Parent' => array('id' => 2,'name' => 'Bright Red Apple', 'mytime' => '22:57:17')),
+			array(
+				'Apple' => array('id' => 2),
+				'Parent' => array('id' => 1, 'name' => 'Red Apple 1', 'mytime' => '22:57:17')),
+			array(
+				'Apple' => array('id' => 3),
+				'Parent' => array('id' => 2,'name' => 'Bright Red Apple', 'mytime' => '22:57:17'))
+		);
+		$result = $Apple->find('all', array(
+			'fields' => array('Apple.id', 'Parent.id', 'Parent.name', 'Parent.mytime'),
+			'conditions' => array('Apple.id <' => '4')
+		));
+		$this->assertEqual($result, $expected2);
+
+		$Apple->Parent->Behaviors->disable('Test');
+		$result = $Apple->find('all');
+		$this->assertEqual($result, $expected);
+
+		$Apple->Parent->Behaviors->attach('Test', array('after' => 'off'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Parent->Behaviors->attach('Test', array('after' => 'test'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Parent->Behaviors->attach('Test', array('after' => 'test2'));
+		$this->assertEqual($Apple->find('all'), $expected);
+
+		$Apple->Parent->Behaviors->attach('Test', array('after' => 'modify'));
+		$expected = array(
+			array('id' => '1', 'apple_id' => '2', 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+			array('id' => '2', 'apple_id' => '1', 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
+			array('id' => '3', 'apple_id' => '2', 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
+			array('id' => '4', 'apple_id' => '2', 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
+			array('id' => '5', 'apple_id' => '5', 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
+			array('id' => '6', 'apple_id' => '4', 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
+			array('id' => '7', 'apple_id' => '6', 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
+		);
+		//$this->assertEqual($Apple->find('all'), $expected);
+	}
+
+/**
+ * testBehaviorSaveCallbacks method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorSaveCallbacks() {
+		$Sample = new Sample();
+		$record = array('Sample' => array('apple_id' => 6, 'name' => 'sample99'));
+
+		$Sample->Behaviors->attach('Test', array('beforeSave' => 'on'));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), false);
+
+		$Sample->Behaviors->attach('Test', array('beforeSave' => 'off'));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), $record);
+
+		$Sample->Behaviors->attach('Test', array('beforeSave' => 'test'));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), $record);
+
+		$Sample->Behaviors->attach('Test', array('beforeSave' => 'modify'));
+		$expected = Set::insert($record, 'Sample.name', 'sample99 modified before');
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), $expected);
+
+		$Sample->Behaviors->disable('Test');
+		$this->assertIdentical($Sample->save($record), $record);
+
+		$Sample->Behaviors->attach('Test', array('beforeSave' => 'off', 'afterSave' => 'on'));
+		$expected = Set::merge($record, array('Sample' => array('aftersave' => 'modified after on create')));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), $expected);
+
+		$Sample->Behaviors->attach('Test', array('beforeSave' => 'modify', 'afterSave' => 'modify'));
+		$expected = Set::merge($record, array('Sample' => array('name' => 'sample99 modified before modified after on create')));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), $expected);
+
+		$Sample->Behaviors->attach('Test', array('beforeSave' => 'off', 'afterSave' => 'test'));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), $record);
+
+		$Sample->Behaviors->attach('Test', array('afterSave' => 'test2'));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record), $record);
+
+		$Sample->Behaviors->attach('Test', array('beforeFind' => 'off', 'afterFind' => 'off'));
+		$Sample->recursive = -1;
+		$record2 = $Sample->read(null, 1);
+
+		$Sample->Behaviors->attach('Test', array('afterSave' => 'on'));
+		$expected = Set::merge($record2, array('Sample' => array('aftersave' => 'modified after')));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record2), $expected);
+
+		$Sample->Behaviors->attach('Test', array('afterSave' => 'modify'));
+		$expected = Set::merge($record2, array('Sample' => array('name' => 'sample1 modified after')));
+		$Sample->create();
+		$this->assertIdentical($Sample->save($record2), $expected);
+	}
+
+/**
+ * testBehaviorDeleteCallbacks method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorDeleteCallbacks() {
+		$Apple = new Apple();
+
+		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off', 'beforeDelete' => 'off'));
+		$this->assertIdentical($Apple->delete(6), true);
+
+		$Apple->Behaviors->attach('Test', array('beforeDelete' => 'on'));
+		$this->assertIdentical($Apple->delete(4), false);
+
+		$Apple->Behaviors->attach('Test', array('beforeDelete' => 'test2'));
+		if (ob_start()) {
+			$results = $Apple->delete(4);
+			$this->assertIdentical(trim(ob_get_clean()), 'beforeDelete success (cascading)');
+			$this->assertIdentical($results, true);
+		}
+		if (ob_start()) {
+			$results = $Apple->delete(3, false);
+			$this->assertIdentical(trim(ob_get_clean()), 'beforeDelete success');
+			$this->assertIdentical($results, true);
+		}
+
+		$Apple->Behaviors->attach('Test', array('beforeDelete' => 'off', 'afterDelete' => 'on'));
+		if (ob_start()) {
+			$results = $Apple->delete(2, false);
+			$this->assertIdentical(trim(ob_get_clean()), 'afterDelete success');
+			$this->assertIdentical($results, true);
+		}
+	}
+	/**
+ * testBehaviorOnErrorCallback method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorOnErrorCallback() {
+		$Apple = new Apple();
+
+		$Apple->Behaviors->attach('Test', array('beforeFind' => 'off', 'onError' => 'on'));
+		if (ob_start()) {
+			$Apple->Behaviors->Test->onError($Apple);
+			$this->assertIdentical(trim(ob_get_clean()), 'onError trigger success');
+		}
+
+		if (ob_start()) {
+			$Apple->delete(99);
+			//$this->assertIdentical(trim(ob_get_clean()), 'onError trigger success');
+		}
+	}
+	/**
+ * testBehaviorValidateCallback method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorValidateCallback() {
+		$Apple = new Apple();
+
+		$Apple->Behaviors->attach('Test');
+		$this->assertIdentical($Apple->validates(), true);
+
+		$Apple->Behaviors->attach('Test', array('validate' => 'on'));
+		$this->assertIdentical($Apple->validates(), false);
+		$this->assertIdentical($Apple->validationErrors, array('name' => true));
+
+		$Apple->Behaviors->attach('Test', array('validate' => 'stop'));
+		$this->assertIdentical($Apple->validates(), false);
+		$this->assertIdentical($Apple->validationErrors, array('name' => true));
+
+		$Apple->Behaviors->attach('Test', array('validate' => 'whitelist'));
+		$Apple->validates();
+		$this->assertIdentical($Apple->whitelist, array());
+
+		$Apple->whitelist = array('unknown');
+		$Apple->validates();
+		$this->assertIdentical($Apple->whitelist, array('unknown', 'name'));
+	}
+
+/**
+ * testBehaviorValidateMethods method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorValidateMethods() {
+		$Apple = new Apple();
+		$Apple->Behaviors->attach('Test');
+		$Apple->validate['color'] = 'validateField';
+
+		$result = $Apple->save(array('name' => 'Genetically Modified Apple', 'color' => 'Orange'));
+		$this->assertEqual(array_keys($result['Apple']), array('name', 'color', 'modified', 'created'));
+
+		$Apple->create();
+		$result = $Apple->save(array('name' => 'Regular Apple', 'color' => 'Red'));
+		$this->assertFalse($result);
+	}
+
+/**
+ * testBehaviorMethodDispatching method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorMethodDispatching() {
+		$Apple = new Apple();
+		$Apple->Behaviors->attach('Test');
+
+		$expected = 'working';
+		$this->assertEqual($Apple->testMethod(), $expected);
+		$this->assertEqual($Apple->Behaviors->dispatchMethod($Apple, 'testMethod'), $expected);
+
+		$result = $Apple->Behaviors->dispatchMethod($Apple, 'wtf');
+		$this->assertEqual($result, array('unhandled'));
+
+		$result = $Apple->{'look for the remote'}('in the couch');
+		$expected = "Item.name = 'the remote' AND Location.name = 'the couch'";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testBehaviorMethodDispatchingWithData method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorMethodDispatchingWithData() {
+		$Apple = new Apple();
+		$Apple->Behaviors->attach('Test');
+
+		$Apple->set('field', 'value');
+		$this->assertTrue($Apple->testData());
+		$this->assertTrue($Apple->data['Apple']['field_2']);
+
+		$this->assertTrue($Apple->testData('one', 'two', 'three', 'four', 'five', 'six'));
+	}
+
+/**
+ * testBehaviorTrigger method
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorTrigger() {
+		$Apple =& new Apple();
+		$Apple->Behaviors->attach('Test');
+		$Apple->Behaviors->attach('Test2');
+		$Apple->Behaviors->attach('Test3');
+
+		$Apple->beforeTestResult = array();
+		$Apple->Behaviors->trigger($Apple, 'beforeTest');
+		$expected = array('testbehavior', 'test2behavior', 'test3behavior');
+		$this->assertIdentical($Apple->beforeTestResult, $expected);
+
+		$Apple->beforeTestResult = array();
+		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => 'test2behavior'));
+		$expected = array('testbehavior', 'test2behavior');
+		$this->assertIdentical($Apple->beforeTestResult, $expected);
+
+		$Apple->beforeTestResult = array();
+		$Apple->Behaviors->trigger($Apple, 'beforeTest', array(), array('break' => true, 'breakOn' => array('test2behavior', 'test3behavior')));
+		$expected = array('testbehavior', 'test2behavior');
+		$this->assertIdentical($Apple->beforeTestResult, $expected);
+	}
+
+/**
+ * undocumented function
+ *
+ * @return void
+ * @access public
+ */
+	function testBindModelCallsInBehaviors() {
+		$this->loadFixtures('Article', 'Comment');
+
+		// hasMany
+		$Article = new Article();
+		$Article->unbindModel(array('hasMany' => array('Comment')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('Comment', $result));
+
+		$Article->Behaviors->attach('Test4');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('Comment', $result));
+
+		// belongsTo
+		$Article->unbindModel(array('belongsTo' => array('User')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('User', $result));
+
+		$Article->Behaviors->attach('Test5');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('User', $result));
+
+		// hasAndBelongsToMany
+		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
+		$result = $Article->find('first');
+		$this->assertFalse(array_key_exists('Tag', $result));
+
+		$Article->Behaviors->attach('Test6');
+		$result = $Article->find('first');
+		$this->assertTrue(array_key_exists('Comment', $result));
+
+		// hasOne
+		$Comment = new Comment();
+		$Comment->unbindModel(array('hasOne' => array('Attachment')));
+		$result = $Comment->find('first');
+		$this->assertFalse(array_key_exists('Attachment', $result));
+
+		$Comment->Behaviors->attach('Test7');
+		$result = $Comment->find('first');
+		$this->assertTrue(array_key_exists('Attachment', $result));
+	}
+
+/**
+ * Test attach and detaching
+ *
+ * @access public
+ * @return void
+ */
+	function testBehaviorAttachAndDetach() {
+		$Sample =& new Sample();
+		$Sample->actsAs = array('Test3' => array('bar'), 'Test2' => array('foo', 'bar'));
+		$Sample->Behaviors->init($Sample->alias, $Sample->actsAs);
+		$Sample->Behaviors->attach('Test2');
+		$Sample->Behaviors->detach('Test3');
+
+		$Sample->Behaviors->trigger($Sample, 'beforeTest');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_delete.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_delete.test.php
new file mode 100644
index 000000000..668a61317
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_delete.test.php
@@ -0,0 +1,754 @@
+<?php
+/**
+ * ModelDeleteTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+
+/**
+ * ModelDeleteTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelDeleteTest extends BaseModelTest {
+
+/**
+ * testDeleteHabtmReferenceWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteHabtmReferenceWithConditions() {
+		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio');
+
+		$Portfolio =& new Portfolio();
+		$Portfolio->hasAndBelongsToMany['Item']['conditions'] = array('ItemsPortfolio.item_id >' => 1);
+
+		$result = $Portfolio->find('first', array(
+			'conditions' => array('Portfolio.id' => 1)
+		));
+		$expected = array(
+			array(
+				'id' => 3,
+				'syfile_id' => 3,
+				'published' => 0,
+				'name' => 'Item 3',
+				'ItemsPortfolio' => array(
+					'id' => 3,
+					'item_id' => 3,
+					'portfolio_id' => 1
+			)),
+			array(
+				'id' => 4,
+				'syfile_id' => 4,
+				'published' => 0,
+				'name' => 'Item 4',
+				'ItemsPortfolio' => array(
+					'id' => 4,
+					'item_id' => 4,
+					'portfolio_id' => 1
+			)),
+			array(
+				'id' => 5,
+				'syfile_id' => 5,
+				'published' => 0,
+				'name' => 'Item 5',
+				'ItemsPortfolio' => array(
+					'id' => 5,
+					'item_id' => 5,
+					'portfolio_id' => 1
+		)));
+		$this->assertEqual($result['Item'], $expected);
+
+		$result = $Portfolio->ItemsPortfolio->find('all', array(
+			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
+		));
+		$expected = array(
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 1,
+					'item_id' => 1,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 3,
+					'item_id' => 3,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 4,
+					'item_id' => 4,
+					'portfolio_id' => 1
+			)),
+			array(
+				'ItemsPortfolio' => array(
+					'id' => 5,
+					'item_id' => 5,
+					'portfolio_id' => 1
+		)));
+		$this->assertEqual($result, $expected);
+
+		$Portfolio->delete(1);
+
+		$result = $Portfolio->find('first', array(
+			'conditions' => array('Portfolio.id' => 1)
+		));
+		$this->assertFalse($result);
+
+		$result = $Portfolio->ItemsPortfolio->find('all', array(
+			'conditions' => array('ItemsPortfolio.portfolio_id' => 1)
+		));
+		$this->assertFalse($result);
+	}
+
+/**
+ * testDeleteArticleBLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteArticleBLinks() {
+		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
+		$TestModel =& new ArticleB();
+
+		$result = $TestModel->ArticlesTag->find('all');
+		$expected = array(
+			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '1', 'tag_id' => '2')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
+			);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->delete(1);
+		$result = $TestModel->ArticlesTag->find('all');
+
+		$expected = array(
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '1')),
+			array('ArticlesTag' => array('article_id' => '2', 'tag_id' => '3'))
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDeleteDependentWithConditions method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteDependentWithConditions() {
+		$this->loadFixtures('Cd','Book','OverallFavorite');
+
+		$Cd =& new Cd();
+		$Book =& new Book();
+		$OverallFavorite =& new OverallFavorite();
+
+		$Cd->delete(1);
+
+		$result = $OverallFavorite->find('all', array(
+			'fields' => array('model_type', 'model_id', 'priority')
+		));
+		$expected = array(
+			array(
+				'OverallFavorite' => array(
+					'model_type' => 'Book',
+					'model_id' => 1,
+					'priority' => 2
+		)));
+
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result, $expected);
+
+		$Book->delete(1);
+
+		$result = $OverallFavorite->find('all', array(
+			'fields' => array('model_type', 'model_id', 'priority')
+		));
+		$expected = array();
+
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDel method
+ *
+ * @access public
+ * @return void
+ */
+	function testDelete() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$result = $TestModel->delete(2);
+		$this->assertTrue($result);
+
+		$result = $TestModel->read(null, 2);
+		$this->assertFalse($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'title')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->delete(3);
+		$this->assertTrue($result);
+
+		$result = $TestModel->read(null, 3);
+		$this->assertFalse($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'title')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		// make sure deleting a non-existent record doesn't break save()
+		// ticket #6293
+		$this->loadFixtures('Uuid');
+		$Uuid =& new Uuid();
+		$data = array(
+			'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3',
+			'52C8865C-10EE-4302-AE6C-6E7D8E12E2C8',
+			'8208C7FE-E89C-47C5-B378-DED6C271F9B8');
+		foreach ($data as $id) {
+			$Uuid->save(array('id' => $id));
+		}
+		$Uuid->delete('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
+		$Uuid->delete('52C8865C-10EE-4302-AE6C-6E7D8E12E2C8');
+		foreach ($data as $id) {
+			$Uuid->save(array('id' => $id));
+		}
+		$result = $Uuid->find('all', array(
+			'conditions' => array('id' => $data),
+			'fields' => array('id'),
+			'order' => 'id'));
+		$expected = array(
+			array('Uuid' => array(
+				'id' => '52C8865C-10EE-4302-AE6C-6E7D8E12E2C8')),
+			array('Uuid' => array(
+				'id' => '8208C7FE-E89C-47C5-B378-DED6C271F9B8')),
+			array('Uuid' => array(
+				'id' => 'B607DAB9-88A2-46CF-B57C-842CA9E3B3B3')));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that delete() updates the correct records counterCache() records.
+ *
+ * @return void
+ */
+	function testDeleteUpdatingCounterCacheCorrectly() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User =& new CounterCacheUser();
+
+		$User->Post->delete(3);
+		$result = $User->read(null, 301);
+		$this->assertEqual($result['User']['post_count'], 0);
+
+		$result = $User->read(null, 66);
+		$this->assertEqual($result['User']['post_count'], 2);
+	}
+
+/**
+ * testDeleteAll method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteAll() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$data = array('Article' => array(
+			'user_id' => 2,
+			'id' => 4,
+			'title' => 'Fourth Article',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Article' => array(
+			'user_id' => 2,
+			'id' => 5,
+			'title' => 'Fifth Article',
+			'published' => 'Y'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Article' => array(
+			'user_id' => 1,
+			'id' => 6,
+			'title' => 'Sixth Article',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y')),
+			array('Article' => array(
+				'id' => 4,
+				'user_id' => 2,
+				'title' => 'Fourth Article',
+				'published' => 'N'
+			)),
+			array('Article' => array(
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'Fifth Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 6,
+				'user_id' => 1,
+				'title' => 'Sixth Article',
+				'published' => 'N'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.published' => 'N'));
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'Fifth Article',
+				'published' => 'Y'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article.user_id' => array(2, 3));
+		$result = $TestModel->deleteAll($data, true, true);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array(
+			'fields' => array('id', 'user_id', 'title', 'published')
+		));
+		$expected = array(
+			array('Article' => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'published' => 'Y'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'published' => 'Y'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
+		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
+
+		$this->expectError();
+		ob_start();
+		$result = $TestModel->deleteAll(array('Article.non_existent_field' => 999));
+		ob_get_clean();
+		$this->assertFalse($result, 'deleteAll returned true when find query generated sql error. %s');
+	}
+
+/**
+ * testRecursiveDel method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveDel() {
+		$this->loadFixtures('Article', 'Comment', 'Attachment');
+		$TestModel =& new Article();
+
+		$result = $TestModel->delete(2);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 2);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->read(null, 5);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->read(null, 6);
+		$this->assertFalse($result);
+
+		$result = $TestModel->Comment->Attachment->read(null, 1);
+		$this->assertFalse($result);
+
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 2);
+
+		$result = $TestModel->Comment->find('count');
+		$this->assertEqual($result, 4);
+
+		$result = $TestModel->Comment->Attachment->find('count');
+		$this->assertEqual($result, 0);
+	}
+
+/**
+ * testDependentExclusiveDelete method
+ *
+ * @access public
+ * @return void
+ */
+	function testDependentExclusiveDelete() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article10();
+
+		$result = $TestModel->find('all');
+		$this->assertEqual(count($result[0]['Comment']), 4);
+		$this->assertEqual(count($result[1]['Comment']), 2);
+		$this->assertEqual($TestModel->Comment->find('count'), 6);
+
+		$TestModel->delete(1);
+		$this->assertEqual($TestModel->Comment->find('count'), 2);
+	}
+
+/**
+ * testDeleteLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testDeleteLinks() {
+		$this->loadFixtures('Article', 'ArticlesTag', 'Tag');
+		$TestModel =& new Article();
+
+		$result = $TestModel->ArticlesTag->find('all');
+		$expected = array(
+			array('ArticlesTag' => array(
+				'article_id' => '1',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '1',
+				'tag_id' => '2'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '3'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->delete(1);
+		$result = $TestModel->ArticlesTag->find('all');
+
+		$expected = array(
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '1'
+			)),
+			array('ArticlesTag' => array(
+				'article_id' => '2',
+				'tag_id' => '3'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->deleteAll(array('Article.user_id' => 999));
+		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
+	}
+
+/**
+ * test deleteLinks with Multiple habtm associations
+ *
+ * @return void
+ */
+	function testDeleteLinksWithMultipleHabtmAssociations() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinC', 'JoinAB', 'JoinAC');
+		$JoinA =& new JoinA();
+
+		//create two new join records to expose the issue.
+		$JoinA->JoinAsJoinC->create(array(
+			'join_a_id' => 1,
+			'join_c_id' => 2,
+		));
+		$JoinA->JoinAsJoinC->save();
+		$JoinA->JoinAsJoinB->create(array(
+			'join_a_id' => 1,
+			'join_b_id' => 2,
+		));
+		$JoinA->JoinAsJoinB->save();
+
+		$result = $JoinA->delete(1);
+		$this->assertTrue($result, 'Delete failed %s');
+
+		$joinedBs = $JoinA->JoinAsJoinB->find('count', array(
+			'conditions' => array('JoinAsJoinB.join_a_id' => 1)
+		));
+		$this->assertEqual($joinedBs, 0, 'JoinA/JoinB link records left over. %s');
+
+		$joinedBs = $JoinA->JoinAsJoinC->find('count', array(
+			'conditions' => array('JoinAsJoinC.join_a_id' => 1)
+		));
+		$this->assertEqual($joinedBs, 0, 'JoinA/JoinC link records left over. %s');
+	}
+
+/**
+ * testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable() {
+
+		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
+		$ThePaper =& new ThePaper();
+		$ThePaper->id = 1;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper =& new ThePaper();
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->delete(1);
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+	}
+
+/**
+ * test that beforeDelete returning false can abort deletion.
+ *
+ * @return void
+ */
+	function testBeforeDeleteDeleteAbortion() {
+		$this->loadFixtures('Post');
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeDeleteReturn = false;
+
+		$result = $Model->delete(1);
+		$this->assertFalse($result);
+
+		$exists = $Model->findById(1);
+		$this->assertTrue(is_array($exists));
+	}
+
+/**
+ * test for a habtm deletion error that occurs in postgres but should not.
+ * And should not occur in any dbo.
+ *
+ * @return void
+ */
+	function testDeleteHabtmPostgresFailure() {
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag');
+
+		$Article =& ClassRegistry::init('Article');
+		$Article->hasAndBelongsToMany['Tag']['unique'] = true;
+
+		$Tag =& ClassRegistry::init('Tag');
+		$Tag->bindModel(array('hasAndBelongsToMany' => array(
+			'Article' => array(
+				'className' => 'Article',
+				'unique' => true
+			)
+		)), true);
+
+		// Article 1 should have Tag.1 and Tag.2
+	    $before = $Article->find("all", array(
+			"conditions" => array("Article.id" => 1),
+		));
+		$this->assertEqual(count($before[0]['Tag']), 2, 'Tag count for Article.id = 1 is incorrect, should be 2 %s');
+
+		// From now on, Tag #1 is only associated with Post #1
+		$submitted_data = array(
+			"Tag" => array("id" => 1, 'tag' => 'tag1'),
+			"Article" => array(
+				"Article" => array(1)
+			)
+		);
+		$Tag->save($submitted_data);
+
+	    // One more submission (The other way around) to make sure the reverse save looks good.
+	    $submitted_data = array(
+			"Article" => array("id" => 2, 'title' => 'second article'),
+			"Tag" => array(
+				"Tag" => array(2, 3)
+			)
+		);
+	    // ERROR:
+	    // Postgresql: DELETE FROM "articles_tags" WHERE tag_id IN ('1', '3')
+	    // MySQL: DELETE `ArticlesTag` FROM `articles_tags` AS `ArticlesTag` WHERE `ArticlesTag`.`article_id` = 2 AND `ArticlesTag`.`tag_id` IN (1, 3)
+	    $Article->save($submitted_data);
+
+		// Want to make sure Article #1 has Tag #1 and Tag #2 still.
+		$after = $Article->find("all", array(
+			"conditions" => array("Article.id" => 1),
+		));
+
+		// Removing Article #2 from Tag #1 is all that should have happened.
+		$this->assertEqual(count($before[0]["Tag"]), count($after[0]["Tag"]));
+	}
+
+/**
+ * test that deleting records inside the beforeDelete doesn't truncate the table.
+ *
+ * @return void
+ */
+	function testBeforeDeleteWipingTable() {
+		$this->loadFixtures('Comment');
+
+		$Comment =& new BeforeDeleteComment();
+		// Delete 3 records.
+		$Comment->delete(4);
+		$result = $Comment->find('count');
+
+		$this->assertTrue($result > 1, 'Comments are all gone.');
+		$Comment->create(array(
+			'article_id' => 1,
+			'user_id' => 2,
+			'comment' => 'new record',
+			'published' => 'Y'
+		));
+		$Comment->save();
+
+		$Comment->delete(5);
+		$result = $Comment->find('count');
+
+		$this->assertTrue($result > 1, 'Comments are all gone.');
+	}
+
+/**
+ * test that deleting the same record from the beforeDelete and the delete doesn't truncate the table.
+ *
+ * @return void
+ */
+	function testBeforeDeleteWipingTableWithDuplicateDelete() {
+		$this->loadFixtures('Comment');
+
+		$Comment =& new BeforeDeleteComment();
+		$Comment->delete(1);
+
+		$result = $Comment->find('count');
+		$this->assertTrue($result > 1, 'Comments are all gone.');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_integration.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_integration.test.php
new file mode 100644
index 000000000..3d951e434
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_integration.test.php
@@ -0,0 +1,1930 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
+/**
+ * ModelIntegrationTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+App::import('Core', 'DboSource');
+
+/**
+ * DboMock class
+ * A Dbo Source driver to mock a connection and a identity name() method
+ */
+class DboMock extends DboSource {
+
+/**
+* Returns the $field without modifications
+*/
+	function name($field) {
+		return $field;
+	}
+/**
+* Returns true to fake a database connection
+*/
+	function connect() {
+		return true;
+	}
+}
+
+/**
+ * ModelIntegrationTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelIntegrationTest extends BaseModelTest {
+
+/**
+ * testPkInHAbtmLinkModelArticleB
+ *
+ * @access public
+ * @return void
+ */
+	function testPkInHabtmLinkModelArticleB() {
+		$this->loadFixtures('Article', 'Tag');
+		$TestModel2 =& new ArticleB();
+		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
+	}
+
+/**
+ * Tests that $cacheSources can only be disabled in the db using model settings, not enabled
+ *
+ * @access public
+ * @return void
+ */
+	function testCacheSourcesDisabling() {
+		$this->db->cacheSources = true;
+		$TestModel = new JoinA();
+		$TestModel->cacheSources = false;
+		$TestModel->setSource('join_as');
+		$this->assertFalse($this->db->cacheSources);
+
+		$this->db->cacheSources = false;
+		$TestModel = new JoinA();
+		$TestModel->cacheSources = true;
+		$TestModel->setSource('join_as');
+		$this->assertFalse($this->db->cacheSources);
+	}
+
+/**
+ * testPkInHabtmLinkModel method
+ *
+ * @access public
+	 * @return void
+ */
+	function testPkInHabtmLinkModel() {
+		//Test Nonconformant Models
+		$this->loadFixtures('Content', 'ContentAccount', 'Account');
+		$TestModel =& new Content();
+		$this->assertEqual($TestModel->ContentAccount->primaryKey, 'iContentAccountsId');
+
+		//test conformant models with no PK in the join table
+		$this->loadFixtures('Article', 'Tag');
+		$TestModel2 =& new Article();
+		$this->assertEqual($TestModel2->ArticlesTag->primaryKey, 'article_id');
+
+		//test conformant models with PK in join table
+		$this->loadFixtures('Item', 'Portfolio', 'ItemsPortfolio');
+		$TestModel3 =& new Portfolio();
+		$this->assertEqual($TestModel3->ItemsPortfolio->primaryKey, 'id');
+
+		//test conformant models with PK in join table - join table contains extra field
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
+		$TestModel4 =& new JoinA();
+		$this->assertEqual($TestModel4->JoinAsJoinB->primaryKey, 'id');
+
+	}
+
+/**
+ * testDynamicBehaviorAttachment method
+ *
+ * @access public
+ * @return void
+ */
+	function testDynamicBehaviorAttachment() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+		$this->assertEqual($TestModel->Behaviors->attached(), array());
+
+		$TestModel->Behaviors->attach('Tree', array('left' => 'left_field', 'right' => 'right_field'));
+		$this->assertTrue(is_object($TestModel->Behaviors->Tree));
+		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
+
+		$expected = array(
+			'parent' => 'parent_id',
+			'left' => 'left_field',
+			'right' => 'right_field',
+			'scope' => '1 = 1',
+			'type' => 'nested',
+			'__parentChange' => false,
+			'recursive' => -1
+		);
+
+		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
+
+		$expected['enabled'] = false;
+		$TestModel->Behaviors->attach('Tree', array('enabled' => false));
+		$this->assertEqual($TestModel->Behaviors->Tree->settings['Apple'], $expected);
+		$this->assertEqual($TestModel->Behaviors->attached(), array('Tree'));
+
+		$TestModel->Behaviors->detach('Tree');
+		$this->assertEqual($TestModel->Behaviors->attached(), array());
+		$this->assertFalse(isset($TestModel->Behaviors->Tree));
+	}
+
+/**
+ * Tests cross database joins.  Requires $test and $test2 to both be set in DATABASE_CONFIG
+ * NOTE: When testing on MySQL, you must set 'persistent' => false on *both* database connections,
+ * or one connection will step on the other.
+ */
+	function testCrossDatabaseJoins() {
+		$config = new DATABASE_CONFIG();
+
+		$skip = $this->skipIf(
+			!isset($config->test) || !isset($config->test2),
+			 '%s Primary and secondary test databases not configured, skipping cross-database '
+			.'join tests.'
+			.' To run these tests, you must define $test and $test2 in your database configuration.'
+		);
+
+		if ($skip) {
+			return;
+		}
+
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag', 'User', 'Comment');
+		$TestModel =& new Article();
+
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+				)),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+				)),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+		));
+		$this->assertEqual($TestModel->find('all'), $expected);
+
+		$db2 =& ConnectionManager::getDataSource('test2');
+
+		foreach (array('User', 'Comment') as $class) {
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->create($db2);
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->insert($db2);
+			$this->db->truncate(Inflector::pluralize(Inflector::underscore($class)));
+		}
+
+		$this->assertEqual($TestModel->User->find('all'), array());
+		$this->assertEqual($TestModel->Comment->find('all'), array());
+		$this->assertEqual($TestModel->find('count'), 3);
+
+		$TestModel->User->setDataSource('test2');
+		$TestModel->Comment->setDataSource('test2');
+
+		foreach ($expected as $key => $value) {
+			unset($value['Comment'], $value['Tag']);
+			$expected[$key] = $value;
+		}
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->find('all');
+		$this->assertEqual($result, $expected);
+
+		foreach ($expected as $key => $value) {
+			unset($value['Comment'], $value['Tag']);
+			$expected[$key] = $value;
+		}
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->find('all');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->User->find('all'), '{n}.User.id');
+		$this->assertEqual($result, array('1', '2', '3', '4'));
+		$this->assertEqual($TestModel->find('all'), $expected);
+
+		$TestModel->Comment->unbindModel(array('hasOne' => array('Attachment')));
+		$expected = array(
+			array(
+				'Comment' => array(
+					'id' => '1',
+					'article_id' => '1',
+					'user_id' => '2',
+					'comment' => 'First Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:45:23',
+					'updated' => '2007-03-18 10:47:31'
+				),
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '2',
+					'article_id' => '1',
+					'user_id' => '4',
+					'comment' => 'Second Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:47:23',
+					'updated' => '2007-03-18 10:49:31'
+				),
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '3',
+					'article_id' => '1',
+					'user_id' => '1',
+					'comment' => 'Third Comment for First Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:49:23',
+					'updated' => '2007-03-18 10:51:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '4',
+					'article_id' => '1',
+					'user_id' => '1',
+					'comment' => 'Fourth Comment for First Article',
+					'published' => 'N',
+					'created' => '2007-03-18 10:51:23',
+					'updated' => '2007-03-18 10:53:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+			)),
+			array(
+				'Comment' => array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+				),
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+				),
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+		)));
+		$this->assertEqual($TestModel->Comment->find('all'), $expected);
+
+		foreach (array('User', 'Comment') as $class) {
+			$this->_fixtures[$this->_fixtureClassMap[$class]]->drop($db2);
+		}
+	}
+
+/**
+ * testDisplayField method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisplayField() {
+		$this->loadFixtures('Post', 'Comment', 'Person');
+		$Post = new Post();
+		$Comment = new Comment();
+		$Person = new Person();
+
+		$this->assertEqual($Post->displayField, 'title');
+		$this->assertEqual($Person->displayField, 'name');
+		$this->assertEqual($Comment->displayField, 'id');
+	}
+
+/**
+ * testSchema method
+ *
+ * @access public
+ * @return void
+ */
+	function testSchema() {
+		$Post = new Post();
+
+		$result = $Post->schema();
+		$columns = array('id', 'author_id', 'title', 'body', 'published', 'created', 'updated');
+		$this->assertEqual(array_keys($result), $columns);
+
+		$types = array('integer', 'integer', 'string', 'text', 'string', 'datetime', 'datetime');
+		$this->assertEqual(Set::extract(array_values($result), '{n}.type'), $types);
+
+		$result = $Post->schema('body');
+		$this->assertEqual($result['type'], 'text');
+		$this->assertNull($Post->schema('foo'));
+
+		$this->assertEqual($Post->getColumnTypes(), array_combine($columns, $types));
+	}
+
+/**
+ * test deconstruct() with time fields.
+ *
+ * @return void
+ */
+	function testDeconstructFieldsTime() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '';
+		$data['Apple']['mytime']['min'] = '';
+		$data['Apple']['mytime']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '';
+		$data['Apple']['mytime']['min'] = '';
+		$data['Apple']['mytime']['meridan'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> ''));
+		$this->assertEqual($TestModel->data, $expected, 'Empty values are not returning properly. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '12';
+		$data['Apple']['mytime']['min'] = '0';
+		$data['Apple']['mytime']['meridian'] = 'am';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '00:00:00'));
+		$this->assertEqual($TestModel->data, $expected, 'Midnight is not returning proper values. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '00';
+		$data['Apple']['mytime']['min'] = '00';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '00:00:00'));
+		$this->assertEqual($TestModel->data, $expected, 'Midnight is not returning proper values. %s');
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '03';
+		$data['Apple']['mytime']['min'] = '04';
+		$data['Apple']['mytime']['sec'] = '04';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '3';
+		$data['Apple']['mytime']['min'] = '4';
+		$data['Apple']['mytime']['sec'] = '4';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple' => array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['mytime']['hour'] = '03';
+		$data['Apple']['mytime']['min'] = '4';
+		$data['Apple']['mytime']['sec'] = '4';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('mytime'=> '03:04:04'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$db = ConnectionManager::getDataSource('test_suite');
+		$data = array();
+		$data['Apple']['mytime'] = $db->expression('NOW()');
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$this->assertEqual($TestModel->data, $data);
+	}
+
+/**
+ * testDeconstructFields with datetime, timestamp, and date fields
+ *
+ * @access public
+ * @return void
+ */
+	function testDeconstructFieldsDateTime() {
+		$this->loadFixtures('Apple');
+		$TestModel =& new Apple();
+
+		//test null/empty values first
+		$data['Apple']['created']['year'] = '';
+		$data['Apple']['created']['month'] = '';
+		$data['Apple']['created']['day'] = '';
+		$data['Apple']['created']['hour'] = '';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['date']['year'] = '';
+		$data['Apple']['date']['month'] = '';
+		$data['Apple']['date']['day'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('date'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '2007-08-20 00:00:00'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '2007-08-20 10:12:00'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '';
+		$data['Apple']['created']['day'] = '12';
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '';
+		$data['Apple']['created']['sec'] = '';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '33';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '20';
+		$data['Apple']['created']['min'] = '33';
+		$data['Apple']['created']['sec'] = '33';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['hour'] = '13';
+		$data['Apple']['created']['min'] = '00';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array(
+			'Apple'=> array(
+			'created'=> '',
+			'date'=> '2006-12-25'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '08';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '09';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array(
+			'Apple'=> array(
+				'created'=> '2007-08-20 10:12:09',
+				'date'=> '2006-12-25'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '--';
+		$data['Apple']['created']['month'] = '--';
+		$data['Apple']['created']['day'] = '--';
+		$data['Apple']['created']['hour'] = '--';
+		$data['Apple']['created']['min'] = '--';
+		$data['Apple']['created']['sec'] = '--';
+		$data['Apple']['date']['year'] = '--';
+		$data['Apple']['date']['month'] = '--';
+		$data['Apple']['date']['day'] = '--';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '', 'date'=> ''));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['created']['year'] = '2007';
+		$data['Apple']['created']['month'] = '--';
+		$data['Apple']['created']['day'] = '20';
+		$data['Apple']['created']['hour'] = '10';
+		$data['Apple']['created']['min'] = '12';
+		$data['Apple']['created']['sec'] = '09';
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('created'=> '', 'date'=> '2006-12-25'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$data = array();
+		$data['Apple']['date']['year'] = '2006';
+		$data['Apple']['date']['month'] = '12';
+		$data['Apple']['date']['day'] = '25';
+
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$expected = array('Apple'=> array('date'=> '2006-12-25'));
+		$this->assertEqual($TestModel->data, $expected);
+
+		$db = ConnectionManager::getDataSource('test_suite');
+		$data = array();
+		$data['Apple']['modified'] = $db->expression('NOW()');
+		$TestModel->data = null;
+		$TestModel->set($data);
+		$this->assertEqual($TestModel->data, $data);
+	}
+
+/**
+ * testTablePrefixSwitching method
+ *
+ * @access public
+ * @return void
+ */
+	function testTablePrefixSwitching() {
+		ConnectionManager::create('database1',
+				array_merge($this->db->config, array('prefix' => 'aaa_')
+		));
+		ConnectionManager::create('database2',
+			array_merge($this->db->config, array('prefix' => 'bbb_')
+		));
+
+		$db1 = ConnectionManager::getDataSource('database1');
+		$db2 = ConnectionManager::getDataSource('database2');
+
+		$TestModel = new Apple();
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
+
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'bbb_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'bbb_apples');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'bbb_apples');
+
+		$TestModel = new Apple();
+		$TestModel->tablePrefix = 'custom_';
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'custom_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'custom_apples');
+
+		$TestModel = new Apple();
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($this->db->fullTableName($TestModel, false), 'aaa_apples');
+		$TestModel->tablePrefix = '';
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
+
+		$TestModel->tablePrefix = null;
+		$TestModel->setDataSource('database1');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'aaa_apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'aaa_apples');
+
+		$TestModel->tablePrefix = false;
+		$TestModel->setDataSource('database2');
+		$this->assertEqual($db2->fullTableName($TestModel, false), 'apples');
+		$this->assertEqual($db1->fullTableName($TestModel, false), 'apples');
+	}
+
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidAssociation() {
+		$TestModel =& new ValidationTest1();
+		$this->assertNull($TestModel->getAssociated('Foo'));
+	}
+
+/**
+ * testLoadModelSecondIteration method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadModelSecondIteration() {
+		$model = new ModelA();
+		$this->assertIsA($model,'ModelA');
+
+		$this->assertIsA($model->ModelB, 'ModelB');
+		$this->assertIsA($model->ModelB->ModelD, 'ModelD');
+
+		$this->assertIsA($model->ModelC, 'ModelC');
+		$this->assertIsA($model->ModelC->ModelD, 'ModelD');
+	}
+
+/**
+ * ensure that exists() does not persist between method calls reset on create
+ *
+ * @return void
+ */
+	function testResetOfExistsOnCreate() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$Article->id = 1;
+		$Article->saveField('title', 'Reset me');
+		$Article->delete();
+		$Article->id = 1;
+		$this->assertFalse($Article->exists());
+
+		$Article->create();
+		$this->assertFalse($Article->exists());
+		$Article->id = 2;
+		$Article->saveField('title', 'Staying alive');
+		$result = $Article->read(null, 2);
+		$this->assertEqual($result['Article']['title'], 'Staying alive');
+	}
+
+/**
+ * testUseTableFalseExistsCheck method
+ *
+ * @return void
+ */
+	function testUseTableFalseExistsCheck() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$Article->id = 1337;
+		$result = $Article->exists();
+		$this->assertFalse($result);
+
+		$Article->useTable = false;
+		$Article->id = null;
+		$result = $Article->exists();
+		$this->assertFalse($result);
+
+		// An article with primary key of '1' has been loaded by the fixtures.
+		$Article->useTable = false;
+		$Article->id = 1;
+		$result = $Article->exists();
+		$this->assertTrue($result);
+	}
+
+/**
+ * testPluginAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginAssociations() {
+		$this->loadFixtures('TestPluginArticle', 'User', 'TestPluginComment');
+		$TestModel =& new TestPluginArticle();
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'TestPluginArticle' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Plugin Article',
+					'body' => 'First Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:39:23',
+					'updated' => '2008-09-24 10:41:31'
+				),
+				'User' => array(
+					'id' => 1,
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'TestPluginComment' => array(
+					array(
+						'id' => 1,
+						'article_id' => 1,
+						'user_id' => 2,
+						'comment' => 'First Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:45:23',
+						'updated' => '2008-09-24 10:47:31'
+					),
+					array(
+						'id' => 2,
+						'article_id' => 1,
+						'user_id' => 4,
+						'comment' => 'Second Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:47:23',
+						'updated' => '2008-09-24 10:49:31'
+					),
+					array(
+						'id' => 3,
+						'article_id' => 1,
+						'user_id' => 1,
+						'comment' => 'Third Comment for First Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:49:23',
+						'updated' => '2008-09-24 10:51:31'
+					),
+					array(
+						'id' => 4,
+						'article_id' => 1,
+						'user_id' => 1,
+						'comment' => 'Fourth Comment for First Plugin Article',
+						'published' => 'N',
+						'created' => '2008-09-24 10:51:23',
+						'updated' => '2008-09-24 10:53:31'
+			))),
+			array(
+				'TestPluginArticle' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Plugin Article',
+					'body' => 'Second Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:41:23',
+					'updated' => '2008-09-24 10:43:31'
+				),
+				'User' => array(
+					'id' => 3,
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'TestPluginComment' => array(
+					array(
+						'id' => 5,
+						'article_id' => 2,
+						'user_id' => 1,
+						'comment' => 'First Comment for Second Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:53:23',
+						'updated' => '2008-09-24 10:55:31'
+					),
+					array(
+						'id' => 6,
+						'article_id' => 2,
+						'user_id' => 2,
+						'comment' => 'Second Comment for Second Plugin Article',
+						'published' => 'Y',
+						'created' => '2008-09-24 10:55:23',
+						'updated' => '2008-09-24 10:57:31'
+			))),
+			array(
+				'TestPluginArticle' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Plugin Article',
+					'body' => 'Third Plugin Article Body',
+					'published' => 'Y',
+					'created' => '2008-09-24 10:43:23',
+					'updated' => '2008-09-24 10:45:31'
+				),
+				'User' => array(
+					'id' => 1,
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'TestPluginComment' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Tests getAssociated method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetAssociated() {
+		$this->loadFixtures('Article');
+		$Article = ClassRegistry::init('Article');
+
+		$assocTypes = array('hasMany', 'hasOne', 'belongsTo', 'hasAndBelongsToMany');
+		foreach ($assocTypes as $type) {
+			 $this->assertEqual($Article->getAssociated($type), array_keys($Article->{$type}));
+		}
+
+		$Article->bindModel(array('hasMany' => array('Category')));
+		$this->assertEqual($Article->getAssociated('hasMany'), array('Comment', 'Category'));
+
+		$results = $Article->getAssociated();
+		$this->assertEqual(sort(array_keys($results)), array('Category', 'Comment', 'Tag'));
+
+		$Article->unbindModel(array('hasAndBelongsToMany' => array('Tag')));
+		$this->assertEqual($Article->getAssociated('hasAndBelongsToMany'), array());
+
+		$result = $Article->getAssociated('Category');
+		$expected = array(
+			'className' => 'Category',
+			'foreignKey' => 'article_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'dependent' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => '',
+			'association' => 'hasMany',
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testAutoConstructAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoConstructAssociations() {
+		$this->loadFixtures('User', 'ArticleFeatured');
+		$TestModel =& new AssociationTest1();
+
+		$result = $TestModel->hasAndBelongsToMany;
+		$expected = array('AssociationTest2' => array(
+				'unique' => false,
+				'joinTable' => 'join_as_join_bs',
+				'foreignKey' => false,
+				'className' => 'AssociationTest2',
+				'with' => 'JoinAsJoinB',
+				'associationForeignKey' => 'join_b_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'limit' => '', 'offset' => '',
+				'finderQuery' => '', 'deleteQuery' => '', 'insertQuery' => ''
+		));
+		$this->assertEqual($result, $expected);
+
+		// Tests related to ticket https://trac.cakephp.org/ticket/5594
+		$TestModel =& new ArticleFeatured();
+		$TestFakeModel =& new ArticleFeatured(array('table' => false));
+
+		$expected = array(
+			'User' => array(
+				'className' => 'User', 'foreignKey' => 'user_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
+			),
+			'Category' => array(
+				'className' => 'Category', 'foreignKey' => 'category_id',
+				'conditions' => '', 'fields' => '', 'order' => '', 'counterCache' => ''
+			)
+		);
+		$this->assertIdentical($TestModel->belongsTo, $expected);
+		$this->assertIdentical($TestFakeModel->belongsTo, $expected);
+
+		$this->assertEqual($TestModel->User->name, 'User');
+		$this->assertEqual($TestFakeModel->User->name, 'User');
+		$this->assertEqual($TestModel->Category->name, 'Category');
+		$this->assertEqual($TestFakeModel->Category->name, 'Category');
+
+		$expected = array(
+			'Featured' => array(
+				'className' => 'Featured',
+				'foreignKey' => 'article_featured_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'dependent' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasOne, $expected);
+		$this->assertIdentical($TestFakeModel->hasOne, $expected);
+
+		$this->assertEqual($TestModel->Featured->name, 'Featured');
+		$this->assertEqual($TestFakeModel->Featured->name, 'Featured');
+
+		$expected = array(
+			'Comment' => array(
+				'className' => 'Comment',
+				'dependent' => true,
+				'foreignKey' => 'article_featured_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'limit' => '',
+				'offset' => '',
+				'exclusive' => '',
+				'finderQuery' => '',
+				'counterQuery' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasMany, $expected);
+		$this->assertIdentical($TestFakeModel->hasMany, $expected);
+
+		$this->assertEqual($TestModel->Comment->name, 'Comment');
+		$this->assertEqual($TestFakeModel->Comment->name, 'Comment');
+
+		$expected = array(
+			'Tag' => array(
+				'className' => 'Tag',
+				'joinTable' => 'article_featureds_tags',
+				'with' => 'ArticleFeaturedsTag',
+				'foreignKey' => 'article_featured_id',
+				'associationForeignKey' => 'tag_id',
+				'conditions' => '',
+				'fields' => '',
+				'order' => '',
+				'limit' => '',
+				'offset' => '',
+				'unique' => true,
+				'finderQuery' => '',
+				'deleteQuery' => '',
+				'insertQuery' => ''
+		));
+
+		$this->assertIdentical($TestModel->hasAndBelongsToMany, $expected);
+		$this->assertIdentical($TestFakeModel->hasAndBelongsToMany, $expected);
+
+		$this->assertEqual($TestModel->Tag->name, 'Tag');
+		$this->assertEqual($TestFakeModel->Tag->name, 'Tag');
+	}
+
+/**
+ * test Model::__construct
+ *
+ * ensure that $actsAS and $_findMethods are merged.
+ *
+ * @return void
+ */
+	function testConstruct() {
+		$this->loadFixtures('Post', 'Comment');
+
+		$TestModel =& ClassRegistry::init('MergeVarPluginPost');
+		$this->assertEqual($TestModel->actsAs, array('Containable', 'Tree'));
+		$this->assertTrue(isset($TestModel->Behaviors->Containable));
+		$this->assertTrue(isset($TestModel->Behaviors->Tree));
+
+		$TestModel =& ClassRegistry::init('MergeVarPluginComment');
+		$expected = array('Containable', 'Containable' => array('some_settings'));
+		$this->assertEqual($TestModel->actsAs, $expected);
+		$this->assertTrue(isset($TestModel->Behaviors->Containable));
+	}
+
+/**
+ * test Model::__construct
+ *
+ * ensure that $actsAS and $_findMethods are merged.
+ *
+ * @return void
+ */
+	function testConstructWithAlternateDataSource() {
+		$TestModel =& ClassRegistry::init(array(
+			'class' => 'DoesntMatter', 'ds' => 'test_suite', 'table' => false
+		));
+		$this->assertEqual('test_suite', $TestModel->useDbConfig);
+
+		//deprecated but test it anyway
+		$NewVoid =& new TheVoid(null, false, 'other');
+		$this->assertEqual('other', $NewVoid->useDbConfig);
+	}
+
+/**
+ * testColumnTypeFetching method
+ *
+ * @access public
+ * @return void
+ */
+	function testColumnTypeFetching() {
+		$model =& new Test();
+		$this->assertEqual($model->getColumnType('id'), 'integer');
+		$this->assertEqual($model->getColumnType('notes'), 'text');
+		$this->assertEqual($model->getColumnType('updated'), 'datetime');
+		$this->assertEqual($model->getColumnType('unknown'), null);
+
+		$model =& new Article();
+		$this->assertEqual($model->getColumnType('User.created'), 'datetime');
+		$this->assertEqual($model->getColumnType('Tag.id'), 'integer');
+		$this->assertEqual($model->getColumnType('Article.id'), 'integer');
+	}
+
+/**
+ * testHabtmUniqueKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUniqueKey() {
+		$model =& new Item();
+		$this->assertFalse($model->hasAndBelongsToMany['Portfolio']['unique']);
+	}
+
+/**
+ * testIdentity method
+ *
+ * @access public
+ * @return void
+ */
+	function testIdentity() {
+		$TestModel =& new Test();
+		$result = $TestModel->alias;
+		$expected = 'Test';
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new TestAlias();
+		$result = $TestModel->alias;
+		$expected = 'TestAlias';
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Test(array('alias' => 'AnotherTest'));
+		$result = $TestModel->alias;
+		$expected = 'AnotherTest';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testWithAssociation method
+ *
+ * @access public
+ * @return void
+ */
+	function testWithAssociation() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+		$TestModel =& new Something();
+		$result = $TestModel->SomethingElse->find('all');
+
+		$expected = array(
+			array(
+				'SomethingElse' => array(
+					'id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'id' => '3',
+							'something_id' => '3',
+							'something_else_id' => '1',
+							'doomed' => '1',
+							'created' => '2007-03-18 10:43:23',
+							'updated' => '2007-03-18 10:45:31'
+			)))),
+			array(
+				'SomethingElse' => array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'id' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2',
+							'doomed' => '1',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+			)))),
+			array(
+				'SomethingElse' => array(
+					'id' => '3',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Something' => array(
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'id' => '2',
+							'something_id' => '2',
+							'something_else_id' => '3',
+							'doomed' => '0',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+		)))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Something' => array(
+					'id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2'
+			)))),
+			array(
+				'Something' => array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'doomed' => '0',
+							'something_id' => '2',
+							'something_else_id' => '3'
+			)))),
+			array(
+				'Something' => array(
+					'id' => '3',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'SomethingElse' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '3',
+							'something_else_id' => '1'
+		)))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'Something' => array(
+				'id' => '1',
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			),
+			'SomethingElse' => array(
+				array(
+					'id' => '2',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'JoinThing' => array(
+						'doomed' => '1',
+						'something_id' => '1',
+						'something_else_id' => '2'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$expected = $TestModel->findById(1);
+		$TestModel->set($expected);
+		$TestModel->save();
+		$result = $TestModel->findById(1);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasAndBelongsToMany['SomethingElse']['unique'] = false;
+		$TestModel->create(array(
+			'Something' => array('id' => 1),
+			'SomethingElse' => array(3, array(
+				'something_else_id' => 1,
+				'doomed' => '1'
+		))));
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->save();
+
+		$TestModel->hasAndBelongsToMany['SomethingElse']['order'] = 'SomethingElse.id ASC';
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'Something' => array(
+				'id' => '1',
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => $ts),
+				'SomethingElse' => array(
+					array(
+						'id' => '1',
+						'title' => 'First Post',
+						'body' => 'First Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '1'
+					)),
+					array(
+						'id' => '2',
+						'title' => 'Second Post',
+						'body' => 'Second Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31',
+						'JoinThing' => array(
+							'doomed' => '1',
+							'something_id' => '1',
+							'something_else_id' => '2'
+					)),
+					array(
+						'id' => '3',
+						'title' => 'Third Post',
+						'body' => 'Third Post Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31',
+						'JoinThing' => array(
+							'doomed' => '0',
+							'something_id' => '1',
+							'something_else_id' => '3'
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindSelfAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindSelfAssociations() {
+		$this->loadFixtures('Person');
+
+		$TestModel =& new Person();
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'Person' => array(
+				'id' => 1,
+				'name' => 'person',
+				'mother_id' => 2,
+				'father_id' => 3
+			),
+			'Mother' => array(
+				'id' => 2,
+				'name' => 'mother',
+				'mother_id' => 4,
+				'father_id' => 5,
+				'Mother' => array(
+					'id' => 4,
+					'name' => 'mother - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0
+				),
+				'Father' => array(
+					'id' => 5,
+					'name' => 'mother - grand father',
+					'mother_id' => 0,
+					'father_id' => 0
+			)),
+			'Father' => array(
+				'id' => 3,
+				'name' => 'father',
+				'mother_id' => 6,
+				'father_id' => 7,
+				'Father' => array(
+					'id' => 7,
+					'name' => 'father - grand father',
+					'mother_id' => 0,
+					'father_id' => 0
+				),
+				'Mother' => array(
+					'id' => 6,
+					'name' => 'father - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 3;
+		$result = $TestModel->read(null, 1);
+		$expected = array(
+			'Person' => array(
+				'id' => 1,
+				'name' => 'person',
+				'mother_id' => 2,
+				'father_id' => 3
+			),
+			'Mother' => array(
+				'id' => 2,
+				'name' => 'mother',
+				'mother_id' => 4,
+				'father_id' => 5,
+				'Mother' => array(
+					'id' => 4,
+					'name' => 'mother - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Mother' => array(),
+					'Father' => array()),
+				'Father' => array(
+					'id' => 5,
+					'name' => 'mother - grand father',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Father' => array(),
+					'Mother' => array()
+			)),
+			'Father' => array(
+				'id' => 3,
+				'name' => 'father',
+				'mother_id' => 6,
+				'father_id' => 7,
+				'Father' => array(
+					'id' => 7,
+					'name' => 'father - grand father',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Father' => array(),
+					'Mother' => array()
+				),
+				'Mother' => array(
+					'id' => 6,
+					'name' => 'father - grand mother',
+					'mother_id' => 0,
+					'father_id' => 0,
+					'Mother' => array(),
+					'Father' => array()
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDynamicAssociations method
+ *
+ * @access public
+ * @return void
+ */
+	function testDynamicAssociations() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = $TestModel->hasOne = array();
+		$TestModel->hasMany['Comment'] = array_merge($TestModel->hasMany['Comment'], array(
+			'foreignKey' => false,
+			'conditions' => array('Comment.user_id =' => '2')
+		));
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testCreation method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreation() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Test();
+		$result = $TestModel->create();
+		$expected = array('Test' => array('notes' => 'write some notes here'));
+		$this->assertEqual($result, $expected);
+		$TestModel =& new User();
+		$result = $TestModel->schema();
+
+		if (isset($this->db->columns['primary_key']['length'])) {
+			$intLength = $this->db->columns['primary_key']['length'];
+		} elseif (isset($this->db->columns['integer']['length'])) {
+			$intLength = $this->db->columns['integer']['length'];
+		} else {
+			$intLength = 11;
+		}
+		foreach (array('collate', 'charset') as $type) {
+			unset($result['user'][$type]);
+			unset($result['password'][$type]);
+		}
+
+		$expected = array(
+			'id' => array(
+				'type' => 'integer',
+				'null' => false,
+				'default' => null,
+				'length' => $intLength,
+				'key' => 'primary'
+			),
+			'user' => array(
+				'type' => 'string',
+				'null' => false,
+				'default' => '',
+				'length' => 255
+			),
+			'password' => array(
+				'type' => 'string',
+				'null' => false,
+				'default' => '',
+				'length' => 255
+			),
+			'created' => array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+			),
+			'updated'=> array(
+				'type' => 'datetime',
+				'null' => true,
+				'default' => null,
+				'length' => null
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Article();
+		$result = $TestModel->create();
+		$expected = array('Article' => array('published' => 'N'));
+		$this->assertEqual($result, $expected);
+
+		$FeaturedModel =& new Featured();
+		$data = array(
+			'article_featured_id' => 1,
+			'category_id' => 1,
+			'published_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 11
+			),
+			'end_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 20
+		));
+
+		$expected = array(
+			'Featured' => array(
+				'article_featured_id' => 1,
+				'category_id' => 1,
+				'published_date' => '2008-6-11 00:00:00',
+				'end_date' => '2008-6-20 00:00:00'
+		));
+
+		$this->assertEqual($FeaturedModel->create($data), $expected);
+
+		$data = array(
+			'published_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 11
+			),
+			'end_date' => array(
+				'year' => 2008,
+				'month' => 06,
+				'day' => 20
+			),
+			'article_featured_id' => 1,
+			'category_id' => 1
+		);
+
+		$expected = array(
+			'Featured' => array(
+				'published_date' => '2008-6-11 00:00:00',
+				'end_date' => '2008-6-20 00:00:00',
+				'article_featured_id' => 1,
+				'category_id' => 1
+		));
+
+		$this->assertEqual($FeaturedModel->create($data), $expected);
+	}
+
+/**
+ * testEscapeField to prove it escapes the field well even when it has part of the alias on it
+ * @see ttp://cakephp.lighthouseapp.com/projects/42648-cakephp-1x/tickets/473-escapefield-doesnt-consistently-prepend-modelname
+ *
+ * @access public
+ * @return void
+ */
+	function testEscapeField() {
+		$TestModel =& new Test();
+		$db =& $TestModel->getDataSource();
+
+		$result = $TestModel->escapeField('test_field');
+		$expected = $db->name('Test.test_field');
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->escapeField('TestField');
+		$expected = $db->name('Test.TestField');
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->escapeField('DomainHandle', 'Domain');
+		$expected = $db->name('Domain.DomainHandle');
+		$this->assertEqual($result, $expected);
+
+		ConnectionManager::create('mock', array('driver' => 'mock'));
+		$TestModel->setDataSource('mock');
+		$db =& $TestModel->getDataSource();
+
+		$result = $TestModel->escapeField('DomainHandle', 'Domain');
+		$expected = $db->name('Domain.DomainHandle');
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_read.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_read.test.php
new file mode 100755
index 000000000..d59af8988
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_read.test.php
@@ -0,0 +1,7456 @@
+<?php
+/**
+ * ModelReadTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+/**
+ * ModelReadTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelReadTest extends BaseModelTest {
+
+/**
+ * testFetchingNonUniqueFKJoinTableRecords()
+ *
+ * Tests if the results are properly returned in the case there are non-unique FK's
+ * in the join table but another fields value is different. For example:
+ * something_id | something_else_id | doomed = 1
+ * something_id | something_else_id | doomed = 0
+ * Should return both records and not just one.
+ *
+ * @access public
+ * @return void
+ */
+	function testFetchingNonUniqueFKJoinTableRecords() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+		$Something = new Something();
+
+		$joinThingData = array(
+			'JoinThing' => array(
+				'something_id' => 1,
+				'something_else_id' => 2,
+				'doomed' => '0',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)
+		);
+
+		$Something->JoinThing->create($joinThingData);
+		$Something->JoinThing->save();
+
+		$result = $Something->JoinThing->find('all', array('conditions' => array('something_else_id' => 2)));
+		$this->assertEqual($result[0]['JoinThing']['doomed'], true);
+		$this->assertEqual($result[1]['JoinThing']['doomed'], false);
+
+		$result = $Something->find('first');
+		$this->assertEqual(count($result['SomethingElse']), 2);
+
+		$doomed = Set::extract('/JoinThing/doomed', $result['SomethingElse']);
+		$this->assertTrue(in_array(true, $doomed));
+		$this->assertTrue(in_array(false, $doomed));
+	}
+
+/**
+ * testGroupBy method
+ *
+ * These tests will never pass with Postgres or Oracle as all fields in a select must be
+ * part of an aggregate function or in the GROUP BY statement.
+ *
+ * @access public
+ * @return void
+ */
+	function testGroupBy() {
+		$db = ConnectionManager::getDataSource('test_suite');
+		$isStrictGroupBy = in_array($db->config['driver'], array('postgres', 'oracle'));
+		$message = '%s Postgres and Oracle have strict GROUP BY and are incompatible with this test.';
+
+		if ($this->skipIf($isStrictGroupBy, $message )) {
+			return;
+		}
+
+		$this->loadFixtures('Project', 'Product', 'Thread', 'Message', 'Bid');
+		$Thread =& new Thread();
+		$Product =& new Product();
+
+		$result = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'order' => 'Thread.id ASC'
+		));
+
+		$expected = array(
+			array(
+				'Thread' => array(
+					'id' => 1,
+					'project_id' => 1,
+					'name' => 'Project 1, Thread 1'
+				),
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Message' => array(
+					array(
+						'id' => 1,
+						'thread_id' => 1,
+						'name' => 'Thread 1, Message 1'
+			))),
+			array(
+				'Thread' => array(
+					'id' => 3,
+					'project_id' => 2,
+					'name' => 'Project 2, Thread 1'
+				),
+				'Project' => array(
+					'id' => 2,
+					'name' => 'Project 2'
+				),
+				'Message' => array(
+					array(
+						'id' => 3,
+						'thread_id' => 3,
+						'name' => 'Thread 3, Message 1'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$rows = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'fields' => array('Thread.project_id', 'COUNT(*) AS total')
+		));
+		$result = array();
+		foreach($rows as $row) {
+			$result[$row['Thread']['project_id']] = $row[0]['total'];
+		}
+		$expected = array(
+			1 => 2,
+			2 => 1
+		);
+		$this->assertEqual($result, $expected);
+
+		$rows = $Thread->find('all', array(
+			'group' => 'Thread.project_id',
+			'fields' => array('Thread.project_id', 'COUNT(*) AS total'),
+			'order'=> 'Thread.project_id'
+		));
+		$result = array();
+		foreach($rows as $row) {
+			$result[$row['Thread']['project_id']] = $row[0]['total'];
+		}
+		$expected = array(
+			1 => 2,
+			2 => 1
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'Thread.project_id'
+		));
+		$expected = array(
+			array(
+				'Thread' => array(
+					'id' => 1,
+					'project_id' => 1,
+					'name' => 'Project 1, Thread 1'
+				),
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Message' => array(
+					array(
+						'id' => 1,
+						'thread_id' => 1,
+						'name' => 'Thread 1, Message 1'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'Thread.project_id, Project.id'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => 'project_id'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('project_id')
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('project_id', 'Project.id')
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $Thread->find('all', array(
+			'conditions' => array('Thread.project_id' => 1),
+			'group' => array('Thread.project_id', 'Project.id')
+		));
+		$this->assertEqual($result, $expected);
+
+		$expected = array(
+			array('Product' => array('type' => 'Clothing'), array('price' => 32)),
+			array('Product' => array('type' => 'Food'), array('price' => 9)),
+			array('Product' => array('type' => 'Music'), array( 'price' => 4)),
+			array('Product' => array('type' => 'Toy'), array('price' => 3))
+		);
+		$result = $Product->find('all',array(
+			'fields'=>array('Product.type', 'MIN(Product.price) as price'),
+			'group'=> 'Product.type',
+			'order' => 'Product.type ASC'
+			));
+		$this->assertEqual($result, $expected);
+
+		$result = $Product->find('all', array(
+			'fields'=>array('Product.type', 'MIN(Product.price) as price'),
+			'group'=> array('Product.type'),
+			'order' => 'Product.type ASC'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testOldQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testOldQuery() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id IN (1,2)';
+
+		$results = $Article->query($query);
+		$this->assertTrue(is_array($results));
+		$this->assertEqual(count($results), 2);
+
+		$query  = 'SELECT title, body FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.id = 1';
+
+		$results = $Article->query($query, false);
+		$this->assertTrue(!isset($this->db->_queryCache[$query]));
+		$this->assertTrue(is_array($results));
+
+		$query  = 'SELECT title, id FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.published = ' . $this->db->value('Y');
+
+		$results = $Article->query($query, true);
+		$this->assertTrue(isset($this->db->_queryCache[$query]));
+		$this->assertTrue(is_array($results));
+	}
+
+/**
+ * testPreparedQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testPreparedQuery() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$this->db->_queryCache = array();
+
+		$finalQuery = 'SELECT title, published FROM ';
+		$finalQuery .= $this->db->fullTableName('articles');
+		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.id = ' . $this->db->value(1);
+		$finalQuery .= ' AND ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.published = ' . $this->db->value('Y');
+
+		$query = 'SELECT title, published FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.id = ? AND ' . $this->db->fullTableName('articles') . '.published = ?';
+
+		$params = array(1, 'Y');
+		$result = $Article->query($query, $params);
+		$expected = array(
+			'0' => array(
+				$this->db->fullTableName('articles', false) => array(
+					'title' => 'First Article', 'published' => 'Y')
+		));
+
+		if (isset($result[0][0])) {
+			$expected[0][0] = $expected[0][$this->db->fullTableName('articles', false)];
+			unset($expected[0][$this->db->fullTableName('articles', false)]);
+		}
+
+		$this->assertEqual($result, $expected);
+		$this->assertTrue(isset($this->db->_queryCache[$finalQuery]));
+
+		$finalQuery = 'SELECT id, created FROM ';
+		$finalQuery .= $this->db->fullTableName('articles');
+		$finalQuery .= ' WHERE ' . $this->db->fullTableName('articles');
+		$finalQuery .= '.title = ' . $this->db->value('First Article');
+
+		$query  = 'SELECT id, created FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= '  WHERE ' . $this->db->fullTableName('articles') . '.title = ?';
+
+		$params = array('First Article');
+		$result = $Article->query($query, $params, false);
+		$this->assertTrue(is_array($result));
+		$this->assertTrue(
+			   isset($result[0][$this->db->fullTableName('articles', false)])
+			|| isset($result[0][0])
+		);
+		$this->assertFalse(isset($this->db->_queryCache[$finalQuery]));
+
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles') . '.title LIKE ?';
+
+		$params = array('%First%');
+		$result = $Article->query($query, $params);
+		$this->assertTrue(is_array($result));
+		$this->assertTrue(
+			   isset($result[0][$this->db->fullTableName('articles', false)]['title'])
+			|| isset($result[0][0]['title'])
+		);
+
+		//related to ticket #5035
+		$query  = 'SELECT title FROM ';
+		$query .= $this->db->fullTableName('articles') . ' WHERE title = ? AND published = ?';
+		$params = array('First? Article', 'Y');
+		$Article->query($query, $params);
+
+		$expected  = 'SELECT title FROM ';
+		$expected .= $this->db->fullTableName('articles');
+		$expected .= " WHERE title = 'First? Article' AND published = 'Y'";
+		$this->assertTrue(isset($this->db->_queryCache[$expected]));
+
+	}
+
+/**
+ * testParameterMismatch method
+ *
+ * @access public
+ * @return void
+ */
+	function testParameterMismatch() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query  = 'SELECT * FROM ' . $this->db->fullTableName('articles');
+		$query .= ' WHERE ' . $this->db->fullTableName('articles');
+		$query .= '.published = ? AND ' . $this->db->fullTableName('articles') . '.user_id = ?';
+		$params = array('Y');
+		$this->expectError();
+
+		ob_start();
+		$result = $Article->query($query, $params);
+		ob_end_clean();
+		$this->assertEqual($result, null);
+	}
+
+/**
+ * testVeryStrangeUseCase method
+ *
+ * @access public
+ * @return void
+ */
+	function testVeryStrangeUseCase() {
+		$message = "%s skipping SELECT * FROM ? WHERE ? = ? AND ? = ?; prepared query.";
+		$message .= " MSSQL is incompatible with this test.";
+
+		if ($this->skipIf($this->db->config['driver'] == 'mssql', $message)) {
+			return;
+		}
+
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+
+		$query = 'SELECT * FROM ? WHERE ? = ? AND ? = ?';
+		$param = array(
+			$this->db->fullTableName('articles'),
+			$this->db->fullTableName('articles') . '.user_id', '3',
+			$this->db->fullTableName('articles') . '.published', 'Y'
+		);
+		$this->expectError();
+
+		ob_start();
+		$result = $Article->query($query, $param);
+		ob_end_clean();
+	}
+
+/**
+ * testRecursiveUnbind method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveUnbind() {
+		$this->loadFixtures('Apple', 'Sample');
+		$TestModel =& new Apple();
+		$TestModel->recursive = 2;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array (
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' =>'',
+						'apple_id' => '',
+						'name' => ''
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 2,
+								'apple_id' => 2,
+								'name' => 'sample2'
+							),
+							'Child' => array(
+								array(
+									'id' => 1,
+									'apple_id' => 2,
+									'color' => 'Red 1',
+									'name' => 'Red Apple 1',
+									'created' => '2006-11-22 10:38:58',
+									'date' => '1951-01-04',
+									'modified' => '2006-12-01 13:31:26',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 3,
+									'apple_id' => 2,
+									'color' => 'blue green',
+									'name' => 'green blue',
+									'created' => '2006-12-25 05:13:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:24',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 4,
+									'apple_id' => 2,
+									'color' => 'Blue Green',
+									'name' => 'Test Name',
+									'created' => '2006-12-25 05:23:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:36',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2',
+						'Apple' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+					)),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(),
+							'Child' => array(
+								array(
+									'id' => 2,
+									'apple_id' => 1,
+									'color' => 'Bright Red 1',
+									'name' => 'Bright Red Apple',
+									'created' => '2006-11-22 10:43:13',
+									'date' => '2014-01-01',
+									'modified' => '2006-11-30 18:38:10',
+									'mytime' => '22:57:17'
+						))),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 1,
+								'apple_id' => 3,
+								'name' => 'sample1'
+						)),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 3,
+								'apple_id' => 4,
+								'name' => 'sample3'
+							),
+							'Child' => array(
+								array(
+									'id' => 6,
+									'apple_id' => 4,
+									'color' => 'My new appleOrange',
+									'name' => 'My new apple',
+									'created' => '2006-12-25 05:29:39',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:29:39',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+						'Sample' => array('id' => 2, 'apple_id' => 2, 'name' => 'sample2'),
+						'Child' => array(
+							array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 3,
+								'apple_id' => 2,
+								'color' => 'blue green',
+								'name' => 'green blue',
+								'created' => '2006-12-25 05:13:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:24',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 4,
+								'apple_id' => 2,
+								'color' => 'Blue Green',
+								'name' => 'Test Name',
+								'created' => '2006-12-25 05:23:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:36',
+								'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 7,
+								'apple_id' => 6,
+								'color' => 'Some wierd color',
+								'name' => 'Some odd color',
+								'created' => '2006-12-25 05:34:21',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:34:21',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					)),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 5,
+								'apple_id' => 5,
+								'color' => 'Green',
+								'name' => 'Blue Green',
+								'created' => '2006-12-25 05:24:06',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:16',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 4,
+								'apple_id' => 5,
+								'name' => 'sample4'
+							),
+							'Child' => array(
+								array(
+									'id' => 5,
+									'apple_id' => 5,
+									'color' => 'Green',
+									'name' => 'Blue Green',
+									'created' => '2006-12-25 05:24:06',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:29:16',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 3,
+						'apple_id' => 4,
+						'name' => 'sample3'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array()
+			))),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' =>
+					'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array()));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'),
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						'Child' => array(
+							array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 3,
+								'apple_id' => 2,
+								'color' => 'blue green',
+								'name' => 'green blue',
+								'created' => '2006-12-25 05:13:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:24',
+								'mytime' => '22:57:17'
+							),
+							array(
+								'id' => 4,
+								'apple_id' => 2,
+								'color' => 'Blue Green',
+								'name' => 'Test Name',
+								'created' => '2006-12-25 05:23:36',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:23:36',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' =>'',
+						'apple_id' => '',
+						'name' => ''
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17',
+							'Parent' => array(
+								'id' => 1,
+								'apple_id' => 2,
+								'color' => 'Red 1',
+								'name' => 'Red Apple 1',
+								'created' => '2006-11-22 10:38:58',
+								'date' => '1951-01-04',
+								'modified' => '2006-12-01 13:31:26',
+								'mytime' => '22:57:17'
+							),
+							'Sample' => array(
+								'id' => 2,
+								'apple_id' => 2,
+								'name' => 'sample2'
+							),
+							'Child' => array(
+								array(
+									'id' => 1,
+									'apple_id' => 2,
+									'color' => 'Red 1',
+									'name' => 'Red Apple 1',
+									'created' => '2006-11-22 10:38:58',
+									'date' => '1951-01-04',
+									'modified' => '2006-12-01 13:31:26',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 3,
+									'apple_id' => 2,
+									'color' => 'blue green',
+									'name' => 'green blue',
+									'created' => '2006-12-25 05:13:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:24',
+									'mytime' => '22:57:17'
+								),
+								array(
+									'id' => 4,
+									'apple_id' => 2,
+									'color' => 'Blue Green',
+									'name' => 'Test Name',
+									'created' => '2006-12-25 05:23:36',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:23:36',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01', 'modified' =>
+								'2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+					))),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 1,
+							'apple_id' => 3,
+							'name' => 'sample1'
+					)),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 3,
+							'apple_id' => 4,
+							'name' => 'sample3'
+						),
+						'Child' => array(
+							array(
+								'id' => 6,
+								'apple_id' => 4,
+								'color' => 'My new appleOrange',
+								'name' => 'My new apple',
+								'created' => '2006-12-25 05:29:39',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:39',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(),
+							'Child' => array(
+								array(
+									'id' => 7,
+									'apple_id' => 6,
+									'color' => 'Some wierd color',
+									'name' => 'Some odd color',
+									'created' => '2006-12-25 05:34:21',
+									'date' => '2006-12-25',
+									'modified' => '2006-12-25 05:34:21',
+									'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+				)),
+				'Child' => array(
+					array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array(
+							'id' => 4,
+							'apple_id' => 5,
+							'name' => 'sample4'
+						),
+						'Child' => array(
+							array(
+								'id' => 5,
+								'apple_id' => 5,
+								'color' => 'Green',
+								'name' => 'Blue Green',
+								'created' => '2006-12-25 05:24:06',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:16',
+								'mytime' => '22:57:17'
+			))))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17',
+						'Parent' => array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+						),
+						'Sample' => array()
+			))),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+				),
+				'Child' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('hasOne' => array('Sample')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array (
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+				'id' => 3,
+				'apple_id' => 2,
+				'color' => 'blue green',
+				'name' => 'green blue',
+				'created' => '2006-12-25 05:13:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:24',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 2,
+				'apple_id' => 1,
+				'color' => 'Bright Red 1',
+				'name' => 'Bright Red Apple',
+				'created' => '2006-11-22 10:43:13',
+				'date' => '2014-01-01',
+				'modified' => '2006-11-30 18:38:10',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 1,
+				'apple_id' => 3,
+				'name' => 'sample1',
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 4,
+				'apple_id' => 2,
+				'color' => 'Blue Green',
+				'name' => 'Test Name',
+				'created' => '2006-12-25 05:23:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:36',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 2,
+				'apple_id' => 1,
+				'color' => 'Bright Red 1',
+				'name' => 'Bright Red Apple',
+				'created' => '2006-11-22 10:43:13',
+				'date' => '2014-01-01',
+				'modified' => '2006-11-30 18:38:10',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 3,
+				'apple_id' => 4,
+				'name' => 'sample3',
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 5,
+				'apple_id' => 5,
+				'color' => 'Green',
+				'name' => 'Blue Green',
+				'created' => '2006-12-25 05:24:06',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:16',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 5,
+				'apple_id' => 5,
+				'color' => 'Green',
+				'name' => 'Blue Green',
+				'created' => '2006-12-25 05:24:06',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:16',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => 4,
+				'apple_id' => 5,
+				'name' => 'sample4',
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+		))),
+		array(
+			'Apple' => array(
+				'id' => 6,
+				'apple_id' => 4,
+				'color' => 'My new appleOrange',
+				'name' => 'My new apple',
+				'created' => '2006-12-25 05:29:39',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:39',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 4,
+				'apple_id' => 2,
+				'color' => 'Blue Green',
+				'name' => 'Test Name',
+				'created' => '2006-12-25 05:23:36',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:23:36',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 6,
+						'apple_id' => 4,
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => '',
+				'apple_id' => '',
+				'name' => ''
+		)),
+		array(
+			'Apple' => array(
+				'id' => 7,
+				'apple_id' => 6,
+				'color' => 'Some wierd color',
+				'name' => 'Some odd color',
+				'created' => '2006-12-25 05:34:21',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:34:21',
+				'mytime' => '22:57:17'
+			),
+			'Parent' => array(
+				'id' => 6,
+				'apple_id' => 4,
+				'color' => 'My new appleOrange',
+				'name' => 'My new apple',
+				'created' => '2006-12-25 05:29:39',
+				'date' => '2006-12-25',
+				'modified' => '2006-12-25 05:29:39',
+				'mytime' => '22:57:17',
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Child' => array(
+					array(
+						'id' => 7,
+						'apple_id' => 6,
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17'
+			))),
+			'Sample' => array(
+				'id' => '',
+				'apple_id' => '',
+				'name' => ''
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->Sample->unbindModel(array('belongsTo' => array('Apple')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 2,
+							'apple_id' => 1,
+							'color' => 'Bright Red 1',
+							'name' => 'Bright Red Apple',
+							'created' => '2006-11-22 10:43:13',
+							'date' => '2014-01-01',
+							'modified' => '2006-11-30 18:38:10',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 1,
+						'apple_id' => 2,
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4'
+			)),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(
+						'id' => 3,
+						'apple_id' => 4,
+						'name' => 'sample3'
+					),
+					'Child' => array(
+						array(
+							'id' => 6,
+							'apple_id' => 4,
+							'color' => 'My new appleOrange',
+							'name' => 'My new apple',
+							'created' => '2006-12-25 05:29:39',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:39',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+					),
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->Parent->unbindModel(array('belongsTo' => array('Parent')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Child')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' =>'',
+					'apple_id' => '',
+					'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 1,
+					'apple_id' => 2,
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17',
+					'Sample' => array(),
+						'Child' => array(
+							array(
+								'id' => 2,
+								'apple_id' => 1,
+								'color' => 'Bright Red 1',
+								'name' => 'Bright Red Apple',
+								'created' => '2006-11-22 10:43:13',
+								'date' => '2014-01-01',
+								'modified' => '2006-11-30 18:38:10',
+								'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 2,
+					'apple_id' => 2,
+					'name' => 'sample2',
+					'Apple' => array(
+						'id' => 2,
+						'apple_id' => 1,
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 3,
+					'apple_id' => 2,
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 1,
+					'apple_id' => 3,
+					'name' => 'sample1',
+					'Apple' => array(
+						'id' => 3,
+						'apple_id' => 2,
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 4,
+					'apple_id' => 2,
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 2,
+					'apple_id' => 1,
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 2,
+						'apple_id' => 2,
+						'name' => 'sample2'
+					),
+					'Child' => array(
+						array(
+							'id' => 1,
+							'apple_id' => 2,
+							'color' => 'Red 1',
+							'name' => 'Red Apple 1',
+							'created' => '2006-11-22 10:38:58',
+							'date' => '1951-01-04',
+							'modified' => '2006-12-01 13:31:26',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 3,
+							'apple_id' => 2,
+							'color' => 'blue green',
+							'name' => 'green blue',
+							'created' => '2006-12-25 05:13:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:24',
+							'mytime' => '22:57:17'
+						),
+						array(
+							'id' => 4,
+							'apple_id' => 2,
+							'color' => 'Blue Green',
+							'name' => 'Test Name',
+							'created' => '2006-12-25 05:23:36',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:23:36',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 3,
+					'apple_id' => 4,
+					'name' => 'sample3',
+					'Apple' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' =>
+					'2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 5,
+					'apple_id' => 5,
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17',
+					'Sample' => array(
+						'id' => 4,
+						'apple_id' => 5,
+						'name' => 'sample4'
+					),
+					'Child' => array(
+						array(
+							'id' => 5,
+							'apple_id' => 5,
+							'color' => 'Green',
+							'name' => 'Blue Green',
+							'created' => '2006-12-25 05:24:06',
+							'date' => '2006-12-25',
+							'modified' => '2006-12-25 05:29:16',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => 4,
+					'apple_id' => 5,
+					'name' => 'sample4',
+					'Apple' => array(
+						'id' => 5,
+						'apple_id' => 5,
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'),
+					'Parent' => array(
+						'id' => 4,
+						'apple_id' => 2,
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17',
+						'Sample' => array(
+							'id' => 3,
+							'apple_id' => 4,
+							'name' => 'sample3'
+						),
+						'Child' => array(
+							array(
+								'id' => 6,
+								'apple_id' => 4,
+								'color' => 'My new appleOrange',
+								'name' => 'My new apple',
+								'created' => '2006-12-25 05:29:39',
+								'date' => '2006-12-25',
+								'modified' => '2006-12-25 05:29:39',
+								'mytime' => '22:57:17'
+					))),
+					'Sample' => array(
+						'id' => '',
+						'apple_id' => '',
+						'name' => ''
+			)),
+			array(
+				'Apple' => array(
+					'id' => 7,
+					'apple_id' => 6,
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => 6,
+					'apple_id' => 4,
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17',
+					'Sample' => array(),
+					'Child' => array(
+						array(
+							'id' => 7,
+							'apple_id' => 6,
+							'color' => 'Some wierd color',
+							'name' => 'Some odd color',
+							'created' => '2006-12-25 05:34:21',
+							'date' => '2006-12-25', 'modified' =>
+							'2006-12-25 05:34:21',
+							'mytime' => '22:57:17'
+				))),
+				'Sample' => array(
+					'id' => '',
+					'apple_id' => '',
+					'name' => ''
+		)));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSelfAssociationAfterFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testSelfAssociationAfterFind() {
+		$this->loadFixtures('Apple');
+		$afterFindModel = new NodeAfterFind();
+		$afterFindModel->recursive = 3;
+		$afterFindData = $afterFindModel->find('all');
+
+		$duplicateModel = new NodeAfterFind();
+		$duplicateModel->recursive = 3;
+		$duplicateModelData = $duplicateModel->find('all');
+
+		$noAfterFindModel = new NodeNoAfterFind();
+		$noAfterFindModel->recursive = 3;
+		$noAfterFindData = $noAfterFindModel->find('all');
+
+		$this->assertFalse($afterFindModel == $noAfterFindModel);
+		// Limitation of PHP 4 and PHP 5 > 5.1.6 when comparing recursive objects
+		if (PHP_VERSION === '5.1.6') {
+			$this->assertFalse($afterFindModel != $duplicateModel);
+		}
+		$this->assertEqual($afterFindData, $noAfterFindData);
+	}
+
+/**
+ * testFindAllThreaded method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllThreaded() {
+		$this->loadFixtures('Category');
+		$TestModel =& new Category();
+
+		$result = $TestModel->find('threaded');
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 1%')
+		));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name'
+		));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '2',
+							'parent_id' => '1',
+							'name' => 'Category 1.1'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2'),
+								'children' => array()))
+					),
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array('order' => 'id DESC'));
+
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => 5,
+					'parent_id' => 0,
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => 6,
+							'parent_id' => 5,
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => 4,
+					'parent_id' => 0,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => 1,
+					'parent_id' => 0,
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => 3,
+							'parent_id' => 1,
+							'name' => 'Category 1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					),
+					array(
+						'Category' => array(
+							'id' => 2,
+							'parent_id' => 1,
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array(
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 3%')
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'conditions' => array('Category.name LIKE' => 'Category 1.1%')
+		));
+		$expected = array(
+				array('Category' =>
+					array(
+						'id' => '2',
+						'parent_id' => '1',
+						'name' => 'Category 1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31'),
+						'children' => array(
+							array('Category' => array(
+								'id' => '7',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()),
+							array('Category' => array(
+								'id' => '8',
+								'parent_id' => '2',
+								'name' => 'Category 1.1.2',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31'),
+								'children' => array()))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name',
+			'conditions' => array('Category.id !=' => 2)
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '3',
+							'parent_id' => '1',
+							'name' => 'Category 1.2'
+						),
+						'children' => array()
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => '4',
+					'parent_id' => '0',
+					'name' => 'Category 2'
+				),
+				'children' => array()
+			),
+			array(
+				'Category' => array(
+					'id' => '5',
+					'parent_id' => '0',
+					'name' => 'Category 3'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'id' => '6',
+							'parent_id' => '5',
+							'name' => 'Category 3.1'
+						),
+						'children' => array()
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'id, name, parent_id',
+			'conditions' => array('Category.id !=' => 1)
+		));
+		$expected = array (
+			array ('Category' => array(
+				'id' => '2',
+				'name' => 'Category 1.1',
+				'parent_id' => '1'
+			)),
+			array ('Category' => array(
+				'id' => '3',
+				'name' => 'Category 1.2',
+				'parent_id' => '1'
+			)),
+			array ('Category' => array(
+				'id' => '4',
+				'name' => 'Category 2',
+				'parent_id' => '0'
+			)),
+			array ('Category' => array(
+				'id' => '5',
+				'name' => 'Category 3',
+				'parent_id' => '0'
+			)),
+			array ('Category' => array(
+				'id' => '6',
+				'name' => 'Category 3.1',
+				'parent_id' => '5'
+			)),
+			array ('Category' => array(
+				'id' => '7',
+				'name' => 'Category 1.1.1',
+				'parent_id' => '2'
+			)),
+			array ('Category' => array(
+				'id' => '8',
+				'name' => 'Category 1.1.2',
+				'parent_id' => '2'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('threaded', array(
+			'fields' => 'id, parent_id, name',
+			'conditions' => array('Category.id !=' => 1)
+		));
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => '2',
+					'parent_id' => '1',
+					'name' => 'Category 1.1'
+				),
+				'children' => array(
+					array('Category' => array(
+						'id' => '7',
+						'parent_id' => '2',
+						'name' => 'Category 1.1.1'),
+						'children' => array()),
+					array('Category' => array(
+						'id' => '8',
+						'parent_id' => '2',
+						'name' => 'Category 1.1.2'),
+						'children' => array()))
+			),
+			array(
+				'Category' => array(
+					'id' => '3',
+					'parent_id' => '1',
+					'name' => 'Category 1.2'
+				),
+				'children' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test find('neighbors')
+ *
+ * @return void
+ * @access public
+ */
+	function testFindNeighbors() {
+		$this->loadFixtures('User', 'Article');
+		$TestModel =& new Article();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('fields' => array('id')));
+		$expected = array(
+			'prev' => null,
+			'next' => array(
+				'Article' => array('id' => 2)
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array(
+			'fields' => array('id')
+		));
+
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1
+			)),
+			'next' => array(
+				'Article' => array(
+					'id' => 3
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('fields' => array('id')));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 2
+			)),
+			'next' => null
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => null,
+			'next' => array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			'next' => array(
+				'Article' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('recursive' => -1));
+		$expected = array(
+			'prev' => array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			),
+			'next' => null
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 0;
+		$TestModel->id = 1;
+		$one = $TestModel->read();
+		$TestModel->id = 2;
+		$two = $TestModel->read();
+		$TestModel->id = 3;
+		$three = $TestModel->read();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => null, 'next' => $two);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => $one, 'next' => $three);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors');
+		$expected = array('prev' => $two, 'next' => null);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 2;
+		$TestModel->id = 1;
+		$one = $TestModel->read();
+		$TestModel->id = 2;
+		$two = $TestModel->read();
+		$TestModel->id = 3;
+		$three = $TestModel->read();
+
+		$TestModel->id = 1;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => null, 'next' => $two);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => $one, 'next' => $three);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 3;
+		$result = $TestModel->find('neighbors', array('recursive' => 2));
+		$expected = array('prev' => $two, 'next' => null);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindCombinedRelations method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCombinedRelations() {
+		$this->loadFixtures('Apple', 'Sample');
+		$TestModel =& new Apple();
+
+		$result = $TestModel->find('all');
+
+		$expected = array(
+			array(
+				'Apple' => array(
+					'id' => '1',
+					'apple_id' => '2',
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array(
+					array(
+						'id' => '2',
+						'apple_id' => '1',
+						'color' => 'Bright Red 1',
+						'name' => 'Bright Red Apple',
+						'created' => '2006-11-22 10:43:13',
+						'date' => '2014-01-01',
+						'modified' => '2006-11-30 18:38:10',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '1',
+					'apple_id' => '2',
+					'color' => 'Red 1',
+					'name' => 'Red Apple 1',
+					'created' => '2006-11-22 10:38:58',
+					'date' => '1951-01-04',
+					'modified' => '2006-12-01 13:31:26',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '2',
+					'apple_id' => '2',
+					'name' => 'sample2'
+				),
+				'Child' => array(
+					array(
+						'id' => '1',
+						'apple_id' => '2',
+						'color' => 'Red 1',
+						'name' => 'Red Apple 1',
+						'created' => '2006-11-22 10:38:58',
+						'date' => '1951-01-04',
+						'modified' => '2006-12-01 13:31:26',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => '3',
+						'apple_id' => '2',
+						'color' => 'blue green',
+						'name' => 'green blue',
+						'created' => '2006-12-25 05:13:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:24',
+						'mytime' => '22:57:17'
+					),
+					array(
+						'id' => '4',
+						'apple_id' => '2',
+						'color' => 'Blue Green',
+						'name' => 'Test Name',
+						'created' => '2006-12-25 05:23:36',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:23:36',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '3',
+					'apple_id' => '2',
+					'color' => 'blue green',
+					'name' => 'green blue',
+					'created' => '2006-12-25 05:13:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:24',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '1',
+					'apple_id' => '3',
+					'name' => 'sample1'
+				),
+				'Child' => array()
+			),
+			array(
+				'Apple' => array(
+					'id' => '4',
+					'apple_id' => '2',
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '2',
+					'apple_id' => '1',
+					'color' => 'Bright Red 1',
+					'name' => 'Bright Red Apple',
+					'created' => '2006-11-22 10:43:13',
+					'date' => '2014-01-01',
+					'modified' => '2006-11-30 18:38:10',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '3',
+					'apple_id' => '4',
+					'name' => 'sample3'
+				),
+				'Child' => array(
+					array(
+						'id' => '6',
+						'apple_id' => '4',
+						'color' => 'My new appleOrange',
+						'name' => 'My new apple',
+						'created' => '2006-12-25 05:29:39',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:39',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '5',
+					'apple_id' => '5',
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '5',
+					'apple_id' => '5',
+					'color' => 'Green',
+					'name' => 'Blue Green',
+					'created' => '2006-12-25 05:24:06',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:16',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => '4',
+					'apple_id' => '5',
+					'name' => 'sample4'
+				),
+				'Child' => array(
+					array(
+						'id' => '5',
+						'apple_id' => '5',
+						'color' => 'Green',
+						'name' => 'Blue Green',
+						'created' => '2006-12-25 05:24:06',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:29:16',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '6',
+					'apple_id' => '4',
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '4',
+					'apple_id' => '2',
+					'color' => 'Blue Green',
+					'name' => 'Test Name',
+					'created' => '2006-12-25 05:23:36',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:23:36',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array(
+					array(
+						'id' => '7',
+						'apple_id' => '6',
+						'color' => 'Some wierd color',
+						'name' => 'Some odd color',
+						'created' => '2006-12-25 05:34:21',
+						'date' => '2006-12-25',
+						'modified' => '2006-12-25 05:34:21',
+						'mytime' => '22:57:17'
+			))),
+			array(
+				'Apple' => array(
+					'id' => '7',
+					'apple_id' => '6',
+					'color' => 'Some wierd color',
+					'name' => 'Some odd color',
+					'created' => '2006-12-25 05:34:21',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:34:21',
+					'mytime' => '22:57:17'
+				),
+				'Parent' => array(
+					'id' => '6',
+					'apple_id' => '4',
+					'color' => 'My new appleOrange',
+					'name' => 'My new apple',
+					'created' => '2006-12-25 05:29:39',
+					'date' => '2006-12-25',
+					'modified' => '2006-12-25 05:29:39',
+					'mytime' => '22:57:17'
+				),
+				'Sample' => array(
+					'id' => null,
+					'apple_id' => null,
+					'name' => null
+				),
+				'Child' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveEmpty method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveEmpty() {
+		$this->loadFixtures('Thread');
+		$TestModel =& new Thread();
+		$data = array();
+		$expected = $TestModel->save($data);
+		$this->assertFalse($expected);
+	}
+
+/**
+ * testFindAllWithConditionInChildQuery
+ *
+ * @todo external conditions like this are going to need to be revisited at some point
+ * @access public
+ * @return void
+ */
+	function testFindAllWithConditionInChildQuery() {
+		$this->loadFixtures('Basket', 'FilmFile');
+
+		$TestModel =& new Basket();
+		$recursive = 3;
+		$result = $TestModel->find('all', compact('conditions', 'recursive'));
+
+		$expected = array(
+			array(
+				'Basket' => array(
+					'id' => 1,
+					'type' => 'nonfile',
+					'name' => 'basket1',
+					'object_id' => 1,
+					'user_id' => 1,
+				),
+				'FilmFile' => array(
+					'id' => '',
+					'name' => '',
+				)
+			),
+			array(
+				'Basket' => array(
+					'id' => 2,
+					'type' => 'file',
+					'name' => 'basket2',
+					'object_id' => 2,
+					'user_id' => 1,
+				),
+				'FilmFile' => array(
+					'id' => 2,
+					'name' => 'two',
+				)
+			),
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindAllWithConditionsHavingMixedDataTypes method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllWithConditionsHavingMixedDataTypes() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			)
+		);
+		$conditions = array('id' => array('1', 2));
+		$recursive = -1;
+		$order = 'Article.id ASC';
+		$result = $TestModel->find('all', compact('conditions', 'recursive', 'order'));
+		$this->assertEqual($result, $expected);
+
+		if ($this->skipIf($this->db->config['driver'] == 'postgres', 'The rest of testFindAllWithConditionsHavingMixedDataTypes test is not compatible with Postgres')) {
+			return;
+		}
+		$conditions = array('id' => array('1', 2, '3.0'));
+		$order = 'Article.id ASC';
+		$result = $TestModel->find('all', compact('recursive', 'conditions', 'order'));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				)
+			),
+			array(
+				'Article' => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testBindUnbind method
+ *
+ * @access public
+ * @return void
+ */
+	function testBindUnbind() {
+		$this->loadFixtures('User', 'Comment', 'FeatureSet');
+		$TestModel =& new User();
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Comment')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->resetAssociations();
+		$result = $TestModel->hasMany;
+		$this->assertEqual($result, array());
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Comment')), false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->hasMany;
+		$expected = array(
+			'Comment' => array(
+				'className' => 'Comment',
+				'foreignKey' => 'user_id',
+				'conditions' => null,
+				'fields' => null,
+				'order' => null,
+				'limit' => null,
+				'offset' => null,
+				'dependent' => null,
+				'exclusive' => null,
+				'finderQuery' => null,
+				'counterQuery' => null
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')));
+		$this->assertTrue($result);
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array('User' => array('id' => '1', 'user' => 'mariano')),
+			array('User' => array('id' => '2', 'user' => 'nate')),
+			array('User' => array('id' => '3', 'user' => 'larry')),
+			array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' =>
+						'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array('hasMany' => array('Comment')), false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+			array('User' => array('id' => '1', 'user' => 'mariano')),
+			array('User' => array('id' => '2', 'user' => 'nate')),
+			array('User' => array('id' => '3', 'user' => 'larry')),
+			array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array(
+			'Comment' => array('className' => 'Comment', 'conditions' => 'Comment.published = \'Y\'')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Comment' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Comment' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Comment' => array(
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel2 =& new DeviceType();
+
+		$expected = array(
+			'className' => 'FeatureSet',
+			'foreignKey' => 'feature_set_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'counterCache' => ''
+		);
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bindModel(array(
+			'belongsTo' => array(
+				'FeatureSet' => array(
+					'className' => 'FeatureSet',
+					'conditions' => array('active' => true)
+				)
+			)
+		));
+		$expected['conditions'] = array('active' => true);
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bindModel(array(
+			'belongsTo' => array(
+				'FeatureSet' => array(
+					'className' => 'FeatureSet',
+					'foreignKey' => false,
+					'conditions' => array('Feature.name' => 'DeviceType.name')
+				)
+			)
+		));
+		$expected['conditions'] = array('Feature.name' => 'DeviceType.name');
+		$expected['foreignKey'] = false;
+		$this->assertEqual($TestModel2->belongsTo['FeatureSet'], $expected);
+
+		$TestModel2->bindModel(array(
+			'hasMany' => array(
+				'NewFeatureSet' => array(
+					'className' => 'FeatureSet',
+					'conditions' => array('active' => true)
+				)
+			)
+		));
+
+		$expected = array(
+			'className' => 'FeatureSet',
+			'conditions' => array('active' => true),
+			'foreignKey' => 'device_type_id',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'dependent' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		);
+		$this->assertEqual($TestModel2->hasMany['NewFeatureSet'], $expected);
+		$this->assertTrue(is_object($TestModel2->NewFeatureSet));
+	}
+
+/**
+ * testBindMultipleTimes method
+ *
+ * @access public
+ * @return void
+ */
+	function testBindMultipleTimes() {
+		$this->loadFixtures('User', 'Comment', 'Article');
+		$TestModel =& new User();
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array(
+			'hasMany' => array(
+				'Items' => array('className' => 'Comment')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Items' => array(
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					),
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Items' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Items' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '4', 'user' => 'garrett'),
+					'Items' => array(
+						array(
+							'id' => '2',
+							'article_id' => '1',
+							'user_id' => '4',
+							'comment' => 'Second Comment for First Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:47:23',
+							'updated' => '2007-03-18 10:49:31'
+		))));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array(
+			'hasMany' => array(
+				'Items' => array('className' => 'Article')
+		)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all', array(
+			'fields' => 'User.id, User.user'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano'
+				),
+				'Items' => array(
+					array(
+						'id' => 1,
+						'user_id' => 1,
+						'title' => 'First Article',
+						'body' => 'First Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+					),
+					array(
+						'id' => 3,
+						'user_id' => 1,
+						'title' => 'Third Article',
+						'body' => 'Third Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:43:23',
+						'updated' => '2007-03-18 10:45:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate'
+				),
+				'Items' => array()
+			),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry'
+				),
+				'Items' => array(
+					array(
+						'id' => 2,
+						'user_id' => 3,
+						'title' => 'Second Article',
+						'body' => 'Second Article Body',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:41:23',
+						'updated' => '2007-03-18 10:43:31'
+			))),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett'
+				),
+				'Items' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that multiple reset = true calls to bindModel() result in the original associations.
+ *
+ * @return void
+ */
+	function testBindModelMultipleTimesResetCorrectly() {
+		$this->loadFixtures('User', 'Comment', 'Article');
+		$TestModel =& new User();
+
+		$TestModel->bindModel(array('hasMany' => array('Comment')));
+		$TestModel->bindModel(array('hasMany' => array('Comment')));
+		$TestModel->resetAssociations();
+
+		$this->assertFalse(isset($TestModel->hasMany['Comment']), 'Association left behind');
+	}
+
+/**
+ * testBindMultipleTimes method with different reset settings
+ *
+ * @access public
+ * @return void
+ */
+	function testBindMultipleTimesWithDifferentResetSettings() {
+		$this->loadFixtures('User', 'Comment', 'Article');
+		$TestModel =& new User();
+
+		$result = $TestModel->hasMany;
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array(
+			'hasMany' => array('Comment')
+		));
+		$this->assertTrue($result);
+		$result = $TestModel->bindModel(
+			array('hasMany' => array('Article')),
+			false
+		);
+		$this->assertTrue($result);
+
+		$result = array_keys($TestModel->hasMany);
+		$expected = array('Comment', 'Article');
+		$this->assertEqual($result, $expected);
+
+		$TestModel->resetAssociations();
+
+		$result = array_keys($TestModel->hasMany);
+		$expected = array('Article');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that bindModel behaves with Custom primary Key associations
+ *
+ * @return void
+ */
+	function bindWithCustomPrimaryKey() {
+		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
+		$Model =& ClassRegistry::init('StoriesTag');
+		$Model->bindModel(array(
+			'belongsTo' => array(
+				'Tag' => array(
+					'className' => 'Tag',
+					'foreignKey' => 'story'
+		))));
+
+		$result = $Model->find('all');
+		$this->assertFalse(empty($result));
+	}
+
+/**
+ * test that calling unbindModel() with reset == true multiple times 
+ * leaves associations in the correct state.
+ *
+ * @return void
+ */
+	function testUnbindMultipleTimesResetCorrectly() {
+		$this->loadFixtures('User', 'Comment', 'Article');
+		$TestModel =& new Article10();
+
+		$TestModel->unbindModel(array('hasMany' => array('Comment')));
+		$TestModel->unbindModel(array('hasMany' => array('Comment')));
+		$TestModel->resetAssociations();
+
+		$this->assertTrue(isset($TestModel->hasMany['Comment']), 'Association permanently removed');
+	}
+
+/**
+ * testBindMultipleTimes method with different reset settings
+ *
+ * @access public
+ * @return void
+ */
+	function testUnBindMultipleTimesWithDifferentResetSettings() {
+		$this->loadFixtures('User', 'Comment', 'Article');
+		$TestModel =& new Comment();
+
+		$result = array_keys($TestModel->belongsTo);
+		$expected = array('Article', 'User');
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->unbindModel(array(
+			'belongsTo' => array('User')
+		));
+		$this->assertTrue($result);
+		$result = $TestModel->unbindModel(
+			array('belongsTo' => array('Article')),
+			false
+		);
+		$this->assertTrue($result);
+
+		$result = array_keys($TestModel->belongsTo);
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$TestModel->resetAssociations();
+
+		$result = array_keys($TestModel->belongsTo);
+		$expected = array('User');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testAssociationAfterFind method
+ *
+ * @access public
+ * @return void
+ */
+	function testAssociationAfterFind() {
+		$this->loadFixtures('Post', 'Author', 'Comment');
+		$TestModel =& new Post();
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Author' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31',
+					'test' => 'working'
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Author' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31',
+					'test' => 'working'
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Author' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31',
+					'test' => 'working'
+		)));
+		$this->assertEqual($result, $expected);
+		unset($TestModel);
+
+		$Author =& new Author();
+		$Author->Post->bindModel(array(
+			'hasMany' => array(
+				'Comment' => array(
+					'className' => 'ModifiedComment',
+					'foreignKey' => 'article_id',
+				)
+		)));
+		$result = $Author->find('all', array(
+			'conditions' => array('Author.id' => 1),
+			'recursive' => 2
+		));
+		$expected = array(
+			'id' => 1,
+			'article_id' => 1,
+			'user_id' => 2,
+			'comment' => 'First Comment for First Article',
+			'published' => 'Y',
+			'created' => '2007-03-18 10:45:23',
+			'updated' => '2007-03-18 10:47:31',
+			'callback' => 'Fire'
+		);
+		$this->assertEqual($result[0]['Post'][0]['Comment'][0], $expected);
+	}
+
+/**
+ * Tests that callbacks can be properly disabled
+ *
+ * @access public
+ * @return void
+ */
+	function testCallbackDisabling() {
+		$this->loadFixtures('Author');
+		$TestModel = new ModifiedAuthor();
+
+		$result = Set::extract($TestModel->find('all'), '/Author/user');
+		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => 'after')), '/Author/user');
+		$expected = array('mariano (CakePHP)', 'nate (CakePHP)', 'larry (CakePHP)', 'garrett (CakePHP)');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => 'before')), '/Author/user');
+		$expected = array('mariano', 'nate', 'larry', 'garrett');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::extract($TestModel->find('all', array('callbacks' => false)), '/Author/user');
+		$expected = array('mariano', 'nate', 'larry', 'garrett');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Tests that the database configuration assigned to the model can be changed using
+ * (before|after)Find callbacks
+ *
+ * @access public
+ * @return void
+ */
+	function testCallbackSourceChange() {
+		$this->loadFixtures('Post');
+		$TestModel = new Post();
+		$this->assertEqual(3, count($TestModel->find('all')));
+
+		$this->expectError(new PatternExpectation('/Non-existent data source foo/i'));
+		$this->assertFalse($TestModel->find('all', array('connection' => 'foo')));
+	}
+
+/**
+ * testMultipleBelongsToWithSameClass method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleBelongsToWithSameClass() {
+		$this->loadFixtures(
+			'DeviceType',
+			'DeviceTypeCategory',
+			'FeatureSet',
+			'ExteriorTypeCategory',
+			'Document',
+			'Device',
+			'DocumentDirectory'
+		);
+
+		$DeviceType =& new DeviceType();
+
+		$DeviceType->recursive = 2;
+		$result = $DeviceType->read(null, 1);
+
+		$expected = array(
+			'DeviceType' => array(
+				'id' => 1,
+				'device_type_category_id' => 1,
+				'feature_set_id' => 1,
+				'exterior_type_category_id' => 1,
+				'image_id' => 1,
+				'extra1_id' => 1,
+				'extra2_id' => 1,
+				'name' => 'DeviceType 1',
+				'order' => 0
+			),
+			'Image' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'Extra1' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'Extra2' => array(
+				'id' => 1,
+				'document_directory_id' => 1,
+				'name' => 'Document 1',
+				'DocumentDirectory' => array(
+					'id' => 1,
+					'name' => 'DocumentDirectory 1'
+			)),
+			'DeviceTypeCategory' => array(
+				'id' => 1,
+				'name' => 'DeviceTypeCategory 1'
+			),
+			'FeatureSet' => array(
+				'id' => 1,
+				'name' => 'FeatureSet 1'
+			),
+			'ExteriorTypeCategory' => array(
+				'id' => 1,
+				'image_id' => 1,
+				'name' => 'ExteriorTypeCategory 1',
+				'Image' => array(
+					'id' => 1,
+					'device_type_id' => 1,
+					'name' => 'Device 1',
+					'typ' => 1
+			)),
+			'Device' => array(
+				array(
+					'id' => 1,
+					'device_type_id' => 1,
+					'name' => 'Device 1',
+					'typ' => 1
+				),
+				array(
+					'id' => 2,
+					'device_type_id' => 1,
+					'name' => 'Device 2',
+					'typ' => 1
+				),
+				array(
+					'id' => 3,
+					'device_type_id' => 1,
+					'name' => 'Device 3',
+					'typ' => 2
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testHabtmRecursiveBelongsTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmRecursiveBelongsTo() {
+		$this->loadFixtures('Portfolio', 'Item', 'ItemsPortfolio', 'Syfile', 'Image');
+		$Portfolio =& new Portfolio();
+
+		$result = $Portfolio->find(array('id' => 2), null, null, 3);
+		$expected = array(
+			'Portfolio' => array(
+				'id' => 2,
+				'seller_id' => 1,
+				'name' => 'Portfolio 2'
+			),
+			'Item' => array(
+				array(
+					'id' => 2,
+					'syfile_id' => 2,
+					'published' => 0,
+					'name' => 'Item 2',
+					'ItemsPortfolio' => array(
+						'id' => 2,
+						'item_id' => 2,
+						'portfolio_id' => 2
+					),
+					'Syfile' => array(
+						'id' => 2,
+						'image_id' => 2,
+						'name' => 'Syfile 2',
+						'item_count' => null,
+						'Image' => array(
+							'id' => 2,
+							'name' => 'Image 2'
+						)
+				)),
+				array(
+					'id' => 6,
+					'syfile_id' => 6,
+					'published' => 0,
+					'name' => 'Item 6',
+					'ItemsPortfolio' => array(
+						'id' => 6,
+						'item_id' => 6,
+						'portfolio_id' => 2
+					),
+					'Syfile' => array(
+						'id' => 6,
+						'image_id' => null,
+						'name' => 'Syfile 6',
+						'item_count' => null,
+						'Image' => array()
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testHabtmFinderQuery method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmFinderQuery() {
+		$this->loadFixtures('Article', 'Tag', 'ArticlesTag');
+		$Article =& new Article();
+
+		$sql = $this->db->buildStatement(
+			array(
+				'fields' => $this->db->fields($Article->Tag, null, array(
+					'Tag.id', 'Tag.tag', 'ArticlesTag.article_id', 'ArticlesTag.tag_id'
+				)),
+				'table' => $this->db->fullTableName('tags'),
+				'alias' => 'Tag',
+				'limit' => null,
+				'offset' => null,
+				'group' => null,
+				'joins' => array(array(
+					'alias' => 'ArticlesTag',
+					'table' => $this->db->fullTableName('articles_tags'),
+					'conditions' => array(
+						array("ArticlesTag.article_id" => '{$__cakeID__$}'),
+						array("ArticlesTag.tag_id" => $this->db->identifier('Tag.id'))
+					)
+				)),
+				'conditions' => array(),
+				'order' => null
+			),
+			$Article
+		);
+
+		$Article->hasAndBelongsToMany['Tag']['finderQuery'] = $sql;
+		$result = $Article->find('first');
+		$expected = array(
+			array(
+				'id' => '1',
+				'tag' => 'tag1'
+			),
+			array(
+				'id' => '2',
+				'tag' => 'tag2'
+		));
+
+		$this->assertEqual($result['Tag'], $expected);
+	}
+
+/**
+ * testHabtmLimitOptimization method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmLimitOptimization() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
+		$TestModel =& new Article();
+
+		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 2;
+		$result = $TestModel->read(null, 2);
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:20:23',
+				'updated' => '2007-03-17 01:22:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+			)),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasAndBelongsToMany['Tag']['limit'] = 1;
+		$result = $TestModel->read(null, 2);
+		unset($expected['Tag'][1]);
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testHasManyLimitOptimization method
+ *
+ * @access public
+ * @return void
+ */
+	function testHasManyLimitOptimization() {
+		$this->loadFixtures('Project', 'Thread', 'Message', 'Bid');
+		$Project =& new Project();
+		$Project->recursive = 3;
+
+		$result = $Project->find('all');
+		$expected = array(
+			array(
+				'Project' => array(
+					'id' => 1,
+					'name' => 'Project 1'
+				),
+				'Thread' => array(
+					array(
+						'id' => 1,
+						'project_id' => 1,
+						'name' => 'Project 1, Thread 1',
+						'Project' => array(
+							'id' => 1,
+							'name' => 'Project 1',
+							'Thread' => array(
+								array(
+									'id' => 1,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 1'
+								),
+								array(
+									'id' => 2,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 2'
+						))),
+						'Message' => array(
+							array(
+								'id' => 1,
+								'thread_id' => 1,
+								'name' => 'Thread 1, Message 1',
+								'Bid' => array(
+									'id' => 1,
+									'message_id' => 1,
+									'name' => 'Bid 1.1'
+					)))),
+					array(
+						'id' => 2,
+						'project_id' => 1,
+						'name' => 'Project 1, Thread 2',
+						'Project' => array(
+							'id' => 1,
+							'name' => 'Project 1',
+							'Thread' => array(
+								array(
+									'id' => 1,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 1'
+								),
+								array(
+									'id' => 2,
+									'project_id' => 1,
+									'name' => 'Project 1, Thread 2'
+						))),
+						'Message' => array(
+							array(
+								'id' => 2,
+								'thread_id' => 2,
+								'name' => 'Thread 2, Message 1',
+								'Bid' => array(
+									'id' => 4,
+									'message_id' => 2,
+									'name' => 'Bid 2.1'
+			)))))),
+			array(
+				'Project' => array(
+					'id' => 2,
+					'name' => 'Project 2'
+				),
+				'Thread' => array(
+					array(
+						'id' => 3,
+						'project_id' => 2,
+						'name' => 'Project 2, Thread 1',
+						'Project' => array(
+							'id' => 2,
+							'name' => 'Project 2',
+							'Thread' => array(
+								array(
+									'id' => 3,
+									'project_id' => 2,
+									'name' => 'Project 2, Thread 1'
+						))),
+						'Message' => array(
+							array(
+								'id' => 3,
+								'thread_id' => 3,
+								'name' => 'Thread 3, Message 1',
+								'Bid' => array(
+									'id' => 3,
+									'message_id' => 3,
+									'name' => 'Bid 3.1'
+			)))))),
+			array(
+				'Project' => array(
+					'id' => 3,
+					'name' => 'Project 3'
+				),
+				'Thread' => array()
+		));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindAllRecursiveSelfJoin method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllRecursiveSelfJoin() {
+		$this->loadFixtures('Home', 'AnotherArticle', 'Advertisement');
+		$TestModel =& new Home();
+		$TestModel->recursive = 2;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'Home' => array(
+					'id' => '1',
+					'another_article_id' => '1',
+					'advertisement_id' => '1',
+					'title' => 'First Home',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'AnotherArticle' => array(
+					'id' => '1',
+					'title' => 'First Article',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+				))),
+				'Advertisement' => array(
+					'id' => '1',
+					'title' => 'First Ad',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+			)))),
+			array(
+				'Home' => array(
+					'id' => '2',
+					'another_article_id' => '3',
+					'advertisement_id' => '1',
+					'title' => 'Second Home',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'AnotherArticle' => array(
+					'id' => '3',
+					'title' => 'Third Article',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31',
+					'Home' => array(
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+				))),
+				'Advertisement' => array(
+					'id' => '1',
+					'title' => 'First Ad',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31',
+					'Home' => array(
+						array(
+							'id' => '1',
+							'another_article_id' => '1',
+							'advertisement_id' => '1',
+							'title' => 'First Home',
+							'created' => '2007-03-18 10:39:23',
+							'updated' => '2007-03-18 10:41:31'
+						),
+						array(
+							'id' => '2',
+							'another_article_id' => '3',
+							'advertisement_id' => '1',
+							'title' => 'Second Home',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+		)))));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindAllRecursiveWithHabtm method
+ *
+ * @return void
+ * @access public
+ */
+	function testFindAllRecursiveWithHabtm() {
+		$this->loadFixtures(
+			'MyCategoriesMyUsers',
+			'MyCategoriesMyProducts',
+			'MyCategory',
+			'MyUser',
+			'MyProduct'
+		);
+
+		$MyUser =& new MyUser();
+		$MyUser->recursive = 2;
+
+		$result = $MyUser->find('all');
+		$expected = array(
+			array(
+				'MyUser' => array('id' => '1', 'firstname' => 'userA'),
+				'MyCategory' => array(
+					array(
+						'id' => '1',
+						'name' => 'A',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+					))),
+					array(
+						'id' => '3',
+						'name' => 'C',
+						'MyProduct' => array(
+							array(
+								'id' => '2',
+								'name' => 'computer'
+			))))),
+			array(
+				'MyUser' => array(
+					'id' => '2',
+					'firstname' => 'userB'
+				),
+				'MyCategory' => array(
+					array(
+						'id' => '1',
+						'name' => 'A',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+					))),
+					array(
+						'id' => '2',
+						'name' => 'B',
+						'MyProduct' => array(
+							array(
+								'id' => '1',
+								'name' => 'book'
+							),
+							array(
+								'id' => '2',
+								'name' => 'computer'
+		))))));
+
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testReadFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testReadFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$TestModel->id = 7;
+		$result = $TestModel->read();
+		$expected = array(
+			'CategoryThread' => array(
+				'id' => 7,
+				'parent_id' => 6,
+				'name' => 'Category 2.1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+			),
+			'ParentCategory' => array(
+				'id' => 6,
+				'parent_id' => 5,
+				'name' => 'Category 2',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31',
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		)))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$result = $TestModel->find(array('CategoryThread.id' => 7));
+
+		$expected = array(
+			'CategoryThread' => array(
+				'id' => 7,
+				'parent_id' => 6,
+				'name' => 'Category 2.1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+			),
+			'ParentCategory' => array(
+				'id' => 6,
+				'parent_id' => 5,
+				'name' => 'Category 2',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31',
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		)))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindAllFakeThread method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAllFakeThread() {
+		$this->loadFixtures('CategoryThread');
+		$TestModel =& new CategoryThread();
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->recursive = 6;
+		$result = $TestModel->find('all', null, null, 'CategoryThread.id ASC');
+		$expected = array(
+			array(
+				'CategoryThread' => array(
+				'id' => 1,
+				'parent_id' => 0,
+				'name' => 'Category 1',
+				'created' => '2007-03-18 15:30:23',
+				'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => null,
+					'parent_id' => null,
+					'name' => null,
+					'created' => null,
+					'updated' => null,
+					'ParentCategory' => array()
+			)),
+			array(
+				'CategoryThread' => array(
+					'id' => 2,
+					'parent_id' => 1,
+					'name' => 'Category 1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 1,
+					'parent_id' => 0,
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array()
+				)),
+			array(
+				'CategoryThread' => array(
+					'id' => 3,
+					'parent_id' => 2,
+					'name' => 'Category 1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 2,
+					'parent_id' => 1,
+					'name' => 'Category 1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 1,
+						'parent_id' => 0,
+						'name' => 'Category 1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array()
+			))),
+			array(
+				'CategoryThread' => array(
+					'id' => 4,
+					'parent_id' => 3,
+					'name' => 'Category 1.1.2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 3,
+					'parent_id' => 2,
+					'name' => 'Category 1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 2,
+						'parent_id' => 1,
+						'name' => 'Category 1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 1,
+							'parent_id' => 0,
+							'name' => 'Category 1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array()
+			)))),
+			array(
+				'CategoryThread' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 4,
+					'parent_id' => 3,
+					'name' => 'Category 1.1.2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 3,
+						'parent_id' => 2,
+						'name' => 'Category 1.1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 2,
+							'parent_id' => 1,
+							'name' => 'Category 1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 1,
+								'parent_id' => 0,
+								'name' => 'Category 1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array()
+			))))),
+			array(
+				'CategoryThread' => array(
+					'id' => 6,
+					'parent_id' => 5,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 5,
+					'parent_id' => 4,
+					'name' => 'Category 1.1.1.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 4,
+						'parent_id' => 3,
+						'name' => 'Category 1.1.2',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 3,
+							'parent_id' => 2,
+							'name' => 'Category 1.1.1',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31',
+									'ParentCategory' => array()
+			)))))),
+			array(
+				'CategoryThread' => array(
+					'id' => 7,
+					'parent_id' => 6,
+					'name' => 'Category 2.1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				),
+				'ParentCategory' => array(
+					'id' => 6,
+					'parent_id' => 5,
+					'name' => 'Category 2',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31',
+					'ParentCategory' => array(
+						'id' => 5,
+						'parent_id' => 4,
+						'name' => 'Category 1.1.1.1',
+						'created' => '2007-03-18 15:30:23',
+						'updated' => '2007-03-18 15:32:31',
+						'ParentCategory' => array(
+							'id' => 4,
+							'parent_id' => 3,
+							'name' => 'Category 1.1.2',
+							'created' => '2007-03-18 15:30:23',
+							'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 3,
+								'parent_id' => 2,
+								'name' => 'Category 1.1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+							'ParentCategory' => array(
+								'id' => 2,
+								'parent_id' => 1,
+								'name' => 'Category 1.1',
+								'created' => '2007-03-18 15:30:23',
+								'updated' => '2007-03-18 15:32:31',
+								'ParentCategory' => array(
+									'id' => 1,
+									'parent_id' => 0,
+									'name' => 'Category 1',
+									'created' => '2007-03-18 15:30:23',
+									'updated' => '2007-03-18 15:32:31'
+		))))))));
+
+		$this->db->fullDebug = $fullDebug;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testConditionalNumerics method
+ *
+ * @access public
+ * @return void
+ */
+	function testConditionalNumerics() {
+		$this->loadFixtures('NumericArticle');
+		$NumericArticle =& new NumericArticle();
+		$data = array('title' => '12345abcde');
+		$result = $NumericArticle->find($data);
+		$this->assertTrue(!empty($result));
+
+		$data = array('title' => '12345');
+		$result = $NumericArticle->find($data);
+		$this->assertTrue(empty($result));
+	}
+
+/**
+ * test find('all') method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindAll() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+		$TestModel->cacheQueries = false;
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('conditions' => 'User.id > 2'));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.id !=' => '0', 'User.user LIKE' => '%arr%')
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('conditions' => array('User.id' => '0')));
+		$expected = array();
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('or' => array('User.id' => '0', 'User.user LIKE' => '%a%')
+		)));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '4',
+					'user' => 'garrett',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:22:23',
+					'updated' => '2007-03-17 01:24:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.id, User.user'));
+		$expected = array(
+				array('User' => array('id' => '1', 'user' => 'mariano')),
+				array('User' => array('id' => '2', 'user' => 'nate')),
+				array('User' => array('id' => '3', 'user' => 'larry')),
+				array('User' => array('id' => '4', 'user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user ASC'));
+		$expected = array(
+				array('User' => array('user' => 'garrett')),
+				array('User' => array('user' => 'larry')),
+				array('User' => array('user' => 'mariano')),
+				array('User' => array('user' => 'nate')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('fields' => 'User.user', 'order' => 'User.user DESC'));
+		$expected = array(
+				array('User' => array('user' => 'nate')),
+				array('User' => array('user' => 'mariano')),
+				array('User' => array('user' => 'larry')),
+				array('User' => array('user' => 'garrett')));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array('limit' => 3, 'page' => 1));
+
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '2',
+					'user' => 'nate',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:18:23',
+					'updated' => '2007-03-17 01:20:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$ids = array(4 => 1, 5 => 3);
+		$result = $TestModel->find('all', array(
+			'conditions' => array('User.id' => $ids),
+			'order' => 'User.id'
+		));
+		$expected = array(
+			array(
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+			)),
+			array(
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		// These tests are expected to fail on SQL Server since the LIMIT/OFFSET
+		// hack can't handle small record counts.
+		if ($this->db->config['driver'] != 'mssql') {
+			$result = $TestModel->find('all', array('limit' => 3, 'page' => 2));
+			$expected = array(
+				array(
+					'User' => array(
+						'id' => '4',
+						'user' => 'garrett',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:22:23',
+						'updated' => '2007-03-17 01:24:31'
+			)));
+			$this->assertEqual($result, $expected);
+
+			$result = $TestModel->find('all', array('limit' => 3, 'page' => 3));
+			$expected = array();
+			$this->assertEqual($result, $expected);
+		}
+	}
+
+/**
+ * test find('list') method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateFindList() {
+		$this->loadFixtures('Article', 'Apple', 'Post', 'Author', 'User');
+
+		$TestModel =& new Article();
+		$TestModel->displayField = 'title';
+
+		$result = $TestModel->find('list', array(
+			'order' => 'Article.title ASC'
+		));
+
+		$expected = array(
+			1 => 'First Article',
+			2 => 'Second Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+
+		$db =& ConnectionManager::getDataSource('test_suite');
+		if ($db->config['driver'] == 'mysql') {
+			$result = $TestModel->find('list', array(
+				'order' => array('FIELD(Article.id, 3, 2) ASC', 'Article.title ASC')
+			));
+			$expected = array(
+				1 => 'First Article',
+				3 => 'Third Article',
+				2 => 'Second Article'
+			);
+			$this->assertEqual($result, $expected);
+		}
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC',
+				'fields' => array('id', 'title')
+			)),
+			'{n}.Article.id', '{n}.Article.title'
+		);
+		$expected = array(
+			1 => 'First Article',
+			2 => 'Second Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC'
+			)),
+			'{n}.Article.id', '{n}.Article'
+		);
+		$expected = array(
+			1 => array(
+				'id' => 1,
+				'user_id' => 1,
+				'title' => 'First Article',
+				'body' => 'First Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			),
+			2 => array(
+				'id' => 2,
+				'user_id' => 3,
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			3 => array(
+				'id' => 3,
+				'user_id' => 1,
+				'title' => 'Third Article',
+				'body' => 'Third Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC'
+			)),
+			'{n}.Article.id', '{n}.Article', '{n}.Article.user_id'
+		);
+		$expected = array(
+			1 => array(
+				1 => array(
+					'id' => 1,
+					'user_id' => 1,
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				3 => array(
+					'id' => 3,
+					'user_id' => 1,
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				)),
+			3 => array(
+				2 => array(
+					'id' => 2,
+					'user_id' => 3,
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+
+		$result = Set::combine(
+			$TestModel->find('all', array(
+				'order' => 'Article.title ASC',
+				'fields' => array('id', 'title', 'user_id')
+			)),
+			'{n}.Article.id', '{n}.Article.title', '{n}.Article.user_id'
+		);
+
+		$expected = array(
+			1 => array(
+				1 => 'First Article',
+				3 => 'Third Article'
+			),
+			3 => array(
+				2 => 'Second Article'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Apple();
+		$expected = array(
+			1 => 'Red Apple 1',
+			2 => 'Bright Red Apple',
+			3 => 'green blue',
+			4 => 'Test Name',
+			5 => 'Blue Green',
+			6 => 'My new apple',
+			7 => 'Some odd color'
+		);
+
+		$this->assertEqual($TestModel->find('list'), $expected);
+		$this->assertEqual($TestModel->Parent->find('list'), $expected);
+
+		$TestModel =& new Post();
+		$result = $TestModel->find('list', array(
+			'fields' => 'Post.title'
+		));
+		$expected = array(
+			1 => 'First Post',
+			2 => 'Second Post',
+			3 => 'Third Post'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => 'title'
+		));
+		$expected = array(
+			1 => 'First Post',
+			2 => 'Second Post',
+			3 => 'Third Post'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('title', 'id')
+		));
+		$expected = array(
+			'First Post' => '1',
+			'Second Post' => '2',
+			'Third Post' => '3'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('title', 'id', 'created')
+		));
+		$expected = array(
+			'2007-03-18 10:39:23' => array(
+				'First Post' => '1'
+			),
+			'2007-03-18 10:41:23' => array(
+				'Second Post' => '2'
+			),
+			'2007-03-18 10:43:23' => array(
+				'Third Post' => '3'
+			),
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.body')
+		));
+		$expected = array(
+			1 => 'First Post Body',
+			2 => 'Second Post Body',
+			3 => 'Third Post Body'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.title', 'Post.body')
+		));
+		$expected = array(
+			'First Post' => 'First Post Body',
+			'Second Post' => 'Second Post Body',
+			'Third Post' => 'Third Post Body'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('list', array(
+			'fields' => array('Post.id', 'Post.title', 'Author.user'),
+			'recursive' => 1
+		));
+		$expected = array(
+			'mariano' => array(
+				1 => 'First Post',
+				3 => 'Third Post'
+			),
+			'larry' => array(
+				2 => 'Second Post'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new User();
+		$result = $TestModel->find('list', array(
+			'fields' => array('User.user', 'User.password')
+		));
+		$expected = array(
+			'mariano' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'nate' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'larry' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'garrett' => '5f4dcc3b5aa765d61d8327deb882cf99'
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new ModifiedAuthor();
+		$result = $TestModel->find('list', array(
+			'fields' => array('Author.id', 'Author.user')
+		));
+		$expected = array(
+			1 => 'mariano (CakePHP)',
+			2 => 'nate (CakePHP)',
+			3 => 'larry (CakePHP)',
+			4 => 'garrett (CakePHP)'
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Article();
+		$TestModel->displayField = 'title';
+		$result = $TestModel->find('list', array(
+			'conditions' => array('User.user' => 'mariano'),
+			'recursive' => 0
+		));
+		$expected = array(
+			1 => 'First Article',
+			3 => 'Third Article'
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFindField method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindField() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$TestModel->id = 1;
+		$result = $TestModel->field('user');
+		$this->assertEqual($result, 'mariano');
+
+		$result = $TestModel->field('User.user');
+		$this->assertEqual($result, 'mariano');
+
+		$TestModel->id = false;
+		$result = $TestModel->field('user', array(
+			'user' => 'mariano'
+		));
+		$this->assertEqual($result, 'mariano');
+
+		$result = $TestModel->field('COUNT(*) AS count', true);
+		$this->assertEqual($result, 4);
+
+		$result = $TestModel->field('COUNT(*)', true);
+		$this->assertEqual($result, 4);
+	}
+
+/**
+ * testFindUnique method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindUnique() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$this->assertFalse($TestModel->isUnique(array(
+			'user' => 'nate'
+		)));
+		$TestModel->id = 2;
+		$this->assertTrue($TestModel->isUnique(array(
+			'user' => 'nate'
+		)));
+		$this->assertFalse($TestModel->isUnique(array(
+			'user' => 'nate',
+			'password' => '5f4dcc3b5aa765d61d8327deb882cf99'
+		)));
+	}
+
+/**
+ * test find('count') method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCount() {
+		$this->loadFixtures('User', 'Project');
+
+		$TestModel =& new User();
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 4);
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+		$TestModel->order = 'User.id';
+		$this->db->_queriesLog = array();
+		$result = $TestModel->find('count');
+		$this->assertEqual($result, 4);
+
+		$this->assertTrue(isset($this->db->_queriesLog[0]['query']));
+		$this->assertNoPattern('/ORDER\s+BY/', $this->db->_queriesLog[0]['query']);
+	}
+
+/**
+ * Test that find('first') does not use the id set to the object.
+ *
+ * @return void
+ */
+	function testFindFirstNoIdUsed() {
+		$this->loadFixtures('Project');
+
+		$Project =& new Project();
+		$Project->id = 3;
+		$result = $Project->find('first');
+
+		$this->assertEqual($result['Project']['name'], 'Project 1', 'Wrong record retrieved');
+	}
+
+/**
+ * test find with COUNT(DISTINCT field)
+ *
+ * @return void
+ */
+	function testFindCountDistinct() {
+		$skip = $this->skipIf(
+			$this->db->config['driver'] == 'sqlite',
+			'SELECT COUNT(DISTINCT field) is not compatible with SQLite'
+		);
+		if ($skip) {
+			return;
+		}
+		$this->loadFixtures('Project');
+		$TestModel =& new Project();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+		$TestModel->create(array('name' => 'project')) && $TestModel->save();
+
+		$result = $TestModel->find('count', array('fields' => 'DISTINCT name'));
+		$this->assertEqual($result, 4);
+	}
+
+/**
+ * Test find(count) with Db::expression
+ *
+ * @access public
+ * @return void
+ */
+	function testFindCountWithDbExpressions() {
+		if ($this->skipIf($this->db->config['driver'] == 'postgres', '%s testFindCountWithExpressions is not compatible with Postgres')) {
+			return;
+		}
+		$this->loadFixtures('Project');
+		$db = ConnectionManager::getDataSource('test_suite');
+		$TestModel =& new Project();
+
+		$result = $TestModel->find('count', array('conditions' => array(
+			$db->expression('Project.name = \'Project 3\'')
+		)));
+		$this->assertEqual($result, 1);
+
+		$result = $TestModel->find('count', array('conditions' => array(
+			'Project.name' => $db->expression('\'Project 3\'')
+		)));
+		$this->assertEqual($result, 1);
+	}
+
+/**
+ * testFindMagic method
+ *
+ * @access public
+ * @return void
+ */
+	function testFindMagic() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$result = $TestModel->findByUser('mariano');
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:16:23',
+				'updated' => '2007-03-17 01:18:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->findByPassword('5f4dcc3b5aa765d61d8327deb882cf99');
+		$expected = array('User' => array(
+			'id' => '1',
+			'user' => 'mariano',
+			'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+			'created' => '2007-03-17 01:16:23',
+			'updated' => '2007-03-17 01:18:31'
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRead() {
+		$this->loadFixtures('User', 'Article');
+		$TestModel =& new User();
+
+		$result = $TestModel->read();
+		$this->assertFalse($result);
+
+		$TestModel->id = 2;
+		$result = $TestModel->read();
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->read(null, 2);
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 2;
+		$result = $TestModel->read(array('id', 'user'));
+		$expected = array('User' => array('id' => '2', 'user' => 'nate'));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->read('id, user', 2);
+		$expected = array(
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate'
+		));
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Article')));
+		$this->assertTrue($result);
+
+		$TestModel->id = 1;
+		$result = $TestModel->read('id, user');
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano'
+			),
+			'Article' => array(
+				array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRecursiveRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveRead() {
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Featured',
+			'ArticleFeatured'
+		);
+		$TestModel =& new User();
+
+		$result = $TestModel->bindModel(array('hasMany' => array('Article')), false);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 0;
+		$result = $TestModel->read('id, user', 1);
+		$expected = array(
+			'User' => array('id' => '1', 'user' => 'mariano'),
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 1;
+		$result = $TestModel->read('id, user', 1);
+		$expected = array(
+			'User' => array(
+				'id' => '1',
+				'user' => 'mariano'
+			),
+			'Article' => array(
+				array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read('id, user', 3);
+		$expected = array(
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry'
+			),
+			'Article' => array(
+				array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31',
+					'User' => array(
+						'id' => '3',
+						'user' => 'larry',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23',
+						'updated' => '2007-03-17 01:22:31'
+					),
+					'Comment' => array(
+						array(
+							'id' => '5',
+							'article_id' => '2',
+							'user_id' => '1',
+							'comment' => 'First Comment for Second Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:53:23',
+							'updated' => '2007-03-18 10:55:31'
+						),
+						array(
+							'id' => '6',
+							'article_id' => '2',
+							'user_id' => '2',
+							'comment' => 'Second Comment for Second Article',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:55:23',
+							'updated' => '2007-03-18 10:57:31'
+					)),
+					'Tag' => array(
+						array(
+							'id' => '1',
+							'tag' => 'tag1',
+							'created' => '2007-03-18 12:22:23',
+							'updated' => '2007-03-18 12:24:31'
+						),
+						array(
+							'id' => '3',
+							'tag' => 'tag3',
+							'created' => '2007-03-18 12:26:23',
+							'updated' => '2007-03-18 12:28:31'
+		)))));
+		$this->assertEqual($result, $expected);
+	}
+
+	function testRecursiveFindAll() {
+		$this->db->truncate(new Featured());
+
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Attachment',
+			'ArticleFeatured',
+			'Featured',
+			'Category'
+		);
+		$TestModel =& new Article();
+
+		$result = $TestModel->find('all', array('conditions' => array('Article.user_id' => 1)));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+					array(
+						'id' => '3',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Third Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:49:23',
+						'updated' => '2007-03-18 10:51:31'
+					),
+					array(
+						'id' => '4',
+						'article_id' => '1',
+						'user_id' => '1',
+						'comment' => 'Fourth Comment for First Article',
+						'published' => 'N',
+						'created' => '2007-03-18 10:51:23',
+						'updated' => '2007-03-18 10:53:31'
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 3),
+			'limit' => 1,
+			'recursive' => 2
+		));
+
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '1',
+							'user' => 'mariano',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23',
+							'updated' => '2007-03-17 01:18:31'
+						),
+						'Attachment' => array(
+							'id' => '1',
+							'comment_id' => 5,
+							'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23',
+							'updated' => '2007-03-18 10:53:31'
+						)
+					),
+					array(
+						'id' => '6',
+						'article_id' => '2',
+						'user_id' => '2',
+						'comment' => 'Second Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:55:23',
+						'updated' => '2007-03-18 10:57:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '2',
+							'user' => 'nate',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:18:23',
+							'updated' => '2007-03-17 01:20:31'
+						),
+						'Attachment' => false
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$Featured = new Featured();
+
+		$Featured->recursive = 2;
+		$Featured->bindModel(array(
+			'belongsTo' => array(
+				'ArticleFeatured' => array(
+					'conditions' => "ArticleFeatured.published = 'Y'",
+					'fields' => 'id, title, user_id, published'
+				)
+			)
+		));
+
+		$Featured->ArticleFeatured->unbindModel(array(
+			'hasMany' => array('Attachment', 'Comment'),
+			'hasAndBelongsToMany' => array('Tag'))
+		);
+
+		$orderBy = 'ArticleFeatured.id ASC';
+		$result = $Featured->find('all', array(
+			'order' => $orderBy, 'limit' => 3
+		));
+
+		$expected = array(
+			array(
+				'Featured' => array(
+					'id' => '1',
+					'article_featured_id' => '1',
+					'category_id' => '1',
+					'published_date' => '2007-03-31 10:39:23',
+					'end_date' => '2007-05-15 10:39:23',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'ArticleFeatured' => array(
+					'id' => '1',
+					'title' => 'First Article',
+					'user_id' => '1',
+					'published' => 'Y',
+					'User' => array(
+						'id' => '1',
+						'user' => 'mariano',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23',
+						'updated' => '2007-03-17 01:18:31'
+					),
+					'Category' => array(),
+					'Featured' => array(
+						'id' => '1',
+						'article_featured_id' => '1',
+						'category_id' => '1',
+						'published_date' => '2007-03-31 10:39:23',
+						'end_date' => '2007-05-15 10:39:23',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+				)),
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+				)),
+			array(
+				'Featured' => array(
+					'id' => '2',
+					'article_featured_id' => '2',
+					'category_id' => '1',
+					'published_date' => '2007-03-31 10:39:23',
+					'end_date' => '2007-05-15 10:39:23',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'ArticleFeatured' => array(
+					'id' => '2',
+					'title' => 'Second Article',
+					'user_id' => '3',
+					'published' => 'Y',
+					'User' => array(
+						'id' => '3',
+						'user' => 'larry',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:20:23',
+						'updated' => '2007-03-17 01:22:31'
+					),
+					'Category' => array(),
+					'Featured' => array(
+						'id' => '2',
+						'article_featured_id' => '2',
+						'category_id' => '1',
+						'published_date' => '2007-03-31 10:39:23',
+						'end_date' => '2007-05-15 10:39:23',
+						'created' => '2007-03-18 10:39:23',
+						'updated' => '2007-03-18 10:41:31'
+				)),
+				'Category' => array(
+					'id' => '1',
+					'parent_id' => '0',
+					'name' => 'Category 1',
+					'created' => '2007-03-18 15:30:23',
+					'updated' => '2007-03-18 15:32:31'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRecursiveFindAllWithLimit method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecursiveFindAllWithLimit() {
+		$this->loadFixtures('Article', 'User', 'Tag', 'ArticlesTag', 'Comment', 'Attachment');
+		$TestModel =& new Article();
+
+		$TestModel->hasMany['Comment']['limit'] = 2;
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 1)
+		));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '1',
+					'user_id' => '1',
+					'title' => 'First Article',
+					'body' => 'First Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '1',
+						'article_id' => '1',
+						'user_id' => '2',
+						'comment' => 'First Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:45:23',
+						'updated' => '2007-03-18 10:47:31'
+					),
+					array(
+						'id' => '2',
+						'article_id' => '1',
+						'user_id' => '4',
+						'comment' => 'Second Comment for First Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:47:23',
+						'updated' => '2007-03-18 10:49:31'
+					),
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Article' => array(
+					'id' => '3',
+					'user_id' => '1',
+					'title' => 'Third Article',
+					'body' => 'Third Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'User' => array(
+					'id' => '1',
+					'user' => 'mariano',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:16:23',
+					'updated' => '2007-03-17 01:18:31'
+				),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->hasMany['Comment']['limit'] = 1;
+
+		$result = $TestModel->find('all', array(
+			'conditions' => array('Article.user_id' => 3),
+			'limit' => 1,
+			'recursive' => 2
+		));
+		$expected = array(
+			array(
+				'Article' => array(
+					'id' => '2',
+					'user_id' => '3',
+					'title' => 'Second Article',
+					'body' => 'Second Article Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'User' => array(
+					'id' => '3',
+					'user' => 'larry',
+					'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+					'created' => '2007-03-17 01:20:23',
+					'updated' => '2007-03-17 01:22:31'
+				),
+				'Comment' => array(
+					array(
+						'id' => '5',
+						'article_id' => '2',
+						'user_id' => '1',
+						'comment' => 'First Comment for Second Article',
+						'published' => 'Y',
+						'created' => '2007-03-18 10:53:23',
+						'updated' => '2007-03-18 10:55:31',
+						'Article' => array(
+							'id' => '2',
+							'user_id' => '3',
+							'title' => 'Second Article',
+							'body' => 'Second Article Body',
+							'published' => 'Y',
+							'created' => '2007-03-18 10:41:23',
+							'updated' => '2007-03-18 10:43:31'
+						),
+						'User' => array(
+							'id' => '1',
+							'user' => 'mariano',
+							'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+							'created' => '2007-03-17 01:16:23',
+							'updated' => '2007-03-17 01:18:31'
+						),
+						'Attachment' => array(
+							'id' => '1',
+							'comment_id' => 5,
+							'attachment' => 'attachment.zip',
+							'created' => '2007-03-18 10:51:23',
+							'updated' => '2007-03-18 10:53:31'
+						)
+					)
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+					)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Testing availability of $this->findQueryType in Model callbacks
+ *
+ * @return void
+ */
+	function testFindQueryTypeInCallbacks() {
+		$this->loadFixtures('Comment');
+		$Comment =& new AgainModifiedComment();
+		$comments = $Comment->find('all');
+		$this->assertEqual($comments[0]['Comment']['querytype'], 'all');
+		$comments = $Comment->find('first');
+		$this->assertEqual($comments['Comment']['querytype'], 'first');
+	}
+
+/**
+ * testVirtualFields()
+ *
+ * Test correct fetching of virtual fields
+ * currently is not possible to do Relation.virtualField
+ *
+ * @access public
+ * @return void
+ */
+	function testVirtualFields() {
+		$this->loadFixtures('Post', 'Author');
+		$Post =& ClassRegistry::init('Post');
+		$Post->virtualFields = array('two' => "1 + 1");
+		$result = $Post->find('first');
+		$this->assertEqual($result['Post']['two'], 2);
+
+		$Post->Author->virtualFields = array('false' => '1 = 2');
+		$result = $Post->find('first');
+		$this->assertEqual($result['Post']['two'], 2);
+		$this->assertEqual($result['Author']['false'], false);
+
+		$result = $Post->find('first',array('fields' => array('author_id')));
+		$this->assertFalse(isset($result['Post']['two']));
+		$this->assertFalse(isset($result['Author']['false']));
+
+		$result = $Post->find('first',array('fields' => array('author_id', 'two')));
+		$this->assertEqual($result['Post']['two'], 2);
+		$this->assertFalse(isset($result['Author']['false']));
+
+		$result = $Post->find('first',array('fields' => array('two')));
+		$this->assertEqual($result['Post']['two'], 2);
+
+		$Post->id = 1;
+		$result = $Post->field('two');
+		$this->assertEqual($result, 2);
+
+		$result = $Post->find('first',array(
+			'conditions' => array('two' => 2),
+			'limit' => 1
+		));
+		$this->assertEqual($result['Post']['two'], 2);
+
+		$result = $Post->find('first',array(
+			'conditions' => array('two <' => 3),
+			'limit' => 1
+		));
+		$this->assertEqual($result['Post']['two'], 2);
+
+		$result = $Post->find('first',array(
+			'conditions' => array('NOT' => array('two >' => 3)),
+			'limit' => 1
+		));
+		$this->assertEqual($result['Post']['two'], 2);
+
+		$dbo =& $Post->getDataSource();
+		$Post->virtualFields = array('other_field' => 'Post.id + 1');
+		$result = $Post->find('first', array(
+			'conditions' => array('other_field' => 3),
+			'limit' => 1
+		));
+		$this->assertEqual($result['Post']['id'], 2);
+
+		$Post->virtualFields = array('other_field' => 'Post.id + 1');
+		$result = $Post->find('all', array(
+			'fields' => array($dbo->calculate($Post, 'max', array('other_field')))
+		));
+		$this->assertEqual($result[0][0]['other_field'], 4);
+
+		ClassRegistry::flush();
+		$Writing =& ClassRegistry::init(array('class' => 'Post', 'alias' => 'Writing'), 'Model');
+		$Writing->virtualFields = array('two' => "1 + 1");
+		$result = $Writing->find('first');
+		$this->assertEqual($result['Writing']['two'], 2);
+
+		$Post->create();
+		$Post->virtualFields = array('other_field' => 'COUNT(Post.id) + 1');
+		$result = $Post->field('other_field');
+		$this->assertEqual($result, 4);
+
+		if ($this->skipIf($this->db->config['driver'] == 'postgres', 'The rest of virtualFieds test is not compatible with Postgres')) {
+			return;
+		}
+		ClassRegistry::flush();
+		$Post =& ClassRegistry::init('Post');
+
+		$Post->create();
+		$Post->virtualFields = array(
+			'year' => 'YEAR(Post.created)',
+			'unique_test_field' => 'COUNT(Post.id)'
+		);
+
+		$expectation = array(
+			'Post' => array(
+				'year' => 2007,
+				'unique_test_field' => 3
+			)
+		);
+
+		$result = $Post->find('first', array(
+			'fields' => array_keys($Post->virtualFields),
+			'group' => array('year')
+		));
+
+		$this->assertEqual($result, $expectation);
+
+
+		$Author =& ClassRegistry::init('Author');
+		$Author->virtualFields = array(
+			'full_name' => 'CONCAT(Author.user, " ", Author.id)'
+		);
+
+		$result = $Author->find('first', array(
+			'conditions' => array('Author.user' => 'mariano'),
+			'fields' => array('Author.password', 'Author.full_name'),
+			'recursive' => -1
+		));
+		$this->assertTrue(isset($result['Author']['full_name']));
+
+		$result = $Author->find('first', array(
+			'conditions' => array('Author.user' => 'mariano'),
+			'fields' => array('Author.full_name', 'Author.password'),
+			'recursive' => -1
+		));
+		$this->assertTrue(isset($result['Author']['full_name']));
+	}
+
+/**
+ * test that virtual fields work when they don't contain functions.
+ *
+ * @return void
+ */
+	function testVirtualFieldAsAString() {
+		$this->loadFixtures('Post', 'Author');
+		$Post =& new Post();
+		$Post->virtualFields = array(
+		    'writer' => 'Author.user'
+		);
+		$result = $Post->find('first');
+		$this->assertTrue(isset($result['Post']['writer']), 'virtual field not fetched %s');
+	}
+
+/**
+ * test that isVirtualField will accept both aliased and non aliased fieldnames
+ *
+ * @return void
+ */
+	function testIsVirtualField() {
+		$this->loadFixtures('Post');
+		$Post =& ClassRegistry::init('Post');
+		$Post->virtualFields = array('other_field' => 'COUNT(Post.id) + 1');
+
+		$this->assertTrue($Post->isVirtualField('other_field'));
+		$this->assertTrue($Post->isVirtualField('Post.other_field'));
+		$this->assertFalse($Post->isVirtualField('id'));
+		$this->assertFalse($Post->isVirtualField('Post.id'));
+		$this->assertFalse($Post->isVirtualField(array()));
+	}
+
+/**
+ * test that getting virtual fields works with and without model alias attached
+ *
+ * @return void
+ */
+	function testGetVirtualField() {
+		$this->loadFixtures('Post');
+		$Post =& ClassRegistry::init('Post');
+		$Post->virtualFields = array('other_field' => 'COUNT(Post.id) + 1');
+
+		$this->assertEqual($Post->getVirtualField('other_field'), $Post->virtualFields['other_field']);
+		$this->assertEqual($Post->getVirtualField('Post.other_field'), $Post->virtualFields['other_field']);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_validation.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_validation.test.php
new file mode 100644
index 000000000..d0b3fb648
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_validation.test.php
@@ -0,0 +1,673 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
+/**
+ * ModelValidationTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+
+/**
+ * ModelValidationTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelValidationTest extends BaseModelTest {
+
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testValidationParams() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate['title'] = array(
+			'rule' => 'customValidatorWithParams',
+			'required' => true
+		);
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->invalidFields();
+
+		$expected = array(
+			'data' => array(
+				'title' => 'foo'
+			),
+			'validator' => array(
+				'rule' => 'customValidatorWithParams',
+				'on' => null,
+				'last' => false,
+				'allowEmpty' => false,
+				'required' => true
+			),
+			'or' => true,
+			'ignore_on_same' => 'id'
+		);
+		$this->assertEqual($TestModel->validatorParams, $expected);
+
+		$TestModel->validate['title'] = array(
+			'rule' => 'customValidatorWithMessage',
+			'required' => true
+		);
+		$expected = array(
+			'title' => 'This field will *never* validate! Muhahaha!'
+		);
+
+		$this->assertEqual($TestModel->invalidFields(), $expected);
+
+		$TestModel->validate['title'] = array(
+			'rule' => array('customValidatorWithSixParams', 'one', 'two', null, 'four'),
+			'required' => true
+		);
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->invalidFields();
+		$expected = array(
+			'data' => array(
+				'title' => 'foo'
+			),
+			'one' => 'one',
+			'two' => 'two',
+			'three' => null,
+			'four' => 'four',
+			'five' => array(
+				'rule' => array(1 => 'one', 2 => 'two', 3 => null, 4 => 'four'),
+				'on' => null,
+				'last' => false,
+				'allowEmpty' => false,
+				'required' => true
+			),
+			'six' => 6
+		);
+		$this->assertEqual($TestModel->validatorParams, $expected);
+
+		$TestModel->validate['title'] = array(
+			'rule' => array('customValidatorWithSixParams', 'one', array('two'), null, 'four', array('five' => 5)),
+			'required' => true
+		);
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->invalidFields();
+		$expected = array(
+			'data' => array(
+				'title' => 'foo'
+			),
+			'one' => 'one',
+			'two' => array('two'),
+			'three' => null,
+			'four' => 'four',
+			'five' => array('five' => 5),
+			'six' => array(
+				'rule' => array(1 => 'one', 2 => array('two'), 3 => null, 4 => 'four', 5 => array('five' => 5)),
+				'on' => null,
+				'last' => false,
+				'allowEmpty' => false,
+				'required' => true
+			)
+		);
+		$this->assertEqual($TestModel->validatorParams, $expected);
+	}
+
+/**
+ * Tests validation parameter fieldList in invalidFields
+ *
+ * @access public
+ * @return void
+ */
+	function testInvalidFieldsWithFieldListParams() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate = $validate = array(
+			'title' => array(
+				'rule' => 'alphaNumeric',
+				'required' => true
+			),
+			'name' => array(
+				'rule' => 'alphaNumeric',
+				'required' => true
+		));
+		$TestModel->set(array('title' => '$$', 'name' => '##'));
+		$TestModel->invalidFields(array('fieldList' => array('title')));
+		$expected = array(
+			'title' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->invalidFields(array('fieldList' => array('name')));
+		$expected = array(
+			'name' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->invalidFields(array('fieldList' => array('name', 'title')));
+		$expected = array(
+			'name' => 'This field cannot be left blank',
+			'title' => 'This field cannot be left blank'
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$TestModel->validationErrors = array();
+
+		$TestModel->whitelist = array('name');
+		$TestModel->invalidFields();
+		$expected = array('name' => 'This field cannot be left blank');
+		$this->assertEqual($TestModel->validationErrors, $expected);
+
+		$this->assertEqual($TestModel->validate, $validate);
+	}
+
+/**
+ * Test that invalidFields() integrates well with save().  And that fieldList can be an empty type.
+ *
+ * @return void
+ */
+	function testInvalidFieldsWhitelist() {
+		$TestModel =& new ValidationTest1();
+		$TestModel->validate = array(
+			'title' => array(
+				'rule' => 'alphaNumeric',
+				'required' => true
+			),
+			'name' => array(
+				'rule' => 'alphaNumeric',
+				'required' => true
+		));
+
+		$TestModel->whitelist = array('name');
+		$TestModel->save(array('name' => '#$$#', 'title' => '$$$$'));
+
+		$expected = array('name' => 'This field cannot be left blank');
+		$this->assertEqual($TestModel->validationErrors, $expected);
+	}
+
+/**
+ * testValidates method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidates() {
+		$TestModel =& new TestValidate();
+
+		$TestModel->validate = array(
+			'user_id' => 'numeric',
+			'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'),
+			'body' => 'notEmpty'
+		);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 'title',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data) && $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => '0',
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate['modified'] = array('allowEmpty' => true, 'rule' => 'date');
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => '2007-05-01'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => 'invalid-date-here'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => 0
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'modified' => '0'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate['modified'] = array('allowEmpty' => false, 'rule' => 'date');
+
+		$data = array('TestValidate' => array('modified' => null));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('modified' => false));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('modified' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'modified' => '2007-05-01'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate['slug'] = array('allowEmpty' => false, 'rule' => array('maxLength', 45));
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => ''
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => 'slug-right-here'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'user_id' => '1',
+			'title' => 0,
+			'body' => 'body',
+			'slug' => 'abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate = array(
+			'number' => array(
+				'rule' => 'validateNumber',
+				'min' => 3,
+				'max' => 5
+			),
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'notEmpty'
+		));
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '0'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 0
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '3'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 3
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'number' => array(
+				'rule' => 'validateNumber',
+				'min' => 5,
+				'max' => 10
+			),
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'notEmpty'
+		));
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => '3'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'title',
+			'number' => 3
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'allowEmpty' => false,
+				'rule' => 'validateTitle'
+		));
+
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('title' => 'new title'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array('title' => 'title-new'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array('title' => array(
+			'allowEmpty' => true,
+			'rule' => 'validateTitle'
+		));
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'length' => array(
+					'allowEmpty' => true,
+					'rule' => array('maxLength', 10)
+		)));
+		$data = array('TestValidate' => array('title' => ''));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'rule' => array('userDefined', 'Article', 'titleDuplicate')
+		));
+		$data = array('TestValidate' => array('title' => 'My Article Title'));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+
+		$data = array('TestValidate' => array(
+			'title' => 'My Article With a Different Title'
+		));
+		$result = $TestModel->create($data);
+		$this->assertTrue($result);
+		$result = $TestModel->validates();
+		$this->assertTrue($result);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'tooShort' => array('rule' => array('minLength', 50)),
+				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
+			),
+		);
+		$data = array('TestValidate' => array(
+			'title' => 'I am a short string'
+		));
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+		$result = $TestModel->validationErrors;
+		$expected = array(
+			'title' => 'onlyLetters'
+		);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array(
+			'title' => array(
+				'tooShort' => array(
+					'rule' => array('minLength', 50),
+					'last' => true
+				),
+				'onlyLetters' => array('rule' => '/^[a-z]+$/i')
+			),
+		);
+		$data = array('TestValidate' => array(
+			'title' => 'I am a short string'
+		));
+		$TestModel->create($data);
+		$result = $TestModel->validates();
+		$this->assertFalse($result);
+		$result = $TestModel->validationErrors;
+		$expected = array(
+			'title' => 'tooShort'
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that validates() checks all the 'with' associations as well for validation
+ * as this can cause partial/wrong data insertion.
+ *
+ * @return void
+ */
+	function testValidatesWithAssociations() {
+		$data = array(
+			'Something' => array(
+				'id' => 5,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => '')
+			)
+		);
+
+		$Something =& new Something();
+		$JoinThing =& $Something->JoinThing;
+
+		$JoinThing->validate = array('doomed' => array('rule' => 'notEmpty'));
+
+		$expectedError = array('doomed' => 'This field cannot be left blank');
+
+		$Something->create();
+		$result = $Something->save($data);
+		$this->assertFalse($result, 'Save occured even when with models failed. %s');
+		$this->assertEqual($JoinThing->validationErrors, $expectedError);
+		$count = $Something->find('count', array('conditions' => array('Something.id' => $data['Something']['id'])));
+		$this->assertIdentical($count, 0);
+
+		$data = array(
+			'Something' => array(
+				'id' => 5,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => 1),
+				array('something_else_id' => 1, 'doomed' => '')
+			)
+		);
+		$Something->create();
+		$result = $Something->save($data);
+		$this->assertFalse($result, 'Save occured even when with models failed. %s');
+
+		$joinRecords = $JoinThing->find('count', array(
+			'conditions' => array('JoinThing.something_id' => $data['Something']['id'])
+		));
+		$this->assertEqual($joinRecords, 0, 'Records were saved on the join table. %s');
+	}
+
+/**
+ * test that saveAll and with models with validation interact well
+ *
+ * @return void
+ */
+	function testValidatesWithModelsAndSaveAll() {
+		$data = array(
+			'Something' => array(
+				'id' => 5,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => '')
+			)
+		);
+		$Something =& new Something();
+		$JoinThing =& $Something->JoinThing;
+
+		$JoinThing->validate = array('doomed' => array('rule' => 'notEmpty'));
+		$expectedError = array('doomed' => 'This field cannot be left blank');
+
+		$Something->create();
+		$result = $Something->saveAll($data, array('validate' => 'only'));
+		$this->assertFalse($result);
+		$this->assertEqual($JoinThing->validationErrors, $expectedError);
+
+		$Something->create();
+		$result = $Something->saveAll($data, array('validate' => 'first'));
+		$this->assertFalse($result);
+		$this->assertEqual($JoinThing->validationErrors, $expectedError);
+
+		$count = $Something->find('count', array('conditions' => array('Something.id' => $data['Something']['id'])));
+		$this->assertIdentical($count, 0);
+
+		$joinRecords = $JoinThing->find('count', array(
+			'conditions' => array('JoinThing.something_id' => $data['Something']['id'])
+		));
+		$this->assertEqual($joinRecords, 0, 'Records were saved on the join table. %s');
+	}
+
+/**
+ * Test that missing validation methods trigger errors in development mode.
+ * Helps to make developement easier.
+ *
+ * @return void
+ */
+	function testMissingValidationErrorTriggering() {
+		$restore = Configure::read('debug');
+		Configure::write('debug', 2);
+
+		$TestModel =& new ValidationTest1();
+		$TestModel->create(array('title' => 'foo'));
+		$TestModel->validate = array(
+			'title' => array(
+				'rule' => array('thisOneBringsThePain'),
+				'required' => true
+			)
+		);
+		$this->expectError(new PatternExpectation('/thisOneBringsThePain for title/i'));
+		$TestModel->invalidFields(array('fieldList' => array('title')));
+
+		Configure::write('debug', 0);
+		$this->assertNoErrors();
+		$TestModel->invalidFields(array('fieldList' => array('title')));
+		Configure::write('debug', $restore);
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_write.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_write.test.php
new file mode 100644
index 000000000..d88bffeaa
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/model_write.test.php
@@ -0,0 +1,4048 @@
+<?php
+/* SVN FILE: $Id: model.test.php 8225 2009-07-08 03:25:30Z mark_story $ */
+
+/**
+ * ModelWriteTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once dirname(__FILE__) . DS . 'model.test.php';
+/**
+ * ModelWriteTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model.operations
+ */
+class ModelWriteTest extends BaseModelTest {
+
+/**
+ * testInsertAnotherHabtmRecordWithSameForeignKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsertAnotherHabtmRecordWithSameForeignKey() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinAB');
+		$TestModel = new JoinA();
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$expected = array(
+			'JoinAsJoinB' => array(
+				'id' => 1,
+				'join_a_id' => 1,
+				'join_b_id' => 2,
+				'other' => 'Data for Join A 1 Join B 2',
+				'created' => '2008-01-03 10:56:33',
+				'updated' => '2008-01-03 10:56:33'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->JoinAsJoinB->create();
+		$result = $TestModel->JoinAsJoinB->save(array(
+			'join_a_id' => 1,
+			'join_b_id' => 1,
+			'other' => 'Data for Join A 1 Join B 1',
+			'created' => '2008-01-03 10:56:44',
+			'updated' => '2008-01-03 10:56:44'
+		));
+		$this->assertTrue($result);
+		$lastInsertId = $TestModel->JoinAsJoinB->getLastInsertID();
+		$this->assertTrue($lastInsertId != null);
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$expected = array(
+			'JoinAsJoinB' => array(
+				'id' => 1,
+				'join_a_id' => 1,
+				'join_b_id' => 2,
+				'other' => 'Data for Join A 1 Join B 2',
+				'created' => '2008-01-03 10:56:33',
+				'updated' => '2008-01-03 10:56:33'
+		));
+		$this->assertEqual($result, $expected);
+
+		$updatedValue = 'UPDATED Data for Join A 1 Join B 2';
+		$TestModel->JoinAsJoinB->id = 1;
+		$result = $TestModel->JoinAsJoinB->saveField('other', $updatedValue, false);
+		$this->assertTrue($result);
+
+		$result = $TestModel->JoinAsJoinB->findById(1);
+		$this->assertEqual($result['JoinAsJoinB']['other'], $updatedValue);
+	}
+
+/**
+ * testSaveDateAsFirstEntry method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveDateAsFirstEntry() {
+		$this->loadFixtures('Article');
+
+		$Article =& new Article();
+
+		$data = array(
+			'Article' => array(
+				'created' => array(
+					'day' => '1',
+					'month' => '1',
+					'year' => '2008'
+				),
+				'title' => 'Test Title',
+				'user_id' => 1
+		));
+		$Article->create();
+		$this->assertTrue($Article->save($data));
+
+		$testResult = $Article->find(array('Article.title' => 'Test Title'));
+
+		$this->assertEqual($testResult['Article']['title'], $data['Article']['title']);
+		$this->assertEqual($testResult['Article']['created'], '2008-01-01 00:00:00');
+
+	}
+
+/**
+ * testUnderscoreFieldSave method
+ *
+ * @access public
+ * @return void
+ */
+	function testUnderscoreFieldSave() {
+		$this->loadFixtures('UnderscoreField');
+		$UnderscoreField =& new UnderscoreField();
+
+		$currentCount = $UnderscoreField->find('count');
+		$this->assertEqual($currentCount, 3);
+		$data = array('UnderscoreField' => array(
+			'user_id' => '1',
+			'my_model_has_a_field' => 'Content here',
+			'body' => 'Body',
+			'published' => 'Y',
+			'another_field' => 4
+		));
+		$ret = $UnderscoreField->save($data);
+		$this->assertTrue($ret);
+
+		$currentCount = $UnderscoreField->find('count');
+		$this->assertEqual($currentCount, 4);
+	}
+
+/**
+ * testAutoSaveUuid method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoSaveUuid() {
+		// SQLite does not support non-integer primary keys
+		$this->skipIf($this->db->config['driver'] == 'sqlite');
+
+		$this->loadFixtures('Uuid');
+		$TestModel =& new Uuid();
+
+		$TestModel->save(array('title' => 'Test record'));
+		$result = $TestModel->findByTitle('Test record');
+		$this->assertEqual(
+			array_keys($result['Uuid']),
+			array('id', 'title', 'count', 'created', 'updated')
+		);
+		$this->assertEqual(strlen($result['Uuid']['id']), 36);
+	}
+
+/**
+ * Ensure that if the id key is null but present the save doesn't fail (with an
+ * x sql error: "Column id specified twice")
+ *
+ * @return void
+ * @access public
+ */
+	function testSaveUuidNull() {
+		// SQLite does not support non-integer primary keys
+		$this->skipIf($this->db->config['driver'] == 'sqlite');
+
+		$this->loadFixtures('Uuid');
+		$TestModel =& new Uuid();
+
+		$TestModel->save(array('title' => 'Test record', 'id' => null));
+		$result = $TestModel->findByTitle('Test record');
+		$this->assertEqual(
+			array_keys($result['Uuid']),
+			array('id', 'title', 'count', 'created', 'updated')
+		);
+		$this->assertEqual(strlen($result['Uuid']['id']), 36);
+	}
+
+/**
+ * testZeroDefaultFieldValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testZeroDefaultFieldValue() {
+		$this->skipIf(
+			$this->db->config['driver'] == 'sqlite',
+			'%s SQLite uses loose typing, this operation is unsupported'
+		);
+		$this->loadFixtures('DataTest');
+		$TestModel =& new DataTest();
+
+		$TestModel->create(array());
+		$TestModel->save();
+		$result = $TestModel->findById($TestModel->id);
+		$this->assertIdentical($result['DataTest']['count'], '0');
+		$this->assertIdentical($result['DataTest']['float'], '0');
+	}
+
+/**
+ * testNonNumericHabtmJoinKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testNonNumericHabtmJoinKey() {
+		$this->loadFixtures('Post', 'Tag', 'PostsTag');
+		$Post =& new Post();
+		$Post->bindModel(array(
+			'hasAndBelongsToMany' => array('Tag')
+		));
+		$Post->Tag->primaryKey = 'tag';
+
+		$result = $Post->find('all');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'First Post',
+					'body' => 'First Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => '2007-03-18 10:41:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+					),
+					array(
+						'id' => '2',
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+			))),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Second Post',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => '2007-03-18 10:43:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array(
+					array(
+						'id' => '1',
+						'tag' => 'tag1',
+						'created' => '2007-03-18 12:22:23',
+						'updated' => '2007-03-18 12:24:31'
+						),
+					array(
+						'id' => '3',
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+				),
+				'Author' => array(
+					'id' => null,
+					'user' => null,
+					'password' => null,
+					'created' => null,
+					'updated' => null,
+					'test' => 'working'
+				),
+				'Tag' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Tests validation parameter order in custom validation methods
+ *
+ * @access public
+ * @return void
+ */
+	function testAllowSimulatedFields() {
+		$TestModel =& new ValidationTest1();
+
+		$TestModel->create(array(
+			'title' => 'foo',
+			'bar' => 'baz'
+		));
+		$expected = array(
+			'ValidationTest1' => array(
+				'title' => 'foo',
+				'bar' => 'baz'
+		));
+		$this->assertEqual($TestModel->data, $expected);
+	}
+
+/**
+ * test that Caches are getting cleared on save().
+ * ensure that both inflections of controller names are getting cleared
+ * as url for controller could be either overallFavorites/index or overall_favorites/index
+ *
+ * @return void
+ */
+	function testCacheClearOnSave() {
+		$_back = array(
+			'check' => Configure::read('Cache.check'),
+			'disable' => Configure::read('Cache.disable'),
+		);
+		Configure::write('Cache.check', true);
+		Configure::write('Cache.disable', false);
+
+		$this->loadFixtures('OverallFavorite');
+		$OverallFavorite =& new OverallFavorite();
+
+		touch(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php');
+		touch(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php');
+
+		$data = array(
+			'OverallFavorite' => array(
+				'id' => 22,
+		 		'model_type' => '8-track',
+				'model_id' => '3',
+				'priority' => '1'
+			)
+		);
+		$OverallFavorite->create($data);
+		$OverallFavorite->save();
+
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overallfavorites_index.php'));
+		$this->assertFalse(file_exists(CACHE . 'views' . DS . 'some_dir_overall_favorites_index.php'));
+
+		Configure::write('Cache.check', $_back['check']);
+		Configure::write('Cache.disable', $_back['disable']);
+	}
+
+/**
+ * testSaveWithCounterCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCounterCache() {
+		$this->loadFixtures('Syfile', 'Item');
+		$TestModel =& new Syfile();
+		$TestModel2 =& new Item();
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], null);
+
+		$TestModel2->save(array(
+			'name' => 'Item 7',
+			'syfile_id' => 1,
+			'published' => false
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$TestModel2->delete(1);
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+
+		$TestModel2->id = 2;
+		$TestModel2->saveField('syfile_id', 1);
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$result = $TestModel->findById(2);
+		$this->assertIdentical($result['Syfile']['item_count'], '0');
+	}
+
+/**
+ * Tests that counter caches are updated when records are added
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheIncrease() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+		$data = array('Post' => array(
+			'id' => 22,
+			'title' => 'New Post',
+			'user_id' => 66
+		));
+
+		$Post->save($data);
+		$user = $User->find('first', array(
+			'conditions' => array('id' => 66),
+			'recursive' => -1
+		));
+
+		$result = $user[$User->alias]['post_count'];
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Tests that counter caches are updated when records are deleted
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheDecrease() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+
+		$Post->delete(2);
+		$user = $User->find('first', array(
+			'conditions' => array('id' => 66),
+			'recursive' => -1
+		));
+
+		$result = $user[$User->alias]['post_count'];
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Tests that counter caches are updated when foreign keys of counted records change
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheUpdated() {
+		$this->loadFixtures('CounterCacheUser', 'CounterCachePost');
+		$User = new CounterCacheUser();
+		$Post = new CounterCachePost();
+
+		$data = $Post->find('first', array(
+			'conditions' => array('id' => 1),
+			'recursive' => -1
+		));
+		$data[$Post->alias]['user_id'] = 301;
+		$Post->save($data);
+
+		$users = $User->find('all',array('order' => 'User.id'));
+		$this->assertEqual($users[0]['User']['post_count'], 1);
+		$this->assertEqual($users[1]['User']['post_count'], 2);
+	}
+
+/**
+ * Test counter cache with models that use a non-standard (i.e. not using 'id')
+ * as their primary key.
+ *
+ * @access public
+ * @return void
+ */
+	function testCounterCacheWithNonstandardPrimaryKey() {
+		$this->loadFixtures(
+			'CounterCacheUserNonstandardPrimaryKey',
+			'CounterCachePostNonstandardPrimaryKey'
+		);
+
+		$User = new CounterCacheUserNonstandardPrimaryKey();
+		$Post = new CounterCachePostNonstandardPrimaryKey();
+
+		$data = $Post->find('first', array(
+			'conditions' => array('pid' => 1),
+			'recursive' => -1
+		));
+		$data[$Post->alias]['uid'] = 301;
+		$Post->save($data);
+
+		$users = $User->find('all',array('order' => 'User.uid'));
+		$this->assertEqual($users[0]['User']['post_count'], 1);
+		$this->assertEqual($users[1]['User']['post_count'], 2);
+	}
+
+/**
+ * test Counter Cache With Self Joining table
+ *
+ * @return void
+ * @access public
+ */
+	function testCounterCacheWithSelfJoin() {
+		$skip = $this->skipIf(
+			($this->db->config['driver'] == 'sqlite'),
+			'SQLite 2.x does not support ALTER TABLE ADD COLUMN'
+		);
+		if ($skip) {
+			return;
+		}
+
+		$this->loadFixtures('CategoryThread');
+		$this->db->query('ALTER TABLE '. $this->db->fullTableName('category_threads') . " ADD COLUMN child_count INTEGER");
+		$Category =& new CategoryThread();
+		$result = $Category->updateAll(array('CategoryThread.name' => "'updated'"), array('CategoryThread.parent_id' => 5));
+		$this->assertTrue($result);
+
+		$Category =& new CategoryThread();
+		$Category->belongsTo['ParentCategory']['counterCache'] = 'child_count';
+		$Category->updateCounterCache(array('parent_id' => 5));
+		$result = Set::extract($Category->find('all', array('conditions' => array('CategoryThread.id' => 5))), '{n}.CategoryThread.child_count');
+		$expected = array_fill(0, 1, 1);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveWithCounterCacheScope method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCounterCacheScope() {
+		$this->loadFixtures('Syfile', 'Item');
+		$TestModel =& new Syfile();
+		$TestModel2 =& new Item();
+		$TestModel2->belongsTo['Syfile']['counterCache'] = true;
+		$TestModel2->belongsTo['Syfile']['counterScope'] = array('published' => true);
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], null);
+
+		$TestModel2->save(array(
+			'name' => 'Item 7',
+			'syfile_id' => 1,
+			'published'=> true
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+
+		$TestModel2->id = 1;
+		$TestModel2->saveField('published', true);
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '2');
+
+		$TestModel2->save(array(
+			'id' => 1,
+			'syfile_id' => 1,
+			'published'=> false
+		));
+
+		$result = $TestModel->findById(1);
+		$this->assertIdentical($result['Syfile']['item_count'], '1');
+	}
+
+/**
+ * test that beforeValidate returning false can abort saves.
+ *
+ * @return void
+ */
+	function testBeforeValidateSaveAbortion() {
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeValidateReturn = false;
+
+		$data = array(
+			'title' => 'new article',
+			'body' => 'this is some text.'
+		);
+		$Model->create();
+		$result = $Model->save($data);
+		$this->assertFalse($result);
+	}
+/**
+ * test that beforeSave returning false can abort saves.
+ *
+ * @return void
+ */
+	function testBeforeSaveSaveAbortion() {
+		$Model =& new CallbackPostTestModel();
+		$Model->beforeSaveReturn = false;
+
+		$data = array(
+			'title' => 'new article',
+			'body' => 'this is some text.'
+		);
+		$Model->create();
+		$result = $Model->save($data);
+		$this->assertFalse($result);
+	}
+
+/**
+ * testSaveField method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveField() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', 'New First Article');
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => 'First Article Body'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', '');
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => '',
+			'body' => 'First Article Body'
+		));
+		$result['Article']['title'] = trim($result['Article']['title']);
+		$this->assertEqual($result, $expected);
+
+		$TestModel->id = 1;
+		$TestModel->set('body', 'Messed up data');
+		$this->assertTrue($TestModel->saveField('title', 'First Article'));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'First Article',
+			'body' => 'First Article Body'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body'), 1);
+
+		$TestModel->id = 1;
+		$result = $TestModel->saveField('title', '', true);
+		$this->assertFalse($result);
+
+		$this->loadFixtures('Node', 'Dependency');
+		$Node =& new Node();
+		$Node->set('id', 1);
+		$result = $Node->read();
+		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
+
+		$Node->saveField('state', 10);
+		$result = $Node->read();
+		$this->assertEqual(Set::extract('/ParentNode/name', $result), array('Second'));
+	}
+
+/**
+ * testSaveWithCreate method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithCreate() {
+		$this->loadFixtures(
+			'User',
+			'Article',
+			'User',
+			'Comment',
+			'Tag',
+			'ArticlesTag',
+			'Attachment'
+		);
+		$TestModel =& new User();
+
+		$data = array('User' => array(
+			'user' => 'user',
+			'password' => ''
+		));
+		$result = $TestModel->save($data);
+		$this->assertFalse($result);
+		$this->assertTrue(!empty($TestModel->validationErrors));
+
+		$TestModel =& new Article();
+
+		$data = array('Article' => array(
+			'user_id' => '',
+			'title' => '',
+			'body' => ''
+		));
+		$result = $TestModel->create($data) && $TestModel->save();
+		$this->assertFalse($result);
+		$this->assertTrue(!empty($TestModel->validationErrors));
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => ''
+		));
+		$result = $TestModel->create($data) && $TestModel->save();
+		$this->assertFalse($result);
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'title' => 'New First Article'
+		));
+		$result = $TestModel->create() && $TestModel->save($data, false);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'New First Article',
+			'body' => 'First Article Body',
+			'published' => 'N'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array(
+			'id' => 1,
+			'user_id' => '2',
+			'title' => 'First Article',
+			'body' => 'New First Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data, true, array('id', 'title', 'published'));
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 1);
+		$expected = array('Article' => array(
+			'id' => '1',
+			'user_id' => '1',
+			'title' => 'First Article',
+			'body' => 'First Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'Tag' => array('Tag' => array(1, 3))
+		);
+		$TestModel->create();
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 4);
+		$expected = array(
+			'Article' => array(
+				'id' => '4',
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'published' => 'N',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+			),
+			'Comment' => array(),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Comment' => array(
+			'article_id' => '4',
+			'user_id' => '1',
+			'comment' => 'Comment New Article',
+			'published' => 'Y',
+			'created' => '2007-03-18 14:57:23',
+			'updated' => '2007-03-18 14:59:31'
+		));
+		$result = $TestModel->Comment->create() && $TestModel->Comment->save($data);
+		$this->assertTrue($result);
+
+		$data = array('Attachment' => array(
+			'comment_id' => '7',
+			'attachment' => 'newattachment.zip',
+			'created' => '2007-03-18 15:02:23',
+			'updated' => '2007-03-18 15:04:31'
+		));
+		$result = $TestModel->Comment->Attachment->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = 2;
+		$result = $TestModel->read(null, 4);
+		$expected = array(
+			'Article' => array(
+				'id' => '4',
+				'user_id' => '2',
+				'title' => 'New Article',
+				'body' => 'New Article Body',
+				'published' => 'N',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'User' => array(
+				'id' => '2',
+				'user' => 'nate',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:18:23',
+				'updated' => '2007-03-17 01:20:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '7',
+					'article_id' => '4',
+					'user_id' => '1',
+					'comment' => 'Comment New Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 14:57:23',
+					'updated' => '2007-03-18 14:59:31',
+					'Article' => array(
+						'id' => '4',
+						'user_id' => '2',
+						'title' => 'New Article',
+						'body' => 'New Article Body',
+						'published' => 'N',
+						'created' => '2007-03-18 14:55:23',
+						'updated' => '2007-03-18 14:57:31'
+					),
+					'User' => array(
+						'id' => '1',
+						'user' => 'mariano',
+						'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+						'created' => '2007-03-17 01:16:23',
+						'updated' => '2007-03-17 01:18:31'
+					),
+					'Attachment' => array(
+						'id' => '2',
+						'comment_id' => '7',
+						'attachment' => 'newattachment.zip',
+						'created' => '2007-03-18 15:02:23',
+						'updated' => '2007-03-18 15:04:31'
+			))),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that a null Id doesn't cause errors
+ *
+ * @return void
+ */
+	function testSaveWithNullId() {
+		$this->loadFixtures('User');
+		$User =& new User();
+		$User->read(null, 1);
+		$User->data['User']['id'] = null;
+		$this->assertTrue($User->save(array('password' => 'test')));
+		$this->assertTrue($User->id > 0);
+
+		$result = $User->read(null, 2);
+		$User->data['User']['id'] = null;
+		$this->assertTrue($User->save(array('password' => 'test')));
+		$this->assertTrue($User->id > 0);
+
+		$User->data['User'] = array('password' => 'something');
+		$this->assertTrue($User->save());
+		$result = $User->read();
+		$this->assertEqual($User->data['User']['password'], 'something');
+	}
+
+/**
+ * testSaveWithSet method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithSet() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+
+		// Create record we will be updating later
+
+		$data = array('Article' => array(
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		// Check record we created
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// Create new record just to overlap Model->id on previously created record
+
+		$data = array('Article' => array(
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// Go back and edit the first article we created, starting by checking it's still there
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article',
+			'body' => 'Fourth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		// And now do the update with set()
+
+		$data = array('Article' => array(
+			'id' => '4',
+			'title' => 'Fourth Article - New Title',
+			'published' => 'N'
+		));
+		$result = $TestModel->set($data) && $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array('id' => '5', 'title' => 'Fifth Article - New Title 5'));
+		$result = ($TestModel->set($data) && $TestModel->save());
+		$this->assertTrue($result);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '4',
+			'title' => 'Fifth Article - New Title 5',
+			'body' => 'Fifth Article Body',
+			'published' => 'Y'
+		));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->recursive = -1;
+		$result = $TestModel->find('all', array('fields' => array('id', 'title')));
+		$expected = array(
+			array('Article' => array('id' => 1, 'title' => 'First Article' )),
+			array('Article' => array('id' => 2, 'title' => 'Second Article' )),
+			array('Article' => array('id' => 3, 'title' => 'Third Article' )),
+			array('Article' => array('id' => 4, 'title' => 'Fourth Article - New Title' )),
+			array('Article' => array('id' => 5, 'title' => 'Fifth Article - New Title 5' ))
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveWithNonExistentFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveWithNonExistentFields() {
+		$this->loadFixtures('Article');
+		$TestModel =& new Article();
+		$TestModel->recursive = -1;
+
+		$data = array(
+			'non_existent' => 'This field does not exist',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		);
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$expected = array('Article' => array(
+			'id' => '4',
+			'user_id' => '1',
+			'title' => 'Fourth Article - New Title',
+			'body' => 'Fourth Article Body',
+			'published' => 'N'
+		));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 4);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'user_id' => '1',
+			'non_existent' => 'This field does not exist',
+			'title' => 'Fiveth Article - New Title',
+			'body' => 'Fiveth Article Body',
+			'published' => 'N'
+		);
+		$result = $TestModel->create() && $TestModel->save($data);
+		$this->assertTrue($result);
+
+		$expected = array('Article' => array(
+			'id' => '5',
+			'user_id' => '1',
+			'title' => 'Fiveth Article - New Title',
+			'body' => 'Fiveth Article Body',
+			'published' => 'N'
+		));
+		$result = $TestModel->read(array('id', 'user_id', 'title', 'body', 'published'), 5);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveFromXml method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveFromXml() {
+		$this->loadFixtures('Article');
+		App::import('Core', 'Xml');
+
+		$Article = new Article();
+		$Article->save(new Xml('<article title="test xml" user_id="5" />'));
+		$this->assertTrue($Article->save(new Xml('<article title="test xml" user_id="5" />')));
+
+		$results = $Article->find(array('Article.title' => 'test xml'));
+		$this->assertTrue($results);
+	}
+
+/**
+ * testSaveHabtm method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveHabtm() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Tag', 'ArticlesTag');
+		$TestModel =& new Article();
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Second Article',
+				'body' => 'Second Article Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			),
+			'User' => array(
+				'id' => '3',
+				'user' => 'larry',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:20:23',
+				'updated' => '2007-03-17 01:22:31'
+			),
+			'Comment' => array(
+				array(
+					'id' => '5',
+					'article_id' => '2',
+					'user_id' => '1',
+					'comment' => 'First Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:53:23',
+					'updated' => '2007-03-18 10:55:31'
+				),
+				array(
+					'id' => '6',
+					'article_id' => '2',
+					'user_id' => '2',
+					'comment' => 'Second Comment for Second Article',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:55:23',
+					'updated' => '2007-03-18 10:57:31'
+			)),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article'
+			),
+			'Tag' => array('Tag' => array(1, 2))
+		);
+
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
+		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Article' => array('id' => '2'), 'Tag' => array('Tag' => array(2, 3)));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array(1, 2, 3)));
+
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id' => 2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array()));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$data = array('Tag' => array('Tag' => ''));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array()
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array('Tag' => array('Tag' => array(2, 3)));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article'
+		));
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'New Second Article Title'
+		));
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'New Second Article Title',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(2, 3)
+			),
+			'Article' => array(
+				'id' => '2',
+				'title' => 'Changed Second Article'
+		));
+		$this->assertTrue($TestModel->set($data));
+		$this->assertTrue($TestModel->save());
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Changed Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '2',
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Tag' => array(
+				'Tag' => array(1, 3)
+			),
+			'Article' => array('id' => '2'),
+		);
+
+		$result = $TestModel->set($data);
+		$this->assertTrue($result);
+
+		$result = $TestModel->save();
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment')
+		));
+		$result = $TestModel->find(array('Article.id'=>2), array('id', 'user_id', 'title', 'body'));
+		$expected = array(
+			'Article' => array(
+				'id' => '2',
+				'user_id' => '3',
+				'title' => 'Changed Second Article',
+				'body' => 'Second Article Body'
+			),
+			'Tag' => array(
+				array(
+					'id' => '1',
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				array(
+					'id' => '3',
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'Article' => array(
+				'id' => 10,
+				'user_id' => '2',
+				'title' => 'New Article With Tags and fieldList',
+				'body' => 'New Article Body with Tags and fieldList',
+				'created' => '2007-03-18 14:55:23',
+				'updated' => '2007-03-18 14:57:31'
+			),
+			'Tag' => array(
+				'Tag' => array(1, 2, 3)
+		));
+		$result =  $TestModel->create()
+				&& $TestModel->save($data, true, array('user_id', 'title', 'published'));
+		$this->assertTrue($result);
+
+		$TestModel->unbindModel(array('belongsTo' => array('User'), 'hasMany' => array('Comment')));
+		$result = $TestModel->read();
+		$expected = array(
+			'Article' => array(
+				'id' => 4,
+				'user_id' => 2,
+				'title' => 'New Article With Tags and fieldList',
+				'body' => '',
+				'published' => 'N',
+				'created' => '',
+				'updated' => ''
+			),
+			'Tag' => array(
+				0 => array(
+					'id' => 1,
+					'tag' => 'tag1',
+					'created' => '2007-03-18 12:22:23',
+					'updated' => '2007-03-18 12:24:31'
+				),
+				1 => array(
+					'id' => 2,
+					'tag' => 'tag2',
+					'created' => '2007-03-18 12:24:23',
+					'updated' => '2007-03-18 12:26:31'
+				),
+				2 => array(
+					'id' => 3,
+					'tag' => 'tag3',
+					'created' => '2007-03-18 12:26:23',
+					'updated' => '2007-03-18 12:28:31'
+		)));
+		$this->assertEqual($result, $expected);
+
+
+		$this->loadFixtures('JoinA', 'JoinC', 'JoinAC', 'JoinB', 'JoinAB');
+		$TestModel = new JoinA();
+		$TestModel->hasBelongsToMany['JoinC']['unique'] = true;
+		$data = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'Join A 1',
+				'body' => 'Join A 1 Body',
+			),
+			'JoinC' => array(
+				'JoinC' => array(
+					array('join_c_id' => 2, 'other' => 'new record'),
+					array('join_c_id' => 3, 'other' => 'new record')
+				)
+			)
+		);
+		$TestModel->save($data);
+		$result = $TestModel->read(null, 1);
+		$expected = array(4, 5);
+		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/id', $result), $expected);
+		$expected = array('new record', 'new record');
+		$this->assertEqual(Set::extract('/JoinC/JoinAsJoinC/other', $result), $expected);
+	}
+
+/**
+ * testSaveHabtmCustomKeys method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveHabtmCustomKeys() {
+		$this->loadFixtures('Story', 'StoriesTag', 'Tag');
+		$Story =& new Story();
+
+		$data = array(
+			'Story' => array('story' => '1'),
+			'Tag' => array(
+				'Tag' => array(2, 3)
+		));
+		$result = $Story->set($data);
+		$this->assertTrue($result);
+
+		$result = $Story->save();
+		$this->assertTrue($result);
+
+		$result = $Story->find('all', array('order' => array('Story.story')));
+		$expected = array(
+			array(
+				'Story' => array(
+					'story' => 1,
+					'title' => 'First Story'
+				),
+				'Tag' => array(
+					array(
+						'id' => 2,
+						'tag' => 'tag2',
+						'created' => '2007-03-18 12:24:23',
+						'updated' => '2007-03-18 12:26:31'
+					),
+					array(
+						'id' => 3,
+						'tag' => 'tag3',
+						'created' => '2007-03-18 12:26:23',
+						'updated' => '2007-03-18 12:28:31'
+			))),
+			array(
+				'Story' => array(
+					'story' => 2,
+					'title' => 'Second Story'
+				),
+				'Tag' => array()
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that saving habtm records respects conditions set in the 'conditions' key
+ * for the association.
+ *
+ * @return void
+ */
+	function testHabtmSaveWithConditionsInAssociation() {
+		$this->loadFixtures('JoinThing', 'Something', 'SomethingElse');
+		$Something =& new Something();
+		$Something->unbindModel(array('hasAndBelongsToMany' => array('SomethingElse')), false);
+
+		$Something->bindModel(array(
+			'hasAndBelongsToMany' => array(
+				'DoomedSomethingElse' => array(
+					'className' => 'SomethingElse',
+					'joinTable' => 'join_things',
+					'conditions' => 'JoinThing.doomed = true',
+					'unique' => true
+				),
+				'NotDoomedSomethingElse' => array(
+					'className' => 'SomethingElse',
+					'joinTable' => 'join_things',
+					'conditions' => array('JoinThing.doomed' => 0),
+					'unique' => true
+				)
+			)
+		), false);
+		$result = $Something->read(null, 1);
+		$this->assertTrue(empty($result['NotDoomedSomethingElse']));
+		$this->assertEqual(count($result['DoomedSomethingElse']), 1);
+
+		$data = array(
+			'Something' => array('id' => 1),
+			'NotDoomedSomethingElse' => array(
+				'NotDoomedSomethingElse' => array(
+					array('something_else_id' => 2, 'doomed' => 0),
+					array('something_else_id' => 3, 'doomed' => 0)
+				)
+			)
+		);
+		$Something->create($data);
+		$result = $Something->save();
+		$this->assertTrue($result);
+
+		$result = $Something->read(null, 1);
+		$this->assertEqual(count($result['NotDoomedSomethingElse']), 2);
+		$this->assertEqual(count($result['DoomedSomethingElse']), 1);
+	}
+/**
+ * testHabtmSaveKeyResolution method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmSaveKeyResolution() {
+		$this->loadFixtures('Apple', 'Device', 'ThePaperMonkies');
+		$ThePaper =& new ThePaper();
+
+		$ThePaper->id = 1;
+		$ThePaper->save(array('Monkey' => array(2, 3)));
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(1, 2, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '1',
+				'device_type_id' => '1',
+				'name' => 'Device 1',
+				'typ' => '1'
+			),
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$ThePaper->id = 2;
+		$ThePaper->save(array('Monkey' => array(1, 3)));
+
+		$result = $ThePaper->findById(2);
+		$expected = array(
+			array(
+				'id' => '1',
+				'device_type_id' => '1',
+				'name' => 'Device 1',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+			));
+		$this->assertEqual($result['Monkey'], $expected);
+
+		$result = $ThePaper->findById(1);
+		$expected = array(
+			array(
+				'id' => '2',
+				'device_type_id' => '1',
+				'name' => 'Device 2',
+				'typ' => '1'
+			),
+			array(
+				'id' => '3',
+				'device_type_id' => '1',
+				'name' => 'Device 3',
+				'typ' => '2'
+		));
+		$this->assertEqual($result['Monkey'], $expected);
+	}
+
+/**
+ * testCreationOfEmptyRecord method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationOfEmptyRecord() {
+		$this->loadFixtures('Author');
+		$TestModel =& new Author();
+		$this->assertEqual($TestModel->find('count'), 4);
+
+		$TestModel->deleteAll(true, false, false);
+		$this->assertEqual($TestModel->find('count'), 0);
+
+		$result = $TestModel->save();
+		$this->assertTrue(isset($result['Author']['created']));
+		$this->assertTrue(isset($result['Author']['updated']));
+		$this->assertEqual($TestModel->find('count'), 1);
+	}
+
+/**
+ * testCreateWithPKFiltering method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreateWithPKFiltering() {
+		$TestModel =& new Article();
+		$data = array(
+			'id' => 5,
+			'user_id' => 2,
+			'title' => 'My article',
+			'body' => 'Some text'
+		);
+
+		$result = $TestModel->create($data);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => 5,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->id, 5);
+
+		$result = $TestModel->create($data, true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+
+		$result = $TestModel->create(array('Article' => $data), true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+
+		$data = array(
+			'id' => 6,
+			'user_id' => 2,
+			'title' => 'My article',
+			'body' => 'Some text',
+			'created' => '1970-01-01 00:00:00',
+			'updated' => '1970-01-01 12:00:00',
+			'modified' => '1970-01-01 12:00:00'
+		);
+
+		$result = $TestModel->create($data);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => 6,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text',
+				'created' => '1970-01-01 00:00:00',
+				'updated' => '1970-01-01 12:00:00',
+				'modified' => '1970-01-01 12:00:00'
+		));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->id, 6);
+
+		$result = $TestModel->create(array(
+			'Article' => array_diff_key($data, array(
+				'created' => true,
+				'updated' => true,
+				'modified' => true
+		))), true);
+		$expected = array(
+			'Article' => array(
+				'published' => 'N',
+				'id' => false,
+				'user_id' => 2,
+				'title' => 'My article',
+				'body' => 'Some text'
+		));
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($TestModel->id);
+	}
+
+/**
+ * testCreationWithMultipleData method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleData() {
+		$this->loadFixtures('Article', 'Comment');
+		$Article =& new Article();
+		$Comment =& new Comment();
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$comments = $Comment->find('all', array(
+			'fields' => array('id','article_id','user_id','comment','published'), 'recursive' => -1));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		))));
+
+		$this->assertEqual($comments, array(
+			array('Comment' => array(
+				'id' => 1,
+				'article_id' => 1,
+				'user_id' => 2,
+				'comment' => 'First Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 2,
+				'article_id' => 1,
+				'user_id' => 4,
+				'comment' => 'Second Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 3,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Third Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 4,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Fourth Comment for First Article',
+				'published' => 'N'
+			)),
+			array('Comment' => array(
+				'id' => 5,
+				'article_id' => 2,
+				'user_id' => 1,
+				'comment' => 'First Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 6,
+				'article_id' => 2,
+				'user_id' => 2,
+				'comment' => 'Second Comment for Second Article',
+				'published' => 'Y'
+		))));
+
+		$data = array(
+			'Comment' => array(
+				'article_id' => 2,
+				'user_id' => 4,
+				'comment' => 'Brand New Comment',
+				'published' => 'N'
+			),
+			'Article' => array(
+				'id' => 2,
+				'title' => 'Second Article Modified'
+		));
+
+		$result = $Comment->create($data);
+
+		$this->assertTrue($result);
+		$result = $Comment->save();
+		$this->assertTrue($result);
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$comments = $Comment->find('all', array(
+			'fields' => array('id','article_id','user_id','comment','published'),
+			'recursive' => -1
+		));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+		))));
+
+		$this->assertEqual($comments, array(
+			array('Comment' => array(
+				'id' => 1,
+				'article_id' => 1,
+				'user_id' => 2,
+				'comment' => 'First Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 2,
+				'article_id' => 1,
+				'user_id' => 4,
+				'comment' => 'Second Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 3,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Third Comment for First Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 4,
+				'article_id' => 1,
+				'user_id' => 1,
+				'comment' => 'Fourth Comment for First Article',
+				'published' => 'N'
+			)),
+			array('Comment' => array(
+				'id' => 5,
+				'article_id' => 2,
+				'user_id' => 1,
+				'comment' => 'First Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 6,
+				'article_id' => 2,
+				'user_id' => 2, 'comment' =>
+				'Second Comment for Second Article',
+				'published' => 'Y'
+			)),
+			array('Comment' => array(
+				'id' => 7,
+				'article_id' => 2,
+				'user_id' => 4,
+				'comment' => 'Brand New Comment',
+				'published' => 'N'
+	))));
+
+	}
+
+/**
+ * testCreationWithMultipleDataSameModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleDataSameModel() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$SecondaryArticle =& new Article();
+
+		$result = $Article->field('title', array('id' => 1));
+		$this->assertEqual($result, 'First Article');
+
+		$data = array(
+			'Article' => array(
+				'user_id' => 2,
+				'title' => 'Brand New Article',
+				'body' => 'Brand New Article Body',
+				'published' => 'Y'
+			),
+			'SecondaryArticle' => array(
+				'id' => 1
+		));
+
+		$Article->create();
+		$result = $Article->save($data);
+		$this->assertTrue($result);
+
+		$result = $Article->getInsertID();
+		$this->assertTrue(!empty($result));
+
+		$result = $Article->field('title', array('id' => 1));
+		$this->assertEqual($result, 'First Article');
+
+		$articles = $Article->find('all', array(
+			'fields' => array('id','title'),
+			'recursive' => -1
+		));
+
+		$this->assertEqual($articles, array(
+			array('Article' => array(
+				'id' => 1,
+				'title' => 'First Article'
+			)),
+			array('Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+			)),
+			array('Article' => array(
+				'id' => 3,
+				'title' => 'Third Article'
+			)),
+			array('Article' => array(
+				'id' => 4,
+				'title' => 'Brand New Article'
+		))));
+	}
+
+/**
+ * testCreationWithMultipleDataSameModelManualInstances method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreationWithMultipleDataSameModelManualInstances() {
+		$this->loadFixtures('PrimaryModel');
+		$Primary =& new PrimaryModel();
+		$Secondary =& new PrimaryModel();
+
+		$result = $Primary->field('primary_name', array('id' => 1));
+		$this->assertEqual($result, 'Primary Name Existing');
+
+		$data = array(
+			'PrimaryModel' => array(
+				'primary_name' => 'Primary Name New'
+			),
+			'SecondaryModel' => array(
+				'id' => array(1)
+		));
+
+		$Primary->create();
+		$result = $Primary->save($data);
+		$this->assertTrue($result);
+
+		$result = $Primary->field('primary_name', array('id' => 1));
+		$this->assertEqual($result, 'Primary Name Existing');
+
+		$result = $Primary->getInsertID();
+		$this->assertTrue(!empty($result));
+
+		$result = $Primary->field('primary_name', array('id' => $result));
+		$this->assertEqual($result, 'Primary Name New');
+
+		$result = $Primary->find('count');
+		$this->assertEqual($result, 2);
+	}
+
+/**
+ * testRecordExists method
+ *
+ * @access public
+ * @return void
+ */
+	function testRecordExists() {
+		$this->loadFixtures('User');
+		$TestModel =& new User();
+
+		$this->assertFalse($TestModel->exists());
+		$TestModel->read(null, 1);
+		$this->assertTrue($TestModel->exists());
+		$TestModel->create();
+		$this->assertFalse($TestModel->exists());
+		$TestModel->id = 4;
+		$this->assertTrue($TestModel->exists());
+
+		$TestModel =& new TheVoid();
+		$this->assertFalse($TestModel->exists());
+
+		$TestModel->id = 5;
+		$this->expectError();
+		ob_start();
+		$this->assertFalse($TestModel->exists());
+		$output = ob_get_clean();
+	}
+
+/**
+ * testUpdateExisting method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateExisting() {
+		$this->loadFixtures('User', 'Article', 'Comment');
+		$TestModel =& new User();
+		$TestModel->create();
+
+		$TestModel->save(array(
+			'User' => array(
+				'user' => 'some user',
+				'password' => 'some password'
+		)));
+		$this->assertTrue(is_int($TestModel->id) || (intval($TestModel->id) === 5));
+		$id = $TestModel->id;
+
+		$TestModel->save(array(
+			'User' => array(
+				'user' => 'updated user'
+		)));
+		$this->assertEqual($TestModel->id, $id);
+
+		$result = $TestModel->findById($id);
+		$this->assertEqual($result['User']['user'], 'updated user');
+		$this->assertEqual($result['User']['password'], 'some password');
+
+		$Article =& new Article();
+		$Comment =& new Comment();
+		$data = array(
+			'Comment' => array(
+				'id' => 1,
+				'comment' => 'First Comment for First Article'
+			),
+			'Article' => array(
+				'id' => 2,
+				'title' => 'Second Article'
+		));
+
+		$result = $Article->save($data);
+		$this->assertTrue($result);
+
+		$result = $Comment->save($data);
+		$this->assertTrue($result);
+	}
+
+/**
+ * test updating records and saving blank values.
+ *
+ * @return void
+ */
+	function testUpdateSavingBlankValues() {
+		$this->loadFixtures('Article');
+		$Article =& new Article();
+		$Article->validate = array();
+		$Article->create();
+		$result = $Article->save(array(
+			'id' => 1,
+			'title' => '',
+			'body' => ''
+		));
+		$this->assertTrue($result);
+		$result = $Article->find('first', array('conditions' => array('Article.id' => 1)));
+		$this->assertEqual('', $result['Article']['title'], 'Title is not blank');
+		$this->assertEqual('', $result['Article']['body'], 'Body is not blank');
+	}
+
+/**
+ * testUpdateMultiple method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateMultiple() {
+		$this->loadFixtures('Comment', 'Article', 'User', 'CategoryThread');
+		$TestModel =& new Comment();
+		$result = Set::extract($TestModel->find('all'), '{n}.Comment.user_id');
+		$expected = array('2', '4', '1', '1', '1', '2');
+		$this->assertEqual($result, $expected);
+
+		$TestModel->updateAll(array('Comment.user_id' => 5), array('Comment.user_id' => 2));
+		$result = Set::combine($TestModel->find('all'), '{n}.Comment.id', '{n}.Comment.user_id');
+		$expected = array(1 => 5, 2 => 4, 3 => 1, 4 => 1, 5 => 1, 6 => 5);
+		$this->assertEqual($result, $expected);
+
+		$result = $TestModel->updateAll(
+			array('Comment.comment' => "'Updated today'"),
+			array('Comment.user_id' => 5)
+		);
+		$this->assertTrue($result);
+		$result = Set::extract(
+			$TestModel->find('all', array(
+				'conditions' => array(
+					'Comment.user_id' => 5
+			))),
+			'{n}.Comment.comment'
+		);
+		$expected = array_fill(0, 2, 'Updated today');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testHabtmUuidWithUuidId method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUuidWithUuidId() {
+		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolio');
+		$TestModel =& new Uuidportfolio();
+
+		$data = array('Uuidportfolio' => array('name' => 'Portfolio 3'));
+		$data['Uuiditem']['Uuiditem'] = array('483798c8-c7cc-430e-8cf9-4fcc40cf8569');
+		$TestModel->create($data);
+		$TestModel->save();
+		$id = $TestModel->id;
+		$result = $TestModel->read(null, $id);
+		$this->assertEqual(1, count($result['Uuiditem']));
+		$this->assertEqual(strlen($result['Uuiditem'][0]['UuiditemsUuidportfolio']['id']), 36);
+	}
+
+/**
+ * test HABTM saving when join table has no primary key and only 2 columns.
+ *
+ * @return void
+ */
+	function testHabtmSavingWithNoPrimaryKeyUuidJoinTable() {
+		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
+		$Fruit =& new Fruit();
+		$data = array(
+			'Fruit' => array(
+				'color' => 'Red',
+				'shape' => 'Heart-shaped',
+				'taste' => 'sweet',
+				'name' => 'Strawberry',
+			),
+			'UuidTag' => array(
+				'UuidTag' => array(
+					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
+				)
+			)
+		);
+		$this->assertTrue($Fruit->save($data));
+	}
+
+/**
+ * test HABTM saving when join table has no primary key and only 2 columns, no with model is used.
+ *
+ * @return void
+ */
+	function testHabtmSavingWithNoPrimaryKeyUuidJoinTableNoWith() {
+		$this->loadFixtures('UuidTag', 'Fruit', 'FruitsUuidTag');
+		$Fruit =& new FruitNoWith();
+		$data = array(
+			'Fruit' => array(
+				'color' => 'Red',
+				'shape' => 'Heart-shaped',
+				'taste' => 'sweet',
+				'name' => 'Strawberry',
+			),
+			'UuidTag' => array(
+				'UuidTag' => array(
+					'481fc6d0-b920-43e0-e50f-6d1740cf8569'
+				)
+			)
+		);
+		$this->assertTrue($Fruit->save($data));
+	}
+
+/**
+ * testHabtmUuidWithNumericId method
+ *
+ * @access public
+ * @return void
+ */
+	function testHabtmUuidWithNumericId() {
+		$this->loadFixtures('Uuidportfolio', 'Uuiditem', 'UuiditemsUuidportfolioNumericid');
+		$TestModel =& new Uuiditem();
+
+		$data = array('Uuiditem' => array('name' => 'Item 7', 'published' => 0));
+		$data['Uuidportfolio']['Uuidportfolio'] = array('480af662-eb8c-47d3-886b-230540cf8569');
+		$TestModel->create($data);
+		$TestModel->save();
+		$id = $TestModel->id;
+		$result = $TestModel->read(null, $id);
+		$this->assertEqual(1, count($result['Uuidportfolio']));
+	}
+
+/**
+ * testSaveMultipleHabtm method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveMultipleHabtm() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinC', 'JoinAB', 'JoinAC');
+		$TestModel = new JoinA();
+		$result = $TestModel->findById(1);
+
+		$expected = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'Join A 1',
+				'body' => 'Join A 1 Body',
+				'created' => '2008-01-03 10:54:23',
+				'updated' => '2008-01-03 10:54:23'
+			),
+			'JoinB' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join B 2',
+					'created' => '2008-01-03 10:55:02',
+					'updated' => '2008-01-03 10:55:02',
+					'JoinAsJoinB' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_b_id' => 2,
+						'other' => 'Data for Join A 1 Join B 2',
+						'created' => '2008-01-03 10:56:33',
+						'updated' => '2008-01-03 10:56:33'
+			))),
+			'JoinC' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join C 2',
+					'created' => '2008-01-03 10:56:12',
+					'updated' => '2008-01-03 10:56:12',
+					'JoinAsJoinC' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_c_id' => 2,
+						'other' => 'Data for Join A 1 Join C 2',
+						'created' => '2008-01-03 10:57:22',
+						'updated' => '2008-01-03 10:57:22'
+		))));
+
+		$this->assertEqual($result, $expected);
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->id = 1;
+		$data = array(
+			'JoinA' => array(
+				'id' => '1',
+				'name' => 'New name for Join A 1',
+				'updated' => $ts
+			),
+			'JoinB' => array(
+				array(
+					'id' => 1,
+					'join_b_id' => 2,
+					'other' => 'New data for Join A 1 Join B 2',
+					'created' => $ts,
+					'updated' => $ts
+			)),
+			'JoinC' => array(
+				array(
+					'id' => 1,
+					'join_c_id' => 2,
+					'other' => 'New data for Join A 1 Join C 2',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+
+		$TestModel->set($data);
+		$TestModel->save();
+
+		$result = $TestModel->findById(1);
+		$expected = array(
+			'JoinA' => array(
+				'id' => 1,
+				'name' => 'New name for Join A 1',
+				'body' => 'Join A 1 Body',
+				'created' => '2008-01-03 10:54:23',
+				'updated' => $ts
+			),
+			'JoinB' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join B 2',
+					'created' => '2008-01-03 10:55:02',
+					'updated' => '2008-01-03 10:55:02',
+					'JoinAsJoinB' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_b_id' => 2,
+						'other' => 'New data for Join A 1 Join B 2',
+						'created' => $ts,
+						'updated' => $ts
+			))),
+			'JoinC' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Join C 2',
+					'created' => '2008-01-03 10:56:12',
+					'updated' => '2008-01-03 10:56:12',
+					'JoinAsJoinC' => array(
+						'id' => 1,
+						'join_a_id' => 1,
+						'join_c_id' => 2,
+						'other' => 'New data for Join A 1 Join C 2',
+						'created' => $ts,
+						'updated' => $ts
+		))));
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveAll method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAll() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$result = $TestModel->find('all');
+		$this->assertEqual(count($result), 3);
+		$this->assertFalse(isset($result[3]));
+		$ts = date('Y-m-d H:i:s');
+
+		$TestModel->saveAll(array(
+			'Post' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author'
+			),
+			'Author' => array(
+				'user' => 'bob',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf90'
+		)));
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			'Post' => array(
+				'id' => '4',
+				'author_id' => '5',
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author',
+				'published' => 'N',
+				'created' => $ts,
+				'updated' => $ts
+			),
+			'Author' => array(
+				'id' => '5',
+				'user' => 'bob',
+				'password' => '5f4dcc3b5aa765d61d8327deb882cf90',
+				'created' => $ts,
+				'updated' => $ts,
+				'test' => 'working'
+		));
+		$this->assertEqual($result[3], $expected);
+		$this->assertEqual(count($result), 4);
+
+		$TestModel->deleteAll(true);
+		$this->assertEqual($TestModel->find('all'), array());
+
+		// SQLite seems to reset the PK counter when that happens, so we need this to make the tests pass
+		$this->db->truncate($TestModel);
+
+		$ts = date('Y-m-d H:i:s');
+		$TestModel->saveAll(array(
+			array(
+				'title' => 'Multi-record post 1',
+				'body' => 'First multi-record post',
+				'author_id' => 2
+			),
+			array(
+				'title' => 'Multi-record post 2',
+				'body' => 'Second multi-record post',
+				'author_id' => 2
+		)));
+
+		$result = $TestModel->find('all', array(
+			'recursive' => -1,
+			'order' => 'Post.id ASC'
+		));
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '2',
+					'title' => 'Multi-record post 1',
+					'body' => 'First multi-record post',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '2',
+					'title' => 'Multi-record post 2',
+					'body' => 'Second multi-record post',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel =& new Comment();
+		$ts = date('Y-m-d H:i:s');
+		$result = $TestModel->saveAll(array(
+			'Comment' => array(
+				'article_id' => 2,
+				'user_id' => 2,
+				'comment' => 'New comment with attachment',
+				'published' => 'Y'
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.tgz'
+			)));
+		$this->assertTrue($result);
+
+		$result = $TestModel->find('all');
+		$expected = array(
+			'id' => '7',
+			'article_id' => '2',
+			'user_id' => '2',
+			'comment' => 'New comment with attachment',
+			'published' => 'Y',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Comment'], $expected);
+
+		$expected = array(
+			'id' => '7',
+			'article_id' => '2',
+			'user_id' => '2',
+			'comment' => 'New comment with attachment',
+			'published' => 'Y',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Comment'], $expected);
+
+		$expected = array(
+			'id' => '2',
+			'comment_id' => '7',
+			'attachment' => 'some_file.tgz',
+			'created' => $ts,
+			'updated' => $ts
+		);
+		$this->assertEqual($result[6]['Attachment'], $expected);
+	}
+
+/**
+ * Test SaveAll with Habtm relations
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHabtm() {
+		$this->loadFixtures('Article', 'Tag', 'Comment', 'User');
+		$data = array(
+			'Article' => array(
+				'user_id' => 1,
+				'title' => 'Article Has and belongs to Many Tags'
+			),
+			'Tag' => array(
+				'Tag' => array(1, 2)
+			),
+			'Comment' => array(
+				array(
+					'comment' => 'Article comment',
+					'user_id' => 1
+		)));
+		$Article =& new Article();
+		$result = $Article->saveAll($data);
+		$this->assertTrue($result);
+
+		$result = $Article->read();
+		$this->assertEqual(count($result['Tag']), 2);
+		$this->assertEqual($result['Tag'][0]['tag'], 'tag1');
+		$this->assertEqual(count($result['Comment']), 1);
+		$this->assertEqual(count($result['Comment'][0]['comment']['Article comment']), 1);
+	}
+
+/**
+ * Test SaveAll with Habtm relations and extra join table fields
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHabtmWithExtraJoinTableFields() {
+		$this->loadFixtures('Something', 'SomethingElse', 'JoinThing');
+
+		$data = array(
+			'Something' => array(
+				'id' => 4,
+				'title' => 'Extra Fields',
+				'body' => 'Extra Fields Body',
+				'published' => '1'
+			),
+			'SomethingElse' => array(
+				array('something_else_id' => 1, 'doomed' => '1'),
+				array('something_else_id' => 2, 'doomed' => '0'),
+				array('something_else_id' => 3, 'doomed' => '1')
+			)
+		);
+
+		$Something =& new Something();
+		$result = $Something->saveAll($data);
+		$this->assertTrue($result);
+		$result = $Something->read();
+
+		$this->assertEqual(count($result['SomethingElse']), 3);
+		$this->assertTrue(Set::matches('/Something[id=4]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[something_else_id=1]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=1]/JoinThing[doomed=1]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[something_else_id=2]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=2]/JoinThing[doomed=0]', $result));
+
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[something_else_id=3]', $result));
+		$this->assertTrue(Set::matches('/SomethingElse[id=3]/JoinThing[doomed=1]', $result));
+	}
+
+/**
+ * testSaveAllHasOne method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasOne() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Attachment->deleteAll(true);
+		$this->assertEqual($model->Attachment->find('all'), array());
+
+		$this->assertTrue($model->saveAll(array(
+			'Comment' => array(
+				'comment' => 'Comment with attachment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.zip'
+		))));
+		$result = $model->find('all', array('fields' => array(
+			'Comment.id', 'Comment.comment', 'Attachment.id',
+			'Attachment.comment_id', 'Attachment.attachment'
+		)));
+		$expected = array(array(
+			'Comment' => array(
+				'id' => '1',
+				'comment' => 'Comment with attachment'
+			),
+			'Attachment' => array(
+				'id' => '1',
+				'comment_id' => '1',
+				'attachment' => 'some_file.zip'
+		)));
+		$this->assertEqual($result, $expected);
+
+
+		$model->Attachment->bindModel(array('belongsTo' => array('Comment')), false);
+		$data = array(
+			'Comment' => array(
+				'comment' => 'Comment with attachment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Attachment' => array(
+				'attachment' => 'some_file.zip'
+		));
+		$this->assertTrue($model->saveAll($data, array('validate' => 'first')));
+	}
+
+/**
+ * testSaveAllBelongsTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllBelongsTo() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Article->deleteAll(true);
+		$this->assertEqual($model->Article->find('all'), array());
+
+		$this->assertTrue($model->saveAll(array(
+			'Comment' => array(
+				'comment' => 'Article comment',
+				'article_id' => 1,
+				'user_id' => 1
+			),
+			'Article' => array(
+				'title' => 'Model Associations 101',
+				'user_id' => 1
+		))));
+		$result = $model->find('all', array('fields' => array(
+			'Comment.id', 'Comment.comment', 'Comment.article_id', 'Article.id', 'Article.title'
+		)));
+		$expected = array(array(
+			'Comment' => array(
+				'id' => '1',
+				'article_id' => '1',
+				'comment' => 'Article comment'
+			),
+			'Article' => array(
+				'id' => '1',
+				'title' => 'Model Associations 101'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveAllHasOneValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasOneValidation() {
+		$model = new Comment();
+		$model->deleteAll(true);
+		$this->assertEqual($model->find('all'), array());
+
+		$model->Attachment->deleteAll(true);
+		$this->assertEqual($model->Attachment->find('all'), array());
+
+		$model->validate = array('comment' => 'notEmpty');
+		$model->Attachment->validate = array('attachment' => 'notEmpty');
+		$model->Attachment->bindModel(array('belongsTo' => array('Comment')));
+
+		$this->assertFalse($model->saveAll(
+			array(
+				'Comment' => array(
+					'comment' => '',
+					'article_id' => 1,
+					'user_id' => 1
+				),
+				'Attachment' => array('attachment' => '')
+			),
+			array('validate' => 'first')
+		));
+		$expected = array(
+			'Comment' => array('comment' => 'This field cannot be left blank'),
+			'Attachment' => array('attachment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($model->validationErrors, $expected['Comment']);
+		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
+
+		$this->assertFalse($model->saveAll(
+			array(
+				'Comment' => array('comment' => '', 'article_id' => 1, 'user_id' => 1),
+				'Attachment' => array('attachment' => '')
+			),
+			array('validate' => 'only')
+		));
+		$this->assertEqual($model->validationErrors, $expected['Comment']);
+		$this->assertEqual($model->Attachment->validationErrors, $expected['Attachment']);
+	}
+
+/**
+ * testSaveAllAtomic method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllAtomic() {
+		$this->loadFixtures('Article', 'User');
+		$TestModel =& new Article();
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved with an author',
+				'user_id' => 2
+			),
+			'Comment' => array(
+				array('comment' => 'First new comment', 'user_id' => 2))
+		), array('atomic' => false));
+
+		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true)));
+
+		$result = $TestModel->saveAll(array(
+			array(
+				'id' => '1',
+				'title' => 'Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => 'Just update the title'
+			),
+			array(
+				'title' => 'Creating a fourth post',
+				'body' => 'Fourth post body',
+				'user_id' => 2
+			)
+		), array('atomic' => false));
+		$this->assertIdentical($result, array(true, true, true));
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$result = $TestModel->saveAll(array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+			)
+		), array('validate' => true, 'atomic' => false));
+
+		$this->assertIdentical($result, array(true, false));
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array(
+					'comment' => 'First new comment',
+					'published' => 'Y',
+					'user_id' => 1
+				),
+				array(
+					'comment' => 'Second new comment',
+					'published' => 'Y',
+					'user_id' => 2
+			))
+		), array('validate' => true, 'atomic' => false));
+		$this->assertIdentical($result, array('Article' => true, 'Comment' => array(true, true)));
+	}
+
+/**
+ * testSaveAllHasMany method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasMany() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array('comment' => 'First new comment', 'published' => 'Y', 'user_id' => 1),
+				array('comment' => 'Second new comment', 'published' => 'Y', 'user_id' => 2)
+			)
+		));
+		$this->assertTrue($result);
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'comment' => 'Third new comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('atomic' => false)
+		);
+		$this->assertTrue($result);
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment',
+			'Third new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+
+		$TestModel->beforeSaveReturn = false;
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'comment' => 'Fourth new comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('atomic' => false)
+		);
+		$this->assertEqual($result, array('Article' => false));
+
+		$result = $TestModel->findById(2);
+		$expected = array(
+			'First Comment for Second Article',
+			'Second Comment for Second Article',
+			'First new comment',
+			'Second new comment',
+			'Third new comment'
+		);
+		$this->assertEqual(Set::extract($result['Comment'], '{n}.comment'), $expected);
+	}
+
+/**
+ * testSaveAllHasManyValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasManyValidation() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array('comment' => '', 'published' => 'Y', 'user_id' => 1),
+			)
+		), array('validate' => true));
+		$expected = array('Comment' => array(false));
+		$this->assertEqual($result, $expected);
+
+		$expected = array('Comment' => array(
+			array('comment' => 'This field cannot be left blank')
+		));
+		$this->assertEqual($TestModel->validationErrors, $expected);
+		$expected = array(
+			array('comment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
+
+		$result = $TestModel->saveAll(array(
+			'Article' => array('id' => 2),
+			'Comment' => array(
+				array(
+					'comment' => '',
+					'published' => 'Y',
+					'user_id' => 1
+			))
+		), array('validate' => 'first'));
+		$this->assertFalse($result);
+	}
+
+/**
+ * test saveAll with transactions and ensure there is no missing rollback.
+ *
+ * @return void
+ */
+	function testSaveAllManyRowsTransactionNoRollback() {
+		$this->loadFixtures('Post');
+
+		Mock::generate('DboSource', 'MockTransactionDboSource');
+		$db = ConnectionManager::create('mock_transaction', array(
+			'datasource' => 'MockTransactionDbo',
+		));
+		$db->expectOnce('rollback');
+
+		$Post =& new Post();
+		$Post->useDbConfig = 'mock_transaction';
+
+		$Post->validate = array(
+			'title' => array('rule' => array('notEmpty'))
+		);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => '')
+		);
+		$Post->saveAll($data, array('atomic' => true));
+	}
+
+/**
+ * test saveAll with transactions and ensure there is no missing rollback.
+ *
+ * @return void
+ */
+	function testSaveAllAssociatedTransactionNoRollback() {
+		$testDb = ConnectionManager::getDataSource('test_suite');
+
+		Mock::generate('DboSource', 'MockTransactionAssociatedDboSource');
+		$db = ConnectionManager::create('mock_transaction_assoc', array(
+			'datasource' => 'MockTransactionAssociatedDbo',
+		));
+		$db->columns = $testDb->columns;
+
+		$db->expectOnce('rollback');
+
+		$Post =& new Post();
+		$Post->useDbConfig = 'mock_transaction_assoc';
+		$Post->Author->useDbConfig = 'mock_transaction_assoc';
+
+		$Post->Author->validate = array(
+			'user' => array('rule' => array('notEmpty'))
+		);
+
+		$data = array(
+			'Post' => array(
+				'title' => 'New post',
+				'body' => 'Content',
+				'published' => 'Y'
+			),
+			'Author' => array(
+				'user' => '',
+				'password' => "sekret"
+			)
+		);
+		$Post->saveAll($data);
+	}
+
+/**
+ * test saveAll with nested saveAll call.
+ *
+ * @return void
+ */
+	function testSaveAllNestedSaveAll() {
+		$this->loadFixtures('Sample');
+		$TransactionTestModel =& new TransactionTestModel();
+
+		$data = array(
+			array('apple_id' => 1, 'name' => 'sample5'),
+		);
+
+		$this->assertTrue($TransactionTestModel->saveAll($data, array('atomic' => true)));
+	}
+
+/**
+ * testSaveAllTransaction method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllTransaction() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$TestModel->validate = array('title' => 'notEmpty');
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post'),
+			array('author_id' => 1, 'title' => '')
+		);
+		$ts = date('Y-m-d H:i:s');
+		$this->assertFalse($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1));
+		$expected = array(
+			array('Post' => array(
+				'id' => '1',
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)),
+			array('Post' => array(
+				'id' => '2',
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			)),
+			array('Post' => array(
+				'id' => '3',
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		)));
+
+		if (count($result) != 3) {
+			// Database doesn't support transactions
+			$expected[] = array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => 1,
+					'title' => 'New Fourth Post',
+					'body' => null,
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$expected[] = array(
+				'Post' => array(
+					'id' => '5',
+					'author_id' => 1,
+					'title' => 'New Fifth Post',
+					'body' => null,
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$this->assertEqual($result, $expected);
+			// Skip the rest of the transactional tests
+			return;
+		}
+
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => ''),
+			array('author_id' => 1, 'title' => 'New Sixth Post')
+		);
+		$ts = date('Y-m-d H:i:s');
+		$this->assertFalse($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1));
+		$expected = array(
+			array('Post' => array(
+				'id' => '1',
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:39:23',
+				'updated' => '2007-03-18 10:41:31'
+			)),
+			array('Post' => array(
+				'id' => '2',
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:41:23',
+				'updated' => '2007-03-18 10:43:31'
+			)),
+			array('Post' => array(
+				'id' => '3',
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y',
+				'created' => '2007-03-18 10:43:23',
+				'updated' => '2007-03-18 10:45:31'
+		)));
+
+		if (count($result) != 3) {
+			// Database doesn't support transactions
+			$expected[] = array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => 1,
+					'title' => 'New Fourth Post',
+					'body' => 'Third Post Body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+
+			$expected[] = array(
+				'Post' => array(
+					'id' => '5',
+					'author_id' => 1,
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+			));
+		}
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array('title' => 'notEmpty');
+		$data = array(
+			array('author_id' => 1, 'title' => 'New Fourth Post'),
+			array('author_id' => 1, 'title' => 'New Fifth Post'),
+			array('author_id' => 1, 'title' => 'New Sixth Post')
+		);
+		$this->assertTrue($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array(
+			'recursive' => -1,
+			'fields' => array('author_id', 'title','body','published')
+		));
+
+		$expected = array(
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'First Post',
+				'body' => 'First Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 3,
+				'title' => 'Second Post',
+				'body' => 'Second Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'Third Post',
+				'body' => 'Third Post Body',
+				'published' => 'Y'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fourth Post',
+				'body' => '',
+				'published' => 'N'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Fifth Post',
+				'body' => '',
+				'published' => 'N'
+			)),
+			array('Post' => array(
+				'author_id' => 1,
+				'title' => 'New Sixth Post',
+				'body' => '',
+				'published' => 'N'
+		)));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSaveAllValidation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidation() {
+		$this->loadFixtures('Post', 'Author', 'Comment', 'Attachment');
+		$TestModel =& new Post();
+
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => 'Just update the title'
+			),
+			array(
+				'title' => 'Creating a fourth post',
+				'body' => 'Fourth post body',
+				'author_id' => 2
+		));
+
+		$this->assertTrue($TestModel->saveAll($data));
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$ts = date('Y-m-d H:i:s');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'Baleeted First Post',
+					'body' => 'Baleeted!',
+					'published' => 'N',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Just update the title',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23', 'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+			)),
+			array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => '2',
+					'title' => 'Creating a fourth post',
+					'body' => 'Fourth post body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$result = $TestModel->saveAll($data);
+		$this->assertEqual($result, false);
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$errors = array(1 => array('title' => 'This field cannot be left blank'));
+		$transactionWorked = Set::matches('/Post[1][title=Baleeted First Post]', $result);
+		if (!$transactionWorked) {
+			$this->assertTrue(Set::matches('/Post[1][title=Un-Baleeted First Post]', $result));
+			$this->assertTrue(Set::matches('/Post[2][title=Just update the title]', $result));
+		}
+
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$TestModel->validate = array('title' => 'notEmpty', 'author_id' => 'numeric');
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Un-Baleeted First Post',
+				'body' => 'Not Baleeted!',
+				'published' => 'Y'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$result = $TestModel->saveAll($data, array('validate' => true, 'atomic' => false));
+		$this->assertEqual($result, array(true, false));
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$errors = array(1 => array('title' => 'This field cannot be left blank'));
+		$newTs = date('Y-m-d H:i:s');
+		$expected = array(
+			array(
+				'Post' => array(
+					'id' => '1',
+					'author_id' => '1',
+					'title' => 'Un-Baleeted First Post',
+					'body' => 'Not Baleeted!',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:39:23',
+					'updated' => $newTs
+			)),
+			array(
+				'Post' => array(
+					'id' => '2',
+					'author_id' => '3',
+					'title' => 'Just update the title',
+					'body' => 'Second Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:41:23',
+					'updated' => $ts
+			)),
+			array(
+				'Post' => array(
+					'id' => '3',
+					'author_id' => '1',
+					'title' => 'Third Post',
+					'body' => 'Third Post Body',
+					'published' => 'Y',
+					'created' => '2007-03-18 10:43:23',
+					'updated' => '2007-03-18 10:45:31'
+			)),
+			array(
+				'Post' => array(
+					'id' => '4',
+					'author_id' => '2',
+					'title' => 'Creating a fourth post',
+					'body' => 'Fourth post body',
+					'published' => 'N',
+					'created' => $ts,
+					'updated' => $ts
+		)));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$data = array(
+			array(
+				'id' => '1',
+				'title' => 'Re-Baleeted First Post',
+				'body' => 'Baleeted!',
+				'published' => 'N'
+			),
+			array(
+				'id' => '2',
+				'title' => '',
+				'body' => 'Trying to get away with an empty title'
+		));
+		$this->assertFalse($TestModel->saveAll($data, array('validate' => 'first')));
+
+		$result = $TestModel->find('all', array('recursive' => -1, 'order' => 'Post.id ASC'));
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($TestModel->validationErrors, $errors);
+
+		$data = array(
+			array(
+				'title' => 'First new post',
+				'body' => 'Woohoo!',
+				'published' => 'Y'
+			),
+			array(
+				'title' => 'Empty body',
+				'body' => ''
+		));
+
+		$TestModel->validate['body'] = 'notEmpty';
+	}
+
+/**
+ * testSaveAllValidationOnly method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidationOnly() {
+		$TestModel =& new Comment();
+		$TestModel->Attachment->validate = array('attachment' => 'notEmpty');
+
+		$data = array(
+			'Comment' => array(
+				'comment' => 'This is the comment'
+			),
+			'Attachment' => array(
+				'attachment' => ''
+			)
+		);
+
+		$result = $TestModel->saveAll($data, array('validate' => 'only'));
+		$this->assertFalse($result);
+
+		$TestModel =& new Article();
+		$TestModel->validate = array('title' => 'notEmpty');
+		$result = $TestModel->saveAll(
+			array(
+				0 => array('title' => ''),
+				1 => array('title' => 'title 1'),
+				2 => array('title' => 'title 2'),
+			),
+			array('validate'=>'only')
+		);
+		$this->assertFalse($result);
+		$expected = array(
+			0 => array('title' => 'This field cannot be left blank'),
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+
+		$result = $TestModel->saveAll(
+			array(
+				0 => array('title' => 'title 0'),
+				1 => array('title' => ''),
+				2 => array('title' => 'title 2'),
+			),
+			array('validate'=>'only')
+		);
+		$this->assertFalse($result);
+		$expected = array(
+			1 => array('title' => 'This field cannot be left blank'),
+		);
+		$this->assertEqual($TestModel->validationErrors, $expected);
+	}
+
+/**
+ * testSaveAllValidateFirst method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllValidateFirst() {
+		$model =& new Article();
+		$model->deleteAll(true);
+
+		$model->Comment->validate = array('comment' => 'notEmpty');
+		$result = $model->saveAll(array(
+			'Article' => array(
+				'title' => 'Post with Author',
+				'body' => 'This post will be saved  author'
+			),
+			'Comment' => array(
+				array('comment' => 'First new comment'),
+				array('comment' => '')
+			)
+		), array('validate' => 'first'));
+
+		$this->assertFalse($result);
+
+		$result = $model->find('all');
+		$this->assertEqual($result, array());
+		$expected = array('Comment' => array(
+			1 => array('comment' => 'This field cannot be left blank')
+		));
+
+		$this->assertEqual($model->Comment->validationErrors, $expected['Comment']);
+
+		$this->assertIdentical($model->Comment->find('count'), 0);
+
+		$result = $model->saveAll(
+			array(
+				'Article' => array(
+					'title' => 'Post with Author',
+					'body' => 'This post will be saved with an author',
+					'user_id' => 2
+				),
+				'Comment' => array(
+					array(
+						'comment' => 'Only new comment',
+						'user_id' => 2
+			))),
+			array('validate' => 'first')
+		);
+
+		$this->assertIdentical($result, true);
+
+		$result = $model->Comment->find('all');
+		$this->assertIdentical(count($result), 1);
+		$result = Set::extract('/Comment/article_id', $result);
+		$this->assertTrue($result[0] === 1 || $result[0] === '1');
+
+
+		$model->deleteAll(true);
+		$data = array(
+			'Article' => array(
+				'title' => 'Post with Author saveAlled from comment',
+				'body' => 'This post will be saved with an author',
+				'user_id' => 2
+			),
+			'Comment' => array(
+				'comment' => 'Only new comment', 'user_id' => 2
+		));
+
+		$result = $model->Comment->saveAll($data, array('validate' => 'first'));
+		$this->assertTrue($result);
+
+		$result = $model->find('all');
+		$this->assertEqual(
+			$result[0]['Article']['title'],
+			'Post with Author saveAlled from comment'
+		);
+		$this->assertEqual($result[0]['Comment'][0]['comment'], 'Only new comment');
+	}
+
+/**
+ * test saveAll()'s return is correct when using atomic = false and validate = first.
+ *
+ * @return void
+ */
+	function testSaveAllValidateFirstAtomicFalse() {
+		$Something =& new Something();
+		$invalidData = array(
+			array(
+				'title' => 'foo',
+				'body' => 'bar',
+				'published' => 'baz',
+			),
+			array(
+				'body' => 3,
+				'published' =>'sd',
+			),
+		);
+		$Something->create();
+		$Something->validate = array(
+			'title' => array(
+				'rule' => 'alphaNumeric',
+				'required' => true,
+			),
+			'body' => array(
+				'rule' => 'alphaNumeric',
+				'required' => true,
+				'allowEmpty' => true,
+			),
+		);
+		$result = $Something->saveAll($invalidData, array(
+			'atomic' => false,
+			'validate' => 'first',
+		));
+		$expected = array(true, false);
+		$this->assertEqual($result, $expected);
+
+		$Something =& new Something();
+		$validData = array(
+			array(
+				'title' => 'title value',
+				'body' => 'body value',
+				'published' => 'baz',
+			),
+			array(
+				'title' => 'valid',
+				'body' => 'this body',
+				'published' =>'sd',
+			),
+		);
+		$Something->create();
+		$result = $Something->saveAll($validData, array(
+			'atomic' => false,
+			'validate' => 'first',
+		));
+		$expected = array(true, true);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUpdateWithCalculation method
+ *
+ * @access public
+ * @return void
+ */
+	function testUpdateWithCalculation() {
+		$this->loadFixtures('DataTest');
+		$model =& new DataTest();
+		$model->deleteAll(true);
+		$result = $model->saveAll(array(
+			array('count' => 5, 'float' => 1.1),
+			array('count' => 3, 'float' => 1.2),
+			array('count' => 4, 'float' => 1.3),
+			array('count' => 1, 'float' => 2.0),
+		));
+		$this->assertTrue($result);
+
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(5, 3, 4, 1));
+
+		$this->assertTrue($model->updateAll(array('count' => 'count + 2')));
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(7, 5, 6, 3));
+
+		$this->assertTrue($model->updateAll(array('DataTest.count' => 'DataTest.count - 1')));
+		$result = Set::extract('/DataTest/count', $model->find('all', array('fields' => 'count')));
+		$this->assertEqual($result, array(6, 4, 5, 2));
+	}
+
+/**
+ * testSaveAllHasManyValidationOnly method
+ *
+ * @access public
+ * @return void
+ */
+	function testSaveAllHasManyValidationOnly() {
+		$this->loadFixtures('Article', 'Comment');
+		$TestModel =& new Article();
+		$TestModel->belongsTo = $TestModel->hasAndBelongsToMany = array();
+		$TestModel->Comment->validate = array('comment' => 'notEmpty');
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1),
+					array(
+						'id' => 2,
+						'comment' =>
+						'comment',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array('validate' => 'only')
+		);
+		$this->assertFalse($result);
+
+		$result = $TestModel->saveAll(
+			array(
+				'Article' => array('id' => 2),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1
+					),
+					array(
+						'id' => 2,
+						'comment' => 'comment',
+						'published' => 'Y',
+						'user_id' => 1
+					),
+					array(
+						'id' => 3,
+						'comment' => '',
+						'published' => 'Y',
+						'user_id' => 1
+			))),
+			array(
+				'validate' => 'only',
+				'atomic' => false
+		));
+		$expected = array(
+			'Article' => true,
+			'Comment' => array(false, true, false)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('Comment' => array(
+			0 => array('comment' => 'This field cannot be left blank'),
+			2 => array('comment' => 'This field cannot be left blank')
+		));
+		$this->assertEqual($TestModel->validationErrors, $expected);
+
+		$expected = array(
+			0 => array('comment' => 'This field cannot be left blank'),
+			2 => array('comment' => 'This field cannot be left blank')
+		);
+		$this->assertEqual($TestModel->Comment->validationErrors, $expected);
+	}
+
+/**
+ * TestFindAllWithoutForeignKey
+ *
+ * @link http://code.cakephp.org/tickets/view/69
+ * @access public
+ * @return void
+ */
+	function testFindAllForeignKey() {
+		$this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll');
+		$ProductUpdateAll =& new ProductUpdateAll();
+
+		$conditions = array('Group.name' => 'group one');
+
+		$ProductUpdateAll->bindModel(array(
+			'belongsTo' => array(
+				'Group' => array('className' => 'GroupUpdateAll')
+			)
+		));
+
+		$ProductUpdateAll->belongsTo = array(
+			'Group' => array('className' => 'GroupUpdateAll', 'foreignKey' => 'group_id')
+		);
+
+		$results = $ProductUpdateAll->find('all', compact('conditions'));
+		$this->assertTrue(!empty($results));
+
+		$ProductUpdateAll->bindModel(array('belongsTo'=>array('Group')));
+		$ProductUpdateAll->belongsTo = array(
+			'Group' => array(
+				'className' => 'GroupUpdateAll',
+				'foreignKey' => false,
+				'conditions' => 'ProductUpdateAll.groupcode = Group.code'
+			));
+
+		$resultsFkFalse = $ProductUpdateAll->find('all', compact('conditions'));
+		$this->assertTrue(!empty($resultsFkFalse));
+		$expected = array(
+			'0' => array(
+				'ProductUpdateAll' => array(
+					'id'  => 1,
+					'name'	=> 'product one',
+					'groupcode'	 => 120,
+					'group_id'	=> 1),
+				'Group' => array(
+					'id' => 1,
+					'name' => 'group one',
+					'code' => 120)
+				),
+			'1' => array(
+				'ProductUpdateAll' => array(
+					'id'  => 2,
+					'name'	=> 'product two',
+					'groupcode'	 => 120,
+					'group_id'	=> 1),
+				'Group' => array(
+					'id' => 1,
+					'name' => 'group one',
+					'code' => 120)
+				)
+
+			);
+		$this->assertEqual($results, $expected);
+		$this->assertEqual($resultsFkFalse, $expected);
+	}
+
+/**
+ * test updateAll with empty values.
+ *
+ * @return void
+ */
+	function testUpdateAllEmptyValues() {
+		$this->loadFixtures('Author', 'Post');
+		$model = new Author();
+		$result = $model->updateAll(array('user' => '""'));
+		$this->assertTrue($result);
+	}
+
+/**
+ * testUpdateAllWithJoins
+ *
+ * @link http://code.cakephp.org/tickets/view/69
+ * @access public
+ * @return void
+ */
+	function testUpdateAllWithJoins() {
+		$this->skipIf(
+			$this->db->config['driver'] == 'postgres',
+			'%s Currently, there is no way of doing joins in an update statement in postgresql'
+		);
+		$this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll');
+		$ProductUpdateAll =& new ProductUpdateAll();
+
+		$conditions = array('Group.name' => 'group one');
+
+		$ProductUpdateAll->bindModel(array('belongsTo' => array(
+			'Group' => array('className' => 'GroupUpdateAll')))
+		);
+
+		$ProductUpdateAll->updateAll(array('name' => "'new product'"), $conditions);
+		$results = $ProductUpdateAll->find('all', array(
+			'conditions' => array('ProductUpdateAll.name' => 'new product')
+		));
+		$expected = array(
+			'0' => array(
+				'ProductUpdateAll' => array(
+					'id'  => 1,
+					'name'	=> 'new product',
+					'groupcode'	 => 120,
+					'group_id'	=> 1),
+				'Group' => array(
+					'id' => 1,
+					'name' => 'group one',
+					'code' => 120)
+				),
+			'1' => array(
+				'ProductUpdateAll' => array(
+					'id'  => 2,
+					'name'	=> 'new product',
+					'groupcode'	 => 120,
+					'group_id'	=> 1),
+				'Group' => array(
+					'id' => 1,
+					'name' => 'group one',
+					'code' => 120)));
+
+		$this->assertEqual($results, $expected);
+	}
+
+/**
+ * testUpdateAllWithoutForeignKey
+ *
+ * @link http://code.cakephp.org/tickets/view/69
+ * @access public
+ * @return void
+ */
+    function testUpdateAllWithoutForeignKey() {
+		$this->skipIf(
+			$this->db->config['driver'] == 'postgres',
+			'%s Currently, there is no way of doing joins in an update statement in postgresql'
+		);
+		$this->loadFixtures('ProductUpdateAll', 'GroupUpdateAll');
+		$ProductUpdateAll =& new ProductUpdateAll();
+
+		$conditions = array('Group.name' => 'group one');
+
+        $ProductUpdateAll->bindModel(array('belongsTo' => array(
+			'Group' => array('className' => 'GroupUpdateAll')
+		)));
+
+        $ProductUpdateAll->belongsTo = array(
+            'Group' => array(
+				'className' => 'GroupUpdateAll',
+				'foreignKey' => false,
+				'conditions' => 'ProductUpdateAll.groupcode = Group.code'
+			)
+		);
+
+		$ProductUpdateAll->updateAll(array('name' => "'new product'"), $conditions);
+		$resultsFkFalse = $ProductUpdateAll->find('all', array('conditions' => array('ProductUpdateAll.name'=>'new product')));
+		$expected = array(
+			'0' => array(
+				'ProductUpdateAll' => array(
+					'id'  => 1,
+					'name'	=> 'new product',
+					'groupcode'	 => 120,
+					'group_id'	=> 1),
+				'Group' => array(
+					'id' => 1,
+					'name' => 'group one',
+					'code' => 120)
+				),
+			'1' => array(
+				'ProductUpdateAll' => array(
+					'id'  => 2,
+					'name'	=> 'new product',
+					'groupcode'	 => 120,
+					'group_id'	=> 1),
+				'Group' => array(
+					'id' => 1,
+					'name' => 'group one',
+					'code' => 120)));
+		$this->assertEqual($resultsFkFalse, $expected);
+	}
+
+/**
+ * test that saveAll behaves like plain save() when suplied empty data
+ *
+ * @link http://cakephp.lighthouseapp.com/projects/42648/tickets/277-test-saveall-with-validation-returns-incorrect-boolean-when-saving-empty-data
+ * @access public
+ * @return void
+ */
+	function testSaveAllEmptyData() {
+		$this->loadFixtures('Article', 'ProductUpdateAll');
+		$model =& new Article();
+		$result = $model->saveAll(array(), array('validate' => 'first'));
+		$this->assertTrue($result);
+
+		$model =& new ProductUpdateAll();
+		$result = $model->saveAll(array());
+		$this->assertFalse($result);
+	}
+
+/**
+ * test writing floats in german locale.
+ *
+ * @return void
+ */
+	function testWriteFloatAsGerman() {
+		$restore = setlocale(LC_ALL, null);
+		setlocale(LC_ALL, 'de_DE');
+
+		$model = new DataTest();
+		$result = $model->save(array(
+			'count' => 1,
+			'float' => 3.14593
+		));
+		$this->assertTrue($result);
+		setlocale(LC_ALL, $restore);
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/models.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/models.php
new file mode 100644
index 000000000..febb073cc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/model/models.php
@@ -0,0 +1,3594 @@
+<?php
+/**
+ * Mock models file
+ *
+ * Mock classes for use in Model and related test cases
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ * @since         CakePHP(tm) v 1.2.0.6464
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+
+/**
+ * Test class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Test extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'Test'
+ * @access public
+ */
+	var $name = 'Test';
+
+/**
+ * schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id'=> array('type' => 'integer', 'null' => '', 'default' => '1', 'length' => '8', 'key'=>'primary'),
+		'name'=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'email'=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'notes'=> array('type' => 'text', 'null' => '1', 'default' => 'write some notes here', 'length' => ''),
+		'created'=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+}
+
+/**
+ * TestAlias class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TestAlias extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'TestAlias'
+ * @access public
+ */
+	var $name = 'TestAlias';
+
+/**
+ * alias property
+ *
+ * @var string 'TestAlias'
+ * @access public
+ */
+	var $alias = 'TestAlias';
+
+/**
+ * schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id'=> array('type' => 'integer', 'null' => '', 'default' => '1', 'length' => '8', 'key'=>'primary'),
+		'name'=> array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'email'=> array('type' => 'string', 'null' => '1', 'default' => '', 'length' => '155'),
+		'notes'=> array('type' => 'text', 'null' => '1', 'default' => 'write some notes here', 'length' => ''),
+		'created'=> array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated'=> array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+}
+
+/**
+ * TestValidate class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TestValidate extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'TestValidate'
+ * @access public
+ */
+	var $name = 'TestValidate';
+
+/**
+ * schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'title' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'body' => array('type' => 'string', 'null' => '1', 'default' => '', 'length' => ''),
+		'number' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'modified' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+
+/**
+ * validateNumber method
+ *
+ * @param mixed $value
+ * @param mixed $options
+ * @access public
+ * @return void
+ */
+	function validateNumber($value, $options) {
+		$options = array_merge(array('min' => 0, 'max' => 100), $options);
+		$valid = ($value['number'] >= $options['min'] && $value['number'] <= $options['max']);
+		return $valid;
+	}
+
+/**
+ * validateTitle method
+ *
+ * @param mixed $value
+ * @access public
+ * @return void
+ */
+	function validateTitle($value) {
+		return (!empty($value) && strpos(low($value['title']), 'title-') === 0);
+	}
+}
+
+/**
+ * User class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class User extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'User'
+ * @access public
+ */
+	var $name = 'User';
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('user' => 'notEmpty', 'password' => 'notEmpty');
+}
+
+/**
+ * Article class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Article extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Article'
+ * @access public
+ */
+	var $name = 'Article';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('User');
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Comment' => array('dependent' => true));
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Tag');
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('user_id' => 'numeric', 'title' => array('allowEmpty' => false, 'rule' => 'notEmpty'), 'body' => 'notEmpty');
+
+/**
+ * beforeSaveReturn property
+ *
+ * @var bool true
+ * @access public
+ */
+	var $beforeSaveReturn = true;
+
+/**
+ * beforeSave method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeSave() {
+		return $this->beforeSaveReturn;
+	}
+
+/**
+ * titleDuplicate method
+ *
+ * @param mixed $title
+ * @access public
+ * @return void
+ */
+	function titleDuplicate ($title) {
+		if ($title === 'My Article Title') {
+			return false;
+		}
+		return true;
+	}
+}
+
+/**
+ * Model stub for beforeDelete testing
+ *
+ * @see #250
+ * @package cake.tests
+ */
+class BeforeDeleteComment extends CakeTestModel {
+	var $name = 'BeforeDeleteComment';
+
+	var $useTable = 'comments';
+
+	function beforeDelete($cascade = true) {
+		$db =& $this->getDataSource();
+		$db->delete($this, array($this->alias . '.' . $this->primaryKey => array(1, 3)));
+		return true;
+	}
+}
+
+/**
+ * NumericArticle class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class NumericArticle extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'NumericArticle'
+ * @access public
+ */
+	var $name = 'NumericArticle';
+
+/**
+ * useTable property
+ *
+ * @var string 'numeric_articles'
+ * @access public
+ */
+	var $useTable = 'numeric_articles';
+}
+
+/**
+ * Article10 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Article10 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Article10'
+ * @access public
+ */
+	var $name = 'Article10';
+
+/**
+ * useTable property
+ *
+ * @var string 'articles'
+ * @access public
+ */
+	var $useTable = 'articles';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Comment' => array('dependent' => true, 'exclusive' => true));
+}
+
+/**
+ * ArticleFeatured class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ArticleFeatured extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ArticleFeatured'
+ * @access public
+ */
+	var $name = 'ArticleFeatured';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('User', 'Category');
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('Featured');
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Comment' => array('className' => 'Comment', 'dependent' => true));
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Tag');
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('user_id' => 'numeric', 'title' => 'notEmpty', 'body' => 'notEmpty');
+}
+
+/**
+ * Featured class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Featured extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Featured'
+ * @access public
+ */
+	var $name = 'Featured';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('ArticleFeatured', 'Category');
+}
+
+/**
+ * Tag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Tag extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Tag'
+ * @access public
+ */
+	var $name = 'Tag';
+}
+
+/**
+ * ArticlesTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ArticlesTag extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ArticlesTag'
+ * @access public
+ */
+	var $name = 'ArticlesTag';
+}
+
+/**
+ * ArticleFeaturedsTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ArticleFeaturedsTag extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ArticleFeaturedsTag'
+ * @access public
+ */
+	var $name = 'ArticleFeaturedsTag';
+}
+
+/**
+ * Comment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Comment extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Comment'
+ * @access public
+ */
+	var $name = 'Comment';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Article', 'User');
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('Attachment' => array('dependent' => true));
+}
+
+/**
+ * Modified Comment Class has afterFind Callback
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ModifiedComment extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Comment'
+ * @access public
+ */
+	var $name = 'Comment';
+
+/**
+ * useTable property
+ *
+ * @var string 'comments'
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Article');
+
+/**
+ * afterFind callback
+ *
+ * @return void
+ */
+	function afterFind($results) {
+		if (isset($results[0])) {
+			$results[0]['Comment']['callback'] = 'Fire';
+		}
+		return $results;
+	}
+}
+
+/**
+ * Modified Comment Class has afterFind Callback
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class AgainModifiedComment extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Comment'
+ * @access public
+ */
+	var $name = 'Comment';
+
+/**
+ * useTable property
+ *
+ * @var string 'comments'
+ * @access public
+ */
+	var $useTable = 'comments';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Article');
+
+/**
+ * afterFind callback
+ *
+ * @return void
+ */
+	function afterFind($results) {
+		if (isset($results[0])) {
+			$results[0]['Comment']['querytype'] = $this->findQueryType;
+		}
+		return $results;
+	}
+}
+
+/**
+ * MergeVarPluginAppModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MergeVarPluginAppModel extends AppModel {
+
+/**
+ * actsAs parameter
+ *
+ * @var array
+ */
+	var $actsAs = array(
+		'Containable'
+	);
+}
+
+/**
+ * MergeVarPluginPost class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MergeVarPluginPost extends MergeVarPluginAppModel {
+
+/**
+ * actsAs parameter
+ *
+ * @var array
+ */
+	var $actsAs = array(
+		'Tree'
+	);
+
+/**
+ * useTable parameter
+ *
+ * @var string
+ */
+	var $useTable = 'posts';
+}
+
+/**
+ * MergeVarPluginComment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MergeVarPluginComment extends MergeVarPluginAppModel {
+
+/**
+ * actsAs parameter
+ *
+ * @var array
+ */
+	var $actsAs = array(
+		'Containable' => array('some_settings')
+	);
+
+/**
+ * useTable parameter
+ *
+ * @var string
+ */
+	var $useTable = 'comments';
+}
+
+
+/**
+ * Attachment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Attachment extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Attachment'
+ * @access public
+ */
+	var $name = 'Attachment';
+}
+
+/**
+ * Category class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Category extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Category'
+ * @access public
+ */
+	var $name = 'Category';
+}
+
+/**
+ * CategoryThread class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class CategoryThread extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'CategoryThread'
+ * @access public
+ */
+	var $name = 'CategoryThread';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('ParentCategory' => array('className' => 'CategoryThread', 'foreignKey' => 'parent_id'));
+}
+
+/**
+ * Apple class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Apple extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Apple'
+ * @access public
+ */
+	var $name = 'Apple';
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('name' => 'notEmpty');
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('Sample');
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Child' => array('className' => 'Apple', 'dependent' => true));
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Parent' => array('className' => 'Apple', 'foreignKey' => 'apple_id'));
+}
+
+/**
+ * Sample class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Sample extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Sample'
+ * @access public
+ */
+	var $name = 'Sample';
+
+/**
+ * belongsTo property
+ *
+ * @var string 'Apple'
+ * @access public
+ */
+	var $belongsTo = 'Apple';
+}
+
+/**
+ * AnotherArticle class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class AnotherArticle extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'AnotherArticle'
+ * @access public
+ */
+	var $name = 'AnotherArticle';
+
+/**
+ * hasMany property
+ *
+ * @var string 'Home'
+ * @access public
+ */
+	var $hasMany = 'Home';
+}
+
+/**
+ * Advertisement class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Advertisement extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Advertisement'
+ * @access public
+ */
+	var $name = 'Advertisement';
+
+/**
+ * hasMany property
+ *
+ * @var string 'Home'
+ * @access public
+ */
+	var $hasMany = 'Home';
+}
+
+/**
+ * Home class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Home extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Home'
+ * @access public
+ */
+	var $name = 'Home';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('AnotherArticle', 'Advertisement');
+}
+
+/**
+ * Post class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Post extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Post'
+ * @access public
+ */
+	var $name = 'Post';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Author');
+
+	function beforeFind($queryData) {
+		if (isset($queryData['connection'])) {
+			$this->useDbConfig = $queryData['connection'];
+		}
+		return true;
+	}
+
+	function afterFind($results) {
+		$this->useDbConfig = 'test_suite';
+		return $results;
+	}
+}
+
+/**
+ * Author class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Author extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Author'
+ * @access public
+ */
+	var $name = 'Author';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Post');
+
+/**
+ * afterFind method
+ *
+ * @param mixed $results
+ * @access public
+ * @return void
+ */
+	function afterFind($results) {
+		$results[0]['Author']['test'] = 'working';
+		return $results;
+	}
+}
+
+/**
+ * ModifiedAuthor class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ModifiedAuthor extends Author {
+
+/**
+ * name property
+ *
+ * @var string 'Author'
+ * @access public
+ */
+	var $name = 'Author';
+
+/**
+ * afterFind method
+ *
+ * @param mixed $results
+ * @access public
+ * @return void
+ */
+	function afterFind($results) {
+		foreach($results as $index => $result) {
+			$results[$index]['Author']['user'] .= ' (CakePHP)';
+		}
+		return $results;
+	}
+}
+
+/**
+ * Project class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Project extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Project'
+ * @access public
+ */
+	var $name = 'Project';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Thread');
+}
+
+/**
+ * Thread class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Thread extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Thread'
+ * @access public
+ */
+	var $name = 'Thread';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Project');
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Message');
+}
+
+/**
+ * Message class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Message extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Message'
+ * @access public
+ */
+	var $name = 'Message';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('Bid');
+}
+
+/**
+ * Bid class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Bid extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Bid'
+ * @access public
+ */
+	var $name = 'Bid';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Message');
+}
+
+/**
+ * NodeAfterFind class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class NodeAfterFind extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'NodeAfterFind'
+ * @access public
+ */
+	var $name = 'NodeAfterFind';
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('name' => 'notEmpty');
+
+/**
+ * useTable property
+ *
+ * @var string 'apples'
+ * @access public
+ */
+	var $useTable = 'apples';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('Sample' => array('className' => 'NodeAfterFindSample'));
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Child' => array('className' => 'NodeAfterFind', 'dependent' => true));
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Parent' => array('className' => 'NodeAfterFind', 'foreignKey' => 'apple_id'));
+
+/**
+ * afterFind method
+ *
+ * @param mixed $results
+ * @access public
+ * @return void
+ */
+	function afterFind($results) {
+		return $results;
+	}
+}
+
+/**
+ * NodeAfterFindSample class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class NodeAfterFindSample extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'NodeAfterFindSample'
+ * @access public
+ */
+	var $name = 'NodeAfterFindSample';
+
+/**
+ * useTable property
+ *
+ * @var string 'samples'
+ * @access public
+ */
+	var $useTable = 'samples';
+
+/**
+ * belongsTo property
+ *
+ * @var string 'NodeAfterFind'
+ * @access public
+ */
+	var $belongsTo = 'NodeAfterFind';
+}
+
+/**
+ * NodeNoAfterFind class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class NodeNoAfterFind extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'NodeAfterFind'
+ * @access public
+ */
+	var $name = 'NodeAfterFind';
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('name' => 'notEmpty');
+
+/**
+ * useTable property
+ *
+ * @var string 'apples'
+ * @access public
+ */
+	var $useTable = 'apples';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('Sample' => array('className' => 'NodeAfterFindSample'));
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Child' => array('className' => 'NodeAfterFind', 'dependent' => true));
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Parent' => array('className' => 'NodeAfterFind', 'foreignKey' => 'apple_id'));
+}
+
+/**
+ * Node class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Node extends CakeTestModel{
+
+/**
+ * name property
+ *
+ * @var string 'Node'
+ * @access public
+ */
+	var $name = 'Node';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array(
+		'ParentNode' => array(
+			'className' => 'Node',
+			'joinTable' => 'dependency',
+			'with' => 'Dependency',
+			'foreignKey' => 'child_id',
+			'associationForeignKey' => 'parent_id',
+		)
+	);
+}
+
+/**
+ * Dependency class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Dependency extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Dependency'
+ * @access public
+ */
+	var $name = 'Dependency';
+}
+
+/**
+ * ModelA class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ModelA extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ModelA'
+ * @access public
+ */
+	var $name = 'ModelA';
+
+/**
+ * useTable property
+ *
+ * @var string 'apples'
+ * @access public
+ */
+	var $useTable = 'apples';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('ModelB', 'ModelC');
+}
+
+/**
+ * ModelB class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ModelB extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ModelB'
+ * @access public
+ */
+	var $name = 'ModelB';
+
+/**
+ * useTable property
+ *
+ * @var string 'messages'
+ * @access public
+ */
+	var $useTable = 'messages';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('ModelD');
+}
+
+/**
+ * ModelC class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ModelC extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ModelC'
+ * @access public
+ */
+	var $name = 'ModelC';
+
+/**
+ * useTable property
+ *
+ * @var string 'bids'
+ * @access public
+ */
+	var $useTable = 'bids';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('ModelD');
+}
+
+/**
+ * ModelD class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ModelD extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ModelD'
+ * @access public
+ */
+	var $name = 'ModelD';
+
+/**
+ * useTable property
+ *
+ * @var string 'threads'
+ * @access public
+ */
+	var $useTable = 'threads';
+}
+
+/**
+ * Something class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Something extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Something'
+ * @access public
+ */
+	var $name = 'Something';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('SomethingElse' => array('with' => array('JoinThing' => array('doomed'))));
+}
+
+/**
+ * SomethingElse class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SomethingElse extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SomethingElse'
+ * @access public
+ */
+	var $name = 'SomethingElse';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Something' => array('with' => 'JoinThing'));
+}
+
+/**
+ * JoinThing class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class JoinThing extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'JoinThing'
+ * @access public
+ */
+	var $name = 'JoinThing';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Something', 'SomethingElse');
+}
+
+/**
+ * Portfolio class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Portfolio extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Portfolio'
+ * @access public
+ */
+	var $name = 'Portfolio';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Item');
+}
+
+/**
+ * Item class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Item extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Item'
+ * @access public
+ */
+	var $name = 'Item';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Syfile' => array('counterCache' => true));
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Portfolio' => array('unique' => false));
+}
+
+/**
+ * ItemsPortfolio class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ItemsPortfolio extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ItemsPortfolio'
+ * @access public
+ */
+	var $name = 'ItemsPortfolio';
+}
+
+/**
+ * Syfile class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Syfile extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Syfile'
+ * @access public
+ */
+	var $name = 'Syfile';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Image');
+}
+
+/**
+ * Image class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Image extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Image'
+ * @access public
+ */
+	var $name = 'Image';
+}
+
+/**
+ * DeviceType class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class DeviceType extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'DeviceType'
+ * @access public
+ */
+	var $name = 'DeviceType';
+
+/**
+ * order property
+ *
+ * @var array
+ * @access public
+ */
+	var $order = array('DeviceType.order' => 'ASC');
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'DeviceTypeCategory', 'FeatureSet', 'ExteriorTypeCategory',
+		'Image' => array('className' => 'Document'),
+		'Extra1' => array('className' => 'Document'),
+		'Extra2' => array('className' => 'Document'));
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Device' => array('order' => array('Device.id' => 'ASC')));
+}
+
+/**
+ * DeviceTypeCategory class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class DeviceTypeCategory extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'DeviceTypeCategory'
+ * @access public
+ */
+	var $name = 'DeviceTypeCategory';
+}
+
+/**
+ * FeatureSet class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class FeatureSet extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'FeatureSet'
+ * @access public
+ */
+	var $name = 'FeatureSet';
+}
+
+/**
+ * ExteriorTypeCategory class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ExteriorTypeCategory extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ExteriorTypeCategory'
+ * @access public
+ */
+	var $name = 'ExteriorTypeCategory';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Image' => array('className' => 'Device'));
+}
+
+/**
+ * Document class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Document extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Document'
+ * @access public
+ */
+	var $name = 'Document';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('DocumentDirectory');
+}
+
+/**
+ * Device class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Device extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Device'
+ * @access public
+ */
+	var $name = 'Device';
+}
+
+/**
+ * DocumentDirectory class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class DocumentDirectory extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'DocumentDirectory'
+ * @access public
+ */
+	var $name = 'DocumentDirectory';
+}
+
+/**
+ * PrimaryModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class PrimaryModel extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'PrimaryModel'
+ * @access public
+ */
+	var $name = 'PrimaryModel';
+}
+
+/**
+ * SecondaryModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class SecondaryModel extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SecondaryModel'
+ * @access public
+ */
+	var $name = 'SecondaryModel';
+}
+
+/**
+ * JoinA class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class JoinA extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'JoinA'
+ * @access public
+ */
+	var $name = 'JoinA';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('JoinB', 'JoinC');
+}
+
+/**
+ * JoinB class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class JoinB extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'JoinB'
+ * @access public
+ */
+	var $name = 'JoinB';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('JoinA');
+}
+
+/**
+ * JoinC class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class JoinC extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'JoinC'
+ * @access public
+ */
+	var $name = 'JoinC';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('JoinA');
+}
+
+/**
+ * ThePaper class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ThePaper extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ThePaper'
+ * @access public
+ */
+	var $name = 'ThePaper';
+
+/**
+ * useTable property
+ *
+ * @var string 'apples'
+ * @access public
+ */
+	var $useTable = 'apples';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('Itself' => array('className' => 'ThePaper', 'foreignKey' => 'apple_id'));
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Monkey' => array('joinTable' => 'the_paper_monkies', 'order' => 'id'));
+}
+
+/**
+ * Monkey class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Monkey extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Monkey'
+ * @access public
+ */
+	var $name = 'Monkey';
+
+/**
+ * useTable property
+ *
+ * @var string 'devices'
+ * @access public
+ */
+	var $useTable = 'devices';
+}
+
+/**
+ * AssociationTest1 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class AssociationTest1 extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var string 'join_as'
+ * @access public
+ */
+	var $useTable = 'join_as';
+
+/**
+ * name property
+ *
+ * @var string 'AssociationTest1'
+ * @access public
+ */
+	var $name = 'AssociationTest1';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('AssociationTest2' => array(
+		'unique' => false, 'joinTable' => 'join_as_join_bs', 'foreignKey' => false
+	));
+}
+
+/**
+ * AssociationTest2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class AssociationTest2 extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var string 'join_bs'
+ * @access public
+ */
+	var $useTable = 'join_bs';
+
+/**
+ * name property
+ *
+ * @var string 'AssociationTest2'
+ * @access public
+ */
+	var $name = 'AssociationTest2';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('AssociationTest1' => array(
+		'unique' => false, 'joinTable' => 'join_as_join_bs'
+	));
+}
+
+/**
+ * Callback class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Callback extends CakeTestModel {
+
+}
+/**
+ * CallbackPostTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class CallbackPostTestModel extends CakeTestModel {
+	var $useTable = 'posts';
+/**
+ * variable to control return of beforeValidate
+ *
+ * @var string
+ */
+	var $beforeValidateReturn = true;
+/**
+ * variable to control return of beforeSave
+ *
+ * @var string
+ */
+	var $beforeSaveReturn = true;
+/**
+ * variable to control return of beforeDelete
+ *
+ * @var string
+ */
+	var $beforeDeleteReturn = true;
+/**
+ * beforeSave callback
+ *
+ * @return void
+ */
+	function beforeSave($options) {
+		return $this->beforeSaveReturn;
+	}
+/**
+ * beforeValidate callback
+ *
+ * @return void
+ */
+	function beforeValidate($options) {
+		return $this->beforeValidateReturn;
+	}
+/**
+ * beforeDelete callback
+ *
+ * @return void
+ */
+	function beforeDelete($cascade = true) {
+		return $this->beforeDeleteReturn;
+	}
+}
+
+/**
+ * Uuid class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Uuid extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Uuid'
+ * @access public
+ */
+	var $name = 'Uuid';
+}
+
+/**
+ * DataTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class DataTest extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'DataTest'
+ * @access public
+ */
+	var $name = 'DataTest';
+}
+
+/**
+ * TheVoid class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TheVoid extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TheVoid'
+ * @access public
+ */
+	var $name = 'TheVoid';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+}
+
+/**
+ * ValidationTest1 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ValidationTest1 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ValidationTest'
+ * @access public
+ */
+	var $name = 'ValidationTest1';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array();
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array(
+		'title' => 'notEmpty',
+		'published' => 'customValidationMethod',
+		'body' => array(
+			'notEmpty',
+			'/^.{5,}$/s' => 'no matchy',
+			'/^[0-9A-Za-z \\.]{1,}$/s'
+		)
+	);
+
+/**
+ * customValidationMethod method
+ *
+ * @param mixed $data
+ * @access public
+ * @return void
+ */
+	function customValidationMethod($data) {
+		return $data === 1;
+	}
+
+/**
+ * Custom validator with parameters + default values
+ *
+ * @access public
+ * @return array
+ */
+	function customValidatorWithParams($data, $validator, $or = true, $ignore_on_same = 'id') {
+		$this->validatorParams = get_defined_vars();
+		unset($this->validatorParams['this']);
+		return true;
+	}
+
+/**
+ * Custom validator with messaage
+ *
+ * @access public
+ * @return array
+ */
+	function customValidatorWithMessage($data) {
+		return 'This field will *never* validate! Muhahaha!';
+	}
+/**
+ * Test validation with many parameters
+ *
+ * @return void
+ */
+	function customValidatorWithSixParams($data, $one = 1, $two = 2, $three = 3, $four = 4, $five = 5, $six = 6) {
+		$this->validatorParams = get_defined_vars();
+		unset($this->validatorParams['this']);
+		return true;
+	}
+}
+
+/**
+ * ValidationTest2 class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ValidationTest2 extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ValidationTest2'
+ * @access public
+ */
+	var $name = 'ValidationTest2';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array(
+		'title' => 'notEmpty',
+		'published' => 'customValidationMethod',
+		'body' => array(
+			'notEmpty',
+			'/^.{5,}$/s' => 'no matchy',
+			'/^[0-9A-Za-z \\.]{1,}$/s'
+		)
+	);
+
+/**
+ * customValidationMethod method
+ *
+ * @param mixed $data
+ * @access public
+ * @return void
+ */
+	function customValidationMethod($data) {
+		return $data === 1;
+	}
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		return array();
+	}
+}
+
+/**
+ * Person class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Person extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Person'
+ * @access public
+ */
+	var $name = 'Person';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+			'Mother' => array(
+				'className' => 'Person',
+				'foreignKey' => 'mother_id'),
+			'Father' => array(
+				'className' => 'Person',
+				'foreignKey' => 'father_id'));
+}
+
+/**
+ * UnderscoreField class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class UnderscoreField extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'UnderscoreField'
+ * @access public
+ */
+	var $name = 'UnderscoreField';
+}
+
+/**
+ * Product class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Product extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Product'
+ * @access public
+ */
+	var $name = 'Product';
+}
+
+/**
+ * Story class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Story extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Story'
+ * @access public
+ */
+	var $name = 'Story';
+
+/**
+ * primaryKey property
+ *
+ * @var string 'story'
+ * @access public
+ */
+	var $primaryKey = 'story';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Tag' => array('foreignKey' => 'story'));
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('title' => 'notEmpty');
+}
+
+/**
+ * Cd class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Cd extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Cd'
+ * @access public
+ */
+	var $name = 'Cd';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('OverallFavorite' => array('foreignKey' => 'model_id', 'dependent' => true, 'conditions' => array('model_type' => 'Cd')));
+}
+
+/**
+ * Book class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Book extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Book'
+ * @access public
+ */
+	var $name = 'Book';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('OverallFavorite' => array('foreignKey' => 'model_id', 'dependent' => true, 'conditions' => 'OverallFavorite.model_type = \'Book\''));
+}
+
+/**
+ * OverallFavorite class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class OverallFavorite extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'OverallFavorite'
+ * @access public
+ */
+	var $name = 'OverallFavorite';
+}
+
+/**
+ * MyUser class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MyUser extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'MyUser'
+ * @access public
+ */
+	var $name = 'MyUser';
+
+/**
+ * undocumented variable
+ *
+ * @var string
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('MyCategory');
+}
+
+/**
+ * MyCategory class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MyCategory extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'MyCategory'
+ * @access public
+ */
+	var $name = 'MyCategory';
+
+/**
+ * undocumented variable
+ *
+ * @var string
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('MyProduct', 'MyUser');
+}
+
+/**
+ * MyProduct class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MyProduct extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'MyProduct'
+ * @access public
+ */
+	var $name = 'MyProduct';
+
+/**
+ * undocumented variable
+ *
+ * @var string
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('MyCategory');
+}
+
+/**
+ * MyCategoriesMyUser class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MyCategoriesMyUser extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'MyCategoriesMyUser'
+ * @access public
+ */
+	var $name = 'MyCategoriesMyUser';
+}
+
+/**
+ * MyCategoriesMyProduct class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class MyCategoriesMyProduct extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'MyCategoriesMyProduct'
+ * @access public
+ */
+	var $name = 'MyCategoriesMyProduct';
+}
+
+/**
+ * I18nModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class I18nModel extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'I18nModel'
+ * @access public
+ */
+	var $name = 'I18nModel';
+
+/**
+ * useTable property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $useTable = 'i18n';
+
+/**
+ * displayField property
+ *
+ * @var string 'field'
+ * @access public
+ */
+	var $displayField = 'field';
+}
+
+/**
+ * NumberTree class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class NumberTree extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'NumberTree'
+ * @access public
+ */
+	var $name = 'NumberTree';
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Tree');
+
+/**
+ * initialize method
+ *
+ * @param int $levelLimit
+ * @param int $childLimit
+ * @param mixed $currentLevel
+ * @param mixed $parent_id
+ * @param string $prefix
+ * @param bool $hierachial
+ * @access public
+ * @return void
+ */
+	function initialize($levelLimit = 3, $childLimit = 3, $currentLevel = null, $parent_id = null, $prefix = '1', $hierachial = true) {
+		if (!$parent_id) {
+			$db =& ConnectionManager::getDataSource($this->useDbConfig);
+			$db->truncate($this->table);
+			$this->save(array($this->name => array('name' => '1. Root')));
+			$this->initialize($levelLimit, $childLimit, 1, $this->id, '1', $hierachial);
+			$this->create(array());
+		}
+
+		if (!$currentLevel || $currentLevel > $levelLimit) {
+			return;
+		}
+
+		for ($i = 1; $i <= $childLimit; $i++) {
+			$name = $prefix . '.' . $i;
+			$data = array($this->name => array('name' => $name));
+			$this->create($data);
+
+			if ($hierachial) {
+				if ($this->name == 'UnconventionalTree') {
+					$data[$this->name]['join'] = $parent_id;
+				} else {
+					$data[$this->name]['parent_id'] = $parent_id;
+				}
+			}
+			$this->save($data);
+			$this->initialize($levelLimit, $childLimit, $currentLevel + 1, $this->id, $name, $hierachial);
+		}
+	}
+}
+
+/**
+ * NumberTreeTwo class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class NumberTreeTwo extends NumberTree {
+
+/**
+ * name property
+ *
+ * @var string 'NumberTree'
+ * @access public
+ */
+	var $name = 'NumberTreeTwo';
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array();
+}
+
+/**
+ * FlagTree class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class FlagTree extends NumberTree {
+
+/**
+ * name property
+ *
+ * @var string 'FlagTree'
+ * @access public
+ */
+	var $name = 'FlagTree';
+}
+
+/**
+ * UnconventionalTree class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class UnconventionalTree extends NumberTree {
+
+/**
+ * name property
+ *
+ * @var string 'FlagTree'
+ * @access public
+ */
+	var $name = 'UnconventionalTree';
+	var $actsAs = array(
+		'Tree' => array(
+			'parent' => 'join',
+			'left'  => 'left',
+			'right' => 'right'
+		)
+	);
+}
+
+/**
+ * UuidTree class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class UuidTree extends NumberTree {
+
+/**
+ * name property
+ *
+ * @var string 'FlagTree'
+ * @access public
+ */
+	var $name = 'UuidTree';
+}
+
+/**
+ * Campaign class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Campaign extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Campaign'
+ * @access public
+ */
+	var $name = 'Campaign';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array('Ad' => array('fields' => array('id','campaign_id','name')));
+}
+
+/**
+ * Ad class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Ad extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Ad'
+ * @access public
+ */
+	var $name = 'Ad';
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Tree');
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('Campaign');
+}
+
+/**
+ * AfterTree class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class AfterTree extends NumberTree {
+
+/**
+ * name property
+ *
+ * @var string 'AfterTree'
+ * @access public
+ */
+	var $name = 'AfterTree';
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Tree');
+
+	function afterSave($created) {
+		if ($created && isset($this->data['AfterTree'])) {
+			$this->data['AfterTree']['name'] = 'Six and One Half Changed in AfterTree::afterSave() but not in database';
+		}
+	}
+}
+
+/**
+ * Nonconformant Content class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Content extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Content'
+ * @access public
+ */
+	var $name = 'Content';
+
+/**
+ * useTable property
+ *
+ * @var string 'Content'
+ * @access public
+ */
+	var $useTable = 'Content';
+
+/**
+ * primaryKey property
+ *
+ * @var string 'iContentId'
+ * @access public
+ */
+	var $primaryKey = 'iContentId';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Account' => array('className' => 'Account', 'with' => 'ContentAccount', 'joinTable' => 'ContentAccounts', 'foreignKey' => 'iContentId', 'associationForeignKey', 'iAccountId'));
+}
+
+/**
+ * Nonconformant Account class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Account extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Account'
+ * @access public
+ */
+	var $name = 'Account';
+
+/**
+ * useTable property
+ *
+ * @var string 'Account'
+ * @access public
+ */
+	var $useTable = 'Accounts';
+
+/**
+ * primaryKey property
+ *
+ * @var string 'iAccountId'
+ * @access public
+ */
+	var $primaryKey = 'iAccountId';
+}
+
+/**
+ * Nonconformant ContentAccount class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class ContentAccount extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Account'
+ * @access public
+ */
+	var $name = 'ContentAccount';
+
+/**
+ * useTable property
+ *
+ * @var string 'Account'
+ * @access public
+ */
+	var $useTable = 'ContentAccounts';
+
+/**
+ * primaryKey property
+ *
+ * @var string 'iAccountId'
+ * @access public
+ */
+	var $primaryKey = 'iContentAccountsId';
+}
+
+/**
+ * FilmFile class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class FilmFile extends CakeTestModel {
+	var $name = 'FilmFile';
+}
+
+/**
+ * Basket test model
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Basket extends CakeTestModel {
+	var $name = 'Basket';
+
+	var $belongsTo = array(
+		'FilmFile' => array(
+			'className' => 'FilmFile',
+			'foreignKey' => 'object_id',
+			'conditions' => "Basket.type = 'file'",
+			'fields' => '',
+			'order' => ''
+		)
+	);
+}
+
+/**
+ * TestPluginArticle class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TestPluginArticle extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestPluginArticle'
+ * @access public
+ */
+	var $name = 'TestPluginArticle';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('User');
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'TestPluginComment' => array(
+			'className' => 'TestPlugin.TestPluginComment',
+			'foreignKey' => 'article_id',
+			'dependent' => true
+		)
+	);
+}
+
+/**
+ * TestPluginComment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TestPluginComment extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TestPluginComment'
+ * @access public
+ */
+	var $name = 'TestPluginComment';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array(
+		'TestPluginArticle' => array(
+			'className' => 'TestPlugin.TestPluginArticle',
+			'foreignKey' => 'article_id',
+		),
+		'User'
+	);
+}
+
+/**
+ * Uuidportfolio class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Uuidportfolio extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Uuidportfolio'
+ * @access public
+ */
+	var $name = 'Uuidportfolio';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Uuiditem');
+}
+
+/**
+ * Uuiditem class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class Uuiditem extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Item'
+ * @access public
+ */
+	var $name = 'Uuiditem';
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('Uuidportfolio' => array('with' => 'UuiditemsUuidportfolioNumericid'));
+
+}
+
+/**
+ * UuiditemsPortfolio class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class UuiditemsUuidportfolio extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ItemsPortfolio'
+ * @access public
+ */
+	var $name = 'UuiditemsUuidportfolio';
+}
+
+/**
+ * UuiditemsPortfolioNumericid class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class UuiditemsUuidportfolioNumericid extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string
+ * @access public
+ */
+	var $name = 'UuiditemsUuidportfolioNumericid';
+}
+
+/**
+ * TranslateTestModel class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslateTestModel extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TranslateTestModel'
+ * @access public
+ */
+	var $name = 'TranslateTestModel';
+
+/**
+ * useTable property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $useTable = 'i18n';
+
+/**
+ * displayField property
+ *
+ * @var string 'field'
+ * @access public
+ */
+	var $displayField = 'field';
+}
+
+/**
+ * TranslateTestModel class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslateWithPrefix extends CakeTestModel {
+/**
+ * name property
+ *
+ * @var string 'TranslateTestModel'
+ * @access public
+ */
+	var $name = 'TranslateWithPrefix';
+/**
+ * tablePrefix property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $tablePrefix = 'i18n_';
+/**
+ * displayField property
+ *
+ * @var string 'field'
+ * @access public
+ */
+	var $displayField = 'field';
+}
+/**
+ * TranslatedItem class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslatedItem extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TranslatedItem'
+ * @access public
+ */
+	var $name = 'TranslatedItem';
+
+/**
+ * cacheQueries property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheQueries = false;
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Translate' => array('content', 'title'));
+
+/**
+ * translateModel property
+ *
+ * @var string 'TranslateTestModel'
+ * @access public
+ */
+	var $translateModel = 'TranslateTestModel';
+}
+
+/**
+ * TranslatedItem class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslatedItem2 extends CakeTestModel {
+/**
+ * name property
+ *
+ * @var string 'TranslatedItem'
+ * @access public
+ */
+	var $name = 'TranslatedItem';
+/**
+ * cacheQueries property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheQueries = false;
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Translate' => array('content', 'title'));
+/**
+ * translateModel property
+ *
+ * @var string 'TranslateTestModel'
+ * @access public
+ */
+	var $translateModel = 'TranslateWithPrefix';
+}
+/**
+ * TranslatedItemWithTable class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslatedItemWithTable extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TranslatedItemWithTable'
+ * @access public
+ */
+	var $name = 'TranslatedItemWithTable';
+
+/**
+ * useTable property
+ *
+ * @var string 'translated_items'
+ * @access public
+ */
+	var $useTable = 'translated_items';
+
+/**
+ * cacheQueries property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheQueries = false;
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Translate' => array('content', 'title'));
+
+/**
+ * translateModel property
+ *
+ * @var string 'TranslateTestModel'
+ * @access public
+ */
+	var $translateModel = 'TranslateTestModel';
+
+/**
+ * translateTable property
+ *
+ * @var string 'another_i18n'
+ * @access public
+ */
+	var $translateTable = 'another_i18n';
+}
+
+/**
+ * TranslateArticleModel class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslateArticleModel extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TranslateArticleModel'
+ * @access public
+ */
+	var $name = 'TranslateArticleModel';
+
+/**
+ * useTable property
+ *
+ * @var string 'article_i18n'
+ * @access public
+ */
+	var $useTable = 'article_i18n';
+
+/**
+ * displayField property
+ *
+ * @var string 'field'
+ * @access public
+ */
+	var $displayField = 'field';
+}
+
+/**
+ * TranslatedArticle class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.model
+ */
+class TranslatedArticle extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'TranslatedArticle'
+ * @access public
+ */
+	var $name = 'TranslatedArticle';
+
+/**
+ * cacheQueries property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $cacheQueries = false;
+
+/**
+ * actsAs property
+ *
+ * @var array
+ * @access public
+ */
+	var $actsAs = array('Translate' => array('title', 'body'));
+
+/**
+ * translateModel property
+ *
+ * @var string 'TranslateArticleModel'
+ * @access public
+ */
+	var $translateModel = 'TranslateArticleModel';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('User');
+}
+
+class CounterCacheUser extends CakeTestModel {
+	var $name = 'CounterCacheUser';
+	var $alias = 'User';
+
+	var $hasMany = array('Post' => array(
+		'className' => 'CounterCachePost',
+		'foreignKey' => 'user_id'
+	));
+}
+
+class CounterCachePost extends CakeTestModel {
+	var $name = 'CounterCachePost';
+	var $alias = 'Post';
+
+	var $belongsTo = array('User' => array(
+		'className' => 'CounterCacheUser',
+		'foreignKey' => 'user_id',
+		'counterCache' => true
+	));
+}
+
+class CounterCacheUserNonstandardPrimaryKey extends CakeTestModel {
+	var $name = 'CounterCacheUserNonstandardPrimaryKey';
+	var $alias = 'User';
+    var $primaryKey = 'uid';
+
+	var $hasMany = array('Post' => array(
+		'className' => 'CounterCachePostNonstandardPrimaryKey',
+		'foreignKey' => 'uid'
+	));
+}
+
+class CounterCachePostNonstandardPrimaryKey extends CakeTestModel {
+	var $name = 'CounterCachePostNonstandardPrimaryKey';
+	var $alias = 'Post';
+    var $primaryKey = 'pid';
+
+	var $belongsTo = array('User' => array(
+		'className' => 'CounterCacheUserNonstandardPrimaryKey',
+		'foreignKey' => 'uid',
+		'counterCache' => true
+	));
+}
+
+class ArticleB extends CakeTestModel {
+	var $name = 'ArticleB';
+	var $useTable = 'articles';
+	var $hasAndBelongsToMany = array(
+		'TagB' => array(
+			'className' => 'TagB',
+			'joinTable' => 'articles_tags',
+			'foreignKey' => 'article_id',
+			'associationForeignKey' => 'tag_id'
+		)
+	);
+}
+
+class TagB extends CakeTestModel {
+	var $name = 'TagB';
+	var $useTable = 'tags';
+	var $hasAndBelongsToMany = array(
+		'ArticleB' => array(
+			'className' => 'ArticleB',
+			'joinTable' => 'articles_tags',
+			'foreignKey' => 'tag_id',
+			'associationForeignKey' => 'article_id'
+		)
+	);
+}
+
+class Fruit extends CakeTestModel {
+	var $name = 'Fruit';
+	var $hasAndBelongsToMany = array(
+		'UuidTag' => array(
+			'className' => 'UuidTag',
+			'joinTable' => 'fruits_uuid_tags',
+			'foreignKey' => 'fruit_id',
+			'associationForeignKey' => 'uuid_tag_id',
+			'with' => 'FruitsUuidTag'
+		)
+	);
+}
+
+class FruitsUuidTag extends CakeTestModel {
+	var $name = 'FruitsUuidTag';
+	var $primaryKey = false;
+	var $belongsTo = array(
+		'UuidTag' => array(
+			'className' => 'UuidTag',
+			'foreignKey' => 'uuid_tag_id',
+		),
+		'Fruit' => array(
+			'className' => 'Fruit',
+			'foreignKey' => 'fruit_id',
+		)
+	);
+}
+
+class UuidTag extends CakeTestModel {
+	var $name = 'UuidTag';
+	var $hasAndBelongsToMany = array(
+		'Fruit' => array(
+			'className' => 'Fruit',
+			'joinTable' => 'fruits_uuid_tags',
+			'foreign_key' => 'uuid_tag_id',
+			'associationForeignKey' => 'fruit_id',
+			'with' => 'FruitsUuidTag'
+		)
+	);
+}
+
+class FruitNoWith extends CakeTestModel {
+	var $name = 'Fruit';
+	var $useTable = 'fruits';
+	var $hasAndBelongsToMany = array(
+		'UuidTag' => array(
+			'className' => 'UuidTagNoWith',
+			'joinTable' => 'fruits_uuid_tags',
+			'foreignKey' => 'fruit_id',
+			'associationForeignKey' => 'uuid_tag_id',
+		)
+	);
+}
+
+class UuidTagNoWith extends CakeTestModel {
+	var $name = 'UuidTag';
+	var $useTable = 'uuid_tags';
+	var $hasAndBelongsToMany = array(
+		'Fruit' => array(
+			'className' => 'FruitNoWith',
+			'joinTable' => 'fruits_uuid_tags',
+			'foreign_key' => 'uuid_tag_id',
+			'associationForeignKey' => 'fruit_id',
+		)
+	);
+}
+
+class ProductUpdateAll extends CakeTestModel {
+	var $name = 'ProductUpdateAll';
+	var $useTable = 'product_update_all';
+}
+
+class GroupUpdateAll extends CakeTestModel {
+	var $name = 'GroupUpdateAll';
+	var $useTable = 'group_update_all';
+}
+
+class TransactionTestModel extends CakeTestModel {
+	var $name = 'TransactionTestModel';
+	var $useTable = 'samples';
+
+	function afterSave($created) {
+		$data = array(
+			array('apple_id' => 1, 'name' => 'sample6'),
+		);
+		$this->saveAll($data, array('atomic' => true, 'callbacks' => false));
+	}
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/multibyte.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/multibyte.test.php
new file mode 100644
index 000000000..47149c708
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/multibyte.test.php
@@ -0,0 +1,9343 @@
+<?php
+/**
+ * MultibyteTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.6833
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Multibyte');
+
+/**
+ * MultibyteTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class MultibyteTest extends CakeTestCase {
+
+/**
+ * testUtf8 method
+ *
+ * @access public
+ * @return void
+ */
+	function testUtf8() {
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = Multibyte::utf8($string);
+		$expected = array(33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+								58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+								83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+								106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126);
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$result = Multibyte::utf8($string);
+		$expected = array(161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+								182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$result = Multibyte::utf8($string);
+		$expected = array(201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+								222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+								243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+								264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+								285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$result = Multibyte::utf8($string);
+		$expected = array(301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
+								322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342,
+								343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
+								364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
+								385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$result = Multibyte::utf8($string);
+		$expected = array(401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421,
+								422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442,
+								443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463,
+								464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484,
+								485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500);
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$result = Multibyte::utf8($string);
+		$expected = array(601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621,
+								622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642,
+								643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663,
+								664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684,
+								685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700);
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$result = Multibyte::utf8($string);
+		$expected = array(1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041,
+								1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051);
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$result = Multibyte::utf8($string);
+		$expected = array(1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069,
+								1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
+								1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100);
+		$this->assertEqual($result, $expected);
+
+		$string = 'Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿';
+		$result = Multibyte::utf8($string);
+		$expected = array(1401, 1402, 1403, 1404, 1405, 1406, 1407);
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$result = Multibyte::utf8($string);
+		$expected = array(1601, 1602, 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615);
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$result = Multibyte::utf8($string);
+		$expected = array(10032, 10033, 10034, 10035, 10036, 10037, 10038, 10039, 10040, 10041, 10042, 10043, 10044,
+								10045, 10046, 10047, 10048, 10049, 10050, 10051, 10052, 10053, 10054, 10055, 10056, 10057,
+								10058, 10059, 10060, 10061, 10062, 10063, 10064, 10065, 10066, 10067, 10068, 10069, 10070,
+								10071, 10072, 10073, 10074, 10075, 10076, 10077, 10078);
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$result = Multibyte::utf8($string);
+		$expected = array(11904, 11905, 11906, 11907, 11908, 11909, 11910, 11911, 11912, 11913, 11914, 11915, 11916, 11917, 11918, 11919,
+								11920, 11921, 11922, 11923, 11924, 11925, 11926, 11927, 11928, 11929, 11931, 11932, 11933, 11934, 11935, 11936,
+								11937, 11938, 11939, 11940, 11941, 11942, 11943, 11944, 11945, 11946, 11947, 11948, 11949, 11950, 11951, 11952,
+								11953, 11954, 11955, 11956, 11957, 11958, 11959, 11960, 11961, 11962, 11963, 11964, 11965, 11966, 11967, 11968,
+								11969, 11970, 11971, 11972, 11973, 11974, 11975, 11976, 11977, 11978, 11979, 11980, 11981, 11982, 11983, 11984,
+								11985, 11986, 11987, 11988, 11989, 11990, 11991, 11992, 11993, 11994, 11995, 11996, 11997, 11998, 11999, 12000);
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$result = Multibyte::utf8($string);
+		$expected = array(12101, 12102, 12103, 12104, 12105, 12106, 12107, 12108, 12109, 12110, 12111, 12112, 12113, 12114, 12115, 12116,
+								12117, 12118, 12119, 12120, 12121, 12122, 12123, 12124, 12125, 12126, 12127, 12128, 12129, 12130, 12131, 12132,
+								12133, 12134, 12135, 12136, 12137, 12138, 12139, 12140, 12141, 12142, 12143, 12144, 12145, 12146, 12147, 12148,
+								12149, 12150, 12151, 12152, 12153, 12154, 12155, 12156, 12157, 12158, 12159);
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$result = Multibyte::utf8($string);
+		$expected = array(45601, 45602, 45603, 45604, 45605, 45606, 45607, 45608, 45609, 45610, 45611, 45612, 45613, 45614, 45615, 45616,
+								45617, 45618, 45619, 45620, 45621, 45622, 45623, 45624, 45625, 45626, 45627, 45628, 45629, 45630, 45631, 45632,
+								45633, 45634, 45635, 45636, 45637, 45638, 45639, 45640, 45641, 45642, 45643, 45644, 45645, 45646, 45647, 45648,
+								45649, 45650, 45651, 45652, 45653, 45654, 45655, 45656, 45657, 45658, 45659, 45660, 45661, 45662, 45663, 45664,
+								45665, 45666, 45667, 45668, 45669, 45670, 45671, 45672, 45673, 45674, 45675, 45676, 45677, 45678, 45679, 45680,
+								45681, 45682, 45683, 45684, 45685, 45686, 45687, 45688, 45689, 45690, 45691, 45692, 45693, 45694, 45695, 45696,
+								45697, 45698, 45699, 45700);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$result = Multibyte::utf8($string);
+		$expected = array(65136, 65137, 65138, 65139, 65140, 65141, 65142, 65143, 65144, 65145, 65146, 65147, 65148, 65149, 65150, 65151,
+								65152, 65153, 65154, 65155, 65156, 65157, 65158, 65159, 65160, 65161, 65162, 65163, 65164, 65165, 65166, 65167,
+								65168, 65169, 65170, 65171, 65172, 65173, 65174, 65175, 65176, 65177, 65178, 65179, 65180, 65181, 65182, 65183,
+								65184, 65185, 65186, 65187, 65188, 65189, 65190, 65191, 65192, 65193, 65194, 65195, 65196, 65197, 65198, 65199,
+								65200);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$result = Multibyte::utf8($string);
+		$expected = array(65201, 65202, 65203, 65204, 65205, 65206, 65207, 65208, 65209, 65210, 65211, 65212, 65213, 65214, 65215, 65216,
+								65217, 65218, 65219, 65220, 65221, 65222, 65223, 65224, 65225, 65226, 65227, 65228, 65229, 65230, 65231, 65232,
+								65233, 65234, 65235, 65236, 65237, 65238, 65239, 65240, 65241, 65242, 65243, 65244, 65245, 65246, 65247, 65248,
+								65249, 65250, 65251, 65252, 65253, 65254, 65255, 65256, 65257, 65258, 65259, 65260, 65261, 65262, 65263, 65264,
+								65265, 65266, 65267, 65268, 65269, 65270, 65271, 65272, 65273, 65274, 65275, 65276);
+		$this->assertEqual($result, $expected);
+
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$result = Multibyte::utf8($string);
+		$expected = array(65345, 65346, 65347, 65348, 65349, 65350, 65351, 65352, 65353, 65354, 65355, 65356, 65357, 65358, 65359, 65360,
+								65361, 65362, 65363, 65364, 65365, 65366, 65367, 65368, 65369, 65370);
+		$this->assertEqual($result, $expected);
+
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$result = Multibyte::utf8($string);
+		$expected = array(65377, 65378, 65379, 65380, 65381, 65382, 65383, 65384, 65385, 65386, 65387, 65388, 65389, 65390, 65391, 65392,
+								65393, 65394, 65395, 65396, 65397, 65398, 65399, 65400);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$result = Multibyte::utf8($string);
+		$expected = array(65401, 65402, 65403, 65404, 65405, 65406, 65407, 65408, 65409, 65410, 65411, 65412, 65413, 65414, 65415, 65416,
+								65417, 65418, 65419, 65420, 65421, 65422, 65423, 65424, 65425, 65426, 65427, 65428, 65429, 65430, 65431, 65432,
+								65433, 65434, 65435, 65436, 65437, 65438);
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = Multibyte::utf8($string);
+		$expected = array(292, 275, 314, 316, 335, 44, 32, 372, 337, 345, 316, 271, 33);
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$result = Multibyte::utf8($string);
+		$expected = array(72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33);
+		$this->assertEqual($result, $expected);
+
+		$string = '¨';
+		$result = Multibyte::utf8($string);
+		$expected = array(168);
+		$this->assertEqual($result, $expected);
+
+		$string = '¿';
+		$result = Multibyte::utf8($string);
+		$expected = array(191);
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$result = Multibyte::utf8($string);
+		$expected = array(269, 105, 110, 105);
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$result = Multibyte::utf8($string);
+		$expected = array(109, 111, 263, 105);
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$result = Multibyte::utf8($string);
+		$expected = array(100, 114, 382, 97, 118, 110, 105);
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$result = Multibyte::utf8($string);
+		$expected = array(25226, 30334, 24230, 35774, 20026, 39318, 39029);
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = Multibyte::utf8($string);
+		$expected = array(19968, 20108, 19977, 21608, 27704, 40845);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ԀԂԄԆԈԊԌԎ�Ԓ';
+		$result = Multibyte::utf8($string);
+		$expected = array(1280, 1282, 1284, 1286, 1288, 1290, 1292, 1294, 1296, 1298);
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ô�ÔƒÔ…Ô‡Ô‰Ô‹Ô�Ô�Ô�Ô’';
+		$result = Multibyte::utf8($string);
+		$expected = array(1281, 1283, 1285, 1287, 1289, 1291, 1293, 1295, 1296, 1298);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�ՂՃՄՅՆՇՈՉՊՋՌ�Վ��ՑՒՓՔՕՖև';
+		$result = Multibyte::utf8($string);
+		$expected = array(1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346,
+								1347, 1348, 1349, 1350, 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 1364,
+								1365, 1366, 1415);
+		$this->assertEqual($result, $expected);
+
+		$string = 'Õ¡Õ¢Õ£Õ¤Õ¥Õ¦Õ§Õ¨Õ©ÕªÕ«Õ¬Õ­Õ®Õ¯Õ°Õ±Õ²Õ³Õ´ÕµÕ¶Õ·Õ¸Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿Ö€Ö�Ö‚ÖƒÖ„Ö…Ö†Ö‡';
+		$result = Multibyte::utf8($string);
+		$expected = array(1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394,
+								1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412,
+								1413, 1414, 1415);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$result = Multibyte::utf8($string);
+		$expected = array(4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271, 4272, 4273,
+								4274, 4275, 4276, 4277, 4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, 4290, 4291,
+								4292, 4293);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ḀḂḄḆḈḊḌḎ�ḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎ�ṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎ�ẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎ�ỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
+		$result = Multibyte::utf8($string);
+		$expected = array(7680, 7682, 7684, 7686, 7688, 7690, 7692, 7694, 7696, 7698, 7700, 7702, 7704, 7706, 7708, 7710, 7712, 7714,
+								7716, 7718, 7720, 7722, 7724, 7726, 7728, 7730, 7732, 7734, 7736, 7738, 7740, 7742, 7744, 7746, 7748, 7750,
+								7752, 7754, 7756, 7758, 7760, 7762, 7764, 7766, 7768, 7770, 7772, 7774, 7776, 7778, 7780, 7782, 7784, 7786,
+								7788, 7790, 7792, 7794, 7796, 7798, 7800, 7802, 7804, 7806, 7808, 7810, 7812, 7814, 7816, 7818, 7820, 7822,
+								7824, 7826, 7828, 7830, 7831, 7832, 7833, 7834,       7840, 7842, 7844, 7846, 7848, 7850, 7852, 7854, 7856,
+								7858, 7860, 7862, 7864, 7866, 7868, 7870, 7872, 7874, 7876, 7878, 7880, 7882, 7884, 7886, 7888, 7890, 7892,
+								7894, 7896, 7898, 7900, 7902, 7904, 7906, 7908, 7910, 7912, 7914, 7916, 7918, 7920, 7922, 7924, 7926,  7928);
+		$this->assertEqual($result, $expected);
+
+		$string = '�ḃḅḇḉḋ��ḑḓḕḗḙḛ�ḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿ�ṃṅṇṉṋ��ṑṓṕṗṙṛ�ṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿ�ẃẅẇẉẋ��ẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽế�ểễệỉị��ốồổỗộớ�ởỡợụủứừửữựỳỵỷỹ';
+		$result = Multibyte::utf8($string);
+		$expected = array(7681, 7683, 7685, 7687, 7689, 7691, 7693, 7695, 7697, 7699, 7701, 7703, 7705, 7707, 7709, 7711, 7713, 7715,
+									7717, 7719, 7721, 7723, 7725, 7727, 7729, 7731, 7733, 7735, 7737, 7739, 7741, 7743, 7745, 7747, 7749, 7751,
+									7753, 7755, 7757, 7759, 7761, 7763, 7765, 7767, 7769, 7771, 7773, 7775, 7777, 7779, 7781, 7783, 7785, 7787,
+									7789, 7791, 7793, 7795, 7797, 7799, 7801, 7803, 7805, 7807, 7809, 7811, 7813, 7815, 7817, 7819, 7821, 7823,
+									7825, 7827, 7829, 7830, 7831, 7832, 7833, 7834, 7841, 7843, 7845, 7847, 7849, 7851, 7853, 7855, 7857, 7859,
+									7861, 7863, 7865, 7867, 7869, 7871, 7873, 7875, 7877, 7879, 7881, 7883, 7885, 7887, 7889, 7891, 7893, 7895,
+									7897, 7899, 7901, 7903, 7905, 7907, 7909, 7911, 7913, 7915, 7917, 7919, 7921, 7923, 7925, 7927, 7929);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ΩKÅℲ';
+		$result = Multibyte::utf8($string);
+		$expected = array(8486, 8490, 8491, 8498);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ωkåⅎ';
+		$result = Multibyte::utf8($string);
+		$expected = array(969, 107, 229, 8526);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯↃ';
+		$result = Multibyte::utf8($string);
+		$expected = array(8544, 8545, 8546, 8547, 8548, 8549, 8550, 8551, 8552, 8553, 8554, 8555, 8556, 8557, 8558, 8559, 8579);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅺⅻⅼⅽⅾⅿↄ';
+		$result = Multibyte::utf8($string);
+		$expected = array(8560, 8561, 8562, 8563, 8564, 8565, 8566, 8567, 8568, 8569, 8570, 8571, 8572, 8573, 8574, 8575, 8580);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀ�ⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌ�Ⓨ�';
+		$result = Multibyte::utf8($string);
+		$expected = array(9398, 9399, 9400, 9401, 9402, 9403, 9404, 9405, 9406, 9407, 9408, 9409, 9410, 9411, 9412, 9413, 9414,
+								9415, 9416, 9417, 9418, 9419, 9420, 9421, 9422, 9423);
+		$this->assertEqual($result, $expected);
+
+		$string = '�ⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜ�ⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ';
+		$result = Multibyte::utf8($string);
+		$expected = array(9424, 9425, 9426, 9427, 9428, 9429, 9430, 9431, 9432, 9433, 9434, 9435, 9436, 9437, 9438, 9439, 9440, 9441,
+								9442, 9443, 9444, 9445, 9446, 9447, 9448, 9449);
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ⰰ�ⰂⰃⰄⰅⰆⰇⰈⰉⰊⰋⰌ�Ⰾ��ⰑⰒⰓⰔⰕⰖⰗⰘⰙⰚⰛⰜ�ⰞⰟⰠⰡⰢⰣⰤⰥⰦⰧⰨⰩⰪⰫⰬⰭⰮ';
+		$result = Multibyte::utf8($string);
+		$expected = array(11264, 11265, 11266, 11267, 11268, 11269, 11270, 11271, 11272, 11273, 11274, 11275, 11276, 11277, 11278,
+								11279, 11280, 11281, 11282, 11283, 11284, 11285, 11286, 11287, 11288, 11289, 11290, 11291, 11292, 11293,
+								11294, 11295, 11296, 11297, 11298, 11299, 11300, 11301, 11302, 11303, 11304, 11305, 11306, 11307, 11308,
+								11309, 11310);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⰰⰱⰲⰳⰴⰵⰶⰷⰸⰹⰺⰻⰼⰽⰾⰿⱀ�ⱂⱃⱄⱅⱆⱇⱈⱉⱊⱋⱌ�ⱎ��ⱑⱒⱓⱔⱕⱖⱗⱘⱙⱚⱛⱜ�ⱞ';
+		$result = Multibyte::utf8($string);
+		$expected = array(11312, 11313, 11314, 11315, 11316, 11317, 11318, 11319, 11320, 11321, 11322, 11323, 11324, 11325, 11326, 11327,
+								11328, 11329, 11330, 11331, 11332, 11333, 11334, 11335, 11336, 11337, 11338, 11339, 11340, 11341, 11342, 11343,
+								11344, 11345, 11346, 11347, 11348, 11349, 11350, 11351, 11352, 11353, 11354, 11355, 11356, 11357, 11358);
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⲀⲂⲄⲆⲈⲊⲌⲎ�ⲒⲔⲖⲘⲚⲜⲞⲠⲢⲤⲦⲨⲪⲬⲮⲰⲲⲴⲶⲸⲺⲼⲾⳀⳂⳄⳆⳈⳊⳌⳎ�ⳒⳔⳖⳘⳚⳜⳞⳠⳢ';
+		$result = Multibyte::utf8($string);
+		$expected = array(11392, 11394, 11396, 11398, 11400, 11402, 11404, 11406, 11408, 11410, 11412, 11414, 11416, 11418, 11420,
+									11422, 11424, 11426, 11428, 11430, 11432, 11434, 11436, 11438, 11440, 11442, 11444, 11446, 11448, 11450,
+									11452, 11454, 11456, 11458, 11460, 11462, 11464, 11466, 11468, 11470, 11472, 11474, 11476, 11478, 11480,
+									11482, 11484, 11486, 11488, 11490);
+		$this->assertEqual($result, $expected);
+
+		$string = '�ⲃⲅⲇⲉⲋ��ⲑⲓⲕⲗⲙⲛ�ⲟⲡⲣⲥⲧⲩⲫⲭⲯⲱⲳⲵⲷⲹⲻⲽⲿ�ⳃⳅⳇⳉⳋ��ⳑⳓⳕⳗⳙⳛ�ⳟⳡⳣ';
+		$result = Multibyte::utf8($string);
+		$expected = array(11393, 11395, 11397, 11399, 11401, 11403, 11405, 11407, 11409, 11411, 11413, 11415, 11417, 11419, 11421, 11423,
+								11425, 11427, 11429, 11431, 11433, 11435, 11437, 11439, 11441, 11443, 11445, 11447, 11449, 11451, 11453, 11455,
+								11457, 11459, 11461, 11463, 11465, 11467, 11469, 11471, 11473, 11475, 11477, 11479, 11481, 11483, 11485, 11487,
+								11489, 11491);
+		$this->assertEqual($result, $expected);
+
+
+		$string = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$result = Multibyte::utf8($string);
+		$expected = array(64256, 64257, 64258, 64259, 64260, 64261, 64262, 64275, 64276, 64277, 64278, 64279);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testAscii method
+ *
+ * @access public
+ * @return void
+ */
+	function testAscii() {
+		$utf8 = array(33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57,
+							58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+							83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105,
+							106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126);
+		$result = Multibyte::ascii($utf8);
+
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, 180, 181,
+								182, 183, 184, 185, 186, 187, 188, 189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200);
+		$result = Multibyte::ascii($utf8);
+
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(201, 202, 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, 217, 218, 219, 220, 221,
+								222, 223, 224, 225, 226, 227, 228, 229, 230, 231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242,
+								243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, 255, 256, 257, 258, 259, 260, 261, 262, 263,
+								264, 265, 266, 267, 268, 269, 270, 271, 272, 273, 274, 275, 276, 277, 278, 279, 280, 281, 282, 283, 284,
+								285, 286, 287, 288, 289, 290, 291, 292, 293, 294, 295, 296, 297, 298, 299, 300);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321,
+								322, 323, 324, 325, 326, 327, 328, 329, 330, 331, 332, 333, 334, 335, 336, 337, 338, 339, 340, 341, 342,
+								343, 344, 345, 346, 347, 348, 349, 350, 351, 352, 353, 354, 355, 356, 357, 358, 359, 360, 361, 362, 363,
+								364, 365, 366, 367, 368, 369, 370, 371, 372, 373, 374, 375, 376, 377, 378, 379, 380, 381, 382, 383, 384,
+								385, 386, 387, 388, 389, 390, 391, 392, 393, 394, 395, 396, 397, 398, 399, 400);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(401, 402, 403, 404, 405, 406, 407, 408, 409, 410, 411, 412, 413, 414, 415, 416, 417, 418, 419, 420, 421,
+								422, 423, 424, 425, 426, 427, 428, 429, 430, 431, 432, 433, 434, 435, 436, 437, 438, 439, 440, 441, 442,
+								443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 457, 458, 459, 460, 461, 462, 463,
+								464, 465, 466, 467, 468, 469, 470, 471, 472, 473, 474, 475, 476, 477, 478, 479, 480, 481, 482, 483, 484,
+								485, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 496, 497, 498, 499, 500);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(601, 602, 603, 604, 605, 606, 607, 608, 609, 610, 611, 612, 613, 614, 615, 616, 617, 618, 619, 620, 621,
+								622, 623, 624, 625, 626, 627, 628, 629, 630, 631, 632, 633, 634, 635, 636, 637, 638, 639, 640, 641, 642,
+								643, 644, 645, 646, 647, 648, 649, 650, 651, 652, 653, 654, 655, 656, 657, 658, 659, 660, 661, 662, 663,
+								664, 665, 666, 667, 668, 669, 670, 671, 672, 673, 674, 675, 676, 677, 678, 679, 680, 681, 682, 683, 684,
+								685, 686, 687, 688, 689, 690, 691, 692, 693, 694, 695, 696, 697, 698, 699, 700);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1024, 1025, 1026, 1027, 1028, 1029, 1030, 1031, 1032, 1033, 1034, 1035, 1036, 1037, 1038, 1039, 1040, 1041,
+								1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1051);
+		$expected = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066, 1067, 1068, 1069,
+								1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1079, 1080, 1081, 1082, 1083, 1084, 1085, 1086, 1087,
+								1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097, 1098, 1099, 1100);
+		$expected = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1401, 1402, 1403, 1404, 1405, 1406, 1407);
+		$expected = 'Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1601, 1602, 1603, 1604, 1605, 1606, 1607, 1608, 1609, 1610, 1611, 1612, 1613, 1614, 1615);
+		$expected = '�قكلمنهوىيًٌ�َ�';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(10032, 10033, 10034, 10035, 10036, 10037, 10038, 10039, 10040, 10041, 10042, 10043, 10044,
+								10045, 10046, 10047, 10048, 10049, 10050, 10051, 10052, 10053, 10054, 10055, 10056, 10057,
+								10058, 10059, 10060, 10061, 10062, 10063, 10064, 10065, 10066, 10067, 10068, 10069, 10070,
+								10071, 10072, 10073, 10074, 10075, 10076, 10077, 10078);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(11904, 11905, 11906, 11907, 11908, 11909, 11910, 11911, 11912, 11913, 11914, 11915, 11916, 11917, 11918, 11919,
+								11920, 11921, 11922, 11923, 11924, 11925, 11926, 11927, 11928, 11929, 11931, 11932, 11933, 11934, 11935, 11936,
+								11937, 11938, 11939, 11940, 11941, 11942, 11943, 11944, 11945, 11946, 11947, 11948, 11949, 11950, 11951, 11952,
+								11953, 11954, 11955, 11956, 11957, 11958, 11959, 11960, 11961, 11962, 11963, 11964, 11965, 11966, 11967, 11968,
+								11969, 11970, 11971, 11972, 11973, 11974, 11975, 11976, 11977, 11978, 11979, 11980, 11981, 11982, 11983, 11984,
+								11985, 11986, 11987, 11988, 11989, 11990, 11991, 11992, 11993, 11994, 11995, 11996, 11997, 11998, 11999, 12000);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(12101, 12102, 12103, 12104, 12105, 12106, 12107, 12108, 12109, 12110, 12111, 12112, 12113, 12114, 12115, 12116,
+								12117, 12118, 12119, 12120, 12121, 12122, 12123, 12124, 12125, 12126, 12127, 12128, 12129, 12130, 12131, 12132,
+								12133, 12134, 12135, 12136, 12137, 12138, 12139, 12140, 12141, 12142, 12143, 12144, 12145, 12146, 12147, 12148,
+								12149, 12150, 12151, 12152, 12153, 12154, 12155, 12156, 12157, 12158, 12159);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(45601, 45602, 45603, 45604, 45605, 45606, 45607, 45608, 45609, 45610, 45611, 45612, 45613, 45614, 45615, 45616,
+								45617, 45618, 45619, 45620, 45621, 45622, 45623, 45624, 45625, 45626, 45627, 45628, 45629, 45630, 45631, 45632,
+								45633, 45634, 45635, 45636, 45637, 45638, 45639, 45640, 45641, 45642, 45643, 45644, 45645, 45646, 45647, 45648,
+								45649, 45650, 45651, 45652, 45653, 45654, 45655, 45656, 45657, 45658, 45659, 45660, 45661, 45662, 45663, 45664,
+								45665, 45666, 45667, 45668, 45669, 45670, 45671, 45672, 45673, 45674, 45675, 45676, 45677, 45678, 45679, 45680,
+								45681, 45682, 45683, 45684, 45685, 45686, 45687, 45688, 45689, 45690, 45691, 45692, 45693, 45694, 45695, 45696,
+								45697, 45698, 45699, 45700);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(65136, 65137, 65138, 65139, 65140, 65141, 65142, 65143, 65144, 65145, 65146, 65147, 65148, 65149, 65150, 65151,
+								65152, 65153, 65154, 65155, 65156, 65157, 65158, 65159, 65160, 65161, 65162, 65163, 65164, 65165, 65166, 65167,
+								65168, 65169, 65170, 65171, 65172, 65173, 65174, 65175, 65176, 65177, 65178, 65179, 65180, 65181, 65182, 65183,
+								65184, 65185, 65186, 65187, 65188, 65189, 65190, 65191, 65192, 65193, 65194, 65195, 65196, 65197, 65198, 65199,
+								65200);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(65201, 65202, 65203, 65204, 65205, 65206, 65207, 65208, 65209, 65210, 65211, 65212, 65213, 65214, 65215, 65216,
+								65217, 65218, 65219, 65220, 65221, 65222, 65223, 65224, 65225, 65226, 65227, 65228, 65229, 65230, 65231, 65232,
+								65233, 65234, 65235, 65236, 65237, 65238, 65239, 65240, 65241, 65242, 65243, 65244, 65245, 65246, 65247, 65248,
+								65249, 65250, 65251, 65252, 65253, 65254, 65255, 65256, 65257, 65258, 65259, 65260, 65261, 65262, 65263, 65264,
+								65265, 65266, 65267, 65268, 65269, 65270, 65271, 65272, 65273, 65274, 65275, 65276);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(65345, 65346, 65347, 65348, 65349, 65350, 65351, 65352, 65353, 65354, 65355, 65356, 65357, 65358, 65359, 65360,
+								65361, 65362, 65363, 65364, 65365, 65366, 65367, 65368, 65369, 65370);
+		$expected = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(65377, 65378, 65379, 65380, 65381, 65382, 65383, 65384, 65385, 65386, 65387, 65388, 65389, 65390, 65391, 65392,
+								65393, 65394, 65395, 65396, 65397, 65398, 65399, 65400);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(65401, 65402, 65403, 65404, 65405, 65406, 65407, 65408, 65409, 65410, 65411, 65412, 65413, 65414, 65415, 65416,
+								65417, 65418, 65419, 65420, 65421, 65422, 65423, 65424, 65425, 65426, 65427, 65428, 65429, 65430, 65431, 65432,
+								65433, 65434, 65435, 65436, 65437, 65438);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(292, 275, 314, 316, 335, 44, 32, 372, 337, 345, 316, 271, 33);
+		$expected = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(72, 101, 108, 108, 111, 44, 32, 87, 111, 114, 108, 100, 33);
+		$expected = 'Hello, World!';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(168);
+		$expected = '¨';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(191);
+		$expected = '¿';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(269, 105, 110, 105);
+		$expected = '�ini';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(109, 111, 263, 105);
+		$expected = 'moći';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(100, 114, 382, 97, 118, 110, 105);
+		$expected = 'državni';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(25226, 30334, 24230, 35774, 20026, 39318, 39029);
+		$expected = '把百度设为首页';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(19968, 20108, 19977, 21608, 27704, 40845);
+		$expected = '一二三周永�';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1280, 1282, 1284, 1286, 1288, 1290, 1292, 1294, 1296, 1298);
+		$expected = 'ԀԂԄԆԈԊԌԎ�Ԓ';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1281, 1283, 1285, 1287, 1289, 1291, 1293, 1295, 1296, 1298);
+		$expected = 'Ô�ÔƒÔ…Ô‡Ô‰Ô‹Ô�Ô�Ô�Ô’';
+		$result = Multibyte::ascii($utf8);
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1329, 1330, 1331, 1332, 1333, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, 1344, 1345, 1346, 1347,
+							1348, 1349, 1350, 1351, 1352, 1353, 1354, 1355, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 1364, 1365,
+							1366, 1415);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�ՂՃՄՅՆՇՈՉՊՋՌ�Վ��ՑՒՓՔՕՖև';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(1377, 1378, 1379, 1380, 1381, 1382, 1383, 1384, 1385, 1386, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394,
+								1395, 1396, 1397, 1398, 1399, 1400, 1401, 1402, 1403, 1404, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412,
+								1413, 1414, 1415);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'Õ¡Õ¢Õ£Õ¤Õ¥Õ¦Õ§Õ¨Õ©ÕªÕ«Õ¬Õ­Õ®Õ¯Õ°Õ±Õ²Õ³Õ´ÕµÕ¶Õ·Õ¸Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿Ö€Ö�Ö‚ÖƒÖ„Ö…Ö†Ö‡';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(4256, 4257, 4258, 4259, 4260, 4261, 4262, 4263, 4264, 4265, 4266, 4267, 4268, 4269, 4270, 4271, 4272, 4273, 4274,
+							4275, 4276, 4277, 4278, 4279, 4280, 4281, 4282, 4283, 4284, 4285, 4286, 4287, 4288, 4289, 4290, 4291, 4292, 4293);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(7680, 7682, 7684, 7686, 7688, 7690, 7692, 7694, 7696, 7698, 7700, 7702, 7704, 7706, 7708, 7710, 7712, 7714,
+								7716, 7718, 7720, 7722, 7724, 7726, 7728, 7730, 7732, 7734, 7736, 7738, 7740, 7742, 7744, 7746, 7748, 7750,
+								7752, 7754, 7756, 7758, 7760, 7762, 7764, 7766, 7768, 7770, 7772, 7774, 7776, 7778, 7780, 7782, 7784, 7786,
+								7788, 7790, 7792, 7794, 7796, 7798, 7800, 7802, 7804, 7806, 7808, 7810, 7812, 7814, 7816, 7818, 7820, 7822,
+								7824, 7826, 7828, 7830, 7831, 7832, 7833, 7834,       7840, 7842, 7844, 7846, 7848, 7850, 7852, 7854, 7856,
+								7858, 7860, 7862, 7864, 7866, 7868, 7870, 7872, 7874, 7876, 7878, 7880, 7882, 7884, 7886, 7888, 7890, 7892,
+								7894, 7896, 7898, 7900, 7902, 7904, 7906, 7908, 7910, 7912, 7914, 7916, 7918, 7920, 7922, 7924, 7926,  7928);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ḀḂḄḆḈḊḌḎ�ḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎ�ṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎ�ẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎ�ỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(7681, 7683, 7685, 7687, 7689, 7691, 7693, 7695, 7697, 7699, 7701, 7703, 7705, 7707, 7709, 7711, 7713, 7715,
+							7717, 7719, 7721, 7723, 7725, 7727, 7729, 7731, 7733, 7735, 7737, 7739, 7741, 7743, 7745, 7747, 7749, 7751,
+							7753, 7755, 7757, 7759, 7761, 7763, 7765, 7767, 7769, 7771, 7773, 7775, 7777, 7779, 7781, 7783, 7785, 7787,
+							7789, 7791, 7793, 7795, 7797, 7799, 7801, 7803, 7805, 7807, 7809, 7811, 7813, 7815, 7817, 7819, 7821, 7823,
+							7825, 7827, 7829, 7830, 7831, 7832, 7833, 7834, 7841, 7843, 7845, 7847, 7849, 7851, 7853, 7855, 7857, 7859,
+							7861, 7863, 7865, 7867, 7869, 7871, 7873, 7875, 7877, 7879, 7881, 7883, 7885, 7887, 7889, 7891, 7893, 7895,
+							7897, 7899, 7901, 7903, 7905, 7907, 7909, 7911, 7913, 7915, 7917, 7919, 7921, 7923, 7925, 7927, 7929);
+		$result = Multibyte::ascii($utf8);
+		$expected = '�ḃḅḇḉḋ��ḑḓḕḗḙḛ�ḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿ�ṃṅṇṉṋ��ṑṓṕṗṙṛ�ṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿ�ẃẅẇẉẋ��ẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽế�ểễệỉị��ốồổỗộớ�ởỡợụủứừửữựỳỵỷỹ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(8486, 8490, 8491, 8498);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ΩKÅℲ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(969, 107, 229, 8526);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ωkåⅎ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(8544, 8545, 8546, 8547, 8548, 8549, 8550, 8551, 8552, 8553, 8554, 8555, 8556, 8557, 8558, 8559, 8579);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯↃ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(8560, 8561, 8562, 8563, 8564, 8565, 8566, 8567, 8568, 8569, 8570, 8571, 8572, 8573, 8574, 8575, 8580);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅺⅻⅼⅽⅾⅿↄ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(9398, 9399, 9400, 9401, 9402, 9403, 9404, 9405, 9406, 9407, 9408, 9409, 9410, 9411, 9412, 9413, 9414,
+							9415, 9416, 9417, 9418, 9419, 9420, 9421, 9422, 9423);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀ�ⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌ�Ⓨ�';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(9424, 9425, 9426, 9427, 9428, 9429, 9430, 9431, 9432, 9433, 9434, 9435, 9436, 9437, 9438, 9439, 9440, 9441,
+							9442, 9443, 9444, 9445, 9446, 9447, 9448, 9449);
+		$result = Multibyte::ascii($utf8);
+		$expected = '�ⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜ�ⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(11264, 11265, 11266, 11267, 11268, 11269, 11270, 11271, 11272, 11273, 11274, 11275, 11276, 11277, 11278, 11279,
+							11280, 11281, 11282, 11283, 11284, 11285, 11286, 11287, 11288, 11289, 11290, 11291, 11292, 11293, 11294, 11295,
+							11296, 11297, 11298, 11299, 11300, 11301, 11302, 11303, 11304, 11305, 11306, 11307, 11308, 11309, 11310);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'Ⰰ�ⰂⰃⰄⰅⰆⰇⰈⰉⰊⰋⰌ�Ⰾ��ⰑⰒⰓⰔⰕⰖⰗⰘⰙⰚⰛⰜ�ⰞⰟⰠⰡⰢⰣⰤⰥⰦⰧⰨⰩⰪⰫⰬⰭⰮ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(11312, 11313, 11314, 11315, 11316, 11317, 11318, 11319, 11320, 11321, 11322, 11323, 11324, 11325, 11326, 11327,
+							11328, 11329, 11330, 11331, 11332, 11333, 11334, 11335, 11336, 11337, 11338, 11339, 11340, 11341, 11342, 11343,
+							11344, 11345, 11346, 11347, 11348, 11349, 11350, 11351, 11352, 11353, 11354, 11355, 11356, 11357, 11358);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ⰰⰱⰲⰳⰴⰵⰶⰷⰸⰹⰺⰻⰼⰽⰾⰿⱀ�ⱂⱃⱄⱅⱆⱇⱈⱉⱊⱋⱌ�ⱎ��ⱑⱒⱓⱔⱕⱖⱗⱘⱙⱚⱛⱜ�ⱞ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(11392, 11394, 11396, 11398, 11400, 11402, 11404, 11406, 11408, 11410, 11412, 11414, 11416, 11418, 11420,
+									11422, 11424, 11426, 11428, 11430, 11432, 11434, 11436, 11438, 11440, 11442, 11444, 11446, 11448, 11450,
+									11452, 11454, 11456, 11458, 11460, 11462, 11464, 11466, 11468, 11470, 11472, 11474, 11476, 11478, 11480,
+									11482, 11484, 11486, 11488, 11490);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ⲀⲂⲄⲆⲈⲊⲌⲎ�ⲒⲔⲖⲘⲚⲜⲞⲠⲢⲤⲦⲨⲪⲬⲮⲰⲲⲴⲶⲸⲺⲼⲾⳀⳂⳄⳆⳈⳊⳌⳎ�ⳒⳔⳖⳘⳚⳜⳞⳠⳢ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(11393, 11395, 11397, 11399, 11401, 11403, 11405, 11407, 11409, 11411, 11413, 11415, 11417, 11419, 11421, 11423,
+							11425, 11427, 11429, 11431, 11433, 11435, 11437, 11439, 11441, 11443, 11445, 11447, 11449, 11451, 11453, 11455,
+							11457, 11459, 11461, 11463, 11465, 11467, 11469, 11471, 11473, 11475, 11477, 11479, 11481, 11483, 11485, 11487,
+							11489, 11491);
+		$result = Multibyte::ascii($utf8);
+		$expected = '�ⲃⲅⲇⲉⲋ��ⲑⲓⲕⲗⲙⲛ�ⲟⲡⲣⲥⲧⲩⲫⲭⲯⲱⲳⲵⲷⲹⲻⲽⲿ�ⳃⳅⳇⳉⳋ��ⳑⳓⳕⳗⳙⳛ�ⳟⳡⳣ';
+		$this->assertEqual($result, $expected);
+
+		$utf8 = array(64256, 64257, 64258, 64259, 64260, 64261, 64262, 64275, 64276, 64277, 64278, 64279);
+		$result = Multibyte::ascii($utf8);
+		$expected = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStripos method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStripos() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = mb_stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = mb_stripos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = mb_stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = mb_stripos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = mb_stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = mb_stripos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'f';
+		$result = mb_stripos($string, $find);
+		$expected = 37;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'Μ';
+		$result = mb_stripos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'É';
+		$result = mb_stripos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_stripos($string, $find);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_stripos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_stripos($string, $find, 40);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ʀ';
+		$result = mb_stripos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ñ—';
+		$result = mb_stripos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_stripos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_stripos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_stripos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_stripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_stripos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_stripos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_stripos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_stripos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_stripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = mb_stripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_stripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_stripos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_stripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = '�';
+		$result = mb_stripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'O';
+		$result = mb_stripos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_stripos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'N';
+		$result = mb_stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'Ć';
+		$result = mb_stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'Ž';
+		$result = mb_stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_stripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_stripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'DŽ';
+		$result = mb_stripos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStripos method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStripos() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = Multibyte::stripos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = Multibyte::stripos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = Multibyte::stripos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'f';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 37;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'Μ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'É';
+		$result = Multibyte::stripos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::stripos($string, $find, 40);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ʀ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ñ—';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::stripos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = '�';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'O';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'N';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'Ć';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'Ž';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::stripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'DŽ';
+		$result = Multibyte::stripos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStristr method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStristr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = mb_stristr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = mb_stristr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = mb_stristr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'f';
+		$result = mb_stristr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'f';
+		$result = mb_stristr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'Μ';
+		$result = mb_stristr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'Μ';
+		$result = mb_stristr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'þ';
+		$result = mb_stristr($string, $find);
+		$expected = 'Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'þ';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_stristr($string, $find);
+		$expected = 'ŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_stristr($string, $find);
+		$expected = 'ƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ʀ';
+		$result = mb_stristr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ʀ';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ñ—';
+		$result = mb_stristr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ñ—';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_stristr($string, $find);
+		$expected = 'РСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_stristr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_stristr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_stristr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_stristr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_stristr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_stristr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_stristr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_stristr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_stristr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_stristr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_stristr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_stristr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = mb_stristr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = mb_stristr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_stristr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_stristr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_stristr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = '�';
+		$result = mb_stristr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = '�';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'ĺļ';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'Ĥē';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'O';
+		$result = mb_stristr($string, $find);
+		$expected = 'o, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'O';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'Hell';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_stristr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_stristr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_stristr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'N';
+		$result = mb_stristr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'N';
+		$result = mb_stristr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'Ć';
+		$result = mb_stristr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'Ć';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'Ž';
+		$result = mb_stristr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'Ž';
+		$result = mb_stristr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_stristr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_stristr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_stristr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_stristr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '二周';
+		$result = mb_stristr($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStristr method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStristr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'f';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã¥';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'Ä‹';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'f';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'f';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'Μ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'Μ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'þ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'þ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ʀ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ʀ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ñ—';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ñ—';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'РСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::stristr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::stristr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::stristr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::stristr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = '�';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = '�';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'ĺļ';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'Ĥē';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'O';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'o, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'O';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'Hell';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'N';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'N';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'Ć';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'Ć';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'Ž';
+		$result = Multibyte::stristr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'Ž';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::stristr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::stristr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::stristr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '二周';
+		$result = Multibyte::stristr($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrlen method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrlen() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$result = mb_strlen($string);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$result = mb_strlen($string);
+		$expected = 30;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$result = mb_strlen($string);
+		$expected = 61;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = mb_strlen($string);
+		$expected = 94;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$result = mb_strlen($string);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$result = mb_strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$result = mb_strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$result = mb_strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$result = mb_strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$result = mb_strlen($string);
+		$expected = 28;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$result = mb_strlen($string);
+		$expected = 49;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$result = mb_strlen($string);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$result = mb_strlen($string);
+		$expected = 47;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$result = mb_strlen($string);
+		$expected = 96;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$result = mb_strlen($string);
+		$expected = 59;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$result = mb_strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$result = mb_strlen($string);
+		$expected = 65;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$result = mb_strlen($string);
+		$expected = 76;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$result = mb_strlen($string);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$result = mb_strlen($string);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$result = mb_strlen($string);
+		$expected = 38;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = mb_strlen($string);
+		$expected = 13;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$result = mb_strlen($string);
+		$expected = 13;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$result = mb_strlen($string);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$result = mb_strlen($string);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$result = mb_strlen($string);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$result = mb_strlen($string);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = mb_strlen($string);
+		$expected = 6;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrlen method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrlen() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$result = Multibyte::strlen($string);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$result = Multibyte::strlen($string);
+		$expected = 30;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$result = Multibyte::strlen($string);
+		$expected = 61;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = Multibyte::strlen($string);
+		$expected = 94;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$result = Multibyte::strlen($string);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$result = Multibyte::strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$result = Multibyte::strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$result = Multibyte::strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$result = Multibyte::strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$result = Multibyte::strlen($string);
+		$expected = 28;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$result = Multibyte::strlen($string);
+		$expected = 49;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$result = Multibyte::strlen($string);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$result = Multibyte::strlen($string);
+		$expected = 47;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$result = Multibyte::strlen($string);
+		$expected = 96;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$result = Multibyte::strlen($string);
+		$expected = 59;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$result = Multibyte::strlen($string);
+		$expected = 100;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$result = Multibyte::strlen($string);
+		$expected = 65;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$result = Multibyte::strlen($string);
+		$expected = 76;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$result = Multibyte::strlen($string);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$result = Multibyte::strlen($string);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$result = Multibyte::strlen($string);
+		$expected = 38;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = Multibyte::strlen($string);
+		$expected = 13;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$result = Multibyte::strlen($string);
+		$expected = 13;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$result = Multibyte::strlen($string);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$result = Multibyte::strlen($string);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$result = Multibyte::strlen($string);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$result = Multibyte::strlen($string);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = Multibyte::strlen($string);
+		$expected = 6;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrpos method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrpos() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strpos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strpos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strpos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strpos($string, $find);
+		$expected = 37;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strpos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'é';
+		$result = mb_strpos($string, $find);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strpos($string, $find);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_strpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = mb_strpos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strpos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strpos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = mb_strpos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strpos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strpos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strpos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strpos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strpos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strpos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘Å™';
+		$result = mb_strpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strpos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strpos($string, $find, 5);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '一周';
+		$result = mb_strpos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrpos method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrpos() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strpos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strpos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strpos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 37;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'é';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = Multibyte::strpos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘Å™';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strpos($string, $find, 5);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '一周';
+		$result = Multibyte::strpos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrrchr method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrrchr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strrchr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strrchr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strrchr($string, $find);
+		$expected = 'РСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strrchr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strrchr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strrchr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strrchr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strrchr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strrchr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strrchr($string, $find);
+		$expected = 'orld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'Hello, W';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_strrchr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_strrchr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_strrchr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strrchr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strrchr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strrchr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strrchr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strrchr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strrchr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周�';
+		$result = mb_strrchr($string, $find, true);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrrchr method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrrchr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'РСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'orld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'Hello, W';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strrchr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周�';
+		$result = Multibyte::strrchr($string, $find, true);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrrichr method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrrichr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strrichr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strrichr($string, $find);
+		$expected = 'fghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcde';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'þÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüý';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strrichr($string, $find);
+		$expected = 'р�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп';
+		$find = 'Р';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strrichr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strrichr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strrichr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strrichr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strrichr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strrichr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strrichr($string, $find);
+		$expected = 'orld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'Hello, W';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_strrichr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_strrichr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_strrichr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strrichr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strrichr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strrichr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strrichr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strrichr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strrichr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '百设';
+		$result = mb_strrichr($string, $find, true);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrrichr method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrrichr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'fghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcde';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'þÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüý';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'р�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмноп';
+		$find = 'Р';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'orld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'Hello, W';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strrichr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '百设';
+		$result = Multibyte::strrichr($string, $find, true);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrripos method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrripos() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strripos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strripos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'ÓÔ';
+		$result = mb_strripos($string, $find);
+		$expected = 19;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strripos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strripos($string, $find);
+		$expected = 69;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strripos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'é';
+		$result = mb_strripos($string, $find);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strripos($string, $find);
+		$expected = 25;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_strripos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = mb_strripos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strripos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strripos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strripos($string, $find);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = mb_strripos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strripos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strripos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strripos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strripos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strripos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ���ｑｒｓｔｕｖｗｘｙｚ';
+		$find = '��';
+		$result = mb_strripos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strripos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strripos($string, $find, 5);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'dž';
+		$result = mb_strripos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrripos method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrripos() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strripos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strripos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'ÓÔ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 19;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strripos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 69;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'é';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 25;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = Multibyte::strripos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ���ｑｒｓｔｕｖｗｘｙｚ';
+		$find = '��';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strripos($string, $find, 5);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strripos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'dž';
+		$result = Multibyte::strripos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrrpos method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrrpos() {
+		$skip = extension_loaded('mbstring') && version_compare(PHP_VERSION, '5.2.0', '<');
+		if ($this->skipIf($skip, '%s PHP version does not support $offset parameter in mb_strrpos().')) {
+			return;
+		}
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strrpos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'ÙÚ';
+		$result = mb_strrpos($string, $find);
+		$expected = 25;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strrpos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strrpos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strrpos($string, $find);
+		$expected = 37;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strrpos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'é';
+		$result = mb_strrpos($string, $find);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strrpos($string, $find);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_strrpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = mb_strrpos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strrpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strrpos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strrpos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = mb_strrpos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strrpos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strrpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strrpos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strrpos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strrpos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strrpos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strrpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strrpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ���ｑｒｓｔｕｖｗｘｙｚ';
+		$find = '��';
+		$result = mb_strrpos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strrpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strrpos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strrpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strrpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strrpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strrpos($string, $find, 5);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strrpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strrpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'H';
+		$result = mb_strrpos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrrpos method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrrpos() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strrpos($string, $find, 6);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strrpos($string, $find, 6);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�Þ';
+		$find = 'ÙÚ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 25;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strrpos($string, $find, 6);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 37;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 20;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'é';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 32;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 24;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 40;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 39;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = Multibyte::strrpos($string, $find, 5);
+		$expected = 36;
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 31;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 26;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 46;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 45;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 10;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ���ｑｒｓｔｕｖｗｘｙｚ';
+		$find = '��';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 15;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 16;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 17;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strrpos($string, $find, 5);
+		$expected = 8;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'H';
+		$result = Multibyte::strrpos($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrstr method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrstr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strstr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strstr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strstr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strstr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = mb_strstr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strstr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = mb_strstr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = mb_strstr($string, $find);
+		$expected = 'Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strstr($string, $find);
+		$expected = 'ŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_strstr($string, $find);
+		$expected = 'ƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strstr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strstr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strstr($string, $find);
+		$expected = 'РСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strstr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_strstr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strstr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = mb_strstr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strstr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_strstr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strstr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_strstr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strstr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = mb_strstr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strstr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strstr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strstr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = mb_strstr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = mb_strstr($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strstr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_strstr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strstr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strstr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'ĺļ';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'Ĥē';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strstr($string, $find);
+		$expected = 'o, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'Hell';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_strstr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_strstr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_strstr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strstr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_strstr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strstr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strstr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_strstr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strstr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_strstr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strstr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_strstr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '二周';
+		$result = mb_strstr($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrstr method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrstr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'À�ÂÃÄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ĀĂĄĆĈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'FGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDE';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$find = 'µ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$find = 'Þ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'Å…';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$find = 'Ƹ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'Ѐ�ЂЃЄЅІ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'РСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'М�ОП';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'نهوىيًٌ�َ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '�قكلم';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strstr($string, $find);
+		$expected = '✿�������������������������������';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$find = '✿';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strstr($string, $find);
+		$expected = '�⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎�';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strstr($string, $find);
+		$expected = '⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strstr($string, $find);
+		$expected = '눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눻';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '�ｂｃｄｅｆｇｈｉｊ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$find = 'Ｋ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ｱｲｳｴｵｶｷｸ';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'őřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'Ĥēĺļ�, Ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'ĺļ';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'Ĥē';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'o, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'Hell';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'Wo';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'Hello, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'llo, World!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'll';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'He';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'rld!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rld';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'Hello, Wo';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ni';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '�i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'ći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'mo';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strstr($string, $find);
+		$expected = 'žavni';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strstr($string, $find);
+		$expected = '设为首页';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '把百度';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strstr($string, $find);
+		$expected = '周永�';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::strstr($string, $find, true);
+		$expected = '一二三';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '二周';
+		$result = Multibyte::strstr($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrtolower method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrtolower() {
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~';
+		$result = mb_strtolower($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$result = mb_strtolower($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À';
+		$result = mb_strtolower($string);
+		$expected = 'à';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'á';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Â';
+		$result = mb_strtolower($string);
+		$expected = 'â';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã';
+		$result = mb_strtolower($string);
+		$expected = 'ã';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä';
+		$result = mb_strtolower($string);
+		$expected = 'ä';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã…';
+		$result = mb_strtolower($string);
+		$expected = 'Ã¥';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Æ';
+		$result = mb_strtolower($string);
+		$expected = 'æ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ç';
+		$result = mb_strtolower($string);
+		$expected = 'ç';
+		$this->assertEqual($result, $expected);
+
+		$string = 'È';
+		$result = mb_strtolower($string);
+		$expected = 'è';
+		$this->assertEqual($result, $expected);
+
+		$string = 'É';
+		$result = mb_strtolower($string);
+		$expected = 'é';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ê';
+		$result = mb_strtolower($string);
+		$expected = 'ê';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ë';
+		$result = mb_strtolower($string);
+		$expected = 'ë';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ì';
+		$result = mb_strtolower($string);
+		$expected = 'ì';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'í';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÃŽ';
+		$result = mb_strtolower($string);
+		$expected = 'î';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'ï';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'ð';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ñ';
+		$result = mb_strtolower($string);
+		$expected = 'ñ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã’';
+		$result = mb_strtolower($string);
+		$expected = 'ò';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ó';
+		$result = mb_strtolower($string);
+		$expected = 'ó';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ô';
+		$result = mb_strtolower($string);
+		$expected = 'ô';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Õ';
+		$result = mb_strtolower($string);
+		$expected = 'õ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ö';
+		$result = mb_strtolower($string);
+		$expected = 'ö';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ø';
+		$result = mb_strtolower($string);
+		$expected = 'ø';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ù';
+		$result = mb_strtolower($string);
+		$expected = 'ù';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ú';
+		$result = mb_strtolower($string);
+		$expected = 'ú';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Û';
+		$result = mb_strtolower($string);
+		$expected = 'û';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ü';
+		$result = mb_strtolower($string);
+		$expected = 'ü';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'ý';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Þ';
+		$result = mb_strtolower($string);
+		$expected = 'þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$result = mb_strtolower($string);
+		$expected = 'àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä€';
+		$result = mb_strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä‚';
+		$result = mb_strtolower($string);
+		$expected = 'ă';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä„';
+		$result = mb_strtolower($string);
+		$expected = 'Ä…';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ć';
+		$result = mb_strtolower($string);
+		$expected = 'ć';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĉ';
+		$result = mb_strtolower($string);
+		$expected = 'ĉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÄŠ';
+		$result = mb_strtolower($string);
+		$expected = 'Ä‹';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Č';
+		$result = mb_strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÄŽ';
+		$result = mb_strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'Ä‘';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä’';
+		$result = mb_strtolower($string);
+		$expected = 'Ä“';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä”';
+		$result = mb_strtolower($string);
+		$expected = 'Ä•';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä–';
+		$result = mb_strtolower($string);
+		$expected = 'Ä—';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ę';
+		$result = mb_strtolower($string);
+		$expected = 'Ä™';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Äš';
+		$result = mb_strtolower($string);
+		$expected = 'Ä›';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĝ';
+		$result = mb_strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Äž';
+		$result = mb_strtolower($string);
+		$expected = 'ÄŸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä ';
+		$result = mb_strtolower($string);
+		$expected = 'Ä¡';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¢';
+		$result = mb_strtolower($string);
+		$expected = 'Ä£';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥ';
+		$result = mb_strtolower($string);
+		$expected = 'Ä¥';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ħ';
+		$result = mb_strtolower($string);
+		$expected = 'ħ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĩ';
+		$result = mb_strtolower($string);
+		$expected = 'Ä©';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ī';
+		$result = mb_strtolower($string);
+		$expected = 'Ä«';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĭ';
+		$result = mb_strtolower($string);
+		$expected = 'Ä­';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä®';
+		$result = mb_strtolower($string);
+		$expected = 'į';
+		$this->assertEqual($result, $expected);
+
+		$string = 'IJ';
+		$result = mb_strtolower($string);
+		$expected = 'ij';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä´';
+		$result = mb_strtolower($string);
+		$expected = 'ĵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ķ';
+		$result = mb_strtolower($string);
+		$expected = 'Ä·';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĺ';
+		$result = mb_strtolower($string);
+		$expected = 'ĺ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä»';
+		$result = mb_strtolower($string);
+		$expected = 'ļ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ľ';
+		$result = mb_strtolower($string);
+		$expected = 'ľ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¿';
+		$result = mb_strtolower($string);
+		$expected = 'Å€';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'Å‚';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ń';
+		$result = mb_strtolower($string);
+		$expected = 'Å„';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å…';
+		$result = mb_strtolower($string);
+		$expected = 'ņ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ň';
+		$result = mb_strtolower($string);
+		$expected = 'ň';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÅŠ';
+		$result = mb_strtolower($string);
+		$expected = 'Å‹';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ō';
+		$result = mb_strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÅŽ';
+		$result = mb_strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtolower($string);
+		$expected = 'Å‘';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å’';
+		$result = mb_strtolower($string);
+		$expected = 'Å“';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å”';
+		$result = mb_strtolower($string);
+		$expected = 'Å•';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å–';
+		$result = mb_strtolower($string);
+		$expected = 'Å—';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ř';
+		$result = mb_strtolower($string);
+		$expected = 'Å™';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Åš';
+		$result = mb_strtolower($string);
+		$expected = 'Å›';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŝ';
+		$result = mb_strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Åž';
+		$result = mb_strtolower($string);
+		$expected = 'ÅŸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å ';
+		$result = mb_strtolower($string);
+		$expected = 'Å¡';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å¢';
+		$result = mb_strtolower($string);
+		$expected = 'Å£';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ť';
+		$result = mb_strtolower($string);
+		$expected = 'Å¥';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŧ';
+		$result = mb_strtolower($string);
+		$expected = 'ŧ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ũ';
+		$result = mb_strtolower($string);
+		$expected = 'Å©';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ū';
+		$result = mb_strtolower($string);
+		$expected = 'Å«';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŭ';
+		$result = mb_strtolower($string);
+		$expected = 'Å­';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å®';
+		$result = mb_strtolower($string);
+		$expected = 'ů';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å°';
+		$result = mb_strtolower($string);
+		$expected = 'ű';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ų';
+		$result = mb_strtolower($string);
+		$expected = 'ų';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å´';
+		$result = mb_strtolower($string);
+		$expected = 'ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŷ';
+		$result = mb_strtolower($string);
+		$expected = 'Å·';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ź';
+		$result = mb_strtolower($string);
+		$expected = 'ź';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å»';
+		$result = mb_strtolower($string);
+		$expected = 'ż';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ž';
+		$result = mb_strtolower($string);
+		$expected = 'ž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$result = mb_strtolower($string);
+		$expected = '�ăąćĉċ��đēĕėęě�ğġģĥħĩīĭįijĵķĺļľŀłńņňŋ��őœŕŗřś�şšţťŧũūŭůűųŵŷźżž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĤĒĹĻŎ, Ŵ�ŘĻĎ!';
+		$result = mb_strtolower($string);
+		$expected = 'ĥēĺļ�, ŵőřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĥēĺļ�, ŵőřļ�!';
+		$result = mb_strtolower($string);
+		$expected = 'ĥēĺļ�, ŵőřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ἈΙ';
+		$result = mb_strtolower($string);
+		$expected = 'ἀι';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ԀԂԄԆԈԊԌԎ�Ԓ';
+		$result = mb_strtolower($string);
+		$expected = 'Ô�ÔƒÔ…Ô‡Ô‰Ô‹Ô�Ô�Ô�Ô’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�ՂՃՄՅՆՇՈՉՊՋՌ�Վ��ՑՒՓՔՕՖև';
+		$result = mb_strtolower($string);
+		$expected = 'Õ¡Õ¢Õ£Õ¤Õ¥Õ¦Õ§Õ¨Õ©ÕªÕ«Õ¬Õ­Õ®Õ¯Õ°Õ±Õ²Õ³Õ´ÕµÕ¶Õ·Õ¸Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿Ö€Ö�Ö‚ÖƒÖ„Ö…Ö†Ö‡';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$result = mb_strtolower($string);
+		$expected = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ḀḂḄḆḈḊḌḎ�ḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎ�ṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎ�ẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎ�ỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
+		$result = mb_strtolower($string);
+		$expected = '�ḃḅḇḉḋ��ḑḓḕḗḙḛ�ḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿ�ṃṅṇṉṋ��ṑṓṕṗṙṛ�ṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿ�ẃẅẇẉẋ��ẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽế�ểễệỉị��ốồổỗộớ�ởỡợụủứừửữựỳỵỷỹ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ΩKÅ';
+		$result = mb_strtolower($string);
+		$expected = 'ωkå';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ΩKÅ';
+		$result = mb_strtolower($string);
+		$expected = 'ωkå';
+		$this->assertEqual($result, $expected);
+
+/*
+mb_strtolower does not work for these strings.
+
+		$string = 'ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯↃ';
+		$result = mb_strtolower($string);
+		$expected = 'ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅺⅻⅼⅽⅾⅿↄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀ�ⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌ�Ⓨ�';
+		$result = mb_strtolower($string);
+		$expected = '�ⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜ�ⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ⰰ�ⰂⰃⰄⰅⰆⰇⰈⰉⰊⰋⰌ�Ⰾ��ⰑⰒⰓⰔⰕⰖⰗⰘⰙⰚⰛⰜ�ⰞⰟⰠⰡⰢⰣⰤⰥⰦⰧⰨⰩⰪⰫⰬⰭⰮ';
+		$result = mb_strtolower($string);
+		$expected = 'ⰰⰱⰲⰳⰴⰵⰶⰷⰸⰹⰺⰻⰼⰽⰾⰿⱀ�ⱂⱃⱄⱅⱆⱇⱈⱉⱊⱋⱌ�ⱎ��ⱑⱒⱓⱔⱕⱖⱗⱘⱙⱚⱛⱜ�ⱞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⲀⲂⲄⲆⲈⲊⲌⲎ�ⲒⲔⲖⲘⲚⲜⲞⲠⲢⲤⲦⲨⲪⲬⲮⲰⲲⲴⲶⲸⲺⲼⲾⳀⳂⳄⳆⳈⳊⳌⳎ�ⳒⳔⳖⳘⳚⳜⳞⳠⳢ';
+		$result = mb_strtolower($string);
+		$expected = '�ⲃⲅⲇⲉⲋ��ⲑⲓⲕⲗⲙⲛ�ⲟⲡⲣⲥⲧⲩⲫⲭⲯⲱⲳⲵⲷⲹⲻⲽⲿ�ⳃⳅⳇⳉⳋ��ⳑⳓⳕⳗⳙⳛ�ⳟⳡⳣ';
+		$this->assertEqual($result, $expected);
+*/
+		$string = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$result = mb_strtolower($string);
+		$expected = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrtolower method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrtolower() {
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~';
+		$result = Multibyte::strtolower($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@abcdefghijklmnopqrstuvwxyz[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$result = Multibyte::strtolower($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À';
+		$result = Multibyte::strtolower($string);
+		$expected = 'à';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'á';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Â';
+		$result = Multibyte::strtolower($string);
+		$expected = 'â';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ã';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ä';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã…';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ã¥';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Æ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'æ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ç';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ç';
+		$this->assertEqual($result, $expected);
+
+		$string = 'È';
+		$result = Multibyte::strtolower($string);
+		$expected = 'è';
+		$this->assertEqual($result, $expected);
+
+		$string = 'É';
+		$result = Multibyte::strtolower($string);
+		$expected = 'é';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ê';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ê';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ë';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ë';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ì';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ì';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'í';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÃŽ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'î';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ï';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ð';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ñ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ñ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã’';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ò';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ó';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ó';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ô';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ô';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Õ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'õ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ö';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ö';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ø';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ø';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ù';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ù';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ú';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ú';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Û';
+		$result = Multibyte::strtolower($string);
+		$expected = 'û';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ü';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ü';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ý';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Þ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä€';
+		$result = Multibyte::strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä‚';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ă';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä„';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä…';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ć';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ć';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĉ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ĉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÄŠ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä‹';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Č';
+		$result = Multibyte::strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÄŽ';
+		$result = Multibyte::strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä‘';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä’';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä“';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä”';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä•';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä–';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä—';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ę';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä™';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Äš';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä›';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĝ';
+		$result = Multibyte::strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Äž';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ÄŸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä¡';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¢';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä£';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä¥';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ħ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ħ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĩ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä©';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ī';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä«';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĭ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä­';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä®';
+		$result = Multibyte::strtolower($string);
+		$expected = 'į';
+		$this->assertEqual($result, $expected);
+
+		$string = 'IJ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ij';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä´';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ĵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ķ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ä·';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĺ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ĺ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä»';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ļ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ľ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ľ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¿';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å€';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å‚';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ń';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å„';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å…';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ņ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ň';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ň';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÅŠ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å‹';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ō';
+		$result = Multibyte::strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÅŽ';
+		$result = Multibyte::strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å‘';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å’';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å“';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å”';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å•';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å–';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å—';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ř';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å™';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Åš';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å›';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŝ';
+		$result = Multibyte::strtolower($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Åž';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ÅŸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å¡';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å¢';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å£';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ť';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å¥';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŧ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ŧ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ũ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å©';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ū';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å«';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŭ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å­';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å®';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ů';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å°';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ű';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ų';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ų';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å´';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ŵ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ŷ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Å·';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ź';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ź';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å»';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ż';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ž';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$result = Multibyte::strtolower($string);
+		$expected = '�ăąćĉċ��đēĕėęě�ğġģĥħĩīĭįijĵķĺļľŀłńņňŋ��őœŕŗřś�şšţťŧũūŭůűųŵŷźżž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĤĒĹĻŎ, Ŵ�ŘĻĎ!';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ĥēĺļ�, ŵőřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĥēĺļ�, ŵőřļ�!';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ĥēĺļ�, ŵőřļ�!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ἈΙ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ἀι';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ԀԂԄԆԈԊԌԎ�Ԓ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Ô�ÔƒÔ…Ô‡Ô‰Ô‹Ô�Ô�Ô�Ô’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�ՂՃՄՅՆՇՈՉՊՋՌ�Վ��ՑՒՓՔՕՖև';
+		$result = Multibyte::strtolower($string);
+		$expected = 'Õ¡Õ¢Õ£Õ¤Õ¥Õ¦Õ§Õ¨Õ©ÕªÕ«Õ¬Õ­Õ®Õ¯Õ°Õ±Õ²Õ³Õ´ÕµÕ¶Õ·Õ¸Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿Ö€Ö�Ö‚ÖƒÖ„Ö…Ö†Ö‡';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ḀḂḄḆḈḊḌḎ�ḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎ�ṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎ�ẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎ�ỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
+		$result = Multibyte::strtolower($string);
+		$expected = '�ḃḅḇḉḋ��ḑḓḕḗḙḛ�ḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿ�ṃṅṇṉṋ��ṑṓṕṗṙṛ�ṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿ�ẃẅẇẉẋ��ẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽế�ểễệỉị��ốồổỗộớ�ởỡợụủứừửữựỳỵỷỹ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ΩKÅℲ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ωkåⅎ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ΩKÅ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ωkå';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ΩKÅ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ωkå';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯↃ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅺⅻⅼⅽⅾⅿↄ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀ�ⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌ�Ⓨ�';
+		$result = Multibyte::strtolower($string);
+		$expected = '�ⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜ�ⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ⰰ�ⰂⰃⰄⰅⰆⰇⰈⰉⰊⰋⰌ�Ⰾ��ⰑⰒⰓⰔⰕⰖⰗⰘⰙⰚⰛⰜ�ⰞⰟⰠⰡⰢⰣⰤⰥⰦⰧⰨⰩⰪⰫⰬⰭⰮ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ⰰⰱⰲⰳⰴⰵⰶⰷⰸⰹⰺⰻⰼⰽⰾⰿⱀ�ⱂⱃⱄⱅⱆⱇⱈⱉⱊⱋⱌ�ⱎ��ⱑⱒⱓⱔⱕⱖⱗⱘⱙⱚⱛⱜ�ⱞ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⲀⲂⲄⲆⲈⲊⲌⲎ�ⲒⲔⲖⲘⲚⲜⲞⲠⲢⲤⲦⲨⲪⲬⲮⲰⲲⲴⲶⲸⲺⲼⲾⳀⳂⳄⳆⳈⳊⳌⳎ�ⳒⳔⳖⳘⳚⳜⳞⳠⳢ';
+		$result = Multibyte::strtolower($string);
+		$expected = '�ⲃⲅⲇⲉⲋ��ⲑⲓⲕⲗⲙⲛ�ⲟⲡⲣⲥⲧⲩⲫⲭⲯⲱⲳⲵⲷⲹⲻⲽⲿ�ⳃⳅⳇⳉⳋ��ⳑⳓⳕⳗⳙⳛ�ⳟⳡⳣ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$result = Multibyte::strtolower($string);
+		$expected = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbStrtoupper method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbStrtoupper() {
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = mb_strtoupper($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$result = mb_strtoupper($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$this->assertEqual($result, $expected);
+
+		$string = 'à';
+		$result = mb_strtoupper($string);
+		$expected = 'À';
+		$this->assertEqual($result, $expected);
+
+		$string = 'á';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'â';
+		$result = mb_strtoupper($string);
+		$expected = 'Â';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ã';
+		$result = mb_strtoupper($string);
+		$expected = 'Ã';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ä';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã¥';
+		$result = mb_strtoupper($string);
+		$expected = 'Ã…';
+		$this->assertEqual($result, $expected);
+
+		$string = 'æ';
+		$result = mb_strtoupper($string);
+		$expected = 'Æ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ç';
+		$result = mb_strtoupper($string);
+		$expected = 'Ç';
+		$this->assertEqual($result, $expected);
+
+		$string = 'è';
+		$result = mb_strtoupper($string);
+		$expected = 'È';
+		$this->assertEqual($result, $expected);
+
+		$string = 'é';
+		$result = mb_strtoupper($string);
+		$expected = 'É';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ê';
+		$result = mb_strtoupper($string);
+		$expected = 'Ê';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ë';
+		$result = mb_strtoupper($string);
+		$expected = 'Ë';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ì';
+		$result = mb_strtoupper($string);
+		$expected = 'Ì';
+		$this->assertEqual($result, $expected);
+
+		$string = 'í';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'î';
+		$result = mb_strtoupper($string);
+		$expected = 'ÃŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ï';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ð';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ñ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ñ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ò';
+		$result = mb_strtoupper($string);
+		$expected = 'Ã’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ó';
+		$result = mb_strtoupper($string);
+		$expected = 'Ó';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ô';
+		$result = mb_strtoupper($string);
+		$expected = 'Ô';
+		$this->assertEqual($result, $expected);
+
+		$string = 'õ';
+		$result = mb_strtoupper($string);
+		$expected = 'Õ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ö';
+		$result = mb_strtoupper($string);
+		$expected = 'Ö';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ø';
+		$result = mb_strtoupper($string);
+		$expected = 'Ø';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ù';
+		$result = mb_strtoupper($string);
+		$expected = 'Ù';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ú';
+		$result = mb_strtoupper($string);
+		$expected = 'Ú';
+		$this->assertEqual($result, $expected);
+
+		$string = 'û';
+		$result = mb_strtoupper($string);
+		$expected = 'Û';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ü';
+		$result = mb_strtoupper($string);
+		$expected = 'Ü';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ý';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'þ';
+		$result = mb_strtoupper($string);
+		$expected = 'Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ';
+		$result = mb_strtoupper($string);
+		$expected = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä€';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ă';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä‚';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä…';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä„';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ć';
+		$result = mb_strtoupper($string);
+		$expected = 'Ć';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĉ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ĉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä‹';
+		$result = mb_strtoupper($string);
+		$expected = 'ÄŠ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtoupper($string);
+		$expected = 'Č';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtoupper($string);
+		$expected = 'ÄŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä‘';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä“';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä•';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä”';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä—';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä–';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä™';
+		$result = mb_strtoupper($string);
+		$expected = 'Ę';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä›';
+		$result = mb_strtoupper($string);
+		$expected = 'Äš';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtoupper($string);
+		$expected = 'Ĝ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÄŸ';
+		$result = mb_strtoupper($string);
+		$expected = 'Äž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¡';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä£';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä¢';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¥';
+		$result = mb_strtoupper($string);
+		$expected = 'Ĥ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ħ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ħ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä©';
+		$result = mb_strtoupper($string);
+		$expected = 'Ĩ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä«';
+		$result = mb_strtoupper($string);
+		$expected = 'Ī';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä­';
+		$result = mb_strtoupper($string);
+		$expected = 'Ĭ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'į';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä®';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ij';
+		$result = mb_strtoupper($string);
+		$expected = 'IJ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĵ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä·';
+		$result = mb_strtoupper($string);
+		$expected = 'Ķ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĺ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ĺ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ļ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä»';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ľ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ľ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å€';
+		$result = mb_strtoupper($string);
+		$expected = 'Ä¿';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å‚';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å„';
+		$result = mb_strtoupper($string);
+		$expected = 'Ń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ņ';
+		$result = mb_strtoupper($string);
+		$expected = 'Å…';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ň';
+		$result = mb_strtoupper($string);
+		$expected = 'Ň';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å‹';
+		$result = mb_strtoupper($string);
+		$expected = 'ÅŠ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtoupper($string);
+		$expected = 'Ō';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtoupper($string);
+		$expected = 'ÅŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å‘';
+		$result = mb_strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å“';
+		$result = mb_strtoupper($string);
+		$expected = 'Å’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å•';
+		$result = mb_strtoupper($string);
+		$expected = 'Å”';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å—';
+		$result = mb_strtoupper($string);
+		$expected = 'Å–';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å™';
+		$result = mb_strtoupper($string);
+		$expected = 'Ř';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å›';
+		$result = mb_strtoupper($string);
+		$expected = 'Åš';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = mb_strtoupper($string);
+		$expected = 'Ŝ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÅŸ';
+		$result = mb_strtoupper($string);
+		$expected = 'Åž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å¡';
+		$result = mb_strtoupper($string);
+		$expected = 'Å ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å£';
+		$result = mb_strtoupper($string);
+		$expected = 'Å¢';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å¥';
+		$result = mb_strtoupper($string);
+		$expected = 'Ť';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ŧ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ŧ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å©';
+		$result = mb_strtoupper($string);
+		$expected = 'Ũ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å«';
+		$result = mb_strtoupper($string);
+		$expected = 'Ū';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å­';
+		$result = mb_strtoupper($string);
+		$expected = 'Ŭ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ů';
+		$result = mb_strtoupper($string);
+		$expected = 'Å®';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ű';
+		$result = mb_strtoupper($string);
+		$expected = 'Å°';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ų';
+		$result = mb_strtoupper($string);
+		$expected = 'Ų';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ŵ';
+		$result = mb_strtoupper($string);
+		$expected = 'Å´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å·';
+		$result = mb_strtoupper($string);
+		$expected = 'Ŷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ź';
+		$result = mb_strtoupper($string);
+		$expected = 'Ź';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ż';
+		$result = mb_strtoupper($string);
+		$expected = 'Å»';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ž';
+		$result = mb_strtoupper($string);
+		$expected = 'Ž';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ăąćĉċ��đēĕėęě�ğġģĥħĩīĭįijĵķĺļľŀłńņňŋ��őœŕŗřś�şšţťŧũūŭůűųŵŷźżž';
+		$result = mb_strtoupper($string);
+		$expected = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = mb_strtoupper($string);
+		$expected = 'ĤĒĹĻŎ, Ŵ�ŘĻĎ!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ἀι';
+		$result = mb_strtoupper($string);
+		$expected = 'ἈΙ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ô�ÔƒÔ…Ô‡Ô‰Ô‹Ô�Ô�Ô�Ô’';
+		$result = mb_strtoupper($string);
+		$expected = 'ԀԂԄԆԈԊԌԎ�Ԓ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Õ¡Õ¢Õ£Õ¤Õ¥Õ¦Õ§Õ¨Õ©ÕªÕ«Õ¬Õ­Õ®Õ¯Õ°Õ±Õ²Õ³Õ´ÕµÕ¶Õ·Õ¸Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿Ö€Ö�Ö‚ÖƒÖ„Ö…Ö†Ö‡';
+		$result = mb_strtoupper($string);
+		$expected = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�ՂՃՄՅՆՇՈՉՊՋՌ�Վ��ՑՒՓՔՕՖև';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$result = mb_strtoupper($string);
+		$expected = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ḃḅḇḉḋ��ḑḓḕḗḙḛ�ḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿ�ṃṅṇṉṋ��ṑṓṕṗṙṛ�ṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿ�ẃẅẇẉẋ��ẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽế�ểễệỉị��ốồổỗộớ�ởỡợụủứừửữựỳỵỷỹ';
+		$result = mb_strtoupper($string);
+		$expected = 'ḀḂḄḆḈḊḌḎ�ḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎ�ṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎ�ẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎ�ỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ωkå';
+		$result = mb_strtoupper($string);
+		$expected = 'ΩKÅ';
+		$this->assertEqual($result, $expected);
+
+/*
+mb_strtoupper does not work for these strings.
+
+		$string = 'ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅺⅻⅼⅽⅾⅿↄ';
+		$result = mb_strtoupper($string);
+		$expected = 'ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯↃ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜ�ⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ';
+		$result = mb_strtoupper($string);
+		$expected = 'ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀ�ⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌ�Ⓨ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⰰⰱⰲⰳⰴⰵⰶⰷⰸⰹⰺⰻⰼⰽⰾⰿⱀ�ⱂⱃⱄⱅⱆⱇⱈⱉⱊⱋⱌ�ⱎ��ⱑⱒⱓⱔⱕⱖⱗⱘⱙⱚⱛⱜ�ⱞ';
+		$result = mb_strtoupper($string);
+		$expected = 'Ⰰ�ⰂⰃⰄⰅⰆⰇⰈⰉⰊⰋⰌ�Ⰾ��ⰑⰒⰓⰔⰕⰖⰗⰘⰙⰚⰛⰜ�ⰞⰟⰠⰡⰢⰣⰤⰥⰦⰧⰨⰩⰪⰫⰬⰭⰮ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ⲃⲅⲇⲉⲋ��ⲑⲓⲕⲗⲙⲛ�ⲟⲡⲣⲥⲧⲩⲫⲭⲯⲱⲳⲵⲷⲹⲻⲽⲿ�ⳃⳅⳇⳉⳋ��ⳑⳓⳕⳗⳙⳛ�ⳟⳡⳣ';
+		$result = mb_strtoupper($string);
+		$expected = 'ⲀⲂⲄⲆⲈⲊⲌⲎ�ⲒⲔⲖⲘⲚⲜⲞⲠⲢⲤⲦⲨⲪⲬⲮⲰⲲⲴⲶⲸⲺⲼⲾⳀⳂⳄⳆⳈⳊⳌⳎ�ⳒⳔⳖⳘⳚⳜⳞⳠⳢ';
+		$this->assertEqual($result, $expected);
+*/
+		$string = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$result = mb_strtoupper($string);
+		$expected = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteStrtoupper method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteStrtoupper() {
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = Multibyte::strtoupper($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`ABCDEFGHIJKLMNOPQRSTUVWXYZ{|}~';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$result = Multibyte::strtoupper($string);
+		$expected = '!"#$%&\'()*+,-./0123456789:;<=>?@';
+		$this->assertEqual($result, $expected);
+
+		$string = 'à';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'À';
+		$this->assertEqual($result, $expected);
+
+		$string = 'á';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'â';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Â';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ã';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ã';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ä';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ã¥';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ã…';
+		$this->assertEqual($result, $expected);
+
+		$string = 'æ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Æ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ç';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ç';
+		$this->assertEqual($result, $expected);
+
+		$string = 'è';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'È';
+		$this->assertEqual($result, $expected);
+
+		$string = 'é';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'É';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ê';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ê';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ë';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ë';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ì';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ì';
+		$this->assertEqual($result, $expected);
+
+		$string = 'í';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'î';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ÃŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ï';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ð';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ñ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ñ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ò';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ã’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ó';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ó';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ô';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ô';
+		$this->assertEqual($result, $expected);
+
+		$string = 'õ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Õ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ö';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ö';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ø';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ø';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ù';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ù';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ú';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ú';
+		$this->assertEqual($result, $expected);
+
+		$string = 'û';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Û';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ü';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ü';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ý';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'þ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'àáâãäåæçèéêëìíîïðñòóôõöøùúûüýþ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä€';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ă';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä‚';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä…';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä„';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ć';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ć';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĉ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ĉ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä‹';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ÄŠ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Č';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ÄŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä‘';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä“';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä•';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä”';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä—';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä–';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä™';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ę';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä›';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Äš';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ĝ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÄŸ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Äž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¡';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä£';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä¢';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä¥';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ĥ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ħ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ħ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä©';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ĩ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä«';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ī';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä­';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ĭ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'į';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä®';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ij';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'IJ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĵ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ä·';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ķ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĺ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ĺ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ļ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä»';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ľ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ľ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å€';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ä¿';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å‚';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å„';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ń';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ņ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å…';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ň';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ň';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å‹';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ÅŠ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ō';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ÅŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å‘';
+		$result = Multibyte::strtoupper($string);
+		$expected = '�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å“';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å’';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å•';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å”';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å—';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å–';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å™';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ř';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å›';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Åš';
+		$this->assertEqual($result, $expected);
+
+		$string = '�';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ŝ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÅŸ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Åž';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å¡';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å£';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å¢';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å¥';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ť';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ŧ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ŧ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å©';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ũ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å«';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ū';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å­';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ŭ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ů';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å®';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ű';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å°';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ų';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ų';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ŵ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å´';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Å·';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ŷ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ź';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ź';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ż';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Å»';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ž';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ž';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ăąćĉċ��đēĕėęě�ğġģĥħĩīĭįijĵķĺļľŀłńņňŋ��őœŕŗřś�şšţťŧũūŭůűųŵŷźżž';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ĤĒĹĻŎ, Ŵ�ŘĻĎ!';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ἀι';
+		$result = mb_strtoupper($string);
+		$expected = 'ἈΙ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ἀι';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ἈΙ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ô�ÔƒÔ…Ô‡Ô‰Ô‹Ô�Ô�Ô�Ô’';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ԀԂԄԆԈԊԌԎ�Ԓ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Õ¡Õ¢Õ£Õ¤Õ¥Õ¦Õ§Õ¨Õ©ÕªÕ«Õ¬Õ­Õ®Õ¯Õ°Õ±Õ²Õ³Õ´ÕµÕ¶Õ·Õ¸Õ¹ÕºÕ»Õ¼Õ½Õ¾Õ¿Ö€Ö�Ö‚ÖƒÖ„Ö…Ö†Ö‡';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀ�ՂՃՄՅՆՇՈՉՊՋՌ�Վ��ՑՒՓՔՕՖև';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀ�ჂჃჄჅ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ḃḅḇḉḋ��ḑḓḕḗḙḛ�ḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿ�ṃṅṇṉṋ��ṑṓṕṗṙṛ�ṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿ�ẃẅẇẉẋ��ẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽế�ểễệỉị��ốồổỗộớ�ởỡợụủứừửữựỳỵỷỹ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ḀḂḄḆḈḊḌḎ�ḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎ�ṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎ�ẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎ�ỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ωkåⅎ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ΩKÅℲ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ωkå';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ΩKÅ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹⅺⅻⅼⅽⅾⅿↄ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯↃ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜ�ⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ⒶⒷⒸⒹⒺⒻⒼⒽⒾⒿⓀ�ⓂⓃⓄⓅⓆⓇⓈⓉⓊⓋⓌ�Ⓨ�';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ⰰⰱⰲⰳⰴⰵⰶⰷⰸⰹⰺⰻⰼⰽⰾⰿⱀ�ⱂⱃⱄⱅⱆⱇⱈⱉⱊⱋⱌ�ⱎ��ⱑⱒⱓⱔⱕⱖⱗⱘⱙⱚⱛⱜ�ⱞ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'Ⰰ�ⰂⰃⰄⰅⰆⰇⰈⰉⰊⰋⰌ�Ⰾ��ⰑⰒⰓⰔⰕⰖⰗⰘⰙⰚⰛⰜ�ⰞⰟⰠⰡⰢⰣⰤⰥⰦⰧⰨⰩⰪⰫⰬⰭⰮ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ⲃⲅⲇⲉⲋ��ⲑⲓⲕⲗⲙⲛ�ⲟⲡⲣⲥⲧⲩⲫⲭⲯⲱⲳⲵⲷⲹⲻⲽⲿ�ⳃⳅⳇⳉⳋ��ⳑⳓⳕⳗⳙⳛ�ⳟⳡⳣ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ⲀⲂⲄⲆⲈⲊⲌⲎ�ⲒⲔⲖⲘⲚⲜⲞⲠⲢⲤⲦⲨⲪⲬⲮⲰⲲⲴⲶⲸⲺⲼⲾⳀⳂⳄⳆⳈⳊⳌⳎ�ⳒⳔⳖⳘⳚⳜⳞⳠⳢ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$result = Multibyte::strtoupper($string);
+		$expected = 'ff�flffifflſtstﬓﬔﬕﬖﬗ';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbSubstrCount method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbSubstrCount() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSFTUVWXYZ0F12345F6789';
+		$find = 'F';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÅÊËÌ�Î��ÑÒÓÔÅÕÖØÅÙÚÛÅÜ�Þ';
+		$find = 'Ã…';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÙÚÂÃÄÅÆÇÈÙÚÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�ÞÙÚ';
+		$find = 'ÙÚ';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊÅËÌ�Î��ÑÒÓÔÕÅÖØÅÙÚÅÛÜÅ�ÞÅ';
+		$find = 'Ã…';
+		$result = mb_substr_count($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĊĀĂĄĆĈĊČĎ�ĒĔĖĊĘĚĜĞĠĢĤĦĨĪĬĮĊIJĴĶĹĻĽĿ�ŃŅŇŊŌĊŎ�ŒŔŖŘŚŜŞŠŢĊŤŦŨŪŬŮŰĊŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_substr_count($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĊĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅĊŇŊŌŎ�ŒŔŖĊŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./012F34567F89:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghiFjklmnopqFrstuvwFxyz{|}~';
+		$find = 'F';
+		$result = mb_substr_count($string, $find);
+		$expected = 6;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥µ¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�µÂõÄÅÆǵÈ';
+		$find = 'µ';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�ÞßàáâãäåæçèéêëìíîïðñòóôÕÖõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉÕÖĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ÕÖĞğĠġĢģĤĥĦÕÖħĨĩĪīĬ';
+		$find = 'ÕÖ';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�ĵĶķĸĹŎ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšĵĶķĸĹŢţŤťŦŧŨũŪūŬŭŮůŰűŲųĵĶķĸĹŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'ĵĶķĸĹ';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƸƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJƸNjnj�ǎ��ǑǒǓƸǔǕǖǗǘǙǚƸǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƹƠơƢƣƤƥƦƧƨƩƹƪƫƬƭƮƯưƱƲƳƴƹƵƶƷƸƹƺƻƼƽƾƿǀ�ǂƹǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞʀɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʀʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʀʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʀʻʼ';
+		$find = 'Ê€';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�ЇЎ��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = mb_substr_count($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСРТУФХЦЧШЩЪЫЬРЭЮЯабРвгдежзийклРмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСрТУФХЦЧШЩЪЫрЬЭЮЯабвгдежзийклмнопрр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '�نقكلنمنهونىينًٌ�َ�';
+		$find = 'Ù†';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✿✴✵✶✷✸✿✹✺✻✼✽✾✿�������✿������������������������';
+		$find = '✿';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉�⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨�⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉�⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽤⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽤⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = mb_substr_count($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눺눻눼눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕눺눻눼뉖뉗뉘뉙뉚뉛뉜�눺눻눼뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눺눻눼';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺞﺟﺠﺡﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺞﺟﺠﺡﺆﺇﺞﺟﺠﺡﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞﺟﺠﺡ';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﻞﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻞﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻞﻸﻹﻺﻞﻻﻼ';
+		$find = 'ﻞ';
+		$result = mb_substr_count($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｋｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｋｙｚ';
+		$find = 'ｋ';
+		$result = mb_substr_count($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｋｌ�ｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｋｌ�ｗｘｙｚ';
+		$find = 'ｋｌ�';
+		$result = mb_substr_count($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄ��ｅｆｇｈｉｊｋｌ�ｎ���ｑｒｓｔｕｖｗｘｙｚ';
+		$find = '��ｅ';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'ĺļ';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = mb_substr_count($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rl';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ni�ini�iini';
+		$find = 'n';
+		$result = mb_substr_count($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moćimoćimoćmćioći';
+		$find = 'ći';
+		$result = mb_substr_count($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = mb_substr_count($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'H';
+		$result = mb_substr_count($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteSubstrCount method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteSubstrCount() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$find = 'F';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ABCDEFGHIJKLMNOPQFRSFTUVWXYZ0F12345F6789';
+		$find = 'F';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÅÊËÌ�Î��ÑÒÓÔÅÕÖØÅÙÚÛÅÜ�Þ';
+		$find = 'Ã…';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÙÚÂÃÄÅÆÇÈÙÚÉÊËÌ�Î��ÑÒÓÔÕÖØÅÙÚÛÜ�ÞÙÚ';
+		$find = 'ÙÚ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊÅËÌ�Î��ÑÒÓÔÕÅÖØÅÙÚÅÛÜÅ�ÞÅ';
+		$find = 'Ã…';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĊĀĂĄĆĈĊČĎ�ĒĔĖĊĘĚĜĞĠĢĤĦĨĪĬĮĊIJĴĶĹĻĽĿ�ŃŅŇŊŌĊŎ�ŒŔŖŘŚŜŞŠŢĊŤŦŨŪŬŮŰĊŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĊĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ĊŃŅĊŇŊŌŎ�ŒŔŖĊŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./012F34567F89:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghiFjklmnopqFrstuvwFxyz{|}~';
+		$find = 'F';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 6;
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥µ¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�µÂõÄÅÆǵÈ';
+		$find = 'µ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�ÞßàáâãäåæçèéêëìíîïðñòóôÕÖõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉÕÖĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ÕÖĞğĠġĢģĤĥĦÕÖħĨĩĪīĬ';
+		$find = 'ÕÖ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�ĵĶķĸĹŎ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšĵĶķĸĹŢţŤťŦŧŨũŪūŬŭŮůŰűŲųĵĶķĸĹŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$find = 'ĵĶķĸĹ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƸƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJƸNjnj�ǎ��ǑǒǓƸǔǕǖǗǘǙǚƸǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'Ƹ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƹƠơƢƣƤƥƦƧƨƩƹƪƫƬƭƮƯưƱƲƳƴƹƵƶƷƸƹƺƻƼƽƾƿǀ�ǂƹǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$find = 'ƹ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞʀɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʀʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʀʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʀʻʼ';
+		$find = 'Ê€';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�ЇЎ��БВГДЕЖЗИЙКЛ';
+		$find = 'Ї';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСРТУФХЦЧШЩЪЫЬРЭЮЯабРвгдежзийклРмнопр�туфхцчшщъыь';
+		$find = 'Р';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСрТУФХЦЧШЩЪЫрЬЭЮЯабвгдежзийклмнопрр�туфхцчшщъыь';
+		$find = 'Ñ€';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '�نقكلنمنهونىينًٌ�َ�';
+		$find = 'Ù†';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✿✴✵✶✷✸✿✹✺✻✼✽✾✿�������✿������������������������';
+		$find = '✿';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉�⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨�⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉�⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$find = '�';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽤⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽤⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$find = '⽤';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눺눻눼눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕눺눻눼뉖뉗뉘뉙뉚뉛뉜�눺눻눼뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$find = '눺눻눼';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺞﺟﺠﺡﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺞﺟﺠﺡﺆﺇﺞﺟﺠﺡﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$find = 'ﺞﺟﺠﺡ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﻞﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻞﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻞﻸﻹﻺﻞﻻﻼ';
+		$find = 'ﻞ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｋｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｋｙｚ';
+		$find = 'ｋ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｋｌ�ｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｋｌ�ｗｘｙｚ';
+		$find = 'ｋｌ�';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄ��ｅｆｇｈｉｊｋｌ�ｎ���ｑｒｓｔｕｖｗｘｙｚ';
+		$find = '��ｅ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$find = 'ï½±';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$find = 'ﾊ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'Å‘';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'ĺļ';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'o';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 2;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$find = 'rl';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$find = 'n';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'ni�ini�iini';
+		$find = 'n';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 3;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$find = 'ć';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'moćimoćimoćmćioći';
+		$find = 'ći';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$find = 'ž';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$find = '设';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$find = '周';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = 1;
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$find = 'H';
+		$result = Multibyte::substrCount($string, $find);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUsingMbSubstr method
+ *
+ * @access public
+ * @return void
+ */
+	function testUsingMbSubstr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$result = mb_substr($string, 4, 7);
+		$expected = 'EFGHIJK';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$result = mb_substr($string, 4, 7);
+		$expected = 'ÄÅÆÇÈÉÊ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = mb_substr($string, 4, 7);
+		$expected = 'ĈĊČĎ�ĒĔ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = mb_substr($string, 4, 7);
+		$expected = '%&\'()*+';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$result = mb_substr($string, 4);
+		$expected = '¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$result = mb_substr($string, 4, 7);
+		$expected = '�Î��ÑÒÓ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$result = mb_substr($string, 4, 7);
+		$expected = 'ıIJijĴĵĶķ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$result = mb_substr($string, 25);
+		$expected = 'ƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$result = mb_substr($string, 3);
+		$expected = 'ɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$result = mb_substr($string, 3);
+		$expected = 'ЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$result = mb_substr($string, 3, 16);
+		$expected = 'ПРСТУФХЦЧШЩЪЫЬЭЮ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$result = mb_substr($string, 3, 6);
+		$expected = 'لمنهوى';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$result = mb_substr($string, 6, 14);
+		$expected = '✶✷✸✹✺✻✼✽✾✿����';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$result = mb_substr($string, 8, 13);
+		$expected = '⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$result = mb_substr($string, 12, 24);
+		$expected = '⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$result = mb_substr($string, 12, 24);
+		$expected = '눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$result = mb_substr($string, 12);
+		$expected = 'ﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$result = mb_substr($string, 24, 12);
+		$expected = 'ﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$result = mb_substr($string, 11, 2);
+		$expected = 'ｌ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$result = mb_substr($string, 7, 11);
+		$expected = 'ｨｩｪｫｬｭｮｯｰｱｲ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$result = mb_substr($string, 13, 13);
+		$expected = 'ﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = mb_substr($string, 3, 4);
+		$expected = 'ļ�, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$result = mb_substr($string, 3, 4);
+		$expected = 'lo, ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$result = mb_substr($string, 3);
+		$expected = 'i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$result = mb_substr($string, 1);
+		$expected = 'oći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$result = mb_substr($string, 0, 2);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$result = mb_substr($string, 3, 3);
+		$expected = '设为首';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = mb_substr($string, 0, 1);
+		$expected = '一';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = mb_substr($string, 6);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = mb_substr($string, 0);
+		$expected = '一二三周永�';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteSubstr method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteSubstr() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$result = Multibyte::substr($string, 4, 7);
+		$expected = 'EFGHIJK';
+		$this->assertEqual($result, $expected);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$result = Multibyte::substr($string, 4, 7);
+		$expected = 'ÄÅÆÇÈÉÊ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$find = 'ÄŠ';
+		$result = Multibyte::substr($string, 4, 7);
+		$expected = 'ĈĊČĎ�ĒĔ';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = Multibyte::substr($string, 4, 7);
+		$expected = '%&\'()*+';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$result = Multibyte::substr($string, 4);
+		$expected = '¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$result = Multibyte::substr($string, 4, 7);
+		$expected = '�Î��ÑÒÓ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$result = Multibyte::substr($string, 4, 7);
+		$expected = 'ıIJijĴĵĶķ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$result = Multibyte::substr($string, 25);
+		$expected = 'ƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$result = Multibyte::substr($string, 3);
+		$expected = 'ɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$result = Multibyte::substr($string, 3);
+		$expected = 'ЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$result = Multibyte::substr($string, 3, 16);
+		$expected = 'ПРСТУФХЦЧШЩЪЫЬЭЮ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$result = Multibyte::substr($string, 3, 6);
+		$expected = 'لمنهوى';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$result = Multibyte::substr($string, 6, 14);
+		$expected = '✶✷✸✹✺✻✼✽✾✿����';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$result = Multibyte::substr($string, 8, 13);
+		$expected = '⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$result = Multibyte::substr($string, 12, 24);
+		$expected = '⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$result = Multibyte::substr($string, 12, 24);
+		$expected = '눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$result = Multibyte::substr($string, 12);
+		$expected = 'ﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$result = Multibyte::substr($string, 24, 12);
+		$expected = 'ﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$result = Multibyte::substr($string, 11, 2);
+		$expected = 'ｌ�';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$result = Multibyte::substr($string, 7, 11);
+		$expected = 'ｨｩｪｫｬｭｮｯｰｱｲ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$result = Multibyte::substr($string, 13, 13);
+		$expected = 'ﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = Multibyte::substr($string, 3, 4);
+		$expected = 'ļ�, ';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$result = Multibyte::substr($string, 3, 4);
+		$expected = 'lo, ';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ini';
+		$result = Multibyte::substr($string, 3);
+		$expected = 'i';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$result = Multibyte::substr($string, 1);
+		$expected = 'oći';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$result = Multibyte::substr($string, 0, 2);
+		$expected = 'dr';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$result = Multibyte::substr($string, 3, 3);
+		$expected = '设为首';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = Multibyte::substr($string, 0, 1);
+		$expected = '一';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = Multibyte::substr($string, 6);
+		$expected = false;
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = Multibyte::substr($string, 0);
+		$expected = '一二三周永�';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMultibyteSubstr method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultibyteMimeEncode() {
+		$string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+		$result = Multibyte::mimeEncode($string);
+		$this->assertEqual($result, $string);
+
+		$string = 'À�ÂÃÄÅÆÇÈÉÊËÌ�Î��ÑÒÓÔÕÖØÙÚÛÜ�Þ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5U=?=' . "\r\n" .
+					' =?UTF-8?B?w5bDmMOZw5rDm8Ocw53Dng==?=';
+		$this->assertEqual($result, $expected);
+		$result = Multibyte::mimeEncode($string, null, "\n");
+		$expected = '=?UTF-8?B?w4DDgcOCw4PDhMOFw4bDh8OIw4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5U=?=' . "\n" .
+					' =?UTF-8?B?w5bDmMOZw5rDm8Ocw53Dng==?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĀĂĄĆĈĊČĎ�ĒĔĖĘĚĜĞĠĢĤĦĨĪĬĮIJĴĶĹĻĽĿ�ŃŅŇŊŌŎ�ŒŔŖŘŚŜŞŠŢŤŦŨŪŬŮŰŲŴŶŹŻŽ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?xIDEgsSExIbEiMSKxIzEjsSQxJLElMSWxJjEmsScxJ7EoMSixKTEpsSoxKo=?=' . "\r\n" .
+					' =?UTF-8?B?xKzErsSyxLTEtsS5xLvEvcS/xYHFg8WFxYfFisWMxY7FkMWSxZTFlsWYxZo=?=' . "\r\n" .
+					' =?UTF-8?B?xZzFnsWgxaLFpMWmxajFqsWsxa7FsMWyxbTFtsW5xbvFvQ==?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '!"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?ISIjJCUmJygpKissLS4vMDEyMzQ1Njc4OTo7PD0+P0BBQkNERUZHSElKS0xN?=' . "\r\n" .
+					' =?UTF-8?B?Tk9QUVJTVFVWV1hZWltcXV5fYGFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6?=' . "\r\n" .
+					' =?UTF-8?B?e3x9fg==?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿À�ÂÃÄÅÆÇÈ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?wqHCosKjwqTCpcKmwqfCqMKpwqrCq8Kswq3CrsKvwrDCscKywrPCtMK1wrY=?=' . "\r\n" .
+					' =?UTF-8?B?wrfCuMK5wrrCu8K8wr3CvsK/w4DDgcOCw4PDhMOFw4bDh8OI?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ÉÊËÌ�Î��ÑÒÓÔÕÖ×ØÙÚÛÜ�Þßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀ�Ă㥹ĆćĈĉĊċČ�Ď��đĒēĔĕĖėĘęĚěĜ�ĞğĠġĢģĤĥĦħĨĩĪīĬ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?w4nDisOLw4zDjcOOw4/DkMORw5LDk8OUw5XDlsOXw5jDmcOaw5vDnMOdw54=?=' . "\r\n" .
+					' =?UTF-8?B?w5/DoMOhw6LDo8Okw6XDpsOnw6jDqcOqw6vDrMOtw67Dr8Oww7HDssOzw7Q=?=' . "\r\n" .
+					' =?UTF-8?B?w7XDtsO3w7jDucO6w7vDvMO9w77Dv8SAxIHEgsSDxITEhcSGxIfEiMSJxIo=?=' . "\r\n" .
+					' =?UTF-8?B?xIvEjMSNxI7Ej8SQxJHEksSTxJTElcSWxJfEmMSZxJrEm8ScxJ3EnsSfxKA=?=' . "\r\n" .
+					' =?UTF-8?B?xKHEosSjxKTEpcSmxKfEqMSpxKrEq8Ss?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀ�łŃńŅņŇňʼnŊŋŌ�Ŏ��őŒœŔŕŖŗŘřŚśŜ�ŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƀ�ƂƃƄƅƆƇƈƉƊƋƌ�Ǝ��';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?xK3ErsSvxLDEscSyxLPEtMS1xLbEt8S4xLnEusS7xLzEvcS+xL/FgMWBxYI=?=' . "\r\n" .
+					' =?UTF-8?B?xYPFhMWFxYbFh8WIxYnFisWLxYzFjcWOxY/FkMWRxZLFk8WUxZXFlsWXxZg=?=' . "\r\n" .
+					' =?UTF-8?B?xZnFmsWbxZzFncWexZ/FoMWhxaLFo8WkxaXFpsWnxajFqcWqxavFrMWtxa4=?=' . "\r\n" .
+					' =?UTF-8?B?xa/FsMWxxbLFs8W0xbXFtsW3xbjFucW6xbvFvMW9xb7Fv8aAxoHGgsaDxoQ=?=' . "\r\n" .
+					' =?UTF-8?B?xoXGhsaHxojGicaKxovGjMaNxo7Gj8aQ?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ƑƒƓƔƕƖƗƘƙƚƛƜ�ƞƟƠơƢƣƤƥƦƧƨƩƪƫƬƭƮƯưƱƲƳƴƵƶƷƸƹƺƻƼƽƾƿǀ�ǂǃDŽDždžLJLjljNJNjnj�ǎ��ǑǒǓǔǕǖǗǘǙǚǛǜ�ǞǟǠǡǢǣǤǥǦǧǨǩǪǫǬǭǮǯǰDZDzdzǴ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?xpHGksaTxpTGlcaWxpfGmMaZxprGm8acxp3GnsafxqDGocaixqPGpMalxqY=?=' . "\r\n" .
+					' =?UTF-8?B?xqfGqMapxqrGq8asxq3GrsavxrDGscayxrPGtMa1xrbGt8a4xrnGusa7xrw=?=' . "\r\n" .
+					' =?UTF-8?B?xr3Gvsa/x4DHgceCx4PHhMeFx4bHh8eIx4nHiseLx4zHjceOx4/HkMeRx5I=?=' . "\r\n" .
+					' =?UTF-8?B?x5PHlMeVx5bHl8eYx5nHmsebx5zHnceex5/HoMehx6LHo8ekx6XHpsenx6g=?=' . "\r\n" .
+					' =?UTF-8?B?x6nHqserx6zHrceux6/HsMexx7LHs8e0?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'əɚɛɜ�ɞɟɠɡɢɣɤɥɦɧɨɩɪɫɬɭɮɯɰɱɲɳɴɵɶɷɸɹɺɻɼɽɾɿʀ�ʂʃʄʅʆʇʈʉʊʋʌ�ʎ��ʑʒʓʔʕʖʗʘʙʚʛʜ�ʞʟʠʡʢʣʤʥʦʧʨʩʪʫʬʭʮʯʰʱʲʳʴʵʶʷʸʹʺʻʼ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?yZnJmsmbyZzJncmeyZ/JoMmhyaLJo8mkyaXJpsmnyajJqcmqyavJrMmtya4=?=' . "\r\n" .
+					' =?UTF-8?B?ya/JsMmxybLJs8m0ybXJtsm3ybjJucm6ybvJvMm9yb7Jv8qAyoHKgsqDyoQ=?=' . "\r\n" .
+					' =?UTF-8?B?yoXKhsqHyojKicqKyovKjMqNyo7Kj8qQypHKksqTypTKlcqWypfKmMqZypo=?=' . "\r\n" .
+					' =?UTF-8?B?ypvKnMqdyp7Kn8qgyqHKosqjyqTKpcqmyqfKqMqpyqrKq8qsyq3KrsqvyrA=?=' . "\r\n" .
+					' =?UTF-8?B?yrHKssqzyrTKtcq2yrfKuMq5yrrKu8q8?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ѐ�ЂЃЄЅІЇЈЉЊЋЌ�Ў��БВГДЕЖЗИЙКЛ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?0IDQgdCC0IPQhNCF0IbQh9CI0InQitCL0IzQjdCO0I/QkNCR0JLQk9CU0JU=?=' . "\r\n" .
+					' =?UTF-8?B?0JbQl9CY0JnQmtCb?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'М�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?0JzQndCe0J/QoNCh0KLQo9Ck0KXQptCn0KjQqdCq0KvQrNCt0K7Qr9Cw0LE=?=' . "\r\n" .
+					' =?UTF-8?B?0LLQs9C00LXQttC30LjQudC60LvQvNC90L7Qv9GA0YHRgtGD0YTRhdGG0Yc=?=' . "\r\n" .
+					' =?UTF-8?B?0YjRidGK0YvRjA==?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '�قكلمنهوىيًٌ�َ�';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?2YHZgtmD2YTZhdmG2YfZiNmJ2YrZi9mM2Y3ZjtmP?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '✰✱✲✳✴✵✶✷✸✹✺✻✼✽✾✿�������������������������������';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?4pyw4pyx4pyy4pyz4py04py14py24py34py44py54py64py74py84py94py+?=' . "\r\n" .
+					' =?UTF-8?B?4py/4p2A4p2B4p2C4p2D4p2E4p2F4p2G4p2H4p2I4p2J4p2K4p2L4p2M4p2N?=' . "\r\n" .
+					' =?UTF-8?B?4p2O4p2P4p2Q4p2R4p2S4p2T4p2U4p2V4p2W4p2X4p2Y4p2Z4p2a4p2b4p2c?=' . "\r\n" .
+					' =?UTF-8?B?4p2d4p2e?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '⺀�⺂⺃⺄⺅⺆⺇⺈⺉⺊⺋⺌�⺎��⺑⺒⺓⺔⺕⺖⺗⺘⺙⺛⺜�⺞⺟⺠⺡⺢⺣⺤⺥⺦⺧⺨⺩⺪⺫⺬⺭⺮⺯⺰⺱⺲⺳⺴⺵⺶⺷⺸⺹⺺⺻⺼⺽⺾⺿⻀�⻂⻃⻄⻅⻆⻇⻈⻉⻊⻋⻌�⻎��⻑⻒⻓⻔⻕⻖⻗⻘⻙⻚⻛⻜�⻞⻟⻠';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?4rqA4rqB4rqC4rqD4rqE4rqF4rqG4rqH4rqI4rqJ4rqK4rqL4rqM4rqN4rqO?=' . "\r\n" .
+					' =?UTF-8?B?4rqP4rqQ4rqR4rqS4rqT4rqU4rqV4rqW4rqX4rqY4rqZ4rqb4rqc4rqd4rqe?=' . "\r\n" .
+					' =?UTF-8?B?4rqf4rqg4rqh4rqi4rqj4rqk4rql4rqm4rqn4rqo4rqp4rqq4rqr4rqs4rqt?=' . "\r\n" .
+					' =?UTF-8?B?4rqu4rqv4rqw4rqx4rqy4rqz4rq04rq14rq24rq34rq44rq54rq64rq74rq8?=' . "\r\n" .
+					' =?UTF-8?B?4rq94rq+4rq/4ruA4ruB4ruC4ruD4ruE4ruF4ruG4ruH4ruI4ruJ4ruK4ruL?=' . "\r\n" .
+					' =?UTF-8?B?4ruM4ruN4ruO4ruP4ruQ4ruR4ruS4ruT4ruU4ruV4ruW4ruX4ruY4ruZ4rua?=' . "\r\n" .
+					' =?UTF-8?B?4rub4ruc4rud4rue4ruf4rug?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '⽅⽆⽇⽈⽉⽊⽋⽌�⽎��⽑⽒⽓⽔⽕⽖⽗⽘⽙⽚⽛⽜�⽞⽟⽠⽡⽢⽣⽤⽥⽦⽧⽨⽩⽪⽫⽬⽭⽮⽯⽰⽱⽲⽳⽴⽵⽶⽷⽸⽹⽺⽻⽼⽽⽾⽿';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?4r2F4r2G4r2H4r2I4r2J4r2K4r2L4r2M4r2N4r2O4r2P4r2Q4r2R4r2S4r2T?=' . "\r\n" .
+					' =?UTF-8?B?4r2U4r2V4r2W4r2X4r2Y4r2Z4r2a4r2b4r2c4r2d4r2e4r2f4r2g4r2h4r2i?=' . "\r\n" .
+					' =?UTF-8?B?4r2j4r2k4r2l4r2m4r2n4r2o4r2p4r2q4r2r4r2s4r2t4r2u4r2v4r2w4r2x?=' . "\r\n" .
+					' =?UTF-8?B?4r2y4r2z4r204r214r224r234r244r254r264r274r284r294r2+4r2/?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '눡눢눣눤눥눦눧눨눩눪눫눬눭눮눯눰눱눲눳눴눵눶눷눸눹눺눻눼눽눾눿뉀�뉂뉃뉄뉅뉆뉇뉈뉉뉊뉋뉌�뉎��뉑뉒뉓뉔뉕뉖뉗뉘뉙뉚뉛뉜�뉞뉟뉠뉡뉢뉣뉤뉥뉦뉧뉨뉩뉪뉫뉬뉭뉮뉯뉰뉱뉲뉳뉴뉵뉶뉷뉸뉹뉺뉻뉼뉽뉾뉿늀�늂늃늄';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?64ih64ii64ij64ik64il64im64in64io64ip64iq64ir64is64it64iu64iv?=' . "\r\n" .
+					' =?UTF-8?B?64iw64ix64iy64iz64i064i164i264i364i464i564i664i764i864i964i+?=' . "\r\n" .
+					' =?UTF-8?B?64i/64mA64mB64mC64mD64mE64mF64mG64mH64mI64mJ64mK64mL64mM64mN?=' . "\r\n" .
+					' =?UTF-8?B?64mO64mP64mQ64mR64mS64mT64mU64mV64mW64mX64mY64mZ64ma64mb64mc?=' . "\r\n" .
+					' =?UTF-8?B?64md64me64mf64mg64mh64mi64mj64mk64ml64mm64mn64mo64mp64mq64mr?=' . "\r\n" .
+					' =?UTF-8?B?64ms64mt64mu64mv64mw64mx64my64mz64m064m164m264m364m464m564m6?=' . "\r\n" .
+					' =?UTF-8?B?64m764m864m964m+64m/64qA64qB64qC64qD64qE?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﹰﹱﹲﹳﹴ﹵ﹶﹷﹸﹹﹺﹻﹼﹽﹾﹿﺀ�ﺂﺃﺄﺅﺆﺇﺈﺉﺊﺋﺌ�ﺎ��ﺑﺒﺓﺔﺕﺖﺗﺘﺙﺚﺛﺜ�ﺞﺟﺠﺡﺢﺣﺤﺥﺦﺧﺨﺩﺪﺫﺬﺭﺮﺯﺰ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?77mw77mx77my77mz77m077m177m277m377m477m577m677m777m877m977m+?=' . "\r\n" .
+					' =?UTF-8?B?77m/77qA77qB77qC77qD77qE77qF77qG77qH77qI77qJ77qK77qL77qM77qN?=' . "\r\n" .
+					' =?UTF-8?B?77qO77qP77qQ77qR77qS77qT77qU77qV77qW77qX77qY77qZ77qa77qb77qc?=' . "\r\n" .
+					' =?UTF-8?B?77qd77qe77qf77qg77qh77qi77qj77qk77ql77qm77qn77qo77qp77qq77qr?=' . "\r\n" .
+					' =?UTF-8?B?77qs77qt77qu77qv77qw?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ﺱﺲﺳﺴﺵﺶﺷﺸﺹﺺﺻﺼﺽﺾﺿﻀ�ﻂﻃﻄﻅﻆﻇﻈﻉﻊﻋﻌ�ﻎ��ﻑﻒﻓﻔﻕﻖﻗﻘﻙﻚﻛﻜ�ﻞﻟﻠﻡﻢﻣﻤﻥﻦﻧﻨﻩﻪﻫﻬﻭﻮﻯﻰﻱﻲﻳﻴﻵﻶﻷﻸﻹﻺﻻﻼ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?77qx77qy77qz77q077q177q277q377q477q577q677q777q877q977q+77q/?=' . "\r\n" .
+					' =?UTF-8?B?77uA77uB77uC77uD77uE77uF77uG77uH77uI77uJ77uK77uL77uM77uN77uO?=' . "\r\n" .
+					' =?UTF-8?B?77uP77uQ77uR77uS77uT77uU77uV77uW77uX77uY77uZ77ua77ub77uc77ud?=' . "\r\n" .
+					' =?UTF-8?B?77ue77uf77ug77uh77ui77uj77uk77ul77um77un77uo77up77uq77ur77us?=' . "\r\n" .
+					' =?UTF-8?B?77ut77uu77uv77uw77ux77uy77uz77u077u177u277u377u477u577u677u7?=' . "\r\n" .
+					' =?UTF-8?B?77u8?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '�ｂｃｄｅｆｇｈｉｊｋｌ�ｎ��ｑｒｓｔｕｖｗｘｙｚ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?772B772C772D772E772F772G772H772I772J772K772L772M772N772O772P?=' . "\r\n" .
+					' =?UTF-8?B?772Q772R772S772T772U772V772W772X772Y772Z772a?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '｡｢｣､･ｦｧｨｩｪｫｬｭｮｯｰｱｲｳｴｵｶｷｸ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?772h772i772j772k772l772m772n772o772p772q772r772s772t772u772v?=' . "\r\n" .
+					' =?UTF-8?B?772w772x772y772z77207721772277237724?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'ｹｺｻｼｽｾｿﾀ�ﾂﾃﾄﾅﾆﾇﾈﾉﾊﾋﾌ�ﾎ��ﾑﾒﾓﾔﾕﾖﾗﾘﾙﾚﾛﾜ�ﾞ';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?77257726772777287729772+772/776A776B776C776D776E776F776G776H?=' . "\r\n" .
+					' =?UTF-8?B?776I776J776K776L776M776N776O776P776Q776R776S776T776U776V776W?=' . "\r\n" .
+					' =?UTF-8?B?776X776Y776Z776a776b776c776d776e?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Ĥēĺļ�, Ŵőřļ�!';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?xKTEk8S6xLzFjywgxbTFkcWZxLzEjyE=?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'Hello, World!';
+		$result = Multibyte::mimeEncode($string);
+		$this->assertEqual($result, $string);
+
+		$string = '�ini';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?xI1pbmk=?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'moći';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?bW/Eh2k=?=';
+		$this->assertEqual($result, $expected);
+
+		$string = 'državni';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?ZHLFvmF2bmk=?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '把百度设为首页';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?5oqK55m+5bqm6K6+5Li66aaW6aG1?=';
+		$this->assertEqual($result, $expected);
+
+		$string = '一二三周永�';
+		$result = Multibyte::mimeEncode($string);
+		$expected = '=?UTF-8?B?5LiA5LqM5LiJ5ZGo5rC46b6N?=';
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/object.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/object.test.php
new file mode 100644
index 000000000..36efe658c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/object.test.php
@@ -0,0 +1,866 @@
+<?php
+/**
+ * ObjectTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('Object', 'Controller', 'Model'));
+
+/**
+ * RequestActionPost class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.object
+ */
+class RequestActionPost extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'ControllerPost'
+ * @access public
+ */
+	var $name = 'RequestActionPost';
+
+/**
+ * useTable property
+ *
+ * @var string 'posts'
+ * @access public
+ */
+	var $useTable = 'posts';
+}
+
+/**
+ * RequestActionController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RequestActionController extends Controller {
+
+/**
+* uses property
+*
+* @var array
+* @access public
+*/
+	var $uses = array('RequestActionPost');
+
+/**
+* test_request_action method
+*
+* @access public
+* @return void
+*/
+	function test_request_action() {
+		return 'This is a test';
+	}
+
+/**
+* another_ra_test method
+*
+* @param mixed $id
+* @param mixed $other
+* @access public
+* @return void
+*/
+	function another_ra_test($id, $other) {
+		return $id + $other;
+	}
+
+/**
+ * normal_request_action method
+ *
+ * @access public
+ * @return void
+ */
+	function normal_request_action() {
+		return 'Hello World';
+	}
+
+/**
+ * returns $this->here
+ *
+ * @return void
+ */
+	function return_here() {
+		return $this->here;
+	}
+
+/**
+ * paginate_request_action method
+ *
+ * @access public
+ * @return void
+ */
+	function paginate_request_action() {
+		$data = $this->paginate();
+		return true;
+	}
+
+/**
+ * post pass, testing post passing
+ *
+ * @return array
+ */
+	function post_pass() {
+		return $this->data;
+	}
+
+/**
+ * test param passing and parsing.
+ *
+ * @return array
+ */
+	function params_pass() {
+		return $this->params;
+	}
+}
+
+/**
+ * RequestActionPersistentController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RequestActionPersistentController extends Controller {
+
+/**
+* uses property
+*
+* @var array
+* @access public
+*/
+	var $uses = array('PersisterOne');
+
+/**
+* persistModel property
+*
+* @var array
+* @access public
+*/
+	var $persistModel = true;
+
+/**
+ * post pass, testing post passing
+ *
+ * @return array
+ */
+	function index() {
+		return 'This is a test';
+	}
+}
+
+/**
+ * TestObject class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class TestObject extends Object {
+
+/**
+ * firstName property
+ *
+ * @var string 'Joel'
+ * @access public
+ */
+	var $firstName = 'Joel';
+
+/**
+ * lastName property
+ *
+ * @var string 'Moss'
+ * @access public
+ */
+	var $lastName = 'Moss';
+
+/**
+ * methodCalls property
+ *
+ * @var array
+ * @access public
+ */
+	var $methodCalls = array();
+
+/**
+ * emptyMethod method
+ *
+ * @access public
+ * @return void
+ */
+	function emptyMethod() {
+		$this->methodCalls[] = 'emptyMethod';
+	}
+
+/**
+ * oneParamMethod method
+ *
+ * @param mixed $param
+ * @access public
+ * @return void
+ */
+	function oneParamMethod($param) {
+		$this->methodCalls[] = array('oneParamMethod' => array($param));
+	}
+
+/**
+ * twoParamMethod method
+ *
+ * @param mixed $param
+ * @param mixed $param2
+ * @access public
+ * @return void
+ */
+	function twoParamMethod($param, $param2) {
+		$this->methodCalls[] = array('twoParamMethod' => array($param, $param2));
+	}
+
+/**
+ * threeParamMethod method
+ *
+ * @param mixed $param
+ * @param mixed $param2
+ * @param mixed $param3
+ * @access public
+ * @return void
+ */
+	function threeParamMethod($param, $param2, $param3) {
+		$this->methodCalls[] = array('threeParamMethod' => array($param, $param2, $param3));
+	}
+	/**
+ * fourParamMethod method
+ *
+ * @param mixed $param
+ * @param mixed $param2
+ * @param mixed $param3
+ * @param mixed $param4
+ * @access public
+ * @return void
+ */
+	function fourParamMethod($param, $param2, $param3, $param4) {
+		$this->methodCalls[] = array('fourParamMethod' => array($param, $param2, $param3, $param4));
+	}
+	/**
+ * fiveParamMethod method
+ *
+ * @param mixed $param
+ * @param mixed $param2
+ * @param mixed $param3
+ * @param mixed $param4
+ * @param mixed $param5
+ * @access public
+ * @return void
+ */
+	function fiveParamMethod($param, $param2, $param3, $param4, $param5) {
+		$this->methodCalls[] = array('fiveParamMethod' => array($param, $param2, $param3, $param4, $param5));
+	}
+
+/**
+ * crazyMethod method
+ *
+ * @param mixed $param
+ * @param mixed $param2
+ * @param mixed $param3
+ * @param mixed $param4
+ * @param mixed $param5
+ * @param mixed $param6
+ * @param mixed $param7
+ * @access public
+ * @return void
+ */
+	function crazyMethod($param, $param2, $param3, $param4, $param5, $param6, $param7 = null) {
+		$this->methodCalls[] = array('crazyMethod' => array($param, $param2, $param3, $param4, $param5, $param6, $param7));
+	}
+
+/**
+ * methodWithOptionalParam method
+ *
+ * @param mixed $param
+ * @access public
+ * @return void
+ */
+	function methodWithOptionalParam($param = null) {
+		$this->methodCalls[] = array('methodWithOptionalParam' => array($param));
+	}
+
+/**
+ * testPersist
+ *
+ * @return void
+ */
+	function testPersist($name, $return = null, &$object, $type = null) {
+		return $this->_persist($name, $return, $object, $type);
+	}
+}
+
+/**
+ * ObjectTestModel class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ObjectTestModel extends CakeTestModel {
+	var $useTable = false;
+	var $name = 'ObjectTestModel';
+}
+
+/**
+ * Object Test class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ObjectTest extends CakeTestCase {
+
+/**
+ * fixtures
+ *
+ * @var string
+ */
+	var $fixtures = array('core.post', 'core.test_plugin_comment', 'core.comment');
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->object = new TestObject();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->object);
+	}
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * testLog method
+ *
+ * @access public
+ * @return void
+ */
+	function testLog() {
+		@unlink(LOGS . 'error.log');
+		$this->assertTrue($this->object->log('Test warning 1'));
+		$this->assertTrue($this->object->log(array('Test' => 'warning 2')));
+		$result = file(LOGS . 'error.log');
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Test warning 1$/', $result[0]);
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Error: Array$/', $result[1]);
+		$this->assertPattern('/^\($/', $result[2]);
+		$this->assertPattern('/\[Test\] => warning 2$/', $result[3]);
+		$this->assertPattern('/^\)$/', $result[4]);
+		unlink(LOGS . 'error.log');
+
+		@unlink(LOGS . 'error.log');
+		$this->assertTrue($this->object->log('Test warning 1', LOG_WARNING));
+		$this->assertTrue($this->object->log(array('Test' => 'warning 2'), LOG_WARNING));
+		$result = file(LOGS . 'error.log');
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Test warning 1$/', $result[0]);
+		$this->assertPattern('/^2[0-9]{3}-[0-9]+-[0-9]+ [0-9]+:[0-9]+:[0-9]+ Warning: Array$/', $result[1]);
+		$this->assertPattern('/^\($/', $result[2]);
+		$this->assertPattern('/\[Test\] => warning 2$/', $result[3]);
+		$this->assertPattern('/^\)$/', $result[4]);
+		unlink(LOGS . 'error.log');
+	}
+
+/**
+ * testSet method
+ *
+ * @access public
+ * @return void
+ */
+	function testSet() {
+		$this->object->_set('a string');
+		$this->assertEqual($this->object->firstName, 'Joel');
+
+		$this->object->_set(array('firstName'));
+		$this->assertEqual($this->object->firstName, 'Joel');
+
+		$this->object->_set(array('firstName' => 'Ashley'));
+		$this->assertEqual($this->object->firstName, 'Ashley');
+
+		$this->object->_set(array('firstName' => 'Joel', 'lastName' => 'Moose'));
+		$this->assertEqual($this->object->firstName, 'Joel');
+		$this->assertEqual($this->object->lastName, 'Moose');
+	}
+
+/**
+ * testPersist method
+ *
+ * @access public
+ * @return void
+ */
+	function testPersist() {
+		ClassRegistry::flush();
+
+		$cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', false);
+		@unlink(CACHE . 'persistent' . DS . 'testmodel.php');
+		$test = new stdClass;
+		$this->assertFalse($this->object->testPersist('TestModel', null, $test));
+		$this->assertFalse($this->object->testPersist('TestModel', true, $test));
+		$this->assertTrue($this->object->testPersist('TestModel', null, $test));
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'testmodel.php'));
+		$this->assertTrue($this->object->testPersist('TestModel', true, $test));
+		$this->assertEqual($this->object->TestModel, $test);
+
+		@unlink(CACHE . 'persistent' . DS . 'testmodel.php');
+
+		$model =& new ObjectTestModel();
+		$expected = ClassRegistry::keys();
+
+		ClassRegistry::flush();
+		$data = array('object_test_model' => $model);
+		$this->assertFalse($this->object->testPersist('ObjectTestModel', true, $data));
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'objecttestmodel.php'));
+
+		$this->object->testPersist('ObjectTestModel', true, $model, 'registry');
+
+		$result = ClassRegistry::keys();
+		$this->assertEqual($result, $expected);
+
+		$newModel = ClassRegistry::getObject('object_test_model');
+		$this->assertEqual('ObjectTestModel', $newModel->name);
+
+		@unlink(CACHE . 'persistent' . DS . 'objecttestmodel.php');
+
+		Configure::write('Cache.disable', $cacheDisable);
+	}
+
+/**
+ * testPersistWithRequestAction method
+ *
+ * @access public
+ * @return void
+ */
+	function testPersistWithBehavior() {
+		ClassRegistry::flush();
+
+		$cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', false);
+
+		App::build(array(
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins'. DS),
+			'behaviors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
+		), true);
+
+		$this->assertFalse(class_exists('PersisterOneBehaviorBehavior'));
+		$this->assertFalse(class_exists('PersisterTwoBehaviorBehavior'));
+		$this->assertFalse(class_exists('TestPluginPersisterBehavior'));
+		$this->assertFalse(class_exists('TestPluginAuthors'));
+
+		$Controller = new RequestActionPersistentController();
+		$Controller->persistModel = true;
+		$Controller->constructClasses();
+
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'persisterone.php'));
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
+
+		$contents = file_get_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
+		$contents = str_replace('"PersisterOne"', '"PersisterTwo"', $contents);
+		$contents = str_replace('persister_one', 'persister_two', $contents);
+		$contents = str_replace('test_plugin_comment', 'test_plugin_authors', $contents);
+		$result = file_put_contents(CACHE . 'persistent' . DS . 'persisteroneregistry.php', $contents);
+
+		$this->assertTrue(class_exists('PersisterOneBehaviorBehavior'));
+		$this->assertTrue(class_exists('TestPluginPersisterOneBehavior'));
+		$this->assertTrue(class_exists('TestPluginComment'));
+		$this->assertFalse(class_exists('PersisterTwoBehaviorBehavior'));
+		$this->assertFalse(class_exists('TestPluginPersisterTwoBehavior'));
+		$this->assertFalse(class_exists('TestPluginAuthors'));
+
+		$Controller = new RequestActionPersistentController();
+		$Controller->persistModel = true;
+		$Controller->constructClasses();
+
+		$this->assertTrue(class_exists('PersisterOneBehaviorBehavior'));
+		$this->assertTrue(class_exists('PersisterTwoBehaviorBehavior'));
+		$this->assertTrue(class_exists('TestPluginPersisterTwoBehavior'));
+		$this->assertTrue(class_exists('TestPluginAuthors'));
+
+		@unlink(CACHE . 'persistent' . DS . 'persisterone.php');
+		@unlink(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
+	}
+
+/**
+ * testPersistWithBehaviorAndRequestAction method
+ *
+ * @see testPersistWithBehavior
+ * @access public
+ * @return void
+ */
+	function testPersistWithBehaviorAndRequestAction() {
+		ClassRegistry::flush();
+
+		$cacheDisable = Configure::read('Cache.disable');
+		Configure::write('Cache.disable', false);
+
+		$this->assertFalse(class_exists('ContainableBehavior'));
+
+		App::build(array(
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'behaviors' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models'. DS . 'behaviors' . DS),
+		), true);
+
+		$this->assertFalse(class_exists('PersistOneBehaviorBehavior'));
+		$this->assertFalse(class_exists('PersistTwoBehaviorBehavior'));
+
+		$Controller = new RequestActionPersistentController();
+		$Controller->persistModel = true;
+		$Controller->constructClasses();
+
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'persisterone.php'));
+		$this->assertTrue(file_exists(CACHE . 'persistent' . DS . 'persisteroneregistry.php'));
+
+		$keys = ClassRegistry::keys();
+		$this->assertEqual($keys, array(
+			'persister_one',
+			'comment',
+			'test_plugin_comment',
+			'test_plugin.test_plugin_comment',
+			'persister_one_behavior_behavior',
+			'test_plugin_persister_one_behavior',
+			'test_plugin.test_plugin_persister_one_behavior'
+		));
+
+		ob_start();
+		$Controller->set('content_for_layout', 'cool');
+		$Controller->render('index', 'ajax', '/layouts/ajax');
+		$result = ob_get_clean();
+
+		$keys = ClassRegistry::keys();
+		$this->assertEqual($keys, array(
+			'persister_one',
+			'comment',
+			'test_plugin_comment',
+			'test_plugin.test_plugin_comment',
+			'persister_one_behavior_behavior',
+			'test_plugin_persister_one_behavior',
+			'test_plugin.test_plugin_persister_one_behavior',
+			'view'
+		));
+		$result = $this->object->requestAction('/request_action_persistent/index');
+		$expected = 'This is a test';
+		$this->assertEqual($result, $expected);
+
+		@unlink(CACHE . 'persistent' . DS . 'persisterone.php');
+		@unlink(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
+
+		$Controller = new RequestActionPersistentController();
+		$Controller->persistModel = true;
+		$Controller->constructClasses();
+
+		@unlink(CACHE . 'persistent' . DS . 'persisterone.php');
+		@unlink(CACHE . 'persistent' . DS . 'persisteroneregistry.php');
+
+		Configure::write('Cache.disable', $cacheDisable);
+	}
+
+/**
+ * testToString method
+ *
+ * @access public
+ * @return void
+ */
+	function testToString() {
+		$result = strtolower($this->object->toString());
+		$this->assertEqual($result, 'testobject');
+	}
+
+/**
+ * testMethodDispatching method
+ *
+ * @access public
+ * @return void
+ */
+	function testMethodDispatching() {
+		$this->object->emptyMethod();
+		$expected = array('emptyMethod');
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->oneParamMethod('Hello');
+		$expected[] = array('oneParamMethod' => array('Hello'));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->twoParamMethod(true, false);
+		$expected[] = array('twoParamMethod' => array(true, false));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->threeParamMethod(true, false, null);
+		$expected[] = array('threeParamMethod' => array(true, false, null));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->crazyMethod(1, 2, 3, 4, 5, 6, 7);
+		$expected[] = array('crazyMethod' => array(1, 2, 3, 4, 5, 6, 7));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object = new TestObject();
+		$this->assertIdentical($this->object->methodCalls, array());
+
+		$this->object->dispatchMethod('emptyMethod');
+		$expected = array('emptyMethod');
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('oneParamMethod', array('Hello'));
+		$expected[] = array('oneParamMethod' => array('Hello'));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('twoParamMethod', array(true, false));
+		$expected[] = array('twoParamMethod' => array(true, false));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('threeParamMethod', array(true, false, null));
+		$expected[] = array('threeParamMethod' => array(true, false, null));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('fourParamMethod', array(1, 2, 3, 4));
+		$expected[] = array('fourParamMethod' => array(1, 2, 3, 4));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('fiveParamMethod', array(1, 2, 3, 4, 5));
+		$expected[] = array('fiveParamMethod' => array(1, 2, 3, 4, 5));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('crazyMethod', array(1, 2, 3, 4, 5, 6, 7));
+		$expected[] = array('crazyMethod' => array(1, 2, 3, 4, 5, 6, 7));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('methodWithOptionalParam', array('Hello'));
+		$expected[] = array('methodWithOptionalParam' => array("Hello"));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+
+		$this->object->dispatchMethod('methodWithOptionalParam');
+		$expected[] = array('methodWithOptionalParam' => array(null));
+		$this->assertIdentical($this->object->methodCalls, $expected);
+	}
+
+/**
+ * testRequestAction method
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestAction() {
+		App::build(array(
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+		));
+		$result = $this->object->requestAction('');
+		$this->assertFalse($result);
+
+		$result = $this->object->requestAction('/request_action/test_request_action');
+		$expected = 'This is a test';
+		$this->assertEqual($result, $expected);;
+
+		$result = $this->object->requestAction('/request_action/another_ra_test/2/5');
+		$expected = 7;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction('/tests_apps/index', array('return'));
+		$expected = 'This is the TestsAppsController index view';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction('/tests_apps/some_method');
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction('/request_action/paginate_request_action');
+		$this->assertTrue($result);
+
+		$result = $this->object->requestAction('/request_action/normal_request_action');
+		$expected = 'Hello World';
+		$this->assertEqual($result, $expected);
+		
+		App::build();
+	}
+
+/**
+ * test requestAction() and plugins.
+ *
+ * @return void
+ */
+	function testRequestActionPlugins() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+		));
+		App::objects('plugin', null, false);
+		Router::reload();
+		
+		$result = $this->object->requestAction('/test_plugin/tests/index', array('return'));
+		$expected = 'test plugin index';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction('/test_plugin/tests/index/some_param', array('return'));
+		$expected = 'test plugin index';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'tests', 'action' => 'index', 'plugin' => 'test_plugin'), array('return')
+		);
+		$expected = 'test plugin index';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction('/test_plugin/tests/some_method');
+		$expected = 25;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'tests', 'action' => 'some_method', 'plugin' => 'test_plugin')
+		);
+		$expected = 25;
+		$this->assertEqual($result, $expected);
+		
+		App::build();
+		App::objects('plugin', null, false);
+	}
+
+/**
+ * test requestAction() with arrays.
+ *
+ * @return void
+ */
+	function testRequestActionArray() {
+		App::build(array(
+			'models' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'models' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+			'controllers' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'controllers' . DS)
+		));
+	
+		$result = $this->object->requestAction(
+			array('controller' => 'request_action', 'action' => 'test_request_action')
+		);
+		$expected = 'This is a test';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'request_action', 'action' => 'another_ra_test'), 
+			array('pass' => array('5', '7'))
+		);
+		$expected = 12;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'tests_apps', 'action' => 'index'), array('return')
+		);
+		$expected = 'This is the TestsAppsController index view';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction(array('controller' => 'tests_apps', 'action' => 'some_method'));
+		$expected = 5;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'request_action', 'action' => 'normal_request_action')
+		);
+		$expected = 'Hello World';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'request_action', 'action' => 'paginate_request_action')
+		);
+		$this->assertTrue($result);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'request_action', 'action' => 'paginate_request_action'),
+			array('pass' => array(5), 'named' => array('param' => 'value'))
+		);
+		$this->assertTrue($result);
+
+		App::build();
+	}
+
+/**
+ * Test that requestAction() is populating $this->params properly
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestActionParamParseAndPass() {
+		$result = $this->object->requestAction('/request_action/params_pass');
+		$this->assertTrue(isset($result['url']['url']));
+		$this->assertEqual($result['url']['url'], '/request_action/params_pass');
+		$this->assertEqual($result['controller'], 'request_action');
+		$this->assertEqual($result['action'], 'params_pass');
+		$this->assertEqual($result['form'], array());
+		$this->assertEqual($result['plugin'], null);
+
+		$result = $this->object->requestAction('/request_action/params_pass/sort:desc/limit:5');
+		$expected = array('sort' => 'desc', 'limit' => 5,);
+		$this->assertEqual($result['named'], $expected);
+
+		$result = $this->object->requestAction(
+			array('controller' => 'request_action', 'action' => 'params_pass'), 
+			array('named' => array('sort' => 'desc', 'limit' => 5))
+		);
+		$this->assertEqual($result['named'], $expected);
+	}
+
+/**
+ * test requestAction and POST parameter passing, and not passing when url is an array.
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestActionPostPassing() {
+		$_tmp = $_POST;
+
+		$_POST = array('data' => array(
+			'item' => 'value'
+		));
+		$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'post_pass'));
+		$expected = array();
+		$this->assertEqual($expected, $result);
+
+		$result = $this->object->requestAction(array('controller' => 'request_action', 'action' => 'post_pass'), array('data' => $_POST['data']));
+		$expected = $_POST['data'];
+		$this->assertEqual($expected, $result);
+
+		$result = $this->object->requestAction('/request_action/post_pass');
+		$expected = $_POST['data'];
+		$this->assertEqual($expected, $result);
+
+		$_POST = $_tmp;
+	}
+
+/**
+ * testCakeError
+ *
+ * @return void
+ */
+	function testCakeError() {
+
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/overloadable.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/overloadable.test.php
new file mode 100644
index 000000000..2b0fd31a8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/overloadable.test.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * OverloadableTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Overloadable');
+
+/**
+ * OverloadableTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class OverloadableTest extends CakeTestCase {
+
+/**
+ * skip method
+ *
+ * @access public
+ * @return void
+ */
+	function skip() {
+		$this->skipIf(true, ' %s OverloadableTest not implemented');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/router.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/router.test.php
new file mode 100644
index 000000000..0d199655d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/router.test.php
@@ -0,0 +1,2672 @@
+<?php
+/**
+ * RouterTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *	Licensed under The Open Group Test Suite License
+ *	Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('Router'));
+
+if (!defined('FULL_BASE_URL')) {
+	define('FULL_BASE_URL', 'http://cakephp.org');
+}
+
+/**
+ * RouterTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class RouterTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->_routing = Configure::read('Routing');
+		Configure::write('Routing', array('admin' => null, 'prefixes' => array()));
+		Router::reload();
+		$this->router =& Router::getInstance();
+	}
+
+/**
+ * end the test and reset the environment
+ *
+ * @return void
+ */
+	function endTest() {
+		Configure::write('Routing', $this->_routing);
+	}
+
+/**
+ * testReturnedInstanceReference method
+ *
+ * @access public
+ * @return void
+ */
+	function testReturnedInstanceReference() {
+		$this->router->testVar = 'test';
+		$this->assertIdentical($this->router, Router::getInstance());
+		unset($this->router->testVar);
+	}
+
+/**
+ * testFullBaseURL method
+ *
+ * @access public
+ * @return void
+ */
+	function testFullBaseURL() {
+		$this->assertPattern('/^http(s)?:\/\//', Router::url('/', true));
+		$this->assertPattern('/^http(s)?:\/\//', Router::url(null, true));
+		$this->assertPattern('/^http(s)?:\/\//', Router::url(array('full_base' => true)));
+		$this->assertIdentical(FULL_BASE_URL . '/', Router::url(array('full_base' => true)));
+	}
+
+/**
+ * testRouteDefaultParams method
+ *
+ * @access public
+ * @return void
+ */
+	function testRouteDefaultParams() {
+		Router::connect('/:controller', array('controller' => 'posts'));
+		$this->assertEqual(Router::url(array('action' => 'index')), '/');
+	}
+
+/**
+ * testRouterIdentity method
+ *
+ * @access public
+ * @return void
+ */
+	function testRouterIdentity() {
+		$router2 = new Router();
+		$this->assertEqual(get_object_vars($this->router), get_object_vars($router2));
+	}
+
+/**
+ * testResourceRoutes method
+ *
+ * @access public
+ * @return void
+ */
+	function testResourceRoutes() {
+		Router::mapResources('Posts');
+
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$result = Router::parse('/posts');
+		$this->assertEqual($result, array('pass' => array(), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'index', '[method]' => 'GET'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$result = Router::parse('/posts/13');
+		$this->assertEqual($result, array('pass' => array('13'), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'view', 'id' => '13', '[method]' => 'GET'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$result = Router::parse('/posts');
+		$this->assertEqual($result, array('pass' => array(), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'add', '[method]' => 'POST'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$result = Router::parse('/posts/13');
+		$this->assertEqual($result, array('pass' => array('13'), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'edit', 'id' => '13', '[method]' => 'PUT'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		$result = Router::parse('/posts/475acc39-a328-44d3-95fb-015000000000');
+		$this->assertEqual($result, array('pass' => array('475acc39-a328-44d3-95fb-015000000000'), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'edit', 'id' => '475acc39-a328-44d3-95fb-015000000000', '[method]' => 'PUT'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		$_SERVER['REQUEST_METHOD'] = 'DELETE';
+		$result = Router::parse('/posts/13');
+		$this->assertEqual($result, array('pass' => array('13'), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'delete', 'id' => '13', '[method]' => 'DELETE'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$result = Router::parse('/posts/add');
+		$this->assertEqual($result, array('pass' => array(), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'add'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		Router::reload();
+		Router::mapResources('Posts', array('id' => '[a-z0-9_]+'));
+
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$result = Router::parse('/posts/add');
+		$this->assertEqual($result, array('pass' => array('add'), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'view', 'id' => 'add', '[method]' => 'GET'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$result = Router::parse('/posts/name');
+		$this->assertEqual($result, array('pass' => array('name'), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'edit', 'id' => 'name', '[method]' => 'PUT'));
+		$this->assertEqual($this->router->__resourceMapped, array('posts'));
+	}
+
+/**
+ * testMultipleResourceRoute method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleResourceRoute() {
+		Router::connect('/:controller', array('action' => 'index', '[method]' => array('GET', 'POST')));
+
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		$result = Router::parse('/posts');
+		$this->assertEqual($result, array('pass' => array(), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'index', '[method]' => array('GET', 'POST')));
+
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		$result = Router::parse('/posts');
+		$this->assertEqual($result, array('pass' => array(), 'named' => array(), 'plugin' => '', 'controller' => 'posts', 'action' => 'index', '[method]' => array('GET', 'POST')));
+	}
+
+/**
+ * testGenerateUrlResourceRoute method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateUrlResourceRoute() {
+		Router::mapResources('Posts');
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', '[method]' => 'GET'));
+		$expected = '/posts';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'view', '[method]' => 'GET', 'id' => 10));
+		$expected = '/posts/10';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'add', '[method]' => 'POST'));
+		$expected = '/posts';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'edit', '[method]' => 'PUT', 'id' => 10));
+		$expected = '/posts/10';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'delete', '[method]' => 'DELETE', 'id' => 10));
+		$expected = '/posts/10';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'edit', '[method]' => 'POST', 'id' => 10));
+		$expected = '/posts/10';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUrlNormalization method
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlNormalization() {
+		$expected = '/users/logout';
+
+		$result = Router::normalize('/users/logout/');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::normalize('//users//logout//');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::normalize('users/logout');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::normalize(array('controller' => 'users', 'action' => 'logout'));
+		$this->assertEqual($result, $expected);
+
+		$result = Router::normalize('/');
+		$this->assertEqual($result, '/');
+
+		$result = Router::normalize('http://google.com/');
+		$this->assertEqual($result, 'http://google.com/');
+
+		$result = Router::normalize('http://google.com//');
+		$this->assertEqual($result, 'http://google.com//');
+
+		$result = Router::normalize('/users/login/scope://foo');
+		$this->assertEqual($result, '/users/login/scope:/foo');
+
+		$result = Router::normalize('/recipe/recipes/add');
+		$this->assertEqual($result, '/recipe/recipes/add');
+
+		Router::setRequestInfo(array(array(), array('base' => '/us')));
+		$result = Router::normalize('/us/users/logout/');
+		$this->assertEqual($result, '/users/logout');
+
+		Router::reload();
+
+		Router::setRequestInfo(array(array(), array('base' => '/cake_12')));
+		$result = Router::normalize('/cake_12/users/logout/');
+		$this->assertEqual($result, '/users/logout');
+
+		Router::reload();
+		$_back = Configure::read('App.baseUrl');
+		Configure::write('App.baseUrl', '/');
+
+		Router::setRequestInfo(array(array(), array('base' => '/')));
+		$result = Router::normalize('users/login');
+		$this->assertEqual($result, '/users/login');
+		Configure::write('App.baseUrl', $_back);
+
+		Router::reload();
+		Router::setRequestInfo(array(array(), array('base' => 'beer')));
+		$result = Router::normalize('beer/admin/beers_tags/add');
+		$this->assertEqual($result, '/admin/beers_tags/add');
+
+		$result = Router::normalize('/admin/beers_tags/add');
+		$this->assertEqual($result, '/admin/beers_tags/add');
+	}
+
+/**
+ * test generation of basic urls.
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlGenerationBasic() {
+		extract(Router::getNamedExpressions());
+
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(), 'action' => 'index', 'plugin' => null, 'controller' => 'subscribe',
+				'admin' => true, 'url' => array('url' => '')
+			),
+			array(
+				'base' => '/magazine', 'here' => '/magazine',
+				'webroot' => '/magazine/', 'passedArgs' => array('page' => 2), 'namedArgs' => array('page' => 2),
+			)
+		));
+		$result = Router::url();
+		$this->assertEqual('/magazine', $result);
+
+		Router::reload();
+
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		$out = Router::url(array('controller' => 'pages', 'action' => 'display', 'home'));
+		$this->assertEqual($out, '/');
+
+		Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+		$result = Router::url(array('controller' => 'pages', 'action' => 'display', 'about'));
+		$expected = '/pages/about';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:plugin/:id/*', array('controller' => 'posts', 'action' => 'view'), array('id' => $ID));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'cake_plugin', 'controller' => 'posts', 'action' => 'view', 'id' => '1'));
+		$expected = '/cake_plugin/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('plugin' => 'cake_plugin', 'controller' => 'posts', 'action' => 'view', 'id' => '1', '0'));
+		$expected = '/cake_plugin/1/0';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:controller/:action/:id', array(), array('id' => $ID));
+		Router::parse('/');
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'view', 'id' => '1'));
+		$expected = '/posts/view/1';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:controller/:id', array('action' => 'view'));
+		Router::parse('/');
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'view', 'id' => '1'));
+		$expected = '/posts/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', '0'));
+		$expected = '/posts/index/0';
+		$this->assertEqual($result, $expected);
+
+		Router::connect('/view/*', array('controller' => 'posts', 'action' => 'view'));
+		Router::promote();
+		$result = Router::url(array('controller' => 'posts', 'action' => 'view', '1'));
+		$expected = '/view/1';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('pass' => array(), 'action' => 'index', 'plugin' => null, 'controller' => 'real_controller_name', 'url' => array('url' => '')),
+			array(
+				'base' => '/', 'here' => '/',
+				'webroot' => '/', 'passedArgs' => array('page' => 2), 'namedArgs' => array('page' => 2),
+			)
+		));
+		Router::connect('short_controller_name/:action/*', array('controller' => 'real_controller_name'));
+		Router::parse('/');
+
+		$result = Router::url(array('controller' => 'real_controller_name', 'page' => '1'));
+		$expected = '/short_controller_name/index/page:1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'add'));
+		$expected = '/short_controller_name/add';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('pass' => array(), 'action' => 'index', 'plugin' => null, 'controller' => 'users', 'url' => array('url' => 'users')),
+			array(
+				'base' => '/', 'here' => '/',
+				'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array(),
+			)
+		));
+
+		$result = Router::url(array('action' => 'login'));
+		$expected = '/users/login';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/page/*', array('plugin' => null, 'controller' => 'pages', 'action' => 'view'));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'my_plugin', 'controller' => 'pages', 'action' => 'view', 'my-page'));
+		$expected = '/my_plugin/pages/view/my-page';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/contact/:action', array('plugin' => 'contact', 'controller' => 'contact'));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'contact', 'controller' => 'contact', 'action' => 'me'));
+
+		$expected = '/contact/me';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(), 'action' => 'index', 'plugin' => 'myplugin', 'controller' => 'mycontroller',
+				'admin' => false, 'url' => array('url' => array())
+			),
+			array(
+				'base' => '/', 'here' => '/',
+				'webroot' => '/', 'passedArgs' => array(), 'namedArgs' => array(),
+			)
+		));
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'myothercontroller'));
+		$expected = '/myothercontroller';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test generation of routes with query string parameters.
+ *
+ * @return void
+ **/
+	function testUrlGenerationWithQueryStrings() {
+		$result = Router::url(array('controller' => 'posts', 'action'=>'index', '0', '?' => 'var=test&var2=test2'));
+		$expected = '/posts/index/0?var=test&var2=test2';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', '0', '?' => 'var=test&var2=test2'));
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', '0', '?' => array('var' => 'test', 'var2' => 'test2')));
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', '0', '?' => array('var' => null)));
+		$this->assertEqual($result, '/posts/index/0');
+
+		$result = Router::url(array('controller' => 'posts', '0', '?' => 'var=test&var2=test2', '#' => 'unencoded string %'));
+		$expected = '/posts/index/0?var=test&var2=test2#unencoded+string+%25';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that regex validation of keyed route params is working.
+ *
+ * @return void
+ **/
+	function testUrlGenerationWithRegexQualifiedParams() {
+		Router::connect(
+			':language/galleries',
+			array('controller' => 'galleries', 'action' => 'index'),
+			array('language' => '[a-z]{3}')
+		);
+
+		Router::connect(
+			'/:language/:admin/:controller/:action/*',
+			array('admin' => 'admin'),
+			array('language' => '[a-z]{3}', 'admin' => 'admin')
+		);
+
+		Router::connect('/:language/:controller/:action/*',
+			array(),
+			array('language' => '[a-z]{3}')
+		);
+
+		$result = Router::url(array('admin' => false, 'language' => 'dan', 'action' => 'index', 'controller' => 'galleries'));
+		$expected = '/dan/galleries';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('admin' => false, 'language' => 'eng', 'action' => 'index', 'controller' => 'galleries'));
+		$expected = '/eng/galleries';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:language/pages',
+			array('controller' => 'pages', 'action' => 'index'),
+			array('language' => '[a-z]{3}')
+		);
+		Router::connect('/:language/:controller/:action/*', array(), array('language' => '[a-z]{3}'));
+
+		$result = Router::url(array('language' => 'eng', 'action' => 'index', 'controller' => 'pages'));
+		$expected = '/eng/pages';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('language' => 'eng', 'controller' => 'pages'));
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('language' => 'eng', 'controller' => 'pages', 'action' => 'add'));
+		$expected = '/eng/pages/add';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/forestillinger/:month/:year/*',
+			array('plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar'),
+			array('month' => '0[1-9]|1[012]', 'year' => '[12][0-9]{3}')
+		);
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar', 'month' => 10, 'year' => 2007, 'min-forestilling'));
+		$expected = '/forestillinger/10/2007/min-forestilling';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/kalender/:month/:year/*',
+			array('plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar'),
+			array('month' => '0[1-9]|1[012]', 'year' => '[12][0-9]{3}')
+		);
+		Router::connect('/kalender/*', array('plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar'));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar', 'min-forestilling'));
+		$expected = '/kalender/min-forestilling';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar', 'year' => 2007, 'month' => 10, 'min-forestilling'));
+		$expected = '/kalender/10/2007/min-forestilling';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:controller/:action/*', array(), array(
+			'controller' => 'source|wiki|commits|tickets|comments|view',
+			'action' => 'branches|history|branch|logs|view|start|add|edit|modify'
+		));
+		Router::defaults(false);
+		$result = Router::parse('/foo/bar');
+		$expected = array('pass' => array(), 'named' => array());
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test url generation with an admin prefix
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlGenerationWithAdminPrefix() {
+		Configure::write('Routing.admin', 'admin');
+		Router::reload();
+
+		Router::connectNamed(array('event', 'lang'));
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::connect('/pages/contact_us', array('controller' => 'pages', 'action' => 'contact_us'));
+		Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+		Router::connect('/reset/*', array('admin' => true, 'controller' => 'users', 'action' => 'reset'));
+		Router::connect('/tests', array('controller' => 'tests', 'action' => 'index'));
+		Router::parseExtensions('rss');
+
+		Router::setRequestInfo(array(
+			array('pass' => array(), 'named' => array(), 'controller' => 'registrations', 'action' => 'admin_index', 'plugin' => '', 'prefix' => 'admin', 'admin' => true, 'url' => array('ext' => 'html', 'url' => 'admin/registrations/index'), 'form' => array()),
+			array('base' => '', 'here' => '/admin/registrations/index', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('page' => 2));
+		$expected = '/admin/registrations/index/page:2';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(), 'action' => 'admin_index', 'plugin' => null, 'controller' => 'subscriptions',
+				'admin' => true, 'url' => array('url' => 'admin/subscriptions/index/page:2'),
+			),
+			array(
+				'base' => '/magazine', 'here' => '/magazine/admin/subscriptions/index/page:2',
+				'webroot' => '/magazine/', 'passedArgs' => array('page' => 2),
+			)
+		));
+		Router::parse('/');
+
+		$result = Router::url(array('page' => 3));
+		$expected = '/magazine/admin/subscriptions/index/page:3';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/admin/subscriptions/:action/*', array('controller' => 'subscribe', 'admin' => true, 'prefix' => 'admin'));
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(), 'action' => 'admin_index', 'plugin' => null, 'controller' => 'subscribe',
+				'admin' => true, 'url' => array('url' => 'admin/subscriptions/edit/1')
+			),
+			array(
+				'base' => '/magazine', 'here' => '/magazine/admin/subscriptions/edit/1',
+				'webroot' => '/magazine/', 'passedArgs' => array('page' => 2), 'namedArgs' => array('page' => 2),
+			)
+		));
+
+		$result = Router::url(array('action' => 'edit', 1));
+		$expected = '/magazine/admin/subscriptions/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('admin' => true, 'controller' => 'users', 'action' => 'login'));
+		$expected = '/magazine/admin/users/login';
+		$this->assertEqual($result, $expected);
+
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('pass' => array(), 'admin' => true, 'action' => 'index', 'plugin' => null, 'controller' => 'users', 'url' => array('url' => 'users')),
+			array(
+				'base' => '/', 'here' => '/',
+				'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array(),
+			)
+		));
+		Router::connect('/page/*', array('controller' => 'pages', 'action' => 'view', 'admin' => true, 'prefix' => 'admin'));
+		Router::parse('/');
+
+		$result = Router::url(array('admin' => true, 'controller' => 'pages', 'action' => 'view', 'my-page'));
+		$expected = '/page/my-page';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.admin', 'admin');
+		Router::reload();
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'pages', 'action' => 'admin_add', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/pages/add')),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/admin/pages/add', 'webroot' => '/')
+		));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'pages', 'action' => 'add', 'id' => false));
+		$expected = '/admin/pages/add';
+		$this->assertEqual($result, $expected);
+
+
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'pages', 'action' => 'admin_add', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/pages/add')),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/admin/pages/add', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'pages', 'action' => 'add', 'id' => false));
+		$expected = '/admin/pages/add';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/admin/:controller/:action/:id', array('admin' => true), array('id' => '[0-9]+'));
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array ('plugin' => null, 'controller' => 'pages', 'action' => 'admin_edit', 'pass' => array('284'), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/pages/edit/284')),
+			array ('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/admin/pages/edit/284', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'pages', 'action' => 'edit', 'id' => '284'));
+		$expected = '/admin/pages/edit/284';
+		$this->assertEqual($result, $expected);
+
+
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array ('plugin' => null, 'controller' => 'pages', 'action' => 'admin_add', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/pages/add')),
+			array ('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/admin/pages/add', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'pages', 'action' => 'add', 'id' => false));
+		$expected = '/admin/pages/add';
+		$this->assertEqual($result, $expected);
+
+
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'pages', 'action' => 'admin_edit', 'pass' => array('284'), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/pages/edit/284')),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/admin/pages/edit/284', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'pages', 'action' => 'edit', 284));
+		$expected = '/admin/pages/edit/284';
+		$this->assertEqual($result, $expected);
+
+
+		Router::reload();
+		Router::connect('/admin/posts/*', array('controller' => 'posts', 'action' => 'index', 'admin' => true));
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('pass' => array(), 'action' => 'admin_index', 'plugin' => null, 'controller' => 'posts', 'prefix' => 'admin', 'admin' => true, 'url' => array('url' => 'admin/posts')),
+			array('base' => '', 'here' => '/admin/posts', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('all'));
+		$expected = '/admin/posts/all';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUrlGenerationWithExtensions method
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlGenerationWithExtensions() {
+		Router::parse('/');
+		$result = Router::url(array('plugin' => null, 'controller' => 'articles', 'action' => 'add', 'id' => null, 'ext' => 'json'));
+		$expected = '/articles/add.json';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'articles', 'action' => 'add', 'ext' => 'json'));
+		$expected = '/articles/add.json';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'articles', 'action' => 'index', 'id' => null, 'ext' => 'json'));
+		$expected = '/articles.json';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('plugin' => null, 'controller' => 'articles', 'action' => 'index', 'ext' => 'json'));
+		$expected = '/articles.json';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testPluginUrlGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlGenerationPlugins() {
+		Router::setRequestInfo(array(
+			array(
+				'controller' => 'controller', 'action' => 'index', 'form' => array(),
+				'url' => array(), 'plugin' => 'test'
+			),
+			array(
+				'base' => '/base', 'here' => '/clients/sage/portal/donations', 'webroot' => '/base/',
+				'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array()
+			)
+		));
+
+		$this->assertEqual(Router::url('read/1'), '/base/test/controller/read/1');
+
+		Router::reload();
+		Router::connect('/:lang/:plugin/:controller/*', array('action' => 'index'));
+
+		Router::setRequestInfo(array(
+			array(
+				'lang' => 'en',
+				'plugin' => 'shows', 'controller' => 'shows', 'action' => 'index', 'pass' =>
+					array(), 'form' => array(), 'url' =>
+					array('url' => 'en/shows/')),
+			array('plugin' => NULL, 'controller' => NULL, 'action' => NULL, 'base' => '',
+			'here' => '/en/shows/', 'webroot' => '/')
+		));
+
+		Router::parse('/en/shows/');
+
+		$result = Router::url(array(
+			'lang' => 'en',
+			'controller' => 'shows', 'action' => 'index', 'page' => '1',
+		));
+		$expected = '/en/shows/shows/page:1';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that you can leave active plugin routes with plugin = null
+ *
+ * @return void
+ */
+	function testCanLeavePlugin() {
+		Router::reload();
+		Router::connect(
+			'/admin/other/:controller/:action/*',
+			array(
+				'admin' => 1,
+				'plugin' => 'aliased',
+				'prefix' => 'admin'
+			)
+		);
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(),
+				'admin' => true,
+				'prefix' => 'admin',
+				'plugin' => 'this',
+				'action' => 'admin_index',
+				'controller' => 'interesting',
+				'url' => array('url' => 'admin/this/interesting/index'),
+			),
+			array(
+				'base' => '',
+				'here' => '/admin/this/interesting/index',
+				'webroot' => '/',
+				'passedArgs' => array(),
+			)
+		));
+		$result = Router::url(array('plugin' => null, 'controller' => 'posts', 'action' => 'index'));
+		$this->assertEqual($result, '/admin/posts');
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index'));
+		$this->assertEqual($result, '/admin/this/posts');
+
+		$result = Router::url(array('plugin' => 'aliased', 'controller' => 'posts', 'action' => 'index'));
+		$this->assertEqual($result, '/admin/other/posts/index');
+	}
+
+/**
+ * testUrlParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlParsing() {
+		extract(Router::getNamedExpressions());
+
+		Router::connect('/posts/:value/:somevalue/:othervalue/*', array('controller' => 'posts', 'action' => 'view'), array('value','somevalue', 'othervalue'));
+		$result = Router::parse('/posts/2007/08/01/title-of-post-here');
+		$expected = array('value' => '2007', 'somevalue' => '08', 'othervalue' => '01', 'controller' => 'posts', 'action' => 'view', 'plugin' =>'', 'pass' => array('0' => 'title-of-post-here'), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$this->router->routes = array();
+		Router::connect('/posts/:year/:month/:day/*', array('controller' => 'posts', 'action' => 'view'), array('year' => $Year, 'month' => $Month, 'day' => $Day));
+		$result = Router::parse('/posts/2007/08/01/title-of-post-here');
+		$expected = array('year' => '2007', 'month' => '08', 'day' => '01', 'controller' => 'posts', 'action' => 'view', 'plugin' =>'', 'pass' => array('0' => 'title-of-post-here'), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$this->router->routes = array();
+		Router::connect('/posts/:day/:year/:month/*', array('controller' => 'posts', 'action' => 'view'), array('year' => $Year, 'month' => $Month, 'day' => $Day));
+		$result = Router::parse('/posts/01/2007/08/title-of-post-here');
+		$expected = array('day' => '01', 'year' => '2007', 'month' => '08', 'controller' => 'posts', 'action' => 'view', 'plugin' =>'', 'pass' => array('0' => 'title-of-post-here'), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$this->router->routes = array();
+		Router::connect('/posts/:month/:day/:year/*', array('controller' => 'posts', 'action' => 'view'), array('year' => $Year, 'month' => $Month, 'day' => $Day));
+		$result = Router::parse('/posts/08/01/2007/title-of-post-here');
+		$expected = array('month' => '08', 'day' => '01', 'year' => '2007', 'controller' => 'posts', 'action' => 'view', 'plugin' =>'', 'pass' => array('0' => 'title-of-post-here'), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$this->router->routes = array();
+		Router::connect('/posts/:year/:month/:day/*', array('controller' => 'posts', 'action' => 'view'));
+		$result = Router::parse('/posts/2007/08/01/title-of-post-here');
+		$expected = array('year' => '2007', 'month' => '08', 'day' => '01', 'controller' => 'posts', 'action' => 'view', 'plugin' =>'', 'pass' => array('0' => 'title-of-post-here'), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		$result = Router::parse('/pages/display/home');
+		$expected = array('plugin' => null, 'pass' => array('home'), 'controller' => 'pages', 'action' => 'display', 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('pages/display/home/');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('pages/display/home');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/page/*', array('controller' => 'test'));
+		$result = Router::parse('/page/my-page');
+		$expected = array('pass' => array('my-page'), 'plugin' => null, 'controller' => 'test', 'action' => 'index');
+
+		Router::reload();
+		Router::connect('/:language/contact', array('language' => 'eng', 'plugin' => 'contact', 'controller' => 'contact', 'action' => 'index'), array('language' => '[a-z]{3}'));
+		$result = Router::parse('/eng/contact');
+		$expected = array('pass' => array(), 'named' => array(), 'language' => 'eng', 'plugin' => 'contact', 'controller' => 'contact', 'action' => 'index');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/forestillinger/:month/:year/*',
+			array('plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar'),
+			array('month' => '0[1-9]|1[012]', 'year' => '[12][0-9]{3}')
+		);
+
+		$result = Router::parse('/forestillinger/10/2007/min-forestilling');
+		$expected = array('pass' => array('min-forestilling'), 'plugin' => 'shows', 'controller' => 'shows', 'action' => 'calendar', 'year' => 2007, 'month' => 10, 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:controller/:action/*');
+		Router::connect('/', array('plugin' => 'pages', 'controller' => 'pages', 'action' => 'display'));
+		$result = Router::parse('/');
+		$expected = array('pass' => array(), 'named' => array(), 'controller' => 'pages', 'action' => 'display', 'plugin' => 'pages');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/posts/edit/0');
+		$expected = array('pass' => array(0), 'named' => array(), 'controller' => 'posts', 'action' => 'edit', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/posts/:id::url_title', array('controller' => 'posts', 'action' => 'view'), array('pass' => array('id', 'url_title'), 'id' => '[\d]+'));
+		$result = Router::parse('/posts/5:sample-post-title');
+		$expected = array('pass' => array('5', 'sample-post-title'), 'named' => array(), 'id' => 5, 'url_title' => 'sample-post-title', 'plugin' => null, 'controller' => 'posts', 'action' => 'view');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/posts/:id::url_title/*', array('controller' => 'posts', 'action' => 'view'), array('pass' => array('id', 'url_title'), 'id' => '[\d]+'));
+		$result = Router::parse('/posts/5:sample-post-title/other/params/4');
+		$expected = array('pass' => array('5', 'sample-post-title', 'other', 'params', '4'), 'named' => array(), 'id' => 5, 'url_title' => 'sample-post-title', 'plugin' => null, 'controller' => 'posts', 'action' => 'view');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/posts/:url_title-(uuid::id)', array('controller' => 'posts', 'action' => 'view'), array('pass' => array('id', 'url_title'), 'id' => $UUID));
+		$result = Router::parse('/posts/sample-post-title-(uuid:47fc97a9-019c-41d1-a058-1fa3cbdd56cb)');
+		$expected = array('pass' => array('47fc97a9-019c-41d1-a058-1fa3cbdd56cb', 'sample-post-title'), 'named' => array(), 'id' => '47fc97a9-019c-41d1-a058-1fa3cbdd56cb', 'url_title' => 'sample-post-title', 'plugin' => null, 'controller' => 'posts', 'action' => 'view');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/posts/view/*', array('controller' => 'posts', 'action' => 'view'), array('named' => false));
+		$result = Router::parse('/posts/view/foo:bar/routing:fun');
+		$expected = array('pass' => array('foo:bar', 'routing:fun'), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'view');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/posts/view/*', array('controller' => 'posts', 'action' => 'view'), array('named' => array('foo', 'answer')));
+		$result = Router::parse('/posts/view/foo:bar/routing:fun/answer:42');
+		$expected = array('pass' => array('routing:fun'), 'named' => array('foo' => 'bar', 'answer' => '42'), 'plugin' => null, 'controller' => 'posts', 'action' => 'view');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/posts/view/*', array('controller' => 'posts', 'action' => 'view'), array('named' => array('foo', 'answer'), 'greedy' => true));
+		$result = Router::parse('/posts/view/foo:bar/routing:fun/answer:42');
+		$expected = array('pass' => array(), 'named' => array('foo' => 'bar', 'routing' => 'fun', 'answer' => '42'), 'plugin' => null, 'controller' => 'posts', 'action' => 'view');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that the persist key works.
+ *
+ * @return void
+ */
+	function testPersistentParameters() {
+		Router::reload();
+		Router::connect(
+			'/:lang/:color/posts/view/*',
+			array('controller' => 'posts', 'action' => 'view'),
+			array('persist' => array('lang', 'color')
+		));
+		Router::connect(
+			'/:lang/:color/posts/index',
+			array('controller' => 'posts', 'action' => 'index'),
+			array('persist' => array('lang')
+		));
+		Router::connect('/:lang/:color/posts/edit/*', array('controller' => 'posts', 'action' => 'edit'));
+		Router::connect('/about', array('controller' => 'pages', 'action' => 'view', 'about'));
+		Router::parse('/en/red/posts/view/5');
+
+		Router::setRequestInfo(array(
+			array('controller' => 'posts', 'action' => 'view', 'lang' => 'en', 'color' => 'red', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/en/red/posts/view/5', 'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
+		));
+		$expected = '/en/red/posts/view/6';
+		$result = Router::url(array('controller' => 'posts', 'action' => 'view', 6));
+		$this->assertEqual($result, $expected);
+
+		$expected = '/en/blue/posts/index';
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', 'color' => 'blue'));
+		$this->assertEqual($result, $expected);
+
+		$expected = '/posts/edit/6';
+		$result = Router::url(array('controller' => 'posts', 'action' => 'edit', 6, 'color' => null, 'lang' => null));
+		$this->assertEqual($result, $expected);
+
+		$expected = '/posts';
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index'));
+		$this->assertEqual($result, $expected);
+
+		$expected = '/posts/edit/7';
+		$result = Router::url(array('controller' => 'posts', 'action' => 'edit', 7));
+		$this->assertEqual($result, $expected);
+
+		$expected = '/about';
+		$result = Router::url(array('controller' => 'pages', 'action' => 'view', 'about'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testUuidRoutes method
+ *
+ * @access public
+ * @return void
+ */
+	function testUuidRoutes() {
+		Router::connect(
+			'/subjects/add/:category_id',
+			array('controller' => 'subjects', 'action' => 'add'),
+			array('category_id' => '\w{8}-\w{4}-\w{4}-\w{4}-\w{12}')
+		);
+		$result = Router::parse('/subjects/add/4795d601-19c8-49a6-930e-06a8b01d17b7');
+		$expected = array('pass' => array(), 'named' => array(), 'category_id' => '4795d601-19c8-49a6-930e-06a8b01d17b7', 'plugin' => null, 'controller' => 'subjects', 'action' => 'add');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRouteSymmetry method
+ *
+ * @access public
+ * @return void
+ */
+	function testRouteSymmetry() {
+		Router::connect(
+			"/:extra/page/:slug/*",
+			array('controller' => 'pages', 'action' => 'view', 'extra' => null),
+			array("extra" => '[a-z1-9_]*', "slug" => '[a-z1-9_]+', "action" => 'view')
+		);
+
+		$result = Router::parse('/some_extra/page/this_is_the_slug');
+		$expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'pages', 'action' => 'view', 'slug' => 'this_is_the_slug', 'extra' => 'some_extra');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/page/this_is_the_slug');
+		$expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'pages', 'action' => 'view', 'slug' => 'this_is_the_slug', 'extra' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect(
+			"/:extra/page/:slug/*",
+			array('controller' => 'pages', 'action' => 'view', 'extra' => null),
+			array("extra" => '[a-z1-9_]*', "slug" => '[a-z1-9_]+')
+		);
+		Router::parse('/');
+
+		$result = Router::url(array('admin' => null, 'plugin' => null, 'controller' => 'pages', 'action' => 'view', 'slug' => 'this_is_the_slug', 'extra' => null));
+		$expected = '/page/this_is_the_slug';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('admin' => null, 'plugin' => null, 'controller' => 'pages', 'action' => 'view', 'slug' => 'this_is_the_slug', 'extra' => 'some_extra'));
+		$expected = '/some_extra/page/this_is_the_slug';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that Routing.prefixes and Routing.admin are used when a Router instance is created
+ * or reset
+ *
+ * @return void
+ */
+	function testRoutingPrefixesSetting() {
+		$restore = Configure::read('Routing');
+
+		Configure::write('Routing.admin', 'admin');
+		Configure::write('Routing.prefixes', array('member', 'super_user'));
+		Router::reload();
+		$result = Router::prefixes();
+		$expected = array('admin', 'member', 'super_user');
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.prefixes', 'member');
+		Router::reload();
+		$result = Router::prefixes();
+		$expected = array('admin', 'member');
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing', $restore);
+	}
+
+/**
+ * test compatibility with old Routing.admin config setting.
+ *
+ * @access public
+ * @return void
+ * @todo Once Routing.admin is removed update these tests.
+ */
+	function testAdminRoutingCompatibility() {
+		Configure::write('Routing.admin', 'admin');
+
+		Router::reload();
+		Router::connect('/admin', array('admin' => true, 'controller' => 'users'));
+		$result = Router::parse('/admin');
+
+		$expected = array('pass' => array(), 'named' => array(), 'plugin' => '', 'controller' => 'users', 'action' => 'index', 'admin' => true, 'prefix' => 'admin');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('admin' => true, 'controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
+		$expected = '/admin/posts/index/0?var=test&var2=test2';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::parse('/');
+		$result = Router::url(array('admin' => false, 'controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
+		$expected = '/posts/index/0?var=test&var2=test2';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('admin' => true, 'controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
+		));
+
+		Router::parse('/');
+		$result = Router::url(array('admin' => false, 'controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
+		$expected = '/posts/index/0?var=test&var2=test2';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
+		$expected = '/admin/posts/index/0?var=test&var2=test2';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		$result = Router::parse('admin/users/view/');
+		$expected = array('pass' => array(), 'named' => array(), 'controller' => 'users', 'action' => 'view', 'plugin' => null, 'prefix' => 'admin', 'admin' => true);
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.admin', 'beheer');
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('beheer' => true, 'controller' => 'posts', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/beheer/posts/index', 'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
+		));
+
+		$result = Router::parse('beheer/users/view/');
+		$expected = array('pass' => array(), 'named' => array(), 'controller' => 'users', 'action' => 'view', 'plugin' => null, 'prefix' => 'beheer', 'beheer' => true);
+		$this->assertEqual($result, $expected);
+
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', '0', '?' => 'var=test&var2=test2'));
+		$expected = '/beheer/posts/index/0?var=test&var2=test2';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test prefix routing and plugin combinations
+ *
+ * @return void
+ */
+	function testPrefixRoutingAndPlugins() {
+		Configure::write('Routing.prefixes', array('admin'));
+		$paths = App::path('plugins');
+		App::build(array(
+			'plugins' =>  array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+			)
+		), true);
+		App::objects('plugin', null, false);
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('admin' => true, 'controller' => 'controller', 'action' => 'action',
+				'form' => array(), 'url' => array(), 'plugin' => null, 'prefix' => 'admin'),
+			array('base' => '/', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array(),
+				'argSeparator' => ':', 'namedArgs' => array())
+		));
+		Router::parse('/');
+
+		$result = Router::url(array('plugin' => 'test_plugin', 'controller' => 'test_plugin', 'action' => 'index'));
+		$expected = '/admin/test_plugin';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array(
+				'plugin' => 'test_plugin', 'controller' => 'show_tickets', 'action' => 'admin_edit',
+				'pass' => array('6'), 'prefix' => 'admin', 'admin' => true, 'form' => array(),
+				'url' => array('url' => 'admin/shows/show_tickets/edit/6')
+			),
+			array(
+				'plugin' => null, 'controller' => null, 'action' => null, 'base' => '',
+				'here' => '/admin/shows/show_tickets/edit/6', 'webroot' => '/'
+			)
+		));
+
+		$result = Router::url(array(
+			'plugin' => 'test_plugin', 'controller' => 'show_tickets', 'action' => 'edit', 6,
+			'admin' => true, 'prefix' => 'admin'
+		));
+		$expected = '/admin/test_plugin/show_tickets/edit/6';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array(
+			'plugin' => 'test_plugin', 'controller' => 'show_tickets', 'action' => 'index', 'admin' => true
+		));
+		$expected = '/admin/test_plugin/show_tickets';
+		$this->assertEqual($result, $expected);
+
+		App::build(array('plugins' => $paths));
+	}
+
+/**
+ * testExtensionParsingSetting method
+ *
+ * @access public
+ * @return void
+ */
+	function testExtensionParsingSetting() {
+		$router =& Router::getInstance();
+		$this->assertFalse($this->router->__parseExtensions);
+
+		$router->parseExtensions();
+		$this->assertTrue($this->router->__parseExtensions);
+	}
+
+/**
+ * testExtensionParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testExtensionParsing() {
+		Router::parseExtensions();
+
+		$result = Router::parse('/posts.rss');
+		$expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'index', 'url' => array('ext' => 'rss'), 'pass'=> array(), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/posts/view/1.rss');
+		$expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 'pass' => array('1'), 'named' => array(), 'url' => array('ext' => 'rss'), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/posts/view/1.rss?query=test');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/posts/view/1.atom');
+		$expected['url'] = array('ext' => 'atom');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::parseExtensions('rss', 'xml');
+
+		$result = Router::parse('/posts.xml');
+		$expected = array('plugin' => null, 'controller' => 'posts', 'action' => 'index', 'url' => array('ext' => 'xml'), 'pass'=> array(), 'named' => array());
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/posts.atom?hello=goodbye');
+		$expected = array('plugin' => null, 'controller' => 'posts.atom', 'action' => 'index', 'pass' => array(), 'named' => array(), 'url' => array('ext' => 'html'));
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::parseExtensions();
+		$result = $this->router->__parseExtension('/posts.atom');
+		$expected = array('ext' => 'atom', 'url' => '/posts');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/controller/action', array('controller' => 'controller', 'action' => 'action', 'url' => array('ext' => 'rss')));
+		$result = Router::parse('/controller/action');
+		$expected = array('controller' => 'controller', 'action' => 'action', 'plugin' => null, 'url' => array('ext' => 'rss'), 'named' => array(), 'pass' => array());
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::parseExtensions('rss');
+		Router::connect('/controller/action', array('controller' => 'controller', 'action' => 'action', 'url' => array('ext' => 'rss')));
+		$result = Router::parse('/controller/action');
+		$expected = array('controller' => 'controller', 'action' => 'action', 'plugin' => null, 'url' => array('ext' => 'rss'), 'named' => array(), 'pass' => array());
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testQuerystringGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testQuerystringGeneration() {
+		$result = Router::url(array('controller' => 'posts', 'action'=>'index', '0', '?' => 'var=test&var2=test2'));
+		$expected = '/posts/index/0?var=test&var2=test2';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action'=>'index', '0', '?' => array('var' => 'test', 'var2' => 'test2')));
+		$this->assertEqual($result, $expected);
+
+		$expected .= '&more=test+data';
+		$result = Router::url(array('controller' => 'posts', 'action'=>'index', '0', '?' => array('var' => 'test', 'var2' => 'test2', 'more' => 'test data')));
+		$this->assertEqual($result, $expected);
+
+// Test bug #4614
+		$restore = ini_get('arg_separator.output');
+		ini_set('arg_separator.output', '&amp;');
+		$result = Router::url(array('controller' => 'posts', 'action'=>'index', '0', '?' => array('var' => 'test', 'var2' => 'test2', 'more' => 'test data')));
+		$this->assertEqual($result, $expected);
+		ini_set('arg_separator.output', $restore);
+
+		$result = Router::url(array('controller' => 'posts', 'action'=>'index', '0', '?' => array('var' => 'test', 'var2' => 'test2')), array('escape' => true));
+		$expected = '/posts/index/0?var=test&amp;var2=test2';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testConnectNamed method
+ *
+ * @access public
+ * @return void
+ */
+	function testConnectNamed() {
+		$named = Router::connectNamed(false, array('default' => true));
+		$this->assertFalse($named['greedy']);
+		$this->assertEqual(array_keys($named['rules']), $named['default']);
+
+		Router::reload();
+		Router::connect('/foo/*', array('controller' => 'bar', 'action' => 'fubar'));
+		Router::connectNamed(array(), array('argSeparator' => '='));
+		$result = Router::parse('/foo/param1=value1/param2=value2');
+		$expected = array('pass' => array(), 'named' => array('param1' => 'value1', 'param2' => 'value2'), 'controller' => 'bar', 'action' => 'fubar', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/controller/action/*', array('controller' => 'controller', 'action' => 'action'), array('named' => array('param1' => 'value[\d]')));
+		Router::connectNamed(array(), array('greedy' => false, 'argSeparator' => '='));
+		$result = Router::parse('/controller/action/param1=value1/param2=value2');
+		$expected = array('pass' => array('param2=value2'), 'named' => array('param1' => 'value1'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:controller/:action/*');
+		Router::connectNamed(array('page'), array('default' => false, 'greedy' => false));
+		$result = Router::parse('/categories/index?limit=5');
+		$this->assertTrue(empty($result['named']));
+	}
+
+/**
+ * testNamedArgsUrlGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testNamedArgsUrlGeneration() {
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', 'published' => 1, 'deleted' => 1));
+		$expected = '/posts/index/published:1/deleted:1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'posts', 'action' => 'index', 'published' => 0, 'deleted' => 0));
+		$expected = '/posts/index/published:0/deleted:0';
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		extract(Router::getNamedExpressions());
+		Router::connectNamed(array('file'=> '[\w\.\-]+\.(html|png)'));
+		Router::connect('/', array('controller' => 'graphs', 'action' => 'index'));
+		Router::connect('/:id/*', array('controller' => 'graphs', 'action' => 'view'), array('id' => $ID));
+
+		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 'id' => 12, 'file' => 'asdf.png'));
+		$expected = '/12/file:asdf.png';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'graphs', 'action' => 'view', 12, 'file' => 'asdf.foo'));
+		$expected = '/graphs/view/12/file:asdf.foo';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.admin', 'admin');
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('admin' => true, 'controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
+		));
+		Router::parse('/');
+
+		$result = Router::url(array('page' => 1, 0 => null, 'sort' => 'controller', 'direction' => 'asc', 'order' => null));
+		$expected = "/admin/controller/index/page:1/sort:controller/direction:asc";
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('admin' => true, 'controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array('type'=> 'whatever'), 'argSeparator' => ':', 'namedArgs' => array('type'=> 'whatever'))
+		));
+
+		$result = Router::parse('/admin/controller/index/type:whatever');
+		$result = Router::url(array('type'=> 'new'));
+		$expected = "/admin/controller/index/type:new";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testNamedArgsUrlParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testNamedArgsUrlParsing() {
+		$Router =& Router::getInstance();
+		Router::reload();
+		$result = Router::parse('/controller/action/param1:value1:1/param2:value2:3/param:value');
+		$expected = array('pass' => array(), 'named' => array('param1' => 'value1:1', 'param2' => 'value2:3', 'param' => 'value'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		$result = Router::connectNamed(false);
+		$this->assertEqual(array_keys($result['rules']), array());
+		$this->assertFalse($result['greedy']);
+		$result = Router::parse('/controller/action/param1:value1:1/param2:value2:3/param:value');
+		$expected = array('pass' => array('param1:value1:1', 'param2:value2:3', 'param:value'), 'named' => array(), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		$result = Router::connectNamed(true);
+		$this->assertEqual(array_keys($result['rules']), $Router->named['default']);
+		$this->assertTrue($result['greedy']);
+		Router::reload();
+		Router::connectNamed(array('param1' => 'not-matching'));
+		$result = Router::parse('/controller/action/param1:value1:1/param2:value2:3/param:value');
+		$expected = array('pass' => array('param1:value1:1'), 'named' => array('param2' => 'value2:3', 'param' => 'value'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/foo/:action/*', array('controller' => 'bar'), array('named' => array('param1' => array('action' => 'index')), 'greedy' => true));
+		$result = Router::parse('/foo/index/param1:value1:1/param2:value2:3/param:value');
+		$expected = array('pass' => array(), 'named' => array('param1' => 'value1:1', 'param2' => 'value2:3', 'param' => 'value'), 'controller' => 'bar', 'action' => 'index', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/foo/view/param1:value1:1/param2:value2:3/param:value');
+		$expected = array('pass' => array('param1:value1:1'), 'named' => array('param2' => 'value2:3', 'param' => 'value'), 'controller' => 'bar', 'action' => 'view', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connectNamed(array('param1' => '[\d]', 'param2' => '[a-z]', 'param3' => '[\d]'));
+		$result = Router::parse('/controller/action/param1:1/param2:2/param3:3');
+		$expected = array('pass' => array('param2:2'), 'named' => array('param1' => '1', 'param3' => '3'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connectNamed(array('param1' => '[\d]', 'param2' => true, 'param3' => '[\d]'));
+		$result = Router::parse('/controller/action/param1:1/param2:2/param3:3');
+		$expected = array('pass' => array(), 'named' => array('param1' => '1', 'param2' => '2', 'param3' => '3'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connectNamed(array('param1' => 'value[\d]+:[\d]+'), array('greedy' => false));
+		$result = Router::parse('/controller/action/param1:value1:1/param2:value2:3/param3:value');
+		$expected = array('pass' => array('param2:value2:3', 'param3:value'), 'named' => array('param1' => 'value1:1'), 'controller' => 'controller', 'action' => 'action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/foo/*', array('controller' => 'bar', 'action' => 'fubar'), array('named' => array('param1' => 'value[\d]:[\d]')));
+		Router::connectNamed(array(), array('greedy' => false));
+		$result = Router::parse('/foo/param1:value1:1/param2:value2:3/param3:value');
+		$expected = array('pass' => array('param2:value2:3', 'param3:value'), 'named' => array('param1' => 'value1:1'), 'controller' => 'bar', 'action' => 'fubar', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test url generation with legacy (1.2) style prefix routes.
+ *
+ * @access public
+ * @return void
+ * @todo Remove tests related to legacy style routes.
+ * @see testUrlGenerationWithAutoPrefixes
+ */
+	function testUrlGenerationWithLegacyPrefixes() {
+		Router::reload();
+		Router::connect('/protected/:controller/:action/*', array(
+			'prefix' => 'protected',
+			'protected' => true
+		));
+		Router::parse('/');
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'images', 'action' => 'index', 'pass' => array(), 'prefix' => null, 'admin' => false, 'form' => array(), 'url' => array('url' => 'images/index')),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/images/index', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('protected' => true));
+		$expected = '/protected/images/index';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'images', 'action' => 'add'));
+		$expected = '/images/add';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'images', 'action' => 'add', 'protected' => true));
+		$expected = '/protected/images/add';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'edit', 1));
+		$expected = '/images/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'edit', 1, 'protected' => true));
+		$expected = '/protected/images/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'protected_edit', 1, 'protected' => true));
+		$expected = '/protected/images/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'edit', 1, 'protected' => true));
+		$expected = '/protected/images/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1));
+		$expected = '/others/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true));
+		$expected = '/protected/others/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'page' => 1));
+		$expected = '/protected/others/edit/1/page:1';
+		$this->assertEqual($result, $expected);
+
+		Router::connectNamed(array('random'));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'random' => 'my-value'));
+		$expected = '/protected/others/edit/1/random:my-value';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test newer style automatically generated prefix routes.
+ *
+ * @return void
+ */
+	function testUrlGenerationWithAutoPrefixes() {
+		Configure::write('Routing.prefixes', array('protected'));
+		Router::reload();
+		Router::parse('/');
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'images', 'action' => 'index', 'pass' => array(), 'prefix' => null, 'protected' => false, 'form' => array(), 'url' => array('url' => 'images/index')),
+			array('base' => '', 'here' => '/images/index', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('controller' => 'images', 'action' => 'add'));
+		$expected = '/images/add';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'images', 'action' => 'add', 'protected' => true));
+		$expected = '/protected/images/add';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'edit', 1));
+		$expected = '/images/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'edit', 1, 'protected' => true));
+		$expected = '/protected/images/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'protected_edit', 1, 'protected' => true));
+		$expected = '/protected/images/edit/1';
+		$this->assertEqual($result, $expected);
+		
+		$result = Router::url(array('action' => 'protectededit', 1, 'protected' => true));
+		$expected = '/protected/images/protectededit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'edit', 1, 'protected' => true));
+		$expected = '/protected/images/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1));
+		$expected = '/others/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true));
+		$expected = '/protected/others/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'page' => 1));
+		$expected = '/protected/others/edit/1/page:1';
+		$this->assertEqual($result, $expected);
+
+		Router::connectNamed(array('random'));
+		$result = Router::url(array('controller' => 'others', 'action' => 'edit', 1, 'protected' => true, 'random' => 'my-value'));
+		$expected = '/protected/others/edit/1/random:my-value';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that auto-generated prefix routes persist
+ *
+ * @return void
+ */
+	function testAutoPrefixRoutePersistence() {
+		Configure::write('Routing.prefixes', array('protected'));
+		Router::reload();
+		Router::parse('/');
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'images', 'action' => 'index', 'pass' => array(), 'prefix' => 'protected', 'protected' => true, 'form' => array(), 'url' => array('url' => 'protected/images/index')),
+			array('base' => '', 'here' => '/protected/images/index', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('controller' => 'images', 'action' => 'add'));
+		$expected = '/protected/images/add';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'images', 'action' => 'add', 'protected' => false));
+		$expected = '/images/add';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that setting a prefix override the current one
+ *
+ * @return void
+ */
+	function testPrefixOverride() {
+		Configure::write('Routing.prefixes', array('protected', 'admin'));
+		Router::reload();
+		Router::parse('/');
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'images', 'action' => 'index', 'pass' => array(), 'prefix' => 'protected', 'protected' => true, 'form' => array(), 'url' => array('url' => 'protected/images/index')),
+			array('base' => '', 'here' => '/protected/images/index', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('controller' => 'images', 'action' => 'add', 'admin' => true));
+		$expected = '/admin/images/add';
+		$this->assertEqual($result, $expected);
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'images', 'action' => 'index', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/images/index')),
+			array('base' => '', 'here' => '/admin/images/index', 'webroot' => '/')
+		));
+		$result = Router::url(array('controller' => 'images', 'action' => 'add', 'protected' => true));
+		$expected = '/protected/images/add';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRemoveBase method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoveBase() {
+		Router::setRequestInfo(array(
+			array('controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'bare' => 0, 'plugin' => null),
+			array('base' => '/base', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
+		));
+
+		$result = Router::url(array('controller' => 'my_controller', 'action' => 'my_action'));
+		$expected = '/base/my_controller/my_action';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'my_controller', 'action' => 'my_action', 'base' => false));
+		$expected = '/my_controller/my_action';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'my_controller', 'action' => 'my_action', 'base' => true));
+		$expected = '/base/my_controller/my_action/base:1';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testPagesUrlParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testPagesUrlParsing() {
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+
+		$result = Router::parse('/');
+		$expected = array('pass'=> array('home'), 'named' => array(), 'plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/pages/home/');
+		$expected = array('pass' => array('home'), 'named' => array(), 'plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+
+		$result = Router::parse('/pages/display/home/parameter:value');
+		$expected = array('pass' => array('home'), 'named' => array('parameter' => 'value'), 'plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+
+		$result = Router::parse('/');
+		$expected = array('pass' => array('home'), 'named' => array(), 'plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/pages/display/home/event:value');
+		$expected = array('pass' => array('home'), 'named' => array('event' => 'value'), 'plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/pages/display/home/event:Val_u2');
+		$expected = array('pass' => array('home'), 'named' => array('event' => 'Val_u2'), 'plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/pages/display/home/event:val-ue');
+		$expected = array('pass' => array('home'), 'named' => array('event' => 'val-ue'), 'plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/', array('controller' => 'posts', 'action' => 'index'));
+		Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+		$result = Router::parse('/pages/contact/');
+
+		$expected = array('pass'=>array('contact'), 'named' => array(), 'plugin'=> null, 'controller'=>'pages', 'action'=>'display');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that requests with a trailing dot don't loose the do.
+ *
+ * @return void
+ */
+	function testParsingWithTrailingPeriod() {
+		Router::reload();
+		$result = Router::parse('/posts/view/something.');
+		$this->assertEqual($result['pass'][0], 'something.', 'Period was chopped off %s');
+
+		$result = Router::parse('/posts/view/something. . .');
+		$this->assertEqual($result['pass'][0], 'something. . .', 'Period was chopped off %s');
+	}
+
+/**
+ * test that requests with a trailing dot don't loose the do.
+ *
+ * @return void
+ */
+	function testParsingWithTrailingPeriodAndParseExtensions() {
+		Router::reload();
+		Router::parseExtensions('json');
+
+		$result = Router::parse('/posts/view/something.');
+		$this->assertEqual($result['pass'][0], 'something.', 'Period was chopped off %s');
+
+		$result = Router::parse('/posts/view/something. . .');
+		$this->assertEqual($result['pass'][0], 'something. . .', 'Period was chopped off %s');
+	}
+
+/**
+ * test that patterns work for :action
+ *
+ * @return void
+ */
+	function testParsingWithPatternOnAction() {
+		Router::reload();
+		Router::connect(
+			'/blog/:action/*',
+			array('controller' => 'blog_posts'),
+			array('action' => 'other|actions')
+		);
+		$result = Router::parse('/blog/other');
+		$expected = array(
+			'plugin' => null,
+			'controller' => 'blog_posts',
+			'action' => 'other',
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->assertEqual($expected, $result);
+
+		$result = Router::parse('/blog/foobar');
+		$expected = array(
+			'plugin' => null,
+			'controller' => 'blog',
+			'action' => 'foobar',
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->assertEqual($expected, $result);
+
+		$result = Router::url(array('controller' => 'blog_posts', 'action' => 'foo'));
+		$this->assertEqual('/blog_posts/foo', $result);
+
+		$result = Router::url(array('controller' => 'blog_posts', 'action' => 'actions'));
+		$this->assertEqual('/blog/actions', $result);
+	}
+
+/**
+ * testParsingWithPrefixes method
+ *
+ * @access public
+ * @return void
+ */
+	function testParsingWithPrefixes() {
+		$adminParams = array('prefix' => 'admin', 'admin' => true);
+		Router::connect('/admin/:controller', $adminParams);
+		Router::connect('/admin/:controller/:action', $adminParams);
+		Router::connect('/admin/:controller/:action/*', $adminParams);
+
+		Router::setRequestInfo(array(
+			array('controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/base', 'here' => '/', 'webroot' => '/base/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
+		));
+
+		$result = Router::parse('/admin/posts/');
+		$expected = array('pass' => array(), 'named' => array(), 'prefix' => 'admin', 'plugin' => null, 'controller' => 'posts', 'action' => 'index', 'admin' => true);
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/admin/posts');
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('admin' => true, 'controller' => 'posts'));
+		$expected = '/base/admin/posts';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::prefixes();
+		$expected = array('admin');
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+
+		$prefixParams = array('prefix' => 'members', 'members' => true);
+		Router::connect('/members/:controller', $prefixParams);
+		Router::connect('/members/:controller/:action', $prefixParams);
+		Router::connect('/members/:controller/:action/*', $prefixParams);
+
+		Router::setRequestInfo(array(
+			array('controller' => 'controller', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/base', 'here' => '/', 'webroot' => '/', 'passedArgs' => array(), 'argSeparator' => ':', 'namedArgs' => array())
+		));
+
+		$result = Router::parse('/members/posts/index');
+		$expected = array('pass' => array(), 'named' => array(), 'prefix' => 'members', 'plugin' => null, 'controller' => 'posts', 'action' => 'index', 'members' => true);
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('members' => true, 'controller' => 'posts', 'action' =>'index', 'page' => 2));
+		$expected = '/base/members/posts/index/page:2';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('members' => true, 'controller' => 'users', 'action' => 'add'));
+		$expected = '/base/members/users/add';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/posts/index');
+		$expected = array('pass' => array(), 'named' => array(), 'plugin' => null, 'controller' => 'posts', 'action' => 'index');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Tests URL generation with flags and prefixes in and out of context
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlWritingWithPrefixes() {
+		Router::connect('/company/:controller/:action/*', array('prefix' => 'company', 'company' => true));
+		Router::connect('/login', array('controller' => 'users', 'action' => 'login'));
+
+		$result = Router::url(array('controller' => 'users', 'action' => 'login', 'company' => true));
+		$expected = '/company/users/login';
+		$this->assertEqual($result, $expected);
+
+		Router::setRequestInfo(array(
+			array('controller' => 'users', 'action' => 'login', 'company' => true, 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('base' => '/', 'here' => '/', 'webroot' => '/base/')
+		));
+
+		$result = Router::url(array('controller' => 'users', 'action' => 'login', 'company' => false));
+		$expected = '/login';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test url generation with prefixes and custom routes
+ *
+ * @return void
+ */
+	function testUrlWritingWithPrefixesAndCustomRoutes() {
+		Router::connect(
+			'/admin/login',
+			array('controller' => 'users', 'action' => 'login', 'prefix' => 'admin', 'admin' => true)
+		);
+		Router::setRequestInfo(array(
+			array('controller' => 'posts', 'action' => 'index', 'admin' => true, 'prefix' => 'admin',
+				'form' => array(), 'url' => array(), 'plugin' => null
+			),
+			array('base' => '/', 'here' => '/', 'webroot' => '/')
+		));
+		$result = Router::url(array('controller' => 'users', 'action' => 'login', 'admin' => true));
+		$this->assertEqual($result, '/admin/login');
+
+		$result = Router::url(array('controller' => 'users', 'action' => 'login'));
+		$this->assertEqual($result, '/admin/login');
+
+		$result = Router::url(array('controller' => 'users', 'action' => 'admin_login'));
+		$this->assertEqual($result, '/admin/login');
+	}
+
+/**
+ * testPassedArgsOrder method
+ *
+ * @access public
+ * @return void
+ */
+	function testPassedArgsOrder() {
+		Router::connect('/test-passed/*', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::connect('/test2/*', array('controller' => 'pages', 'action' => 'display', 2));
+		Router::connect('/test/*', array('controller' => 'pages', 'action' => 'display', 1));
+		Router::parse('/');
+
+		$result = Router::url(array('controller' => 'pages', 'action' => 'display', 1, 'whatever'));
+		$expected = '/test/whatever';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'pages', 'action' => 'display', 2, 'whatever'));
+		$expected = '/test2/whatever';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('controller' => 'pages', 'action' => 'display', 'home', 'whatever'));
+		$expected = '/test-passed/whatever';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing.prefixes', array('admin'));
+		Router::reload();
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'images', 'action' => 'index', 'pass' => array(), 'named' => array(), 'prefix' => 'protected', 'protected' => true,  'form' => array(), 'url' => array ('url' => 'protected/images/index')),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/protected/images/index', 'webroot' => '/')
+		));
+
+		Router::connect('/protected/:controller/:action/*', array(
+			'controller' => 'users',
+			'action' => 'index',
+			'prefix' => 'protected'
+		));
+
+		Router::parse('/');
+		$result = Router::url(array('controller' => 'images', 'action' => 'add'));
+		$expected = '/protected/images/add';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::prefixes();
+		$expected = array('admin', 'protected');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRegexRouteMatching method
+ *
+ * @access public
+ * @return void
+ */
+	function testRegexRouteMatching() {
+		Router::connect('/:locale/:controller/:action/*', array(), array('locale' => 'dan|eng'));
+
+		$result = Router::parse('/test/test_action');
+		$expected = array('pass' => array(), 'named' => array(), 'controller' => 'test', 'action' => 'test_action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/eng/test/test_action');
+		$expected = array('pass' => array(), 'named' => array(), 'locale' => 'eng', 'controller' => 'test', 'action' => 'test_action', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		$result = Router::parse('/badness/test/test_action');
+		$expected = array('pass' => array('test_action'), 'named' => array(), 'controller' => 'badness', 'action' => 'test', 'plugin' => null);
+		$this->assertEqual($result, $expected);
+
+		Router::reload();
+		Router::connect('/:locale/:controller/:action/*', array(), array('locale' => 'dan|eng'));
+
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'test', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array ('url' => 'test/test_action')),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/test/test_action', 'webroot' => '/')
+		));
+
+		$result = Router::url(array('action' => 'test_another_action'));
+		$expected = '/test/test_another_action';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'test_another_action', 'locale' => 'eng'));
+		$expected = '/eng/test/test_another_action';
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('action' => 'test_another_action', 'locale' => 'badness'));
+		$expected = '/test/test_another_action/locale:badness';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testStripPlugin
+ *
+ * @return void
+ * @access public
+ */
+	function testStripPlugin() {
+		$pluginName = 'forums';
+		$url = 'example.com/' . $pluginName . '/';
+		$expected = 'example.com';
+
+		$this->assertEqual(Router::stripPlugin($url, $pluginName), $expected);
+		$this->assertEqual(Router::stripPlugin($url), $url);
+		$this->assertEqual(Router::stripPlugin($url, null), $url);
+	}
+/**
+ * testCurentRoute
+ *
+ * This test needs some improvement and actual requestAction() usage
+ *
+ * @return void
+ * @access public
+ */
+	function testCurrentRoute() {
+		$url = array('controller' => 'pages', 'action' => 'display', 'government');
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route =& Router::currentRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => null)), $route->defaults);
+	}
+/**
+ * testRequestRoute
+ *
+ * @return void
+ * @access public
+ */
+	function testRequestRoute() {
+		$url = array('controller' => 'products', 'action' => 'display', 5);
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route =& Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => null)), $route->defaults);
+
+		// test that the first route is matched
+		$newUrl = array('controller' => 'products', 'action' => 'display', 6);
+		Router::connect('/government', $url);
+		Router::parse('/government');
+		$route =& Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => null)), $route->defaults);
+
+		// test that an unmatched route does not change the current route
+		$newUrl = array('controller' => 'products', 'action' => 'display', 6);
+		Router::connect('/actor', $url);
+		Router::parse('/government');
+		$route =& Router::requestRoute();
+		$this->assertEqual(array_merge($url, array('plugin' => null)), $route->defaults);
+	}
+/**
+ * testGetParams
+ *
+ * @return void
+ * @access public
+ */
+	function testGetParams() {
+		$paths = array('base' => '/', 'here' => '/products/display/5', 'webroot' => '/webroot');
+		$params = array('param1' => '1', 'param2' => '2');
+		Router::setRequestInfo(array($params, $paths));
+		$expected = array(
+			'plugin' => null, 'controller' => false, 'action' => false,
+			'param1' => '1', 'param2' => '2'
+		);
+		$this->assertEqual(Router::getparams(), $expected);
+		$this->assertEqual(Router::getparam('controller'), false);
+		$this->assertEqual(Router::getparam('param1'), '1');
+		$this->assertEqual(Router::getparam('param2'), '2');
+
+		Router::reload();
+
+		$params = array('controller' => 'pages', 'action' => 'display');
+		Router::setRequestInfo(array($params, $paths));
+		$expected = array('plugin' => null, 'controller' => 'pages', 'action' => 'display');
+		$this->assertEqual(Router::getparams(), $expected);
+		$this->assertEqual(Router::getparams(true), $expected);
+	}
+
+/**
+ * test that connectDefaults() can disable default route connection
+ *
+ * @return void
+ */
+	function testDefaultsMethod() {
+		Router::defaults(false);
+		Router::connect('/test/*', array('controller' => 'pages', 'action' => 'display', 2));
+		$result = Router::parse('/posts/edit/5');
+		$this->assertFalse(isset($result['controller']));
+		$this->assertFalse(isset($result['action']));
+	}
+
+/**
+ * test that the required default routes are connected.
+ *
+ * @return void
+ */
+	function testConnectDefaultRoutes() {
+		App::build(array(
+			'plugins' =>  array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS
+			)
+		), true);
+		App::objects('plugin', null, false);
+		Router::reload();
+
+		$result = Router::url(array('plugin' => 'plugin_js', 'controller' => 'js_file', 'action' => 'index'));
+		$this->assertEqual($result, '/plugin_js/js_file');
+
+		$result = Router::parse('/plugin_js/js_file');
+		$expected = array(
+			'plugin' => 'plugin_js', 'controller' => 'js_file', 'action' => 'index',
+			'named' => array(), 'pass' => array()
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = Router::url(array('plugin' => 'test_plugin', 'controller' => 'test_plugin', 'action' => 'index'));
+		$this->assertEqual($result, '/test_plugin');
+
+		$result = Router::parse('/test_plugin');
+		$expected = array(
+			'plugin' => 'test_plugin', 'controller' => 'test_plugin', 'action' => 'index',
+			'named' => array(), 'pass' => array()
+		);
+
+		$this->assertEqual($result, $expected, 'Plugin shortcut route broken. %s');
+	}
+
+/**
+ * test using a custom route class for route connection
+ *
+ * @return void
+ */
+	function testUsingCustomRouteClass() {
+		Mock::generate('CakeRoute', 'MockConnectedRoute');
+		$routes = Router::connect(
+			'/:slug',
+			array('controller' => 'posts', 'action' => 'view'),
+			array('routeClass' => 'MockConnectedRoute', 'slug' => '[a-z_-]+')
+		);
+		$this->assertTrue(is_a($routes[0], 'MockConnectedRoute'), 'Incorrect class used. %s');
+		$expected = array('controller' => 'posts', 'action' => 'view', 'slug' => 'test');
+		$routes[0]->setReturnValue('parse', $expected);
+		$result = Router::parse('/test');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test reversing parameter arrays back into strings.
+ *
+ * @return void
+ */
+	function testRouterReverse() {
+		$params = array(
+			'controller' => 'posts',
+			'action' => 'view',
+			'pass' => array(1),
+			'named' => array(),
+			'url' => array(),
+			'autoRender' => 1,
+			'bare' => 1,
+			'return' => 1,
+			'requested' => 1
+		);
+		$result = Router::reverse($params);
+		$this->assertEqual($result, '/posts/view/1');
+
+		$params = array(
+			'controller' => 'posts',
+			'action' => 'index',
+			'pass' => array(1),
+			'named' => array('page' => 1, 'sort' => 'Article.title', 'direction' => 'desc'),
+			'url' => array()
+		);
+		$result = Router::reverse($params);
+		$this->assertEqual($result, '/posts/index/1/page:1/sort:Article.title/direction:desc');
+
+		Router::connect('/:lang/:controller/:action/*', array(), array('lang' => '[a-z]{3}'));
+		$params = array(
+			'lang' => 'eng',
+			'controller' => 'posts',
+			'action' => 'view',
+			'pass' => array(1),
+			'named' => array(),
+			'url' => array('url' => 'eng/posts/view/1')
+		);
+		$result = Router::reverse($params);
+		$this->assertEqual($result, '/eng/posts/view/1');
+
+		$params = array(
+			'lang' => 'eng',
+			'controller' => 'posts',
+			'action' => 'view',
+			'pass' => array(1),
+			'named' => array(),
+			'url' => array('url' => 'eng/posts/view/1', 'foo' => 'bar', 'baz' => 'quu'),
+			'paging' => array(),
+			'models' => array()
+		);
+		$result = Router::reverse($params);
+		$this->assertEqual($result, '/eng/posts/view/1?foo=bar&baz=quu');
+	}
+}
+
+/**
+ * Test case for CakeRoute
+ *
+ * @package cake.tests.cases.libs.
+ **/
+class CakeRouteTestCase extends CakeTestCase {
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->_routing = Configure::read('Routing');
+		Configure::write('Routing', array('admin' => null, 'prefixes' => array()));
+		Router::reload();
+	}
+
+/**
+ * end the test and reset the environment
+ *
+ * @return void
+ **/
+	function endTest() {
+		Configure::write('Routing', $this->_routing);
+	}
+
+/**
+ * Test the construction of a CakeRoute
+ *
+ * @return void
+ **/
+	function testConstruction() {
+		$route =& new CakeRoute('/:controller/:action/:id', array(), array('id' => '[0-9]+'));
+
+		$this->assertEqual($route->template, '/:controller/:action/:id');
+		$this->assertEqual($route->defaults, array());
+		$this->assertEqual($route->options, array('id' => '[0-9]+'));
+		$this->assertFalse($route->compiled());
+	}
+
+/**
+ * test Route compiling.
+ *
+ * @return void
+ **/
+	function testBasicRouteCompiling() {
+		$route =& new CakeRoute('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		$result = $route->compile();
+		$expected = '#^/*$#';
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($route->keys, array());
+
+		$route =& new CakeRoute('/:controller/:action', array('controller' => 'posts'));
+		$result = $route->compile();
+
+		$this->assertPattern($result, '/posts/edit');
+		$this->assertPattern($result, '/posts/super_delete');
+		$this->assertNoPattern($result, '/posts');
+		$this->assertNoPattern($result, '/posts/super_delete/1');
+
+		$route =& new CakeRoute('/posts/foo:id', array('controller' => 'posts', 'action' => 'view'));
+		$result = $route->compile();
+
+		$this->assertPattern($result, '/posts/foo:1');
+		$this->assertPattern($result, '/posts/foo:param');
+		$this->assertNoPattern($result, '/posts');
+		$this->assertNoPattern($result, '/posts/');
+
+		$this->assertEqual($route->keys, array('id'));
+
+		$route =& new CakeRoute('/:plugin/:controller/:action/*', array('plugin' => 'test_plugin', 'action' => 'index'));
+		$result = $route->compile();
+		$this->assertPattern($result, '/test_plugin/posts/index');
+		$this->assertPattern($result, '/test_plugin/posts/edit/5');
+		$this->assertPattern($result, '/test_plugin/posts/edit/5/name:value/nick:name');
+	}
+
+/**
+ * test route names with - in them.
+ *
+ * @return void
+ */
+	function testHyphenNames() {
+		$route =& new CakeRoute('/articles/:date-from/:date-to', array(
+			'controller' => 'articles', 'action' => 'index'
+		));
+		$expected = array(
+			'controller' => 'articles',
+			'action' => 'index',
+			'date-from' => '2009-07-31',
+			'date-to' => '2010-07-31',
+			'named' => array(),
+			'pass' => array()
+		);
+		$result = $route->parse('/articles/2009-07-31/2010-07-31');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that route parameters that overlap don't cause errors.
+ *
+ * @return void
+ */
+	function testRouteParameterOverlap() {
+		$route =& new CakeRoute('/invoices/add/:idd/:id', array('controller' => 'invoices', 'action' => 'add'));
+		$result = $route->compile();
+		$this->assertPattern($result, '/invoices/add/1/3');
+
+		$route =& new CakeRoute('/invoices/add/:id/:idd', array('controller' => 'invoices', 'action' => 'add'));
+		$result = $route->compile();
+		$this->assertPattern($result, '/invoices/add/1/3');
+	}
+
+/**
+ * test compiling routes with keys that have patterns
+ *
+ * @return void
+ **/
+	function testRouteCompilingWithParamPatterns() {
+		extract(Router::getNamedExpressions());
+
+		$route = new CakeRoute(
+			'/:controller/:action/:id',
+			array(),
+			array('id' => $ID)
+		);
+		$result = $route->compile();
+		$this->assertPattern($result, '/posts/edit/1');
+		$this->assertPattern($result, '/posts/view/518098');
+		$this->assertNoPattern($result, '/posts/edit/name-of-post');
+		$this->assertNoPattern($result, '/posts/edit/4/other:param');
+		$this->assertEqual($route->keys, array('controller', 'action', 'id'));
+
+		$route =& new CakeRoute(
+			'/:lang/:controller/:action/:id',
+			array('controller' => 'testing4'),
+			array('id' => $ID, 'lang' => '[a-z]{3}')
+		);
+		$result = $route->compile();
+		$this->assertPattern($result, '/eng/posts/edit/1');
+		$this->assertPattern($result, '/cze/articles/view/1');
+		$this->assertNoPattern($result, '/language/articles/view/2');
+		$this->assertNoPattern($result, '/eng/articles/view/name-of-article');
+		$this->assertEqual($route->keys, array('lang', 'controller', 'action', 'id'));
+
+		foreach (array(':', '@', ';', '$', '-') as $delim) {
+			$route =& new CakeRoute('/posts/:id' . $delim . ':title');
+			$result = $route->compile();
+
+			$this->assertPattern($result, '/posts/1' . $delim . 'name-of-article');
+			$this->assertPattern($result, '/posts/13244' . $delim . 'name-of_Article[]');
+			$this->assertNoPattern($result, '/posts/11!nameofarticle');
+			$this->assertNoPattern($result, '/posts/11');
+
+			$this->assertEqual($route->keys, array('id', 'title'));
+		}
+
+		$route =& new CakeRoute(
+			'/posts/:id::title/:year',
+			array('controller' => 'posts', 'action' => 'view'),
+			array('id' => $ID, 'year' => $Year, 'title' => '[a-z-_]+')
+		);
+		$result = $route->compile();
+		$this->assertPattern($result, '/posts/1:name-of-article/2009/');
+		$this->assertPattern($result, '/posts/13244:name-of-article/1999');
+		$this->assertNoPattern($result, '/posts/hey_now:nameofarticle');
+		$this->assertNoPattern($result, '/posts/:nameofarticle/2009');
+		$this->assertNoPattern($result, '/posts/:nameofarticle/01');
+		$this->assertEqual($route->keys, array('id', 'title', 'year'));
+
+		$route =& new CakeRoute(
+			'/posts/:url_title-(uuid::id)',
+			array('controller' => 'posts', 'action' => 'view'),
+			array('pass' => array('id', 'url_title'), 'id' => $ID)
+		);
+		$result = $route->compile();
+		$this->assertPattern($result, '/posts/some_title_for_article-(uuid:12534)/');
+		$this->assertPattern($result, '/posts/some_title_for_article-(uuid:12534)');
+		$this->assertNoPattern($result, '/posts/');
+		$this->assertNoPattern($result, '/posts/nameofarticle');
+		$this->assertNoPattern($result, '/posts/nameofarticle-12347');
+		$this->assertEqual($route->keys, array('url_title', 'id'));
+	}
+
+/**
+ * test more complex route compiling & parsing with mid route greedy stars
+ * and optional routing parameters
+ *
+ * @return void
+ */
+	function testComplexRouteCompilingAndParsing() {
+		extract(Router::getNamedExpressions());
+
+		$route =& new CakeRoute(
+			'/posts/:month/:day/:year/*',
+			array('controller' => 'posts', 'action' => 'view'),
+			array('year' => $Year, 'month' => $Month, 'day' => $Day)
+		);
+		$result = $route->compile();
+		$this->assertPattern($result, '/posts/08/01/2007/title-of-post');
+		$result = $route->parse('/posts/08/01/2007/title-of-post');
+
+		$this->assertEqual(count($result), 8);
+		$this->assertEqual($result['controller'], 'posts');
+		$this->assertEqual($result['action'], 'view');
+		$this->assertEqual($result['year'], '2007');
+		$this->assertEqual($result['month'], '08');
+		$this->assertEqual($result['day'], '01');
+
+		$route =& new CakeRoute(
+			"/:extra/page/:slug/*",
+			array('controller' => 'pages', 'action' => 'view', 'extra' => null),
+			array("extra" => '[a-z1-9_]*', "slug" => '[a-z1-9_]+', "action" => 'view')
+		);
+		$result = $route->compile();
+
+		$this->assertPattern($result, '/some_extra/page/this_is_the_slug');
+		$this->assertPattern($result, '/page/this_is_the_slug');
+		$this->assertEqual($route->keys, array('extra', 'slug'));
+		$this->assertEqual($route->options, array('extra' => '[a-z1-9_]*', 'slug' => '[a-z1-9_]+', 'action' => 'view'));
+		$expected = array(
+			'controller' => 'pages',
+			'action' => 'view',
+			'extra' => null,
+		);
+		$this->assertEqual($route->defaults, $expected);
+
+		$route =& new CakeRoute(
+			'/:controller/:action/*',
+			array('project' => false),
+			array(
+				'controller' => 'source|wiki|commits|tickets|comments|view',
+				'action' => 'branches|history|branch|logs|view|start|add|edit|modify'
+			)
+		);
+		$this->assertFalse($route->parse('/chaw_test/wiki'));
+
+		$result = $route->compile();
+		$this->assertNoPattern($result, '/some_project/source');
+		$this->assertPattern($result, '/source/view');
+		$this->assertPattern($result, '/source/view/other/params');
+		$this->assertNoPattern($result, '/chaw_test/wiki');
+		$this->assertNoPattern($result, '/source/wierd_action');
+	}
+
+/**
+ * test that routes match their pattern.
+ *
+ * @return void
+ **/
+	function testMatchBasic() {
+		$route = new CakeRoute('/:controller/:action/:id', array('plugin' => null));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 0));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 'id' => 1));
+		$this->assertEqual($result, '/posts/view/1');
+
+		$route =& new CakeRoute('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'home'));
+		$this->assertEqual($result, '/');
+
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'about'));
+		$this->assertFalse($result);
+
+
+		$route =& new CakeRoute('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'home'));
+		$this->assertEqual($result, '/pages/home');
+
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 'about'));
+		$this->assertEqual($result, '/pages/about');
+
+
+		$route =& new CakeRoute('/blog/:action', array('controller' => 'posts'));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view'));
+		$this->assertEqual($result, '/blog/view');
+
+		$result = $route->match(array('controller' => 'nodes', 'action' => 'view'));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 1));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'id' => 2));
+		$this->assertFalse($result);
+
+
+		$route =& new CakeRoute('/foo/:controller/:action', array('action' => 'index'));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view'));
+		$this->assertEqual($result, '/foo/posts/view');
+
+
+		$route =& new CakeRoute('/:plugin/:id/*', array('controller' => 'posts', 'action' => 'view'));
+		$result = $route->match(array('plugin' => 'test', 'controller' => 'posts', 'action' => 'view', 'id' => '1'));
+		$this->assertEqual($result, '/test/1/');
+
+		$result = $route->match(array('plugin' => 'fo', 'controller' => 'posts', 'action' => 'view', 'id' => '1', '0'));
+		$this->assertEqual($result, '/fo/1/0');
+
+		$result = $route->match(array('plugin' => 'fo', 'controller' => 'nodes', 'action' => 'view', 'id' => 1));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('plugin' => 'fo', 'controller' => 'posts', 'action' => 'edit', 'id' => 1));
+		$this->assertFalse($result);
+
+		$route =& new CakeRoute('/admin/subscriptions/:action/*', array(
+			'controller' => 'subscribe', 'admin' => true, 'prefix' => 'admin'
+		));
+
+		$url = array('controller' => 'subscribe', 'admin' => true, 'action' => 'edit', 1);
+		$result = $route->match($url);
+		$expected = '/admin/subscriptions/edit/1';
+		$this->assertEqual($result, $expected);
+
+		$route =& new CakeRoute('/articles/:date-from/:date-to', array(
+			'controller' => 'articles', 'action' => 'index'
+		));
+		$url = array(
+			'controller' => 'articles',
+			'action' => 'index',
+			'date-from' => '2009-07-31',
+			'date-to' => '2010-07-31'
+		);
+
+		$result = $route->match($url);
+		$expected = '/articles/2009-07-31/2010-07-31';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test match() with greedy routes, named parameters and passed args.
+ *
+ * @return void
+ */
+	function testMatchWithNamedParametersAndPassedArgs() {
+		Router::connectNamed(true);
+
+		$route = new CakeRoute('/:controller/:action/*', array('plugin' => null));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'index', 'plugin' => null, 'page' => 1));
+		$this->assertEqual($result, '/posts/index/page:1');
+
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5));
+		$this->assertEqual($result, '/posts/view/5');
+
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'plugin' => null, 5, 'page' => 1, 'limit' => 20, 'order' => 'title'));
+		$this->assertEqual($result, '/posts/view/5/page:1/limit:20/order:title');
+
+
+		$route =& new CakeRoute('/test2/*', array('controller' => 'pages', 'action' => 'display', 2));
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 1));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 2, 'something'));
+		$this->assertEqual($result, '/test2/something');
+
+		$result = $route->match(array('controller' => 'pages', 'action' => 'display', 5, 'something'));
+		$this->assertFalse($result);
+	}
+
+/**
+ * test that match with patterns works.
+ *
+ * @return void
+ */
+	function testMatchWithPatterns() {
+		$route =& new CakeRoute('/:controller/:action/:id', array('plugin' => null), array('id' => '[0-9]+'));
+		$result = $route->match(array('controller' => 'posts', 'action' => 'view', 'id' => 'foo'));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 'id' => '9'));
+		$this->assertEqual($result, '/posts/view/9');
+
+		$result = $route->match(array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 'id' => '922'));
+		$this->assertEqual($result, '/posts/view/922');
+
+		$result = $route->match(array('plugin' => null, 'controller' => 'posts', 'action' => 'view', 'id' => 'a99'));
+		$this->assertFalse($result);
+	}
+
+/**
+ * test that patterns work for :action
+ *
+ * @return void
+ */
+	function testPatternOnAction() {
+		$route =& new CakeRoute(
+			'/blog/:action/*',
+			array('controller' => 'blog_posts'),
+			array('action' => 'other|actions')
+		);
+		$result = $route->match(array('controller' => 'blog_posts', 'action' => 'foo'));
+		$this->assertFalse($result);
+
+		$result = $route->match(array('controller' => 'blog_posts', 'action' => 'actions'));
+		$this->assertTrue($result);
+
+		$result = $route->parse('/blog/other');
+		$expected = array('controller' => 'blog_posts', 'action' => 'other', 'pass' => array(), 'named' => array());
+		$this->assertEqual($expected, $result);
+
+		$result = $route->parse('/blog/foobar');
+		$this->assertFalse($result);
+	}
+
+/**
+ * test persistParams ability to persist parameters from $params and remove params.
+ *
+ * @return void
+ */
+	function testPersistParams() {
+		$route =& new CakeRoute(
+			'/:lang/:color/blog/:action',
+			array('controller' => 'posts'),
+			array('persist' => array('lang', 'color'))
+		);
+		$url = array('controller' => 'posts', 'action' => 'index');
+		$params = array('lang' => 'en', 'color' => 'blue');
+		$result = $route->persistParams($url, $params);
+		$this->assertEqual($result['lang'], 'en');
+		$this->assertEqual($result['color'], 'blue');
+
+		$url = array('controller' => 'posts', 'action' => 'index', 'color' => 'red');
+		$params = array('lang' => 'en', 'color' => 'blue');
+		$result = $route->persistParams($url, $params);
+		$this->assertEqual($result['lang'], 'en');
+		$this->assertEqual($result['color'], 'red');
+	}
+
+/**
+ * test the parse method of CakeRoute.
+ *
+ * @return void
+ */
+	function testParse() {
+		extract(Router::getNamedExpressions());
+		$route =& new CakeRoute('/:controller/:action/:id', array('controller' => 'testing4', 'id' => null), array('id' => $ID));
+		$route->compile();
+		$result = $route->parse('/posts/view/1');
+		$this->assertEqual($result['controller'], 'posts');
+		$this->assertEqual($result['action'], 'view');
+		$this->assertEqual($result['id'], '1');
+
+		$route =& new Cakeroute(
+			'/admin/:controller',
+			array('prefix' => 'admin', 'admin' => 1, 'action' => 'index')
+		);
+		$route->compile();
+		$result = $route->parse('/admin/');
+		$this->assertFalse($result);
+
+		$result = $route->parse('/admin/posts');
+		$this->assertEqual($result['controller'], 'posts');
+		$this->assertEqual($result['action'], 'index');
+	}
+}
+
+/**
+ * test case for PluginShortRoute
+ *
+ * @package cake.tests.libs
+ */
+class PluginShortRouteTestCase extends  CakeTestCase {
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->_routing = Configure::read('Routing');
+		Configure::write('Routing', array('admin' => null, 'prefixes' => array()));
+		Router::reload();
+	}
+
+/**
+ * end the test and reset the environment
+ *
+ * @return void
+ **/
+	function endTest() {
+		Configure::write('Routing', $this->_routing);
+	}
+
+/**
+ * test the parsing of routes.
+ *
+ * @return void
+ */
+	function testParsing() {
+		$route =& new PluginShortRoute('/:plugin', array('action' => 'index'), array('plugin' => 'foo|bar'));
+
+		$result = $route->parse('/foo');
+		$this->assertEqual($result['plugin'], 'foo');
+		$this->assertEqual($result['controller'], 'foo');
+		$this->assertEqual($result['action'], 'index');
+
+		$result = $route->parse('/wrong');
+		$this->assertFalse($result, 'Wrong plugin name matched %s');
+	}
+
+/**
+ * test the reverse routing of the plugin shortcut urls.
+ *
+ * @return void
+ */
+	function testMatch() {
+		$route =& new PluginShortRoute('/:plugin', array('action' => 'index'), array('plugin' => 'foo|bar'));
+
+		$result = $route->match(array('plugin' => 'foo', 'controller' => 'posts', 'action' => 'index'));
+		$this->assertFalse($result, 'plugin controller mismatch was converted. %s');
+
+		$result = $route->match(array('plugin' => 'foo', 'controller' => 'foo', 'action' => 'index'));
+		$this->assertEqual($result, '/foo');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/sanitize.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/sanitize.test.php
new file mode 100644
index 000000000..34bb5f497
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/sanitize.test.php
@@ -0,0 +1,523 @@
+<?php
+/**
+ * SanitizeTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5428
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Sanitize');
+
+/**
+ * DataTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class SanitizeDataTest extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'SanitizeDataTest'
+ * @access public
+ */
+	var $name = 'SanitizeDataTest';
+
+/**
+ * useTable property
+ *
+ * @var string 'data_tests'
+ * @access public
+ */
+	var $useTable = 'data_tests';
+}
+
+/**
+ * Article class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class SanitizeArticle extends CakeTestModel {
+
+/**
+ * name property
+ *
+ * @var string 'Article'
+ * @access public
+ */
+	var $name = 'SanitizeArticle';
+
+/**
+ * useTable property
+ *
+ * @var string 'articles'
+ * @access public
+ */
+	var $useTable = 'articles';
+}
+
+/**
+ * SanitizeTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class SanitizeTest extends CakeTestCase {
+
+/**
+ * autoFixtures property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $autoFixtures = false;
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array('core.data_test', 'core.article');
+
+/**
+ * startTest method
+ *
+ * @param mixed $method
+ * @access public
+ * @return void
+ */
+	function startTest($method) {
+		parent::startTest($method);
+		$this->_initDb();
+	}
+
+/**
+ * testEscapeAlphaNumeric method
+ *
+ * @access public
+ * @return void
+ */
+	function testEscapeAlphaNumeric() {
+		$resultAlpha = Sanitize::escape('abc', 'test_suite');
+		$this->assertEqual($resultAlpha, 'abc');
+
+		$resultNumeric = Sanitize::escape('123', 'test_suite');
+		$this->assertEqual($resultNumeric, '123');
+
+		$resultNumeric = Sanitize::escape(1234, 'test_suite');
+		$this->assertEqual($resultNumeric, 1234);
+
+		$resultNumeric = Sanitize::escape(1234.23, 'test_suite');
+		$this->assertEqual($resultNumeric, 1234.23);
+
+		$resultNumeric = Sanitize::escape('#1234.23', 'test_suite');
+		$this->assertEqual($resultNumeric, '#1234.23');
+
+		$resultNull = Sanitize::escape(null, 'test_suite');
+		$this->assertEqual($resultNull, null);
+
+		$resultNull = Sanitize::escape(false, 'test_suite');
+		$this->assertEqual($resultNull, false);
+
+		$resultNull = Sanitize::escape(true, 'test_suite');
+		$this->assertEqual($resultNull, true);
+	}
+
+/**
+ * testClean method
+ *
+ * @access public
+ * @return void
+ */
+	function testClean() {
+		$string = 'test & "quote" \'other\' ;.$ symbol.' . "\r" . 'another line';
+		$expected = 'test &amp; &quot;quote&quot; &#039;other&#039; ;.$ symbol.another line';
+		$result = Sanitize::clean($string, array('connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$string = 'test & "quote" \'other\' ;.$ symbol.' . "\r" . 'another line';
+		$expected = 'test & ' . Sanitize::escape('"quote"', 'test_suite') . ' ' . Sanitize::escape('\'other\'', 'test_suite') . ' ;.$ symbol.another line';
+		$result = Sanitize::clean($string, array('encode' => false, 'connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$string = 'test & "quote" \'other\' ;.$ \\$ symbol.' . "\r" . 'another line';
+		$expected = 'test & "quote" \'other\' ;.$ $ symbol.another line';
+		$result = Sanitize::clean($string, array('encode' => false, 'escape' => false, 'connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$string = 'test & "quote" \'other\' ;.$ \\$ symbol.' . "\r" . 'another line';
+		$expected = 'test & "quote" \'other\' ;.$ \\$ symbol.another line';
+		$result = Sanitize::clean($string, array('encode' => false, 'escape' => false, 'dollar' => false, 'connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$string = 'test & "quote" \'other\' ;.$ symbol.' . "\r" . 'another line';
+		$expected = 'test & "quote" \'other\' ;.$ symbol.' . "\r" . 'another line';
+		$result = Sanitize::clean($string, array('encode' => false, 'escape' => false, 'carriage' => false, 'connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$array = array(array('test & "quote" \'other\' ;.$ symbol.' . "\r" . 'another line'));
+		$expected = array(array('test &amp; &quot;quote&quot; &#039;other&#039; ;.$ symbol.another line'));
+		$result = Sanitize::clean($array, array('connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$array = array(array('test & "quote" \'other\' ;.$ \\$ symbol.' . "\r" . 'another line'));
+		$expected = array(array('test & "quote" \'other\' ;.$ $ symbol.another line'));
+		$result = Sanitize::clean($array, array('encode' => false, 'escape' => false, 'connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$array = array(array('test odd Ä spacesé'));
+		$expected = array(array('test odd &Auml; spaces&eacute;'));
+		$result = Sanitize::clean($array, array('odd_spaces' => false, 'escape' => false, 'connection' => 'test_suite'));
+		$this->assertEqual($result, $expected);
+
+		$array = array(array('\\$', array('key' => 'test & "quote" \'other\' ;.$ \\$ symbol.' . "\r" . 'another line')));
+		$expected = array(array('$', array('key' => 'test & "quote" \'other\' ;.$ $ symbol.another line')));
+		$result = Sanitize::clean($array, array('encode' => false, 'escape' => false));
+		$this->assertEqual($result, $expected);
+
+		$string = '';
+		$expected = '';
+		$result = Sanitize::clean($string);
+		$this->assertEqual($string, $expected);
+
+		$data = array(
+			'Grant' => array(
+				'title' => '2 o clock grant',
+				'grant_peer_review_id' => 3,
+				'institution_id' => 5,
+				'created_by' => 1,
+				'modified_by' => 1,
+				'created' => '2010-07-15 14:11:00',
+				'modified' => '2010-07-19 10:45:41'
+			),
+			'GrantsMember' => array(
+				0 => array(
+					'id' => 68,
+					'grant_id' => 120,
+					'member_id' => 16,
+					'program_id' => 29,
+					'pi_percent_commitment' => 1
+				)
+			)
+		);
+		$result = Sanitize::clean($data);
+		$this->assertEqual($result, $data);
+	}
+
+/**
+ * testHtml method
+ *
+ * @access public
+ * @return void
+ */
+	function testHtml() {
+		$string = '<p>This is a <em>test string</em> & so is this</p>';
+		$expected = 'This is a test string &amp; so is this';
+		$result = Sanitize::html($string, array('remove' => true));
+		$this->assertEqual($result, $expected);
+
+		$string = 'The "lazy" dog \'jumped\' & flew over the moon. If (1+1) = 2 <em>is</em> true, (2-1) = 1 is also true';
+		$expected = 'The &quot;lazy&quot; dog &#039;jumped&#039; &amp; flew over the moon. If (1+1) = 2 &lt;em&gt;is&lt;/em&gt; true, (2-1) = 1 is also true';
+		$result = Sanitize::html($string);
+		$this->assertEqual($result, $expected);
+		
+		$string = 'The "lazy" dog \'jumped\'';
+		$expected = 'The &quot;lazy&quot; dog \'jumped\'';
+		$result = Sanitize::html($string, array('quotes' => ENT_COMPAT));
+		$this->assertEqual($result, $expected);
+		
+		$string = 'The "lazy" dog \'jumped\'';
+		$result = Sanitize::html($string, array('quotes' => ENT_NOQUOTES));
+		$this->assertEqual($result, $string);
+		
+		$string = 'The "lazy" dog \'jumped\' & flew over the moon. If (1+1) = 2 <em>is</em> true, (2-1) = 1 is also true';
+		$expected = 'The &quot;lazy&quot; dog &#039;jumped&#039; &amp; flew over the moon. If (1+1) = 2 &lt;em&gt;is&lt;/em&gt; true, (2-1) = 1 is also true';
+		$result = Sanitize::html($string);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testStripWhitespace method
+ *
+ * @access public
+ * @return void
+ */
+	function testStripWhitespace() {
+		$string = "This     sentence \t\t\t has lots of \n\n white\nspace \rthat \r\n needs to be    \t    \n trimmed.";
+		$expected = "This sentence has lots of whitespace that needs to be trimmed.";
+		$result = Sanitize::stripWhitespace($string);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testParanoid method
+ *
+ * @access public
+ * @return void
+ */
+	function testParanoid() {
+		$string = 'I would like to !%@#% & dance & sing ^$&*()-+';
+		$expected = 'Iwouldliketodancesing';
+		$result = Sanitize::paranoid($string);
+		$this->assertEqual($result, $expected);
+
+		$string = array('This |s th% s0ng that never ends it g*es',
+						'on and on my friends, b^ca#use it is the',
+						'so&g th===t never ends.');
+		$expected = array('This s th% s0ng that never ends it g*es',
+						'on and on my friends bcause it is the',
+						'sog tht never ends.');
+		$result = Sanitize::paranoid($string, array('%', '*', '.', ' '));
+		$this->assertEqual($result, $expected);
+
+		$string = "anything' OR 1 = 1";
+		$expected = 'anythingOR11';
+		$result = Sanitize::paranoid($string);
+		$this->assertEqual($result, $expected);
+
+		$string = "x' AND email IS NULL; --";
+		$expected = 'xANDemailISNULL';
+		$result = Sanitize::paranoid($string);
+		$this->assertEqual($result, $expected);
+
+		$string = "x' AND 1=(SELECT COUNT(*) FROM users); --";
+		$expected = "xAND1SELECTCOUNTFROMusers";
+		$result = Sanitize::paranoid($string);
+		$this->assertEqual($result, $expected);
+
+		$string = "x'; DROP TABLE members; --";
+		$expected = "xDROPTABLEmembers";
+		$result = Sanitize::paranoid($string);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testStripImages method
+ *
+ * @access public
+ * @return void
+ */
+	function testStripImages() {
+		$string = '<img src="/img/test.jpg" alt="my image" />';
+		$expected = 'my image<br />';
+		$result = Sanitize::stripImages($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<img src="javascript:alert(\'XSS\');" />';
+		$expected = '';
+		$result = Sanitize::stripImages($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<a href="http://www.badsite.com/phising"><img src="/img/test.jpg" alt="test image alt" title="test image title" id="myImage" class="image-left"/></a>';
+		$expected = '<a href="http://www.badsite.com/phising">test image alt</a><br />';
+		$result = Sanitize::stripImages($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<a onclick="medium()" href="http://example.com"><img src="foobar.png" onclick="evilFunction(); return false;"/></a>';
+		$expected = '<a onclick="medium()" href="http://example.com"></a>';
+		$result = Sanitize::stripImages($string);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testStripScripts method
+ *
+ * @access public
+ * @return void
+ */
+	function testStripScripts() {
+		$string = '<link href="/css/styles.css" media="screen" rel="stylesheet" />';
+		$expected = '';
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<link href="/css/styles.css" media="screen" rel="stylesheet" />' . "\n" . '<link rel="icon" href="/favicon.ico" type="image/x-icon" />' . "\n" . '<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />' . "\n" . '<link rel="alternate" href="/feed.xml" title="RSS Feed" type="application/rss+xml" />';
+		$expected = "\n" . '<link rel="icon" href="/favicon.ico" type="image/x-icon" />' . "\n" . '<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />'."\n".'<link rel="alternate" href="/feed.xml" title="RSS Feed" type="application/rss+xml" />';
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<script type="text/javascript"> alert("hacked!");</script>';
+		$expected = '';
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<script> alert("hacked!");</script>';
+		$expected = '';
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<style>#content { display:none; }</style>';
+		$expected = '';
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<style type="text/css"><!-- #content { display:none; } --></style>';
+		$expected = '';
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = <<<HTML
+text
+<style type="text/css">
+<!-- 
+#content { display:none; } 
+-->
+</style>
+text
+HTML;
+		$expected = "text\n\ntext";
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+
+		$string = <<<HTML
+text
+<script type="text/javascript">
+<!-- 
+alert('wooo');
+-->
+</script>
+text
+HTML;
+		$expected = "text\n\ntext";
+		$result = Sanitize::stripScripts($string);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testStripAll method
+ *
+ * @access public
+ * @return void
+ */
+	function testStripAll() {
+		$string = '<img """><script>alert("xss")</script>"/>';
+		$expected ='"/>';
+		$result = Sanitize::stripAll($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<IMG SRC=&#0000106&#0000097&#0000118&#0000097&#0000115&#0000099&#0000114&#0000105&#0000112&#0000116&#0000058&#0000097&#0000108&#0000101&#0000114&#0000116&#0000040&#0000039&#0000088&#0000083&#0000083&#0000039&#0000041>';
+		$expected = '';
+		$result = Sanitize::stripAll($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<<script>alert("XSS");//<</script>';
+		$expected = '<';
+		$result = Sanitize::stripAll($string);
+		$this->assertEqual($result, $expected);
+
+		$string = '<img src="http://google.com/images/logo.gif" onload="window.location=\'http://sam.com/\'" />'."\n".
+					"<p>This is ok      \t\n   text</p>\n".
+					'<link rel="stylesheet" href="/css/master.css" type="text/css" media="screen" title="my sheet" charset="utf-8">'."\n".
+					'<script src="xss.js" type="text/javascript" charset="utf-8"></script>';
+		$expected = '<p>This is ok text</p>';
+		$result = Sanitize::stripAll($string);
+		$this->assertEqual($result, $expected);
+
+	}
+
+/**
+ * testStripTags method
+ *
+ * @access public
+ * @return void
+ */
+	function testStripTags() {
+		$string = '<h2>Headline</h2><p><a href="http://example.com">My Link</a> could go to a bad site</p>';
+		$expected = 'Headline<p>My Link could go to a bad site</p>';
+		$result = Sanitize::stripTags($string, 'h2', 'a');
+		$this->assertEqual($result, $expected);
+
+		$string = '<script type="text/javascript" src="http://evildomain.com"> </script>';
+		$expected = ' ';
+		$result = Sanitize::stripTags($string, 'script');
+		$this->assertEqual($result, $expected);
+
+		$string = '<h2>Important</h2><p>Additional information here <a href="/about"><img src="/img/test.png" /></a>. Read even more here</p>';
+		$expected = 'Important<p>Additional information here <img src="/img/test.png" />. Read even more here</p>';
+		$result = Sanitize::stripTags($string, 'h2', 'a');
+		$this->assertEqual($result, $expected);
+
+		$string = '<h2>Important</h2><p>Additional information here <a href="/about"><img src="/img/test.png" /></a>. Read even more here</p>';
+		$expected = 'Important<p>Additional information here . Read even more here</p>';
+		$result = Sanitize::stripTags($string, 'h2', 'a', 'img');
+		$this->assertEqual($result, $expected);
+
+		$string = '<b>Important message!</b><br>This message will self destruct!';
+		$expected = 'Important message!<br>This message will self destruct!';
+		$result = Sanitize::stripTags($string, 'b');
+		$this->assertEqual($result, $expected);
+
+		$string = '<b>Important message!</b><br />This message will self destruct!';
+		$expected = 'Important message!<br />This message will self destruct!';
+		$result = Sanitize::stripTags($string, 'b');
+		$this->assertEqual($result, $expected);
+
+		$string = '<h2 onclick="alert(\'evil\'); onmouseover="badness()">Important</h2><p>Additional information here <a href="/about"><img src="/img/test.png" /></a>. Read even more here</p>';
+		$expected = 'Important<p>Additional information here . Read even more here</p>';
+		$result = Sanitize::stripTags($string, 'h2', 'a', 'img');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFormatColumns method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormatColumns() {
+		$this->loadFixtures('DataTest', 'Article');
+
+		$this->DataTest =& new SanitizeDataTest(array('alias' => 'DataTest'));
+		$data = array('DataTest' => array(
+						'id' => 'z',
+						'count' => '12a',
+						'float' => '2.31456',
+						'updated' => '2008-01-01'
+						)
+					);
+		$this->DataTest->set($data);
+		$expected = array('DataTest' => array(
+			'id' => '0',
+			'count' => '12',
+			'float' => 2.31456,
+			'updated' => '2008-01-01 00:00:00',
+		));
+		Sanitize::formatColumns($this->DataTest);
+		$result = $this->DataTest->data;
+		$this->assertEqual($result, $expected);
+
+		$this->Article =& new SanitizeArticle(array('alias' => 'Article'));
+		$data = array('Article' => array(
+			'id' => 'ZB',
+			'user_id' => '12',
+			'title' => 'title of article',
+			'body' => 'body text',
+			'published' => 'QQQQQQQ',
+		));
+		$this->Article->set($data);
+		$expected = array('Article' => array(
+			'id' => '0',
+			'user_id' => '12',
+			'title' => 'title of article',
+			'body' => 'body text',
+			'published' => 'QQQQQQQ',
+		));
+		Sanitize::formatColumns($this->Article);
+		$result = $this->Article->data;
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/security.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/security.test.php
new file mode 100644
index 000000000..ec2819a62
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/security.test.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * SecurityTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Security');
+
+/**
+ * SecurityTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class SecurityTest extends CakeTestCase {
+
+/**
+ * sut property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $sut = null;
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->sut =& Security::getInstance();
+	}
+
+/**
+ * testInactiveMins method
+ *
+ * @access public
+ * @return void
+ */
+	function testInactiveMins() {
+		Configure::write('Security.level', 'high');
+		$this->assertEqual(10, Security::inactiveMins());
+
+		Configure::write('Security.level', 'medium');
+		$this->assertEqual(100, Security::inactiveMins());
+
+		Configure::write('Security.level', 'low');
+		$this->assertEqual(300, Security::inactiveMins());
+	}
+
+/**
+ * testGenerateAuthkey method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenerateAuthkey() {
+		$this->assertEqual(strlen(Security::generateAuthKey()), 40);
+	}
+
+/**
+ * testValidateAuthKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testValidateAuthKey() {
+		$authKey = Security::generateAuthKey();
+		$this->assertTrue(Security::validateAuthKey($authKey));
+	}
+
+/**
+ * testHash method
+ *
+ * @access public
+ * @return void
+ */
+	function testHash() {
+		$Security =& Security::getInstance();
+		$_hashType =  $Security->hashType;
+
+		$key = 'someKey';
+		$hash = 'someHash';
+
+		$this->assertIdentical(strlen(Security::hash($key, null, false)), 40);
+		$this->assertIdentical(strlen(Security::hash($key, 'sha1', false)), 40);
+		$this->assertIdentical(strlen(Security::hash($key, null, true)), 40);
+		$this->assertIdentical(strlen(Security::hash($key, 'sha1', true)), 40);
+
+		$result = Security::hash($key, null, $hash);
+		$this->assertIdentical($result, 'e38fcb877dccb6a94729a81523851c931a46efb1');
+
+		$result = Security::hash($key, 'sha1', $hash);
+		$this->assertIdentical($result, 'e38fcb877dccb6a94729a81523851c931a46efb1');
+
+		$hashType = 'sha1';
+		Security::setHash($hashType);
+		$this->assertIdentical($this->sut->hashType, $hashType);
+		$this->assertIdentical(strlen(Security::hash($key, null, true)), 40);
+		$this->assertIdentical(strlen(Security::hash($key, null, false)), 40);
+
+		$this->assertIdentical(strlen(Security::hash($key, 'md5', false)), 32);
+		$this->assertIdentical(strlen(Security::hash($key, 'md5', true)), 32);
+
+		$hashType = 'md5';
+		Security::setHash($hashType);
+		$this->assertIdentical($this->sut->hashType, $hashType);
+		$this->assertIdentical(strlen(Security::hash($key, null, false)), 32);
+		$this->assertIdentical(strlen(Security::hash($key, null, true)), 32);
+
+		if (!function_exists('hash') && !function_exists('mhash')) {
+			$this->assertIdentical(strlen(Security::hash($key, 'sha256', false)), 32);
+			$this->assertIdentical(strlen(Security::hash($key, 'sha256', true)), 32);
+		} else {
+			$this->assertIdentical(strlen(Security::hash($key, 'sha256', false)), 64);
+			$this->assertIdentical(strlen(Security::hash($key, 'sha256', true)), 64);
+		}
+
+		Security::setHash($_hashType);
+	}
+
+/**
+ * testCipher method
+ *
+ * @access public
+ * @return void
+ */
+	function testCipher() {
+		$length = 10;
+		$txt = '';
+		for ($i = 0; $i < $length; $i++) {
+			$txt .= mt_rand(0, 255);
+		}
+		$key = 'my_key';
+		$result = Security::cipher($txt, $key);
+		$this->assertEqual(Security::cipher($result, $key), $txt);
+
+		$txt = '';
+		$key = 'my_key';
+		$result = Security::cipher($txt, $key);
+		$this->assertEqual(Security::cipher($result, $key), $txt);
+
+		$txt = 'some_text';
+		$key = '';
+		$result = Security::cipher($txt, $key);
+		$this->assertError();
+		$this->assertIdentical($result, '');
+
+		$txt = 123456;
+		$key = 'my_key';
+		$result = Security::cipher($txt, $key);
+		$this->assertEqual(Security::cipher($result, $key), $txt);
+
+		$txt = '123456';
+		$key = 'my_key';
+		$result = Security::cipher($txt, $key);
+		$this->assertEqual(Security::cipher($result, $key), $txt);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/set.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/set.test.php
new file mode 100644
index 000000000..33ca7283e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/set.test.php
@@ -0,0 +1,3098 @@
+<?php
+/**
+ * SetTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Set');
+
+/**
+ * SetTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class SetTest extends CakeTestCase {
+
+/**
+ * testNumericKeyExtraction method
+ *
+ * @access public
+ * @return void
+ */
+	function testNumericKeyExtraction() {
+		$data = array('plugin' => null, 'controller' => '', 'action' => '', 1, 'whatever');
+		$this->assertIdentical(Set::extract($data, '{n}'), array(1, 'whatever'));
+		$this->assertIdentical(Set::diff($data, Set::extract($data, '{n}')), array('plugin' => null, 'controller' => '', 'action' => ''));
+	}
+
+/**
+ * testEnum method
+ *
+ * @access public
+ * @return void
+ */
+	function testEnum() {
+		$result = Set::enum(1, 'one, two');
+		$this->assertIdentical($result, 'two');
+		$result = Set::enum(2, 'one, two');
+		$this->assertNull($result);
+
+		$set = array('one', 'two');
+		$result = Set::enum(0, $set);
+		$this->assertIdentical($result, 'one');
+		$result = Set::enum(1, $set);
+		$this->assertIdentical($result, 'two');
+
+		$result = Set::enum(1, array('one', 'two'));
+		$this->assertIdentical($result, 'two');
+		$result = Set::enum(2, array('one', 'two'));
+		$this->assertNull($result);
+
+		$result = Set::enum('first', array('first' => 'one', 'second' => 'two'));
+		$this->assertIdentical($result, 'one');
+		$result = Set::enum('third', array('first' => 'one', 'second' => 'two'));
+		$this->assertNull($result);
+
+		$result = Set::enum('no', array('no' => 0, 'yes' => 1));
+		$this->assertIdentical($result, 0);
+		$result = Set::enum('not sure', array('no' => 0, 'yes' => 1));
+		$this->assertNull($result);
+
+		$result = Set::enum(0);
+		$this->assertIdentical($result, 'no');
+		$result = Set::enum(1);
+		$this->assertIdentical($result, 'yes');
+		$result = Set::enum(2);
+		$this->assertNull($result);
+	}
+
+/**
+ * testFilter method
+ *
+ * @access public
+ * @return void
+ */
+	function testFilter() {
+		$result = Set::filter(array('0', false, true, 0, array('one thing', 'I can tell you', 'is you got to be', false)));
+		$expected = array('0', 2 => true, 3 => 0, 4 => array('one thing', 'I can tell you', 'is you got to be', false));
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testNumericArrayCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testNumericArrayCheck() {
+		$data = array('one');
+		$this->assertTrue(Set::numeric(array_keys($data)));
+
+		$data = array(1 => 'one');
+		$this->assertFalse(Set::numeric($data));
+
+		$data = array('one');
+		$this->assertFalse(Set::numeric($data));
+
+		$data = array('one' => 'two');
+		$this->assertFalse(Set::numeric($data));
+
+		$data = array('one' => 1);
+		$this->assertTrue(Set::numeric($data));
+
+		$data = array(0);
+		$this->assertTrue(Set::numeric($data));
+
+		$data = array('one', 'two', 'three', 'four', 'five');
+		$this->assertTrue(Set::numeric(array_keys($data)));
+
+		$data = array(1 => 'one', 2 => 'two', 3 => 'three', 4 => 'four', 5 => 'five');
+		$this->assertTrue(Set::numeric(array_keys($data)));
+
+		$data = array('1' => 'one', 2 => 'two', 3 => 'three', 4 => 'four', 5 => 'five');
+		$this->assertTrue(Set::numeric(array_keys($data)));
+
+		$data = array('one', 2 => 'two', 3 => 'three', 4 => 'four', 'a' => 'five');
+		$this->assertFalse(Set::numeric(array_keys($data)));
+	}
+
+/**
+ * testKeyCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testKeyCheck() {
+		$data = array('Multi' => array('dimensonal' => array('array')));
+		$this->assertTrue(Set::check($data, 'Multi.dimensonal'));
+		$this->assertFalse(Set::check($data, 'Multi.dimensonal.array'));
+
+		$data = array(
+			array(
+				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+				'Comment' => array(
+					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
+					array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
+				),
+				'Tag' => array(
+					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
+					array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
+				)
+			),
+			array(
+				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
+				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$this->assertTrue(Set::check($data, '0.Article.user_id'));
+		$this->assertTrue(Set::check($data, '0.Comment.0.id'));
+		$this->assertFalse(Set::check($data, '0.Comment.0.id.0'));
+		$this->assertTrue(Set::check($data, '0.Article.user_id'));
+		$this->assertFalse(Set::check($data, '0.Article.user_id.a'));
+	}
+
+/**
+ * testMerge method
+ *
+ * @access public
+ * @return void
+ */
+	function testMerge() {
+		$r = Set::merge(array('foo'));
+		$this->assertIdentical($r, array('foo'));
+
+		$r = Set::merge('foo');
+		$this->assertIdentical($r, array('foo'));
+
+		$r = Set::merge('foo', 'bar');
+		$this->assertIdentical($r, array('foo', 'bar'));
+
+		if (substr(PHP_VERSION, 0, 1) >= 5) {
+			$r = eval('class StaticSetCaller{static function merge($a, $b){return Set::merge($a, $b);}} return StaticSetCaller::merge("foo", "bar");');
+			$this->assertIdentical($r, array('foo', 'bar'));
+		}
+
+		$r = Set::merge('foo', array('user' => 'bob', 'no-bar'), 'bar');
+		$this->assertIdentical($r, array('foo', 'user' => 'bob', 'no-bar', 'bar'));
+
+		$a = array('foo', 'foo2');
+		$b = array('bar', 'bar2');
+		$this->assertIdentical(Set::merge($a, $b), array('foo', 'foo2', 'bar', 'bar2'));
+
+		$a = array('foo' => 'bar', 'bar' => 'foo');
+		$b = array('foo' => 'no-bar', 'bar' => 'no-foo');
+		$this->assertIdentical(Set::merge($a, $b), array('foo' => 'no-bar', 'bar' => 'no-foo'));
+
+		$a = array('users' => array('bob', 'jim'));
+		$b = array('users' => array('lisa', 'tina'));
+		$this->assertIdentical(Set::merge($a, $b), array('users' => array('bob', 'jim', 'lisa', 'tina')));
+
+		$a = array('users' => array('jim', 'bob'));
+		$b = array('users' => 'none');
+		$this->assertIdentical(Set::merge($a, $b), array('users' => 'none'));
+
+		$a = array('users' => array('lisa' => array('id' => 5, 'pw' => 'secret')), 'cakephp');
+		$b = array('users' => array('lisa' => array('pw' => 'new-pass', 'age' => 23)), 'ice-cream');
+		$this->assertIdentical(Set::merge($a, $b), array('users' => array('lisa' => array('id' => 5, 'pw' => 'new-pass', 'age' => 23)), 'cakephp', 'ice-cream'));
+
+		$c = array('users' => array('lisa' => array('pw' => 'you-will-never-guess', 'age' => 25, 'pet' => 'dog')), 'chocolate');
+		$expected = array('users' => array('lisa' => array('id' => 5, 'pw' => 'you-will-never-guess', 'age' => 25, 'pet' => 'dog')), 'cakephp', 'ice-cream', 'chocolate');
+		$this->assertIdentical(Set::merge($a, $b, $c), $expected);
+
+		$this->assertIdentical(Set::merge($a, $b, array(), $c), $expected);
+
+		$r = Set::merge($a, $b, $c);
+		$this->assertIdentical($r, $expected);
+
+		$a = array('Tree', 'CounterCache',
+				'Upload' => array('folder' => 'products',
+					'fields' => array('image_1_id', 'image_2_id', 'image_3_id', 'image_4_id', 'image_5_id')));
+		$b =  array('Cacheable' => array('enabled' => false),
+				'Limit',
+				'Bindable',
+				'Validator',
+				'Transactional');
+
+		$expected = array('Tree', 'CounterCache',
+				'Upload' => array('folder' => 'products',
+					'fields' => array('image_1_id', 'image_2_id', 'image_3_id', 'image_4_id', 'image_5_id')),
+				'Cacheable' => array('enabled' => false),
+				'Limit',
+				'Bindable',
+				'Validator',
+				'Transactional');
+
+		$this->assertIdentical(Set::merge($a, $b), $expected);
+
+		$expected = array('Tree' => null, 'CounterCache' => null,
+				'Upload' => array('folder' => 'products',
+					'fields' => array('image_1_id', 'image_2_id', 'image_3_id', 'image_4_id', 'image_5_id')),
+				'Cacheable' => array('enabled' => false),
+				'Limit' => null,
+				'Bindable' => null,
+				'Validator' => null,
+				'Transactional' => null);
+
+		$this->assertIdentical(Set::normalize(Set::merge($a, $b)), $expected);
+	}
+
+/**
+ * testSort method
+ *
+ * @access public
+ * @return void
+ */
+	function testSort() {
+		$a = array(
+			0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
+			1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay')))
+		);
+		$b = array(
+			0 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
+			1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate')))
+
+		);
+		$a = Set::sort($a, '{n}.Friend.{n}.name', 'asc');
+		$this->assertIdentical($a, $b);
+
+		$b = array(
+			0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
+			1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay')))
+		);
+		$a = array(
+			0 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
+			1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate')))
+
+		);
+		$a = Set::sort($a, '{n}.Friend.{n}.name', 'desc');
+		$this->assertIdentical($a, $b);
+
+		$a = array(
+			0 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
+			1 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay'))),
+			2 => array('Person' => array('name' => 'Adam'),'Friend' => array(array('name' => 'Bob')))
+		);
+		$b = array(
+			0 => array('Person' => array('name' => 'Adam'),'Friend' => array(array('name' => 'Bob'))),
+			1 => array('Person' => array('name' => 'Jeff'), 'Friend' => array(array('name' => 'Nate'))),
+			2 => array('Person' => array('name' => 'Tracy'),'Friend' => array(array('name' => 'Lindsay')))
+		);
+		$a = Set::sort($a, '{n}.Person.name', 'asc');
+		$this->assertIdentical($a, $b);
+
+		$a = array(
+			array(7,6,4),
+			array(3,4,5),
+			array(3,2,1),
+		);
+
+		$b = array(
+			array(3,2,1),
+			array(3,4,5),
+			array(7,6,4),
+		);
+
+		$a = Set::sort($a, '{n}.{n}', 'asc');
+		$this->assertIdentical($a, $b);
+
+		$a = array(
+			array(7,6,4),
+			array(3,4,5),
+			array(3,2,array(1,1,1)),
+		);
+
+		$b = array(
+			array(3,2,array(1,1,1)),
+			array(3,4,5),
+			array(7,6,4),
+		);
+
+		$a = Set::sort($a, '{n}', 'asc');
+		$this->assertIdentical($a, $b);
+
+		$a = array(
+			0 => array('Person' => array('name' => 'Jeff')),
+			1 => array('Shirt' => array('color' => 'black'))
+		);
+		$b = array(
+			0 => array('Shirt' => array('color' => 'black')),
+			1 => array('Person' => array('name' => 'Jeff')),
+		);
+		$a = Set::sort($a, '{n}.Person.name', 'ASC');
+		$this->assertIdentical($a, $b);
+
+		$names = array(
+			array('employees' => array(array('name' => array('first' => 'John', 'last' => 'Doe')))),
+			array('employees' => array(array('name' => array('first' => 'Jane', 'last' => 'Doe')))),
+			array('employees' => array(array('name' => array()))),
+			array('employees' => array(array('name' => array())))
+		);
+		$result = Set::sort($names, '{n}.employees.0.name', 'asc', 1);
+		$expected = array(
+			array('employees' => array(array('name' => array('first' => 'John', 'last' => 'Doe')))),
+			array('employees' => array(array('name' => array('first' => 'Jane', 'last' => 'Doe')))),
+			array('employees' => array(array('name' => array()))),
+			array('employees' => array(array('name' => array())))
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test sorting with out of order keys.
+ *
+ * @return void
+ */
+	function testSortWithOutOfOrderKeys() {
+		$data = array(
+			9 => array('class' => 510, 'test2' => 2),
+			1 => array('class' => 500, 'test2' => 1),
+			2 => array('class' => 600, 'test2' => 2),
+			5 => array('class' => 625, 'test2' => 4),
+			0 => array('class' => 605, 'test2' => 3),
+		);
+		$expected = array(
+			array('class' => 500, 'test2' => 1),
+			array('class' => 510, 'test2' => 2),
+			array('class' => 600, 'test2' => 2),
+			array('class' => 605, 'test2' => 3),
+			array('class' => 625, 'test2' => 4),
+		);
+		$result = Set::sort($data, '{n}.class', 'asc');
+		$this->assertEqual($expected, $result);
+
+		$result = Set::sort($data, '{n}.test2', 'asc');
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testExtract method
+ *
+ * @access public
+ * @return void
+ */
+	function testExtract() {
+		$a = array(
+			array(
+				'Article' => array('id' => '1', 'user_id' => '1', 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+				'User' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+				'Comment' => array(
+					array('id' => '1', 'article_id' => '1', 'user_id' => '2', 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
+					array('id' => '2', 'article_id' => '1', 'user_id' => '4', 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
+				),
+				'Tag' => array(
+					array('id' => '1', 'tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
+					array('id' => '2', 'tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31')
+				),
+				'Deep' => array(
+					'Nesting' => array(
+						'test' => array(
+							1 => 'foo',
+							2 => array(
+								'and' => array('more' => 'stuff')
+							)
+						)
+					)
+				)
+			),
+			array(
+				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
+				'User' => array('id' => '2', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+				'Comment' => array(),
+				'Tag' => array()
+			),
+			array(
+				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
+				'User' => array('id' => '3', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+				'Comment' => array(),
+				'Tag' => array()
+			),
+			array(
+				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
+				'User' => array('id' => '4', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+				'Comment' => array(),
+				'Tag' => array()
+			),
+			array(
+				'Article' => array('id' => '3', 'user_id' => '1', 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31'),
+				'User' => array('id' => '5', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+				'Comment' => array(),
+				'Tag' => array()
+			)
+		);
+		$b = array('Deep' => $a[0]['Deep']);
+		$c = array(
+			array('a' => array('I' => array('a' => 1))),
+			array(
+				'a' => array(
+					2
+				)
+			),
+			array('a' => array('II' => array('a' => 3, 'III' => array('a' => array('foo' => 4))))),
+		);
+
+		$expected = array(array('a' => $c[2]['a']));
+		$r = Set::extract('/a/II[a=3]/..', $c);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(1, 2, 3, 4, 5);
+		$this->assertEqual(Set::extract('/User/id', $a), $expected);
+
+		$expected = array(1, 2, 3, 4, 5);
+		$this->assertEqual(Set::extract('/User/id', $a), $expected);
+
+		$expected = array(
+			array('id' => 1), array('id' => 2), array('id' => 3), array('id' => 4), array('id' => 5)
+		);
+
+		$r = Set::extract('/User/id', $a, array('flatten' => false));
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('test' => $a[0]['Deep']['Nesting']['test']));
+		$this->assertEqual(Set::extract('/Deep/Nesting/test', $a), $expected);
+		$this->assertEqual(Set::extract('/Deep/Nesting/test', $b), $expected);
+
+		$expected = array(array('test' => $a[0]['Deep']['Nesting']['test']));
+		$r = Set::extract('/Deep/Nesting/test/1/..', $a);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('test' => $a[0]['Deep']['Nesting']['test']));
+		$r = Set::extract('/Deep/Nesting/test/2/and/../..', $a);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('test' => $a[0]['Deep']['Nesting']['test']));
+		$r = Set::extract('/Deep/Nesting/test/2/../../../Nesting/test/2/..', $a);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(2);
+		$r = Set::extract('/User[2]/id', $a);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(4, 5);
+		$r = Set::extract('/User[id>3]/id', $a);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(2, 3);
+		$r = Set::extract('/User[id>1][id<=3]/id', $a);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('I'), array('II'));
+		$r = Set::extract('/a/@*', $c);
+		$this->assertEqual($r, $expected);
+
+		$single = array(
+			'User' => array(
+				'id' => 4,
+				'name' => 'Neo',
+			)
+		);
+		$tricky = array(
+			0 => array(
+				'User' => array(
+					'id' => 1,
+					'name' => 'John',
+				)
+			),
+			1 => array(
+				'User' => array(
+					'id' => 2,
+					'name' => 'Bob',
+				)
+			),
+			2 => array(
+				'User' => array(
+					'id' => 3,
+					'name' => 'Tony',
+				)
+			),
+			'User' => array(
+				'id' => 4,
+				'name' => 'Neo',
+			)
+		);
+
+		$expected = array(1, 2, 3, 4);
+		$r = Set::extract('/User/id', $tricky);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(4);
+		$r = Set::extract('/User/id', $single);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(1, 3);
+		$r = Set::extract('/User[name=/n/]/id', $tricky);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(4);
+		$r = Set::extract('/User[name=/N/]/id', $tricky);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(1, 3, 4);
+		$r = Set::extract('/User[name=/N/i]/id', $tricky);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('id', 'name'), array('id', 'name'), array('id', 'name'), array('id', 'name'));
+		$r = Set::extract('/User/@*', $tricky);
+		$this->assertEqual($r, $expected);
+
+		$common = array(
+			array(
+				'Article' => array(
+					'id' => 1,
+					'name' => 'Article 1',
+				),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'user_id' => 5,
+						'article_id' => 1,
+						'text' => 'Comment 1',
+					),
+					array(
+						'id' => 2,
+						'user_id' => 23,
+						'article_id' => 1,
+						'text' => 'Comment 2',
+					),
+					array(
+						'id' => 3,
+						'user_id' => 17,
+						'article_id' => 1,
+						'text' => 'Comment 3',
+					),
+				),
+			),
+			array(
+				'Article' => array(
+					'id' => 2,
+					'name' => 'Article 2',
+				),
+				'Comment' => array(
+					array(
+						'id' => 4,
+						'user_id' => 2,
+						'article_id' => 2,
+						'text' => 'Comment 4',
+						'addition' => '',
+					),
+					array(
+						'id' => 5,
+						'user_id' => 23,
+						'article_id' => 2,
+						'text' => 'Comment 5',
+						'addition' => 'foo',
+					),
+				),
+			),
+			array(
+				'Article' => array(
+					'id' => 3,
+					'name' => 'Article 3',
+				),
+				'Comment' => array(),
+			)
+		);
+
+		$r = Set::extract('/Comment/id', $common);
+		$expected = array(1, 2, 3, 4, 5);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(1, 2, 4, 5);
+		$r = Set::extract('/Comment[id!=3]/id', $common);
+		$this->assertEqual($r, $expected);
+
+		$r = Set::extract('/', $common);
+		$this->assertEqual($r, $common);
+
+		$expected = array(1, 2, 4, 5);
+		$r = Set::extract($common, '/Comment[id!=3]/id');
+		$this->assertEqual($r, $expected);
+
+		$expected = array($common[0]['Comment'][2]);
+		$r = Set::extract($common, '/Comment/2');
+		$this->assertEqual($r, $expected);
+
+		$expected = array($common[0]['Comment'][0]);
+		$r = Set::extract($common, '/Comment[1]/.[id=1]');
+		$this->assertEqual($r, $expected);
+
+		$expected = array($common[1]['Comment'][1]);
+		$r = Set::extract($common, '/1/Comment/.[2]');
+		$this->assertEqual($r, $expected);
+
+		$expected = array();
+		$r = Set::extract('/User/id', array());
+		$this->assertEqual($r, $expected);
+
+		$expected = array(5);
+		$r = Set::extract('/Comment/id[:last]', $common);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(1);
+		$r = Set::extract('/Comment/id[:first]', $common);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(3);
+		$r = Set::extract('/Article[:last]/id', $common);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('Comment' => $common[1]['Comment'][0]));
+		$r = Set::extract('/Comment[addition=]', $common);
+		$this->assertEqual($r, $expected);
+
+		$habtm = array(
+			array(
+				'Post' => array(
+					'id' => 1,
+					'title' => 'great post',
+				),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'text' => 'foo',
+						'User' => array(
+							'id' => 1,
+							'name' => 'bob'
+						),
+					),
+					array(
+						'id' => 2,
+						'text' => 'bar',
+						'User' => array(
+							'id' => 2,
+							'name' => 'tod'
+						),
+					),
+				),
+			),
+			array(
+				'Post' => array(
+					'id' => 2,
+					'title' => 'fun post',
+				),
+				'Comment' => array(
+					array(
+						'id' => 3,
+						'text' => '123',
+						'User' => array(
+							'id' => 3,
+							'name' => 'dan'
+						),
+					),
+					array(
+						'id' => 4,
+						'text' => '987',
+						'User' => array(
+							'id' => 4,
+							'name' => 'jim'
+						),
+					),
+				),
+			),
+		);
+
+		$r = Set::extract('/Comment/User[name=/bob|dan/]/..', $habtm);
+		$this->assertEqual($r[0]['Comment']['User']['name'], 'bob');
+		$this->assertEqual($r[1]['Comment']['User']['name'], 'dan');
+		$this->assertEqual(count($r), 2);
+
+		$r = Set::extract('/Comment/User[name=/bob|tod/]/..', $habtm);
+		$this->assertEqual($r[0]['Comment']['User']['name'], 'bob');
+
+		$this->assertEqual($r[1]['Comment']['User']['name'], 'tod');
+		$this->assertEqual(count($r), 2);
+
+		$tree = array(
+			array(
+				'Category' => array('name' => 'Category 1'),
+				'children' => array(array('Category' => array('name' => 'Category 1.1')))
+			),
+			array(
+				'Category' => array('name' => 'Category 2'),
+				'children' => array(
+					array('Category' => array('name' => 'Category 2.1')),
+					array('Category' => array('name' => 'Category 2.2'))
+				)
+			),
+			array(
+				'Category' => array('name' => 'Category 3'),
+				'children' => array(array('Category' => array('name' => 'Category 3.1')))
+			)
+		);
+
+		$expected = array(array('Category' => $tree[1]['Category']));
+		$r = Set::extract('/Category[name=Category 2]', $tree);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(
+			array('Category' => $tree[1]['Category'], 'children' => $tree[1]['children'])
+		);
+		$r = Set::extract('/Category[name=Category 2]/..', $tree);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(
+			array('children' => $tree[1]['children'][0]),
+			array('children' => $tree[1]['children'][1])
+		);
+		$r = Set::extract('/Category[name=Category 2]/../children', $tree);
+		$this->assertEqual($r, $expected);
+
+		$habtm = array(
+			array(
+				'Post' => array(
+					'id' => 1,
+					'title' => 'great post',
+				),
+				'Comment' => array(
+					array(
+						'id' => 1,
+						'text' => 'foo',
+						'User' => array(
+							'id' => 1,
+							'name' => 'bob'
+						),
+					),
+					array(
+						'id' => 2,
+						'text' => 'bar',
+						'User' => array(
+							'id' => 2,
+							'name' => 'tod'
+						),
+					),
+				),
+			),
+			array(
+				'Post' => array(
+					'id' => 2,
+					'title' => 'fun post',
+				),
+				'Comment' => array(
+					array(
+						'id' => 3,
+						'text' => '123',
+						'User' => array(
+							'id' => 3,
+							'name' => 'dan'
+						),
+					),
+					array(
+						'id' => 4,
+						'text' => '987',
+						'User' => array(
+							'id' => 4,
+							'name' => 'jim'
+						),
+					),
+				),
+			),
+		);
+
+		$r = Set::extract('/Comment/User[name=/\w+/]/..', $habtm);
+		$this->assertEqual($r[0]['Comment']['User']['name'], 'bob');
+		$this->assertEqual($r[1]['Comment']['User']['name'], 'tod');
+		$this->assertEqual($r[2]['Comment']['User']['name'], 'dan');
+		$this->assertEqual($r[3]['Comment']['User']['name'], 'dan');
+		$this->assertEqual(count($r), 4);
+
+		$r = Set::extract('/Comment/User[name=/[a-z]+/]/..', $habtm);
+		$this->assertEqual($r[0]['Comment']['User']['name'], 'bob');
+		$this->assertEqual($r[1]['Comment']['User']['name'], 'tod');
+		$this->assertEqual($r[2]['Comment']['User']['name'], 'dan');
+		$this->assertEqual($r[3]['Comment']['User']['name'], 'dan');
+		$this->assertEqual(count($r), 4);
+
+		$r = Set::extract('/Comment/User[name=/bob|dan/]/..', $habtm);
+		$this->assertEqual($r[0]['Comment']['User']['name'], 'bob');
+		$this->assertEqual($r[1]['Comment']['User']['name'], 'dan');
+		$this->assertEqual(count($r), 2);
+
+		$r = Set::extract('/Comment/User[name=/bob|tod/]/..', $habtm);
+		$this->assertEqual($r[0]['Comment']['User']['name'], 'bob');
+		$this->assertEqual($r[1]['Comment']['User']['name'], 'tod');
+		$this->assertEqual(count($r), 2);
+
+		$mixedKeys = array(
+			'User' => array(
+				0 => array(
+					'id' => 4,
+					'name' => 'Neo'
+				),
+				1 => array(
+					'id' => 5,
+					'name' => 'Morpheus'
+				),
+				'stringKey' => array()
+			)
+		);
+		$expected = array('Neo', 'Morpheus');
+		$r = Set::extract('/User/name', $mixedKeys);
+		$this->assertEqual($r, $expected);
+
+		$f = array(
+			array(
+				'file' => array(
+					'name' => 'zipfile.zip',
+					'type' => 'application/zip',
+					'tmp_name' => '/tmp/php178.tmp',
+					'error' => 0,
+					'size' => '564647'
+				)
+			),
+			array(
+				'file' => array(
+					'name' => 'zipfile2.zip',
+					'type' => 'application/x-zip-compressed',
+					'tmp_name' => '/tmp/php179.tmp',
+					'error' => 0,
+					'size' => '354784'
+				)
+			),
+			array(
+				'file' => array(
+					'name' => 'picture.jpg',
+					'type' => 'image/jpeg',
+					'tmp_name' => '/tmp/php180.tmp',
+					'error' => 0,
+					'size' => '21324'
+				)
+			)
+		);
+		$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x-zip-compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784'));
+		$r = Set::extract('/file/.[type=application/x-zip-compressed]', $f);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647'));
+		$r = Set::extract('/file/.[type=application/zip]', $f);
+		$this->assertEqual($r, $expected);
+
+		$f = array(
+			array(
+				'file' => array(
+					'name' => 'zipfile.zip',
+					'type' => 'application/zip',
+					'tmp_name' => '/tmp/php178.tmp',
+					'error' => 0,
+					'size' => '564647'
+				)
+			),
+			array(
+				'file' => array(
+					'name' => 'zipfile2.zip',
+					'type' => 'application/x zip compressed',
+					'tmp_name' => '/tmp/php179.tmp',
+					'error' => 0,
+					'size' => '354784'
+				)
+			),
+			array(
+				'file' => array(
+					'name' => 'picture.jpg',
+					'type' => 'image/jpeg',
+					'tmp_name' => '/tmp/php180.tmp',
+					'error' => 0,
+					'size' => '21324'
+				)
+			)
+		);
+		$expected = array(array('name' => 'zipfile2.zip','type' => 'application/x zip compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784'));
+		$r = Set::extract('/file/.[type=application/x zip compressed]', $f);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(
+			array('name' => 'zipfile.zip','type' => 'application/zip','tmp_name' => '/tmp/php178.tmp','error' => 0,'size' => '564647'),
+			array('name' => 'zipfile2.zip','type' => 'application/x zip compressed','tmp_name' => '/tmp/php179.tmp','error' => 0,'size' => '354784')
+		);
+		$r = Set::extract('/file/.[tmp_name=/tmp\/php17/]', $f);
+		$this->assertEqual($r, $expected);
+
+		$hasMany = array(
+			'Node' => array(
+				'id' => 1,
+				'name' => 'First',
+				'state' => 50
+			),
+			'ParentNode' => array(
+				0 => array(
+					'id' => 2,
+					'name' => 'Second',
+					'state' => 60,
+				)
+			)
+		);
+		$result = Set::extract('/ParentNode/name', $hasMany);
+		$expected = array('Second');
+		$this->assertEqual($result, $expected);
+		
+		$data = array(
+			array(
+				'Category' => array(
+					'id' => 1,
+					'name' => 'First'
+				),
+				0 => array(
+					'value' => 50
+				)
+			),
+			array(
+				'Category' => array(
+					'id' => 2,
+					'name' => 'Second'
+				),
+				0 => array(
+					'value' => 60
+				)
+			)
+		);
+		$expected = array(
+			array(
+				'Category' => array(
+					'id' => 1,
+					'name' => 'First'
+				),
+				0 => array(
+					'value' => 50
+				)
+			)
+		);
+		$result = Set::extract('/Category[id=1]/..', $data);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test parent selectors with extract
+ *
+ * @return void
+ */
+	function testExtractParentSelector() {
+		$tree = array(
+			array(
+				'Category' => array(
+					'name' => 'Category 1'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'name' => 'Category 1.1'
+						)
+					)
+				)
+			),
+			array(
+				'Category' => array(
+					'name' => 'Category 2'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'name' => 'Category 2.1'
+						)
+					),
+					array(
+						'Category' => array(
+							'name' => 'Category 2.2'
+						)
+					),
+				)
+			),
+			array(
+				'Category' => array(
+					'name' => 'Category 3'
+				),
+				'children' => array(
+					array(
+						'Category' => array(
+							'name' => 'Category 3.1'
+						)
+					)
+				)
+			)
+		);
+		$expected = array(array('Category' => $tree[1]['Category']));
+		$r = Set::extract('/Category[name=Category 2]', $tree);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('Category' => $tree[1]['Category'], 'children' => $tree[1]['children']));
+		$r = Set::extract('/Category[name=Category 2]/..', $tree);
+		$this->assertEqual($r, $expected);
+
+		$expected = array(array('children' => $tree[1]['children'][0]), array('children' => $tree[1]['children'][1]));
+		$r = Set::extract('/Category[name=Category 2]/../children', $tree);
+		$this->assertEqual($r, $expected);
+
+		$single = array(
+			array(
+				'CallType' => array(
+					'name' => 'Internal Voice'
+				),
+				'x' => array(
+					'hour' => 7
+				)
+			)
+		);
+
+		$expected = array(7);
+		$r = Set::extract('/CallType[name=Internal Voice]/../x/hour', $single);
+		$this->assertEqual($r, $expected);
+
+		$multiple = array(
+			array(
+				'CallType' => array(
+					'name' => 'Internal Voice'
+				),
+				'x' => array(
+					'hour' => 7
+				)
+			),
+			array(
+				'CallType' => array(
+					'name' => 'Internal Voice'
+				),
+				'x' => array(
+					'hour' => 2
+				)
+			),
+			array(
+				'CallType' => array(
+					'name' => 'Internal Voice'
+				),
+				'x' => array(
+					'hour' => 1
+				)
+			)
+		);
+
+		$expected = array(7,2,1);
+		$r = Set::extract('/CallType[name=Internal Voice]/../x/hour', $multiple);
+		$this->assertEqual($r, $expected);
+
+		$a = array(
+			'Model' => array(
+				'0' => array(
+					'id' => 18,
+					'SubModelsModel' => array(
+						'id' => 1,
+						'submodel_id' => 66,
+						'model_id' => 18,
+						'type' => 1
+					),
+				),
+				'1' => array(
+					'id' => 0,
+					'SubModelsModel' => array(
+						'id' => 2,
+						'submodel_id' => 66,
+						'model_id' => 0,
+						'type' => 1
+					),
+				),
+				'2' => array(
+					'id' => 17,
+					'SubModelsModel' => array(
+						'id' => 3,
+						'submodel_id' => 66,
+						'model_id' => 17,
+						'type' => 2
+					),
+				),
+				'3' => array(
+					'id' => 0,
+					'SubModelsModel' => array(
+						'id' => 4,
+						'submodel_id' => 66,
+						'model_id' => 0,
+						'type' => 2
+					)
+				)
+			)
+		);
+
+		$expected = array(
+			array(
+				'Model' => array(
+					'id' => 17,
+					'SubModelsModel' => array(
+						'id' => 3,
+						'submodel_id' => 66,
+						'model_id' => 17,
+						'type' => 2
+					),
+				)
+			),
+			array(
+				'Model' => array(
+					'id' => 0,
+					'SubModelsModel' => array(
+						'id' => 4,
+						'submodel_id' => 66,
+						'model_id' => 0,
+						'type' => 2
+					)
+				)
+			)
+		);
+		$r = Set::extract('/Model/SubModelsModel[type=2]/..', $a);
+		$this->assertEqual($r, $expected);
+	}
+
+/**
+ * test that extract() still works when arrays don't contain a 0 index.
+ *
+ * @return void
+ */
+	function testExtractWithNonZeroArrays() {
+		$nonZero = array(
+			1 => array(
+				'User' => array(
+					'id' => 1,
+					'name' => 'John',
+				)
+			),
+			2 => array(
+				'User' => array(
+					'id' => 2,
+					'name' => 'Bob',
+				)
+			),
+			3 => array(
+				'User' => array(
+					'id' => 3,
+					'name' => 'Tony',
+				)
+			)
+		);
+		$expected = array(1, 2, 3);
+		$r = Set::extract('/User/id', $nonZero);
+		$this->assertEqual($r, $expected);
+		
+		$expected = array(
+			array('User' => array('id' => 1, 'name' => 'John')),
+			array('User' => array('id' => 2, 'name' => 'Bob')),
+			array('User' => array('id' => 3, 'name' => 'Tony')),
+		);
+		$result = Set::extract('/User', $nonZero);
+		$this->assertEqual($result, $expected);
+
+		$nonSequential = array(
+			'User' => array(
+				0  => array('id' => 1),
+				2  => array('id' => 2),
+				6  => array('id' => 3),
+				9  => array('id' => 4),
+				3  => array('id' => 5),
+			),
+		);
+
+		$nonZero = array(
+			'User' => array(
+				2  => array('id' => 1),
+				4  => array('id' => 2),
+				6  => array('id' => 3),
+				9  => array('id' => 4),
+				3  => array('id' => 5),
+			),
+		);
+
+		$expected = array(1, 2, 3, 4, 5);
+		$this->assertEqual(Set::extract('/User/id', $nonSequential), $expected);
+
+		$result = Set::extract('/User/id', $nonZero);
+		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
+
+		$expected = array(1, 2, 3, 4, 5);
+		$this->assertEqual(Set::extract('/User/id', $nonSequential), $expected);
+
+		$result = Set::extract('/User/id', $nonZero);
+		$this->assertEqual($result, $expected, 'Failed non zero array key extract');
+
+		$startingAtOne = array(
+			'Article' => array(
+				1 => array(
+					'id' => 1,
+					'approved' => 1,
+				),
+			)
+		);
+
+		$expected = array(0 => array('Article' => array('id' => 1, 'approved' => 1)));
+		$result = Set::extract('/Article[approved=1]', $startingAtOne);
+		$this->assertEqual($result, $expected);
+
+		$items = array(
+			240 => array(
+				'A' => array(
+					'field1' => 'a240',
+					'field2' => 'a240',
+				),
+				'B' => array(
+					'field1' => 'b240',
+					'field2' => 'b240'
+				),
+			)
+		);
+
+		$expected = array(
+			0 => 'b240'
+		);
+
+		$result = Set::extract('/B/field1', $items);
+		$this->assertIdentical($result, $expected);
+		$this->assertIdentical($result, Set::extract('{n}.B.field1', $items));
+	}
+/**
+ * testExtractWithArrays method
+ *
+ * @access public
+ * @return void
+ */
+	function testExtractWithArrays() {
+		$data = array(
+			'Level1' => array(
+				'Level2' => array('test1', 'test2'),
+				'Level2bis' => array('test3', 'test4')
+			)
+		);
+		$this->assertEqual(Set::extract('/Level1/Level2', $data), array(array('Level2' => array('test1', 'test2'))));
+		$this->assertEqual(Set::extract('/Level1/Level2bis', $data), array(array('Level2bis' => array('test3', 'test4'))));
+	}
+
+/**
+ * test extract() with elements that have non-array children.
+ *
+ * @return void
+ */
+	function testExtractWithNonArrayElements() {
+		$data = array(
+			'node' => array(
+				array('foo'),
+				'bar'
+			)
+		);
+		$result = Set::extract('/node', $data);
+		$expected = array(
+			array('node' => array('foo')),
+			'bar'
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'node' => array(
+				'foo' => array('bar'),
+				'bar' => array('foo')
+			)
+		);
+		$result = Set::extract('/node', $data);
+		$expected = array(
+			array('foo' => array('bar')),
+			array('bar' => array('foo')),
+		);
+		$this->assertEqual($result, $expected);
+
+		$data = array(
+			'node' => array(
+				'foo' => array(
+					'bar'
+				),
+				'bar' => 'foo'
+			)
+		);
+		$result = Set::extract('/node', $data);
+		$expected = array(
+			array('foo' => array('bar')),
+			'foo'
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMatches method
+ *
+ * @access public
+ * @return void
+ */
+	function testMatches() {
+		$a = array(
+			array('Article' => array('id' => 1, 'title' => 'Article 1')),
+			array('Article' => array('id' => 2, 'title' => 'Article 2')),
+			array('Article' => array('id' => 3, 'title' => 'Article 3'))
+		);
+
+		$this->assertTrue(Set::matches(array('id=2'), $a[1]['Article']));
+		$this->assertFalse(Set::matches(array('id>2'), $a[1]['Article']));
+		$this->assertTrue(Set::matches(array('id>=2'), $a[1]['Article']));
+		$this->assertFalse(Set::matches(array('id>=3'), $a[1]['Article']));
+		$this->assertTrue(Set::matches(array('id<=2'), $a[1]['Article']));
+		$this->assertFalse(Set::matches(array('id<2'), $a[1]['Article']));
+		$this->assertTrue(Set::matches(array('id>1'), $a[1]['Article']));
+		$this->assertTrue(Set::matches(array('id>1', 'id<3', 'id!=0'), $a[1]['Article']));
+
+		$this->assertTrue(Set::matches(array('3'), null, 3));
+		$this->assertTrue(Set::matches(array('5'), null, 5));
+
+		$this->assertTrue(Set::matches(array('id'), $a[1]['Article']));
+		$this->assertTrue(Set::matches(array('id', 'title'), $a[1]['Article']));
+		$this->assertFalse(Set::matches(array('non-existant'), $a[1]['Article']));
+
+		$this->assertTrue(Set::matches('/Article[id=2]', $a));
+		$this->assertFalse(Set::matches('/Article[id=4]', $a));
+		$this->assertTrue(Set::matches(array(), $a));
+
+		$r = array(
+			'Attachment' => array(
+				'keep' => array()
+			),
+			'Comment' => array(
+				'keep' => array(
+					'Attachment' =>  array(
+						'fields' => array(
+							0 => 'attachment',
+						),
+					),
+				)
+			),
+			'User' => array(
+				'keep' => array()
+			),
+			'Article' => array(
+				'keep' => array(
+					'Comment' =>  array(
+						'fields' => array(
+							0 => 'comment',
+							1 => 'published',
+						),
+					),
+					'User' => array(
+						'fields' => array(
+							0 => 'user',
+						),
+					),
+				)
+			)
+		);
+
+		$this->assertTrue(Set::matches('/Article/keep/Comment', $r));
+		$this->assertEqual(Set::extract('/Article/keep/Comment/fields', $r), array('comment', 'published'));
+		$this->assertEqual(Set::extract('/Article/keep/User/fields', $r), array('user'));
+
+
+	}
+
+/**
+ * testSetExtractReturnsEmptyArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testSetExtractReturnsEmptyArray() {
+
+		$this->assertIdentical(Set::extract(array(), '/Post/id'), array());
+
+		$this->assertIdentical(Set::extract('/Post/id', array()), array());
+
+		$this->assertIdentical(Set::extract('/Post/id', array(
+			array('Post' => array('name' => 'bob')),
+			array('Post' => array('name' => 'jim'))
+		)), array());
+
+		$this->assertIdentical(Set::extract(array(), 'Message.flash'), null);
+
+	}
+
+/**
+ * testClassicExtract method
+ *
+ * @access public
+ * @return void
+ */
+	function testClassicExtract() {
+		$a = array(
+			array('Article' => array('id' => 1, 'title' => 'Article 1')),
+			array('Article' => array('id' => 2, 'title' => 'Article 2')),
+			array('Article' => array('id' => 3, 'title' => 'Article 3'))
+		);
+
+		$result = Set::extract($a, '{n}.Article.id');
+		$expected = array( 1, 2, 3 );
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a, '{n}.Article.title');
+		$expected = array( 'Article 1', 'Article 2', 'Article 3' );
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a, '1.Article.title');
+		$expected = 'Article 2';
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a, '3.Article.title');
+		$expected = null;
+		$this->assertIdentical($result, $expected);
+
+		$a = array(
+			array(
+				'Article' => array('id' => 1, 'title' => 'Article 1',
+				'User' => array('id' => 1, 'username' => 'mariano.iglesias'))
+			),
+			array(
+				'Article' => array('id' => 2, 'title' => 'Article 2',
+				'User' => array('id' => 1, 'username' => 'mariano.iglesias'))
+			),
+			array(
+				'Article' => array('id' => 3, 'title' => 'Article 3',
+				'User' => array('id' => 2, 'username' => 'phpnut'))
+			)
+		);
+
+		$result = Set::extract($a, '{n}.Article.User.username');
+		$expected = array( 'mariano.iglesias', 'mariano.iglesias', 'phpnut' );
+		$this->assertIdentical($result, $expected);
+
+		$a = array(
+			array('Article' => array('id' => 1, 'title' => 'Article 1',
+				'Comment' => array(
+					array('id' => 10, 'title' => 'Comment 10'),
+					array('id' => 11, 'title' => 'Comment 11'),
+					array('id' => 12, 'title' => 'Comment 12')))),
+			array('Article' => array('id' => 2, 'title' => 'Article 2',
+				'Comment' => array(
+					array('id' => 13, 'title' => 'Comment 13'),
+					array('id' => 14, 'title' => 'Comment 14')))),
+			array('Article' => array('id' => 3, 'title' => 'Article 3')));
+
+		$result = Set::extract($a, '{n}.Article.Comment.{n}.id');
+		$expected = array (array(10, 11, 12), array(13, 14), null);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a, '{n}.Article.Comment.{n}.title');
+		$expected = array(
+			array('Comment 10', 'Comment 11', 'Comment 12'),
+			array('Comment 13', 'Comment 14'),
+			null
+		);
+		$this->assertIdentical($result, $expected);
+
+		$a = array(array('1day' => '20 sales'), array('1day' => '2 sales'));
+		$result = Set::extract($a, '{n}.1day');
+		$expected = array('20 sales', '2 sales');
+		$this->assertIdentical($result, $expected);
+
+		$a = array(
+			'pages'     => array('name' => 'page'),
+			'fruites'   => array('name' => 'fruit'),
+			0           => array('name' => 'zero')
+		);
+		$result = Set::extract($a, '{s}.name');
+		$expected = array('page','fruit');
+		$this->assertIdentical($result, $expected);
+
+		$a = array(
+			0 => array('pages' => array('name' => 'page')),
+			1 => array('fruites'=> array('name' => 'fruit')),
+			'test' => array(array('name' => 'jippi')),
+			'dot.test' => array(array('name' => 'jippi'))
+		);
+
+		$result = Set::extract($a, '{n}.{s}.name');
+		$expected = array(0 => array('page'), 1 => array('fruit'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a, '{s}.{n}.name');
+		$expected = array(array('jippi'), array('jippi'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a,'{\w+}.{\w+}.name');
+		$expected = array(
+			array('pages' => 'page'),
+			array('fruites' => 'fruit'),
+			'test' => array('jippi'),
+			'dot.test' => array('jippi')
+		);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a,'{\d+}.{\w+}.name');
+		$expected = array(array('pages' => 'page'), array('fruites' => 'fruit'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a,'{n}.{\w+}.name');
+		$expected = array(array('pages' => 'page'), array('fruites' => 'fruit'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a,'{s}.{\d+}.name');
+		$expected = array(array('jippi'), array('jippi'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a,'{s}');
+		$expected = array(array(array('name' => 'jippi')), array(array('name' => 'jippi')));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a,'{[a-z]}');
+		$expected = array(
+			'test' => array(array('name' => 'jippi')),
+			'dot.test' => array(array('name' => 'jippi'))
+		);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a, '{dot\.test}.{n}');
+		$expected = array('dot.test' => array(array('name' => 'jippi')));
+		$this->assertIdentical($result, $expected);
+
+		$a = new stdClass();
+		$a->articles = array(
+			array('Article' => array('id' => 1, 'title' => 'Article 1')),
+			array('Article' => array('id' => 2, 'title' => 'Article 2')),
+			array('Article' => array('id' => 3, 'title' => 'Article 3')));
+
+		$result = Set::extract($a, 'articles.{n}.Article.id');
+		$expected = array( 1, 2, 3 );
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::extract($a, 'articles.{n}.Article.title');
+		$expected = array( 'Article 1', 'Article 2', 'Article 3' );
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testInsert method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsert() {
+		$a = array(
+			'pages' => array('name' => 'page')
+		);
+
+		$result = Set::insert($a, 'files', array('name' => 'files'));
+		$expected = array(
+			'pages'     => array('name' => 'page'),
+			'files'		=> array('name' => 'files')
+		);
+		$this->assertIdentical($result, $expected);
+
+		$a = array(
+			'pages' => array('name' => 'page')
+		);
+		$result = Set::insert($a, 'pages.name', array());
+		$expected = array(
+			'pages'     => array('name' => array()),
+		);
+		$this->assertIdentical($result, $expected);
+
+		$a = array(
+			'pages' => array(
+				0 => array('name' => 'main'),
+				1 => array('name' => 'about')
+			)
+		);
+
+		$result = Set::insert($a, 'pages.1.vars', array('title' => 'page title'));
+		$expected = array(
+			'pages' => array(
+				0 => array('name' => 'main'),
+				1 => array('name' => 'about', 'vars' => array('title' => 'page title'))
+			)
+		);
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testRemove method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemove() {
+		$a = array(
+			'pages'     => array('name' => 'page'),
+			'files'		=> array('name' => 'files')
+		);
+
+		$result = Set::remove($a, 'files', array('name' => 'files'));
+		$expected = array(
+			'pages'     => array('name' => 'page')
+		);
+		$this->assertIdentical($result, $expected);
+
+		$a = array(
+			'pages' => array(
+				0 => array('name' => 'main'),
+				1 => array('name' => 'about', 'vars' => array('title' => 'page title'))
+			)
+		);
+
+		$result = Set::remove($a, 'pages.1.vars', array('title' => 'page title'));
+		$expected = array(
+			'pages' => array(
+				0 => array('name' => 'main'),
+				1 => array('name' => 'about')
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::remove($a, 'pages.2.vars', array('title' => 'page title'));
+		$expected = $a;
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testCheck() {
+		$set = array(
+			'My Index 1' => array('First' => 'The first item')
+		);
+		$this->assertTrue(Set::check($set, 'My Index 1.First'));
+		$this->assertTrue(Set::check($set, 'My Index 1'));
+		$this->assertTrue(Set::check($set, array()));
+
+		$set = array(
+			'My Index 1' => array('First' => array('Second' => array('Third' => array('Fourth' => 'Heavy. Nesting.'))))
+		);
+		$this->assertTrue(Set::check($set, 'My Index 1.First.Second'));
+		$this->assertTrue(Set::check($set, 'My Index 1.First.Second.Third'));
+		$this->assertTrue(Set::check($set, 'My Index 1.First.Second.Third.Fourth'));
+		$this->assertFalse(Set::check($set, 'My Index 1.First.Seconds.Third.Fourth'));
+	}
+
+/**
+ * testWritingWithFunkyKeys method
+ *
+ * @access public
+ * @return void
+ */
+	function testWritingWithFunkyKeys() {
+		$set = Set::insert(array(), 'Session Test', "test");
+		$this->assertEqual(Set::extract($set, 'Session Test'), 'test');
+
+		$set = Set::remove($set, 'Session Test');
+		$this->assertFalse(Set::check($set, 'Session Test'));
+
+		$this->assertTrue($set = Set::insert(array(), 'Session Test.Test Case', "test"));
+		$this->assertTrue(Set::check($set, 'Session Test.Test Case'));
+	}
+
+/**
+ * testDiff method
+ *
+ * @access public
+ * @return void
+ */
+	function testDiff() {
+		$a = array(
+			0 => array('name' => 'main'),
+			1 => array('name' => 'about')
+		);
+		$b = array(
+			0 => array('name' => 'main'),
+			1 => array('name' => 'about'),
+			2 => array('name' => 'contact')
+		);
+
+		$result = Set::diff($a, $b);
+		$expected = array(
+			2 => array('name' => 'contact')
+		);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::diff($a, array());
+		$expected = $a;
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::diff(array(), $b);
+		$expected = $b;
+		$this->assertIdentical($result, $expected);
+
+		$b = array(
+			0 => array('name' => 'me'),
+			1 => array('name' => 'about')
+		);
+
+		$result = Set::diff($a, $b);
+		$expected = array(
+			0 => array('name' => 'main')
+		);
+		$this->assertIdentical($result, $expected);
+
+		$a = array();
+		$b = array('name' => 'bob', 'address' => 'home');
+		$result = Set::diff($a, $b);
+		$this->assertIdentical($result, $b);
+
+
+		$a = array('name' => 'bob', 'address' => 'home');
+		$b = array();
+		$result = Set::diff($a, $b);
+		$this->assertIdentical($result, $a);
+
+		$a = array('key' => true, 'another' => false, 'name' => 'me');
+		$b = array('key' => 1, 'another' => 0);
+		$expected = array('name' => 'me');
+		$result = Set::diff($a, $b);
+		$this->assertIdentical($result, $expected);
+
+		$a = array('key' => 'value', 'another' => null, 'name' => 'me');
+		$b = array('key' => 'differentValue', 'another' => null);
+		$expected = array('key' => 'value', 'name' => 'me');
+		$result = Set::diff($a, $b);
+		$this->assertIdentical($result, $expected);
+
+		$a = array('key' => 'value', 'another' => null, 'name' => 'me');
+		$b = array('key' => 'differentValue', 'another' => 'value');
+		$expected = array('key' => 'value', 'another' => null, 'name' => 'me');
+		$result = Set::diff($a, $b);
+		$this->assertIdentical($result, $expected);
+
+		$a = array('key' => 'value', 'another' => null, 'name' => 'me');
+		$b = array('key' => 'differentValue', 'another' => 'value');
+		$expected = array('key' => 'differentValue', 'another' => 'value', 'name' => 'me');
+		$result = Set::diff($b, $a);
+		$this->assertIdentical($result, $expected);
+
+		$a = array('key' => 'value', 'another' => null, 'name' => 'me');
+		$b = array(0 => 'differentValue', 1 => 'value');
+		$expected = $a + $b;
+		$result = Set::diff($a, $b);
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * testContains method
+ *
+ * @access public
+ * @return void
+ */
+	function testContains() {
+		$a = array(
+			0 => array('name' => 'main'),
+			1 => array('name' => 'about')
+		);
+		$b = array(
+			0 => array('name' => 'main'),
+			1 => array('name' => 'about'),
+			2 => array('name' => 'contact'),
+			'a' => 'b'
+		);
+
+		$this->assertTrue(Set::contains($a, $a));
+		$this->assertFalse(Set::contains($a, $b));
+		$this->assertTrue(Set::contains($b, $a));
+	}
+
+/**
+ * testCombine method
+ *
+ * @access public
+ * @return void
+ */
+	function testCombine() {
+		$result = Set::combine(array(), '{n}.User.id', '{n}.User.Data');
+		$this->assertFalse($result);
+		$result = Set::combine('', '{n}.User.id', '{n}.User.Data');
+		$this->assertFalse($result);
+
+		$a = array(
+			array('User' => array('id' => 2, 'group_id' => 1,
+				'Data' => array('user' => 'mariano.iglesias','name' => 'Mariano Iglesias'))),
+			array('User' => array('id' => 14, 'group_id' => 2,
+				'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))),
+			array('User' => array('id' => 25, 'group_id' => 1,
+				'Data' => array('user' => 'gwoo','name' => 'The Gwoo'))));
+		$result = Set::combine($a, '{n}.User.id');
+		$expected = array(2 => null, 14 => null, 25 => null);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.non-existant');
+		$expected = array(2 => null, 14 => null, 25 => null);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data');
+		$expected = array(
+			2 => array('user' => 'mariano.iglesias',	'name' => 'Mariano Iglesias'),
+			14 => array('user' => 'phpnut',	'name' => 'Larry E. Masters'),
+			25 => array('user' => 'gwoo',	'name' => 'The Gwoo'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data.name');
+		$expected = array(
+			2 => 'Mariano Iglesias',
+			14 => 'Larry E. Masters',
+			25 => 'The Gwoo');
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data', '{n}.User.group_id');
+		$expected = array(
+			1 => array(
+				2 => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'),
+				25 => array('user' => 'gwoo', 'name' => 'The Gwoo')),
+			2 => array(
+				14 => array('user' => 'phpnut', 'name' => 'Larry E. Masters')));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data.name', '{n}.User.group_id');
+		$expected = array(
+			1 => array(
+				2 => 'Mariano Iglesias',
+				25 => 'The Gwoo'),
+			2 => array(
+				14 => 'Larry E. Masters'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id');
+		$expected = array(2 => null, 14 => null, 25 => null);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data');
+		$expected = array(
+			2 => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'),
+			14 => array('user' => 'phpnut', 'name' => 'Larry E. Masters'),
+			25 => array('user' => 'gwoo', 'name' => 'The Gwoo'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data.name');
+		$expected = array(2 => 'Mariano Iglesias', 14 => 'Larry E. Masters', 25 => 'The Gwoo');
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data', '{n}.User.group_id');
+		$expected = array(
+			1 => array(
+				2 => array('user' => 'mariano.iglesias', 'name' => 'Mariano Iglesias'),
+				25 => array('user' => 'gwoo', 'name' => 'The Gwoo')),
+			2 => array(
+				14 => array('user' => 'phpnut', 'name' => 'Larry E. Masters')));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', '{n}.User.Data.name', '{n}.User.group_id');
+		$expected = array(
+			1 => array(
+				2 => 'Mariano Iglesias',
+				25 => 'The Gwoo'),
+			2 => array(
+				14 => 'Larry E. Masters'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, '{n}.User.id', array('{0}: {1}', '{n}.User.Data.user', '{n}.User.Data.name'), '{n}.User.group_id');
+		$expected = array (
+			1 => array (
+				2 => 'mariano.iglesias: Mariano Iglesias',
+				25 => 'gwoo: The Gwoo'),
+			2 => array (14 => 'phpnut: Larry E. Masters'));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, array('{0}: {1}', '{n}.User.Data.user', '{n}.User.Data.name'), '{n}.User.id');
+		$expected = array('mariano.iglesias: Mariano Iglesias' => 2, 'phpnut: Larry E. Masters' => 14, 'gwoo: The Gwoo' => 25);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, array('{1}: {0}', '{n}.User.Data.user', '{n}.User.Data.name'), '{n}.User.id');
+		$expected = array('Mariano Iglesias: mariano.iglesias' => 2, 'Larry E. Masters: phpnut' => 14, 'The Gwoo: gwoo' => 25);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, array('%1$s: %2$d', '{n}.User.Data.user', '{n}.User.id'), '{n}.User.Data.name');
+		$expected = array('mariano.iglesias: 2' => 'Mariano Iglesias', 'phpnut: 14' => 'Larry E. Masters', 'gwoo: 25' => 'The Gwoo');
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, array('%2$d: %1$s', '{n}.User.Data.user', '{n}.User.id'), '{n}.User.Data.name');
+		$expected = array('2: mariano.iglesias' => 'Mariano Iglesias', '14: phpnut' => 'Larry E. Masters', '25: gwoo' => 'The Gwoo');
+		$this->assertIdentical($result, $expected);
+
+		$b = new stdClass();
+		$b->users = array(
+			array('User' => array('id' => 2, 'group_id' => 1,
+				'Data' => array('user' => 'mariano.iglesias','name' => 'Mariano Iglesias'))),
+			array('User' => array('id' => 14, 'group_id' => 2,
+				'Data' => array('user' => 'phpnut', 'name' => 'Larry E. Masters'))),
+			array('User' => array('id' => 25, 'group_id' => 1,
+				'Data' => array('user' => 'gwoo','name' => 'The Gwoo'))));
+		$result = Set::combine($b, 'users.{n}.User.id');
+		$expected = array(2 => null, 14 => null, 25 => null);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($b, 'users.{n}.User.id', 'users.{n}.User.non-existant');
+		$expected = array(2 => null, 14 => null, 25 => null);
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::combine($a, 'fail', 'fail');
+		$this->assertEqual($result, array());
+	}
+
+/**
+ * testMapReverse method
+ *
+ * @access public
+ * @return void
+ */
+	function testMapReverse() {
+		$result = Set::reverse(null);
+		$this->assertEqual($result, null);
+
+		$result = Set::reverse(false);
+		$this->assertEqual($result, false);
+
+		$expected = array(
+		'Array1' => array(
+				'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2'),
+		'Array2' => array(
+				0 => array('Array2Data1' => 1, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				1 => array('Array2Data1' => 2, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				2 => array('Array2Data1' => 3, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				3 => array('Array2Data1' => 4, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				4 => array('Array2Data1' => 5, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4')),
+		'Array3' => array(
+				0 => array('Array3Data1' => 1, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				1 => array('Array3Data1' => 2, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				2 => array('Array3Data1' => 3, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				3 => array('Array3Data1' => 4, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				4 => array('Array3Data1' => 5, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4')));
+		$map = Set::map($expected, true);
+		$this->assertEqual($map->Array1->Array1Data1, $expected['Array1']['Array1Data1']);
+		$this->assertEqual($map->Array2[0]->Array2Data1, $expected['Array2'][0]['Array2Data1']);
+
+		$result = Set::reverse($map);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array(
+			'Post' => array('id'=> 1, 'title' => 'First Post'),
+			'Comment' => array(
+				array('id'=> 1, 'title' => 'First Comment'),
+				array('id'=> 2, 'title' => 'Second Comment')
+			),
+			'Tag' => array(
+				array('id'=> 1, 'title' => 'First Tag'),
+				array('id'=> 2, 'title' => 'Second Tag')
+			),
+		);
+		$map = Set::map($expected);
+		$this->assertIdentical($map->title, $expected['Post']['title']);
+		foreach ($map->Comment as $comment) {
+			$ids[] = $comment->id;
+		}
+		$this->assertIdentical($ids, array(1, 2));
+
+		$expected = array(
+		'Array1' => array(
+				'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3','Array1Data4' => 'Array1Data4 value 4',
+				'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'),
+		'string' => 1,
+		'another' => 'string',
+		'some' => 'thing else',
+		'Array2' => array(
+				0 => array('Array2Data1' => 1, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				1 => array('Array2Data1' => 2, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				2 => array('Array2Data1' => 3, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				3 => array('Array2Data1' => 4, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				4 => array('Array2Data1' => 5, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4')),
+		'Array3' => array(
+				0 => array('Array3Data1' => 1, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				1 => array('Array3Data1' => 2, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				2 => array('Array3Data1' => 3, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				3 => array('Array3Data1' => 4, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				4 => array('Array3Data1' => 5, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4')));
+		$map = Set::map($expected, true);
+		$result = Set::reverse($map);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array(
+		'Array1' => array(
+				'Array1Data1' => 'Array1Data1 value 1', 'Array1Data2' => 'Array1Data2 value 2', 'Array1Data3' => 'Array1Data3 value 3','Array1Data4' => 'Array1Data4 value 4',
+				'Array1Data5' => 'Array1Data5 value 5', 'Array1Data6' => 'Array1Data6 value 6', 'Array1Data7' => 'Array1Data7 value 7', 'Array1Data8' => 'Array1Data8 value 8'),
+		'string' => 1,
+		'another' => 'string',
+		'some' => 'thing else',
+		'Array2' => array(
+				0 => array('Array2Data1' => 1, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				1 => array('Array2Data1' => 2, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				2 => array('Array2Data1' => 3, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				3 => array('Array2Data1' => 4, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4'),
+				4 => array('Array2Data1' => 5, 'Array2Data2' => 'Array2Data2 value 2', 'Array2Data3' => 'Array2Data3 value 2', 'Array2Data4' => 'Array2Data4 value 4')),
+		'string2' => 1,
+		'another2' => 'string',
+		'some2' => 'thing else',
+		'Array3' => array(
+				0 => array('Array3Data1' => 1, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				1 => array('Array3Data1' => 2, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				2 => array('Array3Data1' => 3, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				3 => array('Array3Data1' => 4, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4'),
+				4 => array('Array3Data1' => 5, 'Array3Data2' => 'Array3Data2 value 2', 'Array3Data3' => 'Array3Data3 value 2', 'Array3Data4' => 'Array3Data4 value 4')),
+		'string3' => 1,
+		'another3' => 'string',
+		'some3' => 'thing else');
+		$map = Set::map($expected, true);
+		$result = Set::reverse($map);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('User' => array('psword'=> 'whatever', 'Icon' => array('id'=> 851)));
+		$map = Set::map($expected);
+		$result = Set::reverse($map);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('User' => array('psword'=> 'whatever', 'Icon' => array('id'=> 851)));
+		$class = new stdClass;
+		$class->User = new stdClass;
+		$class->User->psword = 'whatever';
+		$class->User->Icon = new stdClass;
+		$class->User->Icon->id = 851;
+		$result = Set::reverse($class);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('User' => array('psword'=> 'whatever', 'Icon' => array('id'=> 851), 'Profile' => array('name' => 'Some Name', 'address' => 'Some Address')));
+		$class = new stdClass;
+		$class->User = new stdClass;
+		$class->User->psword = 'whatever';
+		$class->User->Icon = new stdClass;
+		$class->User->Icon->id = 851;
+		$class->User->Profile = new stdClass;
+		$class->User->Profile->name = 'Some Name';
+		$class->User->Profile->address = 'Some Address';
+
+		$result = Set::reverse($class);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('User' => array('psword'=> 'whatever',
+						'Icon' => array('id'=> 851),
+						'Profile' => array('name' => 'Some Name', 'address' => 'Some Address'),
+						'Comment' => array(
+								array('id' => 1, 'article_id' => 1, 'user_id' => 1, 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
+								array('id' => 2, 'article_id' => 1, 'user_id' => 2, 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'))));
+
+		$class = new stdClass;
+		$class->User = new stdClass;
+		$class->User->psword = 'whatever';
+		$class->User->Icon = new stdClass;
+		$class->User->Icon->id = 851;
+		$class->User->Profile = new stdClass;
+		$class->User->Profile->name = 'Some Name';
+		$class->User->Profile->address = 'Some Address';
+		$class->User->Comment = new stdClass;
+		$class->User->Comment->{'0'} = new stdClass;
+		$class->User->Comment->{'0'}->id = 1;
+		$class->User->Comment->{'0'}->article_id = 1;
+		$class->User->Comment->{'0'}->user_id = 1;
+		$class->User->Comment->{'0'}->comment = 'First Comment for First Article';
+		$class->User->Comment->{'0'}->published = 'Y';
+		$class->User->Comment->{'0'}->created = '2007-03-18 10:47:23';
+		$class->User->Comment->{'0'}->updated = '2007-03-18 10:49:31';
+		$class->User->Comment->{'1'} = new stdClass;
+		$class->User->Comment->{'1'}->id = 2;
+		$class->User->Comment->{'1'}->article_id = 1;
+		$class->User->Comment->{'1'}->user_id = 2;
+		$class->User->Comment->{'1'}->comment = 'Second Comment for First Article';
+		$class->User->Comment->{'1'}->published = 'Y';
+		$class->User->Comment->{'1'}->created = '2007-03-18 10:47:23';
+		$class->User->Comment->{'1'}->updated = '2007-03-18 10:49:31';
+
+		$result = Set::reverse($class);
+		$this->assertIdentical($result, $expected);
+
+		$expected = array('User' => array('psword'=> 'whatever',
+						'Icon' => array('id'=> 851),
+						'Profile' => array('name' => 'Some Name', 'address' => 'Some Address'),
+						'Comment' => array(
+								array('id' => 1, 'article_id' => 1, 'user_id' => 1, 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
+								array('id' => 2, 'article_id' => 1, 'user_id' => 2, 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'))));
+
+		$class = new stdClass;
+		$class->User = new stdClass;
+		$class->User->psword = 'whatever';
+		$class->User->Icon = new stdClass;
+		$class->User->Icon->id = 851;
+		$class->User->Profile = new stdClass;
+		$class->User->Profile->name = 'Some Name';
+		$class->User->Profile->address = 'Some Address';
+		$class->User->Comment = array();
+		$comment = new stdClass;
+		$comment->id = 1;
+		$comment->article_id = 1;
+		$comment->user_id = 1;
+		$comment->comment = 'First Comment for First Article';
+		$comment->published = 'Y';
+		$comment->created = '2007-03-18 10:47:23';
+		$comment->updated = '2007-03-18 10:49:31';
+		$comment2 = new stdClass;
+		$comment2->id = 2;
+		$comment2->article_id = 1;
+		$comment2->user_id = 2;
+		$comment2->comment = 'Second Comment for First Article';
+		$comment2->published = 'Y';
+		$comment2->created = '2007-03-18 10:47:23';
+		$comment2->updated = '2007-03-18 10:49:31';
+		$class->User->Comment =  array($comment, $comment2);
+		$result = Set::reverse($class);
+		$this->assertIdentical($result, $expected);
+
+		$model = new Model(array('id' => false, 'name' => 'Model', 'table' => false));
+		$expected = array(
+			'Behaviors' => array('modelName' => 'Model', '_attached' => array(), '_disabled' => array(), '__methods' => array(), '__mappedMethods' => array()),
+			'useDbConfig' => 'default', 'useTable' => false, 'displayField' => null, 'id' => false, 'data' => array(), 'table' => 'models', 'primaryKey' => 'id', '_schema' => null, 'validate' => array(),
+			'validationErrors' => array(), 'tablePrefix' => null, 'name' => 'Model', 'alias' => 'Model', 'tableToModel' => array(), 'logTransactions' => false, 'cacheQueries' => false,
+			'belongsTo' => array(), 'hasOne' =>  array(), 'hasMany' =>  array(), 'hasAndBelongsToMany' =>  array(), 'actsAs' => null, 'whitelist' =>  array(), 'cacheSources' => true,
+			'findQueryType' => null, 'recursive' => 1, 'order' => null, 'virtualFields' => array(),
+			'__associationKeys' => array(
+				'belongsTo' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'counterCache'),
+				'hasOne' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'dependent'),
+				'hasMany' => array('className', 'foreignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'dependent', 'exclusive', 'finderQuery', 'counterQuery'),
+				'hasAndBelongsToMany' => array('className', 'joinTable', 'with', 'foreignKey', 'associationForeignKey', 'conditions', 'fields', 'order', 'limit', 'offset', 'unique', 'finderQuery', 'deleteQuery', 'insertQuery')),
+			'__associations' => array('belongsTo', 'hasOne', 'hasMany', 'hasAndBelongsToMany'), '__backAssociation' => array(), '__insertID' => null, '__numRows' => null, '__affectedRows' => null,
+				'_findMethods' => array('all' => true, 'first' => true, 'count' => true, 'neighbors' => true, 'list' => true, 'threaded' => true));
+		$result = Set::reverse($model);
+
+		ksort($result);
+		ksort($expected);
+
+		$this->assertIdentical($result, $expected);
+
+		$class = new stdClass;
+		$class->User = new stdClass;
+		$class->User->id = 100;
+		$class->someString = 'this is some string';
+		$class->Profile = new stdClass;
+		$class->Profile->name = 'Joe Mamma';
+
+		$result = Set::reverse($class);
+		$expected = array('User' => array('id' => '100'), 'someString'=> 'this is some string', 'Profile' => array('name' => 'Joe Mamma'));
+		$this->assertEqual($result, $expected);
+
+		$class = new stdClass;
+		$class->User = new stdClass;
+		$class->User->id = 100;
+		$class->User->_name_ = 'User';
+		$class->Profile = new stdClass;
+		$class->Profile->name = 'Joe Mamma';
+		$class->Profile->_name_ = 'Profile';
+
+		$result = Set::reverse($class);
+		$expected = array('User' => array('id' => '100'), 'Profile' => array('name' => 'Joe Mamma'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testFormatting method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormatting() {
+		$data = array(
+			array('Person' => array('first_name' => 'Nate', 'last_name' => 'Abele', 'city' => 'Boston', 'state' => 'MA', 'something' => '42')),
+			array('Person' => array('first_name' => 'Larry', 'last_name' => 'Masters', 'city' => 'Boondock', 'state' => 'TN', 'something' => '{0}')),
+			array('Person' => array('first_name' => 'Garrett', 'last_name' => 'Woodworth', 'city' => 'Venice Beach', 'state' => 'CA', 'something' => '{1}')));
+
+		$result = Set::format($data, '{1}, {0}', array('{n}.Person.first_name', '{n}.Person.last_name'));
+		$expected = array('Abele, Nate', 'Masters, Larry', 'Woodworth, Garrett');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '{0}, {1}', array('{n}.Person.last_name', '{n}.Person.first_name'));
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '{0}, {1}', array('{n}.Person.city', '{n}.Person.state'));
+		$expected = array('Boston, MA', 'Boondock, TN', 'Venice Beach, CA');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '{{0}, {1}}', array('{n}.Person.city', '{n}.Person.state'));
+		$expected = array('{Boston, MA}', '{Boondock, TN}', '{Venice Beach, CA}');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '{{0}, {1}}', array('{n}.Person.something', '{n}.Person.something'));
+		$expected = array('{42, 42}', '{{0}, {0}}', '{{1}, {1}}');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '{%2$d, %1$s}', array('{n}.Person.something', '{n}.Person.something'));
+		$expected = array('{42, 42}', '{0, {0}}', '{0, {1}}');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '{%1$s, %1$s}', array('{n}.Person.something', '{n}.Person.something'));
+		$expected = array('{42, 42}', '{{0}, {0}}', '{{1}, {1}}');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '%2$d, %1$s', array('{n}.Person.first_name', '{n}.Person.something'));
+		$expected = array('42, Nate', '0, Larry', '0, Garrett');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::format($data, '%1$s, %2$d', array('{n}.Person.first_name', '{n}.Person.something'));
+		$expected = array('Nate, 42', 'Larry, 0', 'Garrett, 0');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testCountDim method
+ *
+ * @access public
+ * @return void
+ */
+	function testCountDim() {
+		$data = array('one', '2', 'three');
+		$result = Set::countDim($data);
+		$this->assertEqual($result, 1);
+
+		$data = array('1' => '1.1', '2', '3');
+		$result = Set::countDim($data);
+		$this->assertEqual($result, 1);
+
+		$data = array('1' => array('1.1' => '1.1.1'), '2', '3' => array('3.1' => '3.1.1'));
+		$result = Set::countDim($data);
+		$this->assertEqual($result, 2);
+
+		$data = array('1' => '1.1', '2', '3' => array('3.1' => '3.1.1'));
+		$result = Set::countDim($data);
+		$this->assertEqual($result, 1);
+
+		$data = array('1' => '1.1', '2', '3' => array('3.1' => '3.1.1'));
+		$result = Set::countDim($data, true);
+		$this->assertEqual($result, 2);
+
+		$data = array('1' => array('1.1' => '1.1.1'), '2', '3' => array('3.1' => array('3.1.1' => '3.1.1.1')));
+		$result = Set::countDim($data);
+		$this->assertEqual($result, 2);
+
+		$data = array('1' => array('1.1' => '1.1.1'), '2', '3' => array('3.1' => array('3.1.1' => '3.1.1.1')));
+		$result = Set::countDim($data, true);
+		$this->assertEqual($result, 3);
+
+		$data = array('1' => array('1.1' => '1.1.1'), array('2' => array('2.1' => array('2.1.1' => '2.1.1.1'))), '3' => array('3.1' => array('3.1.1' => '3.1.1.1')));
+		$result = Set::countDim($data, true);
+		$this->assertEqual($result, 4);
+
+		$data = array('1' => array('1.1' => '1.1.1'), array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1')))), '3' => array('3.1' => array('3.1.1' => '3.1.1.1')));
+		$result = Set::countDim($data, true);
+		$this->assertEqual($result, 5);
+
+		$data = array('1' => array('1.1' => '1.1.1'), array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1' => '2.1.1.1.1')))), '3' => array('3.1' => array('3.1.1' => '3.1.1.1')));
+		$result = Set::countDim($data, true);
+		$this->assertEqual($result, 5);
+
+		$set = array('1' => array('1.1' => '1.1.1'), array('2' => array('2.1' => array('2.1.1' => array('2.1.1.1' => '2.1.1.1.1')))), '3' => array('3.1' => array('3.1.1' => '3.1.1.1')));
+		$result = Set::countDim($set, false, 0);
+		$this->assertEqual($result, 2);
+
+		$result = Set::countDim($set, true);
+		$this->assertEqual($result, 5);
+	}
+
+/**
+ * testMapNesting method
+ *
+ * @access public
+ * @return void
+ */
+	function testMapNesting() {
+		$expected = array(
+			array(
+				"IndexedPage" => array(
+					"id" => 1,
+					"url" => 'http://blah.com/',
+					'hash' => '68a9f053b19526d08e36c6a9ad150737933816a5',
+					'headers' => array(
+							'Date' => "Wed, 14 Nov 2007 15:51:42 GMT",
+							'Server' => "Apache",
+							'Expires' => "Thu, 19 Nov 1981 08:52:00 GMT",
+							'Cache-Control' => "private",
+							'Pragma' => "no-cache",
+							'Content-Type' => "text/html; charset=UTF-8",
+							'X-Original-Transfer-Encoding' => "chunked",
+							'Content-Length' => "50210",
+					),
+					'meta' => array(
+							'keywords' => array('testing','tests'),
+							'description'=>'describe me',
+					),
+					'get_vars' => '',
+					'post_vars' => array(),
+					'cookies' => array('PHPSESSID' => "dde9896ad24595998161ffaf9e0dbe2d"),
+					'redirect' => '',
+					'created' => "1195055503",
+					'updated' => "1195055503",
+				)
+			),
+			array(
+				"IndexedPage" => array(
+					"id" => 2,
+					"url" => 'http://blah.com/',
+					'hash' => '68a9f053b19526d08e36c6a9ad150737933816a5',
+					'headers' => array(
+						'Date' => "Wed, 14 Nov 2007 15:51:42 GMT",
+						'Server' => "Apache",
+						'Expires' => "Thu, 19 Nov 1981 08:52:00 GMT",
+						'Cache-Control' => "private",
+						'Pragma' => "no-cache",
+						'Content-Type' => "text/html; charset=UTF-8",
+						'X-Original-Transfer-Encoding' => "chunked",
+						'Content-Length' => "50210",
+					),
+					'meta' => array(
+							'keywords' => array('testing','tests'),
+							'description'=>'describe me',
+					),
+					'get_vars' => '',
+					'post_vars' => array(),
+					'cookies' => array('PHPSESSID' => "dde9896ad24595998161ffaf9e0dbe2d"),
+					'redirect' => '',
+					'created' => "1195055503",
+					'updated' => "1195055503",
+				),
+			)
+		);
+
+		$mapped = Set::map($expected);
+		$ids = array();
+
+		foreach($mapped as $object)	 {
+			$ids[] = $object->id;
+		}
+		$this->assertEqual($ids, array(1, 2));
+		$this->assertEqual(get_object_vars($mapped[0]->headers), $expected[0]['IndexedPage']['headers']);
+
+		$result = Set::reverse($mapped);
+		$this->assertIdentical($result, $expected);
+
+		$data = array(
+			array(
+				"IndexedPage" => array(
+					"id" => 1,
+					"url" => 'http://blah.com/',
+					'hash' => '68a9f053b19526d08e36c6a9ad150737933816a5',
+					'get_vars' => '',
+					'redirect' => '',
+					'created' => "1195055503",
+					'updated' => "1195055503",
+				)
+			),
+			array(
+				"IndexedPage" => array(
+					"id" => 2,
+					"url" => 'http://blah.com/',
+					'hash' => '68a9f053b19526d08e36c6a9ad150737933816a5',
+					'get_vars' => '',
+					'redirect' => '',
+					'created' => "1195055503",
+					'updated' => "1195055503",
+				),
+			)
+		);
+		$mapped = Set::map($data);
+
+		$expected = new stdClass();
+		$expected->_name_ = 'IndexedPage';
+		$expected->id = 2;
+		$expected->url = 'http://blah.com/';
+		$expected->hash = '68a9f053b19526d08e36c6a9ad150737933816a5';
+		$expected->get_vars = '';
+		$expected->redirect = '';
+		$expected->created = "1195055503";
+		$expected->updated = "1195055503";
+		$this->assertIdentical($mapped[1], $expected);
+
+		$ids = array();
+
+		foreach($mapped as $object)	 {
+			$ids[] = $object->id;
+		}
+		$this->assertEqual($ids, array(1, 2));
+
+		$result = Set::map(null);
+		$expected = null;
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testNestedMappedData method
+ *
+ * @access public
+ * @return void
+ */
+	function testNestedMappedData() {
+		$result = Set::map(array(
+				array(
+					'Post' => array('id' => '1', 'author_id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+					'Author' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31', 'test' => 'working'),
+				)
+				, array(
+					'Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+					'Author' => array('id' => '3', 'user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31', 'test' => 'working'),
+				)
+			));
+
+		$expected = new stdClass;
+		$expected->_name_ = 'Post';
+		$expected->id = '1';
+		$expected->author_id = '1';
+		$expected->title = 'First Post';
+		$expected->body = 'First Post Body';
+		$expected->published = 'Y';
+		$expected->created = "2007-03-18 10:39:23";
+		$expected->updated = "2007-03-18 10:41:31";
+
+		$expected->Author = new stdClass;
+		$expected->Author->id = '1';
+		$expected->Author->user = 'mariano';
+		$expected->Author->password = '5f4dcc3b5aa765d61d8327deb882cf99';
+		$expected->Author->created = "2007-03-17 01:16:23";
+		$expected->Author->updated = "2007-03-17 01:18:31";
+		$expected->Author->test = "working";
+		$expected->Author->_name_ = 'Author';
+
+		$expected2 = new stdClass;
+		$expected2->_name_ = 'Post';
+		$expected2->id = '2';
+		$expected2->author_id = '3';
+		$expected2->title = 'Second Post';
+		$expected2->body = 'Second Post Body';
+		$expected2->published = 'Y';
+		$expected2->created = "2007-03-18 10:41:23";
+		$expected2->updated = "2007-03-18 10:43:31";
+
+		$expected2->Author = new stdClass;
+		$expected2->Author->id = '3';
+		$expected2->Author->user = 'larry';
+		$expected2->Author->password = '5f4dcc3b5aa765d61d8327deb882cf99';
+		$expected2->Author->created = "2007-03-17 01:20:23";
+		$expected2->Author->updated = "2007-03-17 01:22:31";
+		$expected2->Author->test = "working";
+		$expected2->Author->_name_ = 'Author';
+
+		$test = array();
+		$test[0] = $expected;
+		$test[1] = $expected2;
+
+		$this->assertIdentical($test, $result);
+
+		$result = Set::map(
+				array(
+					'Post' => array('id' => '1', 'author_id' => '1', 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+					'Author' => array('id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31', 'test' => 'working'),
+				)
+			);
+		$expected = new stdClass;
+		$expected->_name_ = 'Post';
+		$expected->id = '1';
+		$expected->author_id = '1';
+		$expected->title = 'First Post';
+		$expected->body = 'First Post Body';
+		$expected->published = 'Y';
+		$expected->created = "2007-03-18 10:39:23";
+		$expected->updated = "2007-03-18 10:41:31";
+
+		$expected->Author = new stdClass;
+		$expected->Author->id = '1';
+		$expected->Author->user = 'mariano';
+		$expected->Author->password = '5f4dcc3b5aa765d61d8327deb882cf99';
+		$expected->Author->created = "2007-03-17 01:16:23";
+		$expected->Author->updated = "2007-03-17 01:18:31";
+		$expected->Author->test = "working";
+		$expected->Author->_name_ = 'Author';
+		$this->assertIdentical($expected, $result);
+
+		//Case where extra HABTM fields come back in a result
+		$data = array(
+			'User' => array(
+				'id' => 1,
+				'email' => 'user@example.com',
+				'first_name' => 'John',
+				'last_name' => 'Smith',
+			),
+			'Piece' => array(
+				array(
+					'id' => 1,
+					'title' => 'Moonlight Sonata',
+					'composer' => 'Ludwig van Beethoven',
+					'PiecesUser' => array(
+						'id' => 1,
+						'created' => '2008-01-01 00:00:00',
+						'modified' => '2008-01-01 00:00:00',
+						'piece_id' => 1,
+						'user_id' => 2,
+					)
+				),
+				array(
+					'id' => 2,
+					'title' => 'Moonlight Sonata 2',
+					'composer' => 'Ludwig van Beethoven',
+					'PiecesUser' => array(
+						'id' => 2,
+						'created' => '2008-01-01 00:00:00',
+						'modified' => '2008-01-01 00:00:00',
+						'piece_id' => 2,
+						'user_id' => 2,
+					)
+				)
+			)
+		);
+
+		$result = Set::map($data);
+
+		$expected = new stdClass();
+		$expected->_name_ = 'User';
+		$expected->id = 1;
+		$expected->email = 'user@example.com';
+		$expected->first_name = 'John';
+		$expected->last_name = 'Smith';
+
+		$piece = new stdClass();
+		$piece->id = 1;
+		$piece->title = 'Moonlight Sonata';
+		$piece->composer = 'Ludwig van Beethoven';
+
+		$piece->PiecesUser = new stdClass();
+		$piece->PiecesUser->id = 1;
+		$piece->PiecesUser->created = '2008-01-01 00:00:00';
+		$piece->PiecesUser->modified = '2008-01-01 00:00:00';
+		$piece->PiecesUser->piece_id = 1;
+		$piece->PiecesUser->user_id = 2;
+		$piece->PiecesUser->_name_ = 'PiecesUser';
+
+		$piece->_name_ = 'Piece';
+
+
+		$piece2 = new stdClass();
+		$piece2->id = 2;
+		$piece2->title = 'Moonlight Sonata 2';
+		$piece2->composer = 'Ludwig van Beethoven';
+
+		$piece2->PiecesUser = new stdClass();
+		$piece2->PiecesUser->id = 2;
+		$piece2->PiecesUser->created = '2008-01-01 00:00:00';
+		$piece2->PiecesUser->modified = '2008-01-01 00:00:00';
+		$piece2->PiecesUser->piece_id = 2;
+		$piece2->PiecesUser->user_id = 2;
+		$piece2->PiecesUser->_name_ = 'PiecesUser';
+
+		$piece2->_name_ = 'Piece';
+
+		$expected->Piece = array($piece, $piece2);
+
+		$this->assertIdentical($expected, $result);
+
+		//Same data, but should work if _name_ has been manually defined:
+		$data = array(
+			'User' => array(
+				'id' => 1,
+				'email' => 'user@example.com',
+				'first_name' => 'John',
+				'last_name' => 'Smith',
+				'_name_' => 'FooUser',
+			),
+			'Piece' => array(
+				array(
+					'id' => 1,
+					'title' => 'Moonlight Sonata',
+					'composer' => 'Ludwig van Beethoven',
+					'_name_' => 'FooPiece',
+					'PiecesUser' => array(
+						'id' => 1,
+						'created' => '2008-01-01 00:00:00',
+						'modified' => '2008-01-01 00:00:00',
+						'piece_id' => 1,
+						'user_id' => 2,
+						'_name_' => 'FooPiecesUser',
+					)
+				),
+				array(
+					'id' => 2,
+					'title' => 'Moonlight Sonata 2',
+					'composer' => 'Ludwig van Beethoven',
+					'_name_' => 'FooPiece',
+					'PiecesUser' => array(
+						'id' => 2,
+						'created' => '2008-01-01 00:00:00',
+						'modified' => '2008-01-01 00:00:00',
+						'piece_id' => 2,
+						'user_id' => 2,
+						'_name_' => 'FooPiecesUser',
+					)
+				)
+			)
+		);
+
+		$result = Set::map($data);
+
+		$expected = new stdClass();
+		$expected->_name_ = 'FooUser';
+		$expected->id = 1;
+		$expected->email = 'user@example.com';
+		$expected->first_name = 'John';
+		$expected->last_name = 'Smith';
+
+		$piece = new stdClass();
+		$piece->id = 1;
+		$piece->title = 'Moonlight Sonata';
+		$piece->composer = 'Ludwig van Beethoven';
+		$piece->_name_ = 'FooPiece';
+		$piece->PiecesUser = new stdClass();
+		$piece->PiecesUser->id = 1;
+		$piece->PiecesUser->created = '2008-01-01 00:00:00';
+		$piece->PiecesUser->modified = '2008-01-01 00:00:00';
+		$piece->PiecesUser->piece_id = 1;
+		$piece->PiecesUser->user_id = 2;
+		$piece->PiecesUser->_name_ = 'FooPiecesUser';
+
+		$piece2 = new stdClass();
+		$piece2->id = 2;
+		$piece2->title = 'Moonlight Sonata 2';
+		$piece2->composer = 'Ludwig van Beethoven';
+		$piece2->_name_ = 'FooPiece';
+		$piece2->PiecesUser = new stdClass();
+		$piece2->PiecesUser->id = 2;
+		$piece2->PiecesUser->created = '2008-01-01 00:00:00';
+		$piece2->PiecesUser->modified = '2008-01-01 00:00:00';
+		$piece2->PiecesUser->piece_id = 2;
+		$piece2->PiecesUser->user_id = 2;
+		$piece2->PiecesUser->_name_ = 'FooPiecesUser';
+
+		$expected->Piece = array($piece, $piece2);
+
+		$this->assertIdentical($expected, $result);
+	}
+
+/**
+ * testPushDiff method
+ *
+ * @access public
+ * @return void
+ */
+	function testPushDiff() {
+		$array1 = array('ModelOne' => array('id'=>1001, 'field_one'=>'a1.m1.f1', 'field_two'=>'a1.m1.f2'));
+		$array2 = array('ModelTwo' => array('id'=>1002, 'field_one'=>'a2.m2.f1', 'field_two'=>'a2.m2.f2'));
+
+		$result = Set::pushDiff($array1, $array2);
+
+		$this->assertIdentical($result, $array1 + $array2);
+
+		$array3 = array('ModelOne' => array('id'=>1003, 'field_one'=>'a3.m1.f1', 'field_two'=>'a3.m1.f2', 'field_three'=>'a3.m1.f3'));
+		$result = Set::pushDiff($array1, $array3);
+
+		$expected = array('ModelOne' => array('id'=>1001, 'field_one'=>'a1.m1.f1', 'field_two'=>'a1.m1.f2', 'field_three'=>'a3.m1.f3'));
+		$this->assertIdentical($result, $expected);
+
+
+		$array1 = array(
+				0 => array('ModelOne' => array('id'=>1001, 'field_one'=>'s1.0.m1.f1', 'field_two'=>'s1.0.m1.f2')),
+				1 => array('ModelTwo' => array('id'=>1002, 'field_one'=>'s1.1.m2.f2', 'field_two'=>'s1.1.m2.f2')));
+		$array2 = array(
+				0 => array('ModelOne' => array('id'=>1001, 'field_one'=>'s2.0.m1.f1', 'field_two'=>'s2.0.m1.f2')),
+				1 => array('ModelTwo' => array('id'=>1002, 'field_one'=>'s2.1.m2.f2', 'field_two'=>'s2.1.m2.f2')));
+
+		$result = Set::pushDiff($array1, $array2);
+		$this->assertIdentical($result, $array1);
+
+		$array3 = array(0 => array('ModelThree' => array('id'=>1003, 'field_one'=>'s3.0.m3.f1', 'field_two'=>'s3.0.m3.f2')));
+
+		$result = Set::pushDiff($array1, $array3);
+		$expected = array(
+					0 => array('ModelOne' => array('id'=>1001, 'field_one'=>'s1.0.m1.f1', 'field_two'=>'s1.0.m1.f2'),
+						'ModelThree' => array('id'=>1003, 'field_one'=>'s3.0.m3.f1', 'field_two'=>'s3.0.m3.f2')),
+					1 => array('ModelTwo' => array('id'=>1002, 'field_one'=>'s1.1.m2.f2', 'field_two'=>'s1.1.m2.f2')));
+		$this->assertIdentical($result, $expected);
+
+		$result = Set::pushDiff($array1, null);
+		$this->assertIdentical($result, $array1);
+
+		$result = Set::pushDiff($array1, $array2);
+		$this->assertIdentical($result, $array1+$array2);
+	}
+
+/**
+ * testSetApply method
+ * @access public
+ * @return void
+ *
+ */
+	function testApply() {
+		$data = array(
+			array('Movie' => array('id' => 1, 'title' => 'movie 3', 'rating' => 5)),
+			array('Movie' => array('id' => 1, 'title' => 'movie 1', 'rating' => 1)),
+			array('Movie' => array('id' => 1, 'title' => 'movie 2', 'rating' => 3))
+		);
+
+		$result = Set::apply('/Movie/rating', $data, 'array_sum');
+		$expected = 9;
+		$this->assertEqual($result, $expected);
+
+		if (PHP5) {
+			$result = Set::apply('/Movie/rating', $data, 'array_product');
+			$expected = 15;
+			$this->assertEqual($result, $expected);
+		}
+
+		$result = Set::apply('/Movie/title', $data, 'ucfirst', array('type' => 'map'));
+		$expected = array('Movie 3', 'Movie 1', 'Movie 2');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::apply('/Movie/title', $data, 'strtoupper', array('type' => 'map'));
+		$expected = array('MOVIE 3', 'MOVIE 1', 'MOVIE 2');
+		$this->assertEqual($result, $expected);
+
+		$result = Set::apply('/Movie/rating', $data, array('SetTest', '_method'), array('type' => 'reduce'));
+		$expected = 9;
+		$this->assertEqual($result, $expected);
+
+		$result = Set::apply('/Movie/rating', $data, 'strtoupper', array('type' => 'non existing type'));
+		$expected = null;
+		$this->assertEqual($result, $expected);
+
+	}
+
+/**
+ * Helper method to test Set::apply()
+ *
+ * @access protected
+ * @return void
+ */
+	function _method($val1, $val2) {
+		$val1 += $val2;
+		return $val1;
+	}
+
+/**
+ * testXmlSetReverse method
+ *
+ * @access public
+ * @return void
+ */
+	function testXmlSetReverse() {
+		App::import('Core', 'Xml');
+
+		$string = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+		<rss version="2.0">
+		  <channel>
+		  <title>Cake PHP Google Group</title>
+		  <link>http://groups.google.com/group/cake-php</link>
+		  <description>Search this group before posting anything. There are over 20,000 posts and it&amp;#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.</description>
+		  <language>en</language>
+		  	<item>
+			  <title>constructng result array when using findall</title>
+			  <link>http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</link>
+			  <description>i&#39;m using cakephp to construct a logical data model array that will be &lt;br&gt; passed to a flex app. I have the following model association: &lt;br&gt; ServiceDay-&amp;gt;(hasMany)ServiceTi me-&amp;gt;(hasMany)ServiceTimePrice. So what &lt;br&gt; the current output from my findall is something like this example: &lt;br&gt; &lt;p&gt;Array( &lt;br&gt; [0] =&amp;gt; Array(</description>
+			  <guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</guid>
+			  <author>bmil...@gmail.com(bpscrugs)</author>
+			  <pubDate>Fri, 28 Dec 2007 00:44:14 UT</pubDate>
+			  </item>
+			  <item>
+			  <title>Re: share views between actions?</title>
+			  <link>http://groups.google.com/group/cake-php/msg/8b350d898707dad8</link>
+			  <description>Then perhaps you might do us all a favour and refrain from replying to &lt;br&gt; things you do not understand. That goes especially for asinine comments. &lt;br&gt; Indeed. &lt;br&gt; To sum up: &lt;br&gt; No comment. &lt;br&gt; In my day, a simple &amp;quot;RTFM&amp;quot; would suffice. I&#39;ll keep in mind to ignore any &lt;br&gt; further responses from you. &lt;br&gt; You (and I) were referring to the *online documentation*, not other</description>
+			  <guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/8b350d898707dad8</guid>
+			  <author>subtropolis.z...@gmail.com(subtropolis zijn)</author>
+			  <pubDate>Fri, 28 Dec 2007 00:45:01 UT</pubDate>
+			 </item>
+		</channel>
+		</rss>';
+		$xml = new Xml($string);
+		$result = Set::reverse($xml);
+		$expected = array('Rss' => array(
+			'version' => '2.0',
+			'Channel' => array(
+				'title' => 'Cake PHP Google Group',
+				'link' => 'http://groups.google.com/group/cake-php',
+				'description' => 'Search this group before posting anything. There are over 20,000 posts and it&#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.',
+				'language' => 'en',
+				'Item' => array(
+					array(
+						'title' => 'constructng result array when using findall',
+						'link' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f',
+						'description' => "i'm using cakephp to construct a logical data model array that will be <br> passed to a flex app. I have the following model association: <br> ServiceDay-&gt;(hasMany)ServiceTi me-&gt;(hasMany)ServiceTimePrice. So what <br> the current output from my findall is something like this example: <br><p>Array( <br> [0] =&gt; Array(",
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f'),
+						'author' => 'bmil...@gmail.com(bpscrugs)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:44:14 UT',
+					),
+					array(
+						'title' => 'Re: share views between actions?',
+						'link' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8',
+						'description' => 'Then perhaps you might do us all a favour and refrain from replying to <br> things you do not understand. That goes especially for asinine comments. <br> Indeed. <br> To sum up: <br> No comment. <br> In my day, a simple &quot;RTFM&quot; would suffice. I\'ll keep in mind to ignore any <br> further responses from you. <br> You (and I) were referring to the *online documentation*, not other',
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8'),
+						'author' => 'subtropolis.z...@gmail.com(subtropolis zijn)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:45:01 UT'
+					)
+				)
+			)
+		));
+		$this->assertEqual($result, $expected);
+		$string ='<data><post title="Title of this post" description="cool"/></data>';
+
+		$xml = new Xml($string);
+		$result = Set::reverse($xml);
+		$expected = array('Data' => array('Post' => array('title' => 'Title of this post', 'description' => 'cool')));
+		$this->assertEqual($result, $expected);
+
+		$xml = new Xml('<example><item><title>An example of a correctly reversed XMLNode</title><desc/></item></example>');
+		$result = Set::reverse($xml);
+		$expected = array('Example' =>
+			array(
+				'Item' => array(
+					'title' => 'An example of a correctly reversed XMLNode',
+					'desc' => array(),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$xml = new Xml('<example><item attr="123"><titles><title>title1</title><title>title2</title></titles></item></example>');
+		$result = Set::reverse($xml);
+		$expected =
+			array('Example' => array(
+				'Item' => array(
+					'attr' => '123',
+					'Titles' => array(
+						'Title' => array('title1', 'title2')
+					)
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$xml = new Xml('<example attr="ex_attr"><item attr="123"><titles>list</titles>textforitems</item></example>');
+		$result = Set::reverse($xml);
+		$expected =
+			array('Example' => array(
+				'attr' => 'ex_attr',
+				'Item' => array(
+					'attr' => '123',
+					'titles' => 'list',
+					'value'  => 'textforitems'
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$string = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+		<rss version="2.0">
+		  <channel>
+		  <title>Cake PHP Google Group</title>
+		  <link>http://groups.google.com/group/cake-php</link>
+		  <description>Search this group before posting anything. There are over 20,000 posts and it&amp;#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.</description>
+		  <language>en</language>
+		  	<item>
+			  <title>constructng result array when using findall</title>
+			  <link>http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</link>
+			  <description>i&#39;m using cakephp to construct a logical data model array that will be &lt;br&gt; passed to a flex app. I have the following model association: &lt;br&gt; ServiceDay-&amp;gt;(hasMany)ServiceTi me-&amp;gt;(hasMany)ServiceTimePrice. So what &lt;br&gt; the current output from my findall is something like this example: &lt;br&gt; &lt;p&gt;Array( &lt;br&gt; [0] =&amp;gt; Array(</description>
+			  	<dc:creator>cakephp</dc:creator>
+				<category><![CDATA[cakephp]]></category>
+				<category><![CDATA[model]]></category>
+			  <guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</guid>
+			  <author>bmil...@gmail.com(bpscrugs)</author>
+			  <pubDate>Fri, 28 Dec 2007 00:44:14 UT</pubDate>
+			  </item>
+			  <item>
+			  <title>Re: share views between actions?</title>
+			  <link>http://groups.google.com/group/cake-php/msg/8b350d898707dad8</link>
+			  <description>Then perhaps you might do us all a favour and refrain from replying to &lt;br&gt; things you do not understand. That goes especially for asinine comments. &lt;br&gt; Indeed. &lt;br&gt; To sum up: &lt;br&gt; No comment. &lt;br&gt; In my day, a simple &amp;quot;RTFM&amp;quot; would suffice. I&#39;ll keep in mind to ignore any &lt;br&gt; further responses from you. &lt;br&gt; You (and I) were referring to the *online documentation*, not other</description>
+			  	<dc:creator>cakephp</dc:creator>
+				<category><![CDATA[cakephp]]></category>
+				<category><![CDATA[model]]></category>
+			  <guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/8b350d898707dad8</guid>
+			  <author>subtropolis.z...@gmail.com(subtropolis zijn)</author>
+			  <pubDate>Fri, 28 Dec 2007 00:45:01 UT</pubDate>
+			 </item>
+		</channel>
+		</rss>';
+
+		$xml = new Xml($string);
+		$result = Set::reverse($xml);
+
+		$expected = array('Rss' => array(
+			'version' => '2.0',
+			'Channel' => array(
+				'title' => 'Cake PHP Google Group',
+				'link' => 'http://groups.google.com/group/cake-php',
+				'description' => 'Search this group before posting anything. There are over 20,000 posts and it&#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.',
+				'language' => 'en',
+				'Item' => array(
+					array(
+						'title' => 'constructng result array when using findall',
+						'link' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f',
+						'description' => "i'm using cakephp to construct a logical data model array that will be <br> passed to a flex app. I have the following model association: <br> ServiceDay-&gt;(hasMany)ServiceTi me-&gt;(hasMany)ServiceTimePrice. So what <br> the current output from my findall is something like this example: <br><p>Array( <br> [0] =&gt; Array(",
+						'creator' => 'cakephp',
+						'Category' => array('cakephp', 'model'),
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f'),
+						'author' => 'bmil...@gmail.com(bpscrugs)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:44:14 UT',
+					),
+					array(
+						'title' => 'Re: share views between actions?',
+						'link' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8',
+						'description' => 'Then perhaps you might do us all a favour and refrain from replying to <br> things you do not understand. That goes especially for asinine comments. <br> Indeed. <br> To sum up: <br> No comment. <br> In my day, a simple &quot;RTFM&quot; would suffice. I\'ll keep in mind to ignore any <br> further responses from you. <br> You (and I) were referring to the *online documentation*, not other',
+						'creator' => 'cakephp',
+						'Category' => array('cakephp', 'model'),
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8'),
+						'author' => 'subtropolis.z...@gmail.com(subtropolis zijn)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:45:01 UT'
+					)
+				)
+			)
+		));
+		$this->assertEqual($result, $expected);
+
+		$text = '<?xml version="1.0" encoding="UTF-8"?>
+		<XRDS xmlns="xri://$xrds">
+		<XRD xml:id="oauth" xmlns="xri://$XRD*($v*2.0)" version="2.0">
+			<Type>xri://$xrds*simple</Type>
+			<Expires>2008-04-13T07:34:58Z</Expires>
+			<Service>
+				<Type>http://oauth.net/core/1.0/endpoint/authorize</Type>
+				<Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
+				<Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
+				<URI priority="10">https://ma.gnolia.com/oauth/authorize</URI>
+				<URI priority="20">http://ma.gnolia.com/oauth/authorize</URI>
+			</Service>
+		</XRD>
+		<XRD xmlns="xri://$XRD*($v*2.0)" version="2.0">
+			<Type>xri://$xrds*simple</Type>
+				<Service priority="10">
+					<Type>http://oauth.net/discovery/1.0</Type>
+					<URI>#oauth</URI>
+				</Service>
+		</XRD>
+		</XRDS>';
+
+		$xml = new Xml($text);
+		$result = Set::reverse($xml);
+
+		$expected = array('XRDS' => array(
+			'xmlns' => 'xri://$xrds',
+			'XRD' => array(
+				array(
+					'xml:id' => 'oauth',
+					'xmlns' => 'xri://$XRD*($v*2.0)',
+					'version' => '2.0',
+					'Type' => 'xri://$xrds*simple',
+					'Expires' => '2008-04-13T07:34:58Z',
+					'Service' => array(
+						'Type' => array(
+							'http://oauth.net/core/1.0/endpoint/authorize',
+							'http://oauth.net/core/1.0/parameters/auth-header',
+							'http://oauth.net/core/1.0/parameters/uri-query'
+						),
+						'URI' => array(
+							array(
+								'value' => 'https://ma.gnolia.com/oauth/authorize',
+								'priority' => '10',
+							),
+							array(
+								'value' => 'http://ma.gnolia.com/oauth/authorize',
+								'priority' => '20'
+							)
+						)
+					)
+				),
+				array(
+					'xmlns' => 'xri://$XRD*($v*2.0)',
+					'version' => '2.0',
+					'Type' => 'xri://$xrds*simple',
+					'Service' => array(
+						'priority' => '10',
+						'Type' => 'http://oauth.net/discovery/1.0',
+						'URI' => '#oauth'
+					)
+				)
+			)
+		));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testStrictKeyCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testStrictKeyCheck() {
+		$set = array('a' => 'hi');
+		$this->assertFalse(Set::check($set, 'a.b'));
+	}
+
+/**
+ * Tests Set::flatten
+ *
+ * @access public
+ * @return void
+ */
+	function testFlatten() {
+		$data = array('Larry', 'Curly', 'Moe');
+		$result = Set::flatten($data);
+		$this->assertEqual($result, $data);
+
+		$data[9] = 'Shemp';
+		$result = Set::flatten($data);
+		$this->assertEqual($result, $data);
+
+		$data = array(
+			array(
+				'Post' => array('id' => '1', 'author_id' => '1', 'title' => 'First Post'),
+				'Author' => array('id' => '1', 'user' => 'nate', 'password' => 'foo'),
+			),
+			array(
+				'Post' => array('id' => '2', 'author_id' => '3', 'title' => 'Second Post', 'body' => 'Second Post Body'),
+				'Author' => array('id' => '3', 'user' => 'larry', 'password' => null),
+			)
+		);
+
+		$result = Set::flatten($data);
+		$expected = array(
+			'0.Post.id' => '1', '0.Post.author_id' => '1', '0.Post.title' => 'First Post', '0.Author.id' => '1',
+			'0.Author.user' => 'nate', '0.Author.password' => 'foo', '1.Post.id' => '2', '1.Post.author_id' => '3',
+			'1.Post.title' => 'Second Post', '1.Post.body' => 'Second Post Body', '1.Author.id' => '3',
+			'1.Author.user' => 'larry', '1.Author.password' => null
+		);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test normalization
+ *
+ * @return void
+ */
+	function testNormalizeStrings() {
+		$result = Set::normalize('one,two,three');
+		$expected = array('one' => null, 'two' => null, 'three' => null);
+		$this->assertEqual($expected, $result);
+
+		$result = Set::normalize('one two three', true, ' ');
+		$expected = array('one' => null, 'two' => null, 'three' => null);
+		$this->assertEqual($expected, $result);
+
+		$result = Set::normalize('one  ,  two   ,  three   ', true, ',', true);
+		$expected = array('one' => null, 'two' => null, 'three' => null);
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * test normalizing arrays
+ *
+ * @return void
+ */
+	function testNormalizeArrays() {
+		$result = Set::normalize(array('one', 'two', 'three'));
+		$expected = array('one' => null, 'two' => null, 'three' => null);
+		$this->assertEqual($expected, $result);
+
+		$result = Set::normalize(array('one', 'two', 'three'), false);
+		$expected = array('one', 'two', 'three');
+		$this->assertEqual($expected, $result);
+
+		$result = Set::normalize(array('one' => 1, 'two' => 2, 'three' => 3, 'four'), false);
+		$expected = array('one' => 1, 'two' => 2, 'three' => 3, 'four' => null);
+		$this->assertEqual($expected, $result);
+
+		$result = Set::normalize(array('one' => 1, 'two' => 2, 'three' => 3, 'four'));
+		$expected = array('one' => 1, 'two' => 2, 'three' => 3, 'four' => null);
+		$this->assertEqual($expected, $result);
+
+		$result = Set::normalize(array('one' => array('a', 'b', 'c' => 'cee'), 'two' => 2, 'three'));
+		$expected = array('one' => array('a', 'b', 'c' => 'cee'), 'two' => 2, 'three' => null);
+		$this->assertEqual($expected, $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/string.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/string.test.php
new file mode 100644
index 000000000..da284d35d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/string.test.php
@@ -0,0 +1,310 @@
+<?php
+/**
+ * StringTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core', 'String');
+
+/**
+ * StringTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class StringTest extends CakeTestCase {
+
+/**
+ * testUuidGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testUuidGeneration() {
+		$result = String::uuid();
+		$pattern = "/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/";
+		$match = preg_match($pattern, $result);
+		$this->assertTrue($match);
+	}
+
+/**
+ * testMultipleUuidGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleUuidGeneration() {
+		$check = array();
+		$count = mt_rand(10, 1000);
+		$pattern = "/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/";
+
+		for($i = 0; $i < $count; $i++) {
+			$result = String::uuid();
+			$match = preg_match($pattern, $result);
+			$this->assertTrue($match);
+			$this->assertFalse(in_array($result, $check));
+			$check[] = $result;
+		}
+	}
+
+/**
+ * testInsert method
+ *
+ * @access public
+ * @return void
+ */
+	function testInsert() {
+		$string = 'some string';
+		$expected = 'some string';
+		$result = String::insert($string, array());
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = :sum. Cake is :adjective.';
+		$expected = '2 + 2 = 4. Cake is yummy.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'));
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = %sum. Cake is %adjective.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%'));
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = 2sum2. Cake is 9adjective9.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])%s\\1/'));
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = 12sum21. Cake is 23adjective45.';
+		$expected = '2 + 2 = 4. Cake is 23adjective45.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('format' => '/([\d])([\d])%s\\2\\1/'));
+		$this->assertEqual($result, $expected);
+
+		$string = ':web :web_site';
+		$expected = 'www http';
+		$result = String::insert($string, array('web' => 'www', 'web_site' => 'http'));
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = <sum. Cake is <adjective>.';
+		$expected = '2 + 2 = <sum. Cake is yummy.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '<', 'after' => '>'));
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = \:sum. Cake is :adjective.';
+		$expected = '2 + 2 = :sum. Cake is yummy.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'));
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = !:sum. Cake is :adjective.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('escape' => '!'));
+		$this->assertEqual($result, $expected);
+
+		$string = '2 + 2 = \%sum. Cake is %adjective.';
+		$expected = '2 + 2 = %sum. Cake is yummy.';
+		$result = String::insert($string, array('sum' => '4', 'adjective' => 'yummy'), array('before' => '%'));
+		$this->assertEqual($result, $expected);
+
+		$string = ':a :b \:a :a';
+		$expected = '1 2 :a 1';
+		$result = String::insert($string, array('a' => 1, 'b' => 2));
+		$this->assertEqual($result, $expected);
+
+		$string = ':a :b :c';
+		$expected = '2 3';
+		$result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEqual($result, $expected);
+
+		$string = ':a :b :c';
+		$expected = '1 3';
+		$result = String::insert($string, array('a' => 1, 'c' => 3), array('clean' => true));
+		$this->assertEqual($result, $expected);
+
+		$string = ':a :b :c';
+		$expected = '2 3';
+		$result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEqual($result, $expected);
+
+		$string = ':a, :b and :c';
+		$expected = '2 and 3';
+		$result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEqual($result, $expected);
+
+		$string = '":a, :b and :c"';
+		$expected = '"1, 2"';
+		$result = String::insert($string, array('a' => 1, 'b' => 2), array('clean' => true));
+		$this->assertEqual($result, $expected);
+
+		$string = '"${a}, ${b} and ${c}"';
+		$expected = '"1, 2"';
+		$result = String::insert($string, array('a' => 1, 'b' => 2), array('before' => '${', 'after' => '}', 'clean' => true));
+		$this->assertEqual($result, $expected);
+
+		$string = '<img src=":src" alt=":alt" class="foo :extra bar"/>';
+		$expected = '<img src="foo" class="foo bar"/>';
+		$result = String::insert($string, array('src' => 'foo'), array('clean' => 'html'));
+
+		$this->assertEqual($result, $expected);
+
+		$string = '<img src=":src" class=":no :extra"/>';
+		$expected = '<img src="foo"/>';
+		$result = String::insert($string, array('src' => 'foo'), array('clean' => 'html'));
+		$this->assertEqual($result, $expected);
+
+		$string = '<img src=":src" class=":no :extra"/>';
+		$expected = '<img src="foo" class="bar"/>';
+		$result = String::insert($string, array('src' => 'foo', 'extra' => 'bar'), array('clean' => 'html'));
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert("this is a ? string", "test");
+		$expected = "this is a test string";
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert("this is a ? string with a ? ? ?", array('long', 'few?', 'params', 'you know'));
+		$expected = "this is a long string with a few? params you know";
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert('update saved_urls set url = :url where id = :id', array('url' => 'http://www.testurl.com/param1:url/param2:id','id' => 1));
+		$expected = "update saved_urls set url = http://www.testurl.com/param1:url/param2:id where id = 1";
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert('update saved_urls set url = :url where id = :id', array('id' => 1, 'url' => 'http://www.testurl.com/param1:url/param2:id'));
+		$expected = "update saved_urls set url = http://www.testurl.com/param1:url/param2:id where id = 1";
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert(':me cake. :subject :verb fantastic.', array('me' => 'I :verb', 'subject' => 'cake', 'verb' => 'is'));
+		$expected = "I :verb cake. cake is fantastic.";
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert(':I.am: :not.yet: passing.', array('I.am' => 'We are'), array('before' => ':', 'after' => ':', 'clean' => array('replacement' => ' of course', 'method' => 'text')));
+		$expected = "We are of course passing.";
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert(
+			':I.am: :not.yet: passing.',
+			array('I.am' => 'We are'),
+			array('before' => ':', 'after' => ':', 'clean' => true)
+		);
+		$expected = "We are passing.";
+		$this->assertEqual($result, $expected);
+
+		$result = String::insert('?-pended result', array('Pre'));
+		$expected = "Pre-pended result";
+		$this->assertEqual($result, $expected);
+
+		$string = 'switching :timeout / :timeout_count';
+		$expected = 'switching 5 / 10';
+		$result = String::insert($string, array('timeout' => 5, 'timeout_count' => 10));
+		$this->assertEqual($result, $expected);
+
+		$string = 'switching :timeout / :timeout_count';
+		$expected = 'switching 5 / 10';
+		$result = String::insert($string, array('timeout_count' => 10, 'timeout' => 5));
+		$this->assertEqual($result, $expected);
+
+		$string = 'switching :timeout_count by :timeout';
+		$expected = 'switching 10 by 5';
+		$result = String::insert($string, array('timeout' => 5, 'timeout_count' => 10));
+		$this->assertEqual($result, $expected);
+
+		$string = 'switching :timeout_count by :timeout';
+		$expected = 'switching 10 by 5';
+		$result = String::insert($string, array('timeout_count' => 10, 'timeout' => 5));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Clean Insert
+ *
+ * @return void
+ */
+	function testCleanInsert() {
+		$result = String::cleanInsert(':incomplete', array(
+			'clean' => true, 'before' => ':', 'after' => ''
+		));
+		$this->assertEqual($result, '');
+
+		$result = String::cleanInsert(':incomplete', array(
+			'clean' => array('method' => 'text', 'replacement' => 'complete'),
+			'before' => ':', 'after' => '')
+		);
+		$this->assertEqual($result, 'complete');
+
+		$result = String::cleanInsert(':in.complete', array(
+			'clean' => true, 'before' => ':', 'after' => ''
+		));
+		$this->assertEqual($result, '');
+
+		$result = String::cleanInsert(':in.complete and', array(
+			'clean' => true, 'before' => ':', 'after' => '')
+		);
+		$this->assertEqual($result, '');
+
+		$result = String::cleanInsert(':in.complete or stuff', array(
+			'clean' => true, 'before' => ':', 'after' => ''
+		));
+		$this->assertEqual($result, 'stuff');
+
+		$result = String::cleanInsert(
+			'<p class=":missing" id=":missing">Text here</p>',
+			array('clean' => 'html', 'before' => ':', 'after' => '')
+		);
+		$this->assertEqual($result, '<p>Text here</p>');
+	}
+
+/**
+ * Tests that non-insertable variables (i.e. arrays) are skipped when used as values in
+ * String::insert().
+ *
+ * @return void
+ */
+	function testAutoIgnoreBadInsertData() {
+		$data = array('foo' => 'alpha', 'bar' => 'beta', 'fale' => array());
+		$result = String::insert('(:foo > :bar || :fale!)', $data, array('clean' => 'text'));
+		$this->assertEqual($result, '(alpha > beta || !)');
+	}
+
+/**
+ * testTokenize method
+ *
+ * @access public
+ * @return void
+ */
+	function testTokenize() {
+		$result = String::tokenize('A,(short,boring test)');
+		$expected = array('A', '(short,boring test)');
+		$this->assertEqual($result, $expected);
+
+		$result = String::tokenize('A,(short,more interesting( test)');
+		$expected = array('A', '(short,more interesting( test)');
+		$this->assertEqual($result, $expected);
+
+		$result = String::tokenize('A,(short,very interesting( test))');
+		$expected = array('A', '(short,very interesting( test))');
+		$this->assertEqual($result, $expected);
+
+		$result = String::tokenize('"single tag"', ' ', '"', '"');
+		$expected = array('"single tag"');
+		$this->assertEqual($expected, $result);
+
+		$result = String::tokenize('tagA "single tag" tagB', ' ', '"', '"');
+		$expected = array('tagA', '"single tag"', 'tagB');
+		$this->assertEqual($expected, $result);
+	}
+	
+	function testReplaceWithQuestionMarkInString() {
+		$string = ':a, :b and :c?';
+		$expected = '2 and 3?';
+		$result = String::insert($string, array('b' => 2, 'c' => 3), array('clean' => true));
+		$this->assertEqual($expected, $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/test_manager.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/test_manager.test.php
new file mode 100644
index 000000000..a55149988
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/test_manager.test.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * TestManagerTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * TestManagerTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class TestManagerTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @return void
+ * @access public
+ */
+	function setUp() {
+		$this->TestManager =& new TestManager();
+		$this->Reporter =& new CakeHtmlReporter();
+	}
+
+/**
+ * testRunAllTests method
+ *
+ * @return void
+ * @access public
+ */
+	function testRunAllTests() {
+		$folder =& new Folder($this->TestManager->_getTestsPath());
+		$extension = str_replace('.', '\.', $this->TestManager->getExtension('test'));
+		$out = $folder->findRecursive('.*' . $extension);
+
+		$reporter =& new CakeHtmlReporter();
+		$list = $this->TestManager->runAllTests($reporter, true);
+
+		$this->assertEqual(count($out), count($list));
+	}
+
+/**
+ * testRunTestCase method
+ *
+ * @return void
+ * @access public
+ */
+	function testRunTestCase() {
+		$file = md5(time());
+		$result = $this->TestManager->runTestCase($file, $this->Reporter);
+		$this->assertError('Test case ' . $file . ' cannot be found');
+		$this->assertFalse($result);
+
+		$file = str_replace(CORE_TEST_CASES, '', __FILE__);
+		$result = $this->TestManager->runTestCase($file, $this->Reporter, true);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testRunGroupTest method
+ *
+ * @return void
+ * @access public
+ */
+	function testRunGroupTest() {
+	}
+
+/**
+ * testAddTestCasesFromDirectory method
+ *
+ * @return void
+ * @access public
+ */
+	function testAddTestCasesFromDirectory() {
+	}
+
+/**
+ * testAddTestFile method
+ *
+ * @return void
+ * @access public
+ */
+	function testAddTestFile() {
+	}
+
+/**
+ * testGetTestCaseList method
+ *
+ * @return void
+ * @access public
+ */
+	function testGetTestCaseList() {
+	}
+
+/**
+ * testGetGroupTestList method
+ *
+ * @return void
+ * @access public
+ */
+	function testGetGroupTestList() {
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/validation.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/validation.test.php
new file mode 100644
index 000000000..f9908c071
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/validation.test.php
@@ -0,0 +1,2209 @@
+<?php
+/**
+ * ValidationTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Validation');
+
+/**
+ * CustomValidator class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class CustomValidator {
+
+/**
+ * Makes sure that a given $email address is valid and unique
+ *
+ * @param string $email
+ * @return boolean
+ * @access public
+ */
+	function customValidate($check) {
+		return preg_match('/^[0-9]{3}$/', $check);
+	}
+}
+
+/**
+ * TestNlValidation class
+ *
+ * Used to test pass through of Validation
+ *
+ * @package cake.tests.cases.libs
+ */
+class TestNlValidation {
+/**
+ * postal function, for testing postal pass through.
+ *
+ * @param string $check
+ * @return void
+ */
+	function postal($check) {
+		return true;
+	}
+/**
+ * ssn function for testing ssn pass through
+ *
+ * @return void
+ */
+	function ssn($check) {
+		return true;
+	}
+}
+
+/**
+ * TestDeValidation class
+ *
+ * Used to test pass through of Validation
+ *
+ * @package cake.tests.cases.libs
+ */
+class TestDeValidation {
+/**
+ * phone function, for testing phone pass through.
+ *
+ * @param string $check
+ * @return void
+ */
+	function phone($check) {
+		return true;
+	}
+}
+
+/**
+ * Test Case for Validation Class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ValidationTest extends CakeTestCase {
+
+/**
+ * Validation property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $Validation = null;
+
+/**
+ * setup method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Validation =& Validation::getInstance();
+		$this->_appEncoding = Configure::read('App.encoding');
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('App.encoding', $this->_appEncoding);
+	}
+
+/**
+ * testNotEmpty method
+ *
+ * @access public
+ * @return void
+ */
+	function testNotEmpty() {
+		$this->assertTrue(Validation::notEmpty('abcdefg'));
+		$this->assertTrue(Validation::notEmpty('fasdf '));
+		$this->assertTrue(Validation::notEmpty('fooo'.chr(243).'blabla'));
+		$this->assertTrue(Validation::notEmpty('abç�ĕʑʘπй'));
+		$this->assertTrue(Validation::notEmpty('José'));
+		$this->assertTrue(Validation::notEmpty('é'));
+		$this->assertTrue(Validation::notEmpty('Ï€'));
+		$this->assertFalse(Validation::notEmpty("\t "));
+		$this->assertFalse(Validation::notEmpty(""));
+
+	}
+
+/**
+ * testNotEmptyISO88591Encoding method
+ *
+ * @return void
+ * @access public
+ */
+	function testNotEmptyISO88591AppEncoding() {
+		Configure::write('App.encoding', 'ISO-8859-1');
+		$this->assertTrue(Validation::notEmpty('abcdefg'));
+		$this->assertTrue(Validation::notEmpty('fasdf '));
+		$this->assertTrue(Validation::notEmpty('fooo'.chr(243).'blabla'));
+		$this->assertTrue(Validation::notEmpty('abç�ĕʑʘπй'));
+		$this->assertTrue(Validation::notEmpty('José'));
+		$this->assertTrue(Validation::notEmpty(utf8_decode('José')));
+		$this->assertFalse(Validation::notEmpty("\t "));
+		$this->assertFalse(Validation::notEmpty(""));
+	}
+
+/**
+ * testAlphaNumeric method
+ *
+ * @access public
+ * @return void
+ */
+	function testAlphaNumeric() {
+		$this->assertTrue(Validation::alphaNumeric('frferrf'));
+		$this->assertTrue(Validation::alphaNumeric('12234'));
+		$this->assertTrue(Validation::alphaNumeric('1w2e2r3t4y'));
+		$this->assertTrue(Validation::alphaNumeric('0'));
+		$this->assertTrue(Validation::alphaNumeric('abç�ĕʑʘπй'));
+		$this->assertTrue(Validation::alphaNumeric('ˇˆๆゞ'));
+		$this->assertTrue(Validation::alphaNumeric('���アꀀ豈'));
+		$this->assertTrue(Validation::alphaNumeric('Džᾈᾨ'));
+		$this->assertTrue(Validation::alphaNumeric('ÆΔΩЖÇ'));
+
+
+		$this->assertFalse(Validation::alphaNumeric('12 234'));
+		$this->assertFalse(Validation::alphaNumeric('dfd 234'));
+		$this->assertFalse(Validation::alphaNumeric("\n"));
+		$this->assertFalse(Validation::alphaNumeric("\t"));
+		$this->assertFalse(Validation::alphaNumeric("\r"));
+		$this->assertFalse(Validation::alphaNumeric(' '));
+		$this->assertFalse(Validation::alphaNumeric(''));
+	}
+
+/**
+ * testAlphaNumericPassedAsArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testAlphaNumericPassedAsArray() {
+		$this->assertTrue(Validation::alphaNumeric(array('check' => 'frferrf')));
+		$this->assertTrue(Validation::alphaNumeric(array('check' => '12234')));
+		$this->assertTrue(Validation::alphaNumeric(array('check' => '1w2e2r3t4y')));
+		$this->assertTrue(Validation::alphaNumeric(array('check' => '0')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => '12 234')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => 'dfd 234')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => "\n")));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => "\t")));
+		$this->assertFalse(Validation::alphaNumeric(array('check' => "\r")));
+		$this->assertFalse(Validation::alphaNumeric(array('check' =>  ' ')));
+		$this->assertFalse(Validation::alphaNumeric(array('check' =>  '')));
+	}
+
+/**
+ * testBetween method
+ *
+ * @access public
+ * @return void
+ */
+	function testBetween() {
+		$this->assertTrue(Validation::between('abcdefg', 1, 7));
+		$this->assertTrue(Validation::between('', 0, 7));
+		$this->assertTrue(Validation::between('���アꀀ豈', 1, 7));
+
+		$this->assertFalse(Validation::between('abcdefg', 1, 6));
+		$this->assertFalse(Validation::between('ÆΔΩЖÇ', 1, 3));
+	}
+
+/**
+ * testBlank method
+ *
+ * @access public
+ * @return void
+ */
+	function testBlank() {
+		$this->assertTrue(Validation::blank(''));
+		$this->assertTrue(Validation::blank(' '));
+		$this->assertTrue(Validation::blank("\n"));
+		$this->assertTrue(Validation::blank("\t"));
+		$this->assertTrue(Validation::blank("\r"));
+		$this->assertFalse(Validation::blank('    Blank'));
+		$this->assertFalse(Validation::blank('Blank'));
+	}
+
+/**
+ * testBlankAsArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testBlankAsArray() {
+		$this->assertTrue(Validation::blank(array('check' => '')));
+		$this->assertTrue(Validation::blank(array('check' => ' ')));
+		$this->assertTrue(Validation::blank(array('check' => "\n")));
+		$this->assertTrue(Validation::blank(array('check' => "\t")));
+		$this->assertTrue(Validation::blank(array('check' => "\r")));
+		$this->assertFalse(Validation::blank(array('check' => '    Blank')));
+		$this->assertFalse(Validation::blank(array('check' => 'Blank')));
+	}
+
+/**
+ * testcc method
+ *
+ * @access public
+ * @return void
+ */
+	function testcc() {
+		//American Express
+		$this->assertTrue(Validation::cc('370482756063980', array('amex')));
+		$this->assertTrue(Validation::cc('349106433773483', array('amex')));
+		$this->assertTrue(Validation::cc('344671486204764', array('amex')));
+		$this->assertTrue(Validation::cc('344042544509943', array('amex')));
+		$this->assertTrue(Validation::cc('377147515754475', array('amex')));
+		$this->assertTrue(Validation::cc('375239372816422', array('amex')));
+		$this->assertTrue(Validation::cc('376294341957707', array('amex')));
+		$this->assertTrue(Validation::cc('341779292230411', array('amex')));
+		$this->assertTrue(Validation::cc('341646919853372', array('amex')));
+		$this->assertTrue(Validation::cc('348498616319346', array('amex')));
+		//BankCard
+		$this->assertTrue(Validation::cc('5610745867413420', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610376649499352', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610091936000694', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602248780118788', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610631567676765', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602238211270795', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610173951215470', array('bankcard')));
+		$this->assertTrue(Validation::cc('5610139705753702', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602226032150551', array('bankcard')));
+		$this->assertTrue(Validation::cc('5602223993735777', array('bankcard')));
+		//Diners Club 14
+		$this->assertTrue(Validation::cc('30155483651028', array('diners')));
+		$this->assertTrue(Validation::cc('36371312803821', array('diners')));
+		$this->assertTrue(Validation::cc('38801277489875', array('diners')));
+		$this->assertTrue(Validation::cc('30348560464296', array('diners')));
+		$this->assertTrue(Validation::cc('30349040317708', array('diners')));
+		$this->assertTrue(Validation::cc('36567413559978', array('diners')));
+		$this->assertTrue(Validation::cc('36051554732702', array('diners')));
+		$this->assertTrue(Validation::cc('30391842198191', array('diners')));
+		$this->assertTrue(Validation::cc('30172682197745', array('diners')));
+		$this->assertTrue(Validation::cc('30162056566641', array('diners')));
+		$this->assertTrue(Validation::cc('30085066927745', array('diners')));
+		$this->assertTrue(Validation::cc('36519025221976', array('diners')));
+		$this->assertTrue(Validation::cc('30372679371044', array('diners')));
+		$this->assertTrue(Validation::cc('38913939150124', array('diners')));
+		$this->assertTrue(Validation::cc('36852899094637', array('diners')));
+		$this->assertTrue(Validation::cc('30138041971120', array('diners')));
+		$this->assertTrue(Validation::cc('36184047836838', array('diners')));
+		$this->assertTrue(Validation::cc('30057460264462', array('diners')));
+		$this->assertTrue(Validation::cc('38980165212050', array('diners')));
+		$this->assertTrue(Validation::cc('30356516881240', array('diners')));
+		$this->assertTrue(Validation::cc('38744810033182', array('diners')));
+		$this->assertTrue(Validation::cc('30173638706621', array('diners')));
+		$this->assertTrue(Validation::cc('30158334709185', array('diners')));
+		$this->assertTrue(Validation::cc('30195413721186', array('diners')));
+		$this->assertTrue(Validation::cc('38863347694793', array('diners')));
+		$this->assertTrue(Validation::cc('30275627009113', array('diners')));
+		$this->assertTrue(Validation::cc('30242860404971', array('diners')));
+		$this->assertTrue(Validation::cc('30081877595151', array('diners')));
+		$this->assertTrue(Validation::cc('38053196067461', array('diners')));
+		$this->assertTrue(Validation::cc('36520379984870', array('diners')));
+		//2004 MasterCard/Diners Club Alliance International 14
+		$this->assertTrue(Validation::cc('36747701998969', array('diners')));
+		$this->assertTrue(Validation::cc('36427861123159', array('diners')));
+		$this->assertTrue(Validation::cc('36150537602386', array('diners')));
+		$this->assertTrue(Validation::cc('36582388820610', array('diners')));
+		$this->assertTrue(Validation::cc('36729045250216', array('diners')));
+		//2004 MasterCard/Diners Club Alliance US & Canada 16
+		$this->assertTrue(Validation::cc('5597511346169950', array('diners')));
+		$this->assertTrue(Validation::cc('5526443162217562', array('diners')));
+		$this->assertTrue(Validation::cc('5577265786122391', array('diners')));
+		$this->assertTrue(Validation::cc('5534061404676989', array('diners')));
+		$this->assertTrue(Validation::cc('5545313588374502', array('diners')));
+		//Discover
+		$this->assertTrue(Validation::cc('6011802876467237', array('disc')));
+		$this->assertTrue(Validation::cc('6506432777720955', array('disc')));
+		$this->assertTrue(Validation::cc('6011126265283942', array('disc')));
+		$this->assertTrue(Validation::cc('6502187151579252', array('disc')));
+		$this->assertTrue(Validation::cc('6506600836002298', array('disc')));
+		$this->assertTrue(Validation::cc('6504376463615189', array('disc')));
+		$this->assertTrue(Validation::cc('6011440907005377', array('disc')));
+		$this->assertTrue(Validation::cc('6509735979634270', array('disc')));
+		$this->assertTrue(Validation::cc('6011422366775856', array('disc')));
+		$this->assertTrue(Validation::cc('6500976374623323', array('disc')));
+		//enRoute
+		$this->assertTrue(Validation::cc('201496944158937', array('enroute')));
+		$this->assertTrue(Validation::cc('214945833739665', array('enroute')));
+		$this->assertTrue(Validation::cc('214982692491187', array('enroute')));
+		$this->assertTrue(Validation::cc('214901395949424', array('enroute')));
+		$this->assertTrue(Validation::cc('201480676269187', array('enroute')));
+		$this->assertTrue(Validation::cc('214911922887807', array('enroute')));
+		$this->assertTrue(Validation::cc('201485025457250', array('enroute')));
+		$this->assertTrue(Validation::cc('201402662758866', array('enroute')));
+		$this->assertTrue(Validation::cc('214981579370225', array('enroute')));
+		$this->assertTrue(Validation::cc('201447595859877', array('enroute')));
+		//JCB 15 digit
+		$this->assertTrue(Validation::cc('210034762247893', array('jcb')));
+		$this->assertTrue(Validation::cc('180078671678892', array('jcb')));
+		$this->assertTrue(Validation::cc('180010559353736', array('jcb')));
+		$this->assertTrue(Validation::cc('210095474464258', array('jcb')));
+		$this->assertTrue(Validation::cc('210006675562188', array('jcb')));
+		$this->assertTrue(Validation::cc('210063299662662', array('jcb')));
+		$this->assertTrue(Validation::cc('180032506857825', array('jcb')));
+		$this->assertTrue(Validation::cc('210057919192738', array('jcb')));
+		$this->assertTrue(Validation::cc('180031358949367', array('jcb')));
+		$this->assertTrue(Validation::cc('180033802147846', array('jcb')));
+		//JCB 16 digit
+		$this->assertTrue(Validation::cc('3096806857839939', array('jcb')));
+		$this->assertTrue(Validation::cc('3158699503187091', array('jcb')));
+		$this->assertTrue(Validation::cc('3112549607186579', array('jcb')));
+		$this->assertTrue(Validation::cc('3112332922425604', array('jcb')));
+		$this->assertTrue(Validation::cc('3112001541159239', array('jcb')));
+		$this->assertTrue(Validation::cc('3112162495317841', array('jcb')));
+		$this->assertTrue(Validation::cc('3337562627732768', array('jcb')));
+		$this->assertTrue(Validation::cc('3337107161330775', array('jcb')));
+		$this->assertTrue(Validation::cc('3528053736003621', array('jcb')));
+		$this->assertTrue(Validation::cc('3528915255020360', array('jcb')));
+		$this->assertTrue(Validation::cc('3096786059660921', array('jcb')));
+		$this->assertTrue(Validation::cc('3528264799292320', array('jcb')));
+		$this->assertTrue(Validation::cc('3096469164130136', array('jcb')));
+		$this->assertTrue(Validation::cc('3112127443822853', array('jcb')));
+		$this->assertTrue(Validation::cc('3096849995802328', array('jcb')));
+		$this->assertTrue(Validation::cc('3528090735127407', array('jcb')));
+		$this->assertTrue(Validation::cc('3112101006819234', array('jcb')));
+		$this->assertTrue(Validation::cc('3337444428040784', array('jcb')));
+		$this->assertTrue(Validation::cc('3088043154151061', array('jcb')));
+		$this->assertTrue(Validation::cc('3088295969414866', array('jcb')));
+		$this->assertTrue(Validation::cc('3158748843158575', array('jcb')));
+		$this->assertTrue(Validation::cc('3158709206148538', array('jcb')));
+		$this->assertTrue(Validation::cc('3158365159575324', array('jcb')));
+		$this->assertTrue(Validation::cc('3158671691305165', array('jcb')));
+		$this->assertTrue(Validation::cc('3528523028771093', array('jcb')));
+		$this->assertTrue(Validation::cc('3096057126267870', array('jcb')));
+		$this->assertTrue(Validation::cc('3158514047166834', array('jcb')));
+		$this->assertTrue(Validation::cc('3528274546125962', array('jcb')));
+		$this->assertTrue(Validation::cc('3528890967705733', array('jcb')));
+		$this->assertTrue(Validation::cc('3337198811307545', array('jcb')));
+		//Maestro (debit card)
+		$this->assertTrue(Validation::cc('5020147409985219', array('maestro')));
+		$this->assertTrue(Validation::cc('5020931809905616', array('maestro')));
+		$this->assertTrue(Validation::cc('5020412965470224', array('maestro')));
+		$this->assertTrue(Validation::cc('5020129740944022', array('maestro')));
+		$this->assertTrue(Validation::cc('5020024696747943', array('maestro')));
+		$this->assertTrue(Validation::cc('5020581514636509', array('maestro')));
+		$this->assertTrue(Validation::cc('5020695008411987', array('maestro')));
+		$this->assertTrue(Validation::cc('5020565359718977', array('maestro')));
+		$this->assertTrue(Validation::cc('6339931536544062', array('maestro')));
+		$this->assertTrue(Validation::cc('6465028615704406', array('maestro')));
+		//Mastercard
+		$this->assertTrue(Validation::cc('5580424361774366', array('mc')));
+		$this->assertTrue(Validation::cc('5589563059318282', array('mc')));
+		$this->assertTrue(Validation::cc('5387558333690047', array('mc')));
+		$this->assertTrue(Validation::cc('5163919215247175', array('mc')));
+		$this->assertTrue(Validation::cc('5386742685055055', array('mc')));
+		$this->assertTrue(Validation::cc('5102303335960674', array('mc')));
+		$this->assertTrue(Validation::cc('5526543403964565', array('mc')));
+		$this->assertTrue(Validation::cc('5538725892618432', array('mc')));
+		$this->assertTrue(Validation::cc('5119543573129778', array('mc')));
+		$this->assertTrue(Validation::cc('5391174753915767', array('mc')));
+		$this->assertTrue(Validation::cc('5510994113980714', array('mc')));
+		$this->assertTrue(Validation::cc('5183720260418091', array('mc')));
+		$this->assertTrue(Validation::cc('5488082196086704', array('mc')));
+		$this->assertTrue(Validation::cc('5484645164161834', array('mc')));
+		$this->assertTrue(Validation::cc('5171254350337031', array('mc')));
+		$this->assertTrue(Validation::cc('5526987528136452', array('mc')));
+		$this->assertTrue(Validation::cc('5504148941409358', array('mc')));
+		$this->assertTrue(Validation::cc('5240793507243615', array('mc')));
+		$this->assertTrue(Validation::cc('5162114693017107', array('mc')));
+		$this->assertTrue(Validation::cc('5163104807404753', array('mc')));
+		$this->assertTrue(Validation::cc('5590136167248365', array('mc')));
+		$this->assertTrue(Validation::cc('5565816281038948', array('mc')));
+		$this->assertTrue(Validation::cc('5467639122779531', array('mc')));
+		$this->assertTrue(Validation::cc('5297350261550024', array('mc')));
+		$this->assertTrue(Validation::cc('5162739131368058', array('mc')));
+		//Solo 16
+		$this->assertTrue(Validation::cc('6767432107064987', array('solo')));
+		$this->assertTrue(Validation::cc('6334667758225411', array('solo')));
+		$this->assertTrue(Validation::cc('6767037421954068', array('solo')));
+		$this->assertTrue(Validation::cc('6767823306394854', array('solo')));
+		$this->assertTrue(Validation::cc('6334768185398134', array('solo')));
+		$this->assertTrue(Validation::cc('6767286729498589', array('solo')));
+		$this->assertTrue(Validation::cc('6334972104431261', array('solo')));
+		$this->assertTrue(Validation::cc('6334843427400616', array('solo')));
+		$this->assertTrue(Validation::cc('6767493947881311', array('solo')));
+		$this->assertTrue(Validation::cc('6767194235798817', array('solo')));
+		//Solo 18
+		$this->assertTrue(Validation::cc('676714834398858593', array('solo')));
+		$this->assertTrue(Validation::cc('676751666435130857', array('solo')));
+		$this->assertTrue(Validation::cc('676781908573924236', array('solo')));
+		$this->assertTrue(Validation::cc('633488724644003240', array('solo')));
+		$this->assertTrue(Validation::cc('676732252338067316', array('solo')));
+		$this->assertTrue(Validation::cc('676747520084495821', array('solo')));
+		$this->assertTrue(Validation::cc('633465488901381957', array('solo')));
+		$this->assertTrue(Validation::cc('633487484858610484', array('solo')));
+		$this->assertTrue(Validation::cc('633453764680740694', array('solo')));
+		$this->assertTrue(Validation::cc('676768613295414451', array('solo')));
+		//Solo 19
+		$this->assertTrue(Validation::cc('6767838565218340113', array('solo')));
+		$this->assertTrue(Validation::cc('6767760119829705181', array('solo')));
+		$this->assertTrue(Validation::cc('6767265917091593668', array('solo')));
+		$this->assertTrue(Validation::cc('6767938856947440111', array('solo')));
+		$this->assertTrue(Validation::cc('6767501945697390076', array('solo')));
+		$this->assertTrue(Validation::cc('6334902868716257379', array('solo')));
+		$this->assertTrue(Validation::cc('6334922127686425532', array('solo')));
+		$this->assertTrue(Validation::cc('6334933119080706440', array('solo')));
+		$this->assertTrue(Validation::cc('6334647959628261714', array('solo')));
+		$this->assertTrue(Validation::cc('6334527312384101382', array('solo')));
+		//Switch 16
+		$this->assertTrue(Validation::cc('5641829171515733', array('switch')));
+		$this->assertTrue(Validation::cc('5641824852820809', array('switch')));
+		$this->assertTrue(Validation::cc('6759129648956909', array('switch')));
+		$this->assertTrue(Validation::cc('6759626072268156', array('switch')));
+		$this->assertTrue(Validation::cc('5641822698388957', array('switch')));
+		$this->assertTrue(Validation::cc('5641827123105470', array('switch')));
+		$this->assertTrue(Validation::cc('5641823755819553', array('switch')));
+		$this->assertTrue(Validation::cc('5641821939587682', array('switch')));
+		$this->assertTrue(Validation::cc('4936097148079186', array('switch')));
+		$this->assertTrue(Validation::cc('5641829739125009', array('switch')));
+		$this->assertTrue(Validation::cc('5641822860725507', array('switch')));
+		$this->assertTrue(Validation::cc('4936717688865831', array('switch')));
+		$this->assertTrue(Validation::cc('6759487613615441', array('switch')));
+		$this->assertTrue(Validation::cc('5641821346840617', array('switch')));
+		$this->assertTrue(Validation::cc('5641825793417126', array('switch')));
+		$this->assertTrue(Validation::cc('5641821302759595', array('switch')));
+		$this->assertTrue(Validation::cc('6759784969918837', array('switch')));
+		$this->assertTrue(Validation::cc('5641824910667036', array('switch')));
+		$this->assertTrue(Validation::cc('6759139909636173', array('switch')));
+		$this->assertTrue(Validation::cc('6333425070638022', array('switch')));
+		$this->assertTrue(Validation::cc('5641823910382067', array('switch')));
+		$this->assertTrue(Validation::cc('4936295218139423', array('switch')));
+		$this->assertTrue(Validation::cc('6333031811316199', array('switch')));
+		$this->assertTrue(Validation::cc('4936912044763198', array('switch')));
+		$this->assertTrue(Validation::cc('4936387053303824', array('switch')));
+		$this->assertTrue(Validation::cc('6759535838760523', array('switch')));
+		$this->assertTrue(Validation::cc('6333427174594051', array('switch')));
+		$this->assertTrue(Validation::cc('5641829037102700', array('switch')));
+		$this->assertTrue(Validation::cc('5641826495463046', array('switch')));
+		$this->assertTrue(Validation::cc('6333480852979946', array('switch')));
+		$this->assertTrue(Validation::cc('5641827761302876', array('switch')));
+		$this->assertTrue(Validation::cc('5641825083505317', array('switch')));
+		$this->assertTrue(Validation::cc('6759298096003991', array('switch')));
+		$this->assertTrue(Validation::cc('4936119165483420', array('switch')));
+		$this->assertTrue(Validation::cc('4936190990500993', array('switch')));
+		$this->assertTrue(Validation::cc('4903356467384927', array('switch')));
+		$this->assertTrue(Validation::cc('6333372765092554', array('switch')));
+		$this->assertTrue(Validation::cc('5641821330950570', array('switch')));
+		$this->assertTrue(Validation::cc('6759841558826118', array('switch')));
+		$this->assertTrue(Validation::cc('4936164540922452', array('switch')));
+		//Switch 18
+		$this->assertTrue(Validation::cc('493622764224625174', array('switch')));
+		$this->assertTrue(Validation::cc('564182823396913535', array('switch')));
+		$this->assertTrue(Validation::cc('675917308304801234', array('switch')));
+		$this->assertTrue(Validation::cc('675919890024220298', array('switch')));
+		$this->assertTrue(Validation::cc('633308376862556751', array('switch')));
+		$this->assertTrue(Validation::cc('564182377633208779', array('switch')));
+		$this->assertTrue(Validation::cc('564182870014926787', array('switch')));
+		$this->assertTrue(Validation::cc('675979788553829819', array('switch')));
+		$this->assertTrue(Validation::cc('493668394358130935', array('switch')));
+		$this->assertTrue(Validation::cc('493637431790930965', array('switch')));
+		$this->assertTrue(Validation::cc('633321438601941513', array('switch')));
+		$this->assertTrue(Validation::cc('675913800898840986', array('switch')));
+		$this->assertTrue(Validation::cc('564182592016841547', array('switch')));
+		$this->assertTrue(Validation::cc('564182428380440899', array('switch')));
+		$this->assertTrue(Validation::cc('493696376827623463', array('switch')));
+		$this->assertTrue(Validation::cc('675977939286485757', array('switch')));
+		$this->assertTrue(Validation::cc('490302699502091579', array('switch')));
+		$this->assertTrue(Validation::cc('564182085013662230', array('switch')));
+		$this->assertTrue(Validation::cc('493693054263310167', array('switch')));
+		$this->assertTrue(Validation::cc('633321755966697525', array('switch')));
+		$this->assertTrue(Validation::cc('675996851719732811', array('switch')));
+		$this->assertTrue(Validation::cc('493699211208281028', array('switch')));
+		$this->assertTrue(Validation::cc('493697817378356614', array('switch')));
+		$this->assertTrue(Validation::cc('675968224161768150', array('switch')));
+		$this->assertTrue(Validation::cc('493669416873337627', array('switch')));
+		$this->assertTrue(Validation::cc('564182439172549714', array('switch')));
+		$this->assertTrue(Validation::cc('675926914467673598', array('switch')));
+		$this->assertTrue(Validation::cc('564182565231977809', array('switch')));
+		$this->assertTrue(Validation::cc('675966282607849002', array('switch')));
+		$this->assertTrue(Validation::cc('493691609704348548', array('switch')));
+		$this->assertTrue(Validation::cc('675933118546065120', array('switch')));
+		$this->assertTrue(Validation::cc('493631116677238592', array('switch')));
+		$this->assertTrue(Validation::cc('675921142812825938', array('switch')));
+		$this->assertTrue(Validation::cc('633338311815675113', array('switch')));
+		$this->assertTrue(Validation::cc('633323539867338621', array('switch')));
+		$this->assertTrue(Validation::cc('675964912740845663', array('switch')));
+		$this->assertTrue(Validation::cc('633334008833727504', array('switch')));
+		$this->assertTrue(Validation::cc('493631941273687169', array('switch')));
+		$this->assertTrue(Validation::cc('564182971729706785', array('switch')));
+		$this->assertTrue(Validation::cc('633303461188963496', array('switch')));
+		//Switch 19
+		$this->assertTrue(Validation::cc('6759603460617628716', array('switch')));
+		$this->assertTrue(Validation::cc('4936705825268647681', array('switch')));
+		$this->assertTrue(Validation::cc('5641829846600479183', array('switch')));
+		$this->assertTrue(Validation::cc('6759389846573792530', array('switch')));
+		$this->assertTrue(Validation::cc('4936189558712637603', array('switch')));
+		$this->assertTrue(Validation::cc('5641822217393868189', array('switch')));
+		$this->assertTrue(Validation::cc('4903075563780057152', array('switch')));
+		$this->assertTrue(Validation::cc('4936510653566569547', array('switch')));
+		$this->assertTrue(Validation::cc('4936503083627303364', array('switch')));
+		$this->assertTrue(Validation::cc('4936777334398116272', array('switch')));
+		$this->assertTrue(Validation::cc('5641823876900554860', array('switch')));
+		$this->assertTrue(Validation::cc('6759619236903407276', array('switch')));
+		$this->assertTrue(Validation::cc('6759011470269978117', array('switch')));
+		$this->assertTrue(Validation::cc('6333175833997062502', array('switch')));
+		$this->assertTrue(Validation::cc('6759498728789080439', array('switch')));
+		$this->assertTrue(Validation::cc('4903020404168157841', array('switch')));
+		$this->assertTrue(Validation::cc('6759354334874804313', array('switch')));
+		$this->assertTrue(Validation::cc('6759900856420875115', array('switch')));
+		$this->assertTrue(Validation::cc('5641827269346868860', array('switch')));
+		$this->assertTrue(Validation::cc('5641828995047453870', array('switch')));
+		$this->assertTrue(Validation::cc('6333321884754806543', array('switch')));
+		$this->assertTrue(Validation::cc('6333108246283715901', array('switch')));
+		$this->assertTrue(Validation::cc('6759572372800700102', array('switch')));
+		$this->assertTrue(Validation::cc('4903095096797974933', array('switch')));
+		$this->assertTrue(Validation::cc('6333354315797920215', array('switch')));
+		$this->assertTrue(Validation::cc('6759163746089433755', array('switch')));
+		$this->assertTrue(Validation::cc('6759871666634807647', array('switch')));
+		$this->assertTrue(Validation::cc('5641827883728575248', array('switch')));
+		$this->assertTrue(Validation::cc('4936527975051407847', array('switch')));
+		$this->assertTrue(Validation::cc('5641823318396882141', array('switch')));
+		$this->assertTrue(Validation::cc('6759123772311123708', array('switch')));
+		$this->assertTrue(Validation::cc('4903054736148271088', array('switch')));
+		$this->assertTrue(Validation::cc('4936477526808883952', array('switch')));
+		$this->assertTrue(Validation::cc('4936433964890967966', array('switch')));
+		$this->assertTrue(Validation::cc('6333245128906049344', array('switch')));
+		$this->assertTrue(Validation::cc('4936321036970553134', array('switch')));
+		$this->assertTrue(Validation::cc('4936111816358702773', array('switch')));
+		$this->assertTrue(Validation::cc('4936196077254804290', array('switch')));
+		$this->assertTrue(Validation::cc('6759558831206830183', array('switch')));
+		$this->assertTrue(Validation::cc('5641827998830403137', array('switch')));
+		//VISA 13 digit
+		$this->assertTrue(Validation::cc('4024007174754', array('visa')));
+		$this->assertTrue(Validation::cc('4104816460717', array('visa')));
+		$this->assertTrue(Validation::cc('4716229700437', array('visa')));
+		$this->assertTrue(Validation::cc('4539305400213', array('visa')));
+		$this->assertTrue(Validation::cc('4728260558665', array('visa')));
+		$this->assertTrue(Validation::cc('4929100131792', array('visa')));
+		$this->assertTrue(Validation::cc('4024007117308', array('visa')));
+		$this->assertTrue(Validation::cc('4539915491024', array('visa')));
+		$this->assertTrue(Validation::cc('4539790901139', array('visa')));
+		$this->assertTrue(Validation::cc('4485284914909', array('visa')));
+		$this->assertTrue(Validation::cc('4782793022350', array('visa')));
+		$this->assertTrue(Validation::cc('4556899290685', array('visa')));
+		$this->assertTrue(Validation::cc('4024007134774', array('visa')));
+		$this->assertTrue(Validation::cc('4333412341316', array('visa')));
+		$this->assertTrue(Validation::cc('4539534204543', array('visa')));
+		$this->assertTrue(Validation::cc('4485640373626', array('visa')));
+		$this->assertTrue(Validation::cc('4929911445746', array('visa')));
+		$this->assertTrue(Validation::cc('4539292550806', array('visa')));
+		$this->assertTrue(Validation::cc('4716523014030', array('visa')));
+		$this->assertTrue(Validation::cc('4024007125152', array('visa')));
+		$this->assertTrue(Validation::cc('4539758883311', array('visa')));
+		$this->assertTrue(Validation::cc('4024007103258', array('visa')));
+		$this->assertTrue(Validation::cc('4916933155767', array('visa')));
+		$this->assertTrue(Validation::cc('4024007159672', array('visa')));
+		$this->assertTrue(Validation::cc('4716935544871', array('visa')));
+		$this->assertTrue(Validation::cc('4929415177779', array('visa')));
+		$this->assertTrue(Validation::cc('4929748547896', array('visa')));
+		$this->assertTrue(Validation::cc('4929153468612', array('visa')));
+		$this->assertTrue(Validation::cc('4539397132104', array('visa')));
+		$this->assertTrue(Validation::cc('4485293435540', array('visa')));
+		$this->assertTrue(Validation::cc('4485799412720', array('visa')));
+		$this->assertTrue(Validation::cc('4916744757686', array('visa')));
+		$this->assertTrue(Validation::cc('4556475655426', array('visa')));
+		$this->assertTrue(Validation::cc('4539400441625', array('visa')));
+		$this->assertTrue(Validation::cc('4485437129173', array('visa')));
+		$this->assertTrue(Validation::cc('4716253605320', array('visa')));
+		$this->assertTrue(Validation::cc('4539366156589', array('visa')));
+		$this->assertTrue(Validation::cc('4916498061392', array('visa')));
+		$this->assertTrue(Validation::cc('4716127163779', array('visa')));
+		$this->assertTrue(Validation::cc('4024007183078', array('visa')));
+		$this->assertTrue(Validation::cc('4041553279654', array('visa')));
+		$this->assertTrue(Validation::cc('4532380121960', array('visa')));
+		$this->assertTrue(Validation::cc('4485906062491', array('visa')));
+		$this->assertTrue(Validation::cc('4539365115149', array('visa')));
+		$this->assertTrue(Validation::cc('4485146516702', array('visa')));
+		//VISA 16 digit
+		$this->assertTrue(Validation::cc('4916375389940009', array('visa')));
+		$this->assertTrue(Validation::cc('4929167481032610', array('visa')));
+		$this->assertTrue(Validation::cc('4485029969061519', array('visa')));
+		$this->assertTrue(Validation::cc('4485573845281759', array('visa')));
+		$this->assertTrue(Validation::cc('4485669810383529', array('visa')));
+		$this->assertTrue(Validation::cc('4929615806560327', array('visa')));
+		$this->assertTrue(Validation::cc('4556807505609535', array('visa')));
+		$this->assertTrue(Validation::cc('4532611336232890', array('visa')));
+		$this->assertTrue(Validation::cc('4532201952422387', array('visa')));
+		$this->assertTrue(Validation::cc('4485073797976290', array('visa')));
+		$this->assertTrue(Validation::cc('4024007157580969', array('visa')));
+		$this->assertTrue(Validation::cc('4053740470212274', array('visa')));
+		$this->assertTrue(Validation::cc('4716265831525676', array('visa')));
+		$this->assertTrue(Validation::cc('4024007100222966', array('visa')));
+		$this->assertTrue(Validation::cc('4539556148303244', array('visa')));
+		$this->assertTrue(Validation::cc('4532449879689709', array('visa')));
+		$this->assertTrue(Validation::cc('4916805467840986', array('visa')));
+		$this->assertTrue(Validation::cc('4532155644440233', array('visa')));
+		$this->assertTrue(Validation::cc('4467977802223781', array('visa')));
+		$this->assertTrue(Validation::cc('4539224637000686', array('visa')));
+		$this->assertTrue(Validation::cc('4556629187064965', array('visa')));
+		$this->assertTrue(Validation::cc('4532970205932943', array('visa')));
+		$this->assertTrue(Validation::cc('4821470132041850', array('visa')));
+		$this->assertTrue(Validation::cc('4916214267894485', array('visa')));
+		$this->assertTrue(Validation::cc('4024007169073284', array('visa')));
+		$this->assertTrue(Validation::cc('4716783351296122', array('visa')));
+		$this->assertTrue(Validation::cc('4556480171913795', array('visa')));
+		$this->assertTrue(Validation::cc('4929678411034997', array('visa')));
+		$this->assertTrue(Validation::cc('4682061913519392', array('visa')));
+		$this->assertTrue(Validation::cc('4916495481746474', array('visa')));
+		$this->assertTrue(Validation::cc('4929007108460499', array('visa')));
+		$this->assertTrue(Validation::cc('4539951357838586', array('visa')));
+		$this->assertTrue(Validation::cc('4716482691051558', array('visa')));
+		$this->assertTrue(Validation::cc('4916385069917516', array('visa')));
+		$this->assertTrue(Validation::cc('4929020289494641', array('visa')));
+		$this->assertTrue(Validation::cc('4532176245263774', array('visa')));
+		$this->assertTrue(Validation::cc('4556242273553949', array('visa')));
+		$this->assertTrue(Validation::cc('4481007485188614', array('visa')));
+		$this->assertTrue(Validation::cc('4716533372139623', array('visa')));
+		$this->assertTrue(Validation::cc('4929152038152632', array('visa')));
+		$this->assertTrue(Validation::cc('4539404037310550', array('visa')));
+		$this->assertTrue(Validation::cc('4532800925229140', array('visa')));
+		$this->assertTrue(Validation::cc('4916845885268360', array('visa')));
+		$this->assertTrue(Validation::cc('4394514669078434', array('visa')));
+		$this->assertTrue(Validation::cc('4485611378115042', array('visa')));
+		//Visa Electron
+		$this->assertTrue(Validation::cc('4175003346287100', array('electron')));
+		$this->assertTrue(Validation::cc('4913042516577228', array('electron')));
+		$this->assertTrue(Validation::cc('4917592325659381', array('electron')));
+		$this->assertTrue(Validation::cc('4917084924450511', array('electron')));
+		$this->assertTrue(Validation::cc('4917994610643999', array('electron')));
+		$this->assertTrue(Validation::cc('4175005933743585', array('electron')));
+		$this->assertTrue(Validation::cc('4175008373425044', array('electron')));
+		$this->assertTrue(Validation::cc('4913119763664154', array('electron')));
+		$this->assertTrue(Validation::cc('4913189017481812', array('electron')));
+		$this->assertTrue(Validation::cc('4913085104968622', array('electron')));
+		$this->assertTrue(Validation::cc('4175008803122021', array('electron')));
+		$this->assertTrue(Validation::cc('4913294453962489', array('electron')));
+		$this->assertTrue(Validation::cc('4175009797419290', array('electron')));
+		$this->assertTrue(Validation::cc('4175005028142917', array('electron')));
+		$this->assertTrue(Validation::cc('4913940802385364', array('electron')));
+		//Voyager
+		$this->assertTrue(Validation::cc('869940697287073', array('voyager')));
+		$this->assertTrue(Validation::cc('869934523596112', array('voyager')));
+		$this->assertTrue(Validation::cc('869958670174621', array('voyager')));
+		$this->assertTrue(Validation::cc('869921250068209', array('voyager')));
+		$this->assertTrue(Validation::cc('869972521242198', array('voyager')));
+	}
+
+/**
+ * testLuhn method
+ *
+ * @access public
+ * @return void
+ */
+	function testLuhn() {
+		$this->Validation->deep = true;
+
+		//American Express
+		$this->Validation->check = '370482756063980';
+		$this->assertTrue($this->Validation->_luhn());
+		//BankCard
+		$this->Validation->check = '5610745867413420';
+		$this->assertTrue($this->Validation->_luhn());
+		//Diners Club 14
+		$this->Validation->check = '30155483651028';
+		$this->assertTrue($this->Validation->_luhn());
+		//2004 MasterCard/Diners Club Alliance International 14
+		$this->Validation->check = '36747701998969';
+		$this->assertTrue($this->Validation->_luhn());
+		//2004 MasterCard/Diners Club Alliance US & Canada 16
+		$this->Validation->check = '5597511346169950';
+		$this->assertTrue($this->Validation->_luhn());
+		//Discover
+		$this->Validation->check = '6011802876467237';
+		$this->assertTrue($this->Validation->_luhn());
+		//enRoute
+		$this->Validation->check = '201496944158937';
+		$this->assertTrue($this->Validation->_luhn());
+		//JCB 15 digit
+		$this->Validation->check = '210034762247893';
+		$this->assertTrue($this->Validation->_luhn());
+		//JCB 16 digit
+		$this->Validation->check = '3096806857839939';
+		$this->assertTrue($this->Validation->_luhn());
+		//Maestro (debit card)
+		$this->Validation->check = '5020147409985219';
+		$this->assertTrue($this->Validation->_luhn());
+		//Mastercard
+		$this->Validation->check = '5580424361774366';
+		$this->assertTrue($this->Validation->_luhn());
+		//Solo 16
+		$this->Validation->check = '6767432107064987';
+		$this->assertTrue($this->Validation->_luhn());
+		//Solo 18
+		$this->Validation->check = '676714834398858593';
+		$this->assertTrue($this->Validation->_luhn());
+		//Solo 19
+		$this->Validation->check = '6767838565218340113';
+		$this->assertTrue($this->Validation->_luhn());
+		//Switch 16
+		$this->Validation->check = '5641829171515733';
+		$this->assertTrue($this->Validation->_luhn());
+		//Switch 18
+		$this->Validation->check = '493622764224625174';
+		$this->assertTrue($this->Validation->_luhn());
+		//Switch 19
+		$this->Validation->check = '6759603460617628716';
+		$this->assertTrue($this->Validation->_luhn());
+		//VISA 13 digit
+		$this->Validation->check = '4024007174754';
+		$this->assertTrue($this->Validation->_luhn());
+		//VISA 16 digit
+		$this->Validation->check = '4916375389940009';
+		$this->assertTrue($this->Validation->_luhn());
+		//Visa Electron
+		$this->Validation->check = '4175003346287100';
+		$this->assertTrue($this->Validation->_luhn());
+		//Voyager
+		$this->Validation->check = '869940697287073';
+		$this->assertTrue($this->Validation->_luhn());
+
+		$this->Validation->check = '0000000000000000';
+		$this->assertFalse($this->Validation->_luhn());
+
+		$this->Validation->check = '869940697287173';
+		$this->assertFalse($this->Validation->_luhn());
+	}
+
+/**
+ * testCustomRegexForCc method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomRegexForCc() {
+		$this->assertTrue(Validation::cc('12332105933743585', null, null, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('1233210593374358', null, null, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12312305933743585', null, null, '/123321\\d{11}/'));
+	}
+
+/**
+ * testCustomRegexForCcWithLuhnCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomRegexForCcWithLuhnCheck() {
+		$this->assertTrue(Validation::cc('12332110426226941', null, true, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12332105933743585', null, true, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12332105933743587', null, true, '/123321\\d{11}/'));
+		$this->assertFalse(Validation::cc('12312305933743585', null, true, '/123321\\d{11}/'));
+	}
+
+/**
+ * testFastCc method
+ *
+ * @access public
+ * @return void
+ */
+	function testFastCc() {
+		// too short
+		$this->assertFalse(Validation::cc('123456789012'));
+		//American Express
+		$this->assertTrue(Validation::cc('370482756063980'));
+		//Diners Club 14
+		$this->assertTrue(Validation::cc('30155483651028'));
+		//2004 MasterCard/Diners Club Alliance International 14
+		$this->assertTrue(Validation::cc('36747701998969'));
+		//2004 MasterCard/Diners Club Alliance US & Canada 16
+		$this->assertTrue(Validation::cc('5597511346169950'));
+		//Discover
+		$this->assertTrue(Validation::cc('6011802876467237'));
+		//Mastercard
+		$this->assertTrue(Validation::cc('5580424361774366'));
+		//VISA 13 digit
+		$this->assertTrue(Validation::cc('4024007174754'));
+		//VISA 16 digit
+		$this->assertTrue(Validation::cc('4916375389940009'));
+		//Visa Electron
+		$this->assertTrue(Validation::cc('4175003346287100'));
+	}
+
+/**
+ * testAllCc method
+ *
+ * @access public
+ * @return void
+ */
+	function testAllCc() {
+		//American Express
+		$this->assertTrue(Validation::cc('370482756063980', 'all'));
+		//BankCard
+		$this->assertTrue(Validation::cc('5610745867413420', 'all'));
+		//Diners Club 14
+		$this->assertTrue(Validation::cc('30155483651028', 'all'));
+		//2004 MasterCard/Diners Club Alliance International 14
+		$this->assertTrue(Validation::cc('36747701998969', 'all'));
+		//2004 MasterCard/Diners Club Alliance US & Canada 16
+		$this->assertTrue(Validation::cc('5597511346169950', 'all'));
+		//Discover
+		$this->assertTrue(Validation::cc('6011802876467237', 'all'));
+		//enRoute
+		$this->assertTrue(Validation::cc('201496944158937', 'all'));
+		//JCB 15 digit
+		$this->assertTrue(Validation::cc('210034762247893', 'all'));
+		//JCB 16 digit
+		$this->assertTrue(Validation::cc('3096806857839939', 'all'));
+		//Maestro (debit card)
+		$this->assertTrue(Validation::cc('5020147409985219', 'all'));
+		//Mastercard
+		$this->assertTrue(Validation::cc('5580424361774366', 'all'));
+		//Solo 16
+		$this->assertTrue(Validation::cc('6767432107064987', 'all'));
+		//Solo 18
+		$this->assertTrue(Validation::cc('676714834398858593', 'all'));
+		//Solo 19
+		$this->assertTrue(Validation::cc('6767838565218340113', 'all'));
+		//Switch 16
+		$this->assertTrue(Validation::cc('5641829171515733', 'all'));
+		//Switch 18
+		$this->assertTrue(Validation::cc('493622764224625174', 'all'));
+		//Switch 19
+		$this->assertTrue(Validation::cc('6759603460617628716', 'all'));
+		//VISA 13 digit
+		$this->assertTrue(Validation::cc('4024007174754', 'all'));
+		//VISA 16 digit
+		$this->assertTrue(Validation::cc('4916375389940009', 'all'));
+		//Visa Electron
+		$this->assertTrue(Validation::cc('4175003346287100', 'all'));
+		//Voyager
+		$this->assertTrue(Validation::cc('869940697287073', 'all'));
+	}
+
+/**
+ * testAllCcDeep method
+ *
+ * @access public
+ * @return void
+ */
+	function testAllCcDeep() {
+		//American Express
+		$this->assertTrue(Validation::cc('370482756063980', 'all', true));
+		//BankCard
+		$this->assertTrue(Validation::cc('5610745867413420', 'all', true));
+		//Diners Club 14
+		$this->assertTrue(Validation::cc('30155483651028', 'all', true));
+		//2004 MasterCard/Diners Club Alliance International 14
+		$this->assertTrue(Validation::cc('36747701998969', 'all', true));
+		//2004 MasterCard/Diners Club Alliance US & Canada 16
+		$this->assertTrue(Validation::cc('5597511346169950', 'all', true));
+		//Discover
+		$this->assertTrue(Validation::cc('6011802876467237', 'all', true));
+		//enRoute
+		$this->assertTrue(Validation::cc('201496944158937', 'all', true));
+		//JCB 15 digit
+		$this->assertTrue(Validation::cc('210034762247893', 'all', true));
+		//JCB 16 digit
+		$this->assertTrue(Validation::cc('3096806857839939', 'all', true));
+		//Maestro (debit card)
+		$this->assertTrue(Validation::cc('5020147409985219', 'all', true));
+		//Mastercard
+		$this->assertTrue(Validation::cc('5580424361774366', 'all', true));
+		//Solo 16
+		$this->assertTrue(Validation::cc('6767432107064987', 'all', true));
+		//Solo 18
+		$this->assertTrue(Validation::cc('676714834398858593', 'all', true));
+		//Solo 19
+		$this->assertTrue(Validation::cc('6767838565218340113', 'all', true));
+		//Switch 16
+		$this->assertTrue(Validation::cc('5641829171515733', 'all', true));
+		//Switch 18
+		$this->assertTrue(Validation::cc('493622764224625174', 'all', true));
+		//Switch 19
+		$this->assertTrue(Validation::cc('6759603460617628716', 'all', true));
+		//VISA 13 digit
+		$this->assertTrue(Validation::cc('4024007174754', 'all', true));
+		//VISA 16 digit
+		$this->assertTrue(Validation::cc('4916375389940009', 'all', true));
+		//Visa Electron
+		$this->assertTrue(Validation::cc('4175003346287100', 'all', true));
+		//Voyager
+		$this->assertTrue(Validation::cc('869940697287073', 'all', true));
+	}
+
+/**
+ * testComparison method
+ *
+ * @access public
+ * @return void
+ */
+	function testComparison() {
+		$this->assertFalse(Validation::comparison(7, null, 6));
+		$this->assertTrue(Validation::comparison(7, 'is greater', 6));
+		$this->assertTrue(Validation::comparison(7, '>', 6));
+		$this->assertTrue(Validation::comparison(6, 'is less', 7));
+		$this->assertTrue(Validation::comparison(6, '<', 7));
+		$this->assertTrue(Validation::comparison(7, 'greater or equal', 7));
+		$this->assertTrue(Validation::comparison(7, '>=', 7));
+		$this->assertTrue(Validation::comparison(7, 'greater or equal', 6));
+		$this->assertTrue(Validation::comparison(7, '>=', 6));
+		$this->assertTrue(Validation::comparison(6, 'less or equal', 7));
+		$this->assertTrue(Validation::comparison(6, '<=', 7));
+		$this->assertTrue(Validation::comparison(7, 'equal to', 7));
+		$this->assertTrue(Validation::comparison(7, '==', 7));
+		$this->assertTrue(Validation::comparison(7, 'not equal', 6));
+		$this->assertTrue(Validation::comparison(7, '!=', 6));
+		$this->assertFalse(Validation::comparison(6, 'is greater', 7));
+		$this->assertFalse(Validation::comparison(6, '>', 7));
+		$this->assertFalse(Validation::comparison(7, 'is less', 6));
+		$this->assertFalse(Validation::comparison(7, '<', 6));
+		$this->assertFalse(Validation::comparison(6, 'greater or equal', 7));
+		$this->assertFalse(Validation::comparison(6, '>=', 7));
+		$this->assertFalse(Validation::comparison(6, 'greater or equal', 7));
+		$this->assertFalse(Validation::comparison(6, '>=', 7));
+		$this->assertFalse(Validation::comparison(7, 'less or equal', 6));
+		$this->assertFalse(Validation::comparison(7, '<=', 6));
+		$this->assertFalse(Validation::comparison(7, 'equal to', 6));
+		$this->assertFalse(Validation::comparison(7, '==', 6));
+		$this->assertFalse(Validation::comparison(7, 'not equal', 7));
+		$this->assertFalse(Validation::comparison(7, '!=', 7));
+	}
+
+/**
+ * testComparisonAsArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testComparisonAsArray() {
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'is greater', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'is less', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'greater or equal','check2' =>  6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '>=', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => 'less or equal', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 6, 'operator' => '<=', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '==', 'check2' => 7)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 6)));
+		$this->assertTrue(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'is greater', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'is less', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => 'greater or equal', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 6, 'operator' => '>=', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'less or equal', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '<=', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'equal to', 'check2' => 6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '==','check2' =>  6)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => 'not equal', 'check2' => 7)));
+		$this->assertFalse(Validation::comparison(array('check1' => 7, 'operator' => '!=', 'check2' => 7)));
+	}
+
+/**
+ * testCustom method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustom() {
+		$this->assertTrue(Validation::custom('12345', '/(?<!\\S)\\d++(?!\\S)/'));
+		$this->assertFalse(Validation::custom('Text', '/(?<!\\S)\\d++(?!\\S)/'));
+		$this->assertFalse(Validation::custom('123.45', '/(?<!\\S)\\d++(?!\\S)/'));
+		$this->assertFalse(Validation::custom('missing regex'));
+	}
+
+/**
+ * testCustomAsArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testCustomAsArray() {
+		$this->assertTrue(Validation::custom(array('check' => '12345', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
+		$this->assertFalse(Validation::custom(array('check' => 'Text', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
+		$this->assertFalse(Validation::custom(array('check' => '123.45', 'regex' => '/(?<!\\S)\\d++(?!\\S)/')));
+	}
+
+/**
+ * testDateDdmmyyyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDdmmyyyy() {
+		$this->assertTrue(Validation::date('27-12-2006', array('dmy')));
+		$this->assertTrue(Validation::date('27.12.2006', array('dmy')));
+		$this->assertTrue(Validation::date('27/12/2006', array('dmy')));
+		$this->assertTrue(Validation::date('27 12 2006', array('dmy')));
+		$this->assertFalse(Validation::date('00-00-0000', array('dmy')));
+		$this->assertFalse(Validation::date('00.00.0000', array('dmy')));
+		$this->assertFalse(Validation::date('00/00/0000', array('dmy')));
+		$this->assertFalse(Validation::date('00 00 0000', array('dmy')));
+		$this->assertFalse(Validation::date('31-11-2006', array('dmy')));
+		$this->assertFalse(Validation::date('31.11.2006', array('dmy')));
+		$this->assertFalse(Validation::date('31/11/2006', array('dmy')));
+		$this->assertFalse(Validation::date('31 11 2006', array('dmy')));
+	}
+
+/**
+ * testDateDdmmyyyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDdmmyyyyLeapYear() {
+		$this->assertTrue(Validation::date('29-02-2004', array('dmy')));
+		$this->assertTrue(Validation::date('29.02.2004', array('dmy')));
+		$this->assertTrue(Validation::date('29/02/2004', array('dmy')));
+		$this->assertTrue(Validation::date('29 02 2004', array('dmy')));
+		$this->assertFalse(Validation::date('29-02-2006', array('dmy')));
+		$this->assertFalse(Validation::date('29.02.2006', array('dmy')));
+		$this->assertFalse(Validation::date('29/02/2006', array('dmy')));
+		$this->assertFalse(Validation::date('29 02 2006', array('dmy')));
+	}
+
+/**
+ * testDateDdmmyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDdmmyy() {
+		$this->assertTrue(Validation::date('27-12-06', array('dmy')));
+		$this->assertTrue(Validation::date('27.12.06', array('dmy')));
+		$this->assertTrue(Validation::date('27/12/06', array('dmy')));
+		$this->assertTrue(Validation::date('27 12 06', array('dmy')));
+		$this->assertFalse(Validation::date('00-00-00', array('dmy')));
+		$this->assertFalse(Validation::date('00.00.00', array('dmy')));
+		$this->assertFalse(Validation::date('00/00/00', array('dmy')));
+		$this->assertFalse(Validation::date('00 00 00', array('dmy')));
+		$this->assertFalse(Validation::date('31-11-06', array('dmy')));
+		$this->assertFalse(Validation::date('31.11.06', array('dmy')));
+		$this->assertFalse(Validation::date('31/11/06', array('dmy')));
+		$this->assertFalse(Validation::date('31 11 06', array('dmy')));
+	}
+
+/**
+ * testDateDdmmyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDdmmyyLeapYear() {
+		$this->assertTrue(Validation::date('29-02-04', array('dmy')));
+		$this->assertTrue(Validation::date('29.02.04', array('dmy')));
+		$this->assertTrue(Validation::date('29/02/04', array('dmy')));
+		$this->assertTrue(Validation::date('29 02 04', array('dmy')));
+		$this->assertFalse(Validation::date('29-02-06', array('dmy')));
+		$this->assertFalse(Validation::date('29.02.06', array('dmy')));
+		$this->assertFalse(Validation::date('29/02/06', array('dmy')));
+		$this->assertFalse(Validation::date('29 02 06', array('dmy')));
+	}
+
+/**
+ * testDateDmyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDmyy() {
+		$this->assertTrue(Validation::date('7-2-06', array('dmy')));
+		$this->assertTrue(Validation::date('7.2.06', array('dmy')));
+		$this->assertTrue(Validation::date('7/2/06', array('dmy')));
+		$this->assertTrue(Validation::date('7 2 06', array('dmy')));
+		$this->assertFalse(Validation::date('0-0-00', array('dmy')));
+		$this->assertFalse(Validation::date('0.0.00', array('dmy')));
+		$this->assertFalse(Validation::date('0/0/00', array('dmy')));
+		$this->assertFalse(Validation::date('0 0 00', array('dmy')));
+		$this->assertFalse(Validation::date('32-2-06', array('dmy')));
+		$this->assertFalse(Validation::date('32.2.06', array('dmy')));
+		$this->assertFalse(Validation::date('32/2/06', array('dmy')));
+		$this->assertFalse(Validation::date('32 2 06', array('dmy')));
+	}
+
+/**
+ * testDateDmyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDmyyLeapYear() {
+		$this->assertTrue(Validation::date('29-2-04', array('dmy')));
+		$this->assertTrue(Validation::date('29.2.04', array('dmy')));
+		$this->assertTrue(Validation::date('29/2/04', array('dmy')));
+		$this->assertTrue(Validation::date('29 2 04', array('dmy')));
+		$this->assertFalse(Validation::date('29-2-06', array('dmy')));
+		$this->assertFalse(Validation::date('29.2.06', array('dmy')));
+		$this->assertFalse(Validation::date('29/2/06', array('dmy')));
+		$this->assertFalse(Validation::date('29 2 06', array('dmy')));
+	}
+
+/**
+ * testDateDmyyyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDmyyyy() {
+		$this->assertTrue(Validation::date('7-2-2006', array('dmy')));
+		$this->assertTrue(Validation::date('7.2.2006', array('dmy')));
+		$this->assertTrue(Validation::date('7/2/2006', array('dmy')));
+		$this->assertTrue(Validation::date('7 2 2006', array('dmy')));
+		$this->assertFalse(Validation::date('0-0-0000', array('dmy')));
+		$this->assertFalse(Validation::date('0.0.0000', array('dmy')));
+		$this->assertFalse(Validation::date('0/0/0000', array('dmy')));
+		$this->assertFalse(Validation::date('0 0 0000', array('dmy')));
+		$this->assertFalse(Validation::date('32-2-2006', array('dmy')));
+		$this->assertFalse(Validation::date('32.2.2006', array('dmy')));
+		$this->assertFalse(Validation::date('32/2/2006', array('dmy')));
+		$this->assertFalse(Validation::date('32 2 2006', array('dmy')));
+	}
+
+/**
+ * testDateDmyyyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDmyyyyLeapYear() {
+		$this->assertTrue(Validation::date('29-2-2004', array('dmy')));
+		$this->assertTrue(Validation::date('29.2.2004', array('dmy')));
+		$this->assertTrue(Validation::date('29/2/2004', array('dmy')));
+		$this->assertTrue(Validation::date('29 2 2004', array('dmy')));
+		$this->assertFalse(Validation::date('29-2-2006', array('dmy')));
+		$this->assertFalse(Validation::date('29.2.2006', array('dmy')));
+		$this->assertFalse(Validation::date('29/2/2006', array('dmy')));
+		$this->assertFalse(Validation::date('29 2 2006', array('dmy')));
+	}
+
+/**
+ * testDateMmddyyyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMmddyyyy() {
+		$this->assertTrue(Validation::date('12-27-2006', array('mdy')));
+		$this->assertTrue(Validation::date('12.27.2006', array('mdy')));
+		$this->assertTrue(Validation::date('12/27/2006', array('mdy')));
+		$this->assertTrue(Validation::date('12 27 2006', array('mdy')));
+		$this->assertFalse(Validation::date('00-00-0000', array('mdy')));
+		$this->assertFalse(Validation::date('00.00.0000', array('mdy')));
+		$this->assertFalse(Validation::date('00/00/0000', array('mdy')));
+		$this->assertFalse(Validation::date('00 00 0000', array('mdy')));
+		$this->assertFalse(Validation::date('11-31-2006', array('mdy')));
+		$this->assertFalse(Validation::date('11.31.2006', array('mdy')));
+		$this->assertFalse(Validation::date('11/31/2006', array('mdy')));
+		$this->assertFalse(Validation::date('11 31 2006', array('mdy')));
+	}
+
+/**
+ * testDateMmddyyyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMmddyyyyLeapYear() {
+		$this->assertTrue(Validation::date('02-29-2004', array('mdy')));
+		$this->assertTrue(Validation::date('02.29.2004', array('mdy')));
+		$this->assertTrue(Validation::date('02/29/2004', array('mdy')));
+		$this->assertTrue(Validation::date('02 29 2004', array('mdy')));
+		$this->assertFalse(Validation::date('02-29-2006', array('mdy')));
+		$this->assertFalse(Validation::date('02.29.2006', array('mdy')));
+		$this->assertFalse(Validation::date('02/29/2006', array('mdy')));
+		$this->assertFalse(Validation::date('02 29 2006', array('mdy')));
+	}
+
+/**
+ * testDateMmddyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMmddyy() {
+		$this->assertTrue(Validation::date('12-27-06', array('mdy')));
+		$this->assertTrue(Validation::date('12.27.06', array('mdy')));
+		$this->assertTrue(Validation::date('12/27/06', array('mdy')));
+		$this->assertTrue(Validation::date('12 27 06', array('mdy')));
+		$this->assertFalse(Validation::date('00-00-00', array('mdy')));
+		$this->assertFalse(Validation::date('00.00.00', array('mdy')));
+		$this->assertFalse(Validation::date('00/00/00', array('mdy')));
+		$this->assertFalse(Validation::date('00 00 00', array('mdy')));
+		$this->assertFalse(Validation::date('11-31-06', array('mdy')));
+		$this->assertFalse(Validation::date('11.31.06', array('mdy')));
+		$this->assertFalse(Validation::date('11/31/06', array('mdy')));
+		$this->assertFalse(Validation::date('11 31 06', array('mdy')));
+	}
+
+/**
+ * testDateMmddyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMmddyyLeapYear() {
+		$this->assertTrue(Validation::date('02-29-04', array('mdy')));
+		$this->assertTrue(Validation::date('02.29.04', array('mdy')));
+		$this->assertTrue(Validation::date('02/29/04', array('mdy')));
+		$this->assertTrue(Validation::date('02 29 04', array('mdy')));
+		$this->assertFalse(Validation::date('02-29-06', array('mdy')));
+		$this->assertFalse(Validation::date('02.29.06', array('mdy')));
+		$this->assertFalse(Validation::date('02/29/06', array('mdy')));
+		$this->assertFalse(Validation::date('02 29 06', array('mdy')));
+	}
+
+/**
+ * testDateMdyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMdyy() {
+		$this->assertTrue(Validation::date('2-7-06', array('mdy')));
+		$this->assertTrue(Validation::date('2.7.06', array('mdy')));
+		$this->assertTrue(Validation::date('2/7/06', array('mdy')));
+		$this->assertTrue(Validation::date('2 7 06', array('mdy')));
+		$this->assertFalse(Validation::date('0-0-00', array('mdy')));
+		$this->assertFalse(Validation::date('0.0.00', array('mdy')));
+		$this->assertFalse(Validation::date('0/0/00', array('mdy')));
+		$this->assertFalse(Validation::date('0 0 00', array('mdy')));
+		$this->assertFalse(Validation::date('2-32-06', array('mdy')));
+		$this->assertFalse(Validation::date('2.32.06', array('mdy')));
+		$this->assertFalse(Validation::date('2/32/06', array('mdy')));
+		$this->assertFalse(Validation::date('2 32 06', array('mdy')));
+	}
+
+/**
+ * testDateMdyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMdyyLeapYear() {
+		$this->assertTrue(Validation::date('2-29-04', array('mdy')));
+		$this->assertTrue(Validation::date('2.29.04', array('mdy')));
+		$this->assertTrue(Validation::date('2/29/04', array('mdy')));
+		$this->assertTrue(Validation::date('2 29 04', array('mdy')));
+		$this->assertFalse(Validation::date('2-29-06', array('mdy')));
+		$this->assertFalse(Validation::date('2.29.06', array('mdy')));
+		$this->assertFalse(Validation::date('2/29/06', array('mdy')));
+		$this->assertFalse(Validation::date('2 29 06', array('mdy')));
+	}
+
+/**
+ * testDateMdyyyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMdyyyy() {
+		$this->assertTrue(Validation::date('2-7-2006', array('mdy')));
+		$this->assertTrue(Validation::date('2.7.2006', array('mdy')));
+		$this->assertTrue(Validation::date('2/7/2006', array('mdy')));
+		$this->assertTrue(Validation::date('2 7 2006', array('mdy')));
+		$this->assertFalse(Validation::date('0-0-0000', array('mdy')));
+		$this->assertFalse(Validation::date('0.0.0000', array('mdy')));
+		$this->assertFalse(Validation::date('0/0/0000', array('mdy')));
+		$this->assertFalse(Validation::date('0 0 0000', array('mdy')));
+		$this->assertFalse(Validation::date('2-32-2006', array('mdy')));
+		$this->assertFalse(Validation::date('2.32.2006', array('mdy')));
+		$this->assertFalse(Validation::date('2/32/2006', array('mdy')));
+		$this->assertFalse(Validation::date('2 32 2006', array('mdy')));
+	}
+
+/**
+ * testDateMdyyyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMdyyyyLeapYear() {
+		$this->assertTrue(Validation::date('2-29-2004', array('mdy')));
+		$this->assertTrue(Validation::date('2.29.2004', array('mdy')));
+		$this->assertTrue(Validation::date('2/29/2004', array('mdy')));
+		$this->assertTrue(Validation::date('2 29 2004', array('mdy')));
+		$this->assertFalse(Validation::date('2-29-2006', array('mdy')));
+		$this->assertFalse(Validation::date('2.29.2006', array('mdy')));
+		$this->assertFalse(Validation::date('2/29/2006', array('mdy')));
+		$this->assertFalse(Validation::date('2 29 2006', array('mdy')));
+	}
+
+/**
+ * testDateYyyymmdd method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateYyyymmdd() {
+		$this->assertTrue(Validation::date('2006-12-27', array('ymd')));
+		$this->assertTrue(Validation::date('2006.12.27', array('ymd')));
+		$this->assertTrue(Validation::date('2006/12/27', array('ymd')));
+		$this->assertTrue(Validation::date('2006 12 27', array('ymd')));
+		$this->assertFalse(Validation::date('2006-11-31', array('ymd')));
+		$this->assertFalse(Validation::date('2006.11.31', array('ymd')));
+		$this->assertFalse(Validation::date('2006/11/31', array('ymd')));
+		$this->assertFalse(Validation::date('2006 11 31', array('ymd')));
+	}
+
+/**
+ * testDateYyyymmddLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateYyyymmddLeapYear() {
+		$this->assertTrue(Validation::date('2004-02-29', array('ymd')));
+		$this->assertTrue(Validation::date('2004.02.29', array('ymd')));
+		$this->assertTrue(Validation::date('2004/02/29', array('ymd')));
+		$this->assertTrue(Validation::date('2004 02 29', array('ymd')));
+		$this->assertFalse(Validation::date('2006-02-29', array('ymd')));
+		$this->assertFalse(Validation::date('2006.02.29', array('ymd')));
+		$this->assertFalse(Validation::date('2006/02/29', array('ymd')));
+		$this->assertFalse(Validation::date('2006 02 29', array('ymd')));
+	}
+
+/**
+ * testDateYymmdd method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateYymmdd() {
+		$this->assertTrue(Validation::date('06-12-27', array('ymd')));
+		$this->assertTrue(Validation::date('06.12.27', array('ymd')));
+		$this->assertTrue(Validation::date('06/12/27', array('ymd')));
+		$this->assertTrue(Validation::date('06 12 27', array('ymd')));
+		$this->assertFalse(Validation::date('12/27/2600', array('ymd')));
+		$this->assertFalse(Validation::date('12.27.2600', array('ymd')));
+		$this->assertFalse(Validation::date('12/27/2600', array('ymd')));
+		$this->assertFalse(Validation::date('12 27 2600', array('ymd')));
+		$this->assertFalse(Validation::date('06-11-31', array('ymd')));
+		$this->assertFalse(Validation::date('06.11.31', array('ymd')));
+		$this->assertFalse(Validation::date('06/11/31', array('ymd')));
+		$this->assertFalse(Validation::date('06 11 31', array('ymd')));
+	}
+
+/**
+ * testDateYymmddLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateYymmddLeapYear() {
+		$this->assertTrue(Validation::date('2004-02-29', array('ymd')));
+		$this->assertTrue(Validation::date('2004.02.29', array('ymd')));
+		$this->assertTrue(Validation::date('2004/02/29', array('ymd')));
+		$this->assertTrue(Validation::date('2004 02 29', array('ymd')));
+		$this->assertFalse(Validation::date('2006-02-29', array('ymd')));
+		$this->assertFalse(Validation::date('2006.02.29', array('ymd')));
+		$this->assertFalse(Validation::date('2006/02/29', array('ymd')));
+		$this->assertFalse(Validation::date('2006 02 29', array('ymd')));
+	}
+
+/**
+ * testDateDdMMMMyyyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDdMMMMyyyy() {
+		$this->assertTrue(Validation::date('27 December 2006', array('dMy')));
+		$this->assertTrue(Validation::date('27 Dec 2006', array('dMy')));
+		$this->assertFalse(Validation::date('2006 Dec 27', array('dMy')));
+		$this->assertFalse(Validation::date('2006 December 27', array('dMy')));
+	}
+
+/**
+ * testDateDdMMMMyyyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateDdMMMMyyyyLeapYear() {
+		$this->assertTrue(Validation::date('29 February 2004', array('dMy')));
+		$this->assertFalse(Validation::date('29 February 2006', array('dMy')));
+	}
+
+/**
+ * testDateMmmmDdyyyy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMmmmDdyyyy() {
+		$this->assertTrue(Validation::date('December 27, 2006', array('Mdy')));
+		$this->assertTrue(Validation::date('Dec 27, 2006', array('Mdy')));
+		$this->assertTrue(Validation::date('December 27 2006', array('Mdy')));
+		$this->assertTrue(Validation::date('Dec 27 2006', array('Mdy')));
+		$this->assertFalse(Validation::date('27 Dec 2006', array('Mdy')));
+		$this->assertFalse(Validation::date('2006 December 27', array('Mdy')));
+	}
+
+/**
+ * testDateMmmmDdyyyyLeapYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMmmmDdyyyyLeapYear() {
+		$this->assertTrue(Validation::date('February 29, 2004', array('Mdy')));
+		$this->assertTrue(Validation::date('Feb 29, 2004', array('Mdy')));
+		$this->assertTrue(Validation::date('February 29 2004', array('Mdy')));
+		$this->assertTrue(Validation::date('Feb 29 2004', array('Mdy')));
+		$this->assertFalse(Validation::date('February 29, 2006', array('Mdy')));
+	}
+
+/**
+ * testDateMy method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMy() {
+		$this->assertTrue(Validation::date('December 2006', array('My')));
+		$this->assertTrue(Validation::date('Dec 2006', array('My')));
+		$this->assertTrue(Validation::date('December/2006', array('My')));
+		$this->assertTrue(Validation::date('Dec/2006', array('My')));
+	}
+
+/**
+ * testDateMyNumeric method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateMyNumeric() {
+		$this->assertTrue(Validation::date('12/2006', array('my')));
+		$this->assertTrue(Validation::date('12-2006', array('my')));
+		$this->assertTrue(Validation::date('12.2006', array('my')));
+		$this->assertTrue(Validation::date('12 2006', array('my')));
+		$this->assertFalse(Validation::date('12/06', array('my')));
+		$this->assertFalse(Validation::date('12-06', array('my')));
+		$this->assertFalse(Validation::date('12.06', array('my')));
+		$this->assertFalse(Validation::date('12 06', array('my')));
+	}
+
+/**
+ * testTime method
+ *
+ * @access public
+ * @return void
+ */
+	function testTime() {
+		$this->assertTrue(Validation::time('00:00'));
+		$this->assertTrue(Validation::time('23:59'));
+		$this->assertFalse(Validation::time('24:00'));
+		$this->assertTrue(Validation::time('12:00'));
+		$this->assertTrue(Validation::time('12:01'));
+		$this->assertTrue(Validation::time('12:01am'));
+		$this->assertTrue(Validation::time('12:01pm'));
+		$this->assertTrue(Validation::time('1pm'));
+		$this->assertTrue(Validation::time('01:00'));
+		$this->assertFalse(Validation::time('1:00'));
+		$this->assertTrue(Validation::time('1:00pm'));
+		$this->assertFalse(Validation::time('13:00pm'));
+		$this->assertFalse(Validation::time('9:00'));
+	}
+
+/**
+ * testBoolean method
+ *
+ * @access public
+ * @return void
+ */
+	function testBoolean() {
+		$this->assertTrue(Validation::boolean('0'));
+		$this->assertTrue(Validation::boolean('1'));
+		$this->assertTrue(Validation::boolean(0));
+		$this->assertTrue(Validation::boolean(1));
+		$this->assertTrue(Validation::boolean(true));
+		$this->assertTrue(Validation::boolean(false));
+		$this->assertFalse(Validation::boolean('true'));
+		$this->assertFalse(Validation::boolean('false'));
+		$this->assertFalse(Validation::boolean('-1'));
+		$this->assertFalse(Validation::boolean('2'));
+		$this->assertFalse(Validation::boolean('Boo!'));
+	}
+
+/**
+ * testDateCustomRegx method
+ *
+ * @access public
+ * @return void
+ */
+	function testDateCustomRegx() {
+		$this->assertTrue(Validation::date('2006-12-27', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
+		$this->assertFalse(Validation::date('12-27-2006', null, '%^(19|20)[0-9]{2}[- /.](0[1-9]|1[012])[- /.](0[1-9]|[12][0-9]|3[01])$%'));
+	}
+
+/**
+ * testDecimal method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecimal() {
+		$this->assertTrue(Validation::decimal('+1234.54321'));
+		$this->assertTrue(Validation::decimal('-1234.54321'));
+		$this->assertTrue(Validation::decimal('1234.54321'));
+		$this->assertTrue(Validation::decimal('+0123.45e6'));
+		$this->assertTrue(Validation::decimal('-0123.45e6'));
+		$this->assertTrue(Validation::decimal('0123.45e6'));
+		$this->assertFalse(Validation::decimal('string'));
+		$this->assertFalse(Validation::decimal('1234'));
+		$this->assertFalse(Validation::decimal('-1234'));
+		$this->assertFalse(Validation::decimal('+1234'));
+	}
+
+/**
+ * testDecimalWithPlaces method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecimalWithPlaces() {
+		$this->assertTrue(Validation::decimal('.27', '2'));
+		$this->assertTrue(Validation::decimal(.27, 2));
+		$this->assertTrue(Validation::decimal(-.27, 2));
+		$this->assertTrue(Validation::decimal(+.27, 2));
+		$this->assertTrue(Validation::decimal('.277', '3'));
+		$this->assertTrue(Validation::decimal(.277, 3));
+		$this->assertTrue(Validation::decimal(-.277, 3));
+		$this->assertTrue(Validation::decimal(+.277, 3));
+		$this->assertTrue(Validation::decimal('1234.5678', '4'));
+		$this->assertTrue(Validation::decimal(1234.5678, 4));
+		$this->assertTrue(Validation::decimal(-1234.5678, 4));
+		$this->assertTrue(Validation::decimal(+1234.5678, 4));
+		$this->assertFalse(Validation::decimal('1234.5678', '3'));
+		$this->assertFalse(Validation::decimal(1234.5678, 3));
+		$this->assertFalse(Validation::decimal(-1234.5678, 3));
+		$this->assertFalse(Validation::decimal(+1234.5678, 3));
+	}
+
+/**
+ * testDecimalCustomRegex method
+ *
+ * @access public
+ * @return void
+ */
+	function testDecimalCustomRegex() {
+		$this->assertTrue(Validation::decimal('1.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
+		$this->assertFalse(Validation::decimal('.54321', null, '/^[-+]?[0-9]+(\\.[0-9]+)?$/s'));
+	}
+
+/**
+ * testEmail method
+ *
+ * @access public
+ * @return void
+ */
+	function testEmail() {
+		$this->assertTrue(Validation::email('abc.efg@domain.com'));
+		$this->assertTrue(Validation::email('efg@domain.com'));
+		$this->assertTrue(Validation::email('abc-efg@domain.com'));
+		$this->assertTrue(Validation::email('abc_efg@domain.com'));
+		$this->assertTrue(Validation::email('raw@test.ra.ru'));
+		$this->assertTrue(Validation::email('abc-efg@domain-hyphened.com'));
+		$this->assertTrue(Validation::email("p.o'malley@domain.com"));
+		$this->assertTrue(Validation::email('abc+efg@domain.com'));
+		$this->assertTrue(Validation::email('abc&efg@domain.com'));
+		$this->assertTrue(Validation::email('abc.efg@12345.com'));
+		$this->assertTrue(Validation::email('abc.efg@12345.co.jp'));
+		$this->assertTrue(Validation::email('abc@g.cn'));
+		$this->assertTrue(Validation::email('abc@x.com'));
+		$this->assertTrue(Validation::email('henrik@sbcglobal.net'));
+		$this->assertTrue(Validation::email('sani@sbcglobal.net'));
+
+		// all ICANN TLDs
+		$this->assertTrue(Validation::email('abc@example.aero'));
+		$this->assertTrue(Validation::email('abc@example.asia'));
+		$this->assertTrue(Validation::email('abc@example.biz'));
+		$this->assertTrue(Validation::email('abc@example.cat'));
+		$this->assertTrue(Validation::email('abc@example.com'));
+		$this->assertTrue(Validation::email('abc@example.coop'));
+		$this->assertTrue(Validation::email('abc@example.edu'));
+		$this->assertTrue(Validation::email('abc@example.gov'));
+		$this->assertTrue(Validation::email('abc@example.info'));
+		$this->assertTrue(Validation::email('abc@example.int'));
+		$this->assertTrue(Validation::email('abc@example.jobs'));
+		$this->assertTrue(Validation::email('abc@example.mil'));
+		$this->assertTrue(Validation::email('abc@example.mobi'));
+		$this->assertTrue(Validation::email('abc@example.museum'));
+		$this->assertTrue(Validation::email('abc@example.name'));
+		$this->assertTrue(Validation::email('abc@example.net'));
+		$this->assertTrue(Validation::email('abc@example.org'));
+		$this->assertTrue(Validation::email('abc@example.pro'));
+		$this->assertTrue(Validation::email('abc@example.tel'));
+		$this->assertTrue(Validation::email('abc@example.travel'));
+		$this->assertTrue(Validation::email('someone@st.t-com.hr'));
+
+		// strange, but technically valid email addresses
+		$this->assertTrue(Validation::email('S=postmaster/OU=rz/P=uni-frankfurt/A=d400/C=de@gateway.d400.de'));
+		$this->assertTrue(Validation::email('customer/department=shipping@example.com'));
+		$this->assertTrue(Validation::email('$A12345@example.com'));
+		$this->assertTrue(Validation::email('!def!xyz%abc@example.com'));
+		$this->assertTrue(Validation::email('_somename@example.com'));
+
+		// invalid addresses
+		$this->assertFalse(Validation::email('abc@example'));
+		$this->assertFalse(Validation::email('abc@example.c'));
+		$this->assertFalse(Validation::email('abc@example.com.'));
+		$this->assertFalse(Validation::email('abc.@example.com'));
+		$this->assertFalse(Validation::email('abc@example..com'));
+		$this->assertFalse(Validation::email('abc@example.com.a'));
+		$this->assertFalse(Validation::email('abc@example.toolong'));
+		$this->assertFalse(Validation::email('abc;@example.com'));
+		$this->assertFalse(Validation::email('abc@example.com;'));
+		$this->assertFalse(Validation::email('abc@efg@example.com'));
+		$this->assertFalse(Validation::email('abc@@example.com'));
+		$this->assertFalse(Validation::email('abc efg@example.com'));
+		$this->assertFalse(Validation::email('abc,efg@example.com'));
+		$this->assertFalse(Validation::email('abc@sub,example.com'));
+		$this->assertFalse(Validation::email("abc@sub'example.com"));
+		$this->assertFalse(Validation::email('abc@sub/example.com'));
+		$this->assertFalse(Validation::email('abc@yahoo!.com'));
+		$this->assertFalse(Validation::email("Nyrée.surname@example.com"));
+		$this->assertFalse(Validation::email('abc@example_underscored.com'));
+		$this->assertFalse(Validation::email('raw@test.ra.ru....com'));
+	}
+
+/**
+ * testEmailDeep method
+ *
+ * @access public
+ * @return void
+ */
+	function testEmailDeep() {
+		$found = gethostbynamel('example.abcd');
+		if ($this->skipIf($found, 'Your DNS service responds for non-existant domains, skipping deep email checks. %s'))  {
+			return;
+		}
+		$this->assertTrue(Validation::email('abc.efg@cakephp.org', true));
+		$this->assertFalse(Validation::email('abc.efg@caphpkeinvalid.com', true));
+		$this->assertFalse(Validation::email('abc@example.abcd', true));
+	}
+
+/**
+ * testEmailCustomRegex method
+ *
+ * @access public
+ * @return void
+ */
+	function testEmailCustomRegex() {
+		$this->assertTrue(Validation::email('abc.efg@cakephp.org', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
+		$this->assertFalse(Validation::email('abc.efg@com.caphpkeinvalid', null, '/^[A-Z0-9._%-]+@[A-Z0-9.-]+\\.[A-Z]{2,4}$/i'));
+	}
+
+/**
+ * testEqualTo method
+ *
+ * @access public
+ * @return void
+ */
+	function testEqualTo() {
+		$this->assertTrue(Validation::equalTo("1", "1"));
+		$this->assertFalse(Validation::equalTo(1, "1"));
+		$this->assertFalse(Validation::equalTo("", null));
+		$this->assertFalse(Validation::equalTo("", false));
+		$this->assertFalse(Validation::equalTo(0, false));
+		$this->assertFalse(Validation::equalTo(null, false));
+	}
+
+/**
+ * testIp method
+ *
+ * @access public
+ * @return void
+ */
+	function testIpv4() {
+		$this->assertTrue(Validation::ip('0.0.0.0', 'IPv4'));
+		$this->assertTrue(Validation::ip('192.168.1.156', 'IPv4'));
+		$this->assertTrue(Validation::ip('255.255.255.255', 'IPv4'));
+
+		$this->assertFalse(Validation::ip('127.0.0', 'IPv4'));
+		$this->assertFalse(Validation::ip('127.0.0.a', 'IPv4'));
+		$this->assertFalse(Validation::ip('127.0.0.256', 'IPv4'));
+
+		$this->assertFalse(Validation::ip('2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'IPv4'));
+	}
+
+/**
+ * testIp v6
+ *
+ * @access public
+ * @return void
+ */
+	function testIpv6() {
+		$this->assertTrue(Validation::ip('2001:0db8:85a3:0000:0000:8a2e:0370:7334', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:db8:85a3:0:0:8a2e:370:7334', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:db8:85a3::8a2e:370:7334', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:0db8:0000:0000:0000:0000:1428:57ab', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:0db8:0000:0000:0000::1428:57ab', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:0db8:0:0:0:0:1428:57ab', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:0db8:0:0::1428:57ab', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:0db8::1428:57ab', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:db8::1428:57ab', 'IPv6'));
+		$this->assertTrue(Validation::ip('0000:0000:0000:0000:0000:0000:0000:0001', 'IPv6'));
+		$this->assertTrue(Validation::ip('::1', 'IPv6'));
+		$this->assertTrue(Validation::ip('::ffff:12.34.56.78', 'IPv6'));
+		$this->assertTrue(Validation::ip('::ffff:0c22:384e', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:0db8:1234:0000:0000:0000:0000:0000', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:0db8:1234:ffff:ffff:ffff:ffff:ffff', 'IPv6'));
+		$this->assertTrue(Validation::ip('2001:db8:a::123', 'IPv6'));
+		$this->assertTrue(Validation::ip('fe80::', 'IPv6'));
+		$this->assertTrue(Validation::ip('::ffff:192.0.2.128', 'IPv6'));
+		$this->assertTrue(Validation::ip('::ffff:c000:280', 'IPv6'));
+
+		$this->assertFalse(Validation::ip('123', 'IPv6'));
+		$this->assertFalse(Validation::ip('ldkfj', 'IPv6'));
+		$this->assertFalse(Validation::ip('2001::FFD3::57ab', 'IPv6'));
+		$this->assertFalse(Validation::ip('2001:db8:85a3::8a2e:37023:7334', 'IPv6'));
+		$this->assertFalse(Validation::ip('2001:db8:85a3::8a2e:370k:7334', 'IPv6'));
+		$this->assertFalse(Validation::ip('1:2:3:4:5:6:7:8:9', 'IPv6'));
+		$this->assertFalse(Validation::ip('1::2::3', 'IPv6'));
+		$this->assertFalse(Validation::ip('1:::3:4:5', 'IPv6'));
+		$this->assertFalse(Validation::ip('1:2:3::4:5:6:7:8:9', 'IPv6'));
+		$this->assertFalse(Validation::ip('::ffff:2.3.4', 'IPv6'));
+		$this->assertFalse(Validation::ip('::ffff:257.1.2.3', 'IPv6'));
+
+		$this->assertFalse(Validation::ip('0.0.0.0', 'IPv6'));
+	}
+
+/**
+ * testIpBoth method
+ *
+ * @return void
+ * @access public
+ */
+	function testIpBoth() {
+		$this->assertTrue(Validation::ip('0.0.0.0'));
+		$this->assertTrue(Validation::ip('192.168.1.156'));
+		$this->assertTrue(Validation::ip('255.255.255.255'));
+
+		$this->assertFalse(Validation::ip('127.0.0'));
+		$this->assertFalse(Validation::ip('127.0.0.a'));
+		$this->assertFalse(Validation::ip('127.0.0.256'));
+
+		$this->assertTrue(Validation::ip('2001:0db8:85a3:0000:0000:8a2e:0370:7334'));
+		$this->assertTrue(Validation::ip('2001:db8:85a3:0:0:8a2e:370:7334'));
+		$this->assertTrue(Validation::ip('2001:db8:85a3::8a2e:370:7334'));
+
+		$this->assertFalse(Validation::ip('2001:db8:85a3::8a2e:37023:7334'));
+		$this->assertFalse(Validation::ip('2001:db8:85a3::8a2e:370k:7334'));
+		$this->assertFalse(Validation::ip('1:2:3:4:5:6:7:8:9'));
+	}
+
+/**
+ * testMaxLength method
+ *
+ * @access public
+ * @return void
+ */
+	function testMaxLength() {
+		$this->assertTrue(Validation::maxLength('ab', 3));
+		$this->assertTrue(Validation::maxLength('abc', 3));
+		$this->assertTrue(Validation::maxLength('ÆΔΩЖÇ', 10));
+
+		$this->assertFalse(Validation::maxLength('abcd', 3));
+		$this->assertFalse(Validation::maxLength('ÆΔΩЖÇ', 3));
+	}
+
+/**
+ * testMinLength method
+ *
+ * @access public
+ * @return void
+ */
+	function testMinLength() {
+		$this->assertFalse(Validation::minLength('ab', 3));
+		$this->assertFalse(Validation::minLength('ÆΔΩЖÇ', 10));
+
+		$this->assertTrue(Validation::minLength('abc', 3));
+		$this->assertTrue(Validation::minLength('abcd', 3));
+		$this->assertTrue(Validation::minLength('ÆΔΩЖÇ', 2));
+	}
+
+/**
+ * testUrl method
+ *
+ * @access public
+ * @return void
+ */
+	function testUrl() {
+		$this->assertTrue(Validation::url('http://www.cakephp.org'));
+		$this->assertTrue(Validation::url('http://cakephp.org'));
+		$this->assertTrue(Validation::url('http://www.cakephp.org/somewhere#anchor'));
+		$this->assertTrue(Validation::url('http://192.168.0.1'));
+		$this->assertTrue(Validation::url('https://www.cakephp.org'));
+		$this->assertTrue(Validation::url('https://cakephp.org'));
+		$this->assertTrue(Validation::url('https://www.cakephp.org/somewhere#anchor'));
+		$this->assertTrue(Validation::url('https://192.168.0.1'));
+		$this->assertTrue(Validation::url('ftps://www.cakephp.org/pub/cake'));
+		$this->assertTrue(Validation::url('ftps://cakephp.org/pub/cake'));
+		$this->assertTrue(Validation::url('ftps://192.168.0.1/pub/cake'));
+		$this->assertTrue(Validation::url('ftp://www.cakephp.org/pub/cake'));
+		$this->assertTrue(Validation::url('ftp://cakephp.org/pub/cake'));
+		$this->assertTrue(Validation::url('ftp://192.168.0.1/pub/cake'));
+		$this->assertFalse(Validation::url('ftps://256.168.0.1/pub/cake'));
+		$this->assertFalse(Validation::url('ftp://256.168.0.1/pub/cake'));
+		$this->assertTrue(Validation::url('https://my.domain.com/gizmo/app?class=MySip;proc=start'));
+		$this->assertTrue(Validation::url('www.domain.tld'));
+		$this->assertFalse(Validation::url('http://w_w.domain.co_m'));
+		$this->assertFalse(Validation::url('http://www.domain.12com'));
+		$this->assertFalse(Validation::url('http://www.domain.longttldnotallowed'));
+		$this->assertFalse(Validation::url('http://www.-invaliddomain.tld'));
+		$this->assertFalse(Validation::url('http://www.domain.-invalidtld'));
+		$this->assertTrue(Validation::url('http://123456789112345678921234567893123456789412345678951234567896123.com'));
+		$this->assertFalse(Validation::url('http://this-domain-is-too-loooooong-by-icann-rules-maximum-length-is-63.com'));
+		$this->assertTrue(Validation::url('http://www.domain.com/blogs/index.php?blog=6&tempskin=_rss2'));
+		$this->assertTrue(Validation::url('http://www.domain.com/blogs/parenth()eses.php'));
+		$this->assertTrue(Validation::url('http://www.domain.com/index.php?get=params&amp;get2=params'));
+		$this->assertTrue(Validation::url('http://www.domain.com/ndex.php?get=params&amp;get2=params#anchor'));
+		$this->assertFalse(Validation::url('http://www.domain.com/fakeenco%ode'));
+		$this->assertTrue(Validation::url('http://www.domain.com/real%20url%20encodeing'));
+		$this->assertTrue(Validation::url('http://en.wikipedia.org/wiki/Architectural_pattern_(computer_science)'));
+		$this->assertFalse(Validation::url('http://en.(wikipedia).org/'));
+		$this->assertFalse(Validation::url('www.cakephp.org', true));
+		$this->assertTrue(Validation::url('http://www.cakephp.org', true));
+		$this->assertTrue(Validation::url('http://example.com/~userdir/'));
+		$this->assertTrue(Validation::url('http://example.com/~userdir/subdir/index.html'));
+		$this->assertTrue(Validation::url('http://www.zwischenraume.de'));
+		$this->assertTrue(Validation::url('http://www.zwischenraume.cz'));
+		$this->assertTrue(Validation::url('http://www.last.fm/music/浜崎�ゆ�'), 'utf8 path failed');
+		$this->assertTrue(Validation::url('http://www.electrohome.ro/images/239537750-284232-215_300[1].jpg'));
+
+		$this->assertTrue(Validation::url('http://cakephp.org:80'));
+		$this->assertTrue(Validation::url('http://cakephp.org:443'));
+		$this->assertTrue(Validation::url('http://cakephp.org:2000'));
+		$this->assertTrue(Validation::url('http://cakephp.org:27000'));
+		$this->assertTrue(Validation::url('http://cakephp.org:65000'));
+
+		$this->assertTrue(Validation::url('[2001:0db8::1428:57ab]'));
+		$this->assertTrue(Validation::url('[::1]'));
+		$this->assertTrue(Validation::url('[2001:0db8::1428:57ab]:80'));
+		$this->assertTrue(Validation::url('[::1]:80'));
+		$this->assertTrue(Validation::url('http://[2001:0db8::1428:57ab]'));
+		$this->assertTrue(Validation::url('http://[::1]'));
+		$this->assertTrue(Validation::url('http://[2001:0db8::1428:57ab]:80'));
+		$this->assertTrue(Validation::url('http://[::1]:80'));
+
+		$this->assertFalse(Validation::url('[1::2::3]'));
+	}
+
+	function testUuid() {
+		$this->assertTrue(Validation::uuid('550e8400-e29b-11d4-a716-446655440000'));
+		$this->assertFalse(Validation::uuid('BRAP-e29b-11d4-a716-446655440000'));
+		$this->assertTrue(Validation::uuid('550E8400-e29b-11D4-A716-446655440000'));
+		$this->assertFalse(Validation::uuid('550e8400-e29b11d4-a716-446655440000'));
+		$this->assertFalse(Validation::uuid('550e8400-e29b-11d4-a716-4466440000'));
+		$this->assertFalse(Validation::uuid('550e8400-e29b-11d4-a71-446655440000'));
+		$this->assertFalse(Validation::uuid('550e8400-e29b-11d-a716-446655440000'));
+		$this->assertFalse(Validation::uuid('550e8400-e29-11d4-a716-446655440000'));
+	}
+
+/**
+ * testInList method
+ *
+ * @access public
+ * @return void
+ */
+	function testInList() {
+		$this->assertTrue(Validation::inList('one', array('one', 'two')));
+		$this->assertTrue(Validation::inList('two', array('one', 'two')));
+		$this->assertFalse(Validation::inList('three', array('one', 'two')));
+	}
+
+/**
+ * testRange method
+ *
+ * @access public
+ * @return void
+ */
+	function testRange() {
+		$this->assertFalse(Validation::range(20, 100, 1));
+		$this->assertTrue(Validation::range(20, 1, 100));
+		$this->assertFalse(Validation::range(.5, 1, 100));
+		$this->assertTrue(Validation::range(.5, 0, 100));
+		$this->assertTrue(Validation::range(5));
+		$this->assertTrue(Validation::range(-5, -10, 1));
+		$this->assertFalse(Validation::range('word'));
+	}
+
+/**
+ * testExtension method
+ *
+ * @access public
+ * @return void
+ */
+	function testExtension() {
+		$this->assertTrue(Validation::extension('extension.jpeg'));
+		$this->assertTrue(Validation::extension('extension.JPEG'));
+		$this->assertTrue(Validation::extension('extension.gif'));
+		$this->assertTrue(Validation::extension('extension.GIF'));
+		$this->assertTrue(Validation::extension('extension.png'));
+		$this->assertTrue(Validation::extension('extension.jpg'));
+		$this->assertTrue(Validation::extension('extension.JPG'));
+		$this->assertFalse(Validation::extension('noextension'));
+		$this->assertTrue(Validation::extension('extension.pdf', array('PDF')));
+		$this->assertFalse(Validation::extension('extension.jpg', array('GIF')));
+		$this->assertTrue(Validation::extension(array('extension.JPG', 'extension.gif', 'extension.png')));
+		$this->assertTrue(Validation::extension(array('file' => array('name' => 'file.jpg'))));
+		$this->assertTrue(Validation::extension(array('file1' => array('name' => 'file.jpg'),
+												'file2' => array('name' => 'file.jpg'),
+												'file3' => array('name' => 'file.jpg'))));
+		$this->assertFalse(Validation::extension(array('file1' => array('name' => 'file.jpg'),
+												'file2' => array('name' => 'file.jpg'),
+												'file3' => array('name' => 'file.jpg')), array('gif')));
+
+		$this->assertFalse(Validation::extension(array('noextension', 'extension.JPG', 'extension.gif', 'extension.png')));
+		$this->assertFalse(Validation::extension(array('extension.pdf', 'extension.JPG', 'extension.gif', 'extension.png')));
+	}
+
+/**
+ * testMoney method
+ *
+ * @access public
+ * @return void
+ */
+	function testMoney() {
+		$this->assertTrue(Validation::money('$100'));
+		$this->assertTrue(Validation::money('$100.11'));
+		$this->assertTrue(Validation::money('$100.112'));
+		$this->assertFalse(Validation::money('$100.1'));
+		$this->assertFalse(Validation::money('$100.1111'));
+		$this->assertFalse(Validation::money('text'));
+
+		$this->assertTrue(Validation::money('100', 'right'));
+		$this->assertTrue(Validation::money('100.11$', 'right'));
+		$this->assertTrue(Validation::money('100.112$', 'right'));
+		$this->assertFalse(Validation::money('100.1$', 'right'));
+		$this->assertFalse(Validation::money('100.1111$', 'right'));
+
+		$this->assertTrue(Validation::money('€100'));
+		$this->assertTrue(Validation::money('€100.11'));
+		$this->assertTrue(Validation::money('€100.112'));
+		$this->assertFalse(Validation::money('€100.1'));
+		$this->assertFalse(Validation::money('€100.1111'));
+
+		$this->assertTrue(Validation::money('100', 'right'));
+		$this->assertTrue(Validation::money('100.11€', 'right'));
+		$this->assertTrue(Validation::money('100.112€', 'right'));
+		$this->assertFalse(Validation::money('100.1€', 'right'));
+		$this->assertFalse(Validation::money('100.1111€', 'right'));
+	}
+
+/**
+ * Test Multiple Select Validation
+ *
+ * @access public
+ * @return void
+ */
+	function testMultiple() {
+		$this->assertTrue(Validation::multiple(array(0, 1, 2, 3)));
+		$this->assertTrue(Validation::multiple(array(50, 32, 22, 0)));
+		$this->assertTrue(Validation::multiple(array('str', 'var', 'enum', 0)));
+		$this->assertFalse(Validation::multiple(''));
+		$this->assertFalse(Validation::multiple(null));
+		$this->assertFalse(Validation::multiple(array()));
+		$this->assertFalse(Validation::multiple(array(0)));
+		$this->assertFalse(Validation::multiple(array('0')));
+
+		$this->assertTrue(Validation::multiple(array(0, 3, 4, 5), array('in' => range(0, 10))));
+		$this->assertFalse(Validation::multiple(array(0, 15, 20, 5), array('in' => range(0, 10))));
+		$this->assertFalse(Validation::multiple(array(0, 5, 10, 11), array('in' => range(0, 10))));
+		$this->assertFalse(Validation::multiple(array('boo', 'foo', 'bar'), array('in' => array('foo', 'bar', 'baz'))));
+
+		$this->assertTrue(Validation::multiple(array(0, 5, 10, 11), array('max' => 3)));
+		$this->assertFalse(Validation::multiple(array(0, 5, 10, 11, 55), array('max' => 3)));
+		$this->assertTrue(Validation::multiple(array('foo', 'bar', 'baz'), array('max' => 3)));
+		$this->assertFalse(Validation::multiple(array('foo', 'bar', 'baz', 'squirrel'), array('max' => 3)));
+
+		$this->assertTrue(Validation::multiple(array(0, 5, 10, 11), array('min' => 3)));
+		$this->assertTrue(Validation::multiple(array(0, 5, 10, 11, 55), array('min' => 3)));
+		$this->assertFalse(Validation::multiple(array('foo', 'bar', 'baz'), array('min' => 5)));
+		$this->assertFalse(Validation::multiple(array('foo', 'bar', 'baz', 'squirrel'), array('min' => 10)));
+
+		$this->assertTrue(Validation::multiple(array(0, 5, 9), array('in' => range(0, 10), 'max' => 5)));
+		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5)));
+		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 11), array('in' => range(0, 10), 'max' => 5)));
+
+		$this->assertFalse(Validation::multiple(array(0, 5, 9), array('in' => range(0, 10), 'max' => 5, 'min' => 3)));
+		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 6, 2, 1), array('in' => range(0, 10), 'max' => 5, 'min' => 2)));
+		$this->assertFalse(Validation::multiple(array(0, 5, 9, 8, 11), array('in' => range(0, 10), 'max' => 5, 'min' => 2)));
+	}
+
+/**
+ * testNumeric method
+ *
+ * @access public
+ * @return void
+ */
+	function testNumeric() {
+		$this->assertFalse(Validation::numeric('teststring'));
+		$this->assertFalse(Validation::numeric('1.1test'));
+		$this->assertFalse(Validation::numeric('2test'));
+
+		$this->assertTrue(Validation::numeric('2'));
+		$this->assertTrue(Validation::numeric(2));
+		$this->assertTrue(Validation::numeric(2.2));
+		$this->assertTrue(Validation::numeric('2.2'));
+	}
+
+/**
+ * testPhone method
+ *
+ * @access public
+ * @return void
+ */
+	function testPhone() {
+		$this->assertFalse(Validation::phone('teststring'));
+		$this->assertFalse(Validation::phone('1-(33)-(333)-(4444)'));
+		$this->assertFalse(Validation::phone('1-(33)-3333-4444'));
+		$this->assertFalse(Validation::phone('1-(33)-33-4444'));
+		$this->assertFalse(Validation::phone('1-(33)-3-44444'));
+		$this->assertFalse(Validation::phone('1-(33)-3-444'));
+		$this->assertFalse(Validation::phone('1-(33)-3-44'));
+
+		$this->assertFalse(Validation::phone('(055) 999-9999'));
+		$this->assertFalse(Validation::phone('(155) 999-9999'));
+		$this->assertFalse(Validation::phone('(595) 999-9999'));
+		$this->assertFalse(Validation::phone('(555) 099-9999'));
+		$this->assertFalse(Validation::phone('(555) 199-9999'));
+
+		$this->assertTrue(Validation::phone('1 (222) 333 4444'));
+		$this->assertTrue(Validation::phone('+1 (222) 333 4444'));
+		$this->assertTrue(Validation::phone('(222) 333 4444'));
+
+		$this->assertTrue(Validation::phone('1-(333)-333-4444'));
+		$this->assertTrue(Validation::phone('1.(333)-333-4444'));
+		$this->assertTrue(Validation::phone('1.(333).333-4444'));
+		$this->assertTrue(Validation::phone('1.(333).333.4444'));
+		$this->assertTrue(Validation::phone('1-333-333-4444'));
+	}
+
+/**
+ * testPostal method
+ *
+ * @access public
+ * @return void
+ */
+	function testPostal() {
+		$this->assertFalse(Validation::postal('111', null, 'de'));
+		$this->assertFalse(Validation::postal('1111', null, 'de'));
+		$this->assertTrue(Validation::postal('13089', null, 'de'));
+
+		$this->assertFalse(Validation::postal('111', null, 'be'));
+		$this->assertFalse(Validation::postal('0123', null, 'be'));
+		$this->assertTrue(Validation::postal('1204', null, 'be'));
+
+		$this->assertFalse(Validation::postal('111', null, 'it'));
+		$this->assertFalse(Validation::postal('1111', null, 'it'));
+		$this->assertTrue(Validation::postal('13089', null, 'it'));
+
+		$this->assertFalse(Validation::postal('111', null, 'uk'));
+		$this->assertFalse(Validation::postal('1111', null, 'uk'));
+		$this->assertFalse(Validation::postal('AZA 0AB', null, 'uk'));
+		$this->assertFalse(Validation::postal('X0A 0ABC', null, 'uk'));
+		$this->assertTrue(Validation::postal('X0A 0AB', null, 'uk'));
+		$this->assertTrue(Validation::postal('AZ0A 0AA', null, 'uk'));
+		$this->assertTrue(Validation::postal('A89 2DD', null, 'uk'));
+
+		$this->assertFalse(Validation::postal('111', null, 'ca'));
+		$this->assertFalse(Validation::postal('1111', null, 'ca'));
+		$this->assertFalse(Validation::postal('D2A 0A0', null, 'ca'));
+		$this->assertFalse(Validation::postal('BAA 0ABC', null, 'ca'));
+		$this->assertFalse(Validation::postal('B2A AABC', null, 'ca'));
+		$this->assertFalse(Validation::postal('B2A 2AB', null, 'ca'));
+		$this->assertTrue(Validation::postal('X0A 0A2', null, 'ca'));
+		$this->assertTrue(Validation::postal('G4V 4C3', null, 'ca'));
+		$this->assertTrue(Validation::postal('L4J8D6', null, 'ca'));
+
+		$this->assertFalse(Validation::postal('111', null, 'us'));
+		$this->assertFalse(Validation::postal('1111', null, 'us'));
+		$this->assertFalse(Validation::postal('130896', null, 'us'));
+		$this->assertFalse(Validation::postal('13089-33333', null, 'us'));
+		$this->assertFalse(Validation::postal('13089-333', null, 'us'));
+		$this->assertFalse(Validation::postal('13A89-4333', null, 'us'));
+		$this->assertTrue(Validation::postal('13089-3333', null, 'us'));
+
+		$this->assertFalse(Validation::postal('111'));
+		$this->assertFalse(Validation::postal('1111'));
+		$this->assertFalse(Validation::postal('130896'));
+		$this->assertFalse(Validation::postal('13089-33333'));
+		$this->assertFalse(Validation::postal('13089-333'));
+		$this->assertFalse(Validation::postal('13A89-4333'));
+		$this->assertTrue(Validation::postal('13089-3333'));
+	}
+
+/**
+ * test that phone and postal pass to other classes.
+ *
+ * @return void
+ */
+	function testPhonePostalSsnPass() {
+		$this->assertTrue(Validation::postal('text', null, 'testNl'));
+		$this->assertTrue(Validation::phone('text', null, 'testDe'));
+		$this->assertTrue(Validation::ssn('text', null, 'testNl'));
+	}
+
+/**
+ * test the pass through calling of an alternate locale with postal()
+ *
+ * @return void
+ **/
+	function testPassThroughMethod() {
+		$this->assertTrue(Validation::postal('text', null, 'testNl'));
+
+		$this->expectError('Could not find AUTOFAILValidation class, unable to complete validation.');
+		Validation::postal('text', null, 'AUTOFAIL');
+
+		$this->expectError('Method phone does not exist on TestNlValidation unable to complete validation.');
+		Validation::phone('text', null, 'testNl');
+	}
+
+/**
+ * testSsn method
+ *
+ * @access public
+ * @return void
+ */
+	function testSsn() {
+		$this->assertFalse(Validation::ssn('111-333', null, 'dk'));
+		$this->assertFalse(Validation::ssn('111111-333', null, 'dk'));
+		$this->assertTrue(Validation::ssn('111111-3334', null, 'dk'));
+
+		$this->assertFalse(Validation::ssn('1118333', null, 'nl'));
+		$this->assertFalse(Validation::ssn('1234567890', null, 'nl'));
+		$this->assertFalse(Validation::ssn('12345A789', null, 'nl'));
+		$this->assertTrue(Validation::ssn('123456789', null, 'nl'));
+
+		$this->assertFalse(Validation::ssn('11-33-4333', null, 'us'));
+		$this->assertFalse(Validation::ssn('113-3-4333', null, 'us'));
+		$this->assertFalse(Validation::ssn('111-33-333', null, 'us'));
+		$this->assertTrue(Validation::ssn('111-33-4333', null, 'us'));
+	}
+
+/**
+ * testUserDefined method
+ *
+ * @access public
+ * @return void
+ */
+	function testUserDefined() {
+		$validator = new CustomValidator;
+		$this->assertFalse(Validation::userDefined('33', $validator, 'customValidate'));
+		$this->assertFalse(Validation::userDefined('3333', $validator, 'customValidate'));
+		$this->assertTrue(Validation::userDefined('333', $validator, 'customValidate'));
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helper.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helper.test.php
new file mode 100644
index 000000000..75d644d7d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helper.test.php
@@ -0,0 +1,804 @@
+<?php
+/**
+ * HelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('View', 'Helper'));
+
+/**
+ * HelperTestPost class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class HelperTestPost extends Model {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		$this->_schema = array(
+			'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+			'title' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+			'body' => array('type' => 'string', 'null' => true, 'default' => '', 'length' => ''),
+			'number' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+			'date' => array('type' => 'date', 'null' => true, 'default' => '', 'length' => ''),
+			'created' => array('type' => 'date', 'null' => true, 'default' => '', 'length' => ''),
+			'modified' => array('type' => 'datetime', 'null' => true, 'default' => '', 'length' => null)
+		);
+		return $this->_schema;
+	}
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('HelperTestTag'=> array('with' => 'HelperTestPostsTag'));
+}
+
+/**
+ * HelperTestComment class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class HelperTestComment extends Model {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		$this->_schema = array(
+			'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+			'author_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+			'title' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+			'body' => array('type' => 'string', 'null' => true, 'default' => '', 'length' => ''),
+			'created' => array('type' => 'date', 'null' => true, 'default' => '', 'length' => ''),
+			'modified' => array('type' => 'datetime', 'null' => true, 'default' => '', 'length' => null)
+		);
+		return $this->_schema;
+	}
+}
+
+/**
+ * HelperTestTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class HelperTestTag extends Model {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		$this->_schema = array(
+			'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+			'name' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+			'created' => array('type' => 'date', 'null' => true, 'default' => '', 'length' => ''),
+			'modified' => array('type' => 'datetime', 'null' => true, 'default' => '', 'length' => null)
+		);
+		return $this->_schema;
+	}
+}
+
+/**
+ * HelperTestPostsTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class HelperTestPostsTag extends Model {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		$this->_schema = array(
+			'helper_test_post_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+			'helper_test_tag_id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+		);
+		return $this->_schema;
+	}
+}
+
+class TestHelper extends Helper {
+/**
+ * expose a method as public
+ *
+ * @param string $options 
+ * @param string $exclude 
+ * @param string $insertBefore 
+ * @param string $insertAfter 
+ * @return void
+ */
+	function parseAttributes($options, $exclude = null, $insertBefore = ' ', $insertAfter = null) {
+		return $this->_parseAttributes($options, $exclude, $insertBefore, $insertAfter);
+	}
+}
+
+/**
+ * HelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class HelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		ClassRegistry::flush();
+		Router::reload();
+		$null = null;
+		$this->View = new View($null);
+		$this->Helper = new Helper();
+		ClassRegistry::addObject('HelperTestPost', new HelperTestPost());
+		ClassRegistry::addObject('HelperTestComment', new HelperTestComment());
+		ClassRegistry::addObject('HelperTestTag', new HelperTestTag());
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Helper, $this->View);
+		ClassRegistry::flush();
+	}
+
+/**
+ * testFormFieldNameParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testSetEntity() {
+		// PHP4 reference hack
+		ClassRegistry::removeObject('view');
+		ClassRegistry::addObject('view', $this->View);
+
+		$this->Helper->setEntity('HelperTestPost.id');
+		$this->assertFalse($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+
+		$this->Helper->setEntity('HelperTestComment.body');
+		$this->assertFalse($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestComment');
+		$this->assertEqual($this->View->field, 'body');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('HelperTestPost', true);
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, null);
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('_Token.fields');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'fields');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, '_Token');
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+
+		$this->Helper->setEntity('id');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('HelperTestComment.body');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'body');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, 'HelperTestComment');
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('body');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'body');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('Something.else');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'else');
+		$this->assertEqual($this->View->modelId, false);
+		$this->assertEqual($this->View->association, 'Something');
+		$this->assertEqual($this->View->fieldSuffix, '');
+
+		$this->Helper->setEntity('5.id');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, '5');
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->assertEqual($this->View->entity(), array('HelperTestPost', 5, 'id'));
+
+		$this->Helper->setEntity('0.id');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, '0');
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->assertEqual($this->View->entity(), array('HelperTestPost', 0, 'id'));
+
+		$this->Helper->setEntity('5.created.month');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'created');
+		$this->assertEqual($this->View->modelId, '5');
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, 'month');
+
+		$this->Helper->setEntity('HelperTestComment.5.id');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, '5');
+		$this->assertEqual($this->View->association, 'HelperTestComment');
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('HelperTestComment.id.time');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, 'HelperTestComment');
+		$this->assertEqual($this->View->fieldSuffix, 'time');
+
+		$this->Helper->setEntity('HelperTestTag');
+		$this->assertTrue($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'HelperTestTag');
+		$this->assertEqual($this->View->modelId, '');
+		$this->assertEqual($this->View->association, 'HelperTestTag');
+		$this->assertEqual($this->View->fieldSuffix, '');
+
+		$this->Helper->setEntity(null);
+		$this->Helper->setEntity('ModelThatDoesntExist.field_that_doesnt_exist');
+		$this->assertFalse($this->View->modelScope);
+		$this->assertEqual($this->View->model, 'ModelThatDoesntExist');
+		$this->assertEqual($this->View->field, 'field_that_doesnt_exist');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+	}
+
+/**
+ * test that 'view' doesn't break things.
+ *
+ * @return void
+ */
+	function testSetEntityWithView() {
+		$this->assertNull($this->Helper->setEntity('Allow.view.group_id'));
+		$this->assertNull($this->Helper->setEntity('Allow.view'));
+		$this->assertNull($this->Helper->setEntity('View.view'));
+	}
+
+/**
+ * test getting values from Helper
+ *
+ * @return void
+ */
+	function testValue() {
+		$this->Helper->data = array('fullname' => 'This is me');
+		$this->Helper->setEntity('fullname');
+		$result = $this->Helper->value('fullname');
+		$this->assertEqual($result, 'This is me');
+
+		$this->Helper->data = array('Post' => array('name' => 'First Post'));
+		$this->Helper->setEntity('Post.name');
+		$result = $this->Helper->value('Post.name');
+		$this->assertEqual($result, 'First Post');
+
+		$this->Helper->data = array('Post' => array(2 => array('name' => 'First Post')));
+		$this->Helper->setEntity('Post.2.name');
+		$result = $this->Helper->value('Post.2.name');
+		$this->assertEqual($result, 'First Post');
+
+		$this->Helper->data = array('Post' => array(2 => array('created' => array('year' => '2008'))));
+		$this->Helper->setEntity('Post.2.created');
+		$result = $this->Helper->value('Post.2.created');
+		$this->assertEqual($result, array('year' => '2008'));
+
+		$this->Helper->data = array('Post' => array(2 => array('created' => array('year' => '2008'))));
+		$this->Helper->setEntity('Post.2.created.year');
+		$result = $this->Helper->value('Post.2.created.year');
+		$this->assertEqual($result, '2008');
+
+		$this->Helper->data = array('HelperTestTag' => array('HelperTestTag' => ''));
+		$this->Helper->setEntity('HelperTestTag.HelperTestTag');
+		$result = $this->Helper->value('HelperTestTag.HelperTestTag');
+		$this->assertEqual($result, '');
+
+		$this->Helper->data = array('HelperTestTag' => array('HelperTestTag' => array(2, 3, 4)));
+		$this->Helper->setEntity('HelperTestTag.HelperTestTag');
+		$result = $this->Helper->value('HelperTestTag.HelperTestTag');
+		$this->assertEqual($result, array(2, 3, 4));
+
+		$this->Helper->data = array(
+			'HelperTestTag' => array(
+				array('id' => 3),
+				array('id' => 5)
+			)
+		);
+		$this->Helper->setEntity('HelperTestTag.HelperTestTag');
+		$result = $this->Helper->value('HelperTestTag.HelperTestTag');
+		$this->assertEqual($result, array(3 => 3, 5 => 5));
+
+		$this->Helper->data = array('zero' => 0);
+		$this->Helper->setEntity('zero');
+		$result = $this->Helper->value(array('default' => 'something'), 'zero');
+		$this->assertEqual($result, array('value' => 0));
+
+		$this->Helper->data = array('zero' => '0');
+		$result = $this->Helper->value(array('default' => 'something'), 'zero');
+		$this->assertEqual($result, array('value' => '0'));
+
+		$this->Helper->setEntity('inexistent');
+		$result = $this->Helper->value(array('default' => 'something'), 'inexistent');
+		$this->assertEqual($result, array('value' => 'something'));
+	}
+
+/**
+ * Ensure HTML escaping of url params.  So link addresses are valid and not exploited
+ *
+ * @return void
+ */
+	function testUrlConversion() {
+		$result = $this->Helper->url('/controller/action/1');
+		$this->assertEqual($result, '/controller/action/1');
+
+		$result = $this->Helper->url('/controller/action/1?one=1&two=2');
+		$this->assertEqual($result, '/controller/action/1?one=1&amp;two=2');
+
+		$result = $this->Helper->url(array('controller' => 'posts', 'action' => 'index', 'page' => '1" onclick="alert(\'XSS\');"'));
+		$this->assertEqual($result, "/posts/index/page:1&quot; onclick=&quot;alert(&#039;XSS&#039;);&quot;");
+
+		$result = $this->Helper->url('/controller/action/1/param:this+one+more');
+		$this->assertEqual($result, '/controller/action/1/param:this+one+more');
+
+		$result = $this->Helper->url('/controller/action/1/param:this%20one%20more');
+		$this->assertEqual($result, '/controller/action/1/param:this%20one%20more');
+
+		$result = $this->Helper->url('/controller/action/1/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24');
+		$this->assertEqual($result, '/controller/action/1/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24');
+
+		$result = $this->Helper->url(array(
+			'controller' => 'posts', 'action' => 'index', 'param' => '%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24'
+		));
+		$this->assertEqual($result, "/posts/index/param:%7Baround%20here%7D%5Bthings%5D%5Bare%5D%24%24");
+
+		$result = $this->Helper->url(array(
+			'controller' => 'posts', 'action' => 'index', 'page' => '1',
+			'?' => array('one' => 'value', 'two' => 'value', 'three' => 'purple')
+		));
+		$this->assertEqual($result, "/posts/index/page:1?one=value&amp;two=value&amp;three=purple");
+	}
+
+/**
+ * test assetTimestamp application
+ *
+ * @return void
+ */
+	function testAssetTimestamp() {
+		$_timestamp = Configure::read('Asset.timestamp');
+		$_debug = Configure::read('debug');
+
+		Configure::write('Asset.timestamp', false);
+		$result = $this->Helper->assetTimestamp(CSS_URL . 'cake.generic.css');
+		$this->assertEqual($result, CSS_URL . 'cake.generic.css');
+
+		Configure::write('Asset.timestamp', true);
+		Configure::write('debug', 0);
+		$result = $this->Helper->assetTimestamp(CSS_URL . 'cake.generic.css');
+		$this->assertEqual($result, CSS_URL . 'cake.generic.css');
+
+		Configure::write('Asset.timestamp', true);
+		Configure::write('debug', 2);
+		$result = $this->Helper->assetTimestamp(CSS_URL . 'cake.generic.css');
+		$this->assertPattern('/' . preg_quote(CSS_URL . 'cake.generic.css?', '/') . '[0-9]+/', $result);
+
+		Configure::write('Asset.timestamp', 'force');
+		Configure::write('debug', 0);
+		$result = $this->Helper->assetTimestamp(CSS_URL . 'cake.generic.css');
+		$this->assertPattern('/' . preg_quote(CSS_URL . 'cake.generic.css?', '/') . '[0-9]+/', $result);
+
+		$result = $this->Helper->assetTimestamp(CSS_URL . 'cake.generic.css?someparam');
+		$this->assertEqual($result, CSS_URL . 'cake.generic.css?someparam');
+
+		$this->Helper->webroot = '/some/dir/';
+		$result = $this->Helper->assetTimestamp('/some/dir/' . CSS_URL . 'cake.generic.css');
+		$this->assertPattern('/' . preg_quote(CSS_URL . 'cake.generic.css?', '/') . '[0-9]+/', $result);
+
+		Configure::write('debug', $_debug);
+		Configure::write('Asset.timestamp', $_timestamp);
+	}
+
+/**
+ * test assetTimestamp with plugins and themes
+ *
+ * @return void
+ */
+	function testAssetTimestampPluginsAndThemes() {
+		$_timestamp = Configure::read('Asset.timestamp');
+		Configure::write('Asset.timestamp', 'force');
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS),
+		));
+
+		$result = $this->Helper->assetTimestamp('/test_plugin/css/test_plugin_asset.css');
+		$this->assertPattern('#/test_plugin/css/test_plugin_asset.css\?[0-9]+$#', $result, 'Missing timestamp plugin');
+
+		$result = $this->Helper->assetTimestamp('/test_plugin/css/i_dont_exist.css');
+		$this->assertPattern('#/test_plugin/css/i_dont_exist.css\?$#', $result, 'No error on missing file');
+
+		$result = $this->Helper->assetTimestamp('/theme/test_theme/js/theme.js');
+		$this->assertPattern('#/theme/test_theme/js/theme.js\?[0-9]+$#', $result, 'Missing timestamp theme');
+
+		$result = $this->Helper->assetTimestamp('/theme/test_theme/js/non_existant.js');
+		$this->assertPattern('#/theme/test_theme/js/non_existant.js\?$#', $result, 'No error on missing file');
+
+		App::build();
+		Configure::write('Asset.timestamp', $_timestamp);
+	}
+
+/**
+ * testFieldsWithSameName method
+ *
+ * @access public
+ * @return void
+ */
+	function testFieldsWithSameName() {
+		// PHP4 reference hack
+		ClassRegistry::removeObject('view');
+		ClassRegistry::addObject('view', $this->View);
+
+		$this->Helper->setEntity('HelperTestTag', true);
+
+		$this->Helper->setEntity('HelperTestTag.id');
+		$this->assertEqual($this->View->model, 'HelperTestTag');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('My.id');
+		$this->assertEqual($this->View->model, 'HelperTestTag');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, 'My');
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('MyOther.id');
+		$this->assertEqual($this->View->model, 'HelperTestTag');
+		$this->assertEqual($this->View->field, 'id');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, 'MyOther');
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+	}
+
+/**
+ * testFieldSameAsModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFieldSameAsModel() {
+		// PHP4 reference hack
+		ClassRegistry::removeObject('view');
+		ClassRegistry::addObject('view', $this->View);
+
+		$this->Helper->setEntity('HelperTestTag', true);
+
+		$this->Helper->setEntity('helper_test_post');
+		$this->assertEqual($this->View->model, 'HelperTestTag');
+		$this->assertEqual($this->View->field, 'helper_test_post');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('HelperTestTag');
+		$this->assertEqual($this->View->model, 'HelperTestTag');
+		$this->assertEqual($this->View->field, 'HelperTestTag');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+		$this->assertEqual($this->View->entityPath, 'HelperTestTag');
+	}
+
+/**
+ * testFieldSuffixForDate method
+ *
+ * @access public
+ * @return void
+ */
+	function testFieldSuffixForDate() {
+		// PHP4 reference hack
+		ClassRegistry::removeObject('view');
+		ClassRegistry::addObject('view', $this->View);
+
+		$this->Helper->setEntity('HelperTestPost', true);
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, null);
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, null);
+
+		$this->Helper->setEntity('date.month');
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->field, 'date');
+		$this->assertEqual($this->View->modelId, null);
+		$this->assertEqual($this->View->association, null);
+		$this->assertEqual($this->View->fieldSuffix, 'month');
+	}
+
+/**
+ * testMulitDimensionValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testMulitDimensionValue() {
+		$this->Helper->data = array();
+		for ($i = 0; $i < 2; $i++) {
+			$this->Helper->data['Model'][$i] = 'what';
+			$result[] = $this->Helper->value("Model.{$i}");
+			$this->Helper->data['Model'][$i] = array();
+			for ($j = 0; $j < 2; $j++) {
+				$this->Helper->data['Model'][$i][$j] = 'how';
+				$result[] = $this->Helper->value("Model.{$i}.{$j}");
+			}
+		}
+		$expected = array('what', 'how', 'how', 'what', 'how', 'how');
+		$this->assertEqual($result, $expected);
+
+		$this->Helper->data['HelperTestComment']['5']['id'] = 'ok';
+		$result = $this->Helper->value('HelperTestComment.5.id');
+		$this->assertEqual($result, 'ok');
+
+		$this->Helper->setEntity('HelperTestPost', true);
+		$this->Helper->data['HelperTestPost']['5']['created']['month'] = '10';
+		$result = $this->Helper->value('5.created.month');
+		$this->assertEqual($result, 10);
+
+		$this->Helper->data['HelperTestPost']['0']['id'] = 100;
+		$result = $this->Helper->value('0.id');
+		$this->assertEqual($result, 100);
+	}
+
+/**
+ * testClean method
+ *
+ * @access public
+ * @return void
+ */
+	function testClean() {
+		$result = $this->Helper->clean(array());
+		$this->assertEqual($result, null);
+
+		$result = $this->Helper->clean(array('<script>with something</script>', '<applet>something else</applet>'));
+		$this->assertEqual($result, array('with something', 'something else'));
+
+		$result = $this->Helper->clean('<script>with something</script>');
+		$this->assertEqual($result, 'with something');
+
+		$result = $this->Helper->clean('<script type="text/javascript">alert("ruined");</script>');
+		$this->assertNoPattern('#</*script#', $result);
+
+		$result = $this->Helper->clean("<script \ntype=\"text/javascript\">\n\talert('ruined');\n\n\t\t</script>");
+		$this->assertNoPattern('#</*script#', $result);
+
+		$result = $this->Helper->clean('<body/onload=do(/something/)>');
+		$this->assertEqual($result, '<body/>');
+
+		$result = $this->Helper->clean('&lt;script&gt;alert(document.cookie)&lt;/script&gt;');
+		$this->assertEqual($result, '&amp;lt;script&amp;gt;alert(document.cookie)&amp;lt;/script&amp;gt;');
+	}
+
+/**
+ * testMultiDimensionalField method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultiDimensionalField() {
+		// PHP4 reference hack
+		ClassRegistry::removeObject('view');
+		ClassRegistry::addObject('view', $this->View);
+
+		$this->Helper->setEntity('HelperTestPost', true);
+
+		$this->Helper->setEntity('HelperTestPost.2.HelperTestComment.1.title');
+		$this->assertEqual($this->View->model, 'HelperTestPost');
+		$this->assertEqual($this->View->association, 'HelperTestComment');
+		$this->assertEqual($this->View->modelId,2);
+		$this->assertEqual($this->View->field, 'title');
+
+		$this->Helper->setEntity('HelperTestPost.1.HelperTestComment.1.HelperTestTag.1.created');
+		$this->assertEqual($this->View->field,'created');
+		$this->assertEqual($this->View->association,'HelperTestTag');
+		$this->assertEqual($this->View->modelId,1);
+
+		$this->Helper->setEntity('HelperTestPost.0.HelperTestComment.1.HelperTestTag.1.fake');
+		$this->assertEqual($this->View->model,'HelperTestPost');
+		$this->assertEqual($this->View->association,'HelperTestTag');
+		$this->assertEqual($this->View->field,null);
+
+		$this->Helper->setEntity('1.HelperTestComment.1.HelperTestTag.created.year');
+		$this->assertEqual($this->View->model,'HelperTestPost');
+		$this->assertEqual($this->View->association,'HelperTestTag');
+		$this->assertEqual($this->View->field,'created');
+		$this->assertEqual($this->View->modelId,1);
+		$this->assertEqual($this->View->fieldSuffix,'year');
+
+		$this->Helper->data['HelperTestPost'][2]['HelperTestComment'][1]['title'] = 'My Title';
+		$result = $this->Helper->value('HelperTestPost.2.HelperTestComment.1.title');
+		$this->assertEqual($result,'My Title');
+
+		$this->Helper->data['HelperTestPost'][2]['HelperTestComment'][1]['created']['year'] = 2008;
+		$result = $this->Helper->value('HelperTestPost.2.HelperTestComment.1.created.year');
+		$this->assertEqual($result,2008);
+
+		$this->Helper->data[2]['HelperTestComment'][1]['created']['year'] = 2008;
+		$result = $this->Helper->value('HelperTestPost.2.HelperTestComment.1.created.year');
+		$this->assertEqual($result,2008);
+
+		$this->Helper->data['HelperTestPost']['title'] = 'My Title';
+		$result = $this->Helper->value('title');
+		$this->assertEqual($result,'My Title');
+
+		$this->Helper->data['My']['title'] = 'My Title';
+		$result = $this->Helper->value('My.title');
+		$this->assertEqual($result,'My Title');
+	}
+
+	function testWebrootPaths() {
+		$this->Helper->webroot = '/';
+		$result = $this->Helper->webroot('/img/cake.power.gif');
+		$expected = '/img/cake.power.gif';
+		$this->assertEqual($result, $expected);
+
+		$this->Helper->theme = 'test_theme';
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$result = $this->Helper->webroot('/img/cake.power.gif');
+		$expected = '/theme/test_theme/img/cake.power.gif';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Helper->webroot('/img/test.jpg');
+		$expected = '/theme/test_theme/img/test.jpg';
+		$this->assertEqual($result, $expected);
+
+		$webRoot = Configure::read('App.www_root');
+		Configure::write('App.www_root', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
+
+		$result = $this->Helper->webroot('/img/cake.power.gif');
+		$expected = '/theme/test_theme/img/cake.power.gif';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Helper->webroot('/img/test.jpg');
+		$expected = '/theme/test_theme/img/test.jpg';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Helper->webroot('/img/cake.icon.gif');
+		$expected = '/img/cake.icon.gif';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Helper->webroot('/img/cake.icon.gif?some=param');
+		$expected = '/img/cake.icon.gif?some=param';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('App.www_root', $webRoot);
+	}
+
+/**
+ * test parsing attributes.
+ *
+ * @return void
+ */
+	function testParseAttributeCompact() {
+		$helper =& new TestHelper();
+		$compact = array('compact', 'checked', 'declare', 'readonly', 'disabled',
+			'selected', 'defer', 'ismap', 'nohref', 'noshade', 'nowrap', 'multiple', 'noresize');
+		
+		foreach ($compact as $attribute) {
+			foreach (array('true', true, 1, '1', $attribute) as $value) {
+				$attrs = array($attribute => $value);
+				$expected = ' ' . $attribute . '="' . $attribute . '"';
+				$this->assertEqual($helper->parseAttributes($attrs), $expected, '%s Failed on ' . $value);
+			}
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php
new file mode 100644
index 000000000..d06bf4a71
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/ajax.test.php
@@ -0,0 +1,910 @@
+<?php
+/**
+ * AjaxHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import('Helper', array('Html', 'Form', 'Javascript', 'Ajax'));
+/**
+ * AjaxTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class AjaxTestController extends Controller {
+/**
+ * name property
+ *
+ * @var string 'AjaxTest'
+ * @access public
+ */
+	var $name = 'AjaxTest';
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+}
+/**
+ * PostAjaxTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class PostAjaxTest extends Model {
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		return array(
+			'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+			'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+			'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+			'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+		);
+	}
+}
+/**
+ * TestAjaxHelper class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TestAjaxHelper extends AjaxHelper {
+/**
+ * stop method
+ *
+ * @access public
+ * @return void
+ */
+	function _stop() {
+	}
+}
+/**
+ * TestJavascriptHelper class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TestJavascriptHelper extends JavascriptHelper {
+/**
+ * codeBlocks property
+ *
+ * @var mixed
+ * @access public
+ */
+	var $codeBlocks;
+/**
+ * codeBlock method
+ *
+ * @param mixed $parameter
+ * @access public
+ * @return void
+ */
+	function codeBlock($parameter) {
+		if (empty($this->codeBlocks)) {
+			$this->codeBlocks = array();
+		}
+		$this->codeBlocks[] = $parameter;
+	}
+}
+/**
+ * AjaxTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class AjaxHelperTest extends CakeTestCase {
+/**
+ * Regexp for CDATA start block
+ *
+ * @var string
+ */
+	var $cDataStart = 'preg:/^\/\/<!\[CDATA\[[\n\r]*/';
+/**
+ * Regexp for CDATA end block
+ *
+ * @var string
+ */
+	var $cDataEnd = 'preg:/[^\]]*\]\]\>[\s\r\n]*/';
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		Router::reload();
+		$this->Ajax =& new TestAjaxHelper();
+		$this->Ajax->Html =& new HtmlHelper();
+		$this->Ajax->Form =& new FormHelper();
+		$this->Ajax->Javascript =& new JavascriptHelper();
+		$this->Ajax->Form->Html =& $this->Ajax->Html;
+		$view =& new View(new AjaxTestController());
+		ClassRegistry::addObject('view', $view);
+		ClassRegistry::addObject('PostAjaxTest', new PostAjaxTest());
+
+		$this->Ajax->Form->params = array(
+			'plugin' => null,
+			'action' => 'view',
+			'controller' => 'users'
+		);
+	}
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Ajax);
+		ClassRegistry::flush();
+	}
+/**
+ * testEvalScripts method
+ *
+ * @access public
+ * @return void
+ */
+	function testEvalScripts() {
+		$result = $this->Ajax->link('Test Link', 'http://www.cakephp.org', array('id' => 'link1', 'update' => 'content', 'evalScripts' => false));
+		$expected = array(
+			'a' => array('id' => 'link1', 'onclick' => ' event.returnValue = false; return false;', 'href' => 'http://www.cakephp.org'),
+			'Test Link',
+			'/a',
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Event.observe('link1', 'click', function(event) { new Ajax.Updater('content','http://www.cakephp.org', {asynchronous:true, evalScripts:false, requestHeaders:['X-Update', 'content']}) }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->link('Test Link', 'http://www.cakephp.org', array('id' => 'link1', 'update' => 'content'));
+		$expected = array(
+			'a' => array('id' => 'link1', 'onclick' => ' event.returnValue = false; return false;', 'href' => 'http://www.cakephp.org'),
+			'Test Link',
+			'/a',
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Event.observe('link1', 'click', function(event) { new Ajax.Updater('content','http://www.cakephp.org', {asynchronous:true, evalScripts:true, requestHeaders:['X-Update', 'content']}) }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * testAutoComplete method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoComplete() {
+		$result = $this->Ajax->autoComplete('PostAjaxTest.title' , '/posts', array('minChars' => 2));
+		$this->assertPattern('/^<input[^<>]+name="data\[PostAjaxTest\]\[title\]"[^<>]+autocomplete="off"[^<>]+\/>/', $result);
+		$this->assertPattern('/<div[^<>]+id="PostAjaxTestTitle_autoComplete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<div[^<>]+class="auto_complete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<\/div>\s+<script type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\',')) . '/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\', {minChars:2});')) . '/', $result);
+		$this->assertPattern('/<\/script>$/', $result);
+
+		$result = $this->Ajax->autoComplete('PostAjaxTest.title' , '/posts', array('paramName' => 'parameter'));
+		$this->assertPattern('/^<input[^<>]+name="data\[PostAjaxTest\]\[title\]"[^<>]+autocomplete="off"[^<>]+\/>/', $result);
+		$this->assertPattern('/<div[^<>]+id="PostAjaxTestTitle_autoComplete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<div[^<>]+class="auto_complete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<\/div>\s+<script type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\',')) . '/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\', {paramName:\'parameter\'});')) . '/', $result);
+		$this->assertPattern('/<\/script>$/', $result);
+
+		$result = $this->Ajax->autoComplete('PostAjaxTest.title' , '/posts', array('paramName' => 'parameter', 'updateElement' => 'elementUpdated', 'afterUpdateElement' => 'function (input, element) { alert("updated"); }'));
+		$this->assertPattern('/^<input[^<>]+name="data\[PostAjaxTest\]\[title\]"[^<>]+autocomplete="off"[^<>]+\/>/', $result);
+		$this->assertPattern('/<div[^<>]+id="PostAjaxTestTitle_autoComplete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<div[^<>]+class="auto_complete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<\/div>\s+<script type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\',')) . '/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\', {paramName:\'parameter\', updateElement:elementUpdated, afterUpdateElement:function (input, element) { alert("updated"); }});')) . '/', $result);
+		$this->assertPattern('/<\/script>$/', $result);
+
+		$result = $this->Ajax->autoComplete('PostAjaxTest.title' , '/posts', array('callback' => 'function (input, queryString) { alert("requesting"); }'));
+		$this->assertPattern('/^<input[^<>]+name="data\[PostAjaxTest\]\[title\]"[^<>]+autocomplete="off"[^<>]+\/>/', $result);
+		$this->assertPattern('/<div[^<>]+id="PostAjaxTestTitle_autoComplete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<div[^<>]+class="auto_complete"[^<>]*><\/div>/', $result);
+		$this->assertPattern('/<\/div>\s+<script type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\',')) . '/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Autocompleter(\'PostAjaxTestTitle\', \'PostAjaxTestTitle_autoComplete\', \'/posts\', {callback:function (input, queryString) { alert("requesting"); }});')) . '/', $result);
+		$this->assertPattern('/<\/script>$/', $result);
+
+		$result = $this->Ajax->autoComplete("PostAjaxText.title", "/post", array("parameters" => "'key=value&key2=value2'"));
+		$this->assertPattern('/{parameters:\'key=value&key2=value2\'}/', $result);
+
+		$result = $this->Ajax->autoComplete("PostAjaxText.title", "/post", array("with" => "'key=value&key2=value2'"));
+		$this->assertPattern('/{parameters:\'key=value&key2=value2\'}/', $result);
+
+	}
+/**
+ * testAsynchronous method
+ *
+ * @access public
+ * @return void
+ */
+	function testAsynchronous() {
+		$result = $this->Ajax->link('Test Link', '/', array('id' => 'link1', 'update' => 'content', 'type' => 'synchronous'));
+		$expected = array(
+			'a' => array('id' => 'link1', 'onclick' => ' event.returnValue = false; return false;', 'href' => '/'),
+			'Test Link',
+			'/a',
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Event.observe('link1', 'click', function(event) { new Ajax.Updater('content','/', {asynchronous:false, evalScripts:true, requestHeaders:['X-Update', 'content']}) }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * testDraggable method
+ *
+ * @access public
+ * @return void
+ */
+	function testDraggable() {
+		$result = $this->Ajax->drag('id', array('handle' => 'other_id'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Draggable('id', {handle:'other_id'});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->drag('id', array('onDrag' => 'doDrag', 'onEnd' => 'doEnd'));
+		$this->assertPattern('/onDrag:doDrag/', $result);
+		$this->assertPattern('/onEnd:doEnd/', $result);
+	}
+/**
+ * testDroppable method
+ *
+ * @access public
+ * @return void
+ */
+	function testDroppable() {
+		$result = $this->Ajax->drop('droppable', array('accept' => 'crap'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Droppables.add('droppable', {accept:'crap'});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->dropRemote('droppable', array('accept' => 'crap'), array('url' => '/posts'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Droppables.add('droppable', {accept:'crap', onDrop:function(element, droppable, event) {new Ajax.Request('/posts', {asynchronous:true, evalScripts:true})}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->dropRemote('droppable', array('accept' => array('crap1', 'crap2')), array('url' => '/posts'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Droppables.add('droppable', {accept:[\"crap1\",\"crap2\"], onDrop:function(element, droppable, event) {new Ajax.Request('/posts', {asynchronous:true, evalScripts:true})}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->dropRemote('droppable', array('accept' => 'crap'), array('url' => '/posts', 'with' => '{drag_id:element.id,drop_id:dropon.id,event:event.whatever_you_want}'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Droppables.add('droppable', {accept:'crap', onDrop:function(element, droppable, event) {new Ajax.Request('/posts', {asynchronous:true, evalScripts:true, parameters:{drag_id:element.id,drop_id:dropon.id,event:event.whatever_you_want}})}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * testForm method
+ *
+ * @access public
+ * @return void
+ */
+	function testForm() {
+		$result = $this->Ajax->form('showForm', 'post', array('model' => 'Form', 'url' => array('action' => 'showForm', 'controller' => 'forms'), 'update' => 'form_box'));
+		$this->assertNoPattern('/model=/', $result);
+
+		$result = $this->Ajax->form('showForm', 'post', array('name'=> 'SomeFormName', 'id' => 'MyFormID', 'url' => array('action' => 'showForm', 'controller' => 'forms'), 'update' => 'form_box'));
+		$this->assertPattern('/id="MyFormID"/', $result);
+		$this->assertPattern('/name="SomeFormName"/', $result);
+	}
+/**
+ * testSortable method
+ *
+ * @access public
+ * @return void
+ */
+	function testSortable() {
+		$result = $this->Ajax->sortable('ull', array('constraint' => false, 'ghosting' => true));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Sortable.create('ull', {constraint:false, ghosting:true});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->sortable('ull', array('constraint' => 'false', 'ghosting' => 'true'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Sortable.create('ull', {constraint:false, ghosting:true});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->sortable('ull', array('constraint'=>'false', 'ghosting'=>'true', 'update' => 'myId'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Sortable.create('ull', {constraint:false, ghosting:true, update:'myId'});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->sortable('faqs', array('url'=>'http://www.cakephp.org',
+			'update' => 'faqs',
+			'tag' => 'tbody',
+			'handle' => 'grip',
+			'before' => "Element.hide('message')",
+			'complete' => "Element.show('message');"
+		));
+		$expected = 'Sortable.create(\'faqs\', {update:\'faqs\', tag:\'tbody\', handle:\'grip\', onUpdate:function(sortable) {Element.hide(\'message\'); new Ajax.Updater(\'faqs\',\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, onComplete:function(request, json) {Element.show(\'message\');}, parameters:Sortable.serialize(\'faqs\'), requestHeaders:[\'X-Update\', \'faqs\']})}});';
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*' . str_replace('/', '\\/', preg_quote($expected)) . '\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+
+		$result = $this->Ajax->sortable('div', array('overlap' => 'foo'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"Sortable.create('div', {overlap:'foo'});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->sortable('div', array('block' => false));
+		$expected = "Sortable.create('div', {});";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Ajax->sortable('div', array('block' => false, 'scroll' => 'someID'));
+		$expected = "Sortable.create('div', {scroll:'someID'});";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Ajax->sortable('div', array('block' => false, 'scroll' => 'window'));
+		$expected = "Sortable.create('div', {scroll:window});";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Ajax->sortable('div', array('block' => false, 'scroll' => "$('someElement')"));
+		$expected = "Sortable.create('div', {scroll:$('someElement')});";
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testSubmitWithIndicator method
+ *
+ * @access public
+ * @return void
+ */
+	function testSubmitWithIndicator() {
+		$result = $this->Ajax->submit('Add', array('div' => false, 'url' => "http://www.cakephp.org", 'indicator' => 'loading', 'loading' => "doSomething()", 'complete' => 'doSomethingElse() '));
+		$this->assertPattern('/onLoading:function\(request\) {doSomething\(\);\s+Element.show\(\'loading\'\);}/', $result);
+		$this->assertPattern('/onComplete:function\(request, json\) {doSomethingElse\(\) ;\s+Element.hide\(\'loading\'\);}/', $result);
+	}
+/**
+ * testLink method
+ *
+ * @access public
+ * @return void
+ */
+	function testLink() {
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads');
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+id="link\d+"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'link\d+\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Request\(\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('confirm' => 'Are you sure & positive?'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+id="link\d+"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'link\d+\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*if \(confirm\(\'Are you sure & positive\?\'\)\) {\s*new Ajax\.Request\(\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true}\);\s*}\s*else\s*{\s*event.returnValue = false;\s*return false;\s*}\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('update' => 'myDiv'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+id="link\d+"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'link\d+\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Updater\(\'myDiv\',\s*\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true, requestHeaders:\[\'X-Update\', \'myDiv\'\]}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('update' => 'myDiv', 'id' => 'myLink'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+id="myLink"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'myLink\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Updater\(\'myDiv\',\s*\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true, requestHeaders:\[\'X-Update\', \'myDiv\'\]}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('update' => 'myDiv', 'id' => 'myLink', 'complete' => 'myComplete();'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+id="myLink"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'myLink\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Updater\(\'myDiv\',\s*\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true, onComplete:function\(request, json\) {myComplete\(\);}, requestHeaders:\[\'X-Update\', \'myDiv\'\]}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('update' => 'myDiv', 'id' => 'myLink', 'loading' => 'myLoading();', 'complete' => 'myComplete();'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+id="myLink"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'myLink\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Updater\(\'myDiv\',\s*\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true, onComplete:function\(request, json\) {myComplete\(\);}, onLoading:function\(request\) {myLoading\(\);}, requestHeaders:\[\'X-Update\', \'myDiv\'\]}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('update' => 'myDiv', 'encoding' => 'utf-8'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'\w+\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Updater\(\'myDiv\',\s*\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true, encoding:\'utf-8\', requestHeaders:\[\'X-Update\', \'myDiv\'\]}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('update' => 'myDiv', 'success' => 'success();'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'\w+\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Updater\(\'myDiv\',\s*\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true, onSuccess:function\(request\) {success\(\);}, requestHeaders:\[\'X-Update\', \'myDiv\'\]}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', 'http://www.cakephp.org/downloads', array('update' => 'myDiv', 'failure' => 'failure();'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/^<a[^<>]+href="http:\/\/www.cakephp.org\/downloads"[^<>]*>/', $result);
+		$this->assertPattern('/^<a[^<>]+onclick="\s*event.returnValue = false;\s*return false;"[^<>]*>/', $result);
+		$this->assertPattern('/<script[^<>]+type="text\/javascript"[^<>]*>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/Event.observe\(\'\w+\',\s*\'click\',\s*function\(event\)\s*{.+},\s*false\);\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/function\(event\)\s*{\s*new Ajax\.Updater\(\'myDiv\',\s*\'http:\/\/www.cakephp.org\/downloads\',\s*{asynchronous:true, evalScripts:true, onFailure:function\(request\) {failure\(\);}, requestHeaders:\[\'X-Update\', \'myDiv\'\]}\)\s*},\s*false\);/', $result);
+
+		$result = $this->Ajax->link('Ajax Link', '/test', array('complete' => 'test'));
+		$this->assertPattern('/^<a[^<>]+>Ajax Link<\/a><script [^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*[^<>]+\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern("/Event.observe\('link[0-9]+', [\w\d,'\(\)\s{}]+Ajax\.Request\([\w\d\s,'\(\){}:\/]+onComplete:function\(request, json\) {test}/", $result);
+		$this->assertNoPattern('/^<a[^<>]+complete="test"[^<>]*>Ajax Link<\/a>/', $result);
+		$this->assertNoPattern('/^<a\s+[^<>]*url="[^"]*"[^<>]*>/', $result);
+
+		$result = $this->Ajax->link(
+			'Ajax Link',
+			array('controller' => 'posts', 'action' => 'index', '?' => array('one' => '1', 'two' => '2')),
+			array('update' => 'myDiv', 'id' => 'myLink')
+		);
+		$this->assertPattern('#/posts\?one\=1\&two\=2#', $result);
+	}
+/**
+ * testRemoteTimer method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoteTimer() {
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true})')) . '/', $result);
+
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org', 'frequency' => 25));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 25\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true})')) . '/', $result);
+
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org', 'complete' => 'complete();'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, onComplete:function(request, json) {complete();}})')) . '/', $result);
+
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org', 'complete' => 'complete();', 'create' => 'create();'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, onComplete:function(request, json) {complete();}, onCreate:function(request, xhr) {create();}})')) . '/', $result);
+
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org', 'exception' => 'alert(exception);'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, onException:function(request, exception) {alert(exception);}})')) . '/', $result);
+
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org', 'contentType' => 'application/x-www-form-urlencoded'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, contentType:\'application/x-www-form-urlencoded\'})')) . '/', $result);
+
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org', 'method' => 'get', 'encoding' => 'utf-8'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, method:\'get\', encoding:\'utf-8\'})')) . '/', $result);
+
+		$result = $this->Ajax->remoteTimer(array('url' => 'http://www.cakephp.org', 'postBody' => 'var1=value1'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new PeriodicalExecuter\(function\(pe\) {.+}, 10\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, postBody:\'var1=value1\'})')) . '/', $result);
+	}
+/**
+ * testObserveField method
+ *
+ * @access public
+ * @return void
+ */
+	function testObserveField() {
+		$result = $this->Ajax->observeField('field', array('url' => 'http://www.cakephp.org'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new Form.Element.EventObserver\(\'field\', function\(element, value\) {.+}\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, parameters:Form.Element.serialize(\'field\')})')) . '/', $result);
+
+		$result = $this->Ajax->observeField('field', array('url' => 'http://www.cakephp.org', 'frequency' => 15));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new Form.Element.Observer\(\'field\', 15, function\(element, value\) {.+}\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Request(\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, parameters:Form.Element.serialize(\'field\')})')) . '/', $result);
+
+		$result = $this->Ajax->observeField('field', array('url' => 'http://www.cakephp.org', 'update' => 'divId'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new Form.Element.EventObserver\(\'field\', function\(element, value\) {.+}\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Updater(\'divId\',\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, parameters:Form.Element.serialize(\'field\'), requestHeaders:[\'X-Update\', \'divId\']})')) . '/', $result);
+
+		$result = $this->Ajax->observeField('field', array('url' => 'http://www.cakephp.org', 'update' => 'divId', 'with' => 'Form.Element.serialize(\'otherField\')'));
+		$this->assertPattern('/^<script[^<>]+type="text\/javascript"[^<>]*>.+<\/script>$/s', $result);
+		$this->assertNoPattern('/<script[^<>]+[^type]=[^<>]*>/', $result);
+		$this->assertPattern('/^<script[^<>]+>\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*new Form.Element.EventObserver\(\'field\', function\(element, value\) {.+}\)\s*' . str_replace('/', '\\/', preg_quote('//]]>')) . '\s*<\/script>$/', $result);
+		$this->assertPattern('/' . str_replace('/', '\\/', preg_quote('new Ajax.Updater(\'divId\',\'http://www.cakephp.org\', {asynchronous:true, evalScripts:true, parameters:Form.Element.serialize(\'otherField\'), requestHeaders:[\'X-Update\', \'divId\']})')) . '/', $result);
+	}
+/**
+ * testObserveForm method
+ *
+ * @access public
+ * @return void
+ */
+	function testObserveForm() {
+		$result = $this->Ajax->observeForm('form', array('url' => 'http://www.cakephp.org'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Form.EventObserver('form', function(element, value) {new Ajax.Request('http://www.cakephp.org', {asynchronous:true, evalScripts:true, parameters:Form.serialize('form')})})",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->observeForm('form', array('url' => 'http://www.cakephp.org', 'frequency' => 15));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Form.Observer('form', 15, function(element, value) {new Ajax.Request('http://www.cakephp.org', {asynchronous:true, evalScripts:true, parameters:Form.serialize('form')})})",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->observeForm('form', array('url' => 'http://www.cakephp.org', 'update' => 'divId'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Form.EventObserver('form', function(element, value) {new Ajax.Updater('divId','http://www.cakephp.org', {asynchronous:true, evalScripts:true, parameters:Form.serialize('form'), requestHeaders:['X-Update', 'divId']})}",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->observeForm('form', array('url' => 'http://www.cakephp.org', 'update' => 'divId', 'with' => "Form.serialize('otherForm')"));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Form.EventObserver('form', function(element, value) {new Ajax.Updater('divId','http://www.cakephp.org', {asynchronous:true, evalScripts:true, parameters:Form.serialize('otherForm'), requestHeaders:['X-Update', 'divId']})}",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * testSlider method
+ *
+ * @access public
+ * @return void
+ */
+	function testSlider() {
+		$result = $this->Ajax->slider('sliderId', 'trackId');
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var sliderId = new Control.Slider('sliderId', 'trackId', {});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->slider('sliderId', 'trackId', array('axis' => 'vertical'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var sliderId = new Control.Slider('sliderId', 'trackId', {axis:'vertical'});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->slider('sliderId', 'trackId', array('axis' => 'vertical', 'minimum' => 60, 'maximum' => 288, 'alignX' => -28, 'alignY' => -5, 'disabled' => true));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var sliderId = new Control.Slider('sliderId', 'trackId', {axis:'vertical', minimum:60, maximum:288, alignX:-28, alignY:-5, disabled:true});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->slider('sliderId', 'trackId', array('change' => "alert('changed');"));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var sliderId = new Control.Slider('sliderId', 'trackId', {onChange:function(value) {alert('changed');}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->slider('sliderId', 'trackId', array('change' => "alert('changed');", 'slide' => "alert('sliding');"));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var sliderId = new Control.Slider('sliderId', 'trackId', {onChange:function(value) {alert('changed');}, onSlide:function(value) {alert('sliding');}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->slider('sliderId', 'trackId', array('values' => array(10, 20, 30)));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var sliderId = new Control.Slider('sliderId', 'trackId', {values:[10,20,30]});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->slider('sliderId', 'trackId', array('range' => '$R(10, 30)'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var sliderId = new Control.Slider('sliderId', 'trackId', {range:\$R(10, 30)});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * testRemoteFunction method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoteFunction() {
+		$result = $this->Ajax->remoteFunction(array('complete' => 'testComplete();'));
+		$expected = "new Ajax.Request('/', {asynchronous:true, evalScripts:true, onComplete:function(request, json) {testComplete();}})";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Ajax->remoteFunction(array('update' => 'myDiv'));
+		$expected = "new Ajax.Updater('myDiv','/', {asynchronous:true, evalScripts:true, requestHeaders:['X-Update', 'myDiv']})";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Ajax->remoteFunction(array('update' => array('div1', 'div2')));
+		$expected = "new Ajax.Updater(document.createElement('div'),'/', {asynchronous:true, evalScripts:true, requestHeaders:['X-Update', 'div1 div2']})";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Ajax->remoteFunction(array('update' => 'myDiv', 'confirm' => 'Are you sure?'));
+		$expected = "if (confirm('Are you sure?')) { new Ajax.Updater('myDiv','/', {asynchronous:true, evalScripts:true, requestHeaders:['X-Update', 'myDiv']}); } else { event.returnValue = false; return false; }";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDiv method
+ *
+ * @access public
+ * @return void
+ */
+	function testDiv() {
+		ob_start();
+		$oldXUpdate = env('HTTP_X_UPDATE');
+
+		$result = $this->Ajax->div('myDiv');
+		$this->assertTags($result, array('div' => array('id' => 'myDiv')));
+
+		$_SERVER['HTTP_X_UPDATE'] = null;
+		$result = $this->Ajax->divEnd('myDiv');
+		$this->assertTags($result, '/div');
+
+		$_SERVER['HTTP_X_UPDATE'] = 'secondDiv';
+		$result = $this->Ajax->div('myDiv');
+		$this->assertTags($result, array('div' => array('id' => 'myDiv')));
+		$result = $this->Ajax->divEnd('myDiv');
+		$this->assertTags($result, '/div');
+
+		$_SERVER['HTTP_X_UPDATE'] = 'secondDiv myDiv anotherDiv';
+		$result = $this->Ajax->div('myDiv');
+		$this->assertTrue(empty($result));
+
+		$result = $this->Ajax->divEnd('myDiv');
+		$this->assertTrue(empty($result));
+
+		$_SERVER['HTTP_X_UPDATE'] = $oldXUpdate;
+	}
+/**
+ * testAfterRender method
+ *
+ * @access public
+ * @return void
+ */
+	function testAfterRender() {
+		ob_start();
+		$oldXUpdate = env('HTTP_X_UPDATE');
+		$this->Ajax->Javascript =& new TestJavascriptHelper();
+
+		$_SERVER['HTTP_X_UPDATE'] = 'secondDiv myDiv anotherDiv';
+		$result = $this->Ajax->div('myDiv');
+		$this->assertTrue(empty($result));
+
+		echo 'Contents of myDiv';
+
+		$result = $this->Ajax->divEnd('myDiv');
+		$this->assertTrue(empty($result));
+
+		ob_start();
+		$this->Ajax->afterRender();
+
+		$result = array_shift($this->Ajax->Javascript->codeBlocks);
+		$this->assertPattern('/^\s*' . str_replace('/', '\\/', preg_quote('var __ajaxUpdater__ = {myDiv:"Contents%20of%20myDiv"};')) . '\s*' . str_replace('/', '\\/', preg_quote('for (n in __ajaxUpdater__) { if (typeof __ajaxUpdater__[n] == "string" && $(n)) Element.update($(n), unescape(decodeURIComponent(__ajaxUpdater__[n]))); }')) . '\s*$/s', $result);
+
+		$_SERVER['HTTP_X_UPDATE'] = $oldXUpdate;
+	}
+/**
+ * testEditor method
+ *
+ * @access public
+ * @return void
+ */
+	function testEditor() {
+		$result = $this->Ajax->editor('myDiv', '/');
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Ajax.InPlaceEditor('myDiv', '/', {ajaxOptions:{asynchronous:true, evalScripts:true}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->editor('myDiv', '/', array('complete' => 'testComplete();'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Ajax.InPlaceEditor('myDiv', '/', {ajaxOptions:{asynchronous:true, evalScripts:true, onComplete:function(request, json) {testComplete();}}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->editor('myDiv', '/', array('callback' => 'callback();'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Ajax.InPlaceEditor('myDiv', '/', {callback:function(form, value) {callback();}, ajaxOptions:{asynchronous:true, evalScripts:true}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->editor('myDiv', '/', array('collection' => array(1 => 'first', 2 => 'second')));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"new Ajax.InPlaceCollectionEditor('myDiv', '/', {collection:{\"1\":\"first\",\"2\":\"second\"}, ajaxOptions:{asynchronous:true, evalScripts:true}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Ajax->editor('myDiv', '/', array('var' => 'myVar'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript')),
+			$this->cDataStart,
+			"var myVar = new Ajax.InPlaceEditor('myDiv', '/', {ajaxOptions:{asynchronous:true, evalScripts:true}});",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/cache.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/cache.test.php
new file mode 100644
index 000000000..01a8c0bcc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/cache.test.php
@@ -0,0 +1,571 @@
+<?php
+/**
+ * CacheHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('Controller', 'Model', 'View'));
+App::import('Helper', 'Cache');
+
+/**
+ * CacheTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class CacheTestController extends Controller {
+
+/**
+ * helpers property
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html', 'Cache');
+
+/**
+ * cache_parsing method
+ *
+ * @access public
+ * @return void
+ */
+	function cache_parsing() {
+		$this->viewPath = 'posts';
+		$this->layout = 'cache_layout';
+		$this->set('variable', 'variableValue');
+		$this->set('superman', 'clark kent');
+		$this->set('batman', 'bruce wayne');
+		$this->set('spiderman', 'peter parker');
+	}
+}
+
+/**
+ * CacheHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class CacheHelperTest extends CakeTestCase {
+
+/**
+ * Checks if TMP/views is writable, and skips the case if it is not.
+ *
+ * @return void
+ */
+	function skip() {
+		$this->skipUnless(is_writable(TMP . 'cache' . DS . 'views' . DS), 'TMP/views is not writable %s');
+	}
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Controller = new CacheTestController();
+		$this->Cache = new CacheHelper();
+		$this->_cacheSettings = Configure::read('Cache');
+		Configure::write('Cache.check', true);
+		Configure::write('Cache.disable', false);
+	}
+
+/**
+ * Start Case - switch view paths
+ *
+ * @access public
+ * @return void
+ */
+	function startCase() {
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		), true);
+	}
+
+/**
+ * End Case - restore view Paths
+ *
+ * @access public
+ * @return void
+ */
+	function endCase() {
+		App::build();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		clearCache();
+		unset($this->Cache);
+		Configure::write('Cache', $this->_cacheSettings);
+	}
+
+/**
+ * test cache parsing with no cake:nocache tags in view file.
+ *
+ * @access public
+ * @return void
+ */
+	function testLayoutCacheParsingNoTagsInView() {
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = 21600;
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+
+		$contents = file_get_contents($filename);
+		$this->assertPattern('/php echo \$variable/', $contents);
+		$this->assertPattern('/php echo microtime()/', $contents);
+		$this->assertPattern('/clark kent/', $result);
+
+		@unlink($filename);
+	}
+
+/**
+ * test cache parsing with non-latin characters in current route
+ *
+ * @access public
+ * @return void
+ */
+	function testCacheNonLatinCharactersInRoute() {
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array('風街��ん'),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = 21600;
+		$this->Controller->here = '/posts/view/風街��ん';
+		$this->Controller->action = 'view';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$filename = CACHE . 'views' . DS . 'posts_view_風街��ん.php';
+		$this->assertTrue(file_exists($filename));
+
+		@unlink($filename);
+	}
+/**
+ * Test cache parsing with cake:nocache tags in view file.
+ *
+ * @access public
+ * @return void
+ */
+	function testLayoutCacheParsingWithTagsInView() {
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = 21600;
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('test_nocache_tags');
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+
+		$contents = file_get_contents($filename);
+		$this->assertPattern('/if \(is_writable\(TMP\)\)\:/', $contents);
+		$this->assertPattern('/php echo \$variable/', $contents);
+		$this->assertPattern('/php echo microtime()/', $contents);
+		$this->assertNoPattern('/cake:nocache/', $contents);
+
+		@unlink($filename);
+	}
+
+/**
+ * test that multiple <cake:nocache> tags function with multiple nocache tags in the layout.
+ *
+ * @return void
+ */
+	function testMultipleNoCacheTagsInViewfile() {
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = 21600;
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('multiple_nocache');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+
+		$contents = file_get_contents($filename);
+		$this->assertNoPattern('/cake:nocache/', $contents);
+		@unlink($filename);
+	}
+
+/**
+ * testComplexNoCache method
+ *
+ * @return void
+ * @access public
+ */
+	function testComplexNoCache () {
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_complex',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = array('cache_complex' => 21600);
+		$this->Controller->here = '/cacheTest/cache_complex';
+		$this->Controller->action = 'cache_complex';
+		$this->Controller->layout = 'multi_cache';
+		$this->Controller->viewPath = 'posts';
+
+		$View = new View($this->Controller);
+		$result = $View->render('sequencial_nocache');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+		$this->assertPattern('/A\. Layout Before Content/', $result);
+		$this->assertPattern('/B\. In Plain Element/', $result);
+		$this->assertPattern('/C\. Layout After Test Element/', $result);
+		$this->assertPattern('/D\. In View File/', $result);
+		$this->assertPattern('/E\. Layout After Content/', $result);
+		//$this->assertPattern('/F\. In Element With No Cache Tags/', $result);
+		$this->assertPattern('/G\. Layout After Content And After Element With No Cache Tags/', $result);
+		$this->assertNoPattern('/1\. layout before content/', $result);
+		$this->assertNoPattern('/2\. in plain element/', $result);
+		$this->assertNoPattern('/3\. layout after test element/', $result);
+		$this->assertNoPattern('/4\. in view file/', $result);
+		$this->assertNoPattern('/5\. layout after content/', $result);
+		//$this->assertNoPattern('/6\. in element with no cache tags/', $result);
+		$this->assertNoPattern('/7\. layout after content and after element with no cache tags/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_complex.php';
+		$this->assertTrue(file_exists($filename));
+		$contents = file_get_contents($filename);
+		@unlink($filename);
+
+		$this->assertPattern('/A\. Layout Before Content/', $contents);
+		$this->assertNoPattern('/B\. In Plain Element/', $contents);
+		$this->assertPattern('/C\. Layout After Test Element/', $contents);
+		$this->assertPattern('/D\. In View File/', $contents);
+		$this->assertPattern('/E\. Layout After Content/', $contents);
+		//$this->assertPattern('/F\. In Element With No Cache Tags/', $contents);
+		$this->assertPattern('/G\. Layout After Content And After Element With No Cache Tags/', $contents);
+		$this->assertPattern('/1\. layout before content/', $contents);
+		$this->assertNoPattern('/2\. in plain element/', $contents);
+		$this->assertPattern('/3\. layout after test element/', $contents);
+		$this->assertPattern('/4\. in view file/', $contents);
+		$this->assertPattern('/5\. layout after content/', $contents);
+		//$this->assertPattern('/6\. in element with no cache tags/', $contents);
+		$this->assertPattern('/7\. layout after content and after element with no cache tags/', $contents);
+	}
+
+/**
+ * test cache of view vars
+ *
+ * @access public
+ * @return void
+ */
+	function testCacheViewVars() {
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = 21600;
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+
+		$contents = file_get_contents($filename);
+		$this->assertPattern('/\$this\-\>viewVars/', $contents);
+		$this->assertPattern('/extract\(\$this\-\>viewVars, EXTR_SKIP\);/', $contents);
+		$this->assertPattern('/php echo \$variable/', $contents);
+
+		@unlink($filename);
+	}
+
+/**
+ * test cacheAction set to a boolean
+ *
+ * @return void
+ */
+	function testCacheActionArray() {
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = array(
+			'cache_parsing' => 21600
+		);
+		$this->Controller->here = '/cache_test/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cache_test_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+
+
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_parsing' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+
+
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = array(
+			'some_other_action' => 21600
+		);
+		$this->Controller->here = '/cacheTest/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_parsing.php';
+		$this->assertFalse(file_exists($filename));
+	}
+
+/**
+ * test with named and pass args.
+ *
+ * @return void
+ */
+	function testCacheWithNamedAndPassedArgs() {
+		Router::reload();
+
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(1, 2),
+			'named' => array(
+				'name' => 'mark',
+				'ice' => 'cream'
+			)
+		);
+		$this->Controller->cacheAction = array(
+			'cache_parsing' => 21600
+		);
+		$this->Controller->here = '/cache_test/cache_parsing/1/2/name:mark/ice:cream';
+		$this->Controller->action = 'cache_parsing';
+		
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cache_test_cache_parsing_1_2_name_mark_ice_cream.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+	}
+
+/**
+ * test that custom routes are respected when generating cache files.
+ *
+ * @return void
+ */
+	function testCacheWithCustomRoutes() {
+		Router::reload();
+		Router::connect('/:lang/:controller/:action/*', array(), array('lang' => '[a-z]{3}'));
+		
+		$this->Controller->cache_parsing();
+		$this->Controller->params = array(
+			'lang' => 'en',
+			'controller' => 'cache_test',
+			'action' => 'cache_parsing',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->cacheAction = array(
+			'cache_parsing' => 21600
+		);
+		$this->Controller->here = '/en/cache_test/cache_parsing';
+		$this->Controller->action = 'cache_parsing';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'en_cache_test_cache_parsing.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+	}
+
+/**
+ * test ControllerName contains AppName
+ *
+ * This test verifys view cache is created correctly when the app name is contained in part of the controller name.
+ * (webapp Name) base name is 'cache' controller is 'cacheTest' action is 'cache_name'
+ * apps url would look somehing like http://localhost/cache/cacheTest/cache_name
+ *
+ * @return void
+ **/
+	function testCacheBaseNameControllerName() {
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array(
+			'cache_name' => 21600
+		);
+		$this->Controller->params = array(
+			'controller' => 'cacheTest',
+			'action' => 'cache_name',
+			'url' => array(),
+			'pass' => array(),
+			'named' => array()
+		);
+		$this->Controller->here = '/cache/cacheTest/cache_name';
+		$this->Controller->action = 'cache_name';
+		$this->Controller->base = '/cache';
+
+		$View = new View($this->Controller);
+		$result = $View->render('index');
+
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+
+		$filename = CACHE . 'views' . DS . 'cache_cachetest_cache_name.php';
+		$this->assertTrue(file_exists($filename));
+		@unlink($filename);
+    }
+
+/**
+ * testCacheEmptySections method
+ *
+ * This test must be uncommented/fixed in next release (1.2+)
+ *
+ * @return void
+ * @access public
+ *
+	function testCacheEmptySections () {
+		$this->Controller->cache_parsing();
+		$this->Controller->cacheAction = array('cacheTest' => 21600);
+		$this->Controller->here = '/cacheTest/cache_empty_sections';
+		$this->Controller->action = 'cache_empty_sections';
+		$this->Controller->layout = 'cache_empty_sections';
+		$this->Controller->viewPath = 'posts';
+
+		$View = new View($this->Controller);
+		$result = $View->render('cache_empty_sections');
+		$this->assertNoPattern('/cake:nocache/', $result);
+		$this->assertNoPattern('/php echo/', $result);
+		$this->assertPattern(
+			'@</title>\s*</head>\s*' .
+			'<body>\s*' .
+			'View Content\s*' .
+			'cached count is: 3\s*' .
+			'</body>@', $result);
+
+		$filename = CACHE . 'views' . DS . 'cachetest_cache_empty_sections.php';
+		$this->assertTrue(file_exists($filename));
+		$contents = file_get_contents($filename);
+		$this->assertNoPattern('/cake:nocache/', $contents);
+		$this->assertPattern(
+			'@<head>\s*<title>Posts</title>\s*' .
+			"<\?php \$x = 1; \?>\s*" .
+			'</head>\s*' .
+			'<body>\s*' .
+			"<\?php \$x\+\+; \?>\s*" .
+			"<\?php \$x\+\+; \?>\s*" .
+			'View Content\s*' .
+			"<\?php \$y = 1; \?>\s*" .
+			"<\?php echo 'cached count is:' . \$x; \?>\s*" .
+			'@', $contents);
+		@unlink($filename);
+	}
+*/
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/form.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/form.test.php
new file mode 100644
index 000000000..47fcabd1d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/form.test.php
@@ -0,0 +1,6864 @@
+<?php
+/**
+ * FormHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('ClassRegistry', 'Controller', 'View', 'Model', 'Security'));
+App::import('Helper', 'Html');
+App::import('Helper', 'Form');
+
+/**
+ * ContactTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class ContactTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'ContactTest'
+ * @access public
+ */
+	var $name = 'ContactTest';
+
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+}
+
+/**
+ * Contact class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class Contact extends CakeTestModel {
+
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'Contact'
+ * @access public
+ */
+	var $name = 'Contact';
+
+/**
+ * Default schema
+ *
+ * @var array
+ * @access public
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'email' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'phone' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'password' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'published' => array('type' => 'date', 'null' => true, 'default' => null, 'length' => null),
+		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array(
+		'non_existing' => array(),
+		'idontexist' => array(),
+		'imrequired' => array('rule' => array('between', 5, 30), 'allowEmpty' => false),
+		'imalsorequired' => array('rule' => 'alphaNumeric', 'allowEmpty' => false),
+		'imrequiredtoo' => array('rule' => 'notEmpty'),
+		'required_one' => array('required' => array('rule' => array('notEmpty'))),
+		'imnotrequired' => array('required' => false, 'rule' => 'alphaNumeric', 'allowEmpty' => true),
+		'imalsonotrequired' => array(
+			'alpha' => array('rule' => 'alphaNumeric','allowEmpty' => true),
+			'between' => array('rule' => array('between', 5, 30)),
+		),
+		'imnotrequiredeither' => array('required' => true, 'rule' => array('between', 5, 30), 'allowEmpty' => true),
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function setSchema($schema) {
+		$this->_schema = $schema;
+	}
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasAndBelongsToMany = array('ContactTag' => array('with' => 'ContactTagsContact'));
+
+/**
+ * hasAndBelongsToMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('User' => array('className' => 'UserForm'));
+}
+
+/**
+ * ContactTagsContact class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class ContactTagsContact extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'Contact'
+ * @access public
+ */
+	var $name = 'ContactTagsContact';
+
+/**
+ * Default schema
+ *
+ * @var array
+ * @access public
+ */
+	var $_schema = array(
+		'contact_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'contact_tag_id' => array(
+			'type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'
+		)
+	);
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function setSchema($schema) {
+		$this->_schema = $schema;
+	}
+}
+
+/**
+ * ContactNonStandardPk class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class ContactNonStandardPk extends Contact {
+
+/**
+ * primaryKey property
+ *
+ * @var string 'pk'
+ * @access public
+ */
+	var $primaryKey = 'pk';
+
+/**
+ * name property
+ *
+ * @var string 'ContactNonStandardPk'
+ * @access public
+ */
+	var $name = 'ContactNonStandardPk';
+
+/**
+ * schema method
+ *
+ * @access public
+ * @return void
+ */
+	function schema() {
+		$this->_schema = parent::schema();
+		$this->_schema['pk'] = $this->_schema['id'];
+		unset($this->_schema['id']);
+		return $this->_schema;
+	}
+}
+
+/**
+ * ContactTag class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class ContactTag extends Model {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema definition
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => false, 'default' => '', 'length' => '8'),
+		'name' => array('type' => 'string', 'null' => false, 'default' => '', 'length' => '255'),
+		'created' => array('type' => 'date', 'null' => true, 'default' => '', 'length' => ''),
+		'modified' => array('type' => 'datetime', 'null' => true, 'default' => '', 'length' => null)
+	);
+}
+
+/**
+ * UserForm class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class UserForm extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+
+/**
+ * name property
+ *
+ * @var string 'UserForm'
+ * @access public
+ */
+	var $name = 'UserForm';
+
+/**
+ * hasMany property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasMany = array(
+		'OpenidUrl' => array('className' => 'OpenidUrl', 'foreignKey' => 'user_form_id'
+	));
+
+/**
+ * schema definition
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'published' => array('type' => 'date', 'null' => true, 'default' => null, 'length' => null),
+		'other' => array('type' => 'text', 'null' => true, 'default' => null, 'length' => null),
+		'stuff' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 10),
+		'something' => array('type' => 'string', 'null' => true, 'default' => null, 'length' => 255),
+		'active' => array('type' => 'boolean', 'null' => false, 'default' => false),
+		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+}
+
+/**
+ * OpenidUrl class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class OpenidUrl extends CakeTestModel {
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+
+/**
+ * name property
+ *
+ * @var string 'OpenidUrl'
+ * @access public
+ */
+	var $name = 'OpenidUrl';
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('UserForm' => array(
+		'className' => 'UserForm', 'foreignKey' => 'user_form_id'
+	));
+
+/**
+ * validate property
+ *
+ * @var array
+ * @access public
+ */
+	var $validate = array('openid_not_registered' => array());
+
+/**
+ * schema method
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'user_form_id' => array(
+			'type' => 'user_form_id', 'null' => '', 'default' => '', 'length' => '8'
+		),
+		'url' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+	);
+
+/**
+ * beforeValidate method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeValidate() {
+		$this->invalidate('openid_not_registered');
+		return true;
+	}
+}
+
+/**
+ * ValidateUser class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class ValidateUser extends CakeTestModel {
+
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'ValidateUser'
+ * @access public
+ */
+	var $name = 'ValidateUser';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('ValidateProfile' => array(
+		'className' => 'ValidateProfile', 'foreignKey' => 'user_id'
+	));
+
+/**
+ * schema method
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'email' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'balance' => array('type' => 'float', 'null' => false, 'length' => '5,2'),
+		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+
+/**
+ * beforeValidate method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeValidate() {
+		$this->invalidate('email');
+		return false;
+	}
+}
+
+/**
+ * ValidateProfile class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class ValidateProfile extends CakeTestModel {
+
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'user_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'full_name' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'city' => array('type' => 'string', 'null' => '', 'default' => '', 'length' => '255'),
+		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+
+/**
+ * name property
+ *
+ * @var string 'ValidateProfile'
+ * @access public
+ */
+	var $name = 'ValidateProfile';
+
+/**
+ * hasOne property
+ *
+ * @var array
+ * @access public
+ */
+	var $hasOne = array('ValidateItem' => array(
+		'className' => 'ValidateItem', 'foreignKey' => 'profile_id'
+	));
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('ValidateUser' => array(
+		'className' => 'ValidateUser', 'foreignKey' => 'user_id'
+	));
+
+/**
+ * beforeValidate method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeValidate() {
+		$this->invalidate('full_name');
+		$this->invalidate('city');
+		return false;
+	}
+}
+
+/**
+ * ValidateItem class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class ValidateItem extends CakeTestModel {
+
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'ValidateItem'
+ * @access public
+ */
+	var $name = 'ValidateItem';
+
+/**
+ * schema property
+ *
+ * @var array
+ * @access protected
+ */
+	var $_schema = array(
+		'id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'profile_id' => array('type' => 'integer', 'null' => '', 'default' => '', 'length' => '8'),
+		'name' => array('type' => 'text', 'null' => '', 'default' => '', 'length' => '255'),
+		'description' => array(
+			'type' => 'string', 'null' => '', 'default' => '', 'length' => '255'
+		),
+		'created' => array('type' => 'date', 'null' => '1', 'default' => '', 'length' => ''),
+		'updated' => array('type' => 'datetime', 'null' => '1', 'default' => '', 'length' => null)
+	);
+
+/**
+ * belongsTo property
+ *
+ * @var array
+ * @access public
+ */
+	var $belongsTo = array('ValidateProfile' => array('foreignKey' => 'profile_id'));
+
+/**
+ * beforeValidate method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeValidate() {
+		$this->invalidate('description');
+		return false;
+	}
+}
+
+/**
+ * TestMail class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TestMail extends CakeTestModel {
+
+/**
+ * primaryKey property
+ *
+ * @var string 'id'
+ * @access public
+ */
+	var $primaryKey = 'id';
+
+/**
+ * useTable property
+ *
+ * @var bool false
+ * @access public
+ */
+	var $useTable = false;
+
+/**
+ * name property
+ *
+ * @var string 'TestMail'
+ * @access public
+ */
+	var $name = 'TestMail';
+}
+
+/**
+ * FormHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class FormHelperTest extends CakeTestCase {
+
+/**
+ * fixtures property
+ *
+ * @var array
+ * @access public
+ */
+	var $fixtures = array(null);
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		parent::setUp();
+		Router::reload();
+
+		$this->Form =& new FormHelper();
+		$this->Form->Html =& new HtmlHelper();
+		$this->Controller =& new ContactTestController();
+		$this->View =& new View($this->Controller);
+		$this->Form->params['action'] = 'add';
+
+		ClassRegistry::addObject('view', $view);
+		ClassRegistry::addObject('Contact', new Contact());
+		ClassRegistry::addObject('ContactNonStandardPk', new ContactNonStandardPk());
+		ClassRegistry::addObject('OpenidUrl', new OpenidUrl());
+		ClassRegistry::addObject('UserForm', new UserForm());
+		ClassRegistry::addObject('ValidateItem', new ValidateItem());
+		ClassRegistry::addObject('ValidateUser', new ValidateUser());
+		ClassRegistry::addObject('ValidateProfile', new ValidateProfile());
+
+		$this->oldSalt = Configure::read('Security.salt');
+
+		$this->dateRegex = array(
+			'daysRegex' => 'preg:/(?:<option value="0?([\d]+)">\\1<\/option>[\r\n]*)*/',
+			'monthsRegex' => 'preg:/(?:<option value="[\d]+">[\w]+<\/option>[\r\n]*)*/',
+			'yearsRegex' => 'preg:/(?:<option value="([\d]+)">\\1<\/option>[\r\n]*)*/',
+			'hoursRegex' => 'preg:/(?:<option value="0?([\d]+)">\\1<\/option>[\r\n]*)*/',
+			'minutesRegex' => 'preg:/(?:<option value="([\d]+)">0?\\1<\/option>[\r\n]*)*/',
+			'meridianRegex' => 'preg:/(?:<option value="(am|pm)">\\1<\/option>[\r\n]*)*/',
+		);
+
+		Configure::write('Security.salt', 'foo!');
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		ClassRegistry::removeObject('view');
+		ClassRegistry::removeObject('Contact');
+		ClassRegistry::removeObject('ContactNonStandardPk');
+		ClassRegistry::removeObject('ContactTag');
+		ClassRegistry::removeObject('OpenidUrl');
+		ClassRegistry::removeObject('UserForm');
+		ClassRegistry::removeObject('ValidateItem');
+		ClassRegistry::removeObject('ValidateUser');
+		ClassRegistry::removeObject('ValidateProfile');
+		unset($this->Form->Html, $this->Form, $this->Controller, $this->View);
+		Configure::write('Security.salt', $this->oldSalt);
+	}
+
+
+
+/**
+ * testFormCreateWithSecurity method
+ *
+ * Test form->create() with security key.
+ *
+ * @access public
+ * @return void
+ */
+	function testCreateWithSecurity() {
+		$this->Form->params['_Token'] = array('key' => 'testKey');
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$result = $this->Form->create('Contact', array('url' => '/contacts/add'));
+		$expected = array(
+			'form' => array('method' => 'post', 'action' => '/contacts/add', 'accept-charset' => $encoding),
+			'div' => array('style' => 'display:none;'),
+			array('input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST')),
+			array('input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][key]', 'value' => 'testKey', 'id'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected,true);
+
+		$result = $this->Form->create('Contact', array('url' => '/contacts/add', 'id' => 'MyForm'));
+		$expected['form']['id'] = 'MyForm';
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that create() clears the fields property so it starts fresh
+ *
+ * @return void
+ */
+	function testCreateClearingFields() {
+		$this->Form->fields = array('model_id');
+		$this->Form->create('Contact');
+		$this->assertEqual($this->Form->fields, array());
+	}
+
+/**
+ * Tests form hash generation with model-less data
+ *
+ * @access public
+ * @return void
+ */
+	function testValidateHashNoModel() {
+		$this->Form->params['_Token'] = array('key' => 'foo');
+		$result = $this->Form->secure(array('anything'));
+		$this->assertPattern('/540ac9c60d323c22bafe997b72c0790f39a8bdef/', $result);
+	}
+
+/**
+ * Tests that models with identical field names get resolved properly
+ *
+ * @access public
+ * @return void
+ */
+	function testDuplicateFieldNameResolution() {
+		$result = $this->Form->create('ValidateUser');
+		$this->assertEqual($this->View->entity(), array('ValidateUser'));
+
+		$result = $this->Form->input('ValidateItem.name');
+		$this->assertEqual($this->View->entity(), array('ValidateItem', 'name'));
+
+		$result = $this->Form->input('ValidateUser.name');
+		$this->assertEqual($this->View->entity(), array('ValidateUser', 'name'));
+		$this->assertPattern('/name="data\[ValidateUser\]\[name\]"/', $result);
+		$this->assertPattern('/type="text"/', $result);
+
+		$result = $this->Form->input('ValidateItem.name');
+		$this->assertEqual($this->View->entity(), array('ValidateItem', 'name'));
+		$this->assertPattern('/name="data\[ValidateItem\]\[name\]"/', $result);
+		$this->assertPattern('/<textarea/', $result);
+
+		$result = $this->Form->input('name');
+		$this->assertEqual($this->View->entity(), array('ValidateUser', 'name'));
+		$this->assertPattern('/name="data\[ValidateUser\]\[name\]"/', $result);
+		$this->assertPattern('/type="text"/', $result);
+	}
+
+/**
+ * Tests that hidden fields generated for checkboxes don't get locked
+ *
+ * @access public
+ * @return void
+ */
+	function testNoCheckboxLocking() {
+		$this->Form->params['_Token'] = array('key' => 'foo');
+		$this->assertIdentical($this->Form->fields, array());
+
+		$this->Form->checkbox('check', array('value' => '1'));
+		$this->assertIdentical($this->Form->fields, array('check'));
+	}
+
+/**
+ * testFormSecurityFields method
+ *
+ * Test generation of secure form hash generation.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecurityFields() {
+		$key = 'testKey';
+		$fields = array('Model.password', 'Model.username', 'Model.valid' => '0');
+		$this->Form->params['_Token']['key'] = $key;
+		$result = $this->Form->secure($fields);
+
+		$expected = Security::hash(serialize($fields) . Configure::read('Security.salt'));
+		$expected .= ':' . 'Model.valid';
+
+		$expected = array(
+			'div' => array('style' => 'display:none;'),
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][fields]',
+				'value' => urlencode($expected), 'id' => 'preg:/TokenFields\d+/'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Tests correct generation of text fields for double and float fields
+ *
+ * @access public
+ * @return void
+ */
+	function testTextFieldGenerationForFloats() {
+		$model = ClassRegistry::getObject('Contact');
+		$model->setSchema(array('foo' => array(
+			'type' => 'float',
+			'null' => false,
+			'default' => null,
+			'length' => null
+		)));
+
+		$this->Form->create('Contact');
+		$result = $this->Form->input('foo');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactFoo'),
+			'Foo',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][foo]',
+				'id' => 'ContactFoo'
+			)),
+			'/div'
+		);
+	}
+
+/**
+ * testFormSecurityMultipleFields method
+ *
+ * Test secure() with multiple row form. Ensure hash is correct.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecurityMultipleFields() {
+		$key = 'testKey';
+
+		$fields = array(
+			'Model.0.password', 'Model.0.username', 'Model.0.hidden' => 'value',
+			'Model.0.valid' => '0', 'Model.1.password', 'Model.1.username',
+			'Model.1.hidden' => 'value', 'Model.1.valid' => '0'
+		);
+		$this->Form->params['_Token']['key'] = $key;
+		$result = $this->Form->secure($fields);
+
+		$hash  = '51e3b55a6edd82020b3f29c9ae200e14bbeb7ee5%3AModel.0.hidden%7CModel.0.valid';
+		$hash .= '%7CModel.1.hidden%7CModel.1.valid';
+
+		$expected = array(
+			'div' => array('style' => 'display:none;'),
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][fields]',
+				'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormSecurityMultipleSubmitButtons
+ *
+ * test form submit generation and ensure that _Token is only created on end()
+ *
+ * @return void
+ */
+	function testFormSecurityMultipleSubmitButtons() {
+		$key = 'testKey';
+		$this->Form->params['_Token']['key'] = $key;
+
+		$this->Form->create('Addresses');
+		$this->Form->input('Address.title');
+		$this->Form->input('Address.first_name');
+
+		$result = $this->Form->submit('Save', array('name' => 'save'));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'name' => 'save', 'value' => 'Save'),
+			'/div',
+		);
+		$this->assertTags($result, $expected);
+		$result = $this->Form->submit('Cancel', array('name' => 'cancel'));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'name' => 'cancel', 'value' => 'Cancel'),
+			'/div',
+		);
+		$this->assertTags($result, $expected);
+		$result = $this->Form->end(null);
+
+		$expected = array(
+			'div' => array('style' => 'display:none;'),
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][fields]',
+				'value' => 'preg:/.+/', 'id' => 'preg:/TokenFields\d+/'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormSecurityMultipleInputFields method
+ *
+ * Test secure form creation with multiple row creation.  Checks hidden, text, checkbox field types
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecurityMultipleInputFields() {
+		$key = 'testKey';
+
+		$this->Form->params['_Token']['key'] = $key;
+		$this->Form->create('Addresses');
+
+		$this->Form->hidden('Addresses.0.id', array('value' => '123456'));
+		$this->Form->input('Addresses.0.title');
+		$this->Form->input('Addresses.0.first_name');
+		$this->Form->input('Addresses.0.last_name');
+		$this->Form->input('Addresses.0.address');
+		$this->Form->input('Addresses.0.city');
+		$this->Form->input('Addresses.0.phone');
+		$this->Form->input('Addresses.0.primary', array('type' => 'checkbox'));
+
+		$this->Form->hidden('Addresses.1.id', array('value' => '654321'));
+		$this->Form->input('Addresses.1.title');
+		$this->Form->input('Addresses.1.first_name');
+		$this->Form->input('Addresses.1.last_name');
+		$this->Form->input('Addresses.1.address');
+		$this->Form->input('Addresses.1.city');
+		$this->Form->input('Addresses.1.phone');
+		$this->Form->input('Addresses.1.primary', array('type' => 'checkbox'));
+
+		$result = $this->Form->secure($this->Form->fields);
+
+		$hash = 'c9118120e680a7201b543f562e5301006ccfcbe2%3AAddresses.0.id%7CAddresses.1.id';
+
+		$expected = array(
+			'div' => array('style' => 'display:none;'),
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][fields]',
+				'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormSecurityMultipleInputDisabledFields method
+ *
+ * test secure form generation with multiple records and disabled fields.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecurityMultipleInputDisabledFields() {
+		$key = 'testKey';
+		$this->Form->params['_Token']['key'] = $key;
+		$this->Form->params['_Token']['disabledFields'] = array('first_name', 'address');
+		$this->Form->create();
+
+		$this->Form->hidden('Addresses.0.id', array('value' => '123456'));
+		$this->Form->input('Addresses.0.title');
+		$this->Form->input('Addresses.0.first_name');
+		$this->Form->input('Addresses.0.last_name');
+		$this->Form->input('Addresses.0.address');
+		$this->Form->input('Addresses.0.city');
+		$this->Form->input('Addresses.0.phone');
+		$this->Form->hidden('Addresses.1.id', array('value' => '654321'));
+		$this->Form->input('Addresses.1.title');
+		$this->Form->input('Addresses.1.first_name');
+		$this->Form->input('Addresses.1.last_name');
+		$this->Form->input('Addresses.1.address');
+		$this->Form->input('Addresses.1.city');
+		$this->Form->input('Addresses.1.phone');
+
+		$result = $this->Form->secure($this->Form->fields);
+		$hash = '774df31936dc850b7d8a5277dc0b890123788b09%3AAddresses.0.id%7CAddresses.1.id';
+
+		$expected = array(
+			'div' => array('style' => 'display:none;'),
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][fields]',
+				'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormSecurityInputDisabledFields method
+ *
+ * Test single record form with disabled fields.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecurityInputDisabledFields() {
+		$key = 'testKey';
+		$this->Form->params['_Token']['key'] = $key;
+		$this->Form->params['_Token']['disabledFields'] = array('first_name', 'address');
+		$this->Form->create();
+
+		$this->Form->hidden('Addresses.id', array('value' => '123456'));
+		$this->Form->input('Addresses.title');
+		$this->Form->input('Addresses.first_name');
+		$this->Form->input('Addresses.last_name');
+		$this->Form->input('Addresses.address');
+		$this->Form->input('Addresses.city');
+		$this->Form->input('Addresses.phone');
+
+		$result = $this->Form->fields;
+		$expected = array(
+			'Addresses.id' => '123456', 'Addresses.title', 'Addresses.last_name',
+			'Addresses.city', 'Addresses.phone'
+		);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Form->secure($expected);
+
+		$hash = '449b7e889128e8e52c5e81d19df68f5346571492%3AAddresses.id';
+		$expected = array(
+			'div' => array('style' => 'display:none;'),
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][fields]',
+				'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test securing inputs with custom name attributes.
+ *
+ * @return void
+ */
+	function testFormSecureWithCustomNameAttribute() {
+		$this->Form->params['_Token']['key'] = 'testKey';
+
+		$this->Form->text('UserForm.published', array('name' => 'data[User][custom]'));
+		$this->assertEqual('User.custom', $this->Form->fields[0]);
+
+		$this->Form->text('UserForm.published', array('name' => 'data[User][custom][another][value]'));
+		$this->assertEqual('User.custom.another.value', $this->Form->fields[1]);
+	}
+
+/**
+ * testFormSecuredInput method
+ *
+ * Test generation of entire secure form, assertions made on input() output.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecuredInput() {
+		$this->Form->params['_Token']['key'] = 'testKey';
+
+		$result = $this->Form->create('Contact', array('url' => '/contacts/add'));
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$expected = array(
+			'form' => array('method' => 'post', 'action' => '/contacts/add', 'accept-charset' => $encoding),
+			'div' => array('style' => 'display:none;'),
+			array('input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST')),
+			array('input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][key]',
+				'value' => 'testKey', 'id' => 'preg:/Token\d+/'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('UserForm.published', array('type' => 'text'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'UserFormPublished'),
+			'Published',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[UserForm][published]',
+				'id' => 'UserFormPublished'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('UserForm.other', array('type' => 'text'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'UserFormOther'),
+			'Other',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[UserForm][other]',
+				'id' => 'UserFormOther'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->hidden('UserForm.stuff');
+		$expected = array('input' => array(
+				'type' => 'hidden', 'name' => 'data[UserForm][stuff]',
+				'id' => 'UserFormStuff'
+		));
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->hidden('UserForm.hidden', array('value' => '0'));
+		$expected = array('input' => array(
+			'type' => 'hidden', 'name' => 'data[UserForm][hidden]',
+			'value' => '0', 'id' => 'UserFormHidden'
+		));
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('UserForm.something', array('type' => 'checkbox'));
+		$expected = array(
+			'div' => array('class' => 'input checkbox'),
+			array('input' => array(
+				'type' => 'hidden', 'name' => 'data[UserForm][something]',
+				'value' => '0', 'id' => 'UserFormSomething_'
+			)),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[UserForm][something]',
+				'value' => '1', 'id' => 'UserFormSomething'
+			)),
+			'label' => array('for' => 'UserFormSomething'),
+			'Something',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->fields;
+		$expected = array(
+			'UserForm.published', 'UserForm.other', 'UserForm.stuff' => '',
+			'UserForm.hidden' => '0', 'UserForm.something'
+		);
+		$this->assertEqual($result, $expected);
+
+		$hash = 'bd7c4a654e5361f9a433a43f488ff9a1065d0aaf%3AUserForm.hidden%7CUserForm.stuff';
+
+		$result = $this->Form->secure($this->Form->fields);
+		$expected = array(
+			'div' => array('style' => 'display:none;'),
+			array('input' => array(
+				'type' => 'hidden', 'name' => 'data[_Token][fields]',
+				'value' => $hash, 'id' => 'preg:/TokenFields\d+/'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Tests that the correct keys are added to the field hash index
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecuredFileInput() {
+		$this->Form->params['_Token']['key'] = 'testKey';
+		$this->assertEqual($this->Form->fields, array());
+
+		$result = $this->Form->file('Attachment.file');
+		$expected = array (
+			'Attachment.file.name', 'Attachment.file.type', 'Attachment.file.tmp_name',
+			'Attachment.file.error', 'Attachment.file.size'
+		);
+		$this->assertEqual($this->Form->fields, $expected);
+	}
+
+/**
+ * test that multiple selects keys are added to field hash
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecuredMultipleSelect() {
+		$this->Form->params['_Token']['key'] = 'testKey';
+		$this->assertEqual($this->Form->fields, array());
+		$options = array('1' => 'one', '2' => 'two');
+
+		$this->Form->select('Model.select', $options);
+		$expected = array('Model.select');
+		$this->assertEqual($this->Form->fields, $expected);
+
+		$this->Form->fields = array();
+		$this->Form->select('Model.select', $options, null, array('multiple' => true));
+		$this->assertEqual($this->Form->fields, $expected);
+	}
+
+/**
+ * testFormSecuredRadio method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormSecuredRadio() {
+		$this->Form->params['_Token']['key'] = 'testKey';
+		$this->assertEqual($this->Form->fields, array());
+		$options = array('1' => 'option1', '2' => 'option2');
+
+		$this->Form->radio('Test.test', $options);
+		$expected = array('Test.test');
+		$this->assertEqual($this->Form->fields, $expected);
+	}
+
+/**
+ * testDisableSecurityUsingForm method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisableSecurityUsingForm() {
+		$this->Form->params['_Token']['key'] = 'testKey';
+		$this->Form->params['_Token']['disabledFields'] = array();
+		$this->Form->create();
+
+		$this->Form->hidden('Addresses.id', array('value' => '123456'));
+		$this->Form->input('Addresses.title');
+		$this->Form->input('Addresses.first_name', array('secure' => false));
+		$this->Form->input('Addresses.city', array('type' => 'textarea', 'secure' => false));
+		$this->Form->input('Addresses.zip', array(
+			'type' => 'select', 'options' => array(1,2), 'secure' => false
+		));
+
+		$result = $this->Form->fields;
+		$expected = array(
+			'Addresses.id' => '123456', 'Addresses.title',
+		);
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testPasswordValidation method
+ *
+ * test validation errors on password input.
+ *
+ * @access public
+ * @return void
+ */
+	function testPasswordValidation() {
+		$this->Form->validationErrors['Contact']['password'] = 'Please provide a password';
+		$result = $this->Form->input('Contact.password');
+		$expected = array(
+			'div' => array('class' => 'input password error'),
+			'label' => array('for' => 'ContactPassword'),
+			'Password',
+			'/label',
+			'input' => array(
+				'type' => 'password', 'name' => 'data[Contact][password]',
+				'id' => 'ContactPassword', 'class' => 'form-error'
+			),
+			array('div' => array('class' => 'error-message')),
+			'Please provide a password',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormValidationAssociated method
+ *
+ * test display of form errors in conjunction with model::validates.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormValidationAssociated() {
+		$this->UserForm =& ClassRegistry::getObject('UserForm');
+		$this->UserForm->OpenidUrl =& ClassRegistry::getObject('OpenidUrl');
+
+		$data = array(
+			'UserForm' => array('name' => 'user'),
+			'OpenidUrl' => array('url' => 'http://www.cakephp.org')
+		);
+
+		$this->assertTrue($this->UserForm->OpenidUrl->create($data));
+		$this->assertFalse($this->UserForm->OpenidUrl->validates());
+
+		$result = $this->Form->create('UserForm', array('type' => 'post', 'action' => 'login'));
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$expected = array(
+			'form' => array(
+				'method' => 'post', 'action' => '/user_forms/login', 'id' => 'UserFormLoginForm',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$expected = array('OpenidUrl' => array('openid_not_registered' => 1));
+		$this->assertEqual($this->Form->validationErrors, $expected);
+
+		$result = $this->Form->error(
+			'OpenidUrl.openid_not_registered', 'Error, not registered', array('wrap' => false)
+		);
+		$this->assertEqual($result, 'Error, not registered');
+
+		unset($this->UserForm->OpenidUrl, $this->UserForm);
+	}
+
+/**
+ * testFormValidationAssociatedFirstLevel method
+ *
+ * test form error display with associated model.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormValidationAssociatedFirstLevel() {
+		$this->ValidateUser =& ClassRegistry::getObject('ValidateUser');
+		$this->ValidateUser->ValidateProfile =& ClassRegistry::getObject('ValidateProfile');
+
+		$data = array(
+			'ValidateUser' => array('name' => 'mariano'),
+			'ValidateProfile' => array('full_name' => 'Mariano Iglesias')
+		);
+
+		$this->assertTrue($this->ValidateUser->create($data));
+		$this->assertFalse($this->ValidateUser->validates());
+		$this->assertFalse($this->ValidateUser->ValidateProfile->validates());
+
+		$result = $this->Form->create('ValidateUser', array('type' => 'post', 'action' => 'add'));
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$expected = array(
+			'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id','accept-charset' => $encoding),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$expected = array(
+			'ValidateUser' => array('email' => 1),
+			'ValidateProfile' => array('full_name' => 1, 'city' => 1)
+		);
+		$this->assertEqual($this->Form->validationErrors, $expected);
+
+		unset($this->ValidateUser->ValidateProfile);
+		unset($this->ValidateUser);
+	}
+
+/**
+ * testFormValidationAssociatedSecondLevel method
+ *
+ * test form error display with associated model.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormValidationAssociatedSecondLevel() {
+		$this->ValidateUser =& ClassRegistry::getObject('ValidateUser');
+		$this->ValidateUser->ValidateProfile =& ClassRegistry::getObject('ValidateProfile');
+		$this->ValidateUser->ValidateProfile->ValidateItem =& ClassRegistry::getObject('ValidateItem');
+
+		$data = array(
+			'ValidateUser' => array('name' => 'mariano'),
+			'ValidateProfile' => array('full_name' => 'Mariano Iglesias'),
+			'ValidateItem' => array('name' => 'Item')
+		);
+
+		$this->assertTrue($this->ValidateUser->create($data));
+		$this->assertFalse($this->ValidateUser->validates());
+		$this->assertFalse($this->ValidateUser->ValidateProfile->validates());
+		$this->assertFalse($this->ValidateUser->ValidateProfile->ValidateItem->validates());
+
+		$result = $this->Form->create('ValidateUser', array('type' => 'post', 'action' => 'add'));
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$expected = array(
+			'form' => array('method' => 'post', 'action' => '/validate_users/add', 'id','accept-charset' => $encoding),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$expected = array(
+			'ValidateUser' => array('email' => 1),
+			'ValidateProfile' => array('full_name' => 1, 'city' => 1),
+			'ValidateItem' => array('description' => 1)
+		);
+		$this->assertEqual($this->Form->validationErrors, $expected);
+
+		unset($this->ValidateUser->ValidateProfile->ValidateItem);
+		unset($this->ValidateUser->ValidateProfile);
+		unset($this->ValidateUser);
+	}
+
+/**
+ * testFormValidationMultiRecord method
+ *
+ * test form error display with multiple records.
+ *
+ * @access public
+ * @return void
+ */
+	function testFormValidationMultiRecord() {
+		$this->Form->validationErrors['Contact'] = array(2 => array(
+			'name' => 'This field cannot be left blank'
+		));
+		$result = $this->Form->input('Contact.2.name');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'preg:/[^<]+/',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name', 'id',
+				'class' => 'form-error', 'maxlength' => 255
+			),
+			array('div' => array('class' => 'error-message')),
+			'This field cannot be left blank',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['UserForm'] = array(
+			'OpenidUrl' => array('url' => 'You must provide a URL'
+		));
+		$this->Form->create('UserForm');
+		$result = $this->Form->input('OpenidUrl.url');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'preg:/[^<]+/',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name', 'id', 'class' => 'form-error'
+			),
+			array('div' => array('class' => 'error-message')),
+			'You must provide a URL',
+			'/div',
+			'/div'
+		);
+	}
+
+/**
+ * testMultipleInputValidation method
+ *
+ * test multiple record form validation error display.
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleInputValidation() {
+		$this->Form->create();
+		$this->Form->validationErrors['Address'][0]['title'] = 'This field cannot be empty';
+		$this->Form->validationErrors['Address'][0]['first_name'] = 'This field cannot be empty';
+		$this->Form->validationErrors['Address'][1]['last_name'] = 'You must have a last name';
+
+		$result = $this->Form->input('Address.0.title');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'preg:/[^<]+/',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name', 'id', 'class' => 'form-error'
+			),
+			array('div' => array('class' => 'error-message')),
+			'This field cannot be empty',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Address.0.first_name');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'preg:/[^<]+/',
+			'/label',
+			'input' => array('type' => 'text', 'name', 'id', 'class' => 'form-error'),
+			array('div' => array('class' => 'error-message')),
+			'This field cannot be empty',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Address.0.last_name');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'preg:/[^<]+/',
+			'/label',
+			'input' => array('type' => 'text', 'name', 'id'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Address.1.last_name');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'preg:/[^<]+/',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'preg:/[^<]+/',
+				'id' => 'preg:/[^<]+/', 'class' => 'form-error'
+			),
+			array('div' => array('class' => 'error-message')),
+			'You must have a last name',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testInput method
+ *
+ * Test various incarnations of input().
+ *
+ * @access public
+ * @return void
+ */
+	function testInput() {
+		$result = $this->Form->input('ValidateUser.balance');
+		$expected = array(
+			'div' => array('class'),
+			'label' => array('for'),
+			'Balance',
+			'/label',
+			'input' => array('name', 'type' => 'text', 'maxlength' => 8, 'id'),
+			'/div',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.email', array('id' => 'custom'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'custom'),
+			'Email',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][email]',
+				'id' => 'custom', 'maxlength' => 255
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.email', array('div' => array('class' => false)));
+		$expected = array(
+			'<div',
+			'label' => array('for' => 'ContactEmail'),
+			'Email',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][email]',
+				'id' => 'ContactEmail', 'maxlength' => 255
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->hidden('Contact.idontexist');
+		$expected = array('input' => array(
+				'type' => 'hidden', 'name' => 'data[Contact][idontexist]',
+				'id' => 'ContactIdontexist'
+		));
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.email', array('type' => 'text'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactEmail'),
+			'Email',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][email]',
+				'id' => 'ContactEmail'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.5.email', array('type' => 'text'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'Contact5Email'),
+			'Email',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][5][email]',
+				'id' => 'Contact5Email'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.password');
+		$expected = array(
+			'div' => array('class' => 'input password'),
+			'label' => array('for' => 'ContactPassword'),
+			'Password',
+			'/label',
+			array('input' => array(
+				'type' => 'password', 'name' => 'data[Contact][password]',
+				'id' => 'ContactPassword'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.email', array(
+			'type' => 'file', 'class' => 'textbox'
+		));
+		$expected = array(
+			'div' => array('class' => 'input file'),
+			'label' => array('for' => 'ContactEmail'),
+			'Email',
+			'/label',
+			array('input' => array(
+				'type' => 'file', 'name' => 'data[Contact][email]', 'class' => 'textbox',
+				'id' => 'ContactEmail'
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Contact' => array('phone' => 'Hello & World > weird chars'));
+		$result = $this->Form->input('Contact.phone');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactPhone'),
+			'Phone',
+			'/label',
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][phone]',
+				'value' => 'Hello &amp; World &gt; weird chars',
+				'id' => 'ContactPhone', 'maxlength' => 255
+			)),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['0']['OtherModel']['field'] = 'My value';
+		$result = $this->Form->input('Model.0.OtherModel.field', array('id' => 'myId'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'myId'),
+			'Field',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Model][0][OtherModel][field]',
+				'value' => 'My value', 'id' => 'myId'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		unset($this->Form->data);
+
+		$this->Form->validationErrors['Model']['field'] = 'Badness!';
+		$result = $this->Form->input('Model.field');
+		$expected = array(
+			'div' => array('class' => 'input text error'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Model][field]',
+				'id' => 'ModelField', 'class' => 'form-error'
+			),
+			array('div' => array('class' => 'error-message')),
+			'Badness!',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.field', array(
+			'div' => false, 'error' => array('wrap' => 'span')
+		));
+		$expected = array(
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Model][field]',
+				'id' => 'ModelField', 'class' => 'form-error'
+			),
+			array('span' => array('class' => 'error-message')),
+			'Badness!',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.field', array(
+			'div' => array('tag' => 'span'), 'error' => array('wrap' => false)
+		));
+		$expected = array(
+			'span' => array('class' => 'input text error'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Model][field]',
+				'id' => 'ModelField', 'class' => 'form-error'
+			),
+			'Badness!',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.field', array('after' => 'A message to you, Rudy'));
+		$expected = array(
+			'div' => array('class' => 'input text error'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Model][field]',
+				'id' => 'ModelField', 'class' => 'form-error'
+			),
+			'A message to you, Rudy',
+			array('div' => array('class' => 'error-message')),
+			'Badness!',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->setEntity(null);
+		$this->Form->setEntity('Model.field');
+		$result = $this->Form->input('Model.field', array(
+			'after' => 'A message to you, Rudy', 'error' => false
+		));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array('type' => 'text', 'name' => 'data[Model][field]', 'id' => 'ModelField', 'class' => 'form-error'),
+			'A message to you, Rudy',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		unset($this->Form->validationErrors['Model']['field']);
+		$result = $this->Form->input('Model.field', array('after' => 'A message to you, Rudy'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array('type' => 'text', 'name' => 'data[Model][field]', 'id' => 'ModelField'),
+			'A message to you, Rudy',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['Model']['field'] = 'minLength';
+		$result = $this->Form->input('Model.field', array(
+			'error' => array(
+				'minLength' => 'Le login doit contenir au moins 2 caractères',
+				'maxLength' => 'login too large'
+			)
+		));
+		$expected = array(
+			'div' => array('class' => 'input text error'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array('type' => 'text', 'name' => 'data[Model][field]', 'id' => 'ModelField', 'class' => 'form-error'),
+			array('div' => array('class' => 'error-message')),
+			'Le login doit contenir au moins 2 caractères',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['Model']['field'] = 'maxLength';
+		$result = $this->Form->input('Model.field', array(
+			'error' => array(
+				'wrap' => 'span',
+				'attributes' => array('rel' => 'fake'),
+				'minLength' => 'Le login doit contenir au moins 2 caractères',
+				'maxLength' => 'login too large',
+			)
+		));
+		$expected = array(
+			'div' => array('class' => 'input text error'),
+			'label' => array('for' => 'ModelField'),
+			'Field',
+			'/label',
+			'input' => array('type' => 'text', 'name' => 'data[Model][field]', 'id' => 'ModelField', 'class' => 'form-error'),
+			array('span' => array('class' => 'error-message', 'rel' => 'fake')),
+			'login too large',
+			'/span',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test input() with checkbox creation
+ *
+ * @return void
+ */
+	function testInputCheckbox() {
+		$result = $this->Form->input('User.active', array('label' => false, 'checked' => true));
+		$expected = array(
+			'div' => array('class' => 'input checkbox'),
+			'input' => array('type' => 'hidden', 'name' => 'data[User][active]', 'value' => '0', 'id' => 'UserActive_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[User][active]', 'value' => '1', 'id' => 'UserActive', 'checked' => 'checked')),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('User.active', array('label' => false, 'checked' => 1));
+		$expected = array(
+			'div' => array('class' => 'input checkbox'),
+			'input' => array('type' => 'hidden', 'name' => 'data[User][active]', 'value' => '0', 'id' => 'UserActive_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[User][active]', 'value' => '1', 'id' => 'UserActive', 'checked' => 'checked')),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('User.active', array('label' => false, 'checked' => '1'));
+		$expected = array(
+			'div' => array('class' => 'input checkbox'),
+			'input' => array('type' => 'hidden', 'name' => 'data[User][active]', 'value' => '0', 'id' => 'UserActive_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[User][active]', 'value' => '1', 'id' => 'UserActive', 'checked' => 'checked')),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test form->input() with time types.
+ *
+ */
+	function testInputTime() {
+		extract($this->dateRegex);
+		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
+		$result = explode(':', $result);
+		$this->assertPattern('/option value="23"/', $result[0]);
+		$this->assertNoPattern('/option value="24"/', $result[0]);
+
+		$result = $this->Form->input('Contact.created', array('type' => 'time', 'timeFormat' => 24));
+		$result = explode(':', $result);
+		$this->assertPattern('/option value="23"/', $result[0]);
+		$this->assertNoPattern('/option value="24"/', $result[0]);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'time', 'timeFormat' => 24, 'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'time', 'timeFormat' => 12, 'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+
+		$result = $this->Form->input('prueba', array(
+			'type' => 'time', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008,
+			'maxYear' => date('Y') + 1 ,'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+		$this->assertPattern('#<option value="30"[^>]*>30</option>#', $result[1]);
+
+		$result = $this->Form->input('Random.start_time', array(
+			'type' => 'time',
+			'selected' => '18:15'
+		));
+		$this->assertPattern('#<option value="06"[^>]*>6</option>#', $result);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result);
+		$this->assertPattern('#<option value="pm"[^>]*>pm</option>#', $result);
+	}
+
+/**
+ * test form->input() with datetime, date and time types
+ *
+ * @return void
+ */
+	function testInputDatetime() {
+		extract($this->dateRegex);
+		$result = $this->Form->input('prueba', array(
+			'type' => 'datetime', 'timeFormat'=> 24 , 'dateFormat'=>'DMY' , 'minYear' => 2008,
+			'maxYear' => date('Y') + 1 ,'interval' => 15
+		));
+		$result = explode(':', $result);
+		$this->assertNoPattern('#<option value="12"[^>]*>12</option>#', $result[1]);
+		$this->assertNoPattern('#<option value="50"[^>]*>50</option>#', $result[1]);
+		$this->assertPattern('#<option value="15"[^>]*>15</option>#', $result[1]);
+		$this->assertPattern('#<option value="30"[^>]*>30</option>#', $result[1]);
+
+		//related to ticket #5013
+		$result = $this->Form->input('Contact.date', array(
+			'type' => 'date', 'class' => 'customClass', 'onChange' => 'function(){}'
+		));
+		$this->assertPattern('/class="customClass"/', $result);
+		$this->assertPattern('/onChange="function\(\)\{\}"/', $result);
+
+		$result = $this->Form->input('Contact.date', array(
+			'type' => 'date', 'id' => 'customId', 'onChange' => 'function(){}'
+		));
+		$this->assertPattern('/id="customIdDay"/', $result);
+		$this->assertPattern('/id="customIdMonth"/', $result);
+		$this->assertPattern('/onChange="function\(\)\{\}"/', $result);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'datetime', 'timeFormat' => 24, 'id' => 'customID'
+		));
+		$this->assertPattern('/id="customIDDay"/', $result);
+		$this->assertPattern('/id="customIDHour"/', $result);
+		$result = explode('</select><select', $result);
+		$result = explode(':', $result[1]);
+		$this->assertPattern('/option value="23"/', $result[0]);
+		$this->assertNoPattern('/option value="24"/', $result[0]);
+
+		$result = $this->Form->input('Model.field', array(
+			'type' => 'datetime', 'timeFormat' => 12
+		));
+		$result = explode('</select><select', $result);
+		$result = explode(':', $result[1]);
+		$this->assertPattern('/option value="12"/', $result[0]);
+		$this->assertNoPattern('/option value="13"/', $result[0]);
+
+		$this->Form->data = array('Contact' => array('created' => null));
+		$result = $this->Form->input('Contact.created', array('empty' => 'Date Unknown'));
+		$expected = array(
+			'div' => array('class' => 'input date'),
+			'label' => array('for' => 'ContactCreatedMonth'),
+			'Created',
+			'/label',
+			array('select' => array('name' => 'data[Contact][created][month]', 'id' => 'ContactCreatedMonth')),
+			array('option' => array('value' => '')), 'Date Unknown', '/option',
+			$monthsRegex,
+			'/select', '-',
+			array('select' => array('name' => 'data[Contact][created][day]', 'id' => 'ContactCreatedDay')),
+			array('option' => array('value' => '')), 'Date Unknown', '/option',
+			$daysRegex,
+			'/select', '-',
+			array('select' => array('name' => 'data[Contact][created][year]', 'id' => 'ContactCreatedYear')),
+			array('option' => array('value' => '')), 'Date Unknown', '/option',
+			$yearsRegex,
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Contact' => array('created' => null));
+		$result = $this->Form->input('Contact.created', array('type' => 'datetime', 'dateFormat' => 'NONE'));
+		$this->assertPattern('/for\="ContactCreatedHour"/', $result);
+
+		$this->Form->data = array('Contact' => array('created' => null));
+		$result = $this->Form->input('Contact.created', array('type' => 'datetime', 'timeFormat' => 'NONE'));
+		$this->assertPattern('/for\="ContactCreatedMonth"/', $result);
+
+		$result = $this->Form->input('Contact.created', array(
+			'type' => 'date',
+			'id' => array('day' => 'created-day', 'month' => 'created-month', 'year' => 'created-year'),
+			'timeFormat' => 'NONE'
+		));
+		$this->assertPattern('/for\="created-month"/', $result);
+	}
+
+/**
+ * Test generating checkboxes in a loop.
+ *
+ * @return void
+ */
+	function testInputCheckboxesInLoop() {
+		for ($i = 1; $i < 5; $i++) {
+			$result = $this->Form->input("Contact.{$i}.email", array('type' => 'checkbox', 'value' => $i));
+			$expected = array(
+				'div' => array('class' => 'input checkbox'),
+				'input' => array('type' => 'hidden', 'name' => "data[Contact][{$i}][email]", 'value' => '0', 'id' => "Contact{$i}Email_"),
+				array('input' => array('type' => 'checkbox', 'name' => "data[Contact][{$i}][email]", 'value' => $i, 'id' => "Contact{$i}Email")),
+				'label' => array('for' => "Contact{$i}Email"),
+				'Email',
+				'/label',
+				'/div'
+			);
+			$this->assertTags($result, $expected);
+		}
+	}
+
+/**
+ * test input name with leading integer, ensure attributes are generated correctly.
+ *
+ * @return void
+ */
+	function testInputWithLeadingInteger() {
+		$result = $this->Form->text('0.Node.title');
+		$expected = array(
+			'input' => array('name' => 'data[0][Node][title]', 'id' => '0NodeTitle', 'type' => 'text')
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test form->input() with select type inputs.
+ *
+ * @return void
+ */
+	function testInputSelectType() {
+		$result = $this->Form->input('email', array(
+			'options' => array('è' => 'Firést', 'é' => 'Secoènd'), 'empty' => true)
+		);
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'email'),
+			'Email',
+			'/label',
+			array('select' => array('name' => 'data[email]', 'id' => 'email')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => 'è')),
+			'Firést',
+			'/option',
+			array('option' => array('value' => 'é')),
+			'Secoènd',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('email', array(
+			'options' => array('First', 'Second'), 'empty' => true)
+		);
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'email'),
+			'Email',
+			'/label',
+			array('select' => array('name' => 'data[email]', 'id' => 'email')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '0')),
+			'First',
+			'/option',
+			array('option' => array('value' => '1')),
+			'Second',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('user_id' => 'value'));
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
+		$result = $this->Form->input('Model.user_id', array('empty' => true));
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'ModelUserId'),
+			'User',
+			'/label',
+			'select' => array('name' => 'data[Model][user_id]', 'id' => 'ModelUserId'),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => 'value', 'selected' => 'selected')),
+			'good',
+			'/option',
+			array('option' => array('value' => 'other')),
+			'bad',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('user_id' => null));
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
+		$result = $this->Form->input('Model.user_id', array('empty' => 'Some Empty'));
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'ModelUserId'),
+			'User',
+			'/label',
+			'select' => array('name' => 'data[Model][user_id]', 'id' => 'ModelUserId'),
+			array('option' => array('value' => '')),
+			'Some Empty',
+			'/option',
+			array('option' => array('value' => 'value')),
+			'good',
+			'/option',
+			array('option' => array('value' => 'other')),
+			'bad',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('user_id' => 'value'));
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
+		$result = $this->Form->input('Model.user_id', array('empty' => 'Some Empty'));
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'ModelUserId'),
+			'User',
+			'/label',
+			'select' => array('name' => 'data[Model][user_id]', 'id' => 'ModelUserId'),
+			array('option' => array('value' => '')),
+			'Some Empty',
+			'/option',
+			array('option' => array('value' => 'value', 'selected' => 'selected')),
+			'good',
+			'/option',
+			array('option' => array('value' => 'other')),
+			'bad',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('User' => array('User' => array('value')));
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
+		$result = $this->Form->input('User.User', array('empty' => true));
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'UserUser'),
+			'User',
+			'/label',
+			'input' => array('type' => 'hidden', 'name' => 'data[User][User]', 'value' => '', 'id' => 'UserUser_'),
+			'select' => array('name' => 'data[User][User][]', 'id' => 'UserUser', 'multiple' => 'multiple'),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => 'value', 'selected' => 'selected')),
+			'good',
+			'/option',
+			array('option' => array('value' => 'other')),
+			'bad',
+			'/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array();
+		$result = $this->Form->input('Publisher.id', array(
+				'label'		=> 'Publisher',
+				'type'		=> 'select',
+				'multiple'	=> 'checkbox',
+				'options'	=> array('Value 1' => 'Label 1', 'Value 2' => 'Label 2')
+		));
+		$expected = array(
+			array('div' => array('class' => 'input select')),
+				array('label' => array('for' => 'PublisherId')),
+				'Publisher',
+				'/label',
+				'input' => array('type' => 'hidden', 'name' => 'data[Publisher][id]', 'value' => '', 'id' => 'PublisherId'),
+				array('div' => array('class' => 'checkbox')),
+				array('input' => array('type' => 'checkbox', 'name' => 'data[Publisher][id][]', 'value' => 'Value 1', 'id' => 'PublisherIdValue1')),
+				array('label' => array('for' => 'PublisherIdValue1')),
+				'Label 1',
+				'/label',
+				'/div',
+				array('div' => array('class' => 'checkbox')),
+				array('input' => array('type' => 'checkbox', 'name' => 'data[Publisher][id][]', 'value' => 'Value 2', 'id' => 'PublisherIdValue2')),
+				array('label' => array('for' => 'PublisherIdValue2')),
+				'Label 2',
+				'/label',
+				'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that input() and a non standard primary key makes a hidden input by default.
+ *
+ * @return void
+ */
+	function testInputWithNonStandardPrimaryKeyMakesHidden() {
+		$this->Form->create('User');
+		$this->Form->fieldset = array(
+			'User' => array(
+				'fields' => array(
+					'model_id' => array('type' => 'integer')
+				),
+				'validates' => array(),
+				'key' => 'model_id'
+			)
+		);
+		$result = $this->Form->input('model_id');
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[User][model_id]', 'id' => 'UserModelId'),
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that overriding the magic select type widget is possible
+ *
+ * @return void
+ */
+	function testInputOverridingMagicSelectType() {
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
+		$result = $this->Form->input('Model.user_id', array('type' => 'text'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ModelUserId'), 'User', '/label',
+			'input' => array('name' => 'data[Model][user_id]', 'type' => 'text', 'id' => 'ModelUserId'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		//Check that magic types still work for plural/singular vars
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['types'] = array('value' => 'good', 'other' => 'bad');
+		$result = $this->Form->input('Model.type');
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'ModelType'), 'Type', '/label',
+			'select' => array('name' => 'data[Model][type]', 'id' => 'ModelType'),
+			array('option' => array('value' => 'value')), 'good', '/option',
+			array('option' => array('value' => 'other')), 'bad', '/option',
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test that magic input() selects can easily be converted into radio types without error.
+ *
+ * @return void
+ */
+	function testInputMagicSelectChangeToRadio() {
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['users'] = array('value' => 'good', 'other' => 'bad');
+		$result = $this->Form->input('Model.user_id', array('type' => 'radio'));
+		$this->assertPattern('/input type="radio"/', $result);
+	}
+
+/**
+ * fields with the same name as the model should work.
+ *
+ * @return void
+ */
+	function testInputWithMatchingFieldAndModelName() {
+		$this->Form->create('User');
+		$this->Form->fieldset = array(
+			'User' => array(
+				'fields' => array(
+					'User' => array('type' => 'text')
+				),
+				'validates' => array(),
+				'key' => 'id'
+			)
+		);
+		$this->Form->data['User']['User'] = 'ABC, Inc.';
+		$result = $this->Form->input('User', array('type' => 'text'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'UserUser'), 'User', '/label',
+			'input' => array('name' => 'data[User][User]', 'type' => 'text', 'id' => 'UserUser', 'value' => 'ABC, Inc.'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormInputs method
+ *
+ * test correct results from form::inputs().
+ *
+ * @access public
+ * @return void
+ */
+	function testFormInputs() {
+		$this->Form->create('Contact');
+		$result = $this->Form->inputs('The Legend');
+		$expected = array(
+			'<fieldset',
+			'<legend',
+			'The Legend',
+			'/legend',
+			'*/fieldset',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->inputs(array('legend' => 'Field of Dreams', 'fieldset' => 'classy-stuff'));
+		$expected = array(
+			'fieldset' => array('class' => 'classy-stuff'),
+			'<legend',
+			'Field of Dreams',
+			'/legend',
+			'*/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$View = ClassRegistry::getObject('view');
+		$this->Form->create('Contact');
+		$this->Form->params['prefix'] = 'admin';
+		$this->Form->action = 'admin_edit';
+		$result = $this->Form->inputs();
+		$expected = array(
+			'<fieldset',
+			'<legend',
+			'Edit Contact',
+			'/legend',
+			'*/fieldset',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->inputs(false);
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][id]', 'id' => 'ContactId'),
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input password')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input datetime')),
+			'*/div',
+			array('div' => array('class' => 'input select')),
+			'*/div',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->inputs(array('fieldset' => false, 'legend' => false));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][id]', 'id' => 'ContactId'),
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input password')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input datetime')),
+			'*/div',
+			array('div' => array('class' => 'input select')),
+			'*/div',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->inputs(array('fieldset' => true, 'legend' => false));
+		$expected = array(
+			'fieldset' => array(),
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][id]', 'id' => 'ContactId'),
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input password')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input datetime')),
+			'*/div',
+			array('div' => array('class' => 'input select')),
+			'*/div',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->inputs(array('fieldset' => false, 'legend' => 'Hello'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][id]', 'id' => 'ContactId'),
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input password')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input datetime')),
+			'*/div',
+			array('div' => array('class' => 'input select')),
+			'*/div',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->inputs('Hello');
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Hello',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][id]', 'id' => 'ContactId'),
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input password')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input datetime')),
+			'*/div',
+			array('div' => array('class' => 'input select')),
+			'*/div',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->inputs(array('legend' => 'Hello'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Hello',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][id]', 'id' => 'ContactId'),
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input text')),
+			'*/div',
+			array('div' => array('class' => 'input password')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input date')),
+			'*/div',
+			array('div' => array('class' => 'input datetime')),
+			'*/div',
+			array('div' => array('class' => 'input select')),
+			'*/div',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testSelectAsCheckbox method
+ *
+ * test multi-select widget with checkbox formatting.
+ *
+ * @access public
+ * @return void
+ */
+	function testSelectAsCheckbox() {
+		$result = $this->Form->select('Model.multi_field', array('first', 'second', 'third'), array(0, 1), array('multiple' => 'checkbox'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'checked' => 'checked', 'value' => '0', 'id' => 'ModelMultiField0')),
+			array('label' => array('for' => 'ModelMultiField0', 'class' => 'selected')),
+			'first',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'checked' => 'checked', 'value' => '1', 'id' => 'ModelMultiField1')),
+			array('label' => array('for' => 'ModelMultiField1', 'class' => 'selected')),
+			'second',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '2', 'id' => 'ModelMultiField2')),
+			array('label' => array('for' => 'ModelMultiField2')),
+			'third',
+			'/label',
+			'/div',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select('Model.multi_field', array('1/2' => 'half'), null, array('multiple' => 'checkbox'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '1/2', 'id' => 'ModelMultiField12')),
+			array('label' => array('for' => 'ModelMultiField12')),
+			'half',
+			'/label',
+			'/div',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testLabel method
+ *
+ * test label generation.
+ *
+ * @access public
+ * @return void
+ */
+	function testLabel() {
+		$this->Form->text('Person.name');
+		$result = $this->Form->label();
+		$this->assertTags($result, array('label' => array('for' => 'PersonName'), 'Name', '/label'));
+
+		$this->Form->text('Person.name');
+		$result = $this->Form->label();
+		$this->assertTags($result, array('label' => array('for' => 'PersonName'), 'Name', '/label'));
+
+		$result = $this->Form->label('Person.first_name');
+		$this->assertTags($result, array('label' => array('for' => 'PersonFirstName'), 'First Name', '/label'));
+
+		$result = $this->Form->label('Person.first_name', 'Your first name');
+		$this->assertTags($result, array('label' => array('for' => 'PersonFirstName'), 'Your first name', '/label'));
+
+		$result = $this->Form->label('Person.first_name', 'Your first name', array('class' => 'my-class'));
+		$this->assertTags($result, array('label' => array('for' => 'PersonFirstName', 'class' => 'my-class'), 'Your first name', '/label'));
+
+		$result = $this->Form->label('Person.first_name', 'Your first name', array('class' => 'my-class', 'id' => 'LabelID'));
+		$this->assertTags($result, array('label' => array('for' => 'PersonFirstName', 'class' => 'my-class', 'id' => 'LabelID'), 'Your first name', '/label'));
+
+		$result = $this->Form->label('Person.first_name', '');
+		$this->assertTags($result, array('label' => array('for' => 'PersonFirstName'), '/label'));
+
+		$result = $this->Form->label('Person.2.name', '');
+		$this->assertTags($result, array('label' => array('for' => 'Person2Name'), '/label'));
+	}
+
+/**
+ * testTextbox method
+ *
+ * test textbox element generation
+ *
+ * @access public
+ * @return void
+ */
+	function testTextbox() {
+		$result = $this->Form->text('Model.field');
+		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][field]', 'id' => 'ModelField')));
+
+		$result = $this->Form->text('Model.field', array('type' => 'password'));
+		$this->assertTags($result, array('input' => array('type' => 'password', 'name' => 'data[Model][field]', 'id' => 'ModelField')));
+
+		$result = $this->Form->text('Model.field', array('id' => 'theID'));
+		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][field]', 'id' => 'theID')));
+
+		$this->Form->data['Model']['text'] = 'test <strong>HTML</strong> values';
+		$result = $this->Form->text('Model.text');
+		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][text]', 'value' => 'test &lt;strong&gt;HTML&lt;/strong&gt; values', 'id' => 'ModelText')));
+
+		$this->Form->validationErrors['Model']['text'] = 1;
+		$this->Form->data['Model']['text'] = 'test';
+		$result = $this->Form->text('Model.text', array('id' => 'theID'));
+		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][text]', 'value' => 'test', 'id' => 'theID', 'class' => 'form-error')));
+
+		$this->Form->data['Model']['0']['OtherModel']['field'] = 'My value';
+		$result = $this->Form->text('Model.0.OtherModel.field', array('id' => 'myId'));
+		$expected = array(
+			'input' => array('type' => 'text', 'name' => 'data[Model][0][OtherModel][field]', 'value' => 'My value', 'id' => 'myId')
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testDefaultValue method
+ *
+ * Test default value setting
+ *
+ * @access public
+ * @return void
+ */
+	function testDefaultValue() {
+		$this->Form->data['Model']['field'] = 'test';
+		$result = $this->Form->text('Model.field', array('default' => 'default value'));
+		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][field]', 'value' => 'test', 'id' => 'ModelField')));
+
+		unset($this->Form->data['Model']['field']);
+		$result = $this->Form->text('Model.field', array('default' => 'default value'));
+		$this->assertTags($result, array('input' => array('type' => 'text', 'name' => 'data[Model][field]', 'value' => 'default value', 'id' => 'ModelField')));
+	}
+
+/**
+ * testError method
+ *
+ * Test field error generation
+ *
+ * @access public
+ * @return void
+ */
+	function testError() {
+		$this->Form->validationErrors['Model']['field'] = 1;
+		$result = $this->Form->error('Model.field');
+		$this->assertTags($result, array('div' => array('class' => 'error-message'), 'Error in field Field', '/div'));
+
+		$result = $this->Form->error('Model.field', null, array('wrap' => false));
+		$this->assertEqual($result, 'Error in field Field');
+
+		$this->Form->validationErrors['Model']['field'] = "This field contains invalid input";
+		$result = $this->Form->error('Model.field', null, array('wrap' => false));
+		$this->assertEqual($result, 'This field contains invalid input');
+
+		$this->Form->validationErrors['Model']['field'] = "This field contains invalid input";
+		$result = $this->Form->error('Model.field', null, array('wrap' => 'span'));
+		$this->assertTags($result, array('span' => array('class' => 'error-message'), 'This field contains invalid input', '/span'));
+
+		$result = $this->Form->error('Model.field', 'There is an error fool!', array('wrap' => 'span'));
+		$this->assertTags($result, array('span' => array('class' => 'error-message'), 'There is an error fool!', '/span'));
+
+		$result = $this->Form->error('Model.field', "<strong>Badness!</strong>", array('wrap' => false));
+		$this->assertEqual($result, '&lt;strong&gt;Badness!&lt;/strong&gt;');
+
+		$result = $this->Form->error('Model.field', "<strong>Badness!</strong>", array('wrap' => false, 'escape' => true));
+		$this->assertEqual($result, '&lt;strong&gt;Badness!&lt;/strong&gt;');
+
+		$result = $this->Form->error('Model.field', "<strong>Badness!</strong>", array('wrap' => false, 'escape' => false));
+		$this->assertEqual($result, '<strong>Badness!</strong>');
+
+		$this->Form->validationErrors['Model']['field'] = "email";
+		$result = $this->Form->error('Model.field', array('class' => 'field-error', 'email' => 'No good!'));
+		$expected = array(
+			'div' => array('class' => 'field-error'),
+			'No good!',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test error options when using form->input();
+ *
+ * @return void
+ */
+	function testInputErrorEscape() {
+		$this->Form->create('ValidateProfile');
+		$this->Form->validationErrors['ValidateProfile']['city'] = 'required<br>';
+		$result = $this->Form->input('city',array('error' => array('escape' => true)));
+		$this->assertPattern('/required&lt;br&gt;/', $result);
+
+		$result = $this->Form->input('city',array('error' => array('escape' => false)));
+		$this->assertPattern('/required<br>/', $result);
+	}
+
+/**
+ * testPassword method
+ *
+ * Test password element generation
+ *
+ * @access public
+ * @return void
+ */
+	function testPassword() {
+		$result = $this->Form->password('Model.field');
+		$this->assertTags($result, array('input' => array('type' => 'password', 'name' => 'data[Model][field]', 'id' => 'ModelField')));
+
+		$this->Form->validationErrors['Model']['passwd'] = 1;
+		$this->Form->data['Model']['passwd'] = 'test';
+		$result = $this->Form->password('Model.passwd', array('id' => 'theID'));
+		$this->assertTags($result, array('input' => array('type' => 'password', 'name' => 'data[Model][passwd]', 'value' => 'test', 'id' => 'theID', 'class' => 'form-error')));
+	}
+
+/**
+ * testRadio method
+ *
+ * Test radio element set generation
+ *
+ * @access public
+ * @return void
+ */
+	function testRadio() {
+		$result = $this->Form->radio('Model.field', array('option A'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField0')),
+			'label' => array('for' => 'ModelField0'),
+			'option A',
+			'/label'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.field', array('1/2' => 'half'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '1/2', 'id' => 'ModelField12')),
+			'label' => array('for' => 'ModelField12'),
+			'half',
+			'/label'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.field', array('option A', 'option B'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Field',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField0')),
+			array('label' => array('for' => 'ModelField0')),
+			'option A',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField1')),
+			array('label' => array('for' => 'ModelField1')),
+			'option B',
+			'/label',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.field', array('option A', 'option B'), array('separator' => '<br/>'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Field',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField0')),
+			array('label' => array('for' => 'ModelField0')),
+			'option A',
+			'/label',
+			'br' => array(),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField1')),
+			array('label' => array('for' => 'ModelField1')),
+			'option B',
+			'/label',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.field', array('1' => 'Yes', '0' => 'No'), array('value' => '1'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Field',
+			'/legend',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField1', 'checked' => 'checked')),
+			array('label' => array('for' => 'ModelField1')),
+			'Yes',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField0')),
+			array('label' => array('for' => 'ModelField0')),
+			'No',
+			'/label',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.field', array('1' => 'Yes', '0' => 'No'), array('value' => '0'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Field',
+			'/legend',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField1')),
+			array('label' => array('for' => 'ModelField1')),
+			'Yes',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField0', 'checked' => 'checked')),
+			array('label' => array('for' => 'ModelField0')),
+			'No',
+			'/label',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.field', array('1' => 'Yes', '0' => 'No'), array('value' => null));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Field',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField1')),
+			array('label' => array('for' => 'ModelField1')),
+			'Yes',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField0')),
+			array('label' => array('for' => 'ModelField0')),
+			'No',
+			'/label',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.field', array('1' => 'Yes', '0' => 'No'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Field',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField1')),
+			array('label' => array('for' => 'ModelField1')),
+			'Yes',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField0')),
+			array('label' => array('for' => 'ModelField0')),
+			'No',
+			'/label',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Newsletter.subscribe', array('legend' => 'Legend title', 'type' => 'radio', 'options' => array('0' => 'Unsubscribe', '1' => 'Subscribe')));
+		$expected = array(
+			'div' => array('class' => 'input radio'),
+			'fieldset' => array(),
+			'legend' => array(),
+			'Legend title',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Newsletter][subscribe]', 'value' => '', 'id' => 'NewsletterSubscribe_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '0', 'id' => 'NewsletterSubscribe0')),
+			array('label' => array('for' => 'NewsletterSubscribe0')),
+			'Unsubscribe',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '1', 'id' => 'NewsletterSubscribe1')),
+			array('label' => array('for' => 'NewsletterSubscribe1')),
+			'Subscribe',
+			'/label',
+			'/fieldset',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Newsletter.subscribe', array('legend' => false, 'type' => 'radio', 'options' => array('0' => 'Unsubscribe', '1' => 'Subscribe')));
+		$expected = array(
+			'div' => array('class' => 'input radio'),
+			'input' => array('type' => 'hidden', 'name' => 'data[Newsletter][subscribe]', 'value' => '', 'id' => 'NewsletterSubscribe_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '0', 'id' => 'NewsletterSubscribe0')),
+			array('label' => array('for' => 'NewsletterSubscribe0')),
+			'Unsubscribe',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '1', 'id' => 'NewsletterSubscribe1')),
+			array('label' => array('for' => 'NewsletterSubscribe1')),
+			'Subscribe',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Newsletter.subscribe', array('legend' => 'Legend title', 'label' => false, 'type' => 'radio', 'options' => array('0' => 'Unsubscribe', '1' => 'Subscribe')));
+		$expected = array(
+			'div' => array('class' => 'input radio'),
+			'fieldset' => array(),
+			'legend' => array(),
+			'Legend title',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Newsletter][subscribe]', 'value' => '', 'id' => 'NewsletterSubscribe_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '0', 'id' => 'NewsletterSubscribe0')),
+			'Unsubscribe',
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '1', 'id' => 'NewsletterSubscribe1')),
+			'Subscribe',
+			'/fieldset',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Newsletter.subscribe', array('legend' => false, 'label' => false, 'type' => 'radio', 'options' => array('0' => 'Unsubscribe', '1' => 'Subscribe')));
+		$expected = array(
+			'div' => array('class' => 'input radio'),
+			'input' => array('type' => 'hidden', 'name' => 'data[Newsletter][subscribe]', 'value' => '', 'id' => 'NewsletterSubscribe_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '0', 'id' => 'NewsletterSubscribe0')),
+			'Unsubscribe',
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '1', 'id' => 'NewsletterSubscribe1')),
+			'Subscribe',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Newsletter.subscribe', array('legend' => false, 'label' => false, 'type' => 'radio', 'value' => '1', 'options' => array('0' => 'Unsubscribe', '1' => 'Subscribe')));
+		$expected = array(
+			'div' => array('class' => 'input radio'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '0', 'id' => 'NewsletterSubscribe0')),
+			'Unsubscribe',
+			array('input' => array('type' => 'radio', 'name' => 'data[Newsletter][subscribe]', 'value' => '1', 'id' => 'NewsletterSubscribe1', 'checked' => 'checked')),
+			'Subscribe',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Employee.gender', array('male' => 'Male', 'female' => 'Female'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Gender',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Employee][gender]', 'value' => '', 'id' => 'EmployeeGender_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Employee][gender]', 'value' => 'male', 'id' => 'EmployeeGenderMale')),
+			array('label' => array('for' => 'EmployeeGenderMale')),
+			'Male',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Employee][gender]', 'value' => 'female', 'id' => 'EmployeeGenderFemale')),
+			array('label' => array('for' => 'EmployeeGenderFemale')),
+			'Female',
+			'/label',
+			'/fieldset',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Officer.gender', array('male' => 'Male', 'female' => 'Female'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Gender',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Officer][gender]', 'value' => '', 'id' => 'OfficerGender_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Officer][gender]', 'value' => 'male', 'id' => 'OfficerGenderMale')),
+			array('label' => array('for' => 'OfficerGenderMale')),
+			'Male',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Officer][gender]', 'value' => 'female', 'id' => 'OfficerGenderFemale')),
+			array('label' => array('for' => 'OfficerGenderFemale')),
+			'Female',
+			'/label',
+			'/fieldset',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Contact.1.imrequired', array('option A'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][1][imrequired]', 'value' => '', 'id' => 'Contact1Imrequired_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Contact][1][imrequired]', 'value' => '0', 'id' => 'Contact1Imrequired0')),
+			'label' => array('for' => 'Contact1Imrequired0'),
+			'option A',
+			'/label'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.1.field', array('option A'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][1][field]', 'value' => '', 'id' => 'Model1Field_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][1][field]', 'value' => '0', 'id' => 'Model1Field0')),
+			'label' => array('for' => 'Model1Field0'),
+			'option A',
+			'/label'
+		);
+		$this->assertTags($result, $expected);
+
+
+		$result = $this->Form->radio('Model.field', array('option A', 'option B'), array('name' => 'data[Model][custom]'));
+		$expected = array(
+			'fieldset' => array(),
+			'legend' => array(),
+			'Field',
+			'/legend',
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][custom]', 'value' => '', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][custom]', 'value' => '0', 'id' => 'ModelField0')),
+			array('label' => array('for' => 'ModelField0')),
+			'option A',
+			'/label',
+			array('input' => array('type' => 'radio', 'name' => 'data[Model][custom]', 'value' => '1', 'id' => 'ModelField1')),
+			array('label' => array('for' => 'ModelField1')),
+			'option B',
+			'/label',
+			'/fieldset'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test disabling the hidden input for radio buttons
+ *
+ * @return void
+ */
+	function testRadioHiddenInputDisabling() {
+		$result = $this->Form->input('Model.1.field', array(
+				'type' => 'radio',
+				'options' => array('option A'),
+				'hiddenField' => false
+			)
+		);
+		$expected = array(
+			'div' => array('class' => 'input radio'),
+			'input' => array('type' => 'radio', 'name' => 'data[Model][1][field]', 'value' => '0', 'id' => 'Model1Field0'),
+			'label' => array('for' => 'Model1Field0'),
+			'option A',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->radio('Model.1.field', array('option A'), array('hiddenField' => false));
+		$expected = array(
+			'input' => array('type' => 'radio', 'name' => 'data[Model][1][field]', 'value' => '0', 'id' => 'Model1Field0'),
+			'label' => array('for' => 'Model1Field0'),
+			'option A',
+			'/label'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testSelect method
+ *
+ * Test select element generation.
+ *
+ * @access public
+ * @return void
+ */
+	function testSelect() {
+		$result = $this->Form->select('Model.field', array());
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			array('option' => array('value' => '')),
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('field' => 'value'));
+		$result = $this->Form->select('Model.field', array('value' => 'good', 'other' => 'bad'));
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => 'value', 'selected' => 'selected')),
+			'good',
+			'/option',
+			array('option' => array('value' => 'other')),
+			'bad',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array();
+		$result = $this->Form->select('Model.field', array('value' => 'good', 'other' => 'bad'));
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => 'value')),
+			'good',
+			'/option',
+			array('option' => array('value' => 'other')),
+			'bad',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.field', array('first' => 'first "html" <chars>', 'second' => 'value'),
+			null, array('empty' => false)
+		);
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			array('option' => array('value' => 'first')),
+			'first &quot;html&quot; &lt;chars&gt;',
+			'/option',
+			array('option' => array('value' => 'second')),
+			'value',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.field',
+			array('first' => 'first "html" <chars>', 'second' => 'value'),
+			null, array('escape' => false, 'empty' => false)
+		);
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			array('option' => array('value' => 'first')),
+			'first "html" <chars>',
+			'/option',
+			array('option' => array('value' => 'second')),
+			'value',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('contact_id' => 228));
+		$result = $this->Form->select(
+			'Model.contact_id',
+			array('228' => '228 value', '228-1' => '228-1 value', '228-2' => '228-2 value'),
+			null, array('escape' => false, 'empty' => 'pick something')
+		);
+
+		$expected = array(
+			'select' => array('name' => 'data[Model][contact_id]', 'id' => 'ModelContactId'),
+			array('option' => array('value' => '')), 'pick something', '/option',
+			array('option' => array('value' => '228', 'selected' => 'selected')), '228 value', '/option',
+			array('option' => array('value' => '228-1')), '228-1 value', '/option',
+			array('option' => array('value' => '228-2')), '228-2 value', '/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that select() with optiongroups listens to the escape param.
+ *
+ * @return void
+ */
+	function testSelectOptionGroupEscaping() {
+		$options = array(
+			'>< Key' => array(
+				1 => 'One',
+				2 => 'Two'
+			)
+		);
+		$result = $this->Form->select('Model.field', $options, null, array('empty' => false));
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			'optgroup' => array('label' => '&gt;&lt; Key'),
+			array('option' => array('value' => '1')), 'One', '/option',
+			array('option' => array('value' => '2')), 'Two', '/option',
+			'/optgroup',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$options = array(
+			'>< Key' => array(
+				1 => 'One',
+				2 => 'Two'
+			)
+		);
+		$result = $this->Form->select('Model.field', $options, null, array('empty' => false, 'escape' => false));
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			'optgroup' => array('label' => '>< Key'),
+			array('option' => array('value' => '1')), 'One', '/option',
+			array('option' => array('value' => '2')), 'Two', '/option',
+			'/optgroup',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Tests that FormHelper::select() allows null to be passed in the $attributes parameter
+ *
+ * @access public
+ * @return void
+ */
+	function testSelectWithNullAttributes() {
+		$result = $this->Form->select('Model.field', array('first', 'second'), null, array('empty' => false));
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			array('option' => array('value' => '0')),
+			'first',
+			'/option',
+			array('option' => array('value' => '1')),
+			'second',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testNestedSelect method
+ *
+ * test select element generation with optgroups
+ *
+ * @access public
+ * @return void
+ */
+	function testNestedSelect() {
+		$result = $this->Form->select(
+			'Model.field',
+			array(1 => 'One', 2 => 'Two', 'Three' => array(
+				3 => 'Three', 4 => 'Four', 5 => 'Five'
+			)), null, array('empty' => false)
+		);
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]',
+					'id' => 'ModelField'),
+					array('option' => array('value' => 1)),
+					'One',
+					'/option',
+					array('option' => array('value' => 2)),
+					'Two',
+					'/option',
+					array('optgroup' => array('label' => 'Three')),
+						array('option' => array('value' => 4)),
+						'Four',
+						'/option',
+						array('option' => array('value' => 5)),
+						'Five',
+						'/option',
+					'/optgroup',
+					'/select'
+					);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.field',
+			array(1 => 'One', 2 => 'Two', 'Three' => array(3 => 'Three', 4 => 'Four')), null,
+			array('showParents' => true, 'empty' => false)
+		);
+
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+				array('option' => array('value' => 1)),
+				'One',
+				'/option',
+				array('option' => array('value' => 2)),
+				'Two',
+				'/option',
+				array('optgroup' => array('label' => 'Three')),
+					array('option' => array('value' => 3)),
+					'Three',
+					'/option',
+					array('option' => array('value' => 4)),
+					'Four',
+					'/option',
+				'/optgroup',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testSelectMultiple method
+ *
+ * test generation of multiple select elements
+ *
+ * @access public
+ * @return void
+ */
+	function testSelectMultiple() {
+		$options = array('first', 'second', 'third');
+		$result = $this->Form->select(
+			'Model.multi_field', $options, null, array('multiple' => true)
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField_'
+			),
+			'select' => array(
+				'name' => 'data[Model][multi_field][]',
+				'id' => 'ModelMultiField', 'multiple' => 'multiple'
+			),
+			array('option' => array('value' => '0')),
+			'first',
+			'/option',
+			array('option' => array('value' => '1')),
+			'second',
+			'/option',
+			array('option' => array('value' => '2')),
+			'third',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.multi_field', $options, null, array('multiple' => 'multiple')
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField_'
+			),
+			'select' => array(
+				'name' => 'data[Model][multi_field][]',
+				'id' => 'ModelMultiField', 'multiple' => 'multiple'
+			),
+			array('option' => array('value' => '0')),
+			'first',
+			'/option',
+			array('option' => array('value' => '1')),
+			'second',
+			'/option',
+			array('option' => array('value' => '2')),
+			'third',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.multi_field', $options, array(0, 1), array('multiple' => true)
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField_'
+			),
+			'select' => array(
+				'name' => 'data[Model][multi_field][]', 'id' => 'ModelMultiField',
+				'multiple' => 'multiple'
+			),
+			array('option' => array('value' => '0', 'selected' => 'selected')),
+			'first',
+			'/option',
+			array('option' => array('value' => '1', 'selected' => 'selected')),
+			'second',
+			'/option',
+			array('option' => array('value' => '2')),
+			'third',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.multi_field', $options, array(0, 1), array('multiple' => false)
+		);
+		$expected = array(
+			'select' => array(
+				'name' => 'data[Model][multi_field]', 'id' => 'ModelMultiField'
+			),
+			array('option' => array('value' => '0', 'selected' => 'selected')),
+			'first',
+			'/option',
+			array('option' => array('value' => '1', 'selected' => 'selected')),
+			'second',
+			'/option',
+			array('option' => array('value' => '2')),
+			'third',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test generation of habtm select boxes.
+ *
+ * @return void
+ */
+	function testHabtmSelectBox() {
+		$view =& ClassRegistry::getObject('view');
+		$view->viewVars['contactTags'] = array(
+			1 => 'blue',
+			2 => 'red',
+			3 => 'green'
+		);
+		$this->Form->data = array(
+			'Contact' => array(),
+			'ContactTag' => array(
+				array(
+					'id' => 1,
+					'name' => 'blue'
+				),
+				array(
+					'id' => 3,
+					'name' => 'green'
+				)
+			)
+		);
+		$this->Form->create('Contact');
+		$result = $this->Form->input('ContactTag', array('div' => false, 'label' => false));
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[ContactTag][ContactTag]', 'value' => '', 'id' => 'ContactTagContactTag_'
+			),
+			'select' => array(
+				'name' => 'data[ContactTag][ContactTag][]', 'id' => 'ContactTagContactTag',
+				'multiple' => 'multiple'
+			),
+			array('option' => array('value' => '1', 'selected' => 'selected')),
+			'blue',
+			'/option',
+			array('option' => array('value' => '2')),
+			'red',
+			'/option',
+			array('option' => array('value' => '3', 'selected' => 'selected')),
+			'green',
+			'/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test generation of multi select elements in checkbox format
+ *
+ * @access public
+ * @return void
+ */
+	function testSelectMultipleCheckboxes() {
+		$result = $this->Form->select(
+			'Model.multi_field',
+			array('first', 'second', 'third'), null,
+			array('multiple' => 'checkbox')
+		);
+
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'
+			),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][multi_field][]',
+				'value' => '0', 'id' => 'ModelMultiField0'
+			)),
+			array('label' => array('for' => 'ModelMultiField0')),
+			'first',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][multi_field][]',
+				'value' => '1', 'id' => 'ModelMultiField1'
+			)),
+			array('label' => array('for' => 'ModelMultiField1')),
+			'second',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][multi_field][]',
+				'value' => '2', 'id' => 'ModelMultiField2'
+			)),
+			array('label' => array('for' => 'ModelMultiField2')),
+			'third',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.multi_field',
+			array('a' => 'first', 'b' => 'second', 'c' => 'third'), null,
+			array('multiple' => 'checkbox')
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'
+			),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][multi_field][]',
+				'value' => 'a', 'id' => 'ModelMultiFieldA'
+			)),
+			array('label' => array('for' => 'ModelMultiFieldA')),
+			'first',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][multi_field][]',
+				'value' => 'b', 'id' => 'ModelMultiFieldB'
+			)),
+			array('label' => array('for' => 'ModelMultiFieldB')),
+			'second',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][multi_field][]',
+				'value' => 'c', 'id' => 'ModelMultiFieldC'
+			)),
+			array('label' => array('for' => 'ModelMultiFieldC')),
+			'third',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->select(
+			'Model.multi_field', array('1' => 'first'), null, array('multiple' => 'checkbox')
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'
+			),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][multi_field][]',
+				'value' => '1', 'id' => 'ModelMultiField1'
+			)),
+			array('label' => array('for' => 'ModelMultiField1')),
+			'first',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('tags' => array(1)));
+		$result = $this->Form->select(
+			'Model.tags', array('1' => 'first', 'Array' => 'Array'), null, array('multiple' => 'checkbox')
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][tags]', 'value' => '', 'id' => 'ModelTags'
+			),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][tags][]',
+				'value' => '1', 'id' => 'ModelTags1', 'checked' => 'checked'
+			)),
+			array('label' => array('for' => 'ModelTags1', 'class' => 'selected')),
+			'first',
+			'/label',
+			'/div',
+
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][tags][]',
+				'value' => 'Array', 'id' => 'ModelTagsArray'
+			)),
+			array('label' => array('for' => 'ModelTagsArray')),
+			'Array',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test multiple checkboxes with div styles.
+ *
+ * @return void
+ */
+	function testSelectMultipleCheckboxDiv() {
+		$result = $this->Form->select(
+			'Model.tags',
+			array('first', 'second'),
+			null,
+			array('multiple' => 'checkbox', 'class' => 'my-class')
+		);
+		$expected = array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Model][tags]', 'value' => '', 'id' => 'ModelTags'
+			),
+			array('div' => array('class' => 'my-class')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][tags][]',
+				'value' => '0', 'id' => 'ModelTags0'
+			)),
+			array('label' => array('for' => 'ModelTags0')), 'first', '/label',
+			'/div',
+
+			array('div' => array('class' => 'my-class')),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[Model][tags][]',
+				'value' => '1', 'id' => 'ModelTags1'
+			)),
+			array('label' => array('for' => 'ModelTags1')), 'second', '/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.tags', array(
+			'options' => array('first', 'second'),
+			'multiple' => 'checkbox',
+			'class' => 'my-class',
+			'div' => false,
+			'label' => false
+		));
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['Model']['tags'] = 'Select atleast one option';
+		$result = $this->Form->input('Model.tags', array(
+			'options' => array('one'),
+			'multiple' => 'checkbox',
+			'label' => false,
+			'div' => false
+		));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][tags]', 'value' => '', 'id' => 'ModelTags'),
+			array('div' => array('class' => 'checkbox form-error')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][tags][]', 'value' => '0', 'id' => 'ModelTags0')),
+			array('label' => array('for' => 'ModelTags0')),
+			'one',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.tags', array(
+			'options' => array('one'),
+			'multiple' => 'checkbox',
+			'class' => 'mycheckbox',
+			'label' => false,
+			'div' => false
+		));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][tags]', 'value' => '', 'id' => 'ModelTags'),
+			array('div' => array('class' => 'mycheckbox form-error')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][tags][]', 'value' => '0', 'id' => 'ModelTags0')),
+			array('label' => array('for' => 'ModelTags0')),
+			'one',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Checks the security hash array generated for multiple-input checkbox elements
+ *
+ * @access public
+ * @return void
+ */
+	function testSelectMultipleCheckboxSecurity() {
+		$this->Form->params['_Token']['key'] = 'testKey';
+		$this->assertEqual($this->Form->fields, array());
+
+		$result = $this->Form->select(
+			'Model.multi_field', array('1' => 'first', '2' => 'second', '3' => 'third'),
+			null, array('multiple' => 'checkbox')
+		);
+		$this->assertEqual($this->Form->fields, array('Model.multi_field'));
+
+		$result = $this->Form->secure($this->Form->fields);
+		$key = 'f7d573650a295b94e0938d32b323fde775e5f32b%3A';
+		$this->assertPattern('/"' . $key . '"/', $result);
+	}
+
+/**
+ * testInputMultipleCheckboxes method
+ *
+ * test input() resulting in multi select elements being generated.
+ *
+ * @access public
+ * @return void
+ */
+	function testInputMultipleCheckboxes() {
+		$result = $this->Form->input('Model.multi_field', array(
+			'options' => array('first', 'second', 'third'),
+			'multiple' => 'checkbox'
+		));
+		$expected = array(
+			array('div' => array('class' => 'input select')),
+			array('label' => array('for' => 'ModelMultiField')),
+			'Multi Field',
+			'/label',
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '0', 'id' => 'ModelMultiField0')),
+			array('label' => array('for' => 'ModelMultiField0')),
+			'first',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '1', 'id' => 'ModelMultiField1')),
+			array('label' => array('for' => 'ModelMultiField1')),
+			'second',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '2', 'id' => 'ModelMultiField2')),
+			array('label' => array('for' => 'ModelMultiField2')),
+			'third',
+			'/label',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.multi_field', array(
+			'options' => array('a' => 'first', 'b' => 'second', 'c' => 'third'),
+			'multiple' => 'checkbox'
+		));
+		$expected = array(
+			array('div' => array('class' => 'input select')),
+			array('label' => array('for' => 'ModelMultiField')),
+			'Multi Field',
+			'/label',
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => 'a', 'id' => 'ModelMultiFieldA')),
+			array('label' => array('for' => 'ModelMultiFieldA')),
+			'first',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => 'b', 'id' => 'ModelMultiFieldB')),
+			array('label' => array('for' => 'ModelMultiFieldB')),
+			'second',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => 'c', 'id' => 'ModelMultiFieldC')),
+			array('label' => array('for' => 'ModelMultiFieldC')),
+			'third',
+			'/label',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.multi_field', array(
+			'options' => array('1' => 'first'),
+			'multiple' => 'checkbox',
+			'label' => false,
+			'div' => false
+		));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '1', 'id' => 'ModelMultiField1')),
+			array('label' => array('for' => 'ModelMultiField1')),
+			'first',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.multi_field', array(
+			'options' => array('2' => 'second'),
+			'multiple' => 'checkbox',
+			'label' => false,
+			'div' => false
+		));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][multi_field]', 'value' => '', 'id' => 'ModelMultiField'),
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '2', 'id' => 'ModelMultiField2')),
+			array('label' => array('for' => 'ModelMultiField2')),
+			'second',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * testSelectHiddenFieldOmission method
+ *
+ * test that select() with 'hiddenField' => false omits the hidden field
+ *
+ * @access public
+ * @return void
+ */
+	function testSelectHiddenFieldOmission() {
+		$result = $this->Form->select('Model.multi_field',
+			array('first', 'second'),
+			null,
+			array('multiple' => 'checkbox', 'hiddenField' => false)
+		);
+		$expected = array(
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '0', 'id' => 'ModelMultiField0')),
+			array('label' => array('for' => 'ModelMultiField0')),
+			'first',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '1', 'id' => 'ModelMultiField1')),
+			array('label' => array('for' => 'ModelMultiField1')),
+			'second',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Model.multi_field', array(
+			'options' => array('first', 'second'),
+			'multiple' => 'checkbox',
+			'hiddenField' => false
+		));
+		$expected = array(
+			array('div' => array('class' => 'input select')),
+			array('label' => array('for' => 'ModelMultiField')),
+			'Multi Field',
+			'/label',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '0', 'id' => 'ModelMultiField0')),
+			array('label' => array('for' => 'ModelMultiField0')),
+			'first',
+			'/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][multi_field][]', 'value' => '1', 'id' => 'ModelMultiField1')),
+			array('label' => array('for' => 'ModelMultiField1')),
+			'second',
+			'/label',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that select() with multiple = checkbox works with overriding name attribute.
+ *
+ * @return void
+ */
+	function testSelectCheckboxMultipleOverrideName() {
+		$result = $this->Form->input('category', array(
+			'type' => 'select',
+			'multiple' => 'checkbox',
+			'name' => 'data[fish]',
+			'options' => array('1', '2'),
+			'div' => false,
+			'label' => false,
+		));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[fish]', 'value' => '', 'id' => 'category'),
+			array('div' => array('class' => 'checkbox')),
+				array('input' => array('type' => 'checkbox', 'name' => 'data[fish][]', 'value' => '0', 'id' => 'Category0')),
+				array('label' => array('for' => 'Category0')), '1', '/label',
+			'/div',
+			array('div' => array('class' => 'checkbox')),
+				array('input' => array('type' => 'checkbox', 'name' => 'data[fish][]', 'value' => '1', 'id' => 'Category1')),
+				array('label' => array('for' => 'Category1')), '2', '/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testCheckbox method
+ *
+ * Test generation of checkboxes
+ *
+ * @access public
+ * @return void
+ */
+	function testCheckbox() {
+		$result = $this->Form->checkbox('Model.field', array('id' => 'theID', 'value' => 'myvalue'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'theID_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => 'myvalue', 'id' => 'theID'))
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['Model']['field'] = 1;
+		$this->Form->data['Model']['field'] = 'myvalue';
+		$result = $this->Form->checkbox('Model.field', array('id' => 'theID', 'value' => 'myvalue'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'theID_'),
+			array('input' => array('preg:/[^<]+/', 'value' => 'myvalue', 'id' => 'theID', 'checked' => 'checked', 'class' => 'form-error'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Model.field', array('value' => 'myvalue'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('preg:/[^<]+/', 'value' => 'myvalue', 'id' => 'ModelField', 'checked' => 'checked', 'class' => 'form-error'))
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '';
+		$result = $this->Form->checkbox('Model.field', array('id' => 'theID'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'theID_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'theID', 'class' => 'form-error'))
+		);
+		$this->assertTags($result, $expected);
+
+		unset($this->Form->validationErrors['Model']['field']);
+		$result = $this->Form->checkbox('Model.field', array('value' => 'myvalue'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => 'myvalue', 'id' => 'ModelField'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Contact.name', array('value' => 'myvalue'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][name]', 'value' => '0', 'id' => 'ContactName_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Contact][name]', 'value' => 'myvalue', 'id' => 'ContactName'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Model.field');
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Model.field', array('checked' => false));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField'))
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['Model']['field'] = 1;
+		$this->Form->data['Contact']['published'] = 1;
+		$result = $this->Form->checkbox('Contact.published', array('id' => 'theID'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][published]', 'value' => '0', 'id' => 'theID_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Contact][published]', 'value' => '1', 'id' => 'theID', 'checked' => 'checked'))
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['Model']['field'] = 1;
+		$this->Form->data['Contact']['published'] = 0;
+		$result = $this->Form->checkbox('Contact.published', array('id'=>'theID'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Contact][published]', 'value' => '0', 'id' => 'theID_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Contact][published]', 'value' => '1', 'id' => 'theID'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Model.CustomField.1.value');
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][CustomField][1][value]', 'value' => '0', 'id' => 'ModelCustomField1Value_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][CustomField][1][value]', 'value' => '1', 'id' => 'ModelCustomField1Value'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('CustomField.1.value');
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[CustomField][1][value]', 'value' => '0', 'id' => 'CustomField1Value_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[CustomField][1][value]', 'value' => '1', 'id' => 'CustomField1Value'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Test.test', array('name' => 'myField'));
+		$expected = array(
+				'input' => array('type' => 'hidden', 'name' => 'myField', 'value' => '0', 'id' => 'TestTest_'),
+				array('input' => array('type' => 'checkbox', 'name' => 'myField', 'value' => '1', 'id' => 'TestTest'))
+			);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test the checked option for checkboxes.
+ *
+ * @return void
+ */
+	function testCheckboxCheckedOption() {
+		$result = $this->Form->checkbox('Model.field', array('checked' => 'checked'));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField', 'checked' => 'checked'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Model.field', array('checked' => 1));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField', 'checked' => 'checked'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Model.field', array('checked' => true));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField', 'checked' => 'checked'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->checkbox('Model.field', array('checked' => false));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField'))
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = 1;
+		$result = $this->Form->checkbox('Model.field', array('checked' => false));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'value' => '0', 'id' => 'ModelField_'),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Model][field]', 'value' => '1', 'id' => 'ModelField'))
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test that disabling a checkbox also disables the hidden input so no value is submitted
+ *
+ * @return void
+ */
+	function testCheckboxDisabling() {
+		$result = $this->Form->checkbox('Account.show_name', array('disabled' => 'disabled'));
+		$expected = array(
+			array('input' => array('type' => 'hidden', 'name' => 'data[Account][show_name]', 'value' => '0', 'id' => 'AccountShowName_', 'disabled' => 'disabled')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Account][show_name]', 'value' => '1', 'id' => 'AccountShowName', 'disabled' => 'disabled'))
+		);
+		$this->assertTags($result, $expected,true);
+	}
+
+/**
+ * Test that specifying false in the 'disabled' option will not disable either the hidden input or the checkbox input
+ *
+ * @return void
+ */
+	function testCheckboxHiddenDisabling() {
+		$result = $this->Form->checkbox('Account.show_name', array('disabled' => false));
+		$expected = array(
+			array('input' => array('type' => 'hidden', 'name' => 'data[Account][show_name]', 'value' => '0', 'id' => 'AccountShowName_')),
+			array('input' => array('type' => 'checkbox', 'name' => 'data[Account][show_name]', 'value' => '1', 'id' => 'AccountShowName'))
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test that the hidden input for checkboxes can be removed/omitted from the output.
+ *
+ * @return void
+ */
+	function testCheckboxHiddenFieldOmission() {
+		$result = $this->Form->input('UserForm.something', array(
+				'type' => 'checkbox',
+				'hiddenField' => false
+			)
+		);
+		$expected = array(
+			'div' => array('class' => 'input checkbox'),
+			array('input' => array(
+				'type' => 'checkbox', 'name' => 'data[UserForm][something]',
+				'value' => '1', 'id' => 'UserFormSomething'
+			)),
+			'label' => array('for' => 'UserFormSomething'),
+			'Something',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testDateTime method
+ *
+ * Test generation of date/time select elements
+ *
+ * @access public
+ * @return void
+ */
+	function testDateTime() {
+		extract($this->dateRegex);
+
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12', null, array('empty' => false));
+		$now = strtotime('now');
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][date][day]', 'id' => 'ContactDateDay')),
+			$daysRegex,
+			array('option' => array('value' => date('d', $now), 'selected' => 'selected')),
+			date('j', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][month]', 'id' => 'ContactDateMonth')),
+			$monthsRegex,
+			array('option' => array('value' => date('m', $now), 'selected' => 'selected')),
+			date('F', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][year]', 'id' => 'ContactDateYear')),
+			$yearsRegex,
+			array('option' => array('value' => date('Y', $now), 'selected' => 'selected')),
+			date('Y', $now),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][date][hour]', 'id' => 'ContactDateHour')),
+			$hoursRegex,
+			array('option' => array('value' => date('h', $now), 'selected' => 'selected')),
+			date('g', $now),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][date][min]', 'id' => 'ContactDateMin')),
+			$minutesRegex,
+			array('option' => array('value' => date('i', $now), 'selected' => 'selected')),
+			date('i', $now),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][date][meridian]', 'id' => 'ContactDateMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => date('a', $now), 'selected' => 'selected')),
+			date('a', $now),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12');
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][date][day]', 'id' => 'ContactDateDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][month]', 'id' => 'ContactDateMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][year]', 'id' => 'ContactDateYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][date][hour]', 'id' => 'ContactDateHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][date][min]', 'id' => 'ContactDateMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][date][meridian]', 'id' => 'ContactDateMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+		$this->assertNoPattern('/<option[^<>]+value=""[^<>]+selected="selected"[^>]*>/', $result);
+
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12', false);
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][date][day]', 'id' => 'ContactDateDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][month]', 'id' => 'ContactDateMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][year]', 'id' => 'ContactDateYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][date][hour]', 'id' => 'ContactDateHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][date][min]', 'id' => 'ContactDateMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][date][meridian]', 'id' => 'ContactDateMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+		$this->assertNoPattern('/<option[^<>]+value=""[^<>]+selected="selected"[^>]*>/', $result);
+
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12', '');
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][date][day]', 'id' => 'ContactDateDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][month]', 'id' => 'ContactDateMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][year]', 'id' => 'ContactDateYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][date][hour]', 'id' => 'ContactDateHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][date][min]', 'id' => 'ContactDateMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][date][meridian]', 'id' => 'ContactDateMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+		$this->assertNoPattern('/<option[^<>]+value=""[^<>]+selected="selected"[^>]*>/', $result);
+
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12', '', array('interval' => 5));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][date][day]', 'id' => 'ContactDateDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][month]', 'id' => 'ContactDateMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][year]', 'id' => 'ContactDateYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][date][hour]', 'id' => 'ContactDateHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][date][min]', 'id' => 'ContactDateMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00')),
+			'00',
+			'/option',
+			array('option' => array('value' => '05')),
+			'05',
+			'/option',
+			array('option' => array('value' => '10')),
+			'10',
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][date][meridian]', 'id' => 'ContactDateMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+		$this->assertNoPattern('/<option[^<>]+value=""[^<>]+selected="selected"[^>]*>/', $result);
+
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12', '', array('minuteInterval' => 5));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][date][day]', 'id' => 'ContactDateDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][month]', 'id' => 'ContactDateMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][year]', 'id' => 'ContactDateYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][date][hour]', 'id' => 'ContactDateHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][date][min]', 'id' => 'ContactDateMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00')),
+			'00',
+			'/option',
+			array('option' => array('value' => '05')),
+			'05',
+			'/option',
+			array('option' => array('value' => '10')),
+			'10',
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][date][meridian]', 'id' => 'ContactDateMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+		$this->assertNoPattern('/<option[^<>]+value=""[^<>]+selected="selected"[^>]*>/', $result);
+
+		$this->Form->data['Contact']['data'] = null;
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12');
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][date][day]', 'id' => 'ContactDateDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][month]', 'id' => 'ContactDateMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][date][year]', 'id' => 'ContactDateYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][date][hour]', 'id' => 'ContactDateHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][date][min]', 'id' => 'ContactDateMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][date][meridian]', 'id' => 'ContactDateMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+		$this->assertNoPattern('/<option[^<>]+value=""[^<>]+selected="selected"[^>]*>/', $result);
+
+		$this->Form->data['Model']['field'] = date('Y') . '-01-01 00:00:00';
+		$now = strtotime($this->Form->data['Model']['field']);
+		$result = $this->Form->dateTime('Model.field', 'DMY', '12', null, array('empty' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][day]', 'id' => 'ModelFieldDay')),
+			$daysRegex,
+			array('option' => array('value' => date('d', $now), 'selected' => 'selected')),
+			date('j', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Model][field][month]', 'id' => 'ModelFieldMonth')),
+			$monthsRegex,
+			array('option' => array('value' => date('m', $now), 'selected' => 'selected')),
+			date('F', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Model][field][year]', 'id' => 'ModelFieldYear')),
+			$yearsRegex,
+			array('option' => array('value' => date('Y', $now), 'selected' => 'selected')),
+			date('Y', $now),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Model][field][hour]', 'id' => 'ModelFieldHour')),
+			$hoursRegex,
+			array('option' => array('value' => date('h', $now), 'selected' => 'selected')),
+			date('g', $now),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Model][field][min]', 'id' => 'ModelFieldMin')),
+			$minutesRegex,
+			array('option' => array('value' => date('i', $now), 'selected' => 'selected')),
+			date('i', $now),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Model][field][meridian]', 'id' => 'ModelFieldMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => date('a', $now), 'selected' => 'selected')),
+			date('a', $now),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$selected = strtotime('2008-10-26 10:33:00');
+		$result = $this->Form->dateTime('Model.field', 'DMY', '12', $selected);
+		$this->assertPattern('/<option[^<>]+value="2008"[^<>]+selected="selected"[^>]*>2008<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="10"[^<>]+selected="selected"[^>]*>10<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="26"[^<>]+selected="selected"[^>]*>26<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="10"[^<>]+selected="selected"[^>]*>10<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="33"[^<>]+selected="selected"[^>]*>33<\/option>/', $result);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->input('published');
+		$now = strtotime('now');
+		$expected = array(
+			'div' => array('class' => 'input date'),
+			'label' => array('for' => 'ContactPublishedMonth'),
+			'Published',
+			'/label',
+			array('select' => array('name' => 'data[Contact][published][month]', 'id' => 'ContactPublishedMonth')),
+			$monthsRegex,
+			array('option' => array('value' => date('m', $now), 'selected' => 'selected')),
+			date('F', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][published][day]', 'id' => 'ContactPublishedDay')),
+			$daysRegex,
+			array('option' => array('value' => date('d', $now), 'selected' => 'selected')),
+			date('j', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			$yearsRegex,
+			array('option' => array('value' => date('Y', $now), 'selected' => 'selected')),
+			date('Y', $now),
+			'/option',
+			'*/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('published2', array('type' => 'date'));
+		$now = strtotime('now');
+		$expected = array(
+			'div' => array('class' => 'input date'),
+			'label' => array('for' => 'ContactPublished2Month'),
+			'Published2',
+			'/label',
+			array('select' => array('name' => 'data[Contact][published2][month]', 'id' => 'ContactPublished2Month')),
+			$monthsRegex,
+			array('option' => array('value' => date('m', $now), 'selected' => 'selected')),
+			date('F', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][published2][day]', 'id' => 'ContactPublished2Day')),
+			$daysRegex,
+			array('option' => array('value' => date('d', $now), 'selected' => 'selected')),
+			date('j', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][published2][year]', 'id' => 'ContactPublished2Year')),
+			$yearsRegex,
+			array('option' => array('value' => date('Y', $now), 'selected' => 'selected')),
+			date('Y', $now),
+			'/option',
+			'*/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('ContactTag');
+		$expected = array(
+			'div' => array('class' => 'input select'),
+			'label' => array('for' => 'ContactTagContactTag'),
+			'Contact Tag',
+			'/label',
+			array('input' => array('type' => 'hidden', 'name' => 'data[ContactTag][ContactTag]', 'value' => '', 'id' => 'ContactTagContactTag_')),
+			array('select' => array('name' => 'data[ContactTag][ContactTag][]', 'multiple' => 'multiple', 'id' => 'ContactTagContactTag')),
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->create('Contact');
+		$result = $this->Form->input('published', array('monthNames' => false));
+		$now = strtotime('now');
+		$expected = array(
+			'div' => array('class' => 'input date'),
+			'label' => array('for' => 'ContactPublishedMonth'),
+			'Published',
+			'/label',
+			array('select' => array('name' => 'data[Contact][published][month]', 'id' => 'ContactPublishedMonth')),
+			'preg:/(?:<option value="([\d])+">[\d]+<\/option>[\r\n]*)*/',
+			array('option' => array('value' => date('m', $now), 'selected' => 'selected')),
+			date('m', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][published][day]', 'id' => 'ContactPublishedDay')),
+			$daysRegex,
+			array('option' => array('value' => date('d', $now), 'selected' => 'selected')),
+			date('j', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			$yearsRegex,
+			array('option' => array('value' => date('Y', $now), 'selected' => 'selected')),
+			date('Y', $now),
+			'/option',
+			'*/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('published', array('type' => 'time'));
+		$now = strtotime('now');
+		$expected = array(
+			'div' => array('class' => 'input time'),
+			'label' => array('for' => 'ContactPublishedHour'),
+			'Published',
+			'/label',
+			array('select' => array('name' => 'data[Contact][published][hour]', 'id' => 'ContactPublishedHour')),
+			'preg:/(?:<option value="([\d])+">[\d]+<\/option>[\r\n]*)*/',
+			array('option' => array('value' => date('h', $now), 'selected' => 'selected')),
+			date('g', $now),
+			'/option',
+			'*/select',
+			':',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('published', array(
+			'timeFormat' => 24,
+			'interval' => 5,
+			'selected' => strtotime('2009-09-03 13:37:00'),
+			'type' => 'datetime'
+		));
+		$this->assertPattern('/<option[^<>]+value="2009"[^<>]+selected="selected"[^>]*>2009<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="09"[^<>]+selected="selected"[^>]*>September<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="03"[^<>]+selected="selected"[^>]*>3<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="13"[^<>]+selected="selected"[^>]*>13<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="35"[^<>]+selected="selected"[^>]*>35<\/option>/', $result);
+
+		$this->assertNoErrors();
+		$this->Form->data['Contact'] = array(
+			'date' => array(
+				'day' => '',
+				'month' => '',
+				'year' => '',
+				'hour' => '',
+				'min' => '',
+				'meridian' => ''
+			)
+		);
+		$result = $this->Form->dateTime('Contact.date', 'DMY', '12', null, array('empty' => false));
+	}
+
+/**
+ * test that datetime() and default values work.
+ *
+ * @return void
+ */
+	function testDatetimeWithDefault() {
+		$result = $this->Form->dateTime('Contact.updated', 'DMY', '12', null, array('value' => '2009-06-01 11:15:30'));
+		$this->assertPattern('/<option[^<>]+value="2009"[^<>]+selected="selected"[^>]*>2009<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="01"[^<>]+selected="selected"[^>]*>1<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="06"[^<>]+selected="selected"[^>]*>June<\/option>/', $result);
+
+		$result = $this->Form->dateTime('Contact.updated', 'DMY', '12', null, array(
+			'default' => '2009-06-01 11:15:30'
+		));
+		$this->assertPattern('/<option[^<>]+value="2009"[^<>]+selected="selected"[^>]*>2009<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="01"[^<>]+selected="selected"[^>]*>1<\/option>/', $result);
+		$this->assertPattern('/<option[^<>]+value="06"[^<>]+selected="selected"[^>]*>June<\/option>/', $result);
+	}
+
+/**
+ * test that bogus non-date time data doesn't cause errors.
+ *
+ * @return void
+ */
+	function testDateTimeWithBogusData() {
+		$result = $this->Form->dateTime('Contact.updated', 'DMY', '12', 'CURRENT_TIMESTAMP');
+		$this->assertNoPattern('/selected="selected">\d/', $result);
+	}
+
+/**
+ * testFormDateTimeMulti method
+ *
+ * test multiple datetime element generation
+ *
+ * @access public
+ * @return void
+ */
+	function testFormDateTimeMulti() {
+		extract($this->dateRegex);
+
+		$result = $this->Form->dateTime('Contact.1.updated');
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][1][updated][day]', 'id' => 'Contact1UpdatedDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][1][updated][month]', 'id' => 'Contact1UpdatedMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][1][updated][year]', 'id' => 'Contact1UpdatedYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][1][updated][hour]', 'id' => 'Contact1UpdatedHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][1][updated][min]', 'id' => 'Contact1UpdatedMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][1][updated][meridian]', 'id' => 'Contact1UpdatedMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->dateTime('Contact.2.updated');
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][2][updated][day]', 'id' => 'Contact2UpdatedDay')),
+			$daysRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][2][updated][month]', 'id' => 'Contact2UpdatedMonth')),
+			$monthsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array('name' => 'data[Contact][2][updated][year]', 'id' => 'Contact2UpdatedYear')),
+			$yearsRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			array('select' => array('name' => 'data[Contact][2][updated][hour]', 'id' => 'Contact2UpdatedHour')),
+			$hoursRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			':',
+			array('select' => array('name' => 'data[Contact][2][updated][min]', 'id' => 'Contact2UpdatedMin')),
+			$minutesRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select',
+			' ',
+			array('select' => array('name' => 'data[Contact][2][updated][meridian]', 'id' => 'Contact2UpdatedMeridian')),
+			$meridianRegex,
+			array('option' => array('value' => '')),
+			'/option',
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testMonth method
+ *
+ * @access public
+ * @return void
+ */
+	function testMonth() {
+		$result = $this->Form->month('Model.field');
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][month]', 'id' => 'ModelFieldMonth')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			date('F', strtotime('2008-01-01 00:00:00')),
+			'/option',
+			array('option' => array('value' => '02')),
+			date('F', strtotime('2008-02-01 00:00:00')),
+			'/option',
+			'*/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->month('Model.field', null, array('empty' => true));
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][month]', 'id' => 'ModelFieldMonth')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			date('F', strtotime('2008-01-01 00:00:00')),
+			'/option',
+			array('option' => array('value' => '02')),
+			date('F', strtotime('2008-02-01 00:00:00')),
+			'/option',
+			'*/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->month('Model.field', null, array('monthNames' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][month]', 'id' => 'ModelFieldMonth')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'01',
+			'/option',
+			array('option' => array('value' => '02')),
+			'02',
+			'/option',
+			'*/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$monthNames = array(
+			'01' => 'Jan', '02' => 'Feb', '03' => 'Mar', '04' => 'Apr', '05' => 'May', '06' => 'Jun',
+			'07' => 'Jul', '08' => 'Aug', '09' => 'Sep', '10' => 'Oct', '11' => 'Nov', '12' => 'Dec');
+		$result = $this->Form->month('Model.field', null, array('monthNames' => $monthNames));
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][month]', 'id' => 'ModelFieldMonth')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'Jan',
+			'/option',
+			array('option' => array('value' => '02')),
+			'Feb',
+			'/option',
+			'*/select',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testDay method
+ *
+ * @access public
+ * @return void
+ */
+	function testDay() {
+		extract($this->dateRegex);
+
+		$result = $this->Form->day('Model.field', false);
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][day]', 'id' => 'ModelFieldDay')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$daysRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '2006-10-10 23:12:32';
+		$result = $this->Form->day('Model.field');
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][day]', 'id' => 'ModelFieldDay')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$daysRegex,
+			array('option' => array('value' => '10', 'selected' => 'selected')),
+			'10',
+			'/option',
+			$daysRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '';
+		$result = $this->Form->day('Model.field', '10');
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][day]', 'id' => 'ModelFieldDay')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$daysRegex,
+			array('option' => array('value' => '10', 'selected' => 'selected')),
+			'10',
+			'/option',
+			$daysRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '2006-10-10 23:12:32';
+		$result = $this->Form->day('Model.field', true);
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][day]', 'id' => 'ModelFieldDay')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$daysRegex,
+			array('option' => array('value' => '10', 'selected' => 'selected')),
+			'10',
+			'/option',
+			$daysRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testMinute method
+ *
+ * @access public
+ * @return void
+ */
+	function testMinute() {
+		extract($this->dateRegex);
+
+		$result = $this->Form->minute('Model.field');
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][min]', 'id' => 'ModelFieldMin')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00')),
+			'00',
+			'/option',
+			array('option' => array('value' => '01')),
+			'01',
+			'/option',
+			array('option' => array('value' => '02')),
+			'02',
+			'/option',
+			$minutesRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '2006-10-10 00:12:32';
+		$result = $this->Form->minute('Model.field');
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][min]', 'id' => 'ModelFieldMin')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00')),
+			'00',
+			'/option',
+			array('option' => array('value' => '01')),
+			'01',
+			'/option',
+			array('option' => array('value' => '02')),
+			'02',
+			'/option',
+			$minutesRegex,
+			array('option' => array('value' => '12', 'selected' => 'selected')),
+			'12',
+			'/option',
+			$minutesRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '';
+		$result = $this->Form->minute('Model.field', null, array('interval' => 5));
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][min]', 'id' => 'ModelFieldMin')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00')),
+			'00',
+			'/option',
+			array('option' => array('value' => '05')),
+			'05',
+			'/option',
+			array('option' => array('value' => '10')),
+			'10',
+			'/option',
+			$minutesRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '2006-10-10 00:10:32';
+		$result = $this->Form->minute('Model.field', null, array('interval' => 5));
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][min]', 'id' => 'ModelFieldMin')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00')),
+			'00',
+			'/option',
+			array('option' => array('value' => '05')),
+			'05',
+			'/option',
+			array('option' => array('value' => '10', 'selected' => 'selected')),
+			'10',
+			'/option',
+			$minutesRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testHour method
+ *
+ * @access public
+ * @return void
+ */
+	function testHour() {
+		extract($this->dateRegex);
+
+		$result = $this->Form->hour('Model.field', false);
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][hour]', 'id' => 'ModelFieldHour')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$hoursRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '2006-10-10 00:12:32';
+		$result = $this->Form->hour('Model.field', false);
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][hour]', 'id' => 'ModelFieldHour')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$hoursRegex,
+			array('option' => array('value' => '12', 'selected' => 'selected')),
+			'12',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '';
+		$result = $this->Form->hour('Model.field', true, '23');
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][hour]', 'id' => 'ModelFieldHour')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00')),
+			'0',
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$hoursRegex,
+			array('option' => array('value' => '23', 'selected' => 'selected')),
+			'23',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['field'] = '2006-10-10 00:12:32';
+		$result = $this->Form->hour('Model.field', true);
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][hour]', 'id' => 'ModelFieldHour')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '00', 'selected' => 'selected')),
+			'0',
+			'/option',
+			array('option' => array('value' => '01')),
+			'1',
+			'/option',
+			array('option' => array('value' => '02')),
+			'2',
+			'/option',
+			$hoursRegex,
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		unset($this->Form->data['Model']['field']);
+		$result = $this->Form->hour('Model.field', true, 'now');
+		$thisHour = date('H');
+		$optValue = date('G');
+		$this->assertPattern('/<option value="' . $thisHour . '" selected="selected">'. $optValue .'<\/option>/', $result);
+	}
+
+/**
+ * testYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testYear() {
+		$result = $this->Form->year('Model.field', 2006, 2007);
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][year]', 'id' => 'ModelFieldYear')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->year('Model.field', 2006, 2007, null, array('orderYear' => 'asc'));
+		$expected = array(
+			array('select' => array('name' => 'data[Model][field][year]', 'id' => 'ModelFieldYear')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->data['Contact']['published'] = '';
+		$result = $this->Form->year('Contact.published', 2006, 2007, null, array('class' => 'year'));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear', 'class' => 'year')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['published'] = '2006-10-10';
+		$result = $this->Form->year('Contact.published', 2006, 2007, null, array('empty' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006', 'selected' => 'selected')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['published'] = '';
+		$result = $this->Form->year('Contact.published', 2006, 2007, false);
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['published'] = '2006-10-10';
+		$result = $this->Form->year('Contact.published', 2006, 2007, false, array('empty' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006', 'selected' => 'selected')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['published'] = '';
+		$result = $this->Form->year('Contact.published', 2006, 2007, 2007);
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '')),
+			'/option',
+			array('option' => array('value' => '2007', 'selected' => 'selected')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['published'] = '2006-10-10';
+		$result = $this->Form->year('Contact.published', 2006, 2007, 2007, array('empty' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '2007', 'selected' => 'selected')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['published'] = '';
+		$result = $this->Form->year('Contact.published', 2006, 2008, 2007, array('empty' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '2008')),
+			'2008',
+			'/option',
+			array('option' => array('value' => '2007', 'selected' => 'selected')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['published'] = '2006-10-10';
+		$result = $this->Form->year('Contact.published', 2006, 2008, null, array('empty' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '2008')),
+			'2008',
+			'/option',
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006', 'selected' => 'selected')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array();
+		$this->Form->create('Contact');
+		$result = $this->Form->year('published', 2006, 2008, null, array('empty' => false));
+		$expected = array(
+			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear')),
+			array('option' => array('value' => '2008')),
+			'2008',
+			'/option',
+			array('option' => array('value' => '2007')),
+			'2007',
+			'/option',
+			array('option' => array('value' => '2006')),
+			'2006',
+			'/option',
+			'/select',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testTextArea method
+ *
+ * @access public
+ * @return void
+ */
+	function testTextArea() {
+		$this->Form->data = array('Model' => array('field' => 'some test data'));
+		$result = $this->Form->textarea('Model.field');
+		$expected = array(
+			'textarea' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			'some test data',
+			'/textarea',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->textarea('Model.tmp');
+		$expected = array(
+			'textarea' => array('name' => 'data[Model][tmp]', 'id' => 'ModelTmp'),
+			'/textarea',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('field' => 'some <strong>test</strong> data with <a href="#">HTML</a> chars'));
+		$result = $this->Form->textarea('Model.field');
+		$expected = array(
+			'textarea' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			htmlentities('some <strong>test</strong> data with <a href="#">HTML</a> chars'),
+			'/textarea',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array('Model' => array('field' => 'some <strong>test</strong> data with <a href="#">HTML</a> chars'));
+		$result = $this->Form->textarea('Model.field', array('escape' => false));
+		$expected = array(
+			'textarea' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+			'some <strong>test</strong> data with <a href="#">HTML</a> chars',
+			'/textarea',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Model']['0']['OtherModel']['field'] = null;
+		$result = $this->Form->textarea('Model.0.OtherModel.field');
+		$expected = array(
+			'textarea' => array('name' => 'data[Model][0][OtherModel][field]', 'id' => 'Model0OtherModelField'),
+			'/textarea'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testTextAreaWithStupidCharacters method
+ *
+ * test text area with non-ascii characters
+ *
+ * @access public
+ * @return void
+ */
+	function testTextAreaWithStupidCharacters() {
+		$result = $this->Form->input('Post.content', array(
+			'label' => 'Current Text', 'value' => "GREAT®", 'rows' => '15', 'cols' => '75'
+		));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+				'label' => array('for' => 'PostContent'),
+					'Current Text',
+				'/label',
+				'textarea' => array('name' => 'data[Post][content]', 'id' => 'PostContent', 'rows' => '15', 'cols' => '75'),
+				'GREAT®',
+				'/textarea',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testHiddenField method
+ *
+ * @access public
+ * @return void
+ */
+	function testHiddenField() {
+		$this->Form->validationErrors['Model']['field'] = 1;
+		$this->Form->data['Model']['field'] = 'test';
+		$result = $this->Form->hidden('Model.field', array('id' => 'theID'));
+		$this->assertTags($result, array('input' => array('type' => 'hidden', 'name' => 'data[Model][field]', 'id' => 'theID', 'value' => 'test')));
+	}
+
+/**
+ * testFileUploadField method
+ *
+ * @access public
+ * @return void
+ */
+	function testFileUploadField() {
+		$result = $this->Form->file('Model.upload');
+		$this->assertTags($result, array('input' => array('type' => 'file', 'name' => 'data[Model][upload]', 'id' => 'ModelUpload')));
+
+		$this->Form->data['Model.upload'] = array("name" => "", "type" => "", "tmp_name" => "", "error" => 4, "size" => 0);
+		$result = $this->Form->input('Model.upload', array('type' => 'file'));
+		$expected = array(
+			'div' => array('class' => 'input file'),
+			'label' => array('for' => 'ModelUpload'),
+			'Upload',
+			'/label',
+			'input' => array('type' => 'file', 'name' => 'data[Model][upload]', 'id' => 'ModelUpload'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test File upload input on a model not used in create();
+ *
+ * @return void
+ */
+	function testFileUploadOnOtherModel() {
+		ClassRegistry::removeObject('view');
+		$controller =& new Controller();
+		$controller->name = 'ValidateUsers';
+		$controller->uses = array('ValidateUser');
+		$controller->constructClasses();
+		$view =& new View($controller, true);
+
+		$this->Form->create('ValidateUser', array('type' => 'file'));
+		$result = $this->Form->file('ValidateProfile.city');
+		$expected = array(
+			'input' => array('type' => 'file', 'name' => 'data[ValidateProfile][city]', 'id' => 'ValidateProfileCity')
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testButton method
+ *
+ * @access public
+ * @return void
+ */
+	function testButton() {
+		$result = $this->Form->button('Hi');
+		$this->assertTags($result, array('button' => array('type' => 'submit'), 'Hi', '/button'));
+
+		$result = $this->Form->button('Clear Form >', array('type' => 'reset'));
+		$this->assertTags($result, array('button' => array('type' => 'reset'), 'Clear Form >', '/button'));
+
+		$result = $this->Form->button('Clear Form >', array('type' => 'reset', 'id' => 'clearForm'));
+		$this->assertTags($result, array('button' => array('type' => 'reset', 'id' => 'clearForm'), 'Clear Form >', '/button'));
+
+		$result = $this->Form->button('<Clear Form>', array('type' => 'reset', 'escape' => true));
+		$this->assertTags($result, array('button' => array('type' => 'reset'), '&lt;Clear Form&gt;', '/button'));
+
+		$result = $this->Form->button('Upload Text', array('onClick' => "$('#postAddForm').ajaxSubmit({target: '#postTextUpload', url: '/posts/text'});return false;'", 'escape' => false));
+		$this->assertNoPattern('/\&039/', $result);
+	}
+
+/**
+ * testSubmitButton method
+ *
+ * @access public
+ * @return void
+ */
+	function testSubmitButton() {
+		$result = $this->Form->submit('');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => ''),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Test Submit');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'Test Submit'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Test Submit', array('div' => array('tag' => 'span')));
+		$expected = array(
+			'span' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'Test Submit'),
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Test Submit', array('class' => 'save', 'div' => false));
+		$expected = array('input' => array('type' => 'submit', 'value' => 'Test Submit', 'class' => 'save'));
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Test Submit', array('div' => array('id' => 'SaveButton')));
+		$expected = array(
+			'div' => array('class' => 'submit', 'id' => 'SaveButton'),
+			'input' => array('type' => 'submit', 'value' => 'Test Submit'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Next >');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'Next &gt;'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Next >', array('escape' => false));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'Next >'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Reset!', array('type' => 'reset'));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'reset', 'value' => 'Reset!'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$before = '--before--';
+		$after = '--after--';
+		$result = $this->Form->submit('Test', array('before' => $before));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'--before--',
+			'input' => array('type' => 'submit', 'value' => 'Test'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Test', array('after' => $after));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'Test'),
+			'--after--',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Test', array('before' => $before, 'after' => $after));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'--before--',
+			'input' => array('type' => 'submit', 'value' => 'Test'),
+			'--after--',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test image submit types.
+ *
+ * @return void
+ */
+	function testSubmitImage() {
+		$result = $this->Form->submit('http://example.com/cake.power.gif');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'image', 'src' => 'http://example.com/cake.power.gif'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('/relative/cake.power.gif');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'image', 'src' => 'relative/cake.power.gif'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('cake.power.gif');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'image', 'src' => 'img/cake.power.gif'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Not.an.image');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'Not.an.image'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$after = '--after--';
+		$before = '--before--';
+		$result = $this->Form->submit('cake.power.gif', array('after' => $after));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'image', 'src' => 'img/cake.power.gif'),
+			'--after--',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('cake.power.gif', array('before' => $before));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'--before--',
+			'input' => array('type' => 'image', 'src' => 'img/cake.power.gif'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('cake.power.gif', array('before' => $before, 'after' => $after));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'--before--',
+			'input' => array('type' => 'image', 'src' => 'img/cake.power.gif'),
+			'--after--',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->submit('Not.an.image', array('before' => $before, 'after' => $after));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'--before--',
+			'input' => array('type' => 'submit', 'value' => 'Not.an.image'),
+			'--after--',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test the create() method
+ *
+ * @access public
+ * @return void
+ */
+	function testCreate() {
+		$result = $this->Form->create('Contact');
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/add',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'preg:/display\s*\:\s*none;\s*/'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->create('Contact', array('type' => 'GET'));
+		$expected = array('form' => array(
+			'id' => 'ContactAddForm', 'method' => 'get', 'action' => '/contacts/add',
+			'accept-charset' => $encoding
+		));
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->create('Contact', array('type' => 'get'));
+		$expected = array('form' => array(
+			'id' => 'ContactAddForm', 'method' => 'get', 'action' => '/contacts/add',
+			'accept-charset' => $encoding
+		));
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->create('Contact', array('type' => 'put'));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/add',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'PUT'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->create('Contact', array('type' => 'file'));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/add',
+				'accept-charset' => $encoding, 'enctype' => 'multipart/form-data'
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['id'] = 1;
+		$this->Form->params['action'] = 'edit';
+		$result = $this->Form->create('Contact');
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactEditForm', 'method' => 'post', 'action' => '/contacts/edit/1',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'PUT'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['Contact']['id'] = 1;
+		$this->Form->params['action'] = 'edit';
+		$result = $this->Form->create('Contact', array('type' => 'file'));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactEditForm', 'method' => 'post', 'action' => '/contacts/edit/1',
+				'accept-charset' => $encoding, 'enctype' => 'multipart/form-data'
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'PUT'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data['ContactNonStandardPk']['pk'] = 1;
+		$result = $this->Form->create('ContactNonStandardPk');
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactNonStandardPkEditForm', 'method' => 'post',
+				'action' => '/contact_non_standard_pks/edit/1','accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'PUT'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->create('Contact', array('id' => 'TestId'));
+		$expected = array(
+			'form' => array(
+				'id' => 'TestId', 'method' => 'post', 'action' => '/contacts/edit/1',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'PUT'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->params['action'] = 'add';
+		$result = $this->Form->create('User', array('url' => array('action' => 'login')));
+		$expected = array(
+			'form' => array(
+				'id' => 'UserAddForm', 'method' => 'post', 'action' => '/users/login',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->create('User', array('action' => 'login'));
+		$expected = array(
+			'form' => array(
+				'id' => 'UserLoginForm', 'method' => 'post', 'action' => '/users/login',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->create('User', array('url' => '/users/login'));
+		$expected = array(
+			'form' => array('method' => 'post', 'action' => '/users/login','accept-charset' => $encoding),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->params['controller'] = 'pages';
+		$this->Form->params['models'] = array('User', 'Post');
+		$result = $this->Form->create('User', array('action' => 'signup'));
+		$expected = array(
+			'form' => array(
+				'id' => 'UserSignupForm', 'method' => 'post', 'action' => '/users/signup',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array();
+		$this->Form->params['controller'] = 'contacts';
+		$this->Form->params['models'] = array('Contact');
+		$result = $this->Form->create(array('url' => array('action' => 'index', 'param')));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/index/param',
+				'accept-charset' => 'utf-8'
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that inputDefaults are stored and used.
+ *
+ * @return void
+ */
+	function testCreateWithInputDefaults() {
+		$this->Form->create('User', array(
+			'inputDefaults' => array('div' => false, 'label' => false)
+		));
+		$result = $this->Form->input('username');
+		$expected = array(
+			'input' => array('type' => 'text', 'name' => 'data[User][username]', 'id' => 'UserUsername')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('username', array('div' => true, 'label' => 'username'));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'UserUsername'), 'username', '/label',
+			'input' => array('type' => 'text', 'name' => 'data[User][username]', 'id' => 'UserUsername'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test automatic accept-charset overriding
+ *
+ * @return void
+ */
+	function testCreateWithAcceptCharset() {
+		$result = $this->Form->create('UserForm', array(
+				'type' => 'post', 'action' => 'login','encoding' => 'iso-8859-1'
+			)
+		);
+		$expected = array(
+			'form' => array(
+				'method' => 'post', 'action' => '/user_forms/login', 'id' => 'UserFormLoginForm',
+				'accept-charset' => 'iso-8859-1'
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test base form url when url param is passed with multiple parameters (&)
+ *
+ */
+	function testCreateQuerystringParams() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$result = $this->Form->create('Contact', array(
+			'type' => 'post',
+			'escape' => false,
+			'url' => array(
+				'controller' => 'controller',
+				'action' => 'action',
+				'?' => array('param1' => 'value1', 'param2' => 'value2')
+			)
+		));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm',
+				'method' => 'post',
+				'action' => '/controller/action?param1=value1&amp;param2=value2',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected, true);
+	}
+
+/**
+ * test that create() doesn't cause errors by multiple id's being in the primary key
+ * as could happen with multiple select or checkboxes.
+ *
+ * @return void
+ */
+	function testCreateWithMultipleIdInData() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+
+		$this->Form->data['Contact']['id'] = array(1, 2);
+		$result = $this->Form->create('Contact');
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm',
+				'method' => 'post',
+				'action' => '/contacts/add',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that create() doesn't add in extra passed params.
+ *
+ * @return void
+ */
+	function testCreatePassedArgs() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$this->Form->data['Contact']['id'] = 1;
+		$result = $this->Form->create('Contact', array(
+			'type' => 'post',
+			'escape' => false,
+			'url' => array(
+				'action' => 'edit',
+				'myparam'
+			)
+		));
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm',
+				'method' => 'post',
+				'action' => '/contacts/edit/myparam',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected, true);
+	}
+
+/**
+ * test creating a get form, and get form inputs.
+ *
+ * @access public
+ * @return void
+ */
+	function testGetFormCreate() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$result = $this->Form->create('Contact', array('type' => 'get'));
+		$this->assertTags($result, array('form' => array(
+			'id' => 'ContactAddForm', 'method' => 'get', 'action' => '/contacts/add',
+			'accept-charset' => $encoding
+		)));
+
+		$result = $this->Form->text('Contact.name');
+		$this->assertTags($result, array('input' => array(
+			'name' => 'name', 'type' => 'text', 'id' => 'ContactName',
+		)));
+
+		$result = $this->Form->password('password');
+		$this->assertTags($result, array('input' => array(
+			'name' => 'password', 'type' => 'password', 'id' => 'ContactPassword'
+		)));
+		$this->assertNoPattern('/<input[^<>]+[^id|name|type|value]=[^<>]*>$/', $result);
+
+		$result = $this->Form->text('user_form');
+		$this->assertTags($result, array('input' => array(
+			'name' => 'user_form', 'type' => 'text', 'id' => 'ContactUserForm'
+		)));
+	}
+
+/**
+ * test get form, and inputs when the model param is false
+ *
+ * @return void
+ */
+	function testGetFormWithFalseModel() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$result = $this->Form->create(false, array('type' => 'get'));
+
+		$expected = array('form' => array(
+			'id' => 'addForm', 'method' => 'get', 'action' => '/contact_test/add',
+			'accept-charset' => $encoding
+		));
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->text('reason');
+		$expected = array(
+			'input' => array('type' => 'text', 'name' => 'reason', 'id' => 'reason')
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that datetime() works with GET style forms.
+ *
+ * @return void
+ */
+	function testDateTimeWithGetForms() {
+		extract($this->dateRegex);
+		$this->Form->create('Contact', array('type' => 'get'));
+		$result = $this->Form->datetime('created');
+
+		$this->assertPattern('/name="created\[year\]"/', $result, 'year name attribute is wrong.');
+		$this->assertPattern('/name="created\[month\]"/', $result, 'month name attribute is wrong.');
+		$this->assertPattern('/name="created\[day\]"/', $result, 'day name attribute is wrong.');
+		$this->assertPattern('/name="created\[hour\]"/', $result, 'hour name attribute is wrong.');
+		$this->assertPattern('/name="created\[min\]"/', $result, 'min name attribute is wrong.');
+		$this->assertPattern('/name="created\[meridian\]"/', $result, 'meridian name attribute is wrong.');
+	}
+/**
+ * testEditFormWithData method
+ *
+ * test auto populating form elements from submitted data.
+ *
+ * @access public
+ * @return void
+ */
+	function testEditFormWithData() {
+		$this->Form->data = array('Person' => array(
+			'id' => 1,
+			'first_name' => 'Nate',
+			'last_name' => 'Abele',
+			'email' => 'nate@example.com'
+		));
+		$this->Form->params = array('models' => array('Person'), 'controller'	=> 'people', 'action' => 'add');
+		$options = array(1 => 'Nate', 2 => 'Garrett', 3 => 'Larry');
+
+		$this->Form->create();
+		$result = $this->Form->select('People.People', $options, null, array('multiple' => true));
+		$expected = array(
+			'input' => array('type' => 'hidden', 'name' => 'data[People][People]', 'value' => '', 'id' => 'PeoplePeople_'),
+			'select' => array(
+				'name' => 'data[People][People][]', 'multiple' => 'multiple', 'id' => 'PeoplePeople'
+			),
+			array('option' => array('value' => 1)), 'Nate', '/option',
+			array('option' => array('value' => 2)), 'Garrett', '/option',
+			array('option' => array('value' => 3)), 'Larry', '/option',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormMagicInput method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormMagicInput() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$result = $this->Form->create('Contact');
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/add',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('name');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactName'),
+			'Name',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][name]',
+				'id' => 'ContactName', 'maxlength' => '255'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('non_existing_field_in_contact_model');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactNonExistingFieldInContactModel'),
+			'Non Existing Field In Contact Model',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][non_existing_field_in_contact_model]',
+				'id' => 'ContactNonExistingFieldInContactModel'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Address.street');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'AddressStreet'),
+			'Street',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Address][street]',
+				'id' => 'AddressStreet'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Address.non_existing_field_in_model');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'AddressNonExistingFieldInModel'),
+			'Non Existing Field In Model',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Address][non_existing_field_in_model]',
+				'id' => 'AddressNonExistingFieldInModel'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('name', array('div' => false));
+		$expected = array(
+			'label' => array('for' => 'ContactName'),
+			'Name',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][name]',
+				'id' => 'ContactName', 'maxlength' => '255'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.non_existing');
+		$expected = array(
+			'div' => array('class' => 'input text required'),
+			'label' => array('for' => 'ContactNonExisting'),
+			'Non Existing',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][non_existing]',
+				'id' => 'ContactNonExisting'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.imrequired');
+		$expected = array(
+			'div' => array('class' => 'input text required'),
+			'label' => array('for' => 'ContactImrequired'),
+			'Imrequired',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][imrequired]',
+				'id' => 'ContactImrequired'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.imalsorequired');
+		$expected = array(
+			'div' => array('class' => 'input text required'),
+			'label' => array('for' => 'ContactImalsorequired'),
+			'Imalsorequired',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][imalsorequired]',
+				'id' => 'ContactImalsorequired'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.imrequiredtoo');
+		$expected = array(
+			'div' => array('class' => 'input text required'),
+			'label' => array('for' => 'ContactImrequiredtoo'),
+			'Imrequiredtoo',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][imrequiredtoo]',
+				'id' => 'ContactImrequiredtoo'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.required_one');
+		$expected = array(
+			'div' => array('class' => 'input text required'),
+			'label' => array('for' => 'ContactRequiredOne'),
+			'Required One',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][required_one]',
+				'id' => 'ContactRequiredOne'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.imnotrequired');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactImnotrequired'),
+			'Imnotrequired',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][imnotrequired]',
+				'id' => 'ContactImnotrequired'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.imalsonotrequired');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactImalsonotrequired'),
+			'Imalsonotrequired',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][imalsonotrequired]',
+				'id' => 'ContactImalsonotrequired'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.imnotrequiredeither');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'ContactImnotrequiredeither'),
+			'Imnotrequiredeither',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][imnotrequiredeither]',
+				'id' => 'ContactImnotrequiredeither'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		extract($this->dateRegex);
+		$now = strtotime('now');
+
+		$result = $this->Form->input('Contact.published', array('div' => false));
+		$expected = array(
+			'label' => array('for' => 'ContactPublishedMonth'),
+			'Published',
+			'/label',
+			array('select' => array(
+				'name' => 'data[Contact][published][month]', 'id' => 'ContactPublishedMonth'
+			)),
+			$monthsRegex,
+			array('option' => array('value' => date('m', $now), 'selected' => 'selected')),
+			date('F', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array(
+				'name' => 'data[Contact][published][day]', 'id' => 'ContactPublishedDay'
+			)),
+			$daysRegex,
+			array('option' => array('value' => date('d', $now), 'selected' => 'selected')),
+			date('j', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array(
+				'name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear'
+			)),
+			$yearsRegex,
+			array('option' => array('value' => date('Y', $now), 'selected' => 'selected')),
+			date('Y', $now),
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.updated', array('div' => false));
+		$expected = array(
+			'label' => array('for' => 'ContactUpdatedMonth'),
+			'Updated',
+			'/label',
+			array('select' => array(
+				'name' => 'data[Contact][updated][month]', 'id' => 'ContactUpdatedMonth'
+			)),
+			$monthsRegex,
+			array('option' => array('value' => date('m', $now), 'selected' => 'selected')),
+			date('F', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array(
+				'name' => 'data[Contact][updated][day]', 'id' => 'ContactUpdatedDay'
+			)),
+			$daysRegex,
+			array('option' => array('value' => date('d', $now), 'selected' => 'selected')),
+			date('j', $now),
+			'/option',
+			'*/select',
+			'-',
+			array('select' => array(
+				'name' => 'data[Contact][updated][year]', 'id' => 'ContactUpdatedYear'
+			)),
+			$yearsRegex,
+			array('option' => array('value' => date('Y', $now), 'selected' => 'selected')),
+			date('Y', $now),
+			'*/select'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('User.stuff');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'UserStuff'),
+			'Stuff',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[User][stuff]',
+				'id' => 'UserStuff', 'maxlength' => 10
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected, true);
+	}
+
+/**
+ * testForMagicInputNonExistingNorValidated method
+ *
+ * @access public
+ * @return void
+ */
+	function testForMagicInputNonExistingNorValidated() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$result = $this->Form->create('Contact');
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/add',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.non_existing_nor_validated', array('div' => false));
+		$expected = array(
+			'label' => array('for' => 'ContactNonExistingNorValidated'),
+			'Non Existing Nor Validated',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][non_existing_nor_validated]',
+				'id' => 'ContactNonExistingNorValidated'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.non_existing_nor_validated', array(
+			'div' => false, 'value' => 'my value'
+		));
+		$expected = array(
+			'label' => array('for' => 'ContactNonExistingNorValidated'),
+			'Non Existing Nor Validated',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][non_existing_nor_validated]',
+				'value' => 'my value', 'id' => 'ContactNonExistingNorValidated'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->data = array(
+			'Contact' => array('non_existing_nor_validated' => 'CakePHP magic'
+		));
+		$result = $this->Form->input('Contact.non_existing_nor_validated', array('div' => false));
+		$expected = array(
+			'label' => array('for' => 'ContactNonExistingNorValidated'),
+			'Non Existing Nor Validated',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][non_existing_nor_validated]',
+				'value' => 'CakePHP magic', 'id' => 'ContactNonExistingNorValidated'
+			)
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormMagicInputLabel method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormMagicInputLabel() {
+		$encoding = strtolower(Configure::read('App.encoding'));
+		$result = $this->Form->create('Contact');
+		$expected = array(
+			'form' => array(
+				'id' => 'ContactAddForm', 'method' => 'post', 'action' => '/contacts/add',
+				'accept-charset' => $encoding
+			),
+			'div' => array('style' => 'display:none;'),
+			'input' => array('type' => 'hidden', 'name' => '_method', 'value' => 'POST'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.name', array('div' => false, 'label' => false));
+		$this->assertTags($result, array('input' => array(
+			'name' => 'data[Contact][name]', 'type' => 'text',
+			'id' => 'ContactName', 'maxlength' => '255')
+		));
+
+		$result = $this->Form->input('Contact.name', array('div' => false, 'label' => 'My label'));
+		$expected = array(
+			'label' => array('for' => 'ContactName'),
+			'My label',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][name]',
+				'id' => 'ContactName', 'maxlength' => '255'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.name', array(
+			'div' => false, 'label' => array('class' => 'mandatory')
+		));
+		$expected = array(
+			'label' => array('for' => 'ContactName', 'class' => 'mandatory'),
+			'Name',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][name]',
+				'id' => 'ContactName', 'maxlength' => '255'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.name', array(
+			'div' => false, 'label' => array('class' => 'mandatory', 'text' => 'My label')
+		));
+		$expected = array(
+			'label' => array('for' => 'ContactName', 'class' => 'mandatory'),
+			'My label',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][name]',
+				'id' => 'ContactName', 'maxlength' => '255'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.name', array(
+			'div' => false, 'id' => 'my_id', 'label' => array('for' => 'my_id')
+		));
+		$expected = array(
+			'label' => array('for' => 'my_id'),
+			'Name',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][name]',
+				'id' => 'my_id', 'maxlength' => '255'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('1.id');
+		$this->assertTags($result, array('input' => array(
+			'type' => 'hidden', 'name' => 'data[Contact][1][id]',
+			'id' => 'Contact1Id'
+		)));
+
+		$result = $this->Form->input("1.name");
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'Contact1Name'),
+			'Name',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][1][name]',
+				'id' => 'Contact1Name', 'maxlength' => '255'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.1.id');
+		$this->assertTags($result, array(
+			'input' => array(
+				'type' => 'hidden', 'name' => 'data[Contact][1][id]',
+				'id' => 'Contact1Id'
+			)
+		));
+
+		$result = $this->Form->input("Model.1.name");
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'Model1Name'),
+			'Name',
+			'/label',
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Model][1][name]',
+				'id' => 'Model1Name'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFormEnd method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormEnd() {
+		$this->assertEqual($this->Form->end(), '</form>');
+
+		$result = $this->Form->end('');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => ''),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->end(array('label' => ''));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => ''),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->end('save');
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'save'),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->end(array('label' => 'save'));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'save'),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->end(array('label' => 'save', 'name' => 'Whatever'));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'save', 'name' => 'Whatever'),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->end(array('name' => 'Whatever'));
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'value' => 'Submit', 'name' => 'Whatever'),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->end(array('label' => 'save', 'name' => 'Whatever', 'div' => 'good'));
+		$expected = array(
+			'div' => array('class' => 'good'),
+			'input' => array('type' => 'submit', 'value' => 'save', 'name' => 'Whatever'),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->end(array(
+			'label' => 'save', 'name' => 'Whatever', 'div' => array('class' => 'good')
+		));
+		$expected = array(
+			'div' => array('class' => 'good'),
+			'input' => array('type' => 'submit', 'value' => 'save', 'name' => 'Whatever'),
+			'/div',
+			'/form'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testMultipleFormWithIdFields method
+ *
+ * @access public
+ * @return void
+ */
+	function testMultipleFormWithIdFields() {
+		$this->Form->create('UserForm');
+
+		$result = $this->Form->input('id');
+		$this->assertTags($result, array('input' => array(
+			'type' => 'hidden', 'name' => 'data[UserForm][id]', 'id' => 'UserFormId'
+		)));
+
+		$result = $this->Form->input('ValidateItem.id');
+		$this->assertTags($result, array('input' => array(
+			'type' => 'hidden', 'name' => 'data[ValidateItem][id]',
+			'id' => 'ValidateItemId'
+		)));
+
+		$result = $this->Form->input('ValidateUser.id');
+		$this->assertTags($result, array('input' => array(
+			'type' => 'hidden', 'name' => 'data[ValidateUser][id]',
+			'id' => 'ValidateUserId'
+		)));
+	}
+
+/**
+ * testDbLessModel method
+ *
+ * @access public
+ * @return void
+ */
+	function testDbLessModel() {
+		$this->Form->create('TestMail');
+
+		$result = $this->Form->input('name');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'TestMailName'),
+			'Name',
+			'/label',
+			'input' => array(
+				'name' => 'data[TestMail][name]', 'type' => 'text',
+				'id' => 'TestMailName'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		ClassRegistry::init('TestMail');
+		$this->Form->create('TestMail');
+		$result = $this->Form->input('name');
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'label' => array('for' => 'TestMailName'),
+			'Name',
+			'/label',
+			'input' => array(
+				'name' => 'data[TestMail][name]', 'type' => 'text',
+				'id' => 'TestMailName'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testBrokenness method
+ *
+ * @access public
+ * @return void
+ */
+	function testBrokenness() {
+		/*
+		 * #4 This test has two parents and four children. By default (as of r7117) both
+		 * parents are show but the first parent is missing a child. This is the inconsistency
+		 * in the default behaviour - one parent has all children, the other does not - dependent
+		 * on the data values.
+		 */
+		$result = $this->Form->select('Model.field', array(
+			'Fred' => array(
+				'freds_son_1' => 'Fred',
+				'freds_son_2' => 'Freddie'
+			),
+			'Bert' => array(
+				'berts_son_1' => 'Albert',
+				'berts_son_2' => 'Bertie')
+			),
+			null,
+			array('showParents' => true, 'empty' => false)
+		);
+
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+				array('optgroup' => array('label' => 'Fred')),
+					array('option' => array('value' => 'freds_son_1')),
+						'Fred',
+					'/option',
+					array('option' => array('value' => 'freds_son_2')),
+						'Freddie',
+					'/option',
+				'/optgroup',
+				array('optgroup' => array('label' => 'Bert')),
+					array('option' => array('value' => 'berts_son_1')),
+						'Albert',
+					'/option',
+					array('option' => array('value' => 'berts_son_2')),
+						'Bertie',
+					'/option',
+				'/optgroup',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+
+		/*
+		 * #2 This is structurally identical to the test above (#1) - only the parent name has
+		 * changed, so we should expect the same select list data, just with a different name
+		 * for the parent.  As of #7117, this test fails because option 3 => 'Three' disappears.
+		 * This is where data corruption can occur, because when a select value is missing from
+		 * a list a form will substitute the first value in the list - without the user knowing.
+		 * If the optgroup name 'Parent' (above) is updated to 'Three' (below), this should not
+		 * affect the availability of 3 => 'Three' as a valid option.
+		 */
+		$options = array(1 => 'One', 2 => 'Two', 'Three' => array(
+			3 => 'Three', 4 => 'Four', 5 => 'Five'
+		));
+		$result = $this->Form->select(
+			'Model.field', $options, null, array('showParents' => true, 'empty' => false)
+		);
+
+		$expected = array(
+			'select' => array('name' => 'data[Model][field]', 'id' => 'ModelField'),
+				array('option' => array('value' => 1)),
+					'One',
+				'/option',
+				array('option' => array('value' => 2)),
+					'Two',
+				'/option',
+				array('optgroup' => array('label' => 'Three')),
+					array('option' => array('value' => 3)),
+						'Three',
+					'/option',
+					array('option' => array('value' => 4)),
+						'Four',
+					'/option',
+					array('option' => array('value' => 5)),
+						'Five',
+					'/option',
+				'/optgroup',
+			'/select'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test the generation of fields for a multi record form.
+ *
+ * @return void
+ */
+	function testMultiRecordForm() {
+		$this->Form->create('ValidateProfile');
+		$this->Form->data['ValidateProfile'][1]['ValidateItem'][2]['name'] = 'Value';
+		$result = $this->Form->input('ValidateProfile.1.ValidateItem.2.name');
+		$expected = array(
+			'div' => array('class' => 'input textarea'),
+				'label' => array('for' => 'ValidateProfile1ValidateItem2Name'),
+					'Name',
+				'/label',
+				'textarea' => array(
+					'id' => 'ValidateProfile1ValidateItem2Name',
+					'name' => 'data[ValidateProfile][1][ValidateItem][2][name]',
+					'cols' => 30,
+					'rows' => 6
+				),
+				'Value',
+				'/textarea',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('ValidateProfile.1.ValidateItem.2.created',array('empty' => true));
+		$expected = array(
+			'div' => array('class' => 'input date'),
+			'label' => array('for' => 'ValidateProfile1ValidateItem2CreatedMonth'),
+			'Created',
+			'/label',
+			array('select' => array(
+				'name' => 'data[ValidateProfile][1][ValidateItem][2][created][month]',
+				'id' => 'ValidateProfile1ValidateItem2CreatedMonth'
+				)
+			),
+			array('option' => array('value' => '')), '/option',
+			$this->dateRegex['monthsRegex'],
+			'/select', '-',
+			array('select' => array(
+				'name' => 'data[ValidateProfile][1][ValidateItem][2][created][day]',
+				'id' => 'ValidateProfile1ValidateItem2CreatedDay'
+				)
+			),
+			array('option' => array('value' => '')), '/option',
+			$this->dateRegex['daysRegex'],
+			'/select', '-',
+			array('select' => array(
+				'name' => 'data[ValidateProfile][1][ValidateItem][2][created][year]',
+				'id' => 'ValidateProfile1ValidateItem2CreatedYear'
+				)
+			),
+			array('option' => array('value' => '')), '/option',
+			$this->dateRegex['yearsRegex'],
+			'/select',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Form->validationErrors['ValidateProfile'][1]['ValidateItem'][2]['profile_id'] = 'Error';
+		$this->Form->data['ValidateProfile'][1]['ValidateItem'][2]['profile_id'] = '1';
+		$result = $this->Form->input('ValidateProfile.1.ValidateItem.2.profile_id');
+		$expected = array(
+			'div' => array('class' => 'input select error'),
+			'label' => array('for' => 'ValidateProfile1ValidateItem2ProfileId'),
+			'Profile',
+			'/label',
+			'select' => array(
+				'name' => 'data[ValidateProfile][1][ValidateItem][2][profile_id]',
+				'id' => 'ValidateProfile1ValidateItem2ProfileId',
+				'class' => 'form-error'
+			),
+			'/select',
+			array('div' => array('class' => 'error-message')),
+			'Error',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test the correct display of multi-record form validation errors.
+ *
+ * @return void
+ */
+	function testMultiRecordFormValidationErrors() {
+		$this->Form->create('ValidateProfile');
+		$this->Form->validationErrors['ValidateProfile'][2]['ValidateItem'][1]['name'] = 'Error in field name';
+		$result = $this->Form->error('ValidateProfile.2.ValidateItem.1.name');
+		$this->assertTags($result, array('div' => array('class' => 'error-message'), 'Error in field name', '/div'));
+
+		$this->Form->validationErrors['ValidateProfile'][2]['city'] = 'Error in field city';
+		$result = $this->Form->error('ValidateProfile.2.city');
+		$this->assertTags($result, array('div' => array('class' => 'error-message'), 'Error in field city', '/div'));
+
+		$result = $this->Form->error('2.city');
+		$this->assertTags($result, array('div' => array('class' => 'error-message'), 'Error in field city', '/div'));
+	}
+
+/**
+ * tests the ability to change the order of the form input placeholder "input", "label", "before", "between", "after", "error"
+ *
+ * @return void
+ */
+	function testInputTemplate() {
+		$result = $this->Form->input('Contact.email', array(
+			'type' => 'text', 'format' => array('input')
+		));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			'input' => array(
+				'type' => 'text', 'name' => 'data[Contact][email]',
+				'id' => 'ContactEmail'
+			),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.email', array(
+			'type' => 'text', 'format' => array('input', 'label'),
+			'label' => '<em>Email (required)</em>'
+		));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][email]',
+				'id' => 'ContactEmail'
+			)),
+			'label' => array('for' => 'ContactEmail'),
+			'em' => array(),
+			'Email (required)',
+			'/em',
+			'/label',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Form->input('Contact.email', array(
+			'type' => 'text', 'format' => array('input', 'between', 'label', 'after'),
+			'between' => '<div>Something in the middle</div>',
+			'after' => '<span>Some text at the end</span>'
+		));
+		$expected = array(
+			'div' => array('class' => 'input text'),
+			array('input' => array(
+				'type' => 'text', 'name' => 'data[Contact][email]',
+				'id' => 'ContactEmail'
+			)),
+			array('div' => array()),
+			'Something in the middle',
+			'/div',
+			'label' => array('for' => 'ContactEmail'),
+			'Email',
+			'/label',
+			'span' => array(),
+			'Some text at the end',
+			'/span',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/html.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/html.test.php
new file mode 100644
index 000000000..05bd540db
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/html.test.php
@@ -0,0 +1,1309 @@
+<?php
+/**
+ * HtmlHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('Helper', 'AppHelper', 'ClassRegistry', 'Controller', 'Model'));
+App::import('Helper', array('Html', 'Form'));
+
+if (!defined('FULL_BASE_URL')) {
+	define('FULL_BASE_URL', 'http://cakephp.org');
+}
+
+/**
+ * TheHtmlTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TheHtmlTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'TheTest'
+ * @access public
+ */
+	var $name = 'TheTest';
+
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+}
+
+Mock::generate('View', 'HtmlHelperMockView');
+
+/**
+ * HtmlHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class HtmlHelperTest extends CakeTestCase {
+
+/**
+ * Regexp for CDATA start block
+ *
+ * @var string
+ */
+	var $cDataStart = 'preg:/^\/\/<!\[CDATA\[[\n\r]*/';
+/**
+ * Regexp for CDATA end block
+ *
+ * @var string
+ */
+	var $cDataEnd = 'preg:/[^\]]*\]\]\>[\s\r\n]*/';
+/**
+ * html property
+ *
+ * @var object
+ * @access public
+ */
+	var $Html = null;
+
+/**
+ * Backup of app encoding configuration setting
+ *
+ * @var string
+ * @access protected
+ */
+	var $_appEncoding;
+
+/**
+ * Backup of asset configuration settings
+ *
+ * @var string
+ * @access protected
+ */
+	var $_asset;
+
+/**
+ * Backup of debug configuration setting
+ *
+ * @var integer
+ * @access protected
+ */
+	var $_debug;
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Html =& new HtmlHelper();
+		$view =& new View(new TheHtmlTestController());
+		ClassRegistry::addObject('view', $view);
+		$this->_appEncoding = Configure::read('App.encoding');
+		$this->_asset = Configure::read('Asset');
+		$this->_debug = Configure::read('debug');
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		Configure::write('App.encoding', $this->_appEncoding);
+		Configure::write('Asset', $this->_asset);
+		Configure::write('debug', $this->_debug);
+		ClassRegistry::flush();
+		unset($this->Html);
+	}
+
+/**
+ * testDocType method
+ *
+ * @access public
+ * @return void
+ */
+	function testDocType() {
+		$result = $this->Html->docType();
+		$expected = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Html->docType('html4-strict');
+		$expected = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">';
+		$this->assertEqual($result, $expected);
+
+		$this->assertNull($this->Html->docType('non-existing-doctype'));
+	}
+
+/**
+ * testLink method
+ *
+ * @access public
+ * @return void
+ */
+	function testLink() {
+		$result = $this->Html->link('/home');
+		$expected = array('a' => array('href' => '/home'), 'preg:/\/home/', '/a');
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Posts', array('controller' => 'posts', 'action' => 'index', 'full_base' => true));
+		$expected = array('a' => array('href' => FULL_BASE_URL . '/posts'), 'Posts', '/a');
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Home', '/home', array('confirm' => 'Are you sure you want to do this?'));
+		$expected = array(
+			'a' => array('href' => '/home', 'onclick' => 'return confirm(&#039;Are you sure you want to do this?&#039;);'),
+			'Home',
+			'/a'
+		);
+		$this->assertTags($result, $expected, true);
+
+		$result = $this->Html->link('Home', '/home', array('default' => false));
+		$expected = array(
+			'a' => array('href' => '/home', 'onclick' => 'event.returnValue = false; return false;'),
+			'Home',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Next >', '#');
+		$expected = array(
+			'a' => array('href' => '#'),
+			'Next &gt;',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Next >', '#', array('escape' => true));
+		$expected = array(
+			'a' => array('href' => '#'),
+			'Next &gt;',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Next >', '#', array('escape' => 'utf-8'));
+		$expected = array(
+			'a' => array('href' => '#'),
+			'Next &gt;',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Next >', '#', array('escape' => false));
+		$expected = array(
+			'a' => array('href' => '#'),
+			'Next >',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Next >', '#', array(
+			'title' => 'to escape &#8230; or not escape?',
+			'escape' => false
+		));
+		$expected = array(
+			'a' => array('href' => '#', 'title' => 'to escape &#8230; or not escape?'),
+			'Next >',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Next >', '#', array(
+			'title' => 'to escape &#8230; or not escape?',
+			'escape' => true
+		));
+		$expected = array(
+			'a' => array('href' => '#', 'title' => 'to escape &amp;#8230; or not escape?'),
+			'Next &gt;',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->link('Original size', array(
+			'controller' => 'images', 'action' => 'view', 3, '?' => array('height' => 100, 'width' => 200)
+		));
+		$expected = array(
+			'a' => array('href' => '/images/view/3?height=100&amp;width=200'),
+			'Original size',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.timestamp', false);
+
+		$result = $this->Html->link($this->Html->image('test.gif'), '#', array('escape' => false));
+		$expected = array(
+			'a' => array('href' => '#'),
+			'img' => array('src' => 'img/test.gif', 'alt' => ''),
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->image('test.gif', array('url' => '#'));
+		$expected = array(
+			'a' => array('href' => '#'),
+			'img' => array('src' => 'img/test.gif', 'alt' => ''),
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.timestamp', 'force');
+
+ 		$result = $this->Html->link($this->Html->image('test.gif'), '#', array('escape' => false));
+ 		$expected = array(
+ 			'a' => array('href' => '#'),
+			'img' => array('src' => 'preg:/img\/test\.gif\?\d*/', 'alt' => ''),
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->image('test.gif', array('url' => '#'));
+		$expected = array(
+			'a' => array('href' => '#'),
+			'img' => array('src' => 'preg:/img\/test\.gif\?\d*/', 'alt' => ''),
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testImageTag method
+ *
+ * @access public
+ * @return void
+ */
+	function testImageTag() {
+		Configure::write('Asset.timestamp', false);
+
+		$result = $this->Html->image('test.gif');
+		$this->assertTags($result, array('img' => array('src' => 'img/test.gif', 'alt' => '')));
+
+		$result = $this->Html->image('http://google.com/logo.gif');
+		$this->assertTags($result, array('img' => array('src' => 'http://google.com/logo.gif', 'alt' => '')));
+
+		$result = $this->Html->image(array('controller' => 'test', 'action' => 'view', 1, 'ext' => 'gif'));
+		$this->assertTags($result, array('img' => array('src' => '/test/view/1.gif', 'alt' => '')));
+
+		$result = $this->Html->image('/test/view/1.gif');
+		$this->assertTags($result, array('img' => array('src' => '/test/view/1.gif', 'alt' => '')));
+	}
+
+/**
+ * test image() with Asset.timestamp
+ *
+ * @return void
+ */
+	function testImageWithTimestampping() {
+		Configure::write('Asset.timestamp', 'force');
+
+		$this->Html->webroot = '/';
+		$result = $this->Html->image('cake.icon.png');
+		$this->assertTags($result, array('img' => array('src' => 'preg:/\/img\/cake\.icon\.png\?\d+/', 'alt' => '')));
+
+		Configure::write('debug', 0);
+		Configure::write('Asset.timestamp', 'force');
+
+		$result = $this->Html->image('cake.icon.png');
+		$this->assertTags($result, array('img' => array('src' => 'preg:/\/img\/cake\.icon\.png\?\d+/', 'alt' => '')));
+
+		$webroot = $this->Html->webroot;
+		$this->Html->webroot = '/testing/longer/';
+		$result = $this->Html->image('cake.icon.png');
+		$expected = array(
+			'img' => array('src' => 'preg:/\/testing\/longer\/img\/cake\.icon\.png\?[0-9]+/', 'alt' => '')
+		);
+		$this->assertTags($result, $expected);
+		$this->Html->webroot = $webroot;
+	}
+
+/**
+ * Tests creation of an image tag using a theme and asset timestamping
+ *
+ * @access public
+ * @return void
+ * @link https://trac.cakephp.org/ticket/6490
+ */
+	function testImageTagWithTheme() {
+		if ($this->skipIf(!is_writable(WWW_ROOT . 'theme'), 'Cannot write to webroot/theme')) {
+			return;
+		}
+		App::import('Core', 'File');
+
+		$testfile = WWW_ROOT . 'theme' . DS . 'test_theme' . DS . 'img' . DS . '__cake_test_image.gif';
+		$file =& new File($testfile, true);
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+		Configure::write('Asset.timestamp', true);
+		Configure::write('debug', 1);
+
+		$this->Html->webroot = '/';
+		$this->Html->theme = 'test_theme';
+		$result = $this->Html->image('__cake_test_image.gif');
+		$this->assertTags($result, array(
+			'img' => array(
+				'src' => 'preg:/\/theme\/test_theme\/img\/__cake_test_image\.gif\?\d+/',
+				'alt' => ''
+		)));
+
+		$webroot = $this->Html->webroot;
+		$this->Html->webroot = '/testing/';
+		$result = $this->Html->image('__cake_test_image.gif');
+
+		$this->assertTags($result, array(
+			'img' => array(
+				'src' => 'preg:/\/testing\/theme\/test_theme\/img\/__cake_test_image\.gif\?\d+/',
+				'alt' => ''
+		)));
+		$this->Html->webroot = $webroot;
+
+		$dir =& new Folder(WWW_ROOT . 'theme' . DS . 'test_theme');
+		$dir->delete();
+	}
+
+/**
+ * test theme assets in main webroot path
+ *
+ * @access public
+ * @return void
+ */
+	function testThemeAssetsInMainWebrootPath() {
+		Configure::write('Asset.timestamp', false);
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+		$webRoot = Configure::read('App.www_root');
+		Configure::write('App.www_root', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'webroot' . DS);
+
+		$webroot = $this->Html->webroot;
+		$this->Html->theme = 'test_theme';
+		$result = $this->Html->css('webroot_test');
+		$expected = array(
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/.*theme\/test_theme\/css\/webroot_test\.css/')
+		);
+		$this->assertTags($result, $expected);
+
+		$webroot = $this->Html->webroot;
+		$this->Html->theme = 'test_theme';
+		$result = $this->Html->css('theme_webroot');
+		$expected = array(
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/.*theme\/test_theme\/css\/theme_webroot\.css/')
+		);
+		$this->assertTags($result, $expected);
+
+		Configure::write('App.www_root', $webRoot);
+	}
+
+/**
+ * testStyle method
+ *
+ * @access public
+ * @return void
+ */
+	function testStyle() {
+		$result = $this->Html->style(array('display'=> 'none', 'margin'=>'10px'));
+		$expected = 'display:none; margin:10px;';
+		$this->assertPattern('/^display\s*:\s*none\s*;\s*margin\s*:\s*10px\s*;?$/', $expected);
+
+		$result = $this->Html->style(array('display'=> 'none', 'margin'=>'10px'), false);
+		$lines = explode("\n", $result);
+		$this->assertPattern('/^\s*display\s*:\s*none\s*;\s*$/', $lines[0]);
+		$this->assertPattern('/^\s*margin\s*:\s*10px\s*;?$/', $lines[1]);
+	}
+
+/**
+ * testCssLink method
+ *
+ * @access public
+ * @return void
+ */
+	function testCssLink() {
+		Configure::write('Asset.timestamp', false);
+		Configure::write('Asset.filter.css', false);
+
+		$result = $this->Html->css('screen');
+		$expected = array(
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => 'preg:/.*css\/screen\.css/')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->css('screen.css');
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->css('my.css.library');
+		$expected['link']['href'] = 'preg:/.*css\/my\.css\.library\.css/';
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->css('screen.css?1234');
+		$expected['link']['href'] = 'preg:/.*css\/screen\.css\?1234/';
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->css('http://whatever.com/screen.css?1234');
+		$expected['link']['href'] = 'preg:/http:\/\/.*\/screen\.css\?1234/';
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.filter.css', 'css.php');
+		$result = $this->Html->css('cake.generic');
+		$expected['link']['href'] = 'preg:/.*ccss\/cake\.generic\.css/';
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.filter.css', false);
+
+		$result = explode("\n", trim($this->Html->css(array('cake.generic', 'vendor.generic'))));
+		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css/';
+		$this->assertTags($result[0], $expected);
+		$expected['link']['href'] = 'preg:/.*css\/vendor\.generic\.css/';
+		$this->assertTags($result[1], $expected);
+		$this->assertEqual(count($result), 2);
+
+		ClassRegistry::removeObject('view');
+		$view =& new HtmlHelperMockView();
+		ClassRegistry::addObject('view', $view);
+		$view->expectAt(0, 'addScript', array(new PatternExpectation('/css_in_head.css/')));
+		$result = $this->Html->css('css_in_head', null, array('inline' => false));
+		$this->assertNull($result);
+
+		$view =& ClassRegistry::getObject('view');
+		$view->expectAt(1, 'addScript', array(new NoPatternExpectation('/inline=""/')));
+		$result = $this->Html->css('more_css_in_head', null, array('inline' => false));
+		$this->assertNull($result);
+	}
+
+/**
+ * test use of css() and timestamping
+ *
+ * @return void
+ */
+	function testCssTimestamping() {
+		Configure::write('debug', 2);
+		Configure::write('Asset.timestamp', true);
+
+		$expected = array(
+			'link' => array('rel' => 'stylesheet', 'type' => 'text/css', 'href' => '')
+		);
+
+		$result = $this->Html->css('cake.generic');
+		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css\?[0-9]+/';
+		$this->assertTags($result, $expected);
+
+		Configure::write('debug', 0);
+
+		$result = $this->Html->css('cake.generic');
+		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css/';
+		$this->assertTags($result, $expected);
+
+		Configure::write('Asset.timestamp', 'force');
+
+		$result = $this->Html->css('cake.generic');
+		$expected['link']['href'] = 'preg:/.*css\/cake\.generic\.css\?[0-9]+/';
+		$this->assertTags($result, $expected);
+
+		$webroot = $this->Html->webroot;
+		$this->Html->webroot = '/testing/';
+		$result = $this->Html->css('cake.generic');
+		$expected['link']['href'] = 'preg:/\/testing\/css\/cake\.generic\.css\?[0-9]+/';
+		$this->assertTags($result, $expected);
+		$this->Html->webroot = $webroot;
+
+		$webroot = $this->Html->webroot;
+		$this->Html->webroot = '/testing/longer/';
+		$result = $this->Html->css('cake.generic');
+		$expected['link']['href'] = 'preg:/\/testing\/longer\/css\/cake\.generic\.css\?[0-9]+/';
+		$this->assertTags($result, $expected);
+		$this->Html->webroot = $webroot;
+	}
+
+/**
+ * test timestamp enforcement for script tags.
+ *
+ * @return void
+ */
+	function testScriptTimestamping() {
+		$skip = $this->skipIf(!is_writable(JS), 'webroot/js is not Writable, timestamp testing has been skipped');
+		if ($skip) {
+			return;
+		}
+		Configure::write('debug', 2);
+		Configure::write('Asset.timestamp', true);
+
+		touch(WWW_ROOT . 'js' . DS. '__cake_js_test.js');
+		$timestamp = substr(strtotime('now'), 0, 8);
+
+		$result = $this->Html->script('__cake_js_test', array('inline' => true, 'once' => false));
+		$this->assertPattern('/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"/', $result, 'Timestamp value not found %s');
+
+		Configure::write('debug', 0);
+		Configure::write('Asset.timestamp', 'force');
+		$result = $this->Html->script('__cake_js_test', array('inline' => true, 'once' => false));
+		$this->assertPattern('/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"/', $result, 'Timestamp value not found %s');
+		unlink(WWW_ROOT . 'js' . DS. '__cake_js_test.js');
+		Configure::write('Asset.timestamp', false);
+	}
+
+/**
+ * test that scripts added with uses() are only ever included once.
+ * test script tag generation
+ *
+ * @return void
+ */
+	function testScript() {
+		Configure::write('Asset.timestamp', false);
+		$result = $this->Html->script('foo');
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'src' => 'js/foo.js')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->script(array('foobar', 'bar'));
+		$expected = array(
+			array('script' => array('type' => 'text/javascript', 'src' => 'js/foobar.js')),
+			'/script',
+			array('script' => array('type' => 'text/javascript', 'src' => 'js/bar.js')),
+			'/script',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->script('jquery-1.3');
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'src' => 'js/jquery-1.3.js')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->script('test.json');
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'src' => 'js/test.json.js')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->script('/plugin/js/jquery-1.3.2.js?someparam=foo');
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'src' => '/plugin/js/jquery-1.3.2.js?someparam=foo')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->script('test.json.js?foo=bar');
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'src' => 'js/test.json.js?foo=bar')
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->script('foo');
+		$this->assertNull($result, 'Script returned upon duplicate inclusion %s');
+
+		$result = $this->Html->script(array('foo', 'bar', 'baz'));
+		$this->assertNoPattern('/foo.js/', $result);
+
+		$result = $this->Html->script('foo', array('inline' => true, 'once' => false));
+		$this->assertNotNull($result);
+
+		$result = $this->Html->script('jquery-1.3.2', array('defer' => true, 'encoding' => 'utf-8'));
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'src' => 'js/jquery-1.3.2.js', 'defer' => 'defer', 'encoding' => 'utf-8')
+		);
+		$this->assertTags($result, $expected);
+
+		$view =& ClassRegistry::getObject('view');
+		$view =& new HtmlHelperMockView();
+		$view->expectAt(0, 'addScript', array(new PatternExpectation('/script_in_head.js/')));
+		$result = $this->Html->script('script_in_head', array('inline' => false));
+		$this->assertNull($result);
+	}
+
+/**
+ * test a script file in the webroot/theme dir.
+ *
+ * @return void
+ */
+	function testScriptInTheme() {
+		if ($this->skipIf(!is_writable(WWW_ROOT . 'theme'), 'Cannot write to webroot/theme')) {
+			return;
+		}
+		App::import('Core', 'File');
+
+		$testfile = WWW_ROOT . 'theme' . DS . 'test_theme' . DS . 'js' . DS . '__test_js.js';
+		$file =& new File($testfile, true);
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$this->Html->webroot = '/';
+		$this->Html->theme = 'test_theme';
+		$result = $this->Html->script('__test_js.js');
+		$expected = array(
+			'script' => array('src' => '/theme/test_theme/js/__test_js.js', 'type' => 'text/javascript')
+		);
+		$this->assertTags($result, $expected);
+		App::build();
+	}
+
+/**
+ * test Script block generation
+ *
+ * @return void
+ */
+	function testScriptBlock() {
+		$result = $this->Html->scriptBlock('window.foo = 2;');
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'window.foo = 2;',
+			$this->cDataEnd,
+			'/script',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->scriptBlock('window.foo = 2;', array('safe' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'window.foo = 2;',
+			'/script',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->scriptBlock('window.foo = 2;', array('safe' => true));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'window.foo = 2;',
+			$this->cDataEnd,
+			'/script',
+		);
+		$this->assertTags($result, $expected);
+
+		$view =& ClassRegistry::getObject('view');
+		$view =& new HtmlHelperMockView();
+		$view->expectAt(0, 'addScript', array(new PatternExpectation('/window\.foo\s\=\s2;/')));
+
+		$result = $this->Html->scriptBlock('window.foo = 2;', array('inline' => false));
+		$this->assertNull($result);
+
+		$result = $this->Html->scriptBlock('window.foo = 2;', array('safe' => false, 'encoding' => 'utf-8'));
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'encoding' => 'utf-8'),
+			'window.foo = 2;',
+			'/script',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test script tag output buffering when using scriptStart() and scriptEnd();
+ *
+ * @return void
+ */
+	function testScriptStartAndScriptEnd() {
+		$result = $this->Html->scriptStart(array('safe' => true));
+		$this->assertNull($result);
+		echo 'this is some javascript';
+
+		$result = $this->Html->scriptEnd();
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'this is some javascript',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+
+		$result = $this->Html->scriptStart(array('safe' => false));
+		$this->assertNull($result);
+		echo 'this is some javascript';
+
+		$result = $this->Html->scriptEnd();
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'this is some javascript',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		ClassRegistry::removeObject('view');
+		$View =& new HtmlHelperMockView();
+
+		$View->expectOnce('addScript');
+		ClassRegistry::addObject('view', $View);
+
+		$result = $this->Html->scriptStart(array('safe' => false, 'inline' => false));
+		$this->assertNull($result);
+		echo 'this is some javascript';
+
+		$result = $this->Html->scriptEnd();
+		$this->assertNull($result);
+	}
+
+/**
+ * testCharsetTag method
+ *
+ * @access public
+ * @return void
+ */
+	function testCharsetTag() {
+		Configure::write('App.encoding', null);
+		$result = $this->Html->charset();
+		$this->assertTags($result, array('meta' => array('http-equiv' => 'Content-Type', 'content' => 'text/html; charset=utf-8')));
+
+		Configure::write('App.encoding', 'ISO-8859-1');
+		$result = $this->Html->charset();
+		$this->assertTags($result, array('meta' => array('http-equiv' => 'Content-Type', 'content' => 'text/html; charset=iso-8859-1')));
+
+		$result = $this->Html->charset('UTF-7');
+		$this->assertTags($result, array('meta' => array('http-equiv' => 'Content-Type', 'content' => 'text/html; charset=UTF-7')));
+	}
+
+/**
+ * testBreadcrumb method
+ *
+ * @access public
+ * @return void
+ */
+	function testBreadcrumb() {
+		$this->Html->addCrumb('First', '#first');
+		$this->Html->addCrumb('Second', '#second');
+		$this->Html->addCrumb('Third', '#third');
+
+		$result = $this->Html->getCrumbs();
+		$expected = array(
+			array('a' => array('href' => '#first')),
+			'First',
+			'/a',
+			'&raquo;',
+			array('a' => array('href' => '#second')),
+			'Second',
+			'/a',
+			'&raquo;',
+			array('a' => array('href' => '#third')),
+			'Third',
+			'/a',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->getCrumbs(' &gt; ');
+		$expected = array(
+			array('a' => array('href' => '#first')),
+			'First',
+			'/a',
+			' &gt; ',
+			array('a' => array('href' => '#second')),
+			'Second',
+			'/a',
+			' &gt; ',
+			array('a' => array('href' => '#third')),
+			'Third',
+			'/a',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->assertPattern('/^<a[^<>]+>First<\/a> &gt; <a[^<>]+>Second<\/a> &gt; <a[^<>]+>Third<\/a>$/', $result);
+		$this->assertPattern('/<a\s+href=["\']+\#first["\']+[^<>]*>First<\/a>/', $result);
+		$this->assertPattern('/<a\s+href=["\']+\#second["\']+[^<>]*>Second<\/a>/', $result);
+		$this->assertPattern('/<a\s+href=["\']+\#third["\']+[^<>]*>Third<\/a>/', $result);
+		$this->assertNoPattern('/<a[^<>]+[^href]=[^<>]*>/', $result);
+
+		$this->Html->addCrumb('Fourth', null);
+
+		$result = $this->Html->getCrumbs();
+		$expected = array(
+			array('a' => array('href' => '#first')),
+			'First',
+			'/a',
+			'&raquo;',
+			array('a' => array('href' => '#second')),
+			'Second',
+			'/a',
+			'&raquo;',
+			array('a' => array('href' => '#third')),
+			'Third',
+			'/a',
+			'&raquo;',
+			'Fourth'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testNestedList method
+ *
+ * @access public
+ * @return void
+ */
+	function testNestedList() {
+		$list = array(
+			'Item 1',
+			'Item 2' => array(
+				'Item 2.1'
+			),
+			'Item 3',
+			'Item 4' => array(
+				'Item 4.1',
+				'Item 4.2',
+				'Item 4.3' => array(
+					'Item 4.3.1',
+					'Item 4.3.2'
+				)
+			),
+			'Item 5' => array(
+				'Item 5.1',
+				'Item 5.2'
+			)
+		);
+
+		$result = $this->Html->nestedList($list);
+		$expected = array(
+			'<ul',
+			'<li', 'Item 1', '/li',
+			'<li', 'Item 2',
+			'<ul', '<li', 'Item 2.1', '/li', '/ul',
+			'/li',
+			'<li', 'Item 3', '/li',
+			'<li', 'Item 4',
+			'<ul',
+			'<li', 'Item 4.1', '/li',
+			'<li', 'Item 4.2', '/li',
+			'<li', 'Item 4.3',
+			'<ul',
+			'<li', 'Item 4.3.1', '/li',
+			'<li', 'Item 4.3.2', '/li',
+			'/ul',
+			'/li',
+			'/ul',
+			'/li',
+			'<li', 'Item 5',
+			'<ul',
+			'<li', 'Item 5.1', '/li',
+			'<li', 'Item 5.2', '/li',
+			'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->nestedList($list, null);
+		$expected = array(
+			'<ul',
+			'<li', 'Item 1', '/li',
+			'<li', 'Item 2',
+			'<ul', '<li', 'Item 2.1', '/li', '/ul',
+			'/li',
+			'<li', 'Item 3', '/li',
+			'<li', 'Item 4',
+			'<ul',
+			'<li', 'Item 4.1', '/li',
+			'<li', 'Item 4.2', '/li',
+			'<li', 'Item 4.3',
+			'<ul',
+			'<li', 'Item 4.3.1', '/li',
+			'<li', 'Item 4.3.2', '/li',
+			'/ul',
+			'/li',
+			'/ul',
+			'/li',
+			'<li', 'Item 5',
+			'<ul',
+			'<li', 'Item 5.1', '/li',
+			'<li', 'Item 5.2', '/li',
+			'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->nestedList($list, array(), array(), 'ol');
+		$expected = array(
+			'<ol',
+			'<li', 'Item 1', '/li',
+			'<li', 'Item 2',
+			'<ol', '<li', 'Item 2.1', '/li', '/ol',
+			'/li',
+			'<li', 'Item 3', '/li',
+			'<li', 'Item 4',
+			'<ol',
+			'<li', 'Item 4.1', '/li',
+			'<li', 'Item 4.2', '/li',
+			'<li', 'Item 4.3',
+			'<ol',
+			'<li', 'Item 4.3.1', '/li',
+			'<li', 'Item 4.3.2', '/li',
+			'/ol',
+			'/li',
+			'/ol',
+			'/li',
+			'<li', 'Item 5',
+			'<ol',
+			'<li', 'Item 5.1', '/li',
+			'<li', 'Item 5.2', '/li',
+			'/ol',
+			'/li',
+			'/ol'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->nestedList($list, 'ol');
+		$expected = array(
+			'<ol',
+			'<li', 'Item 1', '/li',
+			'<li', 'Item 2',
+			'<ol', '<li', 'Item 2.1', '/li', '/ol',
+			'/li',
+			'<li', 'Item 3', '/li',
+			'<li', 'Item 4',
+			'<ol',
+			'<li', 'Item 4.1', '/li',
+			'<li', 'Item 4.2', '/li',
+			'<li', 'Item 4.3',
+			'<ol',
+			'<li', 'Item 4.3.1', '/li',
+			'<li', 'Item 4.3.2', '/li',
+			'/ol',
+			'/li',
+			'/ol',
+			'/li',
+			'<li', 'Item 5',
+			'<ol',
+			'<li', 'Item 5.1', '/li',
+			'<li', 'Item 5.2', '/li',
+			'/ol',
+			'/li',
+			'/ol'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->nestedList($list, array('class'=>'list'));
+		$expected = array(
+			array('ul' => array('class' => 'list')),
+			'<li', 'Item 1', '/li',
+			'<li', 'Item 2',
+			array('ul' => array('class' => 'list')), '<li', 'Item 2.1', '/li', '/ul',
+			'/li',
+			'<li', 'Item 3', '/li',
+			'<li', 'Item 4',
+			array('ul' => array('class' => 'list')),
+			'<li', 'Item 4.1', '/li',
+			'<li', 'Item 4.2', '/li',
+			'<li', 'Item 4.3',
+			array('ul' => array('class' => 'list')),
+			'<li', 'Item 4.3.1', '/li',
+			'<li', 'Item 4.3.2', '/li',
+			'/ul',
+			'/li',
+			'/ul',
+			'/li',
+			'<li', 'Item 5',
+			array('ul' => array('class' => 'list')),
+			'<li', 'Item 5.1', '/li',
+			'<li', 'Item 5.2', '/li',
+			'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->nestedList($list, array(), array('class' => 'item'));
+		$expected = array(
+			'<ul',
+			array('li' => array('class' => 'item')), 'Item 1', '/li',
+			array('li' => array('class' => 'item')), 'Item 2',
+			'<ul', array('li' => array('class' => 'item')), 'Item 2.1', '/li', '/ul',
+			'/li',
+			array('li' => array('class' => 'item')), 'Item 3', '/li',
+			array('li' => array('class' => 'item')), 'Item 4',
+			'<ul',
+			array('li' => array('class' => 'item')), 'Item 4.1', '/li',
+			array('li' => array('class' => 'item')), 'Item 4.2', '/li',
+			array('li' => array('class' => 'item')), 'Item 4.3',
+			'<ul',
+			array('li' => array('class' => 'item')), 'Item 4.3.1', '/li',
+			array('li' => array('class' => 'item')), 'Item 4.3.2', '/li',
+			'/ul',
+			'/li',
+			'/ul',
+			'/li',
+			array('li' => array('class' => 'item')), 'Item 5',
+			'<ul',
+			array('li' => array('class' => 'item')), 'Item 5.1', '/li',
+			array('li' => array('class' => 'item')), 'Item 5.2', '/li',
+			'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->nestedList($list, array(), array('even' => 'even', 'odd' => 'odd'));
+		$expected = array(
+			'<ul',
+			array('li' => array('class' => 'odd')), 'Item 1', '/li',
+			array('li' => array('class' => 'even')), 'Item 2',
+			'<ul', array('li' => array('class' => 'odd')), 'Item 2.1', '/li', '/ul',
+			'/li',
+			array('li' => array('class' => 'odd')), 'Item 3', '/li',
+			array('li' => array('class' => 'even')), 'Item 4',
+			'<ul',
+			array('li' => array('class' => 'odd')), 'Item 4.1', '/li',
+			array('li' => array('class' => 'even')), 'Item 4.2', '/li',
+			array('li' => array('class' => 'odd')), 'Item 4.3',
+			'<ul',
+			array('li' => array('class' => 'odd')), 'Item 4.3.1', '/li',
+			array('li' => array('class' => 'even')), 'Item 4.3.2', '/li',
+			'/ul',
+			'/li',
+			'/ul',
+			'/li',
+			array('li' => array('class' => 'odd')), 'Item 5',
+			'<ul',
+			array('li' => array('class' => 'odd')), 'Item 5.1', '/li',
+			array('li' => array('class' => 'even')), 'Item 5.2', '/li',
+			'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->nestedList($list, array('class'=>'list'), array('class' => 'item'));
+		$expected = array(
+			array('ul' => array('class' => 'list')),
+			array('li' => array('class' => 'item')), 'Item 1', '/li',
+			array('li' => array('class' => 'item')), 'Item 2',
+			array('ul' => array('class' => 'list')), array('li' => array('class' => 'item')), 'Item 2.1', '/li', '/ul',
+			'/li',
+			array('li' => array('class' => 'item')), 'Item 3', '/li',
+			array('li' => array('class' => 'item')), 'Item 4',
+			array('ul' => array('class' => 'list')),
+			array('li' => array('class' => 'item')), 'Item 4.1', '/li',
+			array('li' => array('class' => 'item')), 'Item 4.2', '/li',
+			array('li' => array('class' => 'item')), 'Item 4.3',
+			array('ul' => array('class' => 'list')),
+			array('li' => array('class' => 'item')), 'Item 4.3.1', '/li',
+			array('li' => array('class' => 'item')), 'Item 4.3.2', '/li',
+			'/ul',
+			'/li',
+			'/ul',
+			'/li',
+			array('li' => array('class' => 'item')), 'Item 5',
+			array('ul' => array('class' => 'list')),
+			array('li' => array('class' => 'item')), 'Item 5.1', '/li',
+			array('li' => array('class' => 'item')), 'Item 5.2', '/li',
+			'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testMeta method
+ *
+ * @access public
+ * @return void
+ */
+	function testMeta() {
+		$result = $this->Html->meta('this is an rss feed', array('controller' => 'posts', 'ext' => 'rss'));
+		$this->assertTags($result, array('link' => array('href' => 'preg:/.*\/posts\.rss/', 'type' => 'application/rss+xml', 'rel' => 'alternate', 'title' => 'this is an rss feed')));
+
+		$result = $this->Html->meta('rss', array('controller' => 'posts', 'ext' => 'rss'), array('title' => 'this is an rss feed'));
+		$this->assertTags($result, array('link' => array('href' => 'preg:/.*\/posts\.rss/', 'type' => 'application/rss+xml', 'rel' => 'alternate', 'title' => 'this is an rss feed')));
+
+		$result = $this->Html->meta('atom', array('controller' => 'posts', 'ext' => 'xml'));
+		$this->assertTags($result, array('link' => array('href' => 'preg:/.*\/posts\.xml/', 'type' => 'application/atom+xml', 'title' => 'atom')));
+
+		$result = $this->Html->meta('non-existing');
+		$this->assertTags($result, array('<meta'));
+
+		$result = $this->Html->meta('non-existing', '/posts.xpp');
+		$this->assertTags($result, array('link' => array('href' => 'preg:/.*\/posts\.xpp/', 'type' => 'application/rss+xml', 'rel' => 'alternate', 'title' => 'non-existing')));
+
+		$result = $this->Html->meta('non-existing', '/posts.xpp', array('type' => 'atom'));
+		$this->assertTags($result, array('link' => array('href' => 'preg:/.*\/posts\.xpp/', 'type' => 'application/atom+xml', 'title' => 'non-existing')));
+
+		$result = $this->Html->meta('atom', array('controller' => 'posts', 'ext' => 'xml'), array('link' => '/articles.rss'));
+		$this->assertTags($result, array('link' => array('href' => 'preg:/.*\/articles\.rss/', 'type' => 'application/atom+xml', 'title' => 'atom')));
+
+		$result = $this->Html->meta(array('link' => 'favicon.ico', 'rel' => 'icon'));
+		$expected = array(
+			'link' => array('href' => 'preg:/.*favicon\.ico/', 'rel' => 'icon'),
+			array('link' => array('href' => 'preg:/.*favicon\.ico/', 'rel' => 'shortcut icon'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->meta('icon', 'favicon.ico');
+		$expected = array(
+			'link' => array('href' => 'preg:/.*favicon\.ico/', 'type' => 'image/x-icon', 'rel' => 'icon'),
+			array('link' => array('href' => 'preg:/.*favicon\.ico/', 'type' => 'image/x-icon', 'rel' => 'shortcut icon'))
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Html->meta('keywords', 'these, are, some, meta, keywords');
+		$this->assertTags($result, array('meta' => array('name' => 'keywords', 'content' => 'these, are, some, meta, keywords')));
+		$this->assertPattern('/\s+\/>$/', $result);
+
+
+		$result = $this->Html->meta('description', 'this is the meta description');
+		$this->assertTags($result, array('meta' => array('name' => 'description', 'content' => 'this is the meta description')));
+
+		$result = $this->Html->meta(array('name' => 'ROBOTS', 'content' => 'ALL'));
+		$this->assertTags($result, array('meta' => array('name' => 'ROBOTS', 'content' => 'ALL')));
+
+		$this->assertNull($this->Html->meta(array('name' => 'ROBOTS', 'content' => 'ALL'), null, array('inline' => false)));
+		$view =& ClassRegistry::getObject('view');
+		$result = $view->__scripts[0];
+		$this->assertTags($result, array('meta' => array('name' => 'ROBOTS', 'content' => 'ALL')));
+	}
+
+/**
+ * testTableHeaders method
+ *
+ * @access public
+ * @return void
+ */
+	function testTableHeaders() {
+		$result = $this->Html->tableHeaders(array('ID', 'Name', 'Date'));
+		$expected = array('<tr', '<th', 'ID', '/th', '<th', 'Name', '/th', '<th', 'Date', '/th', '/tr');
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testTableCells method
+ *
+ * @access public
+ * @return void
+ */
+	function testTableCells() {
+		$tr = array(
+			'td content 1',
+			array('td content 2', array("width" => "100px")),
+			array('td content 3', "width=100px")
+		);
+		$result = $this->Html->tableCells($tr);
+		$expected = array(
+			'<tr',
+			'<td', 'td content 1', '/td',
+			array('td' => array('width' => '100px')), 'td content 2', '/td',
+			array('td' => array('width' => 'preg:/100px/')), 'td content 3', '/td',
+			'/tr'
+		);
+		$this->assertTags($result, $expected);
+
+		$tr = array('td content 1', 'td content 2', 'td content 3');
+		$result = $this->Html->tableCells($tr, null, null, true);
+		$expected = array(
+			'<tr',
+			array('td' => array('class' => 'column-1')), 'td content 1', '/td',
+			array('td' => array('class' => 'column-2')), 'td content 2', '/td',
+			array('td' => array('class' => 'column-3')), 'td content 3', '/td',
+			'/tr'
+		);
+		$this->assertTags($result, $expected);
+
+		$tr = array('td content 1', 'td content 2', 'td content 3');
+		$result = $this->Html->tableCells($tr, true);
+		$expected = array(
+			'<tr',
+			array('td' => array('class' => 'column-1')), 'td content 1', '/td',
+			array('td' => array('class' => 'column-2')), 'td content 2', '/td',
+			array('td' => array('class' => 'column-3')), 'td content 3', '/td',
+			'/tr'
+		);
+		$this->assertTags($result, $expected);
+
+		$tr = array(
+			array('td content 1', 'td content 2', 'td content 3'),
+			array('td content 1', 'td content 2', 'td content 3'),
+			array('td content 1', 'td content 2', 'td content 3')
+		);
+		$result = $this->Html->tableCells($tr, array('class' => 'odd'), array('class' => 'even'));
+		$expected = "<tr class=\"even\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"even\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>";
+		$this->assertEqual($result, $expected);
+
+		$tr = array(
+			array('td content 1', 'td content 2', 'td content 3'),
+			array('td content 1', 'td content 2', 'td content 3'),
+			array('td content 1', 'td content 2', 'td content 3'),
+			array('td content 1', 'td content 2', 'td content 3')
+		);
+		$result = $this->Html->tableCells($tr, array('class' => 'odd'), array('class' => 'even'));
+		$expected = "<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"even\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"even\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>";
+		$this->assertEqual($result, $expected);
+
+		$tr = array(
+			array('td content 1', 'td content 2', 'td content 3'),
+			array('td content 1', 'td content 2', 'td content 3'),
+			array('td content 1', 'td content 2', 'td content 3')
+		);
+		$this->Html->tableCells($tr, array('class' => 'odd'), array('class' => 'even'));
+		$result = $this->Html->tableCells($tr, array('class' => 'odd'), array('class' => 'even'), false, false);
+		$expected = "<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"even\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>\n<tr class=\"odd\"><td>td content 1</td> <td>td content 2</td> <td>td content 3</td></tr>";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testTag method
+ *
+ * @access public
+ * @return void
+ */
+	function testTag() {
+		$result = $this->Html->tag('div');
+		$this->assertTags($result, '<div');
+
+		$result = $this->Html->tag('div', 'text');
+		$this->assertTags($result, '<div', 'text', '/div');
+
+		$result = $this->Html->tag('div', '<text>', 'class-name');
+		$this->assertTags($result, array('div' => array('class' => 'class-name'), 'preg:/<text>/', '/div'));
+
+		$result = $this->Html->tag('div', '<text>', array('class' => 'class-name', 'escape' => true));
+		$this->assertTags($result, array('div' => array('class' => 'class-name'), '&lt;text&gt;', '/div'));
+	}
+
+/**
+ * testDiv method
+ *
+ * @access public
+ * @return void
+ */
+	function testDiv() {
+		$result = $this->Html->div('class-name');
+		$this->assertTags($result, array('div' => array('class' => 'class-name')));
+
+		$result = $this->Html->div('class-name', 'text');
+		$this->assertTags($result, array('div' => array('class' => 'class-name'), 'text', '/div'));
+
+		$result = $this->Html->div('class-name', '<text>', array('escape' => true));
+		$this->assertTags($result, array('div' => array('class' => 'class-name'), '&lt;text&gt;', '/div'));
+	}
+
+/**
+ * testPara method
+ *
+ * @access public
+ * @return void
+ */
+	function testPara() {
+		$result = $this->Html->para('class-name', '');
+		$this->assertTags($result, array('p' => array('class' => 'class-name')));
+
+		$result = $this->Html->para('class-name', 'text');
+		$this->assertTags($result, array('p' => array('class' => 'class-name'), 'text', '/p'));
+
+		$result = $this->Html->para('class-name', '<text>', array('escape' => true));
+		$this->assertTags($result, array('p' => array('class' => 'class-name'), '&lt;text&gt;', '/p'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php
new file mode 100644
index 000000000..60b78b2f8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/javascript.test.php
@@ -0,0 +1,911 @@
+<?php
+/**
+ * JavascriptHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('Controller', 'View', 'ClassRegistry', 'View'));
+App::import('Helper', array('Javascript', 'Html', 'Form'));
+
+/**
+ * TheJsTestController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TheJsTestController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'TheTest'
+ * @access public
+ */
+	var $name = 'TheTest';
+
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+}
+
+/**
+ * TheView class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TheView extends View {
+
+/**
+ * scripts method
+ *
+ * @access public
+ * @return void
+ */
+	function scripts() {
+		return $this->__scripts;
+	}
+}
+
+/**
+ * TestJavascriptObject class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TestJavascriptObject {
+
+/**
+ * property1 property
+ *
+ * @var string 'value1'
+ * @access public
+ */
+	var $property1 = 'value1';
+
+/**
+ * property2 property
+ *
+ * @var int 2
+ * @access public
+ */
+	var $property2 = 2;
+}
+
+/**
+ * JavascriptTest class
+ *
+ * @package       test_suite
+ * @subpackage    test_suite.cases.libs
+ * @since         CakePHP Test Suite v 1.0.0.0
+ */
+class JavascriptTest extends CakeTestCase {
+
+/**
+ * Regexp for CDATA start block
+ *
+ * @var string
+ */
+	var $cDataStart = 'preg:/^\/\/<!\[CDATA\[[\n\r]*/';
+
+/**
+ * Regexp for CDATA end block
+ *
+ * @var string
+ */
+	var $cDataEnd = 'preg:/[^\]]*\]\]\>[\s\r\n]*/';
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Javascript =& new JavascriptHelper();
+		$this->Javascript->Html =& new HtmlHelper();
+		$this->Javascript->Form =& new FormHelper();
+		$this->View =& new TheView(new TheJsTestController());
+		ClassRegistry::addObject('view', $this->View);
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->Javascript->Html);
+		unset($this->Javascript->Form);
+		unset($this->Javascript);
+		ClassRegistry::removeObject('view');
+		unset($this->View);
+	}
+
+/**
+ * testConstruct method
+ *
+ * @access public
+ * @return void
+ */
+	function testConstruct() {
+		$Javascript =& new JavascriptHelper(array('safe'));
+		$this->assertTrue($Javascript->safe);
+
+		$Javascript =& new JavascriptHelper(array('safe' => false));
+		$this->assertFalse($Javascript->safe);
+	}
+
+/**
+ * testLink method
+ *
+ * @access public
+ * @return void
+ */
+	function testLink() {
+		Configure::write('Asset.timestamp', false);
+		$result = $this->Javascript->link('script.js');
+		$expected = '<script type="text/javascript" src="js/script.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('script');
+		$expected = '<script type="text/javascript" src="js/script.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('scriptaculous.js?load=effects');
+		$expected = '<script type="text/javascript" src="js/scriptaculous.js?load=effects"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('some.json.libary');
+		$expected = '<script type="text/javascript" src="js/some.json.libary.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('jquery-1.1.2');
+		$expected = '<script type="text/javascript" src="js/jquery-1.1.2.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('jquery-1.1.2');
+		$expected = '<script type="text/javascript" src="js/jquery-1.1.2.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('/plugin/js/jquery-1.1.2');
+		$expected = '<script type="text/javascript" src="/plugin/js/jquery-1.1.2.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('/some_other_path/myfile.1.2.2.min.js');
+		$expected = '<script type="text/javascript" src="/some_other_path/myfile.1.2.2.min.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('some_other_path/myfile.1.2.2.min.js');
+		$expected = '<script type="text/javascript" src="js/some_other_path/myfile.1.2.2.min.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('some_other_path/myfile.1.2.2.min');
+		$expected = '<script type="text/javascript" src="js/some_other_path/myfile.1.2.2.min.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('http://example.com/jquery.js');
+		$expected = '<script type="text/javascript" src="http://example.com/jquery.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link(array('prototype.js', 'scriptaculous.js'));
+		$this->assertPattern('/^\s*<script\s+type="text\/javascript"\s+src=".*js\/prototype\.js"[^<>]*><\/script>/', $result);
+		$this->assertPattern('/<\/script>\s*<script[^<>]+>/', $result);
+		$this->assertPattern('/<script\s+type="text\/javascript"\s+src=".*js\/scriptaculous\.js"[^<>]*><\/script>\s*$/', $result);
+
+		$result = $this->Javascript->link('jquery-1.1.2', false);
+		$resultScripts = $this->View->scripts();
+		reset($resultScripts);
+		$expected = '<script type="text/javascript" src="js/jquery-1.1.2.js"></script>';
+		$this->assertNull($result);
+		$this->assertEqual(count($resultScripts), 1);
+		$this->assertEqual(current($resultScripts), $expected);
+	}
+
+/**
+ * testFilteringAndTimestamping method
+ *
+ * @access public
+ * @return void
+ */
+	function testFilteringAndTimestamping() {
+		if ($this->skipIf(!is_writable(JS), 'JavaScript directory not writable, skipping JS asset timestamp tests. %s')) {
+			return;
+		}
+
+		cache(str_replace(WWW_ROOT, '', JS) . '__cake_js_test.js', 'alert("test")', '+999 days', 'public');
+		$timestamp = substr(strtotime('now'), 0, 8);
+
+		Configure::write('Asset.timestamp', true);
+		$result = $this->Javascript->link('__cake_js_test');
+		$this->assertPattern('/^<script[^<>]+src=".*js\/__cake_js_test\.js\?' . $timestamp . '[0-9]{2}"[^<>]*>/', $result);
+
+		$debug = Configure::read('debug');
+		Configure::write('debug', 0);
+		$result = $this->Javascript->link('__cake_js_test');
+		$expected = '<script type="text/javascript" src="js/__cake_js_test.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Asset.timestamp', 'force');
+		$result = $this->Javascript->link('__cake_js_test');
+		$this->assertPattern('/^<script[^<>]+src=".*js\/__cake_js_test.js\?' . $timestamp . '[0-9]{2}"[^<>]*>/', $result);
+
+		Configure::write('debug', $debug);
+		Configure::write('Asset.timestamp', false);
+
+		$old = Configure::read('Asset.filter.js');
+
+		Configure::write('Asset.filter.js', 'js.php');
+		$result = $this->Javascript->link('__cake_js_test');
+		$this->assertPattern('/^<script[^<>]+src=".*cjs\/__cake_js_test\.js"[^<>]*>/', $result);
+
+		Configure::write('Asset.filter.js', true);
+		$result = $this->Javascript->link('jquery-1.1.2');
+		$expected = '<script type="text/javascript" src="cjs/jquery-1.1.2.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->link('folderjs/jquery-1.1.2');
+		$expected = '<script type="text/javascript" src="cjs/folderjs/jquery-1.1.2.js"></script>';
+		$this->assertEqual($result, $expected);
+
+		if ($old === null) {
+			Configure::delete('Asset.filter.js');
+		}
+
+		$debug = Configure::read('debug');
+		$webroot = $this->Javascript->webroot;
+
+		Configure::write('debug', 0);
+		Configure::write('Asset.timestamp', 'force');
+
+		$this->Javascript->webroot = '/testing/';
+		$result = $this->Javascript->link('__cake_js_test');
+		$this->assertPattern('/^<script[^<>]+src="\/testing\/js\/__cake_js_test\.js\?\d+"[^<>]*>/', $result);
+
+		$this->Javascript->webroot = '/testing/longer/';
+		$result = $this->Javascript->link('__cake_js_test');
+		$this->assertPattern('/^<script[^<>]+src="\/testing\/longer\/js\/__cake_js_test\.js\?\d+"[^<>]*>/', $result);
+
+		$this->Javascript->webroot = $webroot;
+		Configure::write('debug', $debug);
+
+		unlink(JS . '__cake_js_test.js');
+	}
+
+/**
+ * testValue method
+ *
+ * @access public
+ * @return void
+ */
+	function testValue() {
+		$result = $this->Javascript->value(array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8)));
+		$expected = '{"title":"New thing","indexes":[5,6,7,8]}';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->value(null);
+		$this->assertEqual($result, 'null');
+
+		$result = $this->Javascript->value(true);
+		$this->assertEqual($result, 'true');
+
+		$result = $this->Javascript->value(false);
+		$this->assertEqual($result, 'false');
+
+		$result = $this->Javascript->value(5);
+		$this->assertEqual($result, '5');
+
+		$result = $this->Javascript->value(floatval(5.3));
+		$this->assertPattern('/^5.3[0]+$/', $result);
+
+		$result = $this->Javascript->value('');
+		$expected = '""';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->value('CakePHP' . "\n" . 'Rapid Development Framework');
+		$expected = '"CakePHP\\nRapid Development Framework"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->value('CakePHP' . "\r\n" . 'Rapid Development Framework' . "\r" . 'For PHP');
+		$expected = '"CakePHP\\nRapid Development Framework\\nFor PHP"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->value('CakePHP: "Rapid Development Framework"');
+		$expected = '"CakePHP: \\"Rapid Development Framework\\""';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->value('CakePHP: \'Rapid Development Framework\'');
+		$expected = '"CakePHP: \\\'Rapid Development Framework\\\'"';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testObjectGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testObjectGeneration() {
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8));
+		$result = $this->Javascript->object($object);
+		$expected = '{"title":"New thing","indexes":[5,6,7,8]}';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->object(array('default' => 0));
+		$expected = '{"default":0}';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->object(array(
+			'2007' => array(
+				'Spring' => array('1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky')),
+				'Fall' => array('1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky'))
+			), '2006' => array(
+				'Spring' => array('1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky')),
+				'Fall' => array('1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky')
+			))
+		));
+		$expected = '{"2007":{"Spring":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}},"Fall":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}}},"2006":{"Spring":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}},"Fall":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}}}}';
+		$this->assertEqual($result, $expected);
+
+		if (ini_get('precision') >= 12) {
+			$number = 3.141592653589;
+			if (!$this->Javascript->useNative) {
+				$number = sprintf("%.11f", $number);
+			}
+
+			$result = $this->Javascript->object(array('Object' => array(true, false, 1, '02101', 0, -1, 3.141592653589, "1")));
+			$expected = '{"Object":[true,false,1,"02101",0,-1,' . $number . ',"1"]}';
+			$this->assertEqual($result, $expected);
+
+			$result = $this->Javascript->object(array('Object' => array(true => true, false, -3.141592653589, -10)));
+			$expected = '{"Object":{"1":true,"2":false,"3":' . (-1 * $number) . ',"4":-10}}';
+			$this->assertEqual($result, $expected);
+		}
+
+		$result = $this->Javascript->object(new TestJavascriptObject());
+		$expected = '{"property1":"value1","property2":2}';
+		$this->assertEqual($result, $expected);
+
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8));
+		$result = $this->Javascript->object($object, array('block' => true));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'{"title":"New thing","indexes":[5,6,7,8]}',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8), 'object' => array('inner' => array('value' => 1)));
+		$result = $this->Javascript->object($object);
+		$expected = '{"title":"New thing","indexes":[5,6,7,8],"object":{"inner":{"value":1}}}';
+		$this->assertEqual($result, $expected);
+
+		foreach (array('true' => true, 'false' => false, 'null' => null) as $expected => $data) {
+			$result = $this->Javascript->object($data);
+			$this->assertEqual($result, $expected);
+		}
+		
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8), 'object' => array('inner' => array('value' => 1)));
+		$result = $this->Javascript->object($object, array('prefix' => 'PREFIX', 'postfix' => 'POSTFIX'));
+		$this->assertPattern('/^PREFIX/', $result);
+		$this->assertPattern('/POSTFIX$/', $result);
+		$this->assertNoPattern('/.PREFIX./', $result);
+		$this->assertNoPattern('/.POSTFIX./', $result);
+
+		if ($this->Javascript->useNative) {
+			$this->Javascript->useNative = false;
+			$this->testObjectGeneration();
+			$this->Javascript->useNative = true;
+		}
+	}
+
+/**
+ * testObjectNonNative method
+ *
+ * @access public
+ * @return void
+ */
+	function testObjectNonNative() {
+		$oldNative = $this->Javascript->useNative;
+		$this->Javascript->useNative = false;
+
+		$object = array(
+			'Object' => array(
+				'key1' => 'val1',
+				'key2' => 'val2',
+				'key3' => 'val3'
+			)
+		);
+
+		$expected = '{"Object":{"key1":val1,"key2":"val2","key3":val3}}';
+		$result = $this->Javascript->object($object, array('quoteKeys' => false, 'stringKeys' => array('key1', 'key3')));
+		$this->assertEqual($result, $expected);
+
+		$expected = '{?Object?:{?key1?:"val1",?key2?:"val2",?key3?:"val3"}}';
+		$result = $this->Javascript->object($object, array('q' => '?'));
+		$this->assertEqual($result, $expected);
+		
+		$expected = '{?Object?:{?key1?:"val1",?key2?:val2,?key3?:"val3"}}';
+		$result = $this->Javascript->object($object, array(
+			'q' => '?', 'stringKeys' => array('key3', 'key1')
+		));
+		$this->assertEqual($result, $expected);
+
+		$expected = '{?Object?:{?key1?:val1,?key2?:"val2",?key3?:val3}}';
+		$result = $this->Javascript->object($object, array(
+			'q' => '?', 'stringKeys' => array('key3', 'key1'), 'quoteKeys' => false
+		));
+		$this->assertEqual($result, $expected);
+
+		$this->Javascript->useNative = $oldNative;
+	}
+
+/**
+ * testScriptBlock method
+ *
+ * @access public
+ * @return void
+ */
+	function testScriptBlock() {
+		$result = $this->Javascript->codeBlock('something');
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock('something', array('allowCache' => true, 'safe' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock('something', array('allowCache' => false, 'safe' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock('something', true);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock('something', false);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock('something', array('safe' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			'something',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock('something', array('safe' => true));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'something',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock(null, array('safe' => true, 'allowCache' => false));
+		$this->assertNull($result);
+		echo 'this is some javascript';
+
+		$result = $this->Javascript->blockEnd();
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'this is some javascript',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->codeBlock();
+		$this->assertNull($result);
+		echo "alert('hey');";
+		$result = $this->Javascript->blockEnd();
+
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"alert('hey');",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Javascript->cacheEvents(false, true);
+		$this->assertFalse($this->Javascript->inBlock);
+
+		$result = $this->Javascript->codeBlock();
+		$this->assertIdentical($result, null);
+		$this->assertTrue($this->Javascript->inBlock);
+		echo 'alert("this is a buffered script");';
+
+		$result = $this->Javascript->blockEnd();
+		$this->assertIdentical($result, null);
+		$this->assertFalse($this->Javascript->inBlock);
+
+		$result = $this->Javascript->getCache();
+		$this->assertEqual('alert("this is a buffered script");', $result);
+	}
+
+/**
+ * testOutOfLineScriptWriting method
+ *
+ * @access public
+ * @return void
+ */
+	function testOutOfLineScriptWriting() {
+		echo $this->Javascript->codeBlock('$(document).ready(function() { });', array('inline' => false));
+
+		$this->Javascript->codeBlock(null, array('inline' => false));
+		echo '$(function(){ });';
+		$this->Javascript->blockEnd();
+		$script = $this->View->scripts();
+
+		$this->assertEqual(count($script), 2);
+		$this->assertPattern('/' . preg_quote('$(document).ready(function() { });', '/') . '/', $script[0]);
+		$this->assertPattern('/' . preg_quote('$(function(){ });', '/') . '/', $script[1]);
+	}
+
+/**
+ * testEvent method
+ *
+ * @access public
+ * @return void
+ */
+	function testEvent() {
+		$result = $this->Javascript->event('myId', 'click', 'something();');
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->event('myId', 'click', 'something();', array('safe' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->event('myId', 'click');
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) {  }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->event('myId', 'click', 'something();', false);
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->event('myId', 'click', 'something();', array('useCapture' => true));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, true);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->event('document', 'load');
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe(document, 'load', function(event) {  }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->event('$(\'myId\')', 'click', 'something();', array('safe' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->event('\'document\'', 'load', 'something();', array('safe' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			"Event.observe('document', 'load', function(event) { something(); }, false);",
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Javascript->cacheEvents();
+		$result = $this->Javascript->event('myId', 'click', 'something();');
+		$this->assertNull($result);
+
+		$result = $this->Javascript->getCache();
+		$this->assertPattern('/^' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '$/s', $result);
+
+		$result = $this->Javascript->event('#myId', 'alert(event);');
+		$this->assertNull($result);
+
+		$result = $this->Javascript->getCache();
+		$this->assertPattern('/^\s*var Rules = {\s*\'#myId\': function\(element, event\)\s*{\s*alert\(event\);\s*}\s*}\s*EventSelectors\.start\(Rules\);\s*$/s', $result);
+	}
+
+/**
+ * testWriteEvents method
+ *
+ * @access public
+ * @return void
+ */
+	function testWriteEvents() {
+		$this->Javascript->cacheEvents();
+		$result = $this->Javascript->event('myId', 'click', 'something();');
+		$this->assertNull($result);
+
+		$result = $this->Javascript->writeEvents();
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->getCache();
+		$this->assertTrue(empty($result));
+
+		$this->Javascript->cacheEvents();
+		$result = $this->Javascript->event('myId', 'click', 'something();');
+		$this->assertNull($result);
+
+		$result = $this->Javascript->writeEvents(false);
+		$resultScripts = $this->View->scripts();
+		reset($resultScripts);
+		$this->assertNull($result);
+		$this->assertEqual(count($resultScripts), 1);
+		$result = current($resultScripts);
+
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->getCache();
+		$this->assertTrue(empty($result));
+	}
+
+/**
+ * testEscapeScript method
+ *
+ * @access public
+ * @return void
+ */
+	function testEscapeScript() {
+		$result = $this->Javascript->escapeScript('');
+		$expected = '';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeScript('CakePHP' . "\n" . 'Rapid Development Framework');
+		$expected = 'CakePHP\\nRapid Development Framework';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeScript('CakePHP' . "\r\n" . 'Rapid Development Framework' . "\r" . 'For PHP');
+		$expected = 'CakePHP\\nRapid Development Framework\\nFor PHP';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeScript('CakePHP: "Rapid Development Framework"');
+		$expected = 'CakePHP: \\"Rapid Development Framework\\"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeScript('CakePHP: \'Rapid Development Framework\'');
+		$expected = 'CakePHP: \\\'Rapid Development Framework\\\'';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testEscapeString method
+ *
+ * @access public
+ * @return void
+ */
+	function testEscapeString() {
+		$result = $this->Javascript->escapeString('');
+		$expected = '';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('CakePHP' . "\n" . 'Rapid Development Framework');
+		$expected = 'CakePHP\\nRapid Development Framework';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('CakePHP' . "\r\n" . 'Rapid Development Framework' . "\r" . 'For PHP');
+		$expected = 'CakePHP\\nRapid Development Framework\\nFor PHP';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('CakePHP: "Rapid Development Framework"');
+		$expected = 'CakePHP: \\"Rapid Development Framework\\"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('CakePHP: \'Rapid Development Framework\'');
+		$expected = "CakePHP: \\'Rapid Development Framework\\'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('my \\"string\\"');
+		$expected = 'my \\\\\\"string\\\\\\"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('my string\nanother line');
+		$expected = 'my string\\\nanother line';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('String with \n string that looks like newline');
+		$expected = 'String with \\\n string that looks like newline';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Javascript->escapeString('String with \n string that looks like newline');
+		$expected = 'String with \\\n string that looks like newline';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test string escaping and compare to json_encode()
+ *
+ * @return void
+ */
+	function testStringJsonEncodeCompliance() {
+		if (!function_exists('json_encode')) {
+			return;
+		}
+		$this->Javascript->useNative = false;
+		$data = array();
+		$data['mystring'] = "simple string";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "strïng with spécial chârs";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "a two lines\nstring";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "a \t tabbed \t string";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = "a \"double-quoted\" string";
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+
+		$data['mystring'] = 'a \\"double-quoted\\" string';
+		$this->assertEqual(json_encode($data), $this->Javascript->object($data));
+	}
+
+/**
+ * test that text encoded with Javascript::object decodes properly
+ *
+ * @return void
+ */
+	function testObjectDecodeCompatibility() {
+		if (!function_exists('json_decode')) {
+			return;
+		}
+		$this->Javascript->useNative = false;
+
+		$data = array("simple string");
+		$result = $this->Javascript->object($data);
+		$this->assertEqual(json_decode($result), $data);
+
+		$data = array('my \"string\"');
+		$result = $this->Javascript->object($data);
+		$this->assertEqual(json_decode($result), $data);
+
+		$data = array('my \\"string\\"');
+		$result = $this->Javascript->object($data);
+		$this->assertEqual(json_decode($result), $data);
+	}
+
+/**
+ * testAfterRender method
+ *
+ * @access public
+ * @return void
+ */
+	function testAfterRender() {
+		$this->Javascript->cacheEvents();
+		$result = $this->Javascript->event('myId', 'click', 'something();');
+		$this->assertNull($result);
+
+		ob_start();
+		$this->Javascript->afterRender();
+		$result = ob_get_clean();
+
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"Event.observe($('myId'), 'click', function(event) { something(); }, false);",
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Javascript->getCache();
+		$this->assertTrue(empty($result));
+
+		$old = $this->Javascript->enabled;
+		$this->Javascript->enabled = false;
+
+		$this->Javascript->cacheEvents();
+		$result = $this->Javascript->event('myId', 'click', 'something();');
+		$this->assertNull($result);
+
+		ob_start();
+		$this->Javascript->afterRender();
+		$result = ob_get_clean();
+
+		$this->assertTrue(empty($result));
+
+		$result = $this->Javascript->getCache();
+		$this->assertPattern('/^' . str_replace('/', '\\/', preg_quote('Event.observe($(\'myId\'), \'click\', function(event) { something(); }, false);')) . '$/s', $result);
+
+		$this->Javascript->enabled = $old;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
new file mode 100644
index 000000000..b14144dcf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/jquery_engine.test.php
@@ -0,0 +1,367 @@
+<?php
+/**
+ * JqueryEngineTestCase
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link            http://cakephp.org CakePHP Project
+ * @package         cake.tests
+ * @subpackage      cake.tests.cases.views.helpers
+ * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', array('Html', 'Js', 'JqueryEngine'));
+
+class JqueryEngineHelperTestCase extends CakeTestCase {
+/**
+ * startTest
+ *
+ * @return void
+ */
+	function startTest() {
+		$this->Jquery =& new JqueryEngineHelper();
+	}
+
+/**
+ * end test
+ *
+ * @return void
+ */
+	function endTest() {
+		unset($this->Jquery);
+	}
+
+/**
+ * test selector method
+ *
+ * @return void
+ */
+	function testSelector() {
+		$result = $this->Jquery->get('#content');
+		$this->assertEqual($result, $this->Jquery);
+		$this->assertEqual($this->Jquery->selection, '$("#content")');
+
+		$result = $this->Jquery->get('document');
+		$this->assertEqual($result, $this->Jquery);
+		$this->assertEqual($this->Jquery->selection, '$(document)');
+
+		$result = $this->Jquery->get('window');
+		$this->assertEqual($result, $this->Jquery);
+		$this->assertEqual($this->Jquery->selection, '$(window)');
+
+		$result = $this->Jquery->get('ul');
+		$this->assertEqual($result, $this->Jquery);
+		$this->assertEqual($this->Jquery->selection, '$("ul")');
+	}
+
+/**
+ * test event binding
+ *
+ * @return void
+ */
+	function testEvent() {
+		$this->Jquery->get('#myLink');
+		$result = $this->Jquery->event('click', 'doClick', array('wrap' => false));
+		$expected = '$("#myLink").bind("click", doClick);';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->event('click', '$(this).show();', array('stop' => false));
+		$expected = '$("#myLink").bind("click", function (event) {$(this).show();});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->event('click', '$(this).hide();');
+		$expected = '$("#myLink").bind("click", function (event) {$(this).hide();'."\n".'return false;});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test dom ready event creation
+ *
+ * @return void
+ */
+	function testDomReady() {
+		$result = $this->Jquery->domReady('foo.name = "bar";');
+		$expected = '$(document).ready(function () {foo.name = "bar";});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Each method
+ *
+ * @return void
+ */
+	function testEach() {
+		$this->Jquery->get('#foo');
+		$result = $this->Jquery->each('$(this).hide();');
+		$expected = '$("#foo").each(function () {$(this).hide();});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Effect generation
+ *
+ * @return void
+ */
+	function testEffect() {
+		$this->Jquery->get('#foo');
+		$result = $this->Jquery->effect('show');
+		$expected = '$("#foo").show();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('hide');
+		$expected = '$("#foo").hide();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('hide', array('speed' => 'fast'));
+		$expected = '$("#foo").hide("fast");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('fadeIn');
+		$expected = '$("#foo").fadeIn();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('fadeOut');
+		$expected = '$("#foo").fadeOut();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('slideIn');
+		$expected = '$("#foo").slideDown();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('slideOut');
+		$expected = '$("#foo").slideUp();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('slideDown');
+		$expected = '$("#foo").slideDown();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->effect('slideUp');
+		$expected = '$("#foo").slideUp();';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test Request Generation
+ *
+ * @return void
+ */
+	function testRequest() {
+		$result = $this->Jquery->request(array('controller' => 'posts', 'action' => 'view', 1));
+		$expected = '$.ajax({url:"\\/posts\\/view\\/1"});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->request(array('controller' => 'posts', 'action' => 'view', 1), array(
+			'update' => '#content'
+		));
+		$expected = '$.ajax({dataType:"html", success:function (data, textStatus) {$("#content").html(data);}, url:"\/posts\/view\/1"});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->request('/people/edit/1', array(
+			'method' => 'post',
+			'before' => 'doBefore',
+			'complete' => 'doComplete',
+			'success' => 'doSuccess',
+			'error' => 'handleError',
+			'type' => 'json',
+			'data' => array('name' => 'jim', 'height' => '185cm'),
+			'wrapCallbacks' => false
+		));
+		$expected = '$.ajax({beforeSend:doBefore, complete:doComplete, data:"name=jim&height=185cm", dataType:"json", error:handleError, success:doSuccess, type:"post", url:"\\/people\\/edit\\/1"});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->request('/people/edit/1', array(
+			'update' => '#updated',
+			'success' => 'doFoo',
+			'method' => 'post',
+			'wrapCallbacks' => false
+		));
+		$expected = '$.ajax({dataType:"html", success:function (data, textStatus) {doFoo$("#updated").html(data);}, type:"post", url:"\\/people\\/edit\\/1"});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->request('/people/edit/1', array(
+			'update' => '#updated',
+			'success' => 'doFoo',
+			'method' => 'post',
+			'dataExpression' => true,
+			'data' => '$("#someId").serialize()',
+			'wrapCallbacks' => false
+		));
+		$expected = '$.ajax({data:$("#someId").serialize(), dataType:"html", success:function (data, textStatus) {doFoo$("#updated").html(data);}, type:"post", url:"\\/people\\/edit\\/1"});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->request('/people/edit/1', array(
+			'success' => 'doFoo',
+			'before' => 'doBefore',
+			'method' => 'post',
+			'dataExpression' => true,
+			'data' => '$("#someId").serialize()',
+		));
+		$expected = '$.ajax({beforeSend:function (XMLHttpRequest) {doBefore}, data:$("#someId").serialize(), success:function (data, textStatus) {doFoo}, type:"post", url:"\\/people\\/edit\\/1"});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that alternate jQuery object values work for request()
+ *
+ * @return void
+ */
+	function testRequestWithAlternateJqueryObject() {
+		$this->Jquery->jQueryObject = '$j';
+
+		$result = $this->Jquery->request('/people/edit/1', array(
+			'update' => '#updated',
+			'success' => 'doFoo',
+			'method' => 'post',
+			'dataExpression' => true,
+			'data' => '$j("#someId").serialize()',
+			'wrapCallbacks' => false
+		));
+		$expected = '$j.ajax({data:$j("#someId").serialize(), dataType:"html", success:function (data, textStatus) {doFoo$j("#updated").html(data);}, type:"post", url:"\\/people\\/edit\\/1"});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test sortable list generation
+ *
+ * @return void
+ */
+	function testSortable() {
+		$this->Jquery->get('#myList');
+		$result = $this->Jquery->sortable(array(
+			'distance' => 5,
+			'containment' => 'parent',
+			'start' => 'onStart',
+			'complete' => 'onStop',
+			'sort' => 'onSort',
+			'wrapCallbacks' => false
+		));
+		$expected = '$("#myList").sortable({containment:"parent", distance:5, sort:onSort, start:onStart, stop:onStop});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->sortable(array(
+			'distance' => 5,
+			'containment' => 'parent',
+			'start' => 'onStart',
+			'complete' => 'onStop',
+			'sort' => 'onSort',
+		));
+		$expected = '$("#myList").sortable({containment:"parent", distance:5, sort:function (event, ui) {onSort}, start:function (event, ui) {onStart}, stop:function (event, ui) {onStop}});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test drag() method
+ *
+ * @return void
+ */
+	function testDrag() {
+		$this->Jquery->get('#element');
+		$result = $this->Jquery->drag(array(
+			'container' => '#content',
+			'start' => 'onStart',
+			'drag' => 'onDrag',
+			'stop' => 'onStop',
+			'snapGrid' => array(10, 10),
+			'wrapCallbacks' => false
+		));
+		$expected = '$("#element").draggable({containment:"#content", drag:onDrag, grid:[10,10], start:onStart, stop:onStop});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->drag(array(
+			'container' => '#content',
+			'start' => 'onStart',
+			'drag' => 'onDrag',
+			'stop' => 'onStop',
+			'snapGrid' => array(10, 10),
+		));
+		$expected = '$("#element").draggable({containment:"#content", drag:function (event, ui) {onDrag}, grid:[10,10], start:function (event, ui) {onStart}, stop:function (event, ui) {onStop}});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test drop() method
+ *
+ * @return void
+ */
+	function testDrop() {
+		$this->Jquery->get('#element');
+		$result = $this->Jquery->drop(array(
+			'accept' => '.items',
+			'hover' => 'onHover',
+			'leave' => 'onExit',
+			'drop' => 'onDrop',
+			'wrapCallbacks' => false
+		));
+		$expected = '$("#element").droppable({accept:".items", drop:onDrop, out:onExit, over:onHover});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->drop(array(
+			'accept' => '.items',
+			'hover' => 'onHover',
+			'leave' => 'onExit',
+			'drop' => 'onDrop',
+		));
+		$expected = '$("#element").droppable({accept:".items", drop:function (event, ui) {onDrop}, out:function (event, ui) {onExit}, over:function (event, ui) {onHover}});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test slider generation
+ *
+ * @return void
+ */
+	function testSlider() {
+		$this->Jquery->get('#element');
+		$result = $this->Jquery->slider(array(
+			'complete' => 'onComplete',
+			'change' => 'onChange',
+			'min' => 0,
+			'max' => 10,
+			'value' => 2,
+			'direction' => 'vertical',
+			'wrapCallbacks' => false
+		));
+		$expected = '$("#element").slider({change:onChange, max:10, min:0, orientation:"vertical", stop:onComplete, value:2});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->slider(array(
+			'complete' => 'onComplete',
+			'change' => 'onChange',
+			'min' => 0,
+			'max' => 10,
+			'value' => 2,
+			'direction' => 'vertical',
+		));
+		$expected = '$("#element").slider({change:function (event, ui) {onChange}, max:10, min:0, orientation:"vertical", stop:function (event, ui) {onComplete}, value:2});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test the serializeForm method
+ *
+ * @return void
+ */
+	function testSerializeForm() {
+		$this->Jquery->get('#element');
+		$result = $this->Jquery->serializeForm(array('isForm' => false));
+		$expected = '$("#element").closest("form").serialize();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->serializeForm(array('isForm' => true));
+		$expected = '$("#element").serialize();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Jquery->serializeForm(array('isForm' => false, 'inline' => true));
+		$expected = '$("#element").closest("form").serialize()';
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/js.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/js.test.php
new file mode 100644
index 000000000..dd8b279e5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/js.test.php
@@ -0,0 +1,833 @@
+<?php
+/**
+ * JsHelper Test Case
+ *
+ * TestCase for the JsHelper
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Helper', array('Js', 'Html', 'Form'));
+App::import('Core', array('View', 'ClassRegistry'));
+
+Mock::generate('JsBaseEngineHelper', 'TestJsEngineHelper', array('methodOne'));
+Mock::generate('View', 'JsHelperMockView');
+
+class OptionEngineHelper extends JsBaseEngineHelper {
+	var $_optionMap = array(
+		'request' => array(
+			'complete' => 'success',
+			'request' => 'beforeSend',
+			'type' => 'dataType'
+		)
+	);
+
+/**
+ * test method for testing option mapping
+ *
+ * @return array
+ */
+	function testMap($options = array()) {
+		return $this->_mapOptions('request', $options);
+	}
+/**
+ * test method for option parsing
+ *
+ * @return void
+ */
+	function testParseOptions($options, $safe = array()) {
+		return $this->_parseOptions($options, $safe);
+	}
+}
+
+/**
+ * JsHelper TestCase.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class JsHelperTestCase extends CakeTestCase {
+/**
+ * Regexp for CDATA start block
+ *
+ * @var string
+ */
+	var $cDataStart = 'preg:/^\/\/<!\[CDATA\[[\n\r]*/';
+
+/**
+ * Regexp for CDATA end block
+ *
+ * @var string
+ */
+	var $cDataEnd = 'preg:/[^\]]*\]\]\>[\s\r\n]*/';
+
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->_asset = Configure::read('Asset.timestamp');
+		Configure::write('Asset.timestamp', false);
+
+		$this->Js =& new JsHelper('JsBase');
+		$this->Js->Html =& new HtmlHelper();
+		$this->Js->Form =& new FormHelper();
+		$this->Js->Form->Html =& new HtmlHelper();
+		$this->Js->JsBaseEngine =& new JsBaseEngineHelper();
+
+		$view =& new JsHelperMockView();
+		ClassRegistry::addObject('view', $view);
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		Configure::write('Asset.timestamp', $this->_asset);
+		ClassRegistry::removeObject('view');
+		unset($this->Js);
+	}
+
+/**
+ * Switches $this->Js to a mocked engine.
+ *
+ * @return void
+ */
+	function _useMock() {
+		$this->Js =& new JsHelper(array('TestJs'));
+		$this->Js->TestJsEngine =& new TestJsEngineHelper($this);
+		$this->Js->Html =& new HtmlHelper();
+		$this->Js->Form =& new FormHelper();
+		$this->Js->Form->Html =& new HtmlHelper();
+	}
+
+/**
+ * test object construction
+ *
+ * @return void
+ */
+	function testConstruction() {
+		$js =& new JsHelper();
+		$this->assertEqual($js->helpers, array('Html', 'Form', 'JqueryEngine'));
+
+		$js =& new JsHelper(array('mootools'));
+		$this->assertEqual($js->helpers, array('Html', 'Form', 'mootoolsEngine'));
+
+		$js =& new JsHelper('prototype');
+		$this->assertEqual($js->helpers, array('Html', 'Form', 'prototypeEngine'));
+
+		$js =& new JsHelper('MyPlugin.Dojo');
+		$this->assertEqual($js->helpers, array('Html', 'Form', 'MyPlugin.DojoEngine'));
+	}
+
+/**
+ * test that methods dispatch internally and to the engine class
+ *
+ * @return void
+ */
+	function testMethodDispatching() {
+		$this->_useMock();
+		$this->Js->TestJsEngine->expectOnce('dispatchMethod', array(new PatternExpectation('/methodOne/i'), array()));
+
+		$this->Js->methodOne();
+
+		$this->Js->TestEngine =& new StdClass();
+		$this->expectError();
+		$this->Js->someMethodThatSurelyDoesntExist();
+	}
+
+/**
+ * Test that method dispatching respects buffer parameters and bufferedMethods Lists.
+ *
+ * @return void
+ */
+	function testMethodDispatchWithBuffering() {
+		$this->_useMock();
+
+		$this->Js->TestJsEngine->bufferedMethods = array('event', 'sortables');
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'This is an event call', array('event', '*'));
+
+		$this->Js->event('click', 'foo');
+		$result = $this->Js->getBuffer();
+		$this->assertEqual(count($result), 1);
+		$this->assertEqual($result[0], 'This is an event call');
+
+		$result = $this->Js->event('click', 'foo', array('buffer' => false));
+		$buffer = $this->Js->getBuffer();
+		$this->assertTrue(empty($buffer));
+		$this->assertEqual($result, 'This is an event call');
+
+		$result = $this->Js->event('click', 'foo', false);
+		$buffer = $this->Js->getBuffer();
+		$this->assertTrue(empty($buffer));
+		$this->assertEqual($result, 'This is an event call');
+
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'I am not buffered.', array('effect', '*'));
+
+		$result = $this->Js->effect('slideIn');
+		$buffer = $this->Js->getBuffer();
+		$this->assertTrue(empty($buffer));
+		$this->assertEqual($result, 'I am not buffered.');
+
+		$result = $this->Js->effect('slideIn', true);
+		$buffer = $this->Js->getBuffer();
+		$this->assertNull($result);
+		$this->assertEqual(count($buffer), 1);
+		$this->assertEqual($buffer[0], 'I am not buffered.');
+
+		$result = $this->Js->effect('slideIn', array('speed' => 'slow'), true);
+		$buffer = $this->Js->getBuffer();
+		$this->assertNull($result);
+		$this->assertEqual(count($buffer), 1);
+		$this->assertEqual($buffer[0], 'I am not buffered.');
+
+		$result = $this->Js->effect('slideIn', array('speed' => 'slow', 'buffer' => true));
+		$buffer = $this->Js->getBuffer();
+		$this->assertNull($result);
+		$this->assertEqual(count($buffer), 1);
+		$this->assertEqual($buffer[0], 'I am not buffered.');
+	}
+
+/**
+ * test that writeScripts generates scripts inline.
+ *
+ * @return void
+ */
+	function testWriteScriptsNoFile() {
+		$this->_useMock();
+		$this->Js->buffer('one = 1;');
+		$this->Js->buffer('two = 2;');
+		$result = $this->Js->writeBuffer(array('onDomReady' => false, 'cache' => false, 'clear' => false));
+		$expected = array(
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			"one = 1;\ntwo = 2;",
+			$this->cDataEnd,
+			'/script',
+		);
+		$this->assertTags($result, $expected, true);
+
+		$this->Js->TestJsEngine->expectAtLeastOnce('domReady');
+		$result = $this->Js->writeBuffer(array('onDomReady' => true, 'cache' => false, 'clear' => false));
+
+		ClassRegistry::removeObject('view');
+		$view =& new JsHelperMockView();
+		ClassRegistry::addObject('view', $view);
+
+		$view->expectCallCount('addScript', 1);
+		$view->expectAt(0, 'addScript', array(new PatternExpectation('/one\s\=\s1;\ntwo\s\=\s2;/')));
+		$result = $this->Js->writeBuffer(array('onDomReady' => false, 'inline' => false, 'cache' => false));
+	}
+
+/**
+ * test that writing the buffer with inline = false includes a script tag.
+ *
+ * @return void
+ */
+	function testWriteBufferNotInline() {
+		$this->Js->set('foo', 1);
+
+		$view =& new JsHelperMockView();
+		ClassRegistry::removeObject('view');
+		ClassRegistry::addObject('view', $view);
+		$view->expectCallCount('addScript', 1);
+
+		$pattern = new PatternExpectation('#<script type="text\/javascript">window.app \= \{"foo"\:1\}\;<\/script>#');
+		$view->expectAt(0, 'addScript', array($pattern));
+
+		$result = $this->Js->writeBuffer(array('onDomReady' => false, 'inline' => false, 'safe' => false));
+	}
+
+/**
+ * test that writeBuffer() sets domReady = false when the request is done by XHR.
+ * Including a domReady() when in XHR can cause issues as events aren't triggered by some libraries
+ *
+ * @return void
+ */
+	function testWriteBufferAndXhr() {
+		$this->_useMock();
+		$this->Js->params['isAjax'] = true;
+		$this->Js->buffer('alert("test");');
+		$this->Js->TestJsEngine->expectCallCount('dispatchMethod', 0);
+		$result = $this->Js->writeBuffer();
+	}
+
+/**
+ * test that writeScripts makes files, and puts the events into them.
+ *
+ * @return void
+ */
+	function testWriteScriptsInFile() {
+		if ($this->skipIf(!is_writable(JS), 'webroot/js is not Writable, script caching test has been skipped')) {
+			return;
+		}
+		$this->Js->JsBaseEngine = new TestJsEngineHelper();
+		$this->Js->buffer('one = 1;');
+		$this->Js->buffer('two = 2;');
+		$result = $this->Js->writeBuffer(array('onDomReady' => false, 'cache' => true));
+		$expected = array(
+			'script' => array('type' => 'text/javascript', 'src' => 'preg:/(.)*\.js/'),
+		);
+		$this->assertTags($result, $expected);
+		preg_match('/src="(.*\.js)"/', $result, $filename);
+		$this->assertTrue(file_exists(WWW_ROOT . $filename[1]));
+		$contents = file_get_contents(WWW_ROOT . $filename[1]);
+		$this->assertPattern('/one\s=\s1;\ntwo\s=\s2;/', $contents);
+
+		@unlink(WWW_ROOT . $filename[1]);
+	}
+
+/**
+ * test link()
+ *
+ * @return void
+ */
+	function testLinkWithMock() {
+		$this->_useMock();
+		$options = array('update' => '#content');
+
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax code', array('request', '*'));
+		$this->Js->TestJsEngine->expectAt(0, 'dispatchMethod', array('get', new AnythingExpectation()));
+		$this->Js->TestJsEngine->expectAt(1, 'dispatchMethod', array(
+			'request', array('/posts/view/1', $options)
+		));
+		$this->Js->TestJsEngine->expectAt(2, 'dispatchMethod', array(
+			'event', array('click', 'ajax code', $options + array('buffer' => null))
+		));
+
+		$result = $this->Js->link('test link', '/posts/view/1', $options);
+		$expected = array(
+			'a' => array('id' => 'preg:/link-\d+/', 'href' => '/posts/view/1'),
+			'test link',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$options = array(
+			'confirm' => 'Are you sure?',
+			'update' => '#content',
+			'class' => 'my-class',
+			'id' => 'custom-id',
+			'escape' => false
+		);
+		$this->Js->TestJsEngine->expectAt(0, 'confirm', array($options['confirm']));
+		$this->Js->TestJsEngine->expectAt(1, 'request', array('/posts/view/1', '*'));
+$code = <<<CODE
+var _confirm = confirm("Are you sure?");
+if (!_confirm) {
+	return false;
+}
+CODE;
+		$this->Js->TestJsEngine->expectAt(1, 'event', array('click', $code));
+		$result = $this->Js->link('test link »', '/posts/view/1', $options);
+		$expected = array(
+			'a' => array('id' => $options['id'], 'class' => $options['class'], 'href' => '/posts/view/1'),
+			'test link »',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$options = array('id' => 'something', 'htmlAttributes' => array('arbitrary' => 'value', 'batman' => 'robin'));
+		$result = $this->Js->link('test link', '/posts/view/1', $options);
+		$expected = array(
+			'a' => array('id' => $options['id'], 'href' => '/posts/view/1', 'arbitrary' => 'value',
+				'batman' => 'robin'),
+			'test link',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that link() and no buffering returns an <a> and <script> tags.
+ *
+ * @return void
+ */
+	function testLinkWithNoBuffering() {
+		$this->_useMock();
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax code', array(
+			'request', array('/posts/view/1', array('update' => '#content'))
+		));
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', '-event handler-', array('event', '*'));
+
+		$options = array('update' => '#content', 'buffer' => false);
+		$result = $this->Js->link('test link', '/posts/view/1', $options);
+		$expected = array(
+			'a' => array('id' => 'preg:/link-\d+/', 'href' => '/posts/view/1'),
+			'test link',
+			'/a',
+			'script' => array('type' => 'text/javascript'),
+			$this->cDataStart,
+			'-event handler-',
+			$this->cDataEnd,
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+
+		$options = array('update' => '#content', 'buffer' => false, 'safe' => false);
+		$result = $this->Js->link('test link', '/posts/view/1', $options);
+		$expected = array(
+			'a' => array('id' => 'preg:/link-\d+/', 'href' => '/posts/view/1'),
+			'test link',
+			'/a',
+			'script' => array('type' => 'text/javascript'),
+			'-event handler-',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test submit() with a Mock to check Engine method calls
+ *
+ * @return void
+ */
+	function testSubmitWithMock() {
+		$this->_useMock();
+
+		$options = array('update' => '#content', 'id' => 'test-submit', 'style' => 'margin: 0');
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'serialize-code', array('serializeform', '*'));
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'serialize-code', array('serializeForm', '*'));
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax-code', array('request', '*'));
+
+		$this->Js->TestJsEngine->expectAt(0, 'dispatchMethod', array('get', '*'));
+		$this->Js->TestJsEngine->expectAt(1, 'dispatchMethod', array(new PatternExpectation('/serializeForm/i'), '*'));
+		$this->Js->TestJsEngine->expectAt(2, 'dispatchMethod', array('request', '*'));
+
+		$params = array(
+			'update' => $options['update'], 'data' => 'serialize-code',
+			'method' => 'post', 'dataExpression' => true, 'buffer' => null
+		);
+		$this->Js->TestJsEngine->expectAt(3, 'dispatchMethod', array(
+			'event', array('click', "ajax-code", $params)
+		));
+
+		$result = $this->Js->submit('Save', $options);
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'id' => $options['id'], 'value' => 'Save', 'style' => 'margin: 0'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+
+		$this->Js->TestJsEngine->expectAt(4, 'dispatchMethod', array('get', '*'));
+		$this->Js->TestJsEngine->expectAt(5, 'dispatchMethod', array(new PatternExpectation('/serializeForm/i'), '*'));
+		$requestParams = array(
+			'/custom/url', array(
+				'update' => '#content',
+				'data' => 'serialize-code',
+				'method' => 'post',
+				'dataExpression' => true
+			)
+		);
+		$this->Js->TestJsEngine->expectAt(6, 'dispatchMethod', array('request', $requestParams));
+
+		$params = array(
+			'update' => '#content', 'data' => 'serialize-code',
+			'method' => 'post', 'dataExpression' => true, 'buffer' => null
+		);
+		$this->Js->TestJsEngine->expectAt(7, 'dispatchMethod', array(
+			'event', array('click', "ajax-code", $params)
+		));
+
+		$options = array('update' => '#content', 'id' => 'test-submit', 'url' => '/custom/url');
+		$result = $this->Js->submit('Save', $options);
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'id' => $options['id'], 'value' => 'Save'),
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that no buffer works with submit() and that parameters are leaking into the script tag.
+ *
+ * @return void
+ */
+	function testSubmitWithNoBuffer() {
+		$this->_useMock();
+		$options = array('update' => '#content', 'id' => 'test-submit', 'buffer' => false, 'safe' => false);
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'serialize-code', array('serializeform', '*'));
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'serialize-code', array('serializeForm', '*'));
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'ajax-code', array('request', '*'));
+		$this->Js->TestJsEngine->setReturnValue('dispatchMethod', 'event-handler', array('event', '*'));
+
+		$this->Js->TestJsEngine->expectAt(0, 'dispatchMethod', array('get', '*'));
+		$this->Js->TestJsEngine->expectAt(1, 'dispatchMethod', array(new PatternExpectation('/serializeForm/i'), '*'));
+		$this->Js->TestJsEngine->expectAt(2, 'dispatchMethod', array('request', array(
+			'', array('update' => $options['update'], 'data' => 'serialize-code', 'method' => 'post', 'dataExpression' => true)
+		)));
+
+		$params = array(
+			'update' => $options['update'], 'data' => 'serialize-code',
+			'method' => 'post', 'dataExpression' => true, 'buffer' => false
+		);
+		$this->Js->TestJsEngine->expectAt(3, 'dispatchMethod', array(
+			'event', array('click', "ajax-code", $params)
+		));
+
+		$result = $this->Js->submit('Save', $options);
+		$expected = array(
+			'div' => array('class' => 'submit'),
+			'input' => array('type' => 'submit', 'id' => $options['id'], 'value' => 'Save'),
+			'/div',
+			'script' => array('type' => 'text/javascript'),
+			'event-handler',
+			'/script'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test that Object::Object() is not breaking json output in JsHelper
+ *
+ * @return void
+ */
+	function testObjectPassThrough() {
+		$result = $this->Js->object(array('one' => 'first', 'two' => 'second'));
+		$expected = '{"one":"first","two":"second"}';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test that inherited Helper::value() is overwritten in JsHelper::value()
+ * and calls JsBaseEngineHelper::value().
+ *
+ * @return void
+ */
+	function testValuePassThrough() {
+		$result = $this->Js->value('string "quote"', true);
+		$expected = '"string \"quote\""';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test set()'ing variables to the Javascript buffer and controlling the output var name.
+ *
+ * @return void
+ */
+	function testSet() {
+		$this->Js->set('loggedIn', true);
+		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
+		$result = $this->Js->getBuffer();
+		$expected = 'window.app = {"loggedIn":true,"height":"tall","color":"purple"};';
+		$this->assertEqual($result[0], $expected);
+
+		$this->Js->set('loggedIn', true);
+		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
+		$this->Js->setVariable = 'WICKED';
+		$result = $this->Js->getBuffer();
+		$expected = 'window.WICKED = {"loggedIn":true,"height":"tall","color":"purple"};';
+		$this->assertEqual($result[0], $expected);
+
+		$this->Js->set('loggedIn', true);
+		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
+		$this->Js->setVariable = 'Application.variables';
+		$result = $this->Js->getBuffer();
+		$expected = 'Application.variables = {"loggedIn":true,"height":"tall","color":"purple"};';
+		$this->assertEqual($result[0], $expected);
+	}
+
+/**
+ * test that vars set with Js->set() go to the top of the buffered scripts list.
+ *
+ * @return void
+ */
+	function testSetVarsAtTopOfBufferedScripts() {
+		$this->Js->set(array('height' => 'tall', 'color' => 'purple'));
+		$this->Js->alert('hey you!', array('buffer' => true));
+		$this->Js->confirm('Are you sure?', array('buffer' => true));
+		$result = $this->Js->getBuffer(false);
+
+		$expected = 'window.app = {"height":"tall","color":"purple"};';
+		$this->assertEqual($result[0], $expected);
+		$this->assertEqual($result[1], 'alert("hey you!");');
+		$this->assertEqual($result[2], 'confirm("Are you sure?");');
+	}
+}
+
+/**
+ * JsBaseEngine Class Test case
+ *
+ * @package cake.tests.view.helpers
+ */
+class JsBaseEngineTestCase extends CakeTestCase {
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->JsEngine = new JsBaseEngineHelper();
+	}
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		ClassRegistry::removeObject('view');
+		unset($this->JsEngine);
+	}
+
+/**
+ * test escape string skills
+ *
+ * @return void
+ */
+	function testEscaping() {
+		$result = $this->JsEngine->escape('');
+		$expected = '';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->escape('CakePHP' . "\n" . 'Rapid Development Framework');
+		$expected = 'CakePHP\\nRapid Development Framework';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->escape('CakePHP' . "\r\n" . 'Rapid Development Framework' . "\r" . 'For PHP');
+		$expected = 'CakePHP\\r\\nRapid Development Framework\\rFor PHP';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->escape('CakePHP: "Rapid Development Framework"');
+		$expected = 'CakePHP: \\"Rapid Development Framework\\"';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->escape("CakePHP: 'Rapid Development Framework'");
+		$expected = "CakePHP: 'Rapid Development Framework'";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->escape('my \\"string\\"');
+		$expected = 'my \\\\\\"string\\\\\\"';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test prompt() creation
+ *
+ * @return void
+ */
+	function testPrompt() {
+		$result = $this->JsEngine->prompt('Hey, hey you', 'hi!');
+		$expected = 'prompt("Hey, hey you", "hi!");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->prompt('"Hey"', '"hi"');
+		$expected = 'prompt("\"Hey\"", "\"hi\"");';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test alert generation
+ *
+ * @return void
+ */
+	function testAlert() {
+		$result = $this->JsEngine->alert('Hey there');
+		$expected = 'alert("Hey there");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->alert('"Hey"');
+		$expected = 'alert("\"Hey\"");';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test confirm generation
+ *
+ * @return void
+ */
+	function testConfirm() {
+		$result = $this->JsEngine->confirm('Are you sure?');
+		$expected = 'confirm("Are you sure?");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->confirm('"Are you sure?"');
+		$expected = 'confirm("\"Are you sure?\"");';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Redirect
+ *
+ * @return void
+ */
+	function testRedirect() {
+		$result = $this->JsEngine->redirect(array('controller' => 'posts', 'action' => 'view', 1));
+		$expected = 'window.location = "/posts/view/1";';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testObject encoding with non-native methods.
+ *
+ * @return void
+ */
+	function testObject() {
+		$this->JsEngine->useNative = false;
+
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8));
+		$result = $this->JsEngine->object($object);
+		$expected = '{"title":"New thing","indexes":[5,6,7,8]}';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->object(array('default' => 0));
+		$expected = '{"default":0}';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->JsEngine->object(array(
+			'2007' => array(
+				'Spring' => array(
+					'1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky')
+				),
+				'Fall' => array(
+					'1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky')
+				)
+			),
+			'2006' => array(
+				'Spring' => array(
+				    '1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky')
+				),
+				'Fall' => array(
+				    '1' => array('id' => 1, 'name' => 'Josh'), '2' => array('id' => 2, 'name' => 'Becky')
+				)
+			)
+		));
+		$expected = '{"2007":{"Spring":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}},"Fall":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}}},"2006":{"Spring":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}},"Fall":{"1":{"id":1,"name":"Josh"},"2":{"id":2,"name":"Becky"}}}}';
+		$this->assertEqual($result, $expected);
+
+		foreach (array('true' => true, 'false' => false, 'null' => null) as $expected => $data) {
+			$result = $this->JsEngine->object($data);
+			$this->assertEqual($result, $expected);
+		}
+
+		$object = array('title' => 'New thing', 'indexes' => array(5, 6, 7, 8), 'object' => array('inner' => array('value' => 1)));
+		$result = $this->JsEngine->object($object, array('prefix' => 'PREFIX', 'postfix' => 'POSTFIX'));
+		$this->assertPattern('/^PREFIX/', $result);
+		$this->assertPattern('/POSTFIX$/', $result);
+		$this->assertNoPattern('/.PREFIX./', $result);
+		$this->assertNoPattern('/.POSTFIX./', $result);
+	}
+
+/**
+ * test compatibility of JsBaseEngineHelper::object() vs. json_encode()
+ *
+ * @return void
+ */
+	function testObjectAgainstJsonEncode() {
+		$skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s');
+		if ($skip) {
+			return;
+		}
+		$this->JsEngine->useNative = false;
+		$data = array();
+		$data['mystring'] = "simple string";
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+
+		$data['mystring'] = "strïng with spécial chârs";
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+
+		$data['mystring'] = "a two lines\nstring";
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+
+		$data['mystring'] = "a \t tabbed \t string";
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+
+		$data['mystring'] = "a \"double-quoted\" string";
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+
+		$data['mystring'] = 'a \\"double-quoted\\" string';
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+
+		unset($data['mystring']);
+		$data[3] = array(1, 2, 3);
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+
+		unset($data[3]);
+		$data = array('mystring' => null, 'bool' => false, 'array' => array(1, 44, 66));
+		$this->assertEqual(json_encode($data), $this->JsEngine->object($data));
+	}
+
+/**
+ * test that JSON made with JsBaseEngineHelper::object() against json_decode()
+ *
+ * @return void
+ */
+	function testObjectAgainstJsonDecode() {
+		$skip = $this->skipIf(!function_exists('json_encode'), 'json_encode() not found, comparison tests skipped. %s');
+		if ($skip) {
+			return;
+		}
+		$this->JsEngine->useNative = false;
+
+		$data = array("simple string");
+		$result = $this->JsEngine->object($data);
+		$this->assertEqual(json_decode($result), $data);
+
+		$data = array('my "string"');
+		$result = $this->JsEngine->object($data);
+		$this->assertEqual(json_decode($result), $data);
+
+		$data = array('my \\"string\\"');
+		$result = $this->JsEngine->object($data);
+		$this->assertEqual(json_decode($result), $data);
+	}
+
+/**
+ * test Mapping of options.
+ *
+ * @return void
+ */
+	function testOptionMapping() {
+		$JsEngine = new OptionEngineHelper();
+		$result = $JsEngine->testMap();
+		$this->assertEqual($result, array());
+
+		$result = $JsEngine->testMap(array('foo' => 'bar', 'baz' => 'sho'));
+		$this->assertEqual($result, array('foo' => 'bar', 'baz' => 'sho'));
+
+		$result = $JsEngine->testMap(array('complete' => 'myFunc', 'type' => 'json', 'update' => '#element'));
+		$this->assertEqual($result, array('success' => 'myFunc', 'dataType' => 'json', 'update' => '#element'));
+
+		$result = $JsEngine->testMap(array('success' => 'myFunc', 'dataType' => 'json', 'update' => '#element'));
+		$this->assertEqual($result, array('success' => 'myFunc', 'dataType' => 'json', 'update' => '#element'));
+	}
+
+/**
+ * test that option parsing escapes strings and saves what is supposed to be saved.
+ *
+ * @return void
+ */
+	function testOptionParsing() {
+		$JsEngine = new OptionEngineHelper();
+
+		$result = $JsEngine->testParseOptions(array('url' => '/posts/view/1', 'key' => 1));
+		$expected = 'key:1, url:"\\/posts\\/view\\/1"';
+		$this->assertEqual($result, $expected);
+
+		$result = $JsEngine->testParseOptions(array('url' => '/posts/view/1', 'success' => 'doSuccess'), array('success'));
+		$expected = 'success:doSuccess, url:"\\/posts\\/view\\/1"';
+		$this->assertEqual($result, $expected);
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
new file mode 100644
index 000000000..53b492e08
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/mootools_engine.test.php
@@ -0,0 +1,354 @@
+<?php
+/**
+ * MooEngineTestCase
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link            http://cakephp.org CakePHP Project
+ * @package         cake.tests
+ * @subpackage      cake.tests.cases.views.helpers
+ * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', array('Html', 'Js', 'MootoolsEngine'));
+
+class MooEngineHelperTestCase extends CakeTestCase {
+/**
+ * startTest
+ *
+ * @return void
+ */
+	function startTest() {
+		$this->Moo =& new MootoolsEngineHelper();
+	}
+/**
+ * end test
+ *
+ * @return void
+ */
+	function endTest() {
+		unset($this->Moo);
+	}
+/**
+ * test selector method
+ *
+ * @return void
+ */
+	function testSelector() {
+		$result = $this->Moo->get('#content');
+		$this->assertEqual($result, $this->Moo);
+		$this->assertEqual($this->Moo->selection, '$("content")');
+
+		$result = $this->Moo->get('a .remove');
+		$this->assertEqual($result, $this->Moo);
+		$this->assertEqual($this->Moo->selection, '$$("a .remove")');
+
+		$result = $this->Moo->get('document');
+		$this->assertEqual($result, $this->Moo);
+		$this->assertEqual($this->Moo->selection, "$(document)");
+
+		$result = $this->Moo->get('window');
+		$this->assertEqual($result, $this->Moo);
+		$this->assertEqual($this->Moo->selection, "$(window)");
+
+		$result = $this->Moo->get('ul');
+		$this->assertEqual($result, $this->Moo);
+		$this->assertEqual($this->Moo->selection, '$$("ul")');
+
+		$result = $this->Moo->get('#some_long-id.class');
+		$this->assertEqual($result, $this->Moo);
+		$this->assertEqual($this->Moo->selection, '$$("#some_long-id.class")');
+	}
+/**
+ * test event binding
+ *
+ * @return void
+ */
+	function testEvent() {
+		$this->Moo->get('#myLink');
+		$result = $this->Moo->event('click', 'doClick', array('wrap' => false));
+		$expected = '$("myLink").addEvent("click", doClick);';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->event('click', 'this.setStyle("display", "");', array('stop' => false));
+		$expected = '$("myLink").addEvent("click", function (event) {this.setStyle("display", "");});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->event('click', 'this.setStyle("display", "none");');
+		$expected = "\$(\"myLink\").addEvent(\"click\", function (event) {event.stop();\nthis.setStyle(\"display\", \"none\");});";
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test dom ready event creation
+ *
+ * @return void
+ */
+	function testDomReady() {
+		$result = $this->Moo->domReady('foo.name = "bar";');
+		$expected = 'window.addEvent("domready", function (event) {foo.name = "bar";});';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test Each method
+ *
+ * @return void
+ */
+	function testEach() {
+		$this->Moo->get('#foo');
+		$result = $this->Moo->each('item.setStyle("display", "none");');
+		$expected = '$("foo").each(function (item, index) {item.setStyle("display", "none");});';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test Effect generation
+ *
+ * @return void
+ */
+	function testEffect() {
+		$this->Moo->get('#foo');
+		$result = $this->Moo->effect('show');
+		$expected = '$("foo").setStyle("display", "");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->effect('hide');
+		$expected = '$("foo").setStyle("display", "none");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->effect('fadeIn');
+		$expected = '$("foo").fade("in");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->effect('fadeOut');
+		$expected = '$("foo").fade("out");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->effect('slideIn');
+		$expected = '$("foo").slide("in");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->effect('slideOut');
+		$expected = '$("foo").slide("out");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->effect('slideOut', array('speed' => 'fast'));
+		$expected = '$("foo").set("slide", {duration:"short"}).slide("out");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->effect('slideOut', array('speed' => 'slow'));
+		$expected = '$("foo").set("slide", {duration:"long"}).slide("out");';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * Test Request Generation
+ *
+ * @return void
+ */
+	function testRequest() {
+		$result = $this->Moo->request(array('controller' => 'posts', 'action' => 'view', 1));
+		$expected = 'var jsRequest = new Request({url:"\\/posts\\/view\\/1"}).send();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->request('/posts/view/1', array('update' => 'content'));
+		$expected = 'var jsRequest = new Request.HTML({update:"content", url:"\\/posts\\/view\\/1"}).send();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doSuccess',
+			'error' => 'handleError',
+			'type' => 'json',
+			'data' => array('name' => 'jim', 'height' => '185cm'),
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Request.JSON({method:"post", onComplete:doSuccess, onFailure:handleError, url:"\\/people\\/edit\\/1"}).send({"name":"jim","height":"185cm"});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doSuccess',
+			'update' => '#update-zone',
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Request.HTML({method:"post", onComplete:doSuccess, update:"update-zone", url:"\\/people\\/edit\\/1"}).send();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doComplete',
+			'success' => 'doSuccess',
+			'error' => 'doFailure',
+			'before' => 'doBefore',
+			'update' => 'update-zone',
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Request.HTML({method:"post", onComplete:doComplete, onFailure:doFailure, onRequest:doBefore, onSuccess:doSuccess, update:"update-zone", url:"\\/people\\/edit\\/1"}).send();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doComplete',
+			'success' => 'doSuccess',
+			'error' => 'doFailure',
+			'before' => 'doBefore',
+			'update' => 'update-zone',
+			'dataExpression' => true,
+			'data' => '$("foo").toQueryString()',
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Request.HTML({method:"post", onComplete:doComplete, onFailure:doFailure, onRequest:doBefore, onSuccess:doSuccess, update:"update-zone", url:"\\/people\\/edit\\/1"}).send($("foo").toQueryString());';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->request('/people/edit/1', array(
+			'method' => 'post',
+			'before' => 'doBefore',
+			'success' => 'doSuccess',
+			'complete' => 'doComplete',
+			'update' => '#update-zone',
+		));
+		$expected = 'var jsRequest = new Request.HTML({method:"post", onComplete:function () {doComplete}, onRequest:function () {doBefore}, onSuccess:function (responseText, responseXML) {doSuccess}, update:"update-zone", url:"\\/people\\/edit\\/1"}).send();';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test sortable list generation
+ *
+ * @return void
+ */
+	function testSortable() {
+		$this->Moo->get('#myList');
+		$result = $this->Moo->sortable(array(
+			'distance' => 5,
+			'containment' => 'parent',
+			'start' => 'onStart',
+			'complete' => 'onStop',
+			'sort' => 'onSort',
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsSortable = new Sortables($("myList"), {constrain:"parent", onComplete:onStop, onSort:onSort, onStart:onStart, snap:5});';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test drag() method
+ *
+ * @return void
+ */
+	function testDrag() {
+		$this->Moo->get('#drag-me');
+		$result = $this->Moo->drag(array(
+			'start' => 'onStart',
+			'drag' => 'onDrag',
+			'stop' => 'onStop',
+			'snapGrid' => array(10,10),
+			'wrapCallbacks' => false
+		));
+		$expected = '$("drag-me").makeDraggable({onComplete:onStop, onDrag:onDrag, onStart:onStart, snap:[10,10]});';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test drop() method
+ *
+ * @return void
+ */
+	function testDrop() {
+		$this->expectError();
+		$this->Moo->get('#drop-me');
+		$this->Moo->drop(array(
+			'drop' => 'onDrop',
+			'leave' => 'onLeave',
+			'hover' => 'onHover',
+		));
+
+		$result = $this->Moo->drop(array(
+			'drop' => 'onDrop',
+			'leave' => 'onLeave',
+			'hover' => 'onHover',
+			'drag' => '#my-drag',
+			'wrapCallbacks' => false
+		));
+		$expected = '$("my-drag").makeDraggable({droppables:$("drop-me"), onDrop:onDrop, onEnter:onHover, onLeave:onLeave});';
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($this->Moo->selection, '$("drop-me")');
+
+		$result = $this->Moo->drop(array(
+			'drop' => 'onDrop',
+			'leave' => 'onLeave',
+			'hover' => 'onHover',
+			'drag' => '#my-drag',
+		));
+		$expected = '$("my-drag").makeDraggable({droppables:$("drop-me"), onDrop:function (element, droppable, event) {onDrop}, onEnter:function (element, droppable) {onHover}, onLeave:function (element, droppable) {onLeave}});';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test slider generation
+ *
+ * @return void
+ */
+	function testSlider() {
+		$this->Moo->get('#slider');
+		$result = $this->Moo->slider(array(
+			'handle' => '#my-handle',
+			'complete' => 'onComplete',
+			'change' => 'onChange',
+			'direction' => 'horizontal',
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsSlider = new Slider($("slider"), $("my-handle"), {mode:"horizontal", onChange:onChange, onComplete:onComplete});';
+		$this->assertEqual($result, $expected);
+		$this->assertEqual($this->Moo->selection, '$("slider")');
+
+		$this->Moo->get('#slider');
+		$result = $this->Moo->slider(array(
+			'handle' => '#my-handle',
+			'complete' => 'onComplete',
+			'change' => 'onChange',
+			'direction' => 'horizontal',
+			'min' => 10,
+			'max' => 40,
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsSlider = new Slider($("slider"), $("my-handle"), {mode:"horizontal", onChange:onChange, onComplete:onComplete, range:[10,40]});';
+		$this->assertEqual($result, $expected);
+
+		$this->Moo->get('#slider');
+		$result = $this->Moo->slider(array(
+			'handle' => '#my-handle',
+			'complete' => 'complete;',
+			'change' => 'change;',
+			'direction' => 'horizontal',
+		));
+		$expected = 'var jsSlider = new Slider($("slider"), $("my-handle"), {mode:"horizontal", onChange:function (step) {change;}, onComplete:function (event) {complete;}});';
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * test the serializeForm implementation.
+ *
+ * @return void
+ */
+	function testSerializeForm() {
+		$this->Moo->get('#element');
+		$result = $this->Moo->serializeForm(array('isForm' => true));
+		$expected = '$("element").toQueryString();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->serializeForm(array('isForm' => true, 'inline' => true));
+		$expected = '$("element").toQueryString()';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->serializeForm(array('isForm' => false));
+		$expected = '$($("element").form).toQueryString();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Moo->serializeForm(array('isForm' => false, 'inline' => true));
+		$expected = '$($("element").form).toQueryString()';
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/number.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/number.test.php
new file mode 100644
index 000000000..0e2a53f5b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/number.test.php
@@ -0,0 +1,440 @@
+<?php
+/**
+ * NumberHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Helper', 'Number');
+
+/**
+ * NumberHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class NumberHelperTest extends CakeTestCase {
+
+/**
+ * helper property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $helper = null;
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Number =& new NumberHelper();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->Number);
+	}
+
+/**
+ * testFormatAndCurrency method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormat() {
+		$value = '100100100';
+
+		$result = $this->Number->format($value, '#');
+		$expected = '#100,100,100';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->format($value, 3);
+		$expected = '100,100,100.000';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->format($value);
+		$expected = '100,100,100';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->format($value, '-');
+		$expected = '100-100-100';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * Test currency method.
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrency() {
+		$value = '100100100';
+
+		$result = $this->Number->currency($value);
+		$expected = '$100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, '#');
+		$expected = '#100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, false);
+		$expected = '100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'USD');
+		$expected = '$100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR');
+		$expected = '&#8364;100.100.100,00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP');
+		$expected = '&#163;100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, '', array('thousands' =>' ', 'after' => '€', 'decimals' => ',', 'zero' => 'Gratuit'));
+		$expected = '100 100 100,00€';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency(1000.45, NULL, array('after'=>'øre','before'=>'Kr. ','decimals'=>',','thousands'=>'.'));
+		$expected = 'Kr. 1.000,45';
+		$this->assertEqual($expected,$result);
+
+		$result = $this->Number->currency(0.5, 'USD');
+		$expected = '50c';
+		$this->assertEqual($expected,$result);
+
+		$result = $this->Number->currency(0.5, NULL, array('after'=>'øre'));
+		$expected = '50øre';
+		$this->assertEqual($expected,$result);
+	}
+
+/**
+ * Test adding currency format options to the number helper
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrencyAddFormat() {
+		$this->Number->addFormat('NOK', array('before' => 'Kr. '));
+		$result = $this->Number->currency(1000, 'NOK');
+		$expected = 'Kr. 1,000.00';
+		$this->assertEqual($expected,$result);
+
+		$this->Number->addFormat('Other', array('before' => '$$ ', 'after' => 'c!'));
+		$result = $this->Number->currency(0.22, 'Other');
+		$expected = '22c!';
+		$this->assertEqual($expected,$result);
+
+		$result = $this->Number->currency(-10, 'Other');
+		$expected = '($$ 10.00)';
+		$this->assertEqual($expected,$result);
+	}
+
+/**
+ * testCurrencyPositive method
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrencyPositive() {
+		$value = '100100100';
+
+		$result = $this->Number->currency($value);
+		$expected = '$100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'USD', array('before'=> '#'));
+		$expected = '#100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, false);
+		$expected = '100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'USD');
+		$expected = '$100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR');
+		$expected = '&#8364;100.100.100,00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP');
+		$expected = '&#163;100,100,100.00';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testCurrencyNegative method
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrencyNegative() {
+		$value = '-100100100';
+
+		$result = $this->Number->currency($value);
+		$expected = '($100,100,100.00)';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR');
+		$expected = '(&#8364;100.100.100,00)';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP');
+		$expected = '(&#163;100,100,100.00)';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'USD', array('negative'=>'-'));
+		$expected = '-$100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR', array('negative'=>'-'));
+		$expected = '-&#8364;100.100.100,00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP', array('negative'=>'-'));
+		$expected = '-&#163;100,100,100.00';
+		$this->assertEqual($expected, $result);
+
+	}
+
+/**
+ * testCurrencyCentsPositive method
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrencyCentsPositive() {
+		$value = '0.99';
+
+		$result = $this->Number->currency($value, 'USD');
+		$expected = '99c';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR');
+		$expected = '&#8364;0,99';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP');
+		$expected = '99p';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testCurrencyCentsNegative method
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrencyCentsNegative() {
+		$value = '-0.99';
+
+		$result = $this->Number->currency($value, 'USD');
+		$expected = '(99c)';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR');
+		$expected = '(&#8364;0,99)';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP');
+		$expected = '(99p)';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'USD', array('negative'=>'-'));
+		$expected = '-99c';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR', array('negative'=>'-'));
+		$expected = '-&#8364;0,99';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP', array('negative'=>'-'));
+		$expected = '-99p';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testCurrencyZero method
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrencyZero() {
+		$value = '0';
+
+		$result = $this->Number->currency($value, 'USD');
+		$expected = '$0.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'EUR');
+		$expected = '&#8364;0,00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP');
+		$expected = '&#163;0.00';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP', array('zero' => 'FREE!'));
+		$expected = 'FREE!';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testCurrencyOptions method
+ *
+ * @access public
+ * @return void
+ */
+	function testCurrencyOptions() {
+		$value = '1234567.89';
+
+		$result = $this->Number->currency($value, null, array('before' => 'GBP'));
+		$expected = 'GBP1,234,567.89';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP', array('places' => 0));
+		$expected = '&#163;1,234,568';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency('1234567.8912345', null, array('before' => 'GBP', 'places' => 3));
+		$expected = 'GBP1,234,567.891';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency('650.120001', null, array('before' => 'GBP', 'places' => 4));
+		$expected = 'GBP650.1200';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency($value, 'GBP', array('escape' => true));
+		$expected = '&amp;#163;1,234,567.89';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency('0.35', 'USD', array('after' => false));
+		$expected = '$0.35';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency('0.35', 'GBP', array('after' => false));
+		$expected = '&#163;0.35';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->currency('0.35', 'GBP');
+		$expected = '35p';
+		$this->assertEqual($expected, $result);
+		
+		$result = $this->Number->currency('0.35', 'EUR');
+		$expected = '&#8364;0,35';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testToReadableSize method
+ *
+ * @access public
+ * @return void
+ */
+	function testToReadableSize() {
+		$result = $this->Number->toReadableSize(0);
+		$expected = '0 Bytes';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1);
+		$expected = '1 Byte';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(45);
+		$expected = '45 Bytes';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1023);
+		$expected = '1023 Bytes';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024);
+		$expected = '1 KB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*512);
+		$expected = '512 KB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024-1);
+		$expected = '1.00 MB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024*512);
+		$expected = '512.00 MB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024*1024-1);
+		$expected = '1.00 GB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024*1024*512);
+		$expected = '512.00 GB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024*1024*1024-1);
+		$expected = '1.00 TB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024*1024*1024*512);
+		$expected = '512.00 TB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024*1024*1024*1024-1);
+		$expected = '1024.00 TB';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Number->toReadableSize(1024*1024*1024*1024*1024*1024);
+		$expected = (1024 * 1024) . '.00 TB';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testToPercentage method
+ *
+ * @access public
+ * @return void
+ */
+	function testToPercentage() {
+		$result = $this->Number->toPercentage(45, 0);
+		$expected = '45%';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Number->toPercentage(45, 2);
+		$expected = '45.00%';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Number->toPercentage(0, 0);
+		$expected = '0%';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Number->toPercentage(0, 4);
+		$expected = '0.0000%';
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php
new file mode 100644
index 000000000..1e78415cd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/paginator.test.php
@@ -0,0 +1,1927 @@
+<?php
+/**
+ * PaginatorHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Helper', array('Html', 'Paginator', 'Form', 'Ajax', 'Javascript', 'Js'));
+
+Mock::generate('JsHelper', 'PaginatorMockJsHelper');
+
+if (!defined('FULL_BASE_URL')) {
+	define('FULL_BASE_URL', 'http://cakephp.org');
+}
+
+/**
+ * PaginatorHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class PaginatorHelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Paginator = new PaginatorHelper(array('ajax' => 'Ajax'));
+		$this->Paginator->params['paging'] = array(
+			'Article' => array(
+				'current' => 9,
+				'count' => 62,
+				'prevPage' => false,
+				'nextPage' => true,
+				'pageCount' => 7,
+				'defaults' => array(
+					'order' => array('Article.date' => 'asc'),
+					'limit' => 9,
+					'conditions' => array()
+				),
+				'options' => array(
+					'order' => array('Article.date' => 'asc'),
+					'limit' => 9,
+					'page' => 1,
+					'conditions' => array()
+				)
+			)
+		);
+		$this->Paginator->Html =& new HtmlHelper();
+		$this->Paginator->Ajax =& new AjaxHelper();
+		$this->Paginator->Ajax->Html =& new HtmlHelper();
+		$this->Paginator->Ajax->Javascript =& new JavascriptHelper();
+		$this->Paginator->Ajax->Form =& new FormHelper();
+
+		Configure::write('Routing.prefixes', array());
+		Router::reload();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Paginator);
+	}
+
+/**
+ * testHasPrevious method
+ *
+ * @access public
+ * @return void
+ */
+	function testHasPrevious() {
+		$this->assertIdentical($this->Paginator->hasPrev(), false);
+		$this->Paginator->params['paging']['Article']['prevPage'] = true;
+		$this->assertIdentical($this->Paginator->hasPrev(), true);
+		$this->Paginator->params['paging']['Article']['prevPage'] = false;
+	}
+
+/**
+ * testHasNext method
+ *
+ * @access public
+ * @return void
+ */
+	function testHasNext() {
+		$this->assertIdentical($this->Paginator->hasNext(), true);
+		$this->Paginator->params['paging']['Article']['nextPage'] = false;
+		$this->assertIdentical($this->Paginator->hasNext(), false);
+		$this->Paginator->params['paging']['Article']['nextPage'] = true;
+	}
+
+/**
+ * testDisabledLink method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisabledLink() {
+		$this->Paginator->params['paging']['Article']['nextPage'] = false;
+		$this->Paginator->params['paging']['Article']['page'] = 1;
+		$result = $this->Paginator->next('Next', array(), true);
+		$expected = '<span class="next">Next</span>';
+		$this->assertEqual($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['prevPage'] = false;
+		$result = $this->Paginator->prev('prev', array('update' => 'theList', 'indicator' => 'loading', 'url' => array('controller' => 'posts')), null, array('class' => 'disabled', 'tag' => 'span'));
+		$expected = array(
+			'span' => array('class' => 'disabled'), 'prev', '/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testSortLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testSortLinks() {
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/'), 'bare' => 0),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
+		));
+		$this->Paginator->options(array('url' => array('param')));
+		$result = $this->Paginator->sort('title');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->sort('date');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:date/direction:desc', 'class' => 'asc'),
+			'Date',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('modulus'=> '2', 'url'=> array('controller'=>'projects', 'action'=>'sort'),'update'=>'list'));
+		$this->assertPattern('/\/projects\/sort\/page:2/', $result);
+		$this->assertPattern('/<script type="text\/javascript">\s*' . str_replace('/', '\\/', preg_quote('//<![CDATA[')) . '\s*Event.observe/', $result);
+
+		$result = $this->Paginator->sort('TestTitle', 'title');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
+			'TestTitle',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->sort(array('asc' => 'ascending', 'desc' => 'descending'), 'title');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:asc'),
+			'ascending',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['sort'] = 'title';
+		$result = $this->Paginator->sort(array('asc' => 'ascending', 'desc' => 'descending'), 'title');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/param/page:1/sort:title/direction:desc', 'class' => 'asc'),
+			'descending',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('title');
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('title');
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'asc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:asc" class="desc">Title<\/a>$/', $result);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'asc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="asc">Title<\/a>$/', $result);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['options']['sort'] = null;
+		$result = $this->Paginator->sort('Title', 'title', array('direction' => 'desc', 'class' => 'foo'));
+		$this->assertPattern('/\/accounts\/index\/param\/page:1\/sort:title\/direction:desc" class="foo asc">Title<\/a>$/', $result);
+	}
+
+/**
+ * test that sort() works with virtual field order options.
+ *
+ * @return void
+ */
+	function testSortLinkWithVirtualField() {
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/')),
+			array('base' => '', 'here' => '/accounts/', 'webroot' => '/')
+		));
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('full_name' => 'asc');
+
+		$result = $this->Paginator->sort('Article.full_name');
+		$expected = array(
+			'a' => array('href' => '/accounts/index/page:1/sort:Article.full_name/direction:desc', 'class' => 'asc'),
+			'Article.full Name',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->sort('full_name');
+		$expected = array(
+			'a' => array('href' => '/accounts/index/page:1/sort:full_name/direction:desc', 'class' => 'asc'),
+			'Full Name',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('full_name' => 'desc');
+		$result = $this->Paginator->sort('Article.full_name');
+		$expected = array(
+			'a' => array('href' => '/accounts/index/page:1/sort:Article.full_name/direction:asc', 'class' => 'desc'),
+			'Article.full Name',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->sort('full_name');
+		$expected = array(
+			'a' => array('href' => '/accounts/index/page:1/sort:full_name/direction:asc', 'class' => 'desc'),
+			'Full Name',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testSortLinksUsingDirectionOption method
+ *
+ * @access public
+ * @return void
+ */
+	function testSortLinksUsingDirectionOption(){
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(),
+				'form' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true'), 'bare' => 0),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/', 'here' => '/accounts/',
+				'webroot' => '/', 'passedArgs' => array())
+		));
+		$this->Paginator->options(array('url' => array('param')));
+
+		$result = $this->Paginator->sort('TestTitle', 'title', array('direction' => 'desc'));
+		$expected = array(
+			'a' => array('href' => '/accounts/index/param/page:1/sort:title/direction:desc'),
+			'TestTitle',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->sort(array('asc' => 'ascending', 'desc' => 'descending'), 'title', array('direction' => 'desc'));
+		$expected = array(
+			'a' => array('href' => '/accounts/index/param/page:1/sort:title/direction:desc'),
+			'descending',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testSortLinksUsingDotNotation method
+ *
+ * @access public
+ * @return void
+ */
+	function testSortLinksUsingDotNotation() {
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(),  'form' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true'), 'bare' => 0),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
+		));
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$result = $this->Paginator->sort('Title','Article.title');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/page:1/sort:Article.title/direction:asc', 'class' => 'desc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$result = $this->Paginator->sort('Title','Article.title');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/page:1/sort:Article.title/direction:desc', 'class' => 'asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Account.title' => 'asc');
+		$result = $this->Paginator->sort('title');
+		$expected = array(
+			'a' => array('href' => '/officespace/accounts/index/page:1/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testSortKey method
+ *
+ * @access public
+ * @return void
+ */
+	function testSortKey() {
+		$result = $this->Paginator->sortKey(null, array(
+			'order' => array('Article.title' => 'desc'
+		)));
+		$this->assertEqual('Article.title', $result);
+
+		$result = $this->Paginator->sortKey('Article', array('sort' => 'Article.title'));
+		$this->assertEqual($result, 'Article.title');
+
+		$result = $this->Paginator->sortKey('Article', array('sort' => 'Article'));
+		$this->assertEqual($result, 'Article');
+	}
+
+/**
+ * testSortDir method
+ *
+ * @access public
+ * @return void
+ */
+	function testSortDir() {
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
+
+		$this->assertEqual($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'desc');
+		$result = $this->Paginator->sortDir();
+		$expected = 'desc';
+
+		$this->assertEqual($result, $expected);
+
+		unset($this->Paginator->params['paging']['Article']['options']);
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
+
+		$this->assertEqual($result, $expected);
+
+		unset($this->Paginator->params['paging']['Article']['options']);
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('title' => 'desc');
+		$result = $this->Paginator->sortDir();
+		$expected = 'desc';
+
+		$this->assertEqual($result, $expected);
+
+		unset($this->Paginator->params['paging']['Article']['options']);
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('title' => 'asc');
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
+
+		$this->assertEqual($result, $expected);
+
+		unset($this->Paginator->params['paging']['Article']['options']);
+		$this->Paginator->params['paging']['Article']['options']['direction'] = 'asc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'asc';
+
+		$this->assertEqual($result, $expected);
+
+		unset($this->Paginator->params['paging']['Article']['options']);
+		$this->Paginator->params['paging']['Article']['options']['direction'] = 'desc';
+		$result = $this->Paginator->sortDir();
+		$expected = 'desc';
+
+		$this->assertEqual($result, $expected);
+
+		unset($this->Paginator->params['paging']['Article']['options']);
+		$result = $this->Paginator->sortDir('Article', array('direction' => 'asc'));
+		$expected = 'asc';
+
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Paginator->sortDir('Article', array('direction' => 'desc'));
+		$expected = 'desc';
+
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Paginator->sortDir('Article', array('direction' => 'asc'));
+		$expected = 'asc';
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSortAdminLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testSortAdminLinks() {
+		Configure::write('Routing.prefixes', array('admin'));
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('pass' => array(), 'named' => array(), 'controller' => 'users', 'plugin' => null, 'action' => 'admin_index', 'prefix' => 'admin', 'admin' => true, 'url' => array('ext' => 'html', 'url' => 'admin/users'), 'form' => array()),
+			array('base' => '', 'here' => '/admin/users', 'webroot' => '/')
+		));
+		Router::parse('/admin/users');
+		$this->Paginator->params['paging']['Article']['page'] = 1;
+		$result = $this->Paginator->next('Next');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/admin/users/index/page:2', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		Router::reload();
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'test', 'action' => 'admin_index', 'pass' => array(), 'prefix' => 'admin', 'admin' => true, 'form' => array(), 'url' => array('url' => 'admin/test')),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => '/admin/test', 'webroot' => '/')
+		));
+		Router::parse('/');
+		$this->Paginator->options(array('url' => array('param')));
+		$result = $this->Paginator->sort('title');
+		$expected = array(
+			'a' => array('href' => '/admin/test/index/param/page:1/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->options(array('url' => array('param')));
+		$result = $this->Paginator->sort('Title', 'Article.title');
+		$expected = array(
+			'a' => array('href' => '/admin/test/index/param/page:1/sort:Article.title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testUrlGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlGeneration() {
+		$result = $this->Paginator->sort('controller');
+		$expected = array(
+			'a' => array('href' => '/index/page:1/sort:controller/direction:asc'),
+			'Controller',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->url();
+		$this->assertEqual($result, '/index/page:1');
+
+		$this->Paginator->params['paging']['Article']['options']['page'] = 2;
+		$result = $this->Paginator->url();
+		$this->assertEqual($result, '/index/page:2');
+
+		$options = array('order' => array('Article' => 'desc'));
+		$result = $this->Paginator->url($options);
+		$this->assertEqual($result, '/index/page:2/sort:Article/direction:desc');
+
+		$this->Paginator->params['paging']['Article']['options']['page'] = 3;
+		$options = array('order' => array('Article.name' => 'desc'));
+		$result = $this->Paginator->url($options);
+		$this->assertEqual($result, '/index/page:3/sort:Article.name/direction:desc');
+	}
+
+/**
+ * test URL generation with prefix routes
+ *
+ * @access public
+ * @return void
+ */
+	function testUrlGenerationWithPrefixes() {
+		$_back = Configure::read('Routing');
+
+		Configure::write('Routing.prefixes', array('members'));
+		Router::reload();
+
+		Router::parse('/');
+
+		Router::setRequestInfo( array(
+			array('controller' => 'posts', 'action' => 'index', 'form' => array(), 'url' => array(), 'plugin' => null),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '', 'here' => 'posts/index', 'webroot' => '/')
+		));
+
+		$this->Paginator->params['paging']['Article']['options']['page'] = 2;
+		$this->Paginator->params['paging']['Article']['page'] = 2;
+		$this->Paginator->params['paging']['Article']['prevPage'] = true;
+		$options = array('members' => true);
+
+		$result = $this->Paginator->url($options);
+		$expected = '/members/posts/index/page:2';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Paginator->sort('name', null, array('url' => $options));
+		$expected = array(
+			'a' => array('href' => '/members/posts/index/page:2/sort:name/direction:asc'),
+			'Name',
+			'/a'
+		);
+		$this->assertTags($result, $expected, true);
+
+		$result = $this->Paginator->next('next', array('url' => $options));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/members/posts/index/page:3', 'class' => 'next'),
+			'next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('prev', array('url' => $options));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/members/posts/index/page:1', 'class' => 'prev'),
+			'prev',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$options = array('members' => true, 'controller' => 'posts', 'order' => array('name' => 'desc'));
+		$result = $this->Paginator->url($options);
+		$expected = '/members/posts/index/page:2/sort:name/direction:desc';
+		$this->assertEqual($result, $expected);
+
+		$options = array('controller' => 'posts', 'order' => array('Article.name' => 'desc'));
+		$result = $this->Paginator->url($options);
+		$expected = '/posts/index/page:2/sort:Article.name/direction:desc';
+		$this->assertEqual($result, $expected);
+
+		Configure::write('Routing', $_back);
+	}
+
+/**
+ * testOptions method
+ *
+ * @access public
+ * @return void
+ */
+	function testOptions() {
+		$this->Paginator->options('myDiv');
+		$this->assertEqual('myDiv', $this->Paginator->options['update']);
+
+		$this->Paginator->options = array();
+		$this->Paginator->params = array();
+
+		$options = array('paging' => array('Article' => array(
+			'order' => 'desc',
+			'sort' => 'title'
+		)));
+		$this->Paginator->options($options);
+
+		$expected = array('Article' => array(
+			'order' => 'desc',
+			'sort' => 'title'
+		));
+		$this->assertEqual($expected, $this->Paginator->params['paging']);
+
+		$this->Paginator->options = array();
+		$this->Paginator->params = array();
+
+		$options = array('Article' => array(
+			'order' => 'desc',
+			'sort' => 'title'
+		));
+		$this->Paginator->options($options);
+		$this->assertEqual($expected, $this->Paginator->params['paging']);
+
+		$options = array('paging' => array('Article' => array(
+			'order' => 'desc',
+			'sort' => 'Article.title'
+		)));
+		$this->Paginator->options($options);
+
+		$expected = array('Article' => array(
+			'order' => 'desc',
+			'sort' => 'Article.title'
+		));
+		$this->assertEqual($expected, $this->Paginator->params['paging']);
+	}
+
+/**
+ * testPassedArgsMergingWithUrlOptions method
+ *
+ * @access public
+ * @return void
+ */
+	function testPassedArgsMergingWithUrlOptions() {
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'articles', 'action' => 'index', 'pass' => array('2'), 'named' => array('foo' => 'bar'), 'form' => array(), 'url' => array('url' => 'articles/index/2/foo:bar'), 'bare' => 0),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/', 'here' => '/articles/', 'webroot' => '/', 'passedArgs' => array(0 => '2', 'foo' => 'bar'))
+		));
+		$this->Paginator->params['paging'] = array(
+			'Article' => array(
+				'page' => 1, 'current' => 3, 'count' => 13,
+				'prevPage' => false, 'nextPage' => true, 'pageCount' => 8,
+				'defaults' => array(
+					'limit' => 3, 'step' => 1, 'order' => array(), 'conditions' => array()
+				),
+				'options' => array(
+					'page' => 1, 'limit' => 3, 'order' => array(), 'conditions' => array()
+				)
+			)
+		);
+
+		$this->Paginator->params['pass'] = array(2);
+		$this->Paginator->params['named'] = array('foo' => 'bar');
+		$this->Paginator->beforeRender();
+
+		$result = $this->Paginator->sort('title');
+		$expected = array(
+			'a' => array('href' => '/articles/index/2/page:1/foo:bar/sort:title/direction:asc'),
+			'Title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers();
+		$expected = array(
+			array('span' => array('class' => 'current')), '1', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:2/foo:bar')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:3/foo:bar')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:4/foo:bar')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:5/foo:bar')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:6/foo:bar')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/articles/index/2/page:7/foo:bar')), '7', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->next('Next');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/articles/index/2/page:2/foo:bar', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testPagingLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testPagingLinks() {
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
+		$expected = array(
+			'span' => array('class' => 'disabled'),
+			'&lt;&lt; Previous',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled', 'tag' => 'div'));
+		$expected = array(
+			'div' => array('class' => 'disabled'),
+			'&lt;&lt; Previous',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Client']['page'] = 2;
+		$this->Paginator->params['paging']['Client']['prevPage'] = true;
+		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:1', 'class' => 'prev'),
+			'&lt;&lt; Previous',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->next('Next');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:3', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->next('Next', array('tag' => 'li'));
+		$expected = array(
+			'<li',
+			'a' => array('href' => '/index/page:3', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/li'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('<< Previous', array('escape' => true));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:1', 'class' => 'prev'),
+			'&lt;&lt; Previous',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('<< Previous', array('escape' => false));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:1', 'class' => 'prev'),
+			'preg:/<< Previous/',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 1, 'current' => 1, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
+			'defaults' => array(),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>');
+		$expected = array(
+			'span' => array('class' => 'prev'),
+			'&lt;strong&gt;Disabled&lt;/strong&gt;',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>', array('escape' => true));
+		$expected = array(
+			'span' => array('class' => 'prev'),
+			'&lt;strong&gt;Disabled&lt;/strong&gt;',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->prev('<< Previous', null, '<strong>Disabled</strong>', array('escape' => false));
+		$expected = array(
+			'span' => array('class' => 'prev'),
+			'<strong', 'Disabled', '/strong',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
+			'defaults' => array(),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$this->Paginator->params['paging']['Client']['page'] = 2;
+		$this->Paginator->params['paging']['Client']['prevPage'] = true;
+		$result = $this->Paginator->prev('<< Previous', null, null, array('class' => 'disabled'));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:1/limit:3/sort:Client.name/direction:DESC', 'class' => 'prev'),
+			'&lt;&lt; Previous',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected, true);
+
+		$result = $this->Paginator->next('Next');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:3/limit:3/sort:Client.name/direction:DESC', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 2, 'current' => 1, 'count' => 13, 'prevPage' => true, 'nextPage' => false, 'pageCount' => 2,
+			'defaults' => array(),
+			'options' => array('page' => 2, 'limit' => 10, 'order' => array(), 'conditions' => array())
+		));
+		$result = $this->Paginator->prev('Prev');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:1/limit:10', 'class' => 'prev'),
+			'Prev',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array(
+			'Client' => array(
+				'page' => 2, 'current' => 1, 'count' => 13, 'prevPage' => true,
+				'nextPage' => false, 'pageCount' => 2,
+				'defaults' => array(),
+				'options' => array(
+					'page' => 2, 'limit' => 10, 'order' => array(), 'conditions' => array()
+				)
+			)
+		);
+		$this->Paginator->options(array('url' => array(12, 'page' => 3)));
+		$result = $this->Paginator->prev('Prev', array('url' => array('foo' => 'bar')));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/12/page:1/limit:10/foo:bar', 'class' => 'prev'),
+			'Prev',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that __pagingLink methods use $options when $disabledOptions is an empty value.
+ * allowing you to use shortcut syntax
+ *
+ * @return void
+ */
+	function testPagingLinksOptionsReplaceEmptyDisabledOptions() {
+		$this->Paginator->params['paging'] = array(
+			'Client' => array(
+				'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false,
+				'nextPage' => true, 'pageCount' => 5,
+				'defaults' => array(
+					'limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()
+				),
+				'options' => array(
+					'page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()
+				)
+			)
+		);
+		$result = $this->Paginator->prev('<< Previous', array('escape' => false));
+		$expected = array(
+			'span' => array('class' => 'prev'),
+			'preg:/<< Previous/',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->next('Next >>', array('escape' => false));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:2', 'class' => 'next'),
+			'preg:/Next >>/',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testPagingLinksNotDefaultModel
+ *
+ * Test the creation of paging links when the non default model is used.
+ *
+ * @access public
+ * @return void
+ */
+	function testPagingLinksNotDefaultModel() {
+		// Multiple Model Paginate
+		$this->Paginator->params['paging'] = array(
+			'Client' => array(
+				'page' => 1, 'current' => 3, 'count' => 13, 'prevPage' => false, 'nextPage' => true, 'pageCount' => 5,
+				'defaults' => array( 'limit'=>3, 'order' => array('Client.name' => 'DESC')),
+				'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array())
+			),
+			'Server' => array(
+				'page' => 1, 'current' => 1, 'count' => 5, 'prevPage' => false, 'nextPage' => false, 'pageCount' => 5,
+				'defaults' => array(),
+				'options' => array('page' => 1, 'limit' => 5, 'order' => array('Server.name' => 'ASC'), 'conditions' => array())
+			)
+		);
+		$result = $this->Paginator->next('Next', array('model' => 'Client'));
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:2', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->next('Next', array('model' => 'Server'), 'No Next', array('model' => 'Server'));
+		$expected = array(
+			'span' => array('class' => 'next'), 'No Next', '/span'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testGenericLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testGenericLinks() {
+		$result = $this->Paginator->link('Sort by title on page 5', array('sort' => 'title', 'page' => 5, 'direction' => 'desc'));
+		$expected = array(
+			'a' => array('href' => '/index/page:5/sort:title/direction:desc'),
+			'Sort by title on page 5',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['page'] = 2;
+		$result = $this->Paginator->link('Sort by title', array('sort' => 'title', 'direction' => 'desc'));
+		$expected = array(
+			'a' => array('href' => '/index/page:2/sort:title/direction:desc'),
+			'Sort by title',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Article']['options']['page'] = 4;
+		$result = $this->Paginator->link('Sort by title on page 4', array('sort' => 'Article.title', 'direction' => 'desc'));
+		$expected = array(
+			'a' => array('href' => '/index/page:4/sort:Article.title/direction:desc'),
+			'Sort by title on page 4',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Tests generation of generic links with preset options
+ *
+ * @access public
+ * @return void
+ */
+	function testGenericLinksWithPresetOptions() {
+		$result = $this->Paginator->link('Foo!', array('page' => 1));
+		$this->assertTags($result, array('a' => array('href' => '/index/page:1'), 'Foo!', '/a'));
+
+		$this->Paginator->options(array('sort' => 'title', 'direction' => 'desc'));
+		$result = $this->Paginator->link('Foo!', array('page' => 1));
+		$this->assertTags($result, array(
+			'a' => array(
+				'href' => '/index/page:1',
+				'sort' => 'title',
+				'direction' => 'desc'
+			),
+			'Foo!',
+			'/a'
+		));
+
+		$this->Paginator->options(array('sort' => null, 'direction' => null));
+		$result = $this->Paginator->link('Foo!', array('page' => 1));
+		$this->assertTags($result, array('a' => array('href' => '/index/page:1'), 'Foo!', '/a'));
+
+		$this->Paginator->options(array('url' => array(
+			'sort' => 'title',
+			'direction' => 'desc'
+		)));
+		$result = $this->Paginator->link('Foo!', array('page' => 1));
+		$this->assertTags($result, array(
+			'a' => array('href' => '/index/page:1/sort:title/direction:desc'),
+			'Foo!',
+			'/a'
+		));
+	}
+
+/**
+ * testNumbers method
+ *
+ * @access public
+ * @return void
+ */
+	function testNumbers() {
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 8, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+		$result = $this->Paginator->numbers();
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '8', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('tag' => 'li'));
+		$expected = array(
+			array('li' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/li',
+			' | ',
+			array('li' => array('class' => 'current')), '8', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/li',
+			' | ',
+			array('li' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/li',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('tag' => 'li', 'separator' => false));
+		$expected = array(
+			array('li' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/li',
+			array('li' => array('class' => 'current')), '8', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/li',
+			array('li' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/li',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(true);
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), 'first', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '8', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:15')), 'last', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 1, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+		$result = $this->Paginator->numbers();
+		$expected = array(
+			array('span' => array('class' => 'current')), '1', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 14, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+		$result = $this->Paginator->numbers();
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:13')), '13', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '14', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:15')), '15', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 2, 'current' => 3, 'count' => 27, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 9,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->numbers(array('first' => 1));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('last' => 1));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 15, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->numbers(array('first' => 1));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:13')), '13', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:14')), '14', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '15', '/span',
+
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 10, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '10', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:11')), '11', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:12')), '12', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:13')), '13', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:14')), '14', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:15')), '15', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 6, 'current' => 15, 'count' => 623, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 42,
+			'defaults' => array('limit' => 15, 'step' => 1, 'page' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 6, 'limit' => 15, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '6', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:8')), '8', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:9')), '9', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:10')), '10', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:42')), '42', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 37, 'current' => 15, 'count' => 623, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 42,
+			'defaults' => array('limit' => 15, 'step' => 1, 'page' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 37, 'limit' => 15, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->numbers(array('first' => 1, 'last' => 1));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:33')), '33', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:34')), '34', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:35')), '35', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:36')), '36', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '37', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:38')), '38', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:39')), '39', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:40')), '40', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:41')), '41', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:42')), '42', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array(
+			'Client' => array(
+				'page' => 1,
+				'current' => 10,
+				'count' => 30,
+				'prevPage' => false,
+				'nextPage' => 2,
+				'pageCount' => 3,
+				'defaults' => array(
+					'limit' => 3,
+					'step' => 1,
+					'order' => array('Client.name' => 'DESC'),
+					'conditions' => array()
+				),
+				'options' => array(
+					'page' => 1,
+					'limit' => 3,
+					'order' => array('Client.name' => 'DESC'),
+					'conditions' => array()
+				)
+			)
+		);
+		$options = array('modulus' => 10);
+		$result = $this->Paginator->numbers($options);
+		$expected = array(
+			array('span' => array('class' => 'current')), '1', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 2, 'current' => 10, 'count' => 31, 'prevPage' => true, 'nextPage' => true, 'pageCount' => 4,
+			'defaults' => array('limit' => 10),
+			'options' => array('page' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+		$result = $this->Paginator->numbers();
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1/sort:Client.name/direction:DESC')), '1', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '2', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3/sort:Client.name/direction:DESC')), '3', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4/sort:Client.name/direction:DESC')), '4', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 4895, 'current' => 10, 'count' => 48962, 'prevPage' => 1, 'nextPage' => 1, 'pageCount' => 4897,
+			'defaults' => array('limit' => 10),
+			'options' => array('page' => 4894, 'limit' => 10, 'order' => 'Client.name DESC', 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '4895', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Client']['page'] = 3;
+
+		$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' | ',
+			array('span' => array('class' => 'current')), '3', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' | ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('first' => 2, 'modulus' => 2, 'last' => 2, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '3', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 5, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '3', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4893')), '4893', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Client']['page'] = 4893;
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 4, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4891')), '4891', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4892')), '4892', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '4893', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Client']['page'] = 58;
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 4, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:5')), '5', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:56')), '56', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:57')), '57', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '58', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:59')), '59', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:60')), '60', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4893')), '4893', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging']['Client']['page'] = 5;
+		$result = $this->Paginator->numbers(array('first' => 5, 'modulus' => 4, 'last' => 5, 'separator' => ' - '));
+		$expected = array(
+			array('span' => array()), array('a' => array('href' => '/index/page:1')), '1', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:2')), '2', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:3')), '3', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4')), '4', '/a', '/span',
+			' - ',
+			array('span' => array('class' => 'current')), '5', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:6')), '6', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:7')), '7', '/a', '/span',
+			'...',
+			array('span' => array()), array('a' => array('href' => '/index/page:4893')), '4893', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4894')), '4894', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4895')), '4895', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4896')), '4896', '/a', '/span',
+			' - ',
+			array('span' => array()), array('a' => array('href' => '/index/page:4897')), '4897', '/a', '/span',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testFirstAndLast method
+ *
+ * @access public
+ * @return void
+ */
+	function testFirstAndLast() {
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 1, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->first();
+		$expected = '';
+		$this->assertEqual($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 4, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->first();
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:1'),
+			'&lt;&lt; first',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->first('<<', array('tag' => 'li'));
+		$expected = array(
+			'<li',
+			'a' => array('href' => '/index/page:1'),
+			'&lt;&lt;',
+			'/a',
+			'/li'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last();
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/index/page:15'),
+			'last &gt;&gt;',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last(1);
+		$expected = array(
+			'...',
+			'<span',
+			'a' => array('href' => '/index/page:15'),
+			'15',
+			'/a',
+			'/span'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last(2);
+		$expected = array(
+			'...',
+			'<span',
+			array('a' => array('href' => '/index/page:14')), '14', '/a',
+			'/span',
+			' | ',
+			'<span',
+			array('a' => array('href' => '/index/page:15')), '15', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last(2, array('tag' => 'li'));
+		$expected = array(
+			'...',
+			'<li',
+			array('a' => array('href' => '/index/page:14')), '14', '/a',
+			'/li',
+			' | ',
+			'<li',
+			array('a' => array('href' => '/index/page:15')), '15', '/a',
+			'/li',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 15, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3, 'step' => 1, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+		$result = $this->Paginator->last();
+		$expected = '';
+		$this->assertEqual($result, $expected);
+
+		$this->Paginator->params['paging'] = array('Client' => array(
+			'page' => 4, 'current' => 3, 'count' => 30, 'prevPage' => false, 'nextPage' => 2, 'pageCount' => 15,
+			'defaults' => array('limit' => 3),
+			'options' => array('page' => 1, 'limit' => 3, 'order' => array('Client.name' => 'DESC'), 'conditions' => array()))
+		);
+
+		$result = $this->Paginator->first();
+		$expected = array(
+			'<span',
+			array('a' => array('href' => '/index/page:1/sort:Client.name/direction:DESC')), '&lt;&lt; first', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last();
+		$expected = array(
+			'<span',
+			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), 'last &gt;&gt;', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last(1);
+		$expected = array(
+			'...',
+			'<span',
+			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), '15', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Paginator->last(2);
+		$expected = array(
+			'...',
+			'<span',
+			array('a' => array('href' => '/index/page:14/sort:Client.name/direction:DESC')), '14', '/a',
+			'/span',
+			' | ',
+			'<span',
+			array('a' => array('href' => '/index/page:15/sort:Client.name/direction:DESC')), '15', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->options(array('url' => array('full_base' => true)));
+		$result = $this->Paginator->first();
+
+		$expected = array(
+			'<span',
+			array('a' => array('href' => FULL_BASE_URL . '/index/page:1/sort:Client.name/direction:DESC')), '&lt;&lt; first', '/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testCounter method
+ *
+ * @access public
+ * @return void
+ */
+	function testCounter() {
+		$this->Paginator->params['paging'] = array(
+			'Client' => array(
+				'page' => 1,
+				'current' => 3,
+				'count' => 13,
+				'prevPage' => false,
+				'nextPage' => true,
+				'pageCount' => 5,
+				'defaults' => array(
+					'limit' => 3,
+					'step' => 1,
+					'order' => array('Client.name' => 'DESC'),
+					'conditions' => array()
+				),
+				'options' => array(
+					'page' => 1,
+					'limit' => 3,
+					'order' => array('Client.name' => 'DESC'),
+					'conditions' => array(),
+					'separator' => 'of'
+				),
+			)
+		);
+		$input = 'Page %page% of %pages%, showing %current% records out of %count% total, ';
+		$input .= 'starting on record %start%, ending on %end%';
+		$result = $this->Paginator->counter($input);
+		$expected = 'Page 1 of 5, showing 3 records out of 13 total, starting on record 1, ';
+		$expected .= 'ending on 3';
+		$this->assertEqual($result, $expected);
+
+		$input = 'Page {:page} of {:pages}, showing {:current} records out of {:count} total, ';
+		$input .= 'starting on record {:start}, ending on {:end}';
+		$result = $this->Paginator->counter($input);
+		$this->assertEqual($result, $expected);
+
+		$input = 'Page %page% of %pages%';
+		$result = $this->Paginator->counter($input);
+		$expected = 'Page 1 of 5';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Paginator->counter(array('format' => $input));
+		$expected = 'Page 1 of 5';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Paginator->counter(array('format' => 'pages'));
+		$expected = '1 of 5';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Paginator->counter(array('format' => 'range'));
+		$expected = '1 - 3 of 13';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testHasPage method
+ *
+ * @access public
+ * @return void
+ */
+	function testHasPage() {
+		$result = $this->Paginator->hasPage('Article', 15);
+		$this->assertFalse($result);
+
+		$result = $this->Paginator->hasPage('UndefinedModel', 2);
+		$this->assertFalse($result);
+
+		$result = $this->Paginator->hasPage('Article', 2);
+		$this->assertTrue($result);
+
+		$result = $this->Paginator->hasPage(2);
+		$this->assertTrue($result);
+	}
+
+/**
+ * testWithPlugin method
+ *
+ * @access public
+ * @return void
+ */
+	function testWithPlugin() {
+		Router::reload();
+		Router::setRequestInfo(array(
+			array(
+				'pass' => array(), 'named' => array(), 'prefix' => null, 'form' => array(),
+				'controller' => 'magazines', 'plugin' => 'my_plugin', 'action' => 'index',
+				'url' => array('ext' => 'html', 'url' => 'my_plugin/magazines')),
+			array('base' => '', 'here' => '/my_plugin/magazines', 'webroot' => '/')
+		));
+
+		$result = $this->Paginator->link('Page 3', array('page' => 3));
+		$expected = array(
+			'a' => array('href' => '/my_plugin/magazines/index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->options(array('url' => array('action' => 'another_index')));
+		$result = $this->Paginator->link('Page 3', array('page' => 3));
+		$expected = array(
+			'a' => array('href' => '/my_plugin/magazines/another_index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->options(array('url' => array('controller' => 'issues')));
+		$result = $this->Paginator->link('Page 3', array('page' => 3));
+		$expected = array(
+			'a' => array('href' => '/my_plugin/issues/index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Paginator->options(array('url' => array('plugin' => null)));
+		$result = $this->Paginator->link('Page 3', array('page' => 3));
+		$expected = array(
+			'a' => array('/magazines/index/page:3'), 'Page 3', '/a'
+		);
+
+		$this->Paginator->options(array('url' => array('plugin' => null, 'controller' => 'issues')));
+		$result = $this->Paginator->link('Page 3', array('page' => 3));
+		$expected = array(
+			'a' => array('href' => '/issues/index/page:3'), 'Page 3', '/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testNextLinkUsingDotNotation method
+ *
+ * @access public
+ * @return void
+ */
+	function testNextLinkUsingDotNotation() {
+		Router::reload();
+		Router::parse('/');
+		Router::setRequestInfo(array(
+			array('plugin' => null, 'controller' => 'accounts', 'action' => 'index', 'pass' => array(), 'form' => array(), 'url' => array('url' => 'accounts/', 'mod_rewrite' => 'true'), 'bare' => 0),
+			array('plugin' => null, 'controller' => null, 'action' => null, 'base' => '/officespace', 'here' => '/officespace/accounts/', 'webroot' => '/officespace/', 'passedArgs' => array())
+		));
+
+		$this->Paginator->params['paging']['Article']['options']['order'] = array('Article.title' => 'asc');
+		$this->Paginator->params['paging']['Article']['page'] = 1;
+
+		$test = array('url'=> array(
+			'page'=> '1',
+			'sort'=>'Article.title',
+			'direction'=>'asc',
+		));
+		$this->Paginator->options($test);
+
+		$result = $this->Paginator->next('Next');
+		$expected = array(
+			'<span',
+			'a' => array('href' => '/officespace/accounts/index/page:2/sort:Article.title/direction:asc', 'class' => 'next'),
+			'Next',
+			'/a',
+			'/span',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test that mock classes injected into paginatorHelper are called when using link()
+ *
+ * @return void
+ */
+	function testMockAjaxProviderClassInjection() {
+		$Paginator =& new PaginatorHelper(array('ajax' => 'PaginatorMockJs'));
+		$Paginator->params['paging'] = array(
+			'Article' => array(
+				'current' => 9,
+				'count' => 62,
+				'prevPage' => false,
+				'nextPage' => true,
+				'pageCount' => 7,
+				'defaults' => array(),
+				'options' => array()
+			)
+		);
+		$Paginator->PaginatorMockJs =& new PaginatorMockJsHelper();
+		$Paginator->PaginatorMockJs->expectOnce('link');
+		$result = $Paginator->link('Page 2', array('page' => 2), array('update' => '#content'));
+
+		$this->expectError();
+		$Paginator =& new PaginatorHelper(array('ajax' => 'Form'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
new file mode 100644
index 000000000..0ca94724c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/prototype_engine.test.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ * PrototypeEngine TestCase
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework <http://www.cakephp.org/>
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *								1785 E. Sahara Avenue, Suite 490-204
+ *								Las Vegas, Nevada 89104
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright       Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link            http://cakephp.org CakePHP Project
+ * @package         cake.tests
+ * @subpackage      cake.tests.cases.views.helpers
+ * @license         MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Helper', array('Html', 'Js', 'PrototypeEngine'));
+
+class PrototypeEngineHelperTestCase extends CakeTestCase {
+/**
+ * startTest
+ *
+ * @return void
+ */
+	function startTest() {
+		$this->Proto =& new PrototypeEngineHelper();
+	}
+
+/**
+ * end test
+ *
+ * @return void
+ */
+	function endTest() {
+		unset($this->Proto);
+	}
+
+/**
+ * test selector method
+ *
+ * @return void
+ */
+	function testSelector() {
+		$result = $this->Proto->get('#content');
+		$this->assertEqual($result, $this->Proto);
+		$this->assertEqual($this->Proto->selection, '$("content")');
+
+		$result = $this->Proto->get('a .remove');
+		$this->assertEqual($result, $this->Proto);
+		$this->assertEqual($this->Proto->selection, '$$("a .remove")');
+
+		$result = $this->Proto->get('document');
+		$this->assertEqual($result, $this->Proto);
+		$this->assertEqual($this->Proto->selection, "$(document)");
+
+		$result = $this->Proto->get('window');
+		$this->assertEqual($result, $this->Proto);
+		$this->assertEqual($this->Proto->selection, "$(window)");
+
+		$result = $this->Proto->get('ul');
+		$this->assertEqual($result, $this->Proto);
+		$this->assertEqual($this->Proto->selection, '$$("ul")');
+
+		$result = $this->Proto->get('#some_long-id.class');
+		$this->assertEqual($result, $this->Proto);
+		$this->assertEqual($this->Proto->selection, '$$("#some_long-id.class")');
+	}
+
+/**
+ * test event binding
+ *
+ * @return void
+ */
+	function testEvent() {
+		$this->Proto->get('#myLink');
+		$result = $this->Proto->event('click', 'doClick', array('wrap' => false));
+		$expected = '$("myLink").observe("click", doClick);';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->event('click', 'Element.hide(this);', array('stop' => false));
+		$expected = '$("myLink").observe("click", function (event) {Element.hide(this);});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->event('click', 'Element.hide(this);');
+		$expected = "\$(\"myLink\").observe(\"click\", function (event) {event.stop();\nElement.hide(this);});";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test dom ready event creation
+ *
+ * @return void
+ */
+	function testDomReady() {
+		$result = $this->Proto->domReady('foo.name = "bar";');
+		$expected = 'document.observe("dom:loaded", function (event) {foo.name = "bar";});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Each method
+ *
+ * @return void
+ */
+	function testEach() {
+		$this->Proto->get('#foo li');
+		$result = $this->Proto->each('item.hide();');
+		$expected = '$$("#foo li").each(function (item, index) {item.hide();});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test Effect generation
+ *
+ * @return void
+ */
+	function testEffect() {
+		$this->Proto->get('#foo');
+		$result = $this->Proto->effect('show');
+		$expected = '$("foo").show();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('hide');
+		$expected = '$("foo").hide();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('fadeIn');
+		$expected = '$("foo").appear();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('fadeIn', array('speed' => 'fast'));
+		$expected = '$("foo").appear({duration:0.50000000000});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('fadeIn', array('speed' => 'slow'));
+		$expected = '$("foo").appear({duration:2});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('fadeOut');
+		$expected = '$("foo").fade();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('fadeOut', array('speed' => 'fast'));
+		$expected = '$("foo").fade({duration:0.50000000000});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('fadeOut', array('speed' => 'slow'));
+		$expected = '$("foo").fade({duration:2});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('slideIn');
+		$expected = 'Effect.slideDown($("foo"));';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('slideOut');
+		$expected = 'Effect.slideUp($("foo"));';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('slideOut', array('speed' => 'fast'));
+		$expected = 'Effect.slideUp($("foo"), {duration:0.50000000000});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->effect('slideOut', array('speed' => 'slow'));
+		$expected = 'Effect.slideUp($("foo"), {duration:2});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * Test Request Generation
+ *
+ * @return void
+ */
+	function testRequest() {
+		$result = $this->Proto->request(array('controller' => 'posts', 'action' => 'view', 1));
+		$expected = 'var jsRequest = new Ajax.Request("/posts/view/1");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/posts/view/1', array(
+			'method' => 'post',
+			'complete' => 'doComplete',
+			'before' => 'doBefore',
+			'success' => 'doSuccess',
+			'error' => 'doError',
+			'data' => array('name' => 'jim', 'height' => '185cm'),
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Ajax.Request("/posts/view/1", {method:"post", onComplete:doComplete, onCreate:doBefore, onFailure:doError, onSuccess:doSuccess, parameters:{"name":"jim","height":"185cm"}});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/posts/view/1', array('update' => 'content'));
+		$expected = 'var jsRequest = new Ajax.Updater("content", "/posts/view/1");';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doSuccess',
+			'update' => '#update-zone',
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Ajax.Updater("update-zone", "/people/edit/1", {method:"post", onComplete:doSuccess});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doSuccess',
+			'error' => 'handleError',
+			'type' => 'json',
+			'data' => array('name' => 'jim', 'height' => '185cm'),
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Ajax.Request("/people/edit/1", {method:"post", onComplete:doSuccess, onFailure:handleError, parameters:{"name":"jim","height":"185cm"}});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/people/edit/1', array(
+			'method' => 'post',
+			'complete' => 'doSuccess',
+			'error' => 'handleError',
+			'type' => 'json',
+			'data' => '$("element").serialize()',
+			'dataExpression' => true,
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsRequest = new Ajax.Request("/people/edit/1", {method:"post", onComplete:doSuccess, onFailure:handleError, parameters:$("element").serialize()});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/people/edit/1', array(
+			'method' => 'post',
+			'before' => 'doBefore();',
+			'success' => 'doSuccess();',
+			'complete' => 'doComplete();',
+			'error' => 'handleError();',
+		));
+		$expected = 'var jsRequest = new Ajax.Request("/people/edit/1", {method:"post", onComplete:function (transport) {doComplete();}, onCreate:function (transport) {doBefore();}, onFailure:function (response, jsonHeader) {handleError();}, onSuccess:function (response, jsonHeader) {doSuccess();}});';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->request('/people/edit/1', array(
+			'async' => false,
+			'method' => 'post',
+			'before' => 'doBefore();',
+			'success' => 'doSuccess();',
+			'complete' => 'doComplete();',
+			'error' => 'handleError();',
+		));
+		$expected = 'var jsRequest = new Ajax.Request("/people/edit/1", {asynchronous:false, method:"post", onComplete:function (transport) {doComplete();}, onCreate:function (transport) {doBefore();}, onFailure:function (response, jsonHeader) {handleError();}, onSuccess:function (response, jsonHeader) {doSuccess();}});';
+		$this->assertEqual($result, $expected);
+
+		$this->Proto->get('#submit');
+		$result = $this->Proto->request('/users/login', array(
+			'before' => 'login.create(event)',
+			'complete' => 'login.complete(event)',
+			'update' => 'auth',
+			'data' => $this->Proto->serializeForm(array('isForm' => false, 'inline' => true)),
+			'dataExpression' => true
+		));
+		$this->assertTrue(strpos($result, '$($("submit").form).serialize()') > 0);
+		$this->assertFalse(strpos($result, 'parameters:function () {$($("submit").form).serialize()}') > 0);
+	}
+
+/**
+ * test sortable list generation
+ *
+ * @return void
+ */
+	function testSortable() {
+		$this->Proto->get('#myList');
+		$result = $this->Proto->sortable(array(
+			'complete' => 'onComplete',
+			'sort' => 'onSort',
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsSortable = Sortable.create($("myList"), {onChange:onSort, onUpdate:onComplete});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test drag() method.  Scriptaculous lacks the ability to take an Array of Elements
+ * in new Drag() when selection is a multiple type.  Iterate over the array.
+ *
+ * @return void
+ */
+	function testDrag() {
+		$this->Proto->get('#element');
+		$result = $this->Proto->drag(array(
+			'start' => 'onStart',
+			'drag' => 'onDrag',
+			'stop' => 'onStop',
+			'snapGrid' => array(10, 10),
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsDrag = new Draggable($("element"), {onDrag:onDrag, onEnd:onStop, onStart:onStart, snap:[10,10]});';
+		$this->assertEqual($result, $expected);
+
+		$this->Proto->get('div.dragger');
+		$result = $this->Proto->drag(array(
+			'start' => 'onStart',
+			'drag' => 'onDrag',
+			'stop' => 'onStop',
+			'snapGrid' => array(10, 10),
+			'wrapCallbacks' => false
+		));
+		$expected = '$$("div.dragger").each(function (item, index) {new Draggable(item, {onDrag:onDrag, onEnd:onStop, onStart:onStart, snap:[10,10]});});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test drop() method
+ *
+ * @return void
+ */
+	function testDrop() {
+		$this->Proto->get('#element');
+		$result = $this->Proto->drop(array(
+			'hover' => 'onHover',
+			'drop' => 'onDrop',
+			'accept' => '.drag-me',
+			'wrapCallbacks' => false
+		));
+		$expected = 'Droppables.add($("element"), {accept:".drag-me", onDrop:onDrop, onHover:onHover});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * ensure that slider() method behaves properly
+ *
+ * @return void
+ */
+	function testSlider() {
+		$this->Proto->get('#element');
+		$result = $this->Proto->slider(array(
+			'handle' => '#handle',
+			'direction' => 'horizontal',
+			'change' => 'onChange',
+			'complete' => 'onComplete',
+			'value' => 4,
+			'wrapCallbacks' => false
+		));
+		$expected = 'var jsSlider = new Control.Slider($("handle"), $("element"), {axis:"horizontal", onChange:onComplete, onSlide:onChange, sliderValue:4});';
+		$this->assertEqual($result, $expected);
+
+		$this->Proto->get('#element');
+		$result = $this->Proto->slider(array(
+			'handle' => '#handle',
+			'change' => 'change();',
+			'complete' => 'complete();',
+			'value' => 4,
+			'min' => 10,
+			'max' => 100
+		));
+		$expected = 'var jsSlider = new Control.Slider($("handle"), $("element"), {onChange:function (value) {complete();}, onSlide:function (value) {change();}, range:$R(10,100), sliderValue:4});';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test the serializeForm implementation.
+ *
+ * @return void
+ */
+	function testSerializeForm() {
+		$this->Proto->get('#element');
+		$result = $this->Proto->serializeForm(array('isForm' => true));
+		$expected = '$("element").serialize();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->serializeForm(array('isForm' => true, 'inline' => true));
+		$expected = '$("element").serialize()';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->serializeForm(array('isForm' => false));
+		$expected = '$($("element").form).serialize();';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Proto->serializeForm(array('isForm' => false, 'inline' => true));
+		$expected = '$($("element").form).serialize()';
+		$this->assertEqual($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/rss.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/rss.test.php
new file mode 100644
index 000000000..c302f4c40
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/rss.test.php
@@ -0,0 +1,593 @@
+<?php
+/**
+ * RssHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Helper', array('Rss', 'Time'));
+
+/**
+ * RssHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class RssHelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Rss =& new RssHelper();
+		$this->Rss->Time =& new TimeHelper();
+		$this->Rss->beforeRender();
+
+		$manager =& XmlManager::getInstance();
+		$manager->namespaces = array();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Rss);
+	}
+
+/**
+ * testAddNamespace method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddNamespace() {
+		$this->Rss->addNs('custom', 'http://example.com/dtd.xml');
+		$manager =& XmlManager::getInstance();
+
+		$expected = array('custom' => 'http://example.com/dtd.xml');
+		$this->assertEqual($manager->namespaces, $expected);
+
+		$this->Rss->removeNs('custom');
+
+		$this->Rss->addNs('dummy', 'http://dummy.com/1.0/');
+		$result = $this->Rss->document();
+		$expected = array(
+			'rss' => array(
+				'xmlns:dummy' => 'http://dummy.com/1.0/',
+				'version' => '2.0'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$this->Rss->removeNs('dummy');
+	}
+
+/**
+ * testRemoveNamespace method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoveNamespace() {
+		$this->Rss->addNs('custom', 'http://example.com/dtd.xml');
+		$this->Rss->addNs('custom2', 'http://example.com/dtd2.xml');
+		$manager =& XmlManager::getInstance();
+
+		$expected = array('custom' => 'http://example.com/dtd.xml', 'custom2' => 'http://example.com/dtd2.xml');
+		$this->assertEqual($manager->namespaces, $expected);
+
+		$this->Rss->removeNs('custom');
+		$expected = array('custom2' => 'http://example.com/dtd2.xml');
+		$this->assertEqual($manager->namespaces, $expected);
+	}
+	/**
+ * testDocument method
+ *
+ * @access public
+ * @return void
+ */
+	function testDocument() {
+		$result = $this->Rss->document();
+		$expected = array(
+			'rss' => array(
+				'version' => '2.0'
+			)
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Rss->document(array('contrived' => 'parameter'));
+		$expected = array(
+			'rss' => array(
+				'version' => '2.0'
+			),
+			'<parameter'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Rss->document(null, 'content');
+		$expected = array(
+			'rss' => array(
+				'version' => '2.0'
+			),
+			'content'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Rss->document(array('contrived' => 'parameter'), 'content');
+		$expected = array(
+			'rss' => array(
+				'contrived' => 'parameter',
+				'version' => '2.0'
+			),
+			'content'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testChannel method
+ *
+ * @access public
+ * @return void
+ */
+	function testChannel() {
+		$attrib = array('a' => '1', 'b' => '2');
+		$elements = array('title' => 'title');
+		$content = 'content';
+
+		$result = $this->Rss->channel($attrib, $elements, $content);
+		$expected = array(
+			'channel' => array(
+				'a' => '1',
+				'b' => '2'
+			),
+			'<title',
+			'title',
+			'/title',
+			'<link',
+			RssHelper::url('/', true),
+			'/link',
+			'<description',
+			'content',
+			'/channel'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * test correct creation of channel sub elements.
+ *
+ * @access public
+ * @return void
+ */
+	function testChannelElements() {
+		$attrib = array();
+		$elements = array(
+			'title' => 'Title of RSS Feed',
+			'link' => 'http://example.com',
+			'description' => 'Description of RSS Feed',
+			'image' => array(
+				'title' => 'Title of image',
+				'url' => 'http://example.com/example.png',
+				'link' => 'http://example.com'
+			),
+			'cloud' => array(
+				'domain' => "rpc.sys.com",
+				'port' => "80",
+				'path' =>"/RPC2",
+				'registerProcedure' => "myCloud.rssPleaseNotify",
+				'protocol' => "xml-rpc"
+			)
+		);
+		$content = 'content-here';
+		$result = $this->Rss->channel($attrib, $elements, $content);
+		$expected = array(
+			'<channel',
+				'<title', 'Title of RSS Feed', '/title',
+				'<link', 'http://example.com', '/link',
+				'<description', 'Description of RSS Feed', '/description',
+				'<image',
+					'<title', 'Title of image', '/title',
+					'<url', 'http://example.com/example.png', '/url',
+					'<link', 'http://example.com', '/link',
+				'/image',
+				'cloud' => array(
+					'domain' => "rpc.sys.com",
+					'port' => "80",
+					'path' =>"/RPC2",
+					'registerProcedure' => "myCloud.rssPleaseNotify",
+					'protocol' => "xml-rpc"
+				),
+			'content-here',
+			'/channel',
+		);
+		$this->assertTags($result, $expected);
+	}
+	function testChannelElementAttributes() {
+		$attrib = array();
+		$elements = array(
+			'title' => 'Title of RSS Feed',
+			'link' => 'http://example.com',
+			'description' => 'Description of RSS Feed',
+			'image' => array(
+				'title' => 'Title of image',
+				'url' => 'http://example.com/example.png',
+				'link' => 'http://example.com'
+			),
+			'atom:link' => array(
+				'attrib' => array(
+					'href' => 'http://www.example.com/rss.xml',
+					'rel' => 'self',
+					'type' => 'application/rss+xml')
+			)
+		);
+		$content = 'content-here';
+		$result = $this->Rss->channel($attrib, $elements, $content);
+		$expected = array(
+			'<channel',
+				'<title', 'Title of RSS Feed', '/title',
+				'<link', 'http://example.com', '/link',
+				'<description', 'Description of RSS Feed', '/description',
+				'<image',
+					'<title', 'Title of image', '/title',
+					'<url', 'http://example.com/example.png', '/url',
+					'<link', 'http://example.com', '/link',
+				'/image',
+				'atom:link' => array(
+					'href' => "http://www.example.com/rss.xml",
+					'rel' => "self",
+					'type' =>"application/rss+xml"
+				),
+			'content-here',
+			'/channel',
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testItems method
+ *
+ * @access public
+ * @return void
+ */
+	function testItems() {
+		$items = array(
+			array('title' => 'title1', 'guid' => 'http://www.example.com/guid1', 'link' => 'http://www.example.com/link1', 'description' => 'description1'),
+			array('title' => 'title2', 'guid' => 'http://www.example.com/guid2', 'link' => 'http://www.example.com/link2', 'description' => 'description2'),
+			array('title' => 'title3', 'guid' => 'http://www.example.com/guid3', 'link' => 'http://www.example.com/link3', 'description' => 'description3')
+		);
+
+		$result = $this->Rss->items($items);
+		$expected = array(
+			'<item',
+				'<title', 'title1', '/title',
+				'<guid', 'http://www.example.com/guid1', '/guid',
+				'<link', 'http://www.example.com/link1', '/link',
+				'<description', 'description1', '/description',
+			'/item',
+			'<item',
+				'<title', 'title2', '/title',
+				'<guid', 'http://www.example.com/guid2', '/guid',
+				'<link', 'http://www.example.com/link2', '/link',
+				'<description', 'description2', '/description',
+			'/item',
+			'<item',
+				'<title', 'title3', '/title',
+				'<guid', 'http://www.example.com/guid3', '/guid',
+				'<link', 'http://www.example.com/link3', '/link',
+				'<description', 'description3', '/description',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Rss->items(array());
+		$expected = '';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testItem method
+ *
+ * @access public
+ * @return void
+ */
+	function testItem() {
+		$item = array(
+			'title' => 'My title',
+			'description' => 'My description',
+			'link' => 'http://www.google.com/'
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'<title',
+			'My title',
+			'/title',
+			'<description',
+			'My description',
+			'/description',
+			'<link',
+			'http://www.google.com/',
+			'/link',
+			'<guid',
+			'http://www.google.com/',
+			'/guid',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'title' => array(
+				'value' => 'My Title',
+				'cdata' => true,
+			),
+			'link' => 'http://www.example.com/1',
+			'description' => array(
+				'value' => 'descriptive words',
+				'cdata' => true,
+			),
+			'pubDate' => '2008-05-31 12:00:00',
+			'guid' => 'http://www.example.com/1'
+		);
+		$result = $this->Rss->item(null, $item);
+
+		$expected = array(
+			'<item',
+			'<title',
+			'<![CDATA[My Title]]',
+			'/title',
+			'<link',
+			'http://www.example.com/1',
+			'/link',
+			'<description',
+			'<![CDATA[descriptive words]]',
+			'/description',
+			'<pubDate',
+			date('r', strtotime('2008-05-31 12:00:00')),
+			'/pubDate',
+			'<guid',
+			'http://www.example.com/1',
+			'/guid',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'title' => array(
+				'value' => 'My Title & more',
+				'cdata' => true
+			)
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'<title',
+			'<![CDATA[My Title &amp; more]]',
+			'/title',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'title' => array(
+				'value' => 'My Title & more',
+				'convertEntities' => false
+			)
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'<title',
+			'My Title & more',
+			'/title',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'title' => array(
+				'value' => 'My Title & more',
+				'cdata' => true,
+				'convertEntities' => false,
+			)
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'<title',
+			'<![CDATA[My Title & more]]',
+			'/title',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'category' => array(
+				'value' => 'CakePHP',
+				'cdata' => true,
+				'domain' => 'http://www.cakephp.org'
+			)
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'category' => array('domain' => 'http://www.cakephp.org'),
+			'<![CDATA[CakePHP]]',
+			'/category',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'category' => array(
+				array(
+					'value' => 'CakePHP',
+					'cdata' => true,
+					'domain' => 'http://www.cakephp.org'
+				),
+				array(
+					'value' => 'Bakery',
+					'cdata' => true
+				)
+			)
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'category' => array('domain' => 'http://www.cakephp.org'),
+			'<![CDATA[CakePHP]]',
+			'/category',
+			'<category',
+			'<![CDATA[Bakery]]',
+			'/category',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'title' => array(
+				'value' => 'My Title',
+				'cdata' => true,
+			),
+			'link' => 'http://www.example.com/1',
+			'description' => array(
+				'value' => 'descriptive words',
+				'cdata' => true,
+			),
+			'enclosure' => array(
+				'url' => '/test.flv'
+			),
+			'pubDate' => '2008-05-31 12:00:00',
+			'guid' => 'http://www.example.com/1',
+			'category' => array(
+				array(
+					'value' => 'CakePHP',
+					'cdata' => true,
+					'domain' => 'http://www.cakephp.org'
+				),
+				array(
+					'value' => 'Bakery',
+					'cdata' => true
+				)
+			)
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'<title',
+			'<![CDATA[My Title]]',
+			'/title',
+			'<link',
+			'http://www.example.com/1',
+			'/link',
+			'<description',
+			'<![CDATA[descriptive words]]',
+			'/description',
+			'enclosure' => array('url' => RssHelper::url('/test.flv', true)),
+			'<pubDate',
+			date('r', strtotime('2008-05-31 12:00:00')),
+			'/pubDate',
+			'<guid',
+			'http://www.example.com/1',
+			'/guid',
+			'category' => array('domain' => 'http://www.cakephp.org'),
+			'<![CDATA[CakePHP]]',
+			'/category',
+			'<category',
+			'<![CDATA[Bakery]]',
+			'/category',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+
+		$item = array(
+			'title' => 'Foo bar',
+			'link' => array(
+				'url' => 'http://example.com/foo?a=1&b=2',
+				'convertEntities' => false
+			),
+			'description' =>  array(
+				'value' => 'descriptive words',
+				'cdata' => true,
+			),
+			'pubDate' => '2008-05-31 12:00:00'
+		);
+		$result = $this->Rss->item(null, $item);
+		$expected = array(
+			'<item',
+			'<title',
+			'Foo bar',
+			'/title',
+			'<link',
+			'http://example.com/foo?a=1&amp;b=2',
+			'/link',
+			'<description',
+			'<![CDATA[descriptive words]]',
+			'/description',
+			'<pubDate',
+			date('r', strtotime('2008-05-31 12:00:00')),
+			'/pubDate',
+			'<guid',
+			'http://example.com/foo?a=1&amp;b=2',
+			'/guid',
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * testTime method
+ *
+ * @access public
+ * @return void
+ */
+	function testTime() {
+	}
+
+/**
+ * testElementAttrNotInParent method
+ *
+ * @access public
+ * @return void
+ */
+	function testElementAttrNotInParent() {
+		$attributes = array(
+			'title' => 'Some Title',
+			'link' => 'http://link.com',
+			'description' => 'description'
+		);
+		$elements = array('enclosure' => array('url' => 'http://test.com'));
+
+		$result = $this->Rss->item($attributes, $elements);
+		$expected = array(
+			'item' => array(
+				'title' => 'Some Title',
+				'link' => 'http://link.com',
+				'description' => 'description'
+			),
+			'enclosure' => array(
+				'url' => 'http://test.com'
+			),
+			'/item'
+		);
+		$this->assertTags($result, $expected);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/session.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/session.test.php
new file mode 100644
index 000000000..fdaba33a9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/session.test.php
@@ -0,0 +1,236 @@
+<?php
+/**
+ * SessionHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import('Core', array('Helper', 'AppHelper', 'Controller', 'View'));
+App::import('Helper', array('Session'));
+
+/**
+ * SessionHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class SessionHelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		$this->Session = new SessionHelper();
+
+		$_SESSION = array(
+			'test' => 'info',
+			'Message' => array(
+				'flash' => array(
+					'element' => 'default',
+					'params' => array(),
+					'message' => 'This is a calling'
+				),
+				'notification' => array(
+					'element' => 'session_helper',
+					'params' => array('title' => 'Notice!', 'name' => 'Alert!'),
+					'message' => 'This is a test of the emergency broadcasting system',
+				),
+				'classy' => array(
+					'element' => 'default',
+					'params' => array('class' => 'positive'),
+					'message' => 'Recorded'
+				),
+				'bare' => array(
+					'element' => null,
+					'message' => 'Bare message',
+					'params' => array(),
+				),
+			),
+			'Deeply' => array('nested' => array('key' => 'value')),
+		);
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		$_SESSION = array();
+		unset($this->Session);
+	}
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * test construction and initial property settings
+ *
+ * @return void
+ */
+	function testConstruct() {
+		$this->assertFalse(empty($this->Session->sessionTime));
+		$this->assertFalse(empty($this->Session->security));
+	}
+/**
+ * testRead method
+ *
+ * @access public
+ * @return void
+ */
+	function testRead() {
+		$result = $this->Session->read('Deeply.nested.key');
+		$this->assertEqual($result, 'value');
+
+		$result = $this->Session->read('test');
+		$this->assertEqual($result, 'info');
+	}
+
+/**
+ * testCheck method
+ *
+ * @access public
+ * @return void
+ */
+	function testCheck() {
+		$this->assertTrue($this->Session->check('test'));
+
+		$this->assertTrue($this->Session->check('Message.flash.element'));
+
+		$this->assertFalse($this->Session->check('Does.not.exist'));
+
+		$this->assertFalse($this->Session->check('Nope'));
+	}
+
+/**
+ * testWrite method
+ *
+ * @access public
+ * @return void
+ */
+	function testWrite() {
+		$this->expectError();
+		$this->Session->write('NoWay', 'AccessDenied');
+	}
+
+/**
+ * testFlash method
+ *
+ * @access public
+ * @return void
+ */
+	function testFlash() {
+		$result = $this->Session->flash('flash', true);
+		$expected = '<div id="flashMessage" class="message">This is a calling</div>';
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($this->Session->check('Message.flash'));
+
+		$expected = '<div id="classyMessage" class="positive">Recorded</div>';
+		$result = $this->Session->flash('classy', true);
+		$this->assertEqual($result, $expected);
+
+		App::build(array(
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+		$controller = new Controller();
+		$this->Session->view = new View($controller);
+
+		$result = $this->Session->flash('notification', true);
+		$result = str_replace("\r\n", "\n", $result);
+		$expected = "<div id=\"notificationLayout\">\n\t<h1>Alert!</h1>\n\t<h3>Notice!</h3>\n\t<p>This is a test of the emergency broadcasting system</p>\n</div>";
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($this->Session->check('Message.notification'));
+
+		$result = $this->Session->flash('bare');
+		$expected = 'Bare message';
+		$this->assertEqual($result, $expected);
+		$this->assertFalse($this->Session->check('Message.bare'));
+	}
+
+/**
+ * testID method
+ *
+ * @access public
+ * @return void
+ */
+	function testID() {
+		$id = session_id();
+		$result = $this->Session->id();
+		$this->assertEqual($id, $result);
+	}
+
+/**
+ * testError method
+ *
+ * @access public
+ * @return void
+ */
+	function testError() {
+		$result = $this->Session->error();
+		$this->assertFalse($result);
+
+		$this->Session->read('CauseError');
+		$result = $this->Session->error();
+		$expected = "CauseError doesn't exist";
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testDisabling method
+ *
+ * @access public
+ * @return void
+ */
+	function testDisabling() {
+		Configure::write('Session.start', false);
+		$this->Session = new SessionHelper();
+		$this->assertFalse($this->Session->check('test'));
+		$this->assertFalse($this->Session->read('test'));
+
+		$this->Session->read('CauseError');
+		$this->assertFalse($this->Session->error());
+
+		ob_start();
+		$this->assertFalse($this->Session->flash('bare'));
+		$result = ob_get_contents();
+		ob_clean();
+		$this->assertFalse($result);
+	}
+
+/**
+ * testValid method
+ *
+ * @access public
+ * @return void
+ */
+	function testValid() {
+		//wierd it always ends up false in the test suite
+		//$this->assertFalse($this->Session->valid());
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/text.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/text.test.php
new file mode 100644
index 000000000..d0250a135
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/text.test.php
@@ -0,0 +1,440 @@
+<?php
+/**
+ * TextHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Helper', 'Text');
+
+/**
+ * TextHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TextHelperTest extends CakeTestCase {
+
+/**
+ * helper property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $helper = null;
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Text = new TextHelper();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Text);
+	}
+
+/**
+ * testTruncate method
+ *
+ * @access public
+ * @return void
+ */
+	function testTruncate() {
+		$text1 = 'The quick brown fox jumps over the lazy dog';
+		$text2 = 'Heiz&ouml;lr&uuml;cksto&szlig;abd&auml;mpfung';
+		$text3 = '<b>&copy; 2005-2007, Cake Software Foundation, Inc.</b><br />written by Alexander Wegener';
+		$text4 = '<img src="mypic.jpg"> This image tag is not XHTML conform!<br><hr/><b>But the following image tag should be conform <img src="mypic.jpg" alt="Me, myself and I" /></b><br />Great, or?';
+		$text5 = '0<b>1<i>2<span class="myclass">3</span>4<u>5</u>6</i>7</b>8<b>9</b>0';
+        $text6 = '<p><strong>Extra dates have been announced for this year\'s tour.</strong></p><p>Tickets for the new shows in</p>';
+        $text7 = 'El moño está en el lugar correcto. Eso fue lo que dijo la niña, ¿habrá dicho la verdad?';
+        $text8 = 'Vive la R'.chr(195).chr(169).'publique de France';
+		$text9 = '�ОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопр�туфхцчшщъыь';
+
+		$this->assertIdentical($this->Text->truncate($text1, 15), 'The quick br...');
+		$this->assertIdentical($this->Text->truncate($text1, 15, array('exact' => false)), 'The quick...');
+		$this->assertIdentical($this->Text->truncate($text1, 100), 'The quick brown fox jumps over the lazy dog');
+		$this->assertIdentical($this->Text->truncate($text2, 10), 'Heiz&ou...');
+		$this->assertIdentical($this->Text->truncate($text2, 10, array('exact' => false)), '...');
+		$this->assertIdentical($this->Text->truncate($text3, 20), '<b>&copy; 2005-20...');
+		$this->assertIdentical($this->Text->truncate($text4, 15), '<img src="my...');
+		$this->assertIdentical($this->Text->truncate($text5, 6, array('ending' => '')), '0<b>1<');
+		$this->assertIdentical($this->Text->truncate($text1, 15, array('html' => true)), 'The quick br...');
+		$this->assertIdentical($this->Text->truncate($text1, 15, array('exact' => false, 'html' => true)), 'The quick...');
+		$this->assertIdentical($this->Text->truncate($text2, 10, array('html' => true)), 'Heiz&ouml;lr...');
+		$this->assertIdentical($this->Text->truncate($text2, 10, array('exact' => false, 'html' => true)), '...');
+		$this->assertIdentical($this->Text->truncate($text3, 20, array('html' => true)), '<b>&copy; 2005-2007, Cake...</b>');
+		$this->assertIdentical($this->Text->truncate($text4, 15, array('html' => true)), '<img src="mypic.jpg"> This image ...');
+		$this->assertIdentical($this->Text->truncate($text4, 45, array('html' => true)), '<img src="mypic.jpg"> This image tag is not XHTML conform!<br><hr/><b>But t...</b>');
+		$this->assertIdentical($this->Text->truncate($text4, 90, array('html' => true)), '<img src="mypic.jpg"> This image tag is not XHTML conform!<br><hr/><b>But the following image tag should be conform <img src="mypic.jpg" alt="Me, myself and I" /></b><br />Grea...');
+		$this->assertIdentical($this->Text->truncate($text5, 6, array('ending' => '', 'html' => true)), '0<b>1<i>2<span class="myclass">3</span>4<u>5</u></i></b>');
+		$this->assertIdentical($this->Text->truncate($text5, 20, array('ending' => '', 'html' => true)), $text5);
+		$this->assertIdentical($this->Text->truncate($text6, 57, array('exact' => false, 'html' => true)), "<p><strong>Extra dates have been announced for this year's...</strong></p>");
+		$this->assertIdentical($this->Text->truncate($text7, 255), $text7);
+		$this->assertIdentical($this->Text->truncate($text7, 15), 'El moño está...');
+		$this->assertIdentical($this->Text->truncate($text8, 15), 'Vive la R'.chr(195).chr(169).'pu...');
+		$this->assertIdentical($this->Text->truncate($text9, 10), '�ОПРСТУ...');
+	}
+/**
+ * testHighlight method
+ *
+ * @access public
+ * @return void
+ */
+	function testHighlight() {
+		$text = 'This is a test text';
+		$phrases = array('This', 'text');
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
+		$expected = '<b>This</b> is a test <b>text</b>';
+		$this->assertEqual($expected, $result);
+
+		$text = 'This is a test text';
+		$phrases = null;
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
+		$this->assertEqual($result, $text);
+
+		$text = 'Ich saß in einem Café am Übergang';
+		$expected = 'Ich <b>saß</b> in einem <b>Café</b> am <b>Übergang</b>';
+		$phrases = array('saß', 'café', 'übergang');
+		$result = $this->Text->highlight($text, $phrases, array('format' => '<b>\1</b>'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testHighlightHtml method
+ *
+ * @access public
+ * @return void
+ */
+	function testHighlightHtml() {
+		$text1 = '<p>strongbow isn&rsquo;t real cider</p>';
+		$text2 = '<p>strongbow <strong>isn&rsquo;t</strong> real cider</p>';
+		$text3 = '<img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$text4 = 'What a strong mouse: <img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$options = array('format' => '<b>\1</b>', 'html' => true);
+
+		$expected = '<p><b>strong</b>bow isn&rsquo;t real cider</p>';
+		$this->assertEqual($this->Text->highlight($text1, 'strong', $options), $expected);
+
+		$expected = '<p><b>strong</b>bow <strong>isn&rsquo;t</strong> real cider</p>';
+		$this->assertEqual($this->Text->highlight($text2, 'strong', $options), $expected);
+
+		$this->assertEqual($this->Text->highlight($text3, 'strong', $options), $text3);
+
+		$this->assertEqual($this->Text->highlight($text3, array('strong', 'what'), $options), $text3);
+
+		$expected = '<b>What</b> a <b>strong</b> mouse: <img src="what-a-strong-mouse.png" alt="What a strong mouse!" />';
+		$this->assertEqual($this->Text->highlight($text4, array('strong', 'what'), $options), $expected);
+	}
+
+/**
+ * testHighlightMulti method
+ *
+ * @access public
+ * @return void
+ */
+	function testHighlightMulti() {
+		$text = 'This is a test text';
+		$phrases = array('This', 'text');
+		$result = $this->Text->highlight($text, $phrases, array('format' => array('<b>\1</b>', '<em>\1</em>')));
+		$expected = '<b>This</b> is a test <em>text</em>';
+		$this->assertEqual($expected, $result);
+
+	}
+
+/**
+ * testStripLinks method
+ *
+ * @access public
+ * @return void
+ */
+	function testStripLinks() {
+		$text = 'This is a test text';
+		$expected = 'This is a test text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'This is a <a href="#">test</a> text';
+		$expected = 'This is a test text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'This <strong>is</strong> a <a href="#">test</a> <a href="#">text</a>';
+		$expected = 'This <strong>is</strong> a test text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'This <strong>is</strong> a <a href="#">test</a> and <abbr>some</abbr> other <a href="#">text</a>';
+		$expected = 'This <strong>is</strong> a test and <abbr>some</abbr> other text';
+		$result = $this->Text->stripLinks($text);
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testAutoLink method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoLink() {
+		$text = 'This is a test text';
+		$expected = 'This is a test text';
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'Text with a partial www.cakephp.org URL and test@cakephp.org email address';
+		$result = $this->Text->autoLink($text);
+		$expected = 'Text with a partial <a href="http://www.cakephp.org">www.cakephp.org</a> URL and <a href="mailto:test@cakephp\.org">test@cakephp\.org</a> email address';
+		$this->assertPattern('#^' . $expected . '$#', $result);
+
+		$text = 'This is a test text with URL http://www.cakephp.org';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a>';
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org and some more text';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a> and some more text';
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = "This is a test text with URL http://www.cakephp.org\tand some more text";
+		$expected = "This is a test text with URL <a href=\"http://www.cakephp.org\">http://www.cakephp.org</a>\tand some more text";
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org(and some more text)';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org">http://www.cakephp.org</a>(and some more text)';
+		$result = $this->Text->autoLink($text);
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org" class="link">http://www.cakephp.org</a>';
+		$result = $this->Text->autoLink($text, array('class'=>'link'));
+		$this->assertEqual($result, $expected);
+
+		$text = 'This is a test text with URL http://www.cakephp.org';
+		$expected = 'This is a test text with URL <a href="http://www.cakephp.org" class="link" id="MyLink">http://www.cakephp.org</a>';
+		$result = $this->Text->autoLink($text, array('class'=>'link', 'id'=>'MyLink'));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testAutoLinkUrls method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoLinkUrls() {
+		$text = 'This is a test text';
+		$expected = 'This is a test text';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'This is a test that includes (www.cakephp.org)';
+		$expected = 'This is a test that includes (<a href="http://www.cakephp.org">www.cakephp.org</a>)';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'Text with a partial www.cakephp.org URL';
+		$expected = 'Text with a partial <a href="http://www.cakephp.org"\s*>www.cakephp.org</a> URL';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertPattern('#^' . $expected . '$#', $result);
+
+		$text = 'Text with a partial www.cakephp.org URL';
+		$expected = 'Text with a partial <a href="http://www.cakephp.org" \s*class="link">www.cakephp.org</a> URL';
+		$result = $this->Text->autoLinkUrls($text, array('class' => 'link'));
+		$this->assertPattern('#^' . $expected . '$#', $result);
+
+		$text = 'Text with a partial WWW.cakephp.org URL';
+		$expected = 'Text with a partial <a href="http://WWW.cakephp.org"\s*>WWW.cakephp.org</a> URL';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertPattern('#^' . $expected . '$#', $result);
+
+		$text = 'Text with a partial WWW.cakephp.org &copy; URL';
+		$expected = 'Text with a partial <a href="http://WWW.cakephp.org"\s*>WWW.cakephp.org</a> &copy; URL';
+		$result = $this->Text->autoLinkUrls($text, array('escape' => false));
+		$this->assertPattern('#^' . $expected . '$#', $result);
+
+		$text = 'Text with a url www.cot.ag/cuIb2Q and more';
+		$expected = 'Text with a url <a href="http://www.cot.ag/cuIb2Q">www.cot.ag/cuIb2Q</a> and more';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertEqual($expected, $result);
+		
+		$text = 'Text with a url http://www.does--not--work.com and more';
+		$expected = 'Text with a url <a href="http://www.does--not--work.com">http://www.does--not--work.com</a> and more';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertEqual($expected, $result);
+		
+		$text = 'Text with a url http://www.not--work.com and more';
+		$expected = 'Text with a url <a href="http://www.not--work.com">http://www.not--work.com</a> and more';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testAutoLinkEmails method
+ *
+ * @access public
+ * @return void
+ */
+	function testAutoLinkEmails() {
+		$text = 'This is a test text';
+		$expected = 'This is a test text';
+		$result = $this->Text->autoLinkUrls($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'Text with email@example.com address';
+		$expected = 'Text with <a href="mailto:email@example.com"\s*>email@example.com</a> address';
+		$result = $this->Text->autoLinkEmails($text);
+		$this->assertPattern('#^' . $expected . '$#', $result);
+		
+		$text = "Text with o'hare._-bob@example.com address";
+		$expected = 'Text with <a href="mailto:o&#039;hare._-bob@example.com">o&#039;hare._-bob@example.com</a> address';
+		$result = $this->Text->autoLinkEmails($text);
+		$this->assertEqual($expected, $result);
+
+		$text = 'Text with email@example.com address';
+		$expected = 'Text with <a href="mailto:email@example.com" \s*class="link">email@example.com</a> address';
+		$result = $this->Text->autoLinkEmails($text, array('class' => 'link'));
+		$this->assertPattern('#^' . $expected . '$#', $result);
+	}
+
+/**
+ * test invalid email addresses.
+ *
+ * @return void
+ */
+	function testAutoLinkEmailInvalid() {
+		$result = $this->Text->autoLinkEmails('this is a myaddress@gmx-de test');
+		$expected = 'this is a myaddress@gmx-de test';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testHighlightCaseInsensitivity method
+ *
+ * @access public
+ * @return void
+ */
+	function testHighlightCaseInsensitivity() {
+		$text = 'This is a Test text';
+		$expected = 'This is a <b>Test</b> text';
+
+		$result = $this->Text->highlight($text, 'test', array('format' => '<b>\1</b>'));
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Text->highlight($text, array('test'), array('format' => '<b>\1</b>'));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testExcerpt method
+ *
+ * @access public
+ * @return void
+ */
+	function testExcerpt() {
+		$text = 'This is a phrase with test text to play with';
+
+		$expected = '...with test text...';
+		$result = $this->Text->excerpt($text, 'test', 9, '...');
+		$this->assertEqual($expected, $result);
+
+		$expected = 'This is a...';
+		$result = $this->Text->excerpt($text, 'not_found', 9, '...');
+		$this->assertEqual($expected, $result);
+
+		$expected = 'This is a phras...';
+		$result = $this->Text->excerpt($text, null, 9, '...');
+		$this->assertEqual($expected, $result);
+
+		$expected = $text;
+		$result = $this->Text->excerpt($text, null, 200, '...');
+		$this->assertEqual($expected, $result);
+
+		$expected = '...phrase...';
+		$result = $this->Text->excerpt($text, 'phrase', 2, '...');
+		$this->assertEqual($expected, $result);
+
+		$phrase = 'This is a phrase with test';
+		$expected = $text;
+		$result = $this->Text->excerpt($text, $phrase, strlen($phrase) + 3, '...');
+		$this->assertEqual($expected, $result);
+
+		$phrase = 'This is a phrase with text';
+		$expected = $text;
+		$result = $this->Text->excerpt($text, $phrase, 10, '...');
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testExcerptCaseInsensitivity method
+ *
+ * @access public
+ * @return void
+ */
+	function testExcerptCaseInsensitivity() {
+		$text = 'This is a phrase with test text to play with';
+
+		$expected = '...with test text...';
+		$result = $this->Text->excerpt($text, 'TEST', 9, '...');
+		$this->assertEqual($expected, $result);
+
+		$expected = 'This is a...';
+		$result = $this->Text->excerpt($text, 'NOT_FOUND', 9, '...');
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testListGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testListGeneration() {
+		$result = $this->Text->toList(array());
+		$this->assertEqual($result, '');
+
+		$result = $this->Text->toList(array('One'));
+		$this->assertEqual($result, 'One');
+
+		$result = $this->Text->toList(array('Larry', 'Curly', 'Moe'));
+		$this->assertEqual($result, 'Larry, Curly and Moe');
+
+		$result = $this->Text->toList(array('Dusty', 'Lucky', 'Ned'), 'y');
+		$this->assertEqual($result, 'Dusty, Lucky y Ned');
+
+		$result = $this->Text->toList(array( 1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'y');
+		$this->assertEqual($result, 'Dusty, Lucky y Ned');
+
+		$result = $this->Text->toList(array( 1 => 'Dusty', 2 => 'Lucky', 3 => 'Ned'), 'and', ' + ');
+		$this->assertEqual($result, 'Dusty + Lucky and Ned');
+
+		$result = $this->Text->toList(array( 'name1' => 'Dusty', 'name2' => 'Lucky'));
+		$this->assertEqual($result, 'Dusty and Lucky');
+		
+		$result = $this->Text->toList(array( 'test_0' => 'banana', 'test_1' => 'apple', 'test_2' => 'lemon'));
+		$this->assertEqual($result, 'banana, apple and lemon');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/time.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/time.test.php
new file mode 100644
index 000000000..5501750cf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/time.test.php
@@ -0,0 +1,803 @@
+<?php
+/**
+ * TimeHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import('Helper', 'Time');
+
+/**
+ * TimeHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TimeHelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Time = new TimeHelper();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Time);
+	}
+
+/**
+ * testToQuarter method
+ *
+ * @access public
+ * @return void
+ */
+	function testToQuarter() {
+		$result = $this->Time->toQuarter('2007-12-25');
+		$this->assertEqual($result, 4);
+
+		$result = $this->Time->toQuarter('2007-9-25');
+		$this->assertEqual($result, 3);
+
+		$result = $this->Time->toQuarter('2007-3-25');
+		$this->assertEqual($result, 1);
+
+		$result = $this->Time->toQuarter('2007-3-25', true);
+		$this->assertEqual($result, array('2007-01-01', '2007-03-31'));
+
+		$result = $this->Time->toQuarter('2007-5-25', true);
+		$this->assertEqual($result, array('2007-04-01', '2007-06-30'));
+
+		$result = $this->Time->toQuarter('2007-8-25', true);
+		$this->assertEqual($result, array('2007-07-01', '2007-09-30'));
+
+		$result = $this->Time->toQuarter('2007-12-25', true);
+		$this->assertEqual($result, array('2007-10-01', '2007-12-31'));
+	}
+
+/**
+ * testTimeAgoInWords method
+ *
+ * @access public
+ * @return void
+ */
+	function testTimeAgoInWords() {
+		$result = $this->Time->timeAgoInWords(strtotime('+4 months +2 weeks +3 days'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '4 months, 2 weeks, 3 days');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+4 months +2 weeks +2 days'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '4 months, 2 weeks, 2 days');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+4 months +2 weeks +1 day'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '4 months, 2 weeks, 1 day');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+3 months +2 weeks +1 day'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '3 months, 2 weeks, 1 day');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+3 months +2 weeks'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '3 months, 2 weeks');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+3 months +1 week +6 days'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '3 months, 1 week, 6 days');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +2 weeks +1 day'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '2 months, 2 weeks, 1 day');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +2 weeks'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '2 months, 2 weeks');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +1 week +6 days'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '2 months, 1 week, 6 days');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+1 month +1 week +6 days'), array('end' => '8 years'), true);
+		$this->assertEqual($result, '1 month, 1 week, 6 days');
+
+		for($i = 0; $i < 200; $i ++) {
+			$years = mt_rand(0, 3);
+			$months = mt_rand(0, 11);
+			$weeks = mt_rand(0, 3);
+			$days = mt_rand(0, 6);
+			$hours = 0;
+			$minutes = 0;
+			$seconds = 0;
+			$relative_date = '';
+
+			if ($years > 0) {
+				// years and months and days
+				$relative_date .= ($relative_date ? ', -' : '-') . $years . ' year' . ($years > 1 ? 's' : '');
+				$relative_date .= $months > 0 ? ($relative_date ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '') : '';
+				$relative_date .= $weeks > 0 ? ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
+				$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
+			} elseif (abs($months) > 0) {
+				// months, weeks and days
+				$relative_date .= ($relative_date ? ', -' : '-') . $months . ' month' . ($months > 1 ? 's' : '');
+				$relative_date .= $weeks > 0 ? ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
+				$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
+			} elseif (abs($weeks) > 0) {
+				// weeks and days
+				$relative_date .= ($relative_date ? ', -' : '-') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
+				$relative_date .= $days > 0 ? ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '') : '';
+			} elseif (abs($days) > 0) {
+				// days and hours
+				$relative_date .= ($relative_date ? ', -' : '-') . $days . ' day' . ($days > 1 ? 's' : '');
+				$relative_date .= $hours > 0 ? ($relative_date ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
+			} elseif (abs($hours) > 0) {
+				// hours and minutes
+				$relative_date .= ($relative_date ? ', -' : '-') . $hours . ' hour' . ($hours > 1 ? 's' : '');
+				$relative_date .= $minutes > 0 ? ($relative_date ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
+			} elseif (abs($minutes) > 0) {
+				// minutes only
+				$relative_date .= ($relative_date ? ', -' : '-') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
+			} else {
+				// seconds only
+				$relative_date .= ($relative_date ? ', -' : '-') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
+			}
+
+			if (date('j/n/y', strtotime(str_replace(',','',$relative_date))) != '1/1/70') {
+				$result = $this->Time->timeAgoInWords(strtotime(str_replace(',','',$relative_date)), array('end' => '8 years'), true);
+				if ($relative_date == '0 seconds') {
+					$relative_date = '0 seconds ago';
+				}
+
+				$relative_date = str_replace('-', '', $relative_date) . ' ago';
+				$this->assertEqual($result, $relative_date);
+
+			}
+		}
+
+		for ($i = 0; $i < 200; $i ++) {
+			$years = mt_rand(0, 3);
+			$months = mt_rand(0, 11);
+			$weeks = mt_rand(0, 3);
+			$days = mt_rand(0, 6);
+			$hours = 0;
+			$minutes = 0;
+			$seconds = 0;
+
+			$relative_date = '';
+
+			if ($years > 0) {
+				// years and months and days
+				$relative_date .= ($relative_date ? ', ' : '') . $years . ' year' . ($years > 1 ? 's' : '');
+				$relative_date .= $months > 0 ? ($relative_date ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '') : '';
+				$relative_date .= $weeks > 0 ? ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
+				$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
+			} elseif (abs($months) > 0) {
+				// months, weeks and days
+				$relative_date .= ($relative_date ? ', ' : '') . $months . ' month' . ($months > 1 ? 's' : '');
+				$relative_date .= $weeks > 0 ? ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '') : '';
+				$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
+			} elseif (abs($weeks) > 0) {
+				// weeks and days
+				$relative_date .= ($relative_date ? ', ' : '') . $weeks . ' week' . ($weeks > 1 ? 's' : '');
+				$relative_date .= $days > 0 ? ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '') : '';
+			} elseif (abs($days) > 0) {
+				// days and hours
+				$relative_date .= ($relative_date ? ', ' : '') . $days . ' day' . ($days > 1 ? 's' : '');
+				$relative_date .= $hours > 0 ? ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '') : '';
+			} elseif (abs($hours) > 0) {
+				// hours and minutes
+				$relative_date .= ($relative_date ? ', ' : '') . $hours . ' hour' . ($hours > 1 ? 's' : '');
+				$relative_date .= $minutes > 0 ? ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '') : '';
+			} elseif (abs($minutes) > 0) {
+				// minutes only
+				$relative_date .= ($relative_date ? ', ' : '') . $minutes . ' minute' . ($minutes > 1 ? 's' : '');
+			} else {
+				// seconds only
+				$relative_date .= ($relative_date ? ', ' : '') . $seconds . ' second' . ($seconds != 1 ? 's' : '');
+			}
+
+			if (date('j/n/y', strtotime(str_replace(',','',$relative_date))) != '1/1/70') {
+				$result = $this->Time->timeAgoInWords(strtotime(str_replace(',','',$relative_date)), array('end' => '8 years'), true);
+				if ($relative_date == '0 seconds') {
+					$relative_date = '0 seconds ago';
+				}
+
+				$relative_date = str_replace('-', '', $relative_date) . '';
+				$this->assertEqual($result, $relative_date);
+			}
+		}
+
+		$result = $this->Time->timeAgoInWords(strtotime('-2 years -5 months -2 days'), array('end' => '3 years'), true);
+		$this->assertEqual($result, '2 years, 5 months, 2 days ago');
+
+		$result = $this->Time->timeAgoInWords('2007-9-25');
+		$this->assertEqual($result, 'on 25/9/07');
+
+		$result = $this->Time->timeAgoInWords('2007-9-25', 'Y-m-d');
+		$this->assertEqual($result, 'on 2007-09-25');
+
+		$result = $this->Time->timeAgoInWords('2007-9-25', 'Y-m-d', true);
+		$this->assertEqual($result, 'on 2007-09-25');
+
+		$result = $this->Time->timeAgoInWords(strtotime('-2 weeks -2 days'), 'Y-m-d', false);
+		$this->assertEqual($result, '2 weeks, 2 days ago');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 weeks +2 days'), 'Y-m-d', true);
+		$this->assertPattern('/^2 weeks, [1|2] day(s)?$/', $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +2 days'), array('end' => '1 month'));
+		$this->assertEqual($result, 'on ' . date('j/n/y', strtotime('+2 months +2 days')));
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +2 days'), array('end' => '3 month'));
+		$this->assertPattern('/2 months/', $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +12 days'), array('end' => '3 month'));
+		$this->assertPattern('/2 months, 1 week/', $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('+3 months +5 days'), array('end' => '4 month'));
+		$this->assertEqual($result, '3 months, 5 days');
+
+		$result = $this->Time->timeAgoInWords(strtotime('-2 months -2 days'), array('end' => '3 month'));
+		$this->assertEqual($result, '2 months, 2 days ago');
+
+		$result = $this->Time->timeAgoInWords(strtotime('-2 months -2 days'), array('end' => '3 month'));
+		$this->assertEqual($result, '2 months, 2 days ago');
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +2 days'), array('end' => '3 month'));
+		$this->assertPattern('/2 months/', $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('+2 months +2 days'), array('end' => '1 month', 'format' => 'Y-m-d'));
+		$this->assertEqual($result, 'on ' . date('Y-m-d', strtotime('+2 months +2 days')));
+
+		$result = $this->Time->timeAgoInWords(strtotime('-2 months -2 days'), array('end' => '1 month', 'format' => 'Y-m-d'));
+		$this->assertEqual($result, 'on ' . date('Y-m-d', strtotime('-2 months -2 days')));
+
+		$result = $this->Time->timeAgoInWords(strtotime('-13 months -5 days'), array('end' => '2 years'));
+		$this->assertEqual($result, '1 year, 1 month, 5 days ago');
+
+		$fourHours = $this->Time->timeAgoInWords(strtotime('-5 days -2 hours'), array('userOffset' => -4));
+		$result = $this->Time->timeAgoInWords(strtotime('-5 days -2 hours'), array('userOffset' => 4));
+		$this->assertEqual($fourHours, $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('-2 hours'));
+		$expected = '2 hours ago';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('-12 minutes'));
+		$expected = '12 minutes ago';
+		$this->assertEqual($expected, $result);
+
+		$result = $this->Time->timeAgoInWords(strtotime('-12 seconds'));
+		$expected = '12 seconds ago';
+		$this->assertEqual($expected, $result);
+
+		$time = strtotime('-3 years -12 months');
+		$result = $this->Time->timeAgoInWords($time);
+		$expected = 'on ' . date('j/n/y', $time);
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testRelative method
+ *
+ * @access public
+ * @return void
+ */
+	function testRelative() {
+		$result = $this->Time->relativeTime('-1 week');
+		$this->assertEqual($result, '1 week ago');
+		$result = $this->Time->relativeTime('+1 week');
+		$this->assertEqual($result, '1 week');
+	}
+
+/**
+ * testNice method
+ *
+ * @access public
+ * @return void
+ */
+	function testNice() {
+		$time = time() + 2 * DAY;
+		$this->assertEqual(date('D, M jS Y, H:i', $time), $this->Time->nice($time));
+
+		$time = time() - 2 * DAY;
+		$this->assertEqual(date('D, M jS Y, H:i', $time), $this->Time->nice($time));
+
+		$time = time();
+		$this->assertEqual(date('D, M jS Y, H:i', $time), $this->Time->nice($time));
+
+		$time = 0;
+		$this->assertEqual(date('D, M jS Y, H:i', time()), $this->Time->nice($time));
+
+		$time = null;
+		$this->assertEqual(date('D, M jS Y, H:i', time()), $this->Time->nice($time));
+	}
+
+/**
+ * testNiceShort method
+ *
+ * @access public
+ * @return void
+ */
+	function testNiceShort() {
+		$time = time() + 2 * DAY;
+		if (date('Y', $time) == date('Y')) {
+			$this->assertEqual(date('M jS, H:i', $time), $this->Time->niceShort($time));
+		} else {
+			$this->assertEqual(date('M jS Y, H:i', $time), $this->Time->niceShort($time));
+		}
+
+		$time = time();
+		$this->assertEqual('Today, ' . date('H:i', $time), $this->Time->niceShort($time));
+
+		$time = time() - DAY;
+		$this->assertEqual('Yesterday, ' . date('H:i', $time), $this->Time->niceShort($time));
+	}
+
+/**
+ * testDaysAsSql method
+ *
+ * @access public
+ * @return void
+ */
+	function testDaysAsSql() {
+		$begin = time();
+		$end = time() + DAY;
+		$field = 'my_field';
+		$expected = '(my_field >= \''.date('Y-m-d', $begin).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $end).' 23:59:59\')';
+		$this->assertEqual($expected, $this->Time->daysAsSql($begin, $end, $field));
+	}
+
+/**
+ * testDayAsSql method
+ *
+ * @access public
+ * @return void
+ */
+	function testDayAsSql() {
+		$time = time();
+		$field = 'my_field';
+		$expected = '(my_field >= \''.date('Y-m-d', $time).' 00:00:00\') AND (my_field <= \''.date('Y-m-d', $time).' 23:59:59\')';
+		$this->assertEqual($expected, $this->Time->dayAsSql($time, $field));
+	}
+
+/**
+ * testToUnix method
+ *
+ * @access public
+ * @return void
+ */
+	function testToUnix() {
+		$this->assertEqual(time(), $this->Time->toUnix(time()));
+		$this->assertEqual(strtotime('+1 day'), $this->Time->toUnix('+1 day'));
+		$this->assertEqual(strtotime('+0 days'), $this->Time->toUnix('+0 days'));
+		$this->assertEqual(strtotime('-1 days'), $this->Time->toUnix('-1 days'));
+		$this->assertEqual(false, $this->Time->toUnix(''));
+		$this->assertEqual(false, $this->Time->toUnix(null));
+	}
+
+/**
+ * testToAtom method
+ *
+ * @access public
+ * @return void
+ */
+	function testToAtom() {
+		$this->assertEqual(date('Y-m-d\TH:i:s\Z'), $this->Time->toAtom(time()));
+	}
+
+/**
+ * testToRss method
+ *
+ * @access public
+ * @return void
+ */
+	function testToRss() {
+		$this->assertEqual(date('r'), $this->Time->toRss(time()));
+	}
+
+/**
+ * testFormat method
+ *
+ * @access public
+ * @return void
+ */
+	function testFormat() {
+		$format = 'D-M-Y';
+		$arr = array(time(), strtotime('+1 days'), strtotime('+1 days'), strtotime('+0 days'));
+		foreach ($arr as $val) {
+			$this->assertEqual(date($format, $val), $this->Time->format($format, $val));
+		}
+
+		$result = $this->Time->format('Y-m-d', null, 'never');
+		$this->assertEqual($result, 'never');
+	}
+
+/**
+ * testOfGmt method
+ *
+ * @access public
+ * @return void
+ */
+	function testGmt() {
+		$hour = 3;
+		$min = 4;
+		$sec = 2;
+		$month = 5;
+		$day = 14;
+		$year = 2007;
+		$time = mktime($hour, $min, $sec, $month, $day, $year);
+		$expected = gmmktime($hour, $min, $sec, $month, $day, $year);
+		$this->assertEqual($expected, $this->Time->gmt(date('Y-n-j G:i:s', $time)));
+
+		$hour = date('H');
+		$min = date('i');
+		$sec = date('s');
+		$month = date('m');
+		$day = date('d');
+		$year = date('Y');
+		$expected = gmmktime($hour, $min, $sec, $month, $day, $year);
+		$this->assertEqual($expected, $this->Time->gmt(null));
+	}
+
+/**
+ * testIsToday method
+ *
+ * @access public
+ * @return void
+ */
+	function testIsToday() {
+		$result = $this->Time->isToday('+1 day');
+		$this->assertFalse($result);
+		$result = $this->Time->isToday('+1 days');
+		$this->assertFalse($result);
+		$result = $this->Time->isToday('+0 day');
+		$this->assertTrue($result);
+		$result = $this->Time->isToday('-1 day');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testIsThisWeek method
+ *
+ * @access public
+ * @return void
+ */
+	function testIsThisWeek() {
+		// A map of days which goes from -1 day of week to +1 day of week
+		$map = array(
+			'Mon' => array(-1, 7), 'Tue' => array(-2, 6), 'Wed' => array(-3, 5),
+			'Thu' => array(-4, 4), 'Fri' => array(-5, 3), 'Sat' => array(-6, 2),
+			'Sun' => array(-7, 1)
+		);
+		$days = $map[date('D')];
+
+		for ($day = $days[0] + 1; $day < $days[1]; $day++) {
+			$this->assertTrue($this->Time->isThisWeek(($day > 0 ? '+' : '') . $day . ' days'));
+		}
+		$this->assertFalse($this->Time->isThisWeek($days[0] . ' days'));
+		$this->assertFalse($this->Time->isThisWeek('+' . $days[1] . ' days'));
+	}
+
+/**
+ * testIsThisMonth method
+ *
+ * @access public
+ * @return void
+ */
+	function testIsThisMonth() {
+		$result = $this->Time->isThisMonth('+0 day');
+		$this->assertTrue($result);
+		$result = $this->Time->isThisMonth($time = mktime(0, 0, 0, date('m'), mt_rand(1, 28), date('Y')));
+		$this->assertTrue($result);
+		$result = $this->Time->isThisMonth(mktime(0, 0, 0, date('m'), mt_rand(1, 28), date('Y') - mt_rand(1, 12)));
+		$this->assertFalse($result);
+		$result = $this->Time->isThisMonth(mktime(0, 0, 0, date('m'), mt_rand(1, 28), date('Y') + mt_rand(1, 12)));
+		$this->assertFalse($result);
+
+	}
+
+/**
+ * testIsThisYear method
+ *
+ * @access public
+ * @return void
+ */
+	function testIsThisYear() {
+		$result = $this->Time->isThisYear('+0 day');
+		$this->assertTrue($result);
+		$result = $this->Time->isThisYear(mktime(0, 0, 0, mt_rand(1, 12), mt_rand(1, 28), date('Y')));
+		$this->assertTrue($result);
+	}
+	/**
+ * testWasYesterday method
+ *
+ * @access public
+ * @return void
+ */
+	function testWasYesterday() {
+		$result = $this->Time->wasYesterday('+1 day');
+		$this->assertFalse($result);
+		$result = $this->Time->wasYesterday('+1 days');
+		$this->assertFalse($result);
+		$result = $this->Time->wasYesterday('+0 day');
+		$this->assertFalse($result);
+		$result = $this->Time->wasYesterday('-1 day');
+		$this->assertTrue($result);
+		$result = $this->Time->wasYesterday('-1 days');
+		$this->assertTrue($result);
+		$result = $this->Time->wasYesterday('-2 days');
+		$this->assertFalse($result);
+	}
+	/**
+ * testIsTomorrow method
+ *
+ * @access public
+ * @return void
+ */
+	function testIsTomorrow() {
+		$result = $this->Time->isTomorrow('+1 day');
+		$this->assertTrue($result);
+		$result = $this->Time->isTomorrow('+1 days');
+		$this->assertTrue($result);
+		$result = $this->Time->isTomorrow('+0 day');
+		$this->assertFalse($result);
+		$result = $this->Time->isTomorrow('-1 day');
+		$this->assertFalse($result);
+	}
+
+/**
+ * testWasWithinLast method
+ *
+ * @access public
+ * @return void
+ */
+	function testWasWithinLast() {
+		$this->assertTrue($this->Time->wasWithinLast('1 day', '-1 day'));
+		$this->assertTrue($this->Time->wasWithinLast('1 week', '-1 week'));
+		$this->assertTrue($this->Time->wasWithinLast('1 year', '-1 year'));
+		$this->assertTrue($this->Time->wasWithinLast('1 second', '-1 second'));
+		$this->assertTrue($this->Time->wasWithinLast('1 minute', '-1 minute'));
+		$this->assertTrue($this->Time->wasWithinLast('1 year', '-1 year'));
+		$this->assertTrue($this->Time->wasWithinLast('1 month', '-1 month'));
+		$this->assertTrue($this->Time->wasWithinLast('1 day', '-1 day'));
+
+		$this->assertTrue($this->Time->wasWithinLast('1 week', '-1 day'));
+		$this->assertTrue($this->Time->wasWithinLast('2 week', '-1 week'));
+		$this->assertFalse($this->Time->wasWithinLast('1 second', '-1 year'));
+		$this->assertTrue($this->Time->wasWithinLast('10 minutes', '-1 second'));
+		$this->assertTrue($this->Time->wasWithinLast('23 minutes', '-1 minute'));
+		$this->assertFalse($this->Time->wasWithinLast('0 year', '-1 year'));
+		$this->assertTrue($this->Time->wasWithinLast('13 month', '-1 month'));
+		$this->assertTrue($this->Time->wasWithinLast('2 days', '-1 day'));
+
+		$this->assertFalse($this->Time->wasWithinLast('1 week', '-2 weeks'));
+		$this->assertFalse($this->Time->wasWithinLast('1 second', '-2 seconds'));
+		$this->assertFalse($this->Time->wasWithinLast('1 day', '-2 days'));
+		$this->assertFalse($this->Time->wasWithinLast('1 hour', '-2 hours'));
+		$this->assertFalse($this->Time->wasWithinLast('1 month', '-2 months'));
+		$this->assertFalse($this->Time->wasWithinLast('1 year', '-2 years'));
+
+		$this->assertFalse($this->Time->wasWithinLast('1 day', '-2 weeks'));
+		$this->assertFalse($this->Time->wasWithinLast('1 day', '-2 days'));
+		$this->assertFalse($this->Time->wasWithinLast('0 days', '-2 days'));
+		$this->assertTrue($this->Time->wasWithinLast('1 hour', '-20 seconds'));
+		$this->assertTrue($this->Time->wasWithinLast('1 year', '-60 minutes -30 seconds'));
+		$this->assertTrue($this->Time->wasWithinLast('3 years', '-2 months'));
+		$this->assertTrue($this->Time->wasWithinLast('5 months', '-4 months'));
+
+		$this->assertTrue($this->Time->wasWithinLast('5 ', '-3 days'));
+		$this->assertTrue($this->Time->wasWithinLast('1   ', '-1 hour'));
+		$this->assertTrue($this->Time->wasWithinLast('1   ', '-1 minute'));
+		$this->assertTrue($this->Time->wasWithinLast('1   ', '-23 hours -59 minutes -59 seconds'));
+	}
+	/**
+ * testUserOffset method
+ *
+ * @access public
+ * @return void
+ */
+	function testUserOffset() {
+		if ($this->skipIf(!class_exists('DateTimeZone'), '%s DateTimeZone class not available.')) {
+			return;
+		}
+
+
+		$timezoneServer = new DateTimeZone(date_default_timezone_get());
+		$timeServer = new DateTime('now', $timezoneServer);
+		$yourTimezone = $timezoneServer->getOffset($timeServer) / HOUR;
+
+		$expected = time();
+		$result = $this->Time->fromString(time(), $yourTimezone);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test fromString()
+ *
+ * @access public
+ * @return void
+ */
+	function testFromString() {
+		$result = $this->Time->fromString('');
+		$this->assertFalse($result);
+
+		$result = $this->Time->fromString(0, 0);
+		$this->assertFalse($result);
+
+		$result = $this->Time->fromString('+1 hour');
+		$expected = strtotime('+1 hour');
+		$this->assertEqual($result, $expected);
+
+		$timezone = date('Z', time());
+		$result = $this->Time->fromString('+1 hour', $timezone);
+		$expected = $this->Time->convert(strtotime('+1 hour'), $timezone);
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test converting time specifiers using a time definition localfe file
+ *
+ * @access public
+ * @return void
+ */
+	function testConvertSpecifiers() {
+		App::build(array(
+			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+		), true);
+		Configure::write('Config.language', 'time_test');
+		$time = strtotime('Thu Jan 14 11:43:39 2010');
+
+		$result = $this->Time->convertSpecifiers('%a', $time);
+		$expected = 'jue';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%A', $time);
+		$expected = 'jueves';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%c', $time);
+		$expected = 'jue %d ene %Y %H:%M:%S %Z';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%C', $time);
+		$expected = '20';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%D', $time);
+		$expected = '%m/%d/%y';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%b', $time);
+		$expected = 'ene';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%h', $time);
+		$expected = 'ene';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%B', $time);
+		$expected = 'enero';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%n', $time);
+		$expected = "\n";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%n', $time);
+		$expected = "\n";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%p', $time);
+		$expected = 'AM';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%P', $time);
+		$expected = 'am';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%r', $time);
+		$expected = '%I:%M:%S AM';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%R', $time);
+		$expected = '11:43';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%t', $time);
+		$expected = "\t";
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%T', $time);
+		$expected = '%H:%M:%S';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%u', $time);
+		$expected = 4;
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%x', $time);
+		$expected = '%d/%m/%y';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%X', $time);
+		$expected = '%H:%M:%S';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test convert %e on windows.
+ *
+ * @return void
+ */
+	function testConvertPercentE() {
+		if ($this->skipIf(DS !== '\\', 'Cannot run windows tests on non-windows OS')) {
+			return;
+		}
+		$time = strtotime('Thu Jan 14 11:43:39 2010');
+		$result = $this->Time->convertSpecifiers('%e', $time);
+		$expected = '14';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->convertSpecifiers('%e', strtotime('2011-01-01'));
+		$expected = ' 1';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test formatting dates taking in account preferred i18n locale file
+ *
+ * @access public
+ * @return void
+ */
+	function testI18nFormat() {
+		App::build(array(
+			'locales' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'locale' . DS)
+		), true);
+		Configure::write('Config.language', 'time_test');
+		$time = strtotime('Thu Jan 14 13:59:28 2010');
+
+		$result = $this->Time->i18nFormat($time);
+		$expected = '14/01/10';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->i18nFormat($time, '%c');
+		$expected = 'jue 14 ene 2010 13:59:28 ' . strftime('%Z', $time);
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->i18nFormat($time, 'Time is %r, and date is %x');
+		$expected = 'Time is 01:59:28 PM, and date is 14/01/10';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Time->i18nFormat('invalid date', '%x', 'Date invalid');
+		$expected = 'Date invalid';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test new format() syntax which inverts first and secod parameters
+ *
+ * @access public
+ * @return void
+ */
+	function testFormatNewSyntax() {
+		$time = time();
+		$this->assertEqual($this->Time->format($time), $this->Time->i18nFormat($time));
+		$this->assertEqual($this->Time->format($time, '%c'), $this->Time->i18nFormat($time, '%c'));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/xml.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/xml.test.php
new file mode 100644
index 000000000..3c0f8e382
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/helpers/xml.test.php
@@ -0,0 +1,298 @@
+<?php
+/**
+ * XmlHelperTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+App::import('Helper', 'Xml');
+
+/**
+ * TestXml class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class TestXml extends Object {
+
+/**
+ * content property
+ *
+ * @var string ''
+ * @access public
+ */
+	var $content = '';
+
+/**
+ * construct method
+ *
+ * @param mixed $content
+ * @access private
+ * @return void
+ */
+	function __construct($content) {
+		$this->content = $content;
+	}
+
+/**
+ * toString method
+ *
+ * @access public
+ * @return void
+ */
+	function toString() {
+		return $this->content;
+	}
+}
+
+/**
+ * XmlHelperTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view.helpers
+ */
+class XmlHelperTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->Xml =& new XmlHelper();
+		$this->Xml->beforeRender();
+		$manager =& XmlManager::getInstance();
+		$manager->namespaces = array();
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Xml);
+	}
+
+/**
+ * testAddNamespace method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddNamespace() {
+		$this->Xml->addNs('custom', 'http://example.com/dtd.xml');
+		$manager =& XmlManager::getInstance();
+
+		$expected = array('custom' => 'http://example.com/dtd.xml');
+		$this->assertEqual($manager->namespaces, $expected);
+	}
+
+/**
+ * testRemoveNamespace method
+ *
+ * @access public
+ * @return void
+ */
+	function testRemoveNamespace() {
+		$this->Xml->addNs('custom', 'http://example.com/dtd.xml');
+		$this->Xml->addNs('custom2', 'http://example.com/dtd2.xml');
+		$manager =& XmlManager::getInstance();
+
+		$expected = array('custom' => 'http://example.com/dtd.xml', 'custom2' => 'http://example.com/dtd2.xml');
+		$this->assertEqual($manager->namespaces, $expected);
+
+		$this->Xml->removeNs('custom');
+		$expected = array('custom2' => 'http://example.com/dtd2.xml');
+		$this->assertEqual($manager->namespaces, $expected);
+	}
+
+/**
+ * testRenderZeroElement method
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderZeroElement() {
+		$result = $this->Xml->elem('count', null, 0);
+		$expected = '<count>0</count>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Xml->elem('count', null, array('cdata' => true, 'value' => null));
+		$expected = '<count />';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRenderElementWithNamespace method
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderElementWithNamespace() {
+		$result = $this->Xml->elem('count', array('namespace' => 'myNameSpace'), 'content');
+		$expected = '<myNameSpace:count>content</myNameSpace:count>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Xml->elem('count', array('namespace' => 'myNameSpace'), 'content', false);
+		$expected = '<myNameSpace:count>content';
+		$this->assertEqual($result, $expected);
+
+		$expected .= '</myNameSpace:count>';
+		$result .= $this->Xml->closeElem();
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testRenderElementWithComplexContent method
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderElementWithComplexContent() {
+		$result = $this->Xml->elem('count', array('namespace' => 'myNameSpace'), array('contrived' => 'content'));
+		$expected = '<myNameSpace:count><content /></myNameSpace:count>';
+		$this->assertEqual($result, $expected);
+
+		$result = $this->Xml->elem('count', array('namespace' => 'myNameSpace'), array('cdata' => true, 'value' => 'content'));
+		$expected = '<myNameSpace:count><![CDATA[content]]></myNameSpace:count>';
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSerialize method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerialize() {
+		$data = array(
+			'test1' => 'test with no quotes',
+			'test2' => 'test with "double quotes"'
+		);
+		$result = $this->Xml->serialize($data);
+		$expected = '<std_class test1="test with no quotes" test2="test with &quot;double quotes&quot;" />';
+		$this->assertIdentical($result, $expected);
+
+		$data = array(
+			'test1' => 'test with no quotes',
+			'test2' => 'test without double quotes'
+		);
+		$result = $this->Xml->serialize($data);
+		$expected = '<std_class test1="test with no quotes" test2="test without double quotes" />';
+		$this->assertIdentical($result, $expected);
+
+		$data = array(
+			'ServiceDay' => array('ServiceTime' => array('ServiceTimePrice' => array('dollar' => 1, 'cents' => '2')))
+		);
+		$result = $this->Xml->serialize($data);
+		$expected = '<service_day><service_time><service_time_price dollar="1" cents="2" /></service_time></service_day>';
+		$this->assertIdentical($result, $expected);
+
+		$data = array(
+			'ServiceDay' => array('ServiceTime' => array('ServiceTimePrice' => array('dollar' => 1, 'cents' => '2')))
+		);
+		$result = $this->Xml->serialize($data, array('format' => 'tags'));
+		$expected = '<service_day><service_time><service_time_price><dollar>1</dollar><cents>2</cents></service_time_price></service_time></service_day>';
+		$this->assertIdentical($result, $expected);
+		
+		$data = array(
+			'Pages' => array('id' => 2, 'url' => 'http://www.url.com/rb/153/?id=bbbb&t=access')
+		);
+		$result = $this->Xml->serialize($data);
+		$expected = '<pages id="2" url="http://www.url.com/rb/153/?id=bbbb&amp;t=access" />';
+		$this->assertIdentical($result, $expected);
+
+		$test = array(
+			'Test' => array('test' => true)
+		);
+		$expected = '<test test="1" />';
+		$result = $this->Xml->serialize($test);
+		$this->assertidentical($expected, $result);
+	}
+
+/**
+ * testSerializeOnMultiDimensionalArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerializeOnMultiDimensionalArray() {
+		$data = array(
+			'Statuses' => array(
+				array('Status' => array('id' => 1)),
+				array('Status' => array('id' => 2))
+			)
+		);
+		$result = $this->Xml->serialize($data, array('format' => 'tags'));
+		$expected = '<statuses><status><id>1</id></status><status><id>2</id></status></statuses>';
+		$this->assertIdentical($result, $expected);
+
+	}
+
+/**
+ * testHeader method
+ *
+ * @access public
+ * @return void
+ */
+	function testHeader() {
+		$expectedDefaultEncoding = Configure::read('App.encoding');
+		if (empty($expectedDefaultEncoding)) {
+			$expectedDefaultEncoding = 'UTF-8';
+		}
+		$attrib = array();
+		$result = $this->Xml->header($attrib);
+		$expected = '<?xml version="1.0" encoding="'.$expectedDefaultEncoding.'" ?>';
+		$this->assertIdentical($result, $expected);
+
+		$attrib = array(
+			'encoding' => 'UTF-8',
+			'version' => '1.1'
+		);
+		$result = $this->Xml->header($attrib);
+		$expected = '<?xml version="1.1" encoding="UTF-8" ?>';
+		$this->assertIdentical($result, $expected);
+
+		$attrib = array(
+			'encoding' => 'UTF-8',
+			'version' => '1.2',
+			'additional' => 'attribute'
+		);
+		$result = $this->Xml->header($attrib);
+		$expected = '<?xml version="1.2" encoding="UTF-8" additional="attribute" ?>';
+		$this->assertIdentical($result, $expected);
+
+		$attrib = 'encoding="UTF-8" someOther="value"';
+		$result = $this->Xml->header($attrib);
+		$expected = '<?xml encoding="UTF-8" someOther="value" ?>';
+		$this->assertIdentical($result, $expected);
+	}
+
+/**
+ * test that calling elem() and then header() doesn't break
+ *
+ * @return void
+ */
+	function testElemThenHeader() {
+		$this->Xml->elem('test', array(), 'foo', false);
+		$this->assertPattern('/<\?xml/', $this->Xml->header());
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/media.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/media.test.php
new file mode 100644
index 000000000..d39e01848
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/media.test.php
@@ -0,0 +1,180 @@
+<?php
+/**
+ * ThemeViewTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('Media', 'Controller'));
+
+if (!class_exists('ErrorHandler')) {
+	App::import('Core', array('Error'));
+}
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+
+/**
+ * ThemePostsController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class MediaController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'Media'
+ * @access public
+ */
+	var $name = 'Media';
+
+/**
+ * index download
+ *
+ * @access public
+ * @return void
+ */
+	function download() {
+		$path = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'vendors' . DS .'css' . DS;
+		$id = 'test_asset.css';
+		$extension = 'css';
+		$this->set(compact('path', 'id', 'extension'));
+	}
+}
+
+/**
+ * TestMediaView class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class TestMediaView extends MediaView {
+
+/**
+ * headers public property as a copy from protected property _headers
+ *
+ * @var array
+ * @access public
+ */
+	var $headers = array();
+
+/**
+ * active property to mock the status of a remote connection
+ *
+ * @var boolean true
+ * @access public
+ */
+	var $active = true;
+
+	function _output() {
+		$this->headers = $this->_headers;
+	}
+
+/**
+ * _isActive method. Usted de $active property to mock an active (true) connection,
+ * or an aborted (false) one
+ *
+ * @access protected
+ * @return void
+ */
+	function _isActive() {
+		return $this->active;
+	}
+
+/**
+ * _clearBuffer method
+ *
+ * @access protected
+ * @return void
+ */
+	function _clearBuffer() {
+		return true;
+	}
+
+/**
+ * _flushBuffer method
+ *
+ * @access protected
+ * @return void
+ */
+	function _flushBuffer() {
+	}
+}
+
+/**
+ * ThemeViewTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class MediaViewTest extends CakeTestCase {
+
+/**
+ * startTest method
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		Router::reload();
+		$this->Controller =& new Controller();
+		$this->MediaController =& new MediaController();
+		$this->MediaController->viewPath = 'posts';
+		$this->MediaController->download();
+		$this->MediaView =& new TestMediaView($this->MediaController);
+	}
+
+/**
+ * endTest method
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->MediaView);
+		unset($this->MediaController);
+		unset($this->Controller);
+		ClassRegistry::flush();
+	}
+
+/**
+ * testRender method
+ *
+ * @access public
+ * @return void
+ */
+	function testRender() {
+		ob_start();
+		$result = $this->MediaView->render();
+		$output = ob_get_clean();
+
+		$this->assertTrue($result !== false);
+		$this->assertEqual($output, 'this is the test asset css file');
+	}
+
+/**
+ * testConnectionAborted method
+ *
+ * @access public
+ * @return void
+ */
+	function testConnectionAborted() {
+		$this->MediaView->active = false;
+		$result = $this->MediaView->render();
+		$this->assertFalse($result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/theme.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/theme.test.php
new file mode 100644
index 000000000..15cba28fb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/theme.test.php
@@ -0,0 +1,343 @@
+<?php
+/**
+ * ThemeViewTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('Theme', 'Controller'));
+
+if (!class_exists('ErrorHandler')) {
+	App::import('Core', array('Error'));
+}
+if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) {
+	define('CAKEPHP_UNIT_TEST_EXECUTION', 1);
+}
+
+/**
+ * ThemePostsController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class ThemePostsController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'ThemePosts'
+ * @access public
+ */
+	var $name = 'ThemePosts';
+
+/**
+ * index method
+ *
+ * @access public
+ * @return void
+ */
+	function index() {
+		$this->set('testData', 'Some test data');
+		$test2 = 'more data';
+		$test3 = 'even more data';
+		$this->set(compact('test2', 'test3'));
+	}
+}
+
+/**
+ * ThemeViewTestErrorHandler class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class ThemeViewTestErrorHandler extends ErrorHandler {
+
+/**
+ * stop method
+ *
+ * @access public
+ * @return void
+ */
+	function _stop() {
+		return;
+	}
+}
+
+/**
+ * TestThemeView class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class TestThemeView extends ThemeView {
+
+/**
+ * renderElement method
+ *
+ * @param mixed $name
+ * @param array $params
+ * @access public
+ * @return void
+ */
+	function renderElement($name, $params = array()) {
+		return $name;
+	}
+
+/**
+ * getViewFileName method
+ *
+ * @param mixed $name
+ * @access public
+ * @return void
+ */
+	function getViewFileName($name = null) {
+		return $this->_getViewFileName($name);
+	}
+
+/**
+ * getLayoutFileName method
+ *
+ * @param mixed $name
+ * @access public
+ * @return void
+ */
+	function getLayoutFileName($name = null) {
+		return $this->_getLayoutFileName($name);
+	}
+
+/**
+ * cakeError method
+ *
+ * @param mixed $method
+ * @param mixed $messages
+ * @access public
+ * @return void
+ */
+	function cakeError($method, $messages) {
+		$error =& new ThemeViewTestErrorHandler($method, $messages);
+		return $error;
+	}
+}
+
+/**
+ * ThemeViewTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ThemeViewTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		Router::reload();
+		$this->Controller =& new Controller();
+		$this->PostsController =& new ThemePostsController();
+		$this->PostsController->viewPath = 'posts';
+		$this->PostsController->index();
+		$this->ThemeView =& new ThemeView($this->PostsController);
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->ThemeView);
+		unset($this->PostsController);
+		unset($this->Controller);
+		ClassRegistry::flush();
+	}
+/**
+ * test that the theme view can be constructed without going into the registry
+ *
+ * @return void
+ */
+	function testConstructionNoRegister() {
+		ClassRegistry::flush();
+		$controller = null;
+		$Theme =& new ThemeView($controller, false);
+		$ThemeTwo =& ClassRegistry::getObject('view');
+		$this->assertFalse($ThemeTwo);
+	}
+
+/**
+ * startTest
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+	}
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * testPluginGetTemplate method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginThemedGetTemplate() {
+		$this->Controller->plugin = 'test_plugin';
+		$this->Controller->name = 'TestPlugin';
+		$this->Controller->viewPath = 'tests';
+		$this->Controller->action = 'index';
+		$this->Controller->theme = 'test_theme';
+
+		$ThemeView =& new TestThemeView($this->Controller);
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'tests' . DS .'index.ctp';
+		$result = $ThemeView->getViewFileName('index');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'plugins' . DS . 'test_plugin' . DS . 'layouts' . DS .'plugin_default.ctp';
+		$result = $ThemeView->getLayoutFileName('plugin_default');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$result = $ThemeView->getLayoutFileName('default');
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testGetTemplate method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetTemplate() {
+		$this->Controller->plugin = null;
+		$this->Controller->name = 'Pages';
+		$this->Controller->viewPath = 'pages';
+		$this->Controller->action = 'display';
+		$this->Controller->params['pass'] = array('home');
+
+		$ThemeView =& new TestThemeView($this->Controller);
+		$ThemeView->theme = 'test_theme';
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
+		$result = $ThemeView->getViewFileName('home');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'posts' . DS .'index.ctp';
+		$result = $ThemeView->getViewFileName('/posts/index');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'themed' . DS . 'test_theme' . DS . 'layouts' . DS .'default.ctp';
+		$result = $ThemeView->getLayoutFileName();
+		$this->assertEqual($result, $expected);
+
+		$ThemeView->layoutPath = 'rss';
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
+		$result = $ThemeView->getLayoutFileName();
+		$this->assertEqual($result, $expected);
+
+		$ThemeView->layoutPath = 'email' . DS . 'html';
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
+		$result = $ThemeView->getLayoutFileName();
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMissingView method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingView() {
+		$this->Controller->plugin = null;
+		$this->Controller->name = 'Pages';
+		$this->Controller->viewPath = 'pages';
+		$this->Controller->action = 'display';
+		$this->Controller->theme = 'my_theme';
+
+		$this->Controller->params['pass'] = array('home');
+
+		restore_error_handler();
+		$View =& new TestThemeView($this->Controller);
+		ob_start();
+		$result = $View->getViewFileName('does_not_exist');
+		$expected = str_replace(array("\t", "\r\n", "\n"), "", ob_get_clean());
+		set_error_handler('simpleTestErrorHandler');
+		$this->assertPattern("/PagesController::/", $expected);
+		$this->assertPattern("/views(\/|\\\)themed(\/|\\\)my_theme(\/|\\\)pages(\/|\\\)does_not_exist.ctp/", $expected);
+	}
+
+/**
+ * testMissingLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingLayout() {
+		$this->Controller->plugin = null;
+		$this->Controller->name = 'Posts';
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->layout = 'whatever';
+		$this->Controller->theme = 'my_theme';
+
+		restore_error_handler();
+		$View =& new TestThemeView($this->Controller);
+		ob_start();
+		$result = $View->getLayoutFileName();
+		$expected = str_replace(array("\t", "\r\n", "\n"), "", ob_get_clean());
+		set_error_handler('simpleTestErrorHandler');
+		$this->assertPattern("/Missing Layout/", $expected);
+		$this->assertPattern("/views(\/|\\\)themed(\/|\\\)my_theme(\/|\\\)layouts(\/|\\\)whatever.ctp/", $expected);
+	}
+
+/**
+ * test memory leaks that existed in _paths at one point.
+ *
+ * @return void
+ */
+	function testMemoryLeakInPaths() {
+		if ($this->skipIf(!function_exists('memory_get_usage'), 'No memory measurement function, cannot test for possible memory leak. %s')) {
+			return;
+		}
+		$this->Controller->plugin = null;
+		$this->Controller->name = 'Posts';
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->layout = 'whatever';
+		$this->Controller->theme = 'test_theme';
+
+		$View =& new ThemeView($this->Controller);
+		$View->element('test_element');
+
+		$start = memory_get_usage();
+		for ($i = 0; $i < 10; $i++) {
+			$View->element('test_element');
+		}
+		$end = memory_get_usage();
+		$this->assertWithinMargin($start, $end, 3500);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/view.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/view.test.php
new file mode 100644
index 000000000..938b1aac4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/view/view.test.php
@@ -0,0 +1,1008 @@
+<?php
+/**
+ * ViewTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', array('View', 'Controller'));
+App::import('Helper', 'Cache');
+
+Mock::generate('Helper', 'CallbackMockHelper');
+Mock::generate('CacheHelper', 'ViewTestMockCacheHelper');
+
+if (!class_exists('ErrorHandler')) {
+	App::import('Core', array('Error'));
+}
+
+/**
+ * ViewPostsController class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class ViewPostsController extends Controller {
+
+/**
+ * name property
+ *
+ * @var string 'Posts'
+ * @access public
+ */
+	var $name = 'Posts';
+
+/**
+ * uses property
+ *
+ * @var mixed null
+ * @access public
+ */
+	var $uses = null;
+
+/**
+ * index method
+ *
+ * @access public
+ * @return void
+ */
+	function index() {
+		$this->set('testData', 'Some test data');
+		$test2 = 'more data';
+		$test3 = 'even more data';
+		$this->set(compact('test2', 'test3'));
+	}
+
+/**
+ * nocache_tags_with_element method
+ *
+ * @access public
+ * @return void
+ */
+	function nocache_multiple_element() {
+		$this->set('foo', 'this is foo var');
+		$this->set('bar', 'this is bar var');
+	}
+}
+
+/**
+ * ViewTestErrorHandler class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class ViewTestErrorHandler extends ErrorHandler {
+
+/**
+ * stop method
+ *
+ * @access public
+ * @return void
+ */
+	function _stop() {
+		return;
+	}
+}
+
+/**
+ * TestView class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class TestView extends View {
+
+/**
+ * getViewFileName method
+ *
+ * @param mixed $name
+ * @access public
+ * @return void
+ */
+	function getViewFileName($name = null) {
+		return $this->_getViewFileName($name);
+	}
+
+/**
+ * getLayoutFileName method
+ *
+ * @param mixed $name
+ * @access public
+ * @return void
+ */
+	function getLayoutFileName($name = null) {
+		return $this->_getLayoutFileName($name);
+	}
+
+/**
+ * loadHelpers method
+ *
+ * @param mixed $loaded
+ * @param mixed $helpers
+ * @param mixed $parent
+ * @access public
+ * @return void
+ */
+	function loadHelpers(&$loaded, $helpers, $parent = null) {
+		return $this->_loadHelpers($loaded, $helpers, $parent);
+	}
+
+/**
+ * paths method
+ *
+ * @param string $plugin
+ * @param boolean $cached
+ * @access public
+ * @return void
+ */
+	function paths($plugin = null, $cached = true) {
+		return $this->_paths($plugin, $cached);
+	}
+
+/**
+ * cakeError method
+ *
+ * @param mixed $method
+ * @param mixed $messages
+ * @access public
+ * @return void
+ */
+	function cakeError($method, $messages) {
+		$error =& new ViewTestErrorHandler($method, $messages);
+		return $error;
+	}
+}
+
+/**
+ * TestAfterHelper class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs.view
+ */
+class TestAfterHelper extends Helper {
+
+/**
+ * property property
+ *
+ * @var string ''
+ * @access public
+ */
+	var $property = '';
+
+/**
+ * beforeLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function beforeLayout() {
+		$this->property = 'Valuation';
+	}
+
+/**
+ * afterLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function afterLayout() {
+		$View =& ClassRegistry::getObject('afterView');
+		$View->output .= 'modified in the afterlife';
+	}
+}
+
+
+/**
+ * ViewTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class ViewTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		Router::reload();
+		$this->Controller = new Controller();
+		$this->PostsController = new ViewPostsController();
+		$this->PostsController->viewPath = 'posts';
+		$this->PostsController->index();
+		$this->View = new View($this->PostsController);
+	}
+
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->View);
+		unset($this->PostsController);
+		unset($this->Controller);
+	}
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function startTest() {
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'views' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+				TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS
+			)
+		), true);
+	}
+
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		App::build();
+	}
+
+/**
+ * testPluginGetTemplate method
+ *
+ * @access public
+ * @return void
+ */
+	function testPluginGetTemplate() {
+		$this->Controller->plugin = 'test_plugin';
+		$this->Controller->name = 'TestPlugin';
+		$this->Controller->viewPath = 'tests';
+		$this->Controller->action = 'index';
+
+		$View = new TestView($this->Controller);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS .'tests' . DS .'index.ctp';
+		$result = $View->getViewFileName('index');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS . 'layouts' . DS .'default.ctp';
+		$result = $View->getLayoutFileName();
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that plugin/$plugin_name is only appended to the paths it should be.
+ *
+ * @return void
+ */
+	function testPluginPathGeneration() {
+		$this->Controller->plugin = 'test_plugin';
+		$this->Controller->name = 'TestPlugin';
+		$this->Controller->viewPath = 'tests';
+		$this->Controller->action = 'index';
+
+		$View = new TestView($this->Controller);
+		$paths = $View->paths();
+		$this->assertEqual($paths, App::path('views'));
+
+		$paths = $View->paths('test_plugin');
+
+		$expected = array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'plugins' . DS . 'test_plugin' . DS,
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS . 'test_plugin' . DS . 'views' . DS,
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS,
+			TEST_CAKE_CORE_INCLUDE_PATH . 'libs' . DS . 'view' . DS
+		);
+		$this->assertEqual($paths, $expected);
+	}
+
+/**
+ * test that CamelCase plugins still find their view files.
+ *
+ * @return void
+ */
+	function testCamelCasePluginGetTemplate() {
+		$this->Controller->plugin = 'TestPlugin';
+		$this->Controller->name = 'TestPlugin';
+		$this->Controller->viewPath = 'tests';
+		$this->Controller->action = 'index';
+
+		$View = new TestView($this->Controller);
+		App::build(array(
+			'plugins' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS),
+			'views' => array(TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS)
+		));
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS .'tests' . DS .'index.ctp';
+		$result = $View->getViewFileName('index');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'plugins' . DS .'test_plugin' . DS . 'views' . DS . 'layouts' . DS .'default.ctp';
+		$result = $View->getLayoutFileName();
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testGetTemplate method
+ *
+ * @access public
+ * @return void
+ */
+	function testGetTemplate() {
+		$this->Controller->plugin = null;
+		$this->Controller->name = 'Pages';
+		$this->Controller->viewPath = 'pages';
+		$this->Controller->action = 'display';
+		$this->Controller->params['pass'] = array('home');
+
+		$View = new TestView($this->Controller);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'pages' . DS .'home.ctp';
+		$result = $View->getViewFileName('home');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'posts' . DS .'index.ctp';
+		$result = $View->getViewFileName('/posts/index');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'posts' . DS .'index.ctp';
+		$result = $View->getViewFileName('../posts/index');
+		$this->assertEqual($result, $expected);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS .'default.ctp';
+		$result = $View->getLayoutFileName();
+		$this->assertEqual($result, $expected);
+
+		$View->layoutPath = 'rss';
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'rss' . DS . 'default.ctp';
+		$result = $View->getLayoutFileName();
+		$this->assertEqual($result, $expected);
+
+		$View->layoutPath = 'email' . DS . 'html';
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS . 'layouts' . DS . 'email' . DS . 'html' . DS . 'default.ctp';
+		$result = $View->getLayoutFileName();
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testMissingView method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingView() {
+		$this->Controller->plugin = null;
+		$this->Controller->name = 'Pages';
+		$this->Controller->viewPath = 'pages';
+		$this->Controller->action = 'display';
+		$this->Controller->params['pass'] = array('home');
+
+		$View = new TestView($this->Controller);
+		ob_start();
+		$result = $View->getViewFileName('does_not_exist');
+		$expected = str_replace(array("\t", "\r\n", "\n"), "", ob_get_clean());
+
+		$this->assertPattern("/PagesController::/", $expected);
+		$this->assertPattern("/pages(\/|\\\)does_not_exist.ctp/", $expected);
+	}
+
+/**
+ * testMissingLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function testMissingLayout() {
+		$this->Controller->plugin = null;
+		$this->Controller->name = 'Posts';
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->layout = 'whatever';
+
+		$View = new TestView($this->Controller);
+		ob_start();
+		$result = $View->getLayoutFileName();
+		$expected = str_replace(array("\t", "\r\n", "\n"), "", ob_get_clean());
+
+		$this->assertPattern("/Missing Layout/", $expected);
+		$this->assertPattern("/layouts(\/|\\\)whatever.ctp/", $expected);
+	}
+
+/**
+ * testViewVars method
+ *
+ * @access public
+ * @return void
+ */
+	function testViewVars() {
+		$this->assertEqual($this->View->viewVars, array('testData' => 'Some test data', 'test2' => 'more data', 'test3' => 'even more data'));
+	}
+
+/**
+ * testUUIDGeneration method
+ *
+ * @access public
+ * @return void
+ */
+	function testUUIDGeneration() {
+		$result = $this->View->uuid('form', array('controller' => 'posts', 'action' => 'index'));
+		$this->assertEqual($result, 'form5988016017');
+		$result = $this->View->uuid('form', array('controller' => 'posts', 'action' => 'index'));
+		$this->assertEqual($result, 'formc3dc6be854');
+		$result = $this->View->uuid('form', array('controller' => 'posts', 'action' => 'index'));
+		$this->assertEqual($result, 'form28f92cc87f');
+	}
+
+/**
+ * testAddInlineScripts method
+ *
+ * @access public
+ * @return void
+ */
+	function testAddInlineScripts() {
+		$this->View->addScript('prototype.js');
+		$this->View->addScript('prototype.js');
+		$this->assertEqual($this->View->__scripts, array('prototype.js'));
+
+		$this->View->addScript('mainEvent', 'Event.observe(window, "load", function() { doSomething(); }, true);');
+		$this->assertEqual($this->View->__scripts, array('prototype.js', 'mainEvent' => 'Event.observe(window, "load", function() { doSomething(); }, true);'));
+	}
+
+/**
+ * testElement method
+ *
+ * @access public
+ * @return void
+ */
+	function testElement() {
+		$result = $this->View->element('test_element');
+		$this->assertEqual($result, 'this is the test element');
+		
+		$result = $this->View->element('plugin_element', array('plugin' => 'test_plugin'));
+		$this->assertEqual($result, 'this is the plugin element using params[plugin]');
+		
+		$this->View->plugin = 'test_plugin';
+		$result = $this->View->element('test_plugin_element');
+		$this->assertEqual($result, 'this is the test set using View::$plugin plugin element');
+
+		$result = $this->View->element('non_existant_element');
+		$this->assertPattern('/Not Found:/', $result);
+		$this->assertPattern('/non_existant_element/', $result);
+	}
+
+/**
+ * test that additional element viewVars don't get overwritten with helpers.
+ *
+ * @return void
+ */
+	function testElementParamsDontOverwriteHelpers() {
+		$Controller = new ViewPostsController();
+		$Controller->helpers = array('Form');
+
+		$View = new View($Controller);
+		$result = $View->element('type_check', array('form' => 'string'), true);
+		$this->assertEqual('string', $result);
+
+		$View->set('form', 'string');
+		$result = $View->element('type_check', array(), true);
+		$this->assertEqual('string', $result);
+	}
+
+/**
+ * testElementCacheHelperNoCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testElementCacheHelperNoCache() {
+		$Controller = new ViewPostsController();
+		$View = new View($Controller);
+		$empty = array();
+		$helpers = $View->_loadHelpers($empty, array('cache'));
+		$View->loaded = $helpers;
+		$result = $View->element('test_element', array('ram' => 'val', 'test' => array('foo', 'bar')));
+		$this->assertEqual($result, 'this is the test element');
+	}
+
+/**
+ * testElementCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testElementCache() {
+		$writable = is_writable(CACHE . 'views' . DS);
+		if ($this->skipIf(!$writable, 'CACHE/views dir is not writable, cannot test elementCache. %s')) {
+			return;
+		}
+		$View = new TestView($this->PostsController);
+		$element = 'test_element';
+		$expected = 'this is the test element';
+		$result = $View->element($element);
+		$this->assertEqual($result, $expected);
+
+		$cached = false;
+		$result = $View->element($element, array('cache'=>'+1 second'));
+		if (file_exists(CACHE . 'views' . DS . 'element_cache_'.$element)) {
+			$cached = true;
+			unlink(CACHE . 'views' . DS . 'element_cache_'.$element);
+		}
+		$this->assertTrue($cached);
+
+		$cached = false;
+		$result = $View->element($element, array('cache'=>'+1 second', 'other_param'=> true, 'anotherParam'=> true));
+		if (file_exists(CACHE . 'views' . DS . 'element_cache_other_param_anotherParam_'.$element)) {
+			$cached = true;
+			unlink(CACHE . 'views' . DS . 'element_cache_other_param_anotherParam_'.$element);
+		}
+		$this->assertTrue($cached);
+
+		$cached = false;
+		$result = $View->element($element, array('cache'=>array('time'=>'+1 second', 'key'=>'/whatever/here')));
+		if (file_exists(CACHE . 'views' . DS . 'element_'.Inflector::slug('/whatever/here').'_'.$element)) {
+			$cached = true;
+			unlink(CACHE . 'views' . DS . 'element_'.Inflector::slug('/whatever/here').'_'.$element);
+		}
+		$this->assertTrue($cached);
+
+		$cached = false;
+		$result = $View->element($element, array('cache'=>array('time'=>'+1 second', 'key'=>'whatever_here')));
+		if (file_exists(CACHE . 'views' . DS . 'element_whatever_here_'.$element)) {
+			$cached = true;
+			unlink(CACHE . 'views' . DS . 'element_whatever_here_'.$element);
+		}
+		$this->assertTrue($cached);
+		$this->assertEqual($result, $expected);
+
+	}
+
+/**
+ * test that ctp is used as a fallback file extension for elements
+ *
+ * @return void
+ */
+	function testElementCtpFallback() {
+		$View = new TestView($this->PostsController);
+		$View->ext = '.missing';
+		$element = 'test_element';
+		$expected = 'this is the test element';
+		$result = $View->element($element);
+
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testLoadHelpers method
+ *
+ * @access public
+ * @return void
+ */
+	function testLoadHelpers() {
+		$View = new TestView($this->PostsController);
+
+		$loaded = array();
+		$result = $View->loadHelpers($loaded, array('Html', 'Form', 'Ajax'));
+		$this->assertTrue(is_object($result['Html']));
+		$this->assertTrue(is_object($result['Form']));
+		$this->assertTrue(is_object($result['Form']->Html));
+		$this->assertTrue(is_object($result['Ajax']->Html));
+
+		$View->plugin = 'test_plugin';
+		$result = $View->loadHelpers($loaded, array('TestPlugin.PluggedHelper'));
+		$this->assertTrue(is_object($result['PluggedHelper']));
+		$this->assertTrue(is_object($result['PluggedHelper']->OtherHelper));
+	}
+
+/**
+ * test the correct triggering of helper callbacks
+ *
+ * @return void
+ */
+	function testHelperCallbackTriggering() {
+		$this->PostsController->helpers = array('Session', 'Html', 'CallbackMock');
+		$View =& new TestView($this->PostsController);
+		$loaded = array();
+		$View->loaded = $View->loadHelpers($loaded, $this->PostsController->helpers);
+		$View->loaded['CallbackMock']->expectOnce('beforeRender');
+		$View->loaded['CallbackMock']->expectOnce('afterRender');
+		$View->loaded['CallbackMock']->expectOnce('beforeLayout');
+		$View->loaded['CallbackMock']->expectOnce('afterLayout');
+		$View->render('index');
+	}
+
+/**
+ * testBeforeLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function testBeforeLayout() {
+		$this->PostsController->helpers = array('Session', 'TestAfter', 'Html');
+		$View =& new View($this->PostsController);
+		$out = $View->render('index');
+		$this->assertEqual($View->loaded['testAfter']->property, 'Valuation');
+	}
+
+/**
+ * testAfterLayout method
+ *
+ * @access public
+ * @return void
+ */
+	function testAfterLayout() {
+		$this->PostsController->helpers = array('Session', 'TestAfter', 'Html');
+		$this->PostsController->set('variable', 'values');
+
+		$View =& new View($this->PostsController);
+		ClassRegistry::addObject('afterView', $View);
+
+		$content = 'This is my view output';
+		$result = $View->renderLayout($content, 'default');
+		$this->assertPattern('/modified in the afterlife/', $result);
+		$this->assertPattern('/This is my view output/', $result);
+	}
+
+/**
+ * testRenderLoadHelper method
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderLoadHelper() {
+		$this->PostsController->helpers = array('Session', 'Html', 'Form', 'Ajax');
+		$View =& new TestView($this->PostsController);
+
+		$result = $View->_render($View->getViewFileName('index'), array());
+		$this->assertEqual($result, 'posts index');
+
+		$helpers = $View->loaded;
+		$this->assertTrue(is_object($helpers['html']));
+		$this->assertTrue(is_object($helpers['form']));
+		$this->assertTrue(is_object($helpers['form']->Html));
+		$this->assertTrue(is_object($helpers['ajax']->Html));
+
+		$this->PostsController->helpers = array('Html', 'Form', 'Ajax', 'TestPlugin.PluggedHelper');
+		$View =& new TestView($this->PostsController);
+
+		$result = $View->_render($View->getViewFileName('index'), array());
+		$this->assertEqual($result, 'posts index');
+
+		$helpers = $View->loaded;
+		$this->assertTrue(is_object($helpers['html']));
+		$this->assertTrue(is_object($helpers['form']));
+		$this->assertTrue(is_object($helpers['form']->Html));
+		$this->assertTrue(is_object($helpers['ajax']->Html));
+		$this->assertTrue(is_object($helpers['pluggedHelper']->OtherHelper));
+
+		$this->assertTrue(is_object($View->Html));
+		$this->assertTrue(is_object($View->Form));
+		$this->assertTrue(is_object($View->Form->Html));
+		$this->assertTrue(is_object($View->PluggedHelper->OtherHelper));
+		$this->assertReference($View->Form, $View->loaded['form']);
+		$this->assertReference($View->Html, $View->loaded['html']);
+		$this->assertReference($View->PluggedHelper->OtherHelper, $View->loaded['otherHelper']);
+	}
+
+/**
+ * testRender method
+ *
+ * @access public
+ * @return void
+ */
+	function testRender() {
+		$View =& new TestView($this->PostsController);
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render('index'));
+
+		$this->assertPattern("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\" \/><title>/", $result);
+		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
+		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
+
+		$this->PostsController->set('url', 'flash');
+		$this->PostsController->set('message', 'yo what up');
+		$this->PostsController->set('pause', 3);
+		$this->PostsController->set('page_title', 'yo what up');
+
+		$View =& new TestView($this->PostsController);
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render(false, 'flash'));
+
+		$this->assertPattern("/<title>yo what up<\/title>/", $result);
+		$this->assertPattern("/<p><a href=\"flash\">yo what up<\/a><\/p>/", $result);
+
+		$this->assertTrue($View->render(false, 'flash'));
+
+		$this->PostsController->helpers = array('Session', 'Cache', 'Html');
+		$this->PostsController->constructClasses();
+		$this->PostsController->cacheAction = array('index' => 3600);
+		$this->PostsController->params['action'] = 'index';
+		Configure::write('Cache.check', true);
+
+		$View =& new TestView($this->PostsController);
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render('index'));
+
+		$this->assertPattern("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\" \/><title>/", $result);
+		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
+		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
+	}
+
+/**
+ * test rendering layout with cache helper loaded
+ *
+ * @return void
+ */
+	function testRenderLayoutWithMockCacheHelper() {
+		$_check = Configure::read('Cache.check');
+		Configure::write('Cache.check', true);
+
+		$Controller =& new ViewPostsController();
+		$Controller->cacheAction = '1 day';
+		$View =& new View($Controller);
+		$View->loaded['cache'] = new ViewTestMockCacheHelper();
+		$View->loaded['cache']->expectCallCount('cache', 2);
+
+		$result = $View->render('index');
+		$this->assertPattern('/posts index/', $result);
+
+		Configure::write('Cache.check', $_check);
+	}
+
+/**
+ * test that view vars can replace the local helper variables
+ * and not overwrite the $this->Helper references
+ *
+ * @return void
+ */
+	function testViewVarOverwritingLocalHelperVar() {
+		$Controller =& new ViewPostsController();
+		$Controller->helpers = array('Session', 'Html');
+		$Controller->set('html', 'I am some test html');
+		$View =& new View($Controller);
+		$result = $View->render('helper_overwrite', false);
+
+		$this->assertPattern('/I am some test html/', $result);
+		$this->assertPattern('/Test link/', $result);
+	}
+
+/**
+ * testGetViewFileName method
+ *
+ * @access public
+ * @return void
+ */
+	function testViewFileName() {
+		$View =& new TestView($this->PostsController);
+
+		$result = $View->getViewFileName('index');
+		$this->assertPattern('/posts(\/|\\\)index.ctp/', $result);
+
+		$result = $View->getViewFileName('/pages/home');
+		$this->assertPattern('/pages(\/|\\\)home.ctp/', $result);
+
+		$result = $View->getViewFileName('../elements/test_element');
+		$this->assertPattern('/elements(\/|\\\)test_element.ctp/', $result);
+
+		$result = $View->getViewFileName('../themed/test_theme/posts/index');
+		$this->assertPattern('/themed(\/|\\\)test_theme(\/|\\\)posts(\/|\\\)index.ctp/', $result);
+
+		$expected = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views' . DS .'posts' . DS .'index.ctp';
+		$result = $View->getViewFileName('../posts/index');
+		$this->assertEqual($result, $expected);
+
+	}
+
+/**
+ * testRenderCache method
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderCache() {
+		$writable = is_writable(CACHE . 'views' . DS);
+		if ($this->skipIf(!$writable, 'CACHE/views dir is not writable, cannot test renderCache. %s')) {
+			return;
+		}
+		$view = 'test_view';
+		$View =& new View($this->PostsController);
+		$path = CACHE . 'views' . DS . 'view_cache_'.$view;
+
+		$cacheText = '<!--cachetime:'.time().'-->some cacheText';
+		$f = fopen($path, 'w+');
+		fwrite($f, $cacheText);
+		fclose($f);
+
+		$result = $View->renderCache($path, '+1 second');
+		$this->assertFalse($result);
+		@unlink($path);
+
+		$cacheText = '<!--cachetime:'.(time() + 10).'-->some cacheText';
+		$f = fopen($path, 'w+');
+		fwrite($f, $cacheText);
+		fclose($f);
+		ob_start();
+		$View->renderCache($path, '+1 second');
+		$result = ob_get_clean();
+
+		$expected = 'some cacheText';
+		$this->assertPattern('/^some cacheText/', $result);
+
+		@unlink($path);
+	}
+
+/**
+ * Test that render() will remove the cake:nocache tags when only the cachehelper is present.
+ *
+ * @return void
+ */
+	function testRenderStrippingNoCacheTagsOnlyCacheHelper() {
+		Configure::write('Cache.check', false);
+		$View =& new View($this->PostsController);
+		$View->set(array('superman' => 'clark', 'variable' => 'var'));
+		$View->helpers = array('Html', 'Form', 'Cache');
+		$View->layout = 'cache_layout';
+		$result = $View->render('index');
+		$this->assertNoPattern('/cake:nocache/', $result);
+	}
+
+/**
+ * Test that render() will remove the cake:nocache tags when only the Cache.check is true.
+ *
+ * @return void
+ */
+	function testRenderStrippingNoCacheTagsOnlyCacheCheck() {
+		Configure::write('Cache.check', true);
+		$View =& new View($this->PostsController);
+		$View->set(array('superman' => 'clark', 'variable' => 'var'));
+		$View->helpers = array('Html', 'Form');
+		$View->layout = 'cache_layout';
+		$result = $View->render('index');
+		$this->assertNoPattern('/cake:nocache/', $result);
+	}
+
+/**
+ * testRenderNocache method
+ *
+ * @access public
+ * @return void
+ */
+
+/* This is a new test case for a pending enhancement
+	function testRenderNocache() {
+		$this->PostsController->helpers = array('Cache', 'Html');
+		$this->PostsController->constructClasses();
+		$this->PostsController->cacheAction = 21600;
+		$this->PostsController->here = '/posts/nocache_multiple_element';
+		$this->PostsController->action = 'nocache_multiple_element';
+		$this->PostsController->nocache_multiple_element();
+		Configure::write('Cache.check', true);
+		Configure::write('Cache.disable', false);
+
+		$filename = CACHE . 'views' . DS . 'posts_nocache_multiple_element.php';
+
+		$View = new TestView($this->PostsController);
+		$View->render();
+
+		ob_start();
+		$View->renderCache($filename, getMicroTime());
+		$result = ob_get_clean();
+		@unlink($filename);
+
+		$this->assertPattern('/php echo \$foo;/', $result);
+		$this->assertPattern('/php echo \$bar;/', $result);
+		$this->assertPattern('/php \$barfoo = \'in sub2\';/', $result);
+		$this->assertPattern('/php echo \$barfoo;/', $result);
+		$this->assertPattern('/printing: "in sub2"/', $result);
+		$this->assertPattern('/php \$foobar = \'in sub1\';/', $result);
+		$this->assertPattern('/php echo \$foobar;/', $result);
+		$this->assertPattern('/printing: "in sub1"/', $result);
+	}
+*/
+
+/**
+ * testSet method
+ *
+ * @access public
+ * @return void
+ */
+	function testSet() {
+		$View =& new TestView($this->PostsController);
+		$View->viewVars = array();
+		$View->set('somekey', 'someValue');
+		$this->assertIdentical($View->viewVars, array('somekey' => 'someValue'));
+		$this->assertIdentical($View->getVars(), array('somekey'));
+
+		$View->viewVars = array();
+		$keys = array('key1', 'key2');
+		$values = array('value1', 'value2');
+		$View->set($keys, $values);
+		$this->assertIdentical($View->viewVars, array('key1' => 'value1', 'key2' => 'value2'));
+		$this->assertIdentical($View->getVars(), array('key1', 'key2'));
+		$this->assertIdentical($View->getVar('key1'), 'value1');
+		$this->assertNull($View->getVar('key3'));
+
+		$View->set(array('key3' => 'value3'));
+		$this->assertIdentical($View->getVar('key3'), 'value3');
+		
+		$View->viewVars = array();
+		$View->set(array(3 => 'three', 4 => 'four'));
+		$View->set(array(1 => 'one', 2 => 'two'));
+		$expected = array(3 => 'three', 4 => 'four', 1 => 'one', 2 => 'two');
+		$this->assertEqual($View->viewVars, $expected);
+	}
+
+/**
+ * testEntityReference method
+ *
+ * @access public
+ * @return void
+ */
+	function testEntityReference() {
+		$View =& new TestView($this->PostsController);
+		$View->model = 'Post';
+		$View->field = 'title';
+		$this->assertEqual($View->entity(), array('Post', 'title'));
+
+		$View->association = 'Comment';
+		$View->field = 'user_id';
+		$this->assertEqual($View->entity(), array('Comment', 'user_id'));
+		
+		$View->model = 0;
+		$View->association = null;
+		$View->field = 'Node';
+		$View->fieldSuffix = 'title';
+		$View->entityPath = '0.Node.title';
+		$expected = array(0, 'Node', 'title');
+		$this->assertEqual($View->entity(), $expected);
+		
+		$View->model = 'HelperTestTag';
+		$View->field = 'HelperTestTag';
+		$View->modelId = null;
+		$View->association = null;
+		$View->fieldSuffix = null;
+		$View->entityPath = 'HelperTestTag';
+		$expected = array('HelperTestTag', 'HelperTestTag');
+		$this->assertEqual($View->entity(), $expected);
+	}
+
+/**
+ * testBadExt method
+ *
+ * @access public
+ * @return void
+ */
+	function testBadExt() {
+		$this->PostsController->action = 'something';
+		$this->PostsController->ext = '.whatever';
+		restore_error_handler();
+		ob_start();
+		$View = new TestView($this->PostsController);
+		$View->render('this_is_missing');
+		$result = str_replace(array("\t", "\r\n", "\n"), "", ob_get_clean());
+		set_error_handler('simpleTestErrorHandler');
+
+		$this->assertPattern("/<em>PostsController::<\/em><em>something\(\)<\/em>/", $result);
+		$this->assertPattern("/posts(\/|\\\)this_is_missing.whatever/", $result);
+
+		$this->PostsController->ext = ".bad";
+		$View =& new TestView($this->PostsController);
+		$result = str_replace(array("\t", "\r\n", "\n"), "", $View->render('index'));
+
+		$this->assertPattern("/<meta http-equiv=\"Content-Type\" content=\"text\/html; charset=utf-8\" \/><title>/", $result);
+		$this->assertPattern("/<div id=\"content\">posts index<\/div>/", $result);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/xml.test.php b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/xml.test.php
new file mode 100644
index 000000000..555517836
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/cases/libs/xml.test.php
@@ -0,0 +1,1627 @@
+<?php
+/**
+ * XmlTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Xml');
+
+/**
+ * XmlTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ */
+class XmlTest extends CakeTestCase {
+
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$manager =& new XmlManager();
+		$manager->namespaces = array();
+	}
+
+/**
+ * testRootTagParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testRootTagParsing() {
+		$input = '<' . '?xml version="1.0" encoding="UTF-8" ?' . '>' . "\n" .
+			'<plugin id="1" version_id="1" name="my_plugin" title="My Plugin" author="Me" author_email="me@cakephp.org" description="My awesome package" created="2008-01-28 18:21:13" updated="2008-01-28 18:21:13">'
+			.'<current id="1" plugin_id="1" name="1.0" file="" created="2008-01-28 18:21:13" updated="2008-01-28 18:21:13" />'
+			.'<version id="1" plugin_id="1" name="1.0" file="" created="2008-01-28 18:21:13" updated="2008-01-28 18:21:13" />'
+			.'</plugin>';
+		$xml = new Xml($input);
+		$this->assertEqual($xml->children[0]->name, 'plugin');
+		$this->assertEqual($xml->children[0]->children[0]->name, 'current');
+		$this->assertEqual($xml->toString(true), $input);
+	}
+
+/**
+ * testSerialization method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerialization() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial')
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 2, 'industry_id' => 2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education')
+			)
+		);
+
+		$xml = new Xml($input);
+		$result = preg_replace("/\n/",'', $xml->toString(false));
+		$expected = '<project id="1" title="" client_id="1" show="1" is_spotlight="" style_id="0" job_type_id="1" industry_id="1" modified="" created=""><style id="" name="" /><job_type id="1" name="Touch Screen Kiosk" /><industry id="1" name="Financial" /></project><project id="2" title="" client_id="2" show="1" is_spotlight="" style_id="0" job_type_id="2" industry_id="2" modified="2007-11-26 14:48:36" created=""><style id="" name="" /><job_type id="2" name="Awareness Campaign" /><industry id="2" name="Education" /></project>';
+		$this->assertEqual($result, $expected);
+
+		$input = array(
+			'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+			'Style' => array('id' => null, 'name' => null),
+			'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+			'Industry' => array('id' => 1, 'name' => 'Financial')
+		);
+		$expected = '<project id="1" title="" client_id="1" show="1" is_spotlight="" style_id="0" job_type_id="1" industry_id="1" modified="" created=""><style id="" name="" /><job_type id="1" name="Touch Screen Kiosk" /><industry id="1" name="Financial" /></project>';
+		$xml = new Xml($input);
+		$result = preg_replace("/\n/",'', $xml->toString(false));
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * testSerializeOnMultiDimensionalArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerializeOnMultiDimensionalArray() {
+		$data = array(
+			'Statuses' => array(
+				array('Status' => array('id' => 1)),
+				array('Status' => array('id' => 2))
+			)
+		);
+		$result =& new Xml($data, array('format' => 'tags'));
+		$expected = '<statuses><status><id>1</id></status><status><id>2</id></status></statuses>';
+		$this->assertIdentical($result->toString(), $expected);
+	}
+
+/**
+ * testSerializeCapsWithoutSlug method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerializeCapsWithoutSlug() {
+		$data = array(
+			'USERS' => array(
+				array('USER' => array('ID' => 1)),
+				array('USER' => array('ID' => 2))
+			)
+		);
+		$result =& new Xml($data, array('format' => 'tags', 'slug' => false));
+		$expected = '<USERS><USER><ID>1</ID></USER><USER><ID>2</ID></USER></USERS>';
+		$this->assertIdentical($result->toString(), $expected);
+	}
+
+/**
+ * test serialization of boolean and null values.  false = 0, true = 1, null = ''
+ *
+ * @return void
+ */
+	function testSerializationOfBooleanAndBooleanishValues() {
+		$xml =& new Xml(array('data' => array('example' => false)));
+		$result = $xml->toString(false);
+		$expected = '<data example="0" />';
+		$this->assertEqual($result, $expected, 'Boolean values incorrectly handled. %s');
+
+		$xml =& new Xml(array('data' => array('example' => true)));
+		$result = $xml->toString(false);
+		$expected = '<data example="1" />';
+		$this->assertEqual($result, $expected, 'Boolean values incorrectly handled. %s');
+
+		$xml =& new Xml(array('data' => array('example' => null)));
+		$result = $xml->toString(false);
+		$expected = '<data example="" />';
+		$this->assertEqual($result, $expected, 'Boolean values incorrectly handled. %s');
+
+		$xml =& new Xml(array('data' => array('example' => 0)));
+		$result = $xml->toString(false);
+		$expected = '<data example="0" />';
+		$this->assertEqual($result, $expected, 'Boolean-ish values incorrectly handled. %s');
+
+		$xml =& new Xml(array('data' => array('example' => 1)));
+		$result = $xml->toString(false);
+		$expected = '<data example="1" />';
+		$this->assertEqual($result, $expected, 'Boolean-ish values incorrectly handled. %s');
+	}
+
+/**
+ * testSimpleArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testSimpleArray() {
+		$xml = new Xml(array('hello' => 'world'), array('format' => 'tags'));
+
+		$result = $xml->toString(false);
+		$expected = '<hello><![CDATA[world]]></hello>';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testSimpleObject method
+ *
+ * @access public
+ * @return void
+ */
+	function testSimpleObject() {
+		$input = new StdClass();
+		$input->hello = 'world';
+		$xml = new Xml($input, array('format' => 'tags'));
+
+		$result = $xml->toString(false);
+		$expected = '<hello><![CDATA[world]]></hello>';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testSimpleArrayWithZeroValues method
+ *
+ * @access public
+ * @return void
+ */
+	function testSimpleArrayWithZeroValues() {
+		$xml = new Xml(array('zero_string' => '0', 'zero_integer' => 0), array('format' => 'tags'));
+
+		$result = $xml->toString(false);
+		$expected = '<zero_string>0</zero_string><zero_integer>0</zero_integer>';
+		$this->assertEqual($expected, $result);
+
+		$data = array(
+			'Client' => array(
+				'id' => 3,
+				'object_id' => 9,
+				'key' => 'alt',
+				'name' => 'Client Two',
+				'created_by' => 4,
+				'status' => '0',
+				'num_projects' => 0
+			)
+		);
+		$xml = new Xml($data, array('format' => 'tags'));
+		$result = $xml->toString(array('format' => 'tags', 'header' => false));
+		$this->assertPattern('/<status>0<\/status>/', $result);
+		$this->assertPattern('/<num_projects>0<\/num_projects>/', $result);
+	}
+/**
+ * testHeader method
+ *
+ * @access public
+ * @return void
+ */
+	function testHeader() {
+		$input = new stdClass();
+		$input->hello = 'world';
+		$xml = new Xml($input, array('format' => 'tags'));
+
+		$result = $xml->toString(array('header' => true));
+		$expected = '<'.'?xml version="1.0" encoding="UTF-8" ?'.'>'."\n".'<hello><![CDATA[world]]></hello>';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testOwnerAssignment method
+ *
+ * @access public
+ * @return void
+ */
+	function testOwnerAssignment() {
+		$xml = new Xml();
+		$node =& $xml->createElement('hello', 'world');
+		$owner =& $node->document();
+		$this->assertTrue($xml === $owner);
+
+		$children =& $node->children;
+		$childOwner =& $children[0]->document();
+		$this->assertTrue($xml === $childOwner);
+	}
+
+/**
+ * testArraySingleSerialization method
+ *
+ * @access public
+ * @return void
+ */
+	function testArraySingleSerialization() {
+		$input = array(
+			'Post' => array(
+				'id' => '1', 'author_id' => '1', 'title' => 'First Post',
+				'body' => 'First Post Body', 'published' => 'Y',
+				'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'
+			),
+			'Author' => array(
+				'id' => '1', 'user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99',
+				'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31', 'test' => 'working'
+			)
+		);
+
+		$expected = '<post><id>1</id><author_id>1</author_id><title><![CDATA[First Post]]>';
+		$expected .= '</title><body><![CDATA[First Post Body]]></body><published><![CDATA[Y]]>';
+		$expected .= '</published><created><![CDATA[2007-03-18 10:39:23]]></created><updated>';
+		$expected .= '<![CDATA[2007-03-18 10:41:31]]></updated><author><id>1</id><user>';
+		$expected .= '<![CDATA[mariano]]></user><password><![CDATA[5f4dcc3b5aa765d61d8327deb882';
+		$expected .= 'cf99]]></password><created><![CDATA[2007-03-17 01:16:23]]></created>';
+		$expected .= '<updated><![CDATA[2007-03-17 01:18:31]]></updated><test><![CDATA[working]]>';
+		$expected .= '</test></author></post>';
+
+		$xml = new Xml($input, array('format' => 'tags'));
+		$result = $xml->toString(false);
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testArraySerialization method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerializationArray() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial')
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 2, 'industry_id' => 2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education'),
+			)
+		);
+		$expected = '<project><id>1</id><title /><client_id>1</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>1</job_type_id><industry_id>1</industry_id><modified /><created /><style><id /><name /></style><job_type><id>1</id><name>Touch Screen Kiosk</name></job_type><industry><id>1</id><name>Financial</name></industry></project><project><id>2</id><title /><client_id>2</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>2</job_type_id><industry_id>2</industry_id><modified>2007-11-26 14:48:36</modified><created /><style><id /><name /></style><job_type><id>2</id><name>Awareness Campaign</name></job_type><industry><id>2</id><name>Education</name></industry></project>';
+
+		$xml = new Xml($input, array('format' => 'tags'));
+		$result = $xml->toString(array('header' => false, 'cdata' => false));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testNestedArraySerialization method
+ *
+ * @access public
+ * @return void
+ */
+	function testSerializationNestedArray() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial'),
+				'BusinessSolution' => array(array('id' => 6, 'name' => 'Convert Sales')),
+				'MediaType' => array(
+					array('id' => 15, 'name' => 'Print'),
+					array('id' => 7, 'name' => 'Web Demo'),
+					array('id' => 6, 'name' => 'CD-ROM')
+				)
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 2, 'industry_id' => 2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education'),
+				'BusinessSolution' => array(
+					array('id' => 4, 'name' => 'Build Relationship'),
+					array('id' => 6, 'name' => 'Convert Sales')
+				),
+				'MediaType' => array(
+					array('id' => 17, 'name' => 'Web'),
+					array('id' => 6, 'name' => 'CD-ROM')
+				)
+			)
+		);
+		$expected = '<project><id>1</id><title /><client_id>1</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>1</job_type_id><industry_id>1</industry_id><modified /><created /><style><id /><name /></style><job_type><id>1</id><name>Touch Screen Kiosk</name></job_type><industry><id>1</id><name>Financial</name></industry><business_solution><id>6</id><name>Convert Sales</name></business_solution><media_type><id>15</id><name>Print</name></media_type><media_type><id>7</id><name>Web Demo</name></media_type><media_type><id>6</id><name>CD-ROM</name></media_type></project><project><id>2</id><title /><client_id>2</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>2</job_type_id><industry_id>2</industry_id><modified>2007-11-26 14:48:36</modified><created /><style><id /><name /></style><job_type><id>2</id><name>Awareness Campaign</name></job_type><industry><id>2</id><name>Education</name></industry><business_solution><id>4</id><name>Build Relationship</name></business_solution><business_solution><id>6</id><name>Convert Sales</name></business_solution><media_type><id>17</id><name>Web</name></media_type><media_type><id>6</id><name>CD-ROM</name></media_type></project>';
+
+		$xml = new Xml($input, array('format' => 'tags'));
+		$result = $xml->toString(array('header' => false, 'cdata' => false));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * Prove that serialization with a given root node works
+ * as expected.
+ *
+ * @access public
+ * @return void
+ * @link   https://trac.cakephp.org/ticket/6294
+ */
+	function testArraySerializationWithRoot() {
+		$input = array(
+			array('Shirt' => array('id' => 1, 'color' => 'green')),
+			array('Shirt' => array('id' => 2, 'color' => 'blue')),
+		);
+		$expected = '<collection><shirt id="1" color="green" />';
+		$expected .= '<shirt id="2" color="blue" /></collection>';
+
+		$Xml = new Xml($input, array('root' => 'collection'));
+		$result = $Xml->toString(array('header' => false));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testCloneNode
+ *
+ * @access public
+ * @return void
+ */
+	function testCloneNode() {
+		$node =& new XmlNode('element', 'myValue');
+		$twin =& $node->cloneNode();
+		$this->assertEqual($node, $twin);
+	}
+
+/**
+ * testNextSibling
+ *
+ * @access public
+ * @return void
+ */
+	function testNextSibling() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => '1', 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => '1.89', 'industry_id' => '1.56', 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial')
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => '1', 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => '2.2', 'industry_id' => 2.2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education'),
+			)
+		);
+		$xml =& new Xml($input, array('format' => 'tags'));
+		$node =& $xml->children[0]->children[0];
+
+		$nextSibling =& $node->nextSibling();
+		$this->assertEqual($nextSibling, $xml->children[0]->children[1]);
+
+		$nextSibling2 =& $nextSibling->nextSibling();
+		$this->assertEqual($nextSibling2, $xml->children[0]->children[2]);
+
+		$noFriends =& $xml->children[0]->children[12];
+		$this->assertNull($noFriends->nextSibling());
+	}
+
+/**
+ * testPreviousSibling
+ *
+ * @access public
+ * @return void
+ */
+	function testPreviousSibling() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => '1', 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => '1.89', 'industry_id' => '1.56', 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial')
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => '1', 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => '2.2', 'industry_id' => 2.2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education'),
+			)
+		);
+		$xml =& new Xml($input, array('format' => 'tags'));
+		$node =& $xml->children[0]->children[1];
+
+		$prevSibling =& $node->previousSibling();
+		$this->assertEqual($prevSibling, $xml->children[0]->children[0]);
+
+		$this->assertNull($prevSibling->previousSibling());
+	}
+
+/**
+ * testAddAndRemoveAttributes
+ *
+ * @access public
+ * @return void
+ */
+	function testAddAndRemoveAttributes() {
+		$node =& new XmlElement('myElement', 'superValue');
+		$this->assertTrue(empty($node->attributes));
+
+		$attrs = array(
+			'id' => 'test',
+			'show' => 1,
+			'is_spotlight' => 1,
+		);
+		$node->addAttribute($attrs);
+		$this->assertEqual($node->attributes, $attrs);
+
+		$node =& new XmlElement('myElement', 'superValue');
+		$node->addAttribute('test', 'value');
+		$this->assertTrue(isset($node->attributes['test']));
+
+		$node =& new XmlElement('myElement', 'superValue');
+		$obj =& new StdClass();
+		$obj->class = 'info';
+		$obj->id = 'primaryInfoBox';
+		$node->addAttribute($obj);
+		$expected = array(
+			'class' => 'info',
+			'id' => 'primaryInfoBox',
+		);
+		$this->assertEqual($node->attributes, $expected);
+
+		$result = $node->removeAttribute('class');
+		$this->assertTrue($result);
+		$this->assertFalse(isset($node->attributes['class']));
+
+		$result = $node->removeAttribute('missing');
+		$this->assertFalse($result);
+	}
+
+	/**
+	 * Tests that XML documents with non-standard spacing (i.e. leading whitespace, whole document
+	 * on one line) still parse properly.
+	 *
+	 * @return void
+	 */
+	function testParsingWithNonStandardWhitespace() {
+		$raw = '<?xml version="1.0" encoding="ISO-8859-1" ?><prices><price>1.0</price></prices>';
+		$array = array('Prices' => array('price' => 1.0));
+
+		$xml = new Xml($raw);
+		$this->assertEqual($xml->toArray(), $array);
+		$this->assertEqual($xml->__header, 'xml version="1.0" encoding="ISO-8859-1"');
+
+		$xml = new Xml(' ' . $raw);
+		$this->assertEqual($xml->toArray(), $array);
+		$this->assertEqual($xml->__header, 'xml version="1.0" encoding="ISO-8859-1"');
+
+		$xml = new Xml("\n" . $raw);
+		$this->assertEqual($xml->toArray(), $array);
+		$this->assertEqual($xml->__header, 'xml version="1.0" encoding="ISO-8859-1"');
+	}
+
+	/* Not implemented yet */
+	/* function testChildFilter() {
+	 	$input = array(
+	 		array(
+	 			'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+	 			'Style' => array('id' => null, 'name' => null),
+	 			'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+	 			'Industry' => array('id' => 1, 'name' => 'Financial'),
+	 			'BusinessSolution' => array(array('id' => 6, 'name' => 'Convert Sales')),
+	 			'MediaType' => array(
+	 				array('id' => 15, 'name' => 'Print'),
+	 				array('id' => 7, 'name' => 'Web Demo'),
+	 				array('id' => 6, 'name' => 'CD-ROM')
+	 			)
+	 		),
+	 		array(
+	 			'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 2, 'industry_id' => 2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+	 			'Style' => array('id' => null, 'name' => null),
+	 			'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+	 			'Industry' => array('id' => 2, 'name' => 'Education'),
+	 			'BusinessSolution' => array(
+	 				array('id' => 4, 'name' => 'Build Relationship'),
+	 				array('id' => 6, 'name' => 'Convert Sales')
+	 			),
+	 			'MediaType' => array(
+	 				array('id' => 17, 'name' => 'Web'),
+	 				array('id' => 6, 'name' => 'CD-ROM')
+	 			)
+	 		)
+	 	);
+
+	 	$xml = new Xml($input, array('format' => 'tags', 'tags' => array(
+	 		'MediaType'	=> array('value' => 'id', 'children' => false),
+	 		'JobType'	=> array('children' => array()),
+	 		'Industry'	=> array('children' => array('name')),
+	 		'show'		=> false
+	 	)));
+
+	 	$result = $xml->toString(array('header' => false, 'cdata' => false));
+	 	$expected = '<project><id>1</id><title /><client_id>1</client_id><is_spotlight /><style_id>0</style_id><job_type_id>1</job_type_id><industry_id>1</industry_id><modified /><created /><style><id /><name /></style><job_type><id>1</id><name>Touch Screen Kiosk</name></job_type><industry><name>Financial</name></industry><business_solution><id>6</id><name>Convert Sales</name></business_solution><media_type>15</media_type><media_type>7</media_type><media_type>6</media_type></project><project><id>2</id><title /><client_id>2</client_id><is_spotlight /><style_id>0</style_id><job_type_id>2</job_type_id><industry_id>2</industry_id><modified>2007-11-26 14:48:36</modified><created /><style><id /><name /></style><job_type><id>2</id><name>Awareness Campaign</name></job_type><industry><name>Education</name></industry><business_solution><id>4</id><name>Build Relationship</name></business_solution><business_solution><id>6</id><name>Convert Sales</name></business_solution><media_type>17</media_type><media_type>6</media_type></project>';
+	 	$this->assertEqual($expected, $result);
+	} */
+
+	/* Broken due to a Set class issue */
+	/* function testMixedArray() {
+	 	$input = array('OptionGroup' => array(
+	 		array('name' => 'OptA', 'id' => 12, 'OptA 1', 'OptA 2', 'OptA 3', 'OptA 4', 'OptA 5', 'OptA 6'),
+	 		array('name' => 'OptB', 'id' => 12, 'OptB 1', 'OptB 2', 'OptB 3', 'OptB 4', 'OptB 5', 'OptB 6')
+	 	));
+	 	$expected = '<option_group><name>OptA</name><id>12</id><option_group>OptA 1</option_group><option_group>OptA 2</option_group><option_group>OptA 3</option_group><option_group>OptA 4</option_group><option_group>OptA 5</option_group><option_group>OptA 6</option_group></option_group><option_group><name>OptB</name><id>12</id><option_group>OptB 1</option_group><option_group>OptB 2</option_group><option_group>OptB 3</option_group><option_group>OptB 4</option_group><option_group>OptB 5</option_group><option_group>OptB 6</option_group></option_group>';
+	 	$xml = new Xml($input, array('format' => 'tags'));
+	 	$result = $xml->toString(array('header' => false, 'cdata' => false));
+	 	$this->assertEqual($expected, $result);
+	} */
+
+	/* function testMixedNestedArray() {
+	 	$input = array(
+	 		'OptionA' =>  array(
+	 			'name' => 'OptA',
+	 			'id' => 12,
+	 			'opt' => array('OptA 1', 'OptA 2', 'OptA 3', 'OptA 4', 'OptA 5', 'OptA 6')
+	 		),
+	 		'OptionB' 	=> array(
+	 			'name' => 'OptB',
+	 			'id' => 12,
+	 			'opt' => array('OptB 1', 'OptB 2', 'OptB 3', 'OptB 4', 'OptB 5', 'OptB 6')
+	 		)
+	 	);
+	 	$expected = '<option_a><name>OptA</name><id>12</id><opt>OptA 1</opt><opt>OptA 2</opt><opt>OptA 3</opt><opt>OptA 4</opt><opt>OptA 5</opt><opt>OptA 6</opt></option_a><option_b><name>OptB</name><id>12</id><opt>OptB 1</opt><opt>OptB 2</opt><opt>OptB 3</opt><opt>OptB 4</opt><opt>OptB 5</opt><opt>OptB 6</opt></option_b>';
+	 	$xml = new Xml($input, array('format' => 'tags'));
+	 	$result = $xml->toString(array('header' => false, 'cdata' => false));
+	 	$this->assertEqual($expected, $result);
+	} */
+
+	/* function testMixedArrayAttributes() {
+	 	$input = array('OptionGroup' => array(
+	 		array(
+	 			'name' => 'OptA',
+	 			'id' => 12,
+	 			array('opt' => 'OptA 1'),
+	 			array('opt' => 'OptA 2'),
+	 			array('opt' => 'OptA 3'),
+	 			array('opt' => 'OptA 4'),
+	 			array('opt' => 'OptA 5'),
+	 			array('opt' => 'OptA 6')
+	 		),
+	 		array(
+	 			'name' => 'OptB',
+	 			'id' => 12,
+	 			array('opt' => 'OptB 1'),
+	 			array('opt' => 'OptB 2'),
+	 			array('opt' => 'OptB 3'),
+	 			array('opt' => 'OptB 4'),
+	 			array('opt' => 'OptB 5'),
+	 			array('opt' => 'OptB 6')
+	 		)
+	 	));
+	 	$expected = '<option_group name="OptA" id="12"><opt>OptA 1</opt><opt>OptA 2</opt><opt>OptA 3</opt><opt>OptA 4</opt><opt>OptA 5</opt><opt>OptA 6</opt></option_group><option_group name="OptB" id="12"><opt>OptB 1</opt><opt>OptB 2</opt><opt>OptB 3</opt><opt>OptB 4</opt><opt>OptB 5</opt><opt>OptB 6</opt></option_group>';
+
+	 	$options = array('tags' => array('option_group' => array('attributes' => array('id', 'name'))));
+	 	$xml = new Xml($input, $options);
+	 	$result = $xml->toString(false);
+
+	 	$this->assertEqual($expected, $result);
+	} */
+
+	 /* Not implemented yet */
+	 /* function testTagMap() {
+	 	$input = array(
+	 		array(
+	 			'Project' => array('id' => 1, 'title' => null, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+	 			'Style' => array('id' => null, 'name' => null),
+	 			'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+	 			'Industry' => array('id' => 1, 'name' => 'Financial')
+	 		),
+	 		array(
+	 			'Project' => array('id' => 2, 'title' => null, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 2, 'industry_id' => 2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+	 			'Style' => array('id' => null, 'name' => null),
+	 			'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+	 			'Industry' => array('id' => 2, 'name' => 'Education'),
+	 		)
+	 	);
+	 	$expected = '<project id="1"><title /><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>1</job_type_id><industry_id>1</industry_id><modified /><created /><style id=""><name /></style><jobtype id="1">Touch Screen Kiosk</jobtype><industry id="1"><name>Financial</name></industry></project><project id="2"><title /><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>2</job_type_id><industry_id>2</industry_id><modified>2007-11-26 14:48:36</modified><created /><style id=""><name /></style><jobtype id="2">Awareness Campaign</jobtype><industry id="2"><name>Education</name></industry></project>';
+
+	 	$xml = new Xml($input, array('tags' => array(
+	 		'Project'	=> array('attributes' => array('id')),
+	 		'style'		=> array('attributes' => array('id')),
+	 		'JobType'	=> array('name' => 'jobtype', 'attributes' => array('id'), 'value' => 'name'),
+	 		'Industry'	=> array('attributes' => array('id'))
+	 	)));
+	 	$result = $xml->toString(array('header' => false, 'cdata' => false));
+	 	$this->assertEqual($expected, $result);
+	} */
+
+/**
+ * testAllCData method
+ *
+ * @access public
+ * @return void
+ */
+	function testAllCData() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => '1', 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => '1.89', 'industry_id' => '1.56', 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial')
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => '1', 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => '2.2', 'industry_id' => 2.2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education'),
+			)
+		);
+		$expected = '<project><id>1</id><title /><client_id>1</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>1.89</job_type_id><industry_id>1.56</industry_id><modified /><created /><style><id /><name /></style><job_type><id>1</id><name><![CDATA[Touch Screen Kiosk]]></name></job_type><industry><id>1</id><name><![CDATA[Financial]]></name></industry></project><project><id>2</id><title /><client_id>2</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>2.2</job_type_id><industry_id>2.2</industry_id><modified><![CDATA[2007-11-26 14:48:36]]></modified><created /><style><id /><name /></style><job_type><id>2</id><name><![CDATA[Awareness Campaign]]></name></job_type><industry><id>2</id><name><![CDATA[Education]]></name></industry></project>';
+		$xml = new Xml($input, array('format' => 'tags'));
+		$result = $xml->toString(array('header' => false, 'cdata' => true));
+		$this->assertEqual($expected, $result);
+	}
+	/* PHP-native Unicode support pending */
+	/* function testConvertEntities() {
+	 	$input = array('project' => '&eacute;c&icirc;t');
+	 	$xml = new Xml($input);
+
+	 	$result = $xml->toString(array('header' => false, 'cdata' => false, 'convertEntities' => true));
+	 	$expected = '<project>&#233;c&#238;t</project>';
+	 	$this->assertEqual($result, $expected);
+	} */
+
+/**
+ * testWhitespace method
+ *
+ * @access public
+ * @return void
+ */
+	function testWhitespace() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial')
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 2, 'industry_id' => 2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education'),
+			)
+		);
+		$expected = "\n\t<project>\n\t\t<id>\n\t\t\t1\n\t\t</id>\n\t\t<title />\n\t\t<client_id>\n\t\t\t1\n\t\t</client_id>\n\t\t<show>\n\t\t\t1\n\t\t</show>\n\t\t<is_spotlight />\n\t\t<style_id>\n\t\t\t0\n\t\t</style_id>\n\t\t<job_type_id>\n\t\t\t1\n\t\t</job_type_id>\n\t\t<industry_id>\n\t\t\t1\n\t\t</industry_id>\n\t\t<modified />\n\t\t<created />\n\t\t<style>\n\t\t\t<id />\n\t\t\t<name />\n\t\t</style>\n\t\t<job_type>\n\t\t\t<id>\n\t\t\t\t1\n\t\t\t</id>\n\t\t\t<name>\n\t\t\t\tTouch Screen Kiosk\n\t\t\t</name>\n\t\t</job_type>\n\t\t<industry>\n\t\t\t<id>\n\t\t\t\t1\n\t\t\t</id>\n\t\t\t<name>\n\t\t\t\tFinancial\n\t\t\t</name>\n\t\t</industry>\n\t</project>\n\t<project>\n\t\t<id>\n\t\t\t2\n\t\t</id>\n\t\t<title />\n\t\t<client_id>\n\t\t\t2\n\t\t</client_id>\n\t\t<show>\n\t\t\t1\n\t\t</show>\n\t\t<is_spotlight />\n\t\t<style_id>\n\t\t\t0\n\t\t</style_id>\n\t\t<job_type_id>\n\t\t\t2\n\t\t</job_type_id>\n\t\t<industry_id>\n\t\t\t2\n\t\t</industry_id>\n\t\t<modified>\n\t\t\t2007-11-26 14:48:36\n\t\t</modified>\n\t\t<created />\n\t\t<style>\n\t\t\t<id />\n\t\t\t<name />\n\t\t</style>\n\t\t<job_type>\n\t\t\t<id>\n\t\t\t\t2\n\t\t\t</id>\n\t\t\t<name>\n\t\t\t\tAwareness Campaign\n\t\t\t</name>\n\t\t</job_type>\n\t\t<industry>\n\t\t\t<id>\n\t\t\t\t2\n\t\t\t</id>\n\t\t\t<name>\n\t\t\t\tEducation\n\t\t\t</name>\n\t\t</industry>\n\t</project>\n";
+
+		$xml = new Xml($input, array('format' => 'tags'));
+		$result = $xml->toString(array('header' => false, 'cdata' => false, 'whitespace' => true));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testSetSerialization method
+ *
+ * @access public
+ * @return void
+ */
+	function testSetSerialization() {
+		$input = array(
+			array(
+				'Project' => array('id' => 1, 'title' => null, 'client_id' => 1, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 1, 'industry_id' => 1, 'modified' => null, 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 1, 'name' => 'Touch Screen Kiosk'),
+				'Industry' => array('id' => 1, 'name' => 'Financial')
+			),
+			array(
+				'Project' => array('id' => 2, 'title' => null, 'client_id' => 2, 'show' => 1, 'is_spotlight' => null, 'style_id' => 0, 'job_type_id' => 2, 'industry_id' => 2, 'modified' => '2007-11-26 14:48:36', 'created' => null),
+				'Style' => array('id' => null, 'name' => null),
+				'JobType' => array('id' => 2, 'name' => 'Awareness Campaign'),
+				'Industry' => array('id' => 2, 'name' => 'Education'),
+			)
+		);
+		$expected = '<project><id>1</id><title /><client_id>1</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>1</job_type_id><industry_id>1</industry_id><modified /><created /><style><id /><name /></style><job_type><id>1</id><name>Touch Screen Kiosk</name></job_type><industry><id>1</id><name>Financial</name></industry></project><project><id>2</id><title /><client_id>2</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>2</job_type_id><industry_id>2</industry_id><modified>2007-11-26 14:48:36</modified><created /><style><id /><name /></style><job_type><id>2</id><name>Awareness Campaign</name></job_type><industry><id>2</id><name>Education</name></industry></project>';
+
+		$xml = new Xml(Set::map($input), array('format' => 'tags'));
+		$result = $xml->toString(array('header' => false, 'cdata' => false));
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * ensure that normalize does not add _name_ elements that come from Set::map sometimes.
+ *
+ * @return void
+ */
+	function testNormalizeNotAdding_name_Element() {
+		$input = array(
+			'output' => array(
+				'Vouchers' => array(
+					array('Voucher' => array('id' => 1)),
+					array('Voucher' => array('id' => 2)),
+				),
+			)
+		);
+		$xml = new Xml($input, array('attributes' => false, 'format' => 'tags'));
+		$this->assertFalse(isset($xml->children[0]->children[0]->children[1]), 'Too many children %s');
+		$this->assertEqual($xml->children[0]->children[0]->children[0]->name, 'voucher');
+	}
+/**
+ * testSimpleParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testSimpleParsing() {
+		$source = '<response><hello><![CDATA[happy world]]></hello><goodbye><![CDATA[cruel world]]></goodbye></response>';
+		$xml = new Xml($source);
+		$result = $xml->toString();
+		$this->assertEqual($source, $result);
+	}
+
+/**
+ * test that elements with empty tag values do not collapse and corrupt data structures
+ *
+ * @access public
+ * @return void
+ */
+	function testElementCollapsing() {
+		$xmlDataThatFails = '<resultpackage>
+		<result qid="46b1c46ed6208"><![CDATA[46b1c46ed3af9]]></result>
+		<result qid="46b1c46ed332a"><![CDATA[]]></result>
+		<result qid="46b1c46ed90e6"><![CDATA[46b1c46ed69d8]]></result>
+		<result qid="46b1c46ed71a7"><![CDATA[46b1c46ed5a38]]></result>
+		<result qid="46b1c46ed8146"><![CDATA[46b1c46ed98b6]]></result>
+		<result qid="46b1c46ed7978"><![CDATA[]]></result>
+		<result qid="46b1c46ed4a98"><![CDATA[]]></result>
+		<result qid="46b1c46ed42c8"><![CDATA[]]></result>
+		<result qid="46b1c46ed5268"><![CDATA[46b1c46ed8917]]></result>
+		</resultpackage>';
+
+		$Xml = new Xml();
+		$Xml->load('<?xml version="1.0" encoding="UTF-8" ?>' . $xmlDataThatFails);
+		$result = $Xml->toArray(false);
+
+		$this->assertTrue(is_array($result));
+		$expected = array(
+			'resultpackage' => array(
+				'result' => array(
+					0 => array(
+						'value' => '46b1c46ed3af9',
+						'qid' => '46b1c46ed6208'),
+					1 => array(
+						'qid' => '46b1c46ed332a'),
+					2 => array(
+						'value' => '46b1c46ed69d8',
+						'qid' => '46b1c46ed90e6'),
+					3 => array(
+						'value' => '46b1c46ed5a38',
+						'qid' => '46b1c46ed71a7'),
+					4 => array(
+						'value' => '46b1c46ed98b6',
+						'qid' => '46b1c46ed8146'),
+					5 => array(
+						'qid' => '46b1c46ed7978'),
+					6 => array(
+						'qid' => '46b1c46ed4a98'),
+					7 => array(
+						'qid' => '46b1c46ed42c8'),
+					8 => array(
+						'value' => '46b1c46ed8917',
+						'qid' => '46b1c46ed5268'),
+				)
+		));
+		$this->assertEqual(
+			count($result['resultpackage']['result']), count($expected['resultpackage']['result']),
+			'Incorrect array length %s');
+
+		$this->assertFalse(
+			isset($result['resultpackage']['result'][0][0]['qid']), 'Nested array exists, data is corrupt. %s');
+
+		$this->assertEqual($result, $expected);
+	}
+
+/**
+ * test that empty values do not casefold collapse
+ *
+ * @see http://code.cakephp.org/tickets/view/8
+ * @return void
+ */
+	function testCaseFoldingWithEmptyValues() {
+		$filledValue = '<method name="set_user_settings">
+			<title>update user information</title>
+			<user>1</user>
+			<User>
+				<id>1</id>
+				<name>varchar(45)</name>
+			</User>
+		</method>';
+		$xml =& new XML($filledValue);
+		$expected = array(
+			'Method' => array(
+				'name' => 'set_user_settings',
+				'title' => 'update user information',
+				'user' => '1',
+				'User' => array(
+					'id' => 1,
+					'name' => 'varchar(45)',
+				),
+			)
+		);
+		$result = $xml->toArray();
+		$this->assertEqual($result, $expected);
+
+		$emptyValue ='<method name="set_user_settings">
+			<title>update user information</title>
+			<user></user>
+			<User>
+				<id>1</id>
+				<name>varchar(45)</name>
+			</User>
+		</method>';
+
+		$xml =& new XML($emptyValue);
+		$expected = array(
+			'Method' => array(
+				'name' => 'set_user_settings',
+				'title' => 'update user information',
+				'user' => array(),
+				'User' => array(
+					'id' => 1,
+					'name' => 'varchar(45)',
+				),
+			)
+		);
+		$result = $xml->toArray();
+		$this->assertEqual($result, $expected);
+	}
+/**
+ * testMixedParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testMixedParsing() {
+		$source = '<response><body><hello><![CDATA[happy world]]></hello><![CDATA[in between]]><goodbye><![CDATA[cruel world]]></goodbye></body></response>';
+		$xml = new Xml($source);
+		$result = $xml->toString();
+		$this->assertEqual($source, $result);
+	}
+
+/**
+ * testComplexParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testComplexParsing() {
+		$source = '<projects><project><id>1</id><title /><client_id>1</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>1</job_type_id><industry_id>1</industry_id><modified /><created /><style><id /><name /></style><job_type><id>1</id><name>Touch Screen Kiosk</name></job_type><industry><id>1</id><name>Financial</name></industry></project><project><id>2</id><title /><client_id>2</client_id><show>1</show><is_spotlight /><style_id>0</style_id><job_type_id>2</job_type_id><industry_id>2</industry_id><modified>2007-11-26 14:48:36</modified><created /><style><id /><name /></style><job_type><id>2</id><name>Awareness Campaign</name></job_type><industry><id>2</id><name>Education</name></industry></project></projects>';
+		$xml = new Xml($source);
+		$result = $xml->toString(array('cdata' => false));
+		$this->assertEqual($source, $result);
+	}
+
+/**
+ * testNamespaceParsing method
+ *
+ * @access public
+ * @return void
+ */
+	function testNamespaceParsing() {
+		$source = '<a:container xmlns:a="http://example.com/a" xmlns:b="http://example.com/b" xmlns:c="http://example.com/c" xmlns:d="http://example.com/d" xmlns:e="http://example.com/e"><b:rule test=""><c:result>value</c:result></b:rule><d:rule test=""><e:result>value</e:result></d:rule></a:container>';
+		$xml = new Xml($source);
+
+		$result = $xml->toString(array('cdata' => false));
+		$this->assertEqual($source, $result);
+
+		$children = $xml->children('container');
+		$this->assertEqual($children[0]->namespace, 'a');
+
+		$children = $children[0]->children('rule');
+		$this->assertEqual($children[0]->namespace, 'b');
+	}
+
+/**
+ * testNamespaces method
+ *
+ * @access public
+ * @return void
+ */
+	function testNamespaces() {
+		$source = '<a:container xmlns:a="http://example.com/a" xmlns:b="http://example.com/b" xmlns:c="http://example.com/c" xmlns:d="http://example.com/d" xmlns:e="http://example.com/e"><b:rule test=""><c:result>value</c:result></b:rule><d:rule test=""><e:result>value</e:result></d:rule></a:container>';
+		$xml = new Xml($source);
+
+		$expects = '<a:container xmlns:a="http://example.com/a" xmlns:b="http://example.com/b" xmlns:c="http://example.com/c" xmlns:d="http://example.com/d" xmlns:e="http://example.com/e" xmlns:f="http://example.com/f"><b:rule test=""><c:result>value</c:result></b:rule><d:rule test=""><e:result>value</e:result></d:rule></a:container>';
+
+		$_xml =& XmlManager::getInstance();
+		$xml->addNamespace('f', 'http://example.com/f');
+		$result = $xml->toString(array('cdata' => false));
+		$this->assertEqual($expects, $result);
+	}
+
+/**
+ * testEscapeCharSerialization method
+ *
+ * @access public
+ * @return void
+ */
+	function testEscapeCharSerialization() {
+		$xml = new Xml(array('text' => 'JavaScript & DHTML'), array('attributes' => false, 'format' => 'attributes'));
+
+		$result = $xml->toString(false);
+		$expected = '<std_class text="JavaScript &amp; DHTML" />';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testCompleteEscapeCharSerialization method
+ *
+ * @access public
+ * @return void
+ */
+	function testCompleteEscapeCharSerialization() {
+		$xml = new Xml(array('text' => '<>&"\''), array('attributes' => false, 'format' => 'attributes'));
+
+		$result = $xml->toString(false);
+		$expected = '<std_class text="&lt;&gt;&amp;&quot;&#039;" />';
+		$this->assertEqual($expected, $result);
+	}
+
+/**
+ * testToArray method
+ *
+ * @access public
+ * @return void
+ */
+	function testToArray() {
+		App::import('Set');
+		$string = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+		<rss version="2.0">
+		<channel>
+			<title>Cake PHP Google Group</title>
+			<link>http://groups.google.com/group/cake-php</link>
+			<description>Search this group before posting anything. There are over 20,000 posts and it&amp;#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.</description>
+			<language>en</language>
+			<item>
+				<title>constructng result array when using findall</title>
+				<link>http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</link>
+				<description>i&#39;m using cakephp to construct a logical data model array that will be &lt;br&gt; passed to a flex app. I have the following model association: &lt;br&gt; ServiceDay-&amp;gt;(hasMany)ServiceTi me-&amp;gt;(hasMany)ServiceTimePrice. So what &lt;br&gt; the current output from my findall is something like this example: &lt;br&gt; &lt;p&gt;Array( &lt;br&gt; [0] =&amp;gt; Array(</description>
+				<guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</guid>
+				<author>bmil...@gmail.com(bpscrugs)</author>
+				<pubDate>Fri, 28 Dec 2007 00:44:14 UT</pubDate>
+			</item>
+			<item>
+				<title>Re: share views between actions?</title>
+				<link>http://groups.google.com/group/cake-php/msg/8b350d898707dad8</link>
+				<description>Then perhaps you might do us all a favour and refrain from replying to &lt;br&gt; things you do not understand. That goes especially for asinine comments. &lt;br&gt; Indeed. &lt;br&gt; To sum up: &lt;br&gt; No comment. &lt;br&gt; In my day, a simple &amp;quot;RTFM&amp;quot; would suffice. I&#39;ll keep in mind to ignore any &lt;br&gt; further responses from you. &lt;br&gt; You (and I) were referring to the *online documentation*, not other</description>
+				<guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/8b350d898707dad8</guid>
+				<author>subtropolis.z...@gmail.com(subtropolis zijn)</author>
+				<pubDate>Fri, 28 Dec 2007 00:45:01 UT</pubDate>
+			</item>
+		</channel>
+		</rss>';
+		$xml = new Xml($string);
+		$result = $xml->toArray();
+		$expected = array('Rss' => array(
+			'version' => '2.0',
+			'Channel' => array(
+				'title' => 'Cake PHP Google Group',
+				'link' => 'http://groups.google.com/group/cake-php',
+				'description' => 'Search this group before posting anything. There are over 20,000 posts and it&#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.',
+				'language' => 'en',
+				'Item' => array(
+					array(
+						'title' => 'constructng result array when using findall',
+						'link' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f',
+						'description' => "i'm using cakephp to construct a logical data model array that will be <br> passed to a flex app. I have the following model association: <br> ServiceDay-&gt;(hasMany)ServiceTi me-&gt;(hasMany)ServiceTimePrice. So what <br> the current output from my findall is something like this example: <br><p>Array( <br> [0] =&gt; Array(",
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f'),
+						'author' => 'bmil...@gmail.com(bpscrugs)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:44:14 UT',
+					),
+					array(
+						'title' => 'Re: share views between actions?',
+						'link' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8',
+						'description' => 'Then perhaps you might do us all a favour and refrain from replying to <br> things you do not understand. That goes especially for asinine comments. <br> Indeed. <br> To sum up: <br> No comment. <br> In my day, a simple &quot;RTFM&quot; would suffice. I\'ll keep in mind to ignore any <br> further responses from you. <br> You (and I) were referring to the *online documentation*, not other',
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8'),
+						'author' => 'subtropolis.z...@gmail.com(subtropolis zijn)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:45:01 UT'
+					)
+				)
+			)
+		));
+		$this->assertEqual($result, $expected);
+
+		$string ='<data><post title="Title of this post" description="cool"/></data>';
+		$xml = new Xml($string);
+		$result = $xml->toArray();
+		$expected = array('Data' => array('Post' => array('title' => 'Title of this post', 'description' => 'cool')));
+		$this->assertEqual($result, $expected);
+
+		$xml = new Xml('<example><item><title>An example of a correctly reversed XMLNode</title><desc/></item></example>');
+		$result = Set::reverse($xml);
+		$expected = array(
+			'Example' => array(
+				'Item' => array(
+					'title' => 'An example of a correctly reversed XMLNode',
+					'desc' => array(),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$xml = new Xml('<example><item attr="123"><titles><title>title1</title><title>title2</title></titles></item></example>');
+		$result = $xml->toArray();
+		$expected = array(
+			'Example' => array(
+				'Item' => array(
+					'attr' => '123',
+					'Titles' => array(
+						'Title' => array('title1', 'title2')
+					)
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$xml = new Xml('<example attr="ex_attr"><item attr="123"><titles>list</titles>textforitems</item></example>');
+		$result = $xml->toArray();
+		$expected = array(
+			'Example' => array(
+				'attr' => 'ex_attr',
+				'Item' => array(
+					'attr' => '123',
+					'titles' => 'list',
+					'value'  => 'textforitems'
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$xml = new Xml('<example attr="ex_attr"><item attr="123"><titles>list</titles>textforitems</item></example>');
+		$example = $xml->child('example');
+		$item = $example->child('item');
+		$result = $item->toArray();
+
+		$expected = array(
+			'attr' => '123',
+			'titles' => 'list',
+			'value'  => 'textforitems'
+		);
+		$this->assertIdentical($result, $expected);
+
+		$string = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+		<rss version="2.0">
+		<channel>
+			<title>Cake PHP Google Group</title>
+			<link>http://groups.google.com/group/cake-php</link>
+			<description>Search this group before posting anything. There are over 20,000 posts and it&amp;#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.</description>
+			<language>en</language>
+			<item>
+				<title>constructng result array when using findall</title>
+				<link>http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</link>
+				<description>i&#39;m using cakephp to construct a logical data model array that will be &lt;br&gt; passed to a flex app. I have the following model association: &lt;br&gt; ServiceDay-&amp;gt;(hasMany)ServiceTi me-&amp;gt;(hasMany)ServiceTimePrice. So what &lt;br&gt; the current output from my findall is something like this example: &lt;br&gt; &lt;p&gt;Array( &lt;br&gt; [0] =&amp;gt; Array(</description>
+				<dc:creator>cakephp</dc:creator>
+				<category><![CDATA[cakephp]]></category>
+				<category><![CDATA[model]]></category>
+				<guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f</guid>
+				<author>bmil...@gmail.com(bpscrugs)</author>
+				<pubDate>Fri, 28 Dec 2007 00:44:14 UT</pubDate>
+			</item>
+			<item>
+				<title>Re: share views between actions?</title>
+				<link>http://groups.google.com/group/cake-php/msg/8b350d898707dad8</link>
+				<description>Then perhaps you might do us all a favour and refrain from replying to &lt;br&gt; things you do not understand. That goes especially for asinine comments. &lt;br&gt; Indeed. &lt;br&gt; To sum up: &lt;br&gt; No comment. &lt;br&gt; In my day, a simple &amp;quot;RTFM&amp;quot; would suffice. I&#39;ll keep in mind to ignore any &lt;br&gt; further responses from you. &lt;br&gt; You (and I) were referring to the *online documentation*, not other</description>
+				<dc:creator>cakephp</dc:creator>
+				<category><![CDATA[cakephp]]></category>
+				<category><![CDATA[model]]></category>
+				<guid isPermaLink="true">http://groups.google.com/group/cake-php/msg/8b350d898707dad8</guid>
+				<author>subtropolis.z...@gmail.com(subtropolis zijn)</author>
+				<pubDate>Fri, 28 Dec 2007 00:45:01 UT</pubDate>
+			</item>
+		</channel>
+		</rss>';
+
+		$xml = new Xml($string);
+		$result = $xml->toArray();
+
+		$expected = array('Rss' => array(
+			'version' => '2.0',
+			'Channel' => array(
+				'title' => 'Cake PHP Google Group',
+				'link' => 'http://groups.google.com/group/cake-php',
+				'description' => 'Search this group before posting anything. There are over 20,000 posts and it&#39;s very likely your question was answered before. Visit the IRC channel #cakephp at irc.freenode.net for live chat with users and developers of Cake. If you post, tell us the version of Cake, PHP, and database.',
+				'language' => 'en',
+				'Item' => array(
+					array(
+						'title' => 'constructng result array when using findall',
+						'link' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f',
+						'description' => "i'm using cakephp to construct a logical data model array that will be <br> passed to a flex app. I have the following model association: <br> ServiceDay-&gt;(hasMany)ServiceTi me-&gt;(hasMany)ServiceTimePrice. So what <br> the current output from my findall is something like this example: <br><p>Array( <br> [0] =&gt; Array(",
+						'creator' => 'cakephp',
+						'Category' => array('cakephp', 'model'),
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/49bc00f3bc651b4f'),
+						'author' => 'bmil...@gmail.com(bpscrugs)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:44:14 UT',
+					),
+					array(
+						'title' => 'Re: share views between actions?',
+						'link' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8',
+						'description' => 'Then perhaps you might do us all a favour and refrain from replying to <br> things you do not understand. That goes especially for asinine comments. <br> Indeed. <br> To sum up: <br> No comment. <br> In my day, a simple &quot;RTFM&quot; would suffice. I\'ll keep in mind to ignore any <br> further responses from you. <br> You (and I) were referring to the *online documentation*, not other',
+						'creator' => 'cakephp',
+						'Category' => array('cakephp', 'model'),
+						'guid' => array('isPermaLink' => 'true', 'value' => 'http://groups.google.com/group/cake-php/msg/8b350d898707dad8'),
+						'author' => 'subtropolis.z...@gmail.com(subtropolis zijn)',
+						'pubDate' => 'Fri, 28 Dec 2007 00:45:01 UT'
+					)
+				)
+			)
+		));
+		$this->assertEqual($result, $expected);
+
+		$text = "<?xml version='1.0' encoding='utf-8'?>
+		          <course>
+		            <comps>
+		              <comp>1</comp>
+		              <comp>2</comp>
+		              <comp>3</comp>
+		              <comp>4</comp>
+		            </comps>
+		          </course>";
+		$xml = new Xml($text);
+		$result = $xml->toArray();
+
+		$expected = array('Course' => array(
+			'Comps' => array(
+				'Comp' => array(
+					1, 2, 3, 4
+				)
+			)
+		));
+
+		$this->assertEqual($result, $expected);
+
+		$text = '<?xml version="1.0" encoding="UTF-8"?>
+		<XRDS xmlns="xri://$xrds">
+		<XRD xml:id="oauth" xmlns="xri://$XRD*($v*2.0)" version="2.0">
+			<Type>xri://$xrds*simple</Type>
+			<Expires>2008-04-13T07:34:58Z</Expires>
+			<Service>
+				<Type>http://oauth.net/core/1.0/endpoint/authorize</Type>
+				<Type>http://oauth.net/core/1.0/parameters/auth-header</Type>
+				<Type>http://oauth.net/core/1.0/parameters/uri-query</Type>
+				<URI priority="10">https://ma.gnolia.com/oauth/authorize</URI>
+				<URI priority="20">http://ma.gnolia.com/oauth/authorize</URI>
+			</Service>
+		</XRD>
+		<XRD xmlns="xri://$XRD*($v*2.0)" version="2.0">
+			<Type>xri://$xrds*simple</Type>
+				<Service priority="10">
+					<Type>http://oauth.net/discovery/1.0</Type>
+					<URI>#oauth</URI>
+				</Service>
+		</XRD>
+		</XRDS>';
+
+		$xml = new Xml($text);
+		$result = $xml->toArray();
+
+		$expected = array('XRDS' => array(
+			'xmlns' => 'xri://$xrds',
+			'XRD' => array(
+				array(
+					'xml:id' => 'oauth',
+					'xmlns' => 'xri://$XRD*($v*2.0)',
+					'version' => '2.0',
+					'Type' => 'xri://$xrds*simple',
+					'Expires' => '2008-04-13T07:34:58Z',
+					'Service' => array(
+						'Type' => array(
+							'http://oauth.net/core/1.0/endpoint/authorize',
+							'http://oauth.net/core/1.0/parameters/auth-header',
+							'http://oauth.net/core/1.0/parameters/uri-query'
+						),
+						'URI' => array(
+							array(
+								'value' => 'https://ma.gnolia.com/oauth/authorize',
+								'priority' => '10',
+							),
+							array(
+								'value' => 'http://ma.gnolia.com/oauth/authorize',
+								'priority' => '20'
+							)
+						)
+					)
+				),
+				array(
+					'xmlns' => 'xri://$XRD*($v*2.0)',
+					'version' => '2.0',
+					'Type' => 'xri://$xrds*simple',
+					'Service' => array(
+						'priority' => '10',
+						'Type' => 'http://oauth.net/discovery/1.0',
+						'URI' => '#oauth'
+					)
+				)
+			)
+		));
+		$this->assertEqual($result, $expected);
+
+		$text = '<?xml version="1.0" encoding="UTF-8"?>
+		<root>
+			<child id="1" other="1" />
+			<child id="2" other="1" />
+			<child id="3" other="1" />
+			<child id="4" other="1" />
+			<child id="5" other="1" />
+		</root>';
+		$xml = new Xml($text);
+		$result = $xml->toArray();
+		$expected = array(
+			'Root' => array(
+				'Child' => array(
+					array('id' => 1, 'other' => 1),
+					array('id' => 2, 'other' => 1),
+					array('id' => 3, 'other' => 1),
+					array('id' => 4, 'other' => 1),
+					array('id' => 5, 'other' => 1)
+				)
+			)
+		);
+		$this->assertEqual($result, $expected);
+
+		$text = '<main><first label="first type node 1" /><first label="first type node 2" /><second label="second type node" /></main>';
+		$xml =  new Xml($text);
+		$result = $xml->toArray();
+		$expected = array(
+		    'Main' => array(
+		        'First' => array(
+		            array('label' => 'first type node 1'),
+		            array('label' => 'first type node 2')
+		        ),
+		        'Second' => array('label'=>'second type node')
+		    )
+		);
+		$this->assertIdentical($result,$expected);
+
+		$text = '<main><first label="first type node 1" /><first label="first type node 2" /><second label="second type node" /><collection><fifth label="fifth type node"/><third label="third type node 1"/><third label="third type node 2"/><third label="third type node 3"/><fourth label="fourth type node"/></collection></main>';
+		$xml =  new Xml($text);
+		$result = $xml->toArray();
+		$expected = array(
+		    'Main' => array(
+		        'First' => array(
+		            array('label' => 'first type node 1'),
+		            array('label' => 'first type node 2')
+		        ),
+		        'Second' => array('label'=>'second type node'),
+				'Collection' => array(
+					'Fifth' => array('label' => 'fifth type node'),
+					'Third' => array(
+						array('label' => 'third type node 1'),
+						array('label' => 'third type node 2'),
+						array('label' => 'third type node 3'),
+					),
+					'Fourth' => array('label' => 'fourth type node'),
+				)
+		    )
+		);
+		$this->assertIdentical($result,$expected);
+	}
+
+/**
+ * testAppend method
+ *
+ * @access public
+ * @return void
+ */
+	function testAppend() {
+		$parentNode = new XmlNode('ourParentNode');
+		$parentNode->append( new XmlNode('ourChildNode'));
+		$first =& $parentNode->first();
+		$this->assertEqual($first->name, 'ourChildNode');
+
+		$string = 'ourChildNode';
+		$parentNode = new XmlNode('ourParentNode');
+		$parentNode->append($string);
+		$last =& $parentNode->last();
+		$this->assertEqual($last->name, 'ourChildNode');
+
+		$this->expectError();
+		$parentNode->append($parentNode);
+	}
+
+/**
+ * testNamespacing method
+ *
+ * @access public
+ * @return void
+ */
+	function testNamespacing() {
+		$node = new Xml('<xml></xml>');
+		$node->addNamespace('cake', 'http://cakephp.org');
+		$this->assertEqual($node->toString(), '<xml xmlns:cake="http://cakephp.org" />');
+
+		$this->assertTrue($node->removeNamespace('cake'));
+		$this->assertEqual($node->toString(), '<xml />');
+
+
+		$node = new Xml('<xml xmlns:cake="http://cakephp.org" />');
+		$this->assertTrue($node->removeNamespace('cake'));
+		$this->assertEqual($node->toString(), '<xml />');
+
+		$node->addNamespace('cake', 'http://cakephp.org');
+		$this->assertEqual($node->toString(), '<xml xmlns:cake="http://cakephp.org" />');
+	}
+
+/**
+ * testCamelize method
+ *
+ * @access public
+ * @return void
+ */
+	function testCamelize() {
+		$xmlString = '<methodCall><methodName>examples.getStateName</methodName>' .
+			'<params><param><value><i4>41</i4></value></param></params></methodCall>';
+
+		$Xml = new Xml($xmlString);
+		$expected = array(
+			'methodCall' => array(
+				'methodName' => 'examples.getStateName',
+					'params' => array(
+						'param' => array('value' => array('i4' => 41)))));
+		$this->assertEqual($expected, $Xml->toArray(false));
+
+		$Xml = new Xml($xmlString);
+		$expected = array(
+			'MethodCall' => array(
+				'methodName' => 'examples.getStateName',
+					'Params' => array(
+						'Param' => array('Value' => array('i4' => 41)))));
+		$this->assertEqual($expected, $Xml->toArray());
+	}
+
+/**
+ * testNumericDataHandling method
+ *
+ * @access public
+ * @return void
+ */
+	function testNumericDataHandling() {
+		$data = '<xml><data>012345</data></xml>';
+
+		$node = new Xml();
+		$node->load($data);
+		$node->parse();
+
+		$result = $node->first();
+		$result = $result->children("data");
+
+		$result = $result[0]->first();
+		$this->assertEqual($result->value, '012345');
+	}
+
+/**
+ * test that creating an xml object does not leak memory
+ *
+ * @return void
+ */
+	function testMemoryLeakInConstructor() {
+		if ($this->skipIf(!function_exists('memory_get_usage'), 'Cannot test memory leaks without memory_get_usage')) {
+			return;
+		}
+		$data = '<?xml version="1.0" encoding="UTF-8"?><content>TEST</content>';
+		$start = memory_get_usage();
+		for ($i = 0; $i <= 300; $i++) {
+			$test =& new XML($data);
+			$test->__destruct();
+			unset($test);
+		}
+		$end = memory_get_usage();
+		$this->assertWithinMargin($start, $end, 3600, 'Memory leaked %s');
+	}
+
+/**
+ * Test toArray with alternate inputs.
+ *
+ * @return void
+ */
+	function testToArrayAlternate() {
+		$sXml = 
+		'<t1>
+		 	<t2>A</t2>
+      		<t2><t3>AAA</t3>B</t2>
+	  		<t2>C</t2>
+		</t1>';
+		$xml = new Xml($sXml);
+		$result = $xml->toArray();
+		$expected = array(
+			'T1' => array(
+				'T2' => array(
+					'A',
+					array('t3' => 'AAA', 'value' => 'B'),
+					'C'
+			)
+		)
+		);
+		$this->assertIdentical($result, $expected);
+		$result = $xml->toArray(false);
+		$expected = array(
+			't1' => array(
+				't2' => array(
+					'A',
+					array('t3' => 'AAA', 'value' => 'B'),
+					'C'
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+		
+		$sXml = 
+		'<t1>
+		 	<t2>A</t2>
+	  		<t2>B</t2>
+      		<t2>
+	         	<t3>CCC</t3>
+	      	</t2>
+		</t1>';
+		$xml = new Xml($sXml);
+		$result = $xml->toArray();
+		$expected = array(
+			'T1' => array(
+				'T2' => array(
+					'A',
+					'B',
+					array('t3' => 'CCC'),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+		$result = $xml->toArray(false);
+		$expected = array(
+			't1' => array(
+				't2' => array(
+					'A',
+					'B',
+					array('t3' => 'CCC'),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+		
+		$sXml = 
+		'<t1>
+		 <t2>A</t2>
+		 <t2></t2>
+		 <t2>C</t2>
+		</t1>';
+		$xml = new Xml($sXml);
+		$result = $xml->toArray();
+		$expected = array(
+			'T1' => array(
+				'T2' => array(
+					'A',
+					array(),
+					'C'
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+
+		$result = $xml->toArray(false);
+		$expected = array(
+			't1' => array(
+				't2' => array(
+					'A',
+					array(),
+					'C'
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+		
+		$sXml = 
+		'<stuff>
+    <foo name="abc-16" profile-id="Default" />
+    <foo name="abc-17" profile-id="Default" >
+        <bar id="HelloWorld" />
+    </foo>
+    <foo name="abc-asdf" profile-id="Default" />
+    <foo name="cba-1A" profile-id="Default">
+        <bar id="Baz" />
+    </foo>
+    <foo name="cba-2A" profile-id="Default">
+        <bar id="Baz" />
+    </foo>
+    <foo name="qa" profile-id="Default" />
+</stuff>';
+		$xml = new Xml($sXml);
+		$result = $xml->toArray();
+		$expected = array(
+			'Stuff' => array(
+				'Foo' => array(
+					array('name' => 'abc-16', 'profile-id' => 'Default'),
+					array('name' => 'abc-17', 'profile-id' => 'Default', 
+						'Bar' => array('id' => 'HelloWorld')),
+					array('name' => 'abc-asdf', 'profile-id' => 'Default'),
+					array('name' => 'cba-1A', 'profile-id' => 'Default', 
+						'Bar' => array('id' => 'Baz')),
+					array('name' => 'cba-2A', 'profile-id' => 'Default', 
+						'Bar' => array('id' => 'Baz')),
+					array('name' => 'qa', 'profile-id' => 'Default'),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+		$result = $xml->toArray(false);
+		$expected = array(
+			'stuff' => array(
+				'foo' => array(
+					array('name' => 'abc-16', 'profile-id' => 'Default'),
+					array('name' => 'abc-17', 'profile-id' => 'Default', 
+						'bar' => array('id' => 'HelloWorld')),
+					array('name' => 'abc-asdf', 'profile-id' => 'Default'),
+					array('name' => 'cba-1A', 'profile-id' => 'Default', 
+						'bar' => array('id' => 'Baz')),
+					array('name' => 'cba-2A', 'profile-id' => 'Default', 
+						'bar' => array('id' => 'Baz')),
+					array('name' => 'qa', 'profile-id' => 'Default'),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+		
+		
+		$sXml = 
+		'<root>
+  <node name="first" />
+  <node name="second"><subnode name="first sub" /><subnode name="second sub" /></node>
+  <node name="third" />
+</root>';
+		$xml = new Xml($sXml);
+		$result = $xml->toArray();
+		$expected = array(
+			'Root' => array(
+				'Node' => array(
+					array('name' => 'first'),
+					array('name' => 'second', 
+						'Subnode' => array(
+							array('name' => 'first sub'), 
+							array('name' => 'second sub'))),
+					array('name' => 'third'),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+		
+		$result = $xml->toArray(false);
+		$expected = array(
+			'root' => array(
+				'node' => array(
+					array('name' => 'first'),
+					array('name' => 'second', 
+						'subnode' => array(
+							array('name' => 'first sub'), 
+							array('name' => 'second sub'))),
+					array('name' => 'third'),
+				)
+			)
+		);
+		$this->assertIdentical($result, $expected);
+	}
+	
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/account_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/account_fixture.php
new file mode 100644
index 000000000..8c9b230b2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/account_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AccountFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Aco'
+ * @access public
+ */
+	var $name = 'Account';
+	var $table = 'Accounts';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'iAccountId'		=> array('type' => 'integer', 'key' => 'primary'),
+		'cDescription'	=> array('type' => 'string', 'length' => 10, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('cDescription' => 'gwoo'),
+		array('cDescription' => 'phpnut'),
+		array('cDescription' => 'schreck'),
+		array('cDescription' => 'dude')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_action_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_action_fixture.php
new file mode 100644
index 000000000..40deb2ca6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_action_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AcoActionFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'AcoAction'
+ * @access public
+ */
+	var $name = 'AcoAction';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'parent_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'model' => array('type' => 'string', 'default' => ''),
+		'foreign_key' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'alias' => array('type' => 'string', 'default' => ''),
+		'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array();
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_fixture.php
new file mode 100644
index 000000000..72288c6cf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_fixture.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AcoFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Aco'
+ * @access public
+ */
+	var $name = 'Aco';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'		=> array('type' => 'integer', 'key' => 'primary'),
+		'parent_id'	=> array('type' => 'integer', 'length' => 10, 'null' => true),
+		'model'		=> array('type' => 'string', 'null' => true),
+		'foreign_key' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'alias' => array('type' => 'string', 'default' => ''),
+		'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1,  'rght' => 24),
+		array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller1', 'lft' => 2,  'rght' => 9),
+		array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 3,  'rght' => 6),
+		array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 4,  'rght' => 5),
+		array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 7,  'rght' => 8),
+		array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller2','lft' => 10, 'rght' => 17),
+		array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 11, 'rght' => 14),
+		array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 12, 'rght' => 13),
+		array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 15, 'rght' => 16),
+		array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Users', 'lft' => 18, 'rght' => 23),
+		array('parent_id' => 9, 'model' => null, 'foreign_key' => null, 'alias' => 'Users', 'lft' => 19, 'rght' => 22),
+		array('parent_id' => 10, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 20, 'rght' => 21),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_two_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_two_fixture.php
new file mode 100644
index 000000000..daa93dfa1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aco_two_fixture.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AcoTwoFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'AcoTwo'
+ * @access public
+ */
+	var $name = 'AcoTwo';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'		=> array('type' => 'integer', 'key' => 'primary'),
+		'parent_id'	=> array('type' => 'integer', 'length' => 10, 'null' => true),
+		'model'		=> array('type' => 'string', 'null' => true),
+		'foreign_key' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'alias'		=> array('type' => 'string', 'default' => ''),
+		'lft'		=> array('type' => 'integer', 'length' => 10, 'null' => true),
+		'rght'		=> array('type' => 'integer', 'length' => 10, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('parent_id' => null,	'model' => null, 'foreign_key' => null, 'alias' => 'ROOT',		'lft' => 1,  'rght' => 20),
+		array('parent_id' => 1,		'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports', 'lft' => 2,  'rght' => 9),
+		array('parent_id' => 2,		'model' => null, 'foreign_key' => null, 'alias' => 'view',		'lft' => 3,  'rght' => 6),
+		array('parent_id' => 3,		'model' => null, 'foreign_key' => null, 'alias' => 'current',	'lft' => 4,  'rght' => 5),
+		array('parent_id' => 2,		'model' => null, 'foreign_key' => null, 'alias' => 'update',	'lft' => 7,  'rght' => 8),
+		array('parent_id' => 1,		'model' => null, 'foreign_key' => null, 'alias' => 'printers',	'lft' => 10, 'rght' => 19),
+		array('parent_id' => 6,		'model' => null, 'foreign_key' => null, 'alias' => 'print',		'lft' => 11, 'rght' => 14),
+		array('parent_id' => 7,		'model' => null, 'foreign_key' => null, 'alias' => 'lettersize','lft' => 12, 'rght' => 13),
+		array('parent_id' => 6,		'model' => null, 'foreign_key' => null, 'alias' => 'refill',	'lft' => 15, 'rght' => 16),
+		array('parent_id' => 6,		'model' => null, 'foreign_key' => null, 'alias' => 'smash',		'lft' => 17, 'rght' => 18),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/ad_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/ad_fixture.php
new file mode 100644
index 000000000..0a62e7243
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/ad_fixture.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Short description for ad_fixture.php
+ *
+ * Long description for ad_fixture.php
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * @link          http://www.cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * AdFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AdFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Ad'
+ * @access public
+ */
+	var $name = 'Ad';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'campaign_id' => array('type' => 'integer'),
+		'parent_id' => array('type' => 'integer'),
+		'lft' => array('type' => 'integer'),
+		'rght' => array('type' => 'integer'),
+		'name' => array('type' => 'string', 'length' => 255, 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('parent_id' => null, 'lft' => 1,  'rght' => 2,  'campaign_id' => 1, 'name' => 'Nordover'),
+		array('parent_id' => null, 'lft' => 3,  'rght' => 4,  'campaign_id' => 1, 'name' => 'Statbergen'),
+		array('parent_id' => null, 'lft' => 5,  'rght' => 6,  'campaign_id' => 1, 'name' => 'Feroy'),
+		array('parent_id' => null, 'lft' => 7, 'rght' => 12,  'campaign_id' => 2, 'name' => 'Newcastle'),
+		array('parent_id' => null, 'lft' => 8,  'rght' => 9,  'campaign_id' => 2, 'name' => 'Dublin'),
+		array('parent_id' => null, 'lft' => 10, 'rght' => 11, 'campaign_id' => 2, 'name' => 'Alborg'),
+		array('parent_id' => null, 'lft' => 13, 'rght' => 14, 'campaign_id' => 3, 'name' => 'New York')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/advertisement_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/advertisement_fixture.php
new file mode 100644
index 000000000..0661a3bb5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/advertisement_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AdvertisementFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Advertisement'
+ * @access public
+ */
+	var $name = 'Advertisement';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('title' => 'First Ad', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('title' => 'Second Ad', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/after_tree_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/after_tree_fixture.php
new file mode 100644
index 000000000..e87aeb865
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/after_tree_fixture.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Short description for after_tree_fixture.php
+ *
+ * Long description for after_tree_fixture.php
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * @link          http://www.cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * AdFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AfterTreeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'AfterTree'
+ * @access public
+ */
+	var $name = 'AfterTree';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'parent_id' => array('type' => 'integer'),
+		'lft' => array('type' => 'integer'),
+		'rght' => array('type' => 'integer'),
+		'name' => array('type' => 'string', 'length' => 255, 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('parent_id' => null, 'lft' => 1,  'rght' => 2, 'name' => 'One'),
+		array('parent_id' => null, 'lft' => 3,  'rght' => 4, 'name' => 'Two'),
+		array('parent_id' => null, 'lft' => 5,  'rght' => 6, 'name' => 'Three'),
+		array('parent_id' => null, 'lft' => 7, 'rght' => 12, 'name' => 'Four'),
+		array('parent_id' => null, 'lft' => 8,  'rght' => 9, 'name' => 'Five'),
+		array('parent_id' => null, 'lft' => 10, 'rght' => 11, 'name' => 'Six'),
+		array('parent_id' => null, 'lft' => 13, 'rght' => 14, 'name' => 'Seven')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/another_article_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/another_article_fixture.php
new file mode 100644
index 000000000..3b6f020bf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/another_article_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AnotherArticleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'AnotherArticle'
+ * @access public
+ */
+	var $name = 'AnotherArticle';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('title' => 'First Article', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('title' => 'Second Article', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('title' => 'Third Article', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/apple_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/apple_fixture.php
new file mode 100644
index 000000000..42894aebb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/apple_fixture.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AppleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Apple'
+ * @access public
+ */
+	var $name = 'Apple';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'apple_id' => array('type' => 'integer', 'null' => true),
+		'color' => array('type' => 'string', 'length' => 40, 'null' => false),
+		'name' => array('type' => 'string', 'length' => 40, 'null' => false),
+		'created' => 'datetime',
+		'date' => 'date',
+		'modified' => 'datetime',
+		'mytime' => 'time'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('apple_id' => 2, 'color' => 'Red 1', 'name' => 'Red Apple 1', 'created' => '2006-11-22 10:38:58', 'date' => '1951-01-04', 'modified' => '2006-12-01 13:31:26', 'mytime' => '22:57:17'),
+		array('apple_id' => 1, 'color' => 'Bright Red 1', 'name' => 'Bright Red Apple', 'created' => '2006-11-22 10:43:13', 'date' => '2014-01-01', 'modified' => '2006-11-30 18:38:10', 'mytime' => '22:57:17'),
+		array('apple_id' => 2, 'color' => 'blue green', 'name' => 'green blue', 'created' => '2006-12-25 05:13:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:24', 'mytime' => '22:57:17'),
+		array('apple_id' => 2, 'color' => 'Blue Green', 'name' => 'Test Name', 'created' => '2006-12-25 05:23:36', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:23:36', 'mytime' => '22:57:17'),
+		array('apple_id' => 5, 'color' => 'Green', 'name' => 'Blue Green', 'created' => '2006-12-25 05:24:06', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:16', 'mytime' => '22:57:17'),
+		array('apple_id' => 4, 'color' => 'My new appleOrange', 'name' => 'My new apple', 'created' => '2006-12-25 05:29:39', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:29:39', 'mytime' => '22:57:17'),
+		array('apple_id' => 6, 'color' => 'Some wierd color', 'name' => 'Some odd color', 'created' => '2006-12-25 05:34:21', 'date' => '2006-12-25', 'modified' => '2006-12-25 05:34:21', 'mytime' => '22:57:17')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_fixture.php
new file mode 100644
index 000000000..2c7b681dd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_fixture.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AroFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Aro'
+ * @access public
+ */
+	var $name = 'Aro';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'parent_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'model' => array('type' => 'string', 'null' => true),
+		'foreign_key' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'alias' => array('type' => 'string', 'default' => ''),
+		'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 8),
+		array('parent_id' => '1', 'model' => 'Group', 'foreign_key' => '1', 'alias' => 'admins', 'lft' => 2, 'rght' => 7),
+		array('parent_id' => '2', 'model' => 'AuthUser', 'foreign_key' => '1', 'alias' => 'Gandalf', 'lft' => 3, 'rght' => 4),
+		array('parent_id' => '2', 'model' => 'AuthUser', 'foreign_key' => '2', 'alias' => 'Elrond', 'lft' => 5, 'rght' => 6)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_two_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_two_fixture.php
new file mode 100644
index 000000000..c133abb38
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aro_two_fixture.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AroTwoFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'AroTwo'
+ * @access public
+ */
+	var $name = 'AroTwo';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'parent_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'model' => array('type' => 'string', 'null' => true),
+		'foreign_key' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'alias' => array('type' => 'string', 'default' => ''),
+		'lft' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'rght' => array('type' => 'integer', 'length' => 10, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'root', 	'lft' => '1',  'rght' => '20'),
+		array('id' => 2, 'parent_id' => 1, 'model' => 'Group', 'foreign_key' => '1', 'alias' => 'admin', 	'lft' => '2',   'rght' => '5'),
+		array('id' => 3, 'parent_id' => 1, 'model' => 'Group', 'foreign_key' => '2', 'alias' => 'managers', 'lft' => '6',  'rght' => '9'),
+		array('id' => 4, 'parent_id' => 1, 'model' => 'Group', 'foreign_key' => '3', 'alias' => 'users',    'lft' => '10', 'rght' => '19'),
+		array('id' => 5, 'parent_id' => 2, 'model' => 'User',  'foreign_key' => '1', 'alias' => 'Bobs',      'lft' => '3',  'rght' => '4' ),
+		array('id' => 6, 'parent_id' => 3, 'model' => 'User',  'foreign_key' => '2', 'alias' => 'Lumbergh',  'lft' => '7' ,  'rght' => '8'),
+		array('id' => 7, 'parent_id' => 4, 'model' => 'User',  'foreign_key' => '3', 'alias' => 'Samir',     'lft' => '11' ,  'rght' => '12'),
+		array('id' => 8, 'parent_id' => 4, 'model' => 'User',  'foreign_key' => '4', 'alias' => 'Micheal',   'lft' => '13',  'rght' => '14'),
+		array('id' => 9, 'parent_id' => 4, 'model' => 'User',  'foreign_key' => '5', 'alias' => 'Peter',     'lft' => '15',  'rght' => '16'),
+		array('id' => 10, 'parent_id' => 4, 'model' => 'User',  'foreign_key' => '6', 'alias' => 'Milton',   'lft' => '17',  'rght' => '18'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_fixture.php
new file mode 100644
index 000000000..59076c230
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ArosAcoFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ArosAco'
+ * @access public
+ */
+	var $name = 'ArosAco';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'aro_id' => array('type' => 'integer', 'length' => 10, 'null' => false),
+		'aco_id' => array('type' => 'integer', 'length' => 10, 'null' => false),
+		'_create' => array('type' => 'string', 'length' => 2, 'default' => 0),
+		'_read' => array('type' => 'string', 'length' => 2, 'default' => 0),
+		'_update' => array('type' => 'string', 'length' => 2, 'default' => 0),
+		'_delete' => array('type' => 'string', 'length' => 2, 'default' => 0)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array();
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_two_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_two_fixture.php
new file mode 100644
index 000000000..a6f5cc6ab
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/aros_aco_two_fixture.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ArosAcoTwoFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ArosAcoTwo'
+ * @access public
+ */
+	var $name = 'ArosAcoTwo';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'aro_id' => array('type' => 'integer', 'length' => 10, 'null' => false),
+		'aco_id' => array('type' => 'integer', 'length' => 10, 'null' => false),
+		'_create' => array('type' => 'string', 'length' => 2, 'default' => 0),
+		'_read' => array('type' => 'string', 'length' => 2, 'default' => 0),
+		'_update' => array('type' => 'string', 'length' => 2, 'default' => 0),
+		'_delete' => array('type' => 'string', 'length' => 2, 'default' => 0)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'aro_id' => '1', 'aco_id' => '1', '_create' => '-1',  '_read' => '-1', '_update' => '-1', '_delete' => '-1'),
+		array('id' => 2, 'aro_id' => '2', 'aco_id' => '1', '_create' => '0',  '_read' => '1', '_update' => '1', '_delete' => '1'),
+		array('id' => 3, 'aro_id' => '3', 'aco_id' => '2', '_create' => '0',  '_read' => '1', '_update' => '0', '_delete' => '0'),
+		array('id' => 4, 'aro_id' => '4', 'aco_id' => '2', '_create' => '1',  '_read' => '1', '_update' => '0', '_delete' => '-1'),
+		array('id' => 5, 'aro_id' => '4', 'aco_id' => '6', '_create' => '1',  '_read' => '1', '_update' => '0', '_delete' => '0'),
+		array('id' => 6, 'aro_id' => '5', 'aco_id' => '1', '_create' => '1',  '_read' => '1', '_update' => '1', '_delete' => '1'),
+		array('id' => 7, 'aro_id' => '6', 'aco_id' => '3', '_create' => '-1',  '_read' => '1', '_update' => '-1', '_delete' => '-1'),
+		array('id' => 8, 'aro_id' => '6', 'aco_id' => '4', '_create' => '-1',  '_read' => '1', '_update' => '-1', '_delete' => '1'),
+		array('id' => 9, 'aro_id' => '6', 'aco_id' => '6', '_create' => '-1',  '_read' => '1', '_update' => '1', '_delete' => '-1'),
+		array('id' => 10, 'aro_id' => '7', 'aco_id' => '2', '_create' => '-1',  '_read' => '-1', '_update' => '-1', '_delete' => '-1'),
+		array('id' => 11, 'aro_id' => '7', 'aco_id' => '7', '_create' => '1',  '_read' => '1', '_update' => '1', '_delete' => '0'),
+		array('id' => 12, 'aro_id' => '7', 'aco_id' => '8', '_create' => '1',  '_read' => '1', '_update' => '1', '_delete' => '0'),
+		array('id' => 13, 'aro_id' => '7', 'aco_id' => '9', '_create' => '1',  '_read' => '1', '_update' => '1', '_delete' => '1'),
+		array('id' => 14, 'aro_id' => '7', 'aco_id' => '10', '_create' => '0',  '_read' => '0', '_update' => '0', '_delete' => '1'),
+		array('id' => 15, 'aro_id' => '8', 'aco_id' => '10', '_create' => '1',  '_read' => '1', '_update' => '1', '_delete' => '1'),
+		array('id' => 16, 'aro_id' => '8', 'aco_id' => '2', '_create' => '-1',  '_read' => '-1', '_update' => '-1', '_delete' => '-1'),
+		array('id' => 17, 'aro_id' => '9', 'aco_id' => '4', '_create' => '1',  '_read' => '1', '_update' => '1', '_delete' => '-1'),
+		array('id' => 18, 'aro_id' => '9', 'aco_id' => '9', '_create' => '0',  '_read' => '0', '_update' => '1', '_delete' => '1'),
+		array('id' => 19, 'aro_id' => '10', 'aco_id' => '9', '_create' => '1',  '_read' => '1', '_update' => '1', '_delete' => '1'),
+		array('id' => 20, 'aro_id' => '10', 'aco_id' => '10', '_create' => '-1',  '_read' => '-1', '_update' => '-1', '_delete' => '-1'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featured_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featured_fixture.php
new file mode 100644
index 000000000..b1bdb3b8f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featured_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ArticleFeaturedFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ArticleFeatured'
+ * @access public
+ */
+	var $name = 'ArticleFeatured';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false),
+		'body' => 'text',
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php
new file mode 100644
index 000000000..325ffd89b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_featureds_tags_fixture.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ArticleFeaturedsTagsFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ArticleFeaturedsTags'
+ * @access public
+ */
+	var $name = 'ArticleFeaturedsTags';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'article_featured_id' => array('type' => 'integer', 'null' => false),
+		'tag_id' => array('type' => 'integer', 'null' => false),
+		'indexes' => array('UNIQUE_FEATURED' => array('column'=> array('article_featured_id', 'tag_id'), 'unique'=> 1))
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_fixture.php
new file mode 100644
index 000000000..0908c4ad2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/article_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ArticleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Article'
+ * @access public
+ */
+	var $name = 'Article';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false),
+		'body' => 'text',
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('user_id' => 1, 'title' => 'First Article', 'body' => 'First Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('user_id' => 3, 'title' => 'Second Article', 'body' => 'Second Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('user_id' => 1, 'title' => 'Third Article', 'body' => 'Third Article Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/articles_tag_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/articles_tag_fixture.php
new file mode 100644
index 000000000..84a5e9e5b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/articles_tag_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ArticlesTagFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ArticlesTag'
+ * @access public
+ */
+	var $name = 'ArticlesTag';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'article_id' => array('type' => 'integer', 'null' => false),
+		'tag_id' => array('type' => 'integer', 'null' => false),
+		'indexes' => array('UNIQUE_TAG' => array('column'=> array('article_id', 'tag_id'), 'unique'=>1))
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('article_id' => 1, 'tag_id' => 1),
+		array('article_id' => 1, 'tag_id' => 2),
+		array('article_id' => 2, 'tag_id' => 1),
+		array('article_id' => 2, 'tag_id' => 3)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/attachment_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/attachment_fixture.php
new file mode 100644
index 000000000..ebd4e0749
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/attachment_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AttachmentFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Attachment'
+ * @access public
+ */
+	var $name = 'Attachment';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'comment_id' => array('type' => 'integer', 'null' => false),
+		'attachment' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('comment_id' => 5, 'attachment' => 'attachment.zip',  'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php
new file mode 100644
index 000000000..cee9c3471
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_custom_field_fixture.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.1.8013
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AuthUserCustomFieldFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'AuthUser'
+ * @access public
+ */
+	var $name = 'AuthUserCustomField';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'email' => array('type' => 'string', 'null' => false),
+		'password' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('email' => 'mariano@example.com', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+		array('email' => 'nate@example.com', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
+		array('email' => 'larry@example.com', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
+		array('email' => 'garrett@example.com', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
+		array('email' => 'chartjes@example.com', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
+
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_fixture.php
new file mode 100644
index 000000000..c0ebaf615
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/auth_user_fixture.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AuthUserFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'AuthUser'
+ * @access public
+ */
+	var $name = 'AuthUser';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'username' => array('type' => 'string', 'null' => false),
+		'password' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('username' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+		array('username' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
+		array('username' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
+		array('username' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
+		array('username' => 'chartjes', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
+
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/author_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/author_fixture.php
new file mode 100644
index 000000000..8b78144bb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/author_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class AuthorFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Author'
+ * @access public
+ */
+	var $name = 'Author';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user' => array('type' => 'string', 'default' => null),
+		'password' => array('type' => 'string', 'default' => null),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+		array('user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
+		array('user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
+		array('user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/basket_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/basket_fixture.php
new file mode 100644
index 000000000..5e9fd0ea5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/basket_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class BasketFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Basket'
+ * @access public
+ */
+	var $name = 'Basket';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'type' => array('type' => 'string', 'length' => 255),
+		'name' => array('type' => 'string', 'length' => 255),
+		'object_id' => array('type' => 'integer'),
+		'user_id' => array('type' => 'integer'),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'type' => 'nonfile', 'name' => 'basket1', 'object_id' => 1, 'user_id' => 1),
+		array('id' => 2, 'type' => 'file', 'name' => 'basket2', 'object_id' => 2, 'user_id' => 1),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/bid_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/bid_fixture.php
new file mode 100644
index 000000000..e4dba3b9f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/bid_fixture.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class BidFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Bid'
+ * @access public
+ */
+	var $name = 'Bid';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'message_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('message_id' => 1, 'name' => 'Bid 1.1'),
+		array('message_id' => 1, 'name' => 'Bid 1.2'),
+		array('message_id' => 3, 'name' => 'Bid 3.1'),
+		array('message_id' => 2, 'name' => 'Bid 2.1'),
+		array('message_id' => 2, 'name' => 'Bid 2.2')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/binary_test_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/binary_test_fixture.php
new file mode 100644
index 000000000..ba5f77a26
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/binary_test_fixture.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6700
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class BinaryTestFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'BinaryTest'
+ * @access public
+ */
+	var $name = 'BinaryTest';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'data' => 'binary'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array();
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/book_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/book_fixture.php
new file mode 100644
index 000000000..f3e66fea3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/book_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7198
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class BookFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Book'
+ * @access public
+ */
+	var $name = 'Book';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'isbn' => array('type' => 'string', 'length' => 13),
+		'title' => array('type' => 'string', 'length' =>  255),
+		'author' => array('type' => 'string', 'length' => 255),
+		'year' => array('type' => 'integer', 'null' => true),
+		'pages' => array('type' => 'integer', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'isbn' => '1234567890', 'title' => 'Faust', 'author' => 'Johann Wolfgang von Goethe')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cache_test_model_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cache_test_model_fixture.php
new file mode 100644
index 000000000..029693b86
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cache_test_model_fixture.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CacheTestModelFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'CacheTestModel'
+ * @access public
+ */
+	var $name = 'CacheTestModel';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'		=> array('type' => 'string', 'length' => 255, 'key' => 'primary'),
+		'data'		=> array('type' => 'string', 'length' => 255, 'default' => ''),
+		'expires'	=> array('type' => 'integer', 'length' => 10, 'default' => '0'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/callback_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/callback_fixture.php
new file mode 100644
index 000000000..a2cf8b588
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/callback_fixture.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CallbackFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Callback'
+ * @access public
+ */
+	var $name = 'Callback';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user' => array('type' => 'string', 'null' => false),
+		'password' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('user' => 'user1', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
+		array('user' => 'user2', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
+		array('user' => 'user3', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/campaign_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/campaign_fixture.php
new file mode 100644
index 000000000..80a763b82
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/campaign_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for campaign_fixture.php
+ *
+ * Long description for campaign_fixture.php
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * @link          http://www.cakephp.org
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         1.2
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * CampaignFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CampaignFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Campaign'
+ * @access public
+ */
+	var $name = 'Campaign';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255, 'null' => false),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'Hurtigruten'),
+		array('name' => 'Colorline'),
+		array('name' => 'Queen of Scandinavia')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_fixture.php
new file mode 100644
index 000000000..e29ecaa99
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_fixture.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CategoryFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Category'
+ * @access public
+ */
+	var $name = 'Category';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'parent_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 1, 'name' => 'Category 1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 0, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 0, 'name' => 'Category 3', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 5, 'name' => 'Category 3.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 2, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_thread_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_thread_fixture.php
new file mode 100644
index 000000000..84f77b84f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/category_thread_fixture.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CategoryThreadFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'CategoryThread'
+ * @access public
+ */
+	var $name = 'CategoryThread';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'parent_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('parent_id' => 0, 'name' => 'Category 1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 1, 'name' => 'Category 1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 2, 'name' => 'Category 1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 3, 'name' => 'Category 1.1.2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 4, 'name' => 'Category 1.1.1.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 5, 'name' => 'Category 2', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31'),
+		array('parent_id' => 6, 'name' => 'Category 2.1', 'created' => '2007-03-18 15:30:23', 'updated' => '2007-03-18 15:32:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cd_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cd_fixture.php
new file mode 100644
index 000000000..ad8cf24ef
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/cd_fixture.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7198
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CdFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Cd'
+ * @access public
+ */
+	var $name = 'Cd';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'length' =>  255),
+		'artist' => array('type' => 'string', 'length' => 255, 'null' => true),
+		'genre' => array('type' => 'string', 'length' => 255, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'title' => 'Grace', 'artist' => 'Jeff Buckley', 'genre' => 'awesome')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/comment_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/comment_fixture.php
new file mode 100644
index 000000000..7f80fe543
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/comment_fixture.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CommentFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Comment'
+ * @access public
+ */
+	var $name = 'Comment';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'article_id' => array('type' => 'integer', 'null'=>false),
+		'user_id' => array('type' => 'integer', 'null'=>false),
+		'comment' => 'text',
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:45:23', 'updated' => '2007-03-18 10:47:31'),
+		array('article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:47:23', 'updated' => '2007-03-18 10:49:31'),
+		array('article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Article', 'published' => 'Y', 'created' => '2007-03-18 10:49:23', 'updated' => '2007-03-18 10:51:31'),
+		array('article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Article', 'published' => 'N', 'created' => '2007-03-18 10:51:23', 'updated' => '2007-03-18 10:53:31'),
+		array('article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:53:23', 'updated' => '2007-03-18 10:55:31'),
+		array('article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Article', 'published' => 'Y', 'created' => '2007-03-18 10:55:23', 'updated' => '2007-03-18 10:57:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_account_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_account_fixture.php
new file mode 100644
index 000000000..773938f3f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_account_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ContentAccountFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Aco'
+ * @access public
+ */
+	var $name = 'ContentAccount';
+	var $table = 'ContentAccounts';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'iContentAccountsId' => array('type' => 'integer', 'key' => 'primary'),
+		'iContentId'		=> array('type' => 'integer'),
+		'iAccountId'		=> array('type' => 'integer')
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('iContentId' => 1, 'iAccountId' => 1),
+		array('iContentId' => 2, 'iAccountId' => 2),
+		array('iContentId' => 3, 'iAccountId' => 3),
+		array('iContentId' => 4, 'iAccountId' => 4),
+		array('iContentId' => 1, 'iAccountId' => 2),
+		array('iContentId' => 2, 'iAccountId' => 3),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_fixture.php
new file mode 100644
index 000000000..e92e09cff
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/content_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ContentFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Aco'
+ * @access public
+ */
+	var $name = 'Content';
+	var $table = 'Content';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'iContentId'		=> array('type' => 'integer', 'key' => 'primary'),
+		'cDescription'	=> array('type' => 'string', 'length' => 50, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('cDescription' => 'Test Content 1'),
+		array('cDescription' => 'Test Content 2'),
+		array('cDescription' => 'Test Content 3'),
+		array('cDescription' => 'Test Content 4')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_fixture.php
new file mode 100644
index 000000000..6fc67fbbc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_fixture.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Counter Cache Test Fixtures
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CounterCachePostFixture extends CakeTestFixture {
+
+	var $name = 'CounterCachePost';
+
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'user_id' => array('type' => 'integer', 'null' => true),
+	);
+
+    var $records = array(
+		array('id' => 1, 'title' => 'Rock and Roll',  'user_id' => 66),
+		array('id' => 2, 'title' => 'Music',   'user_id' => 66),
+		array('id' => 3, 'title' => 'Food',   'user_id' => 301),
+    );
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
new file mode 100644
index 000000000..be8c5b6fc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_post_nonstandard_primary_key_fixture.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CounterCachePostNonstandardPrimaryKeyFixture extends CakeTestFixture {
+
+	var $name = 'CounterCachePostNonstandardPrimaryKey';
+
+	var $fields = array(
+		'pid' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'uid' => array('type' => 'integer', 'null' => true),
+	);
+
+    var $records = array(
+		array('pid' => 1, 'title' => 'Rock and Roll',  'uid' => 66),
+		array('pid' => 2, 'title' => 'Music',   'uid' => 66),
+		array('pid' => 3, 'title' => 'Food',   'uid' => 301),
+    );
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_fixture.php
new file mode 100644
index 000000000..799ff69aa
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_fixture.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CounterCacheUserFixture extends CakeTestFixture {
+
+	var $name = 'CounterCacheUser';
+
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'post_count' => array('type' => 'integer', 'null' => true)
+	);
+
+	var $records = array(
+		array('id' => 66, 'name' => 'Alexander','post_count' => 2),
+		array('id' => 301, 'name' => 'Steven','post_count' => 1),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
new file mode 100644
index 000000000..d75f7ab45
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/counter_cache_user_nonstandard_primary_key_fixture.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class CounterCacheUserNonstandardPrimaryKeyFixture extends CakeTestFixture {
+
+	var $name = 'CounterCacheUserNonstandardPrimaryKey';
+
+	var $fields = array(
+		'uid' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'post_count' => array('type' => 'integer', 'null' => true)
+	);
+
+	var $records = array(
+		array('uid' => 66, 'name' => 'Alexander','post_count' => 2),
+		array('uid' => 301, 'name' => 'Steven','post_count' => 1),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/data_test_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/data_test_fixture.php
new file mode 100644
index 000000000..adf635b9e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/data_test_fixture.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6700
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class DataTestFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'DataTest'
+ * @access public
+ */
+	var $name = 'DataTest';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'count' => array('type' => 'integer', 'default' => 0),
+		'float' => array('type' => 'float', 'default' => 0),
+		//'timestamp' => array('type' => 'timestamp', 'default' => null, 'null' => true),
+		'created' => array('type' => 'datetime', 'default' => null),
+		'updated' => array('type' => 'datetime', 'default' => null)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array(
+			'count' => 2,
+			'float' => 2.4,
+			'created' => '2010-09-06 12:28:00',
+			'updated' => '2010-09-06 12:28:00'
+		)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/datatype_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/datatype_fixture.php
new file mode 100644
index 000000000..a12335cd3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/datatype_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7026
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class DatatypeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Datatype'
+ * @access public
+ */
+	var $name = 'Datatype';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'null'=> false, 'default'=> 0, 'key' => 'primary'),
+		'float_field' => array('type' => 'float', 'length' => '5,2', 'null' => false, 'default' => null),
+		'bool' => array('type' => 'boolean', 'null' => false, 'default' => false),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'float_field' => 42.23, 'bool' => false),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/dependency_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/dependency_fixture.php
new file mode 100644
index 000000000..c9b155e1c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/dependency_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6879//Correct version number as needed**
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Short description for file.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6879//Correct version number as needed**
+ */
+class DependencyFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Dependency'
+ * @access public
+ */
+	var $name = 'Dependency';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'child_id' => 'integer',
+		'parent_id' => 'integer'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('child_id' => 1, 'parent_id' => 2),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_fixture.php
new file mode 100644
index 000000000..463d22557
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class DeviceFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Device'
+ * @access public
+ */
+	var $name = 'Device';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'device_type_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false),
+		'typ' => array('type' => 'integer', 'null' => false),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('device_type_id' => 1, 'name' => 'Device 1', 'typ' => 1),
+		array('device_type_id' => 1, 'name' => 'Device 2', 'typ' => 1),
+		array('device_type_id' => 1, 'name' => 'Device 3', 'typ' => 2)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_category_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_category_fixture.php
new file mode 100644
index 000000000..09f533ed4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_category_fixture.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class DeviceTypeCategoryFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'DeviceTypeCategory'
+ * @access public
+ */
+	var $name = 'DeviceTypeCategory';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'DeviceTypeCategory 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_fixture.php
new file mode 100644
index 000000000..9708798f4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/device_type_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class DeviceTypeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'DeviceType'
+ * @access public
+ */
+	var $name = 'DeviceType';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'device_type_category_id' => array('type' => 'integer', 'null' => false),
+		'feature_set_id' => array('type' => 'integer', 'null' => false),
+		'exterior_type_category_id' => array('type' => 'integer', 'null' => false),
+		'image_id' => array('type' => 'integer', 'null' => false),
+		'extra1_id' => array('type' => 'integer', 'null' => false),
+		'extra2_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false),
+		'order' => array('type' => 'integer', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('device_type_category_id' => 1, 'feature_set_id' => 1, 'exterior_type_category_id' => 1, 'image_id' => 1, 'extra1_id' => 1, 'extra2_id' => 1, 'name' => 'DeviceType 1', 'order' => 0)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_directory_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_directory_fixture.php
new file mode 100644
index 000000000..079a5bfde
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_directory_fixture.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class DocumentDirectoryFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'DocumentDirectory'
+ * @access public
+ */
+	var $name = 'DocumentDirectory';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'DocumentDirectory 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_fixture.php
new file mode 100644
index 000000000..3d403334d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/document_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class DocumentFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Document'
+ * @access public
+ */
+	var $name = 'Document';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'document_directory_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('document_directory_id' => 1, 'name' => 'Document 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/exterior_type_category_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/exterior_type_category_fixture.php
new file mode 100644
index 000000000..4b0ad7c71
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/exterior_type_category_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ExteriorTypeCategoryFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ExteriorTypeCategory'
+ * @access public
+ */
+	var $name = 'ExteriorTypeCategory';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'image_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('image_id' => 1, 'name' => 'ExteriorTypeCategory 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/feature_set_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/feature_set_fixture.php
new file mode 100644
index 000000000..041130993
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/feature_set_fixture.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class FeatureSetFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'FeatureSet'
+ * @access public
+ */
+	var $name = 'FeatureSet';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'FeatureSet 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/featured_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/featured_fixture.php
new file mode 100644
index 000000000..d98e57426
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/featured_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class FeaturedFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Featured'
+ * @access public
+ */
+	var $name = 'Featured';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'article_featured_id' => array('type' => 'integer', 'null' => false),
+		'category_id' => array('type' => 'integer', 'null' => false),
+		'published_date' => 'datetime',
+		'end_date' => 'datetime',
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('article_featured_id' => 1, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('article_featured_id' => 2, 'category_id' => 1, 'published_date' => '2007-03-31 10:39:23', 'end_date' => '2007-05-15 10:39:23', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/film_file_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/film_file_fixture.php
new file mode 100644
index 000000000..82cee0d22
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/film_file_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class FilmFileFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'FilmFile'
+ * @access public
+ */
+	var $name = 'FilmFile';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'name' => 'one'),
+		array('id' => 2, 'name' => 'two')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/flag_tree_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/flag_tree_fixture.php
new file mode 100644
index 000000000..38ed2eb5a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/flag_tree_fixture.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Tree behavior class test fixture.
+ *
+ * Enables a model object to act as a node-based tree.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5331
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Flag Tree Test Fixture
+ *
+ * Like Number Tree, but uses a flag for testing scope parameters
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class FlagTreeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'FlagTree'
+ * @access public
+ */
+	var $name = 'FlagTree';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'	=> array('type' => 'integer','key' => 'primary'),
+		'name'	=> array('type' => 'string','null' => false),
+		'parent_id' => 'integer',
+		'lft'	=> array('type' => 'integer','null' => false),
+		'rght'	=> array('type' => 'integer','null' => false),
+		'flag'	=> array('type' => 'integer','null' => false, 'length' => 1, 'default' => 0)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruit_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruit_fixture.php
new file mode 100644
index 000000000..e25be9664
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruit_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7953
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class FruitFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Fruit'
+ * @access public
+ */
+	var $name = 'Fruit';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255),
+		'color' => array('type' => 'string', 'length' => 13),
+		'shape' => array('type' => 'string', 'length' =>  255),
+		'taste' => array('type' => 'string', 'length' => 255)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array(
+			'id' => '481fc6d0-b920-43e0-a40d-6d1740cf8569', 'name' => 'Orange',
+			'color' => 'orange', 'shape' => 'Spherical', 'taste' => 'Tangy & Sweet'
+		)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php
new file mode 100644
index 000000000..35f600aec
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/fruits_uuid_tag_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7953
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class FruitsUuidTagFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'FruitsUuidTag'
+ * @access public
+ */
+	var $name = 'FruitsUuidTag';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'fruit_id' => array('type' => 'string', 'null' => false, 'length' => 36, 'key' => 'primary'),
+		'uuid_tag_id' => array('type' => 'string', 'null' => false, 'length' => 36, 'key' => 'primary'),
+		'indexes' => array(
+			'unique_fruits_tags' => array('unique' => true, 'column' => array('fruit_id', 'uuid_tag_id')),
+		),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('fruit_id' => '481fc6d0-b920-43e0-a40d-6d1740cf8569', 'uuid_tag_id' => '481fc6d0-b920-43e0-e50f-6d1740cf8569')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/group_update_all_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/group_update_all_fixture.php
new file mode 100644
index 000000000..cd450d1df
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/group_update_all_fixture.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class GroupUpdateAllFixture extends CakeTestFixture {
+    var $name = 'GroupUpdateAll';
+    var $table = 'group_update_all';
+
+    var $fields = array(
+            'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
+            'name' => array('type'=>'string', 'null' => false, 'length' => 29),
+            'code' => array('type'=>'integer', 'null' => false, 'length' => 4),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+            );
+    var $records = array(
+        array(
+            'id'  => 1,
+            'name'  => 'group one',
+            'code'  => 120),
+        array(
+            'id'  => 2,
+            'name'  => 'group two',
+            'code'  => 125),
+        array(
+            'id'  => 3,
+            'name'  => 'group three',
+            'code'  => 130),
+        array(
+            'id'  => 4,
+            'name'  => 'group four',
+            'code'  => 135)
+        );
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/home_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/home_fixture.php
new file mode 100644
index 000000000..61459dae3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/home_fixture.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class HomeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Home'
+ * @access public
+ */
+	var $name = 'Home';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'another_article_id' => array('type' => 'integer', 'null' => false),
+		'advertisement_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('another_article_id' => 1, 'advertisement_id' => 1, 'title' => 'First Home', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('another_article_id' => 3, 'advertisement_id' => 1, 'title' => 'Second Home', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/image_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/image_fixture.php
new file mode 100644
index 000000000..fa9cd5268
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/image_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ImageFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Image'
+ * @access public
+ */
+	var $name = 'Image';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'Image 1'),
+		array('name' => 'Image 2'),
+		array('name' => 'Image 3'),
+		array('name' => 'Image 4'),
+		array('name' => 'Image 5')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/item_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/item_fixture.php
new file mode 100644
index 000000000..1743e086f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/item_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ItemFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Item'
+ * @access public
+ */
+	var $name = 'Item';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'syfile_id' => array('type' => 'integer', 'null' => false),
+		'published' => array('type' => 'boolean', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('syfile_id' => 1, 'published' => 0, 'name' => 'Item 1'),
+		array('syfile_id' => 2, 'published' => 0, 'name' => 'Item 2'),
+		array('syfile_id' => 3, 'published' => 0, 'name' => 'Item 3'),
+		array('syfile_id' => 4, 'published' => 0, 'name' => 'Item 4'),
+		array('syfile_id' => 5, 'published' => 0, 'name' => 'Item 5'),
+		array('syfile_id' => 6, 'published' => 0, 'name' => 'Item 6')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/items_portfolio_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/items_portfolio_fixture.php
new file mode 100644
index 000000000..0e6dca3fa
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/items_portfolio_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ItemsPortfolioFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ItemsPortfolio'
+ * @access public
+ */
+	var $name = 'ItemsPortfolio';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'item_id' => array('type' => 'integer', 'null' => false),
+		'portfolio_id' => array('type' => 'integer', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('item_id' => 1, 'portfolio_id' => 1),
+		array('item_id' => 2, 'portfolio_id' => 2),
+		array('item_id' => 3, 'portfolio_id' => 1),
+		array('item_id' => 4, 'portfolio_id' => 1),
+		array('item_id' => 5, 'portfolio_id' => 1),
+		array('item_id' => 6, 'portfolio_id' => 2)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_b_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_b_fixture.php
new file mode 100644
index 000000000..837cd0ccb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_b_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6317
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class JoinABFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'JoinAsJoinB'
+ * @access public
+ */
+	var $name = 'JoinAsJoinB';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'join_a_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'join_b_id' => array('type' => 'integer', 'default' => null),
+		'other' => array('type' => 'string', 'default' => ''),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('join_a_id' => 1, 'join_b_id' => 2, 'other' => 'Data for Join A 1 Join B 2', 'created' => '2008-01-03 10:56:33', 'updated' => '2008-01-03 10:56:33'),
+		array('join_a_id' => 2, 'join_b_id' => 3, 'other' => 'Data for Join A 2 Join B 3', 'created' => '2008-01-03 10:56:34', 'updated' => '2008-01-03 10:56:34'),
+		array('join_a_id' => 3, 'join_b_id' => 1, 'other' => 'Data for Join A 3 Join B 1', 'created' => '2008-01-03 10:56:35', 'updated' => '2008-01-03 10:56:35')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_c_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_c_fixture.php
new file mode 100644
index 000000000..828bf0971
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_c_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6317
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class JoinACFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'JoinAsJoinC'
+ * @access public
+ */
+	var $name = 'JoinAsJoinC';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'join_a_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'join_c_id' => array('type' => 'integer', 'default' => null),
+		'other' => array('type' => 'string', 'default' => ''),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('join_a_id' => 1, 'join_c_id' => 2, 'other' => 'Data for Join A 1 Join C 2', 'created' => '2008-01-03 10:57:22', 'updated' => '2008-01-03 10:57:22'),
+		array('join_a_id' => 2, 'join_c_id' => 3, 'other' => 'Data for Join A 2 Join C 3', 'created' => '2008-01-03 10:57:23', 'updated' => '2008-01-03 10:57:23'),
+		array('join_a_id' => 3, 'join_c_id' => 1, 'other' => 'Data for Join A 3 Join C 1', 'created' => '2008-01-03 10:57:24', 'updated' => '2008-01-03 10:57:24')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_fixture.php
new file mode 100644
index 000000000..6f5781280
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_a_fixture.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6317
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class JoinAFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'JoinA'
+ * @access public
+ */
+	var $name = 'JoinA';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'default' => ''),
+		'body' => array('type' => 'text'),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'Join A 1', 'body' => 'Join A 1 Body', 'created' => '2008-01-03 10:54:23', 'updated' => '2008-01-03 10:54:23'),
+		array('name' => 'Join A 2', 'body' => 'Join A 2 Body', 'created' => '2008-01-03 10:54:24', 'updated' => '2008-01-03 10:54:24'),
+		array('name' => 'Join A 3', 'body' => 'Join A 2 Body', 'created' => '2008-01-03 10:54:25', 'updated' => '2008-01-03 10:54:24')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_b_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_b_fixture.php
new file mode 100644
index 000000000..a7544c56b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_b_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6317
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class JoinBFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'JoinB'
+ * @access public
+ */
+	var $name = 'JoinB';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'default' => ''),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'Join B 1', 'created' => '2008-01-03 10:55:01', 'updated' => '2008-01-03 10:55:01'),
+		array('name' => 'Join B 2', 'created' => '2008-01-03 10:55:02', 'updated' => '2008-01-03 10:55:02'),
+		array('name' => 'Join B 3', 'created' => '2008-01-03 10:55:03', 'updated' => '2008-01-03 10:55:03')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_c_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_c_fixture.php
new file mode 100644
index 000000000..d33e1153c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_c_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6317
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class JoinCFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'JoinC'
+ * @access public
+ */
+	var $name = 'JoinC';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'default' => ''),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'Join C 1', 'created' => '2008-01-03 10:56:11', 'updated' => '2008-01-03 10:56:11'),
+		array('name' => 'Join C 2', 'created' => '2008-01-03 10:56:12', 'updated' => '2008-01-03 10:56:12'),
+		array('name' => 'Join C 3', 'created' => '2008-01-03 10:56:13', 'updated' => '2008-01-03 10:56:13')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_thing_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_thing_fixture.php
new file mode 100644
index 000000000..66abba646
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/join_thing_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class JoinThingFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'JoinThing'
+ * @access public
+ */
+	var $name = 'JoinThing';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'something_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'something_else_id' => array('type' => 'integer', 'default' => null),
+		'doomed' => array('type' => 'boolean', 'default' => '0'),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('something_id' => 1, 'something_else_id' => 2, 'doomed' => '1', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('something_id' => 2, 'something_else_id' => 3, 'doomed' => '0', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('something_id' => 3, 'something_else_id' => 1, 'doomed' => '1', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/message_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/message_fixture.php
new file mode 100644
index 000000000..94a63a674
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/message_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class MessageFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Message'
+ * @access public
+ */
+	var $name = 'Message';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'thread_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('thread_id' => 1, 'name' => 'Thread 1, Message 1'),
+		array('thread_id' => 2, 'name' => 'Thread 2, Message 1'),
+		array('thread_id' => 3, 'name' => 'Thread 3, Message 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php
new file mode 100644
index 000000000..271c9d7a5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_products_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class MyCategoriesMyProductsFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'MyCategoriesMyProducts'
+ * @access public
+ */
+	var $name = 'MyCategoriesMyProducts';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'my_category_id' => array('type' => 'integer'),
+		'my_product_id' => array('type' => 'integer'),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('my_category_id' => 1, 'my_product_id' => 1),
+		array('my_category_id' => 2, 'my_product_id' => 1),
+		array('my_category_id' => 2, 'my_product_id' => 2),
+		array('my_category_id' => 3, 'my_product_id' => 2),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php
new file mode 100644
index 000000000..a015a5ca2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_categories_my_users_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class MyCategoriesMyUsersFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'MyCategoriesMyUsers'
+ * @access public
+ */
+	var $name = 'MyCategoriesMyUsers';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'my_category_id' => array('type' => 'integer'),
+		'my_user_id' => array('type' => 'integer'),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('my_category_id' => 1, 'my_user_id' => 1),
+		array('my_category_id' => 3, 'my_user_id' => 1),
+		array('my_category_id' => 1, 'my_user_id' => 2),
+		array('my_category_id' => 2, 'my_user_id' => 2),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_category_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_category_fixture.php
new file mode 100644
index 000000000..2b0416f75
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_category_fixture.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class MyCategoryFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'MyCategory'
+ * @access public
+ */
+	var $name = 'MyCategory';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'name' => 'A'),
+		array('id' => 2, 'name' => 'B'),
+		array('id' => 3, 'name' => 'C'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_product_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_product_fixture.php
new file mode 100644
index 000000000..dfa93c58b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_product_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class MyProductFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'MyProduct'
+ * @access public
+ */
+	var $name = 'MyProduct';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'name' => 'book'),
+		array('id' => 2, 'name' => 'computer'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_user_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_user_fixture.php
new file mode 100644
index 000000000..67dadd952
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/my_user_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class MyUserFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'MyUser'
+ * @access public
+ */
+	var $name = 'MyUser';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'firstname' => array('type' => 'string', 'null' => false),
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'firstname' => 'userA'),
+		array('id' => 2, 'firstname' => 'userB')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/node_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/node_fixture.php
new file mode 100644
index 000000000..0fb6e01d8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/node_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6879 //Correct version number as needed**
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Short description for file.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6879 //Correct version number as needed**
+ */
+class NodeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Node'
+ * @access public
+ */
+	var $name = 'Node';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => 'string',
+		'state' => 'integer'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'name' => 'First', 'state' => 50),
+		array('id' => 2, 'name' => 'Second', 'state' => 60),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_fixture.php
new file mode 100644
index 000000000..fc829346f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_fixture.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Tree behavior class.
+ *
+ * Enables a model object to act as a node-based tree.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5331
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Number Tree Test Fixture
+ *
+ * Generates a tree of data for use testing the tree behavior
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class NumberTreeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'NumberTree'
+ * @access public
+ */
+	var $name = 'NumberTree';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'	=> array('type' => 'integer','key' => 'primary'),
+		'name'	=> array('type' => 'string','null' => false),
+		'parent_id' => 'integer',
+		'lft'	=> array('type' => 'integer','null' => false),
+		'rght'	=> array('type' => 'integer','null' => false)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_two_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_two_fixture.php
new file mode 100644
index 000000000..bd07894f7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/number_tree_two_fixture.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Tree behavior class.
+ *
+ * Enables a model object to act as a node-based tree.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5331
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Number Tree Test Fixture
+ *
+ * Generates a tree of data for use testing the tree behavior
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class NumberTreeTwoFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'NumberTree'
+ * @access public
+ */
+	var $name = 'NumberTreeTwo';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'	=> array('type' => 'integer','key' => 'primary'),
+		'name'	=> array('type' => 'string','null' => false),
+		'number_tree_id' => array('type' => 'integer', 'null' => false),
+		'parent_id' => 'integer',
+		'lft'	=> array('type' => 'integer','null' => false),
+		'rght'	=> array('type' => 'integer','null' => false)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/numeric_article_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/numeric_article_fixture.php
new file mode 100644
index 000000000..2b5a1b229
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/numeric_article_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class NumericArticleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'NumericArticle'
+ * @access public
+ */
+	var $name = 'NumericArticle';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('title' => 'First Article', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('title' => '12345abcde', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/overall_favorite_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/overall_favorite_fixture.php
new file mode 100644
index 000000000..684f86c2a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/overall_favorite_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7198
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class OverallFavoriteFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'OverallFavorite'
+ * @access public
+ */
+	var $name = 'OverallFavorite';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'model_type' => array('type' => 'string', 'length' => 255),
+		'model_id' => array('type' => 'integer'),
+		'priority' => array('type' => 'integer')
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'model_type' => 'Cd', 'model_id' => '1', 'priority' => '1'),
+		array('id' => 2, 'model_type' => 'Book', 'model_id' => '1', 'priority' => '2')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/person_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/person_fixture.php
new file mode 100644
index 000000000..4233f9678
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/person_fixture.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6700
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class PersonFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Person'
+ * @access public
+ */
+	var $name = 'Person';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'null' => false, 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false, 'length' => 32),
+		'mother_id' => array('type' => 'integer', 'null' => false, 'key' => 'index'),
+		'father_id' => array('type' => 'integer', 'null' => false),
+		'indexes' => array(
+			'PRIMARY' => array('column' => 'id', 'unique' => 1),
+			'mother_id' => array('column' => array('mother_id', 'father_id'), 'unique' => 0)
+		)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'person', 'mother_id' => 2, 'father_id' => 3),
+		array('name' => 'mother', 'mother_id' => 4, 'father_id' => 5),
+		array('name' => 'father', 'mother_id' => 6, 'father_id' => 7),
+		array('name' => 'mother - grand mother', 'mother_id' => 0, 'father_id' => 0),
+		array('name' => 'mother - grand father', 'mother_id' => 0, 'father_id' => 0),
+		array('name' => 'father - grand mother', 'mother_id' => 0, 'father_id' => 0),
+		array('name' => 'father - grand father', 'mother_id' => 0, 'father_id' => 0)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/portfolio_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/portfolio_fixture.php
new file mode 100644
index 000000000..4d82464d5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/portfolio_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class PortfolioFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Portfolio'
+ * @access public
+ */
+	var $name = 'Portfolio';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'seller_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('seller_id' => 1, 'name' => 'Portfolio 1'),
+		array('seller_id' => 1, 'name' => 'Portfolio 2'),
+		array('seller_id' => 2, 'name' => 'Portfolio 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/post_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/post_fixture.php
new file mode 100644
index 000000000..90dfb2284
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/post_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class PostFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Post'
+ * @access public
+ */
+	var $name = 'Post';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'author_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false),
+		'body' => 'text',
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('author_id' => 1, 'title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('author_id' => 3, 'title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('author_id' => 1, 'title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/posts_tag_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/posts_tag_fixture.php
new file mode 100644
index 000000000..25c0e5699
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/posts_tag_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class PostsTagFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'PostsTag'
+ * @access public
+ */
+	var $name = 'PostsTag';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'post_id' => array('type' => 'integer', 'null' => false),
+		'tag_id' => array('type' => 'string', 'null' => false),
+		'indexes' => array('posts_tag' => array('column' => array('tag_id', 'post_id'), 'unique' => 1))
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('post_id' => 1, 'tag_id' => 'tag1'),
+		array('post_id' => 1, 'tag_id' => 'tag2'),
+		array('post_id' => 2, 'tag_id' => 'tag1'),
+		array('post_id' => 2, 'tag_id' => 'tag3')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/primary_model_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/primary_model_fixture.php
new file mode 100644
index 000000000..e4a824475
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/primary_model_fixture.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class PrimaryModelFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'PrimaryModel'
+ * @access public
+ */
+	var $name = 'PrimaryModel';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'primary_name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('primary_name' => 'Primary Name Existing')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_fixture.php
new file mode 100644
index 000000000..acc86dcad
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_fixture.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ProductFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Product'
+ * @access public
+ */
+	var $name = 'Product';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'type' => array('type' => 'string', 'length' => 255, 'null' => false),
+		'price' => array('type' => 'integer', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'Park\'s Great Hits', 'type' => 'Music', 'price' => 19),
+		array('name' => 'Silly Puddy', 'type' => 'Toy', 'price' => 3),
+		array('name' => 'Playstation', 'type' => 'Toy', 'price' => 89),
+		array('name' => 'Men\'s T-Shirt', 'type' => 'Clothing', 'price' => 32),
+		array('name' => 'Blouse', 'type' => 'Clothing', 'price' => 34),
+		array('name' => 'Electronica 2002', 'type' => 'Music', 'price' => 4),
+		array('name' => 'Country Tunes', 'type' => 'Music', 'price' => 21),
+		array('name' => 'Watermelon', 'type' => 'Food', 'price' => 9)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_update_all_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_update_all_fixture.php
new file mode 100644
index 000000000..3edd35076
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/product_update_all_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ProductUpdateAllFixture extends CakeTestFixture {
+	var $name = 'ProductUpdateAll';
+	var $table = 'product_update_all';
+
+    var $fields = array(
+            'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'key' => 'primary'),
+            'name' => array('type'=>'string', 'null' => false, 'length' => 29),
+            'groupcode' => array('type'=>'integer', 'null' => false, 'length' => 4),
+            'group_id' => array('type'=>'integer', 'null' => false, 'length' => 8),
+            'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+            );
+    var $records = array(
+        array(
+            'id'  => 1,
+            'name'  => 'product one',
+            'groupcode'  => 120,
+            'group_id'  => 1
+            ),
+        array(
+            'id'  => 2,
+            'name'  => 'product two',
+            'groupcode'  => 120,
+            'group_id'  => 1),
+        array(
+            'id'  => 3,
+            'name'  => 'product three',
+            'groupcode'  => 125,
+            'group_id'  => 2),
+        array(
+            'id'  => 4,
+            'name'  => 'product four',
+            'groupcode'  => 135,
+            'group_id'  => 4)
+        );
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/project_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/project_fixture.php
new file mode 100644
index 000000000..f86eec1b2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/project_fixture.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ProjectFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Project'
+ * @access public
+ */
+	var $name = 'Project';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('name' => 'Project 1'),
+		array('name' => 'Project 2'),
+		array('name' => 'Project 3')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/sample_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/sample_fixture.php
new file mode 100644
index 000000000..fa4983b2b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/sample_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class SampleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Sample'
+ * @access public
+ */
+	var $name = 'Sample';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'apple_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'length' => 40, 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('apple_id' => 3, 'name' => 'sample1'),
+		array('apple_id' => 2, 'name' => 'sample2'),
+		array('apple_id' => 4, 'name' => 'sample3'),
+		array('apple_id' => 5, 'name' => 'sample4')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/secondary_model_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/secondary_model_fixture.php
new file mode 100644
index 000000000..db361d806
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/secondary_model_fixture.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class SecondaryModelFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'SecondaryModel'
+ * @access public
+ */
+	var $name = 'SecondaryModel';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'secondary_name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('secondary_name' => 'Secondary Name Existing')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/session_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/session_fixture.php
new file mode 100644
index 000000000..03f7dea1f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/session_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class SessionFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Session'
+ * @access public
+ */
+	var $name = 'Session';
+
+/**
+ * table property.
+ *
+ * @var string
+ */
+	// var $table = 'sessions';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'string', 'length' => 255, 'key' => 'primary'),
+		'data' => array('type' => 'text','null' => true),
+		'expires' => array('type' => 'integer', 'length' => 11, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array();
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_else_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_else_fixture.php
new file mode 100644
index 000000000..2f9ffbe58
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_else_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class SomethingElseFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'SomethingElse'
+ * @access public
+ */
+	var $name = 'SomethingElse';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'default' => ''),
+		'body' => array('type' => 'text'),
+		'published' => array('type' => 'string', 'default' => ''),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_fixture.php
new file mode 100644
index 000000000..7be1357b5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/something_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class SomethingFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Something'
+ * @access public
+ */
+	var $name = 'Something';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'default' => ''),
+		'body' => array('type' => 'text'),
+		'published' => array('type' => 'string', 'default' => ''),
+		'created' => array('type' => 'datetime', 'null' => true),
+		'updated' => array('type' => 'datetime', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('title' => 'First Post', 'body' => 'First Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('title' => 'Second Post', 'body' => 'Second Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('title' => 'Third Post', 'body' => 'Third Post Body', 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/stories_tag_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/stories_tag_fixture.php
new file mode 100644
index 000000000..374f540b4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/stories_tag_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class StoriesTagFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'StoriesTag'
+ * @access public
+ */
+	var $name = 'StoriesTag';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'story' => array('type' => 'integer', 'null' => false),
+		'tag_id' => array('type' => 'integer', 'null' => false),
+		'indexes' => array('UNIQUE_STORY_TAG' => array('column'=> array('story', 'tag_id'), 'unique'=>1))
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('story' => 1, 'tag_id' => 1)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/story_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/story_fixture.php
new file mode 100644
index 000000000..2ca56b681
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/story_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class StoryFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Story'
+ * @access public
+ */
+	var $name = 'Story';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'story' => array('type' => 'integer', 'key' => 'primary'),
+		'title' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('title' => 'First Story'),
+		array('title' => 'Second Story')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/syfile_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/syfile_fixture.php
new file mode 100644
index 000000000..dd9720585
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/syfile_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class SyfileFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Syfile'
+ * @access public
+ */
+	var $name = 'Syfile';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'image_id' => array('type' => 'integer', 'null' => true),
+		'name' => array('type' => 'string', 'null' => false),
+		'item_count' => array('type' => 'integer', 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('image_id' => 1, 'name' => 'Syfile 1'),
+		array('image_id' => 2, 'name' => 'Syfile 2'),
+		array('image_id' => 5, 'name' => 'Syfile 3'),
+		array('image_id' => 3, 'name' => 'Syfile 4'),
+		array('image_id' => 4, 'name' => 'Syfile 5'),
+		array('image_id' => null, 'name' => 'Syfile 6')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/tag_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/tag_fixture.php
new file mode 100644
index 000000000..217fdb27d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/tag_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TagFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Tag'
+ * @access public
+ */
+	var $name = 'Tag';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'tag' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('tag' => 'tag1', 'created' => '2007-03-18 12:22:23', 'updated' => '2007-03-18 12:24:31'),
+		array('tag' => 'tag2', 'created' => '2007-03-18 12:24:23', 'updated' => '2007-03-18 12:26:31'),
+		array('tag' => 'tag3', 'created' => '2007-03-18 12:26:23', 'updated' => '2007-03-18 12:28:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_article_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_article_fixture.php
new file mode 100644
index 000000000..dc3300ce0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_article_fixture.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 7660
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TestPluginArticleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Article'
+ * @access public
+ */
+	var $name = 'TestPluginArticle';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'title' => array('type' => 'string', 'null' => false),
+		'body' => 'text',
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('user_id' => 1, 'title' => 'First Plugin Article', 'body' => 'First Plugin Article Body', 'published' => 'Y', 'created' => '2008-09-24 10:39:23', 'updated' => '2008-09-24 10:41:31'),
+		array('user_id' => 3, 'title' => 'Second Plugin Article', 'body' => 'Second Plugin Article Body', 'published' => 'Y', 'created' => '2008-09-24 10:41:23', 'updated' => '2008-09-24 10:43:31'),
+		array('user_id' => 1, 'title' => 'Third Plugin Article', 'body' => 'Third Plugin Article Body', 'published' => 'Y', 'created' => '2008-09-24 10:43:23', 'updated' => '2008-09-24 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php
new file mode 100644
index 000000000..09eb23e73
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/test_plugin_comment_fixture.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 7660
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TestPluginCommentFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Comment'
+ * @access public
+ */
+	var $name = 'TestPluginComment';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'article_id' => array('type' => 'integer', 'null'=>false),
+		'user_id' => array('type' => 'integer', 'null'=>false),
+		'comment' => 'text',
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'article_id' => 1, 'user_id' => 2, 'comment' => 'First Comment for First Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:45:23', 'updated' => '2008-09-24 10:47:31'),
+		array('id' => 2, 'article_id' => 1, 'user_id' => 4, 'comment' => 'Second Comment for First Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:47:23', 'updated' => '2008-09-24 10:49:31'),
+		array('id' => 3, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Third Comment for First Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:49:23', 'updated' => '2008-09-24 10:51:31'),
+		array('id' => 4, 'article_id' => 1, 'user_id' => 1, 'comment' => 'Fourth Comment for First Plugin Article', 'published' => 'N', 'created' => '2008-09-24 10:51:23', 'updated' => '2008-09-24 10:53:31'),
+		array('id' => 5, 'article_id' => 2, 'user_id' => 1, 'comment' => 'First Comment for Second Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:53:23', 'updated' => '2008-09-24 10:55:31'),
+		array('id' => 6, 'article_id' => 2, 'user_id' => 2, 'comment' => 'Second Comment for Second Plugin Article', 'published' => 'Y', 'created' => '2008-09-24 10:55:23', 'updated' => '2008-09-24 10:57:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php
new file mode 100644
index 000000000..a44d24e82
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/the_paper_monkies_fixture.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ThePaperMonkiesFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'ThePaperMonkies'
+ * @access public
+ */
+	var $name = 'ThePaperMonkies';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'apple_id' => array('type' => 'integer', 'length' => 10, 'null' => true),
+		'device_id' => array('type' => 'integer', 'length' => 10, 'null' => true)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array();
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/thread_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/thread_fixture.php
new file mode 100644
index 000000000..cd2069608
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/thread_fixture.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class ThreadFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Thread'
+ * @access public
+ */
+	var $name = 'Thread';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'project_id' => array('type' => 'integer', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('project_id' => 1, 'name' => 'Project 1, Thread 1'),
+		array('project_id' => 1, 'name' => 'Project 1, Thread 2'),
+		array('project_id' => 2, 'name' => 'Project 2, Thread 1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_article_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_article_fixture.php
new file mode 100644
index 000000000..3344cf1c1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_article_fixture.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TranslateArticleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Translate'
+ * @access public
+ */
+	var $name = 'TranslateArticle';
+
+/**
+ * table property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $table = 'article_i18n';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'locale' => array('type' => 'string', 'length' => 6, 'null' => false),
+		'model' => array('type' => 'string', 'null' => false),
+		'foreign_key' => array('type' => 'integer', 'null' => false),
+		'field' => array('type' => 'string', 'null' => false),
+		'content' => array('type' => 'text')
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedArticle', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title (eng) #1'),
+		array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedArticle', 'foreign_key' => 1, 'field' => 'body', 'content' => 'Body (eng) #1'),
+		array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedArticle', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title (deu) #1'),
+		array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedArticle', 'foreign_key' => 1, 'field' => 'body', 'content' => 'Body (deu) #1'),
+		array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedArticle', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title (cze) #1'),
+		array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedArticle', 'foreign_key' => 1, 'field' => 'body', 'content' => 'Body (cze) #1'),
+		array('id' => 7, 'locale' => 'eng', 'model' => 'TranslatedArticle', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title (eng) #2'),
+		array('id' => 8, 'locale' => 'eng', 'model' => 'TranslatedArticle', 'foreign_key' => 2, 'field' => 'body', 'content' => 'Body (eng) #2'),
+		array('id' => 9, 'locale' => 'deu', 'model' => 'TranslatedArticle', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title (deu) #2'),
+		array('id' => 10, 'locale' => 'deu', 'model' => 'TranslatedArticle', 'foreign_key' => 2, 'field' => 'body', 'content' => 'Body (deu) #2'),
+		array('id' => 11, 'locale' => 'cze', 'model' => 'TranslatedArticle', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title (cze) #2'),
+		array('id' => 12, 'locale' => 'cze', 'model' => 'TranslatedArticle', 'foreign_key' => 2, 'field' => 'body', 'content' => 'Body (cze) #2'),
+		array('id' => 13, 'locale' => 'eng', 'model' => 'TranslatedArticle', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title (eng) #3'),
+		array('id' => 14, 'locale' => 'eng', 'model' => 'TranslatedArticle', 'foreign_key' => 3, 'field' => 'body', 'content' => 'Body (eng) #3'),
+		array('id' => 15, 'locale' => 'deu', 'model' => 'TranslatedArticle', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title (deu) #3'),
+		array('id' => 16, 'locale' => 'deu', 'model' => 'TranslatedArticle', 'foreign_key' => 3, 'field' => 'body', 'content' => 'Body (deu) #3'),
+		array('id' => 17, 'locale' => 'cze', 'model' => 'TranslatedArticle', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title (cze) #3'),
+		array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedArticle', 'foreign_key' => 3, 'field' => 'body', 'content' => 'Body (cze) #3')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_fixture.php
new file mode 100644
index 000000000..0f62d91cb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_fixture.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TranslateFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Translate'
+ * @access public
+ */
+	var $name = 'Translate';
+
+/**
+ * table property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $table = 'i18n';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'locale' => array('type' => 'string', 'length' => 6, 'null' => false),
+		'model' => array('type' => 'string', 'null' => false),
+		'foreign_key' => array('type' => 'integer', 'null' => false),
+		'field' => array('type' => 'string', 'null' => false),
+		'content' => array('type' => 'text')
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title #1'),
+		array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'),
+		array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'),
+		array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'),
+		array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1'),
+		array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1'),
+		array('id' => 7, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title #2'),
+		array('id' => 8, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Content #2'),
+		array('id' => 9, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titel #2'),
+		array('id' => 10, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Inhalt #2'),
+		array('id' => 11, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titulek #2'),
+		array('id' => 12, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Obsah #2'),
+		array('id' => 13, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title #3'),
+		array('id' => 14, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Content #3'),
+		array('id' => 15, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titel #3'),
+		array('id' => 16, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Inhalt #3'),
+		array('id' => 17, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titulek #3'),
+		array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Obsah #3')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_table_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_table_fixture.php
new file mode 100644
index 000000000..7e41af7d4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_table_fixture.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TranslateTableFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'TranslateTable'
+ * @access public
+ */
+	var $name = 'TranslateTable';
+
+/**
+ * table property
+ *
+ * @var string 'another_i18n'
+ * @access public
+ */
+	var $table = 'another_i18n';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+			'id' => array('type' => 'integer', 'key' => 'primary'),
+			'locale' => array('type' => 'string', 'length' => 6, 'null' => false),
+			'model' => array('type' => 'string', 'null' => false),
+			'foreign_key' => array('type' => 'integer', 'null' => false),
+			'field' => array('type' => 'string', 'null' => false),
+			'content' => array('type' => 'text'));
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('locale' => 'eng', 'model' => 'TranslatedItemWithTable', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Another Title #1'),
+		array('locale' => 'eng', 'model' => 'TranslatedItemWithTable', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Another Content #1')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php
new file mode 100644
index 000000000..1fec1d63c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translate_with_prefix_fixture.php
@@ -0,0 +1,87 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Short description for file.
+ *
+ * Long description for file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TranslateWithPrefixFixture extends CakeTestFixture {
+/**
+ * name property
+ *
+ * @var string 'Translate'
+ * @access public
+ */
+	var $name = 'TranslateWithPrefix';
+/**
+ * table property
+ *
+ * @var string 'i18n'
+ * @access public
+ */
+	var $table = 'i18n_translate_with_prefixes';
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'locale' => array('type' => 'string', 'length' => 6, 'null' => false),
+		'model' => array('type' => 'string', 'null' => false),
+		'foreign_key' => array('type' => 'integer', 'null' => false),
+		'field' => array('type' => 'string', 'null' => false),
+		'content' => array('type' => 'text')
+	);
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Title #1'),
+		array('id' => 2, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Content #1'),
+		array('id' => 3, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titel #1'),
+		array('id' => 4, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Inhalt #1'),
+		array('id' => 5, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'title', 'content' => 'Titulek #1'),
+		array('id' => 6, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 1, 'field' => 'content', 'content' => 'Obsah #1'),
+		array('id' => 7, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Title #2'),
+		array('id' => 8, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Content #2'),
+		array('id' => 9, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titel #2'),
+		array('id' => 10, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Inhalt #2'),
+		array('id' => 11, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'title', 'content' => 'Titulek #2'),
+		array('id' => 12, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 2, 'field' => 'content', 'content' => 'Obsah #2'),
+		array('id' => 13, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Title #3'),
+		array('id' => 14, 'locale' => 'eng', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Content #3'),
+		array('id' => 15, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titel #3'),
+		array('id' => 16, 'locale' => 'deu', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Inhalt #3'),
+		array('id' => 17, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'title', 'content' => 'Titulek #3'),
+		array('id' => 18, 'locale' => 'cze', 'model' => 'TranslatedItem', 'foreign_key' => 3, 'field' => 'content', 'content' => 'Obsah #3')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_article_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_article_fixture.php
new file mode 100644
index 000000000..f8bd4c31c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_article_fixture.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TranslatedArticleFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'TranslatedItem'
+ * @access public
+ */
+	var $name = 'TranslatedArticle';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => 1, 'user_id' => 1, 'published' => 'Y', 'created' => '2007-03-18 10:39:23', 'updated' => '2007-03-18 10:41:31'),
+		array('id' => 2, 'user_id' => 3, 'published' => 'Y', 'created' => '2007-03-18 10:41:23', 'updated' => '2007-03-18 10:43:31'),
+		array('id' => 3, 'user_id' => 1, 'published' => 'Y', 'created' => '2007-03-18 10:43:23', 'updated' => '2007-03-18 10:45:31')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_item_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_item_fixture.php
new file mode 100644
index 000000000..33eb3e39c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/translated_item_fixture.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class TranslatedItemFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'TranslatedItem'
+ * @access public
+ */
+	var $name = 'TranslatedItem';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'slug' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('slug' => 'first_translated'),
+		array('slug' => 'second_translated'),
+		array('slug' => 'third_translated')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/unconventional_tree_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/unconventional_tree_fixture.php
new file mode 100644
index 000000000..0d63119b0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/unconventional_tree_fixture.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Unconventional Tree behavior class test fixture.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7879
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * UnconventionalTreeFixture class
+ *
+ * Like Number tree, but doesn't use the default values for lft and rght or parent_id
+ *
+ * @uses          CakeTestFixture
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UnconventionalTreeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'FlagTree'
+ * @access public
+ */
+	var $name = 'UnconventionalTree';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'	=> array('type' => 'integer','key' => 'primary'),
+		'name'	=> array('type' => 'string','null' => false),
+		'join' => 'integer',
+		'left'	=> array('type' => 'integer','null' => false),
+		'right'	=> array('type' => 'integer','null' => false),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/underscore_field_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/underscore_field_fixture.php
new file mode 100644
index 000000000..99f0ceb3d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/underscore_field_fixture.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * UnderscoreFieldFixture class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UnderscoreFieldFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'UnderscoreField'
+ * @access public
+ */
+	var $name = 'UnderscoreField';
+	/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user_id' => array('type' => 'integer', 'null' => false),
+		'my_model_has_a_field' => array('type' => 'string', 'null' => false),
+		'body_field' => 'text',
+		'published' => array('type' => 'string', 'length' => 1, 'default' => 'N'),
+		'another_field' => array('type' => 'integer', 'length' => 3),
+	);
+	/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('user_id' => 1, 'my_model_has_a_field' => 'First Article', 'body_field' => 'First Article Body', 'published' => 'Y', 'another_field' => 2),
+		array('user_id' => 3, 'my_model_has_a_field' => 'Second Article', 'body_field' => 'Second Article Body', 'published' => 'Y', 'another_field' => 3),
+		array('user_id' => 1, 'my_model_has_a_field' => 'Third Article', 'body_field' => 'Third Article Body', 'published' => 'Y', 'another_field' => 5),
+	);
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/user_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/user_fixture.php
new file mode 100644
index 000000000..d257ff9cf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/user_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UserFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'User'
+ * @access public
+ */
+	var $name = 'User';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'key' => 'primary'),
+		'user' => array('type' => 'string', 'null' => false),
+		'password' => array('type' => 'string', 'null' => false),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('user' => 'mariano', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:16:23', 'updated' => '2007-03-17 01:18:31'),
+		array('user' => 'nate', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:18:23', 'updated' => '2007-03-17 01:20:31'),
+		array('user' => 'larry', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:20:23', 'updated' => '2007-03-17 01:22:31'),
+		array('user' => 'garrett', 'password' => '5f4dcc3b5aa765d61d8327deb882cf99', 'created' => '2007-03-17 01:22:23', 'updated' => '2007-03-17 01:24:31'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_fixture.php
new file mode 100644
index 000000000..cc5b6e401
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.6700
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UuidFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Uuid'
+ * @access public
+ */
+	var $name = 'Uuid';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
+		'title' => 'string',
+		'count' => array('type' => 'integer', 'default' => 0),
+		'created' => 'datetime',
+		'updated' => 'datetime'
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => '47c36f9c-bc00-4d17-9626-4e183ca6822b', 'title' => 'Unique record 1', 'count' => 2, 'created' => '2008-03-13 01:16:23', 'updated' => '2008-03-13 01:18:31'),
+		array('id' => '47c36f9c-f2b0-43f5-b3f7-4e183ca6822b', 'title' => 'Unique record 2', 'count' => 4, 'created' => '2008-03-13 01:18:24', 'updated' => '2008-03-13 01:20:32'),
+		array('id' => '47c36f9c-0ffc-4084-9b03-4e183ca6822b', 'title' => 'Unique record 3', 'count' => 5, 'created' => '2008-03-13 01:20:25', 'updated' => '2008-03-13 01:22:33'),
+		array('id' => '47c36f9c-2578-4c2e-aeab-4e183ca6822b', 'title' => 'Unique record 4', 'count' => 3, 'created' => '2008-03-13 01:22:26', 'updated' => '2008-03-13 01:24:34'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tag_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tag_fixture.php
new file mode 100644
index 000000000..9d76316b2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tag_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7953
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UuidTagFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'UuidTag'
+ * @access public
+ */
+	var $name = 'UuidTag';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
+		'name' => array('type' => 'string', 'length' => 255),
+		'created' => array('type' => 'datetime')
+);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => '481fc6d0-b920-43e0-e50f-6d1740cf8569', 'name' => 'MyTag', 'created' => '2009-12-09 12:30:00')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tree_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tree_fixture.php
new file mode 100644
index 000000000..009e1aace
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuid_tree_fixture.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * UUID Tree behavior fixture.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.7984
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * UuidTreeFixture class
+ *
+ * @uses          CakeTestFixture
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UuidTreeFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'UuidTree'
+ * @access public
+ */
+	var $name = 'UuidTree';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id'	=> array('type' => 'string', 'length' => 36, 'key' => 'primary'),
+		'name'	=> array('type' => 'string','null' => false),
+		'parent_id' => array('type' => 'string', 'length' => 36, 'null' => true),
+		'lft'	=> array('type' => 'integer','null' => false),
+		'rght'	=> array('type' => 'integer','null' => false)
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditem_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditem_fixture.php
new file mode 100644
index 000000000..c0cb3ea94
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditem_fixture.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UuiditemFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Uuiditem'
+ * @access public
+ */
+	var $name = 'Uuiditem';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
+		'published' => array('type' => 'boolean', 'null' => false),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => '481fc6d0-b920-43e0-a40d-6d1740cf8569', 'published' => 0, 'name' => 'Item 1'),
+		array('id' => '48298a29-81c0-4c26-a7fb-413140cf8569', 'published' => 0, 'name' => 'Item 2'),
+		array('id' => '482b7756-8da0-419a-b21f-27da40cf8569', 'published' => 0, 'name' => 'Item 3'),
+		array('id' => '482cfd4b-0e7c-4ea3-9582-4cec40cf8569', 'published' => 0, 'name' => 'Item 4'),
+		array('id' => '4831181b-4020-4983-a29b-131440cf8569', 'published' => 0, 'name' => 'Item 5'),
+		array('id' => '483798c8-c7cc-430e-8cf9-4fcc40cf8569', 'published' => 0, 'name' => 'Item 6')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
new file mode 100644
index 000000000..c0ed13027
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UuiditemsUuidportfolioFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'UuiditemsUuidportfolio'
+ * @access public
+ */
+	var $name = 'UuiditemsUuidportfolio';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
+		'uuiditem_id' => array('type' => 'string', 'length' => 36, 'null' => false),
+		'uuidportfolio_id' => array('type' => 'string', 'length' => 36, 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => '4850fd8f-cc5c-449f-bf34-0c5240cf8569', 'uuiditem_id' => '481fc6d0-b920-43e0-a40d-6d1740cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569'),
+		array('id' => '4850fee5-d24c-4ea0-9759-0c2e40cf8569', 'uuiditem_id' => '48298a29-81c0-4c26-a7fb-413140cf8569', 'uuidportfolio_id' => '480af662-eb8c-47d3-886b-230540cf8569'),
+		array('id' => '4851af6e-fa18-403d-b57e-437d40cf8569', 'uuiditem_id' => '482b7756-8da0-419a-b21f-27da40cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569'),
+		array('id' => '4851b94c-9790-42dc-b760-4f9240cf8569', 'uuiditem_id' => '482cfd4b-0e7c-4ea3-9582-4cec40cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
new file mode 100644
index 000000000..ac47514cc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuiditems_uuidportfolio_numericid_fixture.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UuiditemsUuidportfolioNumericidFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'UuiditemsUuidportfolioNumericid'
+ * @access public
+ */
+	var $name = 'UuiditemsUuidportfolioNumericid';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'integer', 'length' => 10, 'key' => 'primary'),
+		'uuiditem_id' => array('type' => 'string', 'length' => 36, 'null' => false),
+		'uuidportfolio_id' => array('type' => 'string', 'length' => 36, 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('uuiditem_id' => '481fc6d0-b920-43e0-a40d-6d1740cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569'),
+		array('uuiditem_id' => '48298a29-81c0-4c26-a7fb-413140cf8569', 'uuidportfolio_id' => '480af662-eb8c-47d3-886b-230540cf8569'),
+		array('uuiditem_id' => '482b7756-8da0-419a-b21f-27da40cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569'),
+		array('uuiditem_id' => '482cfd4b-0e7c-4ea3-9582-4cec40cf8569', 'uuidportfolio_id' => '4806e091-6940-4d2b-b227-303740cf8569')
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuidportfolio_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuidportfolio_fixture.php
new file mode 100644
index 000000000..74f1f9298
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/fixtures/uuidportfolio_fixture.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.fixtures
+ */
+class UuidportfolioFixture extends CakeTestFixture {
+
+/**
+ * name property
+ *
+ * @var string 'Uuidportfolio'
+ * @access public
+ */
+	var $name = 'Uuidportfolio';
+
+/**
+ * fields property
+ *
+ * @var array
+ * @access public
+ */
+	var $fields = array(
+		'id' => array('type' => 'string', 'length' => 36, 'key' => 'primary'),
+		'name' => array('type' => 'string', 'null' => false)
+	);
+
+/**
+ * records property
+ *
+ * @var array
+ * @access public
+ */
+	var $records = array(
+		array('id' => '4806e091-6940-4d2b-b227-303740cf8569', 'name' => 'Portfolio 1'),
+		array('id' => '480af662-eb8c-47d3-886b-230540cf8569', 'name' => 'Portfolio 2'),
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/acl.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/acl.group.php
new file mode 100644
index 000000000..14fa0bb3c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/acl.group.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * AclAndAuthGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * AclAndAuthGroupTest class
+ *
+ * This test group will run the Acl and Auth tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class AclAndAuthGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'Acl and Auth Tests'
+ * @access public
+ */
+	var $label = 'Acl and Auth';
+
+/**
+ * AclAndAuthGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function AclAndAuthGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'db_acl');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'components' . DS . 'acl');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'components' . DS . 'auth');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/bake.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/bake.group.php
new file mode 100644
index 000000000..199c3d121
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/bake.group.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Bake Group test file
+ *
+ * Run all the test cases related to bake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * BakeGroupTest class
+ *
+ * This test group will run all bake tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class BakeGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All core cache engines'
+ * @access public
+ */
+	var $label = 'All Tasks related to bake.';
+
+/**
+ * BakeGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function BakeGroupTest() {
+		$path = CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'tasks' . DS;
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'bake');
+		TestManager::addTestFile($this, $path . 'controller');
+		TestManager::addTestFile($this, $path . 'model');
+		TestManager::addTestFile($this, $path . 'view');
+		TestManager::addTestFile($this, $path . 'fixture');
+		TestManager::addTestFile($this, $path . 'test');
+		TestManager::addTestFile($this, $path . 'db_config');
+		TestManager::addTestFile($this, $path . 'plugin');
+		TestManager::addTestFile($this, $path . 'project');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/behaviors.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/behaviors.group.php
new file mode 100644
index 000000000..fa3c6500a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/behaviors.group.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * BehaviorsGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * BehaviorsGroupTest class
+ *
+ * This test group will run all tests related to i18n/l10n and multibyte
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class BehaviorsGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string
+ * @access public
+ */
+	var $label = 'All core behavior test cases.';
+
+/**
+ * BehaviorsGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function BehaviorsGroupTest() {
+		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'behaviors');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/cache.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/cache.group.php
new file mode 100644
index 000000000..6428cb13f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/cache.group.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * CacheGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * CacheGroupTest class
+ *
+ * This test group will run all the Cache class test and all core cache engine tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class CacheGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All core cache engines'
+ * @access public
+ */
+	var $label = 'Cache and all CacheEngines';
+
+/**
+ * CacheGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function CacheGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cache');
+		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cache');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/components.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/components.group.php
new file mode 100644
index 000000000..3bd93bc5d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/components.group.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * ComponentsGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * ComponentsGroupTest class
+ *
+ * This test group will run all tests in the cases/libs/controller/components directory.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class ComponentsGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All core components'
+ * @access public
+ */
+	var $label = 'All Components';
+
+/**
+ * CoreComponentsGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function ComponentsGroupTest() {
+		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'components');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/configure.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/configure.group.php
new file mode 100644
index 000000000..a29caff82
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/configure.group.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ConfigureGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * ConfigureGroupTest class
+ *
+ * This test group will run all test for the configure and loader.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class ConfigureGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'Configure, Loader, ClassRegistry Tests'
+ * @access public
+ */
+	var $label = 'Configure, App and ClassRegistry';
+
+/**
+ * ConfigureGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function ConfigureGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'configure');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/console.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/console.group.php
new file mode 100644
index 000000000..83c8a0ca4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/console.group.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * ConsoleGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * ConsoleGroupTest class
+ *
+ * This test group will run all console tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class ConsoleGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All core cache engines'
+ * @access public
+ */
+	var $label = 'ShellDispatcher, Shell and all Tasks';
+
+/**
+ * ConsoleGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function ConsoleGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'cake');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'acl');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'api');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'bake');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'schema');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'shell');
+
+		$path = CORE_TEST_CASES . DS . 'console' . DS . 'libs' . DS . 'tasks' . DS;
+		
+		TestManager::addTestFile($this, $path . 'controller');
+		TestManager::addTestFile($this, $path . 'db_config');
+		TestManager::addTestFile($this, $path . 'extract');
+		TestManager::addTestFile($this, $path . 'fixture');
+		TestManager::addTestFile($this, $path . 'model');
+		TestManager::addTestFile($this, $path . 'plugin');
+		TestManager::addTestFile($this, $path . 'project');
+		TestManager::addTestFile($this, $path . 'test');
+		TestManager::addTestFile($this, $path . 'view');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/controller.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/controller.group.php
new file mode 100644
index 000000000..02d121df2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/controller.group.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ControllerGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * ControllerGroupTest
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class ControllerGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All cake/libs/controller/* (Not yet implemented)'
+ * @access public
+ */
+	var $label = 'Component, Controllers, Scaffold test cases.';
+/**
+ * LibControllerGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function ControllerGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'scaffold');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'pages_controller');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'component');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'controller' . DS . 'controller_merge_vars');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/database.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/database.group.php
new file mode 100644
index 000000000..f891a2eed
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/database.group.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * DatabaseGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.5517
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * DatabaseGroupTest class
+ *
+ * This test group will run all behavior, schema and datasource tests excluding database
+ * driver-specific tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class DatabaseGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All model tests'
+ * @access public
+ */
+	var $label = 'Datasources, Schema and DbAcl tests';
+
+/**
+ * ModelGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function DatabaseGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'db_acl');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'cake_schema');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'connection_manager');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'datasources' . DS . 'dbo_source');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/helpers.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/helpers.group.php
new file mode 100644
index 000000000..5b1d09f94
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/helpers.group.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * HelpersGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * HelpersGroupTest class
+ *
+ * This test group will run all test in the cases/libs/view/helpers directory.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class HelpersGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All core helpers'
+ * @access public
+ */
+	var $label = 'All Helpers';
+
+/**
+ * HelpersGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function HelpersGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helper');
+		TestManager::addTestCasesFromDirectory($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/i18n.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/i18n.group.php
new file mode 100644
index 000000000..16fc0aa3b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/i18n.group.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * i18nGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * i18nGroupTest class
+ *
+ * This test group will run all tests related to i18n/l10n and multibyte
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class i18nGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string
+ * @access public
+ */
+	var $label = 'i18n, l10n and multibyte tests';
+
+/**
+ * LibGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function i18nGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'i18n');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'l10n');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'multibyte');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/javascript.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/javascript.group.php
new file mode 100644
index 000000000..cb98b61dc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/javascript.group.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * AllCoreJavascriptHelpersGroupTest file
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+/**
+ * AllCoreJavascriptHelpersGroupTest class
+ *
+ * This test group will run all test in the cases/libs/view/helpers directory related
+ * to Js helper and its engines
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class AllCoreJavascriptHelpersGroupTest extends TestSuite {
+/**
+ * label property
+ *
+ * @var string 'All core helpers'
+ * @access public
+ */
+	var $label = 'Js Helper and all Engine Helpers';
+/**
+ * AllCoreHelpersGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function AllCoreJavascriptHelpersGroupTest() {
+		$helperTestPath = CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers' . DS;
+		TestManager::addTestFile($this, $helperTestPath . 'js.test.php');
+		TestManager::addTestFile($this, $helperTestPath . 'jquery_engine.test.php');
+		TestManager::addTestFile($this, $helperTestPath . 'mootools_engine.test.php');
+		TestManager::addTestFile($this, $helperTestPath . 'prototype_engine.test.php');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/lib.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/lib.group.php
new file mode 100644
index 000000000..520f53086
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/lib.group.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * LibGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * LibGroupTest class
+ *
+ * This test group will run all test in the cases/libs directory.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class LibGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string
+ * @access public
+ */
+	var $label = 'All core, non MVC element libs';
+
+/**
+ * LibGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function LibGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'basics');
+		// TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'inflector');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_session');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'debugger');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'error');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'file');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'folder');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_log');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'log' . DS . 'file_log');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'class_registry');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'overloadable');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'sanitize');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'security');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'set');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'string');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'validation');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/model.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/model.group.php
new file mode 100644
index 000000000..33f51bf81
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/model.group.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * ModelGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.5517
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * ModelGroupTest class
+ *
+ * This test group will run all model-layer and related tests, (behaviors, etc.) excluding
+ * database driver-specific tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class ModelGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string
+ * @access public
+ */
+	var $label = 'All Model tests';
+
+/**
+ * ModelGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function ModelGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_behavior');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_read');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_write');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_delete');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_integration');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'model' . DS . 'model_validation');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/no_cross_contamination.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/no_cross_contamination.group.php
new file mode 100644
index 000000000..4fec61fae
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/no_cross_contamination.group.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * NoCrossContaminationGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * NoCrossContaminationGroupTest class
+ *
+ * This test group will run all tests
+ * that are proper isolated to be run in sequence
+ * without affected each other
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class NoCrossContaminationGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string
+ * @access public
+ */
+	var $label = 'No Cross Contamination';
+
+/**
+ * blacklist property
+ *
+ * @var string
+ * @access public
+ */
+	var $blacklist = array('cake_test_case.test.php', 'object.test.php');
+
+/**
+ * NoCrossContaminationGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function NoCrossContaminationGroupTest() {
+		App::import('Core', 'Folder');
+
+		$Folder = new Folder(CORE_TEST_CASES);
+
+		foreach ($Folder->findRecursive('.*\.test\.php', true) as $file) {
+			if (in_array(basename($file), $this->blacklist)) {
+				continue;
+			}
+			TestManager::addTestFile($this, $file);
+		}
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/routing_system.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/routing_system.group.php
new file mode 100644
index 000000000..628b40321
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/routing_system.group.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * RoutingSystemGroupTest
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.5517
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * RoutingSystemGroupTest class
+ *
+ * This test group will run all the Router/Dispatcher (and related) tests
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class RoutingSystemGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'Routing system'
+ * @access public
+ */
+	var $label = 'Router and Dispatcher';
+
+/**
+ * RoutingSystemGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function RoutingSystemGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'dispatcher');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'router');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/socket.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/socket.group.php
new file mode 100644
index 000000000..0b5e295e5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/socket.group.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Socket and HttpSocket Group tests
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake.tests
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/** Socket and HttpSocket tests
+ *
+ * This test group will run socket class tests (socket, http_socket).
+ *
+ * @package       cake.tests
+ * @subpackage    cake.tests.groups
+ */
+
+/**
+ * SocketGroupTest class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class SocketGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'Socket and HttpSocket tests'
+ * @access public
+ */
+	var $label = 'CakeSocket and HttpSocket tests';
+
+/**
+ * SocketGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function SocketGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_socket');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'http_socket');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/test_suite.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/test_suite.group.php
new file mode 100644
index 000000000..038ccc4a8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/test_suite.group.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * TestSuiteGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc.
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc.
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * TestSuiteGroupTest class
+ *
+ * This test group will run the test cases for the test suite classes.
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class TestSuiteGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'Socket and HttpSocket tests'
+ * @access public
+ */
+	var $label = 'TestSuite';
+
+/**
+ * TestSuiteGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function TestSuiteGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'test_manager');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'code_coverage_manager');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_test_case');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'cake_test_fixture');
+
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/view.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/view.group.php
new file mode 100644
index 000000000..fe1d48c39
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/view.group.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * ViewsGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * ViewsGroupTest class
+ *
+ * This test group will run view class tests (view, theme)
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class ViewsGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All core views'
+ * @access public
+ */
+	var $label = 'View and ThemeView';
+
+/**
+ * ViewsGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function ViewsGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'view');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'theme');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/groups/xml.group.php b/code/ryzom/tools/server/www/webtt/cake/tests/groups/xml.group.php
new file mode 100644
index 000000000..8377c4055
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/groups/xml.group.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * XmlGroupTest file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * XmlGroupTest class
+ *
+ * This test group will run view class tests (view, theme).
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class XmlGroupTest extends TestSuite {
+
+/**
+ * label property
+ *
+ * @var string 'All core views'
+ * @access public
+ */
+	var $label = 'Xml based classes (Xml, XmlHelper and RssHelper)';
+
+/**
+ * XmlGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function XmlGroupTest() {
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'xml');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers' . DS .'rss');
+		TestManager::addTestFile($this, CORE_TEST_CASES . DS . 'libs' . DS . 'view' . DS . 'helpers' . DS .'xml');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_case.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_case.php
new file mode 100644
index 000000000..1d4b89eb5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_case.php
@@ -0,0 +1,835 @@
+<?php
+/**
+ * CakeTestCase file
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+if (!class_exists('dispatcher')) {
+	require CAKE . 'dispatcher.php';
+}
+require_once CAKE_TESTS_LIB . 'cake_test_model.php';
+require_once CAKE_TESTS_LIB . 'cake_test_fixture.php';
+App::import('Vendor', 'simpletest' . DS . 'unit_tester');
+
+/**
+ * CakeTestDispatcher
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ */
+class CakeTestDispatcher extends Dispatcher {
+
+/**
+ * controller property
+ *
+ * @var Controller
+ * @access public
+ */
+	var $controller;
+	var $testCase;
+
+/**
+ * testCase method
+ *
+ * @param CakeTestCase $testCase
+ * @return void
+ * @access public
+ */
+	function testCase(&$testCase) {
+		$this->testCase =& $testCase;
+	}
+
+/**
+ * invoke method
+ *
+ * @param Controller $controller
+ * @param array $params
+ * @param boolean $missingAction
+ * @return Controller
+ * @access protected
+ */
+	function _invoke(&$controller, $params, $missingAction = false) {
+		$this->controller =& $controller;
+
+		if (array_key_exists('layout', $params)) {
+			$this->controller->layout = $params['layout'];
+		}
+
+		if (isset($this->testCase) && method_exists($this->testCase, 'startController')) {
+			$this->testCase->startController($this->controller, $params);
+		}
+
+		$result = parent::_invoke($this->controller, $params, $missingAction);
+
+		if (isset($this->testCase) && method_exists($this->testCase, 'endController')) {
+			$this->testCase->endController($this->controller, $params);
+		}
+
+		return $result;
+	}
+}
+
+/**
+ * CakeTestCase class
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ */
+class CakeTestCase extends UnitTestCase {
+
+/**
+ * Methods used internally.
+ *
+ * @var array
+ * @access public
+ */
+	var $methods = array('start', 'end', 'startcase', 'endcase', 'starttest', 'endtest');
+
+/**
+ * By default, all fixtures attached to this class will be truncated and reloaded after each test.
+ * Set this to false to handle manually
+ *
+ * @var array
+ * @access public
+ */
+	var $autoFixtures = true;
+
+/**
+ * Set this to false to avoid tables to be dropped if they already exist
+ *
+ * @var boolean
+ * @access public
+ */
+	var $dropTables = true;
+
+/**
+ * Maps fixture class names to fixture identifiers as included in CakeTestCase::$fixtures
+ *
+ * @var array
+ * @access protected
+ */
+	var $_fixtureClassMap = array();
+
+/**
+ * truncated property
+ *
+ * @var boolean
+ * @access private
+ */
+	var $__truncated = true;
+
+/**
+ * savedGetData property
+ *
+ * @var array
+ * @access private
+ */
+	var $__savedGetData = array();
+
+/**
+ * Called when a test case (group of methods) is about to start (to be overriden when needed.)
+ *
+ * @param string $method Test method about to get executed.
+ * @return void
+ * @access public
+ */
+	function startCase() {
+	}
+
+/**
+ * Called when a test case (group of methods) has been executed (to be overriden when needed.)
+ *
+ * @param string $method Test method about that was executed.
+ * @return void
+ * @access public
+ */
+	function endCase() {
+	}
+
+/**
+ * Called when a test case method is about to start (to be overriden when needed.)
+ *
+ * @param string $method Test method about to get executed.
+ * @return void
+ * @access public
+ */
+	function startTest($method) {
+	}
+
+/**
+ * Called when a test case method has been executed (to be overriden when needed.)
+ *
+ * @param string $method Test method about that was executed.
+ * @return void
+ * @access public
+ */
+	function endTest($method) {
+	}
+
+/**
+ * Overrides SimpleTestCase::assert to enable calling of skipIf() from within tests
+ *
+ * @param Expectation $expectation
+ * @param mixed $compare
+ * @param string $message
+ * @return boolean|null
+ * @access public
+ */
+	function assert(&$expectation, $compare, $message = '%s') {
+		if ($this->_should_skip) {
+			return;
+		}
+		return parent::assert($expectation, $compare, $message);
+	}
+
+/**
+ * Overrides SimpleTestCase::skipIf to provide a boolean return value
+ *
+ * @param boolean $shouldSkip
+ * @param string $message
+ * @return boolean
+ * @access public
+ */
+	function skipIf($shouldSkip, $message = '%s') {
+		parent::skipIf($shouldSkip, $message);
+		return $shouldSkip;
+	}
+
+/**
+ * Callback issued when a controller's action is about to be invoked through testAction().
+ *
+ * @param Controller $controller	Controller that's about to be invoked.
+ * @param array $params	Additional parameters as sent by testAction().
+ * @return void
+ * @access public
+ */
+	function startController(&$controller, $params = array()) {
+		if (isset($params['fixturize']) && ((is_array($params['fixturize']) && !empty($params['fixturize'])) || $params['fixturize'] === true)) {
+			if (!isset($this->db)) {
+				$this->_initDb();
+			}
+
+			if ($controller->uses === false) {
+				$list = array($controller->modelClass);
+			} else {
+				$list = is_array($controller->uses) ? $controller->uses : array($controller->uses);
+			}
+
+			$models = array();
+			ClassRegistry::config(array('ds' => $params['connection']));
+
+			foreach ($list as $name) {
+				if ((is_array($params['fixturize']) && in_array($name, $params['fixturize'])) || $params['fixturize'] === true) {
+					if (class_exists($name) || App::import('Model', $name)) {
+						$object =& ClassRegistry::init($name);
+						//switch back to specified datasource.
+						$object->setDataSource($params['connection']);
+						$db =& ConnectionManager::getDataSource($object->useDbConfig);
+						$db->cacheSources = false;
+
+						$models[$object->alias] = array(
+							'table' => $object->table,
+							'model' => $object->alias,
+							'key' => strtolower($name),
+						);
+					}
+				}
+			}
+			ClassRegistry::config(array('ds' => 'test_suite'));
+
+			if (!empty($models) && isset($this->db)) {
+				$this->_actionFixtures = array();
+
+				foreach ($models as $model) {
+					$fixture =& new CakeTestFixture($this->db);
+
+					$fixture->name = $model['model'] . 'Test';
+					$fixture->table = $model['table'];
+					$fixture->import = array('model' => $model['model'], 'records' => true);
+					$fixture->init();
+
+					$fixture->create($this->db);
+					$fixture->insert($this->db);
+					$this->_actionFixtures[] =& $fixture;
+				}
+
+				foreach ($models as $model) {
+					$object =& ClassRegistry::getObject($model['key']);
+					if ($object !== false) {
+						$object->setDataSource('test_suite');
+						$object->cacheSources = false;
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * Callback issued when a controller's action has been invoked through testAction().
+ *
+ * @param Controller $controller Controller that has been invoked.
+ * @param array $params	Additional parameters as sent by testAction().
+ * @return void
+ * @access public
+ */
+	function endController(&$controller, $params = array()) {
+		if (isset($this->db) && isset($this->_actionFixtures) && !empty($this->_actionFixtures) && $this->dropTables) {
+			foreach ($this->_actionFixtures as $fixture) {
+				$fixture->drop($this->db);
+			}
+		}
+	}
+
+/**
+ * Executes a Cake URL, and can get (depending on the $params['return'] value):
+ *
+ * Params:
+ * - 'return' has several possible values:
+ *   1. 'result': Whatever the action returns (and also specifies $this->params['requested'] for controller)
+ *   2. 'view': The rendered view, without the layout
+ *   3. 'contents': The rendered view, within the layout.
+ *   4. 'vars': the view vars
+ *
+ * - 'fixturize' - Set to true if you want to copy model data from 'connection' to the test_suite connection
+ * - 'data' - The data you want to insert into $this->data in the controller.
+ * - 'connection' - Which connection to use in conjunction with fixturize (defaults to 'default')
+ * - 'method' - What type of HTTP method to simulate (defaults to post)
+ *
+ * @param string $url Cake URL to execute (e.g: /articles/view/455)
+ * @param mixed $params Parameters (see above), or simply a string of what to return
+ * @return mixed Whatever is returned depending of requested result
+ * @access public
+ */
+	function testAction($url, $params = array()) {
+		$default = array(
+			'return' => 'result',
+			'fixturize' => false,
+			'data' => array(),
+			'method' => 'post',
+			'connection' => 'default'
+		);
+
+		if (is_string($params)) {
+			$params = array('return' => $params);
+		}
+		$params = array_merge($default, $params);
+
+		$toSave = array(
+			'case' => null,
+			'group' => null,
+			'app' => null,
+			'output' => null,
+			'show' => null,
+			'plugin' => null
+		);
+		$this->__savedGetData = (empty($this->__savedGetData))
+				? array_intersect_key($_GET, $toSave)
+				: $this->__savedGetData;
+
+		$data = (!empty($params['data'])) ? $params['data'] : array();
+
+		if (strtolower($params['method']) == 'get') {
+			$_GET = array_merge($this->__savedGetData, $data);
+			$_POST = array();
+		} else {
+			$_POST = array('data' => $data);
+			$_GET = $this->__savedGetData;
+		}
+
+		$return = $params['return'];
+		$params = array_diff_key($params, array('data' => null, 'method' => null, 'return' => null));
+
+		$dispatcher =& new CakeTestDispatcher();
+		$dispatcher->testCase($this);
+
+		if ($return != 'result') {
+			if ($return != 'contents') {
+				$params['layout'] = false;
+			}
+
+			ob_start();
+			@$dispatcher->dispatch($url, $params);
+			$result = ob_get_clean();
+
+			if ($return == 'vars') {
+				$view =& ClassRegistry::getObject('view');
+				$viewVars = $view->getVars();
+
+				$result = array();
+
+				foreach ($viewVars as $var) {
+					$result[$var] = $view->getVar($var);
+				}
+
+				if (!empty($view->pageTitle)) {
+					$result = array_merge($result, array('title' => $view->pageTitle));
+				}
+			}
+		} else {
+			$params['return'] = 1;
+			$params['bare'] = 1;
+			$params['requested'] = 1;
+
+			$result = @$dispatcher->dispatch($url, $params);
+		}
+
+		if (isset($this->_actionFixtures)) {
+			unset($this->_actionFixtures);
+		}
+		ClassRegistry::flush();
+
+		return $result;
+	}
+
+/**
+ * Announces the start of a test.
+ *
+ * @param string $method Test method just started.
+ * @return void
+ * @access public
+ */
+	function before($method) {
+		parent::before($method);
+
+		if (isset($this->fixtures) && (!is_array($this->fixtures) || empty($this->fixtures))) {
+			unset($this->fixtures);
+		}
+
+		// Set up DB connection
+		if (isset($this->fixtures) && strtolower($method) == 'start') {
+			$this->_initDb();
+			$this->_loadFixtures();
+		}
+
+		// Create records
+		if (isset($this->_fixtures) && isset($this->db) && !in_array(strtolower($method), array('start', 'end')) && $this->__truncated && $this->autoFixtures == true) {
+			foreach ($this->_fixtures as $fixture) {
+				$inserts = $fixture->insert($this->db);
+			}
+		}
+
+		if (!in_array(strtolower($method), $this->methods)) {
+			$this->startTest($method);
+		}
+	}
+
+/**
+ * Runs as first test to create tables.
+ *
+ * @return void
+ * @access public
+ */
+	function start() {
+		if (isset($this->_fixtures) && isset($this->db)) {
+			Configure::write('Cache.disable', true);
+			$cacheSources = $this->db->cacheSources;
+			$this->db->cacheSources = false;
+			$sources = $this->db->listSources();
+			$this->db->cacheSources = $cacheSources;
+
+			if (!$this->dropTables) {
+				return;
+			}
+			foreach ($this->_fixtures as $fixture) {
+				$table = $this->db->config['prefix'] . $fixture->table;
+				if (in_array($table, $sources)) {
+					$fixture->drop($this->db);
+					$fixture->create($this->db);
+				} elseif (!in_array($table, $sources)) {
+					$fixture->create($this->db);
+				}
+			}
+		}
+	}
+
+/**
+ * Runs as last test to drop tables.
+ *
+ * @return void
+ * @access public
+ */
+	function end() {
+		if (isset($this->_fixtures) && isset($this->db)) {
+			if ($this->dropTables) {
+				foreach (array_reverse($this->_fixtures) as $fixture) {
+					$fixture->drop($this->db);
+				}
+			}
+			$this->db->sources(true);
+			Configure::write('Cache.disable', false);
+		}
+
+		if (class_exists('ClassRegistry')) {
+			ClassRegistry::flush();
+		}
+	}
+
+/**
+ * Announces the end of a test.
+ *
+ * @param string $method Test method just finished.
+ * @return void
+ * @access public
+ */
+	function after($method) {
+		$isTestMethod = !in_array(strtolower($method), array('start', 'end'));
+
+		if (isset($this->_fixtures) && isset($this->db) && $isTestMethod) {
+			foreach ($this->_fixtures as $fixture) {
+				$fixture->truncate($this->db);
+			}
+			$this->__truncated = true;
+		} else {
+			$this->__truncated = false;
+		}
+
+		if (!in_array(strtolower($method), $this->methods)) {
+			$this->endTest($method);
+		}
+		$this->_should_skip = false;
+
+		parent::after($method);
+	}
+
+/**
+ * Gets a list of test names. Normally that will be all internal methods that start with the
+ * name "test". This method should be overridden if you want a different rule.
+ *
+ * @return array List of test names.
+ * @access public
+ */
+	function getTests() {
+		return array_merge(
+			array('start', 'startCase'),
+			array_diff(parent::getTests(), array('testAction', 'testaction')),
+			array('endCase', 'end')
+		);
+	}
+
+/**
+ * Chooses which fixtures to load for a given test
+ *
+ * @param string $fixture Each parameter is a model name that corresponds to a
+ *                        fixture, i.e. 'Post', 'Author', etc.
+ * @return void
+ * @access public
+ * @see CakeTestCase::$autoFixtures
+ */
+	function loadFixtures() {
+		$args = func_get_args();
+		foreach ($args as $class) {
+			if (isset($this->_fixtureClassMap[$class])) {
+				$fixture = $this->_fixtures[$this->_fixtureClassMap[$class]];
+
+				$fixture->truncate($this->db);
+				$fixture->insert($this->db);
+			} else {
+				trigger_error(sprintf(__('Referenced fixture class %s not found', true), $class), E_USER_WARNING);
+			}
+		}
+	}
+
+/**
+ * Takes an array $expected and generates a regex from it to match the provided $string.
+ * Samples for $expected:
+ *
+ * Checks for an input tag with a name attribute (contains any non-empty value) and an id
+ * attribute that contains 'my-input':
+ * 	array('input' => array('name', 'id' => 'my-input'))
+ *
+ * Checks for two p elements with some text in them:
+ * 	array(
+ * 		array('p' => true),
+ * 		'textA',
+ * 		'/p',
+ * 		array('p' => true),
+ * 		'textB',
+ * 		'/p'
+ *	)
+ *
+ * You can also specify a pattern expression as part of the attribute values, or the tag
+ * being defined, if you prepend the value with preg: and enclose it with slashes, like so:
+ *	array(
+ *  	array('input' => array('name', 'id' => 'preg:/FieldName\d+/')),
+ *  	'preg:/My\s+field/'
+ *	)
+ *
+ * Important: This function is very forgiving about whitespace and also accepts any
+ * permutation of attribute order. It will also allow whitespaces between specified tags.
+ *
+ * @param string $string An HTML/XHTML/XML string
+ * @param array $expected An array, see above
+ * @param string $message SimpleTest failure output string
+ * @return boolean
+ * @access public
+ */
+	function assertTags($string, $expected, $fullDebug = false) {
+		$regex = array();
+		$normalized = array();
+		foreach ((array) $expected as $key => $val) {
+			if (!is_numeric($key)) {
+				$normalized[] = array($key => $val);
+			} else {
+				$normalized[] = $val;
+			}
+		}
+		$i = 0;
+		foreach ($normalized as $tags) {
+			if (!is_array($tags)) {
+				$tags = (string)$tags;
+			}
+			$i++;
+			if (is_string($tags) && $tags{0} == '<') {
+				$tags = array(substr($tags, 1) => array());
+			} elseif (is_string($tags)) {
+				$tagsTrimmed = preg_replace('/\s+/m', '', $tags);
+
+				if (preg_match('/^\*?\//', $tags, $match) && $tagsTrimmed !== '//') {
+					$prefix = array(null, null);
+
+					if ($match[0] == '*/') {
+						$prefix = array('Anything, ', '.*?');
+					}
+					$regex[] = array(
+						sprintf('%sClose %s tag', $prefix[0], substr($tags, strlen($match[0]))),
+						sprintf('%s<[\s]*\/[\s]*%s[\s]*>[\n\r]*', $prefix[1], substr($tags,  strlen($match[0]))),
+						$i,
+					);
+					continue;
+				}
+				if (!empty($tags) && preg_match('/^preg\:\/(.+)\/$/i', $tags, $matches)) {
+					$tags = $matches[1];
+					$type = 'Regex matches';
+				} else {
+					$tags = preg_quote($tags, '/');
+					$type = 'Text equals';
+				}
+				$regex[] = array(
+					sprintf('%s "%s"', $type, $tags),
+					$tags,
+					$i,
+				);
+				continue;
+			}
+			foreach ($tags as $tag => $attributes) {
+				$regex[] = array(
+					sprintf('Open %s tag', $tag),
+					sprintf('[\s]*<%s', preg_quote($tag, '/')),
+					$i,
+				);
+				if ($attributes === true) {
+					$attributes = array();
+				}
+				$attrs = array();
+				$explanations = array();
+				$i = 1;
+				foreach ($attributes as $attr => $val) {
+					if (is_numeric($attr) && preg_match('/^preg\:\/(.+)\/$/i', $val, $matches)) {
+						$attrs[] = $matches[1];
+						$explanations[] = sprintf('Regex "%s" matches', $matches[1]);
+						continue;
+					} else {
+						$quotes = '["\']';
+						if (is_numeric($attr)) {
+							$attr = $val;
+							$val = '.+?';
+							$explanations[] = sprintf('Attribute "%s" present', $attr);
+						} elseif (!empty($val) && preg_match('/^preg\:\/(.+)\/$/i', $val, $matches)) {
+							$quotes = '["\']?';
+							$val = $matches[1];
+							$explanations[] = sprintf('Attribute "%s" matches "%s"', $attr, $val);
+						} else {
+							$explanations[] = sprintf('Attribute "%s" == "%s"', $attr, $val);
+							$val = preg_quote($val, '/');
+						}
+						$attrs[] = '[\s]+' . preg_quote($attr, '/') . '=' . $quotes . $val . $quotes;
+					}
+					$i++;
+				}
+				if ($attrs) {
+					$permutations = $this->__array_permute($attrs);
+
+					$permutationTokens = array();
+					foreach ($permutations as $permutation) {
+						$permutationTokens[] = implode('', $permutation);
+					}
+					$regex[] = array(
+						sprintf('%s', implode(', ', $explanations)),
+						$permutationTokens,
+						$i,
+					);
+				}
+				$regex[] = array(
+					sprintf('End %s tag', $tag),
+					'[\s]*\/?[\s]*>[\n\r]*',
+					$i,
+				);
+			}
+		}
+		foreach ($regex as $i => $assertation) {
+			list($description, $expressions, $itemNum) = $assertation;
+			$matches = false;
+			foreach ((array)$expressions as $expression) {
+				if (preg_match(sprintf('/^%s/s', $expression), $string, $match)) {
+					$matches = true;
+					$string = substr($string, strlen($match[0]));
+					break;
+				}
+			}
+			if (!$matches) {
+				$this->assert(new TrueExpectation(), false, sprintf('Item #%d / regex #%d failed: %s', $itemNum, $i, $description));
+				if ($fullDebug) {
+					debug($string, true);
+					debug($regex, true);
+				}
+				return false;
+			}
+		}
+		return $this->assert(new TrueExpectation(), true, '%s');
+	}
+
+/**
+ * Initialize DB connection.
+ *
+ * @return void
+ * @access protected
+ */
+	function _initDb() {
+		$testDbAvailable = in_array('test', array_keys(ConnectionManager::enumConnectionObjects()));
+
+		$_prefix = null;
+
+		if ($testDbAvailable) {
+			// Try for test DB
+			restore_error_handler();
+			@$db =& ConnectionManager::getDataSource('test');
+			set_error_handler('simpleTestErrorHandler');
+			$testDbAvailable = $db->isConnected();
+		}
+
+		// Try for default DB
+		if (!$testDbAvailable) {
+			$db =& ConnectionManager::getDataSource('default');
+			$_prefix = $db->config['prefix'];
+			$db->config['prefix'] = 'test_suite_';
+		}
+
+		ConnectionManager::create('test_suite', $db->config);
+		$db->config['prefix'] = $_prefix;
+
+		// Get db connection
+		$this->db =& ConnectionManager::getDataSource('test_suite');
+		$this->db->cacheSources  = false;
+
+		ClassRegistry::config(array('ds' => 'test_suite'));
+	}
+
+/**
+ * Load fixtures specified in var $fixtures.
+ *
+ * @return void
+ * @access protected
+ */
+	function _loadFixtures() {
+		if (!isset($this->fixtures) || empty($this->fixtures)) {
+			return;
+		}
+
+		if (!is_array($this->fixtures)) {
+			$this->fixtures = array_map('trim', explode(',', $this->fixtures));
+		}
+
+		$this->_fixtures = array();
+
+		foreach ($this->fixtures as $index => $fixture) {
+			$fixtureFile = null;
+
+			if (strpos($fixture, 'core.') === 0) {
+				$fixture = substr($fixture, strlen('core.'));
+				foreach (App::core('cake') as $key => $path) {
+					$fixturePaths[] = $path . 'tests' . DS . 'fixtures';
+				}
+			} elseif (strpos($fixture, 'app.') === 0) {
+				$fixture = substr($fixture, strlen('app.'));
+				$fixturePaths = array(
+					TESTS . 'fixtures',
+					VENDORS . 'tests' . DS . 'fixtures'
+				);
+			} elseif (strpos($fixture, 'plugin.') === 0) {
+				$parts = explode('.', $fixture, 3);
+				$pluginName = $parts[1];
+				$fixture = $parts[2];
+				$fixturePaths = array(
+					App::pluginPath($pluginName) . 'tests' . DS . 'fixtures',
+					TESTS . 'fixtures',
+					VENDORS . 'tests' . DS . 'fixtures'
+				);
+			} else {
+				$fixturePaths = array(
+					TESTS . 'fixtures',
+					VENDORS . 'tests' . DS . 'fixtures',
+					TEST_CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'tests' . DS . 'fixtures'
+				);
+			}
+
+			foreach ($fixturePaths as $path) {
+				if (is_readable($path . DS . $fixture . '_fixture.php')) {
+					$fixtureFile = $path . DS . $fixture . '_fixture.php';
+					break;
+				}
+			}
+
+			if (isset($fixtureFile)) {
+				require_once($fixtureFile);
+				$fixtureClass = Inflector::camelize($fixture) . 'Fixture';
+				$this->_fixtures[$this->fixtures[$index]] =& new $fixtureClass($this->db);
+				$this->_fixtureClassMap[Inflector::camelize($fixture)] = $this->fixtures[$index];
+			}
+		}
+
+		if (empty($this->_fixtures)) {
+			unset($this->_fixtures);
+		}
+	}
+
+/**
+ * Generates all permutation of an array $items and returns them in a new array.
+ *
+ * @param array $items An array of items
+ * @return array
+ * @access private
+ */
+	function __array_permute($items, $perms = array()) {
+		static $permuted;
+		if (empty($perms)) {
+			$permuted = array();
+		}
+
+		if (empty($items)) {
+			$permuted[] = $perms;
+		} else {
+			$numItems = count($items) - 1;
+			for ($i = $numItems; $i >= 0; --$i) {
+				$newItems = $items;
+				$newPerms = $perms;
+				list($tmp) = array_splice($newItems, $i, 1);
+				array_unshift($newPerms, $tmp);
+				$this->__array_permute($newItems, $newPerms);
+			}
+			return $permuted;
+		}
+	}
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_fixture.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_fixture.php
new file mode 100644
index 000000000..49c9ec3ea
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_fixture.php
@@ -0,0 +1,213 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ */
+class CakeTestFixture extends Object {
+
+/**
+ * Name of the object
+ *
+ * @var string
+ */
+	var $name = null;
+
+/**
+ * Cake's DBO driver (e.g: DboMysql).
+ *
+ * @access public
+ */
+	var $db = null;
+
+/**
+ * Full Table Name
+ *
+ * @access public
+ */
+	var $table = null;
+
+/**
+ * Instantiate the fixture.
+ *
+ * @access public
+ */
+	function __construct() {
+		App::import('Model', 'CakeSchema');
+		$this->Schema = new CakeSchema(array('name' => 'TestSuite', 'connection' => 'test_suite'));
+
+		$this->init();
+	}
+
+/**
+ * Initialize the fixture.
+ *
+ * @param object	Cake's DBO driver (e.g: DboMysql).
+ * @access public
+ *
+ */
+	function init() {
+		if (isset($this->import) && (is_string($this->import) || is_array($this->import))) {
+			$import = array_merge(
+				array('connection' => 'default', 'records' => false),
+				is_array($this->import) ? $this->import : array('model' => $this->import)
+			);
+
+			if (isset($import['model']) && App::import('Model', $import['model'])) {
+				ClassRegistry::config(array('ds' => $import['connection']));
+				$model =& ClassRegistry::init($import['model']);
+				$db =& ConnectionManager::getDataSource($model->useDbConfig);
+				$db->cacheSources = false;
+				$this->fields = $model->schema(true);
+				$this->fields[$model->primaryKey]['key'] = 'primary';
+				$this->table = $db->fullTableName($model, false);
+				ClassRegistry::config(array('ds' => 'test_suite'));
+				ClassRegistry::flush();
+			} elseif (isset($import['table'])) {
+				$model =& new Model(null, $import['table'], $import['connection']);
+				$db =& ConnectionManager::getDataSource($import['connection']);
+				$db->cacheSources = false;
+				$model->useDbConfig = $import['connection'];
+				$model->name = Inflector::camelize(Inflector::singularize($import['table']));
+				$model->table = $import['table'];
+				$model->tablePrefix = $db->config['prefix'];
+				$this->fields = $model->schema(true);
+				ClassRegistry::flush();
+			}
+
+			if (!empty($db->config['prefix']) && strpos($this->table, $db->config['prefix']) === 0) {
+				$this->table = str_replace($db->config['prefix'], '', $this->table);
+			}
+
+			if (isset($import['records']) && $import['records'] !== false && isset($model) && isset($db)) {
+				$this->records = array();
+				$query = array(
+					'fields' => $db->fields($model, null, array_keys($this->fields)),
+					'table' => $db->fullTableName($model),
+					'alias' => $model->alias,
+					'conditions' => array(),
+					'order' => null,
+					'limit' => null,
+					'group' => null
+				);
+				$records = $db->fetchAll($db->buildStatement($query, $model), false, $model->alias);
+
+				if ($records !== false && !empty($records)) {
+					$this->records = Set::extract($records, '{n}.' . $model->alias);
+				}
+			}
+		}
+
+		if (!isset($this->table)) {
+			$this->table = Inflector::underscore(Inflector::pluralize($this->name));
+		}
+
+		if (!isset($this->primaryKey) && isset($this->fields['id'])) {
+			$this->primaryKey = 'id';
+		}
+	}
+
+/**
+ * Run before all tests execute, should return SQL statement to create table for this fixture could be executed successfully.
+ *
+ * @param object	$db	An instance of the database object used to create the fixture table
+ * @return boolean True on success, false on failure
+ * @access public
+ */
+	function create(&$db) {
+		if (!isset($this->fields) || empty($this->fields)) {
+			return false;
+		}
+
+		$this->Schema->_build(array($this->table => $this->fields));
+		return (
+			$db->execute($db->createSchema($this->Schema), array('log' => false)) !== false
+		);
+	}
+
+/**
+ * Run after all tests executed, should return SQL statement to drop table for this fixture.
+ *
+ * @param object	$db	An instance of the database object used to create the fixture table
+ * @return boolean True on success, false on failure
+ * @access public
+ */
+	function drop(&$db) {
+		if (empty($this->fields)) {
+			return false;
+		}
+		$this->Schema->_build(array($this->table => $this->fields));
+		return (
+			$db->execute($db->dropSchema($this->Schema), array('log' => false)) !== false
+		);
+	}
+
+/**
+ * Run before each tests is executed, should return a set of SQL statements to insert records for the table
+ * of this fixture could be executed successfully.
+ *
+ * @param object $db An instance of the database into which the records will be inserted
+ * @return boolean on success or if there are no records to insert, or false on failure
+ * @access public
+ */
+	function insert(&$db) {
+		if (!isset($this->_insert)) {
+			$values = array();
+
+			if (isset($this->records) && !empty($this->records)) {
+				$fields = array();
+				foreach($this->records as $record) {
+					$fields = array_merge($fields, array_keys(array_intersect_key($record, $this->fields)));
+				}
+				$fields = array_unique($fields);
+				$default = array_fill_keys($fields, null);
+				foreach ($this->records as $record) {
+					$recordValues = array();
+					foreach(array_merge($default, array_map(array(&$db, 'value'), $record)) as $value) {
+						$recordValues[] = is_null($value) ? 'NULL' : $value;
+					}
+					$values[] = '(' . implode(', ', $recordValues) . ')';
+				}
+				return $db->insertMulti($this->table, $fields, $values);
+			}
+			return true;
+		}
+	}
+
+
+/**
+ * Truncates the current fixture. Can be overwritten by classes extending CakeFixture to trigger other events before / after
+ * truncate.
+ *
+ * @param object $db A reference to a db instance
+ * @return boolean
+ * @access public
+ */
+	function truncate(&$db) {
+		$fullDebug = $db->fullDebug;
+		$db->fullDebug = false;
+		$return = $db->truncate($this->table);
+		$db->fullDebug = $fullDebug;
+		return $return;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_model.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_model.php
new file mode 100644
index 000000000..759e7393b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_model.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4667
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once LIBS.'model'.DS.'model.php';
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ */
+class CakeTestModel extends Model {
+	var $useDbConfig = 'test_suite';
+	var $cacheSources = false;
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_suite_dispatcher.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_suite_dispatcher.php
new file mode 100644
index 000000000..85bb55885
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_test_suite_dispatcher.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * CakeTestSuiteDispatcher controls dispatching TestSuite web based requests.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+require_once CAKE_TESTS_LIB . 'test_manager.php';
+
+/**
+ * CakeTestSuiteDispatcher handles web requests to the test suite and runs the correct action.
+ *
+ * @package cake.tests.libs
+ */
+class CakeTestSuiteDispatcher {
+/**
+ * 'Request' parameters
+ *
+ * @var array
+ */
+	var $params = array(
+		'codeCoverage' => false,
+		'group' => null,
+		'case' => null,
+		'app' => false,
+		'plugin' => null,
+		'output' => 'html',
+		'show' => 'groups',
+		'show_passes' => false
+	);
+
+/**
+ * The classname for the TestManager being used
+ *
+ * @var string
+ */
+	var $_managerClass = 'TestManager';
+
+/**
+ * The Instance of the Manager being used.
+ *
+ * @var TestManager subclass
+ */
+	var $Manager;
+
+/**
+ * Baseurl for the request
+ *
+ * @var string
+ */
+	var $_baseUrl;
+
+/**
+ * Base dir of the request.  Used for accessing assets.
+ *
+ * @var string
+ */
+	var $_baseDir;
+
+/**
+ * constructor
+ *
+ * @return void
+ */
+	function CakeTestSuiteDispatcher() {
+		$this->_baseUrl = $_SERVER['PHP_SELF'];
+		$dir = rtrim(dirname($this->_baseUrl), '\\');
+		$this->_baseDir = ($dir === '/') ? $dir : $dir . '/';
+	}
+
+/**
+ * Runs the actions required by the URL parameters.
+ *
+ * @return void
+ */
+	function dispatch() {
+		$this->_checkSimpleTest();
+		$this->_parseParams();
+
+		if ($this->params['group']) {
+			$this->_runGroupTest();
+		} elseif ($this->params['case']) {
+			$this->_runTestCase();
+		} elseif (isset($_GET['show']) && $_GET['show'] == 'cases') {
+			$this->_testCaseList();
+		} else {
+			$this->_groupTestList();
+		}
+
+		$output = ob_get_clean();
+		echo $output;
+	}
+
+/**
+ * Checks that simpleTest is installed.  Will exit if it doesn't
+ *
+ * @return void
+ */
+	function _checkSimpleTest() {
+		if (!App::import('Vendor', 'simpletest' . DS . 'reporter')) {
+			$baseDir = $this->_baseDir;
+			include CAKE_TESTS_LIB . 'templates' . DS . 'simpletest.php';
+			exit();
+		}
+	}
+
+/**
+ * Checks for the xdebug extension required to do code coverage. Displays an error
+ * if xdebug isn't installed.
+ *
+ * @return void
+ */
+	function _checkXdebug() {
+		if (!extension_loaded('xdebug')) {
+			$baseDir = $this->_baseDir;
+			include CAKE_TESTS_LIB . 'templates' . DS . 'xdebug.php';
+			exit();
+		}
+	}
+
+/**
+ * Generates a page containing the a list of test cases that could be run.
+ *
+ * @return void
+ */
+	function _testCaseList() {
+		$Reporter =& $this->getReporter();
+		$Reporter->paintDocumentStart();
+		$Reporter->paintTestMenu();
+		$Reporter->testCaseList();
+		$Reporter->paintDocumentEnd();
+	}
+
+/**
+ * Generates a page containing a list of group tests that could be run.
+ *
+ * @return void
+ */
+	function _groupTestList() {
+		$Reporter =& $this->getReporter();
+		$Reporter->paintDocumentStart();
+		$Reporter->paintTestMenu();
+		$Reporter->groupTestList();
+		$Reporter->paintDocumentEnd();
+	}
+
+/**
+ * Sets the Manager to use for the request.
+ *
+ * @return string The manager class name
+ * @static
+ */
+	function &getManager() {
+		if (empty($this->Manager)) {
+			$this->Manager = new $this->_managerClass();
+		}
+		return $this->Manager;
+	}
+
+/**
+ * Gets the reporter based on the request parameters
+ *
+ * @return void
+ * @static
+ */
+	function &getReporter() {
+		static $Reporter = NULL;
+		if (!$Reporter) {
+			$type = strtolower($this->params['output']);
+			$coreClass = 'Cake' . ucwords($this->params['output']) . 'Reporter';
+			$coreFile = CAKE_TESTS_LIB . 'reporter' . DS . 'cake_' . $type . '_reporter.php';
+
+			$appClass = $this->params['output'] . 'Reporter';
+			$appFile = APPLIBS . 'test_suite' . DS . 'reporter' . DS . $type . '_reporter.php';
+			if (include_once $coreFile) {
+				$Reporter =& new $coreClass(null, $this->params);
+			} elseif (include_once $appFile) {
+				$Reporter =& new $appClass(null, $this->params);
+			}
+		}
+		return $Reporter;
+	}
+
+/**
+ * Parse url params into a 'request'
+ *
+ * @return void
+ */
+	function _parseParams() {
+		if (!isset($_SERVER['SERVER_NAME'])) {
+			$_SERVER['SERVER_NAME'] = '';
+		}
+		foreach ($this->params as $key => $value) {
+			if (isset($_GET[$key])) {
+				$this->params[$key] = $_GET[$key];
+			}
+		}
+		if (isset($_GET['code_coverage'])) {
+			$this->params['codeCoverage'] = true;
+			require_once CAKE_TESTS_LIB . 'code_coverage_manager.php';
+			$this->_checkXdebug();
+		}
+		$this->params['baseUrl'] = $this->_baseUrl;
+		$this->params['baseDir'] = $this->_baseDir;
+		$this->getManager();
+	}
+
+/**
+ * Runs the group test case.
+ *
+ * @return void
+ */
+	function _runGroupTest() {
+		$Reporter =& CakeTestSuiteDispatcher::getReporter();
+		if ($this->params['codeCoverage']) {
+			CodeCoverageManager::init($this->params['group'], $Reporter);
+		}
+		if ('all' == $this->params['group']) {
+			$this->Manager->runAllTests($Reporter);
+		} else {
+			$this->Manager->runGroupTest(ucfirst($this->params['group']), $Reporter);
+		}
+	}
+
+/**
+ * Runs a test case file.
+ *
+ * @return void
+ */
+	function _runTestCase() {
+		$Reporter =& CakeTestSuiteDispatcher::getReporter();
+		if ($this->params['codeCoverage']) {
+			CodeCoverageManager::init($this->params['case'], $Reporter);
+		}
+		$this->Manager->runTestCase($this->params['case'], $Reporter);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_web_test_case.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_web_test_case.php
new file mode 100644
index 000000000..34ac3b6d9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/cake_web_test_case.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * CakeWebTestCase a simple wrapper around WebTestCase
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * Ignore base class.
+ */
+	SimpleTest::ignore('CakeWebTestCase');
+
+/**
+ * Simple wrapper for the WebTestCase provided by SimpleTest
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ */
+class CakeWebTestCase extends WebTestCase {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/code_coverage_manager.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/code_coverage_manager.php
new file mode 100644
index 000000000..22dce2dc3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/code_coverage_manager.php
@@ -0,0 +1,804 @@
+<?php
+/**
+ * A class to manage all aspects for Code Coverage Analysis
+ *
+ * This class
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+App::import('Core', 'Folder');
+
+/**
+ * Short description for class.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ */
+class CodeCoverageManager {
+
+/**
+ * Is this an app test case?
+ *
+ * @var string
+ */
+	var $appTest = false;
+
+/**
+ * Is this an app test case?
+ *
+ * @var string
+ */
+	var $pluginTest = false;
+
+/**
+ * Is this a grouptest?
+ *
+ * @var string
+ * @access public
+ */
+	var $groupTest = false;
+
+/**
+ * The test case file to analyze
+ *
+ * @var string
+ */
+	var $testCaseFile = '';
+
+/**
+ * The currently used CakeTestReporter
+ *
+ * @var string
+ */
+	var $reporter = '';
+
+/**
+ * undocumented variable
+ *
+ * @var string
+ */
+	var $numDiffContextLines = 7;
+
+/**
+ * Returns a singleton instance
+ *
+ * @return object
+ * @access public
+ */
+	function &getInstance() {
+		static $instance = array();
+		if (!$instance) {
+			$instance[0] =& new CodeCoverageManager();
+		}
+		return $instance[0];
+	}
+
+/**
+ * Initializes a new Coverage Analyzation for a given test case file
+ *
+ * @param string $testCaseFile The test case file being covered.
+ * @param object $reporter Instance of the reporter running.
+ * @return void
+ * @static
+ */
+	function init($testCaseFile, &$reporter) {
+		$manager =& CodeCoverageManager::getInstance();
+		$manager->reporter =& $reporter;
+		$testCaseFile = str_replace(DS . DS, DS, $testCaseFile);
+		$thisFile = str_replace('.php', '.test.php', basename(__FILE__));
+
+		if (strpos($testCaseFile, $thisFile) !== false) {
+			trigger_error(__('Xdebug supports no parallel coverage analysis - so this is not possible.', true), E_USER_ERROR);
+		}
+		$manager->setParams($reporter);
+		$manager->testCaseFile = $testCaseFile;
+	}
+
+/**
+ * Start/resume Code coverage collection.
+ *
+ * @return void
+ * @static
+ */
+	function start() {
+		xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+	}
+
+/**
+ * Stops/pauses code coverage collection. Does not clean the
+ * code coverage memory. Use clean() to clear code coverage memory
+ *
+ * @return void
+ * @static
+ */
+	function stop() {
+		xdebug_stop_code_coverage(false);
+	}
+
+/**
+ * Clears the existing code coverage information.  Also stops any
+ * running collection.
+ *
+ * @return void
+ * @static
+ */
+	function clear() {
+		xdebug_stop_code_coverage();
+	}
+
+/**
+ * Set the parameters from a reporter to the CodeCoverageManager
+ *
+ * @return void
+ */
+	function setParams(&$reporter) {
+		if ($reporter->params['app']) {
+			$this->appTest = true;
+		}
+
+		if ($reporter->params['group']) {
+			$this->groupTest = true;
+		}
+
+		if ($reporter->params['plugin']) {
+			$this->pluginTest = Inflector::underscore($reporter->params['plugin']);
+		}
+	}
+
+/**
+ * Stops the current code coverage analyzation and dumps a nice report
+ * depending on the reporter that was passed to start()
+ *
+ * @return void
+ * @static
+ */
+	function report($output = true) {
+		$manager =& CodeCoverageManager::getInstance();
+
+		CodeCoverageManager::stop();
+		CodeCoverageManager::clear();
+
+		list($coverageData, $testObjectFile) = $manager->_getCoverageData();
+
+		if (empty($coverageData) && $output) {
+			echo "The test object file is never loaded.\n";
+		}
+
+		if (!$manager->groupTest) {
+			$execCodeLines = $manager->__getExecutableLines(file_get_contents($testObjectFile));
+			$result = '';
+
+			switch (get_class($manager->reporter)) {
+				case 'CakeHtmlReporter':
+					$result = $manager->reportCaseHtmlDiff(@file($testObjectFile), $coverageData, $execCodeLines, $manager->numDiffContextLines);
+					break;
+				case 'CakeCliReporter':
+				default:
+					$result = $manager->reportCaseCli(@file($testObjectFile), $coverageData, $execCodeLines, $manager->numDiffContextLines);
+					break;
+			}
+		} else {
+			$execCodeLines = $manager->__getExecutableLines($testObjectFile);
+			$result = '';
+
+			switch (get_class($manager->reporter)) {
+				case 'CakeHtmlReporter':
+					$result = $manager->reportGroupHtml($testObjectFile, $coverageData, $execCodeLines, $manager->numDiffContextLines);
+					break;
+				case 'CakeCliReporter':
+				default:
+					$result = $manager->reportGroupCli($testObjectFile, $coverageData, $execCodeLines, $manager->numDiffContextLines);
+					break;
+			}
+		}
+
+		if ($output) {
+			echo $result;
+		}
+	}
+
+/**
+ * Gets the coverage data for the test case or group test that is being run.
+ *
+ * @return void
+ */
+	function _getCoverageData() {
+		$coverageData = array();
+		$dump = xdebug_get_code_coverage();
+
+		if ($this->groupTest) {
+			$testObjectFile = $this->__testObjectFilesFromGroupFile($this->testCaseFile, $this->appTest);
+			foreach ($testObjectFile as $file) {
+				if (!file_exists($file)) {
+					trigger_error(sprintf(__('This test object file is invalid: %s', true), $file));
+					return ;
+				}
+			}
+			foreach ($testObjectFile as $file) {
+				if (isset($dump[$file])) {
+					$coverageData[$file] = $dump[$file];
+				}
+			}
+		} else {
+			$testObjectFile = $this->__testObjectFileFromCaseFile($this->testCaseFile, $this->appTest);
+
+			if (!file_exists($testObjectFile)) {
+				trigger_error(sprintf(__('This test object file is invalid: %s', true), $testObjectFile));
+				return ;
+			}
+
+			if (isset($dump[$testObjectFile])) {
+				$coverageData = $dump[$testObjectFile];
+			}
+		}
+		return array($coverageData, $testObjectFile);
+	}
+
+/**
+ * Diff reporting
+ *
+ * @param string $testObjectFile
+ * @param string $coverageData
+ * @param string $execCodeLines
+ * @param string $output
+ * @return void
+ * @static
+ */
+	function reportCaseHtmlDiff($testObjectFile, $coverageData, $execCodeLines, $numContextLines) {
+		$manager = CodeCoverageManager::getInstance();
+		$total = count($testObjectFile);
+		$lines = array();
+
+		for ($i = 1; $i < $total + 1; $i++) {
+			$foundByManualFinder = isset($execCodeLines[$i]) && trim($execCodeLines[$i]) != '';
+			$foundByXdebug = isset($coverageData[$i]);
+
+			if (!$foundByManualFinder || !$foundByXdebug || $coverageData[$i] === -2) {
+				if (isset($lines[$i])) {
+					$lines[$i] = 'ignored ' . $lines[$i];
+				} else {
+					$lines[$i] = 'ignored';
+				}
+				continue;
+			}
+
+			if ($coverageData[$i] !== -1) {
+				if (isset($lines[$i])) {
+					$lines[$i] = 'covered ' . $lines[$i];
+				} else {
+					$lines[$i] = 'covered';
+				}
+				continue;
+			}
+			$lines[$i] = 'uncovered show';
+			$foundEndBlockInContextSearch = false;
+
+			for ($j = 1; $j <= $numContextLines; $j++) {
+				$key = $i - $j;
+
+				if ($key > 0 && isset($lines[$key])) {
+					if (strpos($lines[$key], 'end') !== false) {
+						$foundEndBlockInContextSearch = true;
+						if ($j < $numContextLines) {
+							$lines[$key] = str_replace('end', '', $lines[$key-1]);
+						}
+					}
+
+					if (strpos($lines[$key], 'uncovered') === false) {
+						if (strpos($lines[$key], 'covered') !== false) {
+							$lines[$key] .= ' show';
+						} else {
+							$lines[$key] = 'ignored show';
+						}
+					}
+
+					if ($j == $numContextLines) {
+						$lineBeforeIsEndBlock = strpos($lines[$key-1], 'end') !== false;
+						$lineBeforeIsShown = strpos($lines[$key-1], 'show') !== false;
+						$lineBeforeIsUncovered = strpos($lines[$key-1], 'uncovered') !== false;
+
+						if (!$foundEndBlockInContextSearch && !$lineBeforeIsUncovered && ($lineBeforeIsEndBlock)) {
+							$lines[$key-1] = str_replace('end', '', $lines[$key-1]);
+						}
+
+						if (!$lineBeforeIsShown && !$lineBeforeIsUncovered) {
+							$lines[$key] .= ' start';
+						}
+					}
+				}
+				$key = $i + $j;
+
+				if ($key < $total) {
+					$lines[$key] = 'show';
+
+					if ($j == $numContextLines) {
+						$lines[$key] .= ' end';
+					}
+				}
+			}
+		}
+
+		// find the last "uncovered" or "show"n line and "end" its block
+		$lastShownLine = $manager->__array_strpos($lines, 'show', true);
+		if (isset($lines[$lastShownLine])) {
+			$lines[$lastShownLine] .= ' end';
+		}
+
+		// give the first start line another class so we can control the top padding of the entire results
+		$firstShownLine = $manager->__array_strpos($lines, 'show');
+		if (isset($lines[$firstShownLine])) {
+			$lines[$firstShownLine] .= ' realstart';
+		}
+
+		// get the output
+		$lineCount = $coveredCount = 0;
+		$report = '';
+		foreach ($testObjectFile as $num => $line) {
+			// start line count at 1
+			$num++;
+			$class = $lines[$num];
+
+			if (strpos($class, 'ignored') === false) {
+				$lineCount++;
+
+				if (strpos($class, 'covered') !== false && strpos($class, 'uncovered') === false) {
+					$coveredCount++;
+				}
+			}
+
+			if (strpos($class, 'show') !== false) {
+				$report .= $manager->__paintCodeline($class, $num, $line);
+			}
+		}
+		return $manager->__paintHeader($lineCount, $coveredCount, $report);
+	}
+
+/**
+ * CLI reporting
+ *
+ * @param string $testObjectFile
+ * @param string $coverageData
+ * @param string $execCodeLines
+ * @param string $output
+ * @return void
+ * @static
+ */
+	function reportCaseCli($testObjectFile, $coverageData, $execCodeLines) {
+		$manager = CodeCoverageManager::getInstance();
+		$lineCount = $coveredCount = 0;
+		$report = '';
+
+		foreach ($testObjectFile as $num => $line) {
+			$num++;
+			$foundByManualFinder = isset($execCodeLines[$num]) && trim($execCodeLines[$num]) != '';
+			$foundByXdebug = isset($coverageData[$num]) && $coverageData[$num] !== -2;
+
+			if ($foundByManualFinder && $foundByXdebug) {
+				$lineCount++;
+
+				if ($coverageData[$num] > 0) {
+					$coveredCount++;
+				}
+			}
+		}
+		return $manager->__paintHeaderCli($lineCount, $coveredCount, $report);
+	}
+
+/**
+ * Diff reporting
+ *
+ * @param string $testObjectFile
+ * @param string $coverageData
+ * @param string $execCodeLines
+ * @param string $output
+ * @return void
+ * @static
+ */
+	function reportGroupHtml($testObjectFiles, $coverageData, $execCodeLines, $numContextLines) {
+		$manager = CodeCoverageManager::getInstance();
+		$report = '';
+
+		foreach ($testObjectFiles as $testObjectFile) {
+			$lineCount = $coveredCount = 0;
+			$objFilename = $testObjectFile;
+			$testObjectFile = file($testObjectFile);
+
+			foreach ($testObjectFile as $num => $line) {
+				$num++;
+				$foundByManualFinder = isset($execCodeLines[$objFilename][$num]) && trim($execCodeLines[$objFilename][$num]) != '';
+				$foundByXdebug = isset($coverageData[$objFilename][$num]) && $coverageData[$objFilename][$num] !== -2;
+
+				if ($foundByManualFinder && $foundByXdebug) {
+					$class = 'uncovered';
+					$lineCount++;
+
+					if ($coverageData[$objFilename][$num] > 0) {
+						$class = 'covered';
+						$coveredCount++;
+					}
+				} else {
+					$class = 'ignored';
+				}
+			}
+			$report .= $manager->__paintGroupResultLine($objFilename, $lineCount, $coveredCount);
+		}
+		return $manager->__paintGroupResultHeader($report);
+	}
+
+/**
+ * CLI reporting
+ *
+ * @param string $testObjectFile
+ * @param string $coverageData
+ * @param string $execCodeLines
+ * @param string $output
+ * @return void
+ * @static
+ */
+	function reportGroupCli($testObjectFiles, $coverageData, $execCodeLines) {
+		$manager = CodeCoverageManager::getInstance();
+		$report = '';
+
+		foreach ($testObjectFiles as $testObjectFile) {
+			$lineCount = $coveredCount = 0;
+			$objFilename = $testObjectFile;
+			$testObjectFile = file($testObjectFile);
+
+			foreach ($testObjectFile as $num => $line) {
+				$num++;
+				$foundByManualFinder = isset($execCodeLines[$objFilename][$num]) && trim($execCodeLines[$objFilename][$num]) != '';
+				$foundByXdebug = isset($coverageData[$objFilename][$num]) && $coverageData[$objFilename][$num] !== -2;
+
+				if ($foundByManualFinder && $foundByXdebug) {
+					$lineCount++;
+
+					if ($coverageData[$objFilename][$num] > 0) {
+						$coveredCount++;
+					}
+				}
+			}
+			$report .= $manager->__paintGroupResultLineCli($objFilename, $lineCount, $coveredCount);
+		}
+		return $report;
+	}
+
+/**
+ * Returns the name of the test object file based on a given test case file name
+ *
+ * @param string $file
+ * @param string $isApp
+ * @return string name of the test object file
+ * @access private
+ */
+	function __testObjectFileFromCaseFile($file, $isApp = true) {
+		$manager = CodeCoverageManager::getInstance();
+		$path = $manager->__getTestFilesPath($isApp);
+		$folderPrefixMap = array(
+			'behaviors' => 'models',
+			'components' => 'controllers',
+			'helpers' => 'views'
+		);
+
+		foreach ($folderPrefixMap as $dir => $prefix) {
+			if (strpos($file, $dir) === 0) {
+				$path .= $prefix . DS;
+				break;
+			}
+		}
+		$testManager =& new TestManager();
+		$testFile = str_replace(array('/', $testManager->_testExtension), array(DS, '.php'), $file);
+
+		$folder =& new Folder();
+		$folder->cd(ROOT . DS . CAKE_TESTS_LIB);
+		$contents = $folder->read();
+
+		if (in_array(basename($testFile), $contents[1])) {
+			$testFile = basename($testFile);
+			$path = ROOT . DS . CAKE_TESTS_LIB;
+		}
+		$path .= $testFile;
+		$realpath = realpath($path);
+
+		if ($realpath) {
+			return $realpath;
+		}
+		return $path;
+	}
+
+/**
+ * Returns an array of names of the test object files based on a given test group file name
+ *
+ * @param array $files
+ * @param string $isApp
+ * @return array names of the test object files
+ * @access private
+ */
+	function __testObjectFilesFromGroupFile($groupFile, $isApp = true) {
+		$manager = CodeCoverageManager::getInstance();
+		$testManager =& new TestManager();
+
+		$path = TESTS;
+		if (!$isApp) {
+			$path = ROOT . DS . 'cake' . DS . 'tests';
+		}
+		if (!!$manager->pluginTest) {
+			$path = App::pluginPath($manager->pluginTest) . DS . 'tests';
+		}
+
+		$result = array();
+		if ($groupFile == 'all') {
+			$files = array_keys($testManager->getTestCaseList());
+			foreach ($files as $file) {
+				$file = str_replace(DS . 'tests' . DS . 'cases' . DS, DS, $file);
+				$file = str_replace('.test.php', '.php', $file);
+				$file = str_replace(DS . DS, DS, $file);
+				$result[] = $file;
+			}
+		} else {
+			$path .= DS . 'groups' . DS . $groupFile . $testManager->_groupExtension;
+			if (!file_exists($path)) {
+				trigger_error(__('This group file does not exist!', true));
+				return array();
+			}
+
+			$result = array();
+			$groupContent = file_get_contents($path);
+			$ds = '\s*\.\s*DS\s*\.\s*';
+			$pluginTest = 'APP\.\'plugins\'' . $ds . '\'' . $manager->pluginTest . '\'' . $ds . '\'tests\'' . $ds . '\'cases\'';
+			$pluginTest .= '|App::pluginPath\(\'' . $manager->pluginTest . '\'\)' . $ds . '\'tests\'' . $ds . '\'cases\'';
+			$pattern = '/\s*TestManager::addTestFile\(\s*\$this,\s*(' . $pluginTest . '|APP_TEST_CASES|CORE_TEST_CASES)' . $ds . '(.*?)\)/i';
+			preg_match_all($pattern, $groupContent, $matches);
+
+			foreach ($matches[2] as $file) {
+				$patterns = array(
+					'/\s*\.\s*DS\s*\.\s*/',
+					'/\s*APP_TEST_CASES\s*/',
+					'/\s*CORE_TEST_CASES\s*/',
+				);
+
+				$replacements = array(DS, '', '');
+				$file = preg_replace($patterns, $replacements, $file);
+				$file = str_replace("'", '', $file);
+				$result[] = $manager->__testObjectFileFromCaseFile($file, $isApp) . '.php';
+			}
+		}
+		return $result;
+	}
+
+/**
+ * Parses a given code string into an array of lines and replaces some non-executable code lines with the needed
+ * amount of new lines in order for the code line numbers to stay in sync
+ *
+ * @param string $content
+ * @return array array of lines
+ * @access private
+ */
+	function __getExecutableLines($content) {
+		if (is_array($content)) {
+			$manager =& CodeCoverageManager::getInstance();
+			$result = array();
+			foreach ($content as $file) {
+				$result[$file] = $manager->__getExecutableLines(file_get_contents($file));
+			}
+			return $result;
+		}
+		$content = h($content);
+		// arrays are 0-indexed, but we want 1-indexed stuff now as we are talking code lines mind you (**)
+		$content = "\n" . $content;
+		// // strip unwanted lines
+		$content = preg_replace_callback("/(@codeCoverageIgnoreStart.*?@codeCoverageIgnoreEnd)/is", array('CodeCoverageManager', '__replaceWithNewlines'), $content);
+		// strip php | ?\> tag only lines
+		$content = preg_replace('/[ |\t]*[&lt;\?php|\?&gt;]+[ |\t]*/', '', $content);
+
+		// strip lines that contain only braces and parenthesis
+		$content = preg_replace('/[ |\t]*[{|}|\(|\)]+[ |\t]*/', '', $content);
+		$result = explode("\n", $content);
+		// unset the zero line again to get the original line numbers, but starting at 1, see (**)
+		unset($result[0]);
+		return $result;
+	}
+
+/**
+ * Replaces a given arg with the number of newlines in it
+ *
+ * @return string the number of newlines in a given arg
+ * @access private
+ */
+	function __replaceWithNewlines() {
+		$args = func_get_args();
+		$numLineBreaks = count(explode("\n", $args[0][0]));
+		return str_pad('', $numLineBreaks - 1, "\n");
+	}
+
+/**
+ * Paints the headline for code coverage analysis
+ *
+ * @param string $codeCoverage
+ * @param string $report
+ * @return void
+ * @access private
+ */
+	function __paintHeader($lineCount, $coveredCount, $report) {
+		$manager =& CodeCoverageManager::getInstance();
+		$codeCoverage = $manager->__calcCoverage($lineCount, $coveredCount);
+		return $report = '<h2>Code Coverage: ' . $codeCoverage . '%</h2>
+						<div class="code-coverage-results"><pre>' . $report . '</pre></div>';
+	}
+
+/**
+ * Displays a notification concerning group test results
+ *
+ * @return void
+ * @access public
+ */
+	function __paintGroupResultHeader($report) {
+		return '<div class="code-coverage-results"><p class="note">Please keep in mind that the coverage can vary a little bit depending on how much the different tests in the group interfere. If for example, TEST A calls a line from TEST OBJECT B, the coverage for TEST OBJECT B will be a little greater than if you were running the corresponding test case for TEST OBJECT B alone.</p><pre>' . $report . '</pre></div>';
+	}
+
+/**
+ * Paints the headline for code coverage analysis
+ *
+ * @param string $codeCoverage
+ * @param string $report
+ * @return void
+ * @access private
+ */
+	function __paintGroupResultLine($file, $lineCount, $coveredCount) {
+		$manager =& CodeCoverageManager::getInstance();
+		$codeCoverage = $manager->__calcCoverage($lineCount, $coveredCount);
+		$class = 'result-bad';
+
+		if ($codeCoverage > 50) {
+			$class = 'result-ok';
+		}
+		if ($codeCoverage > 80) {
+			$class = 'result-good';
+		}
+		return '<p>Code Coverage for ' . $file . ': <span class="' . $class . '">' . $codeCoverage . '%</span></p>';
+	}
+
+/**
+ * Paints the headline for code coverage analysis
+ *
+ * @param string $codeCoverage
+ * @param string $report
+ * @return void
+ * @access private
+ */
+	function __paintGroupResultLineCli($file, $lineCount, $coveredCount) {
+		$manager =& CodeCoverageManager::getInstance();
+		$codeCoverage = $manager->__calcCoverage($lineCount, $coveredCount);
+		$class = 'bad';
+		if ($codeCoverage > 50) {
+			$class = 'ok';
+		}
+		if ($codeCoverage > 80) {
+			$class = 'good';
+		}
+		return "\n" . 'Code Coverage for ' . $file . ': ' . $codeCoverage . '% (' . $class . ')' . "\n";
+	}
+
+/**
+ * Paints the headline for code coverage analysis in the CLI
+ *
+ * @param string $codeCoverage
+ * @param string $report
+ * @return void
+ * @access private
+ */
+	function __paintHeaderCli($lineCount, $coveredCount, $report) {
+		$manager =& CodeCoverageManager::getInstance();
+		$codeCoverage = $manager->__calcCoverage($lineCount, $coveredCount);
+		$class = 'bad';
+		if ($codeCoverage > 50) {
+			$class = 'ok';
+		}
+		if ($codeCoverage > 80) {
+			$class = 'good';
+		}
+		return $report = "Code Coverage: $codeCoverage% ($class)\n";
+	}
+
+/**
+ * Paints a code line for html output
+ *
+ * @package       default
+ * @access private
+ */
+	function __paintCodeline($class, $num, $line) {
+		$line = h($line);
+
+		if (trim($line) == '') {
+			$line = '&nbsp;'; // Win IE fix
+		}
+		return '<div class="code-line ' . trim($class) . '"><span class="line-num">' . $num . '</span><span class="content">' . $line . '</span></div>';
+	}
+
+/**
+ * Calculates the coverage percentage based on a line count and a covered line count
+ *
+ * @param string $lineCount
+ * @param string $coveredCount
+ * @return void
+ * @access private
+ */
+	function __calcCoverage($lineCount, $coveredCount) {
+		if ($coveredCount > $lineCount) {
+			trigger_error(__('Sorry, you cannot have more covered lines than total lines!', true));
+		}
+		return ($lineCount != 0)
+				? round(100 * $coveredCount / $lineCount, 2)
+				: '0.00';
+	}
+
+/**
+ * Gets us the base path to look for the test files
+ *
+ * @param string $isApp
+ * @return void
+ * @access public
+ */
+	function __getTestFilesPath($isApp = true) {
+		$manager = CodeCoverageManager::getInstance();
+		$path = ROOT . DS;
+
+		if ($isApp) {
+			$path .= APP_DIR . DS;
+		} elseif (!!$manager->pluginTest) {
+			$pluginPath = APP . 'plugins' . DS . $manager->pluginTest . DS;
+
+			$pluginPaths = App::path('plugins');
+			foreach ($pluginPaths as $tmpPath) {
+				$tmpPath = $tmpPath . $manager->pluginTest . DS;
+				if (file_exists($tmpPath)) {
+					$pluginPath = $tmpPath;
+					break;
+				}
+			}
+
+			$path = $pluginPath;
+		} else {
+			$path = TEST_CAKE_CORE_INCLUDE_PATH;
+		}
+
+		return $path;
+	}
+
+/**
+ * Finds the last element of an array that contains $needle in a strpos computation
+ *
+ * @param array $arr
+ * @param string $needle
+ * @return void
+ * @access private
+ */
+	function __array_strpos($arr, $needle, $reverse = false) {
+		if (!is_array($arr) || empty($arr)) {
+			return false;
+		}
+
+		if ($reverse) {
+			$arr = array_reverse($arr, true);
+		}
+
+		foreach ($arr as $key => $val) {
+			if (strpos($val, $needle) !== false) {
+				return $key;
+			}
+		}
+		return false;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_base_reporter.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_base_reporter.php
new file mode 100644
index 000000000..957fb8fd6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_base_reporter.php
@@ -0,0 +1,225 @@
+<?php
+/**
+ * CakeBaseReporter contains common functionality to all cake test suite reporters.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.libs.reporter
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+
+/**
+ * CakeBaseReporter contains common reporting features used in the CakePHP Test suite
+ *
+ * @package cake
+ * @subpackage cake.tests.lib
+ */
+class CakeBaseReporter extends SimpleReporter {
+
+/**
+ * Time the test runs started.
+ *
+ * @var integer
+ * @access protected
+ */
+	var $_timeStart = 0;
+
+/**
+ * Time the test runs ended
+ *
+ * @var integer
+ * @access protected
+ */
+	var $_timeEnd = 0;
+
+/**
+ * Duration of all test methods.
+ *
+ * @var integer
+ * @access protected
+ */
+	var $_timeDuration = 0;
+
+/**
+ * Array of request parameters.  Usually parsed GET params.
+ *
+ * @var array
+ */
+	var $params = array();
+
+/**
+ * Character set for the output of test reporting.
+ *
+ * @var string
+ * @access protected
+ */
+	var $_characterSet;
+
+/**
+ * Does nothing yet. The first output will
+ * be sent on the first test start.
+ *
+ * ### Params
+ *
+ * - show_passes - Should passes be shown
+ * - plugin - Plugin test being run?
+ * - app - App test being run.
+ * - case - The case being run
+ * - codeCoverage - Whether the case/group being run is being code covered.
+ * 
+ * @param string $charset The character set to output with. Defaults to UTF-8
+ * @param array $params Array of request parameters the reporter should use. See above.
+ * @access public
+ */
+	function CakeBaseReporter($charset = 'utf-8', $params = array()) {
+		$this->SimpleReporter();
+		if (!$charset) {
+			$charset = 'utf-8';
+		}
+		$this->_characterSet = $charset;
+		$this->params = $params;
+	}
+
+/**
+ * Signals / Paints the beginning of a TestSuite executing.
+ * Starts the timer for the TestSuite execution time.
+ *
+ * @param string $test_name Name of the test that is being run.
+ * @param integer $size 
+ * @return void
+ */
+	function paintGroupStart($test_name, $size) {
+		if (empty($this->_timeStart)) {
+			$this->_timeStart = $this->_getTime();
+		}
+		parent::paintGroupStart($test_name, $size);
+	}
+
+/**
+ * Signals/Paints the end of a TestSuite. All test cases have run
+ * and timers are stopped.
+ *
+ * @param string $test_name Name of the test that is being run.
+ * @return void
+ */
+	function paintGroupEnd($test_name) {
+		$this->_timeEnd = $this->_getTime();
+		$this->_timeDuration = $this->_timeEnd - $this->_timeStart;
+		parent::paintGroupEnd($test_name);
+	}
+
+/**
+ * Paints the beginning of a test method being run.  This is used
+ * to start/resume the code coverage tool.
+ *
+ * @param string $method The method name being run.
+ * @return void
+ */
+	function paintMethodStart($method) {
+		parent::paintMethodStart($method);
+		if (!empty($this->params['codeCoverage'])) {
+			CodeCoverageManager::start();
+		}
+	}
+
+/**
+ * Paints the end of a test method being run.  This is used
+ * to pause the collection of code coverage if its being used.
+ *
+ * @param string $method The name of the method being run.
+ * @return void
+ */
+	function paintMethodEnd($method) {
+		parent::paintMethodEnd($method);
+		if (!empty($this->params['codeCoverage'])) {
+			CodeCoverageManager::stop();
+		}
+	}
+
+/**
+ * Get the current time in microseconds. Similar to getMicrotime in basics.php
+ * but in a separate function to reduce dependancies.
+ *
+ * @return float Time in microseconds
+ * @access protected
+ */
+	function _getTime() {
+		list($usec, $sec) = explode(' ', microtime());
+		return ((float)$sec + (float)$usec);
+	}
+
+/**
+ * Retrieves a list of test cases from the active Manager class,
+ * displaying it in the correct format for the reporter subclass
+ *
+ * @return mixed
+ */
+	function testCaseList() {
+		$testList = TestManager::getTestCaseList();
+		return $testList;
+	}
+
+/**
+ * Retrieves a list of group test cases from the active Manager class
+ * displaying it in the correct format for the reporter subclass.
+ *
+ * @return void
+ */
+	function groupTestList() {
+		$testList = TestManager::getGroupTestList();
+		return $testList;
+	}
+
+/**
+ * Paints the start of the response from the test suite.
+ * Used to paint things like head elements in an html page.
+ *
+ * @return void
+ */
+	function paintDocumentStart() {
+
+	}
+
+/**
+ * Paints the end of the response from the test suite.
+ * Used to paint things like </body> in an html page.
+ *
+ * @return void
+ */
+	function paintDocumentEnd() {
+		
+	}
+
+/**
+ * Paint a list of test sets, core, app, and plugin test sets
+ * available.
+ *
+ * @return void
+ */
+	function paintTestMenu() {
+		
+	}
+
+/**
+ * Get the baseUrl if one is available.
+ *
+ * @return string The base url for the request.
+ */
+	function baseUrl() {
+		if (!empty($_SERVER['PHP_SELF'])) {
+			return $_SERVER['PHP_SELF'];
+		}
+		return '';
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_cli_reporter.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_cli_reporter.php
new file mode 100644
index 000000000..da1de37b8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_cli_reporter.php
@@ -0,0 +1,178 @@
+<?php
+/**
+ * Cake CLI test reporter.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+	if (version_compare(PHP_VERSION, '4.4.4', '<=') ||
+		PHP_SAPI == 'cgi') {
+		define('STDOUT', fopen('php://stdout', 'w'));
+		define('STDERR', fopen('php://stderr', 'w'));
+		register_shutdown_function(create_function('', 'fclose(STDOUT); fclose(STDERR); return true;'));
+	}
+
+include_once dirname(__FILE__) . DS . 'cake_base_reporter.php';
+
+/**
+ * Minimal command line test displayer. Writes fail details to STDERR. Returns 0
+ * to the shell if all tests pass, ST_FAILS_RETURN_CODE if any test fails.
+ *
+ * @package cake
+ * @subpackage cake.tests.libs.reporter
+ */
+class CakeCliReporter extends CakeBaseReporter {
+/**
+ * separator string for fail, error, exception, and skip messages.
+ *
+ * @var string
+ */
+	var $separator = '->';
+
+/**
+ * array of 'request' parameters
+ *
+ * @var array
+ */
+	var $params = array();
+
+/**
+ * Constructor
+ *
+ * @param string $separator 
+ * @param array $params 
+ * @return void
+ */
+	function CakeCLIReporter($charset = 'utf-8', $params = array()) {
+		$this->CakeBaseReporter($charset, $params);
+	}
+
+	function setFailDetailSeparator($separator) {
+		$this->separator = $separator;
+	}
+
+/**
+ * Paint fail faildetail to STDERR.
+ *
+ * @param string $message Message of the fail.
+ * @return void
+ * @access public
+ */
+	function paintFail($message) {
+		parent::paintFail($message);
+		$message .= $this->_getBreadcrumb();
+		fwrite(STDERR, 'FAIL' . $this->separator . $message);
+	}
+
+/**
+ * Paint PHP errors to STDERR.
+ *
+ * @param string $message Message of the Error
+ * @return void
+ * @access public
+ */
+	function paintError($message) {
+		parent::paintError($message);
+		$message .= $this->_getBreadcrumb();
+		fwrite(STDERR, 'ERROR' . $this->separator . $message);
+	}
+
+/**
+ * Paint exception faildetail to STDERR.
+ *
+ * @param object $exception Exception instance
+ * @return void
+ * @access public
+ */
+	function paintException($exception) {
+		parent::paintException($exception);
+		$message = sprintf('Unexpected exception of type [%s] with message [%s] in [%s] line [%s]',
+			get_class($exception),
+			$exception->getMessage(),
+			$exception->getFile(),
+			$exception->getLine()
+		);
+		$message .= $this->_getBreadcrumb();
+		fwrite(STDERR, 'EXCEPTION' . $this->separator . $message);
+	}
+
+/**
+ * Get the breadcrumb trail for the current test method/case
+ *
+ * @return string The string for the breadcrumb
+ */
+	function _getBreadcrumb() {
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		$out = "\n\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+		$out .= "\n\n";
+		return $out;
+	}
+
+/**
+ * Paint a test skip message
+ *
+ * @param string $message The message of the skip
+ * @return void
+ */
+	function paintSkip($message) {
+		parent::paintSkip($message);
+		fwrite(STDOUT, 'SKIP' . $this->separator . $message . "\n\n");
+	}
+
+/**
+ * Paint a footer with test case name, timestamp, counts of fails and exceptions.
+ */
+	function paintFooter($test_name) {
+		$buffer = $this->getTestCaseProgress() . '/' . $this->getTestCaseCount() . ' test cases complete: ';
+
+		if (0 < ($this->getFailCount() + $this->getExceptionCount())) {
+			$buffer .= $this->getPassCount() . " passes";
+			if (0 < $this->getFailCount()) {
+				$buffer .= ", " . $this->getFailCount() . " fails";
+			}
+			if (0 < $this->getExceptionCount()) {
+				$buffer .= ", " . $this->getExceptionCount() . " exceptions";
+			}
+			$buffer .= ".\n";
+			$buffer .= $this->_timeStats();
+			fwrite(STDOUT, $buffer);
+		} else {
+			fwrite(STDOUT, $buffer . $this->getPassCount() . " passes.\n" . $this->_timeStats());
+		}
+
+		if (
+			isset($this->params['codeCoverage']) && 
+			$this->params['codeCoverage'] && 
+			class_exists('CodeCoverageManager')
+		) {
+			CodeCoverageManager::report();
+		}
+	}
+
+/**
+ * Get the time and memory stats for this test case/group
+ *
+ * @return string String content to display
+ * @access protected
+ */
+	function _timeStats() {
+		$out = 'Time taken by tests (in seconds): ' . $this->_timeDuration . "\n";
+		if (function_exists('memory_get_peak_usage')) {
+			$out .= 'Peak memory use: (in bytes): ' . number_format(memory_get_peak_usage()) . "\n";
+		}
+		return $out;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_html_reporter.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_html_reporter.php
new file mode 100755
index 000000000..b1ef7ac9f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_html_reporter.php
@@ -0,0 +1,378 @@
+<?php
+/**
+ * CakeHtmlReporter
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.libs.reporter
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+include_once dirname(__FILE__) . DS . 'cake_base_reporter.php';
+
+/**
+ * CakeHtmlReporter Reports Results of TestSuites and Test Cases
+ * in an HTML format / context.
+ *
+ * @package cake
+ * @subpackage cake.tests.lib
+ */
+class CakeHtmlReporter extends CakeBaseReporter {
+/**
+ * Constructor
+ *
+ * @param string $charset 
+ * @param string $params 
+ * @return void
+ */
+	function CakeHtmlReporter($charset = 'utf-8', $params = array()) {
+		$params = array_map(array($this, '_htmlEntities'), $params);
+		$this->CakeBaseReporter($charset, $params);
+	}
+/**
+ * Paints the top of the web page setting the
+ * title to the name of the starting test.
+ *
+ * @param string $test_name Name class of test.
+ * @return void
+ * @access public
+ */
+	function paintHeader($testName) {
+		$this->sendNoCacheHeaders();
+		$this->paintDocumentStart();
+		$this->paintTestMenu();
+		printf("<h2>%s</h2>\n", $this->_htmlEntities($testName));
+		echo "<ul class='tests'>\n";
+	}
+
+/**
+ * Paints the document start content contained in header.php
+ *
+ * @return void
+ */
+	function paintDocumentStart() {
+		ob_start();
+		$baseDir = $this->params['baseDir'];
+		include CAKE_TESTS_LIB . 'templates' . DS . 'header.php';
+	}
+
+/**
+ * Paints the menu on the left side of the test suite interface.
+ * Contains all of the various plugin, core, and app buttons.
+ *
+ * @return void
+ */
+	function paintTestMenu() {
+		$groups = $this->baseUrl() . '?show=groups';
+		$cases = $this->baseUrl() . '?show=cases';
+		$plugins = App::objects('plugin', null, false);
+		sort($plugins);
+		include CAKE_TESTS_LIB . 'templates' . DS . 'menu.php';
+	}
+
+/**
+ * Retrieves and paints the list of tests cases in an HTML format.
+ *
+ * @return void
+ */
+	function testCaseList() {
+		$testCases = parent::testCaseList();
+		$app = $this->params['app'];
+		$plugin = $this->params['plugin'];
+
+		$buffer = "<h3>Core Test Cases:</h3>\n<ul>";
+		$urlExtra = null;
+		if ($app) {
+			$buffer = "<h3>App Test Cases:</h3>\n<ul>";
+			$urlExtra = '&app=true';
+		} elseif ($plugin) {
+			$buffer = "<h3>" . Inflector::humanize($plugin) . " Test Cases:</h3>\n<ul>";
+			$urlExtra = '&plugin=' . $plugin;
+		}
+
+		if (1 > count($testCases)) {
+			$buffer .= "<strong>EMPTY</strong>";
+		}
+
+		foreach ($testCases as $testCaseFile => $testCase) {
+			$title = explode(strpos($testCase, '\\') ? '\\' : '/', str_replace('.test.php', '', $testCase));
+			$title[count($title) - 1] = Inflector::camelize($title[count($title) - 1]);
+			$title = implode(' / ', $title);
+				$buffer .= "<li><a href='" . $this->baseUrl() . "?case=" . urlencode($testCase) . $urlExtra ."'>" . $title . "</a></li>\n";
+		}
+		$buffer .= "</ul>\n";
+		echo $buffer;
+	}
+
+/**
+ * Retrieves and paints the list of group tests in an HTML format.
+ *
+ * @return void
+ */
+	function groupTestList() {
+		$groupTests = parent::groupTestList();
+		$app = $this->params['app'];
+		$plugin = $this->params['plugin'];
+
+		$buffer = "<h3>Core Test Groups:</h3>\n<ul>";
+		$urlExtra = null;
+		if ($app) {
+			$buffer = "<h3>App Test Groups:</h3>\n<ul>";
+			$urlExtra = '&app=true';
+		} else if ($plugin) {
+			$buffer = "<h3>" . Inflector::humanize($plugin) . " Test Groups:</h3>\n<ul>";
+			$urlExtra = '&plugin=' . $plugin;
+		}
+
+		$buffer .= "<li><a href='" . $this->baseURL() . "?group=all$urlExtra'>All tests</a></li>\n";
+
+		foreach ($groupTests as $groupTest) {
+			$buffer .= "<li><a href='" . $this->baseURL() . "?group={$groupTest}" . "{$urlExtra}'>" . $groupTest . "</a></li>\n";
+		}
+		$buffer .= "</ul>\n";
+		echo $buffer;
+	}
+
+/**
+ * Send the headers necessary to ensure the page is
+ * reloaded on every request. Otherwise you could be
+ * scratching your head over out of date test data.
+ *
+ * @return void
+ * @access public
+ */
+	function sendNoCacheHeaders() {
+		if (!headers_sent()) {
+			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+			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");
+		}
+	}
+
+/**
+ * Paints the end of the test with a summary of
+ * the passes and failures.
+ *
+ * @param string $test_name Name class of test.
+ * @return void
+ * @access public
+ */
+	function paintFooter($test_name) {
+		$colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
+		echo "</ul>\n";
+		echo "<div style=\"";
+		echo "padding: 8px; margin: 1em 0; background-color: $colour; color: white;";
+		echo "\">";
+		echo $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
+		echo " test cases complete:\n";
+		echo "<strong>" . $this->getPassCount() . "</strong> passes, ";
+		echo "<strong>" . $this->getFailCount() . "</strong> fails and ";
+		echo "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
+		echo "</div>\n";
+		echo '<div style="padding:0 0 5px;">';
+		echo '<p><strong>Time taken by tests (in seconds):</strong> ' . $this->_timeDuration . '</p>';
+		if (function_exists('memory_get_peak_usage')) {
+			echo '<p><strong>Peak memory use: (in bytes):</strong> ' . number_format(memory_get_peak_usage()) . '</p>';
+		}
+		echo $this->_paintLinks();
+		echo '</div>';
+		if (
+			isset($this->params['codeCoverage']) && 
+			$this->params['codeCoverage'] && 
+			class_exists('CodeCoverageManager')
+		) {
+			CodeCoverageManager::report();
+		}
+		$this->paintDocumentEnd();
+	}
+
+/**
+ * Renders the links that for accessing things in the test suite.
+ *
+ * @return void
+ */
+	function _paintLinks() {
+		$show = $query = array();
+		if (!empty($this->params['group'])) {
+			$show['show'] = 'groups';
+		} elseif (!empty($this->params['case'])) {
+			$show['show'] = 'cases';
+		}
+
+		if (!empty($this->params['app'])) {
+			$show['app'] = $query['app'] = 'true';
+		}
+		if (!empty($this->params['plugin'])) {
+			$show['plugin'] = $query['plugin'] = $this->params['plugin'];
+		}
+		if (!empty($this->params['case'])) {
+			$query['case'] = $this->params['case'];
+ 		} elseif (!empty($this->params['group'])) {
+			$query['group'] = $this->params['group'];
+		}
+		$show = $this->_queryString($show);
+		$query = $this->_queryString($query);
+
+		echo "<p><a href='" . $this->baseUrl() . $show . "'>Run more tests</a> | <a href='" . $this->baseUrl() . $query . "&show_passes=1'>Show Passes</a> | \n";
+		echo " <a href='" . $this->baseUrl() . $query . "&amp;code_coverage=true'>Analyze Code Coverage</a></p>\n";
+	}
+
+/**
+ * Convert an array of parameters into a query string url
+ *
+ * @param array $url Url hash to be converted
+ * @return string Converted url query string
+ */
+	function _queryString($url) {
+		$out = '?';
+		$params = array();
+		foreach ($url as $key => $value) {
+			$params[] = "$key=$value";
+		}
+		$out .= implode('&amp;', $params);
+		return $out;
+	}
+
+/**
+ * Paints the end of the document html.
+ *
+ * @return void
+ */
+	function paintDocumentEnd() {
+		$baseDir = $this->params['baseDir'];
+		include CAKE_TESTS_LIB . 'templates' . DS . 'footer.php';
+		ob_end_flush();
+	}
+
+/**
+ * Paints the test failure with a breadcrumbs
+ * trail of the nesting test suites below the
+ * top level test.
+ *
+ * @param string $message Failure message displayed in
+ *   the context of the other tests.
+ * @return void
+ * @access public
+ */
+	function paintFail($message) {
+		parent::paintFail($message);
+		echo "<li class='fail'>\n";
+		echo "<span>Failed</span>";
+		echo "<div class='msg'>" . $this->_htmlEntities($message) . "</div>\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "<div>" . implode(" -&gt; ", $breadcrumb) . "</div>\n";
+		echo "</li>\n";
+	}
+
+/**
+ * Paints the test pass with a breadcrumbs
+ * trail of the nesting test suites below the
+ * top level test.
+ *
+ * @param string $message Pass message displayed in the context of the other tests.
+ * @return void
+ * @access public
+ */
+	function paintPass($message) {
+		parent::paintPass($message);
+
+		if (isset($this->params['show_passes']) && $this->params['show_passes']) {
+			echo "<li class='pass'>\n";
+			echo "<span>Passed</span> ";
+			$breadcrumb = $this->getTestList();
+			array_shift($breadcrumb);
+			echo implode(" -&gt; ", $breadcrumb);
+			echo "<br />" . $this->_htmlEntities($message) . "\n";
+			echo "</li>\n";
+		}
+	}
+
+/**
+ * Paints a PHP error.
+ *
+ * @param string $message Message is ignored.
+ * @return void
+ * @access public
+ */
+	function paintError($message) {
+		parent::paintError($message);
+		echo "<li class='error'>\n";
+		echo "<span>Error</span>";
+		echo "<div class='msg'>" . $this->_htmlEntities($message) . "</div>\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "<div>" . implode(" -&gt; ", $breadcrumb) . "</div>\n";
+		echo "</li>\n";
+	}
+
+/**
+ * Paints a PHP exception.
+ *
+ * @param Exception $exception Exception to display.
+ * @return void
+ * @access public
+ */
+	function paintException($exception) {
+		parent::paintException($exception);
+		echo "<li class='fail'>\n";
+		echo "<span>Exception</span>";
+		$message = 'Unexpected exception of type [' . get_class($exception) .
+			'] with message ['. $exception->getMessage() .
+			'] in ['. $exception->getFile() .
+			' line ' . $exception->getLine() . ']';
+		echo "<div class='msg'>" . $this->_htmlEntities($message) . "</div>\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "<div>" . implode(" -&gt; ", $breadcrumb) . "</div>\n";
+		echo "</li>\n";
+	}
+
+/**
+ * Prints the message for skipping tests.
+ *
+ * @param string $message Text of skip condition.
+ * @return void
+ * @access public
+ */
+	function paintSkip($message) {
+		parent::paintSkip($message);
+		echo "<li class='skipped'>\n";
+		echo "<span>Skipped</span> ";
+		echo $this->_htmlEntities($message);
+		echo "</li>\n";
+	}
+
+/**
+ * Paints formatted text such as dumped variables.
+ *
+ * @param string $message Text to show.
+ * @return void
+ * @access public
+ */
+	function paintFormattedMessage($message) {
+		echo '<pre>' . $this->_htmlEntities($message) . '</pre>';
+	}
+
+/**
+ * Character set adjusted entity conversion.
+ *
+ * @param string $message Plain text or Unicode message.
+ * @return string Browser readable message.
+ * @access protected
+ */
+	function _htmlEntities($message) {
+		return htmlentities($message, ENT_COMPAT, $this->_characterSet);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_text_reporter.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_text_reporter.php
new file mode 100644
index 000000000..9767fec8a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/reporter/cake_text_reporter.php
@@ -0,0 +1,198 @@
+<?php
+/**
+ * CakeTextReporter contains reporting features used for plain text based output
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.libs.reporter
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+include_once dirname(__FILE__) . DS . 'cake_base_reporter.php';
+
+/**
+ * CakeTextReporter contains reporting features used for plain text based output
+ *
+ * @package cake
+ * @subpackage cake.tests.lib
+ */
+class CakeTextReporter extends CakeBaseReporter {
+
+/**
+ * Sets the text/plain header if the test is not a CLI test.
+ *
+ * @return void
+ */
+	function paintDocumentStart() {
+		if (!SimpleReporter::inCli()) {
+			header('Content-type: text/plain');
+		}
+	}
+
+/**
+ * Paints the end of the test with a summary of
+ * the passes and failures.
+ *
+ * @param string $test_name Name class of test.
+ * @return void
+ * @access public
+ */
+	function paintFooter($test_name) {
+		if ($this->getFailCount() + $this->getExceptionCount() == 0) {
+			echo "OK\n";
+		} else {
+			echo "FAILURES!!!\n";
+		}
+		echo "Test cases run: " . $this->getTestCaseProgress() .
+				"/" . $this->getTestCaseCount() .
+				", Passes: " . $this->getPassCount() .
+				", Failures: " . $this->getFailCount() .
+				", Exceptions: " . $this->getExceptionCount() . "\n";
+
+		echo 'Time taken by tests (in seconds): ' . $this->_timeDuration . "\n";
+		if (function_exists('memory_get_peak_usage')) {
+			echo 'Peak memory use: (in bytes): ' . number_format(memory_get_peak_usage()) . "\n";
+		}
+		if (
+			isset($this->params['codeCoverage']) && 
+			$this->params['codeCoverage'] && 
+			class_exists('CodeCoverageManager')
+		) {
+			CodeCoverageManager::report();
+		}
+	}
+
+/**
+ * Paints the title only.
+ *
+ * @param string $test_name Name class of test.
+ * @return void
+ * @access public
+ */
+	function paintHeader($test_name) {
+		$this->paintDocumentStart();
+		echo "$test_name\n";
+		flush();
+	}
+
+/**
+ * Paints the test failure as a stack trace.
+ *
+ * @param string $message Failure message displayed in
+ *    the context of the other tests.
+ * @return void
+ * @access public
+ */
+	function paintFail($message) {
+		parent::paintFail($message);
+		echo $this->getFailCount() . ") $message\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+		echo "\n";
+	}
+
+/**
+ * Paints a PHP error.
+ *
+ * @param string $message Message to be shown.
+ * @return void
+ * @access public
+ */
+	function paintError($message) {
+		parent::paintError($message);
+		echo "Exception " . $this->getExceptionCount() . "!\n$message\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+		echo "\n";
+	}
+
+/**
+ * Paints a PHP exception.
+ *
+ * @param Exception $exception Exception to describe.
+ * @return void
+ * @access public
+ */
+	function paintException($exception) {
+		parent::paintException($exception);
+		$message = 'Unexpected exception of type [' . get_class($exception) .
+				'] with message ['. $exception->getMessage() .
+				'] in ['. $exception->getFile() .
+				' line ' . $exception->getLine() . ']';
+		echo "Exception " . $this->getExceptionCount() . "!\n$message\n";
+		$breadcrumb = $this->getTestList();
+		array_shift($breadcrumb);
+		echo "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+		echo "\n";
+	}
+
+/**
+ * Prints the message for skipping tests.
+ *
+ * @param string $message Text of skip condition.
+ * @return void
+ * @access public
+ */
+	function paintSkip($message) {
+		parent::paintSkip($message);
+		echo "Skip: $message\n";
+	}
+
+/**
+ * Paints formatted text such as dumped variables.
+ *
+ * @param string $message Text to show.
+ * @return void
+ * @access public
+ */
+	function paintFormattedMessage($message) {
+		echo "$message\n";
+		flush();
+	}
+
+/**
+ * Generate a test case list in plain text.
+ * Creates as series of url's for tests that can be run.
+ * One case per line.
+ *
+ * @return void
+ */
+	function testCaseList() {
+		$testCases = parent::testCaseList();
+		$app = $this->params['app'];
+		$plugin = $this->params['plugin'];
+
+		$buffer = "Core Test Cases:\n";
+		$urlExtra = '';
+		if ($app) {
+			$buffer = "App Test Cases:\n";
+			$urlExtra = '&app=true';
+		} elseif ($plugin) {
+			$buffer = Inflector::humanize($plugin) . " Test Cases:\n";
+			$urlExtra = '&plugin=' . $plugin;
+		}
+
+		if (1 > count($testCases)) {
+			$buffer .= "EMPTY";
+			echo $buffer;
+		}
+
+		foreach ($testCases as $testCaseFile => $testCase) {
+			$buffer .= $_SERVER['SERVER_NAME'] . $this->baseUrl() ."?case=" . $testCase . "&output=text"."\n";
+		}
+
+		$buffer .= "\n";
+		echo $buffer;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/footer.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/footer.php
new file mode 100644
index 000000000..63b5b058d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/footer.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>	</div>
+		</div>
+ 		<div id="footer">
+			<p>
+ 			<!--PLEASE USE ONE OF THE POWERED BY CAKEPHP LOGO-->
+ 			<a href="http://www.cakephp.org/" target="_blank">
+				<img src="<?php echo $baseDir; ?>img/cake.power.gif" alt="CakePHP(tm) :: Rapid Development Framework" /></a>
+			</p>
+ 		</div>
+		<?php
+			App::import('Core', 'View');
+			$null = null;
+			$View =& new View($null, false);
+			echo $View->element('sql_dump');
+		?>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/header.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/header.php
new file mode 100644
index 000000000..fb098d4e6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/header.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<title>CakePHP Test Suite 1.3</title>
+		<style type="text/css">
+			h3 {font-size: 170%; padding-top: 1em}
+			a {font-size: 120%}
+			li {line-height: 140%}
+			.test-menu {float:left; margin-right: 24px;}
+			.test-results {float:left; width: 67%;}
+			ul.tests {margin: 0; font-size:12px;}
+			ul.tests li {
+				list-style: none;
+				margin: 14px 0;
+				padding-left: 20px;
+			}
+			ul.tests li span {
+				font-size:14px;
+				text-transform: uppercase;
+				font-weight: bold;
+			}
+			ul.tests li.pass span, ul.tests li.skipped span { display:inline;}
+			ul.tests li.fail span { color: red; }
+			ul.tests li.pass span { color: green; }
+			ul.tests li.skipped span { color: navy; }
+			ul.tests li.error span { color : #d15d00; }
+
+			ul.tests li.pass,
+			ul.tests li.error,
+			ul.tests li.skipped,
+			ul.tests li.fail {
+				background: #fff2f2 url(http://cakephp.org/img/test-fail-icon.png) 5px 5px no-repeat;
+				border-top: 1px dotted red;
+				border-bottom: 1px dotted red;
+				padding:5px 10px 2px 25px;
+			}
+			ul.tests li.pass {
+				background-color: #f2fff2;
+				background-image: url(http://cakephp.org/img/test-pass-icon.png);
+				border-color:green;
+			}
+			ul.tests li.skipped {
+				background-color: #edf1ff;
+				background-image: url(http://cakephp.org/img/test-skip-icon.png);
+				border-color:navy;
+			}
+			ul.tests li.error {
+				background-color: #ffffe5;
+				background-image: url(http://cakephp.org/img/test-error-icon.png);
+				border-color: #DF6300;
+			}
+			ul.tests li div { margin: 5px 0 8px 0; }
+			ul.tests li div.msg { font-weight: bold; }
+			table caption { color:#fff; }
+
+			div.code-coverage-results div.code-line {
+				padding-left:5px;
+				display:block;
+				margin-left:10px;
+			}
+			div.code-coverage-results div.uncovered span.content { background:#ecc; }
+			div.code-coverage-results div.covered span.content { background:#cec; }
+			div.code-coverage-results div.ignored span.content { color:#aaa; }
+			div.code-coverage-results span.line-num {
+				color:#666;
+				display:block;
+				float:left;
+				width:20px;
+				text-align:right;
+				margin-right:5px;
+			}
+			div.code-coverage-results span.line-num strong { color:#666; }
+			div.code-coverage-results div.start {
+				border:1px solid #aaa;
+				border-width:1px 1px 0px 1px;
+				margin-top:30px;
+				padding-top:5px;
+			}
+			div.code-coverage-results div.end {
+				border:1px solid #aaa;
+				border-width:0px 1px 1px 1px;
+				margin-bottom:30px;
+				padding-bottom:5px;
+			}
+			div.code-coverage-results div.realstart { margin-top:0px; }
+			div.code-coverage-results p.note {
+				color:#bbb;
+				padding:5px;
+				margin:5px 0 10px;
+				font-size:10px;
+			}
+			div.code-coverage-results span.result-bad { color: #a00; }
+			div.code-coverage-results span.result-ok { color: #fa0; }
+			div.code-coverage-results span.result-good { color: #0a0; }
+		</style>
+		<link rel="stylesheet" type="text/css" href="<?php echo $baseDir; ?>css/cake.generic.css" />
+	</head>
+	<body>
+		<div id="container">
+			<div id="header">
+				<h1>CakePHP: the rapid development php framework</h1>
+			</div>
+			<div id="content">
+			<h2>CakePHP Test Suite 1.3</h2>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/menu.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/menu.php
new file mode 100644
index 000000000..c678e496d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/menu.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+<div class="test-menu">
+<ul>
+	<li>
+		<span style="font-size: 18px">App</span>
+		<ul>
+			<li><a href='<?php echo $groups;?>&amp;app=true'>Test Groups</a></li>
+			<li><a href='<?php echo $cases;?>&amp;app=true'>Test Cases</a></li>
+		</ul>
+	</li>
+<?php
+if (!empty($plugins)):
+?>
+	<li style="padding-top: 10px">
+		<span style="font-size: 18px">Plugins</span>
+	<?php foreach($plugins as $plugin):
+			$pluginPath = Inflector::underscore($plugin);
+	?>
+			<ul>
+				<li style="padding-top: 10px">
+					<span  style="font-size: 18px"><?php echo $plugin;?></span>
+					<ul>
+						<li><a href='<?php echo $groups;?>&amp;plugin=<?php echo $pluginPath; ?>'>Test Groups</a></li>
+						<li><a href='<?php echo $cases;?>&amp;plugin=<?php echo $pluginPath; ?>'>Test Cases</a></li>
+					</ul>
+				</li>
+			</ul>
+	<?php endforeach; ?>
+<?php endif;?>
+	<li style="padding-top: 10px">
+		<span style="font-size: 18px">Core</span>
+		<ul>
+			<li><a href='<?php echo $groups;?>'>Test Groups</a></li>
+			<li><a href='<?php echo $cases;?>'>Test Cases</a></li>
+		</ul>
+	</li>
+</ul>
+</div>
+<div  class="test-results">
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/simpletest.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/simpletest.php
new file mode 100644
index 000000000..65231599c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/simpletest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Missing SimpleTest error page.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+<?php include dirname(__FILE__) . DS . 'header.php'; ?>
+<div id="content">
+	<h2>SimpleTest is not installed</h2>
+	<p>You must install SimpleTest to use the CakePHP(tm) Test Suite.</p>
+	<p>SimpleTest can be placed in one of the following directories.</p>
+	<ul>
+		<li><?php echo CAKE; ?>vendors </li>
+		<li><?php echo APP_DIR . DS; ?>vendors</li>
+	</ul>
+	<p><a href="http://simpletest.org/en/download.html" target="_blank">Download SimpleTest</a></p>
+</div>
+<?php include dirname(__FILE__) . DS . 'footer.php'; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/xdebug.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/xdebug.php
new file mode 100644
index 000000000..abed00432
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/templates/xdebug.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Xdebug error page
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.libs
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+<?php include dirname(__FILE__) . DS . 'header.php'; ?>
+<div id="content">
+	<h2>Xdebug is not installed</h2>
+	<p>You must install Xdebug to use the CakePHP(tm) Code Coverage Analyzation.</p>
+	<p><a href="http://www.xdebug.org/docs/install" target="_blank">Learn How To Install Xdebug</a></p>
+</div>
+<?php include dirname(__FILE__) . DS . 'footer.php'; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/lib/test_manager.php b/code/ryzom/tools/server/www/webtt/cake/tests/lib/test_manager.php
new file mode 100644
index 000000000..3aff52023
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/lib/test_manager.php
@@ -0,0 +1,421 @@
+<?php
+/**
+ * TestManager for CakePHP Test suite.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ * @since         CakePHP(tm) v 1.2.0.4433
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+define('CORE_TEST_CASES', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'cases');
+define('CORE_TEST_GROUPS', TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'groups');
+define('APP_TEST_CASES', TESTS . 'cases');
+define('APP_TEST_GROUPS', TESTS . 'groups');
+
+/**
+ * TestManager is the base class that handles loading and initiating the running
+ * of TestCase and TestSuite classes that the user has selected.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.tests.lib
+ */
+class TestManager {
+/**
+ * Extension suffix for test case files.
+ *
+ * @var string
+ */
+	var $_testExtension = '.test.php';
+
+/**
+ * Extension suffix for group test case files.
+ *
+ * @var string
+ */
+	var $_groupExtension = '.group.php';
+
+/**
+ * Is this test an AppTest?
+ *
+ * @var boolean
+ */
+	var $appTest = false;
+
+/**
+ * Is this test a plugin test?
+ *
+ * @var mixed boolean false or string name of the plugin being used.
+ */
+	var $pluginTest = false;
+
+/**
+ * Constructor for the TestManager class
+ *
+ * @return void
+ * @access public
+ */
+	function TestManager() {
+		$this->_installSimpleTest();
+		if (isset($_GET['app'])) {
+			$this->appTest = true;
+		}
+		if (isset($_GET['plugin'])) {
+			$this->pluginTest = htmlentities($_GET['plugin']);
+		}
+	}
+
+/**
+ * Includes the required simpletest files in order for the testsuite to run
+ *
+ * @return void
+ * @access public
+ */
+	function _installSimpleTest() {
+		App::import('Vendor', array(
+			'simpletest' . DS . 'unit_tester',
+			'simpletest' . DS . 'mock_objects',
+			'simpletest' . DS . 'web_tester'
+		));
+		require_once(CAKE_TESTS_LIB . 'cake_web_test_case.php');
+		require_once(CAKE_TESTS_LIB . 'cake_test_case.php');
+	}
+
+/**
+ * Runs all tests in the Application depending on the current appTest setting
+ *
+ * @param Object $reporter Reporter object for the tests being run.
+ * @param boolean $testing Are tests supposed to be auto run.  Set to true to return testcase list.
+ * @return mixed
+ * @access public
+ */
+	function runAllTests(&$reporter, $testing = false) {
+		$testCases =& $this->_getTestFileList($this->_getTestsPath());
+		if ($this->appTest) {
+			$test =& new TestSuite(__('All App Tests', true));
+		} else if ($this->pluginTest) {
+			$test =& new TestSuite(sprintf(__('All %s Plugin Tests', true), Inflector::humanize($this->pluginTest)));
+		} else {
+			$test =& new TestSuite(__('All Core Tests', true));
+		}
+
+		if ($testing) {
+			return $testCases;
+		}
+
+		foreach ($testCases as $testCase) {
+			$test->addTestFile($testCase);
+		}
+
+		return $test->run($reporter);
+	}
+
+/**
+ * Runs a specific test case file
+ *
+ * @param string $testCaseFile Filename of the test to be run.
+ * @param Object $reporter Reporter instance to attach to the test case.
+ * @param boolean $testing Set to true if testing, otherwise test case will be run.
+ * @return mixed Result of test case being run.
+ * @access public
+ */
+	function runTestCase($testCaseFile, &$reporter, $testing = false) {
+		$testCaseFileWithPath = $this->_getTestsPath() . DS . $testCaseFile;
+
+		if (!file_exists($testCaseFileWithPath) || strpos($testCaseFileWithPath, '..')) {
+			trigger_error(
+				sprintf(__("Test case %s cannot be found", true), htmlentities($testCaseFile)),
+				E_USER_ERROR
+			);
+			return false;
+		}
+
+		if ($testing) {
+			return true;
+		}
+
+		$test =& new TestSuite(sprintf(__('Individual test case: %s', true), $testCaseFile));
+		$test->addTestFile($testCaseFileWithPath);
+		return $test->run($reporter);
+	}
+
+/**
+ * Runs a specific group test file
+ *
+ * @param string $groupTestName GroupTest that you want to run.
+ * @param Object $reporter Reporter instance to use with the group test being run.
+ * @return mixed Results of group test being run.
+ * @access public
+ */
+	function runGroupTest($groupTestName, &$reporter) {
+		$filePath = $this->_getTestsPath('groups') . DS . strtolower($groupTestName) . $this->_groupExtension;
+
+		if (!file_exists($filePath) || strpos($filePath, '..')) {
+			trigger_error(sprintf(
+					__("Group test %s cannot be found at %s", true), 
+					htmlentities($groupTestName), 
+					htmlentities($filePath)
+				),
+				E_USER_ERROR
+			);
+		}
+
+		require_once $filePath;
+		$test =& new TestSuite(sprintf(__('%s group test', true), $groupTestName));
+		foreach ($this->_getGroupTestClassNames($filePath) as $groupTest) {
+			$testCase = new $groupTest();
+			$test->addTestCase($testCase);
+			if (isset($testCase->label)) {
+				$test->_label = $testCase->label;
+			}
+		}
+		return $test->run($reporter);
+	}
+
+/**
+ * Adds all testcases in a given directory to a given GroupTest object
+ *
+ * @param object $groupTest Instance of TestSuite/GroupTest that files are to be added to.
+ * @param string $directory The directory to add tests from.
+ * @return void
+ * @access public
+ * @static
+ */
+	function addTestCasesFromDirectory(&$groupTest, $directory = '.') {
+		$manager =& new TestManager();
+		$testCases =& $manager->_getTestFileList($directory);
+		foreach ($testCases as $testCase) {
+			$groupTest->addTestFile($testCase);
+		}
+	}
+
+/**
+ * Adds a specific test file and thereby all of its test cases and group tests to a given group test file
+ *
+ * @param object $groupTest Instance of TestSuite/GroupTest that a file should be added to.
+ * @param string $file The file name, minus the suffix to add.
+ * @return void
+ * @access public
+ * @static
+ */
+	function addTestFile(&$groupTest, $file) {
+		$manager =& new TestManager();
+
+		if (file_exists($file . $manager->_testExtension)) {
+			$file .= $manager->_testExtension;
+		} elseif (file_exists($file . $manager->_groupExtension)) {
+			$file .= $manager->_groupExtension;
+		}
+		$groupTest->addTestFile($file);
+	}
+
+/**
+ * Returns a list of test cases found in the current valid test case path
+ *
+ * @access public
+ * @static
+ */
+	function &getTestCaseList() {
+		$manager =& new TestManager();
+		$return = $manager->_getTestCaseList($manager->_getTestsPath());
+		return $return;
+	}
+
+/**
+ * Builds the list of test cases from a given directory
+ *
+ * @param string $directory Directory to get test case list from.
+ * @access protected
+ */
+	function &_getTestCaseList($directory = '.') {
+		$fileList =& $this->_getTestFileList($directory);
+		$testCases = array();
+		foreach ($fileList as $testCaseFile) {
+			$testCases[$testCaseFile] = str_replace($directory . DS, '', $testCaseFile);
+		}
+		return $testCases;
+	}
+
+/**
+ * Returns a list of test files from a given directory
+ *
+ * @param string $directory Directory to get test case files from.
+ * @access protected
+ */
+	function &_getTestFileList($directory = '.') {
+		$return = $this->_getRecursiveFileList($directory, array(&$this, '_isTestCaseFile'));
+		return $return;
+	}
+
+/**
+ * Returns a list of group tests found in the current valid test case path
+ *
+ * @access public
+ * @static
+ */
+	function &getGroupTestList() {
+		$manager =& new TestManager();
+		$return = $manager->_getTestGroupList($manager->_getTestsPath('groups'));
+		return $return;
+	}
+
+/**
+ * Returns a list of group test files from a given directory
+ *
+ * @param string $directory The directory to get group test files from.
+ * @access protected
+ */
+	function &_getTestGroupFileList($directory = '.') {
+		$return = $this->_getRecursiveFileList($directory, array(&$this, '_isTestGroupFile'));
+		return $return;
+	}
+
+/**
+ * Returns a list of group test files from a given directory
+ *
+ * @param string $directory The directory to get group tests from.
+ * @access protected
+ */
+	function &_getTestGroupList($directory = '.') {
+		$fileList =& $this->_getTestGroupFileList($directory);
+		$groupTests = array();
+
+		foreach ($fileList as $groupTestFile) {
+			$groupTests[$groupTestFile] = str_replace($this->_groupExtension, '', basename($groupTestFile));
+		}
+		sort($groupTests);
+		return $groupTests;
+	}
+
+/**
+ * Returns a list of class names from a group test file
+ *
+ * @param string $groupTestFile The groupTest file to scan for TestSuite classnames.
+ * @access protected
+ */
+	function &_getGroupTestClassNames($groupTestFile) {
+		$file = implode("\n", file($groupTestFile));
+		preg_match("~lass\s+?(.*)\s+?extends TestSuite~", $file, $matches);
+		if (!empty($matches)) {
+			unset($matches[0]);
+			return $matches;
+		}
+		$matches = array();
+		return $matches;
+	}
+
+/**
+ * Gets a recursive list of files from a given directory and matches then against
+ * a given fileTestFunction, like isTestCaseFile()
+ *
+ * @param string $directory The directory to scan for files.
+ * @param mixed $fileTestFunction
+ * @access protected
+ */
+	function &_getRecursiveFileList($directory = '.', $fileTestFunction) {
+		$fileList = array();
+		if (!is_dir($directory)) {
+			return $fileList;
+		}
+
+		$files = glob($directory . DS . '*');
+		$files = $files ? $files : array();
+
+		foreach ($files as $file) {
+			if (is_dir($file)) {
+				$fileList = array_merge($fileList, $this->_getRecursiveFileList($file, $fileTestFunction));
+			} elseif ($fileTestFunction[0]->$fileTestFunction[1]($file)) {
+				$fileList[] = $file;
+			}
+		}
+		return $fileList;
+	}
+
+/**
+ * Tests if a file has the correct test case extension
+ *
+ * @param string $file
+ * @return boolean Whether $file is a test case.
+ * @access protected
+ */
+	function _isTestCaseFile($file) {
+		return $this->_hasExpectedExtension($file, $this->_testExtension);
+	}
+
+/**
+ * Tests if a file has the correct group test extension
+ *
+ * @param string $file
+ * @return boolean Whether $file is a group
+ * @access protected
+ */
+	function _isTestGroupFile($file) {
+		return $this->_hasExpectedExtension($file, $this->_groupExtension);
+	}
+
+/**
+ * Check if a file has a specific extension
+ *
+ * @param string $file
+ * @param string $extension
+ * @return void
+ * @access protected
+ */
+	function _hasExpectedExtension($file, $extension) {
+		return $extension == strtolower(substr($file, (0 - strlen($extension))));
+	}
+
+/**
+ * Returns the given path to the test files depending on a given type of tests (cases, group, ..)
+ *
+ * @param string $type either 'cases' or 'groups'
+ * @return string The path tests are located on
+ * @access protected
+ */
+	function _getTestsPath($type = 'cases') {
+		if (!empty($this->appTest)) {
+			if ($type == 'cases') {
+				$result = APP_TEST_CASES;
+			} else if ($type == 'groups') {
+				$result = APP_TEST_GROUPS;
+			}
+		} else if (!empty($this->pluginTest)) {
+			$_pluginBasePath = APP . 'plugins' . DS . $this->pluginTest . DS . 'tests';
+			$pluginPath = App::pluginPath($this->pluginTest);
+			if (file_exists($pluginPath . DS . 'tests')) {
+				$_pluginBasePath = $pluginPath . DS . 'tests';
+			}
+			$result = $_pluginBasePath . DS . $type;
+		} else {
+			if ($type == 'cases') {
+				$result = CORE_TEST_CASES;
+			} else if ($type == 'groups') {
+				$result = CORE_TEST_GROUPS;
+			}
+		}
+		return $result;
+	}
+
+/**
+ * Get the extension for either 'group' or 'test' types.
+ *
+ * @param string $type Type of test to get, either 'test' or 'group'
+ * @return string Extension suffix for test.
+ * @access public
+ */
+	function getExtension($type = 'test') {
+		if ($type == 'test' || $type == 'case') {
+			return $this->_testExtension;
+		}
+		return $this->_groupExtension;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/config/acl.ini.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/config/acl.ini.php
new file mode 100644
index 000000000..11040584d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/config/acl.ini.php
@@ -0,0 +1,61 @@
+;<?php exit() ?>
+; SVN FILE: $Id$
+;/**
+; * Test App Ini Based Acl Config File
+; *
+; *
+; * PHP versions 4 and 5
+; *
+; * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+; * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; *
+; *  Licensed under The MIT License
+; *  Redistributions of files must retain the above copyright notice.
+; *
+; * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+; * @link          http://cakephp.org CakePHP(tm) Project
+; * @package       cake
+; * @subpackage    cake.app.config
+; * @since         CakePHP(tm) v 0.10.0.1076
+; * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+; */
+
+;-------------------------------------
+;Users
+;-------------------------------------
+
+[admin]
+groups = administrators
+allow =
+deny = ads
+
+[paul]
+groups = users
+allow =
+deny =
+
+[jenny]
+groups = users
+allow = ads
+deny = images, files
+
+[nobody]
+groups = anonymous
+allow =
+deny =
+
+;-------------------------------------
+;Groups
+;-------------------------------------
+
+[administrators]
+deny =
+allow = posts, comments, images, files, stats, ads
+
+[users]
+allow = posts, comments, images, files
+deny = stats, ads
+
+[anonymous]
+allow =
+deny = posts, comments, images, files, stats, ads
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/components/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/components/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_controller.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_controller.php
new file mode 100644
index 000000000..c5e240db6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_controller.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestsAppsController extends AppController {
+	var $name = 'TestsApps';
+	var $uses = array();
+
+	function index() {
+	}
+
+	function some_method() {
+		return 5;
+	}
+
+	function set_action() {
+		$this->set('var', 'string');
+		$this->render('index');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php
new file mode 100644
index 000000000..b0fbecbb1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/controllers/tests_apps_posts_controller.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestsAppsPostsController extends AppController {
+	var $name = 'TestsAppsPosts';
+	var $uses = array('Post');
+	var $viewPath = 'tests_apps';
+
+	function add() {
+		$data = array(
+			'Post' => array(
+				'title' => 'Test article',
+				'body' => 'Body of article.',
+				'author_id' => 1
+			)
+		);
+		$this->Post->save($data);
+
+		$this->set('posts', $this->Post->find('all'));
+		$this->render('index');
+	}
+
+/**
+ * check url params
+ *
+ */
+	function url_var() {
+		$this->set('params', $this->params);
+		$this->render('index');
+	}
+
+/**
+ * post var testing
+ *
+ */
+	function post_var() {
+		$this->set('data', $this->data);
+		$this->render('index');
+	}
+
+/**
+ * Fixturized action for testAction()
+ *
+ */
+	function fixtured() {
+		$this->set('posts', $this->Post->find('all'));
+		$this->render('index');
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/cache/test_app_cache.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/cache/test_app_cache.php
new file mode 100644
index 000000000..a26f8116b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/cache/test_app_cache.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Test Suite Test App Cache Engine class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestAppCacheEngine extends CacheEngine {
+	
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/library.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/library.php
new file mode 100644
index 000000000..1a1c96c4a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/library.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Test Suite Library
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class Library {}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/log/test_app_log.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/log/test_app_log.php
new file mode 100644
index 000000000..59c4b52a0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/libs/log/test_app_log.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Test Suite Test App Logging stream class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestAppLog {
+
+	function write($type, $message) {
+		
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..426b6f055
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/default.po
@@ -0,0 +1,5 @@
+msgid "default.foo"
+msgstr "Default Foo"
+
+msgid "default.bar"
+msgstr "Default Bar"
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
new file mode 100644
index 000000000..86fbb7f19
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom1.po
@@ -0,0 +1,8 @@
+msgid ""
+msgstr "Test Domain 1"
+
+msgid "dom1.foo"
+msgstr "Dom 1 Foo"
+
+msgid "dom1.bar"
+msgstr "Dom 1 Bar"
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
new file mode 100644
index 000000000..40c017c93
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/cache_test_po/LC_MESSAGES/dom2.po
@@ -0,0 +1,8 @@
+msgid ""
+msgstr "Test Domain"
+
+msgid "dom2.foo"
+msgstr "Dom 2 Foo"
+
+msgid "dom2.bar"
+msgstr "Dom 2 Bar"
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME
new file mode 100644
index 000000000..2f1efb868
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/ja_jp/LC_TIME
@@ -0,0 +1,48 @@
+escape_char	/
+comment_char %
+abday	"<U65E5>";"<U6708>";"<U706B>";"<U6C34>";"<U6728>";"<U91D1>";"<U571F>"
+
+day	"<U65E5><U66DC><U65E5>";"<U6708><U66DC><U65E5>";/
+	"<U706B><U66DC><U65E5>";"<U6C34><U66DC><U65E5>";/
+	"<U6728><U66DC><U65E5>";"<U91D1><U66DC><U65E5>";/
+	"<U571F><U66DC><U65E5>"
+
+week    7;19971130;7
+first_weekday	1
+first_workday	2
+abmon	"<U0020><U0031><U6708>";"<U0020><U0032><U6708>";/
+	"<U0020><U0033><U6708>";"<U0020><U0034><U6708>";/
+	"<U0020><U0035><U6708>";"<U0020><U0036><U6708>";/
+	"<U0020><U0037><U6708>";"<U0020><U0038><U6708>";/
+	"<U0020><U0039><U6708>";"<U0031><U0030><U6708>";/
+	"<U0031><U0031><U6708>";"<U0031><U0032><U6708>"
+mon	"<U0031><U6708>";"<U0032><U6708>";/
+	"<U0033><U6708>";"<U0034><U6708>";/
+	"<U0035><U6708>";"<U0036><U6708>";/
+	"<U0037><U6708>";"<U0038><U6708>";/
+	"<U0039><U6708>";"<U0031><U0030><U6708>";/
+	"<U0031><U0031><U6708>";"<U0031><U0032><U6708>"
+% Appropriate date and time representation (%c)
+%	
+d_t_fmt	"<U0025><U0059><U5E74><U0025><U006D><U6708><U0025><U0064><U65E5><U0020><U0025><U0048><U6642><U0025><U004D><U5206><U0025><U0053><U79D2>"
+%
+% Appropriate date representation (%x)
+%	"%Y年%m月%d日"
+d_fmt	"<U0025><U0059><U5E74><U0025><U006D><U6708><U0025><U0064><U65E5>"
+%
+% Appropriate time representation (%X)
+%	
+t_fmt	"<U0025><U0048><U6642><U0025><U004D><U5206><U0025><U0053><U79D2>"
+%
+% Appropriate AM/PM time representation (%r)
+%	
+t_fmt_ampm "<U0025><U0070><U0025><U0049><U6642><U0025><U004D><U5206><U0025><U0053><U79D2>"
+%
+% Strings for AM/PM
+%
+am_pm	"<U5348><U524D>";"<U5348><U5F8C>"
+%
+% Appropriate date representation (date(1))   
+date_fmt	"<U0025><U0059><U5E74><U0020><U0025><U0062><U0020><U0025>/
+<U0065><U65E5><U0020><U0025><U0041><U0020><U0025><U0048><U003A><U0025>/
+<U004D><U003A><U0025><U0053><U0020><U0025><U005A>"
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..2fcbdbac2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MESSAGES/default.po
@@ -0,0 +1,76 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+msgid ""
+msgstr "header"
+
+msgid "Plural Rule 1"
+msgstr "Po (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 1 (po translated)"
+msgstr[1] "%d is 2-4 (po translated)"
+msgstr[2] "%d everything else (po translated)"
+
+msgid "This is a multiline translation\n"
+"broken up over multiple lines.\n"
+"This is the third line.\n"
+"This is the forth line."
+msgstr  "This is a multiline translation\n"
+"broken up over multiple lines.\n"
+"This is the third line.\n"
+"This is the forth line. (translated)"
+
+msgid "No Translation needed"
+msgstr ""
+
+msgid "test"
+msgid_plural "tests"
+msgstr[0] "test translated"
+msgstr[1] "test translated"
+msgstr[2] ""
+msgstr[3] ""
+
+msgid "valid\n"
+"second line"
+msgid_plural "valids\n"
+"second line"
+msgstr[0] "v\n"
+"second line"
+msgstr[1] "vs\n"
+"second line"
+
+msgid "%d = 1\n"
+"This is a multiline translation\n"
+"broken up over multiple lines.\n"
+"This is the third line.\n"
+"This is the forth line."
+msgid_plural "%d = 0 or > 1\n"
+"This is a multiline translation\n"
+"broken up over multiple lines.\n"
+"This is the third line.\n"
+"This is the forth line."
+msgstr[0] "%d is 1\n"
+"This is a multiline translation\n"
+"broken up over multiple lines.\n"
+"This is the third line.\n"
+"This is the forth line."
+msgstr[1] "%d is 2-4\n"
+"This is a multiline translation\n"
+"broken up over multiple lines.\n"
+"This is the third line.\n"
+"This is the forth line."
+
+msgid "this is a \"quoted string\""
+msgstr "this is a \"quoted string\" (translated)"
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po
new file mode 100644
index 000000000..e2a3c3a05
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_MONETARY/default.po
@@ -0,0 +1,18 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+msgid ""
+msgstr "header"
+
+msgid "Plural Rule 1"
+msgstr "Monetary Po (translated)"
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_TIME b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_TIME
new file mode 100644
index 000000000..fe9f56629
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/po/LC_TIME
@@ -0,0 +1,60 @@
+escape_char	/
+comment_char %
+abday	"<U0053><U0075><U006E>";"<U004D><U006F><U006E>";/
+	"<U0054><U0075><U0065>";"<U0057><U0065><U0064>";/
+	"<U0054><U0068><U0075>";"<U0046><U0072><U0069>";/
+	"<U0053><U0061><U0074>"
+day	"<U0053><U0075><U006E><U0064><U0061><U0079>";/
+	"<U004D><U006F><U006E><U0064><U0061><U0079>";/
+	"<U0054><U0075><U0065><U0073><U0064><U0061><U0079>";/
+	"<U0057><U0065><U0064><U006E><U0065><U0073><U0064><U0061><U0079>";/
+	"<U0054><U0068><U0075><U0072><U0073><U0064><U0061><U0079>";/
+	"<U0046><U0072><U0069><U0064><U0061><U0079>";/
+	"<U0053><U0061><U0074><U0075><U0072><U0064><U0061><U0079>"
+
+week    7;19971130;7
+first_weekday	1
+first_workday	2
+abmon	"<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
+	"<U004D><U0061><U0072>";"<U0041><U0070><U0072>";/
+	"<U004D><U0061><U0079>";"<U004A><U0075><U006E>";/
+	"<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
+	"<U0053><U0065><U0070>";"<U004F><U0063><U0074>";/
+	"<U004E><U006F><U0076>";"<U0044><U0065><U0063>"
+mon	"<U004A><U0061><U006E><U0075><U0061><U0072><U0079>";/
+	"<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0079>";/
+	"<U004D><U0061><U0072><U0063><U0068>";/
+	"<U0041><U0070><U0072><U0069><U006C>";/
+	"<U004D><U0061><U0079>";/
+	"<U004A><U0075><U006E><U0065>";/
+	"<U004A><U0075><U006C><U0079>";/
+	"<U0041><U0075><U0067><U0075><U0073><U0074>";/
+	"<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0065><U0072>";/
+	"<U004F><U0063><U0074><U006F><U0062><U0065><U0072>";/
+	"<U004E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
+	"<U0044><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
+% Appropriate date and time representation (%c)
+%	"%a %d %b %Y %r %Z"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
+%
+% Appropriate date representation (%x)
+%	"%m/%d/%Y"
+d_fmt   "<U0025><U006D><U002F><U0025><U0064><U002F><U0025><U0059>"
+%
+% Appropriate time representation (%X)
+%	"%r"
+t_fmt   "<U0025><U0072>"
+%
+% Appropriate AM/PM time representation (%r)
+%	"%I:%M:%S %p"
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U0070>"
+%
+% Strings for AM/PM
+%
+am_pm	"<U0041><U004D>";"<U0050><U004D>"
+%
+% Appropriate date representation (date(1))   "%a %b %e %H:%M:%S %Z %Y"
+date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..b82a5eaff
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..356da7174
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..f8aeb734a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/core.po
@@ -0,0 +1,21 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Single Form Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 0 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d ends with any # (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..a790a8f2e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_0_po/LC_MESSAGES/default.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Poedit-Language: Single Form Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 0 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d ends with any # (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 0"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..ae0822e2b
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..1a722b81b
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..9e6946499
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/core.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
+"X-Poedit-Language: Four Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 10 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d ends in 1 (from core translated)"
+msgstr[1] "%d ends in 2 (from core translated)"
+msgstr[2] "%d ends in 03-04 (from core translated)"
+msgstr[3] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..f59b901e1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_10_po/LC_MESSAGES/default.po
@@ -0,0 +1,27 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3;\n"
+"X-Poedit-Language: Four Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 10 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d ends in 1 (translated)"
+msgstr[1] "%d ends in 2 (translated)"
+msgstr[2] "%d ends in 03-04 (translated)"
+msgstr[3] "%d everything else (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..6fb6c7df4
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..181a67f76
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..7fa6e8f33
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/core.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4;\n"
+"X-Poedit-Language: Five Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 11 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d is 1 (from core translated)"
+msgstr[1] "%d is 2 (from core translated)"
+msgstr[2] "%d is 3-6 (from core translated)"
+msgstr[3] "%d is 7-10 (from core translated)"
+msgstr[4] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..bd2c38b9a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_11_po/LC_MESSAGES/default.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=6 ? 2 : n>=7 && n<=10 ? 3 : 4;\n"
+"X-Poedit-Language: Five Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 11 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 1 (translated)"
+msgstr[1] "%d is 2 (translated)"
+msgstr[2] "%d is 3-6 (translated)"
+msgstr[3] "%d is 7-10 (translated)"
+msgstr[4] "%d everything else (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..b6b9133ad
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..0edb5a9c3
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..54f7e1889
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/core.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n==0 || (n>=3 && n<=10) ? 2 : 3;\n"
+"X-Poedit-Language: Four Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 12 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d is 1 (from core translated)"
+msgstr[1] "%d is 2 (from core translated)"
+msgstr[2] "%d is 0 or 3-10 (from core translated)"
+msgstr[3] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..ad49ef81c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_12_po/LC_MESSAGES/default.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n==0 || (n>=3 && n<=10) ? 2 : 3;\n"
+"X-Poedit-Language: Four Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 12 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 1 (translated)"
+msgstr[1] "%d is 2 (translated)"
+msgstr[2] "%d is 0 or 3-10 (translated)"
+msgstr[3] "%d everything else (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..162034a6b
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..65225e769
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..fde299591
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/core.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==0 || (n%100>=1 && n%100<=10) ? 1 : n%100>=11 && n%100<=20 ? 2 : 3;\n"
+"X-Poedit-Language: Four Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 13 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d is 1 (from core translated)"
+msgstr[1] "%d is 0 or ends in 01-10 (from core translated)"
+msgstr[2] "%d ends in 11-20 (from core translated)"
+msgstr[3] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..ceb723f78
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_13_po/LC_MESSAGES/default.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==0 || (n%100>=1 && n%100<=10) ? 1 : n%100>=11 && n%100<=20 ? 2 : 3;\n"
+"X-Poedit-Language: Four Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 13 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 1 (translated)"
+msgstr[1] "%d is 0 or ends in 01-10 (translated)"
+msgstr[2] "%d ends in 11-20 (translated)"
+msgstr[3] "%d everything else (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..37f32aa21
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..35ce08931
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..fd23d236e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 ? 0 : n%10==2 ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 14 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d ends in 1 (from core translated)"
+msgstr[1] "%d ends in 2 (from core translated)"
+msgstr[2] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..deea59f22
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_14_po/LC_MESSAGES/default.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-10-09 19:20-0300\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Renan Gonçalves <renan.saddam@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 ? 0 : n%10==2 ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 14 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d ends in 1 (translated)"
+msgstr[1] "%d ends in 2 (translated)"
+msgstr[2] "%d everything else (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..4084818ee
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..19b7f5b5a
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..5c5aaa96f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/core.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 1 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d = 1 (from core translated)"
+msgstr[1] "%d = 0 or > 1 (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..6667c960c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_1_po/LC_MESSAGES/default.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 1 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d = 1 (translated)"
+msgstr[1] "%d = 0 or > 1 (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..fa0e4e61a
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..b5f1af71b
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..a9cb17c3d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/core.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 2 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d = 0 or 1 (from core translated)"
+msgstr[1] "%d > 1 (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..24d5c6e95
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_2_po/LC_MESSAGES/default.po
@@ -0,0 +1,25 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 2 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d = 0 or 1 (translated)"
+msgstr[1] "%d > 1 (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..05c300a66
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..9c7296491
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..38621d04c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 3 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d ends 1 but not 11 (from core translated)"
+msgstr[1] "%d everything else (from core translated)"
+msgstr[2] "%d = 0 (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..81d98d46e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_3_po/LC_MESSAGES/default.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 3 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d ends 1 but not 11 (translated)"
+msgstr[1] "%d everything else (translated)"
+msgstr[2] "%d = 0 (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..d3faf1c17
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..a75262024
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..17124c247
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 4 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d = 1 (from core translated)"
+msgstr[1] "%d = 2 (from core translated)"
+msgstr[2] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..87cdbb69b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_4_po/LC_MESSAGES/default.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 4 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d = 1 (translated)"
+msgstr[1] "%d = 2 (translated)"
+msgstr[2] "%d everything else (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..835de9c24
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..ab2d1cc31
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..dccbeaeb2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 5 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d = 1 (from core translated)"
+msgstr[1] "%d = 0 or ends in 01-19 (from core translated)"
+msgstr[2] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..b6dd7ecd2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_5_po/LC_MESSAGES/default.po
@@ -0,0 +1,24 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 5 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d = 1 (translated)"
+msgstr[1] "%d = 0 or ends in 01-19 (translated)"
+msgstr[2] "%d everything else (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..698ae1d8a
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..461786106
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..6fa429f58
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 6 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d ends in 1, not 11 (from core translated)"
+msgstr[1] "%d everything else (from core translated)"
+msgstr[2] "%d ends in 0 or ends in 10-20 (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..b294c005a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_6_po/LC_MESSAGES/default.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 6 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d ends in 1, not 11 (translated)"
+msgstr[1] "%d everything else (translated)"
+msgstr[2] "%d ends in 0 or ends in 10-20 (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..767a751b6
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..9964362e8
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..9426b75c7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 7 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d ends in 1, not 11 (from core translated)"
+msgstr[1] "%d ends in 2-4, not 12-14 (from core translated)"
+msgstr[2] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..c0e041785
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_7_po/LC_MESSAGES/default.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 7 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d ends in 1, not 11 (translated)"
+msgstr[1] "%d ends in 2-4, not 12-14 (translated)"
+msgstr[2] "%d everything else (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..98ffe96aa
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..6e882647e
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..de69ddee6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 8 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d is 1 (from core translated)"
+msgstr[1] "%d is 2-4 (from core translated)"
+msgstr[2] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..bfbe2f618
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_8_po/LC_MESSAGES/default.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 8 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 1 (translated)"
+msgstr[1] "%d is 2-4 (translated)"
+msgstr[2] "%d everything else (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo
new file mode 100644
index 000000000..d9e1f47ef
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/core.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo
new file mode 100644
index 000000000..fc1f36cc4
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_mo/LC_MESSAGES/default.mo differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
new file mode 100644
index 000000000..aa2c93cb8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/core.po
@@ -0,0 +1,23 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1 (from core)"
+msgstr "Plural Rule 9 (from core translated)"
+
+msgid "%d = 1 (from core)"
+msgid_plural "%d = 0 or > 1 (from core)"
+msgstr[0] "%d is 1 (from core translated)"
+msgstr[1] "%d ends in 2-4, not 12-14 (from core translated)"
+msgstr[2] "%d everything else (from core translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
new file mode 100644
index 000000000..48f93bc81
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/rule_9_po/LC_MESSAGES/default.po
@@ -0,0 +1,26 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Poedit-Language: Three Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 9 (translated)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d is 1 (translated)"
+msgstr[1] "%d ends in 2-4, not 12-14 (translated)"
+msgstr[2] "%d everything else (translated)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (translated)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/time_test/LC_TIME b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/time_test/LC_TIME
new file mode 100644
index 000000000..63c105f89
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/locale/time_test/LC_TIME
@@ -0,0 +1,42 @@
+escape_char /
+comment_char %
+abday   "<U0064><U006F><U006D>";"<U006C><U0075><U006E>";/
+        "<U006D><U0061><U0072>";"<U006D><U0069><U00E9>";/
+        "<U006A><U0075><U0065>";"<U0076><U0069><U0065>";/
+        "<U0073><U00E1><U0062>"
+day     "<U0064><U006F><U006D><U0069><U006E><U0067><U006F>";/
+        "<U006C><U0075><U006E><U0065><U0073>";/
+        "<U006D><U0061><U0072><U0074><U0065><U0073>";/
+        "<U006D><U0069><U00E9><U0072><U0063><U006F><U006C><U0065><U0073>";/
+        "<U006A><U0075><U0065><U0076><U0065><U0073>";/
+        "<U0076><U0069><U0065><U0072><U006E><U0065><U0073>";/
+        "<U0073><U00E1><U0062><U0061><U0064><U006F>"
+abmon   "<U0065><U006E><U0065>";"<U0066><U0065><U0062>";/
+        "<U006D><U0061><U0072>";"<U0061><U0062><U0072>";/
+        "<U006D><U0061><U0079>";"<U006A><U0075><U006E>";/
+        "<U006A><U0075><U006C>";"<U0061><U0067><U006F>";/
+        "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
+        "<U006E><U006F><U0076>";"<U0064><U0069><U0063>"
+mon     "<U0065><U006E><U0065><U0072><U006F>";/
+        "<U0066><U0065><U0062><U0072><U0065><U0072><U006F>";/
+        "<U006D><U0061><U0072><U007A><U006F>";/
+        "<U0061><U0062><U0072><U0069><U006C>";/
+        "<U006D><U0061><U0079><U006F>";/
+        "<U006A><U0075><U006E><U0069><U006F>";/
+        "<U006A><U0075><U006C><U0069><U006F>";/
+        "<U0061><U0067><U006F><U0073><U0074><U006F>";/
+        "<U0073><U0065><U0070><U0074><U0069><U0065><U006D><U0062><U0072><U0065>";/
+        "<U006F><U0063><U0074><U0075><U0062><U0072><U0065>";/
+        "<U006E><U006F><U0076><U0069><U0065><U006D><U0062><U0072><U0065>";/
+        "<U0064><U0069><U0063><U0069><U0065><U006D><U0062><U0072><U0065>"
+d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
+d_fmt   "<U0025><U0064><U002F><U0025><U006D><U002F><U0025><U0079>"
+t_fmt   "<U0025><U0054>"
+am_pm   "<U0061><U006D>";"<U0070><U006D>"
+t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U0070>"
+date_fmt	"<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
+<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
+<U0025><U005A><U0020><U0025><U0059>"
+%  FIXME: found in CLDR
+first_weekday 2
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php
new file mode 100644
index 000000000..766b16066
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_one_behavior.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Behavior for binding management.
+ *
+ * Behavior to simplify manipulating a model's bindings when doing a find operation
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
+ * the amount of associations and data returned.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class PersisterOneBehaviorBehavior extends ModelBehavior {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php
new file mode 100644
index 000000000..ba9887c1f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/behaviors/persister_two_behavior.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Behavior for binding management.
+ *
+ * Behavior to simplify manipulating a model's bindings when doing a find operation
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+/**
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
+ * the amount of associations and data returned.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class PersisterTwoBehaviorBehavior extends ModelBehavior {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/comment.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/comment.php
new file mode 100644
index 000000000..59194d768
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/comment.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class Comment extends AppModel {
+	var $useTable = 'comments';
+	var $name = 'Comment';
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_other_source.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_other_source.php
new file mode 100644
index 000000000..d5743f606
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_other_source.php
@@ -0,0 +1,27 @@
+<?php
+class Test2OtherSource extends DataSource {
+
+	function describe($model) {
+		return compact('model');
+	}
+
+	function listSources() {
+		return array('test_source');
+	}
+
+	function create($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function read($model, $queryData = array()) {
+		return compact('model', 'queryData');
+	}
+
+	function update($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function delete($model, $id) {
+		return compact('model', 'id');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_source.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_source.php
new file mode 100644
index 000000000..bc6c23fe4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/datasources/test2_source.php
@@ -0,0 +1,27 @@
+<?php
+class Test2Source extends DataSource {
+
+	function describe($model) {
+		return compact('model');
+	}
+
+	function listSources() {
+		return array('test_source');
+	}
+
+	function create($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function read($model, $queryData = array()) {
+		return compact('model', 'queryData');
+	}
+
+	function update($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function delete($model, $id) {
+		return compact('model', 'id');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_one.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_one.php
new file mode 100644
index 000000000..0d2239fb4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_one.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class PersisterOne extends AppModel {
+	var $useTable = 'posts';
+	var $name = 'PersisterOne';
+
+	var $actsAs = array('PersisterOneBehavior', 'TestPlugin.TestPluginPersisterOne');
+
+	var $hasMany = array('Comment', 'TestPlugin.TestPluginComment');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_two.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_two.php
new file mode 100644
index 000000000..e2d1ce172
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/persister_two.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class PersisterTwo extends AppModel {
+	var $useTable = 'posts';
+	var $name = 'PersisterTwo';
+
+	var $actsAs = array('PersisterOneBehavior', 'TestPlugin.TestPluginPersisterOne');
+
+	var $hasMany = array('Comment', 'TestPlugin.TestPluginComment');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/post.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/post.php
new file mode 100644
index 000000000..2a0579eaf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/models/post.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.7726
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class Post extends AppModel {
+	var $useTable = 'posts';
+	var $name = 'Post';
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
new file mode 100644
index 000000000..03e21bb19
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/one/plugin_one.js
@@ -0,0 +1 @@
+alert('plugin one nested js file');
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
new file mode 100644
index 000000000..ac52468f6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/plugin_js/webroot/js/plugin_js.js
@@ -0,0 +1 @@
+alert('win sauce');
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php
new file mode 100644
index 000000000..f6424a5f5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/load.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Test Suite TestPlugin config file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+$config['plugin_load'] = '/test_app/plugins/test_plugin/config/load.php';
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php
new file mode 100644
index 000000000..849b97670
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/more.load.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Test Suite TestPlugin config file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+$config['plugin_more_load'] = '/test_app/plugins/test_plugin/config/more.load.php';
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
new file mode 100644
index 000000000..a7388c966
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/config/schema/schema.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * TestAppSchema file
+ *
+ * Use for testing the loading of schema files from plugins.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.app.config.sql
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class TestPluginAppSchema extends CakeSchema {
+
+	var $name = 'TestPluginApp';
+
+	var $acos = array(
+		'id' => array('type'=>'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
+		'parent_id' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+		'model' => array('type'=>'string', 'null' => true),
+		'foreign_key' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+		'alias' => array('type'=>'string', 'null' => true),
+		'lft' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+		'rght' => array('type'=>'integer', 'null' => true, 'default' => NULL, 'length' => 10),
+		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
+	);
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
new file mode 100644
index 000000000..d5de57839
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/other_component.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class OtherComponentComponent extends Object {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
new file mode 100644
index 000000000..2544376d9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/plugins_component.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class PluginsComponentComponent extends Object {
+	var $components = array('TestPlugin.OtherComponent');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
new file mode 100644
index 000000000..40e97ef88
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_component.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginComponentComponent extends Object {
+	var $components = array('TestPlugin.TestPluginOtherComponent');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
new file mode 100644
index 000000000..a773b4256
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/components/test_plugin_other_component.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginOtherComponentComponent extends Object {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
new file mode 100644
index 000000000..281d85364
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/test_plugin_controller.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * TestPluginController used by Dispatcher test to test plugin shortcut urls.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginController extends TestPluginAppController {
+	var $uses = array();
+	
+	function index() {
+		$this->autoRender = false;
+	}
+
+	function add() {
+		$this->autoRender = false;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
new file mode 100644
index 000000000..12246f8c3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/controllers/tests_controller.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestsController extends TestPluginAppController {
+	var $name = 'Tests';
+	var $uses = array();
+	var $helpers = array('TestPlugin.OtherHelper', 'Html');
+	var $components = array('TestPlugin.PluginsComponent');
+
+	function index() {
+	}
+
+	function some_method() {
+		return 25;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
new file mode 100644
index 000000000..52f8977ed
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/cache/test_plugin_cache.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Test Suite Test Plugin Cache Engine class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginCacheEngine extends CacheEngine {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
new file mode 100644
index 000000000..bb3388c62
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/log/test_plugin_log.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Test Suite Test Plugin Logging stream class.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.3
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginLog {
+
+	function write($type, $message) {
+		
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
new file mode 100644
index 000000000..138aa5df3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/libs/test_plugin_library.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Test Suite TestPlugin Library
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginLibrary {}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
new file mode 100644
index 000000000..922859124
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MESSAGES/test_plugin.po
@@ -0,0 +1,50 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 1 (from plugin)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d = 1 (from plugin)"
+msgstr[1] "%d = 0 or > 1 (from plugin)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (from plugin)"
+
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Plural Rule 1 (from plugin)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "%d = 1 (from plugin)"
+msgstr[1] "%d = 0 or > 1 (from plugin)"
+
+#~ msgid "Plural-Forms 1"
+#~ msgstr "Plural-Forms 1 (from plugin)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
new file mode 100644
index 000000000..d1079d311
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/locale/po/LC_MONETARY/test_plugin.po
@@ -0,0 +1,22 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: CakePHP Testsuite\n"
+"POT-Creation-Date: 2008-05-15 02:51-0700\n"
+"PO-Revision-Date: \n"
+"Last-Translator: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"Language-Team: CakePHP I18N & I10N Team <i10n.cakephp@gmail.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Two Forms of Plurals\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+msgid "Plural Rule 1"
+msgstr "Monetary Plural Rule 1 (from plugin)"
+
+msgid "%d = 1"
+msgid_plural "%d = 0 or > 1"
+msgstr[0] "Monetary %d = 1 (from plugin)"
+msgstr[1] "Monetary %d = 0 or > 1 (from plugin)"
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
new file mode 100644
index 000000000..4f62e595c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_one.php
@@ -0,0 +1,34 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Behavior for binding management.
+ *
+ * Behavior to simplify manipulating a model's bindings when doing a find operation
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+/**
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
+ * the amount of associations and data returned.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class TestPluginPersisterOneBehavior extends ModelBehavior {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
new file mode 100644
index 000000000..3df95a54a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/behaviors/test_plugin_persister_two.php
@@ -0,0 +1,34 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Behavior for binding management.
+ *
+ * Behavior to simplify manipulating a model's bindings when doing a find operation
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.tests.test_app.models
+ * @since         CakePHP(tm) v 1.2.0.5669
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+/**
+ * Behavior to allow for dynamic and atomic manipulation of a Model's associations used for a find call. Most useful for limiting
+ * the amount of associations and data returned.
+ *
+ * @package       cake
+ * @subpackage    cake.cake.console.libs
+ */
+class TestPluginPersisterTwoBehavior extends ModelBehavior {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
new file mode 100644
index 000000000..779eeb709
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/dbo/dbo_dummy.php
@@ -0,0 +1,7 @@
+<?php
+
+class DboDummy extends DboSource {
+	function connect() {
+		return true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php
new file mode 100644
index 000000000..6d5436276
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_other_source.php
@@ -0,0 +1,27 @@
+<?php
+class TestOtherSource extends DataSource {
+
+	function describe($model) {
+		return compact('model');
+	}
+
+	function listSources() {
+		return array('test_source');
+	}
+
+	function create($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function read($model, $queryData = array()) {
+		return compact('model', 'queryData');
+	}
+
+	function update($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function delete($model, $id) {
+		return compact('model', 'id');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php
new file mode 100644
index 000000000..2fc4026b0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/datasources/test_source.php
@@ -0,0 +1,27 @@
+<?php
+class TestSource extends DataSource {
+
+	function describe($model) {
+		return compact('model');
+	}
+
+	function listSources() {
+		return array('test_source');
+	}
+
+	function create($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function read($model, $queryData = array()) {
+		return compact('model', 'queryData');
+	}
+
+	function update($model, $fields = array(), $values = array()) {
+		return compact('model', 'fields', 'values');
+	}
+
+	function delete($model, $id) {
+		return compact('model', 'id');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
new file mode 100644
index 000000000..c670415b3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_auth_user.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Test Plugin Auth User Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.tests.test_app.plugins.test_plugin
+ * @since         CakePHP v 1.2.0.4487
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+class TestPluginAuthUser extends TestPluginAppModel {
+
+/**
+ * Name property
+ *
+ * @var string
+ */
+	var $name = 'TestPluginAuthUser';
+
+/**
+ * useTable property
+ *
+ * @var string
+ */
+	var $useTable = 'auth_users';
+
+/**
+ * useDbConfig property
+ *
+ * @var string 'test_suite'
+ * @access public
+ */
+	var $useDbConfig = 'test_suite';
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
new file mode 100644
index 000000000..fedd811e2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_authors.php
@@ -0,0 +1,29 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.7726
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+class TestPluginAuthors extends TestPluginAppModel {
+	var $useTable = 'authors';
+	var $name = 'TestPluginAuthors';
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
new file mode 100644
index 000000000..2d7c38fdb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_comment.php
@@ -0,0 +1,29 @@
+<?php
+/* SVN FILE: $Id$ */
+/**
+ * Test App Comment Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP :  Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2008, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2008, Cake Software Foundation, Inc.
+ * @link          http://cakefoundation.org/projects/info/cakephp CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.
+ * @since         CakePHP v 1.2.0.7726
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+class TestPluginComment extends TestPluginAppModel {
+	var $useTable = 'test_plugin_comments';
+	var $name = 'TestPluginComment';
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
new file mode 100644
index 000000000..9ab447fae
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/models/test_plugin_post.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Test Plugin Post Model
+ *
+ *
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2006-2010, Cake Software Foundation, Inc.
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2006-2010, Cake Software Foundation, Inc.
+ * @link          http://cakephp.org CakePHP Project
+ * @package       cake
+ * @subpackage    cake.cake.tests.test_app.plugins.test_plugin
+ * @since         CakePHP v 1.2.0.4487
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class TestPluginPost extends TestPluginAppModel {
+
+/**
+ * Name property
+ *
+ * @var string
+ */
+	var $name = 'Post';
+
+/**
+ * useTable property
+ *
+ * @var string
+ */
+	var $useTable = 'posts';
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
new file mode 100644
index 000000000..e7d7d38af
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_controller.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Test Suite TestPlugin AppController
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginAppController extends AppController { }
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
new file mode 100644
index 000000000..f87427508
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/test_plugin_app_model.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Test Suite TestPlugin AppModel
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.cases.libs
+ * @since         CakePHP(tm) v 1.2.0.5432
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class TestPluginAppModel extends CakeTestModel {}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
new file mode 100644
index 000000000..6fad5d955
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/sample/sample_plugin.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.sample
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class SamplePluginClassTestName {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
new file mode 100644
index 000000000..9bc11c04f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/example.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors.shells
+ * @since         CakePHP(tm) v 1.2.0.7871
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class ExampleShell extends Shell {
+
+/**
+ * main method
+ *
+ * @access public
+ * @return void
+ */
+	function main() {
+		$this->out('This is the main method called from TestPlugin.ExampleShell');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/tasks/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/shells/templates/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
new file mode 100644
index 000000000..3fb5ff867
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/vendors/welcome.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.vendors
+ * @since         CakePHP(tm) v 1.2.0.7629
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+This is the welcome.php file in test_plugin/vendors directory
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp
new file mode 100644
index 000000000..a05089228
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/plugin_element.ctp
@@ -0,0 +1 @@
+<?php echo 'this is the plugin element using params[plugin]'; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp
new file mode 100644
index 000000000..3e65a6789
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/elements/test_plugin_element.ctp
@@ -0,0 +1 @@
+<?php echo 'this is the test set using View::$plugin plugin element'; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
new file mode 100644
index 000000000..5f35e2e6b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/other_helper.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class OtherHelperHelper extends AppHelper {}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
new file mode 100644
index 000000000..647a891bb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/plugged_helper.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin.views.helpers
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class PluggedHelperHelper extends AppHelper {
+	var $helpers = array('TestPlugin.OtherHelper');
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
new file mode 100644
index 000000000..a95374c3e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/helpers/test_plugin_app.php
@@ -0,0 +1,5 @@
+<?php
+
+class TestPluginAppHelper extends AppHelper {
+	
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp
new file mode 100644
index 000000000..0437f2c6b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/layouts/default.ctp
@@ -0,0 +1 @@
+test plugin default layout
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp
new file mode 100644
index 000000000..6260ece2d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/index.ctp
@@ -0,0 +1 @@
+test plugin index
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
new file mode 100644
index 000000000..2aef3c7b7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/views/tests/scaffold.edit.ctp
@@ -0,0 +1 @@
+test_plugin add/edit scaffold view
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
new file mode 100644
index 000000000..ac6fe0de6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/test_plugin_asset.css
@@ -0,0 +1 @@
+this is the test plugin asset css file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
new file mode 100644
index 000000000..636fb5144
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/theme_one.htc
@@ -0,0 +1 @@
+htc file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
new file mode 100644
index 000000000..602e2277d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/css/unknown.extension
@@ -0,0 +1 @@
+Testing a file with unknown extension to mime mapping.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
new file mode 100644
index 000000000..02a920ce3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/flash/plugin_test.swf
@@ -0,0 +1 @@
+this is just a test to load swf file from the plugin.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif
new file mode 100644
index 000000000..f29f72ebe
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/img/cake.icon.gif differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
new file mode 100644
index 000000000..6db1d7d02
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/js/test_plugin/test.js
@@ -0,0 +1 @@
+alert("Test App");
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
new file mode 100644
index 000000000..f38d751a9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/pdfs/plugin_test.pdf
@@ -0,0 +1 @@
+this is just a test to load pdf file from the plugin.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js
new file mode 100644
index 000000000..529e1c18c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin/webroot/root.js
@@ -0,0 +1 @@
+alert('I am a root level file!');
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
new file mode 100644
index 000000000..807cb45fa
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/example.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
+ * @since         CakePHP(tm) v 1.2.0.7871
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class ExampleShell extends Shell {
+
+/**
+ * main method
+ *
+ * @access public
+ * @return void
+ */
+	function main() {
+		$this->out('This is the main method called from TestPluginTwo.ExampleShell');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/tasks/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/templates/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
new file mode 100644
index 000000000..0721db4fb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/plugins/test_plugin_two/vendors/shells/welcome.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.plugins.test_plugin_two.vendors.shells
+ * @since         CakePHP(tm) v 1.2.0.7871
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class WelcomeShell extends Shell {
+
+/**
+ * say_hello method
+ *
+ * @access public
+ * @return void
+ */
+	function say_hello() {
+		$this->out('This is the say_hello method called from TestPluginTwo.WelcomeShell');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/tmp/dir_map b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/tmp/dir_map
new file mode 100644
index 000000000..1f8b2ba67
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/tmp/dir_map
@@ -0,0 +1,2 @@
+1845415352
+a:4:{s:27:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs";a:24:{i:0;s:27:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs";i:1;s:32:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view";i:2;s:42:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\scaffolds";i:3;s:38:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\pages";i:4;s:40:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts";i:5;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\xml";i:6;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\rss";i:7;s:43:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\js";i:8;s:46:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\email";i:9;s:51:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\email\\\\text";i:10;s:51:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\layouts\\\\email\\\\html";i:11;s:40:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\helpers";i:12;s:39:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\errors";i:13;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements";i:14;s:47:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements\\\\email";i:15;s:52:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements\\\\email\\\\text";i:16;s:52:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\view\\\\elements\\\\email\\\\html";i:17;s:33:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model";i:18;s:45:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model\\\\datasources";i:19;s:49:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model\\\\datasources\\\\dbo";i:20;s:43:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\model\\\\behaviors";i:21;s:38:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\controller";i:22;s:49:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\controller\\\\components";i:23;s:33:"C:\\\\dev\\\\prj2\\\\sites\\\\cake\\\\libs\\\\cache";}s:35:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors";a:7:{i:0;s:35:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors";i:1;s:42:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells";i:2;s:52:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells\\\\templates";i:3;s:64:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells\\\\templates\\\\cdc_project";i:4;s:48:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\shells\\\\tasks";i:5;s:38:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\js";i:6;s:39:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\vendors\\\\css";}s:25:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors";a:10:{i:0;s:25:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors";i:1;s:36:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest";i:2;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\test";i:3;s:49:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\test\\\\support";i:4;s:59:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\test\\\\support\\\\collector";i:5;s:47:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\extensions";i:6;s:55:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\extensions\\\\testdox";i:7;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\docs";i:8;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\docs\\\\fr";i:9;s:44:"C:\\\\dev\\\\prj2\\\\sites\\\\vendors\\\\simpletest\\\\docs\\\\en";}s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\views\\\\helpers";a:1:{i:0;s:41:"C:\\\\dev\\\\prj2\\\\sites\\\\main_site\\\\views\\\\helpers";}}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/MyTest.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/MyTest.php
new file mode 100644
index 000000000..8ab33e869
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/MyTest.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.vendors.somename
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+This is the MyTest.php file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/hello.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/hello.php
new file mode 100644
index 000000000..b738e022e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/Test/hello.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.vendors.Test
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+This is the hello.php file in Test directory
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/css/test_asset.css b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/css/test_asset.css
new file mode 100644
index 000000000..e8b09dd29
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/css/test_asset.css
@@ -0,0 +1 @@
+this is the test asset css file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/img/test.jpg b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/img/test.jpg
new file mode 100644
index 000000000..ca5197ae8
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/img/test.jpg differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
new file mode 100644
index 000000000..fe57a4768
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/sample/configure_test_vendor_sample.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.vendors.sample
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class ConfigureTestVendorSample {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/sample.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/sample.php
new file mode 100644
index 000000000..69080285f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/sample.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.vendors.shells
+ * @since         CakePHP(tm) v 1.2.0.7871
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+class SampleShell extends Shell {
+
+/**
+ * main method
+ *
+ * @access public
+ * @return void
+ */
+	function main() {
+		$this->out('This is the main method called from SampleShell');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/tasks/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/shells/tasks/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/somename/some.name.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/somename/some.name.php
new file mode 100644
index 000000000..fb8bfad62
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/somename/some.name.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.vendors.somename
+ * @since         CakePHP(tm) v 1.2.0.4206
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+This is a file with dot in file name
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/welcome.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/welcome.php
new file mode 100644
index 000000000..0fc08ec6f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/vendors/welcome.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Short description for file.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) Tests <http://book.cakephp.org/view/1196/Testing>
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ *  Licensed under The Open Group Test Suite License
+ *  Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://book.cakephp.org/view/1196/Testing CakePHP(tm) Tests
+ * @package       cake
+ * @subpackage    cake.tests.test_app.vendors
+ * @since         CakePHP(tm) v 1.2.0.7629
+ * @license       http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License
+ */
+?>
+This is the welcome.php file in vendors directory
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp
new file mode 100644
index 000000000..b65169735
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/custom.ctp
@@ -0,0 +1,26 @@
+<?php
+/* SVN FILE: $Id$ */
+
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+<p>Here is your value: <b><?php echo $value; ?></b></p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/default.ctp
new file mode 100644
index 000000000..02ee255e4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/default.ctp
@@ -0,0 +1,26 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php
+$content = explode("\n", $content);
+
+foreach($content as $line):
+	echo '<p> ' . $line . '</p>';
+endforeach;
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp
new file mode 100644
index 000000000..49858200e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/html/nested_element.ctp
@@ -0,0 +1,3 @@
+Before the element.
+<?php echo $this->element('html_call'); ?>
+After the element.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp
new file mode 100644
index 000000000..c28b6679b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/custom.ctp
@@ -0,0 +1,26 @@
+<?php
+/* SVN FILE: $Id$ */
+
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) :  Rapid Development Framework (http://www.cakephp.org)
+ * Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @filesource
+ * @copyright     Copyright 2005-2008, Cake Software Foundation, Inc. (http://www.cakefoundation.org)
+ * @link          http://www.cakefoundation.org/projects/info/cakephp CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @version       $Revision$
+ * @modifiedby    $LastChangedBy$
+ * @lastmodified  $Date$
+ * @license       http://www.opensource.org/licenses/mit-license.php The MIT License
+ */
+?>
+Here is your value: <?php echo $value; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/default.ctp
new file mode 100644
index 000000000..574514c3f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/default.ctp
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo $content; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp
new file mode 100644
index 000000000..7a5e3aa2f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/email/text/wide.ctp
@@ -0,0 +1,21 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.elements.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+This element has some text that is just too wide to comply with email standards.
+<?php echo $content; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/html_call.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/html_call.ctp
new file mode 100644
index 000000000..8c2c08978
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/html_call.ctp
@@ -0,0 +1,3 @@
+<?php
+echo $this->Html->link('Test', 'http://example.com');
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp
new file mode 100644
index 000000000..588197e03
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/contains_nocache.ctp
@@ -0,0 +1,5 @@
+<h2>Cache Me</h2>
+<cake:nocache>
+	<p>F. In Element With No Cache Tags</p>
+	<?php $this->log('6. In element with no cache tags') ?>
+</cake:nocache>
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp
new file mode 100644
index 000000000..29b808371
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/plain.ctp
@@ -0,0 +1,4 @@
+<h2>Cache Me</h2>
+	<p>B. In Plain Element</p>
+	<?php $this->log('2. in plain element') ?>
+
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp
new file mode 100644
index 000000000..ea85a9fd8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub1.ctp
@@ -0,0 +1,8 @@
+<?php echo $this->element('nocache/sub2'); ?>
+
+<cake:nocache>
+	<?php $foobar = 'in sub1'; ?>
+	<?php echo $foobar; ?>
+</cake:nocache>
+
+<?php echo 'printing: "' . $foobar . '"'; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp
new file mode 100644
index 000000000..236cd75c5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/nocache/sub2.ctp
@@ -0,0 +1,6 @@
+<cake:nocache>
+	<?php $barfoo = 'in sub2'; ?>
+	<?php echo $barfoo; ?>
+</cake:nocache>
+
+<?php echo 'printing: "' . $barfoo . '"'; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/session_helper.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/session_helper.ctp
new file mode 100644
index 000000000..109c9a11f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/session_helper.ctp
@@ -0,0 +1,5 @@
+<div id="notificationLayout">
+	<h1><?php echo $name; ?></h1>
+	<h3><?php echo $title; ?></h3>
+	<p><?php echo $message; ?></p>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/test_element.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/test_element.ctp
new file mode 100644
index 000000000..08f1d67dd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/test_element.ctp
@@ -0,0 +1 @@
+<?php echo 'this is the test element'; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/type_check.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/type_check.ctp
new file mode 100644
index 000000000..a863c2b48
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/elements/type_check.ctp
@@ -0,0 +1 @@
+<?php echo gettype($form); ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/errors/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/errors/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/banana.php b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/banana.php
new file mode 100644
index 000000000..4b020ae6b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/banana.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+class BananaHelper extends Helper {
+}
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/helpers/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax.ctp
new file mode 100644
index 000000000..6d1bb5a7d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax.ctp
@@ -0,0 +1,20 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax2.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax2.ctp
new file mode 100644
index 000000000..299a19a35
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/ajax2.ctp
@@ -0,0 +1,23 @@
+<?php
+/* SVN FILE: $Id: ajax2.ctp 7062 2008-05-30 11:29:53Z nate $ */
+
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+Ajax!
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
new file mode 100644
index 000000000..3b1777fd4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_empty_sections.ctp
@@ -0,0 +1,13 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title><?php echo $title_for_layout; ?></title>
+	<cake:nocache><?php $x = 1; ?></cake:nocache>
+</head>
+<body>
+	<cake:nocache><?php $x++; ?></cake:nocache>
+	<cake:nocache><?php $x++; ?></cake:nocache>
+	<?php echo $content_for_layout;	?>
+	<cake:nocache><?php echo 'cached count is: ' . $x; ?></cake:nocache>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp
new file mode 100644
index 000000000..eb7e02486
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/cache_layout.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<p>This is regular text</p>
+<cake:nocache>
+	<?php echo microtime(); ?>
+</cake:nocache>
+
+<?php echo $content_for_layout; ?>
+
+<?php echo $superman; ?>
+
+<cake:nocache>
+	<?php echo $variable; ?>
+</cake:nocache>
+<p>Additional regular text.</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/default.ctp
new file mode 100644
index 000000000..df808691a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/default.ctp
@@ -0,0 +1,56 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.pages
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<?php echo $this->Html->charset();?>
+	<title>
+		<?php __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo $title_for_layout;?>
+	</title>
+
+	<link rel="icon" href="<?php echo $this->webroot;?>favicon.ico" type="image/x-icon" />
+	<link rel="shortcut icon" href="<?php echo $this->webroot;?>favicon.ico" type="image/x-icon" />
+	<?php echo $this->Html->css('cake.generic');?>
+	<?php echo $scripts_for_layout;?>
+</head>
+<body>
+	<div id="container">
+		<div id="header">
+			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework', true), 'http://cakephp.org');?></h1>
+		</div>
+		<div id="content">
+
+			<?php $this->Session->flash();?>
+
+			<?php echo $content_for_layout;?>
+
+		</div>
+		<div id="footer">
+			<?php echo $this->Html->link(
+							$this->Html->image('cake.power.gif', array('alt'=> __("CakePHP: the rapid development php framework", true), 'border'=>"0")),
+							'http://www.cakephp.org/',
+							array('target'=>'_blank'), null, false
+						);
+			?>
+		</div>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp
new file mode 100644
index 000000000..beae8a600
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/default.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+
+<html>
+<head>
+	<title><?php echo $title_for_layout;?></title>
+</head>
+
+<body>
+	<?php echo $content_for_layout;?>
+
+	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp
new file mode 100644
index 000000000..642afc633
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/html/thin.ctp
@@ -0,0 +1,32 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts.email.html
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
+
+<html>
+<head>
+	<title><?php echo $title_for_layout;?></title>
+</head>
+
+<body>
+	<?php echo $content_for_layout;?>
+
+	<p>This email was sent using the CakePHP Framework</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp
new file mode 100644
index 000000000..bd8f55eea
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/email/text/default.ctp
@@ -0,0 +1,23 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts.email.text
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+
+<?php echo $content_for_layout;?>
+
+This email was sent using the CakePHP Framework, http://cakephp.org.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/flash.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/flash.ctp
new file mode 100644
index 000000000..80c38ed3f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/flash.ctp
@@ -0,0 +1,38 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><?php echo $page_title?></title>
+<?php echo $this->Html->charset(); ?>
+
+<?php if (Configure::read() == 0) { ?>
+<meta http-equiv="Refresh" content="<?php echo $pause?>;url=<?php echo $url?>"/>
+<?php } ?>
+<style><!--
+P { text-align:center; font:bold 1.1em sans-serif }
+A { color:#444; text-decoration:none }
+A:HOVER { text-decoration: underline; color:#44E }
+--></style>
+</head>
+<body>
+<p><a href="<?php echo $url?>"><?php echo $message?></a></p>
+</body>
+</html>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/js/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/js/default.ctp
new file mode 100644
index 000000000..d94dc903a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/js/default.ctp
@@ -0,0 +1,2 @@
+<?php echo $scripts_for_layout; ?>
+<script type="text/javascript"><?php echo $content_for_layout; ?></script>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp
new file mode 100644
index 000000000..86bc4d3ae
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/multi_cache.ctp
@@ -0,0 +1,40 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.layouts
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<p>This is regular text</p>
+<cake:nocache>
+	<p>A. Layout Before Content</p>
+	<?php $this->log('1. layout before content') ?>
+</cake:nocache>
+<cake:nocache><?php echo $this->element('nocache/plain'); ?></cake:nocache>
+<cake:nocache>
+	<p>C. Layout After Test Element But Before Content</p>
+	<?php $this->log('3. layout after test element but before content') ?>
+</cake:nocache>
+<?php echo $content_for_layout; ?>
+<cake:nocache>
+	<p>E. Layout After Content</p>
+	<?php $this->log('5. layout after content') ?>
+</cake:nocache>
+<p>Additional regular text.</p>
+<?php //echo $this->element('nocache/contains_nocache'); stub?>
+<cake:nocache>
+	<p>G. Layout After Content And After Element With No Cache Tags</p>
+	<?php $this->log('7. layout after content and after element with no cache tags') ?>
+</cake:nocache>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/rss/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/rss/default.ctp
new file mode 100644
index 000000000..94067f2bf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/rss/default.ctp
@@ -0,0 +1,17 @@
+<?php
+echo $rss->header();
+
+if (!isset($channel)) {
+	$channel = array();
+}
+if (!isset($channel['title'])) {
+	$channel['title'] = $title_for_layout;
+}
+
+echo $rss->document(
+	$rss->channel(
+		array(), $channel, $content_for_layout
+	)
+);
+
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/xml/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/xml/default.ctp
new file mode 100644
index 000000000..566ca2158
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/layouts/xml/default.ctp
@@ -0,0 +1,2 @@
+<?php echo $xml->header(); ?>
+<?php echo $content_for_layout; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/extract.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/extract.ctp
new file mode 100644
index 000000000..e3eede1c1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/extract.ctp
@@ -0,0 +1,14 @@
+<?php
+$count = 10;
+$messages = array('count' => 10);
+
+// Plural
+__n('You have %d new message.', 'You have %d new messages.', $count);
+__n('You deleted %d message.', 'You deleted %d messages.', $messages['count']);
+
+// Domain Plural
+__dn('domain', 'You have %d new message (domain).', 'You have %d new messages (domain).', '10');
+__dn('domain', 'You deleted %d message (domain).', 'You deleted %d messages (domain).', $messages['count']);
+
+// Duplicated Message
+__('Editing this Page');
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/home.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/home.ctp
new file mode 100644
index 000000000..830a21fae
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/pages/home.ctp
@@ -0,0 +1,82 @@
+<h2>Sweet, "Test App" got Baked by CakePHP!</h2>
+
+<?php
+if (Configure::read() > 0):
+	Debugger::checkSecurityKeys();
+endif;
+?>
+<p>
+<?php
+	if (is_writable(TMP)):
+		echo '<span class="notice success">';
+			__('Your tmp directory is writable.');
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			__('Your tmp directory is NOT writable.');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	$settings = Cache::settings();
+	if (!empty($settings)):
+		echo '<span class="notice success">';
+				printf(__('The %s is being used for caching. To change the config edit APP/config/core.php ', true), '<em>'. $settings['engine'] . 'Engine</em>');
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+				__('Your cache is NOT working. Please check the settings in APP/config/core.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<p>
+<?php
+	$filePresent = null;
+	if (file_exists(CONFIGS . 'database.php')):
+		echo '<span class="notice success">';
+			__('Your database configuration file is present.');
+			$filePresent = true;
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			__('Your database configuration file is NOT present.');
+			echo '<br/>';
+			__('Rename config/database.php.default to config/database.php');
+		echo '</span>';
+	endif;
+?>
+</p>
+<?php
+if (!empty($filePresent)):
+	if (!class_exists('ConnectionManager')) {
+		require LIBS . 'model' . DS . 'connection_manager.php';
+	}
+	$db = ConnectionManager::getInstance();
+ 	$connected = $db->getDataSource('default');
+?>
+<p>
+<?php
+	if ($connected->isConnected()):
+		echo '<span class="notice success">';
+ 			__('Cake is able to connect to the database.');
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			__('Cake is NOT able to connect to the database.');
+		echo '</span>';
+	endif;
+?>
+</p>
+<?php endif;?>
+<h3><?php __('Editing this Page') ?></h3>
+<p>
+<?php
+	printf(__('To change the content of this page, edit: %s
+		To change its layout, edit: %s
+		You can also add some CSS styles for your pages at: %s', true),
+		APP . 'views' . DS . 'pages' . DS . 'home.ctp.<br />',  APP . 'views' . DS . 'layouts' . DS . 'default.ctp.<br />', APP . 'webroot' . DS . 'css');
+?>
+</p>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp
new file mode 100644
index 000000000..ab6fb3ae9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_empty_sections.ctp
@@ -0,0 +1,2 @@
+View Content
+	<cake:nocache><?php $y = 1; ?></cake:nocache>
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_form.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_form.ctp
new file mode 100644
index 000000000..87ec9cf5b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/cache_form.ctp
@@ -0,0 +1,14 @@
+<div class="users form">
+<cake:nocache>
+	<?php echo $form->create('User');?>
+		<fieldset>
+	 		<legend><?php __('Add User');?></legend>
+		<?php
+			echo $form->input('username');
+			echo $form->input('email');
+			echo $form->input('password');
+		?>
+		</fieldset>
+	<?php echo $form->end('Submit');?>
+</cake:nocache>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp
new file mode 100644
index 000000000..a3b6928fb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/helper_overwrite.ctp
@@ -0,0 +1,4 @@
+<?php 
+echo $html;
+echo $this->Html->link('Test link', '#');
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/index.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/index.ctp
new file mode 100644
index 000000000..ff145eeed
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/index.ctp
@@ -0,0 +1 @@
+posts index
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp
new file mode 100644
index 000000000..eb397e492
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/multiple_nocache.ctp
@@ -0,0 +1,15 @@
+--view start--
+<cake:nocache>
+	<?php echo $batman ?>
+</cake:nocache>
+
+this view has 3 nocache blocks
+
+<cake:nocache>
+	<?php echo $spiderman; ?>
+</cake:nocache>
+
+<cake:nocache>
+	<?php echo 'some string'; ?>
+</cake:nocache>
+--view end--
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp
new file mode 100644
index 000000000..a72788305
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/nocache_multiple_element.ctp
@@ -0,0 +1,9 @@
+<cake:nocache>
+	<?php echo $foo; ?>
+</cake:nocache>
+
+<cake:nocache>
+	<?php echo $bar; ?>
+</cake:nocache>
+
+<?php echo $this->element('nocache/sub1'); ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp
new file mode 100644
index 000000000..ff8239012
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/scaffold.edit.ctp
@@ -0,0 +1 @@
+test_app posts add/edit scaffold view
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp
new file mode 100644
index 000000000..27dd47fd2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/sequencial_nocache.ctp
@@ -0,0 +1,24 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.pages
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<h1>Content</h1>
+<cake:nocache>
+	<p>D. In View File</p>
+	<?php $this->log('4. in view file') ?>
+</cake:nocache>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp
new file mode 100644
index 000000000..d1bf80e72
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/posts/test_nocache_tags.ctp
@@ -0,0 +1,144 @@
+<?php
+/**
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @subpackage    cake.cake.libs.view.templates.pages
+ * @since         CakePHP(tm) v 0.10.0.1076
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+?>
+<p>
+	<cake:nocache>
+	<span class="notice">
+		<?php
+			__('Your tmp directory is ');
+			if (is_writable(TMP)):
+				__('writable.');
+			else:
+				__('NOT writable.');
+			endif;
+		?>
+	</span>
+	</cake:nocache>
+</p>
+<p>
+	<span class="notice">
+		<?php
+			__('Your cache is ');
+			if (Cache::isInitialized()):
+				__('set up and initialized properly.');
+				$settings = Cache::settings();
+				echo '<p>' . $settings['engine'];
+				__(' is being used to cache, to change this edit config/core.php ');
+				echo '</p>';
+
+				echo 'Settings: <ul>';
+				foreach ($settings as $name => $value):
+					echo '<li>' . $name . ': ' . $value . '</li>';
+				endforeach;
+				echo '</ul>';
+
+			else:
+				__('NOT working.');
+				echo '<br />';
+				if (is_writable(TMP)):
+					__('Edit: config/core.php to insure you have the newset version of this file and the variable $cakeCache set properly');
+				endif;
+			endif;
+		?>
+	</span>
+</p>
+<p>
+	<span class="notice">
+		<?php
+			__('Your database configuration file is ');
+			$filePresent = null;
+			if (file_exists(CONFIGS.'database.php')):
+				__('present.');
+				$filePresent = true;
+			else:
+				__('NOT present.');
+				echo '<br/>';
+				__('Rename config/database.php.default to config/database.php');
+			endif;
+		?>
+	</span>
+</p>
+<?php
+if (!empty($filePresent)):
+	if (!class_exists('ConnectionManager')) {
+		require LIBS . 'model' . DS . 'connection_manager.php';
+	}
+	$db = ConnectionManager::getInstance();
+ 	$connected = $db->getDataSource('default');
+?>
+<p>
+	<span class="notice">
+		<?php
+			__('Cake');
+			if ($connected->isConnected()):
+		 		__(' is able to ');
+			else:
+				__(' is NOT able to ');
+			endif;
+			__('connect to the database.');
+		?>
+	</span>
+</p>
+<?php endif; ?>
+<h2><?php printf(__('Release Notes for CakePHP %s.', true), Configure::version()); ?></h2>
+<a href="https://trac.cakephp.org/wiki/notes/1.2.x.x"><?php __('Read the release notes and get the latest version'); ?> </a>
+<h2><?php __('Editing this Page'); ?></h2>
+<p>
+<?php __('To change the content of this page, create: /app/views/pages/home.ctp.'); ?><br />
+<?php __('To change its layout, create: /app/views/layouts/default.ctp.'); ?><br />
+<a href="http://manual.cakephp.org/"><?php __('See the views section of the manual for more info.'); ?> </a><br />
+<?php __('You can also add some CSS styles for your pages at: app/webroot/css/.'); ?>
+</p>
+<h2><?php __('Getting Started'); ?></h2>
+<p>
+<a href="http://manual.cakephp.org/appendix/blog_tutorial"><?php __('The 15 min Blog Tutorial'); ?></a><br />
+<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-cake1.html"><?php __('Cook up Web sites fast with CakePHP'); ?></a><br />
+<a href="http://www-128.ibm.com/developerworks/edu/os-dw-os-php-wiki1.html"><?php __('Create an interactive production wiki using PHP'); ?></a>
+</p>
+<h2><?php __('More about Cake'); ?></h2>
+<p>
+<?php __('CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
+</p>
+<p>
+<?php __('Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
+</p>
+<ul>
+	<li><a href="http://cakefoundation.org/"><?php __('Cake Software Foundation'); ?> </a>
+	<ul><li><?php __('Promoting development related to CakePHP'); ?></li></ul></li>
+	<li><a href="http://bakery.cakephp.org"><?php __('The Bakery'); ?> </a>
+	<ul><li><?php __('Everything CakePHP'); ?></li></ul></li>
+	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php __('Book Store'); ?> </a>
+	<ul><li><?php __('Recommended Software Books'); ?></li></ul></li>
+	<li><a href="http://www.cafepress.com/cakefoundation"><?php __('CakeSchwag'); ?> </a>
+	<ul><li><?php __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
+	<li><a href="http://www.cakephp.org"><?php __('CakePHP'); ?> </a>
+	<ul><li><?php __('The Rapid Development Framework'); ?></li></ul></li>
+	<li><a href="http://manual.cakephp.org"><?php __('CakePHP Manual'); ?> </a>
+	<ul><li><?php __('Your Rapid Development Cookbook'); ?></li></ul></li>
+	<li><a href="http://api.cakephp.org"><?php __('CakePHP API'); ?> </a>
+	<ul><li><?php __('Docblock Your Best Friend'); ?></li></ul></li>
+	<li><a href="http://www.cakeforge.org"><?php __('CakeForge'); ?> </a>
+	<ul><li><?php __('Open Development for CakePHP'); ?></li></ul></li>
+	<li><a href="https://trac.cakephp.org/"><?php __('CakePHP Trac'); ?> </a>
+	<ul><li><?php __('For the Development of CakePHP (Tickets, SVN browser, Roadmap, Changelogs)'); ?></li></ul></li>
+	<li><a href="http://groups-beta.google.com/group/cake-php"><?php __('CakePHP Google Group'); ?> </a>
+	<ul><li><?php __('Community mailing list'); ?></li></ul></li>
+	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
+	<ul><li><?php __('Live chat about CakePHP'); ?></li></ul></li>
+</ul>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/scaffolds/empty b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/scaffolds/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/tests_apps/index.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/tests_apps/index.ctp
new file mode 100644
index 000000000..36aecfa1d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/tests_apps/index.ctp
@@ -0,0 +1 @@
+This is the TestsAppsController index view
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
new file mode 100644
index 000000000..745dddbf2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/elements/test_element.ctp
@@ -0,0 +1 @@
+Hi, I'm the test element.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
new file mode 100644
index 000000000..89107d393
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/layouts/default.ctp
@@ -0,0 +1 @@
+default test_theme layout
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
new file mode 100644
index 000000000..9e1e449c2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/layouts/plugin_default.ctp
@@ -0,0 +1 @@
+test_plugin test_plugin_theme default layout
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
new file mode 100644
index 000000000..edf7ab4b2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/plugins/test_plugin/tests/index.ctp
@@ -0,0 +1 @@
+test plugin index theme view
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp
new file mode 100644
index 000000000..3ec978c95
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/index.ctp
@@ -0,0 +1 @@
+posts index themed view
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
new file mode 100644
index 000000000..a7829877c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/posts/scaffold.index.ctp
@@ -0,0 +1 @@
+I'm a themed scaffold file.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css
new file mode 100644
index 000000000..e8b09dd29
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/test_asset.css
@@ -0,0 +1 @@
+this is the test asset css file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
new file mode 100644
index 000000000..12e29a565
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/css/theme_webroot.css
@@ -0,0 +1 @@
+theme webroot css file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
new file mode 100644
index 000000000..cfe782b7a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/flash/theme_test.swf
@@ -0,0 +1 @@
+this is just a test to load swf file from the theme.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif
new file mode 100644
index 000000000..8f8d570a2
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/cake.power.gif differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg
new file mode 100644
index 000000000..ca5197ae8
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/img/test.jpg differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
new file mode 100644
index 000000000..d29bcbc94
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/one/theme_one.js
@@ -0,0 +1 @@
+nested theme js file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
new file mode 100644
index 000000000..ec17940de
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/js/theme.js
@@ -0,0 +1 @@
+root theme js file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
new file mode 100644
index 000000000..9c1dcbcc4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/views/themed/test_theme/webroot/pdfs/theme_test.pdf
@@ -0,0 +1 @@
+this is just a test to load pdf file from the theme.
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css
new file mode 100644
index 000000000..f65d3e08a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/theme_webroot.css
@@ -0,0 +1 @@
+override the theme webroot css file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css
new file mode 100644
index 000000000..83c3bc4d7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/css/webroot_test.css
@@ -0,0 +1 @@
+this is the webroot test asset css file
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif
new file mode 100644
index 000000000..8f8d570a2
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/cake.power.gif differ
diff --git a/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg
new file mode 100644
index 000000000..ca5197ae8
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/cake/tests/test_app/webroot/theme/test_theme/img/test.jpg differ
diff --git a/code/ryzom/tools/server/www/webtt/docs/INSTALL b/code/ryzom/tools/server/www/webtt/docs/INSTALL
new file mode 100644
index 000000000..3137f86e9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/docs/INSTALL
@@ -0,0 +1,31 @@
+1. Web-Based Translation Tool use ryzom translation pipeline, so you need to setup it first.
+
+2. Change path/to/translation to your translation pipeline path in app/config/database.php
+
+3. Add following VirtualHost config to your apache configuration.
+
+<VirtualHost *:80>
+  DocumentRoot /path/to/webtt
+        <Directory /path/to/webtt>
+                php_admin_value open_basedir none
+                php_flag short_open_tag on
+                php_value memory_limit 256M
+                php_flag output_buffering on
+        </Directory>
+  ServerName webtt.your.domain
+</VirtualHost>
+
+4. Change permissions to tmp directory.
+
+# chmod -R o+w webtt/app/tmp
+
+5. Create MySQL database with default user and WebTT tables.
+
+# mysql -uroot
+CREATE DATABASE webtt2;
+GRANT ALL ON webtt2.* TO webtt@localhost IDENTIFIED BY 'webtt77';
+# cat db/webtt2.db | mysql -uwebtt -pwebtt77 webtt2
+
+6. Go to http://webtt.your.domain and register new user for user access.
+
+7. For administrator access, go to http://webtt.your.domain/admin and log in as admin/newpass
diff --git a/code/ryzom/tools/server/www/webtt/docs/db/CakePHP_Associations b/code/ryzom/tools/server/www/webtt/docs/db/CakePHP_Associations
new file mode 100644
index 000000000..addae59e6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/docs/db/CakePHP_Associations
@@ -0,0 +1,69 @@
+Name:       Language
+DB Table:   `languages`
+Associations:
+        Language hasMany TranslationFile
+
+Name:       TranslationFile
+DB Table:   `translation_files`
+Associations:
+        TranslationFile belongsTo Language
+        TranslationFile hasMany ImportedTranslationFile
+	TranslationFile hasMany Identifier
+
+Name:       ImportedTranslationFile
+DB Table:   `imported_translation_files`
+Associations:
+        TranslationFile belongsTo TranslationFile
+        TranslationFile hasMany FileIdentifier
+
+Name:       Identifier
+DB Table:   `identifiers`
+Associations:
+        Identifier belongsTo TranslationFile
+        Identifier hasMany Translation
+	Identifier hasMany Comment
+	Identifier hasMany FileIdentifier
+	Identifier hasMany IdentifierColumn
+	Identifier hasOne BestTranslation
+
+Name:       IdentifierColumn
+DB Table:   `identifier_columns`
+Associations:
+	IdentifierColumn belongsTo Identifier
+	IdentifierColumn hasMany Translation
+
+Name:       FileIdentifier
+DB Table:   `file_identifiers`
+Associations:
+        FileIdentifier belongsTo ImportedTranslationFile
+        FileIdentifier belongsTo Identifier
+
+Name:       Translation
+DB Table:   `translations`
+Associations:
+        Translation belongsTo Identifier
+	Translation belongsTo IdentifierColumn
+        Translation belongsTo User
+	Translation belongsTo ParentTranslation
+        Translation hasMany Vote
+	Translation hasMany ChildTranslation
+
+Name:       User
+DB Table:   `users`
+Associations:
+        User hasMany Translation
+        User hasMany Vote
+	User hasMany Comment
+
+Name:       Vote
+DB Table:   `votes`
+Associations:
+        Vote belongsTo Translation
+        Vote belongsTo User
+
+Name:       Comment
+DB Table:   `comments`
+Associations:
+        Comment belongsTo Identifier
+        Comment belongsTo User
+
diff --git a/code/ryzom/tools/server/www/webtt/docs/db/erd.png b/code/ryzom/tools/server/www/webtt/docs/db/erd.png
new file mode 100644
index 000000000..d49b4e49c
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/docs/db/erd.png differ
diff --git a/code/ryzom/tools/server/www/webtt/docs/db/webtt2.db b/code/ryzom/tools/server/www/webtt/docs/db/webtt2.db
new file mode 100644
index 000000000..41089a9d0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/docs/db/webtt2.db
@@ -0,0 +1,239 @@
+-- MySQL dump 10.13  Distrib 5.1.51, for pc-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: webtt2
+-- ------------------------------------------------------
+-- Server version	5.1.51
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `comments`
+--
+
+DROP TABLE IF EXISTS `comments`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `comments` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `translation_id` int(10) unsigned DEFAULT NULL,
+  `identifier_id` int(10) unsigned DEFAULT NULL,
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `comment` text,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `identifier_id` (`identifier_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `file_identifiers`
+--
+
+DROP TABLE IF EXISTS `file_identifiers`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `file_identifiers` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `imported_translation_file_id` int(10) unsigned DEFAULT NULL,
+  `command` varchar(50) DEFAULT NULL,
+  `translation_index` int(10) unsigned DEFAULT NULL,
+  `identifier_id` int(10) unsigned DEFAULT NULL,
+  `arguments` text,
+  `reference_string` text,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `imported_translation_file_id` (`imported_translation_file_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `identifier_columns`
+--
+
+DROP TABLE IF EXISTS `identifier_columns`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `identifier_columns` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `identifier_id` int(10) unsigned DEFAULT NULL,
+  `column_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `reference_string` text,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `identifier_id` (`identifier_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `identifiers`
+--
+
+DROP TABLE IF EXISTS `identifiers`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `identifiers` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `language_id` int(10) unsigned DEFAULT NULL,
+  `translation_file_id` int(10) unsigned DEFAULT NULL,
+  `translation_index` int(10) unsigned DEFAULT NULL,
+  `identifier` varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `arguments` text,
+  `reference_string` text,
+  `context_description` text,
+  `translated` tinyint(1) DEFAULT '0',
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `translation_file_id` (`translation_file_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `imported_translation_files`
+--
+
+DROP TABLE IF EXISTS `imported_translation_files`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `imported_translation_files` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `language_id` int(10) unsigned DEFAULT NULL,
+  `translation_file_id` int(10) unsigned DEFAULT NULL,
+  `filename` varchar(255) DEFAULT NULL,
+  `merged` tinyint(1) DEFAULT '0',
+  `file_last_modified_date` int(11) DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `translation_file_id` (`translation_file_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `languages`
+--
+
+DROP TABLE IF EXISTS `languages`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `languages` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(50) DEFAULT NULL,
+  `code` varchar(10) DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `code` (`code`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `translation_files`
+--
+
+DROP TABLE IF EXISTS `translation_files`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `translation_files` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `language_id` int(10) unsigned DEFAULT NULL,
+  `filename_template` varchar(255) DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `language_id` (`language_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `translations`
+--
+
+DROP TABLE IF EXISTS `translations`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `translations` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `parent_id` int(10) unsigned DEFAULT NULL,
+  `identifier_id` int(10) unsigned DEFAULT NULL,
+  `identifier_column_id` int(10) unsigned DEFAULT NULL,
+  `translation_text` text,
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `best` tinyint(1) DEFAULT NULL,
+  `translation_hash` varchar(32) DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `best` (`best`),
+  KEY `identifier_column_id` (`identifier_column_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `users`
+--
+
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `name` varchar(100) DEFAULT NULL,
+  `email` varchar(200) DEFAULT NULL,
+  `activated` tinyint(1) DEFAULT NULL,
+  `username` varchar(40) DEFAULT NULL,
+  `password` varchar(100) DEFAULT NULL,
+  `role` varchar(20) DEFAULT NULL,
+  `confirm_hash` varchar(40) DEFAULT NULL,
+  `last_login` datetime DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+LOCK TABLES `users` WRITE;
+/*!40000 ALTER TABLE `users` DISABLE KEYS */;
+
+INSERT INTO `users` VALUES (1,'Admin','',1,'admin','9ff60bfc5939c7863518e202cba4dff81da316be','admin',NULL,NULL,NULL,NULL);
+
+/*!40000 ALTER TABLE `users` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `votes`
+--
+
+DROP TABLE IF EXISTS `votes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `votes` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `translation_id` int(10) unsigned DEFAULT NULL,
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `created` datetime DEFAULT NULL,
+  `modified` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
diff --git a/code/ryzom/tools/server/www/webtt/index.php b/code/ryzom/tools/server/www/webtt/index.php
new file mode 100644
index 000000000..9fd58145e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/index.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Requests collector.
+ *
+ *  This file collects requests if:
+ *	- no mod_rewrite is avilable or .htaccess files are not supported
+ *  - requires App.baseUrl to be uncommented in app/config/core.php
+ *	- app/webroot is not set as a document root.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org CakePHP(tm) Project
+ * @package       cake
+ * @since         CakePHP(tm) v 0.2.9
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+/**
+ *  Get Cake's root directory
+ */
+	define('APP_DIR', 'app');
+	define('DS', DIRECTORY_SEPARATOR);
+	define('ROOT', dirname(__FILE__));
+	define('WEBROOT_DIR', 'webroot');
+	define('WWW_ROOT', ROOT . DS . APP_DIR . DS . WEBROOT_DIR . DS);
+/**
+ * This only needs to be changed if the "cake" directory is located
+ * outside of the distributed structure.
+ * Full path to the directory containing "cake". Do not add trailing directory separator
+ */
+	if (!defined('CAKE_CORE_INCLUDE_PATH')) {
+		define('CAKE_CORE_INCLUDE_PATH', ROOT);
+	}
+
+/**
+ * Set the include path or define app and core path
+ */
+	if (function_exists('ini_set')) {
+		ini_set('include_path',
+			ini_get('include_path') . PATH_SEPARATOR . CAKE_CORE_INCLUDE_PATH
+			. PATH_SEPARATOR . ROOT . DS . APP_DIR . DS
+		);
+		define('APP_PATH', null);
+		define('CORE_PATH', null);
+	} else {
+		define('APP_PATH', ROOT . DS . APP_DIR . DS);
+		define('CORE_PATH', CAKE_CORE_INCLUDE_PATH . DS);
+	}
+	require APP_DIR . DS . WEBROOT_DIR . DS . 'index.php';
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/.gitignore b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/.gitignore
new file mode 100644
index 000000000..983a9993d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/.gitignore
@@ -0,0 +1,15 @@
+*.diff
+*.err
+*.orig
+*.rej
+*.swo
+*.swp
+*.vi
+*~
+.DS_Store
+.cache
+.project
+.settings
+.svn
+errors.err
+tags
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/README.mdown b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/README.mdown
new file mode 100644
index 000000000..10a386c7a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/README.mdown
@@ -0,0 +1,31 @@
+# CakePHP DebugKit
+
+DebugKit provides a debugging toolbar and enhanced debugging tools for CakePHP applications.
+
+## Installation
+
+* Clone/Copy the files in this directory into `app/plugins/debug_kit`
+* Include the toolbar component in your `app_controller.php`:
+   * `var $components = array('DebugKit.Toolbar');`
+* Set debug mode to at least 1.
+* Make sure to remove the 'sql_dump' element from your layout if you want to experience the awesome that is the debug kit SQL log.
+
+## Documentation
+
+Further documentation including additional configuration and ways of extending DebugKit can be found in the [Lighthouse wiki](http://cakephp.lighthouseapp.com/projects/42880-debug-kit/overview)
+
+## Reporting issues
+
+If you have an issues with DebugKit please open a ticket on lighthouse http://cakephp.lighthouseapp.com/projects/42880-debug-kit/overview
+
+## Contributing
+
+If you'd like to contribute to DebugKit, check out the [Roadmap](http://cakephp.lighthouseapp.com/projects/42880/roadmap) for any planned features.  You can fork the project add features and send pull requests, or open tickets on lighthouse.
+
+## Versions
+
+DebugKit has several versions, they are compatible with different release of CakePHP.
+
+* `1.0 -> 1.2` are compatible with CakePHP 1.2.x.  These releases of DebugKit will not work with CakePHP 1.3.
+* `1.3` is compatible with CakePHP 1.3.x only.  It will not work with CakePHP 1.2.
+
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/build.py b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/build.py
new file mode 100755
index 000000000..ba75dcf62
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/build.py
@@ -0,0 +1,130 @@
+#! /usr/bin/env python
+
+import sys, os
+import tarfile, zipfile, gzip, bz2
+from optparse import OptionParser
+
+"""
+Builds packaged releases of DebugKit so I don't have to do things manually.
+
+Excludes itself (build.py), .gitignore, .DS_Store and the .git folder from the archives.
+"""
+def main():
+    parser = OptionParser();
+    parser.add_option('-o', '--output-dir', dest="output_dir",
+                      help="write the packages to DIR", metavar="DIR")
+    parser.add_option('-p', '--prefix-name', dest="prefix",
+                      help="prefix used for the generated files")
+    parser.add_option('-k', '--skip', dest="skip", default="",
+                      help="A comma separated list of files to skip")
+    parser.add_option('-s', '--source-dir', dest="source", default=".",
+                      help="The source directory for the build process")
+
+    (options, args) = parser.parse_args()
+
+    if options.output_dir == '' or options.output_dir == options.source:
+        print 'Requires an output dir, and that output dir cannot be the same as the source one!'
+        exit()
+
+    # append .git and build.py to the skip files
+    skip = options.skip.split(',')
+    skip.extend(['.git', '.gitignore', '.DS_Store', 'build.py'])
+
+    # get list of files in top level dir.
+    files = os.listdir(options.source)
+
+    os.chdir(options.source)
+
+    # filter the files, I couldn't figure out how to do it in a more concise way.
+    for f in files[:]:
+        try:
+            skip.index(f)
+            files.remove(f)
+        except ValueError:
+            pass
+    
+    # make a boring tar file
+    destfile = ''.join([options.output_dir, options.prefix])
+    tar_file_name = destfile + '.tar'
+    tar = tarfile.open(tar_file_name, 'w');
+    for f in files:
+        tar.add(f)
+    tar.close()
+    print "Generated tar file"
+
+    # make the gzip
+    if make_gzip(tar_file_name, destfile):
+        print "Generated gzip file"
+    else:
+        print "Could not generate gzip file"
+    
+    # make the bz2
+    if make_bz2(tar_file_name, destfile):
+        print "Generated bz2 file"
+    else:
+        print "Could not generate bz2 file"
+
+    # make the zip file
+    zip_recursive(destfile + '.zip', options.source, files)
+    print "Generated zip file\n"
+
+def make_gzip(tar_file, destination):
+    """
+    Takes a tar_file and destination. Compressess the tar file and creates
+    a .tar.gzip
+    """
+    tar_contents = open(tar_file, 'rb')
+    gzipfile = gzip.open(destination + '.tar.gz', 'wb')
+    gzipfile.writelines(tar_contents)
+    gzipfile.close()
+    tar_contents.close()
+    return True
+
+def make_bz2(tar_file, destination):
+    """
+    Takes a tar_file and destination. Compressess the tar file and creates
+    a .tar.bz2
+    """
+    tar_contents = open(tar_file, 'rb')
+    bz2file = bz2.BZ2File(destination + '.tar.bz2', 'wb')
+    bz2file.writelines(tar_contents)
+    bz2file.close()
+    tar_contents.close()
+    return True
+
+def zip_recursive(destination, source_dir, rootfiles):
+    """
+    Recursively zips source_dir into destination.
+    rootfiles should contain a list of files in the top level directory that 
+    are to be included.  Any top level files not in rootfiles will be omitted
+    from the zip file.
+    """
+    zipped = zipfile.ZipFile(destination, 'w', zipfile.ZIP_DEFLATED)
+
+    for root, dirs, files in os.walk(source_dir):
+        inRoot = False
+        if root == source_dir:
+            inRoot = True
+        
+        if inRoot:
+            for d in dirs:
+                try:
+                    rootfiles.index(d)
+                except ValueError:
+                    dirs.remove(d)
+
+        for f in files[:]:
+            if inRoot:
+                try:
+                    rootfiles.index(f)
+                except ValueError:
+                    continue
+            
+            fullpath = os.path.join(root, f)
+            zipped.write(fullpath)
+    zipped.close()
+    return destination
+
+
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/components/toolbar.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/components/toolbar.php
new file mode 100644
index 000000000..1066cf75f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/components/toolbar.php
@@ -0,0 +1,700 @@
+<?php
+/**
+ * DebugKit DebugToolbar Component
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.controllers.components
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+class ToolbarComponent extends Object {
+/**
+ * Settings for the Component
+ *
+ * - forceEnable - Force the toolbar to display even if debug == 0. Default = false
+ * - autoRun - Automatically display the toolbar. If set to false, toolbar display can be triggered by adding
+ *    `?debug=true` to your URL.
+ *
+ * @var array
+ **/
+	var $settings = array(
+		'forceEnable' => false,
+		'autoRun' => true
+	);
+
+/**
+ * Controller instance reference
+ *
+ * @var object
+ */
+	var $controller;
+
+/**
+ * Components used by DebugToolbar
+ *
+ * @var array
+ */
+	var $components = array('RequestHandler', 'Session');
+
+/**
+ * The default panels the toolbar uses.
+ * which panels are used can be configured when attaching the component
+ *
+ * @var array
+ */
+	var $_defaultPanels = array('history', 'session', 'request', 'sqlLog', 'timer', 'log', 'variables');
+
+/**
+ * Loaded panel objects.
+ *
+ * @var array
+ */
+	var $panels = array();
+
+/**
+ * javascript files component will be using
+ *
+ * @var array
+ **/
+	var $javascript = array(
+		'behavior' => '/debug_kit/js/js_debug_toolbar'
+	);
+
+/**
+ * CacheKey used for the cache file.
+ *
+ * @var string
+ **/
+	var $cacheKey = 'toolbar_cache';
+
+/**
+ * Duration of the debug kit history cache
+ *
+ * @var string
+ **/
+	var $cacheDuration = '+4 hours';
+
+/**
+ * initialize
+ *
+ * If debug is off the component will be disabled and not do any further time tracking
+ * or load the toolbar helper.
+ *
+ * @return bool
+ **/
+	function initialize(&$controller, $settings) {
+		$this->settings = am($this->settings, $settings);
+		if (!Configure::read('debug') && empty($this->settings['forceEnable'])) {
+			$this->enabled = false;
+			return false;
+		}
+		if ($this->settings['autoRun'] == false && !isset($controller->params['url']['debug'])) {
+			$this->enabled = false;
+			return false;
+		}
+		App::import('Vendor', 'DebugKit.DebugKitDebugger');
+
+		DebugKitDebugger::setMemoryPoint(__d('debug_kit', 'Component initialization', true));
+		DebugKitDebugger::startTimer('componentInit', __d('debug_kit', 'Component initialization and startup', true));
+
+		$panels = $this->_defaultPanels;
+		if (isset($settings['panels'])) {
+			$panels = $this->_makePanelList($settings['panels']);
+			unset($settings['panels']);
+		}
+
+		$this->cacheKey .= $this->Session->read('Config.userAgent');
+		if (in_array('history', $panels) || (isset($settings['history']) && $settings['history'] !== false)) {
+			$this->_createCacheConfig();
+		}
+
+		$this->_loadPanels($panels, $settings);
+
+		$this->_set($settings);
+		$this->controller =& $controller;
+		return false;
+	}
+
+/**
+ * Go through user panels and remove default panels as indicated.
+ *
+ * @param array $userPanels The list of panels ther user has added removed.
+ * @return array Array of panels to use.
+ **/
+	function _makePanelList($userPanels) {
+		$panels = $this->_defaultPanels;
+		foreach ($userPanels as $key => $value) {
+			if (is_numeric($key)) {
+				$panels[] = $value;
+			}
+			if (is_string($key) && $value === false) {
+				$index = array_search($key, $panels);
+				if ($index !== false) {
+					unset($panels[$index]);
+				}
+			}
+		}
+		return $panels;
+	}
+
+/**
+ * Component Startup
+ *
+ * @return bool
+ **/
+	function startup(&$controller) {
+		$currentViewClass = $controller->view;
+		$this->_makeViewClass($currentViewClass);
+		$controller->view = 'DebugKit.Debug';
+		$isHtml = (
+			!isset($controller->params['url']['ext']) ||
+			(isset($controller->params['url']['ext']) && $controller->params['url']['ext'] == 'html')
+		);
+
+		if (!$this->RequestHandler->isAjax() && $isHtml) {
+			$format = 'Html';
+		} else {
+			$format = 'FirePhp';
+		}
+		$controller->helpers['DebugKit.Toolbar'] = array(
+			'output' => sprintf('DebugKit.%sToolbar', $format),
+			'cacheKey' => $this->cacheKey,
+			'cacheConfig' => 'debug_kit',
+			'forceEnable' => $this->settings['forceEnable'],
+		);
+		$panels = array_keys($this->panels);
+		foreach ($panels as $panelName) {
+			$this->panels[$panelName]->startup($controller);
+		}
+		DebugKitDebugger::stopTimer('componentInit');
+		DebugKitDebugger::startTimer('controllerAction', __d('debug_kit', 'Controller action', true));
+		DebugKitDebugger::setMemoryPoint(__d('debug_kit', 'Controller action start', true));
+	}
+
+/**
+ * beforeRedirect callback
+ *
+ * @return void
+ **/
+	function beforeRedirect(&$controller) {
+		if (!class_exists('DebugKitDebugger')) {
+			return null;
+		}
+		DebugKitDebugger::stopTimer('controllerAction');
+		$vars = $this->_gatherVars($controller);
+		$this->_saveState($controller, $vars);
+	}
+
+/**
+ * beforeRender callback
+ *
+ * Calls beforeRender on all the panels and set the aggregate to the controller.
+ *
+ * @return void
+ **/
+	function beforeRender(&$controller) {
+		if (!class_exists('DebugKitDebugger')) {
+			return null;
+		}
+		DebugKitDebugger::stopTimer('controllerAction');
+		$vars = $this->_gatherVars($controller);
+		$this->_saveState($controller, $vars);
+
+		$controller->set(array('debugToolbarPanels' => $vars, 'debugToolbarJavascript' => $this->javascript));
+		DebugKitDebugger::startTimer('controllerRender', __d('debug_kit', 'Render Controller Action', true));
+		DebugKitDebugger::setMemoryPoint(__d('debug_kit', 'Controller render start', true));
+	}
+
+/**
+ * Load a toolbar state from cache
+ *
+ * @param int $key
+ * @return array
+ **/
+	function loadState($key) {
+		$history = Cache::read($this->cacheKey, 'debug_kit');
+		if (isset($history[$key])) {
+			return $history[$key];
+		}
+		return array();
+	}
+
+/**
+ * Create the cache config for the history
+ *
+ * @return void
+ * @access protected
+ **/
+	function _createCacheConfig() {
+		if (Configure::read('Cache.disable') !== true) {
+			Cache::config('debug_kit', array(
+				'duration' => $this->cacheDuration,
+				'engine' => 'File',
+				'path' => CACHE
+			));
+			Cache::config('default');
+		}
+	}
+
+/**
+ * collects the panel contents
+ *
+ * @return array Array of all panel beforeRender()
+ * @access protected
+ **/
+	function _gatherVars(&$controller) {
+		$vars = array();
+		$panels = array_keys($this->panels);
+
+		foreach ($panels as $panelName) {
+			$panel =& $this->panels[$panelName];
+			$panelName = Inflector::underscore($panelName);
+			$vars[$panelName]['content'] = $panel->beforeRender($controller);
+			$elementName = Inflector::underscore($panelName) . '_panel';
+			if (isset($panel->elementName)) {
+				$elementName = $panel->elementName;
+			}
+			$vars[$panelName]['elementName'] = $elementName;
+			$vars[$panelName]['plugin'] = $panel->plugin;
+			$vars[$panelName]['title'] = $panel->title;
+			$vars[$panelName]['disableTimer'] = true;
+		}
+		return $vars;
+	}
+
+/**
+ * Load Panels used in the debug toolbar
+ *
+ * @return 	void
+ * @access protected
+ **/
+	function _loadPanels($panels, $settings) {
+		foreach ($panels as $panel) {
+			$className = $panel . 'Panel';
+			if (!class_exists($className) && !App::import('Vendor',  $className)) {
+				trigger_error(sprintf(__d('debug_kit', 'Could not load DebugToolbar panel %s', true), $panel), E_USER_WARNING);
+				continue;
+			}
+			list($plugin, $className) = pluginSplit($className);
+			$panelObj =& new $className($settings);
+			if (is_subclass_of($panelObj, 'DebugPanel') || is_subclass_of($panelObj, 'debugpanel')) {
+				list(, $panel) = pluginSplit($panel);
+				$this->panels[$panel] =& $panelObj;
+			}
+		}
+	}
+/**
+ * Makes the DoppleGangerView class if it doesn't already exist.
+ * This allows DebugView to be compatible with all view classes.
+ *
+ * @param string $baseClassName
+ * @access protected
+ * @return void
+ */
+	function _makeViewClass($baseClassName) {
+		if (!class_exists('DoppelGangerView')) {
+			$parent = strtolower($baseClassName) === 'view' ? false : true;
+			App::import('View', $baseClassName, $parent);
+			if (strpos($baseClassName, '.') !== false) {
+				list($plugin, $baseClassName) = explode('.', $baseClassName);
+			}
+			if (strpos($baseClassName, 'View') === false) {
+				$baseClassName .= 'View';
+			}
+			$class = "class DoppelGangerView extends $baseClassName {}";
+			$this->_eval($class);
+		}
+	}
+
+/**
+ * Method wrapper for eval() for testing uses.
+ *
+ * @return void
+ **/
+	function _eval($code) {
+		eval($code);
+	}
+
+/**
+ * Save the current state of the toolbar varibles to the cache file.
+ *
+ * @param object $controller Controller instance
+ * @param array $vars Vars to save.
+ * @access protected
+ * @return void
+ **/
+	function _saveState(&$controller, $vars) {
+		$config = Cache::config('debug_kit');
+		if (empty($config) || !isset($this->panels['history'])) {
+			return;
+		}
+		$history = Cache::read($this->cacheKey, 'debug_kit');
+		if (empty($history)) {
+			$history = array();
+		}
+		if (count($history) == $this->panels['history']->history) {
+			array_pop($history);
+		}
+		unset($vars['history']);
+		array_unshift($history, $vars);
+		Cache::write($this->cacheKey, $history, 'debug_kit');
+	}
+}
+
+/**
+ * Debug Panel
+ *
+ * Abstract class for debug panels.
+ *
+ * @package       cake.debug_kit
+ */
+class DebugPanel extends Object {
+/**
+ * Defines which plugin this panel is from so the element can be located.
+ *
+ * @var string
+ */
+	var $plugin = null;
+
+/**
+ * Defines the title for displaying on the toolbar. If null, the class name will be used.
+ * Overriding this allows you to define a custom name in the toolbar.
+ *
+ * @var string
+ */
+	var $title = null;
+
+/**
+ * Provide a custom element name for this panel.  If null, the underscored version of the class
+ * name will be used.
+ *
+ * @var string
+ */
+	var $elementName = null;
+
+/**
+ * startup the panel
+ *
+ * Pull information from the controller / request
+ *
+ * @param object $controller Controller reference.
+ * @return void
+ **/
+	function startup(&$controller) { }
+
+/**
+ * Prepare output vars before Controller Rendering.
+ *
+ * @param object $controller Controller reference.
+ * @return void
+ **/
+	function beforeRender(&$controller) { }
+}
+
+/**
+ * History Panel
+ *
+ * Provides debug information on previous requests.
+ *
+ * @package       cake.debug_kit.panels
+ **/
+class HistoryPanel extends DebugPanel {
+
+	var $plugin = 'debug_kit';
+
+/**
+ * Number of history elements to keep
+ *
+ * @var string
+ **/
+	var $history = 5;
+
+/**
+ * Constructor
+ *
+ * @param array $settings Array of settings.
+ * @return void
+ **/
+	function __construct($settings) {
+		if (isset($settings['history'])) {
+			$this->history = $settings['history'];
+		}
+	}
+
+/**
+ * beforeRender callback function
+ *
+ * @return array contents for panel
+ **/
+	function beforeRender(&$controller) {
+		$cacheKey = $controller->Toolbar->cacheKey;
+		$toolbarHistory = Cache::read($cacheKey, 'debug_kit');
+		$historyStates = array();
+		if (is_array($toolbarHistory) && !empty($toolbarHistory)) {
+			$prefix = array();
+			if (!empty($controller->params['prefix'])) {
+				$prefix[$controller->params['prefix']] = false;
+			}
+			foreach ($toolbarHistory as $i => $state) {
+				if (!isset($state['request']['content']['params']['url']['url'])) {
+					continue;
+				}
+				$historyStates[] = array(
+					'title' => $state['request']['content']['params']['url']['url'],
+					'url' => array_merge($prefix, array(
+						'plugin' => 'debug_kit',
+						'controller' => 'toolbar_access',
+						'action' => 'history_state',
+						$i + 1))
+				);
+			}
+		}
+		if (count($historyStates) >= $this->history) {
+			array_pop($historyStates);
+		}
+		return $historyStates;
+	}
+}
+
+/**
+ * Variables Panel
+ *
+ * Provides debug information on the View variables.
+ *
+ * @package       cake.debug_kit.panels
+ **/
+class VariablesPanel extends DebugPanel {
+
+	var $plugin = 'debug_kit';
+
+/**
+ * beforeRender callback
+ *
+ * @return array
+ **/
+	function beforeRender(&$controller) {
+		return array_merge($controller->viewVars, array('$this->data' => $controller->data));
+	}
+}
+
+/**
+ * Session Panel
+ *
+ * Provides debug information on the Session contents.
+ *
+ * @package       cake.debug_kit.panels
+ **/
+class SessionPanel extends DebugPanel {
+
+	var $plugin = 'debug_kit';
+
+/**
+ * beforeRender callback
+ *
+ * @param object $controller
+ * @access public
+ * @return array
+ */
+	function beforeRender(&$controller) {
+		$sessions = $controller->Toolbar->Session->read();
+		return $sessions;
+	}
+}
+
+/**
+ * Request Panel
+ *
+ * Provides debug information on the Current request params.
+ *
+ * @package       cake.debug_kit.panels
+ **/
+class RequestPanel extends DebugPanel {
+
+	var $plugin = 'debug_kit';
+
+/**
+ * beforeRender callback - grabs request params
+ *
+ * @return array
+ **/
+	function beforeRender(&$controller) {
+		$out = array();
+		$out['params'] = $controller->params;
+		if (isset($controller->Cookie)) {
+			$out['cookie'] = $controller->Cookie->read();
+		}
+		$out['get'] = $_GET;
+		$out['currentRoute'] = Router::currentRoute();
+		return $out;
+	}
+}
+
+/**
+ * Timer Panel
+ *
+ * Provides debug information on all timers used in a request.
+ *
+ * @package       cake.debug_kit.panels
+ **/
+class TimerPanel extends DebugPanel {
+
+	var $plugin = 'debug_kit';
+	
+/**
+ * startup - add in necessary helpers
+ *
+ * @return void
+ **/
+	function startup(&$controller) {
+		if (!in_array('Number', $controller->helpers)) {
+			$controller->helpers[] = 'Number';
+		}
+		if (!in_array('SimpleGraph', $controller->helpers)) {
+			$controller->helpers[] = 'DebugKit.SimpleGraph';
+		}
+	}
+}
+
+/**
+ * SqlLog Panel
+ *
+ * Provides debug information on the SQL logs and provides links to an ajax explain interface.
+ *
+ * @package       cake.debug_kit.panels
+ **/
+class SqlLogPanel extends DebugPanel {
+
+	var $plugin = 'debug_kit';
+
+/**
+ * Minimum number of Rows Per Millisecond that must be returned by a query before an explain
+ * is done.
+ *
+ * @var int
+ **/
+	var $slowRate = 20;
+
+/**
+ * Gets the connection names that should have logs + dumps generated.
+ *
+ * @param string $controller
+ * @access public
+ * @return void
+ */
+	function beforeRender(&$controller) {
+		if (!class_exists('ConnectionManager')) {
+			return array();
+		}
+		$connections = array();
+
+		$dbConfigs = ConnectionManager::sourceList();
+		foreach ($dbConfigs as $configName) {
+			$driver = null;
+			$db =& ConnectionManager::getDataSource($configName);
+			if (
+				(empty($db->config['driver']) && empty($db->config['datasource'])) ||
+				!$db->isInterfaceSupported('getLog')
+			) {
+				continue;
+			}
+
+			if (isset($db->config['driver'])) {
+				$driver = $db->config['driver'];
+			}
+			if (empty($driver) && isset($db->config['datasource'])) {
+				$driver = $db->config['datasource'];
+			}
+			$explain = false;
+			$isExplainable = ($driver === 'mysql' || $driver === 'mysqli' || $driver === 'postgres');
+			if ($isExplainable) {
+				$explain = true;
+			}
+			$connections[$configName] = $explain;
+		}
+		return array('connections' => $connections, 'threshold' => $this->slowRate);
+	}
+}
+
+/**
+ * Log Panel - Reads log entries made this request.
+ *
+ * @package       cake.debug_kit.panels
+ */
+class LogPanel extends DebugPanel {
+
+	var $plugin = 'debug_kit';
+
+/**
+ * Constructor - sets up the log listener.
+ *
+ * @return void
+ */
+	function __construct($settings) {
+		parent::__construct();
+		if (!class_exists('CakeLog')) {
+			App::import('Core', 'CakeLog');
+		}
+		$existing = CakeLog::configured();
+		if (empty($existing)) {
+			CakeLog::config('default', array(
+				'engine' => 'FileLog'
+			));
+		}
+		CakeLog::config('debug_kit_log_panel', array(
+			'engine' => 'DebugKitLogListener',
+			'panel' => $this
+		));
+	}
+
+/**
+ * beforeRender Callback
+ *
+ * @return array
+ **/
+	function beforeRender(&$controller) {
+		$logs = $this->logger->logs;
+		return $logs;
+	}
+}
+
+/**
+ * A CakeLog listener which saves having to munge files or other configured loggers.
+ *
+ * @package debug_kit.components
+ */
+class DebugKitLogListener {
+
+	var $logs = array();
+
+/**
+ * Makes the reverse link needed to get the logs later.
+ *
+ * @return void
+ */
+	function DebugKitLogListener($options) {
+		$options['panel']->logger =& $this;
+	}
+
+/**
+ * Captures log messages in memory
+ *
+ * @return void
+ */
+	function write($type, $message) {
+		if (!isset($this->logs[$type])) {
+			$this->logs[$type] = array();
+		}
+		$this->logs[$type][] = array(date('Y-m-d H:i:s'), $message);
+	}
+}
+
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php
new file mode 100644
index 000000000..5e6afdf31
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/controllers/toolbar_access_controller.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * DebugKit ToolbarAccess Controller
+ *
+ * Allows retrieval of information from the debugKit internals.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.controllers
+ * @since         DebugKit 1.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+class ToolbarAccessController extends DebugKitAppController {
+/**
+ * name
+ *
+ * @var string
+ */
+	var $name = 'ToolbarAccess';
+
+/**
+ * Helpers
+ *
+ * @var array
+ **/
+	var $helpers = array(
+		'DebugKit.Toolbar' => array('output' => 'DebugKit.HtmlToolbar'),
+		'Javascript', 'Number', 'DebugKit.SimpleGraph'
+	);
+
+/**
+ * Components
+ *
+ * @var array
+ **/
+	var $components = array('RequestHandler', 'DebugKit.Toolbar');
+
+/**
+ * Uses
+ *
+ * @var array
+ **/
+	var $uses = array('DebugKit.ToolbarAccess');
+
+/**
+ * beforeFilter callback
+ *
+ * @return void
+ **/
+	function beforeFilter() {
+		parent::beforeFilter();
+		if (isset($this->Toolbar)) {
+			$this->Toolbar->enabled = false;
+		}
+		$this->helpers['DebugKit.Toolbar']['cacheKey'] = $this->Toolbar->cacheKey;
+		$this->helpers['DebugKit.Toolbar']['cacheConfig'] = 'debug_kit';
+	}
+
+/**
+ * Get a stored history state from the toolbar cache.
+ *
+ * @return void
+ **/
+	function history_state($key = null) {
+		if (Configure::read('debug') == 0) {
+			return $this->redirect($this->referer());
+		}
+		$oldState = $this->Toolbar->loadState($key);
+		$this->set('toolbarState', $oldState);
+		$this->set('debugKitInHistoryMode', true);
+	}
+
+/**
+ * Run SQL explain/profiling on queries. Checks the hash + the hashed queries, 
+ * if there is mismatch a 404 will be rendered.  If debug == 0 a 404 will also be
+ * rendered.  No explain will be run if a 404 is made.
+ *
+ * @return void
+ */
+	function sql_explain() {
+		if (
+			!$this->RequestHandler->isPost() ||
+			empty($this->data['log']['sql']) || 
+			empty($this->data['log']['ds']) ||
+			empty($this->data['log']['hash']) ||
+			Configure::read('debug') == 0
+		) {
+			$this->cakeError('error404', array(array(
+				'message' => 'Invalid parameters'
+			)));
+		}
+		App::import('Core', 'Security');
+		$hash = Security::hash($this->data['log']['sql'] . $this->data['log']['ds'], null, true);
+		if ($hash !== $this->data['log']['hash']) {
+			$this->cakeError('error404', array(array(
+				'message' => 'Invalid parameters'
+			)));
+		}
+		$result = $this->ToolbarAccess->explainQuery($this->data['log']['ds'], $this->data['log']['sql']);
+		$this->set(compact('result'));
+	}
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_controller.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_controller.php
new file mode 100644
index 000000000..3592cb5ed
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_controller.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Debug Kit App Controller
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+class DebugKitAppController extends AppController {
+	
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_model.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_model.php
new file mode 100644
index 000000000..4b0f248a3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/debug_kit_app_model.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Debug Kit App Model
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+class DebugKitAppModel extends AppModel {
+	
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/debug_kit.pot b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/debug_kit.pot
new file mode 100644
index 000000000..df4988dd1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/debug_kit.pot
@@ -0,0 +1,138 @@
+# LANGUAGE translation of Debug Kit Application
+# Copyright 2008 Andy Dawson <andydawson76@yahoo.co.uk>
+# No version information was available in the source files.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: debug_kit-\n"
+"POT-Creation-Date: 2009-05-27 09:47+0200\n"
+"PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
+"Last-Translator: Andy Dawson <andydawson76@yahoo.co.uk>\n"
+"Language-Team:\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Basepath: ../../../\n"
+
+#: controllers/components/toolbar.php:91
+msgid "Component initialization and startup"
+msgstr ""
+
+#: controllers/components/toolbar.php:140
+msgid "Controller Action"
+msgstr ""
+
+#: controllers/components/toolbar.php:167
+msgid "Render Controller Action"
+msgstr ""
+
+#: controllers/components/toolbar.php:231
+msgid "Could not load DebugToolbar panel %s"
+msgstr ""
+
+#: views/elements/debug_toolbar.ctp:25
+msgid "There are no active panels. You must enable a panel to see its output."
+msgstr ""
+
+#: views/elements/history_panel.ctp:21
+msgid "Request History"
+msgstr ""
+
+#: views/elements/history_panel.ctp:23
+msgid "No previous requests logged."
+msgstr ""
+
+#: views/elements/history_panel.ctp:25
+msgid "previous requests available"
+msgstr ""
+
+#: views/elements/history_panel.ctp:27
+msgid "Restore to current request"
+msgstr ""
+
+#: views/elements/log_panel.ctp:21
+msgid "Logs"
+msgstr ""
+
+#: views/elements/log_panel.ctp:28
+msgid "Time"
+msgstr ""
+
+#: views/elements/log_panel.ctp:28
+#: views/elements/timer_panel.ctp:54
+msgid "Message"
+msgstr ""
+
+#: views/elements/log_panel.ctp:37
+msgid "There were no log entries made this request"
+msgstr ""
+
+#: views/elements/request_panel.ctp:21
+msgid "Request"
+msgstr ""
+
+#: views/elements/request_panel.ctp:35
+msgid "Current Route"
+msgstr ""
+
+#: views/elements/session_panel.ctp:21
+msgid "Session"
+msgstr ""
+
+#: views/elements/sql_log_panel.ctp:21
+msgid "Sql Logs"
+msgstr ""
+
+#: views/elements/sql_log_panel.ctp:31
+msgid "toggle (%s) query explains for %s"
+msgstr ""
+
+#: views/elements/sql_log_panel.ctp:39
+msgid "No slow queries!, or your database does not support EXPLAIN"
+msgstr ""
+
+#: views/elements/sql_log_panel.ctp:44
+msgid "No active database connections"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:33
+msgid "Memory"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:35
+msgid "Current Memory Use"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:39
+msgid "Peak Memory Use"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:43
+msgid "Timers"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:45
+msgid "%s (ms)"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:46
+msgid "Total Request Time:"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:54
+msgid "Time in ms"
+msgstr ""
+
+#: views/elements/timer_panel.ctp:54
+msgid "Graph"
+msgstr ""
+
+#: views/elements/variables_panel.ctp:21
+msgid "View Variables"
+msgstr ""
+
+#: views/helpers/simple_graph.php:79
+msgid "Starting %sms into the request, taking %sms"
+msgstr ""
+
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po
new file mode 100644
index 000000000..9aec83297
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/eng/LC_MESSAGES/debug_kit.po
@@ -0,0 +1,135 @@
+# LANGUAGE translation of CakePHP Application
+# Copyright YEAR NAME <EMAIL@ADDRESS>
+# No version information was available in the source files.
+#
+#, fuzzy
+msgid   ""
+msgstr  "Project-Id-Version: PROJECT VERSION\n"
+        "POT-Creation-Date: 2009-05-27 09:47+0200\n"
+        "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
+        "Last-Translator: NAME <EMAIL@ADDRESS>\n"
+        "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
+        "MIME-Version: 1.0\n"
+        "Content-Type: text/plain; charset=UTF-8\n"
+        "Content-Transfer-Encoding: 8bit\n"
+        "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: controllers/components/toolbar.php:91
+msgid   "Component initialization and startup"
+msgstr  ""
+
+#: controllers/components/toolbar.php:140
+msgid   "Controller Action"
+msgstr  ""
+
+#: controllers/components/toolbar.php:167
+msgid   "Render Controller Action"
+msgstr  ""
+
+#: controllers/components/toolbar.php:231
+msgid   "Could not load DebugToolbar panel %s"
+msgstr  ""
+
+#: views/elements/debug_toolbar.ctp:25
+msgid   "There are no active panels. You must enable a panel to see its output."
+msgstr  ""
+
+#: views/elements/history_panel.ctp:21
+msgid   "Request History"
+msgstr  ""
+
+#: views/elements/history_panel.ctp:23
+msgid   "No previous requests logged."
+msgstr  ""
+
+#: views/elements/history_panel.ctp:25
+msgid   "previous requests available"
+msgstr  ""
+
+#: views/elements/history_panel.ctp:27
+msgid   "Restore to current request"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:21
+msgid   "Logs"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:28
+msgid   "Time"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:28 views/elements/timer_panel.ctp:54
+msgid   "Message"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:37
+msgid   "There were no log entries made this request"
+msgstr  ""
+
+#: views/elements/request_panel.ctp:21
+msgid   "Request"
+msgstr  ""
+
+#: views/elements/request_panel.ctp:35
+msgid   "Current Route"
+msgstr  ""
+
+#: views/elements/session_panel.ctp:21
+msgid   "Session"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:21
+msgid   "Sql Logs"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:31
+msgid   "toggle (%s) query explains for %s"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:39
+msgid   "No slow queries!, or your database does not support EXPLAIN"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:44
+msgid   "No active database connections"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:33
+msgid   "Memory"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:35
+msgid   "Current Memory Use"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:39
+msgid   "Peak Memory Use"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:43
+msgid   "Timers"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:45
+msgid   "%s (ms)"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:46
+msgid   "Total Request Time:"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:54
+msgid   "Time in ms"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:54
+msgid   "Graph"
+msgstr  ""
+
+#: views/elements/variables_panel.ctp:21
+msgid   "View Variables"
+msgstr  ""
+
+#: views/helpers/simple_graph.php:79
+msgid   "Starting %sms into the request, taking %sms"
+msgstr  ""
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po
new file mode 100644
index 000000000..0833a4942
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/locale/spa/LC_MESSAGES/debug_kit.po
@@ -0,0 +1,135 @@
+# LANGUAGE translation of CakePHP Application
+# Copyright YEAR NAME <EMAIL@ADDRESS>
+# No version information was available in the source files.
+#
+#, fuzzy
+msgid   ""
+msgstr  "Project-Id-Version: PROJECT VERSION\n"
+        "POT-Creation-Date: 2009-05-27 09:47+0200\n"
+        "PO-Revision-Date: YYYY-mm-DD HH:MM+ZZZZ\n"
+        "Last-Translator: NAME <EMAIL@ADDRESS>\n"
+        "Language-Team: LANGUAGE <EMAIL@ADDRESS>\n"
+        "MIME-Version: 1.0\n"
+        "Content-Type: text/plain; charset=UTF-8\n"
+        "Content-Transfer-Encoding: 8bit\n"
+        "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: controllers/components/toolbar.php:91
+msgid   "Component initialization and startup"
+msgstr  ""
+
+#: controllers/components/toolbar.php:140
+msgid   "Controller Action"
+msgstr  ""
+
+#: controllers/components/toolbar.php:167
+msgid   "Render Controller Action"
+msgstr  ""
+
+#: controllers/components/toolbar.php:231
+msgid   "Could not load DebugToolbar panel %s"
+msgstr  ""
+
+#: views/elements/debug_toolbar.ctp:25
+msgid   "There are no active panels. You must enable a panel to see its output."
+msgstr  ""
+
+#: views/elements/history_panel.ctp:21
+msgid   "Request History"
+msgstr  ""
+
+#: views/elements/history_panel.ctp:23
+msgid   "No previous requests logged."
+msgstr  ""
+
+#: views/elements/history_panel.ctp:25
+msgid   "previous requests available"
+msgstr  ""
+
+#: views/elements/history_panel.ctp:27
+msgid   "Restore to current request"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:21
+msgid   "Logs"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:28
+msgid   "Time"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:28 views/elements/timer_panel.ctp:54
+msgid   "Message"
+msgstr  ""
+
+#: views/elements/log_panel.ctp:37
+msgid   "There were no log entries made this request"
+msgstr  ""
+
+#: views/elements/request_panel.ctp:21
+msgid   "Request"
+msgstr  ""
+
+#: views/elements/request_panel.ctp:35
+msgid   "Current Route"
+msgstr  ""
+
+#: views/elements/session_panel.ctp:21
+msgid   "Session"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:21
+msgid   "Sql Logs"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:31
+msgid   "toggle (%s) query explains for %s"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:39
+msgid   "No slow queries!, or your database does not support EXPLAIN"
+msgstr  ""
+
+#: views/elements/sql_log_panel.ctp:44
+msgid   "No active database connections"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:33
+msgid   "Memory"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:35
+msgid   "Current Memory Use"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:39
+msgid   "Peak Memory Use"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:43
+msgid   "Timers"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:45
+msgid   "%s (ms)"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:46
+msgid   "Total Request Time:"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:54
+msgid   "Time in ms"
+msgstr  ""
+
+#: views/elements/timer_panel.ctp:54
+msgid   "Graph"
+msgstr  ""
+
+#: views/elements/variables_panel.ctp:21
+msgid   "View Variables"
+msgstr  ""
+
+#: views/helpers/simple_graph.php:79
+msgid   "Starting %sms into the request, taking %sms"
+msgstr  ""
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/behaviors/timed.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/behaviors/timed.php
new file mode 100644
index 000000000..28eadec74
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/behaviors/timed.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * DebugKit TimedBehavior
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.models.behaviors
+ * @since         DebugKit 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+
+class TimedBehavior extends ModelBehavior {
+
+/**
+ * Behavior settings
+ *
+ * @access public
+ * @var array
+ */
+	var $settings = array();
+
+/**
+ * Default setting values
+ *
+ * @access private
+ * @var array
+ */
+	var $_defaults = array();
+
+/**
+ * Setup the behavior and import required classes.
+ *
+ * @param object $Model Model using the behavior
+ * @param array $settings Settings to override for model.
+ * @access public
+ * @return void
+ */
+	function setup(&$Model, $settings = null) {
+		if (!class_exists('DebugKitDebugger')){
+			App::import('Vendor', 'DebugKit.DebugKitDebugger');
+		}
+		if (is_array($settings)) {
+			$this->settings[$Model->alias] = array_merge($this->_defaults, $settings);
+		} else {
+			$this->settings[$Model->alias] = $this->_defaults;
+		}
+	}
+
+/**
+ * beforeFind, starts a timer for a find operation.
+ *
+ * @param Model $Model
+ * @param array $queryData Array of query data (not modified)
+ * @return boolean true
+ */
+	function beforeFind(&$Model, $queryData){
+		DebugKitDebugger::startTimer($Model->alias . '_find', $Model->alias . '->find()');
+		return true;
+	}
+
+/**
+ * afterFind, stops a timer for a find operation.
+ *
+ * @param Model $Model
+ * @param array $results Array of results
+ * @return boolean true.
+ */
+	function afterFind(&$Model, $results){
+		DebugKitDebugger::stopTimer($Model->alias . '_find');
+		return true;
+	}
+
+/**
+ * beforeSave, starts a time before a save is initiated.
+ *
+ * @param Model $Model
+ * @return boolean true
+ */
+	function beforeSave(&$Model){
+		DebugKitDebugger::startTimer($Model->alias . '_save', $Model->alias . '->save()');
+		return true;
+	}
+
+/**
+ * afterSave, stop the timer started from a save.
+ *
+ * @param string $Model
+ * @param string $created
+ * @return void
+ */
+	function afterSave(&$Model, $created) {
+		DebugKitDebugger::stopTimer($Model->alias . '_save');
+		return true;
+	}
+ }
+
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/toolbar_access.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/toolbar_access.php
new file mode 100644
index 000000000..ab1fea99b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/models/toolbar_access.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * DebugKit ToolbarAccess Model
+ *
+ * Contains logic for accessing DebugKit specific information.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.controllers
+ * @since         DebugKit 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+class ToolbarAccess extends Object {
+
+/**
+ * Runs an explain on a query if the connection supports EXPLAIN. 
+ * currently only PostgreSQL and MySQL are supported.
+ *
+ * @param string $connection Connection name
+ * @param string $query SQL query to explain / find query plan for.
+ * @return array Array of explain information or empty array if connection is unsupported.
+ */
+	function explainQuery($connection, $query) {
+		App::import('Model', 'ConnectionManager');
+		$db =& ConnectionManager::getDataSource($connection);
+		$driver = $db->config['driver'];
+
+		$return = array();
+		if ($driver === 'mysqli' || $driver === 'mysql' || $driver === 'postgres') {
+			$explained = $db->query('EXPLAIN ' . $query);
+			if ($driver === 'postgres') {
+				$queryPlan = array();
+				foreach ($explained as $postgreValue) {
+					$queryPlan[] = array($postgreValue[0]['QUERY PLAN']);
+				}
+				$return = array_merge(array(array('')), $queryPlan);
+			} else {
+				$keys = array_keys($explained[0][0]);
+				foreach ($explained as $mysqlValue) {
+					$queryPlan[] = array_values($mysqlValue[0]);
+				}
+				$return = array_merge(array($keys), $queryPlan);
+			}
+		}
+		return $return;
+	}
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php
new file mode 100644
index 000000000..3fbbd614b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/behaviors/timed.test.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * DebugKit TimedBehavior test case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.models.behaviors
+ * @since         DebugKit 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Vendor', 'DebugKit.DebugKitDebugger');
+
+class TimedBehaviorTestCase extends CakeTestCase {
+
+	var $fixtures = array('core.article');
+/**
+ * startTest callback
+ *
+ * @return void
+ */
+	function startTest() {
+		$this->Article =& new Model(array('ds' => 'test_suite', 'table' => 'articles', 'name' => 'Article'));
+		$this->Article->Behaviors->attach('DebugKit.Timed');
+	}
+
+/**
+ * end a test
+ *
+ * @return void
+ */
+	function endTest() {
+		unset($this->Article);
+		ClassRegistry::flush();
+		DebugKitDebugger::clearTimers();
+	}
+
+/**
+ * test find timers
+ *
+ * @return void
+ */
+	function testFindTimers() {
+		$timers = DebugKitDebugger::getTimers(false);
+		$this->assertEqual(count($timers), 1);
+
+		$this->Article->find('all');
+		$result = DebugKitDebugger::getTimers(false);
+		$this->assertEqual(count($result), 2);
+		
+		$this->Article->find('all');
+		$result = DebugKitDebugger::getTimers(false);
+		$this->assertEqual(count($result), 3);
+	}
+
+/**
+ * test save timers
+ *
+ * @return void
+ */
+	function testSaveTimers() {
+		$timers = DebugKitDebugger::getTimers(false);
+		$this->assertEqual(count($timers), 1);
+
+		$this->Article->save(array('user_id' => 1, 'title' => 'test', 'body' => 'test'));
+		$result = DebugKitDebugger::getTimers(false);
+		$this->assertEqual(count($result), 2);
+	}
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php
new file mode 100644
index 000000000..05f464ed6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/controllers/components/toolbar.test.php
@@ -0,0 +1,580 @@
+<?php
+/**
+ * DebugToolbar Test
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.controllers.components
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Component', 'DebugKit.Toolbar');
+
+class TestToolbarComponent extends ToolbarComponent {
+	var $evalTest = false;
+	var $evalCode = '';
+
+	function loadPanels($panels, $settings = array()) {
+		$this->_loadPanels($panels, $settings);
+	}
+
+	function _eval($code) {
+		if ($this->evalTest) {
+			$this->evalCode = $code;
+			return;
+		}
+		eval($code);
+	}
+}
+
+Mock::generate('DebugPanel');
+
+if (!class_exists('AppController')) {
+	class AppController extends Controller {
+
+	}
+}
+
+class TestPanel extends DebugPanel {
+
+}
+
+/**
+* DebugToolbar Test case
+*/
+class DebugToolbarTestCase extends CakeTestCase {
+/**
+ * fixtures.
+ *
+ * @var array
+ **/
+	var $fixtures = array('core.article');
+/**
+ * Start test callback
+ *
+ * @access public
+ * @return void
+ **/
+	function startTest() {
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		$this->Controller =& new Controller();
+		$this->Controller->params = Router::parse('/');
+		$this->Controller->params['url']['url'] = '/';
+		$this->Controller->uses = array();
+		$this->Controller->components = array('TestToolBar');
+		$this->Controller->constructClasses();
+		$this->Controller->Toolbar =& $this->Controller->TestToolBar;
+
+		$this->_server = $_SERVER;
+		$this->_paths = array();
+		$this->_paths['plugins'] = App::path('plugins');
+		$this->_paths['views'] = App::path('views');
+		$this->_paths['vendors'] = App::path('vendors');
+		$this->_paths['controllers'] = App::path('controllers');
+		Configure::write('Cache.disable', false);
+	}
+/**
+ * endTest
+ *
+ * @return void
+ **/
+	function endTest() {
+		$_SERVER = $this->_server;
+		App::build(array(
+			'plugins' => $this->_paths['plugins'],
+			'views' => $this->_paths['views'],
+			'controllers' => $this->_paths['controllers'],
+			'vendors' => $this->_paths['vendors']
+		), true);
+		Configure::write('Cache.disable', true);
+
+		unset($this->Controller);
+		if (class_exists('DebugKitDebugger')) {
+			DebugKitDebugger::clearTimers();
+			DebugKitDebugger::clearMemoryPoints();
+		}
+	}
+/**
+ * test Loading of panel classes
+ *
+ * @return void
+ **/
+	function testLoadPanels() {
+		$this->Controller->Toolbar->loadPanels(array('session', 'request'));
+		$this->assertTrue(is_a($this->Controller->Toolbar->panels['session'], 'SessionPanel'));
+		$this->assertTrue(is_a($this->Controller->Toolbar->panels['request'], 'RequestPanel'));
+
+		$this->Controller->Toolbar->loadPanels(array('history'), array('history' => 10));
+		$this->assertEqual($this->Controller->Toolbar->panels['history']->history, 10);
+
+		$this->expectError();
+		$this->Controller->Toolbar->loadPanels(array('randomNonExisting', 'request'));
+	}
+/**
+ * test Loading of panel classes from a plugin
+ *
+ * @return void
+ **/
+	function testLoadPluginPanels() {
+		$this->Controller->Toolbar->loadPanels(array('plugin.test'));
+		$this->assertTrue(is_a($this->Controller->Toolbar->panels['test'], 'TestPanel'));
+	}
+/**
+ * test generating a DoppelGangerView with a pluginView.
+ *
+ * If $this->Controller->Toolbar->startup() has been previously called,
+ * DoppelGangerView class has already been defined.
+ *
+ * @return void
+ **/
+	function testPluginViewParsing() {
+		if (class_exists('DoppelGangerView')) {
+			$this->skipIf(true, 'Class DoppelGangerView already defined, skipping %s');
+			return;
+		}
+		App::import('Vendor', 'DebugKit.DebugKitDebugger');
+		$this->Controller->Toolbar->evalTest = true;
+		$this->Controller->view = 'Plugin.OtherView';
+		$this->Controller->Toolbar->startup($this->Controller);
+		$this->assertPattern('/class DoppelGangerView extends OtherView/', $this->Controller->Toolbar->evalCode);
+	}
+/**
+ * test loading of vendor panels from test_app folder
+ *
+ * @access public
+ * @return void
+ */
+	function testVendorPanels() {
+		$debugKitPath = App::pluginPath('DebugKit');
+		$noDir = (empty($debugKitPath) || !file_exists($debugKitPath));
+		$skip = $this->skipIf($noDir, 'Could not find debug_kit in plugin paths, skipping %s');
+		if ($skip) {
+			return;
+		}
+
+		App::build(array(
+			'vendors' => array($debugKitPath . 'tests' . DS . 'test_app' . DS . 'vendors' . DS)
+		));
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array(
+				'panels' => array('test'),
+			)
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Component->startup($this->Controller);
+		$this->assertTrue(isset($this->Controller->Toolbar->panels['test']));
+		$this->assertTrue(is_a($this->Controller->Toolbar->panels['test'], 'TestPanel'));
+	}
+/**
+ * test initialize
+ *
+ * @return void
+ * @access public
+ **/
+	function testInitialize() {
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+
+		$this->assertFalse(empty($this->Controller->Toolbar->panels));
+
+		$timers = DebugKitDebugger::getTimers();
+		$this->assertTrue(isset($timers['componentInit']));
+		$memory = DebugKitDebugger::getMemoryPoints();
+		$this->assertTrue(isset($memory['Component initialization']));
+	}
+/**
+ * test initialize w/ custom panels and defaults
+ *
+ * @return void
+ * @access public
+ **/
+	function testInitializeCustomPanelsWithDefaults() {
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array('panels' => array('test'))
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+
+		$expected = array('history', 'session', 'request', 'sqlLog', 'timer', 'log', 'variables', 'test');
+		$this->assertEqual($expected, array_keys($this->Controller->Toolbar->panels));
+	}
+
+/**
+ * test syntax for removing panels
+ *
+ * @return void
+ **/
+	function testInitializeRemovingPanels() {
+		unset($this->Controller->Toolbar);
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array('panels' => array('session' => false, 'history' => false, 'test'))
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+
+		$expected = array('request', 'sqlLog', 'timer', 'log', 'variables', 'test');
+		$this->assertEqual($expected, array_keys($this->Controller->Toolbar->panels));
+	}
+/**
+ * ensure that enabled = false when debug == 0 on initialize
+ *
+ * @return void
+ **/
+	function testDebugDisableOnInitialize() {
+		$_debug = Configure::read('debug');
+		Configure::write('debug', 0);
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->assertFalse($this->Controller->Toolbar->enabled);
+
+		Configure::write('debug', $_debug);
+	}
+/**
+ * test that passing in forceEnable will enable the toolbar even if debug = 0
+ *
+ * @return void
+ **/
+	function testForceEnable() {
+		unset($this->Controller->Toolbar);
+		$_debug = Configure::read('debug');
+		Configure::write('debug', 0);
+		$this->Controller->components = array('DebugKit.Toolbar' => array('forceEnable' => true));
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->assertTrue($this->Controller->Toolbar->enabled);
+
+		Configure::write('debug', $_debug);
+	}
+/**
+ * Test disabling autoRunning of toolbar
+ *
+ * @return void
+ **/
+	function testAutoRunSettingFalse() {
+		$this->Controller->components = array('DebugKit.Toolbar' => array('autoRun' => false));
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->assertFalse($this->Controller->Toolbar->enabled);
+	}
+/**
+ * test autorun = false with query string param
+ *
+ * @return void
+ **/
+	function testAutoRunSettingWithQueryString() {
+		$this->Controller->params['url']['debug'] = true;
+		$this->Controller->components = array('DebugKit.Toolbar' => array('autoRun' => false));
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->assertTrue($this->Controller->Toolbar->enabled);
+	}
+/**
+ * test startup
+ *
+ * @return void
+ **/
+	function testStartup() {
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array(
+				'panels' => array('MockDebug')
+			)
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Toolbar->panels['MockDebug']->expectOnce('startup');
+		$this->Controller->Toolbar->startup($this->Controller);
+
+		$this->assertEqual($this->Controller->view, 'DebugKit.Debug');
+		$this->assertTrue(isset($this->Controller->helpers['DebugKit.Toolbar']));
+
+		$this->assertEqual($this->Controller->helpers['DebugKit.Toolbar']['output'], 'DebugKit.HtmlToolbar');
+		$this->assertEqual($this->Controller->helpers['DebugKit.Toolbar']['cacheConfig'], 'debug_kit');
+		$this->assertTrue(isset($this->Controller->helpers['DebugKit.Toolbar']['cacheKey']));
+
+		$timers = DebugKitDebugger::getTimers();
+		$this->assertTrue(isset($timers['controllerAction']));
+		$memory = DebugKitDebugger::getMemoryPoints();
+		$this->assertTrue(isset($memory['Controller action start']));
+	}
+/**
+ * Test that cache config generation works.
+ *
+ * @return void
+ **/
+	function testCacheConfigGeneration() {
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Component->startup($this->Controller);
+
+		$results = Cache::config('debug_kit');
+		$this->assertTrue(is_array($results));
+	}
+/**
+ * test state saving of toolbar
+ *
+ * @return void
+ **/
+	function testStateSaving() {
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$configName = 'debug_kit';
+		$this->Controller->Toolbar->cacheKey = 'toolbar_history';
+
+		$this->Controller->Component->startup($this->Controller);
+		$this->Controller->set('test', 'testing');
+		$this->Controller->Component->beforeRender($this->Controller);
+
+		$result = Cache::read('toolbar_history', $configName);
+		$this->assertEqual($result[0]['variables']['content']['test'], 'testing');
+		Cache::delete('toolbar_history', $configName);
+	}
+/**
+ * Test Before Render callback
+ *
+ * @return void
+ **/
+	function testBeforeRender() {
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array(
+				'panels' => array('MockDebug', 'session')
+			)
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Toolbar->panels['MockDebug']->expectOnce('beforeRender');
+		$this->Controller->Toolbar->beforeRender($this->Controller);
+
+		$this->assertTrue(isset($this->Controller->viewVars['debugToolbarPanels']));
+		$vars = $this->Controller->viewVars['debugToolbarPanels'];
+
+		$expected = array(
+			'plugin' => 'debug_kit',
+			'elementName' => 'session_panel',
+			'content' => $this->Controller->Toolbar->Session->read(),
+			'disableTimer' => true,
+			'title' => ''
+		);
+		$this->assertEqual($expected, $vars['session']);
+
+		$memory = DebugKitDebugger::getMemoryPoints();
+		$this->assertTrue(isset($memory['Controller render start']));
+	}
+/**
+ * test that vars are gathered and state is saved on beforeRedirect
+ *
+ * @return void
+ **/
+	function testBeforeRedirect() {
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array(
+				'panels' => array('MockDebug', 'session', 'history')
+			)
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+
+		$configName = 'debug_kit';
+		$this->Controller->Toolbar->cacheKey = 'toolbar_history';
+		Cache::delete('toolbar_history', $configName);
+
+		DebugKitDebugger::startTimer('controllerAction', 'testing beforeRedirect');
+		$this->Controller->Toolbar->panels['MockDebug']->expectOnce('beforeRender');
+		$this->Controller->Toolbar->beforeRedirect($this->Controller);
+
+		$result = Cache::read('toolbar_history', $configName);
+		$this->assertTrue(isset($result[0]['session']));
+		$this->assertTrue(isset($result[0]['mock_debug']));
+
+		$timers = DebugKitDebugger::getTimers();
+		$this->assertTrue(isset($timers['controllerAction']));
+	}
+/**
+ * test that loading state (accessing cache) works.
+ *
+ * @return void
+ **/
+	function testLoadState() {
+		$this->Controller->Toolbar->cacheKey = 'toolbar_history';
+
+		$data = array(0 => array('my data'));
+		Cache::write('toolbar_history', $data, 'debug_kit');
+		$result = $this->Controller->Toolbar->loadState(0);
+		$this->assertEqual($result, $data[0]);
+	}
+/**
+ * test the Log panel log reading.
+ *
+ * @return void
+ **/
+	function testLogPanel() {
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array(
+				'panels' => array('log', 'session', 'history' => false, 'variables' => false, 'sqlLog' => false,
+					'timer' => false)
+			)
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+
+		sleep(1);
+		$this->Controller->log('This is a log I made this request');
+		$this->Controller->log('This is the second  log I made this request');
+		$this->Controller->log('This time in the debug log!', LOG_DEBUG);
+		
+		$this->Controller->Component->startup($this->Controller);
+		$this->Controller->Component->beforeRender($this->Controller);
+		$result = $this->Controller->viewVars['debugToolbarPanels']['log'];
+
+		$this->assertEqual(count($result['content']), 2);
+		$this->assertEqual(count($result['content']['error']), 2);
+		$this->assertEqual(count($result['content']['debug']), 1);
+
+		$this->assertEqual(trim($result['content']['debug'][0][1]), 'This time in the debug log!');
+		$this->assertEqual(trim($result['content']['error'][0][1]), 'This is a log I made this request');
+
+		$data = array(
+			'Post' => array(
+				'id' => 1,
+				'title' => 'post!',
+				'body' => 'some text here',
+				'created' => '2009-11-07 23:23:23'
+			),
+			'Comment' => array(
+				'id' => 23
+			)
+		);
+		$this->Controller->log($data);
+		$this->Controller->Component->beforeRender($this->Controller);
+		$result = $this->Controller->viewVars['debugToolbarPanels']['log'];
+		$this->assertPattern('/\[created\] => 2009-11-07 23:23:23/', $result['content']['error'][2][1]);
+		$this->assertPattern('/\[Comment\] => Array/', $result['content']['error'][2][1]);
+	}
+
+/**
+ * test that creating the log panel creates the default file logger if none
+ * are configured.  This stops DebugKit from mucking with the default auto-magic log config
+ *
+ * @return void
+ */
+	function testLogPanelConstructCreatingDefaultLogConfiguration() {
+		CakeLog::drop('default');
+		CakeLog::drop('debug_kit_log_panel');
+
+		$panel =& new LogPanel(array());
+		$configured = CakeLog::configured();
+
+		$this->assertTrue(in_array('default', $configured));
+		$this->assertTrue(in_array('debug_kit_log_panel', $configured));
+	}
+
+/**
+ * Test that history state urls set prefix = null and admin = null so generated urls do not
+ * adopt these params.
+ *
+ * @return void
+ **/
+	function testHistoryUrlGenerationWithPrefixes() {
+		$configName = 'debug_kit';
+		$this->Controller->params = array(
+			'controller' => 'posts',
+			'action' => 'edit',
+			'admin' => 1,
+			'prefix' => 'admin',
+			'plugin' => 'cms',
+			'url' => array(
+				'url' => '/admin/cms/posts/edit/'
+			)
+		);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Toolbar->cacheKey = 'url_test';
+		$this->Controller->Component->beforeRender($this->Controller);
+
+		$result = $this->Controller->Toolbar->panels['history']->beforeRender($this->Controller);
+		$expected = array(
+			'plugin' => 'debug_kit', 'controller' => 'toolbar_access', 'action' => 'history_state',
+			0 => 1, 'admin' => false
+		);
+		$this->assertEqual($result[0]['url'], $expected);
+		Cache::delete('url_test', $configName);
+	}
+/**
+ * Test that the FireCake toolbar is used on AJAX requests
+ *
+ * @return void
+ **/
+	function testAjaxToolbar() {
+		$_SERVER['HTTP_X_REQUESTED_WITH'] = 'XMLHttpRequest';
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Component->startup($this->Controller);
+		$this->assertEqual($this->Controller->helpers['DebugKit.Toolbar']['output'], 'DebugKit.FirePhpToolbar');
+	}
+/**
+ * Test that the toolbar does not interfere with requestAction
+ *
+ * @return void
+ **/
+	function testNoRequestActionInterference() {
+		$debugKitPath = App::pluginPath('DebugKit');
+		$noDir = (empty($debugKitPath) || !file_exists($debugKitPath));
+		$skip = $this->skipIf($noDir, 'Could not find debug_kit in plugin paths, skipping %s');
+		if ($skip) {
+			return;
+		}
+
+		App::build(array(
+			'controllers' => $debugKitPath . 'tests' . DS . 'test_app' . DS . 'controllers' . DS,
+			'views' => array(
+				$debugKitPath . 'tests' . DS . 'test_app' . DS . 'views' . DS,
+				CAKE_CORE_INCLUDE_PATH . DS . 'cake' . DS . 'libs' . DS . 'view' . DS
+			),
+			'plugins' => $this->_paths['plugins']
+		));
+		Router::reload();
+
+		$result = $this->Controller->requestAction('/debug_kit_test/request_action_return', array('return'));
+		$this->assertEqual($result, 'I am some value from requestAction.');
+
+		$result = $this->Controller->requestAction('/debug_kit_test/request_action_render', array('return'));
+		$this->assertEqual($result, 'I have been rendered.');
+	}
+/**
+ * test the sqlLog panel parsing of db->showLog
+ *
+ * @return void
+ **/
+	function testSqlLogPanel() {
+		App::import('Core', 'Model');
+		$Article =& new Model(array('ds' => 'test_suite', 'name' => 'Article'));
+		$Article->find('first', array('conditions' => array('Article.id' => 1)));
+
+		$this->Controller->components = array(
+			'DebugKit.Toolbar' => array(
+				'panels' => array('SqlLog')
+			)
+		);
+		$this->Controller->Component->init($this->Controller);
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Component->startup($this->Controller);
+		$this->Controller->Component->beforeRender($this->Controller);
+		$result = $this->Controller->viewVars['debugToolbarPanels']['sql_log'];
+
+		$this->assertTrue(isset($result['content']['connections']['test_suite']));
+		$this->assertTrue(isset($result['content']['threshold']));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php
new file mode 100644
index 000000000..008f4fe10
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/models/toolbar_access.test.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * DebugKit ToolbarAccess Model Test case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.controllers
+ * @since         DebugKit 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Model', 'DebugKit.ToolbarAccess');
+/**
+ * Test case for ToolbarAccess model
+ *
+ * @package debug_kit
+ */
+class ToolbarAccessTestCase extends CakeTestCase {
+/**
+ * Included fixtures
+ *
+ * @var array
+ */
+	var $fixtures = array('core.post');
+
+/**
+ * startTest method
+ *
+ * @return void
+ */
+	function startTest() {
+		$this->Model =& new ToolbarAccess();
+	}
+
+/**
+ * endTest
+ *
+ * @return void
+ */
+	function endTest() {
+		unset($this->Model);
+	}
+
+/**
+ * test that explain query returns arrays of query information.
+ *
+ * @return void
+ */
+	function testExplainQuery() {
+		$db =& ConnectionManager::getDataSource('test_suite');
+		$sql = 'SELECT * FROM ' . $db->fullTableName('posts') . ';';
+		$result = $this->Model->explainQuery('test_suite', $sql);
+
+		$this->assertTrue(is_array($result));
+		$this->assertFalse(empty($result));
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/test_objects.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/test_objects.php
new file mode 100644
index 000000000..67b01a7df
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/test_objects.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Common test objects used in DebugKit tests
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+/**
+ * TestFireCake class allows for testing of FireCake
+ *
+ * @package debug_kit.tests.
+ */
+class TestFireCake extends FireCake {
+	var $sentHeaders = array();
+
+	function _sendHeader($name, $value) {
+		$_this =& FireCake::getInstance();
+		$_this->sentHeaders[$name] = $value;
+	}
+/**
+ * skip client detection as headers are not being sent.
+ *
+ * @access public
+ * @return void
+ */	
+	function detectClientExtension() {
+		return true;
+	}
+/**
+ * Reset the fireCake
+ *
+ * @return void
+ **/
+	function reset() {
+		$_this =& FireCake::getInstance();
+		$_this->sentHeaders = array();
+		$_this->_messageIndex = 1;
+	}
+}
+
+
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php
new file mode 100644
index 000000000..536e89922
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/debug_kit_debugger.test.php
@@ -0,0 +1,232 @@
+<?php
+/**
+ * DebugKit Debugger Test Case File
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.vendors
+ * @since         debug_kit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Vendor', 'DebugKit.DebugKitDebugger');
+require_once App::pluginPath('DebugKit') . 'tests' . DS . 'cases' . DS . 'test_objects.php';
+
+/**
+ * Test case for the DebugKitDebugger
+ *
+ * @package       debug_kit.tests
+ * @subpackage    debug_kit.tests.cases.vendors
+ */
+class DebugKitDebuggerTest extends CakeTestCase {
+/**
+ * setUp method
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		Configure::write('log', false);
+	}
+/**
+ * tearDown method
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		Configure::write('log', true);
+		DebugKitDebugger::clearTimers();
+	}
+/**
+ * Start Timer test
+ *
+ * @return void
+ **/
+	function testTimers() {
+		$this->assertTrue(DebugKitDebugger::startTimer('test1', 'this is my first test'));
+		usleep(5000);
+		$this->assertTrue(DebugKitDebugger::stopTimer('test1'));
+		$elapsed = DebugKitDebugger::elapsedTime('test1');
+		$this->assertTrue($elapsed > 0.0050);
+
+		$this->assertTrue(DebugKitDebugger::startTimer('test2', 'this is my second test'));
+		sleep(1);
+		$this->assertTrue(DebugKitDebugger::stopTimer('test2'));
+		$elapsed = DebugKitDebugger::elapsedTime('test2');
+		$this->assertTrue($elapsed > 1);
+
+		DebugKitDebugger::startTimer('test3');
+		$this->assertFalse(DebugKitDebugger::elapsedTime('test3'));
+		$this->assertFalse(DebugKitDebugger::stopTimer('wrong'));
+	}
+/**
+ * test timers with no names.
+ *
+ * @return void
+ **/
+	function testAnonymousTimers() {
+		$this->assertTrue(DebugKitDebugger::startTimer());
+		usleep(2000);
+		$this->assertTrue(DebugKitDebugger::stopTimer());
+		$timers = DebugKitDebugger::getTimers();
+
+		$this->assertEqual(count($timers), 2);
+		end($timers);
+		$key = key($timers);
+		$lineNo = __LINE__ - 8;
+
+		$file = Debugger::trimPath(__FILE__);
+		$expected = $file . ' line ' . $lineNo;
+		$this->assertEqual($key, $expected);
+
+		$timer = $timers[$expected];
+		$this->assertTrue($timer['time'] > 0.0020);
+		$this->assertEqual($timers[$expected]['message'], $expected);
+	}
+/**
+ * Assert that nested anonymous timers don't get mixed up.
+ *
+ * @return void
+ **/
+	function testNestedAnonymousTimers() {
+		$this->assertTrue(DebugKitDebugger::startTimer());
+		usleep(100);
+		$this->assertTrue(DebugKitDebugger::startTimer());
+		usleep(100);
+		$this->assertTrue(DebugKitDebugger::stopTimer());
+		$this->assertTrue(DebugKitDebugger::stopTimer());
+
+		$timers = DebugKitDebugger::getTimers();
+		$this->assertEqual(count($timers), 3, 'incorrect number of timers %s');
+		$firstTimerLine = __LINE__ -9;
+		$secondTimerLine = __LINE__ -8;
+		$file = Debugger::trimPath(__FILE__);
+
+		$this->assertTrue(isset($timers[$file . ' line ' . $firstTimerLine]), 'first timer is not set %s');
+		$this->assertTrue(isset($timers[$file . ' line ' . $secondTimerLine]), 'second timer is not set %s');
+
+		$firstTimer = $timers[$file . ' line ' . $firstTimerLine];
+		$secondTimer = $timers[$file . ' line ' . $secondTimerLine];
+		$this->assertTrue($firstTimer['time'] > $secondTimer['time']);
+	}
+/**
+ * test that calling startTimer with the same name does not overwrite previous timers
+ * and instead adds new ones.
+ *
+ * @return void
+ **/
+	function testRepeatTimers() {
+		DebugKitDebugger::startTimer('my timer', 'This is the first call');
+		usleep(100);
+		DebugKitDebugger::startTimer('my timer', 'This is the second call');
+		usleep(100);
+
+		DebugKitDebugger::stopTimer('my timer');
+		DebugKitDebugger::stopTimer('my timer');
+
+		$timers = DebugKitDebugger::getTimers();
+		$this->assertEqual(count($timers), 3, 'wrong timer count %s');
+
+		$this->assertTrue(isset($timers['my timer']));
+		$this->assertTrue(isset($timers['my timer #2']));
+
+		$this->assertTrue($timers['my timer']['time'] > $timers['my timer #2']['time'], 'timer 2 is longer? %s');
+		$this->assertEqual($timers['my timer']['message'], 'This is the first call');
+		$this->assertEqual($timers['my timer #2']['message'], 'This is the second call #2');
+	}
+/**
+ * testRequestTime
+ *
+ * @access public
+ * @return void
+ */
+	function testRequestTime() {
+		$result1 = DebugKitDebugger::requestTime();
+		usleep(50);
+		$result2 = DebugKitDebugger::requestTime();
+		$this->assertTrue($result1 < $result2);
+	}
+/**
+ * test getting all the set timers.
+ *
+ * @return void
+ **/
+	function testGetTimers() {
+		DebugKitDebugger::startTimer('test1', 'this is my first test');
+		DebugKitDebugger::stopTimer('test1');
+		usleep(50);
+		DebugKitDebugger::startTimer('test2');
+		DebugKitDebugger::stopTimer('test2');
+		$timers = DebugKitDebugger::getTimers();
+
+		$this->assertEqual(count($timers), 3);
+		$this->assertTrue(is_float($timers['test1']['time']));
+		$this->assertTrue(isset($timers['test1']['message']));
+		$this->assertTrue(isset($timers['test2']['message']));
+	}
+/**
+ * test memory usage
+ *
+ * @return void
+ **/
+	function testMemoryUsage() {
+		$result = DebugKitDebugger::getMemoryUse();
+		$this->assertTrue(is_int($result));
+
+		$result = DebugKitDebugger::getPeakMemoryUse();
+		$this->assertTrue(is_int($result));
+	}
+/**
+ * test _output switch to firePHP
+ *
+ * @return void
+ */
+	function testOutput() {
+		$firecake =& FireCake::getInstance('TestFireCake');
+		Debugger::invoke(DebugKitDebugger::getInstance('DebugKitDebugger'));
+		Debugger::output('fb');
+		$foo .= '';
+		$result = $firecake->sentHeaders;
+
+		$this->assertPattern('/GROUP_START/', $result['X-Wf-1-1-1-1']);
+		$this->assertPattern('/ERROR/', $result['X-Wf-1-1-1-2']);
+		$this->assertPattern('/GROUP_END/', $result['X-Wf-1-1-1-5']);
+
+		Debugger::invoke(Debugger::getInstance('Debugger'));
+		Debugger::output();
+	}
+/**
+ * test making memory use markers.
+ *
+ * @return void
+ **/
+	function testMemorySettingAndGetting() {
+		$result = DebugKitDebugger::setMemoryPoint('test marker');
+		$this->assertTrue($result);
+
+		$result = DebugKitDebugger::getMemoryPoints(true);
+		$this->assertEqual(count($result), 1);
+		$this->assertTrue(isset($result['test marker']));
+		$this->assertTrue(is_numeric($result['test marker']));
+
+		$result = DebugKitDebugger::getMemoryPoints();
+		$this->assertTrue(empty($result));
+
+		DebugKitDebugger::setMemoryPoint('test marker');
+		DebugKitDebugger::setMemoryPoint('test marker');
+		$result = DebugKitDebugger::getMemoryPoints();
+		$this->assertEqual(count($result), 2);
+		$this->assertTrue(isset($result['test marker']));
+		$this->assertTrue(isset($result['test marker #2']));
+	}
+
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php
new file mode 100644
index 000000000..80abdfc73
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/vendors/fire_cake.test.php
@@ -0,0 +1,340 @@
+<?php
+/**
+ * CakeFirePHP test case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.vendors
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Vendor', 'DebugKit.FireCake');
+require_once App::pluginPath('DebugKit') . 'tests' . DS . 'cases' . DS . 'test_objects.php';
+
+/**
+ * Test Case For FireCake
+ *
+ * @package debug_kit.tests
+ */
+class FireCakeTestCase extends CakeTestCase {
+/**
+ * setup test
+ *
+ * Fill FireCake with TestFireCake instance.
+ *
+ * @access public
+ * @return void
+ */
+	function setUp() {
+		$this->firecake =& FireCake::getInstance('TestFireCake');
+	}
+/**
+ * test getInstance cheat.
+ *
+ * If this fails the rest of the test is going to fail too.
+ *
+ * @return void
+ **/
+	function testGetInstanceOverride() {
+		$instance =& FireCake::getInstance();
+		$instance2 =& FireCake::getInstance();
+		$this->assertReference($instance, $instance2);
+		$this->assertIsA($instance, 'FireCake');
+		$this->assertIsA($instance, 'TestFireCake', 'Stored instance is not a copy of TestFireCake, test case is broken.');
+	}	
+/**
+ * testsetoption
+ *
+ * @return void
+ **/
+	function testSetOptions() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		$this->assertEqual($this->firecake->options['includeLineNumbers'], false);
+	}
+/**
+ * test Log()
+ *
+ * @access public
+ * @return void
+ */	
+	function testLog() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		FireCake::log('Testing');
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '26|[{"Type":"LOG"},"Testing"]|');
+		
+		FireCake::log('Testing', 'log-info');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '45|[{"Type":"LOG","Label":"log-info"},"Testing"]|');
+	}
+/**
+ * test info()
+ *
+ * @access public
+ * @return void
+ */	
+	function testInfo() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		FireCake::info('I have information');
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '38|[{"Type":"INFO"},"I have information"]|');
+
+		FireCake::info('I have information', 'info-label');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '59|[{"Type":"INFO","Label":"info-label"},"I have information"]|');
+	}
+/**
+ * test info()
+ *
+ * @access public
+ * @return void
+ */	
+	function testWarn() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		FireCake::warn('A Warning');
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '29|[{"Type":"WARN"},"A Warning"]|');
+
+		FireCake::warn('A Warning', 'Bzzz');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '44|[{"Type":"WARN","Label":"Bzzz"},"A Warning"]|');
+	}
+/**
+ * test error()
+ *
+ * @access public
+ * @return void
+ **/
+	function testError() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		FireCake::error('An error');
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 1);
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '29|[{"Type":"ERROR"},"An error"]|');
+		
+		FireCake::error('An error', 'wonky');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '45|[{"Type":"ERROR","Label":"wonky"},"An error"]|');
+	}
+/**
+ * test dump()
+ *
+ * @return void
+ **/
+	function testDump() {
+		FireCake::dump('mydump', array('one' => 1, 'two' => 2));
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-2-1-1'], '28|{"mydump":{"one":1,"two":2}}|');
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-2']));
+	}
+/**
+ * test table() generation
+ *
+ * @return void
+ **/
+	function testTable() {
+		$table[] = array('Col 1 Heading','Col 2 Heading');
+		$table[] = array('Row 1 Col 1','Row 1 Col 2');
+		$table[] = array('Row 2 Col 1','Row 2 Col 2');
+		$table[] = array('Row 3 Col 1','Row 3 Col 2');
+		FireCake::table('myTrace', $table);
+		$expected = '162|[{"Type":"TABLE","Label":"myTrace"},[["Col 1 Heading","Col 2 Heading"],["Row 1 Col 1","Row 1 Col 2"],["Row 2 Col 1","Row 2 Col 2"],["Row 3 Col 1","Row 3 Col 2"]]]|';
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], $expected);
+	}
+/**
+ * testStringEncoding
+ *
+ * @return void
+ **/
+	function testStringEncode() {
+		$vars = array(1,2,3);
+		$result = $this->firecake->stringEncode($vars);
+		$this->assertEqual($result, array(1,2,3));
+
+		$this->firecake->setOptions(array('maxArrayDepth' => 3));
+		$deep = array(1 => array(2 => array(3)));
+		$result = $this->firecake->stringEncode($deep);
+		$this->assertEqual($result, array(1 => array(2 => '** Max Array Depth (3) **')));
+	}
+/**
+ * test object encoding
+ *
+ * @return void
+ **/
+	function testStringEncodeObjects() {
+		$obj =& FireCake::getInstance();
+		$result = $this->firecake->stringEncode($obj);
+
+		$this->assertTrue(is_array($result));
+		$this->assertEqual($result['_defaultOptions']['useNativeJsonEncode'], true);
+		$this->assertEqual($result['_encodedObjects'][0], '** Recursion (TestFireCake) **');
+	}
+/**
+ * test trace()
+ *
+ * @return void
+ **/
+	function testTrace() {
+		FireCake::trace('myTrace');
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-Protocol-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Plugin-1']));
+		$this->assertTrue(isset($this->firecake->sentHeaders['X-Wf-1-Structure-1']));
+		$dump = $this->firecake->sentHeaders['X-Wf-1-1-1-1'];
+		$this->assertPattern('/"Message":"myTrace"/', $dump);
+		$this->assertPattern('/"Trace":\[/', $dump);
+	}
+/**
+ * test enabling and disabling of FireCake output
+ *
+ * @return void
+ **/
+	function testEnableDisable() {
+		FireCake::disable();
+		FireCake::trace('myTrace');
+		$this->assertTrue(empty($this->firecake->sentHeaders));
+		
+		FireCake::enable();
+		FireCake::trace('myTrace');
+		$this->assertFalse(empty($this->firecake->sentHeaders));
+	}
+
+/**
+ * test correct line continuation markers on multi line headers.
+ *
+ * @access public
+ * @return void
+ */	
+	function testMultiLineOutput() {
+		$skip = $this->skipIf(!PHP5, 'Output is not long enough with PHP4');
+		if ($skip) {
+			return;
+		}
+		FireCake::trace('myTrace');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 4);
+		$header = $this->firecake->sentHeaders['X-Wf-1-1-1-1'];
+		$this->assertEqual(substr($header, -2), '|\\');
+
+		$header = $this->firecake->sentHeaders['X-Wf-1-1-1-2'];
+		$this->assertEqual(substr($header, -2), '|\\');
+
+		$header = $this->firecake->sentHeaders['X-Wf-1-1-1-3'];
+		$this->assertEqual(substr($header, -2), '|\\');
+
+		$header = $this->firecake->sentHeaders['X-Wf-1-1-1-4'];
+		$this->assertEqual(substr($header, -1), '|');
+	}
+/**
+ * test inclusion of line numbers
+ *
+ * @return void
+ **/
+	function testIncludeLineNumbers() {
+		FireCake::setOptions(array('includeLineNumbers' => true));
+		FireCake::info('Testing');
+		$result = $this->firecake->sentHeaders['X-Wf-1-1-1-1'];
+		$this->assertPattern('/"File"\:".*fire_cake.test.php/', $result);
+		$this->assertPattern('/"Line"\:\d+/', $result);
+	}
+/**
+ * test Group messages
+ *
+ * @return void
+ **/
+	function testGroup() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		FireCake::group('test');
+		FireCake::info('my info');
+		FireCake::groupEnd();
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '63|[{"Collapsed":"true","Type":"GROUP_START","Label":"test"},null]|');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-3'], '27|[{"Type":"GROUP_END"},null]|');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 3);
+	}
+/**
+ * test fb() parameter parsing
+ *
+ * @return void
+ **/
+	function testFbParameterParsing() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		FireCake::fb('Test');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '23|[{"Type":"LOG"},"Test"]|');
+
+		FireCake::fb('Test', 'warn');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-2'], '24|[{"Type":"WARN"},"Test"]|');
+
+		FireCake::fb('Test', 'Custom label', 'warn');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-3'], '47|[{"Type":"WARN","Label":"Custom label"},"Test"]|');
+
+		$this->expectError();
+		$this->assertFalse(FireCake::fb('Test', 'Custom label', 'warn', 'more parameters'));
+
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-Index'], 3);
+	}
+/**
+ * Test defaulting to log if incorrect message type is used
+ *
+ * @return void
+ **/
+	function testIncorrectMessageType() {
+		FireCake::setOptions(array('includeLineNumbers' => false));
+		FireCake::fb('Hello World', 'foobared');
+		$this->assertEqual($this->firecake->sentHeaders['X-Wf-1-1-1-1'], '30|[{"Type":"LOG"},"Hello World"]|');
+	}
+/**
+ * testClientExtensionDetection.
+ *
+ * @return void
+ **/
+	function testDetectClientExtension() {
+		$back = env('HTTP_USER_AGENT');
+		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.4) Gecko/2008102920 Firefox/3.0.4 FirePHP/0.2.1';
+		$this->assertTrue(FireCake::detectClientExtension());
+		
+		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.4) Gecko/2008102920 Firefox/3.0.4 FirePHP/0.0.4';
+		$this->assertFalse(FireCake::detectClientExtension());
+		
+		$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.4) Gecko/2008102920 Firefox/3.0.4';
+		$this->assertFalse(FireCake::detectClientExtension());
+		$_SERVER['HTTP_USER_AGENT'] = $back;
+	}	
+/**
+ * test of Non Native JSON encoding.
+ *
+ * @return void
+ **/
+	function testNonNativeEncoding() {
+		FireCake::setOptions(array('useNativeJsonEncode' => false));
+		$json = FireCake::jsonEncode(array('one' => 1, 'two' => 2));
+		$this->assertEqual($json, '{"one":1,"two":2}');
+		
+		$json = FireCake::jsonEncode(array(1,2,3));
+		$this->assertEqual($json, '[1,2,3]');
+		
+		$json = FireCake::jsonEncode(FireCake::getInstance());
+		$this->assertPattern('/"options"\:\{"maxObjectDepth"\:\d*,/', $json);
+	}
+/**
+ * reset the FireCake counters and headers.
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		TestFireCake::reset();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/debug.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/debug.test.php
new file mode 100644
index 000000000..606ab0630
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/debug.test.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * DebugView test Case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.views
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Core', 'View');
+
+if (!class_exists('DoppelGangerView')) {
+	class DoppelGangerView extends View {}
+}
+
+App::import('View', 'DebugKit.Debug');
+App::import('Vendor', 'DebugKit.DebugKitDebugger');
+/**
+ * Debug View Test Case
+ *
+ * @package       debug_kit.tests
+ */
+class DebugViewTestCase extends CakeTestCase {
+/**
+ * set Up test case
+ *
+ * @return void
+ **/
+	function startTest() {
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::parse('/');
+		$this->Controller =& new Controller();
+		$this->View =& new DebugView($this->Controller, false);
+		$this->_debug = Configure::read('debug');
+		$this->_paths = array();
+		$this->_paths['plugins'] = App::path('plugins');
+		$this->_paths['views'] = App::path('views');
+		$this->_paths['vendors'] = App::path('vendors');
+		$this->_paths['controllers'] = App::path('controllers');
+	}
+/**
+ * tear down function
+ *
+ * @return void
+ **/
+	function endTest() {
+		App::build(array(
+			'plugins' => $this->_paths['plugins'],
+			'views' => $this->_paths['views'],
+			'vendors' => $this->_paths['vendors'],
+			'controllers' => $this->_paths['controllers']
+		));
+
+		unset($this->View, $this->Controller);
+		DebugKitDebugger::clearTimers();
+		Configure::write('debug', $this->_debug);
+	}
+/**
+ * start Case - switch view paths
+ *
+ * @return void
+ **/
+	function startCase() {
+		App::build(array(
+			'views' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+				APP . 'plugins' . DS . 'debug_kit' . DS . 'views'. DS,
+				ROOT . DS . LIBS . 'view' . DS
+			)
+		), true);
+	}
+/**
+ * test that element timers are working
+ *
+ * @return void
+ **/
+	function testElementTimers() {
+		$result = $this->View->element('test_element');
+		$expected = <<<TEXT
+<!-- Starting to render - test_element -->
+this is the test element
+<!-- Finished - test_element -->
+
+TEXT;
+		$this->assertEqual($result, $expected);
+
+		$result = DebugKitDebugger::getTimers();
+		$this->assertTrue(isset($result['render_test_element.ctp']));
+	}
+/**
+ * test rendering and ensure that timers are being set.
+ *
+ * @access public
+ * @return void
+ */
+	function testRenderTimers() {
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->action = 'index';
+		$this->Controller->params = array(
+			'action' => 'index',
+			'controller' => 'posts',
+			'plugin' => null,
+			'url' => array('url' => 'posts/index'),
+			'base' => null,
+			'here' => '/posts/index',
+		);
+		$this->Controller->layout = 'default';
+		$View =& new DebugView($this->Controller, false);
+		$View->render('index');
+
+		$result = DebugKitDebugger::getTimers();
+		$this->assertEqual(count($result), 4);
+		$this->assertTrue(isset($result['viewRender']));
+		$this->assertTrue(isset($result['render_default.ctp']));
+		$this->assertTrue(isset($result['render_index.ctp']));
+		
+		$result = DebugKitDebugger::getMemoryPoints();
+		$this->assertTrue(isset($result['View render complete']));
+	}
+/**
+ * Test for correct loading of helpers into custom view
+ *
+ * @return void
+ */
+	function testLoadHelpers() {
+		$loaded = array();
+		$result = $this->View->_loadHelpers($loaded, array('Html', 'Javascript', 'Number'));
+		$this->assertTrue(is_object($result['Html']));
+		$this->assertTrue(is_object($result['Javascript']));
+		$this->assertTrue(is_object($result['Number']));
+	}
+/**
+ * test that $out is returned when a layout is rendered instead of the empty
+ * $this->output.  As this causes issues with requestAction()
+ *
+ * @return void
+ **/
+	function testProperReturnUnderRequestAction() {
+		$testapp = App::pluginPath('DebugKit') . 'tests' . DS . 'test_app' . DS . 'views' . DS;
+		App::build(array('views' => array($testapp)));
+
+		$this->View->set('test', 'I have been rendered.');
+		$this->View->action = 'request_action_render';
+		$this->View->name = 'DebugKitTest';
+		$this->View->viewPath = 'debug_kit_test';
+		$this->View->layout = false;
+		$result = $this->View->render('request_action_render');
+
+		$this->assertEqual($result, 'I have been rendered.');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php
new file mode 100644
index 000000000..dd269483b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/fire_php_toolbar.test.php
@@ -0,0 +1,149 @@
+<?php
+/**
+ * Toolbar Abstract Helper Test Case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+$path = App::pluginPath('DebugKit');
+
+App::import('Helper', 'DebugKit.FirePhpToolbar');
+App::import('Core', array('View', 'Controller'));
+require_once $path . 'tests' . DS . 'cases' . DS . 'test_objects.php';
+
+FireCake::getInstance('TestFireCake');
+
+class FirePhpToolbarHelperTestCase extends CakeTestCase {
+/**
+ * setUp
+ *
+ * @return void
+ **/
+	function startTest() {
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::parse('/');
+
+		$this->Toolbar =& new ToolbarHelper(array('output' => 'DebugKit.FirePhpToolbar'));
+		$this->Toolbar->FirePhpToolbar =& new FirePhpToolbarHelper();
+
+		$this->Controller =& new Controller();
+		if (isset($this->_debug)) {
+			Configure::write('debug', $this->_debug);
+		}
+	}
+/**
+ * start Case - switch view paths
+ *
+ * @return void
+ **/
+	function startCase() {
+		$this->_viewPaths = App::build('views');
+		App::build(array(
+			'views' => array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+			APP . 'plugins' . DS . 'debug_kit' . DS . 'views'. DS, 
+			ROOT . DS . LIBS . 'view' . DS
+		)), true);
+		$this->_debug = Configure::read('debug');
+		$this->firecake =& FireCake::getInstance();
+	}
+/**
+ * test neat array (dump)creation
+ *
+ * @return void
+ */
+	function testMakeNeatArray() {
+		$this->Toolbar->makeNeatArray(array(1,2,3));
+		$result = $this->firecake->sentHeaders;
+		$this->assertTrue(isset($result['X-Wf-1-1-1-1']));
+		$this->assertPattern('/\[1,2,3\]/', $result['X-Wf-1-1-1-1']);
+	}
+/**
+ * testAfterlayout element rendering
+ *
+ * @return void
+ */
+	function testAfterLayout(){
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->action = 'index';
+		$this->Controller->params = array(
+			'action' => 'index',
+			'controller' => 'posts',
+			'plugin' => null,
+			'url' => array('url' => 'posts/index', 'ext' => 'xml'),
+			'base' => null,
+			'here' => '/posts/index',
+		);
+		$this->Controller->layout = 'default';
+		$this->Controller->uses = null;
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->constructClasses();
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Component->startup($this->Controller);
+		$this->Controller->Component->beforeRender($this->Controller);
+		$result = $this->Controller->render();
+		$this->assertNoPattern('/debug-toolbar/', $result);
+		$result = $this->firecake->sentHeaders;
+		$this->assertTrue(is_array($result));
+	}
+/**
+ * test starting a panel
+ *
+ * @return void
+ **/
+	function testPanelStart() {
+		$this->Toolbar->panelStart('My Panel', 'my_panel');
+		$result = $this->firecake->sentHeaders;
+		$this->assertPattern('/GROUP_START.+My Panel/', $result['X-Wf-1-1-1-1']);
+	}
+/**
+ * test ending a panel
+ *
+ * @return void
+ **/
+	function testPanelEnd() {
+		$this->Toolbar->panelEnd();
+		$result = $this->firecake->sentHeaders;
+		$this->assertPattern('/GROUP_END/', $result['X-Wf-1-1-1-1']);	
+	}
+/**
+ * endTest()
+ *
+ * @return void
+ */
+	function endTest() {
+		TestFireCake::reset();
+	}
+/**
+ * reset the view paths
+ *
+ * @return void
+ **/
+	function endCase() {
+		Configure::write('viewPaths', $this->_viewPaths);
+	}
+/**
+ * tearDown
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Toolbar, $this->Controller);
+		ClassRegistry::removeObject('view');
+		ClassRegistry::flush();
+		Router::reload();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php
new file mode 100644
index 000000000..766edd621
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/html_toolbar.test.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * Toolbar HTML Helper Test Case
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Helper', array('DebugKit.HtmlToolbar', 'Html', 'Form'));
+App::import('Core', array('View', 'Controller'));
+
+class HtmlToolbarHelperTestCase extends CakeTestCase {
+/**
+ * setUp
+ *
+ * @return void
+ **/
+	function setUp() {
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::parse('/');
+		
+		$this->Toolbar =& new ToolbarHelper(array('output' => 'DebugKit.HtmlToolbar'));
+		$this->Toolbar->HtmlToolbar =& new HtmlToolbarHelper();
+		$this->Toolbar->HtmlToolbar->Html =& new HtmlHelper();
+		$this->Toolbar->HtmlToolbar->Form =& new FormHelper();
+		
+		$this->Controller =& new Controller();
+		if (isset($this->_debug)) {
+			Configure::write('debug', $this->_debug);
+		}
+	}
+/**
+ * start Case - switch view paths
+ *
+ * @return void
+ **/
+	function startCase() {
+		$this->_viewPaths = App::path('views');
+		App::build(array(
+			'views' => array(
+			TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+			APP . 'plugins' . DS . 'debug_kit' . DS . 'views'. DS, 
+			ROOT . DS . LIBS . 'view' . DS
+		)), true);
+		$this->_debug = Configure::read('debug');
+	}
+/**
+ * test Neat Array formatting
+ *
+ * @return void
+ **/
+	function testMakeNeatArray() {
+		$in = false;
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', '0' , '/strong', '(false)', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = null;
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', '0' , '/strong', '(null)', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = true;
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', '0' , '/strong', '(true)', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = array();
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', '0' , '/strong', '(empty)', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = array('key' => 'value');
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', 'key', '/strong', 'value', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = array('key' => null);
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', 'key', '/strong', '(null)', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = array('key' => 'value', 'foo' => 'bar');
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', 'key', '/strong', 'value', '/li',
+			'<li', '<strong', 'foo', '/strong', 'bar', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = array(
+			'key' => 'value', 
+			'foo' => array(
+				'this' => 'deep',
+				'another' => 'value'
+			)
+		);
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', 'key', '/strong', 'value', '/li',
+			'<li', '<strong', 'foo', '/strong',
+				array('ul' => array('class' => 'neat-array depth-1')),
+				'<li', '<strong', 'this', '/strong', 'deep', '/li',
+				'<li', '<strong', 'another', '/strong', 'value', '/li',
+				'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = array(
+			'key' => 'value', 
+			'foo' => array(
+				'this' => 'deep',
+				'another' => 'value'
+			),
+			'lotr' => array(
+				'gandalf' => 'wizard',
+				'bilbo' => 'hobbit'
+			)
+		);
+		$result = $this->Toolbar->makeNeatArray($in, 1);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0 expanded'),
+			'<li', '<strong', 'key', '/strong', 'value', '/li',
+			'<li', '<strong', 'foo', '/strong', 
+				array('ul' => array('class' => 'neat-array depth-1')),
+				'<li', '<strong', 'this', '/strong', 'deep', '/li',
+				'<li', '<strong', 'another', '/strong', 'value', '/li',
+				'/ul',
+			'/li',
+			'<li', '<strong', 'lotr', '/strong', 
+				array('ul' => array('class' => 'neat-array depth-1')),
+				'<li', '<strong', 'gandalf', '/strong', 'wizard', '/li',
+				'<li', '<strong', 'bilbo', '/strong', 'hobbit', '/li',
+				'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$result = $this->Toolbar->makeNeatArray($in, 2);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0 expanded'),
+			'<li', '<strong', 'key', '/strong', 'value', '/li',
+			'<li', '<strong', 'foo', '/strong', 
+				array('ul' => array('class' => 'neat-array depth-1 expanded')),
+				'<li', '<strong', 'this', '/strong', 'deep', '/li',
+				'<li', '<strong', 'another', '/strong', 'value', '/li',
+				'/ul',
+			'/li',
+			'<li', '<strong', 'lotr', '/strong',
+				array('ul' => array('class' => 'neat-array depth-1 expanded')),
+				'<li', '<strong', 'gandalf', '/strong', 'wizard', '/li',
+				'<li', '<strong', 'bilbo', '/strong', 'hobbit', '/li',
+				'/ul',
+			'/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+
+		$in = array('key' => 'value', 'array' => array());
+		$result = $this->Toolbar->makeNeatArray($in);
+		$expected = array(
+			'ul' => array('class' => 'neat-array depth-0'),
+			'<li', '<strong', 'key', '/strong', 'value', '/li',
+			'<li', '<strong', 'array', '/strong', '(empty)', '/li',
+			'/ul'
+		);
+		$this->assertTags($result, $expected);
+	}
+
+/**
+ * Test injection of toolbar
+ *
+ * @return void
+ **/
+	function testInjectToolbar() {
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->action = 'index';
+		$this->Controller->params = array(
+			'action' => 'index',
+			'controller' => 'posts',
+			'plugin' => null,
+			'url' => array('url' => 'posts/index'),
+			'base' => null,
+			'here' => '/posts/index',
+		);
+		$this->Controller->helpers = array('Html', 'Javascript', 'Session', 'DebugKit.Toolbar');
+		$this->Controller->layout = 'default';
+		$this->Controller->uses = null;
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->constructClasses();
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Component->startup($this->Controller);
+		$this->Controller->Component->beforeRender($this->Controller);
+		$result = $this->Controller->render();
+		$result = str_replace(array("\n", "\r"), '', $result);
+		$this->assertPattern('#<div id\="debug-kit-toolbar">.+</div>.*</body>#', $result);
+	}
+
+/**
+ * test injection of javascript
+ *
+ * @return void
+ **/
+	function testJavascriptInjection() {
+		$this->Controller->viewPath = 'posts';
+		$this->Controller->uses = null;
+		$this->Controller->action = 'index';
+		$this->Controller->params = array(
+			'action' => 'index',
+			'controller' => 'posts',
+			'plugin' => null,
+			'url' => array('url' => 'posts/index'),
+			'base' => '/',
+			'here' => '/posts/index',
+		);
+		$this->Controller->helpers = array('Javascript', 'Html', 'Session');
+		$this->Controller->components = array('DebugKit.Toolbar');
+		$this->Controller->layout = 'default';
+		$this->Controller->constructClasses();
+		$this->Controller->Component->initialize($this->Controller);
+		$this->Controller->Component->startup($this->Controller);
+		$this->Controller->Component->beforeRender($this->Controller);
+		$result = $this->Controller->render();
+		$result = str_replace(array("\n", "\r"), '', $result);
+		$this->assertPattern('#<script\s*type="text/javascript"\s*src="/debug_kit/js/js_debug_toolbar.js(:?\?\d*?)?"\s*>\s?</script>#', $result);
+	}
+
+/**
+ * test message creation
+ *
+ * @return void
+ */
+	function testMessage() {
+		$result = $this->Toolbar->message('test', 'one, two');
+		$expected = array(
+			'<p',
+				'<strong', 'test', '/strong',
+				' one, two',
+			'/p',
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * Test Table generation
+ *
+ * @return void
+ */
+	function testTable() {
+		$rows = array(
+			array(1,2),
+			array(3,4),
+		);
+		$result = $this->Toolbar->table($rows);
+		$expected = array(
+			'table' => array('class' =>'debug-table'),
+			array('tr' => array('class' => 'odd')),
+			'<td', '1', '/td',
+			'<td', '2', '/td',
+			'/tr',
+			array('tr' => array('class' => 'even')),
+			'<td', '3', '/td',
+			'<td', '4', '/td',
+			'/tr',
+			'/table'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * test starting a panel
+ *
+ * @return void
+ **/
+	function testStartPanel() {
+		$result = $this->Toolbar->panelStart('My Panel', 'my_panel');
+		$expected = array(
+			'a' => array('href' => '#my_panel'),
+			'My Panel',
+			'/a'
+		);
+		$this->assertTags($result, $expected);
+	}
+/**
+ * test ending a panel
+ *
+ * @return void
+ **/
+	function testPanelEnd() {
+		$result = $this->Toolbar->panelEnd();
+		$this->assertNull($result);
+	}
+/**
+ * reset the view paths
+ *
+ * @return void
+ **/
+	function endCase() {
+		App::build();
+	}
+	
+/**
+ * tearDown
+ *
+ * @access public
+ * @return void
+ */
+	function tearDown() {
+		unset($this->Toolbar, $this->Controller);
+		ClassRegistry::removeObject('view');
+		ClassRegistry::flush();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php
new file mode 100644
index 000000000..81c914e73
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/cases/views/helpers/toolbar.test.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * Toolbar facade tests.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Helper', array('DebugKit.Toolbar'));
+App::import('Core', array('View', 'Controller'));
+
+Mock::generate('Helper', 'MockBackendHelper', array('testMethod'));
+
+class ToolbarHelperTestCase extends CakeTestCase {
+
+	var $fixtures = array('core.post');
+/**
+ * setUp
+ *
+ * @return void
+ **/
+	function startTest() {
+		Configure::write('Cache.disable', false);
+		Router::connect('/', array('controller' => 'pages', 'action' => 'display', 'home'));
+		Router::parse('/');
+		
+		$this->Toolbar =& new ToolbarHelper(array(
+			'output' => 'MockBackendHelper',
+			'cacheKey' => 'debug_kit_toolbar_test_case',
+			'cacheConfig' => 'default'
+		));
+		$this->Toolbar->MockBackend = new MockBackendHelper();
+		
+		$this->Controller =& ClassRegistry::init('Controller');
+		if (isset($this->_debug)) {
+			Configure::write('debug', $this->_debug);
+		}
+	}
+/**
+ * start Case - switch view paths
+ *
+ * @return void
+ **/
+	function startCase() {
+		$this->_viewPaths = App::path('views');
+		App::build(array(
+			'views' => array(
+				TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'views'. DS,
+				APP . 'plugins' . DS . 'debug_kit' . DS . 'views'. DS, 
+				ROOT . DS . LIBS . 'view' . DS
+		)), true);
+		$this->_debug = Configure::read('debug');
+	}
+/**
+ * test cache writing for views.
+ *
+ * @return void
+ **/
+	function testCacheWrite() {
+		$result = $this->Toolbar->writeCache('test', array('stuff', 'to', 'cache'));
+		$this->assertTrue($result);
+	}
+/**
+ * Ensure that the cache writing only affects the 
+ * top most level of the history stack. As this is where the current request is stored.
+ *
+ * @return void
+ **/
+	function testOnlyWritingToFirstElement() {
+		$values = array(
+			array('test' => array('content' => array('first', 'values'))),
+			array('test' => array('content' => array('second', 'values'))),
+		);
+		Cache::write('debug_kit_toolbar_test_case', $values, 'default');
+		$this->Toolbar->writeCache('test', array('new', 'values'));
+
+		$result = $this->Toolbar->readCache('test');
+		$this->assertEqual($result, array('new', 'values'));
+
+		$result = $this->Toolbar->readCache('test', 1);
+		$this->assertEqual($result, array('second', 'values'));
+	}
+/**
+ * test cache reading for views
+ *
+ * @return void
+ **/
+	function testCacheRead() {
+		$result = $this->Toolbar->writeCache('test', array('stuff', 'to', 'cache'));
+		$this->assertTrue($result, 'Cache write failed %s');
+		
+		$result = $this->Toolbar->readCache('test');
+		$this->assertEqual($result, array('stuff', 'to', 'cache'), 'Cache value is wrong %s');
+		
+		$result = $this->Toolbar->writeCache('test', array('new', 'stuff'));
+		$this->assertTrue($result, 'Cache write failed %s');
+		
+		$result = $this->Toolbar->readCache('test');
+		$this->assertEqual($result, array('new', 'stuff'), 'Cache value is wrong %s');
+	}
+/**
+ * Test that reading/writing doesn't work with no cache config.
+ *
+ * @return void
+ **/
+	function testNoCacheConfigPresent() {
+		$this->Toolbar = new ToolbarHelper(array('output' => 'MockBackendHelper'));
+
+		$result = $this->Toolbar->writeCache('test', array('stuff', 'to', 'cache'));
+		$this->assertFalse($result, 'Writing to cache succeeded with no cache config %s');
+
+		$result = $this->Toolbar->readCache('test');
+		$this->assertFalse($result, 'Reading cache succeeded with no cache config %s');
+	}
+/**
+ * ensure that getQueryLogs works and writes to the cache so the history panel will 
+ * work.
+ *
+ * @return void
+ */
+	function testGetQueryLogs() {
+		$model =& new Model(array('ds' => 'test_suite', 'table' => 'posts', 'name' => 'Post'));
+		$model->find('all');
+		$model->find('first');
+
+		$result = $this->Toolbar->getQueryLogs('test_suite', array('cache' => false));
+		$this->assertTrue(is_array($result));
+		$this->assertTrue(count($result) >= 2, 'Should be more than 2 queries in the log %s');
+		$this->assertTrue(isset($result[0]['actions']));
+
+		$model->find('first');
+		Cache::delete('debug_kit_toolbar_test_case', 'default');
+		$result = $this->Toolbar->getQueryLogs('test_suite', array('cache' => true));
+
+		$cached = $this->Toolbar->readCache('sql_log');
+		$this->assertTrue(isset($cached['test_suite']));
+		$this->assertEqual($cached['test_suite'][0], $result[0]);
+	}
+/**
+ * reset the view paths
+ *
+ * @return void
+ **/
+	function endCase() {
+		App::build(array('views' => $this->_viewPaths), true);
+		Cache::delete('debug_kit_toolbar_test_case', 'default');
+	}
+/**
+ * endTest
+ *
+ * @access public
+ * @return void
+ */
+	function endTest() {
+		unset($this->Toolbar, $this->Controller);
+		ClassRegistry::removeObject('view');
+		ClassRegistry::flush();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/groups/view_group.group.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/groups/view_group.group.php
new file mode 100644
index 000000000..4f5625545
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/groups/view_group.group.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * View Group Test for debugkit
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.groups
+ * @since         DebugKit 1.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+/**
+ * DebugKitViewTestSuite class
+ *
+ * @package       cake
+ * @subpackage    cake.tests.groups
+ */
+class DebugKitViewTestSuite extends TestSuite {
+/**
+ * label property
+ *
+ * @var string 'All core helpers'
+ * @access public
+ */
+	var $label = 'All View layer tests for DebugKit';
+/**
+ * AllCoreHelpersGroupTest method
+ *
+ * @access public
+ * @return void
+ */
+	function DebugKitViewTestSuite() {
+		$testDir = dirname(dirname(__FILE__));
+		TestManager::addTestCasesFromDirectory($this, $testDir . DS . 'cases' . DS . 'views');
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php
new file mode 100644
index 000000000..5652c86f0
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/controllers/debug_kit_test_controller.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * DebugKitTestController
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.test_app
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+class DebugKitTestController extends Controller {
+	var $name = 'DebugKitTest';
+
+	var $uses = array();
+
+	var $components = array('DebugKit.Toolbar');
+
+	function request_action_return() {
+		$this->autoRender = false;
+		return 'I am some value from requestAction.';
+	}
+	
+	function request_action_render() {
+		$this->set('test', 'I have been rendered.');
+	}
+	
+}
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php
new file mode 100644
index 000000000..3b004d3f7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/vendors/test_panel.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Test Panel 
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.tests.test_app
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+class TestPanel extends DebugPanel {
+	function startup(&$controller) {
+		$controller->testPanel = true;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp
new file mode 100644
index 000000000..172d541d7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/tests/test_app/views/debug_kit_test/request_action_render.ctp
@@ -0,0 +1 @@
+<?php echo $test; ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php
new file mode 100644
index 000000000..862ce627d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/debug_kit_debugger.php
@@ -0,0 +1,400 @@
+<?php
+/**
+ * DebugKit Debugger class. Extends and enhances core
+ * debugger. Adds benchmarking and timing functionality.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.vendors
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Core', 'Debugger');
+App::import('Vendor', 'DebugKit.FireCake');
+
+/**
+ * Debug Kit Temporary Debugger Class
+ *
+ * Provides the future features that are planned. Yet not implemented in the 1.2 code base
+ *
+ * This file will not be needed in future version of CakePHP.
+ */
+class DebugKitDebugger extends Debugger {
+/**
+ * Internal benchmarks array
+ *
+ * @var array
+ **/
+	var $__benchmarks = array();
+/**
+ * Internal memory points array
+ *
+ * @var array
+ **/
+	var $__memoryPoints = array();
+/**
+ * destruct method
+ *
+ * Allow timer info to be displayed if the code dies or is being debugged before rendering the view
+ * Cheat and use the debug log class for formatting
+ *
+ * @return void
+ * @access private
+ */
+	function __destruct() {
+		$_this =& DebugKitDebugger::getInstance();
+		if (Configure::read('debug') < 2 || !$_this->__benchmarks) {
+			return;
+		}
+		$timers = array_values(DebugKitDebugger::getTimers());
+		$end = end($timers);
+		echo '<table class="cake-sql-log"><tbody>';
+		echo '<caption>Debug timer info</caption>';
+		echo '<tr><th>Message</th><th>Start Time (ms)</th><th>End Time (ms)</th><th>Duration (ms)</th></tr>';
+		$i = 0;
+		foreach ($timers as $timer) {
+			$indent = 0;
+			for ($j = 0; $j < $i; $j++) {
+				if (($timers[$j]['end']) > ($timer['start']) && ($timers[$j]['end']) > ($timer['end'])) {
+					$indent++;
+				}
+			}
+			$indent = str_repeat(' » ', $indent);
+
+			extract($timer);
+			$start = round($start * 1000, 0);
+			$end = round($end * 1000, 0);
+			$time = round($time * 1000, 0);
+			echo "<tr><td>{$indent}$message</td><td>$start</td><td>$end</td><td>$time</td></tr>";
+			$i++;
+		}
+		echo '</tbody></table>';
+	}
+/**
+ * Start an benchmarking timer.
+ *
+ * @param string $name The name of the timer to start.
+ * @param string $message A message for your timer
+ * @return bool true
+ * @static
+ **/
+	function startTimer($name = null, $message = null) {
+		$start = getMicrotime();
+		$_this =& DebugKitDebugger::getInstance();
+
+		if (!$name) {
+			$named = false;
+			$calledFrom = debug_backtrace();
+			$_name = $name = Debugger::trimpath($calledFrom[0]['file']) . ' line ' . $calledFrom[0]['line'];
+		} else {
+			$named = true;
+		}
+
+		if (!$message) {
+			$message = $name;
+		}
+
+		$_name = $name;
+		$i = 1;
+		while (isset($_this->__benchmarks[$name])) {
+			$i++;
+			$name = $_name . ' #' . $i;
+		}
+
+		if ($i > 1) {
+			$message .= ' #' . $i;
+		}
+
+		$_this->__benchmarks[$name] = array(
+			'start' => $start,
+			'message' => $message,
+			'named' => $named
+		);
+		return true;
+	}
+/**
+ * Stop a benchmarking timer.
+ *
+ * $name should be the same as the $name used in startTimer().
+ *
+ * @param string $name The name of the timer to end.
+ * @access public
+ * @return boolean true if timer was ended, false if timer was not started.
+ * @static
+ */
+	function stopTimer($name = null) {
+		$end = getMicrotime();
+		$_this =& DebugKitDebugger::getInstance();
+		if (!$name) {
+			$names = array_reverse(array_keys($_this->__benchmarks));
+			foreach($names as $name) {
+				if (!empty($_this->__benchmarks[$name]['end'])) {
+					continue;
+				}
+				if (empty($_this->__benchmarks[$name]['named'])) {
+					break;
+				}
+			}
+		} else {
+			$i = 1;
+			$_name = $name;
+			while (isset($_this->__benchmarks[$name])) {
+				if (empty($_this->__benchmarks[$name]['end'])) {
+					break;
+				}
+				$i++;
+				$name = $_name . ' #' . $i;
+			}
+		}
+		if (!isset($_this->__benchmarks[$name])) {
+			return false;
+		}
+		$_this->__benchmarks[$name]['end'] = $end;
+		return true;
+	}
+/**
+ * Get all timers that have been started and stopped.
+ * Calculates elapsed time for each timer. If clear is true, will delete existing timers
+ *
+ * @param bool $clear false
+ * @return array
+ * @access public
+ **/
+	function getTimers($clear = false) {
+		$_this =& DebugKitDebugger::getInstance();
+		$start = DebugKitDebugger::requestStartTime();
+		$now = getMicrotime();
+
+		$times = array();
+		if (!empty($_this->__benchmarks)) {
+			$firstTimer = current($_this->__benchmarks);
+			$_end = $firstTimer['start'];
+		} else {
+			$_end = $now;
+		}
+		$times['Core Processing (Derived)'] = array(
+			'message' => __d('debug_kit', 'Core Processing (Derived)', true),
+			'start' => 0,
+			'end' => $_end - $start,
+			'time' => round($_end - $start, 6),
+			'named' => null
+		);
+		foreach ($_this->__benchmarks as $name => $timer) {
+			if (!isset($timer['end'])) {
+				$timer['end'] = $now;
+			}
+			$times[$name] = array_merge($timer, array(
+				'start' => $timer['start'] - $start,
+				'end' => $timer['end'] - $start,
+				'time' => DebugKitDebugger::elapsedTime($name)
+			));
+		}
+		if ($clear) {
+			$_this->__benchmarks = array();
+		}
+		return $times;
+	}
+/**
+ * Clear all existing timers
+ *
+ * @return bool true
+ **/
+	function clearTimers() {
+		$_this =& DebugKitDebugger::getInstance();
+		$_this->__benchmarks = array();
+		return true;
+	}
+/**
+ * Get the difference in time between the timer start and timer end.
+ *
+ * @param $name string the name of the timer you want elapsed time for.
+ * @param $precision int the number of decimal places to return, defaults to 5.
+ * @return float number of seconds elapsed for timer name, 0 on missing key
+ * @static
+ **/
+	function elapsedTime($name = 'default', $precision = 5) {
+		$_this =& DebugKitDebugger::getInstance();
+		if (!isset($_this->__benchmarks[$name]['start']) || !isset($_this->__benchmarks[$name]['end'])) {
+			return 0;
+		}
+		return round($_this->__benchmarks[$name]['end'] - $_this->__benchmarks[$name]['start'], $precision);
+	}
+/**
+ * Get the total execution time until this point
+ *
+ * @access public
+ * @return float elapsed time in seconds since script start.
+ * @static
+ */
+	function requestTime() {
+		$start = DebugKitDebugger::requestStartTime();
+		$now = getMicroTime();
+		return ($now - $start);
+	}
+/**
+ * get the time the current request started.
+ *
+ * @access public
+ * @return float time of request start
+ * @static
+ */
+	function requestStartTime() {
+		if (defined('TIME_START')) {
+			$startTime = TIME_START;
+		} else if (isset($GLOBALS['TIME_START'])) {
+			$startTime = $GLOBALS['TIME_START'];
+		} else {
+			$startTime = env('REQUEST_TIME');
+		}
+		return $startTime;
+	}
+/**
+ * get current memory usage
+ *
+ * @return integer number of bytes ram currently in use. 0 if memory_get_usage() is not available.
+ * @static
+ **/
+	function getMemoryUse() {
+		if (!function_exists('memory_get_usage')) {
+			return 0;
+		}
+		return memory_get_usage();
+	}
+/**
+ * Get peak memory use
+ *
+ * @return integer peak memory use (in bytes).  Returns 0 if memory_get_peak_usage() is not available
+ * @static
+ **/
+	function getPeakMemoryUse() {
+		if (!function_exists('memory_get_peak_usage')) {
+			return 0;
+		}
+		return memory_get_peak_usage();
+	}
+/**
+ * Stores a memory point in the internal tracker.
+ * Takes a optional message name which can be used to identify the memory point.
+ * If no message is supplied a debug_backtrace will be done to identifty the memory point.
+ * If you don't have memory_get_xx methods this will not work.
+ *
+ * @param string $message Message to identify this memory point.
+ * @return boolean
+ **/
+	function setMemoryPoint($message = null) {
+		$memoryUse = DebugKitDebugger::getMemoryUse();
+		if (!$message) {
+			$named = false;
+			$trace = debug_backtrace();
+			$message = Debugger::trimpath($trace[0]['file']) . ' line ' . $trace[0]['line'];
+		}
+		$self =& DebugKitDebugger::getInstance();
+		if (isset($self->__memoryPoints[$message])) {
+			$originalMessage = $message;
+			$i = 1;
+			while (isset($self->__memoryPoints[$message])) {
+				$i++;
+				$message = $originalMessage . ' #' . $i;
+			}
+		}
+		$self->__memoryPoints[$message] = $memoryUse;
+		return true;
+	}
+/**
+ * Get all the stored memory points
+ *
+ * @param boolean $clear Whether you want to clear the memory points as well. Defaults to false.
+ * @return array Array of memory marks stored so far.
+ **/
+	function getMemoryPoints($clear = false) {
+		$self =& DebugKitDebugger::getInstance();
+		$marks = $self->__memoryPoints;
+		if ($clear) {
+			$self->__memoryPoints = array();
+		}
+		return $marks;
+	}
+/**
+ * Clear out any existing memory points
+ *
+ * @return void
+ **/
+	function clearMemoryPoints() {
+		$self =& DebugKitDebugger::getInstance();
+		$self->__memoryPoints = array();
+	}
+/**
+ * Handles object conversion to debug string.
+ *
+ * @param string $var Object to convert
+ * @access protected
+ */
+	function _output($data = array()) {
+		extract($data);
+		if (is_array($level)) {
+			$error = $level['error'];
+			$code = $level['code'];
+			if (isset($level['helpID'])) {
+				$helpID = $level['helpID'];
+			} else {
+				$helpID = '';
+			}
+			$description = $level['description'];
+			$file = $level['file'];
+			$line = $level['line'];
+			$context = $level['context'];
+			$level = $level['level'];
+		}
+		$files = $this->trace(array('start' => 2, 'format' => 'points'));
+		$listing = $this->excerpt($files[0]['file'], $files[0]['line'] - 1, 1);
+		$trace = $this->trace(array('start' => 2, 'depth' => '20'));
+
+		if ($this->_outputFormat == 'fb') {
+			$kontext = array();
+			foreach ((array)$context as $var => $value) {
+				$kontext[] = "\${$var}\t=\t" . $this->exportVar($value, 1);
+			}
+			$this->_fireError($error, $code, $description, $file, $line, $trace, $kontext);
+		} else {
+			$data = compact(
+				'level', 'error', 'code', 'helpID', 'description', 'file', 'path', 'line', 'context'
+			);
+			echo parent::_output($data);
+		}
+	}
+/**
+ * Create a FirePHP error message
+ *
+ * @param string $error Name of error
+ * @param string $code  Code of error
+ * @param string $description Description of error
+ * @param string $file File error occured in
+ * @param string $line Line error occured on
+ * @param string $trace Stack trace at time of error
+ * @param string $context context of error
+ * @return void
+ * @access protected
+ */
+	function _fireError($error, $code, $description, $file, $line, $trace, $context) {
+		$name = $error . ' - ' . $description;
+		$message = "$error $code $description on line: $line in file: $file";
+		FireCake::group($name);
+		FireCake::error($message, $name);
+		FireCake::log($context, 'Context');
+		FireCake::log($trace, 'Trace');
+		FireCake::groupEnd();
+	}
+}
+
+
+Debugger::invoke(DebugKitDebugger::getInstance('DebugKitDebugger'));
+Debugger::getInstance('DebugKitDebugger');
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/fire_cake.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/fire_cake.php
new file mode 100644
index 000000000..1b7835ccb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/fire_cake.php
@@ -0,0 +1,546 @@
+<?php
+/**
+ * FirePHP Class for CakePHP
+ *
+ * Provides most of the functionality offered by FirePHPCore
+ * Interoperates with FirePHP extension for firefox
+ *
+ * For more information see: http://www.firephp.org/
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Core', 'Debugger');
+
+if (!function_exists('firecake')) {
+	function firecake($message, $label = null) {
+		FireCake::fb($message, $label, 'log');
+	}
+}
+
+class FireCake extends Object {
+/**
+ * Options for FireCake.
+ *
+ * @see _defaultOptions and setOptions();
+ * @var string
+ */
+	var	$options = array();
+/**
+ * Default Options used in CakeFirePhp
+ *
+ * @var string
+ * @access protected
+ */
+	var $_defaultOptions = array(
+		'maxObjectDepth' => 10,
+	    'maxArrayDepth' => 20,
+	    'useNativeJsonEncode' => true,
+	    'includeLineNumbers' => true,
+	);
+/**
+ * Message Levels for messages sent via FirePHP
+ *
+ * @var array
+ */
+	var $_levels = array(
+		'log' => 'LOG',
+		'info' => 'INFO',
+		'warn' => 'WARN',
+		'error' => 'ERROR',
+		'dump' => 'DUMP',
+		'trace' => 'TRACE',
+		'exception' => 'EXCEPTION',
+		'table' => 'TABLE',
+		'groupStart' => 'GROUP_START',
+		'groupEnd' => 'GROUP_END',
+	);
+
+	var $_version = '0.2.1';
+/**
+ * internal messageIndex counter
+ *
+ * @var int
+ * @access protected
+ */
+	var $_messageIndex = 1;
+/**
+ * stack of objects encoded by stringEncode()
+ *
+ * @var array
+ **/
+	var $_encodedObjects = array();
+/**
+ * methodIndex to include in tracebacks when using includeLineNumbers
+ *
+ * @var array
+ **/
+	var $_methodIndex = array('info', 'log', 'warn', 'error', 'table', 'trace');
+/**
+ * FireCake output status
+ *
+ * @var bool
+ **/
+	var $_enabled = true;
+/**
+ * get Instance of the singleton
+ *
+ * @param string $class Class instance to store in the singleton. Used with subclasses and Tests.
+ * @access public
+ * @static
+ * @return void
+ */
+	function &getInstance($class = null) {
+		static $instance = array();
+		if (!empty($class)) {
+			if (!$instance || strtolower($class) != strtolower(get_class($instance[0]))) {
+				$instance[0] =& new $class();
+				$instance[0]->setOptions();
+			}
+		}
+		if (!isset($instance[0]) || !$instance[0]) {
+			$instance[0] =& new FireCake();
+			$instance[0]->setOptions();
+		}
+		return $instance[0];
+	}
+/**
+ * setOptions
+ *
+ * @param array $options Array of options to set.
+ * @access public
+ * @static
+ * @return void
+ */
+	function setOptions($options = array()) {
+		$_this =& FireCake::getInstance();
+		if (empty($_this->options)) {
+			$_this->options = array_merge($_this->_defaultOptions, $options);
+		} else {
+			$_this->options = array_merge($_this->options, $options);
+		}
+	}
+/**
+ * Return boolean based on presence of FirePHP extension
+ *
+ * @access public
+ * @return boolean
+ **/
+	function detectClientExtension() {
+		$ua = FireCake::getUserAgent();
+		if (!preg_match('/\sFirePHP\/([\.|\d]*)\s?/si', $ua, $match) || !version_compare($match[1], '0.0.6', '>=')) {
+			return false;
+		}
+		return true;
+	}
+/**
+ * Get the Current UserAgent
+ *
+ * @access public
+ * @static
+ * @return string UserAgent string of active client connection
+ **/
+	function getUserAgent() {
+		return env('HTTP_USER_AGENT');
+	}
+/**
+ * Disable FireCake output
+ * All subsequent output calls will not be run.
+ *
+ * @return void
+ **/
+	function disable() {
+		$_this =& FireCake::getInstance();
+		$_this->_enabled = false;
+	}
+/**
+ * Enable FireCake output
+ *
+ * @return void
+ **/
+	function enable() {
+		$_this =& FireCake::getInstance();
+		$_this->_enabled = true;
+	}
+/**
+ * Convenience wrapper for LOG messages
+ *
+ * @param string $message Message to log
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */
+	function log($message, $label = null) {
+		FireCake::fb($message, $label, 'log');
+	}
+/**
+ * Convenience wrapper for WARN messages
+ *
+ * @param string $message Message to log
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */
+	function warn($message, $label = null) {
+		FireCake::fb($message, $label, 'warn');
+	}
+/**
+ * Convenience wrapper for INFO messages
+ *
+ * @param string $message Message to log
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */
+	function info($message, $label = null) {
+		FireCake::fb($message, $label, 'info');
+	}
+/**
+ * Convenience wrapper for ERROR messages
+ *
+ * @param string $message Message to log
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */
+	function error($message, $label = null) {
+		FireCake::fb($message, $label, 'error');
+	}
+/**
+ * Convenience wrapper for TABLE messages
+ *
+ * @param string $message Message to log
+ * @param string $label Label for message (optional)
+ * @access public
+ * @static
+ * @return void
+ */
+	function table($label, $message) {
+		FireCake::fb($message, $label, 'table');
+	}
+/**
+ * Convenience wrapper for DUMP messages
+ *
+ * @param string $message Message to log
+ * @param string $label Unique label for message
+ * @access public
+ * @static
+ * @return void
+ */
+	function dump($label, $message) {
+		FireCake::fb($message, $label, 'dump');
+	}
+/**
+ * Convenience wrapper for TRACE messages
+ *
+ * @param string $label Label for message (optional)
+ * @access public
+ * @return void
+ */
+	function trace($label)  {
+		FireCake::fb($label, 'trace');
+	}
+/**
+ * Convenience wrapper for GROUP messages
+ * Messages following the group call will be nested in a group block
+ *
+ * @param string $label Label for group (optional)
+ * @access public
+ * @return void
+ */
+	function group($label)  {
+		FireCake::fb(null, $label, 'groupStart');
+	}
+/**
+ * Convenience wrapper for GROUPEND messages
+ * Closes a group block
+ *
+ * @param string $label Label for group (optional)
+ * @access public
+ * @return void
+ */
+	function groupEnd()  {
+		FireCake::fb(null, null, 'groupEnd');
+	}
+/**
+ * fb - Send messages with FireCake to FirePHP
+ *
+ * Much like FirePHP's fb() this method can be called with various parameter counts
+ * fb($message) - Just send a message defaults to LOG type
+ * fb($message, $type) - Send a message with a specific type
+ * fb($message, $label, $type) - Send a message with a custom label and type.
+ *
+ * @param mixed $message Message to output. For other parameters see usage above.
+ * @static
+ * @return void
+ **/
+	function fb($message) {
+		$_this =& FireCake::getInstance();
+
+		if (headers_sent($filename, $linenum)) {
+			trigger_error(sprintf(__d('debug_kit', 'Headers already sent in %s on line %s. Cannot send log data to FirePHP.', true), $filename, $linenum), E_USER_WARNING);
+			return false;
+		}
+		if (!$_this->_enabled || !$_this->detectClientExtension()) {
+			return false;
+		}
+
+		$args = func_get_args();
+		$type = $label = null;
+		switch (count($args)) {
+			case 1:
+				$type = $_this->_levels['log'];
+				break;
+			case 2:
+				$type = $args[1];
+				break;
+			case 3:
+				$type = $args[2];
+				$label = $args[1];
+				break;
+			default:
+				trigger_error(__d('debug_kit', 'Incorrect parameter count for FireCake::fb()', true), E_USER_WARNING);
+				return false;
+		}
+		if (isset($_this->_levels[$type])) {
+			$type = $_this->_levels[$type];
+		} else {
+			$type = $_this->_levels['log'];
+		}
+
+		$meta = array();
+		$skipFinalObjectEncode = false;
+		if ($type == $_this->_levels['trace']) {
+			$trace = debug_backtrace();
+			if (!$trace) {
+				return false;
+			}
+			$message = $_this->_parseTrace($trace, $args[0]);
+			$skipFinalObjectEncode = true;
+		}
+
+		if ($_this->options['includeLineNumbers']) {
+			if (!isset($meta['file']) || !isset($meta['line'])) {
+				$trace = debug_backtrace();
+				for ($i = 0, $len = count($trace); $i < $len ; $i++) {
+					$keySet = (isset($trace[$i]['class']) && isset($trace[$i]['function']));
+					$selfCall = ($keySet && 
+						strtolower($trace[$i]['class']) == 'firecake' &&
+						in_array($trace[$i]['function'], $_this->_methodIndex)
+					);
+					if ($selfCall) {
+						$meta['File'] = isset($trace[$i]['file']) ? Debugger::trimPath($trace[$i]['file']) : '';
+						$meta['Line'] = isset($trace[$i]['line']) ? $trace[$i]['line'] : '';
+						break;
+					}
+				}
+			}
+		}
+
+		$structureIndex = 1;
+		if ($type == $_this->_levels['dump']) {
+			$structureIndex = 2;
+			$_this->_sendHeader('X-Wf-1-Structure-2','http://meta.firephp.org/Wildfire/Structure/FirePHP/Dump/0.1');
+		} else {
+			$_this->_sendHeader('X-Wf-1-Structure-1','http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1');
+		}
+
+		$_this->_sendHeader('X-Wf-Protocol-1', 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2');
+		$_this->_sendHeader('X-Wf-1-Plugin-1', 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/'. $_this->_version);
+		if ($type == $_this->_levels['groupStart']) {
+			$meta['Collapsed'] = 'true';
+		}
+		if ($type == $_this->_levels['dump']) {
+			$dump = $_this->jsonEncode($message);
+			$msg = '{"' . $label .'":' . $dump .'}';
+		} else {
+			$meta['Type'] = $type;
+			if ($label !== null) {
+				$meta['Label'] = $label;
+			}
+			$msg = '[' . $_this->jsonEncode($meta) . ',' . $_this->jsonEncode($message, $skipFinalObjectEncode).']';
+		}
+
+		$lines = explode("\n", chunk_split($msg, 5000, "\n"));
+
+		foreach ($lines as $i => $line) {
+			if (empty($line)) {
+				continue;
+			}
+			$header = 'X-Wf-1-' . $structureIndex . '-1-' . $_this->_messageIndex;
+			if (count($lines) > 2) {
+				$first = ($i == 0) ? strlen($msg) : '';
+				$end = ($i < count($lines) - 2) ? '\\' : '';
+				$message = $first . '|' . $line . '|' . $end;
+				$_this->_sendHeader($header, $message);
+			} else {
+				$_this->_sendHeader($header, strlen($line) . '|' . $line . '|');
+			}
+			$_this->_messageIndex++;
+			if ($_this->_messageIndex > 99999) {
+				trigger_error(__d('debug_kit', 'Maximum number (99,999) of messages reached!', true), E_USER_WARNING);
+			}
+		}
+		$_this->_sendHeader('X-Wf-1-Index', $_this->_messageIndex - 1);
+		return true;
+	}
+/**
+ * Parse a debug backtrace
+ *
+ * @param array $trace Debug backtrace output
+ * @access protected
+ * @return array
+ **/
+	function _parseTrace($trace, $messageName) {
+		$message = array();
+		for ($i = 0, $len = count($trace); $i < $len ; $i++) {
+			$keySet = (isset($trace[$i]['class']) && isset($trace[$i]['function']));
+			$selfCall = ($keySet && $trace[$i]['class'] == 'FireCake');
+			if (!$selfCall) {
+				$message = array(
+					'Class' => isset($trace[$i]['class']) ? $trace[$i]['class'] : '',
+					'Type' => isset($trace[$i]['type']) ? $trace[$i]['type'] : '',
+					'Function' => isset($trace[$i]['function']) ? $trace[$i]['function'] : '',
+					'Message' => $messageName,
+					'File' => isset($trace[$i]['file']) ? Debugger::trimPath($trace[$i]['file']) : '',
+					'Line' => isset($trace[$i]['line']) ? $trace[$i]['line'] : '',
+					'Args' => isset($trace[$i]['args']) ? $this->stringEncode($trace[$i]['args']) : '',
+					'Trace' => $this->_escapeTrace(array_splice($trace, $i + 1))
+				);
+				break;
+			}
+		}
+		return $message;
+	}
+/**
+ * Fix a trace for use in output
+ *
+ * @param mixed $trace Trace to fix
+ * @access protected
+ * @static
+ * @return string
+ **/
+	function _escapeTrace($trace) {
+		for ($i = 0, $len = count($trace); $i < $len; $i++) {
+			if (isset($trace[$i]['file'])) {
+				$trace[$i]['file'] = Debugger::trimPath($trace[$i]['file']);
+			}
+			if (isset($trace[$i]['args'])) {
+				$trace[$i]['args'] = $this->stringEncode($trace[$i]['args']);
+			}
+		}
+		return $trace;
+	}
+/**
+ * Encode non string objects to string.
+ * Filter out recursion, so no errors are raised by json_encode or $javascript->object()
+ *
+ * @param mixed $object Object or variable to encode to string.
+ * @param int $objectDepth Current Depth in object chains.
+ * @param int $arrayDepth Current Depth in array chains.
+ * @static
+ * @return void
+ **/
+	function stringEncode($object, $objectDepth = 1, $arrayDepth = 1) {
+		$_this =& FireCake::getInstance();
+		$return = array();
+		if (is_resource($object)) {
+			return '** ' . (string)$object . '**';
+		}
+		if (is_object($object)) {
+			if ($objectDepth == $_this->options['maxObjectDepth']) {
+				return '** Max Object Depth (' . $_this->options['maxObjectDepth'] . ') **';
+			}
+			foreach ($_this->_encodedObjects as $encoded) {
+				if ($encoded === $object) {
+					return '** Recursion (' . get_class($object) . ') **';
+				}
+			}
+			$_this->_encodedObjects[] =& $object;
+
+			$return['__className'] = $class = get_class($object);
+			$properties = (array)$object;
+			foreach ($properties as $name => $property) {
+				$return[$name] = FireCake::stringEncode($property, 1, $objectDepth + 1);
+			}
+			array_pop($_this->_encodedObjects);
+		}
+		if (is_array($object)) {
+			if ($arrayDepth == $_this->options['maxArrayDepth']) {
+				return '** Max Array Depth ('. $_this->options['maxArrayDepth'] . ') **';
+			}
+			foreach ($object as $key => $value) {
+				$return[$key] = FireCake::stringEncode($value, 1, $arrayDepth + 1);
+			}
+		}
+		if (is_string($object) || is_numeric($object) || is_bool($object) || is_null($object)) {
+			return $object;
+		}
+		return $return;
+	}
+/**
+ * Encode an object into JSON
+ *
+ * @param mixed $object Object or array to json encode
+ * @param boolean $doIt
+ * @access public
+ * @static
+ * @return string
+ **/
+	function jsonEncode($object, $skipEncode = false) {
+		$_this =& FireCake::getInstance();
+		if (!$skipEncode) {
+			$object = FireCake::stringEncode($object);
+		}
+
+		if (function_exists('json_encode') && $_this->options['useNativeJsonEncode']) {
+			return json_encode($object);
+		} else {
+			return FireCake::_jsonEncode($object);
+		}
+	}
+/**
+ * jsonEncode Helper method for PHP4 compatibility
+ *
+ * @param mixed $object Something to encode
+ * @access protected
+ * @static
+ * @return string
+ **/
+	function _jsonEncode($object) {
+		if (!class_exists('JavascriptHelper')) {
+			App::import('Helper', 'Javascript');
+		}
+		$javascript =& new JavascriptHelper();
+		$javascript->useNative = false;
+		if (is_string($object)) {
+			return '"' . $javascript->escapeString($object) . '"';
+		}
+		return $javascript->object($object);
+	}
+/**
+ * Send Headers - write headers.
+ *
+ * @access protected
+ * @return void
+ **/
+	function _sendHeader($name, $value) {
+		header($name . ': ' . $value);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/benchmark.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/benchmark.php
new file mode 100644
index 000000000..eb2a3dcc4
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/benchmark.php
@@ -0,0 +1,167 @@
+<?php
+/**
+ * Benchmark Shell.
+ *
+ * Provides basic benchmarking of application requests
+ * functionally similar to Apache AB
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.vendors.shells
+ * @since         DebugKit 1.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+
+/**
+ * Benchmark Shell Class
+ *
+ * @package cake
+ * @subpackage cake.debug_kit.vendors.shells
+ * @todo Print/export time detail information
+ * @todo Export/graphing of data to .dot format for graphviz visualization
+ * @todo Make calculated results round to leading significant digit position of std dev.
+ */
+class BenchmarkShell extends Shell {
+/**
+ * Main execution of shell
+ *
+ * @return void
+ * @access public
+ */
+	function main() {
+		if (empty($this->args) || count($this->args) > 1) {
+			return $this->help();
+		}
+
+		$url = $this->args[0];
+		$defaults = array('t' => 100, 'n' => 10);
+		$options  = array_merge($defaults, $this->params);
+		$times = array();
+
+		$this->out(String::insert(__d('debug_kit', '-> Testing :url', true), compact('url')));
+		$this->out("");
+		for ($i = 0; $i < $options['n']; $i++) {
+			if (floor($options['t'] - array_sum($times)) <= 0 || $options['n'] <= 1) {
+				break;
+			}
+
+			$start = microtime(true);
+			file_get_contents($url);
+			$stop = microtime(true);
+
+			$times[] = $stop - $start;
+		}
+		$this->_results($times);
+	}
+/**
+ * Prints calculated results
+ *
+ * @param array $times Array of time values
+ * @return void
+ * @access protected
+ */
+	function _results($times) {
+		$duration = array_sum($times);
+		$requests = count($times);
+
+		$this->out(String::insert(__d('debug_kit', 'Total Requests made: :requests', true), compact('requests')));
+		$this->out(String::insert(__d('debug_kit', 'Total Time elapsed: :duration (seconds)', true), compact('duration')));
+
+		$this->out("");
+
+		$this->out(String::insert(__d('debug_kit', 'Requests/Second: :rps req/sec', true), array(
+				'rps' => round($requests / $duration, 3)
+		)));
+
+		$this->out(String::insert(__d('debug_kit', 'Average request time: :average-time seconds', true), array(
+				'average-time' => round($duration / $requests, 3)
+		)));
+
+		$this->out(String::insert(__d('debug_kit', 'Standard deviation of average request time: :std-dev', true), array(
+				'std-dev' => round($this->_deviation($times, true), 3)
+		)));
+
+		$this->out(String::insert(__d('debug_kit', 'Longest/shortest request: :longest sec/:shortest sec', true), array(
+				'longest' => round(max($times), 3),
+				'shortest' => round(min($times), 3)
+		)));
+
+		$this->out("");
+
+	}
+/**
+ * One-pass, numerically stable calculation of population variance.
+ *
+ * Donald E. Knuth (1998).
+ * The Art of Computer Programming, volume 2: Seminumerical Algorithms, 3rd edn.,
+ * p. 232. Boston: Addison-Wesley.
+ *
+ * @param array $times Array of values
+ * @param boolean $sample If true, calculates an unbiased estimate of the population
+ * 						  variance from a finite sample.
+ * @return float Variance
+ * @access protected
+ */
+	function _variance($times, $sample = true) {
+		$n = $mean = $M2 = 0;
+
+		foreach($times as $time){
+			$n += 1;
+			$delta = $time - $mean;
+			$mean = $mean + $delta/$n;
+			$M2 = $M2 + $delta*($time - $mean);
+		}
+
+		if ($sample) $n -= 1;
+
+		return $M2/$n;
+	}
+/**
+ * Calculate the standard deviation.
+ *
+ * @param array $times Array of values
+ * @return float Standard deviation
+ * @access protected
+ */
+	function _deviation($times, $sample = true) {
+		return sqrt($this->_variance($times, $sample));
+	}
+/**
+ * Help for Benchmark shell
+ *
+ * @return void
+ * @access public
+ */
+	function help() {
+		$this->out(__d('debug_kit', "DebugKit Benchmark Shell", true));
+		$this->out("");
+		$this->out(__d('debug_kit', "\tAllows you to obtain some rough benchmarking statistics \n\tabout a fully qualified URL.", true));
+		$this->out("");
+		$this->out(__d('debug_kit', "\tUse:", true));
+		$this->out(__d('debug_kit', "\t\tcake benchmark [-n iterations] [-t timeout] url", true));
+		$this->out("");
+		$this->out(__d('debug_kit', "\tParams:", true));
+		$this->out(__d('debug_kit', "\t\t-n Number of iterations to perform. Defaults to 10. \n\t\t   Must be an integer.", true));
+		$this->out(__d('debug_kit', "\t\t-t Maximum total time for all iterations, in seconds. \n\t\t   Defaults to 100. Must be an integer.", true));
+		$this->out("");
+		$this->out(__d('debug_kit', "\tIf a single iteration takes more than the \n\ttimeout specified, only one request will be made.", true));
+		$this->out("");
+		$this->out(__d('debug_kit', "\tExample Use:", true));
+		$this->out(__d('debug_kit', "\t\tcake benchmark -n 10 -t 100 http://localhost/testsite", true));
+		$this->out("");
+		$this->out(__d('debug_kit', "\tNote that this benchmark does not include browser render time", true));
+		$this->out("");
+		$this->hr();
+		$this->out("");
+	}
+}
+
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/whitespace.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/whitespace.php
new file mode 100644
index 000000000..d5185d454
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/vendors/shells/whitespace.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Whitespace shell. Helps find and trim whitespace from files.
+ *
+ * Based on jperras' shell found at http://bin.cakephp.org/view/626544881
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.vendors.shells
+ * @since         DebugKit 1.3
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+App::import('Core',array('Folder'));
+
+class WhitespaceShell extends Shell {
+
+/**
+ * Will check files for whitespace and notify you
+ * of any files containing leading or trailing whitespace.
+ *
+ * @return void
+ */
+	function main() {
+		$siteRoot = new Folder(ROOT);
+
+		$r = $siteRoot->findRecursive('.*\.php');
+		$this->out("Checking *.php in ".ROOT);
+		foreach($r as $file) {
+			$c = file_get_contents($file);
+			if (preg_match('/^[\n\r|\n\r|\n|\r|\s]+\<\?php/',$c)) {
+				$this->out('!!!contains leading whitespaces: '.$this->shortPath($file));
+			}
+			if (preg_match('/\?\>[\n\r|\n\r|\n|\r|\s]+$/',$c)) {
+				$this->out('!!!contains trailing whitespaces: '.$this->shortPath($file));
+			}
+		}
+	}
+
+/**
+ * Much like main() except files are modified.  Be sure to have 
+ * backups or use version control.
+ *
+ * @return void
+ */
+	function trim() {
+		$siteRoot = new Folder(ROOT);
+
+		$r = $siteRoot->findRecursive('.*\.php');
+		$this->out("Checking *.php in ".ROOT);
+		foreach($r as $file) {
+			$c = file_get_contents($file);
+			if (preg_match('/^[\n\r|\n\r|\n|\r|\s]+\<\?php/', $c) || preg_match('/\?\>[\n\r|\n\r|\n|\r|\s]+$/', $c)) {
+				$this->out('trimming' . $this->shortPath($file));
+				$c = preg_replace('/^[\n\r|\n\r|\n|\r|\s]+\<\?php/', '<?php', $c);
+				$c = preg_replace('/\?\>[\n\r|\n\r|\n|\r|\s]+$/', '?>', $c);
+				file_put_contents($file, $c);
+			}
+        }
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/debug.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/debug.php
new file mode 100644
index 000000000..43601e72d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/debug.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Debug View
+ *
+ * Custom Debug View class, helps with development.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Vendor', 'DebugKit.DebugKitDebugger');
+App::import('Component', 'DebugKit.Toolbar');
+
+/**
+ * DebugView used by DebugKit
+ *
+ * @package debug_kit.views
+ */
+class DebugView extends DoppelGangerView {
+/**
+ * Overload _render to capture filenames and time actual rendering of each view file
+ *
+ * @param string $___viewFn Filename of the view
+ * @param array $___dataForView Data to include in rendered view
+ * @return string Rendered output
+ * @access protected
+ */
+	function _render($___viewFn, $___dataForView, $loadHelpers = true, $cached = false) {
+		if (!isset($___dataForView['disableTimer'])) {
+			DebugKitDebugger::startTimer('render_' . basename($___viewFn), sprintf(__d('debug_kit', 'Rendering %s', true), Debugger::trimPath($___viewFn)));
+		}
+		$out = parent::_render($___viewFn, $___dataForView, $loadHelpers, $cached);
+
+		if (!isset($___dataForView['disableTimer'])) {
+			DebugKitDebugger::stopTimer('render_' . basename($___viewFn));
+		}
+		return $out;
+	}
+
+/**
+ * Element method, adds comment injection to the features View offers.
+ *
+ * @return void
+ */
+	function element($name, $params = array(), $loadHelpers = false) {
+		$out = '';
+		$isHtml = (
+			(isset($this->params['url']['ext']) && $this->params['url']['ext'] === 'html') ||
+			!isset($this->params['url']['ext'])
+		);
+		if ($isHtml) {
+			$out .= sprintf("<!-- %s - %s -->\n", __d('debug_kit', 'Starting to render', true), $name); 
+		}
+		$out .= parent::element($name, $params, $loadHelpers);
+		if ($isHtml) {
+			$out .= sprintf("\n<!-- %s - %s -->\n", __d('debug_kit', 'Finished', true), $name);
+		}
+		return $out;
+	}
+
+/**
+ * Renders view for given action and layout. If $file is given, that is used
+ * for a view filename (e.g. customFunkyView.ctp).
+ * Adds timers, for all subsequent rendering, and injects the debugKit toolbar.
+ *
+ * @param string $action Name of action to render for
+ * @param string $layout Layout to use
+ * @param string $file Custom filename for view
+ * @return string Rendered Element
+ */
+	function render($action = null, $layout = null, $file = null) {
+		DebugKitDebugger::startTimer('viewRender', __d('debug_kit', 'Rendering View', true));
+
+		$out = parent::render($action, $layout, $file);
+
+		DebugKitDebugger::stopTimer('viewRender');
+		DebugKitDebugger::stopTimer('controllerRender');
+		DebugKitDebugger::setMemoryPoint(__d('debug_kit', 'View render complete', true));
+
+		if (empty($this->params['requested']) && isset($this->loaded['toolbar'])) {
+			$backend = $this->loaded['toolbar']->getName();
+			$this->loaded['toolbar']->{$backend}->send();
+		}
+		if (empty($this->output)) {
+			return $out;
+		}
+		return $this->output;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp
new file mode 100644
index 000000000..327f0eb85
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/debug_toolbar.ctp
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Debug Toolbar Element
+ *
+ * Renders all of the other panel elements.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+?>
+<div id="debug-kit-toolbar">
+	<?php if (empty($debugToolbarPanels)) :?>
+		<p class="warning"><?php __d('debug_kit', 'There are no active panels. You must enable a panel to see its output.'); ?></p>
+	<?php else: ?>
+		<ul id="panel-tabs">
+			<li class="panel-tab icon">
+				<a href="#hide" id="hide-toolbar">
+					<?php echo $html->image('/debug_kit/img/cake.icon.png', array('alt' => 'CakePHP')); ?>
+				</a>
+			</li>
+		<?php foreach ($debugToolbarPanels as $panelName => $panelInfo): ?>
+			<?php $panelUnderscore = Inflector::underscore($panelName);?>
+			<li class="panel-tab">
+			<?php
+				$title = (empty($panelInfo['title'])) ? Inflector::humanize($panelUnderscore) : $panelInfo['title'];
+				echo $toolbar->panelStart($title, $panelUnderscore);
+			?>
+				<div class="panel-content" id="<?php echo $panelUnderscore ?>-tab">
+					<a href="#" class="panel-maximize ui-control ui-button">+</a>
+					<a href="#" class="panel-minimize ui-control ui-button">–</a>
+					<div class="panel-resize-region">
+						<div class="panel-content-data">
+							<?php echo $this->element($panelInfo['elementName'], $panelInfo); ?>
+						</div>
+						<div class="panel-content-data panel-history" id="<?php echo $panelUnderscore; ?>-history">
+							<!-- content here -->
+						</div>
+					</div>
+					<div class="panel-resize-handle ui-control">====</div>
+				</div>
+			<?php $toolbar->panelEnd(); ?>
+			</li>
+		<?php endforeach; ?>
+		</ul>
+	<?php endif; ?>
+</div>
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/history_panel.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/history_panel.ctp
new file mode 100644
index 000000000..8f4cdab4d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/history_panel.ctp
@@ -0,0 +1,195 @@
+<?php
+/**
+ * View Variables Panel Element
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 1.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+?>
+<h2> <?php __d('debug_kit', 'Request History'); ?></h2>
+<?php if (empty($content)): ?>
+  <p class="warning"><?php __d('debug_kit', 'No previous requests logged.'); ?></p>
+<?php else: ?>
+	<?php echo count($content); ?> <?php __d('debug_kit', 'previous requests available') ?>
+	<ul class="history-list">
+		<li><?php echo $html->link(__d('debug_kit', 'Restore to current request', true),
+			'#', array('class' => 'history-link', 'id' => 'history-restore-current')); ?>
+		</li>
+		<?php foreach ($content as $previous): ?>
+			<li><?php echo $html->link($previous['title'], $previous['url'], array('class' => 'history-link')); ?></li>
+		<?php endforeach; ?>
+	</ul>
+<?php endif; ?>
+
+<script type="text/javascript">
+//<![CDATA[
+DEBUGKIT.module('historyPanel');
+DEBUGKIT.historyPanel = function () {
+	var toolbar = DEBUGKIT.toolbar,
+		Element = DEBUGKIT.Util.Element,
+		Cookie = DEBUGKIT.Util.Cookie,
+		Event = DEBUGKIT.Util.Event,
+		Request = DEBUGKIT.Util.Request,
+		Collection = DEBUGKIT.Util.Collection,
+		historyLinks = [];
+
+	// Private methods to handle JSON response and insertion of
+	// new content.
+	var switchHistory = function (response) {
+		try {
+			var responseJson = eval( '(' + response.response.text + ')');
+		} catch (e) {
+			alert('Could not convert JSON response');
+			return false;
+		}
+
+		Element.removeClass(historyLinks, 'loading');
+
+		Collection.apply(toolbar.panels, function (panel, id) {
+			if (panel.content === undefined || responseJson[id] === undefined) {
+				return;
+			}
+
+			var panelDivs = panel.content.childNodes,
+				i = panelDivs.length,
+				regionDiv;
+
+			while (i--) {
+				var panelRegion = panelDivs[i];
+				if (panelRegion.nodeType != 1) {
+					continue;
+				}
+				if (
+					Element.nodeName(panelRegion, 'DIV') &&
+					Element.hasClass(panelRegion, 'panel-resize-region')
+				) {
+					regionDiv = panelRegion;
+					break;
+				}
+			}
+			if (!regionDiv) return;
+
+			var regionDivs = regionDiv.childNodes,
+				i = regionDivs.length;
+
+			while (i--) {
+				//toggle history element, hide current request one.
+				var panelContent = regionDivs[i];
+				if (Element.nodeName(panelContent, 'DIV') && Element.hasClass(panelContent, 'panel-history')) {
+					var panelId = panelContent.id.replace('-history', '');
+					if (responseJson[panelId]) {
+						panelContent.innerHTML = responseJson[panelId];
+						var lists;
+						if (panelContent.getElementsByClassName) {
+							lists = panelContent.getElementsByClassName('depth-0');
+						} else {
+							lists = panelContent.getElementsByTagName('UL');
+						}
+						toolbar.makeNeatArray(lists);
+					}
+					Element.show(panelContent);
+				} else if (Element.nodeName(panelContent, 'DIV')) {
+					Element.hide(panelContent);
+				}
+			}
+		});
+	};
+
+	// Private method to handle restoration to current request.
+	var restoreCurrentState = function () {
+		var id, i, panelContent, tag;
+
+		Element.removeClass(historyLinks, 'loading');
+
+		//for (id in toolbar.panels) {
+		Collection.apply(toolbar.panels, function (panel, id) {
+			if (panel.content === undefined) {
+				return;
+			}
+
+			var panelDivs = panel.content.childNodes,
+				i = panelDivs.length,
+				regionDiv;
+
+			while (i--) {
+				var panelRegion = panelDivs[i];
+				if (panelRegion.nodeType != 1) {
+					continue;
+				}
+				if (
+					Element.nodeName(panelRegion, 'DIV') &&
+					Element.hasClass(panelRegion, 'panel-resize-region')
+				) {
+					regionDiv = panelRegion;
+					break;
+				}
+			}
+			if (!regionDiv) return;
+
+			var regionDivs = regionDiv.childNodes,
+				i = regionDivs.length;
+
+			while (i--) {
+				panelContent = regionDivs[i];
+				if (Element.nodeName(panelContent, 'DIV') && Element.hasClass(panelContent, 'panel-history')) {
+					Element.hide(panelContent);
+				} else if (Element.nodeName(panelContent, 'DIV')) {
+					Element.show(panelContent);
+				}
+			}
+		});
+	};
+
+	function handleHistoryLink (event) {
+		event.preventDefault();
+
+		Element.removeClass(historyLinks, 'active');
+		Element.addClass(this, 'active loading');
+
+		if (this.id === 'history-restore-current') {
+			restoreCurrentState();
+			return false;
+		}
+
+		var remote = new Request({
+			onComplete : switchHistory,
+			onFail : function () {
+				alert('History retrieval failed');
+			}
+		});
+		remote.send(this.href);
+	};
+
+	return {
+		init : function () {
+			if (toolbar.panels['history'] === undefined) {
+				console.log('bailing on history');
+				return;
+			}
+
+			var anchors = toolbar.panels['history'].content.getElementsByTagName('A');
+			Collection.apply(anchors, function (button) {
+				if (Element.hasClass(button, 'history-link')) {
+					historyLinks.push(button);
+					Event.addEvent(button, 'click', handleHistoryLink);
+				}
+			});
+		}
+	};
+}();
+
+DEBUGKIT.loader.register(DEBUGKIT.historyPanel);
+//]]>
+</script>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/log_panel.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/log_panel.ctp
new file mode 100644
index 000000000..1751df991
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/log_panel.ctp
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Log Panel Element
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+?>
+<h2><?php __d('debug_kit', 'Logs') ?></h2>
+<div class="code-table">
+<?php foreach ($content as $logName => $logs): ?>
+	<h3><?php echo $logName ?></h3>
+	<?php
+		$len = count($logs);
+		if ($len > 0):
+			$headers = array(__d('debug_kit', 'Time', true), __d('debug_kit', 'Message', true));
+			$rows = array();
+			for ($i = 0; $i < $len; $i += 1):
+				$rows[] = array(
+					$logs[$i][0], h($logs[$i][1])
+				);
+			endfor;
+			echo $toolbar->table($rows, $headers, array('title' => $logName));
+		else: ?>
+		<p class="info"><?php __d('debug_kit', 'There were no log entries made this request'); ?></p>
+	<?php endif; ?>
+<?php endforeach; ?>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/request_panel.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/request_panel.ctp
new file mode 100644
index 000000000..310090ea9
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/request_panel.ctp
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Request Panel Element
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+?>
+<h2> <?php __d('debug_kit', 'Request'); ?></h2>
+<h4>Cake Params</h4>
+<?php echo $toolbar->makeNeatArray($content['params']); ?>
+
+<h4>$_GET</h4>
+<?php echo $toolbar->makeNeatArray($content['get']); ?>
+
+<h4>Cookie</h4>
+<?php if (isset($content['cookie'])): ?>
+	<?php echo $toolbar->makeNeatArray($content['cookie']); ?>
+<?php else: ?>
+	<p class="warning">To view Cookies, add CookieComponent to Controller</p>
+<?php endif; ?>
+
+<h4><?php __d('debug_kit', 'Current Route') ?></h4>
+<?php echo $toolbar->makeNeatArray($content['currentRoute']); ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/session_panel.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/session_panel.ctp
new file mode 100644
index 000000000..c729a8273
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/session_panel.ctp
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Session Panel Element
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 1.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+?>
+<h2><?php __d('debug_kit', 'Session'); ?></h2>
+<?php echo $toolbar->makeNeatArray($content); ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp
new file mode 100755
index 000000000..148c694dc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/sql_log_panel.ctp
@@ -0,0 +1,105 @@
+<?php
+/**
+ * SQL Log Panel Element
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+$headers = array('Query', 'Error', 'Affected', 'Num. rows', 'Took (ms)', 'Actions');
+if (isset($debugKitInHistoryMode)) {
+	$content = $toolbar->readCache('sql_log', $this->params['pass'][0]);
+}
+?>
+<h2><?php __d('debug_kit', 'Sql Logs')?></h2>
+<?php if (!empty($content)) : ?>
+	<?php foreach ($content['connections'] as $dbName => $explain): ?>
+	<div class="sql-log-panel-query-log">
+		<h4><?php echo $dbName ?></h4>
+		<?php
+			if (!isset($debugKitInHistoryMode)):
+				$queryLog = $toolbar->getQueryLogs($dbName, array(
+					'explain' => $explain, 'threshold' => $content['threshold']
+				));
+			else:
+				$queryLog = $content[$dbName];
+			endif;
+			echo $toolbar->table($queryLog, $headers, array('title' => 'SQL Log ' . $dbName));
+		 ?>
+		<h4><?php __d('debug_kit', 'Query Explain:'); ?></h4>
+		<div id="sql-log-explain-<?php echo $dbName ?>">
+			<a id="debug-kit-explain-<?php echo $dbName ?>"> </a>
+			<p><?php __d('debug_kit', 'Click an "Explain" link above, to see the query explanation.'); ?></p>
+		</div>
+	</div>
+	<?php endforeach; ?>
+<?php else:
+	echo $toolbar->message('Warning', __d('debug_kit', 'No active database connections', true));
+endif; ?>
+
+<script type="text/javascript">
+//<![CDATA[
+DEBUGKIT.module('sqlLog');
+DEBUGKIT.sqlLog = function () {
+	var Element = DEBUGKIT.Util.Element,
+		Request = DEBUGKIT.Util.Request,
+		Event = DEBUGKIT.Util.Event,
+		Collection = DEBUGKIT.Util.Collection;
+
+	return {
+		init : function () {
+			var sqlPanel = document.getElementById('sql_log-tab');
+			var buttons = sqlPanel.getElementsByTagName('input');
+
+			// Button handling code for explain links.
+			// performs XHR request to get explain query.
+			var handleButton = function (event) {
+				event.preventDefault();
+				var data = {};
+				var dbName = 'default';
+				var inputs = this.form.getElementsByTagName('input');
+				var i = inputs.length;
+				while (i--) {
+					var input = inputs[i];
+					if (input.name) {
+						data[input.name] = input.value;
+						if (input.name.indexOf('[ds]') != -1) {
+							dbName = input.value;
+						}
+					}
+				}
+
+				var fetch = new Request({
+					method: 'POST',
+					onComplete : function (response) {
+						var targetEl = document.getElementById('sql-log-explain-' + dbName);
+						targetEl.innerHTML = response.response.text;
+					},
+					onFail : function () {
+						alert('Could not fetch EXPLAIN for query.');
+					}
+				}).send(this.form.action, data);
+			};
+	
+			Collection.apply(buttons, function (button) {
+				if (Element.hasClass(button, 'sql-explain-link')) {
+					Event.addEvent(button, 'click', handleButton);
+				}
+			});
+		}
+	};
+}();
+DEBUGKIT.loader.register(DEBUGKIT.sqlLog);
+//]]>
+</script>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/timer_panel.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/timer_panel.ctp
new file mode 100644
index 000000000..c5c010937
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/timer_panel.ctp
@@ -0,0 +1,108 @@
+<?php
+/**
+ * Timer Panel Element
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+if (!isset($debugKitInHistoryMode)):
+	$timers = DebugKitDebugger::getTimers(true);
+	$currentMemory = DebugKitDebugger::getMemoryUse();
+	$peakMemory = DebugKitDebugger::getPeakMemoryUse();
+	$requestTime = DebugKitDebugger::requestTime();
+else:
+	$content = $toolbar->readCache('timer', $this->params['pass'][0]);
+	if (is_array($content)):
+		extract($content);
+	endif;
+endif;
+?>
+<div class="debug-info">
+	<h2><?php __d('debug_kit', 'Memory'); ?></h2>
+	<div class="peak-mem-use">
+	<?php
+		echo $toolbar->message(__d('debug_kit', 'Peak Memory Use', true), $number->toReadableSize($peakMemory)); ?>
+	</div>
+
+	<?php
+	$headers = array(__d('debug_kit', 'Message', true), __d('debug_kit', 'Memory use', true));
+	$memoryPoints = DebugKitDebugger::getMemoryPoints();
+
+	$rows = array();
+	foreach($memoryPoints as $key => $value):
+		$rows[] = array($key, $number->toReadableSize($value));
+	endforeach;
+
+	echo $toolbar->table($rows, $headers);
+	?>
+</div>
+
+<div class="debug-info debug-timers">
+	<h2><?php __d('debug_kit', 'Timers'); ?></h2>
+	<div class="request-time">
+		<?php $totalTime = sprintf(__d('debug_kit', '%s (ms)', true), $number->precision($requestTime * 1000, 0)); ?>
+		<?php echo $toolbar->message(__d('debug_kit', 'Total Request Time:', true), $totalTime)?>
+	</div>
+<?php
+$rows = array();
+$end = end($timers);
+$maxTime = $end['end'];
+
+$headers = array(
+	__d('debug_kit', 'Message', true),
+	__d('debug_kit', 'Time in ms', true),
+	__d('debug_kit', 'Graph', true)
+);
+
+$i = 0;
+$values = array_values($timers);
+
+foreach ($timers as $timerName => $timeInfo):
+	$indent = 0;
+	for ($j = 0; $j < $i; $j++) {
+		if (($values[$j]['end'] > $timeInfo['start']) && ($values[$j]['end']) > ($timeInfo['end'])) {
+			$indent++;
+		}
+	}
+	$indent = str_repeat(' » ', $indent);
+	$rows[] = array(
+		$indent . $timeInfo['message'],
+		$number->precision($timeInfo['time'] * 1000, 2),
+		$simpleGraph->bar(
+			$number->precision($timeInfo['time'] * 1000, 2),
+			$number->precision($timeInfo['start'] * 1000, 2),
+			array(
+				'max' => $maxTime * 1000,
+				'requestTime' => $requestTime * 1000,
+			)
+		)
+	);
+	$i++;
+endforeach;
+
+if (strtolower($toolbar->getName()) == 'firephptoolbar'):
+	for ($i = 0, $len = count($rows); $i < $len; $i++):
+		unset($rows[$i][2]);
+	endfor;
+	unset($headers[2]);
+endif;
+
+echo $toolbar->table($rows, $headers, array('title' => 'Timers'));
+
+if (!isset($debugKitInHistoryMode)):
+	$toolbar->writeCache('timer', compact('timers', 'currentMemory', 'peakMemory', 'requestTime'));
+endif;
+?>
+</div>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/variables_panel.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/variables_panel.ctp
new file mode 100644
index 000000000..3be537d6a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/variables_panel.ctp
@@ -0,0 +1,25 @@
+<?php
+/**
+ * View Variables Panel Element
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.elements
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+?>
+<h2> <?php __d('debug_kit', 'View Variables'); ?></h2>
+<?php 
+$content['$this->validationErrors'] = $this->validationErrors;
+$content['Loaded Helpers'] = array_keys($this->loaded);
+echo $toolbar->makeNeatArray($content); ?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php
new file mode 100644
index 000000000..e8bb814af
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/fire_php_toolbar.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * FirePHP Toolbar Helper
+ *
+ * Injects the toolbar elements into non-HTML layouts via FireCake.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Helper', 'DebugKit.Toolbar');
+App::import('Vendor', 'DebugKit.FireCake');
+
+class FirePhpToolbarHelper extends ToolbarHelper {
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array('format' => 'firePHP', 'forceEnable' => false);
+/**
+ * send method
+ *
+ * @return void
+ * @access protected
+ */
+	function send() {
+		$view =& ClassRegistry::getObject('view');
+		$view->element('debug_toolbar', array('plugin' => 'debug_kit', 'disableTimer' => true));
+	}
+/**
+ * makeNeatArray.
+ *
+ * wraps FireCake::dump() allowing panel elements to continue functioning
+ *
+ * @param string $values 
+ * @return void
+ */	
+	function makeNeatArray($values) {
+		FireCake::info($values);
+	}
+/**
+ * Create a simple message
+ *
+ * @param string $label Label of message
+ * @param string $message Message content
+ * @return void
+ */
+	function message($label, $message) {
+		FireCake::log($message, $label);
+	}
+/**
+ * Generate a table with FireCake
+ *
+ * @param array $rows Rows to print
+ * @param array $headers Headers for table
+ * @param array $options Additional options and params
+ * @return void
+ */
+	function table($rows, $headers, $options = array()) {
+		$title = $headers[0];
+		if (isset($options['title'])) {
+			$title = $options['title'];
+		}
+		foreach ($rows as $i => $row) {
+			$rows[$i] = array_values($row);
+		}
+		array_unshift($rows, $headers);
+		FireCake::table($title, $rows);
+	}
+/**
+ * Start a panel which is a 'Group' in FirePHP
+ *
+ * @return void
+ **/
+	function panelStart($title, $anchor) {
+		FireCake::group($title);
+	}
+/**
+ * End a panel (Group)
+ *
+ * @return void
+ **/
+	function panelEnd() {
+		FireCake::groupEnd();
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/html_toolbar.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/html_toolbar.php
new file mode 100755
index 000000000..f772870ce
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/html_toolbar.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * Html Toolbar Helper
+ *
+ * Injects the toolbar elements into HTML layouts.
+ * Contains helper methods for
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('helper', 'DebugKit.Toolbar');
+
+class HtmlToolbarHelper extends ToolbarHelper {
+/**
+ * helpers property
+ *
+ * @var array
+ * @access public
+ */
+	var $helpers = array('Html', 'Form');
+/**
+ * settings property
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array('format' => 'html', 'forceEnable' => false);
+/**
+ * Recursively goes through an array and makes neat HTML out of it.
+ *
+ * @param mixed $values Array to make pretty.
+ * @param int $openDepth Depth to add open class
+ * @param int $currentDepth current depth.
+ * @return string
+ **/
+	function makeNeatArray($values, $openDepth = 0, $currentDepth = 0) {
+		$className ="neat-array depth-$currentDepth";
+		if ($openDepth > $currentDepth) {
+			$className .= ' expanded';
+		}
+		$nextDepth = $currentDepth + 1;
+		$out = "<ul class=\"$className\">";
+		if (!is_array($values)) {
+			if (is_bool($values)) {
+				$values = array($values);
+			}
+			if (is_null($values)) {
+				$values = array(null);
+			}
+		}
+		if (empty($values)) {
+			$values[] = '(empty)';
+		}
+		foreach ($values as $key => $value) {
+			$out .= '<li><strong>' . $key . '</strong>';
+			if ($value === null) {
+				$value = '(null)';
+			}
+			if ($value === false) {
+				$value = '(false)';
+			}
+			if ($value === true) {
+				$value = '(true)';
+			}
+			if (empty($value) && $value != 0) {
+				$value = '(empty)';
+			}
+
+			if (is_object($value)) {
+				$value = Set::reverse($value, true);
+			}
+
+			if (is_array($value) && !empty($value)) {
+				$out .= $this->makeNeatArray($value, $openDepth, $nextDepth);
+			} else {
+				$out .= h($value);
+			}
+			$out .= '</li>';
+		}
+		$out .= '</ul>';
+		return $out;
+	}
+/**
+ * Create an HTML message
+ *
+ * @param string $label label content
+ * @param string $message message content
+ * @return string
+ */
+	function message($label, $message) {
+		return sprintf('<p><strong>%s</strong> %s</p>', $label, $message);
+	}
+/**
+ * Start a panel.
+ * make a link and anchor.
+ *
+ * @return void
+ **/
+	function panelStart($title, $anchor) {
+		$link = $this->Html->link($title, '#' . $anchor);
+		return $link;
+	}
+/**
+ * Create a table.
+ *
+ * @param array $rows Rows to make.
+ * @param array $headers Optional header row.
+ * @return string
+ */
+	function table($rows, $headers = array()) {
+		$out = '<table class="debug-table">';
+		if (!empty($headers)) {
+			$out .= $this->Html->tableHeaders($headers);
+		}
+		$out .= $this->Html->tableCells($rows, array('class' => 'odd'), array('class' => 'even'), false, false);
+		$out .= '</table>';
+		return $out;
+	}
+/**
+ * send method
+ *
+ * @return void
+ * @access public
+ */
+	function send() {
+		if (!$this->settings['forceEnable'] && Configure::read('debug') == 0) {
+			return;
+		}
+		$view =& ClassRegistry::getObject('view');
+		$head = $this->Html->css('/debug_kit/css/debug_toolbar');
+		if (isset($view->viewVars['debugToolbarJavascript'])) {
+			foreach ($view->viewVars['debugToolbarJavascript'] as $script) {
+				if ($script) {
+					$head .= $this->Html->script($script);
+				}
+			}
+		}
+		if (preg_match('#</head>#', $view->output)) {
+			$view->output = preg_replace('#</head>#', $head . "\n</head>", $view->output, 1);
+		}
+		$toolbar = $view->element('debug_toolbar', array('plugin' => 'debug_kit', 'disableTimer' => true));
+		if (preg_match('#</body>#', $view->output)) {
+			$view->output = preg_replace('#</body>#', $toolbar . "\n</body>", $view->output, 1);
+		}
+	}
+/**
+ * Generates a SQL explain link for a given query
+ *
+ * @param string $sql SQL query string you want an explain link for.
+ * @return string Rendered Html link or '' if the query is not a select/describe
+ */
+	function explainLink($sql, $connection) {
+		if (!preg_match('/^(SELECT)/i', $sql)) {
+			return '';
+		}
+		App::import('Core', 'Security');
+		$hash = Security::hash($sql . $connection, null, true);
+		$url = array(
+			'plugin' => 'debug_kit',
+			'controller' => 'toolbar_access',
+			'action' => 'sql_explain'
+		);
+		foreach (Router::prefixes() as $prefix) {
+			$url[$prefix] = false;
+		}
+		$this->explainLinkUid = (isset($this->explainLinkUid) ? $this->explainLinkUid + 1 : 0); 
+		$uid = $this->explainLinkUid . '_' . rand(0, 10000);
+		$form = $this->Form->create('log', array('url' => $url, 'id' => "logForm{$uid}"));
+		$form .= $this->Form->hidden('log.ds', array('id' => "logDs{$uid}", 'value' => $connection));
+		$form .= $this->Form->hidden('log.sql', array('id' => "logSql{$uid}", 'value' => $sql));
+		$form .= $this->Form->hidden('log.hash', array('id' => "logHash{$uid}", 'value' => $hash));
+		$form .= $this->Form->submit(__d('debug_kit', 'Explain', true), array(
+			'div' => false,
+			'class' => 'sql-explain-link'
+		));
+		$form .= $this->Form->end();
+		return $form;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/simple_graph.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/simple_graph.php
new file mode 100644
index 000000000..22c17865c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/simple_graph.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * Simple Graph Helper
+ *
+ * Allows creation and display of extremely simple graphing elements
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         DebugKit 1.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Helper', 'Html');
+
+class SimpleGraphHelper extends AppHelper {
+/**
+ * Helpers
+ *
+ * @var array
+ */
+	var $helpers = array('Html');
+/**
+ * Default settings to be applied to each Simple Graph
+ *
+ * Allowed options:
+ *
+ * - max => (int) Maximum value in the graphs
+ * - width => (int)
+ * - valueType => string (value, percentage)
+ * - style => array
+ *
+ * @var array
+ */
+	var $__defaultSettings = array(
+		'max' => 100,
+		'width' => 350,
+		'valueType' => 'value',
+	);
+/**
+ * bar method
+ *
+ * @param $value Value to be graphed
+ * @param $offset how much indentation
+ * @param $options Graph options
+ * @return string Html graph
+ * @access public
+ */
+	function bar($value, $offset, $options = array()) {
+		$settings = array_merge($this->__defaultSettings, $options);
+		extract($settings);
+
+		$graphValue = ($value / $max) * $width;
+		$graphValue = max(round($graphValue), 1);
+
+		if ($valueType == 'percentage') {
+			$graphOffset = 0;
+		} else {
+			$graphOffset = ($offset / $max) * $width;
+			$graphOffset = round($graphOffset);
+		}
+		return $this->Html->div(
+			'debug-kit-graph-bar',
+				$this->Html->div(
+					'debug-kit-graph-bar-value',
+					' ',
+					array(
+						'style' => "margin-left: {$graphOffset}px; width: {$graphValue}px",
+						'title' => sprintf(__d('debug_kit', "Starting %sms into the request, taking %sms", true), $offset, $value),
+					)
+				),
+			array('style' => "width: {$width}px;"),
+			false
+		);
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/toolbar.php b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/toolbar.php
new file mode 100644
index 000000000..1ae3a9734
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/helpers/toolbar.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Abstract Toolbar helper.  Provides Base methods for content
+ * specific debug toolbar helpers.  Acts as a facade for other toolbars helpers as well.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+App::import('Vendor', 'DebugKit.DebugKitDebugger');
+
+class ToolbarHelper extends AppHelper {
+/**
+ * settings property to be overloaded.  Subclasses should specify a format
+ *
+ * @var array
+ * @access public
+ */
+	var $settings = array();
+/**
+ * flag for whether or not cache is enabled.
+ *
+ * @var boolean
+ **/
+	var $_cacheEnabled = false;
+/**
+ * Construct the helper and make the backend helper.
+ *
+ * @param string $options
+ * @access public
+ * @return void
+ */
+	function __construct($options = array()) {
+		$this->_myName = strtolower(get_class($this));
+		$this->settings = am($this->settings, $options);
+
+		if ($this->_myName !== 'toolbarhelper') {
+			return;
+		}
+
+		if (!isset($options['output'])) {
+			$options['output'] = 'DebugKit.HtmlToolbar';
+		}
+		App::import('Helper', $options['output']);
+		$className = $options['output'];
+		if (strpos($options['output'], '.') !== false) {
+			list($plugin, $className) = explode('.', $options['output']);
+		}
+		$this->_backEndClassName = $className;
+		$this->helpers[$options['output']] = $options;
+		if (isset($options['cacheKey']) && isset($options['cacheConfig'])) {
+			$this->_cacheKey = $options['cacheKey'];
+			$this->_cacheConfig = $options['cacheConfig'];
+			$this->_cacheEnabled = true;
+		}
+	}
+/**
+ * Get the name of the backend Helper
+ * used to conditionally trigger toolbar output
+ *
+ * @return string
+ **/
+	function getName() {
+		return $this->_backEndClassName;
+	}
+/**
+ * call__
+ *
+ * Allows method calls on backend helper
+ *
+ * @param string $method
+ * @param mixed $params
+ * @access public
+ * @return void
+ */
+	function call__($method, $params) {
+		if (method_exists($this->{$this->_backEndClassName}, $method)) {
+			return $this->{$this->_backEndClassName}->dispatchMethod($method, $params);
+		}
+	}
+/**
+ * Allows for writing to panel cache from view.
+ * Some panels generate all variables in the view by
+ * necessity ie. Timer.  Using this method, will allow you to replace in full
+ * the content for a panel.
+ *
+ * @param string $name Name of the panel you are replacing.
+ * @param string $content Content to write to the panel.
+ * @return boolean Sucess of write.
+ **/
+	function writeCache($name, $content) {
+		if (!$this->_cacheEnabled) {
+			return false;
+		}
+		$existing = (array)Cache::read($this->_cacheKey, $this->_cacheConfig);
+		$existing[0][$name]['content'] = $content;
+		return Cache::write($this->_cacheKey, $existing, $this->_cacheConfig);
+	}
+/**
+ * Read the toolbar
+ *
+ * @param string $name Name of the panel you want cached data for
+ * @return mixed Boolean false on failure, array of data otherwise.
+ **/
+	function readCache($name, $index = 0) {
+		if (!$this->_cacheEnabled) {
+			return false;
+		}
+		$existing = (array)Cache::read($this->_cacheKey, $this->_cacheConfig);
+		if (!isset($existing[$index][$name]['content'])) {
+			return false;
+		}
+		return $existing[$index][$name]['content'];
+	}
+/**
+ * Gets the query logs for the given connection names.
+ *
+ * ### Options
+ *
+ * - explain - Whether explain links should be generated for this connection.
+ * - cache - Whether the toolbar_state Cache should be updated.
+ * - threshold - The threshold at which a visual 'maybe slow' flag should be added.
+ *   results with rows/ms lower than $threshold will be marked.
+ *
+ * @param string $connection Connection name to get logs for.
+ * @param array $options Options for the query log retrieval.
+ * @return array Array of data to be converted into a table.
+ */
+	function getQueryLogs($connection, $options = array()) {
+		$options += array('explain' => false, 'cache' => true, 'threshold' => 20);
+		App::import('Model', 'ConnectionManager');
+		$db =& ConnectionManager::getDataSource($connection);
+		
+		if (!$db->isInterfaceSupported('getLog')) {
+			return array();
+		}
+
+		$out = array();
+		$log = $db->getLog();
+		foreach ($log['log'] as $i => $query) {
+			$isSlow = (
+				$query['took'] > 0 &&
+				$query['numRows'] / $query['took'] != 1 &&
+				$query['numRows'] / $query['took'] <= $options['threshold']
+			);
+			$query['actions'] = '';
+			$isHtml = ($this->getName() == 'HtmlToolbar');
+			if ($isSlow && $isHtml) {
+				$query['actions'] = sprintf(
+					'<span class="slow-query">%s</span>',
+					__d('debug_kit', 'maybe slow', true)
+				);
+			} elseif ($isSlow) {
+				$query['actions'] = '*';
+			}
+			if ($options['explain'] && $isHtml) {
+				$query['actions'] .= $this->explainLink($query['query'], $connection);
+			}
+			if ($isHtml) {
+				$query['query'] = h($query['query']);
+			}
+			$out[] = $query;
+		}
+		if ($options['cache']) {
+			$existing = $this->readCache('sql_log');
+			$existing[$connection] = $out;
+			$this->writeCache('sql_log', $existing);
+		}
+		return $out;
+	}
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp
new file mode 100644
index 000000000..21a1dcfef
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/history_state.ctp
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Toolbar history state view.
+ *
+ * PHP versions 4 and 5
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         DebugKit 1.0
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ **/
+$panels = array();
+foreach ($toolbarState as $panelName => $panel) {
+	$panels[$panelName] = $this->element($panel['elementName'], array(
+		'content' => $panel['content'], 
+		'plugin' => $panel['plugin']
+	));
+}
+echo $javascript->object($panels);
+Configure::write('debug', 0);
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp
new file mode 100644
index 000000000..a38939005
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/toolbar_access/sql_explain.ctp
@@ -0,0 +1,12 @@
+<table class="sql-log-query-explain debug-table">
+<?php
+$headers = array_shift($result);
+
+echo $html->tableHeaders($headers);
+echo $html->tableCells($result);
+?>
+</table>
+<?php
+// Consume and toss out the timers
+$timers = DebugKitDebugger::getTimers(true);
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css
new file mode 100644
index 000000000..46939561a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/css/debug_toolbar.css
@@ -0,0 +1,377 @@
+/* @override http://localhost/mark_story/site/debug_kit/css/debug_toolbar.css */
+#debug-kit-toolbar {
+	position: fixed;
+	top: 0px;
+	right:0px;
+	width: 100%;
+	height: 1%;
+	overflow: visible;
+	z-index:10000;
+	font-family: helvetica, arial, sans-serif;
+	font-size: 12px;
+	direction: ltr;
+}
+#debug-kit-toolbar img {
+	border:0;
+	outline:0;
+}
+
+/* panel tabs */
+#debug-kit-toolbar #panel-tabs {
+	float: right;
+	list-style: none;
+	margin: 0;
+}
+#debug-kit-toolbar .panel-tab {
+	clear: none;
+	float: left;
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+#debug-kit-toolbar .panel-tab > a {
+	float: left;
+	clear: none;
+	background: #efefef;
+	background: -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#cacaca));
+	background: -moz-linear-gradient(top, #efefef, #cacaca);
+	color: #222;
+	padding: 6px;
+	border-right: 1px solid #ccc;
+	border-bottom: 1px solid #aaa;
+	font-size: 12px;
+	line-height: 16px;
+	margin: 0;
+	display: block;
+	text-decoration:none;
+	text-shadow:1px 1px #eee;
+	-moz-text-shadow:1px 1px #eee;
+	-webkit-text-shadow:1px 1px #eee;
+}
+#debug-kit-toolbar .panel-tab .active {
+	background: #fff;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#fff));
+	background: -moz-linear-gradient(top, #f5f5f5, #fff);
+}
+#debug-kit-toolbar .panel-tab > a:hover {
+	background: #fff;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f5f5f5), to(#fff));
+	background: -moz-linear-gradient(top, #f5f5f5, #fff);
+	text-decoration:underline;
+}
+#debug-kit-toolbar .panel-tab.icon a {
+	padding: 4px;
+}
+#debug-kit-toolbar .panel-tab a.edit-value {
+    float: none;
+    display: inline;
+}
+
+/* Hovering over link shows tab, useful for no js  */
+#debug-kit-toolbar .panel-tab a:hover + .panel-content,
+#debug-kit-toolbar .panel-tab a + .panel-content:hover {
+	display: block;
+}
+#debug-kit-toolbar .panel-tab.icon a {
+	-webkit-border-top-left-radius: 8px 8px;
+	-webkit-border-bottom-left-radius: 8px 8px;
+	-moz-border-radius-topleft: 8px;
+	-moz-border-radius-bottomleft: 8px
+}
+#debug-kit-toolbar .panel-tab.icon img {
+	display:block;
+}
+
+/* panel content */
+#debug-kit-toolbar .panel-content {
+	position: absolute;
+	text-align: left;
+	width: auto;
+	top:28px;
+	right:0px;
+	background: #fff;
+	color: #000;
+	width:100%;
+	box-shadow:0px 5px 6px #ccc;
+	height: 200px;
+	overflow: hidden;
+}
+
+#debug-kit-toolbar .panel-resize-region {
+	padding:15px;
+	position: absolute;
+	top: 0px;
+	bottom: 14px;
+	left: 0px;
+	right: 0px;
+	overflow: auto;
+}
+
+#debug-kit-toolbar .ui-control {
+	background:#ccc;
+	background: -webkit-gradient(linear, left top, left bottom, from(#d6d6d6), to(#c2c2c2));
+	background: -moz-linear-gradient(top, #d6d6d6, #c2c2c2);
+	text-align:center;
+	border-top:1px solid #afafaf;
+	border-bottom:1px solid #7c7c7c;
+	color:#666;
+	text-shadow: 1px 1px #eee;
+	-webkit-text-shadow: 1px 1px #eee;
+	-moz-text-shadow: 1px 1px #eee;
+}
+#debug-kit-toolbar .ui-button {
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+#debug-kit-toolbar .ui-button:hover {
+	text-decoration: none;
+	background:#ccc;
+	background: -webkit-gradient(linear, left top, left bottom, from(#c2c2c2), to(#d6d6d6));
+	background: -moz-linear-gradient(top, #c2c2c2, #d6d6d6);
+}
+#debug-kit-toolbar .panel-resize-handle {
+	cursor: row-resize;
+	height:14px;
+	line-height: 14px;
+	position: absolute;
+	bottom: 0px;
+	left: 0px;
+	right: 0px;
+}
+#debug-kit-toolbar .panel-maximize,
+#debug-kit-toolbar .panel-minimize {
+	float: right;
+	display: block;
+	width: 12px;
+	height: 12px;
+	line-height: 12px;
+	border-left: 1px solid #afafaf;
+	border-right: 1px solid #7c7c7c;
+}
+#debug-kit-toolbar .panel-maximize {
+	float: right;
+	margin: 10px 20px 0 0;
+	z-index: 999;
+	position: relative;
+}
+#debug-kit-toolbar .panel-minimize {
+	float: right;
+	margin: 10px 10px 0 0;
+	z-index: 999;
+	position: relative;
+}
+
+/* Hide panel content by default */
+#debug-kit-toolbar .panel-content {
+	display: none;
+}
+.panel-content p {
+	margin: 1em 0;
+}
+.panel-content h2 {
+	padding: 0;
+	margin-top:0;
+}
+.panel-content h3 {
+	padding: 0;
+	margin-top: 1em;
+}
+.panel-content .info {
+	padding: 4px;
+	border-top: 1px dashed #6c6cff;
+	border-bottom: 1px dashed #6c6cff;
+}
+#debug-kit-toolbar h1,
+#debug-kit-toolbar h2,
+#debug-kit-toolbar h3,
+#debug-kit-toolbar h4,
+#debug-kit-toolbar h5,
+#debug-kit-toolbar th {
+	color: #5d1717;
+	font-family: "Trebuchet MS", trebuchet, helvetica, arial, sans-serif;
+	margin-bottom:0.6em;
+	background:none;
+}
+#debug-kit-toolbar h1 {
+	font-size: 18px;
+}
+#debug-kit-toolbar h2 {
+	font-size: 16px;
+}
+#debug-kit-toolbar h4 {
+	font-size: 14px;
+}
+
+
+/* panel tables */
+#debug-kit-toolbar table.debug-table {
+	width: 100%;
+	border: 0;
+	clear:both;
+	margin-bottom: 20px;
+}
+#debug-kit-toolbar table.debug-table td,
+#debug-kit-toolbar table.debug-table th {
+	text-align: left;
+	border: 0;
+	padding: 3px;
+}
+#debug-kit-toolbar table.debug-table th {
+	border-bottom: 1px solid #222;
+	background: 0;
+	color: #252525;
+}
+#debug-kit-toolbar table.debug-table tr:nth-child(2n+1) td {
+	background:#f6f6f6;
+}
+#debug-kit-toolbar table.debug-table tr.even td {
+	background:#f7f7f7;
+}
+#debug-kit-toolbar .debug-timers .debug-table td:nth-child(2),
+#debug-kit-toolbar .debug-timers .debug-table th:nth-child(2) {
+	text-align:right;
+}
+
+/** code tables **/
+#debug-kit-toolbar .code-table td {
+	white-space: pre;
+	font-family: monaco, Consolas, "courier new", courier, monospaced;
+}
+#debug-kit-toolbar .code-table td:first-child {
+	width: 15%;
+}
+#debug-kit-toolbar .code-table td:last-child {
+	width: 80%;
+}
+
+#debug-kit-toolbar .panel-content.request {
+	display: block;
+}
+
+/** Neat Array styles **/
+#debug-kit-toolbar .neat-array,
+#debug-kit-toolbar .neat-array li {
+	list-style:none;
+	list-style-image:none;
+}
+.neat-array {
+	padding: 1px 2px 1px 20px;
+	background: #CE9E23;
+	list-style: none;
+	margin: 0 0 1em 0;
+}
+.neat-array .neat-array {
+	padding: 0 0 0 20px;
+	margin:0;
+	border-top:1px solid #CE9E23;
+}
+.neat-array li {
+	background: #FEF6E5;
+	border-top: 1px solid #CE9E23;
+	border-bottom: 1px solid #CE9E23;
+	margin: 0;
+	line-height: 1.5em;
+}
+.neat-array li:hover {
+	background: #fff;
+}
+.neat-array li strong {
+	padding: 0 8px;
+	font-weight: bold;
+}
+
+
+/* expandable sections */
+.neat-array li.expandable {
+	cursor: pointer;
+}
+.neat-array .expanded {
+	border-bottom:0;
+}
+.neat-array li.expandable.expanded > strong:before {
+	content: 'v ';
+}
+.neat-array li.expandable.collapsed > strong:before,
+.neat-array li.expandable.expanded .expandable.collapsed > strong:before {
+	content: '> ';
+}
+.neat-array li {
+	cursor: default;
+}
+
+#debug-kit-toolbar .debug-kit-graph-bar,
+#debug-kit-toolbar .debug-kit-graph-bar-value {
+	margin: 0;
+	padding: 0px;
+	border: none;
+	overflow: hidden;
+	height: 10px;
+}
+#debug-kit-toolbar .debug-kit-graph-bar {
+	background-color: #ddd;
+	padding:2px;
+}
+#debug-kit-toolbar .debug-kit-graph-bar-value {
+	background-color: #CE9E23;
+}
+
+/* Sql Log */
+#sql_log-tab td,
+#sql_log-tab .slow-query-container p {
+	font-family: Monaco, 'Consolas', "Courier New", Courier, monospaced;
+}
+#debug-kit-toolbar #sql_log-tab a.show-slow {
+	display:block;
+	margin: 3px;
+	float:none;
+}
+#sql_log-tab .slow-query-container p {
+	display:block;
+	clear:both;
+	margin: 20px 0 5px;
+}
+#debug-kit-toolbar #sql_log-tab .panel-content-data a {
+	background: none;
+	border:none;
+}
+#sql_log-tab .slow-query {
+	background:#e79302;
+	font-size:9px;
+	color:#fff;
+	padding: 2px;
+	white-space:nowrap;
+}
+#sql_log-tab input[type=submit] {
+	border: 0;
+	background: transparent;
+	cursor: pointer;
+	font-size: 12px;
+	font-family: Monaco, 'Consolas', "Courier New", Courier, monospaced;
+}
+#sql_log-tab input[type=submit]:hover {
+	color: darkred;
+}
+
+/* previous panels */
+#debug-kit-toolbar .panel-history {
+	display: none;
+	background:#eeffff;
+}
+#debug-kit-toolbar #history-tab ul {
+	margin: 20px 0 0 20px;
+}
+#debug-kit-toolbar #history-tab li {
+	margin: 0 0 5px 0;
+}
+#debug-kit-toolbar #history-tab .panel-content-data a {
+	float: none;
+	display:block;
+}
+#debug-kit-toolbar #history-tab a.active {
+	background: #FEF6E5;
+}
+#debug-kit-toolbar #history-tab a.loading:after {
+	content : ' Loading...';
+	font-style:italic;
+}
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/img/cake.icon.png b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/img/cake.icon.png
new file mode 100644
index 000000000..394fa42d5
Binary files /dev/null and b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/img/cake.icon.png differ
diff --git a/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js
new file mode 100644
index 000000000..57cc1cc08
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/plugins/debug_kit/webroot/js/js_debug_toolbar.js
@@ -0,0 +1,767 @@
+/**
+ * Debug Toolbar Javascript.
+ *
+ * Creates the DEBUGKIT namespace and provides methods for extending
+ * and enhancing the Html toolbar.  Includes library agnostic Event, Element,
+ * Cookie and Request wrappers.
+ *
+ *
+ * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
+ * Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * @link          http://cakephp.org
+ * @package       debug_kit
+ * @subpackage    debug_kit.views.helpers
+ * @since         DebugKit 0.1
+ * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ */
+var DEBUGKIT = function () {
+	var undef;
+	return {
+		module: function (newmodule) {
+			if (this[newmodule] === undef) {
+				this[newmodule] = {};
+				return this[newmodule];
+			}
+			return this[newmodule];
+		}
+	};
+}() ;
+
+DEBUGKIT.loader = function () {
+	return {
+		//list of methods to run on startup.
+		_startup: [],
+
+		//register a new method to be run on dom ready.
+		register: function (method) {
+			this._startup.push(method);
+		},
+
+		init: function () {
+			for (var i = 0, callback; callback = this._startup[i]; i++) {
+				callback.init();
+			}
+		}
+	};
+}();
+
+//Util module and Element utility class.
+DEBUGKIT.module('Util');
+DEBUGKIT.Util.Element = {
+
+	//test if an element is a name node.
+	nodeName: function (element, name) {
+		return element.nodeName && element.nodeName.toLowerCase() == name.toLowerCase();
+	},
+
+	//return a boolean if the element has the classname
+	hasClass: function (element, className) {
+		if (!element.className) {
+			return false;
+		}
+		return element.className.indexOf(className) > -1;
+	},
+
+	addClass: function (element, className) {
+		if (!element.className) {
+			element.className = className;
+			return;
+		}
+		element.className = element.className.replace(/^(.*)$/, '$1 ' + className);
+	},
+
+	removeClass: function (element, className) {
+		if (DEBUGKIT.Util.isArray(element)) {
+			DEBUGKIT.Util.Collection.apply(element, function (element) {
+				DEBUGKIT.Util.Element.removeClass(element, className);
+			});
+		}
+		if (!element.className) {
+			return false;
+		}
+		element.className = element.className.replace(new RegExp(' ?(' + className +') ?'), '');
+	},
+
+	swapClass: function (element, removeClass, addClass) {
+		if (!element.className) {
+			return false;
+		}
+		element.className = element.className.replace(removeClass, addClass);
+	},
+
+	show: function (element) {
+		element.style.display = 'block';
+	},
+
+	hide: function (element) {
+		element.style.display = 'none';
+	},
+
+	//go between hide() and show() depending on element.style.display
+	toggle: function (element) {
+		if (element.style.display == 'none') {
+			this.show(element);
+			return;
+		}
+		this.hide(element);
+	},
+
+	_walk: function (element, walk) {
+		var sibling = element[walk];
+		while (true) {
+			if (sibling.nodeType == 1) {
+				break;
+			}
+			sibling = sibling[walk];
+		}
+		return sibling;
+	},
+
+	getNext: function (element) {
+		return this._walk(element, 'nextSibling');
+	},
+
+	getPrevious: function (element) {
+		return this._walk(element, 'previousSibling');
+	},
+
+	//get or set an element's height, omit value to get, add value (integer) to set.
+	height: function (element, value) {
+		//get value
+		if (value === undefined) {
+			return parseInt(this.getStyle(element, 'height'));
+		}
+		element.style.height = value + 'px';
+	},
+
+	//gets the style in css format for property
+	getStyle: function (element, property) {
+		if (element.currentStyle) {
+			property = property.replace(/-[a-z]/g, function (match) {
+				return match.charAt(1).toUpperCase();
+			});
+			return element.currentStyle[property];
+		}
+		if (window.getComputedStyle) {
+			return document.defaultView.getComputedStyle(element, null).getPropertyValue(property);
+		}
+	}
+};
+
+DEBUGKIT.Util.Collection = {
+	/*
+	 Apply the passed function to each item in the collection.
+	 The current element in the collection will be `this` in the callback
+	 The callback is also passed the element and the index as arguments.
+	 Optionally you can supply a binding parameter to change `this` in the callback.
+	*/
+	apply: function (collection, callback, binding) {
+		var name, thisVar, i = 0, len = collection.length;
+		
+		if (len === undefined) {
+			for (name in collection) {
+				thisVar = (binding === undefined) ? collection[name] : binding;
+				callback.apply(thisVar, [collection[name], name]);
+			}
+		} else {
+			for (; i < len; i++) {
+				thisVar = (binding === undefined) ? collection[i] : binding;
+				callback.apply(thisVar, [collection[i], i]);
+			}
+		}
+	}
+}
+
+
+//Event binding
+DEBUGKIT.Util.Event = function () {
+	var _listeners = {},
+		_eventId = 0;
+
+	var preventDefault = function () {
+		this.returnValue = false;
+	}
+	
+	var stopPropagation = function () {
+		this.cancelBubble = true;
+	}
+	
+	// Fixes IE's broken event object, adds in common methods + properties.
+	var fixEvent = function (event) {
+		if (!event.preventDefault) {
+			event.preventDefault = preventDefault;
+		}
+		if (!event.stopPropagation) {
+			event.stopPropagation = stopPropagation;
+		}
+		if (!event.target) {
+			event.target = event.srcElement || document;
+		}
+		if (event.pageX == null && event.clientX != null) {
+			var doc = document.body;
+			event.pageX = event.clientX + (doc.scrollLeft || 0) - (doc.clientLeft || 0);
+			event.pageY = event.clientY + (doc.scrollTop || 0) - (doc.clientTop || 0);
+		}
+		return event;
+	}
+	
+	return {
+		// bind an event listener of type to element, handler is your method.
+		addEvent: function(element, type, handler, capture) {
+			capture = (capture === undefined) ? false : capture;
+
+			var callback = function (event) {
+				event = fixEvent(event || window.event);
+				handler.apply(element, [event]);
+			};
+
+			if (element.addEventListener) {
+				element.addEventListener(type, callback, capture);
+			} else if (element.attachEvent) {
+				type = 'on' + type;
+				element.attachEvent(type, callback);
+			} else {
+				type = 'on' + type;
+				element[type] = callback;
+			}
+			_listeners[++_eventId] = {element: element, type: type, handler: callback};
+		},
+
+		// destroy an event listener. requires the exact same function as was used for attaching
+		// the event.
+		removeEvent: function (element, type, handler) {
+			if (element.removeEventListener) {
+				element.removeEventListener(type, handler, false);
+			} else if (element.detachEvent) {
+				type = 'on' + type;
+				element.detachEvent(type, handler);
+			} else {
+				type = 'on' + type;
+				element[type] = null;
+			}
+		},
+
+		// bind an event to the DOMContentLoaded or other similar event.
+		domready: function(callback) {
+			if (document.addEventListener) {
+				return document.addEventListener("DOMContentLoaded", callback, false);
+			}
+
+			if (document.all && !window.opera) {
+				//Define a "blank" external JavaScript tag
+				document.write('<script type="text/javascript" id="__domreadywatcher" defer="defer" src="://"><\/script>');
+				var contentloadtag = document.getElementById("__domreadywatcher");
+				contentloadtag.onreadystatechange = function (){
+					if (this.readyState == "complete") {
+						callback();
+					}
+				}
+				contentloadtag = null;
+				return;
+			}
+
+			if (/Webkit/i.test(navigator.userAgent)){
+				var _timer = setInterval(function (){
+					if (/loaded|complete/.test(document.readyState)) {
+						clearInterval(_timer);
+						callback();
+					}
+				}, 10);
+			}
+		},
+
+		// unload all the events attached by DebugKit. Fix any memory leaks.
+		unload: function () {
+			var listener;
+			for (var i in _listeners) {
+				listener = _listeners[i];
+				try {
+					this.removeEvent(listener.element, listener.type, listener.handler);
+				} catch (e) {}
+				delete _listeners[i];
+			}
+			delete _listeners;
+		}
+	};
+}();
+
+//Cookie utility
+DEBUGKIT.Util.Cookie = function() {
+	var cookieLife = 60;
+
+//public methods
+	return {
+		/*
+		 Write to cookie
+		 @param [string] name Name of cookie to write.
+		 @param [mixed] value Value to write to cookie.
+		*/
+		write: function (name, value) {
+			var date = new Date();
+			date.setTime(date.getTime() + (cookieLife * 24 * 60 * 60 * 1000));
+			var expires = "; expires=" + date.toGMTString();
+			document.cookie = name + "=" + value + expires + "; path=/";
+			return true;
+		},
+
+		/*
+		 Read from the cookie
+		 @param [string] name Name of cookie to read.
+		*/
+		read: function (name) {
+			name = name + '=';
+			var cookieJar = document.cookie.split(';');
+			for (var i = 0; i < cookieJar.length; i++) {
+				var chips = cookieJar[i];
+				//trim leading spaces
+				while (chips.charAt(0) == ' ') {
+					chips = chips.substring(1, chips.length);
+				}
+				if (chips.indexOf(name) == 0) {
+					return chips.substring(name.length, chips.length);
+				}
+			}
+			return false;
+		},
+		/*
+		 Delete a cookie by name.
+		 @param [string] name of cookie to delete.
+		*/
+		del: function (name) {
+			var date = new Date();
+			date.setFullYear(2000,0,1);
+			var expires = " ; expires=" + date.toGMTString();
+			document.cookie = name + "=" + expires + "; path=/";
+		}
+	};
+}();
+
+
+/*
+ Object merge takes any number of arguments and glues them together
+ @param [Object] one first object
+ @return object
+*/
+DEBUGKIT.Util.merge = function() {
+	var out = {};
+	for (var i = 0; i < arguments.length; i++) {
+		var current = arguments[i];
+		for (prop in current) {
+			if (current[prop] !== undefined){
+				out[prop] = current[prop];
+			}
+		}
+	}
+	return out;
+};
+/*
+ Check if the given object is an array.
+*/
+DEBUGKIT.Util.isArray = function (test) {
+	return Object.prototype.toString.call(test) === '[object Array]';
+}
+
+
+// Simple wrapper for XmlHttpRequest objects.
+DEBUGKIT.Util.Request = function (options) {
+	var _defaults = {
+		onComplete : function () {},
+		onRequest : function () {},
+		onFail : function () {},
+		method : 'GET',
+		async : true,
+		headers : {
+			'X-Requested-With': 'XMLHttpRequest',
+			'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
+		}
+	};
+
+	var self = this;
+	this.options = DEBUGKIT.Util.merge(_defaults, options);
+	this.options.method = this.options.method.toUpperCase();
+
+	var ajax = this.createObj();
+	this.transport = ajax;
+
+	//event assignment
+	this.onComplete = this.options.onComplete;
+	this.onRequest = this.options.onRequest;
+	this.onFail = this.options.onFail;
+
+	this.send = function (url, data) {
+		if (this.options.method == 'GET' && data) {
+			url = url + ( (url.charAt(url.length -1) == '?') ? '&' : '?') + data; //check for ? at the end of the string
+			data = null;
+		}
+		//open connection
+		this.transport.open(this.options.method, url, this.options.async);
+
+		//set statechange and pass the active XHR object to it.  From here it handles all status changes.
+		this.transport.onreadystatechange = function () {
+			self.onReadyStateChange.apply(self, arguments);
+		};
+		for (var key in this.options.headers) {
+			this.transport.setRequestHeader(key, this.options.headers[key]);
+		}
+		if (typeof data == 'object') {
+			data = this.serialize(data);
+		}
+		if (data) {
+			this.transport.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
+		}
+		this.onRequest();
+		this.transport.send(data);
+	};
+};
+
+DEBUGKIT.Util.Request.prototype.onReadyStateChange = function (){
+	if (this.transport.readyState !== 4) {
+		return;
+	}
+	if (this.transport.status == 200 || this.transport.status > 300 && this.transport.status < 400 ) {
+		this.response = {
+			xml: this.transport.responseXML,
+			text: this.transport.responseText
+		};
+
+		if (typeof this.onComplete == 'function') {
+			this.onComplete.apply(this, [this, this.response]);
+		} else {
+			return this.response;
+		}
+	} else if (this.transport.status > 400) {
+		if (typeof this.onFail == 'function') {
+			this.onFail.apply(this, []);
+		} else {
+			console.error('Request failed');
+		}
+	}
+};
+
+/*
+ Creates cross-broswer XHR object used for requests
+ Tries using the standard XmlHttpRequest, then IE's wacky ActiveX Objects
+*/
+DEBUGKIT.Util.Request.prototype.createObj = function(){
+	var request = null;
+	try {
+		request = new XMLHttpRequest();
+	} catch (MS) {
+		try {
+			request = new ActiveXObject("Msxml2.XMLHTTP");
+		} catch (old_MS) {
+			try {
+				request = new ActiveXObject("Microsoft.XMLHTTP");
+			} catch(failure) {
+				request = null;
+			}
+		}
+	}
+	return request;
+};
+
+/*
+ Serializes an object literal into a querystring
+*/
+DEBUGKIT.Util.Request.prototype.serialize = function (data) {
+	var out = '';
+	for (var name in data) {
+		if (data.hasOwnProperty(name)) {
+			out += name + '=' + data[name] + '&';
+		}
+	}
+	return out.substring(0, out.length - 1);
+};
+
+
+//Basic toolbar module.
+DEBUGKIT.toolbar = function () {
+	//shortcuts
+	var Request = DEBUGKIT.Request,
+		Element = DEBUGKIT.Util.Element,
+		Cookie = DEBUGKIT.Util.Cookie,
+		Event = DEBUGKIT.Util.Event,
+		Collection = DEBUGKIT.Util.Collection,
+		toolbarHidden = false;
+
+
+	/*
+	 Add neat array functionality.
+	 Events are bound to depth-0 UL elements.
+	 Use event delegation to find original target.
+	*/
+	function _delegateNeatArray (event) {
+		var clickedEl = event.target;
+		while (!Element.nodeName(clickedEl, 'LI')) {
+			clickedEl = clickedEl.parentNode;
+		}
+		var subUl = clickedEl.lastChild;
+		if (!Element.nodeName(subUl, 'ul')) {
+			return;
+		}
+		var hide = Boolean(subUl.style.display === 'block');
+		if (hide) {
+			Element.hide(subUl);
+			Element.swapClass(clickedEl, 'expanded', 'collapsed');
+		} else {
+			Element.show(subUl);
+			Element.swapClass(clickedEl, 'collapsed', 'expanded');
+		}
+		event.stopPropagation();
+	}
+
+	return {
+		elements: {},
+		panels: {},
+
+		init: function () {
+			var i, element, lists, index;
+			this.elements.toolbar = document.getElementById('debug-kit-toolbar');
+
+			if (this.elements.toolbar === undefined) {
+				throw('Toolbar not found, make sure you loaded it.');
+			}
+
+			for (i in this.elements.toolbar.childNodes) {
+				element = this.elements.toolbar.childNodes[i];
+				if (element.nodeName && element.id === 'panel-tabs') {
+					this.elements.panel = element;
+					break;
+				}
+			}
+
+			Collection.apply(this.elements.panel.childNodes, function (element) {
+				if (Element.hasClass(element, 'panel-tab')) {
+					this.addPanel(element);
+				}
+			}, this);
+
+			if (document.getElementsByClassName) {
+				lists = this.elements.toolbar.getElementsByClassName('depth-0');
+			} else {
+				lists = this.elements.toolbar.getElementsByTagName('ul');
+			}
+			this.makeNeatArray(lists);
+			this.deactivatePanel(true);
+		},
+
+		// Add a panel to the toolbar
+		addPanel: function (tab) {
+			if (!Element.nodeName(tab, 'li')) {
+				throw ('Toolbar not found, make sure you loaded it.');
+			}
+			var panel = {
+				id : false,
+				element : tab,
+				button : undefined,
+				content : undefined,
+				active : false
+			};
+
+			Collection.apply(tab.childNodes, function (element) {
+				if (Element.nodeName(element, 'A')) {
+					panel.id = element.hash.replace(/^#/, '');
+					panel.button = element;
+				} else if (Element.nodeName(element, 'DIV')) {
+					panel.content = element;
+				}
+			});
+	
+			if (!panel.id || !panel.content) {
+				return false;
+			}
+			this.makePanelDraggable(panel);
+			this.makePanelMinMax(panel);
+
+			var self = this;
+			Event.addEvent(panel.button, 'click', function (event) {
+				event.preventDefault();
+				return self.togglePanel(panel.id);
+			});
+			this.panels[panel.id] = panel;
+			return panel.id;
+		},
+
+		// find the handle element and make the panel drag resizable.
+		makePanelDraggable: function (panel) {
+
+			//create a variable in the enclosing scope, for scope tricks.
+			var currentElement = null;
+
+			// Use the elements startHeight stored Event.pageY and current Event.pageY to
+			// resize the panel
+			var mouseMoveHandler = function (event) {
+				event.preventDefault();
+				if (!currentElement) {
+					return;
+				}
+				var newHeight = currentElement._startHeight + (event.pageY - currentElement._startY);
+				Element.height(currentElement.parentNode, newHeight);
+			}
+
+			// handle the mouseup event, remove the other listeners so the panel
+			// doesn't continue to resize
+			var mouseUpHandler = function (event) {
+				currentElement = null;
+				Event.removeEvent(document, 'mousemove', mouseMoveHandler);
+				Event.removeEvent(document, 'mouseup', mouseUpHandler);
+			}
+
+			var mouseDownHandler = function (event) {
+				event.preventDefault();
+				currentElement = this;
+				this._startY = event.pageY;
+				this._startHeight = parseInt(Element.height(currentElement.parentNode));
+
+				// attach to document so mouse doesn't have to stay precisely on the 'handle'
+				Event.addEvent(document, 'mousemove', mouseMoveHandler);
+				Event.addEvent(document, 'mouseup', mouseUpHandler);
+			}
+
+			Collection.apply(panel.content.childNodes, function (element) {
+				if (Element.nodeName(element, 'DIV') && Element.hasClass(element, 'panel-resize-handle')) {
+					Event.addEvent(element, 'mousedown', mouseDownHandler);
+				}
+			});
+		},
+		
+		// make the maximize button work on the panels.
+		makePanelMinMax: function (panel) {
+			var _oldHeight;
+	
+			var maximize = function (event) {
+				event.preventDefault();
+				if (!_oldHeight) {
+					_oldHeight = this.parentNode.offsetHeight;
+				}
+				var windowHeight = window.innerHeight;
+				var panelHeight = windowHeight - this.parentNode.offsetTop;
+				Element.height(this.parentNode, panelHeight);
+			};
+			
+			var minimize = function (event) {
+				event.preventDefault();
+				Element.height(this.parentNode, _oldHeight);
+				_oldHeight = null;
+			};
+
+			Collection.apply(panel.content.getElementsByTagName('A'), function (element) {
+				if (Element.hasClass(element, 'panel-maximize')) {
+					Event.addEvent(element, 'click', maximize);
+				}
+				if (Element.hasClass(element, 'panel-minimize')) {
+					Event.addEvent(element, 'click', minimize);
+				}
+			});
+		},
+
+		// Toggle a panel
+		togglePanel: function (id) {
+			if (this.panels[id] && this.panels[id].active) {
+				this.deactivatePanel(true);
+			} else {
+				this.deactivatePanel(true);
+				this.activatePanel(id);
+			}
+		},
+
+		// Make a panel active.
+		activatePanel: function (id, unique) {
+			if (this.panels[id] !== undefined && !this.panels[id].active) {
+				var panel = this.panels[id];
+				if (panel.content !== undefined) {
+					Element.show(panel.content);
+				}
+				Element.addClass(panel.button, 'active');
+				panel.active = true;
+				return true;
+			}
+			return false;
+		},
+
+		// Deactivate a panel.  use true to hide all panels.
+		deactivatePanel: function (id) {
+			if (id === true) {
+				for (var i in this.panels) {
+					this.deactivatePanel(i);
+				}
+				return true;
+			}
+			if (this.panels[id] !== undefined) {
+				var panel = this.panels[id];
+				if (panel.content !== undefined) {
+					Element.hide(panel.content);
+				}
+				Element.removeClass(panel.button, 'active');
+				panel.active = false;
+				return true;
+			}
+			return false;
+		},
+
+		// Bind events for all the collapsible arrays.
+		makeNeatArray: function (lists) {
+			for (var i = 0, element; element = lists[i]; i++) {
+				if (Element.hasClass(element, 'neat-array') && element.className.match(/depth-0/)) {
+					var childLists = element.getElementsByTagName('UL');
+					for (var j = 0, childEl; childEl = childLists[j]; j++) {
+						Element.hide(childEl);
+						Element.addClass(childEl.parentNode, 'expandable collapsed');
+					}
+					Event.addEvent(element, 'click', _delegateNeatArray);
+				}
+			}
+		}
+	};
+}();
+DEBUGKIT.loader.register(DEBUGKIT.toolbar);
+
+//Add events + behaviors for toolbar collapser.
+DEBUGKIT.toolbarToggle = function () {
+	var toolbar = DEBUGKIT.toolbar,
+		Element = DEBUGKIT.Util.Element,
+		Cookie = DEBUGKIT.Util.Cookie,
+		Collection = DEBUGKIT.Util.Collection,
+		Event = DEBUGKIT.Util.Event,
+		toolbarHidden = false;
+
+	return {
+		init: function () {
+			var button = document.getElementById('hide-toolbar'),
+				self = this;
+
+			Event.addEvent(button, 'click', function (event) {
+				event.preventDefault();
+				self.toggleToolbar();
+			});
+
+			var toolbarState = Cookie.read('toolbarDisplay');
+			if (toolbarState != 'show') {
+				toolbarHidden = false;
+				this.toggleToolbar();
+			}
+		},
+
+		toggleToolbar: function () {
+			var display = toolbarHidden ? 'show' : 'hide';
+			Collection.apply(toolbar.panels, function (panel) {
+				Element[display](panel.element);
+				Cookie.write('toolbarDisplay', display);
+			});
+			toolbarHidden = !toolbarHidden;
+			return false;
+		}
+	};
+}();
+DEBUGKIT.loader.register(DEBUGKIT.toolbarToggle);
+
+
+DEBUGKIT.Util.Event.domready(function () {
+	DEBUGKIT.loader.init();
+	DEBUGKIT.Util.Event.addEvent(window, 'unload', DEBUGKIT.Util.Event.unload);
+});
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/plugins/empty b/code/ryzom/tools/server/www/webtt/plugins/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/vendors/shells/tasks/empty b/code/ryzom/tools/server/www/webtt/vendors/shells/tasks/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/vendors/shells/templates/empty b/code/ryzom/tools/server/www/webtt/vendors/shells/templates/empty
new file mode 100644
index 000000000..e69de29bb
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/code/ryzom/tools/server/www/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
new file mode 100644
index 000000000..a65e83e87
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
@@ -0,0 +1,399 @@
+Simple Test interface changes
+=============================
+Because the SimpleTest tool set is still evolving it is likely that tests
+written with earlier versions will fail with the newest ones. The most
+dramatic changes are in the alpha releases. Here is a list of possible
+problems and their fixes...
+
+assertText() no longer finds a string inside a <script> tag
+-----------------------------------------------------------
+The assertText() method is intended to match only visible,
+human-readable text on the web page. Therefore, the contents of script
+tags should not be matched by this assertion. However there was a bug
+in the text normalisation code of simpletest which meant that <script>
+tags spanning multiple lines would not have their content stripped
+out. If you want to check the content of a <script> tag, use
+assertPattern(), or write a custom expectation.
+
+Overloaded method not working
+-----------------------------
+All protected and private methods had underscores
+removed. This means that any private/protected methods that
+you overloaded with those names need to be updated.
+
+Fatal error: Call to undefined method Classname::classname()
+------------------------------------------------------------
+SimpleTest renamed all of its constructors from 
+Classname to __construct; derived classes invoking
+their parent constructors should replace parent::Classname()
+with parent::__construct().
+
+Custom CSS in HtmlReporter not being applied
+--------------------------------------------
+Batch rename of protected and private methods 
+means that _getCss() was renamed to getCss().
+Please rename your method and it should work again.
+
+setReturnReference() throws errors in E_STRICT
+----------------------------------------------
+Happens when an object is passed by reference.
+This also happens with setReturnReferenceAt().
+If you want to return objects then replace these
+with calls to returns() and returnsAt() with the
+same arguments. This change was forced in the 1.1
+version for E_STRICT compatibility.
+
+assertReference() throws errors in E_STRICT
+-------------------------------------------
+Due to language restrictions you cannot compare
+both variables and objects in E_STRICT mode. Use
+assertSame() in this mode with objects. This change
+was forced the 1.1 version.
+
+Cannot create GroupTest
+-----------------------
+The GroupTest has been renamed TestSuite (see below).
+It was removed completely in 1.1 in favour of this
+name.
+
+No method getRelativeUrls() or getAbsoluteUrls()
+------------------------------------------------
+These methods were always a bit weird anyway, and
+the new parsing of the base tag makes them more so.
+They have been replaced with getUrls() instead. If
+you want the old functionality then simply chop
+off the current domain from getUrls().
+
+Method setWildcard() removed in mocks
+-------------------------------------
+Even setWildcard() has been removed in 1.0.1beta now.
+If you want to test explicitely for a '*' string, then
+simply pass in new IdenticalExpectation('*') instead.
+
+No method _getTest() on mocks
+-----------------------------
+This has finally been removed. It was a pretty esoteric
+flex point anyway. It was there to allow the mocks to
+work with other test tools, but no one does this.
+
+No method assertError(), assertNoErrors(), swallowErrors()
+----------------------------------------------------------
+These have been deprecated in 1.0.1beta in favour of
+expectError() and expectException(). assertNoErrors() is
+redundant if you use expectError() as failures are now reported
+immediately.
+
+No method TestCase::signal()
+----------------------------
+This has been deprecated in favour of triggering an error or
+throwing an exception. Deprecated as of 1.0.1beta.
+
+No method TestCase::sendMessage()
+---------------------------------
+This has been deprecated as of 1.0.1beta.
+
+Failure to connect now emits failures
+-------------------------------------
+It used to be that you would have to use the
+getTransferError() call on the web tester to see if
+there was a socket level error in a fetch. This check
+is now always carried out by the WebTestCase unless
+the fetch is prefaced with WebTestCase::ignoreErrors().
+The ignore directive only lasts for the next fetching
+action such as get() and click().
+
+No method SimpleTestOptions::ignore()
+-------------------------------------
+This is deprecated in version 1.0.1beta and has been moved
+to SimpleTest::ignore() as that is more readable. In
+addition, parent classes are also ignored automatically.
+If you are using PHP5 you can skip this directive simply
+by marking your test case as abstract.
+
+No method assertCopy()
+----------------------
+This is deprecated in 1.0.1 in favour of assertClone().
+The assertClone() method is slightly different in that
+the objects must be identical, but without being a
+reference. It is thus not a strict inversion of
+assertReference().
+
+Constructor wildcard override has no effect in mocks
+----------------------------------------------------
+As of 1.0.1beta this is now set with setWildcard() instead
+of in the constructor.
+
+No methods setStubBaseClass()/getStubBaseClass()
+------------------------------------------------
+As mocks are now used instead of stubs, these methods
+stopped working and are now removed as of the 1.0.1beta
+release. The mock objects may be freely used instead.
+
+No method addPartialMockCode()
+------------------------------
+The ability to insert arbitrary partial mock code
+has been removed. This was a low value feature
+causing needless complications. It was removed
+in the 1.0.1beta release.
+
+No method setMockBaseClass()
+----------------------------
+The ability to change the mock base class has been
+scheduled for removal and is deprecated since the
+1.0.1beta version. This was a rarely used feature
+except as a workaround for PHP5 limitations. As
+these limitations are being resolved it's hoped
+that the bundled mocks can be used directly.
+
+No class Stub
+-------------
+Server stubs are deprecated from 1.0.1 as the mocks now
+have exactly the same interface. Just use mock objects
+instead.
+
+No class SimpleTestOptions
+--------------------------
+This was replced by the shorter SimpleTest in 1.0.1beta1
+and is since deprecated.
+
+No file simple_test.php
+-----------------------
+This was renamed test_case.php in 1.0.1beta to more accurately
+reflect it's purpose. This file should never be directly
+included in test suites though, as it's part of the
+underlying mechanics and has a tendency to be refactored.
+
+No class WantedPatternExpectation
+---------------------------------
+This was deprecated in 1.0.1alpha in favour of the simpler
+name PatternExpectation.
+
+No class NoUnwantedPatternExpectation
+-------------------------------------
+This was deprecated in 1.0.1alpha in favour of the simpler
+name NoPatternExpectation.
+
+No method assertNoUnwantedPattern()
+-----------------------------------
+This has been renamed to assertNoPattern() in 1.0.1alpha and
+the old form is deprecated.
+
+No method assertWantedPattern()
+-------------------------------
+This has been renamed to assertPattern() in 1.0.1alpha and
+the old form is deprecated.
+
+No method assertExpectation()
+-----------------------------
+This was renamed as assert() in 1.0.1alpha and the old form
+has been deprecated.
+
+No class WildcardExpectation
+----------------------------
+This was a mostly internal class for the mock objects. It was
+renamed AnythingExpectation to bring it closer to JMock and
+NMock in version 1.0.1alpha.
+
+Missing UnitTestCase::assertErrorPattern()
+------------------------------------------
+This method is deprecated for version 1.0.1 onwards.
+This method has been subsumed by assertError() that can now
+take an expectation. Simply pass a PatternExpectation
+into assertError() to simulate the old behaviour.
+
+No HTML when matching page elements
+-----------------------------------
+This behaviour has been switched to using plain text as if it
+were seen by the user of the browser. This means that HTML tags
+are suppressed, entities are converted and whitespace is
+normalised. This should make it easier to match items in forms.
+Also images are replaced with their "alt" text so that they
+can be matched as well.
+
+No method SimpleRunner::_getTestCase()
+--------------------------------------
+This was made public as getTestCase() in 1.0RC2.
+
+No method restartSession()
+--------------------------
+This was renamed to restart() in the WebTestCase, SimpleBrowser
+and the underlying SimpleUserAgent in 1.0RC2. Because it was
+undocumented anyway, no attempt was made at backward
+compatibility.
+
+My custom test case ignored by tally()
+--------------------------------------
+The _assertTrue method has had it's signature changed due to a bug
+in the PHP 5.0.1 release. You must now use getTest() from within
+that method to get the test case. Mock compatibility with other
+unit testers is now deprecated as of 1.0.1alpha as PEAR::PHPUnit2
+should soon have mock support of it's own.
+
+Broken code extending SimpleRunner
+----------------------------------
+This was replaced with SimpleScorer so that I could use the runner
+name in another class. This happened in RC1 development and there
+is no easy backward compatibility fix. The solution is simply to
+extend SimpleScorer instead.
+
+Missing method getBaseCookieValue()
+-----------------------------------
+This was renamed getCurrentCookieValue() in RC1.
+
+Missing files from the SimpleTest suite
+---------------------------------------
+Versions of SimpleTest prior to Beta6 required a SIMPLE_TEST constant
+to point at the SimpleTest folder location before any of the toolset
+was loaded. This is no longer documented as it is now unnecessary
+for later versions. If you are using an earlier version you may
+need this constant. Consult the documentation that was bundled with
+the release that you are using or upgrade to Beta6 or later.
+
+No method SimpleBrowser::getCurrentUrl()
+--------------------------------------
+This is replaced with the more versatile showRequest() for
+debugging. It only existed in this context for version Beta5.
+Later versions will have SimpleBrowser::getHistory() for tracking
+paths through pages. It is renamed as getUrl() since 1.0RC1.
+
+No method Stub::setStubBaseClass()
+----------------------------------
+This method has finally been removed in 1.0RC1. Use
+SimpleTestOptions::setStubBaseClass() instead.
+
+No class CommandLineReporter
+----------------------------
+This was renamed to TextReporter in Beta3 and the deprecated version
+was removed in 1.0RC1.
+
+No method requireReturn()
+-------------------------
+This was deprecated in Beta3 and is now removed.
+
+No method expectCookie()
+------------------------
+This method was abruptly removed in Beta4 so as to simplify the internals
+until another mechanism can replace it. As a workaround it is necessary
+to assert that the cookie has changed by setting it before the page
+fetch and then assert the desired value.
+
+No method clickSubmitByFormId()
+-------------------------------
+This method had an incorrect name as no button was involved. It was
+renamed to submitByFormId() in Beta4 and the old version deprecated.
+Now removed.
+
+No method paintStart() or paintEnd()
+------------------------------------
+You should only get this error if you have subclassed the lower level
+reporting and test runner machinery. These methods have been broken
+down into events for test methods, events for test cases and events
+for group tests. The new methods are...
+
+paintStart() --> paintMethodStart(), paintCaseStart(), paintGroupStart()
+paintEnd() --> paintMethodEnd(), paintCaseEnd(), paintGroupEnd()
+
+This change was made in Beta3, ironically to make it easier to subclass
+the inner machinery. Simply duplicating the code you had in the previous
+methods should provide a temporary fix.
+
+No class TestDisplay
+--------------------
+This has been folded into SimpleReporter in Beta3 and is now deprecated.
+It was removed in RC1.
+
+No method WebTestCase::fetch()
+------------------------------
+This was renamed get() in Alpha8. It is removed in Beta3.
+
+No method submit()
+------------------
+This has been renamed clickSubmit() in Beta1. The old method was
+removed in Beta2.
+
+No method clearHistory()
+------------------------
+This method is deprecated in Beta2 and removed in RC1.
+
+No method getCallCount()
+------------------------
+This method has been deprecated since Beta1 and has now been
+removed. There are now more ways to set expectations on counts
+and so this method should be unecessery. Removed in RC1.
+
+Cannot find file *
+------------------
+The following public name changes have occoured...
+
+simple_html_test.php --> reporter.php
+simple_mock.php --> mock_objects.php
+simple_unit.php --> unit_tester.php
+simple_web.php --> web_tester.php
+
+The old names were deprecated in Alpha8 and removed in Beta1.
+
+No method attachObserver()
+--------------------------
+Prior to the Alpha8 release the old internal observer pattern was
+gutted and replaced with a visitor. This is to trade flexibility of
+test case expansion against the ease of writing user interfaces.
+
+Code such as...
+
+$test = &new MyTestCase();
+$test->attachObserver(new TestHtmlDisplay());
+$test->run();
+
+...should be rewritten as...
+
+$test = &new MyTestCase();
+$test->run(new HtmlReporter());
+
+If you previously attached multiple observers then the workaround
+is to run the tests twice, once with each, until they can be combined.
+For one observer the old method is simulated in Alpha 8, but is
+removed in Beta1.
+
+No class TestHtmlDisplay
+------------------------
+This class has been renamed to HtmlReporter in Alpha8. It is supported,
+but deprecated in Beta1 and removed in Beta2. If you have subclassed
+the display for your own design, then you will have to extend this
+class (HtmlReporter) instead.
+
+If you have accessed the event queue by overriding the notify() method
+then I am afraid you are in big trouble :(. The reporter is now
+carried around the test suite by the runner classes and the methods
+called directly. In the unlikely event that this is a problem and
+you don't want to upgrade the test tool then simplest is to write your
+own runner class and invoke the tests with...
+
+$test->accept(new MyRunner(new MyReporter()));
+
+...rather than the run method. This should be easier to extend
+anyway and gives much more control. Even this method is overhauled
+in Beta3 where the runner class can be set within the test case. Really
+the best thing to do is to upgrade to this version as whatever you were
+trying to achieve before should now be very much easier.
+
+Missing set options method
+--------------------------
+All test suite options are now in one class called SimpleTestOptions.
+This means that options are set differently...
+
+GroupTest::ignore() --> SimpleTestOptions::ignore()
+Mock::setMockBaseClass() --> SimpleTestOptions::setMockBaseClass()
+
+These changed in Alpha8 and the old versions are now removed in RC1.
+
+No method setExpected*()
+------------------------
+The mock expectations changed their names in Alpha4 and the old names
+ceased to be supported in Alpha8. The changes are...
+
+setExpectedArguments() --> expectArguments()
+setExpectedArgumentsSequence() --> expectArgumentsAt()
+setExpectedCallCount() --> expectCallCount()
+setMaximumCallCount() --> expectMaximumCallCount()
+
+The parameters remained the same.
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/LICENSE b/code/ryzom/tools/server/www/webtt/vendors/simpletest/LICENSE
new file mode 100644
index 000000000..09f465ab7
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/LICENSE
@@ -0,0 +1,502 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/README b/code/ryzom/tools/server/www/webtt/vendors/simpletest/README
new file mode 100644
index 000000000..40f41666d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/README
@@ -0,0 +1,102 @@
+SimpleTest
+==========
+
+You probably got this package from:
+
+    http://simpletest.org/en/download.html
+
+If there is no licence agreement with this package please download
+a version from the location above. You must read and accept that
+licence to use this software. The file is titled simply LICENSE.
+
+What is it? It's a framework for unit testing, web site testing and
+mock objects for PHP 5.0.5+.
+
+If you have used JUnit, you will find this PHP unit testing version very
+similar. Also included is a mock objects and server stubs generator.
+The stubs can have return values set for different arguments, can have
+sequences set also by arguments and can return items by reference.
+The mocks inherit all of this functionality and can also have
+expectations set, again in sequences and for different arguments.
+
+A web tester similar in concept to JWebUnit is also included. There is no
+JavaScript or tables support, but forms, authentication, cookies and
+frames are handled.
+
+You can see a release schedule at http://simpletest.org/en/overview.html
+which is also copied to the documentation folder with this release.
+A full PHPDocumenter API documentation exists at
+http://simpletest.org/api/.
+
+The user interface is minimal in the extreme, but a lot of information 
+flows from the test suite. After version 1.0 we will release a better 
+web UI, but we are leaving XUL and GTK versions to volunteers as 
+everybody has their own opinion on a good GUI, and we don't want to 
+discourage development by shipping one with the toolkit. You can 
+download an Eclipse plug-in separately. 
+
+The unit tests for SimpleTest itself can be run here:
+
+    test/unit_tests.php
+
+And tests involving live network connections as well are here:
+
+    test/all_tests.php
+
+The full tests will typically overrun the 8Mb limit often allowed
+to a PHP process. A workaround is to run the tests on the command
+with a custom php.ini file or with the switch -dmemory_limit=-1
+if you do not have access to your server version.
+
+The full tests read some test data from simpletest.org. If the site
+is down or has been modified for a later version then you will get
+spurious errors. A unit_tests.php failure on the other hand would be
+very serious. Please notify us if you find one.
+
+Even if all of the tests run please verify that your existing test suites
+also function as expected. The file:
+
+    HELP_MY_TESTS_DONT_WORK_ANYMORE
+
+...contains information on interface changes. It also points out
+deprecated interfaces, so you should read this even if all of
+your current tests appear to run.
+
+There is a documentation folder which contains the core reference information
+in English and French, although this information is fairly basic.
+You can find a tutorial on...
+
+    http://simpletest.org/en/first_test_tutorial.html
+
+...to get you started and this material will eventually become included
+with the project documentation. A French translation exists at:
+
+    http://simpletest.org/fr/first_test_tutorial.html
+
+If you download and use, and possibly even extend this tool, please let us
+know. Any feedback, even bad, is always welcome and we will work to get
+your suggestions into the next release. Ideally please send your
+comments to:
+
+    simpletest-support@lists.sourceforge.net
+
+...so that others can read them too. We usually try to respond within 48
+hours.
+
+There is no change log except at Sourceforge. You can visit the
+release notes to see the completed TODO list after each cycle and also the
+status of any bugs, but if the bug is recent then it will be fixed in SVN only.
+The SVN check-ins always have all the tests passing and so SVN snapshots should
+be pretty usable, although the code may not look so good internally.
+
+Oh, and one last thing: SimpleTest is called "Simple" because it should 
+be simple to use. We intend to add a complete set of tools for a test 
+first and "test as you code" type of development. "Simple" does not mean 
+"Lite" in this context. 
+
+Thanks to everyone who has sent comments and offered suggestions. They
+really are invaluable, but sadly you are too many to mention in full.
+Thanks to all on the advanced PHP forum on SitePoint, especially Harry
+Fuecks. Early adopters are always an inspiration.
+
+ -- Marcus Baker, Jason Sweat, Travis Swicegood, Perrick Penet and Edward Z. Yang.
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/VERSION b/code/ryzom/tools/server/www/webtt/vendors/simpletest/VERSION
new file mode 100644
index 000000000..6a7343198
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/VERSION
@@ -0,0 +1 @@
+1.1alpha3
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/authentication.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/authentication.php
new file mode 100644
index 000000000..fcd4efd3f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/authentication.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: authentication.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+/**
+ *  include http class
+ */
+require_once(dirname(__FILE__) . '/http.php');
+
+/**
+ *    Represents a single security realm's identity.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRealm {
+    private $type;
+    private $root;
+    private $username;
+    private $password;
+
+    /**
+     *    Starts with the initial entry directory.
+     *    @param string $type      Authentication type for this
+     *                             realm. Only Basic authentication
+     *                             is currently supported.
+     *    @param SimpleUrl $url    Somewhere in realm.
+     *    @access public
+     */
+    function SimpleRealm($type, $url) {
+        $this->type = $type;
+        $this->root = $url->getBasePath();
+        $this->username = false;
+        $this->password = false;
+    }
+
+    /**
+     *    Adds another location to the realm.
+     *    @param SimpleUrl $url    Somewhere in realm.
+     *    @access public
+     */
+    function stretch($url) {
+        $this->root = $this->getCommonPath($this->root, $url->getPath());
+    }
+
+    /**
+     *    Finds the common starting path.
+     *    @param string $first        Path to compare.
+     *    @param string $second       Path to compare.
+     *    @return string              Common directories.
+     *    @access private
+     */
+    protected function getCommonPath($first, $second) {
+        $first = explode('/', $first);
+        $second = explode('/', $second);
+        for ($i = 0; $i < min(count($first), count($second)); $i++) {
+            if ($first[$i] != $second[$i]) {
+                return implode('/', array_slice($first, 0, $i)) . '/';
+            }
+        }
+        return implode('/', $first) . '/';
+    }
+
+    /**
+     *    Sets the identity to try within this realm.
+     *    @param string $username    Username in authentication dialog.
+     *    @param string $username    Password in authentication dialog.
+     *    @access public
+     */
+    function setIdentity($username, $password) {
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     *    Accessor for current identity.
+     *    @return string        Last succesful username.
+     *    @access public
+     */
+    function getUsername() {
+        return $this->username;
+    }
+
+    /**
+     *    Accessor for current identity.
+     *    @return string        Last succesful password.
+     *    @access public
+     */
+    function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     *    Test to see if the URL is within the directory
+     *    tree of the realm.
+     *    @param SimpleUrl $url    URL to test.
+     *    @return boolean          True if subpath.
+     *    @access public
+     */
+    function isWithin($url) {
+        if ($this->isIn($this->root, $url->getBasePath())) {
+            return true;
+        }
+        if ($this->isIn($this->root, $url->getBasePath() . $url->getPage() . '/')) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Tests to see if one string is a substring of
+     *    another.
+     *    @param string $part        Small bit.
+     *    @param string $whole       Big bit.
+     *    @return boolean            True if the small bit is
+     *                               in the big bit.
+     *    @access private
+     */
+    protected function isIn($part, $whole) {
+        return strpos($whole, $part) === 0;
+    }
+}
+
+/**
+ *    Manages security realms.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAuthenticator {
+    private $realms;
+
+    /**
+     *    Clears the realms.
+     *    @access public
+     */
+    function SimpleAuthenticator() {
+        $this->restartSession();
+    }
+
+    /**
+     *    Starts with no realms set up.
+     *    @access public
+     */
+    function restartSession() {
+        $this->realms = array();
+    }
+
+    /**
+     *    Adds a new realm centered the current URL.
+     *    Browsers privatey wildly on their behaviour in this
+     *    regard. Mozilla ignores the realm and presents
+     *    only when challenged, wasting bandwidth. IE
+     *    just carries on presenting until a new challenge
+     *    occours. SimpleTest tries to follow the spirit of
+     *    the original standards committee and treats the
+     *    base URL as the root of a file tree shaped realm.
+     *    @param SimpleUrl $url    Base of realm.
+     *    @param string $type      Authentication type for this
+     *                             realm. Only Basic authentication
+     *                             is currently supported.
+     *    @param string $realm     Name of realm.
+     *    @access public
+     */
+    function addRealm($url, $type, $realm) {
+        $this->realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
+    }
+
+    /**
+     *    Sets the current identity to be presented
+     *    against that realm.
+     *    @param string $host        Server hosting realm.
+     *    @param string $realm       Name of realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @access public
+     */
+    function setIdentityForRealm($host, $realm, $username, $password) {
+        if (isset($this->realms[$host][$realm])) {
+            $this->realms[$host][$realm]->setIdentity($username, $password);
+        }
+    }
+
+    /**
+     *    Finds the name of the realm by comparing URLs.
+     *    @param SimpleUrl $url        URL to test.
+     *    @return SimpleRealm          Name of realm.
+     *    @access private
+     */
+    protected function findRealmFromUrl($url) {
+        if (! isset($this->realms[$url->getHost()])) {
+            return false;
+        }
+        foreach ($this->realms[$url->getHost()] as $name => $realm) {
+            if ($realm->isWithin($url)) {
+                return $realm;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Presents the appropriate headers for this location.
+     *    @param SimpleHttpRequest $request  Request to modify.
+     *    @param SimpleUrl $url              Base of realm.
+     *    @access public
+     */
+    function addHeaders(&$request, $url) {
+        if ($url->getUsername() && $url->getPassword()) {
+            $username = $url->getUsername();
+            $password = $url->getPassword();
+        } elseif ($realm = $this->findRealmFromUrl($url)) {
+            $username = $realm->getUsername();
+            $password = $realm->getPassword();
+        } else {
+            return;
+        }
+        $this->addBasicHeaders($request, $username, $password);
+    }
+
+    /**
+     *    Presents the appropriate headers for this
+     *    location for basic authentication.
+     *    @param SimpleHttpRequest $request  Request to modify.
+     *    @param string $username            Username for realm.
+     *    @param string $password            Password for realm.
+     *    @access public
+     */
+    static function addBasicHeaders(&$request, $username, $password) {
+        if ($username && $password) {
+            $request->addHeaderLine(
+                'Authorization: Basic ' . base64_encode("$username:$password"));
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/autorun.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/autorun.php
new file mode 100644
index 000000000..17ad7a39e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/autorun.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ *  Autorunner which runs all tests cases found in a file
+ *  that includes this module.
+ *  @package    SimpleTest
+ *  @version    $Id: autorun.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * include simpletest files
+ */
+require_once dirname(__FILE__) . '/unit_tester.php';
+require_once dirname(__FILE__) . '/mock_objects.php';
+require_once dirname(__FILE__) . '/collector.php';
+require_once dirname(__FILE__) . '/default_reporter.php';
+/**#@-*/
+
+$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_CLASSES'] = get_declared_classes();
+register_shutdown_function('simpletest_autorun');
+
+/**
+ *    Exit handler to run all recent test cases and exit system if in CLI
+ */
+function simpletest_autorun() {
+    if (tests_have_run()) {
+        return;
+    }
+    $result = run_local_tests();
+    if (SimpleReporter::inCli()) {
+        exit($result ? 0 : 1);
+    }
+}
+
+/**
+ *    run all recent test cases if no test has
+ *    so far been run. Uses the DefaultReporter which can have
+ *    it's output controlled with SimpleTest::prefer().
+ *    @return boolean/null false if there were test failures, true if
+ *                         there were no failures, null if tests are
+ *                         already running
+ */
+function run_local_tests() {
+    try {
+        if (tests_have_run()) {
+            return;
+        }
+        $candidates = capture_new_classes();
+        $loader = new SimpleFileLoader();
+        $suite = $loader->createSuiteFromClasses(
+                basename(initial_file()),
+                $loader->selectRunnableTests($candidates));
+        return $suite->run(new DefaultReporter());
+    } catch (Exception $stack_frame_fix) {
+        print $stack_frame_fix->getMessage();
+        return false;
+    }
+}
+
+/**
+ *    Checks the current test context to see if a test has
+ *    ever been run.
+ *    @return boolean        True if tests have run.
+ */
+function tests_have_run() {
+    if ($context = SimpleTest::getContext()) {
+        return (boolean)$context->getTest();
+    }
+    return false;
+}
+
+/**
+ *    The first autorun file.
+ *    @return string        Filename of first autorun script.
+ */
+function initial_file() {
+    static $file = false;
+    if (! $file) {
+        if (isset($_SERVER, $_SERVER['SCRIPT_FILENAME'])) {
+            $file = $_SERVER['SCRIPT_FILENAME'];
+        } else {
+            $included_files = get_included_files();
+            $file = reset($included_files);
+        }
+    }
+    return $file;
+}
+
+/**
+ *    Every class since the first autorun include. This
+ *    is safe enough if require_once() is always used.
+ *    @return array        Class names.
+ */
+function capture_new_classes() {
+    global $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES;
+    return array_map('strtolower', array_diff(get_declared_classes(),
+                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
+                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/browser.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/browser.php
new file mode 100644
index 000000000..615e738d3
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/browser.php
@@ -0,0 +1,1144 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: browser.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/php_parser.php');
+require_once(dirname(__FILE__) . '/tidy_parser.php');
+require_once(dirname(__FILE__) . '/selector.php');
+require_once(dirname(__FILE__) . '/frames.php');
+require_once(dirname(__FILE__) . '/user_agent.php');
+if (! SimpleTest::getParsers()) {
+    SimpleTest::setParsers(array(new SimpleTidyPageBuilder(), new SimplePHPPageBuilder()));
+    //SimpleTest::setParsers(array(new SimplePHPPageBuilder()));
+}
+/**#@-*/
+
+if (! defined('DEFAULT_MAX_NESTED_FRAMES')) {
+    define('DEFAULT_MAX_NESTED_FRAMES', 3);
+}
+
+/**
+ *    Browser history list.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBrowserHistory {
+    private $sequence = array();
+    private $position = -1;
+
+    /**
+     *    Test for no entries yet.
+     *    @return boolean        True if empty.
+     *    @access private
+     */
+    protected function isEmpty() {
+        return ($this->position == -1);
+    }
+
+    /**
+     *    Test for being at the beginning.
+     *    @return boolean        True if first.
+     *    @access private
+     */
+    protected function atBeginning() {
+        return ($this->position == 0) && ! $this->isEmpty();
+    }
+
+    /**
+     *    Test for being at the last entry.
+     *    @return boolean        True if last.
+     *    @access private
+     */
+    protected function atEnd() {
+        return ($this->position + 1 >= count($this->sequence)) && ! $this->isEmpty();
+    }
+
+    /**
+     *    Adds a successfully fetched page to the history.
+     *    @param SimpleUrl $url                 URL of fetch.
+     *    @param SimpleEncoding $parameters     Any post data with the fetch.
+     *    @access public
+     */
+    function recordEntry($url, $parameters) {
+        $this->dropFuture();
+        array_push(
+                $this->sequence,
+                array('url' => $url, 'parameters' => $parameters));
+        $this->position++;
+    }
+
+    /**
+     *    Last fully qualified URL for current history
+     *    position.
+     *    @return SimpleUrl        URL for this position.
+     *    @access public
+     */
+    function getUrl() {
+        if ($this->isEmpty()) {
+            return false;
+        }
+        return $this->sequence[$this->position]['url'];
+    }
+
+    /**
+     *    Parameters of last fetch from current history
+     *    position.
+     *    @return SimpleFormEncoding    Post parameters.
+     *    @access public
+     */
+    function getParameters() {
+        if ($this->isEmpty()) {
+            return false;
+        }
+        return $this->sequence[$this->position]['parameters'];
+    }
+
+    /**
+     *    Step back one place in the history. Stops at
+     *    the first page.
+     *    @return boolean     True if any previous entries.
+     *    @access public
+     */
+    function back() {
+        if ($this->isEmpty() || $this->atBeginning()) {
+            return false;
+        }
+        $this->position--;
+        return true;
+    }
+
+    /**
+     *    Step forward one place. If already at the
+     *    latest entry then nothing will happen.
+     *    @return boolean     True if any future entries.
+     *    @access public
+     */
+    function forward() {
+        if ($this->isEmpty() || $this->atEnd()) {
+            return false;
+        }
+        $this->position++;
+        return true;
+    }
+
+    /**
+     *    Ditches all future entries beyond the current
+     *    point.
+     *    @access private
+     */
+    protected function dropFuture() {
+        if ($this->isEmpty()) {
+            return;
+        }
+        while (! $this->atEnd()) {
+            array_pop($this->sequence);
+        }
+    }
+}
+
+/**
+ *    Simulated web browser. This is an aggregate of
+ *    the user agent, the HTML parsing, request history
+ *    and the last header set.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBrowser {
+    private $user_agent;
+    private $page;
+    private $history;
+    private $ignore_frames;
+    private $maximum_nested_frames;
+    private $parser;
+
+    /**
+     *    Starts with a fresh browser with no
+     *    cookie or any other state information. The
+     *    exception is that a default proxy will be
+     *    set up if specified in the options.
+     *    @access public
+     */
+    function __construct() {
+        $this->user_agent = $this->createUserAgent();
+        $this->user_agent->useProxy(
+                SimpleTest::getDefaultProxy(),
+                SimpleTest::getDefaultProxyUsername(),
+                SimpleTest::getDefaultProxyPassword());
+        $this->page = new SimplePage();
+        $this->history = $this->createHistory();
+        $this->ignore_frames = false;
+        $this->maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
+    }
+
+    /**
+     *    Creates the underlying user agent.
+     *    @return SimpleFetcher    Content fetcher.
+     *    @access protected
+     */
+    protected function createUserAgent() {
+        return new SimpleUserAgent();
+    }
+
+    /**
+     *    Creates a new empty history list.
+     *    @return SimpleBrowserHistory    New list.
+     *    @access protected
+     */
+    protected function createHistory() {
+        return new SimpleBrowserHistory();
+    }
+
+    /**
+     *    Get the HTML parser to use. Can be overridden by
+     *    setParser. Otherwise scans through the available parsers and
+     *    uses the first one which is available.
+     *    @return object SimplePHPPageBuilder or SimpleTidyPageBuilder
+     */
+    protected function getParser() {
+        if ($this->parser) {
+            return $this->parser;
+        }
+        foreach (SimpleTest::getParsers() as $parser) {
+            if ($parser->can()) {
+                return $parser;
+            }
+        }
+    }
+
+    /**
+     *    Override the default HTML parser, allowing parsers to be plugged in.
+     *    @param object           A parser object instance.
+     */
+    public function setParser($parser) {
+        $this->parser = $parser;
+    }
+
+    /**
+     *    Disables frames support. Frames will not be fetched
+     *    and the frameset page will be used instead.
+     *    @access public
+     */
+    function ignoreFrames() {
+        $this->ignore_frames = true;
+    }
+
+    /**
+     *    Enables frames support. Frames will be fetched from
+     *    now on.
+     *    @access public
+     */
+    function useFrames() {
+        $this->ignore_frames = false;
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->user_agent->ignoreCookies();
+    }
+
+    /**
+     *    Switches back on the cookie sending and recieving.
+     *    @access public
+     */
+    function useCookies() {
+        $this->user_agent->useCookies();
+    }
+
+    /**
+     *    Parses the raw content into a page. Will load further
+     *    frame pages unless frames are disabled.
+     *    @param SimpleHttpResponse $response    Response from fetch.
+     *    @param integer $depth                  Nested frameset depth.
+     *    @return SimplePage                     Parsed HTML.
+     *    @access private
+     */
+    protected function parse($response, $depth = 0) {
+        $page = $this->buildPage($response);
+        if ($this->ignore_frames || ! $page->hasFrames() || ($depth > $this->maximum_nested_frames)) {
+            return $page;
+        }
+        $frameset = new SimpleFrameset($page);
+        foreach ($page->getFrameset() as $key => $url) {
+            $frame = $this->fetch($url, new SimpleGetEncoding(), $depth + 1);
+            $frameset->addFrame($frame, $key);
+        }
+        return $frameset;
+    }
+
+    /**
+     *    Assembles the parsing machinery and actually parses
+     *    a single page. Frees all of the builder memory and so
+     *    unjams the PHP memory management.
+     *    @param SimpleHttpResponse $response    Response from fetch.
+     *    @return SimplePage                     Parsed top level page.
+     */
+    protected function buildPage($response) {
+        return $this->getParser()->parse($response);
+    }
+
+    /**
+     *    Fetches a page. Jointly recursive with the parse()
+     *    method as it descends a frameset.
+     *    @param string/SimpleUrl $url          Target to fetch.
+     *    @param SimpleEncoding $encoding       GET/POST parameters.
+     *    @param integer $depth                 Nested frameset depth protection.
+     *    @return SimplePage                    Parsed page.
+     *    @access private
+     */
+    protected function fetch($url, $encoding, $depth = 0) {
+        $response = $this->user_agent->fetchResponse($url, $encoding);
+        if ($response->isError()) {
+            return new SimplePage($response);
+        }
+        return $this->parse($response, $depth);
+    }
+
+    /**
+     *    Fetches a page or a single frame if that is the current
+     *    focus.
+     *    @param SimpleUrl $url                   Target to fetch.
+     *    @param SimpleEncoding $parameters       GET/POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function load($url, $parameters) {
+        $frame = $url->getTarget();
+        if (! $frame || ! $this->page->hasFrames() || (strtolower($frame) == '_top')) {
+            return $this->loadPage($url, $parameters);
+        }
+        return $this->loadFrame(array($frame), $url, $parameters);
+    }
+
+    /**
+     *    Fetches a page and makes it the current page/frame.
+     *    @param string/SimpleUrl $url            Target to fetch as string.
+     *    @param SimplePostEncoding $parameters   POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function loadPage($url, $parameters) {
+        $this->page = $this->fetch($url, $parameters);
+        $this->history->recordEntry(
+                $this->page->getUrl(),
+                $this->page->getRequestData());
+        return $this->page->getRaw();
+    }
+
+    /**
+     *    Fetches a frame into the existing frameset replacing the
+     *    original.
+     *    @param array $frames                    List of names to drill down.
+     *    @param string/SimpleUrl $url            Target to fetch as string.
+     *    @param SimpleFormEncoding $parameters   POST parameters.
+     *    @return string                          Raw content of page.
+     *    @access private
+     */
+    protected function loadFrame($frames, $url, $parameters) {
+        $page = $this->fetch($url, $parameters);
+        $this->page->setFrame($frames, $page);
+        return $page->getRaw();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened.
+     *    @param string/integer $date   Time when session restarted.
+     *                                  If omitted then all persistent
+     *                                  cookies are kept.
+     *    @access public
+     */
+    function restart($date = false) {
+        $this->user_agent->restart($date);
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->user_agent->addHeader($header);
+    }
+
+    /**
+     *    Ages the cookies by the specified time.
+     *    @param integer $interval    Amount in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->user_agent->ageCookies($interval);
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name       Cookie key.
+     *    @param string $value      Value of cookie.
+     *    @param string $host       Host upon which the cookie is valid.
+     *    @param string $path       Cookie path if not host wide.
+     *    @param string $expiry     Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->user_agent->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        return $this->user_agent->getCookieValue($host, $path, $name);
+    }
+
+    /**
+     *    Reads the current cookies for the current URL.
+     *    @param string $name   Key of cookie to find.
+     *    @return string        Null if there is no current URL, false
+     *                          if the cookie is not set.
+     *    @access public
+     */
+    function getCurrentCookieValue($name) {
+        return $this->user_agent->getBaseCookieValue($name, $this->page->getUrl());
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    a page will be loaded anyway.
+     *    @param integer $max        Most hops allowed.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        $this->user_agent->setMaximumRedirects($max);
+    }
+
+    /**
+     *    Sets the maximum number of nesting of framed pages
+     *    within a framed page to prevent loops.
+     *    @param integer $max        Highest depth allowed.
+     *    @access public
+     */
+    function setMaximumNestedFrames($max) {
+        $this->maximum_nested_frames = $max;
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->user_agent->setConnectionTimeout($timeout);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username = false, $password = false) {
+        $this->user_agent->useProxy($proxy, $username, $password);
+    }
+
+    /**
+     *    Fetches the page content with a HEAD request.
+     *    Will affect cookies, but will not change the base URL.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
+     *                                                HEAD request.
+     *    @return boolean                             True if successful.
+     *    @access public
+     */
+    function head($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        $response = $this->user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
+        $this->page = new SimplePage($response);
+        return ! $response->isError();
+    }
+
+    /**
+     *    Fetches the page content with a simple GET request.
+     *    @param string/SimpleUrl $url                Target to fetch.
+     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
+     *                                                GET request.
+     *    @return string                              Content of page or false.
+     *    @access public
+     */
+    function get($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        return $this->load($url, new SimpleGetEncoding($parameters));
+    }
+
+    /**
+     *    Fetches the page content with a POST request.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleFormEncoding $parameters  POST parameters or request body.
+     *    @param string $content_type                 MIME Content-Type of the request body
+     *    @return string                              Content of page.
+     *    @access public
+     */
+    function post($url, $parameters = false, $content_type = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        if ($this->getUrl()) {
+            $url = $url->makeAbsolute($this->getUrl());
+        }
+        return $this->load($url, new SimplePostEncoding($parameters, $content_type));
+    }
+
+    /**
+     *    Fetches the page content with a PUT request.
+     *    @param string/SimpleUrl $url                Target to fetch as string.
+     *    @param hash/SimpleFormEncoding $parameters  PUT request body.
+     *    @param string $content_type                 MIME Content-Type of the request body
+     *    @return string                              Content of page.
+     *    @access public
+     */
+    function put($url, $parameters = false, $content_type = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        return $this->load($url, new SimplePutEncoding($parameters, $content_type));
+    }
+
+    /**
+     *    Sends a DELETE request and fetches the response.
+     *    @param string/SimpleUrl $url                Target to fetch.
+     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
+     *                                                DELETE request.
+     *    @return string                              Content of page or false.
+     *    @access public
+     */
+    function delete($url, $parameters = false) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        return $this->load($url, new SimpleDeleteEncoding($parameters));
+    }
+
+    /**
+     *    Equivalent to hitting the retry button on the
+     *    browser. Will attempt to repeat the page fetch. If
+     *    there is no history to repeat it will give false.
+     *    @return string/boolean   Content if fetch succeeded
+     *                             else false.
+     *    @access public
+     */
+    function retry() {
+        $frames = $this->page->getFrameFocus();
+        if (count($frames) > 0) {
+            $this->loadFrame(
+                    $frames,
+                    $this->page->getUrl(),
+                    $this->page->getRequestData());
+            return $this->page->getRaw();
+        }
+        if ($url = $this->history->getUrl()) {
+            $this->page = $this->fetch($url, $this->history->getParameters());
+            return $this->page->getRaw();
+        }
+        return false;
+    }
+
+    /**
+     *    Equivalent to hitting the back button on the
+     *    browser. The browser history is unchanged on
+     *    failure. The page content is refetched as there
+     *    is no concept of content caching in SimpleTest.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded
+     *    @access public
+     */
+    function back() {
+        if (! $this->history->back()) {
+            return false;
+        }
+        $content = $this->retry();
+        if (! $content) {
+            $this->history->forward();
+        }
+        return $content;
+    }
+
+    /**
+     *    Equivalent to hitting the forward button on the
+     *    browser. The browser history is unchanged on
+     *    failure. The page content is refetched as there
+     *    is no concept of content caching in SimpleTest.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded
+     *    @access public
+     */
+    function forward() {
+        if (! $this->history->forward()) {
+            return false;
+        }
+        $content = $this->retry();
+        if (! $content) {
+            $this->history->back();
+        }
+        return $content;
+    }
+
+    /**
+     *    Retries a request after setting the authentication
+     *    for the current realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @return boolean            True if successful fetch. Note
+     *                               that authentication may still have
+     *                               failed.
+     *    @access public
+     */
+    function authenticate($username, $password) {
+        if (! $this->page->getRealm()) {
+            return false;
+        }
+        $url = $this->page->getUrl();
+        if (! $url) {
+            return false;
+        }
+        $this->user_agent->setIdentity(
+                $url->getHost(),
+                $this->page->getRealm(),
+                $username,
+                $password);
+        return $this->retry();
+    }
+
+    /**
+     *    Accessor for a breakdown of the frameset.
+     *    @return array   Hash tree of frames by name
+     *                    or index if no name.
+     *    @access public
+     */
+    function getFrames() {
+        return $this->page->getFrames();
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus.
+     *    @return integer/string/boolean    Label if any, otherwise
+     *                                      the position in the frameset
+     *                                      or false if none.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return $this->page->getFrameFocus();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return $this->page->setFrameFocusByIndex($choice);
+    }
+
+    /**
+     *    Sets the focus by name.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return $this->page->setFrameFocus($name);
+    }
+
+    /**
+     *    Clears the frame focus. All frames will be searched
+     *    for content.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        return $this->page->clearFrameFocus();
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->page->getTransportError();
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        return $this->page->getMimeType();
+    }
+
+    /**
+     *    Accessor for last response code.
+     *    @return integer    Last HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        return $this->page->getResponseCode();
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        return $this->page->getAuthentication();
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        return $this->page->getRealm();
+    }
+
+    /**
+     *    Accessor for current URL of page or frame if
+     *    focused.
+     *    @return string    Location of current page or frame as
+     *                      a string.
+     */
+    function getUrl() {
+        $url = $this->page->getUrl();
+        return $url ? $url->asString() : false;
+    }
+
+    /**
+     *    Accessor for base URL of page if set via BASE tag
+     *    @return string    base URL
+     */
+    function getBaseUrl() {
+        $url = $this->page->getBaseUrl();
+        return $url ? $url->asString() : false;
+    }
+
+    /**
+     *    Accessor for raw bytes sent down the wire.
+     *    @return string      Original text sent.
+     *    @access public
+     */
+    function getRequest() {
+        return $this->page->getRequest();
+    }
+
+    /**
+     *    Accessor for raw header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getHeaders() {
+        return $this->page->getHeaders();
+    }
+
+    /**
+     *    Accessor for raw page information.
+     *    @return string      Original text content of web page.
+     *    @access public
+     */
+    function getContent() {
+        return $this->page->getRaw();
+    }
+
+    /**
+     *    Accessor for plain text version of the page.
+     *    @return string      Normalised text representation.
+     *    @access public
+     */
+    function getContentAsText() {
+        return $this->page->getText();
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        return $this->page->getTitle();
+    }
+
+    /**
+     *    Accessor for a list of all links in current page.
+     *    @return array   List of urls with scheme of
+     *                    http or https and hostname.
+     *    @access public
+     */
+    function getUrls() {
+        return $this->page->getUrls();
+    }
+
+    /**
+     *    Sets all form fields with that name.
+     *    @param string $label   Name or label of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setField($label, $value, $position=false) {
+        return $this->page->setField(new SimpleByLabelOrName($label), $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that name. Will use label if
+     *    one is available (not yet implemented).
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldByName($name, $value, $position=false) {
+        return $this->page->setField(new SimpleByName($name), $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that id attribute.
+     *    @param string/integer $id   Id of field in forms.
+     *    @param string $value        New value of field.
+     *    @return boolean             True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldById($id, $value) {
+        return $this->page->setField(new SimpleById($id), $value);
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    Finds the first match.
+     *    @param string $label       Field label.
+     *    @return string/boolean     A value if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getField($label) {
+        return $this->page->getField(new SimpleByLabelOrName($label));
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    Finds the first match.
+     *    @param string $name        Field name.
+     *    @return string/boolean     A string if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getFieldByName($name) {
+        return $this->page->getField(new SimpleByName($name));
+    }
+
+    /**
+     *    Accessor for a form element value within the page.
+     *    @param string/integer $id  Id of field in forms.
+     *    @return string/boolean     A string if the field is
+     *                               present, false if unchecked
+     *                               and null if missing.
+     *    @access public
+     */
+    function getFieldById($id) {
+        return $this->page->getField(new SimpleById($id));
+    }
+
+    /**
+     *    Clicks the submit button by label. The owning
+     *    form will be submitted by this.
+     *    @param string $label    Button label. An unlabeled
+     *                            button can be triggered by 'Submit'.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmit($label = 'Submit', $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleByLabel($label)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleByLabel($label), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit button by name attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $name     Button name.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmitByName($name, $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleByName($name)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleByName($name), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit button by ID attribute of the button
+     *    itself. The owning form will be submitted by this.
+     *    @param string $id       Button ID.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickSubmitById($id, $additional = false) {
+        if (! ($form = $this->page->getFormBySubmit(new SimpleById($id)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitButton(new SimpleById($id), $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Tests to see if a submit button exists with this
+     *    label.
+     *    @param string $label    Button label.
+     *    @return boolean         True if present.
+     *    @access public
+     */
+    function isSubmit($label) {
+        return (boolean)$this->page->getFormBySubmit(new SimpleByLabel($label));
+    }
+
+    /**
+     *    Clicks the submit image by some kind of label. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $label    ID attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickImage($label, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleByLabel($label)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit image by the name. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $name     Name attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form data.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleByName($name)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleByName($name), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Clicks the submit image by ID attribute. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param integer/string $id    ID attribute of button.
+     *    @param integer $x            X-coordinate of imaginary click.
+     *    @param integer $y            Y-coordinate of imaginary click.
+     *    @param hash $additional      Additional form data.
+     *    @return string/boolean       Page on success.
+     *    @access public
+     */
+    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+        if (! ($form = $this->page->getFormByImage(new SimpleById($id)))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submitImage(new SimpleById($id), $x, $y, $additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Tests to see if an image exists with this
+     *    title or alt text.
+     *    @param string $label    Image text.
+     *    @return boolean         True if present.
+     *    @access public
+     */
+    function isImage($label) {
+        return (boolean)$this->page->getFormByImage(new SimpleByLabel($label));
+    }
+
+    /**
+     *    Submits a form by the ID.
+     *    @param string $id       The form ID. No submit button value
+     *                            will be sent.
+     *    @return string/boolean  Page on success.
+     *    @access public
+     */
+    function submitFormById($id, $additional = false) {
+        if (! ($form = $this->page->getFormById($id))) {
+            return false;
+        }
+        $success = $this->load(
+                $form->getAction(),
+                $form->submit($additional));
+        return ($success ? $this->getContent() : $success);
+    }
+
+    /**
+     *    Finds a URL by label. Will find the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. The match ignores case and
+     *    white space issues.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return string/boolean   URL on success.
+     *    @access public
+     */
+    function getLink($label, $index = 0) {
+        $urls = $this->page->getUrlsByLabel($label);
+        if (count($urls) == 0) {
+            return false;
+        }
+        if (count($urls) < $index + 1) {
+            return false;
+        }
+        return $urls[$index];
+    }
+
+    /**
+     *    Follows a link by label. Will click the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. The match ignores case and
+     *    white space issues.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return string/boolean   Page on success.
+     *    @access public
+     */
+    function clickLink($label, $index = 0) {
+        $url = $this->getLink($label, $index);
+        if ($url === false) {
+            return false;
+        }
+        $this->load($url, new SimpleGetEncoding());
+        return $this->getContent();
+    }
+
+    /**
+     *    Finds a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return string/boolean   URL on success.
+     *    @access public
+     */
+    function getLinkById($id) {
+        return $this->page->getUrlById($id);
+    }
+
+    /**
+     *    Follows a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return string/boolean   Page on success.
+     *    @access public
+     */
+    function clickLinkById($id) {
+        if (! ($url = $this->getLinkById($id))) {
+            return false;
+        }
+        $this->load($url, new SimpleGetEncoding());
+        return $this->getContent();
+    }
+
+    /**
+     *    Clicks a visible text item. Will first try buttons,
+     *    then links and then images.
+     *    @param string $label        Visible text or alt text.
+     *    @return string/boolean      Raw page or false.
+     *    @access public
+     */
+    function click($label) {
+        $raw = $this->clickSubmit($label);
+        if (! $raw) {
+            $raw = $this->clickLink($label);
+        }
+        if (! $raw) {
+            $raw = $this->clickImage($label);
+        }
+        return $raw;
+    }
+
+    /**
+     *    Tests to see if a click target exists.
+     *    @param string $label    Visible text or alt text.
+     *    @return boolean         True if target present.
+     *    @access public
+     */
+    function isClickable($label) {
+        return $this->isSubmit($label) || ($this->getLink($label) !== false) || $this->isImage($label);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/collector.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/collector.php
new file mode 100644
index 000000000..ac49937aa
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/collector.php
@@ -0,0 +1,122 @@
+<?php
+/**
+ * This file contains the following classes: {@link SimpleCollector},
+ * {@link SimplePatternCollector}.
+ *
+ * @author Travis Swicegood <development@domain51.com>
+ * @package SimpleTest
+ * @subpackage UnitTester
+ * @version $Id: collector.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ * The basic collector for {@link GroupTest}
+ *
+ * @see collect(), GroupTest::collect()
+ * @package SimpleTest
+ * @subpackage UnitTester
+ */
+class SimpleCollector {
+
+    /**
+     * Strips off any kind of slash at the end so as to normalise the path.
+     * @param string $path    Path to normalise.
+     * @return string         Path without trailing slash.
+     */
+    protected function removeTrailingSlash($path) {
+        if (substr($path, -1) == DIRECTORY_SEPARATOR) {
+            return substr($path, 0, -1);
+        } elseif (substr($path, -1) == '/') {
+            return substr($path, 0, -1);
+        } else {
+            return $path;
+        }
+    }
+
+    /**
+     * Scans the directory and adds what it can.
+     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $path    Directory to scan.
+     * @see _attemptToAdd()
+     */
+    function collect(&$test, $path) {
+        $path = $this->removeTrailingSlash($path);
+        if ($handle = opendir($path)) {
+            while (($entry = readdir($handle)) !== false) {
+                if ($this->isHidden($entry)) {
+                    continue;
+                }
+                $this->handle($test, $path . DIRECTORY_SEPARATOR . $entry);
+            }
+            closedir($handle);
+        }
+    }
+
+    /**
+     * This method determines what should be done with a given file and adds
+     * it via {@link GroupTest::addTestFile()} if necessary.
+     *
+     * This method should be overriden to provide custom matching criteria,
+     * such as pattern matching, recursive matching, etc.  For an example, see
+     * {@link SimplePatternCollector::_handle()}.
+     *
+     * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $filename  A filename as generated by {@link collect()}
+     * @see collect()
+     * @access protected
+     */
+    protected function handle(&$test, $file) {
+        if (is_dir($file)) {
+            return;
+        }
+        $test->addFile($file);
+    }
+
+    /**
+     *  Tests for hidden files so as to skip them. Currently
+     *  only tests for Unix hidden files.
+     *  @param string $filename        Plain filename.
+     *  @return boolean                True if hidden file.
+     *  @access private
+     */
+    protected function isHidden($filename) {
+        return strncmp($filename, '.', 1) == 0;
+    }
+}
+
+/**
+ * An extension to {@link SimpleCollector} that only adds files matching a
+ * given pattern.
+ *
+ * @package SimpleTest
+ * @subpackage UnitTester
+ * @see SimpleCollector
+ */
+class SimplePatternCollector extends SimpleCollector {
+    private $pattern;
+
+    /**
+     *
+     * @param string $pattern   Perl compatible regex to test name against
+     *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
+     *  for full documentation of valid pattern.s
+     */
+    function __construct($pattern = '/php$/i') {
+        $this->pattern = $pattern;
+    }
+
+    /**
+     * Attempts to add files that match a given pattern.
+     *
+     * @see SimpleCollector::_handle()
+     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
+     * @param string $path    Directory to scan.
+     * @access protected
+     */
+    protected function handle(&$test, $filename) {
+        if (preg_match($this->pattern, $filename)) {
+            parent::handle($test, $filename);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/compatibility.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/compatibility.php
new file mode 100644
index 000000000..e313db0cb
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/compatibility.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @version    $Id: compatibility.php 1900 2009-07-29 11:44:37Z lastcraft $
+ */
+
+/**
+ *  Static methods for compatibility between different
+ *  PHP versions.
+ *  @package    SimpleTest
+ */
+class SimpleTestCompatibility {
+
+    /**
+     *    Creates a copy whether in PHP5 or PHP4.
+     *    @param object $object     Thing to copy.
+     *    @return object            A copy.
+     *    @access public
+     */
+    static function copy($object) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            eval('$copy = clone $object;');
+            return $copy;
+        }
+        return $object;
+    }
+
+    /**
+     *    Identity test. Drops back to equality + types for PHP5
+     *    objects as the === operator counts as the
+     *    stronger reference constraint.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if identical.
+     *    @access public
+     */
+    static function isIdentical($first, $second) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            return SimpleTestCompatibility::isIdenticalType($first, $second);
+        }
+        if ($first != $second) {
+            return false;
+        }
+        return ($first === $second);
+    }
+
+    /**
+     *    Recursive type test.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if same type.
+     *    @access private
+     */
+    protected static function isIdenticalType($first, $second) {
+        if (gettype($first) != gettype($second)) {
+            return false;
+        }
+        if (is_object($first) && is_object($second)) {
+            if (get_class($first) != get_class($second)) {
+                return false;
+            }
+            return SimpleTestCompatibility::isArrayOfIdenticalTypes(
+                    (array) $first,
+                    (array) $second);
+        }
+        if (is_array($first) && is_array($second)) {
+            return SimpleTestCompatibility::isArrayOfIdenticalTypes($first, $second);
+        }
+        if ($first !== $second) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Recursive type test for each element of an array.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if identical.
+     *    @access private
+     */
+    protected static function isArrayOfIdenticalTypes($first, $second) {
+        if (array_keys($first) != array_keys($second)) {
+            return false;
+        }
+        foreach (array_keys($first) as $key) {
+            $is_identical = SimpleTestCompatibility::isIdenticalType(
+                    $first[$key],
+                    $second[$key]);
+            if (! $is_identical) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Test for two variables being aliases.
+     *    @param mixed $first    Test subject.
+     *    @param mixed $second   Comparison object.
+     *    @return boolean        True if same.
+     *    @access public
+     */
+    static function isReference(&$first, &$second) {
+        if (version_compare(phpversion(), '5', '>=') && is_object($first)) {
+            return ($first === $second);
+        }
+        if (is_object($first) && is_object($second)) {
+            $id = uniqid("test");
+            $first->$id = true;
+            $is_ref = isset($second->$id);
+            unset($first->$id);
+            return $is_ref;
+        }
+        $temp = $first;
+        $first = uniqid("test");
+        $is_ref = ($first === $second);
+        $first = $temp;
+        return $is_ref;
+    }
+
+    /**
+     *    Test to see if an object is a member of a
+     *    class hiearchy.
+     *    @param object $object    Object to test.
+     *    @param string $class     Root name of hiearchy.
+     *    @return boolean         True if class in hiearchy.
+     *    @access public
+     */
+    static function isA($object, $class) {
+        if (version_compare(phpversion(), '5') >= 0) {
+            if (! class_exists($class, false)) {
+                if (function_exists('interface_exists')) {
+                    if (! interface_exists($class, false))  {
+                        return false;
+                    }
+                }
+            }
+            eval("\$is_a = \$object instanceof $class;");
+            return $is_a;
+        }
+        if (function_exists('is_a')) {
+            return is_a($object, $class);
+        }
+        return ((strtolower($class) == get_class($object))
+                or (is_subclass_of($object, $class)));
+    }
+
+    /**
+     *    Sets a socket timeout for each chunk.
+     *    @param resource $handle    Socket handle.
+     *    @param integer $timeout    Limit in seconds.
+     *    @access public
+     */
+    static function setTimeout($handle, $timeout) {
+        if (function_exists('stream_set_timeout')) {
+            stream_set_timeout($handle, $timeout, 0);
+        } elseif (function_exists('socket_set_timeout')) {
+            socket_set_timeout($handle, $timeout, 0);
+        } elseif (function_exists('set_socket_timeout')) {
+            set_socket_timeout($handle, $timeout, 0);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/cookies.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/cookies.php
new file mode 100644
index 000000000..7a28f4a5b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/cookies.php
@@ -0,0 +1,380 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: cookies.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/url.php');
+/**#@-*/
+
+/**
+ *    Cookie data holder. Cookie rules are full of pretty
+ *    arbitary stuff. I have used...
+ *    http://wp.netscape.com/newsref/std/cookie_spec.html
+ *    http://www.cookiecentral.com/faq/
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCookie {
+    private $host;
+    private $name;
+    private $value;
+    private $path;
+    private $expiry;
+    private $is_secure;
+
+    /**
+     *    Constructor. Sets the stored values.
+     *    @param string $name            Cookie key.
+     *    @param string $value           Value of cookie.
+     *    @param string $path            Cookie path if not host wide.
+     *    @param string $expiry          Expiry date as string.
+     *    @param boolean $is_secure      Currently ignored.
+     */
+    function __construct($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
+        $this->host = false;
+        $this->name = $name;
+        $this->value = $value;
+        $this->path = ($path ? $this->fixPath($path) : "/");
+        $this->expiry = false;
+        if (is_string($expiry)) {
+            $this->expiry = strtotime($expiry);
+        } elseif (is_integer($expiry)) {
+            $this->expiry = $expiry;
+        }
+        $this->is_secure = $is_secure;
+    }
+
+    /**
+     *    Sets the host. The cookie rules determine
+     *    that the first two parts are taken for
+     *    certain TLDs and three for others. If the
+     *    new host does not match these rules then the
+     *    call will fail.
+     *    @param string $host       New hostname.
+     *    @return boolean           True if hostname is valid.
+     *    @access public
+     */
+    function setHost($host) {
+        if ($host = $this->truncateHost($host)) {
+            $this->host = $host;
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for the truncated host to which this
+     *    cookie applies.
+     *    @return string       Truncated hostname.
+     *    @access public
+     */
+    function getHost() {
+        return $this->host;
+    }
+
+    /**
+     *    Test for a cookie being valid for a host name.
+     *    @param string $host    Host to test against.
+     *    @return boolean        True if the cookie would be valid
+     *                           here.
+     */
+    function isValidHost($host) {
+        return ($this->truncateHost($host) === $this->getHost());
+    }
+
+    /**
+     *    Extracts just the domain part that determines a
+     *    cookie's host validity.
+     *    @param string $host    Host name to truncate.
+     *    @return string        Domain or false on a bad host.
+     *    @access private
+     */
+    protected function truncateHost($host) {
+        $tlds = SimpleUrl::getAllTopLevelDomains();
+        if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
+            return $matches[0];
+        } elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
+            return $matches[0];
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for name.
+     *    @return string       Cookie key.
+     *    @access public
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Accessor for value. A deleted cookie will
+     *    have an empty string for this.
+     *    @return string       Cookie value.
+     *    @access public
+     */
+    function getValue() {
+        return $this->value;
+    }
+
+    /**
+     *    Accessor for path.
+     *    @return string       Valid cookie path.
+     *    @access public
+     */
+    function getPath() {
+        return $this->path;
+    }
+
+    /**
+     *    Tests a path to see if the cookie applies
+     *    there. The test path must be longer or
+     *    equal to the cookie path.
+     *    @param string $path       Path to test against.
+     *    @return boolean           True if cookie valid here.
+     *    @access public
+     */
+    function isValidPath($path) {
+        return (strncmp(
+                $this->fixPath($path),
+                $this->getPath(),
+                strlen($this->getPath())) == 0);
+    }
+
+    /**
+     *    Accessor for expiry.
+     *    @return string       Expiry string.
+     *    @access public
+     */
+    function getExpiry() {
+        if (! $this->expiry) {
+            return false;
+        }
+        return gmdate("D, d M Y H:i:s", $this->expiry) . " GMT";
+    }
+
+    /**
+     *    Test to see if cookie is expired against
+     *    the cookie format time or timestamp.
+     *    Will give true for a session cookie.
+     *    @param integer/string $now  Time to test against. Result
+     *                                will be false if this time
+     *                                is later than the cookie expiry.
+     *                                Can be either a timestamp integer
+     *                                or a cookie format date.
+     *    @access public
+     */
+    function isExpired($now) {
+        if (! $this->expiry) {
+            return true;
+        }
+        if (is_string($now)) {
+            $now = strtotime($now);
+        }
+        return ($this->expiry < $now);
+    }
+
+    /**
+     *    Ages the cookie by the specified number of
+     *    seconds.
+     *    @param integer $interval   In seconds.
+     *    @public
+     */
+    function agePrematurely($interval) {
+        if ($this->expiry) {
+            $this->expiry -= $interval;
+        }
+    }
+
+    /**
+     *    Accessor for the secure flag.
+     *    @return boolean       True if cookie needs SSL.
+     *    @access public
+     */
+    function isSecure() {
+        return $this->is_secure;
+    }
+
+    /**
+     *    Adds a trailing and leading slash to the path
+     *    if missing.
+     *    @param string $path            Path to fix.
+     *    @access private
+     */
+    protected function fixPath($path) {
+        if (substr($path, 0, 1) != '/') {
+            $path = '/' . $path;
+        }
+        if (substr($path, -1, 1) != '/') {
+            $path .= '/';
+        }
+        return $path;
+    }
+}
+
+/**
+ *    Repository for cookies. This stuff is a
+ *    tiny bit browser dependent.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCookieJar {
+    private $cookies;
+
+    /**
+     *    Constructor. Jar starts empty.
+     *    @access public
+     */
+    function __construct() {
+        $this->cookies = array();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened.
+     *    @param string/integer $now   Time to test expiry against.
+     *    @access public
+     */
+    function restartSession($date = false) {
+        $surviving_cookies = array();
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            if (! $this->cookies[$i]->getValue()) {
+                continue;
+            }
+            if (! $this->cookies[$i]->getExpiry()) {
+                continue;
+            }
+            if ($date && $this->cookies[$i]->isExpired($date)) {
+                continue;
+            }
+            $surviving_cookies[] = $this->cookies[$i];
+        }
+        $this->cookies = $surviving_cookies;
+    }
+
+    /**
+     *    Ages all cookies in the cookie jar.
+     *    @param integer $interval     The old session is moved
+     *                                 into the past by this number
+     *                                 of seconds. Cookies now over
+     *                                 age will be removed.
+     *    @access public
+     */
+    function agePrematurely($interval) {
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            $this->cookies[$i]->agePrematurely($interval);
+        }
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name       Cookie key.
+     *    @param string $value      Value of cookie.
+     *    @param string $host       Host upon which the cookie is valid.
+     *    @param string $path       Cookie path if not host wide.
+     *    @param string $expiry     Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $cookie = new SimpleCookie($name, $value, $path, $expiry);
+        if ($host) {
+            $cookie->setHost($host);
+        }
+        $this->cookies[$this->findFirstMatch($cookie)] = $cookie;
+    }
+
+    /**
+     *    Finds a matching cookie to write over or the
+     *    first empty slot if none.
+     *    @param SimpleCookie $cookie    Cookie to write into jar.
+     *    @return integer                Available slot.
+     *    @access private
+     */
+    protected function findFirstMatch($cookie) {
+        for ($i = 0; $i < count($this->cookies); $i++) {
+            $is_match = $this->isMatch(
+                    $cookie,
+                    $this->cookies[$i]->getHost(),
+                    $this->cookies[$i]->getPath(),
+                    $this->cookies[$i]->getName());
+            if ($is_match) {
+                return $i;
+            }
+        }
+        return count($this->cookies);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies. Looks for the longest path that
+     *    matches.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        $longest_path = '';
+        foreach ($this->cookies as $cookie) {
+            if ($this->isMatch($cookie, $host, $path, $name)) {
+                if (strlen($cookie->getPath()) > strlen($longest_path)) {
+                    $value = $cookie->getValue();
+                    $longest_path = $cookie->getPath();
+                }
+            }
+        }
+        return (isset($value) ? $value : false);
+    }
+
+    /**
+     *    Tests cookie for matching against search
+     *    criteria.
+     *    @param SimpleTest $cookie    Cookie to test.
+     *    @param string $host          Host must match.
+     *    @param string $path          Cookie path must be shorter than
+     *                                 this path.
+     *    @param string $name          Name must match.
+     *    @return boolean              True if matched.
+     *    @access private
+     */
+    protected function isMatch($cookie, $host, $path, $name) {
+        if ($cookie->getName() != $name) {
+            return false;
+        }
+        if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
+            return false;
+        }
+        if (! $cookie->isValidPath($path)) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Uses a URL to sift relevant cookies by host and
+     *    path. Results are list of strings of form "name=value".
+     *    @param SimpleUrl $url       Url to select by.
+     *    @return array               Valid name and value pairs.
+     *    @access public
+     */
+    function selectAsPairs($url) {
+        $pairs = array();
+        foreach ($this->cookies as $cookie) {
+            if ($this->isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
+                $pairs[] = $cookie->getName() . '=' . $cookie->getValue();
+            }
+        }
+        return $pairs;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/default_reporter.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/default_reporter.php
new file mode 100644
index 000000000..6feb67a30
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/default_reporter.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ *  Optional include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: default_reporter.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/reporter.php');
+require_once(dirname(__FILE__) . '/xml.php');
+/**#@-*/
+
+/**
+ *    Parser for command line arguments. Extracts
+ *    the a specific test to run and engages XML
+ *    reporting when necessary.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleCommandLineParser {
+    private $to_property = array(
+            'case' => 'case', 'c' => 'case',
+            'test' => 'test', 't' => 'test',
+    );
+    private $case = '';
+    private $test = '';
+    private $xml = false;
+    private $help = false;
+    private $no_skips = false;
+
+    /**
+     *    Parses raw command line arguments into object properties.
+     *    @param string $arguments        Raw commend line arguments.
+     */
+    function __construct($arguments) {
+        if (! is_array($arguments)) {
+            return;
+        }
+        foreach ($arguments as $i => $argument) {
+            if (preg_match('/^--?(test|case|t|c)=(.+)$/', $argument, $matches)) {
+                $property = $this->to_property[$matches[1]];
+                $this->$property = $matches[2];
+            } elseif (preg_match('/^--?(test|case|t|c)$/', $argument, $matches)) {
+                $property = $this->to_property[$matches[1]];
+                if (isset($arguments[$i + 1])) {
+                    $this->$property = $arguments[$i + 1];
+                }
+            } elseif (preg_match('/^--?(xml|x)$/', $argument)) {
+                $this->xml = true;
+            } elseif (preg_match('/^--?(no-skip|no-skips|s)$/', $argument)) {
+                $this->no_skips = true;
+            } elseif (preg_match('/^--?(help|h)$/', $argument)) {
+                $this->help = true;
+            }
+        }
+    }
+
+    /**
+     *    Run only this test.
+     *    @return string        Test name to run.
+     */
+    function getTest() {
+        return $this->test;
+    }
+
+    /**
+     *    Run only this test suite.
+     *    @return string        Test class name to run.
+     */
+    function getTestCase() {
+        return $this->case;
+    }
+
+    /**
+     *    Output should be XML or not.
+     *    @return boolean        True if XML desired.
+     */
+    function isXml() {
+        return $this->xml;
+    }
+
+    /**
+     *    Output should suppress skip messages.
+     *    @return boolean        True for no skips.
+     */
+    function noSkips() {
+        return $this->no_skips;
+    }
+
+    /**
+     *    Output should be a help message. Disabled during XML mode.
+     *    @return boolean        True if help message desired.
+     */
+    function help() {
+        return $this->help && ! $this->xml;
+    }
+
+    /**
+     *    Returns plain-text help message for command line runner.
+     *    @return string         String help message
+     */
+    function getHelpText() {
+        return <<<HELP
+SimpleTest command line default reporter (autorun)
+Usage: php <test_file> [args...]
+
+    -c <class>      Run only the test-case <class>
+    -t <method>     Run only the test method <method>
+    -s              Suppress skip messages
+    -x              Return test results in XML
+    -h              Display this help message
+
+HELP;
+    }
+
+}
+
+/**
+ *    The default reporter used by SimpleTest's autorun
+ *    feature. The actual reporters used are dependency
+ *    injected and can be overridden.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class DefaultReporter extends SimpleReporterDecorator {
+
+    /**
+     *  Assembles the appropriate reporter for the environment.
+     */
+    function __construct() {
+        if (SimpleReporter::inCli()) {
+            $parser = new SimpleCommandLineParser($_SERVER['argv']);
+            $interfaces = $parser->isXml() ? array('XmlReporter') : array('TextReporter');
+            if ($parser->help()) {
+                // I'm not sure if we should do the echo'ing here -- ezyang
+                echo $parser->getHelpText();
+                exit(1);
+            }
+            $reporter = new SelectiveReporter(
+                    SimpleTest::preferred($interfaces),
+                    $parser->getTestCase(),
+                    $parser->getTest());
+            if ($parser->noSkips()) {
+                $reporter = new NoSkipsReporter($reporter);
+            }
+        } else {
+            $reporter = new SelectiveReporter(
+                    SimpleTest::preferred('HtmlReporter'),
+                    @$_GET['c'],
+                    @$_GET['t']);
+            if (@$_GET['skips'] == 'no' || @$_GET['show-skips'] == 'no') {
+                $reporter = new NoSkipsReporter($reporter);
+            }
+        }
+        parent::__construct($reporter);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/detached.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/detached.php
new file mode 100644
index 000000000..a325e140d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/detached.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: detached.php 1784 2008-04-26 13:07:14Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/xml.php');
+require_once(dirname(__FILE__) . '/shell_tester.php');
+/**#@-*/
+
+/**
+ *    Runs an XML formated test in a separate process.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class DetachedTestCase {
+    private $command;
+    private $dry_command;
+    private $size;
+
+    /**
+     *    Sets the location of the remote test.
+     *    @param string $command       Test script.
+     *    @param string $dry_command   Script for dry run.
+     *    @access public
+     */
+    function __construct($command, $dry_command = false) {
+        $this->command = $command;
+        $this->dry_command = $dry_command ? $dry_command : $command;
+        $this->size = false;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string       Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->command;
+    }
+
+    /**
+     *    Runs the top level test for this class. Currently
+     *    reads the data as a single chunk. I'll fix this
+     *    once I have added iteration to the browser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @returns boolean                   True if no failures.
+     *    @access public
+     */
+    function run(&$reporter) {
+        $shell = &new SimpleShell();
+        $shell->execute($this->command);
+        $parser = &$this->createParser($reporter);
+        if (! $parser->parse($shell->getOutput())) {
+            trigger_error('Cannot parse incoming XML from [' . $this->command . ']');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Accessor for the number of subtests.
+     *    @return integer       Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        if ($this->size === false) {
+            $shell = &new SimpleShell();
+            $shell->execute($this->dry_command);
+            $reporter = &new SimpleReporter();
+            $parser = &$this->createParser($reporter);
+            if (! $parser->parse($shell->getOutput())) {
+                trigger_error('Cannot parse incoming XML from [' . $this->dry_command . ']');
+                return false;
+            }
+            $this->size = $reporter->getTestCaseCount();
+        }
+        return $this->size;
+    }
+
+    /**
+     *    Creates the XML parser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @return SimpleTestXmlListener      XML reader.
+     *    @access protected
+     */
+    protected function &createParser(&$reporter) {
+        return new SimpleTestXmlParser($reporter);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/authentication_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/authentication_documentation.html
new file mode 100644
index 000000000..e058e19a1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/authentication_documentation.html
@@ -0,0 +1,378 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for testing log-in and authentication</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <span class="chosen">Authentication</span>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Authentication documentation</h1>
+        This page...
+        <ul>
+<li>
+            Getting through <a href="#basic">Basic HTTP authentication</a>
+        </li>
+<li>
+            Testing <a href="#cookies">cookie based authentication</a>
+        </li>
+<li>
+            Managing <a href="#session">browser sessions</a> and timeouts
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                One of the trickiest, and yet most important, areas
+                of testing web sites is the security.
+                Testing these schemes is one of the core goals of
+                the SimpleTest web tester.
+            </p>
+        
+        <h2>
+<a class="target" name="basic"></a>Basic HTTP authentication</h2>
+            <p>
+                If you fetch a page protected by basic authentication then
+                rather than receiving content, you will instead get a 401
+                header.
+                We can illustrate this with this test...
+<pre>
+class AuthenticationTest extends WebTestCase {<strong>
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;showHeaders();
+    }</strong>
+}
+</pre>
+                This allows us to see the challenge header...
+                <div class="demo">
+                    <h1>File test</h1>
+<pre>
+HTTP/1.1 401 Authorization Required
+Date: Sat, 18 Sep 2004 19:25:18 GMT
+Server: Apache/1.3.29 (Unix) PHP/4.3.4
+WWW-Authenticate: Basic realm="SimpleTest basic authentication"
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+</pre>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                We are trying to get away from visual inspection though, and so SimpleTest
+                allows to make automated assertions against the challenge.
+                Here is a thorough test of our header...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;assertAuthentication('Basic');
+        $this-&gt;assertResponse(401);
+        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
+    }
+}
+</pre>
+                Any one of these tests would normally do on it's own depending
+                on the amount of detail you want to see.
+            </p>
+            <p>
+                One theme that runs through SimpleTest is the ability to use
+                <span class="new_code">SimpleExpectation</span> objects wherever a simple
+                match is not enough.
+                If you want only an approximate match to the realm for
+                example, you can do this...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
+    }
+}
+</pre>
+                This type of test, testing HTTP responses, is not typical.
+            </p>
+            <p>
+                Most of the time we are not interested in testing the
+                authentication itself, but want to get past it to test
+                the pages underneath.
+                As soon as the challenge has been issued we can reply with
+                an authentication response...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanAuthenticate() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;authenticate('Me', 'Secret');</strong>
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                The username and password will now be sent with every
+                subsequent request to that directory and subdirectories.
+                You will have to authenticate again if you step outside
+                the authenticated directory, but SimpleTest is smart enough
+                to merge subdirectories into a common realm.
+            </p>
+            <p>
+                If you want, you can shortcut this step further by encoding
+                the log in details straight into the URL...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanReadAuthenticatedPages() {
+        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                If your username or password has special characters, then you
+                will have to URL encode them or the request will not be parsed
+                correctly.
+                I'm afraid we leave this up to you.
+            </p>
+            <p>
+                A problem with encoding the login details directly in the URL is
+                the authentication header will not be sent on subsequent requests.
+                If you navigate with relative URLs though, the authentication
+                information will be preserved along with the domain name.
+            </p>
+            <p>
+                Normally though, you use the <span class="new_code">authenticate()</span> call.
+                SimpleTest will then remember your login information on each request.
+            </p>
+            <p>
+                Only testing with basic authentication is currently supported, and
+                this is only really secure in tandem with HTTPS connections.
+                This is usually good enough to protect test server from prying eyes,
+                however.
+                Digest authentication and NTLM authentication may be added
+                in the future if enough people request this feature.
+            </p>
+        
+        <h2>
+<a class="target" name="cookies"></a>Cookies</h2>
+            <p>
+                Basic authentication doesn't give enough control over the
+                user interface for web developers.
+                More likely this functionality will be coded directly into
+                the web architecture using cookies with complicated timeouts.
+                We need to be able to test this too.
+            </p>
+            <p>
+                Starting with a simple log-in form...
+<pre>
+&lt;form&gt;
+    Username:
+    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
+    Password:
+    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
+    &lt;input type="submit" value="Log in" /&gt;
+&lt;/form&gt;
+</pre>
+                Which looks like...
+            </p>
+            <p>
+                <form class="demo">
+                    Username:
+                    <input type="text" name="u" value=""><br>
+                    Password:
+                    <input type="password" name="p" value=""><br>
+                    <input type="submit" value="Log in">
+                </form>
+            </p>
+            <p>
+                Let's suppose that in fetching this page a cookie has been
+                set with a session ID.
+                We are not going to fill the form in yet, just test that
+                we are tracking the user.
+                Here is the test...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieSetBeforeForm() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;assertCookie('SID');</strong>
+    }
+}
+</pre>
+                All we are doing is confirming that the cookie is set.
+                As the value is likely to be rather cryptic it's not
+                really worth testing this with...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieIsCorrectPattern() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
+    }
+}
+</pre>
+                If you are using PHP to handle sessions for you then
+                this test is even more useless, as we are just testing PHP itself.
+            </p>
+            <p>
+                The simplest test of logging in is to visually inspect the
+                next page to see if you are really logged in.
+                Just test the next page with <span class="new_code">WebTestCase::assertText()</span>.
+            </p>
+            <p>
+                The test is similar to any other form test,
+                but we might want to confirm that we still have the same
+                cookie after log-in as before we entered.
+                We wouldn't want to lose track of this after all.
+                Here is a possible test for this...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $session = $this-&gt;getCookie('SID');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');
+        $this-&gt;assertCookie('SID', $session);</strong>
+    }
+}
+</pre>
+                This confirms that the session identifier is maintained
+                afer log-in and we haven't accidently reset it.
+            </p>
+            <p>
+                We could even attempt to hack our own system by setting
+                arbitrary cookies to gain access...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;setCookie('SID', 'Some other session');
+        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
+        $this-&gt;assertText('Access denied');
+    }
+}
+</pre>
+                Is your site protected from this attack?
+            </p>
+        
+        <h2>
+<a class="target" name="session"></a>Browser sessions</h2>
+            <p>
+                If you are testing an authentication system a critical piece
+                of behaviour is what happens when a user logs back in.
+                We would like to simulate closing and reopening a browser...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterBrowserClose() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');<strong>
+        
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertText('Access denied');</strong>
+    }
+}
+</pre>
+                The <span class="new_code">WebTestCase::restart()</span> method will
+                preserve cookies that have unexpired timeouts, but throw away
+                those that are temporary or expired.
+                You can optionally specify the time and date that the restart
+                happened.
+            </p>
+            <p>
+                Expiring cookies can be a problem.
+                After all, if you have a cookie that expires after an hour,
+                you don't want to stall the test for an hour while waiting
+                for the cookie to pass it's timeout.
+            </p>
+            <p>
+                To push the cookies over the hour limit you can age them
+                before you restart the session...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterOneHour() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;click('Log in');
+        $this-&gt;assertText('Welcome Me');
+        <strong>
+        $this-&gt;ageCookies(3600);</strong>
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertText('Access denied');
+    }
+}
+</pre>
+                After the restart it will appear that cookies are an
+                hour older, and any that pass their expiry will have
+                disappeared.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <span class="chosen">Authentication</span>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/browser_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/browser_documentation.html
new file mode 100644
index 000000000..809c14311
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/browser_documentation.html
@@ -0,0 +1,501 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for the scriptable web browser component</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <span class="chosen">Scriptable browser</span>
+</div></div>
+<h1>PHP Scriptable Web Browser</h1>
+        This page...
+        <ul>
+<li>
+            Using the bundled <a href="#scripting">web browser in scripts</a>
+        </li>
+<li>
+            <a href="#debug">Debugging</a> failed pages
+        </li>
+<li>
+            Complex <a href="#unit">tests with multiple web browsers</a>
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest's web browser component can be used not just
+                outside of the <span class="new_code">WebTestCase</span> class, but also
+                independently of the SimpleTest framework itself.
+            </p>
+        
+        <h2>
+<a class="target" name="scripting"></a>The Scriptable Browser</h2>
+            <p>
+                You can use the web browser in PHP scripts to confirm
+                services are up and running, or to extract information
+                from them at a regular basis.
+                For example, here is a small script to extract the current number of
+                open PHP 5 bugs from the <a href="http://www.php.net/">PHP web site</a>...
+<pre>
+<strong>&lt;?php
+require_once('simpletest/browser.php');
+    
+$browser = &amp;new SimpleBrowser();
+$browser-&gt;get('http://php.net/');
+$browser-&gt;click('reporting bugs');
+$browser-&gt;click('statistics');
+$page = $browser-&gt;click('PHP 5 bugs only');
+preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
+print $matches[1];
+?&gt;</strong>
+</pre>
+                There are simpler methods to do this particular example in PHP
+                of course.
+                For example you can just use the PHP <span class="new_code">file()</span>
+                command against what here is a pretty fixed page.
+                However, using the web browser for scripts allows authentication,
+                correct handling of cookies, automatic loading of frames, redirects,
+                form submission and the ability to examine the page headers.
+            <p>
+            </p>
+                Methods such as periodic scraping are fragile against a site that is constantly
+                evolving and you would want a more direct way of accessing
+                data in a permanent set up, but for simple tasks this can provide
+                a very rapid solution.
+            </p>
+            <p>
+                All of the navigation methods used in the
+                <a href="web_tester_documentation.html">WebTestCase</a>
+                are present in the <span class="new_code">SimpleBrowser</span> class, but
+                the assertions are replaced with simpler accessors.
+                Here is a full list of the page navigation methods...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Adds a header to every fetch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
+<td>Use this proxy from now on</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Perform a HEAD request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Fetch a page with GET</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Fetch a page with POST</td>
+</tr>
+                    <tr>
+<td><span class="new_code">click($label)</span></td>
+<td>Clicks visible link or button text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label)</span></td>
+<td>Follows a link by label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Follows a link by attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>Current URL of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTitle()</span></td>
+<td>Page title</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContent()</span></td>
+<td>Raw page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContentAsText()</span></td>
+<td>HTML removed except for alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Repeat the last request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Use the browser back button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Use the browser forward button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($username, $password)</span></td>
+<td>Retry page or frame after a 401 response</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart($date)</span></td>
+<td>Restarts the browser for a new session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Ages the cookies by the specified time</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Sets an additional cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
+<td>Reads the most specific cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCurrentCookieValue($name)</span></td>
+<td>Reads cookie for the current context</td>
+</tr>
+                </tbody></table>
+                The methods <span class="new_code">SimpleBrowser::useProxy()</span> and
+                <span class="new_code">SimpleBrowser::addHeader()</span> are special.
+                Once called they continue to apply to all subsequent fetches.
+            </p>
+            <p>
+                Navigating forms is similar to the
+                <a href="form_testing_documentation.html">WebTestCase form navigation</a>...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setField($label, $value)</span></td>
+<td>Sets all form fields with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldByName($name, $value)</span></td>
+<td>Sets all form fields with that name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldById($id, $value)</span></td>
+<td>Sets all form fields with that id</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getField($label)</span></td>
+<td>Accessor for a form element value by label tag and then name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldByName($name)</span></td>
+<td>Accessor for a form element value using name attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldById($id)</span></td>
+<td>Accessor for a form element value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Submits form by button label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Submits form by button attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Submits form by button attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clicks an input tag of type image by title or alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clicks an input tag of type image by name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clicks an input tag of type image by ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Submits by the form tag attribute</td>
+</tr>
+                </tbody></table>
+                At the moment there aren't many methods to list available links and fields.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">isClickable($label)</span></td>
+<td>Test to see if a click target exists by label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isSubmit($label)</span></td>
+<td>Test for the existence of a button with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isImage($label)</span></td>
+<td>Test for the existence of an image button with that label or name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLink($label)</span></td>
+<td>Finds a URL from its label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLinkById($label)</span></td>
+<td>Finds a URL from its ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrls()</span></td>
+<td>Lists available links in the current page</td>
+</tr>
+                </tbody></table>
+                This will be expanded in later versions of SimpleTest.
+            </p>
+            <p>
+                Frames are a rather esoteric feature these days, but SimpleTest has
+                retained support for them.
+            </p>
+            <p>
+                Within a page, individual frames can be selected.
+                If no selection is made then all the frames are merged together
+                in one large conceptual page.
+                The content of the current page will be a concatenation of all of the
+                frames in the order that they were specified in the "frameset"
+                tags.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getFrames()</span></td>
+<td>A dump of the current frame structure</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>Current frame label or index</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Select a frame numbered from 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Select frame by label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Treat all the frames as a single page</td>
+</tr>
+                </tbody></table>
+                When focused on a single frame, the content will come from
+                that frame only.
+                This includes links to click and forms to submit.
+            </p>
+        
+        <h2>
+<a class="target" name="debug"></a>What went wrong?</h2>
+            <p>
+                All of this functionality is great when we actually manage to fetch pages,
+                but that doesn't always happen.
+                To help figure out what went wrong, the browser has some methods to
+                aid in debugging...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Close the socket on overrun</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>Url of most recent page fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRequest()</span></td>
+<td>Raw request header of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getHeaders()</span></td>
+<td>Raw response header of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>Any socket level errors in the last fetch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getResponseCode()</span></td>
+<td>HTTP response of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getMimeType()</span></td>
+<td>Mime type of page or frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getAuthentication()</span></td>
+<td>Authentication type in 401 challenge header</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRealm()</span></td>
+<td>Authentication realm in 401 challenge header</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getBaseUrl()</span></td>
+<td>Base url only of most recent page fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Number of redirects before page is loaded anyway</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
+<td>Protection against recursive framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Disables frames support</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useFrames()</span></td>
+<td>Enables frames support</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreCookies()</span></td>
+<td>Disables sending and receiving of cookies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useCookies()</span></td>
+<td>Enables cookie support</td>
+</tr>
+                </tbody></table>
+                The methods <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>
+                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreFrames()</span>,
+                <span class="new_code">SimpleBrowser::useFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreCookies()</span> and
+                <span class="new_code">SimpleBrowser::useCokies()</span> continue to apply
+                to every subsequent request.
+                The other methods are frames aware.
+                This means that if you have an individual frame that is not
+                loading, navigate to it using <span class="new_code">SimpleBrowser::setFrameFocus()</span>
+                and you can then use <span class="new_code">SimpleBrowser::getRequest()</span>, etc to
+                see what happened.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Complex unit tests with multiple browsers</h2>
+            <p>
+                Anything that could be done in a
+                <a href="web_tester_documentation.html">WebTestCase</a> can
+                now be done in a <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                This means that we could freely mix domain object testing with the
+                web interface...
+<pre>
+<strong>class TestOfRegistration extends UnitTestCase {
+    function testNewUserAddedToAuthenticator() {</strong>
+        $browser = new SimpleBrowser();
+        $browser-&gt;get('http://my-site.com/register.php');
+        $browser-&gt;setField('email', 'me@here');
+        $browser-&gt;setField('password', 'Secret');
+        $browser-&gt;click('Register');
+        <strong>
+        $authenticator = new Authenticator();
+        $member = $authenticator-&gt;findByEmail('me@here');
+        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');
+    }
+}</strong>
+</pre>
+                While this may be a useful temporary expediency, I am not a fan
+                of this type of testing.
+                The testing has cut across application layers, make it twice as
+                likely it will need refactoring when the code changes.
+            </p>
+            <p>
+                A more useful case of where using the browser directly can be helpful
+                is where the <span class="new_code">WebTestCase</span> cannot cope.
+                An example is where two browsers are needed at the same time.
+            </p>
+            <p>
+                For example, say we want to disallow multiple simultaneous
+                usage of a site with the same username.
+                This test case will do the job...
+<pre>
+class TestOfSecurity extends UnitTestCase {
+    function testNoMultipleLoginsFromSameUser() {<strong>
+        $first_attempt = new SimpleBrowser();
+        $first_attempt-&gt;get('http://my-site.com/login.php');
+        $first_attempt-&gt;setField('name', 'Me');
+        $first_attempt-&gt;setField('password', 'Secret');
+        $first_attempt-&gt;click('Enter');
+        $this-&gt;assertEqual($first_attempt-&gt;getTitle(), 'Welcome');
+        
+        $second_attempt = new SimpleBrowser();
+        $second_attempt-&gt;get('http://my-site.com/login.php');
+        $second_attempt-&gt;setField('name', 'Me');
+        $second_attempt-&gt;setField('password', 'Secret');
+        $second_attempt-&gt;click('Enter');
+        $this-&gt;assertEqual($second_attempt-&gt;getTitle(), 'Access Denied');</strong>
+    }
+}
+</pre>
+                You can also use the <span class="new_code">SimpleBrowser</span> class
+                directly when you want to write test cases using a different
+                test tool than SimpleTest, such as PHPUnit.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <span class="chosen">Scriptable browser</span>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/docs.css b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/docs.css
new file mode 100644
index 000000000..18368a04f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/docs.css
@@ -0,0 +1,121 @@
+body {
+    padding-left: 3%;
+    padding-right: 3%;
+}
+h1, h2, h3 {
+	font-family: sans-serif;
+}
+h1 {
+    text-align: center;
+}
+pre {
+    font-family: "courier new", courier, typewriter, monospace;
+    font-size: 90%;
+    border: 1px solid;
+	border-color: #999966;
+    background-color: #ffffcc;
+    padding: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+}
+.code, .new_code, pre.new_code {
+    font-family: "courier new", courier, typewriter, monospace;
+    font-weight: bold;
+}
+div.copyright {
+    font-size: 80%;
+    color: gray;
+}
+div.copyright a {
+    margin-top: 1em;
+    color: gray;
+}
+ul.api {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+ul.api li {
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    list-style: none;
+    text-indent: -3em;
+    padding-left: 1em;
+}
+div.demo {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+}
+div.demo span.fail {
+    color: red;
+}
+div.demo span.pass {
+    color: green;
+}
+div.demo h1 {
+    font-size: 12pt;
+    text-align: left;
+    font-weight: bold;
+}
+div.menu {
+    text-align: center;
+}
+table {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+td {
+    font-size: 90%;
+}
+.shell {
+    color: white;
+}
+pre.shell {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: #000100;
+	color: #99ff99;
+    font-size: 90%;
+}
+pre.file {
+    color: black;
+    border: 1px solid;
+    border-color: black;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+    font-size: 90%;
+}
+form.demo {
+    background-color: lightgray;
+    border: 4px outset;
+    border-color: lightgray;
+    padding: 10px;
+    margin-right: 40%;
+}
+dl, dd {
+	margin:  10px;
+	margin-left:  30px;
+}
+em {
+    font-weight: bold;
+    font-family: "courier new", courier, typewriter, monospace;
+}
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/expectation_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/expectation_documentation.html
new file mode 100644
index 000000000..26704d5ae
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/expectation_documentation.html
@@ -0,0 +1,476 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Extending the SimpleTest unit tester with additional expectation classes
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <span class="chosen">Expectations</span>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Expectation documentation</h1>
+        This page...
+        <ul>
+<li>
+            Using expectations for
+            <a href="#mock">more precise testing with mock objects</a>
+        </li>
+<li>
+            <a href="#behaviour">Changing mock object behaviour</a> with expectations
+        </li>
+<li>
+            <a href="#extending">Extending the expectations</a>
+        </li>
+<li>
+            Underneath SimpleTest <a href="#unit">uses expectation classes</a>
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="mock"></a>More control over mock objects</h2>
+            <p>
+                The default behaviour of the
+                <a href="mock_objects_documentation.html">mock objects</a>
+                in
+                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
+                is either an identical match on the argument or to allow any argument at all.
+                For almost all tests this is sufficient.
+                Sometimes, though, you want to weaken a test case.
+            </p>
+            <p>
+                One place where a test can be too tightly coupled is with
+                text matching.
+                Suppose we have a component that outputs a helpful error
+                message when something goes wrong.
+                You want to test that the correct error was sent, but the actual
+                text may be rather long.
+                If you test for the text exactly, then every time the exact wording
+                of the message changes, you will have to go back and edit the test suite.
+            </p>
+            <p>
+                For example, suppose we have a news service that has failed
+                to connect to its remote source.
+<pre>
+<strong>class NewsService {
+    ...
+    function publish($writer) {
+        if (! $this-&gt;isConnected()) {
+            $writer-&gt;write('Cannot connect to news service "' .
+                    $this-&gt;_name . '" at this time. ' .
+                    'Please try again later.');
+        }
+        ...
+    }
+}</strong>
+</pre>
+                Here it is sending its content to a
+                <span class="new_code">Writer</span> class.
+                We could test this behaviour with a
+                <span class="new_code">MockWriter</span> like so...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {<strong>
+        $writer = new MockWriter();
+        $writer-&gt;expectOnce('write', array(
+                'Cannot connect to news service ' .
+                '"BBC News" at this time. ' .
+                'Please try again later.'));
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);</strong>
+    }
+}
+</pre>
+                This is a good example of a brittle test.
+                If we decide to add additional instructions, such as
+                suggesting an alternative news source, we will break
+                our tests even though no underlying functionality
+                has been altered.
+            </p>
+            <p>
+                To get around this, we would like to do a regular expression
+                test rather than an exact match.
+                We can actually do this with...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {
+        $writer = new MockWriter();<strong>
+        $writer-&gt;expectOnce(
+                'write',
+                array(new PatternExpectation('/cannot connect/i')));</strong>
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+    }
+}
+</pre>
+                Instead of passing in the expected parameter to the
+                <span class="new_code">MockWriter</span> we pass an
+                expectation class called
+                <span class="new_code">PatternExpectation</span>.
+                The mock object is smart enough to recognise this as special
+                and to treat it differently.
+                Rather than simply comparing the incoming argument to this
+                object, it uses the expectation object itself to
+                perform the test.
+            </p>
+            <p>
+                The <span class="new_code">PatternExpectation</span> takes
+                the regular expression to match in its constructor.
+                Whenever a comparison is made by the <span class="new_code">MockWriter</span>
+                against this expectation class, it will do a
+                <span class="new_code">preg_match()</span> with this pattern.
+                With our test case above, as long as "cannot connect"
+                appears in the text of the string, the mock will issue a pass
+                to the unit tester.
+                The rest of the text does not matter.
+            </p>
+            <p>
+                The possible expectation classes are...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">AnythingExpectation</span></td>
+<td>Will always match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">EqualExpectation</span></td>
+<td>An equality, rather than the stronger identity comparison</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotEqualExpectation</span></td>
+<td>An inequality comparison</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IndenticalExpectation</span></td>
+<td>The default mock object check which must match exactly</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotIndenticalExpectation</span></td>
+<td>Inverts the mock object logic</td>
+</tr>
+                    <tr>
+<td><span class="new_code">WithinMarginExpectation</span></td>
+<td>Compares a value to within a margin</td>
+</tr>
+                    <tr>
+<td><span class="new_code">OutsideMarginExpectation</span></td>
+<td>Checks that a value is out side the margin</td>
+</tr>
+                    <tr>
+<td><span class="new_code">PatternExpectation</span></td>
+<td>Uses a Perl Regex to match a string</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NoPatternExpectation</span></td>
+<td>Passes only if failing a Perl Regex</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IsAExpectation</span></td>
+<td>Checks the type or class name only</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotAExpectation</span></td>
+<td>Opposite of the <span class="new_code">IsAExpectation</span>
+</td>
+</tr>
+                    <tr>
+<td><span class="new_code">MethodExistsExpectation</span></td>
+<td>Checks a method is available on an object</td>
+</tr>
+                    <tr>
+<td><span class="new_code">TrueExpectation</span></td>
+<td>Accepts any PHP variable that evaluates to true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">FalseExpectation</span></td>
+<td>Accepts any PHP variable that evaluates to false</td>
+</tr>
+                </tbody></table>
+                Most take the expected value in the constructor.
+                The exceptions are the pattern matchers, which take a regular expression,
+                and the <span class="new_code">IsAExpectation</span> and <span class="new_code">NotAExpectation</span> which takes a type
+                or class name as a string.
+            </p>
+            <p>
+                Some examples...
+            </p>
+            <p>
+<pre>
+$mock-&gt;expectOnce('method', array(new IdenticalExpectation(14)));
+</pre>
+                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array(14))</span>.
+<pre>
+$mock-&gt;expectOnce('method', array(new EqualExpectation(14)));
+</pre>
+                This is different from the previous version in that the string
+                <span class="new_code">"14"</span> as a parameter will also pass.
+                Sometimes the additional type checks of SimpleTest are too restrictive.
+<pre>
+$mock-&gt;expectOnce('method', array(new AnythingExpectation(14)));
+</pre>
+                This is the same as <span class="new_code">$mock-&gt;expectOnce('method', array('*'))</span>.
+<pre>
+$mock-&gt;expectOnce('method', array(new IdenticalExpectation('*')));
+</pre>
+                This is handy if you want to assert a literal <span class="new_code">"*"</span>.
+<pre>
+new NotIdenticalExpectation(14)
+</pre>
+                This matches on anything other than integer 14.
+                Even the string <span class="new_code">"14"</span> would pass.
+<pre>
+new WithinMarginExpectation(14.0, 0.001)
+</pre>
+                This will accept any value from 13.999 to 14.001 inclusive.
+            </p>
+        
+        <h2>
+<a class="target" name="behaviour"></a>Using expectations to control stubs</h2>
+            <p>
+                The expectation classes can be used not just for sending assertions
+                from mock objects, but also for selecting behaviour for the
+                <a href="mock_objects_documentation.html">mock objects</a>.
+                Anywhere a list of arguments is given, a list of expectation objects
+                can be inserted instead.
+            </p>
+            <p>
+                Suppose we want a mock authorisation server to simulate a successful login,
+                but only if it receives a valid session object.
+                We can do this as follows...
+<pre>
+Mock::generate('Authorisation');
+<strong>
+$authorisation = new MockAuthorisation();
+$authorisation-&gt;returns(
+        'isAllowed',
+        true,
+        array(new IsAExpectation('Session', 'Must be a session')));
+$authorisation-&gt;returns('isAllowed', false);</strong>
+</pre>
+                We have set the default mock behaviour to return false when
+                <span class="new_code">isAllowed</span> is called.
+                When we call the method with a single parameter that
+                is a <span class="new_code">Session</span> object, it will return true.
+                We have also added a second parameter as a message.
+                This will be displayed as part of the mock object
+                failure message if this expectation is the cause of
+                a failure.
+            </p>
+            <p>
+                This kind of sophistication is rarely useful, but is included for
+                completeness.
+            </p>
+        
+        <h2>
+<a class="target" name="extending"></a>Creating your own expectations</h2>
+            <p>
+                The expectation classes have a very simple structure.
+                So simple that it is easy to create your own versions for
+                commonly used test logic.
+            </p>
+            <p>
+                As an example here is the creation of a class to test for
+                valid IP addresses.
+                In order to work correctly with the stubs and mocks the new
+                expectation class should extend
+                <span class="new_code">SimpleExpectation</span> or further extend a subclass...
+<pre>
+<strong>class ValidIp extends SimpleExpectation {
+    
+    function test($ip) {
+        return (ip2long($ip) != -1);
+    }
+    
+    function testMessage($ip) {
+        return "Address [$ip] should be a valid IP address";
+    }
+}</strong>
+</pre>
+                There are only two methods to implement.
+                The <span class="new_code">test()</span> method should
+                evaluate to true if the expectation is to pass, and
+                false otherwise.
+                The <span class="new_code">testMessage()</span> method
+                should simply return some helpful text explaining the test
+                that was carried out.
+            </p>
+            <p>
+                This class can now be used in place of the earlier expectation
+                classes.
+            </p>
+            <p>
+                Here is a more typical example, matching part of a hash...
+<pre>
+<strong>class JustField extends EqualExpectation {
+    private $key;
+    
+    function __construct($key, $expected) {
+        parent::__construct($expected);
+        $this-&gt;key = $key;
+    }
+    
+    function test($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return false;
+        }
+        return parent::test($compare[$this-&gt;key]);
+    }
+    
+    function testMessage($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return 'Key [' . $this-&gt;key . '] does not exist';
+        }
+        return 'Key [' . $this-&gt;key . '] -&gt; ' .
+                parent::testMessage($compare[$this-&gt;key]);
+    }
+}</strong>
+</pre>
+                We tend to seperate message clauses with
+                "&amp;nbsp;-&gt;&amp;nbsp;".
+                This allows derivative tools to reformat the output.
+            </p>
+            <p>
+                Suppose some authenticator is expecting to be given
+                a database row corresponding to the user, and we
+                only need to confirm the username is correct.
+                We can assert just their username with...
+<pre>
+$mock-&gt;expectOnce('authenticate',
+                  array(new JustKey('username', 'marcus')));
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Under the bonnet of the unit tester</h2>
+            <p>
+                The <a href="http://sourceforge.net/projects/simpletest/">SimpleTest unit testing framework</a>
+                also uses the expectation classes internally for the
+                <a href="unit_test_documentation.html">UnitTestCase class</a>.
+                We can also take advantage of these mechanisms to reuse our
+                homebrew expectation classes within the test suites directly.
+            </p>
+            <p>
+                The most crude way of doing this is to use the generic
+                <span class="new_code">SimpleTest::assert()</span> method to
+                test against it directly...
+<pre>
+<strong>class TestOfNetworking extends UnitTestCase {
+    ...
+    function testGetValidIp() {
+        $server = &amp;new Server();
+        $this-&gt;assert(
+                new ValidIp(),
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');
+    }
+}</strong>
+</pre>
+                <span class="new_code">assert()</span> will test any expectation class directly.
+            </p>
+            <p>
+                This is a little untidy compared with our usual
+                <span class="new_code">assert...()</span> syntax.
+            </p>
+            <p>
+                For such a simple case we would normally create a
+                separate assertion method on our test case rather
+                than bother using the expectation class.
+                If we pretend that our expectation is a little more
+                complicated for a moment, so that we want to reuse it,
+                we get...
+<pre>
+class TestOfNetworking extends UnitTestCase {
+    ...<strong>
+    function assertValidIp($ip, $message = '%s') {
+        $this-&gt;assert(new ValidIp(), $ip, $message);
+    }</strong>
+    
+    function testGetValidIp() {
+        $server = &amp;new Server();<strong>
+        $this-&gt;assertValidIp(
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');</strong>
+    }
+}
+</pre>
+                It is rare to need the expectations for more than pattern
+                matching, but these facilities do allow testers to build
+                some sort of domain language for testing their application.
+                Also, complex expectation classes could make the tests
+                harder to read and debug.
+                In effect extending the test framework to create their own tool set.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The expectations mimic the constraints in <a href="http://www.jmock.org/">JMock</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <span class="chosen">Expectations</span>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/form_testing_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/form_testing_documentation.html
new file mode 100644
index 000000000..328735c9d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/form_testing_documentation.html
@@ -0,0 +1,351 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest documentation for testing HTML forms</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <span class="chosen">Testing forms</span>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Form testing documentation</h1>
+        This page...
+        <ul>
+<li>
+            Changing form values and successfully
+            <a href="#submit">Submitting a simple form</a>
+        </li>
+<li>
+            Handling <a href="#multiple">widgets with multiple values</a>
+            by setting lists.
+        </li>
+<li>
+            Bypassing javascript to <a href="#hidden-field">set a hidden field</a>.
+        </li>
+<li>
+            <a href="#raw">Raw posting</a> when you don't have a button
+            to click.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="submit"></a>Submitting a simple form</h2>
+            <p>
+                When a page is fetched by the <span class="new_code">WebTestCase</span>
+                using <span class="new_code">get()</span> or
+                <span class="new_code">post()</span> the page content is
+                automatically parsed.
+                This results in any form controls that are inside &lt;form&gt; tags
+                being available from within the test case.
+                For example, if we have this snippet of HTML...
+<pre>
+&lt;form&gt;
+    &lt;input type="text" name="a" value="A default" /&gt;
+    &lt;input type="submit" value="Go" /&gt;
+&lt;/form&gt;
+</pre>
+                Which looks like this...
+            </p>
+            <p>
+                <form class="demo">
+                    <input type="text" name="a" value="A default">
+                    <input type="submit" value="Go">
+                </form>
+            </p>
+            <p>
+                We can navigate to this code, via the
+                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>
+                site, with the following test...
+<pre>
+class SimpleFormTests extends WebTestCase {<strong>
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', 'A default');
+    }</strong>
+}
+</pre>
+                Immediately after loading the page all of the HTML controls are set at
+                their default values just as they would appear in the web browser.
+                The assertion tests that a HTML widget exists in the page with the
+                name "a" and that it is currently set to the value
+                "A default".
+                As usual, we could use a pattern expectation instead of a fixed
+                string.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', <strong>new PatternExpectation('/default/')</strong>);
+    }
+}
+</pre>
+                We could submit the form straight away, but first we'll change
+                the value of the text field and only then submit it...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testDefaultValue() {
+        $this-&gt;get('http://www.my-site.com/');
+        $this-&gt;assertField('a', 'A default');<strong>
+        $this-&gt;setField('a', 'New value');
+        $this-&gt;click('Go');</strong>
+    }
+}
+</pre>
+                Because we didn't specify a method attribute on the form tag, and
+                didn't specify an action either, the test case will follow
+                the usual browser behaviour of submitting the form data as a <em>GET</em>
+                request back to the same location.
+                In general SimpleTest tries to emulate typical browser behaviour as much as possible,
+                rather than attempting to catch any form of HTML omission.
+                This is because the target of the testing framework is the PHP application
+                logic, not syntax or other errors in the HTML code.
+                For HTML errors, other tools such as
+                <a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a> should be used,
+                or any of the HTML and CSS validators already out there.
+            </p>
+            <p>
+                If a field is not present in any form, or if an option is unavailable,
+                then <span class="new_code">WebTestCase::setField()</span> will return
+                <span class="new_code">false</span>.
+                For example, suppose we wish to verify that a "Superuser"
+                option is not present in this form...
+<pre>
+&lt;strong&gt;Select type of user to add:&lt;/strong&gt;
+&lt;select name="type"&gt;
+    &lt;option&gt;Subscriber&lt;/option&gt;
+    &lt;option&gt;Author&lt;/option&gt;
+    &lt;option&gt;Administrator&lt;/option&gt;
+&lt;/select&gt;
+</pre>
+                Which looks like...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Select type of user to add:</strong>
+                    <select name="type">
+                        <option>Subscriber</option>
+                        <option>Author</option>
+                        <option>Administrator</option>
+                    </select>
+                </form>
+            </p>
+            <p>
+                The following test will confirm it...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...
+    function testNoSuperuserChoiceAvailable() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
+    }
+}
+</pre>
+                The current selection will not be changed if the new value is not an option.
+            </p>
+            <p>
+                Here is the full list of widgets currently supported...
+                <ul>
+                    <li>Text fields, including hidden and password fields.</li>
+                    <li>Submit buttons including the button tag, although not yet reset buttons</li>
+                    <li>Text area. This includes text wrapping behaviour.</li>
+                    <li>Checkboxes, including multiple checkboxes in the same form.</li>
+                    <li>Drop down selections, including multiple selects.</li>
+                    <li>Radio buttons.</li>
+                    <li>Images.</li>
+                </ul>
+            </p>
+            <p>
+                The browser emulation offered by SimpleTest mimics
+                the actions which can be perform by a user on a
+                standard HTML page. Javascript is not supported, and
+                it's unlikely that support will be added any time
+                soon.
+            </p>
+            <p>
+                Of particular note is that the Javascript idiom of
+                passing form results by setting a hidden field cannot
+                be performed using the normal SimpleTest
+                commands. See below for a way to test such forms.
+            </p>
+        
+        <h2>
+<a class="target" name="multiple"></a>Fields with multiple values</h2>
+            <p>
+                SimpleTest can cope with two types of multivalue controls: Multiple
+                selection drop downs, and multiple checkboxes with the same name
+                within a form.
+                The multivalue nature of these means that setting and testing
+                are slightly different.
+                Using checkboxes as an example...
+<pre>
+&lt;form class="demo"&gt;
+    &lt;strong&gt;Create privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Retrieve privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Update privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Destroy privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
+    &lt;input type="submit" value="Enable Privileges"&gt;
+&lt;/form&gt;
+</pre>
+                Which renders as...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Create privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="c" checked><br>
+                    <strong>Retrieve privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="r" checked><br>
+                    <strong>Update privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="u" checked><br>
+                    <strong>Destroy privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="d" checked><br>
+                    <input type="submit" value="Enable Privileges">
+                </form>
+            </p>
+            <p>
+                If we wish to disable all but the retrieval privileges and
+                submit this information we can do it like this...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>
+    function testDisableNastyPrivileges() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
+        $this-&gt;setField('crud', array('r'));
+        $this-&gt;click('Enable Privileges');
+    }</strong>
+}
+</pre>
+                Instead of setting the field to a single value, we give it a list
+                of values.
+                We do the same when testing expected values.
+                We can then write other test code to confirm the effect of this, perhaps
+                by logging in as that user and attempting an update.
+            </p>
+        
+        <h2>
+<a class="target" name="hidden-field"></a>Forms which use javascript to set a hidden field</h2>
+            <p>
+                If you want to test a form which relies on javascript to set a hidden
+                field, you can't just call setField().
+                The following code will <em>not</em> work:
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testEmulateMyJavascriptForm() {
+        <strong>// This does *not* work</strong>
+        $this-&gt;setField('a_hidden_field', '123');
+        $this-&gt;clickSubmit('OK');
+    }
+}
+</pre>
+                Instead, you need to pass the additional form parameters to the
+                clickSubmit() method:
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testMyJavascriptForm() {
+        <strong>$this-&gt;clickSubmit('OK', array('a_hidden_field'=&gt;'123'));</strong>
+    }
+
+}
+</pre>
+                Bear in mind that in doing this you're effectively stubbing out a
+                part of your software (the javascript code in the form), and
+                perhaps you might be better off using something like 
+                <a href="http://selenium.openqa.org/">Selenium</a> to ensure a complete
+                test.
+            </p>
+        
+        <h2>
+<a class="target" name="raw"></a>Raw posting</h2>
+            <p>
+                If you want to test a form handler, but have not yet written
+                or do not have access to the form itself, you can create a
+                form submission by hand.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>    
+    function testAttemptedHack() {
+        $this-&gt;post(
+                'http://www.my-site.com/add_user.php',
+                array('type' =&gt; 'superuser'));
+        $this-&gt;assertNoText('user created');
+    }</strong>
+}
+</pre>
+                By adding data to the <span class="new_code">WebTestCase::post()</span>
+                method, we are emulating a form submission.
+                You would normally only do this as a temporary expedient, or where
+                you are expecting a 3rd party to submit to a form.
+                The exception is when you want tests to protect you from
+                attempts to spoof your pages.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <span class="chosen">Testing forms</span>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/group_test_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/group_test_documentation.html
new file mode 100644
index 000000000..10f22a2b1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/group_test_documentation.html
@@ -0,0 +1,252 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP test suites</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <span class="chosen">Group tests</span>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Test suite documentation</h1>
+        This page...
+        <ul>
+<li>
+            Different ways to <a href="#group">group tests</a> together.
+        </li>
+<li>
+            Combining group tests into <a href="#higher">larger groups</a>.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="group"></a>Grouping tests into suites</h2>
+            <p>
+                There are many ways to group tests together into test suites.
+                One way is to simply place multiple test cases into a single file...
+<pre>
+<strong>&lt;?php
+require_once(dirname(__FILE__) . '/simpletest/autorun.php');
+require_once(dirname(__FILE__) . '/../classes/io.php');
+
+class FileTester extends UnitTestCase {
+    ...
+}
+
+class SocketTester extends UnitTestCase {
+    ...
+}
+?&gt;</strong>
+</pre>
+                As many cases as needed can appear in a single file.
+                They should include any code they need, such as the library
+                being tested, but need none of the SimpleTest libraries.
+            </p>
+            <p>
+                Occasionally special subclasses are created that methods useful
+                for testing part of the application.
+                These new base classes are then used in place of <span class="new_code">UnitTestCase</span>
+                or <span class="new_code">WebTestCase</span>.
+                You don't normally want to run these as test cases.
+                Simply mark any base test cases that should not be run as abstract...
+<pre>
+<strong>abstract</strong> class MyFileTestCase extends UnitTestCase {
+    ...
+}
+
+class FileTester extends MyFileTestCase { ... }
+
+class SocketTester extends UnitTestCase { ... }
+</pre>
+                Here the <span class="new_code">FileTester</span> class does
+                not contain any actual tests, but is the base class for other
+                test cases.
+            </p>
+            <p>
+                We will call this sample <em>file_test.php</em>.
+                Currently the test cases are grouped simply by being in the same file.
+                We can build larger constructs just by including other test files in.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('file_test.php');
+?&gt;
+</pre>
+                This will work, but create a purely flat hierarchy.
+                INstead we create a test suite file.
+                Our top level test suite can look like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        <strong>$this-&gt;addFile('file_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                What happens here is that the <span class="new_code">TestSuite</span>
+                class will do the <span class="new_code">require_once()</span>
+                for us.
+                It then checks to see if any new test case classes
+                have been created by the new file and automatically composes
+                them to the test suite.
+                This method gives us the most control as we just manually add
+                more test files as our test suite grows.
+            </p>
+            <p>
+                If this is too much typing, and you are willing to group
+                test suites together in their own directories or otherwise
+                tag the file names, then there is a more automatic way...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class AllFileTests extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;collect(dirname(__FILE__) . '/unit',
+                       new SimplePatternCollector('/_test.php/'));
+    }
+}
+?&gt;
+</pre>
+                This will scan a directory called "unit" for any files
+                ending with "_test.php" and load them.
+                You don't have to use <span class="new_code">SimplePatternCollector</span> to
+                filter by a pattern in the filename, but this is the most common
+                usage.
+            </p>
+            <p>
+                That snippet above is very common in practice.
+                Now all you have to do is drop a file of test cases into the
+                directory and it will run just by running the test suite script.
+            </p>
+            <p>
+                The catch is that you cannot control the order in which the test
+                cases are run.
+                If you want to see lower level components fail first in the test suite,
+                and this will make diagnosis a lot easier, then you should manually
+                call <span class="new_code">addFile()</span> for these.
+                Tests cases are only loaded once, so it's fine to have these included
+                again by a directory scan.
+            </p>
+            <p>
+                Test cases loaded with the <span class="new_code">addFile</span> method have some
+                useful properties.
+                You can guarantee that the constructor is run
+                just before the first test method and the destructor
+                is run just after the last test method.
+                This allows you to place test case wide set up and tear down
+                code in the constructor and destructor, just like a normal
+                class.
+            </p>
+        
+        <h2>
+<a class="target" name="higher"></a>Composite suites</h2>
+            <p>
+                The above method places all of the test cases into one large suite.
+                For larger projects though this may not be flexible enough; you
+                may want to group the tests together in all sorts of ways.
+            </p>
+            <p>
+                Everything we have described so far with test scripts applies to
+                <span class="new_code">TestSuite</span>s as well...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+    }
+}</strong>
+?&gt;
+</pre>
+                This effectively adds our test cases and a single suite below
+                the first.
+                When a test fails, we see the breadcrumb trail of the nesting.
+                We can even mix groups and test cases freely as long as
+                we are careful about loops in our includes.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class BigTestSuite extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('file_tests.php');
+        <strong>$this-&gt;addFile('some_other_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                Note that in the event of a double include, ony the first instance
+                of the test case will be run.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <span class="chosen">Group tests</span>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/index.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/index.html
new file mode 100644
index 000000000..9f022d6b1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/index.html
@@ -0,0 +1,542 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Download the SimpleTest testing framework -
+        Unit tests and mock objects for PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<span class="chosen">SimpleTest</span>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>SimpleTest for PHP</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Using unit tester</a>
+            with an example.
+        </li>
+<li>
+            <a href="#group">Grouping tests</a>
+            for testing with one click.
+        </li>
+<li>
+            <a href="#mock">Using mock objects</a>
+            to ease testing and gain tighter control.
+        </li>
+<li>
+            <a href="#web">Testing web pages</a>
+            at the browser level.
+        </li>
+</ul>
+<div class="content">
+        
+        
+            <p>
+                The following assumes that you are familiar with the concept
+                of unit testing as well as the PHP web development language.
+                It is a guide for the impatient new user of
+                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
+                For fuller documentation, especially if you are new
+                to unit testing see the ongoing
+                <a href="unit_test_documentation.html">documentation</a>, and for
+                example test cases see the
+                <a href="http://www.lastcraft.com/first_test_tutorial.php">unit testing tutorial</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Using the tester quickly</h2>
+            <p>
+                Amongst software testing tools, a unit tester is the one
+                closest to the developer.
+                In the context of agile development the test code sits right
+                next to the source code as both are written simultaneously.
+                In this context SimpleTest aims to be a complete PHP developer
+                test solution and is called "Simple" because it
+                should be easy to use and extend.
+                It wasn't a good choice of name really.
+                It includes all of the typical functions you would expect from
+                <a href="http://www.junit.org/">JUnit</a> and the
+                <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>
+                ports, and includes
+                <a href="http://www.mockobjects.com">mock objects</a>.
+            </p>
+            <p>
+                What makes this tool immediately useful to the PHP developer is the internal
+                web browser.
+                This allows tests that navigate web sites, fill in forms and test pages.
+                Being able to write these test in PHP means that it is easy to write
+                integrated tests.
+                An example might be confirming that a user was written to a database
+                after a signing up through the web site.
+            </p>
+            <p>
+                The quickest way to demonstrate SimpleTest is with an example.
+            </p>
+            <p>
+                Let us suppose we are testing a simple file logging class called
+                <span class="new_code">Log</span> in <em>classes/log.php</em>.
+                We start by creating a test script which we will call
+                <em>tests/log_test.php</em> and populate it as follows...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+require_once('../classes/log.php');
+
+class TestOfLogging extends <strong>UnitTestCase</strong> {
+}
+?&gt;
+</pre>
+                Here the <em>simpletest</em> folder is either local or in the path.
+                You would have to edit these locations depending on where you
+                unpacked the toolset.
+                The "autorun.php" file does more than just include the
+                SimpleTest files, it also runs our test for us.
+            </p>
+            <p>
+                The <span class="new_code">TestOfLogging</span> is our first test case and it's
+                currently empty.
+                Each test case is a class that extends one of the SimpleTet base classes
+                and we can have as many of these in the file as we want.
+            </p>
+            <p>
+                With three lines of scaffolding, and our <span class="new_code">Log</span> class
+                include, we have a test suite.
+                No tests though.
+            </p>
+            <p>
+                For our first test, we'll assume that the <span class="new_code">Log</span> class
+                takes the file name to write to in the constructor, and we have
+                a temporary folder in which to place this file...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+
+class TestOfLogging extends UnitTestCase {
+    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
+        @unlink('/temp/test.log');
+        $log = new Log('/temp/test.log');
+        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
+        $log-&gt;message('Should write this to a file');
+        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
+    }
+}
+?&gt;
+</pre>
+                When a test case runs, it will search for any method that
+                starts with the string "test"
+                and execute that method.
+                If the method starts "test", it's a test.
+                Note the very long name <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
+                This is considered good style and makes the test output more readable.
+            </p>
+            <p>
+                We would normally have more than one test method in a test case,
+                but that's for later.
+            </p>
+            <p>
+                Assertions within the test methods trigger messages to the
+                test framework which displays the result immediately.
+                This immediate response is important, not just in the event
+                of the code causing a crash, but also so that
+                <span class="new_code">print</span> statements can display
+                their debugging content right next to the assertion concerned.
+            </p>
+            <p>
+                To see these results we have to actually run the tests.
+                No other code is necessary - we can just open the page
+                with our browser.
+            </p>
+            <p>
+                On failure the display looks like this...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <span class="fail">Fail</span>: testLogCreatesNewFileOnFirstMessage-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
+                </div>
+                ...and if it passes like this...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
+                </div>
+                And if you get this...
+                <div class="demo">
+                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
+                </div>
+                it means you're missing the <em>classes/Log.php</em> file that could look like...
+<pre>
+&lt;?php<strong>
+class Log {
+    function Log($file_path) {
+    }
+
+    function message() {
+    }
+}</strong>
+?&gt;
+</pre>
+                It's fun to write the code after the test.
+                More than fun even -
+                this system is called "Test Driven Development".
+            </p>
+            <p>
+                For more information about <span class="new_code">UnitTestCase</span>, see
+                the <a href="unit_test_documentation.html">unit test documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="group"></a>Building test suites</h2>
+            <p>
+                It is unlikely in a real application that we will only ever run
+                one test case.
+                This means that we need a way of grouping cases into a test
+                script that can, if need be, run every test for the application.
+            </p>
+            <p>
+                Our first step is to create a new file called <em>tests/all_tests.php</em>
+                and insert the following code...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+
+class AllTests extends <strong>TestSuite</strong> {
+    function AllTests() {
+        $this-&gt;TestSuite(<strong>'All tests'</strong>);
+        <strong>$this-&gt;addFile('log_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                The "autorun" include allows our upcoming test suite
+                to be run just by invoking this script.
+            </p>
+            <p>
+                The <span class="new_code">TestSuite</span> subclass must chain it's constructor.
+                This limitation will be removed in future versions.
+            </p>
+            <p>
+                The method <span class="new_code">TestSuite::addFile()</span>
+                will include the test case file and read any new classes
+                that are descended from <span class="new_code">SimpleTestCase</span>.
+                <span class="new_code">UnitTestCase</span> is just one example of a class derived from
+                <span class="new_code">SimpleTestCase</span>, and you can create your own.
+                <span class="new_code">TestSuite::addFile()</span> can include other test suites.
+            </p>
+            <p>
+                The class will not be instantiated yet.
+                When the test suite runs it will construct each instance once
+                it reaches that test, then destroy it straight after.
+                This means that the constructor is run just before each run
+                of that test case, and the destructor is run before the next test case starts.
+            </p>
+            <p>
+                It is common to group test case code into superclasses which are not
+                supposed to run, but become the base classes of other tests.
+                For "autorun" to work properly the test case file should not blindly run
+                any other test case extensions that do not actually run tests.
+                This could result in extra test cases being counted during the test
+                run.
+                Hardly a major problem, but to avoid this inconvenience simply mark your
+                base class as <span class="new_code">abstract</span>.
+                SimpleTest won't run abstract classes.
+                If you are still using PHP4, then
+                a <span class="new_code">SimpleTestOptions::ignore()</span> directive
+                somewhere in the test case file will have the same effect.
+            </p>
+            <p>
+                Also, the test case file should not have been included
+                elsewhere or no cases will be added to this group test.
+                This would be a more serious error as if the test case classes are
+                already loaded by PHP the <span class="new_code">TestSuite::addFile()</span>
+                method will not detect them.
+            </p>
+            <p>
+                To display the results it is necessary only to invoke
+                <em>tests/all_tests.php</em> from the web server or the command line.
+            </p>
+            <p>
+                For more information about building test suites,
+                see the <a href="group_test_documentation.html">test suite documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="mock"></a>Using mock objects</h2>
+            <p>
+                Let's move further into the future and do something really complicated.
+            </p>
+            <p>
+                Assume that our logging class is tested and completed.
+                Assume also that we are testing another class that is
+                required to write log messages, say a
+                <span class="new_code">SessionPool</span>.
+                We want to test a method that will probably end up looking
+                like this...
+<pre><strong>
+class SessionPool {
+    ...
+    function logIn($username) {
+        ...
+        $this-&gt;_log-&gt;message("User $username logged in.");
+        ...
+    }
+    ...
+}
+</strong>
+</pre>
+                In the spirit of reuse, we are using our
+                <span class="new_code">Log</span> class.
+                A conventional test case might look like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+<strong>require_once('../classes/session_pool.php');</strong>
+
+class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
+    
+    function setUp() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function tearDown() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function testLoggingInIsLogged() {
+        <strong>$log = new Log('/temp/test.log');
+        $session_pool = &amp;new SessionPool($log);
+        $session_pool-&gt;logIn('fred');</strong>
+        $messages = file('/temp/test.log');
+        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
+    }
+}
+?&gt;
+</pre>
+                We'll explain the <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
+                methods later.
+            </p>
+            <p>
+                This test case design is not all bad, but it could be improved.
+                We are spending time fiddling with log files which are
+                not part of our test.
+                We have created close ties with the <span class="new_code">Log</span> class and
+                this test.
+                What if we don't use files any more, but use ths
+                <em>syslog</em> library instead?
+                It means that our <span class="new_code">TestOfSessionLogging</span> test will
+                fail, even thouh it's not testing Logging.
+            </p>
+            <p>
+                It's fragile in smaller ways too.
+                Did you notice the extra carriage return in the message?
+                Was that added by the logger?
+                What if it also added a time stamp or other data?
+            </p>
+            <p>
+                The only part that we really want to test is that a particular
+                message was sent to the logger.
+                We can reduce coupling if we pass in a fake logging class
+                that simply records the message calls for testing, but
+                takes no action.
+                It would have to look exactly like our original though.
+            </p>
+            <p>
+                If the fake object doesn't write to a file then we save on deleting
+                the file before and after each test. We could save even more
+                test code if the fake object would kindly run the assertion for us.
+            <p>
+            </p>
+                Too good to be true?
+                We can create such an object easily...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+require_once('../classes/session_pool.php');
+
+<strong>Mock::generate('Log');</strong>
+
+class TestOfSessionLogging extends UnitTestCase {
+    
+    function testLoggingInIsLogged() {<strong>
+        $log = &amp;new MockLog();
+        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
+        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
+        $session_pool-&gt;logIn('fred');
+    }
+}
+?&gt;
+</pre>
+                The <span class="new_code">Mock::generate()</span> call code generated a new class
+                called <span class="new_code">MockLog</span>.
+                This looks like an identical clone, except that we can wire test code
+                to it.
+                That's what <span class="new_code">expectOnce()</span> does.
+                It says that if <span class="new_code">message()</span> is ever called on me, it had
+                better be with the parameter "User fred logged in.".
+            </p>
+            <p>
+                The test will be triggered when the call to
+                <span class="new_code">message()</span> is invoked on the
+                <span class="new_code">MockLog</span> object by <span class="new_code">SessionPool::logIn()</span> code.
+                The mock call will trigger a parameter comparison and then send the
+                resulting pass or fail event to the test display.
+                Wildcards can be included here too, so you don't have to test every parameter of
+                a call when you only want to test one.
+            </p>
+            <p>
+                If the mock reaches the end of the test case without the
+                method being called, the <span class="new_code">expectOnce()</span>
+                expectation will trigger a test failure.
+                In other words the mocks can detect the absence of
+                behaviour as well as the presence.
+            </p>
+            <p>
+                The mock objects in the SimpleTest suite can have arbitrary
+                return values set, sequences of returns, return values
+                selected according to the incoming arguments, sequences of
+                parameter expectations and limits on the number of times
+                a method is to be invoked.
+            </p>
+            <p>
+                For more information about mocking and stubbing, see the
+                <a href="mock_objects_documentation.html">mock objects documentation</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="web"></a>Web page testing</h2>
+            <p>
+                One of the requirements of web sites is that they produce web
+                pages.
+                If you are building a project top-down and you want to fully
+                integrate testing along the way then you will want a way of
+                automatically navigating a site and examining output for
+                correctness.
+                This is the job of a web tester.
+            </p>
+            <p>
+                The web testing in SimpleTest is fairly primitive, as there is
+                no JavaScript.
+                Most other browser operations are simulated.
+            </p>
+            <p>
+                To give an idea here is a trivial example where a home
+                page is fetched, from which we navigate to an "about"
+                page and then test some client determined content.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>require_once('simpletest/web_tester.php');</strong>
+
+class TestOfAbout extends <strong>WebTestCase</strong> {
+    function testOurAboutPageGivesFreeReignToOurEgo() {
+        <strong>$this-&gt;get('http://test-server/index.php');
+        $this-&gt;click('About');
+        $this-&gt;assertTitle('About why we are so great');
+        $this-&gt;assertText('We are really great');</strong>
+    }
+}
+?&gt;
+</pre>
+                With this code as an acceptance test, you can ensure that
+                the content always meets the specifications of both the
+                developers, and the other project stakeholders.
+            </p>
+            <p>
+                You can navigate forms too...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class TestOfRankings extends WebTestCase {
+    function testWeAreTopOfGoogle() {
+        $this-&gt;get('http://google.com/');
+        $this-&gt;setField('q', 'simpletest');
+        $this-&gt;click("I'm Feeling Lucky");
+        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
+    }
+}
+?&gt;
+</pre>
+                ...although this could violate Google's(tm) terms and conditions.
+            </p>
+            <p>
+                For more information about web testing, see the
+                <a href="browser_documentation.html">scriptable
+                browser documentation</a> and the
+                <a href="web_tester_documentation.html">WebTestCase</a>.
+            </p>
+            <p>
+                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Download PHP SimpleTest</a>
+            from <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<span class="chosen">SimpleTest</span>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html
new file mode 100644
index 000000000..b4697f9ee
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/mock_objects_documentation.html
@@ -0,0 +1,870 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP mock objects documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <span class="chosen">Mock objects</span>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Mock objects documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#what">What are mock objects?</a>
+        </li>
+<li>
+            <a href="#creation">Creating mock objects</a>.
+        </li>
+<li>
+            <a href="#expectations">Mocks as critics</a> with expectations.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="what"></a>What are mock objects?</h2>
+            <p>
+                Mock objects have two roles during a test case: actor and critic.
+            </p>
+            <p>
+                The actor behaviour is to simulate objects that are difficult to
+                set up or time consuming to set up for a test.
+                The classic example is a database connection.
+                Setting up a test database at the start of each test would slow
+                testing to a crawl and would require the installation of the
+                database engine and test data on the test machine.
+                If we can simulate the connection and return data of our
+                choosing we not only win on the pragmatics of testing, but can
+                also feed our code spurious data to see how it responds.
+                We can simulate databases being down or other extremes
+                without having to create a broken database for real.
+                In other words, we get greater control of the test environment.
+            </p>
+            <p>
+                If mock objects only behaved as actors they would simply be
+                known as "server stubs".
+                This was originally a pattern named by Robert Binder (<a href="">Testing
+                object-oriented systems</a>: models, patterns, and tools,
+                Addison-Wesley) in 1999.
+            </p>
+            <p>
+                A server stub is a simulation of an object or component.
+                It should exactly replace a component in a system for test
+                or prototyping purposes, but remain lightweight.
+                This allows tests to run more quickly, or if the simulated
+                class has not been written, to run at all.
+            </p>
+            <p>
+                However, the mock objects not only play a part (by supplying chosen
+                return values on demand) they are also sensitive to the
+                messages sent to them (via expectations).
+                By setting expected parameters for a method call they act
+                as a guard that the calls upon them are made correctly.
+                If expectations are not met they save us the effort of
+                writing a failed test assertion by performing that duty on our
+                behalf.
+            </p>
+            <p>
+                In the case of an imaginary database connection they can
+                test that the query, say SQL, was correctly formed by
+                the object that is using the connection.
+                Set them up with fairly tight expectations and you will
+                hardly need manual assertions at all.
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Creating mock objects</h2>
+            <p>
+                All we need is an existing class or interface, say a database connection
+                that looks like this...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query($sql) { }
+    function selectQuery($sql) { }
+}</strong>
+</pre>
+                To create a mock version of the class we need to run a
+                code generator...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+<strong>Mock::generate('DatabaseConnection');</strong>
+</pre>
+                This code generates a clone class called
+                <span class="new_code">MockDatabaseConnection</span>.
+                This new class appears to be the same, but actually has no behaviour at all.
+            </p>
+            <p>
+                The new class is usually a subclass of <span class="new_code">DatabaseConnection</span>.
+                Unfortunately, there is no way to create a mock version of a
+                class with a <span class="new_code">final</span> method without having a living version of
+                that method.
+                We consider that unsafe.
+                If the target is an interface, or if <span class="new_code">final</span> methods are
+                present in a target class, then a whole new class
+                is created, but one implemeting the same interfaces.
+                If you try to pass this separate class through a type hint that specifies
+                the old concrete class name, it will fail.
+                Code like that insists on type hinting to a class with <span class="new_code">final</span>
+                methods probably cannot be safely tested with mocks.
+            </p>
+            <p>
+                If you want to see the generated code, then simply <span class="new_code">print</span>
+                the output of <span class="new_code">Mock::generate()</span>.
+                Here is the generated code for the <span class="new_code">DatabaseConnection</span>
+                class rather than the interface version...
+<pre>
+class MockDatabaseConnection extends DatabaseConnection {
+    public $mock;
+    protected $mocked_methods = array('databaseconnection', 'query', 'selectquery');
+
+    function MockDatabaseConnection() {
+        $this-&gt;mock = new SimpleMock();
+        $this-&gt;mock-&gt;disableExpectationNameChecks();
+    }
+    ...
+    function DatabaseConnection() {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("DatabaseConnection", $args);
+        return $result;
+    }
+    function query($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("query", $args);
+        return $result;
+    }
+    function selectQuery($sql) {
+        $args = func_get_args();
+        $result = &amp;$this-&gt;mock-&gt;invoke("selectQuery", $args);
+        return $result;
+    }
+}
+</pre>
+                Your output may vary depending on the exact version
+                of SimpleTest you are using.
+            </p>
+            <p>
+                Besides the original methods of the class, you will see some extra
+                methods that help testing.
+                More on these later.
+            </p>
+            <p>
+                We can now create instances of the new class within
+                our test case...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('database_connection.php');
+
+Mock::generate('DatabaseConnection');
+
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        <strong>$connection = new MockDatabaseConnection();</strong>
+    }
+}
+</pre>
+                The mock version now has all the methods of the original.
+                Also, any type hints will be faithfully preserved.
+                Say our query methods expect a <span class="new_code">Query</span> object...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() { }
+    function query(Query $query) { }
+    function selectQuery(Query $query) { }
+}</strong>
+</pre>
+                If we now pass the wrong type of object, or worse a non-object...
+<pre>
+class MyTestCase extends UnitTestCase {
+
+    function testSomething() {
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;query('insert into accounts () values ()');
+    }
+}
+</pre>
+                ...the code will throw a type violation at you just as the
+                original class would.
+            </p>
+            <p>
+                The mock version now has all the methods of the original.
+                Unfortunately, they all return <span class="new_code">null</span>.
+                As methods that always return <span class="new_code">null</span> are not that useful,
+                we need to be able to set them to something else...
+            </p>
+            <p>
+                <a class="target" name="stub"><h2>Mocks as actors</h2></a>
+            </p>
+            <p>
+                Changing the return value of a method from <span class="new_code">null</span>
+                to something else is pretty easy...
+<pre>
+<strong>$connection-&gt;returns('query', 37)</strong>
+</pre>
+                Now every time we call
+                <span class="new_code">$connection-&gt;query()</span> we get
+                the result of 37.
+                There is nothing special about 37.
+                The return value can be arbitrarily complicated.
+            </p>
+            <p>
+                Parameters are irrelevant here, we always get the same
+                values back each time once they have been set up this way.
+                That may not sound like a convincing replica of a
+                database connection, but for the half a dozen lines of
+                a test method it is usually all you need.
+            </p>
+            <p>
+                Things aren't always that simple though.
+                One common problem is iterators, where constantly returning
+                the same value could cause an endless loop in the object
+                being tested.
+                For these we need to set up sequences of values.
+                Let's say we have a simple iterator that looks like this...
+<pre>
+class Iterator {
+    function Iterator() { }
+    function next() { }
+}
+</pre>
+                This is about the simplest iterator you could have.
+                Assuming that this iterator only returns text until it
+                reaches the end, when it returns false, we can simulate it
+                with...
+<pre>
+Mock::generate('Iterator');
+
+class IteratorTest extends UnitTestCase() {
+
+    function testASequence() {<strong>
+        $iterator = new MockIterator();
+        $iterator-&gt;returns('next', false);
+        $iterator-&gt;returnsAt(0, 'next', 'First string');
+        $iterator-&gt;returnsAt(1, 'next', 'Second string');</strong>
+        ...
+    }
+}
+</pre>
+                When <span class="new_code">next()</span> is called on the
+                <span class="new_code">MockIterator</span> it will first return "First string",
+                on the second call "Second string" will be returned
+                and on any other call <span class="new_code">false</span> will
+                be returned.
+                The sequenced return values take precedence over the constant
+                return value.
+                The constant one is a kind of default if you like.
+            </p>
+            <p>
+                Another tricky situation is an overloaded
+                <span class="new_code">get()</span> operation.
+                An example of this is an information holder with name/value pairs.
+                Say we have a configuration class like...
+<pre>
+class Configuration {
+    function Configuration() { ... }
+    function get($key) { ... }
+}
+</pre>
+                This is a likely situation for using mock objects, as
+                actual configuration will vary from machine to machine and
+                even from test to test.
+                The problem though is that all the data comes through the
+                <span class="new_code">get()</span> method and yet
+                we want different results for different keys.
+                Luckily the mocks have a filter system...
+<pre>
+<strong>$config = &amp;new MockConfiguration();
+$config-&gt;returns('get', 'primary', array('db_host'));
+$config-&gt;returns('get', 'admin', array('db_user'));
+$config-&gt;returns('get', 'secret', array('db_password'));</strong>
+</pre>
+                The extra parameter is a list of arguments to attempt
+                to match.
+                In this case we are trying to match only one argument which
+                is the look up key.
+                Now when the mock object has the
+                <span class="new_code">get()</span> method invoked
+                like this...
+<pre>
+$config-&gt;get('db_user')
+</pre>
+                ...it will return "admin".
+                It finds this by attempting to match the calling arguments
+                to its list of returns one after another until
+                a complete match is found.
+            </p>
+            <p>
+                You can set a default argument argument like so...
+<pre><strong>
+$config-&gt;returns('get', false, array('*'));</strong>
+</pre>
+                This is not the same as setting the return value without
+                any argument requirements like this...
+<pre><strong>
+$config-&gt;returns('get', false);</strong>
+</pre>
+                In the first case it will accept any single argument,
+                but exactly one is required.
+                In the second case any number of arguments will do and
+                it acts as a catchall after all other matches.
+                Note that if we add further single parameter options after
+                the wildcard in the first case, they will be ignored as the wildcard
+                will match first.
+                With complex parameter lists the ordering could be important
+                or else desired matches could be masked by earlier wildcard
+                ones.
+                Declare the most specific matches first if you are not sure.
+            </p>
+            <p>
+                There are times when you want a specific reference to be
+                dished out by the mock rather than a copy or object handle.
+                This a rarity to say the least, but you might be simulating
+                a container that can hold primitives such as strings.
+                For example...
+<pre>
+class Pad {
+    function Pad() { }
+    function &amp;note($index) { }
+}
+</pre>
+                In this case you can set a reference into the mock's
+                return list...
+<pre>
+function testTaskReads() {
+    $note = 'Buy books';
+    $pad = new MockPad();
+    $vector-&gt;<strong>returnsByReference(</strong>'note', $note, array(3)<strong>)</strong>;
+    $task = new Task($pad);
+    ...
+}
+</pre>
+                With this arrangement you know that every time
+                <span class="new_code">$pad-&gt;note(3)</span> is
+                called it will return the same <span class="new_code">$note</span> each time,
+                even if it get's modified.
+            </p>
+            <p>
+                These three factors, timing, parameters and whether to copy,
+                can be combined orthogonally.
+                For example...
+<pre>
+$buy_books = 'Buy books';
+$write_code = 'Write code';
+$pad = new MockPad();
+$vector-&gt;<strong>returnsByReferenceAt(0, 'note', $buy_books, array('*', 3));</strong>
+$vector-&gt;<strong>returnsByReferenceAt(1, 'note', $write_code, array('*', 3));</strong>
+</pre>
+                This will return a reference to <span class="new_code">$buy_books</span> and
+                then to <span class="new_code">$write_code</span>, but only if two parameters
+                were set the second of which must be the integer 3.
+                That should cover most situations.
+            </p>
+            <p>
+                A final tricky case is one object creating another, known
+                as a factory pattern.
+                Suppose that on a successful query to our imaginary
+                database, a result set is returned as an iterator, with
+                each call to the the iterator's <span class="new_code">next()</span> giving
+                one row until false.
+                This sounds like a simulation nightmare, but in fact it can all
+                be mocked using the mechanics above...
+<pre>
+Mock::generate('DatabaseConnection');
+Mock::generate('ResultIterator');
+
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinderReadsResultsFromDatabase() {<strong>
+        $result = new MockResultIterator();
+        $result-&gt;returns('next', false);
+        $result-&gt;returnsAt(0, 'next', array(1, 'tom'));
+        $result-&gt;returnsAt(1, 'next', array(3, 'dick'));
+        $result-&gt;returnsAt(2, 'next', array(6, 'harry'));
+
+        $connection = new MockDatabaseConnection();
+        $connection-&gt;returns('selectQuery', $result);</strong>
+
+        $finder = new UserFinder(<strong>$connection</strong>);
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                Now only if our
+                <span class="new_code">$connection</span> is called with the
+                <span class="new_code">query()</span> method will the
+                <span class="new_code">$result</span> be returned that is
+                itself exhausted after the third call to <span class="new_code">next()</span>.
+                This should be enough
+                information for our <span class="new_code">UserFinder</span> class,
+                the class actually
+                being tested here, to come up with goods.
+                A very precise test and not a real database in sight.
+            </p>
+            <p>
+                We could refine this test further by insisting that the correct
+                query is sent...
+<pre>
+$connection-&gt;returns('selectQuery', $result, array(<strong>'select name, id from people'</strong>));
+</pre>
+                This is actually a bad idea.
+            </p>
+            <p>
+                We have a <span class="new_code">UserFinder</span> in object land, talking to
+                database tables using a large interface - the whole of SQL.
+                Imagine that we have written a lot of tests that now depend
+                on the exact SQL string passed.
+                These queries could change en masse for all sorts of reasons
+                not related to the specific test.
+                For example the quoting rules could change, a table name could
+                change, a link table added or whatever.
+                This would require the rewriting of every single test any time
+                one of these refactoring is made, yet the intended behaviour has
+                stayed the same.
+                Tests are supposed to help refactoring, not hinder it.
+                I'd certainly like to have a test suite that passes while I change
+                table names.
+            </p>
+            <p>
+                As a rule it is best not to mock a fat interface.
+            </p>
+            <p>
+                By contrast, here is the round trip test...
+<pre>
+class DatabaseTest extends UnitTestCase {<strong>
+    function setUp() { ... }
+    function tearDown() { ... }</strong>
+
+    function testUserFinderReadsResultsFromDatabase() {
+        $finder = new UserFinder(<strong>new DatabaseConnection()</strong>);
+        $finder-&gt;add('tom');
+        $finder-&gt;add('dick');
+        $finder-&gt;add('harry');
+        $this-&gt;assertIdentical(
+                $finder-&gt;findNames(),
+                array('tom', 'dick', 'harry'));
+    }
+}
+</pre>
+                This test is immune to schema changes.
+                It will only fail if you actually break the functionality, which
+                is what you want a test to do.
+            </p>
+            <p>
+                The catch is those <span class="new_code">setUp()</span> and <span class="new_code">tearDown()</span>
+                methods that we've rather glossed over.
+                They have to clear out the database tables and ensure that the
+                schema is defined correctly.
+                That can be a chunk of extra work, but you usually have this code
+                lying around anyway for deployment purposes.
+            </p>
+            <p>
+                One place where you definitely need a mock is simulating failures.
+                Say the database goes down while <span class="new_code">UserFinder</span> is doing
+                it's work.
+                Does <span class="new_code">UserFinder</span> behave well...?
+<pre>
+class DatabaseTest extends UnitTestCase {
+
+    function testUserFinder() {
+        $connection = new MockDatabaseConnection();<strong>
+        $connection-&gt;throwOn('selectQuery', new TimedOut('Ouch!'));</strong>
+        $alert = new MockAlerts();<strong>
+        $alert-&gt;expectOnce('notify', 'Database is busy - please retry');</strong>
+        $finder = new UserFinder($connection, $alert);
+        $this-&gt;assertIdentical($finder-&gt;findNames(), array());
+    }
+}
+</pre>
+                We've passed the <span class="new_code">UserFinder</span> an <span class="new_code">$alert</span>
+                object.
+                This is going to do some kind of pretty notifications in the
+                user interface in the event of an error.
+                We'd rather not sprinkle our code with hard wired <span class="new_code">print</span>
+                statements if we can avoid it.
+                Wrapping the means of output means we can use this code anywhere.
+                It also makes testing easier.
+            </p>
+            <p>
+                To pass this test, the finder has to write a nice user friendly
+                message to <span class="new_code">$alert</span>, rather than propogating the exception.
+                So far, so good.
+            </p>
+            <p>
+                How do we get the mock <span class="new_code">DatabaseConnection</span> to throw an exception?
+                We generate the exception using the <span class="new_code">throwOn</span> method
+                on the mock.
+            </p>
+            <p>
+                Finally, what if the method you want to simulate does not exist yet?
+                If you set a return value on a method that is not there, SimpleTest
+                will throw an error.
+                What if you are using <span class="new_code">__call()</span> to simulate dynamic methods?
+            </p>
+            <p>
+                Objects with dynamic interfaces, using <span class="new_code">__call</span>, can
+                be problematic with the current mock objects implementation.
+                You can mock the <span class="new_code">__call()</span> method, but this is ugly.
+                Why should a test know anything about such low level implementation details?
+                It just wants to simulate the call.
+            </p>
+            <p>
+                The way round this is to add extra methods to the mock when
+                generating it.
+<pre>
+<strong>Mock::generate('DatabaseConnection', 'MockDatabaseConnection', array('setOptions'));</strong>
+</pre>
+                In a large test suite this could cause trouble, as you probably
+                already have a mock version of the class called
+                <span class="new_code">MockDatabaseConnection</span> without the extra methods.
+                The code generator will not generate a mock version of the class if
+                one of the same name already exists.
+                You will confusingly fail to see your method if another definition
+                was run first.
+            </p>
+            <p>
+                To cope with this, SimpleTest allows you to choose any name for the
+                new class at the same time as you add the extra methods.
+<pre>
+Mock::generate('DatabaseConnection', <strong>'MockDatabaseConnectionWithOptions'</strong>, array('setOptions'));
+</pre>
+                Here the mock will behave as if the <span class="new_code">setOptions()</span>
+                existed in the original class.
+            </p>
+            <p>
+                Mock objects can only be used within test cases, as upon expectations
+                they send messages straight to the currently running test case.
+                Creating them outside a test case will cause a run time error
+                when an expectation is triggered and there is no running test case
+                for the message to end up.
+                We cover expectations next.
+            </p>
+        
+        <h2>
+<a class="target" name="expectations"></a>Mocks as critics</h2>
+            <p>
+                Although the server stubs approach insulates your tests from
+                real world disruption, it is only half the benefit.
+                You can have the class under test receiving the required
+                messages, but is your new class sending correct ones?
+                Testing this can get messy without a mock objects library.
+            </p>
+			<p>
+                By way of example, let's take a simple <span class="new_code">PageController</span>
+                class to handle a credit card payment form...
+<pre>
+class PaymentForm extends PageController {
+    function __construct($alert, $payment_gateway) { ... }
+    function makePayment($request) { ... }
+}
+</pre>
+                This class takes a <span class="new_code">PaymentGateway</span> to actually talk
+                to the bank.
+                It also takes an <span class="new_code">Alert</span> object to handle errors.
+                This class talks to the page or template.
+                It's responsible for painting the error message and highlighting any
+                form fields that are incorrect.
+            </p>
+            <p>
+                It might look something like...
+<pre>
+class Alert {
+    function warn($warning, $id) {
+        print '&lt;div class="warning"&gt;' . $warning . '&lt;/div&gt;';
+        print '&lt;style type="text/css"&gt;#' . $id . ' { background-color: red }&lt;/style&gt;';
+    }
+}
+</pre>
+            </p>
+            <p>
+                Our interest is in the <span class="new_code">makePayment()</span> method.
+                If we fail to enter a "CVV2" number (the three digit number
+                on the back of the credit card), we want to show an error rather than
+                try to process the payment.
+                In test form...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('payment_form.php');
+Mock::generate('Alert');
+Mock::generate('PaymentGateway');
+
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        <strong>$alert-&gt;expectOnce(
+                    'warn',
+                    array('Missing three digit security code', 'cvv2'));</strong>
+        $controller = new PaymentForm(<strong>$alert</strong>, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+?&gt;
+</pre>
+                The first question you may be asking is, where are the assertions?
+            </p>
+            <p>
+                The call to <span class="new_code">expectOnce('warn', array(...))</span> instructs the mock
+                to expect a call to <span class="new_code">warn()</span> before the test ends.
+                When it gets a call to <span class="new_code">warn()</span>, it checks the arguments.
+                If the arguments don't match, then a failure is generated.
+                It also fails if the method is never called at all.
+            </p>
+            <p>
+                The test above not only asserts that <span class="new_code">warn</span> was called,
+                but that it received the string "Missing three digit security code"
+                and also the tag "cvv2".
+                The equivalent of <span class="new_code">assertIdentical()</span> is applied to both
+                fields when the parameters are compared.
+            </p>
+            <p>
+                If you are not interested in the actual message, and we are not
+                for user interface code that changes often, we can skip that
+                parameter with the "*" operator...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() {
+        $alert = new MockAlert();
+        $alert-&gt;expectOnce('warn', array(<strong>'*'</strong>, 'cvv2'));
+        $controller = new PaymentForm($alert, new MockPaymentGateway());
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    function requestWithMissingCvv2() { ... }
+}
+</pre>
+                We can weaken the test further by missing
+                out the parameters array...
+<pre>
+function testMissingCvv2CausesAlert() {
+    $alert = new MockAlert();
+    <strong>$alert-&gt;expectOnce('warn');</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                This will only test that the method is called,
+                which is a bit drastic in this case.
+                Later on, we'll see how we can weaken the expectations more precisely.
+            </p>
+            <p>
+                Tests without assertions can be both compact and very expressive.
+                Because we intercept the call on the way into an object, here of
+                the <span class="new_code">Alert</span> class, we avoid having to assert its state
+                afterwards.
+                This not only avoids the assertions in the tests, but also having
+                to add extra test only accessors to the original code.
+                If you catch yourself adding such accessors, called "state based testing",
+                it's probably time to consider using mocks in the tests.
+                This is called "behaviour based testing", and is normally superior.
+            </p>
+            <p>
+                Let's add another test.
+                Let's make sure that we don't even attempt a payment without a CVV2...
+<pre>
+class PaymentFormFailuresShouldBeGraceful extends UnitTestCase {
+
+    function testMissingCvv2CausesAlert() { ... }
+
+    function testNoPaymentAttemptedWithMissingCvv2() {
+        $payment_gateway = new MockPaymentGateway();
+        <strong>$payment_gateway-&gt;expectNever('pay');</strong>
+        $controller = new PaymentForm(new MockAlert(), $payment_gateway);
+        $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+    }
+
+    ...
+}
+</pre>
+                Asserting a negative can be very hard in tests, but
+                <span class="new_code">expectNever()</span> makes it easy.
+            </p>
+            <p>
+                <span class="new_code">expectOnce()</span> and <span class="new_code">expectNever()</span> are
+                sufficient for most tests, but
+                occasionally you want to test multiple events.
+                Normally for usability purposes we want all missing fields
+                in the form to light up, not just the first one.
+                This means that we should get multiple calls to
+                <span class="new_code">Alert::warn()</span>, not just one...
+<pre>
+function testAllRequiredFieldsHighlightedOnEmptyRequest() {
+    $alert = new MockAlert();<strong>
+    $alert-&gt;expectAt(0, 'warn', array('*', 'cc_number'));
+    $alert-&gt;expectAt(1, 'warn', array('*', 'expiry'));
+    $alert-&gt;expectAt(2, 'warn', array('*', 'cvv2'));
+    $alert-&gt;expectAt(3, 'warn', array('*', 'card_holder'));
+    $alert-&gt;expectAt(4, 'warn', array('*', 'address'));
+    $alert-&gt;expectAt(5, 'warn', array('*', 'postcode'));
+    $alert-&gt;expectAt(6, 'warn', array('*', 'country'));
+    $alert-&gt;expectCallCount('warn', 7);</strong>
+    $controller = new PaymentForm($alert, new MockPaymentGateway());
+    $controller-&gt;makePayment($this-&gt;requestWithMissingCvv2());
+}
+</pre>
+                The counter in <span class="new_code">expectAt()</span> is the number of times
+                the method has been called already.
+                Here we are asserting that every field will be highlighted.
+            </p>
+            <p>
+                Note that we are forced to assert the order too.
+                SimpleTest does not yet have a way to avoid this, but
+                this will be fixed in future versions.
+            </p>
+            <p>
+                Here is the full list of expectations you can set on a mock object
+                in <a href="http://simpletest.org/">SimpleTest</a>.
+                As with the assertions, these methods take an optional failure message.
+                <table>
+                    <thead><tr>
+<th>Expectation</th>
+<th>Description</th>
+</tr></thead>
+                    <tbody>
+                        <tr>
+                            <td><span class="new_code">expect($method, $args)</span></td>
+                            <td>Arguments must match if called</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAt($timing, $method, $args)</span></td>
+                            <td>Arguments must match when called on the <span class="new_code">$timing</span>'th time</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectCallCount($method, $count)</span></td>
+                            <td>The method must be called exactly this many times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
+                            <td>Call this method no more than <span class="new_code">$count</span> times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
+                            <td>Must be called at least <span class="new_code">$count</span> times</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectNever($method)</span></td>
+                            <td>Must never be called</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectOnce($method, $args)</span></td>
+                            <td>Must be called once and with the expected arguments if supplied</td>
+                        </tr>
+                        <tr>
+                            <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
+                            <td>Must be called at least once, and always with any expected arguments</td>
+                        </tr>
+                    </tbody>
+                </table>
+                Where the parameters are...
+                <dl>
+                    <dt class="new_code">$method</dt>
+                    <dd>The method name, as a string, to apply the condition to.</dd>
+                    <dt class="new_code">$args</dt>
+                    <dd>
+                        The arguments as a list. Wildcards can be included in the same
+                        manner as for <span class="new_code">setReturn()</span>.
+                        This argument is optional for <span class="new_code">expectOnce()</span>
+                        and <span class="new_code">expectAtLeastOnce()</span>.
+                    </dd>
+                    <dt class="new_code">$timing</dt>
+                    <dd>
+                        The only point in time to test the condition.
+                        The first call starts at zero and the count is for
+                        each method independently.
+                    </dd>
+                    <dt class="new_code">$count</dt>
+                    <dd>The number of calls expected.</dd>
+                </dl>
+            </p>
+            <p>
+                If you have just one call in your test, make sure you're using
+                <span class="new_code">expectOnce</span>.<br>
+                Using <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
+                on its own will allow the method to never be called.
+                Checking the arguments and the overall call count
+                are currently independant.
+                Add an <span class="new_code">expectCallCount()</span> expectation when you
+                are using <span class="new_code">expectAt()</span> unless zero calls is allowed.
+            </p>
+            <p>
+                Like the assertions within test cases, all of the expectations
+                can take a message override as an extra parameter.
+                Also the original failure message can be embedded in the output
+                as "%s".
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            The original
+            <a href="http://www.mockobjects.com/">Mock objects</a> paper.
+        </li>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest home page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <span class="chosen">Mock objects</span>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/overview.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/overview.html
new file mode 100644
index 000000000..85ea94077
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/overview.html
@@ -0,0 +1,487 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Overview and feature list for the SimpleTest PHP unit tester and web tester
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <span class="chosen">Overview</span>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Overview of SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#summary">Quick summary</a>
+            of the SimpleTest tool for PHP.
+        </li>
+<li>
+            <a href="#features">List of features</a>,
+            both current ones and those planned.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="summary"></a>What is SimpleTest?</h2>
+            <p>
+                The heart of SimpleTest is a testing framework built around
+                test case classes.
+                These are written as extensions of base test case classes,
+                each extended with methods that actually contain test code.
+                Each test method of a test case class is written to invoke
+                various assertions that the developer expects to be true such as
+                <span class="new_code">assertEqual()</span>.
+                If the expectation is correct, then a successful result is
+                dispatched to the observing test reporter, but any failure
+                or unexpected exception triggers an alert and a description
+                of the mismatch.
+                These test case declarations are transformed into executable
+                test scripts by including a SimpleTest aurorun.php file.
+            </p>
+            <p>
+                These documents apply to SimpleTest version 1.1, although we
+                try hard to maintain compatibility between versions.
+                If you get a test failure after an upgrade, check out the
+                file "HELP_MY_TESTS_DONT_WORK_ANYMORE" in the
+                simpletest directory to see if a feature you are using
+                has since been deprecated and later removed.
+            </p>
+            <p>
+                A <a href="unit_test_documentation.html">test case</a> looks like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class <strong>CanAddUp</strong> extends UnitTestCase {<strong>
+    function testOneAndOneMakesTwo() {
+        $this-&gt;assertEqual(1 + 1, 2);
+    }</strong>
+}
+?&gt;
+</pre>
+                Tests are grouped into test cases, which are just
+                PHP classes that extend <span class="new_code">UnitTestCase</span>
+                or <span class="new_code">WebTestCase</span>.
+                The tests themselves are just normal methods that start
+                their name with the letters "test".
+                You can have as many test cases as you want in a test
+                script and each test case can have as many test methods
+                as it wants too.
+            </p>
+            <p>
+                This test script is immediately runnable.
+                You just invoke it on the command line like so...
+<pre class="shell">
+php adding_test.php
+</pre>
+            </p>
+            <p>
+                When run on the command line you should see something like...
+<pre class="shell">
+adding_test.php
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                If you place it on a web server and point your
+                web browser at it...
+                <div class="demo">
+                    <h1>adding_test.php</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>6</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+            </p>
+            <p>
+                Of course this is a silly example.
+                A more realistic example might be...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('log.php');
+
+class <strong>TestOfLogging</strong> extends UnitTestCase {
+    function testWillCreateLogFileOnFirstMessage() {
+        $log = new Log('my.log');
+        $this-&gt;assertFalse(file_exists('my.log'));
+        $log-&gt;message('Hello');
+        $this-&gt;assertTrue(file_exists('my.log'));
+    }&lt;/strong&gt;
+}
+?&gt;
+</pre>
+            </p>
+            <p>
+                This tool is designed for the developer.
+                The target audience of this tool is anyone developing a small
+                to medium PHP application, including developers new to
+                unit and web regression testing.
+                The core principles are ease of use first, with extendibility and
+                essential features.
+            </p>
+            <p>
+                Tests are written in the PHP language itself more or less
+                as the application itself is built.
+                The advantage of using PHP as the testing language is that
+                there are no new languages to learn, testing can start straight away,
+                and the developer can test any part of the code.
+                Basically, all parts that can be accessed by the application code can also be
+                accessed by the test code when they are in the same programming language.
+            </p>
+            <p>
+                The simplest type of test case is the
+                <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                This class of test case includes standard tests for equality,
+                references and pattern matching.
+                All these test the typical expectations of what you would
+                expect the result of a function or method to be.
+                This is by far the most common type of test in the daily
+                routine of development, making up about 95% of test cases.
+            </p>
+            <p>
+                The top level task of a web application though is not to
+                produce correct output from its methods and objects, but
+                to generate web pages.
+                The <a href="web_tester_documentation.html">WebTestCase</a> class tests web
+                pages.
+                It simulates a web browser requesting a page, complete with
+                cookies, proxies, secure connections, authentication, forms, frames and most
+                navigation elements.
+                With this type of test case, the developer can assert that
+                information is present in the page and that forms and
+                sessions are handled correctly.
+            </p>
+            <p>
+                A <a href="web_tester_documentation.html">WebTestCase</a> looks like this...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class <strong>MySiteTest</strong> extends WebTestCase {
+    <strong>
+    function testHomePageHasContactDetailsLink() {
+        $this-&gt;get('http://www.my-site.com/index.php');
+        $this-&gt;assertTitle('My Home Page');
+        $this-&gt;clickLink('Contact');
+        $this-&gt;assertTitle('Contact me');
+        $this-&gt;assertText('/Email me at/');
+    }</strong>
+}
+?&gt;
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="features"></a>Feature list</h2>
+            <p>
+                The following is a very rough outline of past and future features
+                and their expected point of release.
+                I am afraid it is liable to change without warning, as meeting the
+                milestones rather depends on time available.
+            </p>
+            <p>
+                Green stuff has been coded, but not necessarily released yet.
+                If you have a pressing need for a green but unreleased feature
+                then you should check-out the code from Sourceforge SVN directly.
+                <table>
+<thead>
+                    <tr>
+<th>Feature</th>
+<th>Description</th>
+<th>Release</th>
+</tr>
+                    </thead>
+<tbody>
+<tr>
+                        <td>Unit test case</td>
+                        <td>Core test case class and assertions</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Html display</td>
+                        <td>Simplest possible display</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Autoloading of test cases</td>
+                        <td>
+                            Reading a file with test cases and loading them into a
+                            group test automatically
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Mock objects</td>
+                        <td>
+                            Objects capable of simulating other objects removing
+                            test dependencies
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Web test case</td>
+                        <td>Allows link following and title tag matching</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Partial mocks</td>
+                        <td>
+                            Mocking parts of a class for testing less than a class
+                            or for complex simulations
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Web cookie handling</td>
+                        <td>Correct handling of cookies when fetching pages</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Following redirects</td>
+                        <td>Page fetching automatically follows 300 redirects</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Form parsing</td>
+                        <td>Ability to submit simple forms and read default form values</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Command line interface</td>
+                        <td>Test display without the need of a web browser</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Exposure of expectation classes</td>
+                        <td>Can create precise tests with mocks as well as test cases</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>XML output and parsing</td>
+                        <td>
+                            Allows multi host testing and the integration of acceptance
+                            testing extensions
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Browser component</td>
+                        <td>
+                            Exposure of lower level web browser interface for more
+                            detailed test cases
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>HTTP authentication</td>
+                        <td>
+                            Fetching protected web pages with basic authentication
+                            only
+                        </td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>SSL support</td>
+                        <td>Can connect to https: pages</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Proxy support</td>
+                        <td>Can connect via. common proxies</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>Frames support</td>
+                        <td>Handling of frames in web test cases</td>
+                        <td style="color: green;">1.0</td>
+                    </tr>
+                    <tr>
+                        <td>File upload testing</td>
+                        <td>Can simulate the input type file tag</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Mocking interfaces</td>
+                        <td>
+                            Can generate mock objects to interfaces as well as classes
+                            and class interfaces are carried for type hints
+                        </td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Testing exceptions</td>
+                        <td>Similar to testing PHP errors</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>HTML label support</td>
+                        <td>Can access all controls using the visual label</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Base tag support</td>
+                        <td>Respects page base tag when clicking</td>
+                        <td style="color: green;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>PHP 5 E_STRICT compliant</td>
+                        <td>PHP 5 only version that works with the E_STRICT error level</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Alternate HTML parsers</td>
+                        <td>Can detect compiled parsers for performance improvements</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>REST support</td>
+                        <td>Support for REST verbs as put(), delete(), etc.</td>
+                        <td style="color: green;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>BDD style fixtures</td>
+                        <td>Can import fixtures using a mixin like given() method</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Plug-in architecture</td>
+                        <td>Automatic import of extensions including command line options</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Reporting machinery enhancements</td>
+                        <td>Improved message passing for better cooperation with IDEs</td>
+                        <td style="color: red;">1.5</td>
+                    </tr>
+                    <tr>
+                        <td>Fluent mock interface</td>
+                        <td>More flexible and concise mock objects</td>
+                        <td style="color: red;">1.6</td>
+                    </tr>
+                    <tr>
+                        <td>Localisation</td>
+                        <td>Messages abstracted and code generated as well as UTF support</td>
+                        <td style="color: red;">1.6</td>
+                    </tr>
+                    <tr>
+                        <td>CSS selectors</td>
+                        <td>HTML content can be examined using CSS selectors</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>HTML table assertions</td>
+                        <td>Can match HTML or other table elements to expectations</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>Unified acceptance testing model</td>
+                        <td>Content searchable through selectors combined with expectations</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>DatabaseTestCase</td>
+                        <td>SQL selectors and DB drivers</td>
+                        <td style="color: red;">1.7</td>
+                    </tr>
+                    <tr>
+                        <td>IFrame support</td>
+                        <td>Reads IFrame content that can be refreshed</td>
+                        <td style="color: red;">1.8</td>
+                    </tr>
+                    <tr>
+                        <td>Integrated Selenium support</td>
+                        <td>Easy to use built in Selenium driver and tutorial or similar browser automation</td>
+                        <td style="color: red;">1.9</td>
+                    </tr>
+                    <tr>
+                        <td>Code coverage</td>
+                        <td>Reports using the bundled tool when using XDebug</td>
+                        <td style="color: red;">1.9</td>
+                    </tr>
+                    <tr>
+                        <td>Deprecation of old methods</td>
+                        <td>Simpler interface for SimpleTest2</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Javascript suport</td>
+                        <td>Use of PECL module to add Javascript to the native browser</td>
+                        <td style="color: red;">3.0</td>
+                    </tr>
+                </tbody>
+</table>
+                PHP 5 migration is complete, which means that only PHP 5.0.3+
+                will be supported in SimpleTest version 1.1+.
+                Earlier versions of SimpleTest are compatible with PHP 4.2 up to
+                PHP 5 (non E_STRICT).
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="unit_test_documentation.html">Documentation for SimpleTest</a>.
+        </li>
+<li>
+            <a href="http://www.lastcraft.com/first_test_tutorial.php">How to write PHP test cases</a>
+            is a fairly advanced tutorial.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">SimpleTest API</a> from phpdoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <span class="chosen">Overview</span>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html
new file mode 100644
index 000000000..cb70b1f86
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/partial_mocks_documentation.html
@@ -0,0 +1,457 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP partial mocks documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <span class="chosen">Partial mocks</span>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Partial mock objects documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#inject">The mock injection problem</a>.
+        </li>
+<li>
+            Moving creation to a <a href="#creation">protected factory</a> method.
+        </li>
+<li>
+            <a href="#partial">Partial mocks</a> generate subclasses.
+        </li>
+<li>
+            Partial mocks <a href="#less">test less than a class</a>.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                A partial mock is simply a pattern to alleviate a specific problem
+                in testing with mock objects,
+                that of getting mock objects into tight corners.
+                It's quite a limited tool and possibly not even a good idea.
+                It is included with SimpleTest because I have found it useful
+                on more than one occasion and has saved a lot of work at that point.
+            </p>
+        
+        <h2>
+<a class="target" name="inject"></a>The mock injection problem</h2>
+            <p>
+                When one object uses another it is very simple to just pass a mock
+                version in already set up with its expectations.
+                Things are rather tricker if one object creates another and the
+                creator is the one you want to test.
+                This means that the created object should be mocked, but we can
+                hardly tell our class under test to create a mock instead.
+                The tested class doesn't even know it is running inside a test
+                after all.
+            </p>
+            <p>
+                For example, suppose we are building a telnet client and it
+                needs to create a network socket to pass its messages.
+                The connection method might look something like...
+<pre>
+<strong>&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        $socket = new Socket($ip, $port);
+        $socket-&gt;read( ... );
+        ...
+    }
+}
+?&gt;</strong>
+</pre>
+                We would really like to have a mock object version of the socket
+                here, what can we do?
+            </p>
+            <p>
+                The first solution is to pass the socket in as a parameter,
+                forcing the creation up a level.
+                Having the client handle this is actually a very good approach
+                if you can manage it and should lead to factoring the creation from
+                the doing.
+                In fact, this is one way in which testing with mock objects actually
+                forces you to code more tightly focused solutions.
+                They improve your programming.
+            </p>
+            <p>
+                Here this would be...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    <strong>function connect($socket, $username, $password) {
+        $socket-&gt;read( ... );
+        ...
+    }</strong>
+}
+?&gt;
+</pre>
+                This means that the test code is typical for a test involving
+                mock objects.
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect($socket, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                It is pretty obvious though that one level is all you can go.
+                You would hardly want your top level application creating
+                every low level file, socket and database connection ever
+                needed.
+                It wouldn't know the constructor parameters anyway.
+            </p>
+            <p>
+                The next simplest compromise is to have the created object passed
+                in as an optional parameter...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...<strong>
+    function connect($ip, $port, $username, $password, $socket = false) {
+        if (! $socket) {
+            $socket = new Socket($ip, $port);
+        }
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                For a quick solution this is usually good enough.
+                The test now looks almost the same as if the parameter
+                was formally passed...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', $socket);
+        ...</strong>
+    }
+}
+</pre>
+                The problem with this approach is its untidiness.
+                There is test code in the main class and parameters passed
+                in the test case that are never used.
+                This is a quick and dirty approach, but nevertheless effective
+                in most situations.
+            </p>
+            <p>
+                The next method is to pass in a factory object to do the creation...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {<strong>
+   function Telnet($network) {
+        $this-&gt;_network = $network;
+    }</strong>
+    ...
+    function connect($ip, $port, $username, $password) {<strong>
+        $socket = $this-&gt;_network-&gt;createSocket($ip, $port);
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                This is probably the most highly factored answer as creation
+                is now moved into a small specialist class.
+                The networking factory can now be tested separately, but mocked
+                easily when we are testing the telnet class...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $network = new MockNetwork();
+        $network-&gt;returnsByReference('createSocket', $socket);
+        $telnet = new Telnet($network);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The downside is that we are adding a lot more classes to the
+                library.
+                Also we are passing a lot of factories around which will
+                make the code a little less intuitive.
+                The most flexible solution, but the most complex.
+            </p>
+            <p>
+                Well techniques like "Dependency Injection" tackle the problem of
+                instantiating a lot of constructor parameters.
+                Unfortunately knowledge of this pattern is not widespread, and if you
+                are trying to get older code to work, rearchitecting the whole
+                application is not really an option.
+            </p>
+            <p>
+                Is there a middle ground?
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Protected factory method</h2>
+            <p>
+                There is a way we can circumvent the problem without creating
+                any new application classes, but it involves creating a subclass
+                when we do the actual testing.
+                Firstly we move the socket creation into its own method...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function connect($ip, $port, $username, $password) {
+        <strong>$socket = $this-&gt;createSocket($ip, $port);</strong>
+        $socket-&gt;read( ... );
+        ...
+    }<strong>
+
+    protected function createSocket($ip, $port) {
+        return new Socket($ip, $port);
+    }</strong>
+}
+?&gt;
+</pre>
+                This is a pretty safe step even for very tangled legacy code.
+                This is the only change we make to the application.
+            </p>
+            <p>
+                For the test case we have to create a subclass so that
+                we can intercept the socket creation...
+<pre>
+<strong>class TelnetTestVersion extends Telnet {
+    var $mock;
+
+    function TelnetTestVersion($mock) {
+        $this-&gt;mock = $mock;
+        $this-&gt;Telnet();
+    }
+
+    protected function createSocket() {
+        return $this-&gt;mock;
+    }
+}</strong>
+</pre>
+                Here I have passed the mock in the constructor, but a
+                setter would have done just as well.
+                Note that the mock was set into the object variable
+                before the constructor was chained.
+                This is necessary in case the constructor calls
+                <span class="new_code">connect()</span>.
+                Otherwise it could get a null value from
+                <span class="new_code">createSocket()</span>.
+            </p>
+            <p>
+                After the completion of all of this extra work the
+                actual test case is fairly easy.
+                We just test our new class instead...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion($socket);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The new class is very simple of course.
+                It just sets up a return value, rather like a mock.
+                It would be nice if it also checked the incoming parameters
+                as well.
+                Just like a mock.
+                It seems we are likely to do this often, can
+                we automate the subclass creation?
+            </p>
+        
+        <h2>
+<a class="target" name="partial"></a>A partial mock</h2>
+            <p>
+                Of course the answer is "yes" or I would have stopped writing
+                this by now!
+                The previous test case was a lot of work, but we can
+                generate the subclass using a similar approach to the mock objects.
+            </p>
+            <p>
+                Here is the partial mock version of the test...
+<pre>
+<strong>Mock::generatePartial(
+        'Telnet',
+        'TelnetTestVersion',
+        array('createSocket'));</strong>
+
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');</strong>
+    }
+}
+</pre>
+                The partial mock is a subclass of the original with
+                selected methods "knocked out" with test
+                versions.
+                The <span class="new_code">generatePartial()</span> call
+                takes three parameters: the class to be subclassed,
+                the new test class name and a list of methods to mock.
+            </p>
+            <p>
+                Instantiating the resulting objects is slightly tricky.
+                The only constructor parameter of a partial mock is
+                the unit tester reference.
+                As with the normal mock objects this is needed for sending
+                test results in response to checked expectations.
+            </p>
+            <p>
+                The original constructor is not run yet.
+                This is necessary in case the constructor is going to
+                make use of the as yet unset mocked methods.
+                We set any return values at this point and then run the
+                constructor with its normal parameters.
+                This three step construction of "new", followed
+                by setting up the methods, followed by running the constructor
+                proper is what distinguishes the partial mock code.
+            </p>
+            <p>
+                Apart from construction, all of the mocked methods have
+                the same features as mock objects and all of the unmocked
+                methods behave as before.
+                We can set expectations very easily...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {
+        $socket = new MockSocket();
+        ...
+        $telnet = new TelnetTestVersion();
+        $telnet-&gt;setReturnReference('createSocket', $socket);
+        <strong>$telnet-&gt;expectOnce('createSocket', array('127.0.0.1', 21));</strong>
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+    }
+}
+</pre>
+                Partial mocks are not used often.
+                I consider them transitory.
+                Useful while refactoring, but once the application has
+                all of it's dependencies nicely separated then the
+                partial mocks can wither away.
+            </p>
+        
+        <h2>
+<a class="target" name="less"></a>Testing less than a class</h2>
+            <p>
+                The mocked out methods don't have to be factory methods,
+                they could be any sort of method.
+                In this way partial mocks allow us to take control of any part of
+                a class except the constructor.
+                We could even go as far as to mock every method
+                except one we actually want to test.
+            </p>
+            <p>
+                This last situation is all rather hypothetical, as I've hardly
+                tried it.
+                I am a little worried that
+                forcing object granularity may be better for the code quality.
+                I personally use partial mocks as a way of overriding creation
+                or for occasional testing of the TemplateMethod pattern.
+            </p>
+            <p>
+                It's all going to come down to the coding standards of your
+                project to decide if you allow test mechanisms like this.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+<li>
+            The protected factory is described in
+            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">this paper from IBM</a>.
+            This is the only formal comment I have seen on this problem.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <span class="chosen">Partial mocks</span>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/reporter_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/reporter_documentation.html
new file mode 100644
index 000000000..28b6cc9be
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/reporter_documentation.html
@@ -0,0 +1,616 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP test runner and display documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <span class="chosen">Reporting</span>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Test reporter documentation</h1>
+        This page...
+        <ul>
+<li>
+            Displaying <a href="#html">results in HTML</a>
+        </li>
+<li>
+            Displaying and <a href="#other">reporting results</a>
+            in other formats
+        </li>
+<li>
+            Using <a href="#cli">SimpleTest from the command line</a>
+        </li>
+<li>
+            <a href="#xml">Using XML</a> for remote testing
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest pretty much follows the MVC-ish pattern
+                (Model-View-Controller).
+                The reporter classes are the view and the model is your
+                test cases and their hiearchy.
+                The controller is mostly hidden from the user of
+                SimpleTest unless you want to change how the test cases
+                are actually run, in which case it is possible to
+                override the runner objects from within the test case.
+                As usual with MVC, the controller is mostly undefined
+                and there are other places to control the test run.
+            </p>
+        
+        <h2>
+<a class="target" name="html"></a>Reporting results in HTML</h2>
+            <p>
+                The default HTML display is minimal in the extreme.
+                It reports success and failure with the conventional red and
+                green bars and shows a breadcrumb trail of test groups
+                for every failed assertion.
+                Here's a fail...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                And here all tests passed...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                The good news is that there are several points in the display
+                hiearchy for subclassing.
+            </p>
+            <p>
+                For web page based displays there is the
+                <span class="new_code">HtmlReporter</span> class with the following
+                signature...
+<pre>
+class HtmlReporter extends SimpleReporter {
+    public __construct($encoding) { ... }
+    public makeDry(boolean $is_dry) { ... }
+    public void paintHeader(string $test_name) { ... }
+    public void sendNoCacheHeaders() { ... }
+    public void paintFooter(string $test_name) { ... }
+    public void paintGroupStart(string $test_name, integer $size) { ... }
+    public void paintGroupEnd(string $test_name) { ... }
+    public void paintCaseStart(string $test_name) { ... }
+    public void paintCaseEnd(string $test_name) { ... }
+    public void paintMethodStart(string $test_name) { ... }
+    public void paintMethodEnd(string $test_name) { ... }
+    public void paintFail(string $message) { ... }
+    public void paintPass(string $message) { ... }
+    public void paintError(string $message) { ... }
+    public void paintException(string $message) { ... }
+    public void paintMessage(string $message) { ... }
+    public void paintFormattedMessage(string $message) { ... }
+    protected string getCss() { ... }
+    public array getTestList() { ... }
+    public integer getPassCount() { ... }
+    public integer getFailCount() { ... }
+    public integer getExceptionCount() { ... }
+    public integer getTestCaseCount() { ... }
+    public integer getTestCaseProgress() { ... }
+}
+</pre>
+                Here is what some of these methods mean. First the display methods
+                that you will probably want to override...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
+                        is the constructor.
+                        Note that the unit test sets up the link to the display
+                        rather than the other way around.
+                        The display is a mostly passive receiver of test events.
+                        This allows easy adaption of the display for other test
+                        systems beside unit tests, such as monitoring servers.
+                        The encoding is the character encoding you wish to
+                        display the test output in.
+                        In order to correctly render debug output when
+                        using the web tester, this should match the encoding
+                        of the site you are trying to test.
+                        The available character set strings are described in
+                        the PHP <a href="http://www.php.net/manual/en/function.htmlentities.php">html_entities()</a>
+                        function.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintHeader(string $test_name)</span><br>
+                        is called once at the very start of the test when the first
+                        start event arrives.
+                        The first start event is usually delivered by the top level group
+                        test and so this is where <span class="new_code">$test_name</span>
+                        comes from.
+                        It paints the page title, CSS, body tag, etc.
+                        It returns nothing (<span class="new_code">void</span>).
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFooter(string $test_name)</span><br>
+                        Called at the very end of the test to close any tags opened
+                        by the page header.
+                        By default it also displays the red/green bar and the final
+                        count of results.
+                        Actually the end of the test happens when a test end event
+                        comes in with the same name as the one that started it all
+                        at the same level.
+                        The tests nest you see.
+                        Closing the last test finishes the display.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
+                        is called at the start of each test method.
+                        The name normally comes from method name.
+                        The other test start events behave the same way except
+                        that the group test one tells the reporter how large
+                        it is in number of held test cases.
+                        This is so that the reporter can display a progress bar
+                        as the runner churns through the test cases.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
+                        backs out of the test started with the same name.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFail(string $message)</span><br>
+                        paints a failure.
+                        By default it just displays the word fail, a breadcrumbs trail
+                        showing the current test nesting and the message issued by
+                        the assertion.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintPass(string $message)</span><br>
+                        by default does nothing.
+                    </li>
+                    <li>
+                        <span class="new_code">string getCss()</span><br>
+                        Returns the CSS styles as a string for the page header
+                        method.
+                        Additional styles have to be appended here if you are
+                        not overriding the page header.
+                        You will want to use this method in an overriden page header
+                        if you want to include the original CSS.
+                    </li>
+                </ul>
+                There are also some accessors to get information on the current
+                state of the test suite.
+                Use these to enrich the display...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">array getTestList()</span><br>
+                        is the first convenience method for subclasses.
+                        Lists the current nesting of the tests as a list
+                        of test names.
+                        The first, top level test case, is first in the
+                        list and the current test method will be last.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getPassCount()</span><br>
+                        returns the number of passes chalked up so far.
+                        Needed for the display at the end.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getFailCount()</span><br>
+                        is likewise the number of fails so far.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getExceptionCount()</span><br>
+                        is likewise the number of errors so far.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseCount()</span><br>
+                        is the total number of test cases in the test run.
+                        This includes the grouping tests themselves.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseProgress()</span><br>
+                        is the number of test cases completed so far.
+                    </li>
+                </ul>
+                One simple modification is to get the HtmlReporter to display
+                the passes as well as the failures and errors...
+<pre>
+<strong>class ReporterShowingPasses extends HtmlReporter {
+    
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
+        $breadcrumb = $this-&gt;getTestList();
+        array_shift($breadcrumb);
+        print implode("-&amp;gt;", $breadcrumb);
+        print "-&amp;gt;$message&lt;br /&gt;\n";
+    }
+    
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: green; }';
+    }
+}</strong>
+</pre>
+            </p>
+            <p>
+                One method that was glossed over was the <span class="new_code">makeDry()</span>
+                method.
+                If you run this method, with no parameters, on the reporter
+                before the test suite is run no actual test methods
+                will be called.
+                You will still get the events of entering and leaving the
+                test methods and test cases, but no passes or failures etc,
+                because the test code will not actually be executed.
+            </p>
+            <p>
+                The reason for this is to allow for more sophistcated
+                GUI displays that allow the selection of individual test
+                cases.
+                In order to build a list of possible tests they need a
+                report on the test structure for drawing, say a tree view
+                of the test suite.
+                With a reporter set to dry run that just sends drawing events
+                this is easily accomplished.
+            </p>
+        
+        <h2>
+<a class="target" name="other"></a>Extending the reporter</h2>
+            <p>
+                Rather than simply modifying the existing display, you might want to
+                produce a whole new HTML look, or even generate text or XML.
+                Rather than override every method in
+                <span class="new_code">HtmlReporter</span> we can take one
+                step up the class hiearchy to <span class="new_code">SimpleReporter</span>
+                in the <em>simple_test.php</em> source file.
+            </p>
+            <p>
+                A do nothing display, a blank canvas for your own creation, would
+                be...
+<pre>
+<strong>require_once('simpletest/simpletest.php');</strong>
+
+class MyDisplay extends SimpleReporter {<strong>
+    </strong>
+    function paintHeader($test_name) { }
+    
+    function paintFooter($test_name) { }
+    
+    function paintStart($test_name, $size) {<strong>
+        parent::paintStart($test_name, $size);</strong>
+    }
+    
+    function paintEnd($test_name, $size) {<strong>
+        parent::paintEnd($test_name, $size);</strong>
+    }
+    
+    function paintPass($message) {<strong>
+        parent::paintPass($message);</strong>
+    }
+    
+    function paintFail($message) {<strong>
+        parent::paintFail($message);</strong>
+    }
+    
+    function paintError($message) {<strong>
+        parent::paintError($message);</strong>
+    }
+    
+    function paintException($exception) {<strong>
+        parent::paintException($exception);</strong>
+    }
+}
+</pre>
+                No output would come from this class until you add it.
+            </p>
+            <p>
+                The catch with using this low level class is that you must
+                explicitely invoke it in the test script.
+                The "autorun" facility will not be able to use
+                it's runime context (whether it's running in a web browser
+                or the command line) to select the reporter.
+            </p>
+            <p>
+                You explicitely invoke the test runner like so...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                ...perhaps like this...
+<pre>
+&lt;?php
+require_once('simpletest/simpletest.php');
+require_once('my_reporter.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+
+$test = new MyTest();
+$test-&gt;run(<strong>new MyReporter()</strong>);
+?&gt;
+</pre>
+                We'll show how to fit in with "autorun" later.
+            </p>
+        
+        <h2>
+<a class="target" name="cli"></a>The command line reporter</h2>
+            <p>
+                SimpleTest also ships with a minimal command line reporter.
+                The interface mimics JUnit to some extent, but paints the
+                failure messages as they arrive.
+                To use the command line reporter explicitely, substitute it
+                for the HTML version...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+$test-&gt;run(<strong>new TextReporter()</strong>);
+?&gt;
+</pre>
+                Then invoke the test suite from the command line...
+<pre class="shell">
+php file_test.php
+</pre>
+                You will need the command line version of PHP installed
+                of course.
+                A passing test suite looks like this...
+<pre class="shell">
+File test
+OK
+Test cases run: 1/1, Passes: 1, Failures: 0, Exceptions: 0
+</pre>
+                A failure triggers a display like this...
+<pre class="shell">
+File test
+1) True assertion failed.
+    in createNewFile
+FAILURES!!!
+Test cases run: 1/1, Passes: 0, Failures: 1, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                One of the main reasons for using a command line driven
+                test suite is of using the tester as part of some automated
+                process.
+                To function properly in shell scripts the test script should
+                return a non-zero exit code on failure.
+                If a test suite fails the value <span class="new_code">false</span>
+                is returned from the <span class="new_code">SimpleTest::run()</span>
+                method.
+                We can use that result to exit the script with the desired return
+                code...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
+?&gt;
+</pre>
+                Of course we wouldn't really want to create two test scripts,
+                a command line one and a web browser one, for each test suite.
+                The command line reporter includes a method to sniff out the
+                run time environment...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+$test = new TestSuite('File test');
+$test-&gt;addFile('tests/file_test.php');
+<strong>if (TextReporter::inCli()) {</strong>
+    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);
+<strong>}</strong>
+$test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                This is the form used within SimpleTest itself.
+                When you use the "autorun.php", and no
+                test has been run by the end, this is pretty much
+                the code that SimpleTest will run for you implicitely.
+            </p>
+            <p>
+                In other words, this is gives the same result...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+
+class MyTest extends TestSuite {
+    function __construct() {
+        parent::__construct();
+        $this-&gt;addFile('tests/file_test.php');
+    }
+}
+?&gt;
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="xml"></a>Remote testing</h2>
+            <p>
+                SimpleTest ships with an <span class="new_code">XmlReporter</span> class
+                used for internal communication.
+                When run the output looks like...
+<pre class="shell">
+&lt;?xml version="1.0"?&gt;
+&lt;run&gt;
+  &lt;group size="4"&gt;
+    &lt;name&gt;Remote tests&lt;/name&gt;
+    &lt;group size="4"&gt;
+      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
+      &lt;case&gt;
+        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
+        &lt;test&gt;
+          &lt;name&gt;testofresults&lt;/name&gt;
+          &lt;pass&gt;This assertion passed&lt;/pass&gt;
+          &lt;fail&gt;This assertion failed&lt;/fail&gt;
+        &lt;/test&gt;
+        &lt;test&gt;
+          ...
+        &lt;/test&gt;
+      &lt;/case&gt;
+    &lt;/group&gt;
+  &lt;/group&gt;
+&lt;/run&gt;
+</pre>
+                To get your normal test cases to produce this format, on the
+                command line add the <span class="new_code">--xml</span> flag.
+<pre class="shell">
+php my_test.php --xml
+</pre>
+                You can do teh same thing in the web browser by adding the
+                URL parameter <span class="new_code">xml=1</span>.
+                Any true value will do.
+            </p>
+            <p>
+                You can consume this format with the parser
+                supplied as part of SimpleTest itself.
+                This is called <span class="new_code">SimpleTestXmlParser</span> and
+                resides in <em>xml.php</em> within the SimpleTest package...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+    
+...
+$parser = new SimpleTestXmlParser(new HtmlReporter());
+$parser-&gt;parse($test_output);
+?&gt;
+</pre>
+                The <span class="new_code">$test_output</span> should be the XML format
+                from the XML reporter, and could come from say a command
+                line run of a test case.
+                The parser sends events to the reporter just like any
+                other test run.
+                There are some odd occasions where this is actually useful.
+            </p>
+            <p>
+                Most likely it's when you want to isolate a problematic crash
+                prone test.
+                You can collect the XML output using the backtick operator
+                from another test.
+                In that way it runs in it's own process...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+
+if (TextReporter::inCli()) {
+    $parser = new SimpleTestXmlParser(new TextReporter());
+} else {
+    $parser = new SimpleTestXmlParser(new HtmlReporter());
+}
+$parser-&gt;parse(`php flakey_test.php --xml`);
+?&gt;
+</pre>
+            </p>
+            <p>
+                Another use is breaking up large test suites.
+            </p>
+            <p>
+                A problem with large test suites is thet they can exhaust
+                the default 16Mb memory limit on a PHP process.
+                By having the test groups output in XML and run in
+                separate processes, the output can be reparsed to
+                aggregate the results into a much smaller footprint top level
+                test.
+            </p>
+            <p>
+                Because the XML output can come from anywhere, this opens
+                up the possibility of aggregating test runs from remote
+                servers.
+                A test case already exists to do this within the SimpleTest
+                framework, but it is currently experimental...
+<pre>
+&lt;?php
+<strong>require_once('../remote.php');</strong>
+require_once('simpletest/autorun.php');
+    
+$test_url = ...;
+$dry_url = ...;
+
+class MyTestOnAnotherServer extends RemoteTestCase {
+    function __construct() {
+        $test_url = ...
+        parent::__construct($test_url, $test_url . ' --dry');
+    }
+}
+?&gt;
+</pre>
+                The <span class="new_code">RemoteTestCase</span> takes the actual location
+                of the test runner, basically a web page in XML format.
+                It also takes the URL of a reporter set to do a dry run.
+                This is so that progress can be reported upward correctly.
+                The <span class="new_code">RemoteTestCase</span> can be added to test suites
+                just like any other test suite.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <span class="chosen">Reporting</span>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/unit_test_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/unit_test_documentation.html
new file mode 100644
index 000000000..a399bf34c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/unit_test_documentation.html
@@ -0,0 +1,442 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP regression test documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <span class="chosen">Unit tester</span>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>PHP Unit Test documentation</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Unit test cases</a> and basic assertions.
+        </li>
+<li>
+            <a href="#extending_unit">Extending test cases</a> to
+            customise them for your own project.
+        </li>
+<li>
+            <a href="#running_unit">Running a single case</a> as
+            a single script.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="unit"></a>Unit test cases</h2>
+            <p>
+                The core system is a regression testing framework built around
+                test cases.
+                A sample test case looks like this...
+<pre>
+<strong>class FileTestCase extends UnitTestCase {
+}</strong>
+</pre>
+                Actual tests are added as methods in the test case whose names
+                by default start with the string "test" and
+                when the test case is invoked all such methods are run in
+                the order that PHP introspection finds them.
+                As many test methods can be added as needed.
+            </p>
+            <p>
+                For example...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    function FileTestCase() {
+        $this-&gt;UnitTestCase('File test');
+    }<strong>
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');
+        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
+    }</strong>
+}
+</pre>
+                The constructor is optional and usually omitted.
+                Without a name, the class name is taken as the name of the test case.
+            </p>
+            <p>
+                Our only test method at the moment is <span class="new_code">testCreation()</span>
+                where we check that a file has been created by our
+                <span class="new_code">Writer</span> object.
+                We could have put the <span class="new_code">unlink()</span>
+                code into this method as well, but by placing it in
+                <span class="new_code">setUp()</span> and
+                <span class="new_code">tearDown()</span> we can use it with
+                other test methods that we add.
+            </p>
+            <p>
+                The <span class="new_code">setUp()</span> method is run
+                just before each and every test method.
+                <span class="new_code">tearDown()</span> is run just after
+                each and every test method.
+            </p>
+            <p>
+                You can place some test case set up into the constructor to
+                be run once for all the methods in the test case, but
+                you risk test interference that way.
+                This way is slightly slower, but it is safer.
+                Note that if you come from a JUnit background this will not
+                be the behaviour you are used to.
+                JUnit surprisingly reinstantiates the test case for each test
+                method to prevent such interference.
+                SimpleTest requires the end user to use <span class="new_code">setUp()</span>, but
+                supplies additional hooks for library writers.
+            </p>
+            <p>
+                The means of reporting test results (see below) are by a
+                visiting display class
+                that is notified by various <span class="new_code">assert...()</span>
+                methods.
+                Here is the full list for the <span class="new_code">UnitTestCase</span>
+                class, the default for SimpleTest...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertTrue($x)</span></td>
+<td>Fail if $x is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFalse($x)</span></td>
+<td>Fail if $x is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNull($x)</span></td>
+<td>Fail if $x is set</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotNull($x)</span></td>
+<td>Fail if $x not set</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertIsA($x, $t)</span></td>
+<td>Fail if $x is not the class or type $t</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotA($x, $t)</span></td>
+<td>Fail if $x is of the class or type $t</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertEqual($x, $y)</span></td>
+<td>Fail if $x == $y is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotEqual($x, $y)</span></td>
+<td>Fail if $x == $y is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertWithinMargin($x, $y, $m)</span></td>
+<td>Fail if abs($x - $y) &lt; $m is false</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertOutsideMargin($x, $y, $m)</span></td>
+<td>Fail if abs($x - $y) &lt; $m is true</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertIdentical($x, $y)</span></td>
+<td>Fail if $x == $y is false or a type mismatch</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
+<td>Fail if $x == $y is true and types match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertReference($x, $y)</span></td>
+<td>Fail unless $x and $y are the same variable</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertClone($x, $y)</span></td>
+<td>Fail unless $x and $y are identical copies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertPattern($p, $x)</span></td>
+<td>Fail unless the regex $p matches $x</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoPattern($p, $x)</span></td>
+<td>Fail if the regex $p matches $x</td>
+</tr>
+                    <tr>
+<td><span class="new_code">expectError($x)</span></td>
+<td>Fail if matching error does not occour</td>
+</tr>
+                    <tr>
+<td><span class="new_code">expectException($x)</span></td>
+<td>Fail if matching exception is not thrown</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreException($x)</span></td>
+<td>Swallows any upcoming matching exception</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assert($e)</span></td>
+<td>Fail on failed <a href="expectation_documentation.html">expectation</a> object $e</td>
+</tr>
+                </tbody></table>
+                All assertion methods can take an optional description as a
+                last parameter.
+                This is to label the displayed result with.
+                If omitted a default message is sent instead, which is usually
+                sufficient.
+                This default message can still be embedded in your own message
+                if you include "%s" within the string.
+                All the assertions return true on a pass or false on failure.
+            </p>
+            <p>
+                Some examples...
+<pre>
+$variable = null;
+<strong>$this-&gt;assertNull($variable, 'Should be cleared');</strong>
+</pre>
+                ...will pass and normally show no message.
+                If you have
+                <a href="http://www.lastcraft.com/display_subclass_tutorial.php">set up the tester to display passes</a>
+                as well then the message will be displayed as is.
+<pre>
+<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
+</pre>
+                This will fail as it performs a type
+                check, as well as a comparison, between the two values.
+                The "%s" part is replaced by the default
+                error message that would have been shown if we had not
+                supplied our own.
+<pre>
+$a = 1;
+$b = $a;
+<strong>$this-&gt;assertReference($a, $b);</strong>
+</pre>
+                Will fail as the variable <span class="new_code">$a</span> is a copy of <span class="new_code">$b</span>.
+<pre>
+<strong>$this-&gt;assertPattern('/hello/i', 'Hello world');</strong>
+</pre>
+                This will pass as using a case insensitive match the string
+                <span class="new_code">hello</span> is contained in <span class="new_code">Hello world</span>.
+<pre>
+<strong>$this-&gt;expectError();</strong>
+trigger_error('Catastrophe');
+</pre>
+                Here the check catches the "Catastrophe"
+                message without checking the text and passes.
+                This removes the error from the queue.
+<pre>
+<strong>$this-&gt;expectError('Catastrophe');</strong>
+trigger_error('Catastrophe');
+</pre>
+                The next error check tests not only the existence of the error,
+                but also the text which, here matches so another pass.
+                If any unchecked errors are left at the end of a test method then
+                an exception will be reported in the test.
+            </p>
+            <p>
+                Note that SimpleTest cannot catch compile time PHP errors.
+            </p>
+            <p>
+                The test cases also have some convenience methods for debugging
+                code or extending the suite...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setUp()</span></td>
+<td>Runs this before each test method</td>
+</tr>
+                    <tr>
+<td><span class="new_code">tearDown()</span></td>
+<td>Runs this after each test method</td>
+</tr>
+                    <tr>
+<td><span class="new_code">pass()</span></td>
+<td>Sends a test pass</td>
+</tr>
+                    <tr>
+<td><span class="new_code">fail()</span></td>
+<td>Sends a test failure</td>
+</tr>
+                    <tr>
+<td><span class="new_code">error()</span></td>
+<td>Sends an exception event</td>
+</tr>
+                    <tr>
+<td><span class="new_code">signal($type, $payload)</span></td>
+<td>Sends a user defined message to the test reporter</td>
+</tr>
+                    <tr>
+<td><span class="new_code">dump($var)</span></td>
+<td>Does a formatted <span class="new_code">print_r()</span> for quick and dirty debugging</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+        <h2>
+<a class="target" name="extending_unit"></a>Extending test cases</h2>
+            <p>
+                Of course additional test methods can be added to create
+                specific types of test case, so as to extend framework...
+<pre>
+require_once('simpletest/autorun.php');
+<strong>
+class FileTester extends UnitTestCase {
+    function FileTester($name = false) {
+        $this-&gt;UnitTestCase($name);
+    }
+
+    function assertFileExists($filename, $message = '%s') {
+        $this-&gt;assertTrue(
+                file_exists($filename),
+                sprintf($message, 'File [$filename] existence check'));
+    }</strong>
+}
+</pre>
+                Here the SimpleTest library is held in a folder called
+                <em>simpletest</em> that is local.
+                Substitute your own path for this.
+            </p>
+            <p>
+                To prevent this test case being run accidently, it is
+                advisable to mark it as <span class="new_code">abstract</span>.
+            </p>
+            <p>
+                Alternatively you could add a
+                <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>
+                directive in your code.
+            </p>
+            <p>
+                This new case can be now be inherited just like
+                a normal test case...
+<pre>
+class FileTestCase extends <strong>FileTester</strong> {
+
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');<strong>
+        $this-&gt;assertFileExists('../temp/test.txt');</strong>
+    }
+}
+</pre>
+            </p>
+            <p>
+                If you want a test case that does not have all of the
+                <span class="new_code">UnitTestCase</span> assertions,
+                only your own and a few basics,
+                you need to extend the <span class="new_code">SimpleTestCase</span>
+                class instead.
+                It is found in <em>simple_test.php</em> rather than
+                <em>unit_tester.php</em>.
+                See <a href="group_test_documentation.html">later</a> if you
+                want to incorporate other unit tester's
+                test cases in your test suites.
+            </p>
+        
+        <h2>
+<a class="target" name="running_unit"></a>Running a single test case</h2>
+            <p>
+                You won't often run single test cases except when bashing
+                away at a module that is having difficulty, and you don't
+                want to upset the main test suite.
+                With <em>autorun</em> no particular scaffolding is needed,
+                just launch your particular test file and you're ready to go.
+            </p>
+            <p>
+                You can even decide which reporter (for example,
+                <span class="new_code">TextReporter</span> or <span class="new_code">HtmlReporter</span>)
+                you prefer for a specific file when launched on its own...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+SimpleTest :: prefer(new TextReporter());</strong>
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    ...
+}
+?&gt;
+</pre>
+                This script will run as is, but of course will output zero passes
+                and zero failures until test methods are added.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">Full API for SimpleTest</a>
+            from the PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <span class="chosen">Unit tester</span>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/web_tester_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/web_tester_documentation.html
new file mode 100644
index 000000000..aa9df50a6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/en/web_tester_documentation.html
@@ -0,0 +1,588 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>SimpleTest for PHP web script testing documentation</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <span class="chosen">Web tester</span>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Web tester documentation</h1>
+        This page...
+        <ul>
+<li>
+            Successfully <a href="#fetch">fetching a web page</a>
+        </li>
+<li>
+            Testing the <a href="#content">page content</a>
+        </li>
+<li>
+            <a href="#navigation">Navigating a web site</a>
+            while testing
+        </li>
+<li>
+            <a href="#request">Raw request modifications</a> and debugging methods
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="fetch"></a>Fetching a page</h2>
+            <p>
+                Testing classes is all very well, but PHP is predominately
+                a language for creating functionality within web pages.
+                How do we test the front end presentation role of our PHP
+                applications?
+                Well the web pages are just text, so we should be able to
+                examine them just like any other test data.
+            </p>
+            <p>
+                This leads to a tricky issue.
+                If we test at too low a level, testing for matching tags
+                in the page with pattern matching for example, our tests will
+                be brittle.
+                The slightest change in layout could break a large number of
+                tests.
+                If we test at too high a level, say using mock versions of a
+                template engine, then we lose the ability to automate some classes
+                of test.
+                For example, the interaction of forms and navigation will
+                have to be tested manually.
+                These types of test are extremely repetitive and error prone.
+            </p>
+            <p>
+                SimpleTest includes a special form of test case for the testing
+                of web page actions.
+                The <span class="new_code">WebTestCase</span> includes facilities
+                for navigation, content and cookie checks and form handling.
+                Usage of these test cases is similar to the
+                <a href="unit_tester_documentation.html">UnitTestCase</a>...
+<pre>
+<strong>class TestOfLastcraft extends WebTestCase {
+}</strong>
+</pre>
+                Here we are about to test the
+                <a href="http://www.lastcraft.com/">Last Craft</a> site itself.
+                If this test case is in a file called <em>lastcraft_test.php</em>
+                then it can be loaded in a runner script just like unit tests...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+require_once('simpletest/web_tester.php');</strong>
+SimpleTest::prefer(new TextReporter());
+
+class WebTests extends TestSuite {
+    function WebTests() {
+        $this-&gt;TestSuite('Web site tests');<strong>
+        $this-&gt;addFile('lastcraft_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                I am using the text reporter here to more clearly
+                distinguish the web content from the test output.
+            </p>
+            <p>
+                Nothing is being tested yet.
+                We can fetch the home page by using the
+                <span class="new_code">get()</span> method...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    <strong>
+    function testHomepage() {
+        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
+    }</strong>
+}
+</pre>
+                The <span class="new_code">get()</span> method will
+                return true only if page content was successfully
+                loaded.
+                It is a simple, but crude way to check that a web page
+                was actually delivered by the web server.
+                However that content may be a 404 response and yet
+                our <span class="new_code">get()</span> method will still return true.
+            </p>
+            <p>
+                Assuming that the web server for the Last Craft site is up
+                (sadly not always the case), we should see...
+<pre class="shell">
+Web site tests
+OK
+Test cases run: 1/1, Failures: 0, Exceptions: 0
+</pre>
+                All we have really checked is that any kind of page was
+                returned.
+                We don't yet know if it was the right one.
+            </p>
+        
+        <h2>
+<a class="target" name="content"></a>Testing page content</h2>
+            <p>
+                To confirm that the page we think we are on is actually the
+                page we are on, we need to verify the page content.
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/');
+        $this-&gt;assertText('Why the last craft');</strong>
+    }
+}
+</pre>
+                The page from the last fetch is held in a buffer in
+                the test case, so there is no need to refer to it directly.
+                The pattern match is always made against the buffer.
+            </p>
+            <p>
+                Here is the list of possible content assertions...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertTitle($title)</span></td>
+<td>Pass if title is an exact match</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertText($text)</span></td>
+<td>Pass if matches visible and "alt" text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoText($text)</span></td>
+<td>Pass if doesn't match visible and "alt" text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertPattern($pattern)</span></td>
+<td>A Perl pattern match against the page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoPattern($pattern)</span></td>
+<td>A Perl pattern match to not find content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLink($label)</span></td>
+<td>Pass if a link with this text is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLink($label)</span></td>
+<td>Pass if no link with this text is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLinkById($id)</span></td>
+<td>Pass if a link with this id attribute is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLinkById($id)</span></td>
+<td>Pass if no link with this id attribute is present</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertField($name, $value)</span></td>
+<td>Pass if an input tag with this name has this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFieldById($id, $value)</span></td>
+<td>Pass if an input tag with this id has this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertResponse($codes)</span></td>
+<td>Pass if HTTP response matches this list</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertMime($types)</span></td>
+<td>Pass if MIME type is in this list</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertAuthentication($protocol)</span></td>
+<td>Pass if the current challenge is this protocol</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoAuthentication()</span></td>
+<td>Pass if there is no current challenge</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertRealm($name)</span></td>
+<td>Pass if the current challenge realm matches</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeader($header, $content)</span></td>
+<td>Pass if a header was fetched matching this value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoHeader($header)</span></td>
+<td>Pass if a header was not fetched</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertCookie($name, $value)</span></td>
+<td>Pass if there is currently a matching cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoCookie($name)</span></td>
+<td>Pass if there is currently no cookie of this name</td>
+</tr>
+                </tbody></table>
+                As usual with the SimpleTest assertions, they all return
+                false on failure and true on pass.
+                They also allow an optional test message and you can embed
+                the original test message inside using "%s" inside
+                your custom message.
+            </p>
+            <p>
+                So now we could instead test against the title tag with...
+<pre>
+<strong>$this-&gt;assertTitle('The Last Craft? Web developer tutorials on PHP, Extreme programming and Object Oriented development');</strong>
+</pre>
+                ...or, if that is too long and fragile...
+<pre>
+<strong>$this-&gt;assertTitle(new PatternExpectation('/The Last Craft/'));</strong>
+</pre>
+                As well as the simple HTML content checks we can check
+                that the MIME type is in a list of allowed types with...
+<pre>
+<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
+</pre>
+                More interesting is checking the HTTP response code.
+                Like the MIME type, we can assert that the response code
+                is in a list of allowed values...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testRedirects() {
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(200);&lt;/strong&gt;
+    }
+}
+</pre>
+                Here we are checking that the fetch is successful by
+                allowing only a 200 HTTP response.
+                This test will pass, but it is not actually correct to do so.
+                There is no page, instead the server issues a redirect.
+                The <span class="new_code">WebTestCase</span> will
+                automatically follow up to three such redirects.
+                The tests are more robust this way and we are usually
+                interested in the interaction with the pages rather
+                than their delivery.
+                If the redirects are of interest then this ability must
+                be disabled...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;setMaximumRedirects(0);</strong>
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(200);
+    }
+}
+</pre>
+                The assertion now fails as expected...
+<pre class="shell">
+Web site tests
+1) Expecting response in [200] got [302]
+    in testhomepage
+    in testoflastcraft
+    in lastcraft_test.php
+FAILURES!!!
+Test cases run: 1/1, Failures: 1, Exceptions: 0
+</pre>
+                We can modify the test to correctly assert redirects with...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;setMaximumRedirects(0);
+        $this-&gt;get('http://www.lastcraft.com/test/redirect.php');
+        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
+    }
+}
+</pre>
+                This now passes.
+            </p>
+        
+        <h2>
+<a class="target" name="navigation"></a>Navigating a web site</h2>
+            <p>
+                Users don't often navigate sites by typing in URLs, but by
+                clicking links and buttons.
+                Here we confirm that the contact details can be reached
+                from the home page...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    ...
+    function testContact() {
+        $this-&gt;get('http://www.lastcraft.com/');<strong>
+        $this-&gt;clickLink('About');
+        $this-&gt;assertTitle(new PatternExpectation('/About Last Craft/'));</strong>
+    }
+}
+</pre>
+                The parameter is the text of the link.
+            </p>
+            <p>
+                If the target is a button rather than an anchor tag, then
+                <span class="new_code">clickSubmit()</span> can be used
+                with the button title...
+<pre>
+<strong>$this-&gt;clickSubmit('Go!');</strong>
+</pre>
+                If you are not sure or don't care, the usual case, then just
+                use the <span class="new_code">click()</span> method...
+<pre>
+<strong>$this-&gt;click('Go!');</strong>
+</pre>
+            </p>
+            <p>
+                The list of navigation methods is...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>The current location</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Send a GET request with these parameters</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Send a POST request with these parameters</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Send a HEAD request without replacing the page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Reload the last request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Like the browser back button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Like the browser forward button</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($name, $password)</span></td>
+<td>Retry after a challenge</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart()</span></td>
+<td>Restarts the browser as if a new session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookie($name)</span></td>
+<td>Gets the cookie value for the current context</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Ages current cookies prior to a restart</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Go back to treating all frames as one page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Click the first button with this label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Click the button with this name attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Click the button with this ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Click an input tag of type image by title or alt text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Click an input tag of type image by name</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Click an input tag of type image by ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Submit a form without the submit value</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label, $index)</span></td>
+<td>Click an anchor by the visible label text</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Click an anchor by the ID attribute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>The name of the currently selected frame</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Focus on a frame counting from 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Focus on a frame by name</td>
+</tr>
+                </tbody></table>
+            </p>
+            <p>
+                The parameters in the <span class="new_code">get()</span>, <span class="new_code">post()</span> or
+                <span class="new_code">head()</span> methods are optional.
+                The HTTP HEAD fetch does not change the browser context, only loads
+                cookies.
+                This can be useful for when an image or stylesheet sets a cookie
+                for crafty robot blocking.
+            </p>
+            <p>
+                The <span class="new_code">retry()</span>, <span class="new_code">back()</span> and
+                <span class="new_code">forward()</span> commands work as they would on
+                your web browser.
+                They use the history to retry pages.
+                This can be handy for checking the effect of hitting the
+                back button on your forms.
+            </p>
+            <p>
+                The frame methods need a little explanation.
+                By default a framed page is treated just like any other.
+                Content will be searced for throughout the entire frameset,
+                so clicking a link will work no matter which frame
+                the anchor tag is in.
+                You can override this behaviour by focusing on a single
+                frame.
+                If you do that, all searches and actions will apply to that
+                frame alone, such as authentication and retries.
+                If a link or button is not in a focused frame then it cannot
+                be clicked.
+            </p>
+            <p>
+                Testing navigation on fixed pages only tells you when you
+                have broken an entire script.
+                For highly dynamic pages, such as for bulletin boards, this can
+                be crucial for verifying the correctness of the application.
+                For most applications though, the really tricky logic is usually in
+                the handling of forms and sessions.
+                Fortunately SimpleTest includes
+                <a href="form_testing_documentation.html">tools for testing web forms</a>
+                as well.
+            </p>
+        
+        <h2>
+<a class="target" name="request"></a>Modifying the request</h2>
+            <p>
+                Although SimpleTest does not have the goal of testing networking
+                problems, it does include some methods to modify and debug
+                the requests it makes.
+                Here is another method list...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>The last socket error</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showRequest()</span></td>
+<td>Dump the outgoing request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showHeaders()</span></td>
+<td>Dump the incoming headers</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showSource()</span></td>
+<td>Dump the raw HTML page content</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Do not load framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Set a cookie from now on</td>
+</tr>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Always add this header to the request</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Stop after this many redirects</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Kill the connection after this time between bytes</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
+<td>Make requests via this proxy URL</td>
+</tr>
+                </tbody></table>
+                These methods are principally for debugging.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            SimpleTest project page on <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            SimpleTest download page on <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            The <a href="http://simpletest.org/api/">developer's API for SimpleTest</a>
+            gives full detail on the classes and assertions available.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <span class="chosen">Web tester</span>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/authentication_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/authentication_documentation.html
new file mode 100644
index 000000000..fb9ca42d6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/authentication_documentation.html
@@ -0,0 +1,371 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation Simple Test : tester l'authentification</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur l'authentification</h1>
+        This page...
+        <ul>
+<li>
+            Passer au travers d'une <a href="#basique">authentification HTTP basique</a>
+        </li>
+<li>
+            Tester l'<a href="#cookies">authentification basée sur des cookies</a>
+        </li>
+<li>
+            Gérer les <a href="#session">sessions du navigateur</a> et les timeouts
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Un des secteurs à la fois délicat et important lors d'un test
+                de site web reste la sécurité. Tester ces schémas est au coeur
+                des objectifs du testeur web de SimpleTest.
+            </p>
+        
+        <h2>
+<a class="target" name="basique"></a>Authentification HTTP basique</h2>
+            <p>
+                Si vous allez chercher une page web protégée
+                par une authentification basique, vous hériterez d'une entête 401.
+                Nous pouvons représenter ceci par ce test...
+<pre>
+class AuthenticationTest extends WebTestCase {<strong>
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;showHeaders();
+    }</strong>
+}
+</pre>
+                Ce qui nous permet de voir les entêtes reçues...
+                <div class="demo">
+                    <h1>File test</h1>
+<pre style="background-color: lightgray; color: black">
+HTTP/1.1 401 Authorization Required
+Date: Sat, 18 Sep 2004 19:25:18 GMT
+Server: Apache/1.3.29 (Unix) PHP/4.3.4
+WWW-Authenticate: Basic realm="SimpleTest basic authentication"
+Connection: close
+Content-Type: text/html; charset=iso-8859-1
+</pre>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                Sauf que nous voulons éviter l'inspection visuelle,
+                on souhaite que SimpleTest puisse nous dire si oui ou non
+                la page est protégée. Voici un test en profondeur sur nos entêtes...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;assertAuthentication('Basic');
+        $this-&gt;assertResponse(401);
+        $this-&gt;assertRealm('SimpleTest basic authentication');</strong>
+    }
+}
+</pre>
+                N'importe laquelle de ces assertions suffirait,
+                tout dépend de la masse de détails que vous souhaitez voir.
+            </p>
+            <p>
+                Un des axes qui traverse SimpleTest est la possibilité d'utiliser
+				des objets <span class="new_code">SimpleExpectation</span> à chaque fois qu'une
+				vérification simple suffit.
+				Si vous souhaitez vérifiez simplement le contenu du realm - l'identification
+				du domaine - dans notre exemple, il suffit de faire...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function test401Header() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');
+        $this-&gt;assertRealm(<strong>new PatternExpectation('/simpletest/i')</strong>);
+    }
+}
+</pre>
+                Ce type de test, vérifier les réponses HTTP, n'est cependant pas commun.
+            </p>
+			<p>
+                La plupart du temps, nous ne souhaitons pas tester
+                l'authentification en elle-même, mais plutôt
+                les pages protégées par cette authentification.
+                Dès que la tentative d'authentification est reçue,
+                nous pouvons y répondre à l'aide d'une réponse d'authentification :
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testAuthentication() {
+        $this-&gt;get('http://www.lastcraft.com/protected/');<strong>
+        $this-&gt;authenticate('Me', 'Secret');</strong>
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                Le nom d'utilisateur et le mot de passe seront désormais
+                envoyés à chaque requête vers ce répertoire
+                et ses sous-répertoires.
+                En revanche vous devrez vous authentifier à nouveau
+                si vous sortez de ce répertoire mais SimpleTest est assez
+                intelligent pour fusionner les sous-répertoires dans un même domaine.
+            </p>
+            <p>
+                Vous pouvez gagner une ligne en définissant
+                l'authentification au niveau de l'URL...
+<pre>
+class AuthenticationTest extends WebTestCase {
+    function testCanReadAuthenticatedPages() {
+        $this-&gt;get('http://<strong>Me:Secret@</strong>www.lastcraft.com/protected/');
+        $this-&gt;assertTitle(...);
+    }
+}
+</pre>
+                Si votre nom d'utilisateur ou mot de passe comporte
+                des caractères spéciaux, alors n'oubliez pas de les encoder,
+                sinon la requête ne sera pas analysée correctement.
+                De plus cette entête ne sera pas envoyée aux
+                sous requêtes si vous la définissez avec une URL absolue.
+                Par contre si vous naviguez avec des URL relatives,
+                l'information d'authentification sera préservée.
+            </p>
+            <p>
+                Normalement, vous utilisez l'appel <span class="new_code">authenticate()</span>. SimpleTest
+				utilisera alors vos informations de connexion à chaque requête.
+            </p>
+            <p>
+                 Pour l'instant, seule l'authentification de base est implémentée
+                 et elle n'est réellement fiable qu'en tandem avec une connexion HTTPS.
+                 C'est généralement suffisant pour protéger
+                 le serveur testé des regards malveillants.
+                 Les authentifications Digest et NTLM pourraient être ajoutées prochainement.
+            </p>
+        
+        <h2>
+<a class="target" name="cookies"></a>Cookies</h2>
+            <p>
+                L'authentification de base ne donne pas assez de contrôle
+                au développeur Web sur l'interface utilisateur.
+                Il y a de forte chance pour que cette fonctionnalité
+                soit codée directement dans l'architecture web
+                à grand renfort de cookies et de timeouts compliqués.
+            </p>
+            <p>
+                Commençons par un simple formulaire de connexion...
+<pre>
+&lt;form&gt;
+    Username:
+    &lt;input type="text" name="u" value="" /&gt;&lt;br /&gt;
+    Password:
+    &lt;input type="password" name="p" value="" /&gt;&lt;br /&gt;
+    &lt;input type="submit" value="Log in" /&gt;
+&lt;/form&gt;
+</pre>
+                Lequel doit ressembler à...
+            </p>
+            <p>
+                <form class="demo">
+                    Username:
+                    <input type="text" name="u" value=""><br>
+                    Password:
+                    <input type="password" name="p" value=""><br>
+                    <input type="submit" value="Log in">
+                </form>
+            </p>
+            <p>
+                Supposons que, durant le chargement de la page,
+                un cookie ait été inscrit avec un numéro d'identifiant de session.
+                Nous n'allons pas encore remplir le formulaire,
+                juste tester que nous pistons bien l'utilisateur.
+                Voici le test...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieSetBeforeForm() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;assertCookie('SID');</strong>
+    }
+}
+</pre>
+                Nous nous contentons ici de vérifier que le cookie a bien été défini.
+                Etant donné que sa valeur est plutôt énigmatique,
+                elle ne vaudrait pas la peine d'être testée avec...
+<pre>
+class LogInTest extends WebTestCase {
+    function testSessionCookieIsCorrectPattern() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;assertCookie('SID', <strong>new PatternExpectation('/[a-f0-9]{32}/i')</strong>);
+    }
+}
+</pre>
+                Si vous utilisez PHP pour gérer vos sessions alors
+				ce test est encore plus inutile, étant donné qu'il ne fait
+				que tester PHP lui-même.
+            </p>
+            <p>
+                Le test le plus simple pour vérifier que la connexion a bien eu lieu
+				reste d'inspecter visuellement la page suivante :
+				un simple appel à <span class="new_code">WebTestCase::assertText()</span> et le tour est joué.
+            </p>
+            <p>
+                Le reste du test est le même que dans n'importe quel autre formulaire,
+                mais nous pourrions souhaiter nous assurer
+                que le cookie n'a pas été modifié depuis la phase de connexion.
+                Voici comment cela pourrait être testé :
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $session = $this-&gt;getCookie('SID');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');
+        $this-&gt;assertCookie('SID', $session);</strong>
+    }
+}
+</pre>
+                Ceci confirme que l'identifiant de session
+                est identique avant et après la connexion.
+            </p>
+            <p>
+                Nous pouvons même essayer de duper notre propre système
+                en créant un cookie arbitraire pour se connecter...
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testSessionCookieSameAfterLogIn() {
+        $this-&gt;get('http://www.my-site.com/login.php');<strong>
+        $this-&gt;setCookie('SID', 'Some other session');
+        $this-&gt;get('http://www.my-site.com/restricted.php');</strong>
+        $this-&gt;assertWantedPattern('/Access denied/');
+    }
+}
+</pre>
+                Votre site est-il protégé contre ce type d'attaque ?
+            </p>
+        
+        <h2>
+<a class="target" name="session"></a>Sessions de navigateur</h2>
+            <p>
+                Si vous testez un système d'authentification,
+                la reconnexion par un utilisateur est un point sensible.
+                Essayons de simuler ce qui se passe dans ce cas :
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterBrowserClose() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');<strong>
+        
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertWantedPattern('/Access denied/');</strong>
+    }
+}
+</pre>
+                La méthode <span class="new_code">WebTestCase::restart()</span> préserve les cookies
+                dont le timeout a expiré, mais conserve les cookies temporaires ou expirés.
+                Vous pouvez spécifier l'heure et la date de leur réactivation.
+            </p>
+            <p>
+                L'expiration des cookies peut être un problème.
+                Si vous avez un cookie qui doit expirer au bout d'une heure,
+                nous n'allons pas mettre le test en veille en attendant
+                que le cookie expire...
+            </p>
+            <p>
+                Afin de provoquer leur expiration,
+                vous pouvez dater manuellement les cookies,
+                avant le début de la session.
+<pre>
+class LogInTest extends WebTestCase {
+    ...
+    function testLoseAuthenticationAfterOneHour() {
+        $this-&gt;get('http://www.my-site.com/login.php');
+        $this-&gt;setField('u', 'Me');
+        $this-&gt;setField('p', 'Secret');
+        $this-&gt;clickSubmit('Log in');
+        $this-&gt;assertWantedPattern('/Welcome Me/');
+        <strong>
+        $this-&gt;ageCookies(3600);</strong>
+        $this-&gt;restart();
+        $this-&gt;get('http://www.my-site.com/restricted.php');
+        $this-&gt;assertWantedPattern('/Access denied/');
+    }
+}
+</pre>
+                Après le redémarrage, les cookies seront plus vieux
+                d'une heure et que tous ceux dont la date d'expiration
+                sera passée auront disparus.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a> donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/browser_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/browser_documentation.html
new file mode 100644
index 000000000..6be126777
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/browser_documentation.html
@@ -0,0 +1,500 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : le composant de navigation web scriptable</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le navigateur scriptable</h1>
+        This page...
+        <ul>
+<li>
+            Utiliser le <a href="#scripting">navigateur web dans des scripts</a>
+        </li>
+<li>
+            <a href="#deboguer">Déboguer</a> les erreurs sur les pages
+        </li>
+<li>
+            <a href="#unit">Tests complexes avec des navigateurs web multiples</a>
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Le composant de navigation web de SimpleTest peut être utilisé
+                non seulement à l'extérieur de la classe <span class="new_code">WebTestCase</span>,
+                mais aussi indépendamment du framework SimpleTest lui-même.
+            </p>
+        
+        <h2>
+<a class="target" name="script"></a>Le navigateur scriptable</h2>
+            <p>
+                Vous pouvez utiliser le navigateur web dans des scripts PHP
+                pour confirmer que des services marchent bien comme il faut
+                ou pour extraire des informations à partir de ceux-ci de façon régulière.
+                Par exemple, voici un petit script pour extraire
+                le nombre de bogues ouverts dans PHP 5 à partir
+                du <a href="http://www.php.net/">site web PHP</a>...
+<pre>
+&lt;?php
+    require_once('simpletest/browser.php');
+    
+    $browser = &amp;new SimpleBrowser();
+    $browser-&gt;get('http://php.net/');
+    $browser-&gt;clickLink('reporting bugs');
+    $browser-&gt;clickLink('statistics');
+    $browser-&gt;clickLink('PHP 5 bugs only');
+    $page = $browser-&gt;getContent();
+    preg_match('/status=Open.*?by=Any.*?(\d+)&lt;\/a&gt;/', $page, $matches);
+    print $matches[1];
+?&gt;
+</pre>
+                Bien sûr Il y a des méthodes plus simple pour réaliser
+                cet exemple en PHP. Par exemple, vous pourriez juste
+                utiliser la commande PHP <span class="new_code">file()</span> sur ce qui est
+                ici une page fixe. Cependant, en utilisant des scripts
+                avec le navigateur web vous vous autorisez l'authentification,
+                la gestion des cookies, le chargement automatique des fenêtres,
+                les redirections, la transmission de formulaires et la capacité
+                d'examiner les entêtes.
+			</p>
+			<p>
+				Ces méthodes qui se basent sur le contenu textuel des pages
+				sont fragiles dans un site en constante évolution
+				et vous voudrez employer une méthode plus directe
+				pour accéder aux données de façon permanente,
+                mais pour des tâches simples cette technique peut s'avérer
+                une solution très rapide.
+            </p>
+            <p>
+                Toutes les méthode de navigation utilisées dans <a href="web_tester_documentation.html">WebTestCase</a> sont présente dans la classe <span class="new_code">SimpleBrowser</span>, mais les assertions sont remplacées par de simples accesseurs. Voici une liste complète des méthodes de navigation de page à page...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Ajouter une entête à chaque téléchargement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $username, $password)</span></td>
+<td>Utilise ce proxy à partir de maintenant</td>
+</tr> 
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Effectue une requête HEAD</td>
+</tr>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Télécharge une page avec un GET</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Télécharge une page avec un POST</td>
+</tr>
+                    <tr>
+<td><span class="new_code">click($label)</span></td>
+<td>Suit un lien visible ou un bouton texte par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label)</span></td>
+<td>Suit un lien par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isLink($label)</span></td>
+<td>Vérifie l'existance d'un lien par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Suit un lien par son attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isLinkById($id)</span></td>
+<td>Vérifie l'existance d'un lien par son attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>La page ou la fenêtre URL en cours</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTitle()</span></td>
+<td>Le titre de la page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContent()</span></td>
+<td>Le page ou la fenêtre brute</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getContentAsText()</span></td>
+<td>Sans code HTML à l'exception du text "alt"</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Répète la dernière requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Utilise le bouton "précédent" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Utilise le bouton "suivant" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($username, $password)</span></td>
+<td>Retente la page ou la fenêtre après une réponse 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">restart($date)</span></td>
+<td>Relance le navigateur pour une nouvelle session</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ageCookies($interval)</span></td>
+<td>Change la date des cookies</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Lance un nouveau cookie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCookieValue($host, $path, $name)</span></td>
+<td>Lit le cookie le plus spécifique</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getCurrentCookieValue($name)</span></td>
+<td>Lit le contenue du cookie en cours</td>
+</tr>
+                </tbody></table>
+                Les méthode <span class="new_code">SimpleBrowser::useProxy()</span> et
+                <span class="new_code">SimpleBrowser::addHeader()</span> sont spéciales.
+                Une fois appelées, elles continuent à s'appliquer sur les téléchargements suivants.
+            </p>
+            <p>
+                Naviguer dans les formulaires est similaire à la <a href="form_testing_documentation.html">navigation des formulaires via WebTestCase</a>...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setField($label, $value)</span></td>
+<td>Modifie tous les champs avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldByName($name, $value)</span></td>
+<td>Modifie tous les champs avec ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFieldById($id, $value)</span></td>
+<td>Modifie tous les champs avec cet identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getField($label)</span></td>
+<td>Accesseur de la valeur d'un élément de formulaire avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldByName($name)</span></td>
+<td>Accesseur de la valeur d'un élément de formulaire avec ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFieldById($id)</span></td>
+<td>Accesseur de la valeur de l'élément de formulaire avec cet identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Transmet le formulaire avec l'étiquette de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Transmet le formulaire avec l'attribut de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Transmet le formulaire avec l'identifiant de son bouton</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son attribut (name="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Transmet le formulaire par son identifiant propre</td>
+</tr>
+                </tbody></table>
+                Au jourd d'aujourd'hui il n'existe pas beaucoup de méthodes pour lister
+                les formulaires et les champs disponibles.
+				<table><tbody>
+                    <tr>
+<td><span class="new_code">isClickable($label)</span></td>
+<td>Vérifie si un lien existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isSubmit($label)</span></td>
+<td>Vérifie si un bouton existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">isImage($label)</span></td>
+<td>Vérifie si un bouton image existe avec cette étiquette ou ce nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLink($label)</span></td>
+<td>Trouve une URL à partir de son label</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getLinkById($label)</span></td>
+<td>Trouve une URL à partir de son identifiant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrls()</span></td>
+<td>Liste l'ensemble des liens de la page courante</td>
+</tr>
+                </tbody></table>
+				Ce sera probablement
+                ajouté dans des versions successives de SimpleTest.
+            </p>
+            <p>
+                A l'intérieur d'une page, les fenêtres individuelles peuvent être
+                sélectionnées. Si aucune sélection n'est réalisée alors
+                toutes les fenêtres sont fusionnées ensemble dans
+                une unique et grande page.
+                Le contenu de la page en cours sera une concaténation des
+                toutes les fenêtres dans l'ordre spécifié par les balises "frameset".
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getFrames()</span></td>
+<td>Un déchargement de la structure de la fenêtre courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>L'index ou l'étiquette de la fenêtre en courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Sélectionne la fenêtre numérotée à partir de 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Sélectionne une fenêtre par son étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Traite toutes les fenêtres comme une seule page</td>
+</tr>
+                </tbody></table>
+                Lorsqu'on est focalisé sur une fenêtre unique,
+                le contenu viendra de celle-ci uniquement.
+                Cela comprend les liens à cliquer et les formulaires à transmettre.
+            </p>
+        
+        <h2>
+<a class="target" name="deboguer"></a>Où sont les erreurs ?</h2>
+            <p>
+                Toute cette masse de fonctionnalités est géniale
+                lorsqu'on arrive à bien télécharger les pages,
+                mais ce n'est pas toujours évident.
+                Pour aider à découvrir les erreurs, le navigateur a aussi
+                des méthodes pour aider au débogage.
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Ferme la socket avec un délai trop long</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>L'URL de la page chargée le plus récemment</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRequest()</span></td>
+<td>L'entête de la requête brute de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getHeaders()</span></td>
+<td>L'entête de réponse de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>N'importe quel erreur au niveau de la socket dans le dernier téléchargement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getResponseCode()</span></td>
+<td>La réponse HTTP de la page ou de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getMimeType()</span></td>
+<td>Le type Mime de la page our de la fenêtre</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getAuthentication()</span></td>
+<td>Le type d'authentification dans l'entête d'une provocation 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getRealm()</span></td>
+<td>Le realm d'authentification dans l'entête d'une provocation 401</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getBaseUrl()</span></td>
+<td>Uniquement la base de l'URL de la page chargée le plus récemment</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>Nombre de redirections avant que la page ne soit chargée automatiquement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumNestedFrames($max)</span></td>
+<td>Protection contre des framesets récursifs</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Neutralise le support des fenêtres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useFrames()</span></td>
+<td>Autorise le support des fenêtres</td>
+</tr>
+                </tbody></table>
+                Les méthodes <span class="new_code">SimpleBrowser::setConnectionTimeout()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumRedirects()</span>,
+                <span class="new_code">SimpleBrowser::setMaximumNestedFrames()</span>,
+                <span class="new_code">SimpleBrowser::ignoreFrames()</span>
+                et <span class="new_code">SimpleBrowser::useFrames()</span> continuent à s'appliquer
+                sur toutes les requêtes suivantes.
+                Les autres méthodes tiennent compte des fenêtres.
+                Cela veut dire que si une fenêtre individuelle ne se charge pas,
+                il suffit de se diriger vers elle avec
+                <span class="new_code">SimpleBrowser::setFrameFocus()</span> : ensuite on utilisera
+                <span class="new_code">SimpleBrowser::getRequest()</span>, etc. pour voir ce qui se passe.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Tests unitaires complexes avec des navigateurs multiples</h2>
+            <p>
+                Tout ce qui peut être fait dans
+                <a href="web_tester_documentation.html">WebTestCase</a> peut maintenant
+                être fait dans un <a href="unit_tester_documentation.html">UnitTestCase</a>.
+                Ce qui revient à dire que nous pouvons librement mélanger
+                des tests sur des objets de domaine avec l'interface web...
+<pre><strong>
+class TestOfRegistration extends UnitTestCase {
+    function testNewUserAddedToAuthenticator() {</strong>
+        $browser = new SimpleBrowser();
+        $browser-&gt;get('http://my-site.com/register.php');
+        $browser-&gt;setField('email', 'me@here');
+        $browser-&gt;setField('password', 'Secret');
+        $browser-&gt;clickSubmit('Register');
+        <strong>
+        $authenticator = new Authenticator();
+        $member = $authenticator-&gt;findByEmail('me@here');
+        $this-&gt;assertEqual($member-&gt;getPassword(), 'Secret');</strong>
+    }
+}
+</pre>
+                Bien que ça puisse être utile par convenance temporaire,
+                je ne suis pas fan de ce genre de test. Ce test s'applique
+                à plusieurs couches de l'application, ça implique qu'il est
+                plus que probable qu'il faudra le remanier lorsque le code changera.
+            </p>
+            <p>
+                Un cas plus utile d'utilisation directe du navigateur est
+                le moment où le <span class="new_code">WebTestCase</span> ne peut plus suivre.
+                Un exemple ? Quand deux navigateurs doivent être utilisés en même temps.
+            </p>
+            <p>
+                Par exemple, supposons que nous voulions interdire
+                des usages simultanés d'un site avec le même login d'identification.
+                Ce scénario de test le vérifie...
+<pre>
+class TestOfSecurity extends UnitTestCase {
+    function testNoMultipleLoginsFromSameUser() {
+        $first = &amp;new SimpleBrowser();
+        $first-&gt;get('http://my-site.com/login.php');
+        $first-&gt;setField('name', 'Me');
+        $first-&gt;setField('password', 'Secret');
+        $first-&gt;clickSubmit('Enter');
+        $this-&gt;assertEqual($first-&gt;getTitle(), 'Welcome');
+        
+        $second = &amp;new SimpleBrowser();
+        $second-&gt;get('http://my-site.com/login.php');
+        $second-&gt;setField('name', 'Me');
+        $second-&gt;setField('password', 'Secret');
+        $second-&gt;clickSubmit('Enter');
+        $this-&gt;assertEqual($second-&gt;getTitle(), 'Access Denied');
+    }
+}
+</pre>
+                Vous pouvez aussi utiliser la classe <span class="new_code">SimpleBrowser</span>
+                quand vous souhaitez écrire des scénarios de test en utilisant
+                un autre outil que SimpleTest, comme PHPUnit par exemple.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API de développeur pour SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/docs.css b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/docs.css
new file mode 100644
index 000000000..49170486a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/docs.css
@@ -0,0 +1,84 @@
+body {
+    padding-left: 3%;
+    padding-right: 3%;
+}
+pre {
+    font-family: "courier new", courier;
+    font-size: 80%;
+    border: 1px solid;
+    background-color: #cccccc;
+    padding: 5px;
+    margin-left: 5%;
+    margin-right: 8%;
+}
+.code, .new_code, pre.new_code {
+    font-weight: bold;
+}
+div.copyright {
+    font-size: 80%;
+    color: gray;
+}
+div.copyright a {
+    color: gray;
+}
+ul.api {
+    padding-left: 0em;
+    padding-right: 25%;
+}
+ul.api li {
+    margin-top: 0.2em;
+    margin-bottom: 0.2em;
+    list-style: none;
+    text-indent: -3em;
+    padding-left: 3em;
+}
+div.demo {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: white;
+}
+div.demo span.fail {
+    color: red;
+}
+div.demo span.pass {
+    color: green;
+}
+div.demo h1 {
+    font-size: 12pt;
+    text-align: left;
+    font-weight: bold;
+}
+table {
+    border: 2px outset;
+    border-color: gray;
+    background-color: white;
+    margin: 5px;
+    margin-left: 5%;
+    margin-right: 5%;
+}
+td {
+    font-size: 80%;
+}
+.shell {
+    color: white;
+}
+pre.shell {
+    border: 4px ridge;
+    border-color: gray;
+    padding: 10px;
+    margin: 5px;
+    margin-left: 20px;
+    margin-right: 40px;
+    background-color: black;
+}
+form.demo {
+    background-color: lightgray;
+    border: 4px outset;
+    border-color: lightgray;
+    padding: 10px;
+    margin-right: 40%;
+}
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/expectation_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/expectation_documentation.html
new file mode 100644
index 000000000..ee579110a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/expectation_documentation.html
@@ -0,0 +1,451 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : étendre le testeur unitaire avec des classes d'attentes supplémentaires</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les attentes</h1>
+        This page...
+        <ul>
+<li>
+            Utiliser les attentes <a href="#fantaisie">pour des tests
+            plus précis avec des objets fantaisie</a>
+        </li>
+<li>
+            <a href="#comportement">Changer le comportement d'un objet fantaisie</a>
+            avec des attentes
+        </li>
+<li>
+            <a href="#etendre">Créer des attentes</a>
+        </li>
+<li>
+            Par dessous SimpleTest <a href="#unitaire">utilise des classes d'attente</a>
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="fantaisie"></a>Plus de contrôle sur les objets fantaisie</h2>
+            <p>
+                Le comportement par défaut des
+                <a href="mock_objects_documentation.html">objets fantaisie</a> dans
+                <a href="http://sourceforge.net/projects/simpletest/">SimpleTest</a>
+                est soit une correspondance identique sur l'argument,
+                soit l'acceptation de n'importe quel argument.
+                Pour la plupart des tests, c'est suffisant.
+                Cependant il est parfois nécessaire de ramollir un scénario de test.
+            </p>
+            <p>
+                Un des endroits où un test peut être trop serré
+                est la reconnaissance textuelle. Prenons l'exemple
+                d'un composant qui produirait un message d'erreur
+                utile lorsque quelque chose plante. Il serait utile de tester
+                que l'erreur correcte est renvoyée,
+                mais le texte proprement dit risque d'être plutôt long.
+                Si vous testez le texte dans son ensemble alors
+                à chaque modification de ce même message
+                -- même un point ou une virgule -- vous aurez
+                à revenir sur la suite de test pour la modifier.
+            </p>
+            <p>
+                Voici un cas concret, nous avons un service d'actualités
+                qui a échoué dans sa tentative de connexion à sa source distante.
+<pre>
+<strong>class NewsService {
+    ...
+    function publish($writer) {
+        if (! $this-&gt;isConnected()) {
+            $writer-&gt;write('Cannot connect to news service "' .
+                    $this-&gt;_name . '" at this time. ' .
+                    'Please try again later.');
+        }
+        ...
+    }
+}</strong>
+</pre>
+                Là il envoie son contenu vers un classe <span class="new_code">Writer</span>.
+                Nous pourrions tester ce comportement avec un <span class="new_code">MockWriter</span>...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {<strong>
+        $writer = new MockWriter($this);
+        $writer-&gt;expectOnce('write', array(
+                'Cannot connect to news service ' .
+                '"BBC News" at this time. ' .
+                'Please try again later.'));
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+        
+        $writer-&gt;tally();</strong>
+    }
+}
+</pre>
+                C'est un bon exemple d'un test fragile.
+                Si nous décidons d'ajouter des instructions complémentaires,
+                par exemple proposer une source d'actualités alternative,
+                nous casserons nos tests par la même occasion sans pourtant
+                avoir modifié une seule fonctionnalité.
+            </p>
+            <p>
+                Pour contourner ce problème, nous voudrions utiliser
+                un test avec une expression rationnelle plutôt
+                qu'une correspondance exacte. Nous pouvons y parvenir avec...
+<pre>
+class TestOfNewsService extends UnitTestCase {
+    ...
+    function testConnectionFailure() {
+        $writer = new MockWriter($this);<strong>
+        $writer-&gt;expectOnce(
+                'write',
+                array(new PatternExpectation('/cannot connect/i')));</strong>
+        
+        $service = new NewsService('BBC News');
+        $service-&gt;publish($writer);
+        
+        $writer-&gt;tally();
+    }
+}
+</pre>
+                Plutôt que de transmettre le paramètre attendu au <span class="new_code">MockWriter</span>,
+                nous envoyons une classe d'attente appelée <span class="new_code">PatternExpectation</span>.
+                L'objet fantaisie est suffisamment élégant pour reconnaître
+                qu'il s'agit d'un truc spécial et pour le traiter différemment.
+                Plutôt que de comparer l'argument entrant à cet objet,
+                il utilise l'objet attente lui-même pour exécuter le test.
+            </p>
+            <p>
+                <span class="new_code">PatternExpectation</span> utilise
+                l'expression rationnelle pour la comparaison avec son constructeur.
+                A chaque fois qu'une comparaison est fait à travers
+                <span class="new_code">MockWriter</span> par rapport à cette classe attente,
+                elle fera un <span class="new_code">preg_match()</span> avec ce motif.
+                Dans notre scénario de test ci-dessus, aussi longtemps
+                que la chaîne "cannot connect" apparaît dans le texte,
+                la fantaisie transmettra un succès au testeur unitaire.
+                Peu importe le reste du texte.
+            </p>
+            <p>
+                Les classes attente possibles sont...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">AnythingExpectation</span></td>
+<td>Sera toujours validé</td>
+</tr>
+                    <tr>
+<td><span class="new_code">EqualExpectation</span></td>
+<td>Une égalité, plutôt que la plus forte comparaison à l'identique</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotEqualExpectation</span></td>
+<td>Une comparaison sur la non-égalité</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IndenticalExpectation</span></td>
+<td>La vérification par défaut de l'objet fantaisie qui doit correspondre exactement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotIndenticalExpectation</span></td>
+<td>Inverse la logique de l'objet fantaisie</td>
+</tr>
+                    <tr>
+<td><span class="new_code">PatternExpectation</span></td>
+<td>Utilise une expression rationnelle Perl pour comparer une chaîne</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NoPatternExpectation</span></td>
+<td>Passe seulement si l'expression rationnelle Perl échoue</td>
+</tr>
+                    <tr>
+<td><span class="new_code">IsAExpectation</span></td>
+<td>Vérifie le type ou le nom de la classe uniquement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">NotAExpectation</span></td>
+<td>L'opposé de <span class="new_code">IsAExpectation</span>
+</td>
+</tr>
+                    <tr>
+<td><span class="new_code">MethodExistsExpectation</span></td>
+<td>Vérifie si la méthode est disponible sur un objet</td>
+</tr>
+					<tr>
+<td><span class="new_code">TrueExpectation</span></td>
+<td>Accepte n'importe quelle variable PHP qui vaut vrai</td>
+</tr>
+                    <tr>
+<td><span class="new_code">FalseExpectation</span></td>
+<td>Accepte n'importe quelle variable PHP qui vaut faux</td>
+</tr>
+                </tbody></table>
+                La plupart utilisent la valeur attendue dans le constructeur.
+                Les exceptions sont les vérifications sur motif,
+                qui utilisent une expression rationnelle, ainsi que
+                <span class="new_code">IsAExpectation</span> et <span class="new_code">NotAExpectation</span>,
+                qui prennent un type ou un nom de classe comme chaîne.
+            </p>
+        
+        <h2>
+<a class="target" name="comportement"></a>Utiliser les attentes pour contrôler les bouchons serveur</h2>
+            <p>
+                Les classes attente peuvent servir à autre chose
+                que l'envoi d'assertions depuis les objets fantaisie,
+                afin de choisir le comportement d'un
+                <a href="mock_objects_documentation.html">objet fantaisie</a>
+                ou celui d'un <a href="server_stubs_documentation.html">bouchon serveur</a>.
+                A chaque fois qu'une liste d'arguments est donnée,
+                une liste d'objets d'attente peut être insérée à la place.
+            </p>
+            <p>
+                Mettons que nous voulons qu'un bouchon serveur
+                d'autorisation simule une connexion réussie seulement
+                si il reçoit un objet de session valide.
+                Nous pouvons y arriver avec ce qui suit...
+<pre>
+Stub::generate('Authorisation');
+<strong>
+$authorisation = new StubAuthorisation();
+$authorisation-&gt;returns(
+        'isAllowed',
+        true,
+        array(new IsAExpectation('Session', 'Must be a session')));
+$authorisation-&gt;returns('isAllowed', false);</strong>
+</pre>
+                Le comportement par défaut du bouchon serveur
+                est défini pour renvoyer <span class="new_code">false</span>
+                quand <span class="new_code">isAllowed</span> est appelé.
+                Lorsque nous appelons cette méthode avec un unique paramètre
+                qui est un objet <span class="new_code">Session</span>, il renverra <span class="new_code">true</span>.
+                Nous avons aussi ajouté un deuxième paramètre comme message.
+                Il sera affiché dans le message d'erreur de l'objet fantaisie
+                si l'attente est la cause de l'échec.
+            </p>
+            <p>
+                Ce niveau de sophistication est rarement utile :
+                il n'est inclut que pour être complet.
+            </p>
+        
+        <h2>
+<a class="target" name="etendre"></a>Créer vos propres attentes</h2>
+            <p>
+                Les classes d'attentes ont une structure très simple.
+                Tellement simple qu'il devient très simple de créer
+                vos propres version de logique pour des tests utilisés couramment.
+            </p>
+            <p>
+                Par exemple voici la création d'une classe pour tester
+                la validité d'adresses IP. Pour fonctionner correctement
+                avec les bouchons serveurs et les objets fantaisie,
+                cette nouvelle classe d'attente devrait étendre
+                <span class="new_code">SimpleExpectation</span> ou une autre de ses sous-classes...
+<pre>
+<strong>class ValidIp extends SimpleExpectation {
+    
+    function test($ip) {
+        return (ip2long($ip) != -1);
+    }
+    
+    function testMessage($ip) {
+        return "Address [$ip] should be a valid IP address";
+    }
+}</strong>
+</pre> 
+               Il n'y a véritablement que deux méthodes à mettre en place.
+               La méthode <span class="new_code">test()</span> devrait renvoyer un <span class="new_code">true</span>
+               si l'attente doit passer, et une erreur <span class="new_code">false</span>
+               dans le cas contraire. La méthode <span class="new_code">testMessage()</span>
+               ne devrait renvoyer que du texte utile à la compréhension du test en lui-même.
+            </p>
+            <p>
+                Cette classe peut désormais être employée à la place
+                des classes d'attente précédentes.
+            </p>
+			<p>
+				Voici un exemple plus typique, vérifier un hash...
+<pre>
+<strong>class JustField extends EqualExpectation {
+    private $key;
+    
+    function __construct($key, $expected) {
+        parent::__construct($expected);
+        $this-&gt;key = $key;
+    }
+    
+    function test($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return false;
+        }
+        return parent::test($compare[$this-&gt;key]);
+    }
+    
+    function testMessage($compare) {
+        if (! isset($compare[$this-&gt;key])) {
+            return 'Key [' . $this-&gt;key . '] does not exist';
+        }
+        return 'Key [' . $this-&gt;key . '] -&gt; ' .
+                parent::testMessage($compare[$this-&gt;key]);
+    }
+}</strong>
+</pre>
+                L'habitude a été prise pour séparer les clauses du message avec
+                "&amp;nbsp;-&gt;&amp;nbsp;".
+				Cela permet aux outils dérivés de reformater la sortie.
+            </p>
+            <p>
+                Supposons qu'un authentificateur s'attend à recevoir
+				une ligne de base de données correspondant à l'utilisateur,
+				et que nous avons juste besoin de valider le nom d'utilisateur.
+				Nous pouvons le faire très simplement avec... 
+<pre>
+$mock-&gt;expectOnce('authenticate',
+                  array(new JustKey('username', 'marcus')));
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="unitaire"></a>Sous le capot du testeur unitaire</h2>
+            <p>
+                Le <a href="http://sourceforge.net/projects/simpletest/">framework
+                de test unitaire SimpleTest</a> utilise aussi dans son coeur
+                des classes d'attente pour
+                la <a href="unit_test_documentation.html">classe UnitTestCase</a>.
+                Nous pouvons aussi tirer parti de ces mécanismes pour réutiliser
+                nos propres classes attente à l'intérieur même des suites de test.
+            </p>
+            <p>
+                La méthode la plus directe est d'utiliser la méthode
+                <span class="new_code">SimpleTest::assert()</span> pour effectuer le test...
+<pre>
+<strong>class TestOfNetworking extends UnitTestCase {
+    ...
+    function testGetValidIp() {
+        $server = &amp;new Server();
+        $this-&gt;assert(
+                new ValidIp(),
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');
+    }
+}</strong>
+</pre>
+                <span class="new_code">assert()</span> testera toute attente directement.
+            </p>
+			<p>
+				C'est plutôt sale par rapport à notre syntaxe habituelle
+                du type <span class="new_code">assert...()</span>.
+            </p>
+            <p>
+                Pour un cas aussi simple, nous créons d'ordinaire une méthode
+                d'assertion distincte en utilisant la classe d'attente.
+                Supposons un instant que notre attente soit un peu plus
+                compliquée et que par conséquent nous souhaitions la réutiliser,
+                nous obtenons...
+<pre>
+class TestOfNetworking extends UnitTestCase {
+    ...<strong>
+    function assertValidIp($ip, $message = '%s') {
+        $this-&gt;assertExpectation(new ValidIp(), $ip, $message);
+    }</strong>
+    
+    function testGetValidIp() {
+        $server = &amp;new Server();<strong>
+        $this-&gt;assertValidIp(
+                $server-&gt;getIp(),
+                'Server IP address-&gt;%s');</strong>
+    }
+}
+</pre>
+                It is rare to need the expectations for more than pattern
+                matching, but these facilities do allow testers to build
+                some sort of domain language for testing their application.
+                Also, complex expectation classes could make the tests
+                harder to read and debug.
+                In effect extending the test framework to create their own tool set.
+            
+			
+                Il est assez rare que le besoin d'une attente dépasse
+                le stade de la reconnaissance d'un motif, mais ils permettent
+				aux testeurs de construire leur propre langage dédié ou DSL
+				(Domain Specific Language) pour tester leurs applications.
+                Attention, les classes d'attente complexes peuvent rendre
+                les tests difficiles à lire et à déboguer.
+                Ces mécanismes sont véritablement là pour les auteurs
+                de système qui étendront le framework de test
+                pour leurs propres outils de test.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            Les attentes imitent les contraintes dans
+            <a href="http://www.jmock.org/">JMock</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
+            réalisé avec PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html
new file mode 100644
index 000000000..5ab914eda
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/form_testing_documentation.html
@@ -0,0 +1,353 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : tester des formulaires HTML</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les tests de formulaire</h1>
+        This page...
+        <ul>
+<li>
+            Modifier les valeurs d'un formulaire et
+            <a href="#submit">réussir à transmettre un simple formulaire</a>
+        </li>
+<li>
+            Gérer des <a href="#multiple">objets à valeurs multiples</a>
+            en initialisant des listes.
+        </li>
+<li>
+            Le cas des formulaires utilisant Javascript pour
+            modifier <a href="#hidden-field">un champ caché</a>
+        </li>
+<li>
+            <a href="#brut">Envoi brut</a> quand il n'existe pas de bouton à cliquer.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="submit"></a>Valider un formulaire simple</h2>
+            <p>
+                Lorsqu'une page est téléchargée par <span class="new_code">WebTestCase</span>
+                en utilisant <span class="new_code">get()</span> ou <span class="new_code">post()</span>
+                le contenu de la page est automatiquement analysé.
+                De cette analyse découle le fait que toutes les commandes
+                à l'intérieur de la balise &lt;form&gt; sont disponibles
+                depuis l'intérieur du scénario de test.
+                Prenons par exemple cet extrait de code HTML...
+<pre>
+&lt;form&gt;
+    &lt;input type="text" name="a" value="A default" /&gt;
+    &lt;input type="submit" value="Go" /&gt;
+&lt;/form&gt;
+</pre>
+                Il ressemble à...
+            </p>
+            <p>
+                <form class="demo">
+                    <input type="text" name="a" value="A default">
+                    <input type="submit" value="Go">
+                </form>
+            </p>
+            <p>
+                Nous pouvons naviguer vers ce code, via le site
+                <a href="http://www.lastcraft.com/form_testing_documentation.php">LastCraft</a>,
+                avec le test suivant...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    <strong>
+    function testDefaultValue() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('a', 'A default');
+    }</strong>
+}
+</pre>
+                Directement après le chargement de la page toutes les commandes HTML
+                sont initiées avec leur valeur par défaut, comme elles apparaîtraient
+                dans un navigateur web. L'assertion teste qu'un objet HTML
+                avec le nom "a" existe dans la page
+                et qu'il contient la valeur "A default".
+            </p>
+            <p>
+                Nous pourrions retourner le formulaire tout de suite,
+                mais d'abord nous allons changer la valeur du champ texte.
+                Ce n'est qu'après que nous le transmettrons...
+<pre>
+class SimpleFormTests extends WebTestCase {
+
+    function testDefaultValue() {
+        $this-&gt;get('http://www.my-site.com/');
+        $this-&gt;assertField('a', 'A default');<strong>
+        $this-&gt;setField('a', 'New value');
+        $this-&gt;clickSubmit('Go');</strong>
+    }
+}
+</pre>
+                Parce que nous n'avons spécifié ni attribut "method"
+                sur la balise form, ni attribut "action",
+                le scénario de test suivra le comportement classique d'un navigateur :
+                transmission des données avec une requête <em>GET</em>
+                vers la même page. SimpleTest essaie d'émuler
+                le comportement typique d'un navigateur autant que possible,
+                plutôt que d'essayer d'attraper des attributs manquants sur les balises.
+                La raison est simple : la cible d'un framework de test est
+                la logique d'une application PHP, pas les erreurs
+                -- de syntaxe ou autres -- du code HTML.
+                Pour les erreurs HTML, d'autres outils tel
+                <a href="http://www.w3.org/People/Raggett/tidy/">HTMLTidy</a>
+                devraient être employés.
+            </p>
+            <p>
+                Si un champ manque dans n'importe quel formulaire ou si
+                une option est indisponible alors <span class="new_code">WebTestCase::setField()</span>
+                renverra <span class="new_code">false</span>. Par exemple, supposons que
+                nous souhaitons vérifier qu'une option "Superuser"
+                n'est pas présente dans ce formulaire...
+<pre>
+&lt;strong&gt;Select type of user to add:&lt;/strong&gt;
+&lt;select name="type"&gt;
+    &lt;option&gt;Subscriber&lt;/option&gt;
+    &lt;option&gt;Author&lt;/option&gt;
+    &lt;option&gt;Administrator&lt;/option&gt;
+&lt;/select&gt;
+</pre>
+                Qui ressemble à...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Select type of user to add:</strong>
+                    <select name="type">
+                        <option>Subscriber</option>
+                        <option>Author</option>
+                        <option>Administrator</option>
+                    </select>
+                </form>
+            </p>
+            <p>
+                Le test suivant le confirmera...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...
+    function testNoSuperuserChoiceAvailable() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertFalse($this-&gt;setField('type', 'Superuser'));</strong>
+    }
+}
+</pre>
+                La sélection ne sera pas changée suite à un échec d'initialisation
+                d'une valeur sur un objet.
+            </p>
+            <p>
+                Voici la liste complète des objets supportés à aujourd'hui...
+                <ul>
+                    <li>Champs texte, y compris les champs masqués (hidden) ou cryptés (password).</li>
+                    <li>Boutons submit, en incluant aussi la balise button, mais pas encore les boutons reset</li>
+                    <li>Aires texte (textarea) avec leur gestion des retours à la ligne (wrap).</li> 
+                    <li>Cases à cocher, y compris les cases à cocher multiples dans un même formulaire.</li>
+                    <li>Listes à menu déroulant, y compris celles à sélections multiples.</li>
+                    <li>Boutons radio.</li>
+                    <li>Images.</li>
+                </ul>
+            </p>
+            <p>
+                Le navigateur proposé par SimpleTest émule les actions
+                qui peuvent être réalisées par un utilisateur sur
+                une page HTML standard. Javascript n'est pas supporté et
+                il y a peu de chance pour qu'il le soit prochainement.
+            </p>
+            <p>
+                Une attention particulière doit être porté aux techniques Javascript
+                qui changent la valeur d'un champ caché : elles ne peuvent pas être
+                réalisées avec les commandes classiques de SimpleTest.
+                Une méthode alternative est proposée plus loin.
+            </p>
+        
+        <h2>
+<a class="target" name="multiple"></a>Champs à valeurs multiples</h2>
+            <p>
+                SimpleTest peut gérer deux types de commandes à valeur multiple :
+                les menus déroulants à sélection multiple et les cases à cocher
+                avec le même nom à l'intérieur même d'un formulaire.
+                La nature de ceux-ci implique que leur initialisation
+                et leur test sont légèrement différents.
+                Voici un exemple avec des cases à cocher...
+<pre>
+&lt;form class="demo"&gt;
+    &lt;strong&gt;Create privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="c" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Retrieve privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="r" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Update privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="u" checked&gt;&lt;br&gt;
+    &lt;strong&gt;Destroy privileges allowed:&lt;/strong&gt;
+    &lt;input type="checkbox" name="crud" value="d" checked&gt;&lt;br&gt;
+    &lt;input type="submit" value="Enable Privileges"&gt;
+&lt;/form&gt;
+</pre>
+                Qui se traduit par...
+            </p>
+            <p>
+                <form class="demo">
+                    <strong>Create privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="c" checked><br>
+                    <strong>Retrieve privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="r" checked><br>
+                    <strong>Update privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="u" checked><br>
+                    <strong>Destroy privileges allowed:</strong>
+                    <input type="checkbox" name="crud" value="d" checked><br>
+                    <input type="submit" value="Enable Privileges">
+                </form>
+            </p>
+            <p>
+                Si nous souhaitons désactiver tous les privilèges sauf
+                ceux de téléchargement (Retrieve) et transmettre cette information,
+                nous pouvons y arriver par...
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>
+    function testDisableNastyPrivileges() {
+        $this-&gt;get('http://www.lastcraft.com/form_testing_documentation.php');
+        $this-&gt;assertField('crud', array('c', 'r', 'u', 'd'));
+        $this-&gt;setField('crud', array('r'));
+        $this-&gt;clickSubmit('Enable Privileges');
+    }</strong>
+}
+</pre>
+                Plutôt que d'initier le champ à une valeur unique,
+                nous lui donnons une liste de valeurs.
+                Nous faisons la même chose pour tester les valeurs attendues.
+                Nous pouvons écrire d'autres bouts de code de test
+                pour confirmer cet effet, peut-être en nous connectant
+                comme utilisateur et en essayant d'effectuer une mise à jour.
+            </p>
+        
+        <h2>
+<a class="target" name="hidden-field"></a>Formulaires utilisant Javascript pour changer un champ caché</h2>
+            <p>
+                Si vous souhaitez tester un formulaire dépendant de Javascript
+                pour la modification d'un champ caché, vous ne pouvez pas
+                simplement utiliser setField().
+                Le code suivant <em>ne fonctionnera pas</em> :
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testMyJavascriptForm() {
+        <strong>// Ne fonctionne *pas*</strong>
+        $this-&gt;setField('un_champ_caché', '123');
+        $this-&gt;clickSubmit('OK');
+    }
+}
+</pre>
+                A la place, vous aurez besoin d'ajouter le paramètre supplémentaire
+                du formulaire à la méthode clickSubmit() :
+<pre>
+class SimpleFormTests extends WebTestCase {
+    function testMyJavascriptForm() {
+        // Ajoute le champ caché comme variable POST supplémentaire
+        <strong>$this-&gt;clickSubmit('OK', array('un_champ_caché'=&gt;'123'));</strong>
+    }
+
+}
+</pre>
+            </p>
+            <p>
+                N'oubliez pas que de la sorte, vous êtes effectivement en train
+                de court-circuitez une partie de votre application (le code Javascript
+                dans le formulaire) et que peut-être serait-il plus prudent
+                d'utiliser un outil comme
+                <a href="http://selenium.openqa.org/">Selenium</a> pour mettre sur pied
+                un test de recette complet.
+            </p>
+        
+        <h2>
+<a class="target" name="brut"></a>Envoi brut</h2>
+            <p>
+                Si vous souhaitez tester un gestionnaire de formulaire
+                mais que vous ne l'avez pas écrit ou que vous n'y avez
+                pas encore accès, vous pouvez créer un envoi de formulaire à la main.
+<pre>
+class SimpleFormTests extends WebTestCase {
+    ...<strong>    
+    function testAttemptedHack() {
+        $this-&gt;post(
+                'http://www.my-site.com/add_user.php',
+                array('type' =&gt; 'superuser'));
+        $this-&gt;assertNoUnwantedPattern('/user created/i');
+    }</strong>
+}
+</pre>
+                En ajoutant des données à la méthode <span class="new_code">WebTestCase::post()</span>,
+                nous essayons de télécharger la page via la transmission d'un formulaire.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li> 
+           <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
+           donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/group_test_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/group_test_documentation.html
new file mode 100644
index 000000000..a384f9510
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/group_test_documentation.html
@@ -0,0 +1,401 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : Grouper des tests</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le groupement des tests</h1>
+        This page...
+        <ul>
+<li>
+            Plusieurs approches pour <a href="#group">grouper des tests</a> ensemble.
+        </li>
+<li>
+            Combiner des groupes des tests dans des
+            <a href="#plus-haut">groupes plus grands</a>.
+        </li>
+<li>
+            Intégrer des <a href="#heritage">scénarios de test hérités</a>
+            d'un autre type de PHPUnit.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="grouper"></a>Grouper des tests</h2>
+            <p>
+                Pour lancer les scénarios de tests en tant que groupe,
+                ils devraient être placés dans des fichiers sans le code du lanceur...
+<pre>
+<strong>&lt;?php
+    require_once('../classes/io.php');
+
+    class FileTester extends UnitTestCase {
+        ...
+    }
+
+    class SocketTester extends UnitTestCase {
+        ...
+    }
+?&gt;</strong>
+</pre>
+                Autant de scénarios que nécessaires peuvent être
+                mis dans un fichier unique. Ils doivent contenir
+                tout le code nécessaire, entre autres la bibliothèque testée,
+                mais aucune des bibliothèques de SimpleTest.
+            </p>
+            <p>
+                Si vous avez étendu l'un ou l'autre des scénarios de test,
+                vous pouvez aussi les inclure.
+<pre>
+&lt;?php
+    require_once('../classes/io.php');
+<strong>
+    class MyFileTestCase extends UnitTestCase {
+        ...
+    }
+    SimpleTestOptions::ignore('MyFileTestCase');</strong>
+
+    class FileTester extends MyFileTestCase {
+        ...
+    }
+
+    class SocketTester extends UnitTestCase {
+        ...
+    }
+?&gt;
+</pre>
+                La classe <span class="new_code">FileTester</span> ne contient aucun test véritable,
+                il s'agit d'une classe de base pour d'autres scénarios de test.
+                Pour cette raison nous utilisons la directive
+                <span class="new_code">SimpleTestOptions::ignore()</span> pour indiquer
+                au prochain groupe de tests de l'ignorer.
+                Cette directive peut se placer n'importe où dans le fichier
+                et fonctionne quand un fichier complet des scénarios de test
+                est chargé (cf. ci-dessous).
+                Nous l'appelons <em>file_test.php</em>.
+            </p>
+            <p>
+                Ensuite nous créons un fichier de groupe de tests,
+                disons <em>group_test.php</em>.
+                Vous penserez à un nom plus convaincant, j'en suis sûr.
+                Nous lui ajoutons le fichier de test avec une méthode sans risque...
+<pre>
+&lt;?php
+    require_once('simpletest/unit_tester.php');
+    require_once('simpletest/reporter.php');<strong>
+    require_once('file_test.php');
+
+    $test = &amp;new GroupTest('All file tests');
+    $test-&gt;addTestCase(new FileTestCase());
+    $test-&gt;run(new HtmlReporter());</strong>
+?&gt;
+</pre>
+                Ceci instancie le scénario de test avant que
+                la suite de test ne soit lancée.
+                Ça pourrait devenir assez onéreux avec
+                un grand nombre de scénarios de test : 
+                il existe donc une autre méthode qui instancie
+                la classe uniquement quand elle devient nécessaire...
+<pre>
+&lt;?php
+    require_once('simpletest/unit_tester.php');
+    require_once('simpletest/reporter.php');
+    require_once('file_test.php');
+
+    $test = &amp;new GroupTest('All file tests');<strong>
+    $test-&gt;addTestClass('FileTestCase');</strong>
+    $test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Le problème de cette technique est que pour
+                chaque scénario de test supplémentaire nous aurons à importer
+                (via <span class="new_code">require_once()</span>) le fichier de code de test
+                et à instancier manuellement chaque scénario de test.
+                Nous pouvons nous épargner beaucoup de dactylographie avec...
+<pre>
+&lt;?php
+    require_once('simpletest/unit_tester.php');
+    require_once('simpletest/reporter.php');
+
+    $test = &amp;new GroupTest('All file tests');<strong>
+    $test-&gt;addTestFile('file_test.php');</strong>
+    $test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Voici ce qui vient de se passer :
+                la classe <span class="new_code">GroupTest</span> a réalisé le
+                <span class="new_code">require_once()</span> pour nous.
+                Ensuite elle vérifie si de nouvelles classes de scénario
+                de test ont été créées par ce nouveau fichier
+                et les ajoute automatiquement au groupe de tests.
+                Désormais tout ce qu'il nous reste à faire,
+                c'est d'ajouter chaque nouveau fichier.
+            </p>
+            <p>
+                Il y a deux choses qui peuvent planter
+                et qui demandent un minimum d'attention...
+                <ol>
+                    <li>
+                        Le fichier peut déjà avoir été analysé par PHP
+                        et dans ce cas aucune classe ne sera ajoutée.
+                        Pensez à bien vérifier que les scénarios de test
+                        ne sont inclus que dans ce fichier et dans aucun autre
+                        (Note : avec la nouvelle fonctionnalité <cite>autorun</cite>,
+                        ce problème a maintenant été résolu).
+                    </li>
+                    <li>
+                        Les nouvelles classes d'extension de scénario
+                        de test qui sont incluses seront placées
+                        dans le groupe de tests et exécutées par la même occasion.
+                        Vous aurez à ajouter une directive
+                        <span class="new_code">SimpleTestOptions::ignore()</span> pour ces classes
+                        ou alors pensez à les ajouter avant la ligne
+                        <span class="new_code">GroupTest::addTestFile()</span>.
+                    </li>
+                </ol>
+            </p>
+        
+        <h2>
+<a class="target" name="plus-haut"></a>Groupements de plus haut niveau</h2>
+            <p>
+                La technique ci-dessus place tous les scénarios de test
+                dans un unique et grand groupe.
+                Sauf que pour des projets plus conséquents,
+                ce n'est probablement pas assez souple;
+                vous voudriez peut-être grouper les tests tout à fait différemment.
+            </p>
+            <p>
+                Pour obtenir un groupe de tests plus souple
+                nous pouvons sous classer <span class="new_code">GroupTest</span>
+                et ensuite l'instancier au cas par cas...
+<pre>
+&lt;?php
+    require_once('simpletest/unit_tester.php');
+    require_once('simpletest/reporter.php');
+    <strong>
+    class FileGroupTest extends GroupTest {
+        function FileGroupTest() {
+            $this-&gt;GroupTest('All file tests');
+            $this-&gt;addTestFile('file_test.php');
+        }
+    }</strong>
+?&gt;
+</pre>
+                Ceci nomme le test dans le constructeur
+                et ensuite ajoute à la fois nos scénarios
+                de test et un unique groupe en dessous.
+                Bien sûr nous pouvons ajouter plus d'un groupe à cet instant.
+                Nous pouvons maintenant invoquer les tests
+                à partir d'un autre fichier d'exécution...
+<pre>
+&lt;?php
+    require_once('file_group_test.php');
+    <strong>
+    $test = &amp;new FileGroupTest();
+    $test-&gt;run(new HtmlReporter());</strong>
+?&gt;
+</pre>
+                ...ou alors nous pouvons les grouper
+                dans un groupe de tests encore plus grand...
+<pre>
+&lt;?php
+    require_once('file_group_test.php');
+    <strong>
+    $test = &amp;new BigGroupTest('Big group');
+    $test-&gt;addTestCase(new FileGroupTest());
+    $test-&gt;addTestCase(...);
+    $test-&gt;run(new HtmlReporter());</strong>
+?&gt;
+</pre>
+                Si nous souhaitons lancer le groupe de tests original
+                sans utiliser ses petits fichiers d'exécution,
+                nous pouvons mettre le code du lanceur de test
+                derrière des barreaux quand nous créons chaque groupe.
+<pre>
+&lt;?php
+    class FileGroupTest extends GroupTest {
+        function FileGroupTest() {
+            $this-&gt;GroupTest('All file tests');
+            $test-&gt;addTestFile('file_test.php');
+        }
+    }
+    <strong>
+    if (! defined('RUNNER')) {
+        define('RUNNER', true);</strong>
+        $test = &amp;new FileGroupTest();
+        $test-&gt;run(new HtmlReporter());
+    }
+?&gt;
+</pre>
+                Cette approche exige aux barrières d'être activées
+                à l'inclusion du fichier de groupe de tests,
+                mais c'est quand même moins de tracas que beaucoup
+                de fichiers de lancement éparpillés.
+                Reste à inclure des barreaux identiques
+                au niveau supérieur afin de s'assurer que
+                le <span class="new_code">run()</span> ne sera lancé qu'une seule fois
+                à partir du script de haut niveau qui l'a invoqué.
+<pre>
+&lt;?php
+    define('RUNNER', true);
+
+    require_once('file_group_test.php');
+    $test = &amp;new BigGroupTest('Big group');
+    $test-&gt;addTestCase(new FileGroupTest());
+    $test-&gt;addTestCase(...);
+    $test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Comme les scénarios de test normaux,
+                un <span class="new_code">GroupTest</span> peut être chargé avec la méthode
+                <span class="new_code">GroupTest::addTestFile()</span>.
+<pre>  
+&lt;?php   
+    define('RUNNER', true); 
+        
+    $test = &amp;new BigGroupTest('Big group');<strong> 
+    $test-&gt;addTestFile('file_group_test.php');  
+    $test-&gt;addTestFile(...);</strong>   
+    $test-&gt;run(new HtmlReporter()); 
+?&gt;  
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="heritage"></a>Intégrer des scénarios de test hérités</h2>
+            <p>
+                Si vous avez déjà des tests unitaires pour votre code
+                ou alors si vous étendez des classes externes
+                qui ont déjà leurs propres tests, il y a peu de chances
+                pour que ceux-ci soient déjà au format SimpleTest.
+                Heureusement il est possible d'incorporer ces scénarios
+                de test en provenance d'autres testeurs unitaires
+                directement dans des groupes de test SimpleTest.
+            </p>
+            <p>
+                Par exemple, supposons que nous ayons
+                ce scénario de test prévu pour
+                <a href="http://sourceforge.net/projects/phpunit">PhpUnit</a>
+                dans le fichier <em>config_test.php</em>...
+<pre>
+<strong>class ConfigFileTest extends TestCase {
+    function ConfigFileTest() {
+        $this-&gt;TestCase('Config file test');
+    }
+    
+    function testContents() {
+        $config = new ConfigFile('test.conf');
+        $this-&gt;assertRegexp('/me/', $config-&gt;getValue('username'));
+    }
+}</strong>
+</pre>
+                Le groupe de tests peut le reconnaître à partir
+                du moment où nous mettons l'adaptateur approprié
+                avant d'ajouter le fichier de test...
+<pre>
+&lt;?php
+    require_once('simpletest/unit_tester.php');
+    require_once('simpletest/reporter.php');<strong>
+    require_once('simpletest/adapters/phpunit_test_case.php');</strong>
+
+    $test = &amp;new GroupTest('All file tests');<strong>
+    $test-&gt;addTestFile('config_test.php');</strong>
+    $test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Il n'y a que deux adaptateurs,
+                l'autre est pour le paquet testeur unitaire de
+                <a href="http://pear.php.net/manual/en/package.php.phpunit.php">PEAR</a>...
+<pre>
+&lt;?php
+    require_once('simpletest/unit_tester.php');
+    require_once('simpletest/reporter.php');<strong>
+    require_once('simpletest/adapters/pear_test_case.php');</strong>
+
+    $test = &amp;new GroupTest('All file tests');<strong>
+    $test-&gt;addTestFile('some_pear_test_cases.php');</strong>
+    $test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Les scénarios de test de PEAR peuvent être
+                librement mélangés avec ceux de SimpleTest
+                mais vous ne pouvez pas utiliser les assertions
+                de SimpleTest au sein des versions héritées
+                des scénarios de test. La raison ?
+                Une simple vérification que vous ne rendez pas
+                par accident vos scénarios de test complètement
+                dépendants de SimpleTest.
+                Peut-être que vous souhaitez publier
+                votre bibliothèque sur PEAR par exemple :
+                ça voudrait dire la livrer avec des scénarios de
+                test compatibles avec PEAR::PhpUnit.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/index.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/index.html
new file mode 100644
index 000000000..964be9e5a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/index.html
@@ -0,0 +1,576 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Prise en main rapide de SimpleTest pour PHP -
+        Tests unitaire et objets fantaisie pour PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Prise en main rapide de SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unit">Utiliser le testeur rapidement</a>
+            avec un exemple.
+        </li>
+<li>
+            <a href="#group">Groupes de tests</a>
+            pour tester en un seul clic.
+        </li>
+<li>
+            <a href="#mock">Utiliser les objets fantaisie</a>
+            pour faciliter les tests et gagner en contrôle.
+        </li>
+<li>
+            <a href="#web">Tester des pages web</a>
+            au niveau de l'HTML.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Le présent article présuppose que vous soyez familier avec
+                le concept de tests unitaires ainsi que celui de développement
+                web avec le langage PHP. Il s'agit d'un guide pour le nouvel
+                et impatient utilisateur de
+                <a href="https://sourceforge.net/project/showfiles.php?group_id=76550">SimpleTest</a>.
+                Pour une documentation plus complète, particulièrement si
+                vous découvrez les tests unitaires, consultez la
+                <a href="http://www.lastcraft.com/unit_test_documentation.php">documentation
+                en cours</a>, et pour des exemples de scénarios de test,
+                consultez le
+                <a href="http://www.lastcraft.com/first_test_tutorial.php">tutorial
+                sur les tests unitaires</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="unit"></a>Utiliser le testeur rapidement</h2>
+            <p>
+                Parmi les outils de test pour logiciel, le testeur unitaire
+                est le plus proche du développeur. Dans un contexte de
+                développement agile, le code de test se place juste à côté
+                du code source étant donné que tous les deux sont écrits
+                simultanément. Dans ce contexte, SimpleTest aspire à être
+                une solution complète de test pour un développeur PHP et
+                s'appelle "Simple" parce qu'elle devrait être simple à
+                utiliser et à étendre. Ce nom n'était pas vraiment un bon
+                choix. Non seulement cette solution inclut toutes les
+                fonctions classiques qu'on est en droit d'attendre de la
+                part des portages de <a href="http://www.junit.org/">JUnit</a> et des <a href="http://sourceforge.net/projects/phpunit/">PHPUnit</a>,
+                mais elle inclut aussi les <a href="http://www.mockobjects.com/">objets fantaisie ou
+                "mock objects"</a>.
+            </p>
+            <p>
+                Ce qui rend cet outil immédiatement utile pour un développeur PHP,
+                c'est son navigateur web interne.
+                Il permet des tests qui parcourent des sites web, remplissent
+                des formulaires et testent le contenu des pages.
+                Etre capable d'écrire ces tests en PHP veut dire qu'il devient
+                facile d'écrire des tests de recette (ou d'intégration).
+                Un exemple serait de confirmer qu'un utilisateur a bien été ajouté
+                dans une base de données après s'être enregistré sur une site web.
+            </p>
+            <p>
+                La démonstration la plus rapide : l'exemple
+            </p>
+            <p>
+                Supposons que nous sommes en train de tester une simple
+                classe de log dans un fichier : elle s'appelle
+                <span class="new_code">Log</span> dans <em>classes/Log.php</em>. Commençons
+                par créer un script de test, appelé
+                <em>tests/log_test.php</em>. Son contenu est le suivant...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+require_once('../classes/log.php');
+
+class TestOfLogging extends <strong>UnitTestCase</strong> {
+}
+?&gt;
+</pre>
+                Ici le répertoire <em>simpletest</em> est soit dans le
+                dossier courant, soit dans les dossiers pour fichiers
+                inclus. Vous auriez à éditer ces arborescences suivant
+                l'endroit où vous avez installé SimpleTest.
+                Le fichier "autorun.php" fait plus que juste inclure
+                les éléments de SimpleTest : il lance aussi les tests pour nous.  
+            </p>
+            <p>
+                <span class="new_code">TestOfLogging</span> est notre premier scénario de test
+                et il est pour l'instant vide.
+                Chaque scénario de test est une classe qui étend une des classes
+                de base de SimpleTest. Nous pouvons avoir autant de classes de ce type
+                que nous voulons.
+            </p>
+            <p>
+                Avec ces trois lignes d'échafaudage
+                l'inclusion de notre classe <span class="new_code">Log</span>, nous avons une suite
+                de tests. Mais pas encore de test !
+            </p>
+            <p>
+                Pour notre premier test, supposons que la classe <span class="new_code">Log</span>
+                prenne le nom du fichier à écrire au sein du constructeur,
+                et que nous avons un répertoire temporaire dans lequel placer
+                ce fichier.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+
+class TestOfLogging extends UnitTestCase {
+    function <strong>testLogCreatesNewFileOnFirstMessage()</strong> {
+        @unlink('/temp/test.log');
+        $log = new Log('/temp/test.log');
+        <strong>$this-&gt;assertFalse(file_exists('/temp/test.log'));</strong>
+        $log-&gt;message('Should write this to a file');
+        <strong>$this-&gt;assertTrue(file_exists('/temp/test.log'));</strong>
+    }
+}
+?&gt;
+</pre>
+                Au lancement du scénario de test, toutes les méthodes qui
+                commencent avec la chaîne <span class="new_code">test</span> sont
+                identifiées puis exécutées.
+                Si la méthode commence par <span class="new_code">test</span>, c'est un test.
+                Remarquez bien le nom très long de notre exemple :
+                <span class="new_code">testLogCreatesNewFileOnFirstMessage()</span>.
+                C'est bel et bien délibéré : ce style est considéré désirable
+                et il rend la sortie du test plus lisible.
+            </p>
+            <p>
+                D'ordinaire nous avons bien plusieurs méthodes de tests.
+                Mais ce sera pour plus tard.
+            </p>
+            <p>
+                Les assertions dans les
+                méthodes de test envoient des messages vers le framework de
+                test qui affiche immédiatement le résultat. Cette réponse
+                immédiate est importante, non seulement lors d'un crash
+                causé par le code, mais aussi de manière à rapprocher
+                l'affichage de l'erreur au plus près du scénario de test
+                concerné via un appel à <span class="new_code">print</span>code&gt;.
+            </p>
+            <p>
+                Pour voir ces résultats lançons effectivement les tests.
+                Aucun autre code n'est nécessaire, il suffit d'ouvrir
+                la page dans un navigateur.
+            </p>
+            <p>
+                En cas échec, l'affichage ressemble à...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <span class="fail">Fail</span>: testcreatingnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes and <strong>1</strong> fails.</div>
+                </div>
+                ...et si ça passe, on obtient...
+                <div class="demo">
+                    <h1>TestOfLogging</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>2</strong> passes and <strong>0</strong> fails.</div>
+                </div>
+                Et si vous obtenez ça...
+                <div class="demo">
+                    <b>Fatal error</b>:  Failed opening required '../classes/log.php' (include_path='') in <b>/home/marcus/projects/lastcraft/tutorial_tests/Log/tests/log_test.php</b> on line <b>7</b>
+                </div>
+                c'est qu'il vous manque le fichier <em>classes/Log.php</em>
+                qui pourrait ressembler à : 
+<pre>
+&lt;?php<strong>
+class Log {
+    function Log($file_path) {
+    }
+
+    function message() {
+    }
+}</strong>
+?&gt;
+</pre>
+                C'est largement plus sympathique d'écrire le code après le test.
+                Plus que sympatique même - cette technique s'appelle
+                "Développement Piloté par les Tests" ou 
+                "Test Driven Development" en anglais.
+            </p>
+            <p>
+                Pour plus de renseignements sur le testeur, voyez la
+                <a href="unit_test_documentation.html">documentation pour les tests de régression</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="group"></a>Construire des groupes de tests</h2>
+            <p>
+                Il est peu probable que dans une véritable application on
+                ait uniquement besoin de passer un seul scénario de test.
+                Cela veut dire que nous avons besoin de grouper les
+                scénarios dans un script de test qui peut, si nécessaire,
+                lancer tous les tests de l'application.
+            </p>
+            <p>
+                Notre première étape est de créer un nouveau fichier appelé
+                <em>tests/all_tests.php</em> et d'y inclure le code suivant...
+<pre>
+&lt;?php
+<strong>require_once('simpletest/autorun.php');</strong>
+
+class AllTests extends <strong>TestSuite</strong> {
+    function AllTests() {
+        $this-&gt;TestSuite(<strong>'All tests'</strong>);
+        <strong>$this-&gt;addFile('log_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                L'inclusion de "autorun" permettra à notre future suite
+                de tests d'être lancée juste en invoquant ce script.
+            </p>
+            <p>
+                La sous-classe <span class="new_code">TestSuite</span> doit chaîner
+                son constructeur. Cette limitation sera supprimée dans
+                les versions à venir.   
+            </p>
+            <p>
+                The method <span class="new_code">TestSuite::addFile()</span>
+                will include the test case file and read any new classes
+                that are descended from <span class="new_code">SimpleTestCase</span>.
+
+                Cette méthode <span class="new_code">TestSuite::addTestFile()</span> va
+                inclure le fichier de scénarios de test et lire parmi
+                toutes les nouvelles classes créées celles qui sont issues
+                de <span class="new_code">SimpleTestCase</span>.
+                <span class="new_code">UnitTestCase</span> est juste un exemple de classe dérivée
+                depuis <span class="new_code">SimpleTestCase</span> et vous pouvez créer les vôtres.
+                <span class="new_code">TestSuite::addFile()</span> peut aussi inclure d'autres suites.
+            </p>
+            <p>
+                La classe ne sera pas encore instanciée.
+                Quand la suite de tests est lancée, elle construira chaque instance
+                une fois le test atteint, et le détuira juste ensuite.
+                Cela veut dire que le constructeur n'est lancé qu'une fois avant
+                chaque initialisation de ce scénario de test et que le destructeur
+                est lui aussi lancé avant que le test suivant ne commence.
+            </p>
+            <p>
+                Il est commun de grouper des scénarios de test dans des super-classes
+                qui ne sont pas sensées être lancées, mais qui deviennent une classe de base
+                pour d'autres tests.
+                Pour que "autorun" fonctionne proprement les fichiers
+                des scénarios de test ne devraient pas lancer aveuglement
+                d'autres extensions de scénarios de test qui ne lanceraient pas
+                effectivement des tests.
+                Cela pourrait aboutir à un mauvais comptages des scénarios de test
+                pendant la procédure.
+                Pas vraiement un problème majeure, mais pour éviter cet inconvénient
+                il suffit de marquer vos classes de base comme <span class="new_code">abstract</span>.
+                SimpleTest ne lance pas les classes abstraites. Et si vous utilisez encore
+                PHP4 alors une directive <span class="new_code">SimpleTestOptions::ignore()</span>
+                dans votre fichier de scénario de test aura le même effet.
+            </p>
+            <p>
+                Par ailleurs, le fichier avec le scénario de test ne devrait pas
+                avoir été inclus ailleurs. Sinon aucun scénario de test
+                ne sera inclus à ce groupe.
+                Ceci pourrait se transformer en un problème plus grave :
+                si des fichiers ont déjà été inclus par PHP alors la méthode
+                <span class="new_code">TestSuite::addFile()</span> ne les détectera pas.
+            </p>
+            <p>
+                Pour afficher les résultats, il est seulement nécessaire
+                d'invoquer <em>tests/all_tests.php</em> à partir du serveur
+                web.
+            </p>
+            <p>
+                Pour plus de renseignements des groupes de tests, voyez le
+                <a href="group_test_documentation.html">documentation sur le groupement des tests</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="mock"></a>Utiliser les objets fantaisie</h2>
+            <p>
+                Avançons un peu plus dans le futur.
+            </p>
+            <p>
+                Supposons que notre class logging soit testée et terminée.
+                Supposons aussi que nous testons une autre classe qui ait
+                besoin d'écrire des messages de log, disons
+                <span class="new_code">SessionPool</span>. Nous voulons tester une méthode
+                qui ressemblera probablement à quelque chose comme...
+<pre><strong>
+class SessionPool {
+    ...
+    function logIn($username) {
+        ...
+        $this-&gt;_log-&gt;message('User $username logged in.');
+        ...
+    }
+    ...
+}
+</strong>
+</pre>
+                Avec le concept de "réutilisation de code" comme fil
+                conducteur, nous utilisons notre class <span class="new_code">Log</span>. Un
+                scénario de test classique ressemblera peut-être à...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+<strong>require_once('../classes/session_pool.php');</strong>
+
+class <strong>TestOfSessionLogging</strong> extends UnitTestCase {
+    
+    function setUp() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function tearDown() {
+        <strong>@unlink('/temp/test.log');</strong>
+    }
+    
+    function testLoggingInIsLogged() {
+        <strong>$log = new Log('/temp/test.log');
+        $session_pool = &amp;new SessionPool($log);
+        $session_pool-&gt;logIn('fred');</strong>
+        $messages = file('/temp/test.log');
+        $this-&gt;assertEqual($messages[0], "User fred logged in.<strong>\n</strong>");
+    }
+}
+?&gt;
+</pre>
+                Nous expliquerons les méthodes <span class="new_code">setUp()</span>
+                et <span class="new_code">tearDown()</span> plus tard.
+            </p>
+            <p>
+                Le design de ce scénario de test n'est pas complètement
+                mauvais, mais on peut l'améliorer. Nous passons du temps à
+                tripoter les fichiers de log qui ne font pas partie de
+                notre test.
+                Pire, nous avons créé des liens de proximité
+                entre la classe <span class="new_code">Log</span> et ce test. Que se
+                passerait-il si nous n'utilisions plus de fichiers, mais la
+                bibliothèque <em>syslog</em> à la place ?
+                
+                Cela veut dire que notre test <span class="new_code">TestOfSessionLogging</span>
+                enverra un échec alors même qu'il ne teste pas Logging.
+            </p>
+            <p>
+                Il est aussi fragile sur des petites retouches. Avez-vous
+                remarqué le retour chariot supplémentaire à la fin du
+                message ? A-t-il été ajouté par le loggueur ? Et si il
+                ajoutait aussi un timestamp ou d'autres données ?
+            </p>
+            <p>
+                L'unique partie à tester réellement est l'envoi d'un
+                message précis au loggueur.
+                Nous pouvons réduire le couplage en
+                créant une fausse classe de logging : elle ne fait
+                qu'enregistrer le message pour le test, mais ne produit
+                aucun résultat. Sauf qu'elle doit ressembler exactement à
+                l'original.
+            </p>
+            <p>
+                Si l'objet fantaisie n'écrit pas dans un fichier alors nous
+                nous épargnons la suppression du fichier avant et après le
+                test. Nous pourrions même nous épargner quelques lignes de
+                code supplémentaires si l'objet fantaisie pouvait exécuter
+                l'assertion.
+            <p>
+            </p>
+                Trop beau pour être vrai ? Pas vraiement on peut créer un tel
+                objet très facilement...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('../classes/log.php');
+require_once('../classes/session_pool.php');
+
+<strong>Mock::generate('Log');</strong>
+
+class TestOfSessionLogging extends UnitTestCase {
+    
+    function testLoggingInIsLogged() {<strong>
+        $log = &amp;new MockLog();
+        $log-&gt;expectOnce('message', array('User fred logged in.'));</strong>
+        $session_pool = &amp;new SessionPool(<strong>$log</strong>);
+        $session_pool-&gt;logIn('fred');
+    }
+}
+?&gt;
+</pre>
+                L'appel <span class="new_code">Mock::generate()</span> a généré
+                une nouvelle classe appelé <span class="new_code">MockLog</span>.
+                Cela ressemble à un clone identique, sauf que nous pouvons
+                y adjoindre du code de test.
+                C'est ce que fait <span class="new_code">expectOnce()</span>.
+                Cela dit que si <span class="new_code">message()</span> m'est appelé,
+                il a intérêt à l'être avec le paramètre
+                "User fred logged in.".
+            </p>
+            <p>
+                L'appel <span class="new_code">tally()</span> est nécessaire pour annoncer à
+                l'objet fantaisie qu'il n'y aura plus d'appels ultérieurs.
+                Sans ça l'objet fantaisie pourrait attendre pendant une
+                éternité l'appel de la méthode sans jamais prévenir le
+                scénario de test. Les autres tests sont déclenchés
+                automatiquement quand l'appel à <span class="new_code">message()</span> est
+                invoqué sur l'objet <span class="new_code">MockLog</span> par le code 
+                <span class="new_code">SessionPool::logIn()</span>.
+                L'appel <span class="new_code">mock</span> va déclencher une comparaison des
+                paramètres et ensuite envoyer le message "pass" ou "fail"
+                au test pour l'affichage. Des jokers peuvent être inclus
+                pour ne pas avoir à tester tous les paramètres d'un appel
+                alors que vous ne souhaitez qu'en tester un.
+            </p>
+            <p>
+                Les objets fantaisie dans la suite SimpleTest peuvent avoir
+                un ensemble de valeurs de sortie arbitraires, des séquences
+                de sorties, des valeurs de sortie sélectionnées à partir
+                des arguments d'entrée, des séquences de paramètres
+                attendus et des limites sur le nombre de fois qu'une
+                méthode peut être invoquée.
+            </p>
+            <p>
+                Pour que ce test fonctionne la librairie avec les objets
+                fantaisie doit être incluse dans la suite de tests, par
+                exemple dans <em>all_tests.php</em>.
+            </p>
+            <p>
+                Pour plus de renseignements sur les objets fantaisie, voyez le
+                <a href="mock_objects_documentation.html">documentation sur les objets fantaisie</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="web"></a>Tester une page web</h2>
+            <p>
+                Une des exigences des sites web, c'est qu'ils produisent
+                des pages web. Si vous construisez un projet de A à Z et
+                que vous voulez intégrer des tests au fur et à mesure alors
+                vous voulez un outil qui puisse effectuer une navigation
+                automatique et en examiner le résultat. C'est le boulot
+                d'un testeur web.
+            </p>
+            <p>
+                Effectuer un test web via SimpleTest reste assez primitif :
+                il n'y a pas de javascript par exemple.
+                La plupart des autres opérations d'un navigateur sont simulées.
+            </p>
+            <p>
+                Pour vous donner une idée, voici un exemple assez trivial :
+                aller chercher une page web,
+                à partir de là naviguer vers la page "about"
+                et finalement tester un contenu déterminé par le client.
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+<strong>require_once('simpletest/web_tester.php');</strong>
+
+class TestOfAbout extends <strong>WebTestCase</strong> {
+    function testOurAboutPageGivesFreeReignToOurEgo() {
+        <strong>$this-&gt;get('http://test-server/index.php');
+        $this-&gt;click('About');
+        $this-&gt;assertTitle('About why we are so great');
+        $this-&gt;assertText('We are really great');</strong>
+    }
+}
+?&gt;
+</pre>
+                Avec ce code comme test de recette, vous pouvez vous
+                assurer que le contenu corresponde toujours aux
+                spécifications à la fois des développeurs et des autres
+                parties prenantes au projet.
+            </p>
+            <p>
+                Vous pouvez aussi naviguer à travers des formulaires...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');
+require_once('simpletest/web_tester.php');
+
+class TestOfRankings extends WebTestCase {
+    function testWeAreTopOfGoogle() {
+        $this-&gt;get('http://google.com/');
+        $this-&gt;setField('q', 'simpletest');
+        $this-&gt;click("I'm Feeling Lucky");
+        $this-&gt;assertTitle('SimpleTest - Unit Testing for PHP');
+    }
+}
+?&gt;
+</pre>
+                ...même si cela pourrait constituer une violation
+                des documents juridiques de Google(tm).
+            </p>
+            <p>
+                Pour plus de renseignements sur comment tester une page web, voyez la
+                <a href="web_tester_documentation.html">documentation sur tester des scripts web</a>.
+            </p>
+            <p>
+                <a href="http://sourceforge.net/projects/simpletest/"><img src="http://sourceforge.net/sflogo.php?group_id=76550&amp;type=5" width="210" height="62" border="0" alt="SourceForge.net Logo"></a>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="https://sourceforge.net/project/showfiles.php?group_id=76550&amp;release_id=153280">Télécharger PHP Simple Test</a>
+            depuis <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            L'<a href="http://simpletest.org/api/">API de SimpleTest pour développeur</a>
+            donne tous les détails sur les classes et assertions existantes.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html
new file mode 100644
index 000000000..9d2ad41b2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/mock_objects_documentation.html
@@ -0,0 +1,784 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : les objets fantaise</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les objets fantaisie</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#quoi">Que sont les objets fantaisie ?</a>
+        </li>
+<li>
+            <a href="#creation">Créer des objets fantaisie</a>.
+        </li>
+<li>
+            <a href="#bouchon">L'objet fantaisie - acteur</a> ou bouchon.
+        </li>
+<li>
+            <a href="#attentes">L'objet fantaisie - critique</a> avec des attentes.
+        </li>
+<li>
+            <a href="#approches">D'autres approches</a>
+            y compris des librairies d'objets fantaisie.
+        </li>
+<li>
+            Utiliser les objets fantaisie avec
+            <a href="#autres_testeurs">d'autres testeurs unitaires</a>.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="quoi"></a>Que sont les objets fantaisie ?</h2>
+            <p>
+                Les objets fantaisie - ou "mock objects" en anglais -
+                ont deux rôles pendant un scénario de test : acteur et critique.
+            </p>
+            <p>
+                Le comportement d'acteur est celui de simuler
+                des objets difficiles à initialiser ou trop consommateurs
+                en temps pendant un test.
+                Le cas classique est celui de la connexion à une base de données.
+                Mettre sur pied une base de données de test au lancement
+                de chaque test ralentirait considérablement les tests
+                et en plus exigerait l'installation d'un moteur
+                de base de données ainsi que des données sur la machine de test.
+                Si nous pouvons simuler la connexion
+                et renvoyer des données à notre guise
+                alors non seulement nous gagnons en pragmatisme
+                sur les tests mais en sus nous pouvons nourrir
+                notre base avec des données falsifiées
+                et voir comment il répond. Nous pouvons
+                simuler une base de données en suspens ou
+                d'autres cas extrêmes sans avoir à créer
+                une véritable panne de base de données.
+                En d'autres termes nous pouvons gagner
+                en contrôle sur l'environnement de test.
+            </p>
+            <p>
+                Si les objets fantaisie ne se comportaient que comme
+                des acteurs alors on les connaîtrait sous le nom de
+                <a href="server_stubs_documentation.html">bouchons serveur</a>.
+            </p>
+            <p>
+                Cependant non seulement les objets fantaisie jouent
+                un rôle (en fournissant à la demande les valeurs requises)
+                mais en plus ils sont aussi sensibles aux messages qui
+                leur sont envoyés (par le biais d'attentes).
+                En posant les paramètres attendus d'une méthode
+                ils agissent comme des gardiens :
+                un appel sur eux doit être réalisé correctement.
+                Si les attentes ne sont pas atteintes ils nous épargnent
+                l'effort de l'écriture d'une assertion de test avec
+                échec en réalisant cette tâche à notre place.
+                Dans le cas d'une connexion à une base de données
+                imaginaire ils peuvent tester si la requête, disons SQL,
+                a bien été formé par l'objet qui utilise cette connexion.
+                Mettez-les sur pied avec des attentes assez précises
+                et vous verrez que vous n'aurez presque plus d'assertion à écrire manuellement.
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Créer des objets fantaisie</h2>
+            <p>
+                Comme pour la création des bouchons serveur, tout ce dont
+                nous avons besoin c'est d'un classe existante.
+                La fameuse connexion à une base de données qui ressemblerait à...
+<pre>
+<strong>class DatabaseConnection {
+    function DatabaseConnection() {
+    }
+    
+    function query() {
+    }
+    
+    function selectQuery() {
+    }
+}</strong>
+</pre>
+                Cette classe n'a pas encore besoin d'être implémentée.
+                Pour en créer sa version fantaisie nous devons juste
+                inclure la librairie d'objet fantaisie puis lancer le générateur...
+<pre>
+<strong>require_once('simpletest/unit_tester.php');
+require_once('simpletest/mock_objects.php');
+require_once('database_connection.php');
+
+Mock::generate('DatabaseConnection');</strong>
+</pre>
+                Ceci génère une classe clone appelée <span class="new_code">MockDatabaseConnection</span>.
+                Nous pouvons désormais créer des instances de
+                cette nouvelle classe à l'intérieur même de notre scénario de test...
+<pre>
+require_once('simpletest/unit_tester.php');
+require_once('simpletest/mock_objects.php');
+require_once('database_connection.php');
+
+Mock::generate('DatabaseConnection');
+<strong>
+class MyTestCase extends UnitTestCase {
+    
+    function testSomething() {
+        $connection = &amp;new MockDatabaseConnection($this);
+    }
+}</strong>
+</pre>
+                Contrairement aux bouchons, le constructeur
+                d'une classe fantaisie a besoin d'une référence au scénario
+                de test pour pouvoir transmettre les succès
+                et les échecs pendant qu'il vérifie les attentes.
+                Concrètement ça veut dire que les objets fantaisie
+                ne peuvent être utilisés qu'au sein d'un scénario de test.
+                Malgré tout, cette puissance supplémentaire implique
+                que les bouchons ne sont que rarement utilisés
+                si des objets fantaisie sont disponibles.
+            </p>
+        
+        <h2>
+<a class="target" name="bouchon"></a>Objets fantaisie en action</h2>
+            <p>
+                La version fantaisie d'une classe contient
+                toutes les méthodes de l'originale.
+                De la sorte une opération comme
+                <span class="new_code">$connection-&gt;query()</span>
+                est encore possible.
+                Tout comme avec les bouchons, nous pouvons remplacer
+                la valeur nulle renvoyée par défaut...
+<pre>
+<strong>$connection-&gt;setReturnValue('query', 37);</strong>
+</pre>
+                Désormais à chaque appel de
+                <span class="new_code">$connection-&gt;query()</span>
+                nous recevons comme résultat 37.
+                Tout comme avec les bouchons nous pouvons utiliser
+                des jokers et surcharger le paramètre joker.
+                Nous pouvons aussi ajouter des méthodes supplémentaires
+                à l'objet fantaisie lors de sa génération
+                et lui choisir un nom de classe qui lui soit propre...
+<pre>
+<strong>Mock::generate('DatabaseConnection', 'MyMockDatabaseConnection', array('setOptions'));</strong>
+</pre>
+                Ici l'objet fantaisie se comportera comme
+                si <span class="new_code">setOptions()</span> existait dans la classe originale.
+                C'est pratique si une classe a utilisé le mécanisme
+                <span class="new_code">overload()</span> de PHP pour ajouter des méthodes dynamiques.
+                Vous pouvez créer des fantaisies spéciales pour simuler cette situation.
+            </p>
+            <p>
+                Tous les modèles disponibles avec les bouchons serveur
+                le sont également avec les objets fantaisie...
+<pre>
+class Iterator {
+    function Iterator() {
+    }
+    
+    function next() {
+    }
+}
+</pre>
+                Une nouvelle fois, supposons que cet itérateur
+                ne retourne que du texte jusqu'au moment où il atteint
+                son terme, quand il renvoie <span class="new_code">false</span>.
+                Nous pouvons le simuler avec...
+<pre>
+Mock::generate('Iterator');
+
+class IteratorTest extends UnitTestCase() {
+    
+    function testASequence() {<strong>
+        $iterator = &amp;new MockIterator($this);
+        $iterator-&gt;setReturnValue('next', false);
+        $iterator-&gt;setReturnValueAt(0, 'next', 'First string');
+        $iterator-&gt;setReturnValueAt(1, 'next', 'Second string');</strong>
+        ...
+    }
+}
+</pre>
+                Au moment du premier appel à <span class="new_code">next()</span>
+                sur l'itérateur fantaisie il renverra tout d'abord
+                "First string", puis ce sera au tour de
+                "Second string" au deuxième appel
+                et ensuite pour tout appel suivant <span class="new_code">false</span>
+                sera renvoyé.
+                Ces valeurs renvoyées successivement sont prioritaires
+                sur la valeur constante retournée.
+                Cette dernière est un genre de valeur par défaut si vous voulez.
+            </p>
+            <p>
+                Reprenons aussi le conteneur d'information bouchonné
+                avec des pairs clef / valeur...
+<pre>
+class Configuration {
+    function Configuration() {
+    }
+    
+    function getValue($key) {
+    }
+}
+</pre>
+                Il s'agit là d'une situation classique
+                d'utilisation d'objets fantaisie étant donné
+                que la configuration peut varier grandement de machine à machine :
+                ça contraint fortement la fiabilité de nos tests
+                si nous l'utilisons directement.
+                Le problème est que toutes les données nous parviennent
+                à travers la méthode <span class="new_code">getValue()</span>
+                et que nous voulons des résultats différents pour des clefs différentes.
+                Heureusement les objets fantaisie ont un système de filtrage...
+<pre>
+<strong>$config = &amp;new MockConfiguration($this);
+$config-&gt;setReturnValue('getValue', 'primary', array('db_host'));
+$config-&gt;setReturnValue('getValue', 'admin', array('db_user'));
+$config-&gt;setReturnValue('getValue', 'secret', array('db_password'));</strong>
+</pre>
+                Le paramètre en plus est une liste d'arguments
+                à faire correspondre. Dans ce cas nous essayons
+                de faire correspondre un unique argument :
+                en l'occurrence la clef recherchée.
+                Maintenant que la méthode <span class="new_code">getValue()</span>
+                est invoquée sur l'objet fantaisie...
+<pre>
+$config-&gt;getValue('db_user')
+</pre>
+                ...elle renverra "admin".
+                Elle le trouve en essayant de faire correspondre
+                les arguments entrants dans sa liste
+                d'arguments sortants les uns après les autres
+                jusqu'au moment où une correspondance exacte est atteinte.
+            </p>
+            <p>
+                Il y a des fois où vous souhaitez
+                qu'un objet spécifique soit servi par la fantaisie
+                plutôt qu'une copie.
+                De nouveau c'est identique au mécanisme des bouchons serveur...
+<pre>
+class Thing {
+}
+
+class Vector {
+    function Vector() {
+    }
+    
+    function get($index) {
+    }
+}
+</pre>
+                Dans ce cas vous pouvez placer une référence
+                dans la liste renvoyée par l'objet fantaisie...
+<pre>
+$thing = new Thing();<strong>
+$vector = &amp;new MockVector($this);
+$vector-&gt;setReturnReference('get', $thing, array(12));</strong>
+</pre>
+                Avec cet arrangement vous savez qu'à chaque appel
+                de <span class="new_code">$vector-&gt;get(12)</span>
+                le même <span class="new_code">$thing</span> sera renvoyé.
+            </p>
+        
+        <h2>
+<a class="target" name="attentes"></a>Objets fantaisie en critique</h2>
+            <p>
+                Même si les bouchons serveur vous isolent
+                du désordre du monde réel, il ne s'agit là que
+                de la moitié du bénéfice potentiel.
+                Vous pouvez avoir une classe de test recevant
+                les messages ad hoc, mais est-ce que votre nouvelle classe
+                renvoie bien les bons ?
+                Le tester peut devenir cafouillis sans une librairie d'objets fantaisie.
+            </p>
+            <p>
+                Pour l'exemple, prenons une classe <span class="new_code">SessionPool</span>
+                à laquelle nous allons ajouter une fonction de log.
+                Plutôt que de complexifier la classe originale,
+                nous souhaitons ajouter ce comportement avec un décorateur (GOF).
+                Pour l'instant le code de <span class="new_code">SessionPool</span> ressemble à...
+<pre>
+<strong>class SessionPool {
+    function SessionPool() {
+        ...
+    }
+    
+    function &amp;findSession($cookie) {
+        ...
+    }
+    ...
+}
+
+class Session {
+    ...
+}</strong>
+
+</pre>
+                Alors que pour notre code de log, nous avons...
+<pre><strong>
+class Log {
+    function Log() {
+        ...
+    }
+    
+    function message() {
+        ...
+    }
+}
+
+class LoggingSessionPool {
+    function LoggingSessionPool(&amp;$session_pool, &amp;$log) {
+        ...
+    }
+    
+    function &amp;findSession($cookie) {
+        ...
+    }
+    ...
+}</strong>
+</pre>
+                Dans tout ceci, la seule classe à tester est
+                <span class="new_code">LoggingSessionPool</span>. En particulier,
+                nous voulons vérifier que la méthode <span class="new_code">findSession()</span>
+                est appelée avec le bon identifiant de session au sein du cookie
+                et qu'elle renvoie bien le message "Starting session $cookie"
+                au loggueur.
+            </p>
+            <p>
+                Bien que nous ne testions que quelques lignes
+                de code de production, voici la liste des choses
+                à faire dans un scénario de test conventionnel :
+                <ol>
+                    <li>Créer un objet de log.</li>
+                    <li>Indiquer le répertoire d'écriture du fichier de log.</li>
+                    <li>Modifier les droits sur le répertoire pour pouvoir y écrire le fichier.</li>
+                    <li>Créer un objet <span class="new_code">SessionPool</span>.</li>
+                    <li>Lancer une session, ce qui demande probablement pas mal de choses.</li>
+                    <li>Invoquer <span class="new_code">findSession()</span>.</li>
+                    <li>Lire le nouvel identifiant de session (en espérant qu'il existe un accesseur !).</li>
+                    <li>Lever une assertion de test pour vérifier que cet identifiant correspond bien au cookie.</li>
+                    <li>Lire la dernière ligne du fichier de log.</li>
+                    <li>Supprimer avec une (ou plusieurs) expression rationnelle les timestamps de log en trop, etc.</li>
+                    <li>Vérifier que le message de session est bien dans le texte.</li>
+                </ol>
+                Pas étonnant que les développeurs détestent
+                écrire des tests quand ils sont aussi ingrats.
+                Pour rendre les choses encore pire, à chaque fois que
+                le format de log change ou bien que la méthode de création
+                des sessions change, nous devons réécrire une partie
+                des tests alors même qu'ils ne testent pas ces parties
+                du système. Nous sommes en train de préparer
+                le cauchemar pour les développeurs de ces autres classes.
+            </p>
+            <p>
+                A la place, voici la méthode complète pour le test
+                avec un peu de magie via les objets fantaisie...
+<pre>
+Mock::generate('Session');
+Mock::generate('SessionPool');
+Mock::generate('Log');
+
+class LoggingSessionPoolTest extends UnitTestCase {
+    ...
+    function testFindSessionLogging() {<strong>
+        $session = &amp;new MockSession($this);
+        $pool = &amp;new MockSessionPool($this);
+        $pool-&gt;setReturnReference('findSession', $session);
+        $pool-&gt;expectOnce('findSession', array('abc'));
+        
+        $log = &amp;new MockLog($this);
+        $log-&gt;expectOnce('message', array('Starting session abc'));
+        
+        $logging_pool = &amp;new LoggingSessionPool($pool, $log);
+        $this-&gt;assertReference($logging_pool-&gt;findSession('abc'), $session);
+        $pool-&gt;tally();
+        $log-&gt;tally();</strong>
+    }
+}
+</pre>
+                Commençons par écrire une session simulacre.
+                Pas la peine d'être trop pointilleux avec
+                celle-ci puisque la vérification de la session
+                désirée est effectuée ailleurs. Nous avons
+                juste besoin de vérifier qu'il s'agit de
+                la même que celle qui vient du groupe commun des sessions.
+            </p>
+            <p>
+                <span class="new_code">findSession()</span> est un méthode fabrique
+                dont la simulation est décrite <a href="#stub">plus haut</a>.
+                Le point de départ vient avec le premier appel
+                <span class="new_code">expectOnce()</span>. Cette ligne indique
+                qu'à chaque fois que <span class="new_code">findSession()</span>
+                est invoqué sur l'objet fantaisie, il vérifiera
+                les arguments entrant. S'il ne reçoit
+                que la chaîne "abc" en tant qu'argument
+                alors un succès est envoyé au testeur unitaire,
+                sinon c'est un échec qui est généré.
+                Il s'agit là de la partie qui teste si nous avons bien
+                la bonne session. La liste des arguments suit
+                une format identique à celui qui précise les valeurs renvoyées.
+                Vous pouvez avoir des jokers et des séquences
+                et l'ordre de l'évaluation restera le même.
+            </p>
+            <p>
+                Si l'appel n'est jamais effectué alors n'est généré
+                ni le succès, ni l'échec. Pour contourner cette limitation,
+                nous devons dire à l'objet fantaisie que le test est terminé :
+                il pourra alors décider si les attentes ont été répondues.
+                L'assertion du testeur unitaire de ceci est déclenchée
+                par l'appel <span class="new_code">tally()</span> à la fin du test.
+            </p>
+            <p>
+                Nous utilisons le même modèle pour mettre sur pied
+                le loggueur fantaisie. Nous lui indiquons que <span class="new_code">message()</span>
+                devrait être invoqué une fois et une fois seulement
+                avec l'argument "Starting session abc".
+                En testant les arguments d'appel, plutôt que ceux de sortie du loggueur,
+                nous isolons le test de tout modification dans le loggueur.
+            </p>
+            <p>
+                Nous commençons le lancement nos tests à la création
+                du nouveau <span class="new_code">LoggingSessionPool</span>
+                et nous l'alimentons avec nos objets fantaisie juste créés.
+                Désormais tout est sous contrôle. Au final nous confirmons
+                que le <span class="new_code">$session</span> donné au décorateur est bien
+                celui reçu et prions les objets fantaisie de lancer leurs
+                tests de comptage d'appel interne avec les appels <span class="new_code">tally()</span>.
+            </p>
+            <p>
+                Il y a encore pas mal de code de test, mais ce code est très strict.
+                S'il vous semble encore terrifiant il l'est bien moins
+                que si nous avions essayé sans les objets fantaisie
+                et ce test en particulier, interactions plutôt que résultat,
+                est toujours plus difficile à mettre en place.
+                Le plus souvent vous aurez besoin de tester des situations
+                plus complexes sans ce niveau ni cette précision.
+                En outre une partie peut être remaniée avec la méthode
+                de scénario de test <span class="new_code">setUp()</span>.
+            </p>
+            <p>
+                Voici la liste complète des attentes que vous pouvez
+                placer sur un objet fantaisie avec
+                <a href="http://www.lastcraft.com/simple_test.php">SimpleTest</a>...
+                <table>
+<thead>
+                    <tr>
+<th>Attente</th>
+<th>Nécessite <span class="new_code">tally()</span>
+</th>
+</tr>
+                    </thead>
+<tbody>
+<tr>
+                        <td><span class="new_code">expectArguments($method, $args)</span></td>
+                        <td style="text-align: center">Non</td>
+                    </tr>
+                    <tr>
+                        <td><span class="new_code">expectArgumentsAt($timing, $method, $args)</span></td>
+                        <td style="text-align: center">Non</td>
+                    </tr>
+                    <tr>
+                        <td><span class="new_code">expectCallCount($method, $count)</span></td>
+                        <td style="text-align: center">Oui</td>
+                    </tr>
+                    <tr>
+                        <td><span class="new_code">expectMaximumCallCount($method, $count)</span></td>
+                        <td style="text-align: center">Non</td>
+                    </tr>
+                    <tr>
+                        <td><span class="new_code">expectMinimumCallCount($method, $count)</span></td>
+                        <td style="text-align: center">Oui</td>
+                    </tr>
+                    <tr>
+                        <td><span class="new_code">expectNever($method)</span></td>
+                        <td style="text-align: center">Non</td>
+                    </tr>
+                    <tr>
+                        <td><span class="new_code">expectOnce($method, $args)</span></td>
+                        <td style="text-align: center">Oui</td>
+                    </tr>
+                    <tr>
+                        <td><span class="new_code">expectAtLeastOnce($method, $args)</span></td>
+                        <td style="text-align: center">Oui</td>
+                    </tr>
+                </tbody>
+</table>
+                Où les paramètres sont...
+                <dl>
+                    <dt class="new_code">$method</dt>
+                    <dd>Le nom de la méthode, sous la forme d'une chaîne,
+                    à laquelle la condition doit être appliquée.</dd>
+                    <dt class="new_code">$args</dt>
+                    <dd>
+                        Les arguments sous la forme d'une liste.
+                        Les jokers peuvent être inclus de la même manière
+                        qu'avec <span class="new_code">setReturn()</span>.
+                        Cet argument est optionnel pour <span class="new_code">expectOnce()</span>
+                        et <span class="new_code">expectAtLeastOnce()</span>.
+                    </dd>
+                    <dt class="new_code">$timing</dt>
+                    <dd>
+                        Le seul point dans le temps pour tester
+                        la condition. Le premier appel commence à zéro.
+                    </dd>
+                    <dt class="new_code">$count</dt>
+                    <dd>Le nombre d'appels attendu.</dd>
+                </dl>
+                La méthode <span class="new_code">expectMaximumCallCount()</span>
+                est légèrement différente dans le sens où elle ne pourra
+                générer qu'un échec. Elle reste silencieuse
+                si la limite n'est jamais atteinte.
+            </p>
+            <p>
+                Par ailleurs si vous avez just un appel dans votre test,
+                vérifiez bien que vous utiliser
+                <span class="new_code">expectOnce</span>.<br>
+                Utiliser <span class="new_code">$mocked-&gt;expectAt(0, 'method', 'args);</span>
+                tout seul ne sera pas pris en compte :
+                la vérification des arguments et le comptage total
+                sont pour l'instant encore indépendant.
+            </p>
+            <p>
+                Comme avec les assertions dans les scénarios de test,
+                toutes ces attentes peuvent accepter une surcharge de
+                message sous la forme d'un paramètre supplémentaire.
+                Par ailleurs le message d'échec original peut être inclus
+                dans le résultat avec "%s".
+            </p>
+        
+        <h2>
+<a class="target" name="approches"></a>D'autres approches</h2>
+            <p>
+                Il existe trois approches pour créer des objets
+                fantaisie en comprenant celle utilisée par SimpleTest.
+                Les coder à la main en utilisant une classe de base,
+                les générer dans un fichier ou les générer dynamiquement à la volée.
+            </p>
+            <p>
+                Les objets fantaisie générés avec
+                <a href="simple_test.html">SimpleTest</a> sont dynamiques.
+                Ils sont créés à l'exécution dans la mémoire,
+                grâce à <span class="new_code">eval()</span>, plutôt qu'écrits dans un fichier.
+                Cette opération les rend facile à créer,
+                en une seule ligne, surtout par rapport à leur création
+                à la main dans une hiérarchie de classe parallèle.
+                Le problème avec ce comportement tient généralement
+                dans la mise en place des tests proprement dits.
+                Si les objets originaux changent les versions fantaisie
+                sur lesquels reposent les tests, une désynchronisation peut subvenir.
+                Cela peut aussi arriver avec l'approche en hiérarchie parallèle,
+                mais c'est détecté beaucoup plus vite.
+            </p>
+            <p>
+                Bien sûr, la solution est d'ajouter de véritables tests d'intégration.
+                Vous n'en avez pas besoin de beaucoup
+                et le côté pratique des objets fantaisie fait plus
+                que compenser la petite dose de test supplémentaire.
+                Vous ne pouvez pas avoir confiance dans du code qui
+                ne serait testé que par des objets fantaisie.
+            </p>
+            <p>
+                Si vous restez déterminé de construire des librairies
+                statiques d'objets fantaisie parce que vous souhaitez
+                émuler un comportement très spécifique,
+                vous pouvez y parvenir grâce au générateur de classe de SimpleTest.
+                Dans votre fichier librairie, par exemple
+                <em>mocks/connection.php</em> pour une connexion à une base de données,
+                créer un objet fantaisie et provoquer l'héritage
+                pour hériter pour surcharger des méthodes spéciales
+                ou ajouter des préréglages...
+<pre>
+&lt;?php
+    require_once('simpletest/mock_objects.php');
+    require_once('../classes/connection.php');
+<strong>
+    Mock::generate('Connection', 'BasicMockConnection');
+    class MockConnection extends BasicMockConnection {
+        function MockConnection(&amp;$test, $wildcard = '*') {
+            $this-&gt;BasicMockConnection($test, $wildcard);
+            $this-&gt;setReturn('query', false);
+        }
+    }</strong>
+?&gt;
+</pre>
+                L'appel <span class="new_code">generate</span> dit au générateur de classe
+                d'en créer une appelée <span class="new_code">BasicMockConnection</span>
+                plutôt que la plus courante <span class="new_code">MockConnection</span>.
+                Ensuite nous héritons à partir de celle-ci pour obtenir
+                notre version de <span class="new_code">MockConnection</span>.
+                En interceptant de cette manière nous pouvons ajouter
+                un comportement, ici transformer la valeur par défaut de
+                <span class="new_code">query()</span> en "false".
+                En utilisant le nom par défaut nous garantissons
+                que le générateur de classe fantaisie n'en recréera
+                pas une autre différente si il est invoqué ailleurs
+                dans les tests. Il ne créera jamais de classe
+                si elle existe déjà. Aussi longtemps que le fichier
+                ci-dessus est inclus avant alors tous les tests qui
+                généraient <span class="new_code">MockConnection</span> devraient
+                utiliser notre version à présent. Par contre si
+                nous avons une erreur dans l'ordre et que la librairie
+                de fantaisie en crée une d'abord alors la création
+                de la classe échouera tout simplement.
+            </p>
+            <p>
+                Utiliser cette astuce si vous vous trouvez avec beaucoup
+                de comportement en commun sur les objets fantaisie
+                ou si vous avez de fréquents problèmes d'intégration
+                plus tard dans les étapes de test.
+            </p>
+        
+        <h2>
+<a class="target" name="autres_testeurs"></a>Je pense que SimpleTest pue !</h2>
+            <p>
+                Mais au moment d'écrire ces lignes c'est le seul
+                à gérer les objets fantaisie, donc vous êtes bloqué avec lui ?
+            </p>
+            <p>
+                Non, pas du tout.
+                <a href="simple_test.html">SimpleTest</a> est une boîte à outils
+                et parmi ceux-ci on trouve les objets fantaisie
+                qui peuvent être utilisés indépendamment.
+                Supposons que vous avez votre propre testeur unitaire favori
+                et que tous vos tests actuels l'utilisent.
+                Prétendez que vous avez appelé votre tester unitaire PHPUnit
+                (c'est ce que tout le monde a fait) et que la classe principale
+                de test ressemble à...
+<pre>
+class PHPUnit {
+    function PHPUnit() {
+    }
+    
+    function assertion($message, $assertion) {
+    }
+    ...
+}
+</pre>
+                La seule chose que la méthode <span class="new_code">assertion()</span> réalise,
+                c'est de préparer une sortie embellie alors le paramètre boolien
+                de l'assertion sert à déterminer s'il s'agit d'une erreur ou d'un succès.
+                Supposons qu'elle est utilisée de la manière suivante...
+<pre>
+$unit_test = new PHPUnit();
+$unit_test&gt;assertion('I hope this file exists', file_exists('my_file'));
+</pre>
+                Comment utiliser les objets fantaisie avec ceci ?
+            </p>
+            <p>
+                Il y a une méthode protégée sur la classe de base
+                des objets fantaisie : elle s'appelle <span class="new_code">_assertTrue()</span>.
+                En surchargeant cette méthode nous pouvons utiliser
+                notre propre format d'assertion.
+                Nous commençons avec une sous-classe, dans <em>my_mock.php</em>...
+<pre>
+<strong>&lt;?php
+    require_once('simpletest/mock_objects.php');
+    
+    class MyMock extends SimpleMock() {
+        function MyMock(&amp;$test, $wildcard) {
+            $this-&gt;SimpleMock($test, $wildcard);
+        }
+        
+        function _assertTrue($assertion, $message) {
+            $test = &amp;$this-&gt;getTest();
+            $test-&gt;assertion($message, $assertion);
+        }
+    }
+?&gt;</strong>
+</pre>
+                Maintenant une instance de <span class="new_code">MyMock</span>
+                créera un objet qui parle le même langage que votre testeur.
+                Bien sûr le truc c'est que nous créons jamais un tel objet :
+                le générateur s'en chargera. Nous avons juste besoin
+                d'une ligne de code supplémentaire pour dire au générateur
+                d'utiliser vos nouveaux objets fantaisie...
+<pre>
+&lt;?php
+    require_once('simpletst/mock_objects.php');
+    
+    class MyMock extends SimpleMock() {
+        function MyMock($test, $wildcard) {
+            $this-&gt;SimpleMock(&amp;$test, $wildcard);
+        }
+        
+        function _assertTrue($assertion, $message , &amp;$test) {
+            $test-&gt;assertion($message, $assertion);
+        }
+    }<strong>
+    SimpleTestOptions::setMockBaseClass('MyMock');</strong>
+?&gt;
+</pre>
+                A partir de maintenant vous avez juste à inclure
+                <em>my_mock.php</em> à la place de la version par défaut
+                <em>simple_mock.php</em> et vous pouvez introduire
+                des objets fantaisie dans votre suite de tests existants.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            L'article originel sur
+            <a href="http://www.mockobjects.com/">les objets fantaisie</a>.
+        </li>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page d'accueil de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/overview.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/overview.html
new file mode 100644
index 000000000..968bbc48e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/overview.html
@@ -0,0 +1,321 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>
+        Aperçu et liste des fonctionnalités des testeurs unitaires PHP et web de SimpleTest PHP
+    </title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Apercu de SimpleTest</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#resume">Résumé rapide</a> de l'outil SimpleTest pour PHP.
+        </li>
+<li>
+            <a href="#fonctionnalites">La liste des fonctionnalites</a>, à la fois présentes et à venir.
+        </li>
+<li>
+            Il y a beaucoup de <a href="#ressources">ressources sur les tests unitaires</a> sur le web.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="resume"></a>Qu'est-ce que SimpleTest ?</h2>
+            <p>
+                Le coeur de SimpleTest est un framework de test construit autour de classes de scénarios de test. Celles-ci sont écrites comme des extensions des classes premières de scénarios de test, chacune élargie avec des méthodes qui contiennent le code de test effectif. Les scripts de test de haut niveau invoque la méthode <span class="new_code">run()</span> à chaque scénario de test successivement. Chaque méthode de test est écrite pour appeler des assertions diverses que le développeur suppose être vraies, <span class="new_code">assertEqual()</span> par exemple. Si l'assertion est correcte, alors un succès est expédié au rapporteur observant le test, mais toute erreur déclenche une alerte et une description de la dissension.
+            </p>
+            <p>
+                Un <a href="unit_test_documentation.html">scénario de test</a> ressemble à...
+<pre>
+class <strong>MyTestCase</strong> extends UnitTestCase {
+    <strong>
+    function testLog() {
+        $log = &amp;new Log('my.log');
+        $log-&gt;message('Hello');
+        $this-&gt;assertTrue(file_exists('my.log'));
+    }</strong>
+}
+</pre>
+            </p>
+            <p>
+                Ces outils sont conçus pour le développeur. Les tests sont écrits en PHP directement, plus ou moins simultanément avec la construction de l'application elle-même. L'avantage d'utiliser PHP lui-même comme langage de test est qu'il n'y a pas de nouveau langage à apprendre, les tests peuvent commencer directement et le développeur peut tester n'importe quelle partie du code. Plus simplement, toutes les parties qui peuvent être accédées par le code de l'application peuvent aussi être accédées par le code de test si ils sont tous les deux dans le même langage.
+            </p>
+            <p>
+                Le type de scénario de test le plus simple est le <span class="new_code">UnitTestCase</span>. Cette classe de scénario de test inclut les tests standards pour l'égalité, les références et l'appariement de motifs (via les expressions rationnelles). Ceux-ci testent ce que vous seriez en droit d'attendre du résultat d'une fonction ou d'une méthode. Il s'agit du type de test le plus commun pendant le quotidien du développeur, peut-être 95% des scénarios de test.
+            </p>
+            <p>
+                La tâche ultime d'une application web n'est cependant pas de produire une sortie correcte à partir de méthodes ou d'objets, mais plutôt de produire des pages web. La classe <span class="new_code">WebTestCase</span> teste des pages web. Elle simule un navigateur web demandant une page, de façon exhaustive : cookies, proxies, connexions sécurisées, authentification, formulaires, cadres et la plupart des éléments de navigation. Avec ce type de scénario de test, le développeur peut garantir que telle ou telle information est présente dans la page et que les formulaires ainsi que les sessions sont gérés comme il faut.
+            </p>
+            <p>
+                Un <a href="web_tester_documentation.html">scénario de test web</a> ressemble à...
+<pre>
+class <strong>MySiteTest</strong> extends WebTestCase {
+    <strong>
+    function testHomePage() {
+        $this-&gt;get('http://www.my-site.com/index.php');
+        $this-&gt;assertTitle('My Home Page');
+        $this-&gt;clickLink('Contact');
+        $this-&gt;assertTitle('Contact me');
+        $this-&gt;assertWantedPattern('/Email me at/');
+    }</strong>
+}
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="fonctionnalites"></a>Liste des fonctionnalites</h2>
+            <p>
+                Ci-dessous vous trouverez un canevas assez brut des fonctionnalités à aujourd'hui et pour demain, sans oublier leur date approximative de publication. J'ai bien peur qu'il soit modifiable sans pré-avis étant donné que les jalons dépendent beaucoup sur le temps disponible. Les trucs en vert ont été codés, mais pas forcément déjà rendus public. Si vous avez une besoin pressant pour une fonctionnalité verte mais pas encore publique alors vous devriez retirer le code directement sur le  CVS chez SourceFourge. Une fonctionnalitée publiée est indiqué par "Fini".
+                <table>
+<thead>
+                    <tr>
+<th>Fonctionnalité</th>
+<th>Description</th>
+<th>Publication</th>
+</tr>
+                    </thead>
+<tbody>
+<tr>
+                        <td>Scénariot de test unitaire</td>
+                        <td>Les classes de test et assertions de base</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Affichage HTML</td>
+                        <td>L'affichage le plus simple possible</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Autochargement des scénarios de test</td>
+                        <td>Lire un fichier avec des scénarios de test et les charger dans un groupe de tests automatiquement</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Générateur de code d'objets fantaisie</td>
+                        <td>Des objets capable de simuler d'autres objets, supprimant les dépendances dans les tests</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Bouchons serveur</td>
+                        <td>Des objets fantaisie sans résultat attendu à utiliser à l'extérieur des scénarios de test, pour le prototypage par exemple.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Intégration d'autres testeurs unitaires</td>
+                        <td>
+                            La capacité de lire et simuler d'autres scénarios de test en provenance de PHPUnit et de PEAR::Phpunit.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Scénario de test web</td>
+                        <td>Appariement basique de motifs dans une page téléchargée.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Analyse de page HTML</td>
+                        <td>Permet de suivre les liens et de trouver la balise de titre</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Simulacre partiel</td>
+                        <td>Simuler des parties d'une classe pour tester moins qu'une classe ou dans des cas complexes.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Gestion des cookies Web</td>
+                        <td>Gestion correcte des cookies au téléchargement d'une page.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Suivi des redirections</td>
+                        <td>Le téléchargement d'une page suit automatiquement une redirection 300.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Analyse d'un formulaire</td>
+                        <td>La capacité de valider un formulaire simple et d'en lire les valeurs par défaut.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Interface en ligne de commande</td>
+                        <td>Affiche le résultat des tests sans navigateur web.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Mise à nu des attentes d'une classe</td>
+                        <td>Peut créer des tests précis avec des simulacres ainsi que des scénarios de test.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Sortie et analyse XML</td>
+                        <td>Permet de tester sur plusieurs hôtes et d'intégrer des extensions d'acceptation de test.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Scénario de test en ligne de commande</td>
+                        <td>Permet de tester des outils ou scripts en ligne de commande et de manier des fichiers.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Compatibilité avec PHP Documentor</td>
+                        <td>Génération automatique et complète de la documentation au niveau des classes.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Interface navigateur</td>
+                        <td>Mise à nu des niveaux bas de l'interface du navigateur web pour des scénarios de test plus précis.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Authentification HTTP</td>
+                        <td>Téléchargement des pages web protégées avec une authentification basique seulement.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Boutons de navigation d'un navigateur</td>
+                        <td>Arrière, avant et recommencer</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support de SSL</td>
+                        <td>Peut se connecter à des pages de type https.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support de proxy</td>
+                        <td>Peut se connecter via des proxys communs</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Support des cadres</td>
+                        <td>Gère les cadres dans les scénarios de test web.</td>
+                        <td style="color: green;">Fini</td>
+                    </tr>
+                    <tr>
+                        <td>Test de l'upload de fichier</td>
+                        <td>Peut simuler la balise input de type file</td>
+                        <td style="color: red;">1.0.1</td>
+                    </tr>
+                    <tr>
+                        <td>Amélioration sur la machinerie des rapports</td>
+                        <td>Retouche sur la transmission des messages pour une meilleur coopération avec les IDEs</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Amélioration de l'affichage des tests</td>
+                        <td>Une meilleure interface graphique web, avec un arbre des scénarios de test.</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Localisation</td>
+                        <td>Abstraction des messages et génration du code à partir de fichiers XML.</td>
+                        <td style="color: red;">1.1</td>
+                    </tr>
+                    <tr>
+                        <td>Simulation d'interface</td>
+                        <td>Peut générer des objets fantaisie tant vers des interfaces que vers des classes.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Test sur es exceptions</td>
+                        <td>Dans le même esprit que sur les tests des erreurs PHP.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                    <tr>
+                        <td>Rercherche d'éléments avec XPath</td>
+                        <td>Peut utiliser Tidy HTML pour un appariement plus rapide et plus souple.</td>
+                        <td style="color: red;">2.0</td>
+                    </tr>
+                </tbody>
+</table>
+                La migration vers PHP5 commencera juste après la série des 1.0, à partir de là PHP4 ne sera plus supporté. SimpleTest est actuellement compatible avec PHP5 mais n'utilisera aucune des nouvelles fonctionnalités avant la version 2.
+            </p>
+        
+        <h2>
+<a class="target" name="ressources"></a>Ressources sur le web pour les tests</h2>
+            <p>
+                Le processus est au moins aussi important que les outils. Le type de procédure que fait un usage le plus intensif des outils de test pour développeur est bien sûr l'<a href="http://www.extremeprogramming.org/">Extreme Programming</a>. Il s'agit là d'une des <a href="http://www.agilealliance.com/articles/index">méthodes agiles</a> qui combinent plusieurs pratiques pour "lisser la courbe de coût" du développement logiciel. La plus extrème reste le <a href="http://www.testdriven.com/modules/news/">développement piloté par les tests</a>, où vous devez adhérer à la règle du <cite>pas de code avant d'avoir un test</cite>. Si vous êtes plutôt du genre planninficateur ou que vous estimez que l'expérience compte plus que l'évolution, vous préférerez peut-être l'approche <a href="http://www.therationaledge.com/content/dec_01/f_spiritOfTheRUP_pk.html">RUP</a>. Je ne l'ai pas testé mais je peux voir où vous aurez besoin d'outils de test (cf. illustration 9).
+            </p>
+            <p>
+                La plupart des testeurs unitaires sont dans une certaine mesure un clone de <a href="http://www.junit.org/">JUnit</a>, au moins dans l'interface. Il y a énormément d'information sur le site de JUnit, à commencer par la <a href="http://junit.sourceforge.net/doc/faq/faq.htm">FAQ</a> quie contient pas mal de conseils généraux sur les tests. Une fois mordu par le bogue vous apprécierez sûrement la phrase <a href="http://junit.sourceforge.net/doc/testinfected/testing.htm">infecté par les tests</a> trouvée par Eric Gamma. Si vous êtes encore en train de tergiverser sur un testeur unitaire, sachez que les choix principaux sont <a href="http://phpunit.sourceforge.net/">PHPUnit</a> et <a href="http://pear.php.net/manual/en/package.php.phpunit.php">Pear PHP::PHPUnit</a>. De nombreuses fonctionnalités de SimpleTest leurs font défaut, mais la version PEAR a d'ores et déjà été mise à jour pour PHP5. Elle est aussi recommandée si vous portez des scénarios de test existant depuis <a href="http://www.junit.org/">JUnit</a>.
+            </p>
+            <p>
+                Les développeurs de bibliothèque n'ont pas l'air de livrer très souvent des tests avec leur code : c'est bien dommage. Le code d'une bibliothèque qui inclut des tests peut être remanié avec plus de sécurité et le code de test sert de documentation additionnelle dans un format assez standard. Ceci peut épargner la pêche aux indices dans le code source lorsque qu'un problème survient, en particulier lors de la mise à jour d'une telle bibliothèque. Parmi les bibliothèques utilisant SimpleTest comme testeur unitaire on retrouve <a href="http://wact.sourceforge.net/">WACT</a> et <a href="http://sourceforge.net/projects/htmlsax">PEAR::XML_HTMLSax</a>.
+            </p>
+            <p>
+                Au jour d'aujourd'hui il manque tristement beaucoup de matière sur les objets fantaisie : dommage, surtout que tester unitairement sans eux représente pas mal de travail en plus. L'<a href="http://www.sidewize.com/company/mockobjects.pdf">article original sur les objets fantaisie</a> est très orienté Java, mais reste intéressant à lire. Etant donné qu'il s'agit d'une nouvelle technologie il y a beaucoup de discussions et de débats sur comment les utiliser, souvent sur des wikis comme <a href="http://xpdeveloper.com/cgi-bin/oldwiki.cgi?MockObjects">Extreme Tuesday</a> ou <a href="http://www.mockobjects.com/MocksObjectsPaper.html">www.mockobjects.com</a>ou <a href="http://c2.com/cgi/wiki?MockObject">the original C2 Wiki</a>. Injecter des objets fantaisie dans une classe est un des champs principaux du débat : cet <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">article chez IBM</a> en est un bon point de départ.
+            </p>
+            <p>
+                Il y a énormement d'outils de test web mais la plupart sont écrits en Java. De plus les tutoriels et autres conseils sont plutôt rares. Votre seul espoir est de regarder directement la documentation pour <a href="http://httpunit.sourceforge.net/">HTTPUnit</a>, <a href="http://htmlunit.sourceforge.net/">HTMLUnit</a> ou <a href="http://jwebunit.sourceforge.net/">JWebUnit</a> et d'espérer y trouver pour des indices. Il y a aussi des frameworks basés sur XML, mais de nouveau la plupart ont besoin de Java pour tourner.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            <a href="unit_test_documentation.html">Documentation pour SimpleTest</a>.
+        </li>
+<li>
+            <a href="http://www.lastcraft.com/first_test_tutorial.php">Comment écrire des scénarios de test en PHP</a> est un tutoriel plutôt avancé.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API de SimpleTest</a> par phpdoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html
new file mode 100644
index 000000000..3a0ee35cf
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/partial_mocks_documentation.html
@@ -0,0 +1,464 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : les objets fantaisie partiels</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les objets fantaisie partiels</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#injection">Le problème de l'injection d'un objet fantaisie</a>.
+        </li>
+<li>
+            Déplacer la création vers une méthode <a href="#creation">fabrique protégée</a>.
+        </li>
+<li>
+            <a href="#partiel">L'objet fantaisie partiel</a> génère une sous-classe.
+        </li>
+<li>
+            Les objets fantaisie partiels <a href="#moins">testent moins qu'une classe</a>.
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                Un objet fantaisie partiel n'est ni plus ni moins
+                qu'un modèle de conception pour soulager un problème spécifique
+                du test avec des objets fantaisie, celui de placer
+                des objets fantaisie dans des coins serrés.
+                Il s'agit d'un outil assez limité et peut-être même
+                une idée pas si bonne que ça. Elle est incluse dans SimpleTest
+                pour la simple raison que je l'ai trouvée utile
+                à plus d'une occasion et qu'elle m'a épargnée
+                pas mal de travail dans ces moments-là.
+            </p>
+        
+        <h2>
+<a class="target" name="injection"></a>Le problème de l'injection dans un objet fantaisie</h2>
+            <p>
+                Quand un objet en utilise un autre il est très simple
+                d'y faire circuler une version fantaisie déjà prête
+                avec ses attentes. Les choses deviennent un peu plus délicates
+                si un objet en crée un autre et que le créateur est celui
+                que l'on souhaite tester. Cela revient à dire que l'objet
+                créé devrait être une fantaisie, mais nous pouvons
+                difficilement dire à notre classe sous test de créer
+                un objet fantaisie plutôt qu'un "vrai" objet.
+                La classe testée ne sait même pas qu'elle travaille dans un environnement de test.
+            </p>
+            <p>
+                Par exemple, supposons que nous sommes en train
+                de construire un client telnet et qu'il a besoin
+                de créer une socket réseau pour envoyer ses messages.
+                La méthode de connexion pourrait ressemble à quelque chose comme...
+<pre>
+<strong>&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function &amp;connect($ip, $port, $username, $password) {
+        $socket = &amp;new Socket($ip, $port);
+        $socket-&gt;read( ... );
+        ...
+    }
+}
+?&gt;</strong>
+</pre>
+                Nous voudrions vraiment avoir une version fantaisie
+                de l'objet socket, que pouvons nous faire ?
+            </p>
+            <p>
+                La première solution est de passer la socket en
+                tant que paramètre, ce qui force la création
+                au niveau inférieur. Charger le client de cette tâche
+                est effectivement une bonne approche si c'est possible
+                et devrait conduire à un remaniement -- de la création
+                à partir de l'action. En fait, c'est là une des manières
+                avec lesquels tester en s'appuyant sur des objets fantaisie
+                vous force à coder des solutions plus resserrées sur leur objectif.
+                Ils améliorent votre programmation.
+            </p>
+            <p>
+                Voici ce que ça devrait être...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    <strong>function &amp;connect(&amp;$socket, $username, $password) {
+        $socket-&gt;read( ... );
+        ...
+    }</strong>
+}
+?&gt;
+</pre>
+                Sous-entendu, votre code de test est typique d'un cas
+                de test avec un objet fantaisie.
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = &amp;new MockSocket($this);
+        ...
+        $telnet = &amp;new Telnet();
+        $telnet-&gt;connect($socket, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                C'est assez évident que vous ne pouvez descendre que d'un niveau.
+                Vous ne voudriez pas que votre application de haut niveau
+                crée tous les fichiers de bas niveau, sockets et autres connexions
+                à la base de données dont elle aurait besoin.
+                Elle ne connaîtrait pas les paramètres du constructeur de toute façon.
+            </p>
+            <p>
+                La solution suivante est de passer l'objet créé sous la forme
+                d'un paramètre optionnel...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...<strong>
+    function &amp;connect($ip, $port, $username, $password, $socket = false) {
+        if (!$socket) {
+            $socket = &amp;new Socket($ip, $port);
+        }
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                Pour une solution rapide, c'est généralement suffisant.
+                Ensuite le test est très similaire : comme si le paramètre
+                était transmis formellement...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = &amp;new MockSocket($this);
+        ...
+        $telnet = &amp;new Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret', &amp;$socket);
+        ...</strong>
+    }
+}
+</pre>
+                Le problème de cette approche tient dans son manque de netteté.
+                Il y a du code de test dans la classe principale et aussi
+                des paramètres transmis dans le scénario de test
+                qui ne sont jamais utilisés. Il s'agit là d'une approche
+                rapide et sale, mais qui ne reste pas moins efficace
+                dans la plupart des situations.
+            </p>
+            <p>
+                Une autre solution encore est de laisser un objet fabrique
+                s'occuper de la création...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {<strong>
+    function Telnet(&amp;$network) {
+        $this-&gt;_network = &amp;$network;
+    }</strong>
+    ...
+    function &amp;connect($ip, $port, $username, $password) {<strong>
+        $socket = &amp;$this-&gt;_network-&gt;createSocket($ip, $port);
+        $socket-&gt;read( ... );</strong>
+        ...
+        return $socket;
+    }
+}
+?&gt;
+</pre>
+                Il s'agit là probablement de la réponse la plus travaillée
+                étant donné que la création est maintenant située
+                dans une petite classe spécialisée. La fabrique réseau
+                peut être testée séparément et utilisée en tant que fantaisie
+                quand nous testons la classe telnet...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = &amp;new MockSocket($this);
+        ...
+        $network = &amp;new MockNetwork($this);
+        $network-&gt;setReturnReference('createSocket', $socket);
+        $telnet = &amp;new Telnet($network);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                Le problème reste que nous ajoutons beaucoup de classes
+                à la bibliothèque. Et aussi que nous utilisons beaucoup
+                de fabriques ce qui rend notre code un peu moins intuitif.
+                La solution la plus flexible, mais aussi la plus complexe.
+            </p>
+            <p>
+                Peut-on trouver un juste milieu ?
+            </p>
+        
+        <h2>
+<a class="target" name="creation"></a>Méthode fabrique protégée</h2>
+            <p>
+                Il existe une technique pour palier à ce problème
+                sans créer de nouvelle classe dans l'application;
+                par contre elle induit la création d'une sous-classe au moment du test.
+                Premièrement nous déplaçons la création de la socket dans sa propre méthode...
+<pre>
+&lt;?php
+require_once('socket.php');
+
+class Telnet {
+    ...
+    function &amp;connect($ip, $port, $username, $password) {<strong>
+        $socket = &amp;$this-&gt;_createSocket($ip, $port);</strong>
+        $socket-&gt;read( ... );
+        ...
+    }<strong>
+    
+    function &amp;_createSocket($ip, $port) {
+        return new Socket($ip, $port);
+    }</strong>
+}
+?&gt;
+</pre>
+                Il s'agit là de la seule modification dans le code de l'application.
+            </p>
+            <p>
+                Pour le scénario de test, nous devons créer
+                une sous-classe de manière à intercepter la création de la socket...
+<pre>
+<strong>class TelnetTestVersion extends Telnet {
+    var $_mock;
+    
+    function TelnetTestVersion(&amp;$mock) {
+        $this-&gt;_mock = &amp;$mock;
+        $this-&gt;Telnet();
+    }
+    
+    function &amp;_createSocket() {
+        return $this-&gt;_mock;
+    }
+}</strong>
+</pre>
+                Ici j'ai déplacé la fantaisie dans le constructeur,
+                mais un setter aurait fonctionné tout aussi bien.
+                Notez bien que la fantaisie est placée dans une variable
+                d'objet avant que le constructeur ne soit attaché.
+                C'est nécessaire dans le cas où le constructeur appelle 
+                <span class="new_code">connect()</span>.
+                Autrement il pourrait donner un valeur nulle à partir de
+                <span class="new_code">_createSocket()</span>.
+            </p>
+            <p>
+                Après la réalisation de tout ce travail supplémentaire
+                le scénario de test est assez simple.
+                Nous avons juste besoin de tester notre nouvelle classe à la place...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = &amp;new MockSocket($this);
+        ...
+        $telnet = &amp;new TelnetTestVersion($socket);
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                Cette nouvelle classe est très simple bien sûr.
+                Elle ne fait qu'initier une valeur renvoyée, à la manière
+                d'une fantaisie. Ce serait pas mal non plus si elle pouvait
+                vérifier les paramètres entrants.
+                Exactement comme un objet fantaisie.
+                Il se pourrait bien que nous ayons à réaliser cette astuce régulièrement :
+                serait-il possible d'automatiser la création de cette sous-classe ?
+            </p>
+        
+        <h2>
+<a class="target" name="partiel"></a>Un objet fantaisie partiel</h2>
+            <p>
+                Bien sûr la réponse est "oui"
+                ou alors j'aurais arrêté d'écrire depuis quelques temps déjà !
+                Le test précédent a représenté beaucoup de travail,
+                mais nous pouvons générer la sous-classe en utilisant
+                une approche à celle des objets fantaisie.
+            </p>
+            <p>
+                Voici donc une version avec objet fantaisie partiel du test...
+<pre>
+<strong>Mock::generatePartial(
+        'Telnet',
+        'TelnetTestVersion',
+        array('_createSocket'));</strong>
+
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {<strong>
+        $socket = &amp;new MockSocket($this);
+        ...
+        $telnet = &amp;new TelnetTestVersion($this);
+        $telnet-&gt;setReturnReference('_createSocket', $socket);
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+        ...</strong>
+    }
+}
+</pre>
+                La fantaisie partielle est une sous-classe de l'original
+                dont on aurait "remplacé" les méthodes sélectionnées
+                avec des versions de test. L'appel à <span class="new_code">generatePartial()</span>
+                nécessite trois paramètres : la classe à sous classer,
+                le nom de la nouvelle classe et une liste des méthodes à simuler.
+            </p>
+            <p>
+                Instancier les objets qui en résultent est plutôt délicat.
+                L'unique paramètre du constructeur d'un objet fantaisie partiel
+                est la référence du testeur unitaire.
+                Comme avec les objets fantaisie classiques c'est nécessaire
+                pour l'envoi des résultats de test en réponse à la vérification des attentes.
+            </p>
+            <p>
+                Une nouvelle fois le constructeur original n'est pas lancé.
+                Indispensable dans le cas où le constructeur aurait besoin
+                des méthodes fantaisie : elles n'ont pas encore été initiées !
+                Nous initions les valeurs retournées à cet instant et
+                ensuite lançons le constructeur avec ses paramètres normaux.
+                Cette construction en trois étapes de "new",
+                suivie par la mise en place des méthodes et ensuite
+                par la lancement du constructeur proprement dit est
+                ce qui distingue le code d'un objet fantaisie partiel.
+            </p>
+            <p>
+                A part pour leur construction, toutes ces méthodes
+                fantaisie ont les mêmes fonctionnalités que dans
+                le cas des objets fantaisie et toutes les méthodes
+                non fantaisie se comportent comme avant.
+                Nous pouvons mettre en place des attentes très facilement...
+<pre>
+class TelnetTest extends UnitTestCase {
+    ...
+    function testConnection() {
+        $socket = &amp;new MockSocket($this);
+        ...
+        $telnet = &amp;new TelnetTestVersion($this);
+        $telnet-&gt;setReturnReference('_createSocket', $socket);<strong>
+        $telnet-&gt;expectOnce('_createSocket', array('127.0.0.1', 21));</strong>
+        $telnet-&gt;Telnet();
+        $telnet-&gt;connect('127.0.0.1', 21, 'Me', 'Secret');
+        ...<strong>
+        $telnet-&gt;tally();</strong>
+    }
+}
+</pre>
+            </p>
+        
+        <h2>
+<a class="target" name="moins"></a>Tester moins qu'une classe</h2>
+            <p>
+                Les méthodes issues d'un objet fantaisie n'ont pas
+                besoin d'être des méthodes fabrique, Il peut s'agir
+                de n'importe quelle sorte de méthode.
+                Ainsi les objets fantaisie partiels nous permettent
+                de prendre le contrôle de n'importe quelle partie d'une classe,
+                le constructeur excepté. Nous pourrions même aller jusqu'à
+                créer des fantaisies sur toutes les méthodes à part celle
+                que nous voulons effectivement tester.
+            </p>
+            <p>
+                Cette situation est assez hypothétique, étant donné
+                que je ne l'ai jamais essayée. Je suis ouvert à cette possibilité,
+                mais je crains qu'en forçant la granularité d'un objet
+                on n'obtienne pas forcément un code de meilleur qualité.
+                Personnellement j'utilise les objets fantaisie partiels
+                comme moyen de passer outre la création ou alors
+                de temps en temps pour tester le modèle de conception TemplateMethod.
+            </p>
+            <p>
+                Pour choisir le mécanisme à utiliser, on en revient
+                toujours aux standards de code de votre projet.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète pour SimpleTest</a>
+            à partir de PHPDoc.
+        </li>
+<li>
+            La méthode fabrique protégée est décrite dans
+            <a href="http://www-106.ibm.com/developerworks/java/library/j-mocktest.html">
+            cet article d'IBM</a>. Il s'agit de l'unique papier
+            formel que j'ai vu sur ce problème.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/reporter_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/reporter_documentation.html
new file mode 100644
index 000000000..c9665d55e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/reporter_documentation.html
@@ -0,0 +1,538 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : le rapporteur de test</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le rapporteur de test</h1>
+        This page...
+        <ul>
+<li>
+            Afficher <a href="#html">les résultats en HTML</a>
+        </li>
+<li>
+            Afficher et <a href="#autres">rapporter les résultats</a>
+            dans d'autres formats
+        </li>
+<li>
+            Utilisé <a href="#cli">SimpleTest depuis la ligne de commande</a>
+        </li>
+<li>
+            <a href="#xml">Utiliser XML</a> pour des tests distants
+        </li>
+</ul>
+<div class="content">
+        
+            <p>
+                SimpleTest suit plutôt plus que moins le modèle MVC (Modèle-Vue-Contrôleur).
+                Les classes "reporter" sont les vues et les modèles
+                sont vos scénarios de test et leur hiérarchie.
+                Le contrôleur est le plus souvent masqué à l'utilisateur
+                de SimpleTest à moins de vouloir changer la façon
+                dont les tests sont effectivement exécutés,
+                auquel cas il est possible de surcharger les objets
+                "runner" (ceux de l'exécuteur) depuis l'intérieur
+                d'un scénario de test. Comme d'habitude avec MVC,
+                le contrôleur est plutôt indéfini et il existe d'autres endroits
+                pour contrôler l'exécution des tests.
+            </p>
+        
+        <h2>
+<a class="target" name="html"></a>Les résultats rapportés au format HTML</h2>
+            <p>
+                L'affichage par défaut est minimal à l'extrême.
+                Il renvoie le succès ou l'échec avec les barres conventionnelles
+                - rouge et verte - et affichent une trace d'arborescence
+                des groupes de test pour chaque assertion erronée. Voici un tel échec...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <span class="fail">Fail</span>: createnewfile-&gt;True assertion failed.<br>
+                    <div style="padding: 8px; margin-top: 1em; background-color: red; color: white;">1/1 test cases complete.
+                    <strong>0</strong> passes, <strong>1</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                Alors qu'ici tous les tests passent...
+                <div class="demo">
+                    <h1>File test</h1>
+                    <div style="padding: 8px; margin-top: 1em; background-color: green; color: white;">1/1 test cases complete.
+                    <strong>1</strong> passes, <strong>0</strong> fails and <strong>0</strong> exceptions.</div>
+                </div>
+                La bonne nouvelle, c'est qu'il existe pas mal de points
+                dans la hiérarchie de l'affichage pour créer des sous-classes.
+            </p>
+            <p>
+                Pour l'affichage basé sur des pages web,
+                il y a la classe <span class="new_code">HtmlReporter</span> avec la signature suivante...
+<pre>
+class HtmlReporter extends SimpleReporter {
+    public HtmlReporter($encoding) { ... }
+    public makeDry(boolean $is_dry) { ... }
+    public void paintHeader(string $test_name) { ... }
+    public void sendNoCacheHeaders() { ... }
+    public void paintFooter(string $test_name) { ... }
+    public void paintGroupStart(string $test_name, integer $size) { ... }
+    public void paintGroupEnd(string $test_name) { ... }
+    public void paintCaseStart(string $test_name) { ... }
+    public void paintCaseEnd(string $test_name) { ... }
+    public void paintMethodStart(string $test_name) { ... }
+    public void paintMethodEnd(string $test_name) { ... }
+    public void paintFail(string $message) { ... }
+    public void paintPass(string $message) { ... }
+    public void paintError(string $message) { ... }
+    public void paintException(string $message) { ... }
+    public void paintMessage(string $message) { ... }
+    public void paintFormattedMessage(string $message) { ... }
+    protected string getCss() { ... }
+    public array getTestList() { ... }
+    public integer getPassCount() { ... }
+    public integer getFailCount() { ... }
+    public integer getExceptionCount() { ... }
+    public integer getTestCaseCount() { ... }
+    public integer getTestCaseProgress() { ... }
+}
+</pre>
+                Voici ce que certaines de ces méthodes veulent dire.
+                Premièrement les méthodes d'affichage que vous voudrez probablement surcharger...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">HtmlReporter(string $encoding)</span><br>
+                        est le constructeur. Notez que le test unitaire initie
+                        le lien à l'affichage plutôt que l'opposé.
+                        L'affichage est principalement un receveur passif
+                        des évènements de tests. Cela permet d'adapter
+                        facilement l'affichage pour d'autres systèmes
+                        en dehors des tests unitaires, tel le suivi
+                        de la charge de serveurs.
+                        L'"encoding" est le type d'encodage
+                        que vous souhaitez utiliser pour l'affichage du test.
+                        Pour pouvoir effectuer un rendu correct de la sortie
+                        de débogage quand on utilise le testeur web,
+                        il doit correspondre à l'encodage du site testé.
+                        Les chaînes de caractères disponibles
+                        sont indiquées dans la fonction PHP
+                        <a href="http://www.php.net/manual/fr/function.htmlentities.php">html_entities()</a>.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintHeader(string $test_name)</span><br>
+                        est appelé une fois, au début du test quand l'évènement
+                        de démarrage survient. Le premier évènement de démarrage
+                        est souvent délivré par le groupe de tests du niveau
+                        le plus haut et donc c'est de là que le
+                        <span class="new_code">$test_name</span> arrive.
+                        Il peint les titres de la page, CSS, la balise "body", etc.
+                        Il ne renvoie rien du tout (<span class="new_code">void</span>).
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFooter(string $test_name)</span><br>
+                        est appelé à la toute fin du test pour fermer
+                        les balises ouvertes par l'entête de la page.
+                        Par défaut il affiche aussi la barre rouge ou verte
+                        et le décompte final des résultats.
+                        En fait la fin des tests arrive quand l'évènement
+                        de fin de test arrive avec le même nom
+                        que celui qui l'a initié au même niveau.
+                        Le nid des tests en quelque sorte.
+                        Fermer le dernier test finit l'affichage.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodStart(string $test_name)</span><br>
+                        est appelé au début de chaque méthode de test.
+                        Normalement le nom vient de celui de la méthode.
+                        Les autres évènements de départ de test
+                        se comportent de la même manière sauf que
+                        celui du groupe de tests indique au rapporteur
+                        le nombre de scénarios de test qu'il contient.
+                        De la sorte le rapporteur peut afficher une barre
+                        de progrès au fur et à mesure que l'exécuteur
+                        passe en revue les scénarios de test.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintMethodEnd(string $test_name)</span><br>
+                        clôt le test lancé avec le même nom.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintFail(string $message)</span><br>
+                        peint un échec. Par défaut il ne fait qu'afficher
+                        le mot "fail", une trace d'arborescence
+                        affichant la position du test en cours
+                        et le message transmis par l'assertion.
+                    </li>
+                    <li>
+                        <span class="new_code">void paintPass(string $message)</span><br>
+                        ne fait rien, par défaut.
+                    </li>
+                    <li>
+                        <span class="new_code">string getCss()</span><br>
+                        renvoie les styles CSS sous la forme d'une chaîne
+                        à l'attention de la méthode d'entêtes d'une page.
+                        Des styles additionnels peuvent être ajoutés ici
+                        si vous ne surchargez pas les entêtes de la page.
+                        Vous ne voudrez pas utiliser cette méthode dans
+                        des entêtes d'une page surchargée si vous souhaitez
+                        inclure le feuille de style CSS d'origine.
+                    </li>
+                </ul>
+                Il y a aussi des accesseurs pour aller chercher l'information
+                sur l'état courant de la suite de test. Vous les utiliserez
+                pour enrichir l'affichage...
+                <ul class="api">
+                    <li>
+                        <span class="new_code">array getTestList()</span><br>
+                        est la première méthode très commode pour les sous-classes.
+                        Elle liste l'arborescence courante des tests
+                        sous la forme d'une liste de noms de tests.
+                        Le premier test -- celui le plus proche du coeur --
+                        sera le premier dans la liste et la méthode de test
+                        en cours sera la dernière.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getPassCount()</span><br>
+                        renvoie le nombre de succès atteint. Il est nécessaire
+                        pour l'affichage à la fin.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getFailCount()</span><br>
+                        renvoie de la même manière le nombre d'échecs.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getExceptionCount()</span><br>
+                        renvoie quant à lui le nombre d'erreurs.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseCount()</span><br>
+                        est le nombre total de scénarios lors de l'exécution des tests.
+                        Il comprend aussi les tests groupés.
+                    </li>
+                    <li>
+                        <span class="new_code">integer getTestCaseProgress()</span><br>
+                        est le nombre de scénarios réalisés jusqu'à présent.
+                    </li>
+                </ul>
+                Une modification simple : demander à l'HtmlReporter d'afficher
+                aussi bien les succès que les échecs et les erreurs...
+<pre><strong>
+class ShowPasses extends HtmlReporter {
+    
+    function paintPass($message) {
+        parent::paintPass($message);
+        print "&amp;&lt;span class=\"pass\"&gt;Pass&lt;/span&gt;: ";
+        $breadcrumb = $this-&gt;getTestList();
+        array_shift($breadcrumb);
+        print implode("-&amp;gt;", $breadcrumb);
+        print "-&amp;gt;$message&lt;br /&gt;\n";
+    }
+    
+    protected function getCss() {
+        return parent::getCss() . ' .pass { color: green; }';
+    }
+}</strong>
+</pre>
+            </p>
+            <p>
+                Une méthode qui a beaucoup fait jaser reste la méthode <span class="new_code">makeDry()</span>.
+                Si vous lancez cette méthode, sans paramètre,
+                sur le rapporteur avant que la suite de test
+                ne soit exécutée alors aucune méthode de test
+                ne sera appelée. Vous continuerez à avoir
+                les évènements entrants et sortants des méthodes
+                et scénarios de test, mais aucun succès ni échec ou erreur,
+                parce que le code de test ne sera pas exécuté.
+            </p>
+            <p>
+                La raison ? Pour permettre un affichage complexe
+                d'une IHM (ou GUI) qui permettrait la sélection
+                de scénarios de test individuels.
+                Afin de construire une liste de tests possibles,
+                ils ont besoin d'un rapport sur la structure du test
+                pour l'affichage, par exemple, d'une vue en arbre
+                de la suite de test. Avec un rapporteur lancé
+                sur une exécution sèche qui ne renverrait
+                que les évènements d'affichage, cela devient
+                facilement réalisable.
+            </p>
+        
+        <h2>
+<a class="target" name="autre"></a>Etendre le rapporteur</h2>
+            <p>
+                Plutôt que de modifier l'affichage existant,
+                vous voudrez peut-être produire une présentation HTML
+                complètement différente, ou même générer une version texte ou XML.
+                Plutôt que de surcharger chaque méthode dans 
+                <span class="new_code">HtmlReporter</span> nous pouvons nous rendre
+                une étape plus haut dans la hiérarchie de classe vers
+                <span class="new_code">SimpleReporter</span> dans le fichier source <em>simple_test.php</em>.
+            </p>
+            <p>
+                Un affichage sans rien, un canevas vierge
+                pour votre propre création, serait...
+<pre><strong>
+require_once('simpletest/simple_test.php');</strong>
+
+class MyDisplay extends SimpleReporter {<strong>
+    </strong>
+    function paintHeader($test_name) {
+    }
+    
+    function paintFooter($test_name) {
+    }
+    
+    function paintStart($test_name, $size) {<strong>
+        parent::paintStart($test_name, $size);</strong>
+    }
+    
+    function paintEnd($test_name, $size) {<strong>
+        parent::paintEnd($test_name, $size);</strong>
+    }
+    
+    function paintPass($message) {<strong>
+        parent::paintPass($message);</strong>
+    }
+    
+    function paintFail($message) {<strong>
+        parent::paintFail($message);</strong>
+    }
+}
+</pre>
+                Aucune sortie ne viendrait de cette classe jusqu'à un ajout de votre part.
+            </p>
+        
+        <h2>
+<a class="target" name="cli"></a>Le rapporteur en ligne de commande</h2>
+            <p>
+                SimpleTest est aussi livré avec un rapporteur
+                en ligne de commande, minime lui aussi.
+                L'interface imite celle de JUnit,
+                sauf qu'elle envoie les messages d'erreur au fur
+                et à mesure de leur arrivée.
+                Pour utiliser le rapporteur en ligne de commande,
+                il suffit de l'intervertir avec celui de la version HTML...
+<pre>
+&lt;?php
+require_once('simpletest/unit_tester.php');
+require_once('simpletest/reporter.php');
+
+$test = &amp;new GroupTest('File test');
+$test-&gt;addTestFile('tests/file_test.php');
+$test-&gt;run(<strong>new TextReporter()</strong>);
+?&gt;
+</pre>
+                Et ensuite d'invoquer la suite de test à partir d'une ligne de commande...
+<pre class="shell">
+php file_test.php
+</pre>
+                Bien sûr vous aurez besoin d'installer PHP
+                en ligne de commande. Une suite de test qui
+                passerait toutes ses assertions ressemble à...
+<pre class="shell">
+File test
+OK
+Test cases run: 1/1, Failures: 0, Exceptions: 0
+</pre>
+                Un échec déclenche un affichage comme...
+<pre class="shell">
+File test
+1) True assertion failed.
+    in createnewfile
+FAILURES!!!
+Test cases run: 1/1, Failures: 1, Exceptions: 0
+</pre>
+            </p>
+            <p>
+                Une des principales raisons pour utiliser
+                une suite de test en ligne de commande tient
+                dans l'utilisation possible du testeur avec
+                un processus automatisé. Pour fonctionner comme
+                il faut dans des scripts shell le script de test
+                devrait renvoyer un code de sortie non-nul suite à un échec.
+                Si une suite de test échoue la valeur <span class="new_code">false</span>
+                est renvoyée par la méthode <span class="new_code">SimpleTest::run()</span>.
+                Nous pouvons utiliser ce résultat pour terminer le script
+                avec la bonne valeur renvoyée...
+<pre>
+&lt;?php
+require_once('simpletest/unit_tester.php');
+require_once('simpletest/reporter.php');
+
+$test = &amp;new GroupTest('File test');
+$test-&gt;addTestFile('tests/file_test.php');<strong>
+exit ($test-&gt;run(new TextReporter()) ? 0 : 1);</strong>
+?&gt;
+</pre>
+                Bien sûr l'objectif n'est pas de créer deux scripts de test,
+                l'un en ligne de commande et l'autre pour un navigateur web,
+                pour chaque suite de test.
+                Le rapporteur en ligne de commande inclut
+                une méthode pour déterminer l'environnement d'exécution...
+<pre>
+&lt;?php
+require_once('simpletest/unit_tester.php');
+require_once('simpletest/reporter.php');
+
+$test = &amp;new GroupTest('File test');
+$test-&gt;addTestFile('tests/file_test.php');<strong>
+if (TextReporter::inCli()) {</strong>
+    exit ($test-&gt;run(new TextReporter()) ? 0 : 1);<strong>
+}</strong>
+$test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                Il s'agit là de la forme utilisée par SimpleTest lui-même.
+            </p>
+        
+        <h2>
+<a class="target" name="xml"></a>Test distant</h2>
+            <p>
+                SimpleTest est livré avec une classe <span class="new_code">XmlReporter</span>
+                utilisée pour de la communication interne.
+                Lors de son exécution, le résultat ressemble à...
+<pre class="shell">
+&lt;?xml version="1.0"?&gt;
+&lt;run&gt;
+  &lt;group size="4"&gt;
+    &lt;name&gt;Remote tests&lt;/name&gt;
+    &lt;group size="4"&gt;
+      &lt;name&gt;Visual test with 48 passes, 48 fails and 4 exceptions&lt;/name&gt;
+      &lt;case&gt;
+        &lt;name&gt;testofunittestcaseoutput&lt;/name&gt;
+        &lt;test&gt;
+          &lt;name&gt;testofresults&lt;/name&gt;
+          &lt;pass&gt;This assertion passed&lt;/pass&gt;
+          &lt;fail&gt;This assertion failed&lt;/fail&gt;
+        &lt;/test&gt;
+        &lt;test&gt;
+          ...
+        &lt;/test&gt;
+      &lt;/case&gt;
+    &lt;/group&gt;
+  &lt;/group&gt;
+&lt;/run&gt;
+</pre>
+                Vous pouvez utiliser ce format avec le parseur
+                fourni dans SimpleTest lui-même.
+                Il s'agit de <span class="new_code">SimpleTestXmlParser</span>
+                et se trouve <em>xml.php</em> à l'intérieur du paquet SimpleTest...
+<pre>
+&lt;?php
+require_once('simpletest/xml.php');
+
+...
+$parser = &amp;new SimpleTestXmlParser(new HtmlReporter());
+$parser-&gt;parse($test_output);
+?&gt;
+</pre>
+                <span class="new_code">$test_output</span> devrait être au format XML,
+                à partir du rapporteur XML, et pourrait venir
+                d'une exécution en ligne de commande d'un scénario de test.
+                Le parseur envoie des évènements au rapporteur exactement
+                comme tout autre exécution de test.
+                Il y a des occasions bizarres dans lesquelles c'est en fait très utile.
+            </p>
+            <p>
+                Un problème des très grandes suites de test,
+                c'est qu'elles peuvent venir à bout de la limite de mémoire
+                par défaut d'un process PHP - 8Mb.
+                En plaçant la sortie des groupes de test dans du XML
+                et leur exécution dans des process différents,
+                le résultat peut être parsé à nouveau pour agréger
+                les résultats avec moins d'impact sur le test au premier niveau.
+            </p>
+            <p>
+                Parce que la sortie XML peut venir de n'importe où,
+                ça ouvre des possibilités d'agrégation d'exécutions de test
+                depuis des serveur distants.
+                Un scénario de test pour le réaliser existe déjà
+                à l'intérieur du framework SimpleTest, mais il est encore expérimental...
+<pre>
+&lt;?php<strong>
+require_once('../remote.php');</strong>
+require_once('../reporter.php');
+
+$test_url = ...;
+$dry_url = ...;
+
+$test = &amp;new GroupTest('Remote tests');
+$test-&gt;addTestCase(<strong>new RemoteTestCase($test_url, $dry_url)</strong>);
+$test-&gt;run(new HtmlReporter());
+?&gt;
+</pre>
+                <span class="new_code">RemoteTestCase</span> prend la localisation réelle
+                du lanceur de test, tout simplement un page web au format XML.
+                Il prend aussi l'URL d'un rapporteur initié
+                pour effectuer une exécution sèche.
+                Cette technique est employée pour que les progrès
+                soient correctement rapportés vers le haut.
+                <span class="new_code">RemoteTestCase</span> peut être ajouté à
+                une suite de test comme n'importe quel autre groupe de tests.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            L'<a href="http://simpletest.org/api/">API pour développeur de SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html
new file mode 100644
index 000000000..300f1656a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/unit_test_documentation.html
@@ -0,0 +1,450 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest pour les tests de régression en PHP</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur les tests unitaires en PHP</h1>
+        This page...
+        <ul>
+<li>
+            <a href="#unitaire">Scénarios de test unitaire</a>
+            et opérations basiques.
+        </li>
+<li>
+            <a href="#extension_unitaire">Étendre des scénarios de test</a>
+            pour les personnaliser à votre propre projet.
+        </li>
+<li>
+            <a href="#lancement_unitaire">Lancer un scénario seul</a>
+            comme un script unique.
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="unitaire"></a>Scénarios de tests unitaires</h2>
+            <p>
+                Le coeur du système est un framework de tests de régression
+                construit autour des scénarios de test.
+                Un exemple de scénario de test ressemble à...
+<pre>
+<strong>class FileTestCase extends UnitTestCase {
+}</strong>
+</pre>
+                Si aucun nom de test n'est fourni au moment
+                de la liaison avec le constructeur alors
+                le nom de la classe sera utilisé.
+                Il s'agit du nom qui sera affiché dans les résultats du test.
+            </p>
+            <p>
+                Les véritables tests sont ajoutés en tant que méthode
+                dans le scénario de test dont le nom par défaut
+                commence par la chaîne "test"
+                et quand le scénario de test est appelé toutes les méthodes
+                de ce type sont exécutées dans l'ordre utilisé
+                par l'introspection de PHP pour les trouver.
+                Peuvent être ajoutées autant de méthodes de test que nécessaires.
+                Par exemple...
+<pre>
+require_once('simpletest/autorun.php');
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    function FileTestCase() {
+        $this-&gt;UnitTestCase('File test');
+    }<strong>
+    
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+    
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+    
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');
+        $this-&gt;assertTrue(file_exists('../temp/test.txt'), 'File created');
+    }</strong>
+}
+</pre>
+                Le constructeur est optionnel et souvent omis. Sans nom,
+                le nom de la classe est utilisé comme nom pour le scénario de test.
+            </p>
+            <p>
+                Notre unique méthode de test pour le moment est
+                <span class="new_code">testCreation()</span> où nous vérifions
+                qu'un fichier a bien été créé par notre objet
+                <span class="new_code">Writer</span>. Nous pourrions avoir mis
+                le code <span class="new_code">unlink()</span> dans cette méthode,
+                mais en la plaçant dans <span class="new_code">setUp()</span>
+                et <span class="new_code">tearDown()</span> nous pouvons l'utiliser
+                pour nos autres méthodes de test que nous ajouterons.
+            </p>
+            <p>
+                La méthode <span class="new_code">setUp()</span> est lancé
+                juste avant chaque méthode de test.
+                <span class="new_code">tearDown()</span> est lancé après chaque méthode de test.
+            </p>
+            <p>
+                Vous pouvez placer une initialisation de
+                scénario de test dans le constructeur afin qu'elle soit lancée
+                pour toutes les méthodes dans le scénario de test
+                mais dans un tel cas vous vous exposeriez à des interférences.
+                Cette façon de faire est légèrement moins rapide,
+                mais elle est plus sûre.
+                Notez que si vous arrivez avec des notions de JUnit,
+                il ne s'agit pas du comportement auquel vous êtes habitués.
+                Bizarrement JUnit re-instancie le scénario de test
+                pour chaque méthode de test pour se prévenir
+                d'une telle interférence.
+                SimpleTest demande à l'utilisateur final d'utiliser
+                <span class="new_code">setUp()</span>, mais fournit aux codeurs de bibliothèque d'autres crochets.
+            </p>
+            <p>
+                Pour rapporter les résultats de test,
+                le passage par une classe d'affichage - notifiée par
+                les différentes méthodes de type <span class="new_code">assert...()</span> -
+                est utilisée. En voici la liste complète pour
+                la classe <span class="new_code">UnitTestCase</span>,
+                celle par défaut dans SimpleTest...
+            <table><tbody>
+                <tr>
+<td><span class="new_code">assertTrue($x)</span></td>
+<td>Echoue si $x est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertFalse($x)</span></td>
+<td>Echoue si $x est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNull($x)</span></td>
+<td>Echoue si $x est initialisé</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotNull($x)</span></td>
+<td>Echoue si $x n'est pas initialisé</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertIsA($x, $t)</span></td>
+<td>Echoue si $x n'est pas de la classe ou du type $t</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertEqual($x, $y)</span></td>
+<td>Echoue si $x == $y est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotEqual($x, $y)</span></td>
+<td>Echoue si $x == $y est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertIdentical($x, $y)</span></td>
+<td>Echoue si $x === $y est faux</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNotIdentical($x, $y)</span></td>
+<td>Echoue si $x === $y est vrai</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertReference($x, $y)</span></td>
+<td>Echoue sauf si $x et $y sont la même variable</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertCopy($x, $y)</span></td>
+<td>Echoue si $x et $y sont la même variable</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertWantedPattern($p, $x)</span></td>
+<td>Echoue sauf si l'expression rationnelle $p capture $x</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNoUnwantedPattern($p, $x)</span></td>
+<td>Echoue si l'expression rationnelle $p capture $x</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertNoErrors()</span></td>
+<td>Echoue si une erreur PHP arrive</td>
+</tr>
+                <tr>
+<td><span class="new_code">assertError($x)</span></td>
+<td>Echoue si aucune erreur ou message incorrect de PHP n'arrive</td>
+</tr>
+            </tbody></table>
+                Toutes les méthodes d'assertion peuvent recevoir
+                une description optionnelle :
+                cette description sert pour étiqueter le résultat.
+                Sans elle, une message par défaut est envoyée à la place :
+                il est généralement suffisant.
+                Ce message par défaut peut encore être encadré
+                dans votre propre message si vous incluez "%s"
+                dans la chaîne.
+                Toutes les assertions renvoient vrai / true en cas de succès
+                et faux / false en cas d'échec.
+            </p>
+            <p>
+                D'autres exemples...
+<pre>
+<strong>$variable = null;
+$this-&gt;assertNull($variable, 'Should be cleared');</strong>
+</pre>
+                ...passera et normalement n'affichera aucun message.
+                Si vous avez <a href="http://www.lastcraft.com/display_subclass_tutorial.php">
+                configuré le testeur pour afficher aussi les succès</a>
+                alors le message sera affiché comme tel.
+<pre>
+<strong>$this-&gt;assertIdentical(0, false, 'Zero is not false [%s]');</strong>
+</pre>
+                Ceci échouera étant donné qu'il effectue une vérification
+                sur le type en plus d'une comparaison sur les deux valeurs.
+                La partie "%s" est remplacée par le message d'erreur
+                par défaut qui aurait été affiché si nous n'avions pas fourni le nôtre.
+                Cela nous permet d'emboîter les messages de test.
+<pre>
+<strong>$a = 1;
+$b = $a;
+$this-&gt;assertReference($a, $b);</strong>
+</pre>
+                Échouera étant donné que la variable <span class="new_code">$b</span>
+                est une copie de <span class="new_code">$a</span>.
+<pre>
+<strong>$this-&gt;assertWantedPattern('/hello/i', 'Hello world');</strong>
+</pre>
+                Là, ça passe puisque la recherche est insensible
+                à la casse et que donc <span class="new_code">hello</span>
+                est bien repérable dans <span class="new_code">Hello world</span>.
+<pre>
+<strong>trigger_error('Disaster');
+trigger_error('Catastrophe');
+$this-&gt;assertError();
+$this-&gt;assertError('Catastrophe');
+$this-&gt;assertNoErrors();</strong>
+</pre>
+                Ici, il y a besoin d'une petite explication :
+                toutes passent !
+            </p>
+            <p>
+                Les erreurs PHP dans SimpleTest sont piégées et
+                placées dans une queue. Ici la première vérification
+                d'erreur attrape le message "Disaster"
+                sans vérifier le texte et passe. Résultat :
+                l'erreur est supprimée de la queue.
+                La vérification suivante teste non seulement l'existence
+                de l'erreur mais aussi le texte qui correspond :
+                un autre succès. Désormais la queue est vide
+                et le dernier test passe aussi.
+                Si une autre erreur non vérifiée est encore
+                dans la queue à la fin de notre méthode de test
+                alors une exception sera rapportée dans le test.
+                Notez que SimpleTest ne peut pas attraper les erreurs PHP à la compilation.
+            </p>
+            <p>
+                Les scénarios de test peuvent utiliser des méthodes
+                bien pratiques pour déboguer le code ou pour étendre la suite...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">setUp()</span></td>
+<td>Est lancée avant chaque méthode de test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">tearDown()</span></td>
+<td>Est lancée après chaque méthode de test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">pass()</span></td>
+<td>Envoie un succès</td>
+</tr>
+                    <tr>
+<td><span class="new_code">fail()</span></td>
+<td>Envoie un échec</td>
+</tr>
+                    <tr>
+<td><span class="new_code">error()</span></td>
+<td>Envoi un évènement exception</td>
+</tr>
+                    <tr>
+<td><span class="new_code">sendMessage()</span></td>
+<td>Envoie un message d'état aux systèmes d'affichage qui le supporte</td>
+</tr>
+                    <tr>
+<td><span class="new_code">signal($type, $payload)</span></td>
+<td>Envoie un message défini par l'utilisateur au rapporteur du test</td>
+</tr>
+                    <tr>
+<td><span class="new_code">dump($var)</span></td>
+<td>Effectue un <span class="new_code">print_r()</span> formaté pour du déboguage rapide et grossier</td>
+</tr>
+                    <tr>
+<td><span class="new_code">swallowErrors()</span></td>
+<td>Vide les erreurs de la queue</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+        <h2>
+<a class="target" name="extension_unitaire"></a>Etendre les scénarios de test</h2>
+            <p>
+                Bien sûr des méthodes supplémentaires de test
+                peuvent être ajoutées pour créer d'autres types
+                de scénario de test afin d'étendre le framework...
+<pre>
+require_once('simpletest/autorun.php');
+<strong>
+class FileTester extends UnitTestCase {
+    function FileTester($name = false) {
+        $this-&gt;UnitTestCase($name);
+    }
+    
+    function assertFileExists($filename, $message = '%s') {
+        $this-&gt;assertTrue(
+                file_exists($filename),
+                sprintf($message, 'File [$filename] existence check'));
+    }</strong>
+}
+</pre>
+                Ici la bibliothèque SimpleTest est localisée
+                dans un répertoire local appelé <em>simpletest</em>.
+                Pensez à le modifier pour votre propre environnement.
+            </p>
+            <p>
+                Alternativement vous pourriez utiliser dans votre code
+                un directive <span class="new_code">SimpleTestOptions::ignore('FileTester');</span>.
+            </p>
+            <p>
+                Ce nouveau scénario peut être hérité exactement
+                comme un scénario de test classique...
+<pre>
+class FileTestCase extends <strong>FileTester</strong> {
+    
+    function setUp() {
+        @unlink('../temp/test.txt');
+    }
+    
+    function tearDown() {
+        @unlink('../temp/test.txt');
+    }
+    
+    function testCreation() {
+        $writer = &amp;new FileWriter('../temp/test.txt');
+        $writer-&gt;write('Hello');<strong>
+        $this-&gt;assertFileExists('../temp/test.txt');</strong>
+    }
+}
+</pre>
+            </p>
+            <p>
+                Si vous souhaitez un scénario de test sans
+                toutes les assertions de <span class="new_code">UnitTestCase</span>
+                mais uniquement avec les vôtres propres,
+                vous aurez besoin d'étendre la classe
+                <span class="new_code">SimpleTestCase</span> à la place.
+                Elle se trouve dans <em>simple_test.php</em>
+                en lieu et place de <em>unit_tester.php</em>.
+                A consulter <a href="group_test_documentation.html">plus tard</a>
+                si vous souhaitez incorporer les scénarios
+                d'autres testeurs unitaires dans votre suite de test.
+            </p>
+        
+        <h2>
+<a class="target" name="lancement_unitaire"></a>Lancer un unique scénario de test</h2>
+            <p>
+                Ce n'est pas souvent qu'il faille lancer des scénarios
+                avec un unique test. Sauf lorsqu'il s'agit de s'arracher
+                les cheveux sur un module à problème sans pour
+                autant désorganiser la suite de test principale.
+                Avec <em>autorun</em> aucun échafaudage particulier
+                n'est nécessaire, il suffit de lancer votre test et
+                vous y êtes.
+            </p>
+            <p>
+                Vous pouvez même décider quel rapporteur
+                (par exemple, <span class="new_code">TextReporter</span> ou <span class="new_code">HtmlReporter</span>)
+                vous préférez pour un fichier spécifique quand il est lancé
+                tout seul...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+SimpleTest :: prefer(new TextReporter());</strong>
+require_once('../classes/writer.php');
+
+class FileTestCase extends UnitTestCase {
+    ...
+}
+?&gt;
+</pre>
+                Ce script sera lancé tel que mais il n'y aura
+                aucun succès ou échec avant que des méthodes de test soient ajoutées.
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page de SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API complète de SimpleTest</a>
+            à partir de PHPDoc.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html
new file mode 100644
index 000000000..308fbc9cc
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/docs/fr/web_tester_documentation.html
@@ -0,0 +1,570 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Documentation SimpleTest : tester des scripts web</title>
+<link rel="stylesheet" type="text/css" href="docs.css" title="Styles">
+</head>
+<body>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<h1>Documentation sur le testeur web</h1>
+        This page...
+        <ul>
+<li>
+            Réussir à <a href="#telecharger">télécharger une page web</a>
+        </li>
+<li>
+            Tester le <a href="#contenu">contenu de la page</a>
+        </li>
+<li>
+            <a href="#navigation">Naviguer sur un site web</a> pendant le test
+        </li>
+<li>
+            Méthodes pour <a href="#requete">modifier une requête</a> et pour déboguer
+        </li>
+</ul>
+<div class="content">
+        <h2>
+<a class="target" name="telecharger"></a>Télécharger une page</h2>
+            <p>
+                Tester des classes c'est très bien.
+                Reste que PHP est avant tout un langage
+                pour créer des fonctionnalités à l'intérieur de pages web.
+                Comment pouvons tester la partie de devant
+                -- celle de l'interface -- dans nos applications en PHP ?
+                Etant donné qu'une page web n'est constituée que de texte,
+                nous devrions pouvoir les examiner exactement
+                comme n'importe quelle autre donnée de test.
+            </p>
+            <p>
+                Cela nous amène à une situation délicate.
+                Si nous testons dans un niveau trop bas,
+                vérifier des balises avec un motif ad hoc par exemple,
+                nos tests seront trop fragiles. Le moindre changement
+                dans la présentation pourrait casser un grand nombre de test.
+                Si nos tests sont situés trop haut, en utilisant
+                une version fantaisie du moteur de template pour
+                donner un cas précis, alors nous perdons complètement
+                la capacité à automatiser certaines classes de test.
+                Par exemple, l'interaction entre des formulaires
+                et la navigation devra être testé manuellement.
+                Ces types de test sont extrêmement fastidieux
+                et plutôt sensibles aux erreurs.
+            </p>
+            <p>
+                SimpleTest comprend une forme spéciale de scénario
+                de test pour tester les actions d'une page web.
+                <span class="new_code">WebTestCase</span> inclut des facilités pour la navigation,
+                des vérifications sur le contenu
+                et les cookies ainsi que la gestion des formulaires.
+                Utiliser ces scénarios de test ressemble
+                fortement à <span class="new_code">UnitTestCase</span>...
+<pre>
+<strong>class TestOfLastcraft extends WebTestCase {
+}</strong>
+</pre>
+                Ici nous sommes sur le point de tester
+                le site de <a href="http://www.lastcraft.com/">Last Craft</a>.
+                Si ce scénario de test est situé dans un fichier appelé
+                <em>lastcraft_test.php</em> alors il peut être chargé
+                dans un script de lancement tout comme des tests unitaires...
+<pre>
+&lt;?php
+require_once('simpletest/autorun.php');<strong>
+require_once('simpletest/web_tester.php');</strong>
+SimpleTest::prefer(new TextReporter());
+
+class WebTests extends TestSuite {
+    function WebTests() {
+        $this-&gt;TestSuite('Web site tests');<strong>
+        $this-&gt;addFile('lastcraft_test.php');</strong>
+    }
+}
+?&gt;
+</pre>
+                J'utilise ici le rapporteur en mode texte
+                pour mieux distinguer le contenu au format HTML
+                du résultat du test proprement dit.
+            </p>
+            <p>
+                Rien n'est encore testé. Nous pouvons télécharger
+                la page d'accueil en utilisant la méthode <span class="new_code">get()</span>...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    <strong>
+    function testHomepage() {
+        $this-&gt;assertTrue($this-&gt;get('http://www.lastcraft.com/'));
+    }</strong>
+}
+</pre>
+                La méthode <span class="new_code">get()</span> renverra "true"
+                uniquement si le contenu de la page a bien été téléchargé.
+                C'est un moyen simple, mais efficace pour vérifier
+                qu'une page web a bien été délivré par le serveur web.
+                Cependant le contenu peut révéler être une erreur 404
+                et dans ce cas notre méthode <span class="new_code">get()</span> renverrait encore un succès.
+            </p>
+            <p>
+                En supposant que le serveur web pour le site Last Craft
+                soit opérationnel (malheureusement ce n'est pas toujours le cas),
+                nous devrions voir...
+<pre class="shell">
+Web site tests
+OK
+Test cases run: 1/1, Failures: 0, Exceptions: 0
+</pre>
+                Nous avons vérifié qu'une page, de n'importe quel type,
+                a bien été renvoyée. Nous ne savons pas encore
+                s'il s'agit de celle que nous souhaitions.
+            </p>
+        
+        <h2>
+<a class="target" name="contenu"></a>Tester le contenu d'une page</h2>
+            <p>
+                Pour obtenir la confirmation que la page téléchargée
+                est bien celle que nous attendions,
+                nous devons vérifier son contenu.
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;get('http://www.lastcraft.com/');
+        $this-&gt;assertWantedPattern('/why the last craft/i');</strong>
+    }
+}
+</pre>
+                La page obtenue par le dernier téléchargement est
+                placée dans un buffer au sein même du scénario de test.
+                Il n'est donc pas nécessaire de s'y référer directement.
+                La correspondance du motif est toujours effectuée
+                par rapport à ce buffer.
+            </p>
+            <p>
+                Voici une liste possible d'assertions sur le contenu...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">assertWantedPattern($pattern)</span></td>
+<td>Vérifier une correspondance sur le contenu via une expression rationnelle Perl</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoUnwantedPattern($pattern)</span></td>
+<td>Une expression rationnelle Perl pour vérifier une absence</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertTitle($title)</span></td>
+<td>Passe si le titre de la page correspond exactement</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLink($label)</span></td>
+<td>Passe si un lien avec ce texte est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoLink($label)</span></td>
+<td>Passe si aucun lien avec ce texte est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertLinkById($id)</span></td>
+<td>Passe si un lien avec cet attribut d'identification est présent</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertField($name, $value)</span></td>
+<td>Passe si une balise input avec ce nom contient cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertFieldById($id, $value)</span></td>
+<td>Passe si une balise input avec cet identifiant contient cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertResponse($codes)</span></td>
+<td>Passe si la réponse HTTP trouve une correspondance dans la liste</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertMime($types)</span></td>
+<td>Passe si le type MIME se retrouve dans cette liste</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertAuthentication($protocol)</span></td>
+<td>Passe si l'authentification provoquée est de ce type de protocole</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoAuthentication()</span></td>
+<td>Passe s'il n'y pas d'authentification provoquée en cours</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertRealm($name)</span></td>
+<td>Passe si le domaine provoqué correspond</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeader($header, $content)</span></td>
+<td>Passe si une entête téléchargée correspond à cette valeur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoUnwantedHeader($header)</span></td>
+<td>Passe si une entête n'a pas été téléchargé</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertHeaderPattern($header, $pattern)</span></td>
+<td>Passe si une entête téléchargée correspond à cette expression rationnelle Perl</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertCookie($name, $value)</span></td>
+<td>Passe s'il existe un cookie correspondant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">assertNoCookie($name)</span></td>
+<td>Passe s'il n'y a pas de cookie avec un tel nom</td>
+</tr>
+                </tbody></table>
+                Comme d'habitude avec les assertions de SimpleTest,
+                elles renvoient toutes "false" en cas d'échec
+                et "true" si c'est un succès.
+                Elles renvoient aussi un message de test optionnel :
+                vous pouvez l'ajouter dans votre propre message en utilisant "%s".
+            </p>
+            <p>
+                A présent nous pourrions effectué le test sur le titre uniquement...
+<pre>
+<strong>$this-&gt;assertTitle('The Last Craft?');</strong>
+</pre>
+                En plus d'une simple vérification sur le contenu HTML,
+                nous pouvons aussi vérifier que le type MIME est bien d'un type acceptable...
+<pre>
+<strong>$this-&gt;assertMime(array('text/plain', 'text/html'));</strong>
+</pre>
+                Plus intéressant encore est la vérification sur
+                le code de la réponse HTTP. Pareillement au type MIME,
+                nous pouvons nous assurer que le code renvoyé se trouve
+                bien dans un liste de valeurs possibles...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;get('http://simpletest.sourceforge.net/');<strong>
+        $this-&gt;assertResponse(200);</strong>
+    }
+}
+</pre>
+                Ici nous vérifions que le téléchargement s'est
+                bien terminé en ne permettant qu'une réponse HTTP 200.
+                Ce test passera, mais ce n'est pas la meilleure façon de procéder.
+                Il n'existe aucune page sur <em>http://simpletest.sourceforge.net/</em>,
+                à la place le serveur renverra une redirection vers
+                <em>http://www.lastcraft.com/simple_test.php</em>.
+                <span class="new_code">WebTestCase</span> suit automatiquement trois
+                de ces redirections. Les tests sont quelque peu plus
+                robustes de la sorte. Surtout qu'on est souvent plus intéressé
+                par l'interaction entre les pages que de leur simple livraison.
+                Si les redirections se révèlent être digne d'intérêt,
+                il reste possible de les supprimer...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {<strong>
+        $this-&gt;setMaximumRedirects(0);</strong>
+        $this-&gt;get('http://simpletest.sourceforge.net/');
+        $this-&gt;assertResponse(200);
+    }
+}
+</pre>
+                Alors l'assertion échoue comme prévue...
+<pre class="shell">
+Web site tests
+1) Expecting response in [200] got [302]
+    in testhomepage
+    in testoflastcraft
+    in lastcraft_test.php
+FAILURES!!!
+Test cases run: 1/1, Failures: 1, Exceptions: 0
+</pre>
+                Nous pouvons modifier le test pour accepter les redirections...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    
+    function testHomepage() {
+        $this-&gt;setMaximumRedirects(0);
+        $this-&gt;get('http://simpletest.sourceforge.net/');
+        $this-&gt;assertResponse(<strong>array(301, 302, 303, 307)</strong>);
+    }
+}
+</pre>
+                Maitenant ça passe.
+            </p>
+        
+        <h2>
+<a class="target" name="navigation"></a>Navigeur dans un site web</h2>
+            <p>
+                Les utilisateurs ne naviguent pas souvent en tapant les URLs,
+                mais surtout en cliquant sur des liens et des boutons.
+                Ici nous confirmons que les informations sur le contact
+                peuvent être atteintes depuis la page d'accueil...
+<pre>
+class TestOfLastcraft extends WebTestCase {
+    ...
+    function testContact() {
+        $this-&gt;get('http://www.lastcraft.com/');<strong>
+        $this-&gt;clickLink('About');
+        $this-&gt;assertTitle('About Last Craft');</strong>
+    }
+}
+</pre>
+                Le paramètre est le texte du lien.
+            </p>
+            <p>
+                Il l'objectif est un bouton plutôt qu'une balise ancre,
+                alors <span class="new_code">clickSubmit()</span> doit être utilisé avec
+                le titre du bouton...
+<pre>
+<strong>$this-&gt;clickSubmit('Go!');</strong>
+</pre>
+            </p>
+            <p>
+                La liste des méthodes de navigation est...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">get($url, $parameters)</span></td>
+<td>Envoie une requête GET avec ces paramètres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">post($url, $parameters)</span></td>
+<td>Envoie une requête POST avec ces paramètres</td>
+</tr>
+                    <tr>
+<td><span class="new_code">head($url, $parameters)</span></td>
+<td>Envoie une requête HEAD sans remplacer le contenu de la page</td>
+</tr>
+                    <tr>
+<td><span class="new_code">retry()</span></td>
+<td>Relance la dernière requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">back()</span></td>
+<td>Identique au bouton "Précédent" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">forward()</span></td>
+<td>Identique au bouton "Suivant" du navigateur</td>
+</tr>
+                    <tr>
+<td><span class="new_code">authenticate($name, $password)</span></td>
+<td>Re-essaye avec une tentative d'authentification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getFrameFocus()</span></td>
+<td>Le nom de la fenêtre en cours d'utilisation</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocusByIndex($choice)</span></td>
+<td>Change le focus d'une fenêtre en commençant par 1</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setFrameFocus($name)</span></td>
+<td>Change le focus d'une fenêtre en utilisant son nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clearFrameFocus()</span></td>
+<td>Revient à un traitement de toutes les fenêtres comme une seule</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmit($label)</span></td>
+<td>Clique sur le premier bouton avec cette étiquette</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitByName($name)</span></td>
+<td>Clique sur le bouton avec cet attribut de nom</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickSubmitById($id)</span></td>
+<td>Clique sur le bouton avec cet attribut d'identification</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImage($label, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son titre (title="*") our son texte alternatif (alt="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageByName($name, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son attribut (name="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickImageById($id, $x, $y)</span></td>
+<td>Clique sur une balise input de type image par son identifiant (id="*")</td>
+</tr>
+                    <tr>
+<td><span class="new_code">submitFormById($id)</span></td>
+<td>Soumet un formulaire sans valeur de soumission</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLink($label, $index)</span></td>
+<td>Clique sur une ancre avec ce texte d'étiquette visible</td>
+</tr>
+                    <tr>
+<td><span class="new_code">clickLinkById($id)</span></td>
+<td>Clique sur une ancre avec cet attribut d'identification</td>
+</tr>
+                </tbody></table>
+            </p>
+            <p>
+                Les paramètres dans les méthodes <span class="new_code">get()</span>, 
+                <span class="new_code">post()</span> et <span class="new_code">head()</span> sont optionnels.
+                Le téléchargement via  HTTP HEAD ne modifie pas
+                le contexte du navigateur, il se limite au chargement des cookies.
+                Cela peut être utilise lorsqu'une image ou une feuille de style
+                initie un cookie pour bloquer un robot trop entreprenant.
+            </p>
+            <p>
+                Les commandes <span class="new_code">retry()</span>, <span class="new_code">back()</span>
+                et <span class="new_code">forward()</span> fonctionnent exactement comme
+                dans un navigateur. Elles utilisent l'historique pour
+                relancer les pages. Une technique bien pratique pour
+                vérifier les effets d'un bouton retour sur vos formulaires.
+            </p>
+            <p>
+                Les méthodes sur les fenêtres méritent une petite explication.
+                Par défaut, une page avec des fenêtres est traitée comme toutes
+                les autres. Le contenu sera vérifié à travers l'ensemble de
+                la "frameset", par conséquent un lien fonctionnera,
+                peu importe la fenêtre qui contient la balise ancre.
+                Vous pouvez outrepassé ce comportement en exigeant
+                le focus sur une unique fenêtre. Si vous réalisez cela,
+                toutes les recherches et toutes les actions se limiteront
+                à cette unique fenêtre, y compris les demandes d'authentification.
+                Si un lien ou un bouton n'est pas dans la fenêtre en focus alors
+                il ne peut pas être cliqué.
+            </p>
+            <p>
+                Tester la navigation sur des pages fixes ne vous alerte que
+                quand vous avez cassé un script entier.
+                Pour des pages fortement dynamiques,
+                un forum de discussion par exemple,
+                ça peut être crucial pour vérifier l'état de l'application.
+                Pour la plupart des applications cependant,
+                la logique vraiment délicate se situe dans la gestion
+                des formulaires et des sessions.
+                Heureusement SimpleTest aussi inclut
+                <a href="form_testing_documentation.html">
+                des outils pour tester des formulaires web</a>.
+            </p>
+        
+        <h2>
+<a class="target" name="requete"></a>Modifier la requête</h2>
+            <p>
+                Bien que SimpleTest n'ait pas comme objectif
+                de contrôler des erreurs réseau, il contient quand même
+                des méthodes pour modifier et déboguer les requêtes qu'il lance.
+                Voici une autre liste de méthode...
+                <table><tbody>
+                    <tr>
+<td><span class="new_code">getTransportError()</span></td>
+<td>La dernière erreur de socket</td>
+</tr>
+                    <tr>
+<td><span class="new_code">getUrl()</span></td>
+<td>La localisation courante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showRequest()</span></td>
+<td>Déverse la requête sortante</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showHeaders()</span></td>
+<td>Déverse les entêtes d'entrée</td>
+</tr>
+                    <tr>
+<td><span class="new_code">showSource()</span></td>
+<td>Déverse le contenu brut de la page HTML</td>
+</tr>
+                    <tr>
+<td><span class="new_code">ignoreFrames()</span></td>
+<td>Ne recharge pas les framesets</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setCookie($name, $value)</span></td>
+<td>Initie un cookie à partir de maintenant</td>
+</tr>
+                    <tr>
+<td><span class="new_code">addHeader($header)</span></td>
+<td>Ajoute toujours cette entête à la requête</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setMaximumRedirects($max)</span></td>
+<td>S'arrête après autant de redirections</td>
+</tr>
+                    <tr>
+<td><span class="new_code">setConnectionTimeout($timeout)</span></td>
+<td>Termine la connexion après autant de temps entre les bytes</td>
+</tr>
+                    <tr>
+<td><span class="new_code">useProxy($proxy, $name, $password)</span></td>
+<td>Effectue les requêtes à travers ce proxy d'URL</td>
+</tr>
+                </tbody></table>
+            </p>
+        
+    </div>
+        References and related information...
+        <ul>
+<li>
+            La page du projet SimpleTest sur
+            <a href="http://sourceforge.net/projects/simpletest/">SourceForge</a>.
+        </li>
+<li>
+            La page de téléchargement de SimpleTest sur
+            <a href="http://www.lastcraft.com/simple_test.php">LastCraft</a>.
+        </li>
+<li>
+            <a href="http://simpletest.org/api/">L'API du développeur pour SimpleTest</a>
+            donne tous les détails sur les classes et les assertions disponibles.
+        </li>
+</ul>
+<div class="menu_back"><div class="menu">
+<a href="index.html">SimpleTest</a>
+                |
+                <a href="overview.html">Overview</a>
+                |
+                <a href="unit_test_documentation.html">Unit tester</a>
+                |
+                <a href="group_test_documentation.html">Group tests</a>
+                |
+                <a href="mock_objects_documentation.html">Mock objects</a>
+                |
+                <a href="partial_mocks_documentation.html">Partial mocks</a>
+                |
+                <a href="reporter_documentation.html">Reporting</a>
+                |
+                <a href="expectation_documentation.html">Expectations</a>
+                |
+                <a href="web_tester_documentation.html">Web tester</a>
+                |
+                <a href="form_testing_documentation.html">Testing forms</a>
+                |
+                <a href="authentication_documentation.html">Authentication</a>
+                |
+                <a href="browser_documentation.html">Scriptable browser</a>
+</div></div>
+<div class="copyright">
+            Copyright<br>Marcus Baker 2006
+        </div>
+</body>
+</html>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/dumper.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/dumper.php
new file mode 100644
index 000000000..339923c22
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/dumper.php
@@ -0,0 +1,407 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: dumper.php 1909 2009-07-29 15:58:11Z dgheath $
+ */
+/**
+ * does type matter
+ */
+if (! defined('TYPE_MATTERS')) {
+    define('TYPE_MATTERS', true);
+}
+
+/**
+ *    Displays variables as text and does diffs.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleDumper {
+
+    /**
+     *    Renders a variable in a shorter form than print_r().
+     *    @param mixed $value      Variable to render as a string.
+     *    @return string           Human readable string form.
+     *    @access public
+     */
+    function describeValue($value) {
+        $type = $this->getType($value);
+        switch($type) {
+            case "Null":
+                return "NULL";
+            case "Boolean":
+                return "Boolean: " . ($value ? "true" : "false");
+            case "Array":
+                return "Array: " . count($value) . " items";
+            case "Object":
+                return "Object: of " . get_class($value);
+            case "String":
+                return "String: " . $this->clipString($value, 200);
+            default:
+                return "$type: $value";
+        }
+        return "Unknown";
+    }
+
+    /**
+     *    Gets the string representation of a type.
+     *    @param mixed $value    Variable to check against.
+     *    @return string         Type.
+     *    @access public
+     */
+    function getType($value) {
+        if (! isset($value)) {
+            return "Null";
+        } elseif (is_bool($value)) {
+            return "Boolean";
+        } elseif (is_string($value)) {
+            return "String";
+        } elseif (is_integer($value)) {
+            return "Integer";
+        } elseif (is_float($value)) {
+            return "Float";
+        } elseif (is_array($value)) {
+            return "Array";
+        } elseif (is_resource($value)) {
+            return "Resource";
+        } elseif (is_object($value)) {
+            return "Object";
+        }
+        return "Unknown";
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two variables. Uses a
+     *    dynamic call.
+     *    @param mixed $first        First variable.
+     *    @param mixed $second       Value to compare with.
+     *    @param boolean $identical  If true then type anomolies count.
+     *    @return string             Description of difference.
+     *    @access public
+     */
+    function describeDifference($first, $second, $identical = false) {
+        if ($identical) {
+            if (! $this->isTypeMatch($first, $second)) {
+                return "with type mismatch as [" . $this->describeValue($first) .
+                    "] does not match [" . $this->describeValue($second) . "]";
+            }
+        }
+        $type = $this->getType($first);
+        if ($type == "Unknown") {
+            return "with unknown type";
+        }
+        $method = 'describe' . $type . 'Difference';
+        return $this->$method($first, $second, $identical);
+    }
+
+    /**
+     *    Tests to see if types match.
+     *    @param mixed $first        First variable.
+     *    @param mixed $second       Value to compare with.
+     *    @return boolean            True if matches.
+     *    @access private
+     */
+    protected function isTypeMatch($first, $second) {
+        return ($this->getType($first) == $this->getType($second));
+    }
+
+    /**
+     *    Clips a string to a maximum length.
+     *    @param string $value         String to truncate.
+     *    @param integer $size         Minimum string size to show.
+     *    @param integer $position     Centre of string section.
+     *    @return string               Shortened version.
+     *    @access public
+     */
+    function clipString($value, $size, $position = 0) {
+        $length = strlen($value);
+        if ($length <= $size) {
+            return $value;
+        }
+        $position = min($position, $length);
+        $start = ($size/2 > $position ? 0 : $position - $size/2);
+        if ($start + $size > $length) {
+            $start = $length - $size;
+        }
+        $value = substr($value, $start, $size);
+        return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two variables. The minimal
+     *    version.
+     *    @param null $first          First value.
+     *    @param mixed $second        Value to compare with.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeGenericDifference($first, $second) {
+        return "as [" . $this->describeValue($first) .
+                "] does not match [" .
+                $this->describeValue($second) . "]";
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a null and another variable.
+     *    @param null $first          First null.
+     *    @param mixed $second        Null to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeNullDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a boolean and another variable.
+     *    @param boolean $first       First boolean.
+     *    @param mixed $second        Boolean to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeBooleanDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a string and another variable.
+     *    @param string $first        First string.
+     *    @param mixed $second        String to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeStringDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        $position = $this->stringDiffersAt($first, $second);
+        $message = "at character $position";
+        $message .= " with [" .
+                $this->clipString($first, 200, $position) . "] and [" .
+                $this->clipString($second, 200, $position) . "]";
+        return $message;
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between an integer and another variable.
+     *    @param integer $first       First number.
+     *    @param mixed $second        Number to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeIntegerDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return "because [" . $this->describeValue($first) .
+                "] differs from [" .
+                $this->describeValue($second) . "] by " .
+                abs($first - $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two floating point numbers.
+     *    @param float $first         First float.
+     *    @param mixed $second        Float to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeFloatDifference($first, $second, $identical) {
+        if (is_object($second) || is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return "because [" . $this->describeValue($first) .
+                "] differs from [" .
+                $this->describeValue($second) . "] by " .
+                abs($first - $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two arrays.
+     *    @param array $first         First array.
+     *    @param mixed $second        Array to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeArrayDifference($first, $second, $identical) {
+        if (! is_array($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        if (! $this->isMatchingKeys($first, $second, $identical)) {
+            return "as key list [" .
+                    implode(", ", array_keys($first)) . "] does not match key list [" .
+                    implode(", ", array_keys($second)) . "]";
+        }
+        foreach (array_keys($first) as $key) {
+            if ($identical && ($first[$key] === $second[$key])) {
+                continue;
+            }
+            if (! $identical && ($first[$key] == $second[$key])) {
+                continue;
+            }
+            return "with member [$key] " . $this->describeDifference(
+                    $first[$key],
+                    $second[$key],
+                    $identical);
+        }
+        return "";
+    }
+
+    /**
+     *    Compares two arrays to see if their key lists match.
+     *    For an identical match, the ordering and types of the keys
+     *    is significant.
+     *    @param array $first         First array.
+     *    @param array $second        Array to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return boolean             True if matching.
+     *    @access private
+     */
+    protected function isMatchingKeys($first, $second, $identical) {
+        $first_keys = array_keys($first);
+        $second_keys = array_keys($second);
+        if ($identical) {
+            return ($first_keys === $second_keys);
+        }
+        sort($first_keys);
+        sort($second_keys);
+        return ($first_keys == $second_keys);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between a resource and another variable.
+     *    @param resource $first       First resource.
+     *    @param mixed $second         Resource to compare with.
+     *    @param boolean $identical    If true then type anomolies count.
+     *    @return string              Human readable description.
+     *    @access private
+     */
+    protected function describeResourceDifference($first, $second, $identical) {
+        return $this->describeGenericDifference($first, $second);
+    }
+
+    /**
+     *    Creates a human readable description of the
+     *    difference between two objects.
+     *    @param object $first        First object.
+     *    @param mixed $second        Object to compare with.
+     *    @param boolean $identical   If true then type anomolies count.
+     *    @return string              Human readable description.
+     */
+    protected function describeObjectDifference($first, $second, $identical) {
+        if (! is_object($second)) {
+            return $this->describeGenericDifference($first, $second);
+        }
+        return $this->describeArrayDifference(
+                $this->getMembers($first),
+                $this->getMembers($second),
+                $identical);
+    }
+
+    /**
+     *    Get all members of an object including private and protected ones.
+     *    A safer form of casting to an array.
+     *    @param object $object     Object to list members of,
+     *                              including private ones.
+     *    @return array             Names and values in the object.
+     */
+    protected function getMembers($object) {
+        $reflection = new ReflectionObject($object);
+        $members = array();
+        foreach ($reflection->getProperties() as $property) {
+            if (method_exists($property, 'setAccessible')) {
+                $property->setAccessible(true);
+            }
+            try {
+                $members[$property->getName()] = $property->getValue($object);
+            } catch (ReflectionException $e) {
+                $members[$property->getName()] =
+                    $this->getPrivatePropertyNoMatterWhat($property->getName(), $object);
+            }
+        }
+        return $members;
+    }
+
+    /**
+     *    Extracts a private member's value when reflection won't play ball.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getPrivatePropertyNoMatterWhat($name, $object) {
+        foreach ((array)$object as $mangled_name => $value) {
+            if ($this->unmangle($mangled_name) == $name) {
+                return $value;
+            }
+        }
+    }
+
+    /**
+     *    Removes crud from property name after it's been converted
+     *    to an array.
+     *    @param string $mangled     Name from array cast.
+     *    @return string             Cleaned up name.
+     */
+    function unmangle($mangled) {
+        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
+        return array_pop($parts);
+    }
+
+    /**
+     *    Find the first character position that differs
+     *    in two strings by binary chop.
+     *    @param string $first        First string.
+     *    @param string $second       String to compare with.
+     *    @return integer             Position of first differing
+     *                                character.
+     *    @access private
+     */
+    protected function stringDiffersAt($first, $second) {
+        if (! $first || ! $second) {
+            return 0;
+        }
+        if (strlen($first) < strlen($second)) {
+            list($first, $second) = array($second, $first);
+        }
+        $position = 0;
+        $step = strlen($first);
+        while ($step > 1) {
+            $step = (integer)(($step + 1) / 2);
+            if (strncmp($first, $second, $position + $step) == 0) {
+                $position += $step;
+            }
+        }
+        return $position;
+    }
+
+    /**
+     *    Sends a formatted dump of a variable to a string.
+     *    @param mixed $variable    Variable to display.
+     *    @return string            Output from print_r().
+     *    @access public
+     */
+    function dump($variable) {
+        ob_start();
+        print_r($variable);
+        $formatted = ob_get_contents();
+        ob_end_clean();
+        return $formatted;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/eclipse.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/eclipse.php
new file mode 100644
index 000000000..20bd4530b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/eclipse.php
@@ -0,0 +1,307 @@
+<?php
+/**
+ *  base include file for eclipse plugin
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ *  @version    $Id: eclipse.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+/**#@+
+ * simpletest include files
+ */
+include_once 'unit_tester.php';
+include_once 'test_case.php';
+include_once 'invoker.php';
+include_once 'socket.php';
+include_once 'mock_objects.php';
+/**#@-*/
+
+/**
+ *  base reported class for eclipse plugin
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ */
+class EclipseReporter extends SimpleScorer {
+
+    /**
+     *    Reporter to be run inside of Eclipse interface.
+     *    @param object $listener   Eclipse listener (?).
+     *    @param boolean $cc        Whether to include test coverage.
+     */
+    function __construct(&$listener, $cc=false){
+        $this->listener = &$listener;
+        $this->SimpleScorer();
+        $this->case = "";
+        $this->group = "";
+        $this->method = "";
+        $this->cc = $cc;
+        $this->error = false;
+        $this->fail = false;
+    }
+
+    /**
+     *    Means to display human readable object comparisons.
+     *    @return SimpleDumper        Visual comparer.
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Localhost connection from Eclipse.
+     *    @param integer $port      Port to connect to Eclipse.
+     *    @param string $host       Normally localhost.
+     *    @return SimpleSocket      Connection to Eclipse.
+     */
+    function &createListener($port, $host="127.0.0.1"){
+        $tmplistener = &new SimpleSocket($host, $port, 5);
+        return $tmplistener;
+    }
+
+    /**
+     *    Wraps the test in an output buffer.
+     *    @param SimpleInvoker $invoker     Current test runner.
+     *    @return EclipseInvoker            Decorator with output buffering.
+     *    @access public
+     */
+    function &createInvoker(&$invoker){
+        $eclinvoker = &new EclipseInvoker($invoker, $this->listener);
+        return $eclinvoker;
+    }
+
+    /**
+     *    C style escaping.
+     *    @param string $raw    String with backslashes, quotes and whitespace.
+     *    @return string        Replaced with C backslashed tokens.
+     */
+    function escapeVal($raw){
+        $needle = array("\\","\"","/","\b","\f","\n","\r","\t");
+        $replace = array('\\\\','\"','\/','\b','\f','\n','\r','\t');
+        return str_replace($needle, $replace, $raw);
+    }
+
+    /**
+     *    Stash the first passing item. Clicking the test
+     *    item goes to first pass.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintPass($message){
+        if (! $this->pass){
+            $this->message = $this->escapeVal($message);
+        }
+        $this->pass = true;
+    }
+
+    /**
+     *    Stash the first failing item. Clicking the test
+     *    item goes to first fail.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintFail($message){
+        //only get the first failure or error
+        if (! $this->fail && ! $this->error){
+            $this->fail = true;
+            $this->message = $this->escapeVal($message);
+            $this->listener->write('{status:"fail",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
+        }
+    }
+
+    /**
+     *    Stash the first error. Clicking the test
+     *    item goes to first error.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintError($message){
+        if (! $this->fail && ! $this->error){
+            $this->error = true;
+            $this->message = $this->escapeVal($message);
+            $this->listener->write('{status:"error",message:"'.$this->message.'",group:"'.$this->group.'",case:"'.$this->case.'",method:"'.$this->method.'"}');
+        }
+    }
+
+
+    /**
+     *    Stash the first exception. Clicking the test
+     *    item goes to first message.
+     *    @param string $message    Test message, but we only wnat the first.
+     *    @access public
+     */
+    function paintException($exception){
+        if (! $this->fail && ! $this->error){
+            $this->error = true;
+            $message = 'Unexpected exception of type[' . get_class($exception) .
+                    '] with message [' . $exception->getMessage() . '] in [' .
+                    $exception->getFile() .' line '. $exception->getLine() . ']';
+            $this->message = $this->escapeVal($message);
+            $this->listener->write(
+                    '{status:"error",message:"' . $this->message . '",group:"' .
+                    $this->group . '",case:"' . $this->case . '",method:"' . $this->method
+                    . '"}');
+        }
+    }
+
+
+    /**
+     *    We don't display any special header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+    }
+
+    /**
+     *    We don't display any special footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+    }
+
+    /**
+     *    Paints nothing at the start of a test method, but stash
+     *    the method name for later.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($method) {
+        $this->pass = false;
+        $this->fail = false;
+        $this->error = false;
+        $this->method = $this->escapeVal($method);
+    }
+
+    /**
+     *    Only send one message if the test passes, after that
+     *    suppress the message.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintMethodEnd($method){
+        if ($this->fail || $this->error || ! $this->pass){
+        } else {
+            $this->listener->write(
+                        '{status:"pass",message:"' . $this->message . '",group:"' .
+                        $this->group . '",case:"' . $this->case . '",method:"' .
+                        $this->method . '"}');
+        }
+    }
+
+    /**
+     *    Stashes the test case name for the later failure message.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($case){
+        $this->case = $this->escapeVal($case);
+    }
+
+    /**
+     *    Drops the name.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($case){
+        $this->case = "";
+    }
+
+    /**
+     *    Stashes the name of the test suite. Starts test coverage
+     *    if enabled.
+     *    @param string $group     Name of test or other label.
+     *    @param integer $size     Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($group, $size){
+        $this->group = $this->escapeVal($group);
+        if ($this->cc){
+            if (extension_loaded('xdebug')){
+                xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+            }
+        }
+    }
+
+    /**
+     *    Paints coverage report if enabled.
+     *    @param string $group     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($group){
+        $this->group = "";
+        $cc = "";
+        if ($this->cc){
+            if (extension_loaded('xdebug')){
+                $arrfiles = xdebug_get_code_coverage();
+                xdebug_stop_code_coverage();
+                $thisdir = dirname(__FILE__);
+                $thisdirlen = strlen($thisdir);
+                foreach ($arrfiles as $index=>$file){
+                    if (substr($index, 0, $thisdirlen)===$thisdir){
+                        continue;
+                    }
+                    $lcnt = 0;
+                    $ccnt = 0;
+                    foreach ($file as $line){
+                        if ($line == -2){
+                            continue;
+                        }
+                        $lcnt++;
+                        if ($line==1){
+                            $ccnt++;
+                        }
+                    }
+                    if ($lcnt > 0){
+                        $cc .= round(($ccnt/$lcnt) * 100, 2) . '%';
+                    }else{
+                        $cc .= "0.00%";
+                    }
+                    $cc.= "\t". $index . "\n";
+                }
+            }
+        }
+        $this->listener->write('{status:"coverage",message:"' .
+                                EclipseReporter::escapeVal($cc) . '"}');
+    }
+}
+
+/**
+ *  Invoker decorator for Eclipse. Captures output until
+ *  the end of the test.
+ *  @package    SimpleTest
+ *  @subpackage Eclipse
+ */
+class EclipseInvoker extends SimpleInvokerDecorator{
+    function __construct(&$invoker, &$listener) {
+        $this->listener = &$listener;
+        $this->SimpleInvokerDecorator($invoker);
+    }
+
+    /**
+     *    Starts output buffering.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method){
+        ob_start();
+        $this->invoker->before($method);
+    }
+
+    /**
+     *    Stops output buffering and send the captured output
+     *    to the listener.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->invoker->after($method);
+        $output = ob_get_contents();
+        ob_end_clean();
+        if ($output !== ""){
+            $result = $this->listener->write('{status:"info",message:"' .
+                                              EclipseReporter::escapeVal($output) . '"}');
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/encoding.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/encoding.php
new file mode 100644
index 000000000..cadc84e7a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/encoding.php
@@ -0,0 +1,649 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: encoding.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/socket.php');
+/**#@-*/
+
+/**
+ *    Single post parameter.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEncodedPair {
+    private $key;
+    private $value;
+
+    /**
+     *    Stashes the data for rendering later.
+     *    @param string $key       Form element name.
+     *    @param string $value     Data to send.
+     */
+    function __construct($key, $value) {
+        $this->key = $key;
+        $this->value = $value;
+    }
+
+    /**
+     *    The pair as a single string.
+     *    @return string        Encoded pair.
+     *    @access public
+     */
+    function asRequest() {
+        return urlencode($this->key) . '=' . urlencode($this->value);
+    }
+
+    /**
+     *    The MIME part as a string.
+     *    @return string        MIME part encoding.
+     *    @access public
+     */
+    function asMime() {
+        $part = 'Content-Disposition: form-data; ';
+        $part .= "name=\"" . $this->key . "\"\r\n";
+        $part .= "\r\n" . $this->value;
+        return $part;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @param string $key    Identifier.
+     *    @return boolean       True if matched.
+     *    @access public
+     */
+    function isKey($key) {
+        return $key == $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Identifier.
+     *    @access public
+     */
+    function getKey() {
+        return $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Content.
+     *    @access public
+     */
+    function getValue() {
+        return $this->value;
+    }
+}
+
+/**
+ *    Single post parameter.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAttachment {
+    private $key;
+    private $content;
+    private $filename;
+
+    /**
+     *    Stashes the data for rendering later.
+     *    @param string $key          Key to add value to.
+     *    @param string $content      Raw data.
+     *    @param hash $filename       Original filename.
+     */
+    function __construct($key, $content, $filename) {
+        $this->key = $key;
+        $this->content = $content;
+        $this->filename = $filename;
+    }
+
+    /**
+     *    The pair as a single string.
+     *    @return string        Encoded pair.
+     *    @access public
+     */
+    function asRequest() {
+        return '';
+    }
+
+    /**
+     *    The MIME part as a string.
+     *    @return string        MIME part encoding.
+     *    @access public
+     */
+    function asMime() {
+        $part = 'Content-Disposition: form-data; ';
+        $part .= 'name="' . $this->key . '"; ';
+        $part .= 'filename="' . $this->filename . '"';
+        $part .= "\r\nContent-Type: " . $this->deduceMimeType();
+        $part .= "\r\n\r\n" . $this->content;
+        return $part;
+    }
+
+    /**
+     *    Attempts to figure out the MIME type from the
+     *    file extension and the content.
+     *    @return string        MIME type.
+     *    @access private
+     */
+    protected function deduceMimeType() {
+        if ($this->isOnlyAscii($this->content)) {
+            return 'text/plain';
+        }
+        return 'application/octet-stream';
+    }
+
+    /**
+     *    Tests each character is in the range 0-127.
+     *    @param string $ascii    String to test.
+     *    @access private
+     */
+    protected function isOnlyAscii($ascii) {
+        for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
+            if (ord($ascii[$i]) > 127) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @param string $key    Identifier.
+     *    @return boolean       True if matched.
+     *    @access public
+     */
+    function isKey($key) {
+        return $key == $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Identifier.
+     *    @access public
+     */
+    function getKey() {
+        return $this->key;
+    }
+
+    /**
+     *    Is this the value we are looking for?
+     *    @return string       Content.
+     *    @access public
+     */
+    function getValue() {
+        return $this->filename;
+    }
+}
+
+/**
+ *    Bundle of GET/POST parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEncoding {
+    private $request;
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        if (! $query) {
+            $query = array();
+        }
+        $this->clear();
+        $this->merge($query);
+    }
+
+    /**
+     *    Empties the request of parameters.
+     *    @access public
+     */
+    function clear() {
+        $this->request = array();
+    }
+
+    /**
+     *    Adds a parameter to the query.
+     *    @param string $key            Key to add value to.
+     *    @param string/array $value    New data.
+     *    @access public
+     */
+    function add($key, $value) {
+        if ($value === false) {
+            return;
+        }
+        if (is_array($value)) {
+            foreach ($value as $item) {
+                $this->addPair($key, $item);
+            }
+        } else {
+            $this->addPair($key, $value);
+        }
+    }
+
+    /**
+     *    Adds a new value into the request.
+     *    @param string $key            Key to add value to.
+     *    @param string/array $value    New data.
+     *    @access private
+     */
+    protected function addPair($key, $value) {
+        $this->request[] = new SimpleEncodedPair($key, $value);
+    }
+
+    /**
+     *    Adds a MIME part to the query. Does nothing for a
+     *    form encoded packet.
+     *    @param string $key          Key to add value to.
+     *    @param string $content      Raw data.
+     *    @param hash $filename       Original filename.
+     *    @access public
+     */
+    function attach($key, $content, $filename) {
+        $this->request[] = new SimpleAttachment($key, $content, $filename);
+    }
+
+    /**
+     *    Adds a set of parameters to this query.
+     *    @param array/SimpleQueryString $query  Multiple values are
+     *                                           as lists on a single key.
+     *    @access public
+     */
+    function merge($query) {
+        if (is_object($query)) {
+            $this->request = array_merge($this->request, $query->getAll());
+        } elseif (is_array($query)) {
+            foreach ($query as $key => $value) {
+                $this->add($key, $value);
+            }
+        }
+    }
+
+    /**
+     *    Accessor for single value.
+     *    @return string/array    False if missing, string
+     *                            if present and array if
+     *                            multiple entries.
+     *    @access public
+     */
+    function getValue($key) {
+        $values = array();
+        foreach ($this->request as $pair) {
+            if ($pair->isKey($key)) {
+                $values[] = $pair->getValue();
+            }
+        }
+        if (count($values) == 0) {
+            return false;
+        } elseif (count($values) == 1) {
+            return $values[0];
+        } else {
+            return $values;
+        }
+    }
+
+    /**
+     *    Accessor for listing of pairs.
+     *    @return array        All pair objects.
+     *    @access public
+     */
+    function getAll() {
+        return $this->request;
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part.
+     *    @return string        Part of URL.
+     *    @access protected
+     */
+    protected function encode() {
+        $statements = array();
+        foreach ($this->request as $pair) {
+            if ($statement = $pair->asRequest()) {
+                $statements[] = $statement;
+            }
+        }
+        return implode('&', $statements);
+    }
+}
+
+/**
+ *    Bundle of GET parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleGetEncoding extends SimpleEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always GET.
+     *    @access public
+     */
+    function getMethod() {
+        return 'GET';
+    }
+
+    /**
+     *    Writes no extra headers.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+    }
+
+    /**
+     *    No data is sent to the socket as the data is encoded into
+     *    the URL.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part for attaching to a URL.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function asUrlRequest() {
+        return $this->encode();
+    }
+}
+
+/**
+ *    Bundle of URL parameters for a HEAD request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHeadEncoding extends SimpleGetEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return 'HEAD';
+    }
+}
+
+/**
+ *    Bundle of URL parameters for a DELETE request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleDeleteEncoding extends SimpleGetEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false) {
+        parent::__construct($query);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always DELETE.
+     *    @access public
+     */
+    function getMethod() {
+        return 'DELETE';
+    }
+}
+
+/**
+ *    Bundles an entity-body for transporting
+ *    a raw content payload with the request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleEntityEncoding extends SimpleEncoding {
+    private $content_type;
+    private $body;
+
+    function __construct($query = false, $content_type = false) {
+        $this->content_type = $content_type;
+    	if (is_string($query)) {
+            $this->body = $query;
+            parent::__construct();
+        } else {
+            parent::__construct($query);
+        }
+    }
+
+    /**
+     *    Returns the media type of the entity body
+     *    @return string
+     *    @access public
+     */
+    function getContentType() {
+        if (!$this->content_type) {
+        	return ($this->body) ? 'text/plain' : 'application/x-www-form-urlencoded';
+        }
+    	return $this->content_type;
+    }
+
+    /**
+     *    Dispatches the form headers down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
+        $socket->write("Content-Type: " .  $this->getContentType() . "\r\n");
+    }
+
+    /**
+     *    Dispatches the form data down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+        $socket->write($this->encode());
+    }
+
+    /**
+     *    Renders the request body
+     *    @return Encoded entity body
+     *    @access protected
+     */
+    protected function encode() {
+        return ($this->body) ? $this->body : parent::encode();
+    }
+}
+
+/**
+ *    Bundle of POST parameters. Can include
+ *    repeated parameters.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePostEncoding extends SimpleEntityEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $content_type = false) {
+        if (is_array($query) and $this->hasMoreThanOneLevel($query)) {
+            $query = $this->rewriteArrayWithMultipleLevels($query);
+        }
+        parent::__construct($query, $content_type);
+    }
+
+    function hasMoreThanOneLevel($query) {
+        foreach ($query as $key => $value) {
+            if (is_array($value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function rewriteArrayWithMultipleLevels($query) {
+        $query_ = array();
+        foreach ($query as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $sub_key => $sub_value) {
+                    $query_[$key."[".$sub_key."]"] = $sub_value;
+                }
+            } else {
+                $query_[$key] = $value;
+            }
+        }
+        if ($this->hasMoreThanOneLevel($query_)) {
+            $query_ = $this->rewriteArrayWithMultipleLevels($query_);
+        }
+
+        return $query_;
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always POST.
+     *    @access public
+     */
+    function getMethod() {
+        return 'POST';
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part for attaching to a URL.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function asUrlRequest() {
+        return '';
+    }
+}
+
+/**
+ *    Encoded entity body for a PUT request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePutEncoding extends SimpleEntityEncoding {
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $content_type = false) {
+        parent::__construct($query, $content_type);
+    }
+
+    /**
+     *    HTTP request method.
+     *    @return string        Always PUT.
+     *    @access public
+     */
+    function getMethod() {
+        return 'PUT';
+    }
+}
+
+/**
+ *    Bundle of POST parameters in the multipart
+ *    format. Can include file uploads.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleMultipartEncoding extends SimplePostEncoding {
+    private $boundary;
+
+    /**
+     *    Starts empty.
+     *    @param array $query       Hash of parameters.
+     *                              Multiple values are
+     *                              as lists on a single key.
+     *    @access public
+     */
+    function __construct($query = false, $boundary = false) {
+        parent::__construct($query);
+        $this->boundary = ($boundary === false ? uniqid('st') : $boundary);
+    }
+
+    /**
+     *    Dispatches the form headers down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeHeadersTo(&$socket) {
+        $socket->write("Content-Length: " . (integer)strlen($this->encode()) . "\r\n");
+        $socket->write("Content-Type: multipart/form-data; boundary=" . $this->boundary . "\r\n");
+    }
+
+    /**
+     *    Dispatches the form data down the socket.
+     *    @param SimpleSocket $socket        Socket to write to.
+     *    @access public
+     */
+    function writeTo(&$socket) {
+        $socket->write($this->encode());
+    }
+
+    /**
+     *    Renders the query string as a URL encoded
+     *    request part.
+     *    @return string        Part of URL.
+     *    @access public
+     */
+    function encode() {
+        $stream = '';
+        foreach ($this->getAll() as $pair) {
+            $stream .= "--" . $this->boundary . "\r\n";
+            $stream .= $pair->asMime() . "\r\n";
+        }
+        $stream .= "--" . $this->boundary . "--\r\n";
+        return $stream;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/errors.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/errors.php
new file mode 100644
index 000000000..b3d0c2a07
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/errors.php
@@ -0,0 +1,267 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: errors.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files.
+ */
+require_once dirname(__FILE__) . '/invoker.php';
+require_once dirname(__FILE__) . '/test_case.php';
+require_once dirname(__FILE__) . '/expectation.php';
+/**#@-*/
+
+/**
+ *    Extension that traps errors into an error queue.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
+
+    /**
+     *    Stores the invoker to wrap.
+     *    @param SimpleInvoker $invoker  Test method runner.
+     */
+    function __construct($invoker) {
+        parent::__construct($invoker);
+    }
+
+    /**
+     *    Invokes a test method and dispatches any
+     *    untrapped errors. Called back from
+     *    the visiting runner.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $queue = $this->createErrorQueue();
+        set_error_handler('SimpleTestErrorHandler');
+        parent::invoke($method);
+        restore_error_handler();
+        $queue->tally();
+    }
+
+    /**
+     *    Wires up the error queue for a single test.
+     *    @return SimpleErrorQueue    Queue connected to the test.
+     *    @access private
+     */
+    protected function createErrorQueue() {
+        $context = SimpleTest::getContext();
+        $test = $this->getTestCase();
+        $queue = $context->get('SimpleErrorQueue');
+        $queue->setTestCase($test);
+        return $queue;
+    }
+}
+
+/**
+ *    Error queue used to record trapped
+ *    errors.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleErrorQueue {
+    private $queue;
+    private $expectation_queue;
+    private $test;
+    private $using_expect_style = false;
+
+    /**
+     *    Starts with an empty queue.
+     */
+    function __construct() {
+        $this->clear();
+    }
+
+    /**
+     *    Discards the contents of the error queue.
+     *    @access public
+     */
+    function clear() {
+        $this->queue = array();
+        $this->expectation_queue = array();
+    }
+
+    /**
+     *    Sets the currently running test case.
+     *    @param SimpleTestCase $test    Test case to send messages to.
+     *    @access public
+     */
+    function setTestCase($test) {
+        $this->test = $test;
+    }
+
+    /**
+     *    Sets up an expectation of an error. If this is
+     *    not fulfilled at the end of the test, a failure
+     *    will occour. If the error does happen, then this
+     *    will cancel it out and send a pass message.
+     *    @param SimpleExpectation $expected    Expected error match.
+     *    @param string $message                Message to display.
+     *    @access public
+     */
+    function expectError($expected, $message) {
+        array_push($this->expectation_queue, array($expected, $message));
+    }
+
+    /**
+     *    Adds an error to the front of the queue.
+     *    @param integer $severity       PHP error code.
+     *    @param string $content         Text of error.
+     *    @param string $filename        File error occoured in.
+     *    @param integer $line           Line number of error.
+     *    @access public
+     */
+    function add($severity, $content, $filename, $line) {
+        $content = str_replace('%', '%%', $content);
+        $this->testLatestError($severity, $content, $filename, $line);
+    }
+
+    /**
+     *    Any errors still in the queue are sent to the test
+     *    case. Any unfulfilled expectations trigger failures.
+     *    @access public
+     */
+    function tally() {
+        while (list($severity, $message, $file, $line) = $this->extract()) {
+            $severity = $this->getSeverityAsString($severity);
+            $this->test->error($severity, $message, $file, $line);
+        }
+        while (list($expected, $message) = $this->extractExpectation()) {
+            $this->test->assert($expected, false, "%s -> Expected error not caught");
+        }
+    }
+
+    /**
+     *    Tests the error against the most recent expected
+     *    error.
+     *    @param integer $severity       PHP error code.
+     *    @param string $content         Text of error.
+     *    @param string $filename        File error occoured in.
+     *    @param integer $line           Line number of error.
+     *    @access private
+     */
+    protected function testLatestError($severity, $content, $filename, $line) {
+        if ($expectation = $this->extractExpectation()) {
+            list($expected, $message) = $expectation;
+            $this->test->assert($expected, $content, sprintf(
+                    $message,
+                    "%s -> PHP error [$content] severity [" .
+                            $this->getSeverityAsString($severity) .
+                            "] in [$filename] line [$line]"));
+        } else {
+            $this->test->error($severity, $content, $filename, $line);
+        }
+    }
+
+    /**
+     *    Pulls the earliest error from the queue.
+     *    @return  mixed    False if none, or a list of error
+     *                      information. Elements are: severity
+     *                      as the PHP error code, the error message,
+     *                      the file with the error, the line number
+     *                      and a list of PHP super global arrays.
+     *    @access public
+     */
+    function extract() {
+        if (count($this->queue)) {
+            return array_shift($this->queue);
+        }
+        return false;
+    }
+
+    /**
+     *    Pulls the earliest expectation from the queue.
+     *    @return     SimpleExpectation    False if none.
+     *    @access private
+     */
+    protected function extractExpectation() {
+        if (count($this->expectation_queue)) {
+            return array_shift($this->expectation_queue);
+        }
+        return false;
+    }
+
+    /**
+     *    Converts an error code into it's string
+     *    representation.
+     *    @param $severity  PHP integer error code.
+     *    @return           String version of error code.
+     *    @access public
+     */
+    static function getSeverityAsString($severity) {
+        static $map = array(
+                E_STRICT => 'E_STRICT',
+                E_ERROR => 'E_ERROR',
+                E_WARNING => 'E_WARNING',
+                E_PARSE => 'E_PARSE',
+                E_NOTICE => 'E_NOTICE',
+                E_CORE_ERROR => 'E_CORE_ERROR',
+                E_CORE_WARNING => 'E_CORE_WARNING',
+                E_COMPILE_ERROR => 'E_COMPILE_ERROR',
+                E_COMPILE_WARNING => 'E_COMPILE_WARNING',
+                E_USER_ERROR => 'E_USER_ERROR',
+                E_USER_WARNING => 'E_USER_WARNING',
+                E_USER_NOTICE => 'E_USER_NOTICE');
+        if (defined('E_RECOVERABLE_ERROR')) {
+            $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
+        }
+        if (defined('E_DEPRECATED')) {
+            $map[E_DEPRECATED] = 'E_DEPRECATED';
+        }
+        return $map[$severity];
+    }
+}
+
+/**
+ *    Error handler that simply stashes any errors into the global
+ *    error queue. Simulates the existing behaviour with respect to
+ *    logging errors, but this feature may be removed in future.
+ *    @param $severity        PHP error code.
+ *    @param $message         Text of error.
+ *    @param $filename        File error occoured in.
+ *    @param $line            Line number of error.
+ *    @param $super_globals   Hash of PHP super global arrays.
+ *    @access public
+ */
+function SimpleTestErrorHandler($severity, $message, $filename = null, $line = null, $super_globals = null, $mask = null) {
+    $severity = $severity & error_reporting();
+    if ($severity) {
+        restore_error_handler();
+        if (IsNotCausedBySimpleTest($message) && IsNotTimeZoneNag($message)) {
+            if (ini_get('log_errors')) {
+                $label = SimpleErrorQueue::getSeverityAsString($severity);
+                error_log("$label: $message in $filename on line $line");
+            }
+            $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
+            $queue->add($severity, $message, $filename, $line);
+        }
+        set_error_handler('SimpleTestErrorHandler');
+    }
+    return true;
+}
+
+/**
+ *  Certain messages can be caused by the unit tester itself.
+ *  These have to be filtered.
+ *  @param string $message      Message to filter.
+ *  @return boolean             True if genuine failure.
+ */
+function IsNotCausedBySimpleTest($message) {
+    return ! preg_match('/returned by reference/', $message);
+}
+
+/**
+ *  Certain messages caused by PHP are just noise.
+ *  These have to be filtered.
+ *  @param string $message      Message to filter.
+ *  @return boolean             True if genuine failure.
+ */
+function IsNotTimeZoneNag($message) {
+    return ! preg_match('/not safe to rely .* timezone settings/', $message);
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/exceptions.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/exceptions.php
new file mode 100644
index 000000000..2f469e93a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/exceptions.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: exceptions.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+
+/**#@+
+ * Include required SimpleTest files
+ */
+require_once dirname(__FILE__) . '/invoker.php';
+require_once dirname(__FILE__) . '/expectation.php';
+/**#@-*/
+
+/**
+ *    Extension that traps exceptions and turns them into
+ *    an error message. PHP5 only.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
+
+    /**
+     *    Stores the invoker to be wrapped.
+     *    @param SimpleInvoker $invoker   Test method runner.
+     */
+    function __construct($invoker) {
+        parent::__construct($invoker);
+    }
+
+    /**
+     *    Invokes a test method whilst trapping expected
+     *    exceptions. Any left over unthrown exceptions
+     *    are then reported as failures.
+     *    @param string $method    Test method to call.
+     */
+    function invoke($method) {
+        $trap = SimpleTest::getContext()->get('SimpleExceptionTrap');
+        $trap->clear();
+        try {
+            $has_thrown = false;
+            parent::invoke($method);
+        } catch (Exception $exception) {
+            $has_thrown = true;
+            if (! $trap->isExpected($this->getTestCase(), $exception)) {
+                $this->getTestCase()->exception($exception);
+            }
+            $trap->clear();
+        }
+        if ($message = $trap->getOutstanding()) {
+            $this->getTestCase()->fail($message);
+        }
+        if ($has_thrown) {
+            try {
+                parent::getTestCase()->tearDown();
+            } catch (Exception $e) { }
+        }
+    }
+}
+
+/**
+ *    Tests exceptions either by type or the exact
+ *    exception. This could be improved to accept
+ *    a pattern expectation to test the error
+ *    message, but that will have to come later.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ExceptionExpectation extends SimpleExpectation {
+    private $expected;
+
+    /**
+     *    Sets up the conditions to test against.
+     *    If the expected value is a string, then
+     *    it will act as a test of the class name.
+     *    An exception as the comparison will
+     *    trigger an identical match. Writing this
+     *    down now makes it look doubly dumb. I hope
+     *    come up with a better scheme later.
+     *    @param mixed $expected   A class name or an actual
+     *                             exception to compare with.
+     *    @param string $message   Message to display.
+     */
+    function __construct($expected, $message = '%s') {
+        $this->expected = $expected;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Carry out the test.
+     *    @param Exception $compare    Value to check.
+     *    @return boolean              True if matched.
+     */
+    function test($compare) {
+        if (is_string($this->expected)) {
+            return ($compare instanceof $this->expected);
+        }
+        if (get_class($compare) != get_class($this->expected)) {
+            return false;
+        }
+        return $compare->getMessage() == $this->expected->getMessage();
+    }
+
+    /**
+     *    Create the message to display describing the test.
+     *    @param Exception $compare     Exception to match.
+     *    @return string                Final message.
+     */
+    function testMessage($compare) {
+        if (is_string($this->expected)) {
+            return "Exception [" . $this->describeException($compare) .
+                    "] should be type [" . $this->expected . "]";
+        }
+        return "Exception [" . $this->describeException($compare) .
+                "] should match [" .
+                $this->describeException($this->expected) . "]";
+    }
+
+    /**
+     *    Summary of an Exception object.
+     *    @param Exception $compare     Exception to describe.
+     *    @return string                Text description.
+     */
+    protected function describeException($exception) {
+        return get_class($exception) . ": " . $exception->getMessage();
+    }
+}
+
+/**
+ *    Stores expected exceptions for when they
+ *    get thrown. Saves the irritating try...catch
+ *    block.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleExceptionTrap {
+    private $expected;
+    private $ignored;
+    private $message;
+
+    /**
+     *    Clears down the queue ready for action.
+     */
+    function __construct() {
+        $this->clear();
+    }
+
+    /**
+     *    Sets up an expectation of an exception.
+     *    This has the effect of intercepting an
+     *    exception that matches.
+     *    @param SimpleExpectation $expected    Expected exception to match.
+     *    @param string $message                Message to display.
+     *    @access public
+     */
+    function expectException($expected = false, $message = '%s') {
+        $this->expected = $this->coerceToExpectation($expected);
+        $this->message = $message;
+    }
+
+    /**
+     *    Adds an exception to the ignore list. This is the list
+     *    of exceptions that when thrown do not affect the test.
+     *    @param SimpleExpectation $ignored    Exception to skip.
+     *    @access public
+     */
+    function ignoreException($ignored) {
+        $this->ignored[] = $this->coerceToExpectation($ignored);
+    }
+
+    /**
+     *    Compares the expected exception with any
+     *    in the queue. Issues a pass or fail and
+     *    returns the state of the test.
+     *    @param SimpleTestCase $test    Test case to send messages to.
+     *    @param Exception $exception    Exception to compare.
+     *    @return boolean                False on no match.
+     */
+    function isExpected($test, $exception) {
+        if ($this->expected) {
+            return $test->assert($this->expected, $exception, $this->message);
+        }
+        foreach ($this->ignored as $ignored) {
+            if ($ignored->test($exception)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Turns an expected exception into a SimpleExpectation object.
+     *    @param mixed $exception      Exception, expectation or
+     *                                 class name of exception.
+     *    @return SimpleExpectation    Expectation that will match the
+     *                                 exception.
+     */
+    private function coerceToExpectation($exception) {
+        if ($exception === false) {
+            return new AnythingExpectation();
+        }
+        if (! SimpleExpectation::isExpectation($exception)) {
+            return new ExceptionExpectation($exception);
+        }
+        return $exception;
+    }
+
+    /**
+     *    Tests for any left over exception.
+     *    @return string/false     The failure message or false if none.
+     */
+    function getOutstanding() {
+        return sprintf($this->message, 'Failed to trap exception');
+    }
+
+    /**
+     *    Discards the contents of the error queue.
+     */
+    function clear() {
+        $this->expected = false;
+        $this->message = false;
+        $this->ignored = array();
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/expectation.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/expectation.php
new file mode 100644
index 000000000..a480a366c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/expectation.php
@@ -0,0 +1,984 @@
+<?php
+/**
+ *    base include file for SimpleTest
+ *    @package    SimpleTest
+ *    @subpackage    UnitTester
+ *    @version    $Id: expectation.php 2009 2011-04-28 08:57:25Z pp11 $
+ */
+
+/**#@+
+ *    include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Assertion that can display failure information.
+ *    Also includes various helper methods.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ *    @abstract
+ */
+class SimpleExpectation {
+    protected $dumper = false;
+    private $message;
+
+    /**
+     *    Creates a dumper for displaying values and sets
+     *    the test message.
+     *    @param string $message    Customised message on failure.
+     */
+    function __construct($message = '%s') {
+        $this->message = $message;
+    }
+
+    /**
+     *    Tests the expectation. True if correct.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     *    @abstract
+     */
+    function test($compare) {
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     *    @abstract
+     */
+    function testMessage($compare) {
+    }
+
+    /**
+     *    Overlays the generated message onto the stored user
+     *    message. An additional message can be interjected.
+     *    @param mixed $compare        Comparison value.
+     *    @param SimpleDumper $dumper  For formatting the results.
+     *    @return string               Description of success
+     *                                 or failure.
+     *    @access public
+     */
+    function overlayMessage($compare, $dumper) {
+        $this->dumper = $dumper;
+        return sprintf($this->message, $this->testMessage($compare));
+    }
+
+    /**
+     *    Accessor for the dumper.
+     *    @return SimpleDumper    Current value dumper.
+     *    @access protected
+     */
+    protected function getDumper() {
+        if (! $this->dumper) {
+            $dumper = new SimpleDumper();
+            return $dumper;
+        }
+        return $this->dumper;
+    }
+
+    /**
+     *    Test to see if a value is an expectation object.
+     *    A useful utility method.
+     *    @param mixed $expectation    Hopefully an Expectation
+     *                                 class.
+     *    @return boolean              True if descended from
+     *                                 this class.
+     *    @access public
+     */
+    static function isExpectation($expectation) {
+        return is_object($expectation) &&
+                SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
+    }
+}
+
+/**
+ *    A wildcard expectation always matches.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class AnythingExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation. Always true.
+     *    @param mixed $compare  Ignored.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function test($compare) {
+        return true;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Anything always matches [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that never matches.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class FailedExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation. Always false.
+     *    @param mixed $compare  Ignored.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function test($compare) {
+        return false;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Failed expectation never matches [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that passes on boolean true.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class TrueExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation.
+     *    @param mixed $compare  Should be true.
+     *    @return boolean        True on match.
+     *    @access public
+     */
+    function test($compare) {
+        return (boolean)$compare;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Expected true, got [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    An expectation that passes on boolean false.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class FalseExpectation extends SimpleExpectation {
+
+    /**
+     *    Tests the expectation.
+     *    @param mixed $compare  Should be false.
+     *    @return boolean        True on match.
+     *    @access public
+     */
+    function test($compare) {
+        return ! (boolean)$compare;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return 'Expected false, got [' . $dumper->describeValue($compare) . ']';
+    }
+}
+
+/**
+ *    Test for equality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class EqualExpectation extends SimpleExpectation {
+    private $value;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value        Test value to match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($message);
+        $this->value = $value;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (($this->value == $compare) && ($compare == $this->value));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return "Equal expectation [" . $this->dumper->describeValue($this->value) . "]";
+        } else {
+            return "Equal expectation fails " .
+                    $this->dumper->describeDifference($this->value, $compare);
+        }
+    }
+
+    /**
+     *    Accessor for comparison value.
+     *    @return mixed       Held value to compare with.
+     *    @access protected
+     */
+    protected function getValue() {
+        return $this->value;
+    }
+}
+
+/**
+ *    Test for inequality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NotEqualExpectation extends EqualExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value       Test value to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it differs from the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Not equal expectation passes " .
+                    $dumper->describeDifference($this->getValue(), $compare);
+        } else {
+            return "Not equal expectation fails [" .
+                    $dumper->describeValue($this->getValue()) .
+                    "] matches";
+        }
+    }
+}
+
+/**
+ *    Test for being within a range.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class WithinMarginExpectation extends SimpleExpectation {
+    private $upper;
+    private $lower;
+
+    /**
+     *    Sets the value to compare against and the fuzziness of
+     *    the match. Used for comparing floating point values.
+     *    @param mixed $value        Test value to match.
+     *    @param mixed $margin       Fuzziness of match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $margin, $message = '%s') {
+        parent::__construct($message);
+        $this->upper = $value + $margin;
+        $this->lower = $value - $margin;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (($compare <= $this->upper) && ($compare >= $this->lower));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->withinMessage($compare);
+        } else {
+            return $this->outsideMessage($compare);
+        }
+    }
+
+    /**
+     *    Creates a the message for being within the range.
+     *    @param mixed $compare        Value being tested.
+     *    @access private
+     */
+    protected function withinMessage($compare) {
+        return "Within expectation [" . $this->dumper->describeValue($this->lower) . "] and [" .
+                $this->dumper->describeValue($this->upper) . "]";
+    }
+
+    /**
+     *    Creates a the message for being within the range.
+     *    @param mixed $compare        Value being tested.
+     *    @access private
+     */
+    protected function outsideMessage($compare) {
+        if ($compare > $this->upper) {
+            return "Outside expectation " .
+                    $this->dumper->describeDifference($compare, $this->upper);
+        } else {
+            return "Outside expectation " .
+                    $this->dumper->describeDifference($compare, $this->lower);
+        }
+    }
+}
+
+/**
+ *    Test for being outside of a range.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class OutsideMarginExpectation extends WithinMarginExpectation {
+
+    /**
+     *    Sets the value to compare against and the fuzziness of
+     *    the match. Used for comparing floating point values.
+     *    @param mixed $value        Test value to not match.
+     *    @param mixed $margin       Fuzziness of match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $margin, $message = '%s') {
+        parent::__construct($value, $margin, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it matches the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if (! $this->test($compare)) {
+            return $this->withinMessage($compare);
+        } else {
+            return $this->outsideMessage($compare);
+        }
+    }
+}
+
+/**
+ *    Test for reference.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ReferenceExpectation {
+    private $value;
+
+    /**
+     *    Sets the reference value to compare against.
+     *    @param mixed $value       Test reference to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct(&$value, $message = '%s') {
+        $this->message = $message;
+        $this->value = &$value;
+    }
+
+    /**
+     *    Tests the expectation. True if it exactly
+     *    references the held value.
+     *    @param mixed $compare        Comparison reference.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test(&$compare) {
+        return SimpleTestCompatibility::isReference($this->value, $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return "Reference expectation [" . $this->dumper->describeValue($this->value) . "]";
+        } else {
+            return "Reference expectation fails " .
+                    $this->dumper->describeDifference($this->value, $compare);
+        }
+    }
+
+    /**
+     *    Overlays the generated message onto the stored user
+     *    message. An additional message can be interjected.
+     *    @param mixed $compare        Comparison value.
+     *    @param SimpleDumper $dumper  For formatting the results.
+     *    @return string               Description of success
+     *                                 or failure.
+     *    @access public
+     */
+    function overlayMessage($compare, $dumper) {
+        $this->dumper = $dumper;
+        return sprintf($this->message, $this->testMessage($compare));
+    }
+
+    /**
+     *    Accessor for the dumper.
+     *    @return SimpleDumper    Current value dumper.
+     *    @access protected
+     */
+    protected function getDumper() {
+        if (! $this->dumper) {
+            $dumper = new SimpleDumper();
+            return $dumper;
+        }
+        return $this->dumper;
+    }
+}
+
+/**
+ *    Test for identity.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class IdenticalExpectation extends EqualExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value       Test value to match.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it exactly
+     *    matches the held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return SimpleTestCompatibility::isIdentical($this->getValue(), $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Identical expectation [" . $dumper->describeValue($this->getValue()) . "]";
+        } else {
+            return "Identical expectation [" . $dumper->describeValue($this->getValue()) .
+                    "] fails with [" .
+                    $dumper->describeValue($compare) . "] " .
+                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
+        }
+    }
+}
+
+/**
+ *    Test for non-identity.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NotIdenticalExpectation extends IdenticalExpectation {
+
+    /**
+     *    Sets the value to compare against.
+     *    @param mixed $value        Test value to match.
+     *    @param string $message     Customised message on failure.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($value, $message);
+    }
+
+    /**
+     *    Tests the expectation. True if it differs from the
+     *    held value.
+     *    @param mixed $compare        Comparison value.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if ($this->test($compare)) {
+            return "Not identical expectation passes " .
+                    $dumper->describeDifference($this->getValue(), $compare, TYPE_MATTERS);
+        } else {
+            return "Not identical expectation [" . $dumper->describeValue($this->getValue()) . "] matches";
+        }
+    }
+}
+
+/**
+ *    Test for a pattern using Perl regex rules.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class PatternExpectation extends SimpleExpectation {
+    private $pattern;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $pattern    Pattern to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($pattern, $message = '%s') {
+        parent::__construct($message);
+        $this->pattern = $pattern;
+    }
+
+    /**
+     *    Accessor for the pattern.
+     *    @return string       Perl regex as string.
+     *    @access protected
+     */
+    protected function getPattern() {
+        return $this->pattern;
+    }
+
+    /**
+     *    Tests the expectation. True if the Perl regex
+     *    matches the comparison value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (boolean)preg_match($this->getPattern(), $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->describePatternMatch($this->getPattern(), $compare);
+        } else {
+            $dumper = $this->getDumper();
+            return "Pattern [" . $this->getPattern() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        }
+    }
+
+    /**
+     *    Describes a pattern match including the string
+     *    found and it's position.
+     *    @param string $pattern        Regex to match against.
+     *    @param string $subject        Subject to search.
+     *    @access protected
+     */
+    protected function describePatternMatch($pattern, $subject) {
+        preg_match($pattern, $subject, $matches);
+        $position = strpos($subject, $matches[0]);
+        $dumper = $this->getDumper();
+        return "Pattern [$pattern] detected at character [$position] in [" .
+                $dumper->describeValue($subject) . "] as [" .
+                $matches[0] . "] in region [" .
+                $dumper->clipString($subject, 100, $position) . "]";
+    }
+}
+
+/**
+ *    Fail if a pattern is detected within the
+ *    comparison.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoPatternExpectation extends PatternExpectation {
+
+    /**
+     *    Sets the reject pattern
+     *    @param string $pattern    Pattern to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($pattern, $message = '%s') {
+        parent::__construct($pattern, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the Perl regex
+     *    matches the comparison value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param string $compare      Comparison value.
+     *    @return string              Description of success
+     *                                or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            $dumper = $this->getDumper();
+            return "Pattern [" . $this->getPattern() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        } else {
+            return $this->describePatternMatch($this->getPattern(), $compare);
+        }
+    }
+}
+
+/**
+ *    Tests either type or class name if it's an object.
+ *      @package SimpleTest
+ *      @subpackage UnitTester
+ */
+class IsAExpectation extends SimpleExpectation {
+    private $type;
+
+    /**
+     *    Sets the type to compare with.
+     *    @param string $type       Type or class name.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($type, $message = '%s') {
+        parent::__construct($message);
+        $this->type = $type;
+    }
+
+    /**
+     *    Accessor for type to check against.
+     *    @return string    Type or class name.
+     *    @access protected
+     */
+    protected function getType() {
+        return $this->type;
+    }
+
+    /**
+     *    Tests the expectation. True if the type or
+     *    class matches the string value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        if (is_object($compare)) {
+            return SimpleTestCompatibility::isA($compare, $this->type);
+        } else {
+            $function = 'is_'.$this->canonicalType($this->type);
+            if (is_callable($function)) {
+                return $function($compare);
+            }
+            return false;
+        }
+    }
+
+    /**
+     *    Coerces type name into a is_*() match.
+     *    @param string $type        User type.
+     *    @return string             Simpler type.
+     *    @access private
+     */
+    protected function canonicalType($type) {
+        $type = strtolower($type);
+        $map = array('boolean' => 'bool');
+        if (isset($map[$type])) {
+            $type = $map[$type];
+        }
+        return $type;
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return "Value [" . $dumper->describeValue($compare) .
+                "] should be type [" . $this->type . "]";
+    }
+}
+
+/**
+ *    Tests either type or class name if it's an object.
+ *    Will succeed if the type does not match.
+ *      @package SimpleTest
+ *      @subpackage UnitTester
+ */
+class NotAExpectation extends IsAExpectation {
+    private $type;
+
+    /**
+     *    Sets the type to compare with.
+     *    @param string $type       Type or class name.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($type, $message = '%s') {
+        parent::__construct($type, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the type or
+     *    class matches the string value.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if different.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        return "Value [" . $dumper->describeValue($compare) .
+                "] should not be type [" . $this->getType() . "]";
+    }
+}
+
+/**
+ *    Tests for existance of a method in an object
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MethodExistsExpectation extends SimpleExpectation {
+    private $method;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $method     Method to check.
+     *    @param string $message    Customised message on failure.
+     *    @return void
+     */
+    function __construct($method, $message = '%s') {
+        parent::__construct($message);
+        $this->method = &$method;
+    }
+
+    /**
+     *    Tests the expectation. True if the method exists in the test object.
+     *    @param string $compare        Comparison method name.
+     *    @return boolean               True if correct.
+     */
+    function test($compare) {
+        return (boolean)(is_object($compare) && method_exists($compare, $this->method));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if (! is_object($compare)) {
+            return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
+        }
+        $method = $this->method;
+        return "Object [" . $dumper->describeValue($compare) .
+                "] should contain method [$method]";
+    }
+}
+
+/**
+ *    Compares an object member's value even if private.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MemberExpectation extends IdenticalExpectation {
+    private $name;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $method     Method to check.
+     *    @param string $message    Customised message on failure.
+     *    @return void
+     */
+    function __construct($name, $expected) {
+        $this->name = $name;
+        parent::__construct($expected);
+    }
+
+    /**
+     *    Tests the expectation. True if the property value is identical.
+     *    @param object $actual         Comparison object.
+     *    @return boolean               True if identical.
+     */
+    function test($actual) {
+        if (! is_object($actual)) {
+            return false;
+        }
+        return parent::test($this->getProperty($this->name, $actual));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($actual) {
+        return parent::testMessage($this->getProperty($this->name, $actual));
+    }
+
+    /**
+     *    Extracts the member value even if private using reflection.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getProperty($name, $object) {
+        $reflection = new ReflectionObject($object);
+        $property = $reflection->getProperty($name);
+        if (method_exists($property, 'setAccessible')) {
+            $property->setAccessible(true);
+        }
+        try {
+            return $property->getValue($object);
+        } catch (ReflectionException $e) {
+            return $this->getPrivatePropertyNoMatterWhat($name, $object);
+        }
+    }
+
+    /**
+     *    Extracts a private member's value when reflection won't play ball.
+     *    @param string $name        Property name.
+     *    @param object $object      Object to read.
+     *    @return mixed              Value of property.
+     */
+    private function getPrivatePropertyNoMatterWhat($name, $object) {
+        foreach ((array)$object as $mangled_name => $value) {
+            if ($this->unmangle($mangled_name) == $name) {
+                return $value;
+            }
+        }
+    }
+
+    /**
+     *    Removes crud from property name after it's been converted
+     *    to an array.
+     *    @param string $mangled     Name from array cast.
+     *    @return string             Cleaned up name.
+     */
+    function unmangle($mangled) {
+        $parts = preg_split('/[^a-zA-Z0-9_\x7f-\xff]+/', $mangled);
+        return array_pop($parts);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/pear_test_case.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/pear_test_case.php
new file mode 100644
index 000000000..71657ae4c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/pear_test_case.php
@@ -0,0 +1,196 @@
+<?php
+    /**
+     *	adapter for SimpleTest to use PEAR PHPUnit test cases
+     *	@package	SimpleTest
+     *	@subpackage Extensions
+     *	@version	$Id: pear_test_case.php 1836 2008-12-21 00:02:26Z edwardzyang $
+     */
+    
+    /**#@+
+     * include SimpleTest files
+     */
+    require_once(dirname(__FILE__) . '/../dumper.php');
+    require_once(dirname(__FILE__) . '/../compatibility.php');
+    require_once(dirname(__FILE__) . '/../test_case.php');
+    require_once(dirname(__FILE__) . '/../expectation.php');
+	/**#@-*/
+   
+    /**
+     *    Adapter for PEAR PHPUnit test case to allow
+     *    legacy PEAR test cases to be used with SimpleTest.
+     *    @package      SimpleTest
+     *    @subpackage   Extensions
+     */
+    class PHPUnit_TestCase extends SimpleTestCase {
+        private $_loosely_typed;
+        
+        /**
+         *    Constructor. Sets the test name.
+         *    @param $label        Test name to display.
+         *    @public
+         */
+        function __construct($label = false) {
+            parent::__construct($label);
+            $this->_loosely_typed = false;
+        }
+        
+        /**
+         *    Will test straight equality if set to loose
+         *    typing, or identity if not.
+         *    @param $first          First value.
+         *    @param $second         Comparison value.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertEquals($first, $second, $message = "%s", $delta = 0) {
+            if ($this->_loosely_typed) {
+                $expectation = new EqualExpectation($first);
+            } else {
+                $expectation = new IdenticalExpectation($first);
+            }
+            $this->assert($expectation, $second, $message);
+        }
+        
+        /**
+         *    Passes if the value tested is not null.
+         *    @param $value          Value to test against.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNotNull($value, $message = "%s") {
+            parent::assert(new TrueExpectation(), isset($value), $message);
+        }
+        
+        /**
+         *    Passes if the value tested is null.
+         *    @param $value          Value to test against.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNull($value, $message = "%s") {
+            parent::assert(new TrueExpectation(), !isset($value), $message);
+        }
+        
+        /**
+         *    Identity test tests for the same object.
+         *    @param $first          First object handle.
+         *    @param $second         Hopefully the same handle.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertSame($first, $second, $message = "%s") {
+            $dumper = new SimpleDumper();
+            $message = sprintf(
+                    $message,
+                    "[" . $dumper->describeValue($first) .
+                            "] and [" . $dumper->describeValue($second) .
+                            "] should reference the same object");
+            return $this->assert(
+					new TrueExpectation(),
+                    SimpleTestCompatibility::isReference($first, $second),
+                    $message);
+        }
+        
+        /**
+         *    Inverted identity test.
+         *    @param $first          First object handle.
+         *    @param $second         Hopefully a different handle.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertNotSame($first, $second, $message = "%s") {
+            $dumper = new SimpleDumper();
+            $message = sprintf(
+                    $message,
+                    "[" . $dumper->describeValue($first) .
+                            "] and [" . $dumper->describeValue($second) .
+                            "] should not be the same object");
+            return $this->assert(
+					new falseExpectation(),
+                    SimpleTestCompatibility::isReference($first, $second),
+                    $message);
+        }
+        
+        /**
+         *    Sends pass if the test condition resolves true,
+         *    a fail otherwise.
+         *    @param $condition      Condition to test true.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertTrue($condition, $message = "%s") {
+            parent::assert(new TrueExpectation(), $condition, $message);
+        }
+        
+        /**
+         *    Sends pass if the test condition resolves false,
+         *    a fail otherwise.
+         *    @param $condition      Condition to test false.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertFalse($condition, $message = "%s") {
+            parent::assert(new FalseExpectation(), $condition, $message);
+        }
+        
+        /**
+         *    Tests a regex match. Needs refactoring.
+         *    @param $pattern        Regex to match.
+         *    @param $subject        String to search in.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertRegExp($pattern, $subject, $message = "%s") {
+            $this->assert(new PatternExpectation($pattern), $subject, $message);
+        }
+        
+        /**
+         *    Tests the type of a value.
+         *    @param $value          Value to take type of.
+         *    @param $type           Hoped for type.
+         *    @param $message        Message to display.
+         *    @public
+         */
+        function assertType($value, $type, $message = "%s") {
+            parent::assert(new TrueExpectation(), gettype($value) == strtolower($type), $message);
+        }
+        
+        /**
+         *    Sets equality operation to act as a simple equal
+         *    comparison only, allowing a broader range of
+         *    matches.
+         *    @param $loosely_typed     True for broader comparison.
+         *    @public
+         */
+        function setLooselyTyped($loosely_typed) {
+            $this->_loosely_typed = $loosely_typed;
+        }
+
+        /**
+         *    For progress indication during
+         *    a test amongst other things.
+         *    @return            Usually one.
+         *    @public
+         */
+        function countTestCases() {
+            return $this->getSize();
+        }
+        
+        /**
+         *    Accessor for name, normally just the class
+         *    name.
+         *    @public
+         */
+        function getName() {
+            return $this->getLabel();
+        }
+        
+        /**
+         *    Does nothing. For compatibility only.
+         *    @param $name        Dummy
+         *    @public
+         */
+        function setName($name) {
+        }
+    }
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox.php
new file mode 100644
index 000000000..5cf32f351
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ *	Extension for a TestDox reporter
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ *	@version	$Id: testdox.php 2004 2010-10-31 13:44:14Z jsweat $
+ */
+
+/**
+ * 	TestDox reporter 
+ *	@package	SimpleTest
+ *	@subpackage	Extensions
+ */
+class TestDoxReporter extends SimpleReporter
+{
+    var $_test_case_pattern = '/^TestOf(.*)$/';
+
+    function __construct($test_case_pattern = '/^TestOf(.*)$/') {
+        parent::__construct();
+        $this->_test_case_pattern = empty($test_case_pattern) ? '/^(.*)$/' : $test_case_pattern;
+    }
+
+    function paintCaseStart($test_name) {
+        preg_match($this->_test_case_pattern, $test_name, $matches);
+        if (!empty($matches[1])) {
+            echo $matches[1] . "\n";
+        } else {
+            echo $test_name . "\n";
+        }
+    }
+
+    function paintCaseEnd($test_name) {
+        echo "\n";
+    }
+
+    function paintMethodStart($test_name) {
+        if (!preg_match('/^test(.*)$/i', $test_name, $matches)) {
+            return;
+        }
+        $test_name = $matches[1];
+        $test_name = preg_replace('/([A-Z])([A-Z])/', '$1 $2', $test_name);
+        echo '- ' . strtolower(preg_replace('/([a-zA-Z])([A-Z0-9])/', '$1 $2', $test_name));
+    }
+
+    function paintMethodEnd($test_name) {
+        echo "\n";
+    }
+
+    function paintFail($message) {
+        echo " [FAILED]";
+    }
+}
+?>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox/test.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox/test.php
new file mode 100644
index 000000000..b03abe510
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/extensions/testdox/test.php
@@ -0,0 +1,107 @@
+<?php
+// $Id: test.php 1748 2008-04-14 01:50:41Z lastcraft $
+require_once dirname(__FILE__) . '/../../autorun.php';
+require_once dirname(__FILE__) . '/../testdox.php';
+
+// uncomment to see test dox in action
+//SimpleTest::prefer(new TestDoxReporter());
+
+class TestOfTestDoxReporter extends UnitTestCase
+{
+    function testIsAnInstanceOfSimpleScorerAndReporter() {
+        $dox = new TestDoxReporter();
+        $this->assertIsA($dox, 'SimpleScorer');
+        $this->assertIsA($dox, 'SimpleReporter');
+    }
+
+    function testOutputsNameOfTestCase() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintCaseStart('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^TestDoxReporter/', $buffer);
+    }
+
+    function testOutputOfTestCaseNameFilteredByConstructParameter() {
+        $dox = new TestDoxReporter('/^(.*)Test$/');
+        ob_start();
+        $dox->paintCaseStart('SomeGreatWidgetTest');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^SomeGreatWidget/', $buffer);
+    }
+
+    function testIfTest_case_patternIsEmptyAssumeEverythingMatches() {
+        $dox = new TestDoxReporter('');
+        ob_start();
+        $dox->paintCaseStart('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertPattern('/^TestOfTestDoxReporter/', $buffer);
+    }
+
+    function testEmptyLineInsertedWhenCaseEnds() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintCaseEnd('TestOfTestDoxReporter');
+        $buffer = ob_get_clean();
+        $this->assertEqual("\n", $buffer);
+    }
+
+    function testPaintsTestMethodInTestDoxFormat() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('testSomeGreatTestCase');
+        $buffer = ob_get_clean();
+        $this->assertEqual("- some great test case", $buffer);
+        unset($buffer);
+
+        $random = rand(100, 200);
+        ob_start();
+        $dox->paintMethodStart("testRandomNumberIs{$random}");
+        $buffer = ob_get_clean();
+        $this->assertEqual("- random number is {$random}", $buffer);
+    }
+
+    function testDoesNotOutputAnythingOnNoneTestMethods() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('nonMatchingMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual('', $buffer);
+    }
+
+    function testPaintMethodAddLineBreak() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodEnd('someMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual("\n", $buffer);
+    }
+
+    function testProperlySpacesSingleLettersInMethodName() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('testAVerySimpleAgainAVerySimpleMethod');
+        $buffer = ob_get_clean();
+        $this->assertEqual('- a very simple again a very simple method', $buffer);
+    }
+
+    function testOnFailureThisPrintsFailureNotice() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintFail('');
+        $buffer = ob_get_clean();
+        $this->assertEqual(' [FAILED]', $buffer);
+    }
+
+    function testWhenMatchingMethodNamesTestPrefixIsCaseInsensitive() {
+        $dox = new TestDoxReporter();
+        ob_start();
+        $dox->paintMethodStart('TESTSupportsAllUppercaseTestPrefixEvenThoughIDoNotKnowWhyYouWouldDoThat');
+        $buffer = ob_get_clean();
+        $this->assertEqual(
+            '- supports all uppercase test prefix even though i do not know why you would do that',
+            $buffer
+        );
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/form.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/form.php
new file mode 100644
index 000000000..5e423a9df
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/form.php
@@ -0,0 +1,361 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: form.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/selector.php');
+/**#@-*/
+
+/**
+ *    Form tag class to hold widget values.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleForm {
+    private $method;
+    private $action;
+    private $encoding;
+    private $default_target;
+    private $id;
+    private $buttons;
+    private $images;
+    private $widgets;
+    private $radios;
+    private $checkboxes;
+
+    /**
+     *    Starts with no held controls/widgets.
+     *    @param SimpleTag $tag        Form tag to read.
+     *    @param SimplePage $page      Holding page.
+     */
+    function __construct($tag, $page) {
+        $this->method = $tag->getAttribute('method');
+        $this->action = $this->createAction($tag->getAttribute('action'), $page);
+        $this->encoding = $this->setEncodingClass($tag);
+        $this->default_target = false;
+        $this->id = $tag->getAttribute('id');
+        $this->buttons = array();
+        $this->images = array();
+        $this->widgets = array();
+        $this->radios = array();
+        $this->checkboxes = array();
+    }
+
+    /**
+     *    Creates the request packet to be sent by the form.
+     *    @param SimpleTag $tag        Form tag to read.
+     *    @return string               Packet class.
+     *    @access private
+     */
+    protected function setEncodingClass($tag) {
+        if (strtolower($tag->getAttribute('method')) == 'post') {
+            if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
+                return 'SimpleMultipartEncoding';
+            }
+            return 'SimplePostEncoding';
+        }
+        return 'SimpleGetEncoding';
+    }
+
+    /**
+     *    Sets the frame target within a frameset.
+     *    @param string $frame        Name of frame.
+     *    @access public
+     */
+    function setDefaultTarget($frame) {
+        $this->default_target = $frame;
+    }
+
+    /**
+     *    Accessor for method of form submission.
+     *    @return string           Either get or post.
+     *    @access public
+     */
+    function getMethod() {
+        return ($this->method ? strtolower($this->method) : 'get');
+    }
+
+    /**
+     *    Combined action attribute with current location
+     *    to get an absolute form target.
+     *    @param string $action    Action attribute from form tag.
+     *    @param SimpleUrl $base   Page location.
+     *    @return SimpleUrl        Absolute form target.
+     */
+    protected function createAction($action, $page) {
+        if (($action === '') || ($action === false)) {
+            return $page->expandUrl($page->getUrl());
+        }
+        return $page->expandUrl(new SimpleUrl($action));;
+    }
+
+    /**
+     *    Absolute URL of the target.
+     *    @return SimpleUrl           URL target.
+     *    @access public
+     */
+    function getAction() {
+        $url = $this->action;
+        if ($this->default_target && ! $url->getTarget()) {
+            $url->setTarget($this->default_target);
+        }
+        if ($this->getMethod() == 'get') {
+            $url->clearRequest();
+        }
+        return $url;
+    }
+
+    /**
+     *    Creates the encoding for the current values in the
+     *    form.
+     *    @return SimpleFormEncoding    Request to submit.
+     *    @access private
+     */
+    protected function encode() {
+        $class = $this->encoding;
+        $encoding = new $class();
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            $this->widgets[$i]->write($encoding);
+        }
+        return $encoding;
+    }
+
+    /**
+     *    ID field of form for unique identification.
+     *    @return string           Unique tag ID.
+     *    @access public
+     */
+    function getId() {
+        return $this->id;
+    }
+
+    /**
+     *    Adds a tag contents to the form.
+     *    @param SimpleWidget $tag        Input tag to add.
+     */
+    function addWidget($tag) {
+        if (strtolower($tag->getAttribute('type')) == 'submit') {
+            $this->buttons[] = $tag;
+        } elseif (strtolower($tag->getAttribute('type')) == 'image') {
+            $this->images[] = $tag;
+        } elseif ($tag->getName()) {
+            $this->setWidget($tag);
+        }
+    }
+
+    /**
+     *    Sets the widget into the form, grouping radio
+     *    buttons if any.
+     *    @param SimpleWidget $tag   Incoming form control.
+     *    @access private
+     */
+    protected function setWidget($tag) {
+        if (strtolower($tag->getAttribute('type')) == 'radio') {
+            $this->addRadioButton($tag);
+        } elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
+            $this->addCheckbox($tag);
+        } else {
+            $this->widgets[] = &$tag;
+        }
+    }
+
+    /**
+     *    Adds a radio button, building a group if necessary.
+     *    @param SimpleRadioButtonTag $tag   Incoming form control.
+     *    @access private
+     */
+    protected function addRadioButton($tag) {
+        if (! isset($this->radios[$tag->getName()])) {
+            $this->widgets[] = new SimpleRadioGroup();
+            $this->radios[$tag->getName()] = count($this->widgets) - 1;
+        }
+        $this->widgets[$this->radios[$tag->getName()]]->addWidget($tag);
+    }
+
+    /**
+     *    Adds a checkbox, making it a group on a repeated name.
+     *    @param SimpleCheckboxTag $tag   Incoming form control.
+     *    @access private
+     */
+    protected function addCheckbox($tag) {
+        if (! isset($this->checkboxes[$tag->getName()])) {
+            $this->widgets[] = $tag;
+            $this->checkboxes[$tag->getName()] = count($this->widgets) - 1;
+        } else {
+            $index = $this->checkboxes[$tag->getName()];
+            if (! SimpleTestCompatibility::isA($this->widgets[$index], 'SimpleCheckboxGroup')) {
+                $previous = $this->widgets[$index];
+                $this->widgets[$index] = new SimpleCheckboxGroup();
+                $this->widgets[$index]->addWidget($previous);
+            }
+            $this->widgets[$index]->addWidget($tag);
+        }
+    }
+
+    /**
+     *    Extracts current value from form.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return string/array              Value(s) as string or null
+     *                                      if not set.
+     *    @access public
+     */
+    function getValue($selector) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                return $this->widgets[$i]->getValue();
+            }
+        }
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                return $button->getValue();
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Sets a widget value within the form.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param string $value              Value to input into the widget.
+     *    @return boolean                   True if value is legal, false
+     *                                      otherwise. If the field is not
+     *                                      present, nothing will be set.
+     *    @access public
+     */
+    function setField($selector, $value, $position=false) {
+        $success = false;
+        $_position = 0;
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                $_position++;
+                if ($position === false or $_position === (int)$position) {
+                    if ($this->widgets[$i]->setValue($value)) {
+                        $success = true;
+                    }
+                }
+            }
+        }
+        return $success;
+    }
+
+    /**
+     *    Used by the page object to set widgets labels to
+     *    external label tags.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @access public
+     */
+    function attachLabelBySelector($selector, $label) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($selector->isMatch($this->widgets[$i])) {
+                if (method_exists($this->widgets[$i], 'setLabel')) {
+                    $this->widgets[$i]->setLabel($label);
+                    return;
+                }
+            }
+        }
+    }
+
+    /**
+     *    Test to see if a form has a submit button.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return boolean                   True if present.
+     *    @access public
+     */
+    function hasSubmit($selector) {
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Test to see if a form has an image control.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @return boolean                   True if present.
+     *    @access public
+     */
+    function hasImage($selector) {
+        foreach ($this->images as $image) {
+            if ($selector->isMatch($image)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Gets the submit values for a selected button.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param hash $additional           Additional data for the form.
+     *    @return SimpleEncoding            Submitted values or false
+     *                                      if there is no such button
+     *                                      in the form.
+     *    @access public
+     */
+    function submitButton($selector, $additional = false) {
+        $additional = $additional ? $additional : array();
+        foreach ($this->buttons as $button) {
+            if ($selector->isMatch($button)) {
+                $encoding = $this->encode();
+                $button->write($encoding);
+                if ($additional) {
+                    $encoding->merge($additional);
+                }
+                return $encoding;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Gets the submit values for an image.
+     *    @param SimpleSelector $selector   Criteria to apply.
+     *    @param integer $x                 X-coordinate of click.
+     *    @param integer $y                 Y-coordinate of click.
+     *    @param hash $additional           Additional data for the form.
+     *    @return SimpleEncoding            Submitted values or false
+     *                                      if there is no such button in the
+     *                                      form.
+     *    @access public
+     */
+    function submitImage($selector, $x, $y, $additional = false) {
+        $additional = $additional ? $additional : array();
+        foreach ($this->images as $image) {
+            if ($selector->isMatch($image)) {
+                $encoding = $this->encode();
+                $image->write($encoding, $x, $y);
+                if ($additional) {
+                    $encoding->merge($additional);
+                }
+                return $encoding;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Simply submits the form without the submit button
+     *    value. Used when there is only one button or it
+     *    is unimportant.
+     *    @return hash           Submitted values.
+     *    @access public
+     */
+    function submit($additional = false) {
+        $encoding = $this->encode();
+        if ($additional) {
+            $encoding->merge($additional);
+        }
+        return $encoding;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/frames.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/frames.php
new file mode 100644
index 000000000..d6d8e96fd
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/frames.php
@@ -0,0 +1,592 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: frames.php 1784 2008-04-26 13:07:14Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/user_agent.php');
+/**#@-*/
+
+/**
+ *    A composite page. Wraps a frameset page and
+ *    adds subframes. The original page will be
+ *    mostly ignored. Implements the SimplePage
+ *    interface so as to be interchangeable.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFrameset {
+    private $frameset;
+    private $frames;
+    private $focus;
+    private $names;
+
+    /**
+     *    Stashes the frameset page. Will make use of the
+     *    browser to fetch the sub frames recursively.
+     *    @param SimplePage $page        Frameset page.
+     */
+    function __construct($page) {
+        $this->frameset = $page;
+        $this->frames = array();
+        $this->focus = false;
+        $this->names = array();
+    }
+
+    /**
+     *    Adds a parsed page to the frameset.
+     *    @param SimplePage $page    Frame page.
+     *    @param string $name        Name of frame in frameset.
+     *    @access public
+     */
+    function addFrame($page, $name = false) {
+        $this->frames[] = $page;
+        if ($name) {
+            $this->names[$name] = count($this->frames) - 1;
+        }
+    }
+
+    /**
+     *    Replaces existing frame with another. If the
+     *    frame is nested, then the call is passed down
+     *    one level.
+     *    @param array $path        Path of frame in frameset.
+     *    @param SimplePage $page   Frame source.
+     *    @access public
+     */
+    function setFrame($path, $page) {
+        $name = array_shift($path);
+        if (isset($this->names[$name])) {
+            $index = $this->names[$name];
+        } else {
+            $index = $name - 1;
+        }
+        if (count($path) == 0) {
+            $this->frames[$index] = &$page;
+            return;
+        }
+        $this->frames[$index]->setFrame($path, $page);
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus. Will have the nested
+     *    frame focus if any.
+     *    @return array     Labels or indexes of nested frames.
+     *    @access public
+     */
+    function getFrameFocus() {
+        if ($this->focus === false) {
+            return array();
+        }
+        return array_merge(
+                array($this->getPublicNameFromIndex($this->focus)),
+                $this->frames[$this->focus]->getFrameFocus());
+    }
+
+    /**
+     *    Turns an internal array index into the frames list
+     *    into a public name, or if none, then a one offset
+     *    index.
+     *    @param integer $subject    Internal index.
+     *    @return integer/string     Public name.
+     *    @access private
+     */
+    protected function getPublicNameFromIndex($subject) {
+        foreach ($this->names as $name => $index) {
+            if ($subject == $index) {
+                return $name;
+            }
+        }
+        return $subject + 1;
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    If already focused and the target frame also has frames,
+     *    then the nested frame will be focused.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        if (is_integer($this->focus)) {
+            if ($this->frames[$this->focus]->hasFrames()) {
+                return $this->frames[$this->focus]->setFrameFocusByIndex($choice);
+            }
+        }
+        if (($choice < 1) || ($choice > count($this->frames))) {
+            return false;
+        }
+        $this->focus = $choice - 1;
+        return true;
+    }
+
+    /**
+     *    Sets the focus by name. If already focused and the
+     *    target frame also has frames, then the nested frame
+     *    will be focused.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        if (is_integer($this->focus)) {
+            if ($this->frames[$this->focus]->hasFrames()) {
+                return $this->frames[$this->focus]->setFrameFocus($name);
+            }
+        }
+        if (in_array($name, array_keys($this->names))) {
+            $this->focus = $this->names[$name];
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     *    Clears the frame focus.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        $this->focus = false;
+        $this->clearNestedFramesFocus();
+    }
+
+    /**
+     *    Clears the frame focus for any nested frames.
+     *    @access private
+     */
+    protected function clearNestedFramesFocus() {
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $this->frames[$i]->clearFrameFocus();
+        }
+    }
+
+    /**
+     *    Test for the presence of a frameset.
+     *    @return boolean        Always true.
+     *    @access public
+     */
+    function hasFrames() {
+        return true;
+    }
+
+    /**
+     *    Accessor for frames information.
+     *    @return array/string      Recursive hash of frame URL strings.
+     *                              The key is either a numerical
+     *                              index or the name attribute.
+     *    @access public
+     */
+    function getFrames() {
+        $report = array();
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $report[$this->getPublicNameFromIndex($i)] =
+                    $this->frames[$i]->getFrames();
+        }
+        return $report;
+    }
+
+    /**
+     *    Accessor for raw text of either all the pages or
+     *    the frame in focus.
+     *    @return string        Raw unparsed content.
+     *    @access public
+     */
+    function getRaw() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRaw();
+        }
+        $raw = '';
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $raw .= $this->frames[$i]->getRaw();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for plain text of either all the pages or
+     *    the frame in focus.
+     *    @return string        Plain text content.
+     *    @access public
+     */
+    function getText() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getText();
+        }
+        $raw = '';
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $raw .= ' ' . $this->frames[$i]->getText();
+        }
+        return trim($raw);
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getTransportError();
+        }
+        return $this->frameset->getTransportError();
+    }
+
+    /**
+     *    Request method used to fetch this frame.
+     *    @return string      GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getMethod();
+        }
+        return $this->frameset->getMethod();
+    }
+
+    /**
+     *    Original resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        if (is_integer($this->focus)) {
+            $url = $this->frames[$this->focus]->getUrl();
+            $url->setTarget($this->getPublicNameFromIndex($this->focus));
+        } else {
+            $url = $this->frameset->getUrl();
+        }
+        return $url;
+    }
+
+    /**
+     *    Page base URL.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getBaseUrl() {
+        if (is_integer($this->focus)) {
+            $url = $this->frames[$this->focus]->getBaseUrl();
+        } else {
+            $url = $this->frameset->getBaseUrl();
+        }
+        return $url;
+    }
+
+    /**
+     *    Expands expandomatic URLs into fully qualified
+     *    URLs for the frameset page.
+     *    @param SimpleUrl $url        Relative URL.
+     *    @return SimpleUrl            Absolute URL.
+     *    @access public
+     */
+    function expandUrl($url) {
+        return $this->frameset->expandUrl($url);
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRequestData();
+        }
+        return $this->frameset->getRequestData();
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getMimeType();
+        }
+        return $this->frameset->getMimeType();
+    }
+
+    /**
+     *    Accessor for last response code.
+     *    @return integer    Last HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getResponseCode();
+        }
+        return $this->frameset->getResponseCode();
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getAuthentication();
+        }
+        return $this->frameset->getAuthentication();
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRealm();
+        }
+        return $this->frameset->getRealm();
+    }
+
+    /**
+     *    Accessor for outgoing header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getRequest() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getRequest();
+        }
+        return $this->frameset->getRequest();
+    }
+
+    /**
+     *    Accessor for raw header information.
+     *    @return string      Header block.
+     *    @access public
+     */
+    function getHeaders() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getHeaders();
+        }
+        return $this->frameset->getHeaders();
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        return $this->frameset->getTitle();
+    }
+
+    /**
+     *    Accessor for a list of all fixed links.
+     *    @return array   List of urls as strings.
+     *    @access public
+     */
+    function getUrls() {
+        if (is_integer($this->focus)) {
+            return $this->frames[$this->focus]->getUrls();
+        }
+        $urls = array();
+        foreach ($this->frames as $frame) {
+            $urls = array_merge($urls, $frame->getUrls());
+        }
+        return array_values(array_unique($urls));
+    }
+
+    /**
+     *    Accessor for URLs by the link label. Label will match
+     *    regardess of whitespace issues and case.
+     *    @param string $label    Text of link.
+     *    @return array           List of links with that label.
+     *    @access public
+     */
+    function getUrlsByLabel($label) {
+        if (is_integer($this->focus)) {
+            return $this->tagUrlsWithFrame(
+                    $this->frames[$this->focus]->getUrlsByLabel($label),
+                    $this->focus);
+        }
+        $urls = array();
+        foreach ($this->frames as $index => $frame) {
+            $urls = array_merge(
+                    $urls,
+                    $this->tagUrlsWithFrame(
+                                $frame->getUrlsByLabel($label),
+                                $index));
+        }
+        return $urls;
+    }
+
+    /**
+     *    Accessor for a URL by the id attribute. If in a frameset
+     *    then the first link found with that ID attribute is
+     *    returned only. Focus on a frame if you want one from
+     *    a specific part of the frameset.
+     *    @param string $id       Id attribute of link.
+     *    @return string          URL with that id.
+     *    @access public
+     */
+    function getUrlById($id) {
+        foreach ($this->frames as $index => $frame) {
+            if ($url = $frame->getUrlById($id)) {
+                if (! $url->gettarget()) {
+                    $url->setTarget($this->getPublicNameFromIndex($index));
+                }
+                return $url;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Attaches the intended frame index to a list of URLs.
+     *    @param array $urls        List of SimpleUrls.
+     *    @param string $frame      Name of frame or index.
+     *    @return array             List of tagged URLs.
+     *    @access private
+     */
+    protected function tagUrlsWithFrame($urls, $frame) {
+        $tagged = array();
+        foreach ($urls as $url) {
+            if (! $url->getTarget()) {
+                $url->setTarget($this->getPublicNameFromIndex($frame));
+            }
+            $tagged[] = $url;
+        }
+        return $tagged;
+    }
+
+    /**
+     *    Finds a held form by button label. Will only
+     *    search correctly built forms.
+     *    @param SimpleSelector $selector       Button finder.
+     *    @return SimpleForm                    Form object containing
+     *                                          the button.
+     *    @access public
+     */
+    function getFormBySubmit($selector) {
+        return $this->findForm('getFormBySubmit', $selector);
+    }
+
+    /**
+     *    Finds a held form by image using a selector.
+     *    Will only search correctly built forms. The first
+     *    form found either within the focused frame, or
+     *    across frames, will be the one returned.
+     *    @param SimpleSelector $selector  Image finder.
+     *    @return SimpleForm               Form object containing
+     *                                     the image.
+     *    @access public
+     */
+    function getFormByImage($selector) {
+        return $this->findForm('getFormByImage', $selector);
+    }
+
+    /**
+     *    Finds a held form by the form ID. A way of
+     *    identifying a specific form when we have control
+     *    of the HTML code. The first form found
+     *    either within the focused frame, or across frames,
+     *    will be the one returned.
+     *    @param string $id     Form label.
+     *    @return SimpleForm    Form object containing the matching ID.
+     *    @access public
+     */
+    function getFormById($id) {
+        return $this->findForm('getFormById', $id);
+    }
+
+    /**
+        *    General form finder. Will search all the frames or
+        *    just the one in focus.
+        *    @param string $method    Method to use to find in a page.
+        *    @param string $attribute Label, name or ID.
+        *    @return SimpleForm    Form object containing the matching ID.
+        *    @access private
+        */
+    protected function findForm($method, $attribute) {
+        if (is_integer($this->focus)) {
+            return $this->findFormInFrame(
+                    $this->frames[$this->focus],
+                    $this->focus,
+                    $method,
+                    $attribute);
+        }
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $form = $this->findFormInFrame(
+                    $this->frames[$i],
+                    $i,
+                    $method,
+                    $attribute);
+            if ($form) {
+                return $form;
+            }
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Finds a form in a page using a form finding method. Will
+     *    also tag the form with the frame name it belongs in.
+     *    @param SimplePage $page  Page content of frame.
+     *    @param integer $index    Internal frame representation.
+     *    @param string $method    Method to use to find in a page.
+     *    @param string $attribute Label, name or ID.
+     *    @return SimpleForm       Form object containing the matching ID.
+     *    @access private
+     */
+    protected function findFormInFrame($page, $index, $method, $attribute) {
+        $form = $this->frames[$index]->$method($attribute);
+        if (isset($form)) {
+            $form->setDefaultTarget($this->getPublicNameFromIndex($index));
+        }
+        return $form;
+    }
+
+    /**
+     *    Sets a field on each form in which the field is
+     *    available.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @param string $value               Value to set field to.
+     *    @return boolean                    True if value is valid.
+     *    @access public
+     */
+    function setField($selector, $value) {
+        if (is_integer($this->focus)) {
+            $this->frames[$this->focus]->setField($selector, $value);
+        } else {
+            for ($i = 0; $i < count($this->frames); $i++) {
+                $this->frames[$i]->setField($selector, $value);
+            }
+        }
+    }
+
+    /**
+     *    Accessor for a form element value within a page.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @return string/boolean             A string if the field is
+     *                                       present, false if unchecked
+     *                                       and null if missing.
+     *    @access public
+     */
+    function getField($selector) {
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $value = $this->frames[$i]->getField($selector);
+            if (isset($value)) {
+                return $value;
+            }
+        }
+        return null;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/http.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/http.php
new file mode 100644
index 000000000..1bd74031a
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/http.php
@@ -0,0 +1,628 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: http.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/socket.php');
+require_once(dirname(__FILE__) . '/cookies.php');
+require_once(dirname(__FILE__) . '/url.php');
+/**#@-*/
+
+/**
+ *    Creates HTTP headers for the end point of
+ *    a HTTP request.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRoute {
+    private $url;
+
+    /**
+     *    Sets the target URL.
+     *    @param SimpleUrl $url   URL as object.
+     *    @access public
+     */
+    function __construct($url) {
+        $this->url = $url;
+    }
+
+    /**
+     *    Resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access protected
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Creates the first line which is the actual request.
+     *    @param string $method   HTTP request method, usually GET.
+     *    @return string          Request line content.
+     *    @access protected
+     */
+    protected function getRequestLine($method) {
+        return $method . ' ' . $this->url->getPath() .
+                $this->url->getEncodedRequest() . ' HTTP/1.0';
+    }
+
+    /**
+     *    Creates the host part of the request.
+     *    @return string          Host line content.
+     *    @access protected
+     */
+    protected function getHostLine() {
+        $line = 'Host: ' . $this->url->getHost();
+        if ($this->url->getPort()) {
+            $line .= ':' . $this->url->getPort();
+        }
+        return $line;
+    }
+
+    /**
+     *    Opens a socket to the route.
+     *    @param string $method      HTTP request method, usually GET.
+     *    @param integer $timeout    Connection timeout.
+     *    @return SimpleSocket       New socket.
+     *    @access public
+     */
+    function createConnection($method, $timeout) {
+        $default_port = ('https' == $this->url->getScheme()) ? 443 : 80;
+        $socket = $this->createSocket(
+                $this->url->getScheme() ? $this->url->getScheme() : 'http',
+                $this->url->getHost(),
+                $this->url->getPort() ? $this->url->getPort() : $default_port,
+                $timeout);
+        if (! $socket->isError()) {
+            $socket->write($this->getRequestLine($method) . "\r\n");
+            $socket->write($this->getHostLine() . "\r\n");
+            $socket->write("Connection: close\r\n");
+        }
+        return $socket;
+    }
+
+    /**
+     *    Factory for socket.
+     *    @param string $scheme                   Protocol to use.
+     *    @param string $host                     Hostname to connect to.
+     *    @param integer $port                    Remote port.
+     *    @param integer $timeout                 Connection timeout.
+     *    @return SimpleSocket/SimpleSecureSocket New socket.
+     *    @access protected
+     */
+    protected function createSocket($scheme, $host, $port, $timeout) {
+        if (in_array($scheme, array('file'))) {
+            return new SimpleFileSocket($this->url);
+        } elseif (in_array($scheme, array('https'))) {
+            return new SimpleSecureSocket($host, $port, $timeout);
+        } else {
+            return new SimpleSocket($host, $port, $timeout);
+        }
+    }
+}
+
+/**
+ *    Creates HTTP headers for the end point of
+ *    a HTTP request via a proxy server.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleProxyRoute extends SimpleRoute {
+    private $proxy;
+    private $username;
+    private $password;
+
+    /**
+     *    Stashes the proxy address.
+     *    @param SimpleUrl $url     URL as object.
+     *    @param string $proxy      Proxy URL.
+     *    @param string $username   Username for autentication.
+     *    @param string $password   Password for autentication.
+     *    @access public
+     */
+    function __construct($url, $proxy, $username = false, $password = false) {
+        parent::__construct($url);
+        $this->proxy = $proxy;
+        $this->username = $username;
+        $this->password = $password;
+    }
+
+    /**
+     *    Creates the first line which is the actual request.
+     *    @param string $method   HTTP request method, usually GET.
+     *    @param SimpleUrl $url   URL as object.
+     *    @return string          Request line content.
+     *    @access protected
+     */
+    function getRequestLine($method) {
+        $url = $this->getUrl();
+        $scheme = $url->getScheme() ? $url->getScheme() : 'http';
+        $port = $url->getPort() ? ':' . $url->getPort() : '';
+        return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
+                $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
+    }
+
+    /**
+     *    Creates the host part of the request.
+     *    @param SimpleUrl $url   URL as object.
+     *    @return string          Host line content.
+     *    @access protected
+     */
+    function getHostLine() {
+        $host = 'Host: ' . $this->proxy->getHost();
+        $port = $this->proxy->getPort() ? $this->proxy->getPort() : 8080;
+        return "$host:$port";
+    }
+
+    /**
+     *    Opens a socket to the route.
+     *    @param string $method       HTTP request method, usually GET.
+     *    @param integer $timeout     Connection timeout.
+     *    @return SimpleSocket        New socket.
+     *    @access public
+     */
+    function createConnection($method, $timeout) {
+        $socket = $this->createSocket(
+                $this->proxy->getScheme() ? $this->proxy->getScheme() : 'http',
+                $this->proxy->getHost(),
+                $this->proxy->getPort() ? $this->proxy->getPort() : 8080,
+                $timeout);
+        if ($socket->isError()) {
+            return $socket;
+        }
+        $socket->write($this->getRequestLine($method) . "\r\n");
+        $socket->write($this->getHostLine() . "\r\n");
+        if ($this->username && $this->password) {
+            $socket->write('Proxy-Authorization: Basic ' .
+                    base64_encode($this->username . ':' . $this->password) .
+                    "\r\n");
+        }
+        $socket->write("Connection: close\r\n");
+        return $socket;
+    }
+}
+
+/**
+ *    HTTP request for a web page. Factory for
+ *    HttpResponse object.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpRequest {
+    private $route;
+    private $encoding;
+    private $headers;
+    private $cookies;
+
+    /**
+     *    Builds the socket request from the different pieces.
+     *    These include proxy information, URL, cookies, headers,
+     *    request method and choice of encoding.
+     *    @param SimpleRoute $route              Request route.
+     *    @param SimpleFormEncoding $encoding    Content to send with
+     *                                           request.
+     *    @access public
+     */
+    function __construct($route, $encoding) {
+        $this->route = $route;
+        $this->encoding = $encoding;
+        $this->headers = array();
+        $this->cookies = array();
+    }
+
+    /**
+     *    Dispatches the content to the route's socket.
+     *    @param integer $timeout      Connection timeout.
+     *    @return SimpleHttpResponse   A response which may only have
+     *                                 an error, but hopefully has a
+     *                                 complete web page.
+     *    @access public
+     */
+    function fetch($timeout) {
+        $socket = $this->route->createConnection($this->encoding->getMethod(), $timeout);
+        if (! $socket->isError()) {
+            $this->dispatchRequest($socket, $this->encoding);
+        }
+        return $this->createResponse($socket);
+    }
+
+    /**
+     *    Sends the headers.
+     *    @param SimpleSocket $socket           Open socket.
+     *    @param string $method                 HTTP request method,
+     *                                          usually GET.
+     *    @param SimpleFormEncoding $encoding   Content to send with request.
+     *    @access private
+     */
+    protected function dispatchRequest($socket, $encoding) {
+        foreach ($this->headers as $header_line) {
+            $socket->write($header_line . "\r\n");
+        }
+        if (count($this->cookies) > 0) {
+            $socket->write("Cookie: " . implode(";", $this->cookies) . "\r\n");
+        }
+        $encoding->writeHeadersTo($socket);
+        $socket->write("\r\n");
+        $encoding->writeTo($socket);
+    }
+
+    /**
+     *    Adds a header line to the request.
+     *    @param string $header_line    Text of full header line.
+     *    @access public
+     */
+    function addHeaderLine($header_line) {
+        $this->headers[] = $header_line;
+    }
+
+    /**
+     *    Reads all the relevant cookies from the
+     *    cookie jar.
+     *    @param SimpleCookieJar $jar     Jar to read
+     *    @param SimpleUrl $url           Url to use for scope.
+     *    @access public
+     */
+    function readCookiesFromJar($jar, $url) {
+        $this->cookies = $jar->selectAsPairs($url);
+    }
+
+    /**
+     *    Wraps the socket in a response parser.
+     *    @param SimpleSocket $socket   Responding socket.
+     *    @return SimpleHttpResponse    Parsed response object.
+     *    @access protected
+     */
+    protected function createResponse($socket) {
+        $response = new SimpleHttpResponse(
+                $socket,
+                $this->route->getUrl(),
+                $this->encoding);
+        $socket->close();
+        return $response;
+    }
+}
+
+/**
+ *    Collection of header lines in the response.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpHeaders {
+    private $raw_headers;
+    private $response_code;
+    private $http_version;
+    private $mime_type;
+    private $location;
+    private $cookies;
+    private $authentication;
+    private $realm;
+
+    /**
+     *    Parses the incoming header block.
+     *    @param string $headers     Header block.
+     *    @access public
+     */
+    function __construct($headers) {
+        $this->raw_headers = $headers;
+        $this->response_code = false;
+        $this->http_version = false;
+        $this->mime_type = '';
+        $this->location = false;
+        $this->cookies = array();
+        $this->authentication = false;
+        $this->realm = false;
+        foreach (explode("\r\n", $headers) as $header_line) {
+            $this->parseHeaderLine($header_line);
+        }
+    }
+
+    /**
+     *    Accessor for parsed HTTP protocol version.
+     *    @return integer           HTTP error code.
+     *    @access public
+     */
+    function getHttpVersion() {
+        return $this->http_version;
+    }
+
+    /**
+     *    Accessor for raw header block.
+     *    @return string        All headers as raw string.
+     *    @access public
+     */
+    function getRaw() {
+        return $this->raw_headers;
+    }
+
+    /**
+     *    Accessor for parsed HTTP error code.
+     *    @return integer           HTTP error code.
+     *    @access public
+     */
+    function getResponseCode() {
+        return (integer)$this->response_code;
+    }
+
+    /**
+     *    Returns the redirected URL or false if
+     *    no redirection.
+     *    @return string      URL or false for none.
+     *    @access public
+     */
+    function getLocation() {
+        return $this->location;
+    }
+
+    /**
+     *    Test to see if the response is a valid redirect.
+     *    @return boolean       True if valid redirect.
+     *    @access public
+     */
+    function isRedirect() {
+        return in_array($this->response_code, array(301, 302, 303, 307)) &&
+                (boolean)$this->getLocation();
+    }
+
+    /**
+     *    Test to see if the response is an authentication
+     *    challenge.
+     *    @return boolean       True if challenge.
+     *    @access public
+     */
+    function isChallenge() {
+        return ($this->response_code == 401) &&
+                (boolean)$this->authentication &&
+                (boolean)$this->realm;
+    }
+
+    /**
+     *    Accessor for MIME type header information.
+     *    @return string           MIME type.
+     *    @access public
+     */
+    function getMimeType() {
+        return $this->mime_type;
+    }
+
+    /**
+     *    Accessor for authentication type.
+     *    @return string        Type.
+     *    @access public
+     */
+    function getAuthentication() {
+        return $this->authentication;
+    }
+
+    /**
+     *    Accessor for security realm.
+     *    @return string        Realm.
+     *    @access public
+     */
+    function getRealm() {
+        return $this->realm;
+    }
+
+    /**
+     *    Writes new cookies to the cookie jar.
+     *    @param SimpleCookieJar $jar   Jar to write to.
+     *    @param SimpleUrl $url         Host and path to write under.
+     *    @access public
+     */
+    function writeCookiesToJar($jar, $url) {
+        foreach ($this->cookies as $cookie) {
+            $jar->setCookie(
+                    $cookie->getName(),
+                    $cookie->getValue(),
+                    $url->getHost(),
+                    $cookie->getPath(),
+                    $cookie->getExpiry());
+        }
+    }
+
+    /**
+     *    Called on each header line to accumulate the held
+     *    data within the class.
+     *    @param string $header_line        One line of header.
+     *    @access protected
+     */
+    protected function parseHeaderLine($header_line) {
+        if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
+            $this->http_version = $matches[1];
+            $this->response_code = $matches[2];
+        }
+        if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
+            $this->mime_type = trim($matches[1]);
+        }
+        if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
+            $this->location = trim($matches[1]);
+        }
+        if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
+            $this->cookies[] = $this->parseCookie($matches[1]);
+        }
+        if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
+            $this->authentication = $matches[1];
+            $this->realm = trim($matches[2]);
+        }
+    }
+
+    /**
+     *    Parse the Set-cookie content.
+     *    @param string $cookie_line    Text after "Set-cookie:"
+     *    @return SimpleCookie          New cookie object.
+     *    @access private
+     */
+    protected function parseCookie($cookie_line) {
+        $parts = explode(";", $cookie_line);
+        $cookie = array();
+        preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
+        foreach ($parts as $part) {
+            if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
+                $cookie[$matches[1]] = trim($matches[2]);
+            }
+        }
+        return new SimpleCookie(
+                $cookie[1],
+                trim($cookie[2]),
+                isset($cookie["path"]) ? $cookie["path"] : "",
+                isset($cookie["expires"]) ? $cookie["expires"] : false);
+    }
+}
+
+/**
+ *    Basic HTTP response.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHttpResponse extends SimpleStickyError {
+    private $url;
+    private $encoding;
+    private $sent;
+    private $content;
+    private $headers;
+
+    /**
+     *    Constructor. Reads and parses the incoming
+     *    content and headers.
+     *    @param SimpleSocket $socket   Network connection to fetch
+     *                                  response text from.
+     *    @param SimpleUrl $url         Resource name.
+     *    @param mixed $encoding        Record of content sent.
+     *    @access public
+     */
+    function __construct($socket, $url, $encoding) {
+        parent::__construct();
+        $this->url = $url;
+        $this->encoding = $encoding;
+        $this->sent = $socket->getSent();
+        $this->content = false;
+        $raw = $this->readAll($socket);
+        if ($socket->isError()) {
+            $this->setError('Error reading socket [' . $socket->getError() . ']');
+            return;
+        }
+        $this->parse($raw);
+    }
+
+    /**
+     *    Splits up the headers and the rest of the content.
+     *    @param string $raw    Content to parse.
+     *    @access private
+     */
+    protected function parse($raw) {
+        if (! $raw) {
+            $this->setError('Nothing fetched');
+            $this->headers = new SimpleHttpHeaders('');
+        } elseif ('file' == $this->url->getScheme()) {
+            $this->headers = new SimpleHttpHeaders('');
+            $this->content = $raw;
+        } elseif (! strstr($raw, "\r\n\r\n")) {
+            $this->setError('Could not split headers from content');
+            $this->headers = new SimpleHttpHeaders($raw);
+        } else {
+            list($headers, $this->content) = explode("\r\n\r\n", $raw, 2);
+            $this->headers = new SimpleHttpHeaders($headers);
+        }
+    }
+
+    /**
+     *    Original request method.
+     *    @return string        GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return $this->encoding->getMethod();
+    }
+
+    /**
+     *    Resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        return $this->encoding;
+    }
+
+    /**
+     *    Raw request that was sent down the wire.
+     *    @return string        Bytes actually sent.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Accessor for the content after the last
+     *    header line.
+     *    @return string           All content.
+     *    @access public
+     */
+    function getContent() {
+        return $this->content;
+    }
+
+    /**
+     *    Accessor for header block. The response is the
+     *    combination of this and the content.
+     *    @return SimpleHeaders        Wrapped header block.
+     *    @access public
+     */
+    function getHeaders() {
+        return $this->headers;
+    }
+
+    /**
+     *    Accessor for any new cookies.
+     *    @return array       List of new cookies.
+     *    @access public
+     */
+    function getNewCookies() {
+        return $this->headers->getNewCookies();
+    }
+
+    /**
+     *    Reads the whole of the socket output into a
+     *    single string.
+     *    @param SimpleSocket $socket  Unread socket.
+     *    @return string               Raw output if successful
+     *                                 else false.
+     *    @access private
+     */
+    protected function readAll($socket) {
+        $all = '';
+        while (! $this->isLastPacket($next = $socket->read())) {
+            $all .= $next;
+        }
+        return $all;
+    }
+
+    /**
+     *    Test to see if the packet from the socket is the
+     *    last one.
+     *    @param string $packet    Chunk to interpret.
+     *    @return boolean          True if empty or EOF.
+     *    @access private
+     */
+    protected function isLastPacket($packet) {
+        if (is_string($packet)) {
+            return $packet === '';
+        }
+        return ! $packet;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/invoker.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/invoker.php
new file mode 100644
index 000000000..ee310343f
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/invoker.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: invoker.php 1785 2008-04-26 13:56:41Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files and defined the root constant
+ * for dependent libraries.
+ */
+require_once(dirname(__FILE__) . '/errors.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+if (! defined('SIMPLE_TEST')) {
+    define('SIMPLE_TEST', dirname(__FILE__) . '/');
+}
+/**#@-*/
+
+/**
+ *    This is called by the class runner to run a
+ *    single test method. Will also run the setUp()
+ *    and tearDown() methods.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleInvoker {
+    private $test_case;
+
+    /**
+     *    Stashes the test case for later.
+     *    @param SimpleTestCase $test_case  Test case to run.
+     */
+    function __construct($test_case) {
+        $this->test_case = $test_case;
+    }
+
+    /**
+     *    Accessor for test case being run.
+     *    @return SimpleTestCase    Test case.
+     *    @access public
+     */
+    function getTestCase() {
+        return $this->test_case;
+    }
+
+    /**
+     *    Runs test level set up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method) {
+        $this->test_case->before($method);
+    }
+
+    /**
+     *    Invokes a test method and buffered with setUp()
+     *    and tearDown() calls.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $this->test_case->setUp();
+        $this->test_case->$method();
+        $this->test_case->tearDown();
+    }
+
+    /**
+     *    Runs test level clean up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->test_case->after($method);
+    }
+}
+
+/**
+ *    Do nothing decorator. Just passes the invocation
+ *    straight through.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleInvokerDecorator {
+    private $invoker;
+
+    /**
+     *    Stores the invoker to wrap.
+     *    @param SimpleInvoker $invoker  Test method runner.
+     */
+    function __construct($invoker) {
+        $this->invoker = $invoker;
+    }
+
+    /**
+     *    Accessor for test case being run.
+     *    @return SimpleTestCase    Test case.
+     *    @access public
+     */
+    function getTestCase() {
+        return $this->invoker->getTestCase();
+    }
+
+    /**
+     *    Runs test level set up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function before($method) {
+        $this->invoker->before($method);
+    }
+
+    /**
+     *    Invokes a test method and buffered with setUp()
+     *    and tearDown() calls.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function invoke($method) {
+        $this->invoker->invoke($method);
+    }
+
+    /**
+     *    Runs test level clean up. Used for changing
+     *    the mechanics of base test cases.
+     *    @param string $method    Test method to call.
+     *    @access public
+     */
+    function after($method) {
+        $this->invoker->after($method);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/mock_objects.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/mock_objects.php
new file mode 100644
index 000000000..93a827b6c
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/mock_objects.php
@@ -0,0 +1,1641 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ *  @version    $Id: mock_objects.php 1973 2009-12-22 01:16:59Z lastcraft $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+/**#@-*/
+
+/**
+ * Default character simpletest will substitute for any value
+ */
+if (! defined('MOCK_ANYTHING')) {
+    define('MOCK_ANYTHING', '*');
+}
+
+/**
+ *    Parameter comparison assertion.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class ParametersExpectation extends SimpleExpectation {
+    private $expected;
+
+    /**
+     *    Sets the expected parameter list.
+     *    @param array $parameters  Array of parameters including
+     *                              those that are wildcarded.
+     *                              If the value is not an array
+     *                              then it is considered to match any.
+     *    @param string $message    Customised message on failure.
+     */
+    function __construct($expected = false, $message = '%s') {
+        parent::__construct($message);
+        $this->expected = $expected;
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param array $parameters     Comparison values.
+     *    @return boolean              True if correct.
+     */
+    function test($parameters) {
+        if (! is_array($this->expected)) {
+            return true;
+        }
+        if (count($this->expected) != count($parameters)) {
+            return false;
+        }
+        for ($i = 0; $i < count($this->expected); $i++) {
+            if (! $this->testParameter($parameters[$i], $this->expected[$i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests an individual parameter.
+     *    @param mixed $parameter    Value to test.
+     *    @param mixed $expected     Comparison value.
+     *    @return boolean            True if expectation
+     *                               fulfilled.
+     */
+    protected function testParameter($parameter, $expected) {
+        $comparison = $this->coerceToExpectation($expected);
+        return $comparison->test($parameter);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param array $comparison   Incoming parameter list.
+     *    @return string             Description of success
+     *                               or failure.
+     */
+    function testMessage($parameters) {
+        if ($this->test($parameters)) {
+            return "Expectation of " . count($this->expected) .
+                    " arguments of [" . $this->renderArguments($this->expected) .
+                    "] is correct";
+        } else {
+            return $this->describeDifference($this->expected, $parameters);
+        }
+    }
+
+    /**
+     *    Message to display if expectation differs from
+     *    the parameters actually received.
+     *    @param array $expected      Expected parameters as list.
+     *    @param array $parameters    Actual parameters received.
+     *    @return string              Description of difference.
+     */
+    protected function describeDifference($expected, $parameters) {
+        if (count($expected) != count($parameters)) {
+            return "Expected " . count($expected) .
+                    " arguments of [" . $this->renderArguments($expected) .
+                    "] but got " . count($parameters) .
+                    " arguments of [" . $this->renderArguments($parameters) . "]";
+        }
+        $messages = array();
+        for ($i = 0; $i < count($expected); $i++) {
+            $comparison = $this->coerceToExpectation($expected[$i]);
+            if (! $comparison->test($parameters[$i])) {
+                $messages[] = "parameter " . ($i + 1) . " with [" .
+                        $comparison->overlayMessage($parameters[$i], $this->getDumper()) . "]";
+            }
+        }
+        return "Parameter expectation differs at " . implode(" and ", $messages);
+    }
+
+    /**
+     *    Creates an identical expectation if the
+     *    object/value is not already some type
+     *    of expectation.
+     *    @param mixed $expected      Expected value.
+     *    @return SimpleExpectation   Expectation object.
+     */
+    protected function coerceToExpectation($expected) {
+        if (SimpleExpectation::isExpectation($expected)) {
+            return $expected;
+        }
+        return new IdenticalExpectation($expected);
+    }
+
+    /**
+     *    Renders the argument list as a string for
+     *    messages.
+     *    @param array $args    Incoming arguments.
+     *    @return string        Simple description of type and value.
+     */
+    protected function renderArguments($args) {
+        $descriptions = array();
+        if (is_array($args)) {
+            foreach ($args as $arg) {
+                $dumper = new SimpleDumper();
+                $descriptions[] = $dumper->describeValue($arg);
+            }
+        }
+        return implode(', ', $descriptions);
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ */
+class CallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Expected number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if expected.
+     */
+    function test($compare) {
+        return ($this->count == $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Expected call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ */
+class MinimumCallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Minimum number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if enough.
+     */
+    function test($compare) {
+        return ($this->count <= $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Minimum call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Confirms that the number of calls on a method is as expected.
+ *    @package      SimpleTest
+ *    @subpackage   MockObjects
+ */
+class MaximumCallCountExpectation extends SimpleExpectation {
+    private $method;
+    private $count;
+
+    /**
+     *    Stashes the method and expected count for later
+     *    reporting.
+     *    @param string $method    Name of method to confirm against.
+     *    @param integer $count    Minimum number of calls.
+     *    @param string $message   Custom error message.
+     */
+    function __construct($method, $count, $message = '%s') {
+        $this->method = $method;
+        $this->count = $count;
+        parent::__construct($message);
+    }
+
+    /**
+     *    Tests the assertion. True if correct.
+     *    @param integer $compare     Measured call count.
+     *    @return boolean             True if not over.
+     */
+    function test($compare) {
+        return ($this->count >= $compare);
+    }
+
+    /**
+     *    Reports the comparison.
+     *    @param integer $compare     Measured call count.
+     *    @return string              Message to show.
+     */
+    function testMessage($compare) {
+        return 'Maximum call count for [' . $this->method .
+                '] was [' . $this->count .
+                '] got [' . $compare . ']';
+    }
+}
+
+/**
+ *    Retrieves method actions by searching the
+ *    parameter lists until an expected match is found.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleSignatureMap {
+    private $map;
+
+    /**
+     *    Creates an empty call map.
+     */
+    function __construct() {
+        $this->map = array();
+    }
+
+    /**
+     *    Stashes a reference against a method call.
+     *    @param array $parameters    Array of arguments (including wildcards).
+     *    @param mixed $action        Reference placed in the map.
+     */
+    function add($parameters, $action) {
+        $place = count($this->map);
+        $this->map[$place] = array();
+        $this->map[$place]['params'] = new ParametersExpectation($parameters);
+        $this->map[$place]['content'] = $action;
+    }
+
+    /**
+     *    Searches the call list for a matching parameter
+     *    set. Returned by reference.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return object              Object held in the first matching
+     *                                slot, otherwise null.
+     */
+    function &findFirstAction($parameters) {
+        $slot = $this->findFirstSlot($parameters);
+        if (isset($slot) && isset($slot['content'])) {
+            return $slot['content'];
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Searches the call list for a matching parameter
+     *    set. True if successful.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return boolean             True if a match is present.
+     */
+    function isMatch($parameters) {
+        return ($this->findFirstSlot($parameters) != null);
+    }
+
+    /**
+     *    Compares the incoming parameters with the
+     *    internal expectation. Uses the incoming $test
+     *    to dispatch the test message.
+     *    @param SimpleTestCase $test   Test to dispatch to.
+     *    @param array $parameters      The actual calling arguments.
+     *    @param string $message        The message to overlay.
+     */
+    function test($test, $parameters, $message) {
+    }
+
+    /**
+     *    Searches the map for a matching item.
+     *    @param array $parameters    Parameters to search by
+     *                                without wildcards.
+     *    @return array               Reference to slot or null.
+     */
+    function &findFirstSlot($parameters) {
+        $count = count($this->map);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->map[$i]["params"]->test($parameters)) {
+                return $this->map[$i];
+            }
+        }
+        $null = null;
+        return $null;
+    }
+}
+
+/**
+ *    Allows setting of actions against call signatures either
+ *    at a specific time, or always. Specific time settings
+ *    trump lasting ones, otherwise the most recently added
+ *    will mask an earlier match.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleCallSchedule {
+    private $wildcard = MOCK_ANYTHING;
+    private $always;
+    private $at;
+
+    /**
+     *    Sets up an empty response schedule.
+     *    Creates an empty call map.
+     */
+    function __construct() {
+        $this->always = array();
+        $this->at = array();
+    }
+
+    /**
+     *    Stores an action against a signature that
+     *    will always fire unless masked by a time
+     *    specific one.
+     *    @param string $method        Method name.
+     *    @param array $args           Calling parameters.
+     *    @param SimpleAction $action  Actually simpleByValue, etc.
+     */
+    function register($method, $args, $action) {
+        $args = $this->replaceWildcards($args);
+        $method = strtolower($method);
+        if (! isset($this->always[$method])) {
+            $this->always[$method] = new SimpleSignatureMap();
+        }
+        $this->always[$method]->add($args, $action);
+    }
+
+    /**
+     *    Stores an action against a signature that
+     *    will fire at a specific time in the future.
+     *    @param integer $step         delay of calls to this method,
+     *                                 0 is next.
+     *    @param string $method        Method name.
+     *    @param array $args           Calling parameters.
+     *    @param SimpleAction $action  Actually SimpleByValue, etc.
+     */
+    function registerAt($step, $method, $args, $action) {
+        $args = $this->replaceWildcards($args);
+        $method = strtolower($method);
+        if (! isset($this->at[$method])) {
+            $this->at[$method] = array();
+        }
+        if (! isset($this->at[$method][$step])) {
+            $this->at[$method][$step] = new SimpleSignatureMap();
+        }
+        $this->at[$method][$step]->add($args, $action);
+    }
+
+    /**
+     *  Sets up an expectation on the argument list.
+     *  @param string $method       Method to test.
+     *  @param array $args          Bare arguments or list of
+     *                              expectation objects.
+     *  @param string $message      Failure message.
+     */
+    function expectArguments($method, $args, $message) {
+        $args = $this->replaceWildcards($args);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args[strtolower($method)] =
+                new ParametersExpectation($args, $message);
+
+    }
+
+    /**
+     *    Actually carry out the action stored previously,
+     *    if the parameters match.
+     *    @param integer $step      Time of call.
+     *    @param string $method     Method name.
+     *    @param array $args        The parameters making up the
+     *                              rest of the call.
+     *    @return mixed             The result of the action.
+     */
+    function &respond($step, $method, $args) {
+        $method = strtolower($method);
+        if (isset($this->at[$method][$step])) {
+            if ($this->at[$method][$step]->isMatch($args)) {
+                $action = $this->at[$method][$step]->findFirstAction($args);
+                if (isset($action)) {
+                    return $action->act();
+                }
+            }
+        }
+        if (isset($this->always[$method])) {
+            $action = $this->always[$method]->findFirstAction($args);
+            if (isset($action)) {
+                return $action->act();
+            }
+        }
+        $null = null;
+        return $null;
+    }
+
+    /**
+     *    Replaces wildcard matches with wildcard
+     *    expectations in the argument list.
+     *    @param array $args      Raw argument list.
+     *    @return array           Argument list with
+     *                            expectations.
+     */
+    protected function replaceWildcards($args) {
+        if ($args === false) {
+            return false;
+        }
+        for ($i = 0; $i < count($args); $i++) {
+            if ($args[$i] === $this->wildcard) {
+                $args[$i] = new AnythingExpectation();
+            }
+        }
+        return $args;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a value for returning later. Follows usual
+ *    PHP5 semantics of objects being returned by reference.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleReturn {
+    private $value;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $value     You need to clone objects
+     *                            if you want copy semantics
+     *                            for these.
+     */
+    function __construct($value) {
+        $this->value = $value;
+    }
+
+    /**
+     *    Returns the value stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function act() {
+        return $this->value;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a reference for returning later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleByReference {
+    private $reference;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $reference     Actual PHP4 style reference.
+     */
+    function __construct(&$reference) {
+        $this->reference = &$reference;
+    }
+
+    /**
+     *    Returns the reference stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function &act() {
+        return $this->reference;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes a value for returning later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleByValue {
+    private $value;
+
+    /**
+     *    Stashes it for later.
+     *    @param mixed $value     You need to clone objects
+     *                            if you want copy semantics
+     *                            for these.
+     */
+    function __construct($value) {
+        $this->value = $value;
+    }
+
+    /**
+     *    Returns the value stored earlier.
+     *    @return mixed    Whatever was stashed.
+     */
+    function &act() {
+        $dummy = $this->value;
+        return $dummy;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes an exception for throwing later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleThrower {
+    private $exception;
+
+    /**
+     *    Stashes it for later.
+     *    @param Exception $exception    The exception object to throw.
+     */
+    function __construct($exception) {
+        $this->exception = $exception;
+    }
+
+    /**
+     *    Throws the exceptins stashed earlier.
+     */
+    function act() {
+        throw $this->exception;
+    }
+}
+
+/**
+ *    A type of SimpleMethodAction.
+ *    Stashes an error for emitting later.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleErrorThrower {
+    private $error;
+    private $severity;
+
+    /**
+     *    Stashes an error to throw later.
+     *    @param string $error      Error message.
+     *    @param integer $severity  PHP error constant, e.g E_USER_ERROR.
+     */
+    function __construct($error, $severity) {
+        $this->error = $error;
+        $this->severity = $severity;
+    }
+
+    /**
+     *    Triggers the stashed error.
+     */
+    function &act() {
+        trigger_error($this->error, $this->severity);
+        $null = null;
+        return $null;
+    }
+}
+
+/**
+ *    A base class or delegate that extends an
+ *    empty collection of methods that can have their
+ *    return values set and expectations made of the
+ *    calls upon them. The mock will assert the
+ *    expectations against it's attached test case in
+ *    addition to the server stub behaviour or returning
+ *    preprogrammed responses.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class SimpleMock {
+    private $actions;
+    private $expectations;
+    private $wildcard = MOCK_ANYTHING;
+    private $is_strict = true;
+    private $call_counts;
+    private $expected_counts;
+    private $max_counts;
+    private $expected_args;
+    private $expected_args_at;
+
+    /**
+     *    Creates an empty action list and expectation list.
+     *    All call counts are set to zero.
+     */
+    function SimpleMock() {
+        $this->actions = new SimpleCallSchedule();
+        $this->expectations = new SimpleCallSchedule();
+        $this->call_counts = array();
+        $this->expected_counts = array();
+        $this->max_counts = array();
+        $this->expected_args = array();
+        $this->expected_args_at = array();
+        $this->getCurrentTestCase()->tell($this);
+    }
+
+    /**
+     *    Disables a name check when setting expectations.
+     *    This hack is needed for the partial mocks.
+     */
+    function disableExpectationNameChecks() {
+        $this->is_strict = false;
+    }
+
+    /**
+     *    Finds currently running test.
+     *    @return SimpeTestCase    Current test case.
+     */
+    protected function getCurrentTestCase() {
+        return SimpleTest::getContext()->getTest();
+    }
+
+    /**
+     *    Die if bad arguments array is passed.
+     *    @param mixed $args     The arguments value to be checked.
+     *    @param string $task    Description of task attempt.
+     *    @return boolean        Valid arguments
+     */
+    protected function checkArgumentsIsArray($args, $task) {
+        if (! is_array($args)) {
+            trigger_error(
+                "Cannot $task as \$args parameter is not an array",
+                E_USER_ERROR);
+        }
+    }
+
+    /**
+     *    Triggers a PHP error if the method is not part
+     *    of this object.
+     *    @param string $method        Name of method.
+     *    @param string $task          Description of task attempt.
+     */
+    protected function dieOnNoMethod($method, $task) {
+        if ($this->is_strict && ! method_exists($this, $method)) {
+            trigger_error(
+                    "Cannot $task as no ${method}() in class " . get_class($this),
+                    E_USER_ERROR);
+        }
+    }
+
+    /**
+     *    Replaces wildcard matches with wildcard
+     *    expectations in the argument list.
+     *    @param array $args      Raw argument list.
+     *    @return array           Argument list with
+     *                            expectations.
+     */
+    function replaceWildcards($args) {
+        if ($args === false) {
+            return false;
+        }
+        for ($i = 0; $i < count($args); $i++) {
+            if ($args[$i] === $this->wildcard) {
+                $args[$i] = new AnythingExpectation();
+            }
+        }
+        return $args;
+    }
+
+    /**
+     *    Adds one to the call count of a method.
+     *    @param string $method        Method called.
+     *    @param array $args           Arguments as an array.
+     */
+    protected function addCall($method, $args) {
+        if (! isset($this->call_counts[$method])) {
+            $this->call_counts[$method] = 0;
+        }
+        $this->call_counts[$method]++;
+    }
+
+    /**
+     *    Fetches the call count of a method so far.
+     *    @param string $method        Method name called.
+     *    @return integer              Number of calls so far.
+     */
+    function getCallCount($method) {
+        $this->dieOnNoMethod($method, "get call count");
+        $method = strtolower($method);
+        if (! isset($this->call_counts[$method])) {
+            return 0;
+        }
+        return $this->call_counts[$method];
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed on by all calls to this method that match.
+     *    @param string $method       Method name.
+     *    @param mixed $value         Result of call by value/handle.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returns($method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return");
+        $this->actions->register($method, $args, new SimpleReturn($value));
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed only when the required call count
+     *    is reached.
+     *    @param integer $timing   Number of calls in the future
+     *                             to which the result applies. If
+     *                             not set then all calls will return
+     *                             the value.
+     *    @param string $method    Method name.
+     *    @param mixed $value      Result of call passed.
+     *    @param array $args       List of parameters to match
+     *                             including wildcards.
+     */
+    function returnsAt($timing, $method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleReturn($value));
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value for all calls to this method.
+     *    @param string $method       Method name.
+     *    @param mixed $value         Result of call passed by value.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returnsByValue($method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value");
+        $this->actions->register($method, $args, new SimpleByValue($value));
+    }
+
+    /** @deprecated */
+    function setReturnValue($method, $value, $args = false) {
+        $this->returnsByValue($method, $value, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value only when the required call count
+     *    is reached.
+     *    @param integer $timing   Number of calls in the future
+     *                             to which the result applies. If
+     *                             not set then all calls will return
+     *                             the value.
+     *    @param string $method    Method name.
+     *    @param mixed $value      Result of call passed by value.
+     *    @param array $args       List of parameters to match
+     *                             including wildcards.
+     */
+    function returnsByValueAt($timing, $method, $value, $args = false) {
+        $this->dieOnNoMethod($method, "set return value sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleByValue($value));
+    }
+
+    /** @deprecated */
+    function setReturnValueAt($timing, $method, $value, $args = false) {
+        $this->returnsByValueAt($timing, $method, $value, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by reference for all calls.
+     *    @param string $method       Method name.
+     *    @param mixed $reference     Result of the call will be this object.
+     *    @param array $args          List of parameters to match
+     *                                including wildcards.
+     */
+    function returnsByReference($method, &$reference, $args = false) {
+        $this->dieOnNoMethod($method, "set return reference");
+        $this->actions->register($method, $args, new SimpleByReference($reference));
+    }
+
+    /** @deprecated */
+    function setReturnReference($method, &$reference, $args = false) {
+        $this->returnsByReference($method, $reference, $args);
+    }
+
+    /**
+     *    Sets a return for a parameter list that will
+     *    be passed by value only when the required call count
+     *    is reached.
+     *    @param integer $timing    Number of calls in the future
+     *                              to which the result applies. If
+     *                              not set then all calls will return
+     *                              the value.
+     *    @param string $method     Method name.
+     *    @param mixed $reference   Result of the call will be this object.
+     *    @param array $args        List of parameters to match
+     *                              including wildcards.
+     */
+    function returnsByReferenceAt($timing, $method, &$reference, $args = false) {
+        $this->dieOnNoMethod($method, "set return reference sequence");
+        $this->actions->registerAt($timing, $method, $args, new SimpleByReference($reference));
+    }
+
+    /** @deprecated */
+    function setReturnReferenceAt($timing, $method, &$reference, $args = false) {
+        $this->returnsByReferenceAt($timing, $method, $reference, $args);
+    }
+
+    /**
+     *    Sets up an expected call with a set of
+     *    expected parameters in that call. All
+     *    calls will be compared to these expectations
+     *    regardless of when the call is made.
+     *    @param string $method        Method call to test.
+     *    @param array $args           Expected parameters for the call
+     *                                 including wildcards.
+     *    @param string $message       Overridden message.
+     */
+    function expect($method, $args, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected arguments');
+        $this->checkArgumentsIsArray($args, 'set expected arguments');
+        $this->expectations->expectArguments($method, $args, $message);
+        $args = $this->replaceWildcards($args);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args[strtolower($method)] =
+                new ParametersExpectation($args, $message);
+    }
+
+    /**
+     *    Sets up an expected call with a set of
+     *    expected parameters in that call. The
+     *    expected call count will be adjusted if it
+     *    is set too low to reach this call.
+     *    @param integer $timing    Number of calls in the future at
+     *                              which to test. Next call is 0.
+     *    @param string $method     Method call to test.
+     *    @param array $args        Expected parameters for the call
+     *                              including wildcards.
+     *    @param string $message    Overridden message.
+     */
+    function expectAt($timing, $method, $args, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected arguments at time');
+        $this->checkArgumentsIsArray($args, 'set expected arguments at time');
+        $args = $this->replaceWildcards($args);
+        if (! isset($this->expected_args_at[$timing])) {
+            $this->expected_args_at[$timing] = array();
+        }
+        $method = strtolower($method);
+        $message .= Mock::getExpectationLine();
+        $this->expected_args_at[$timing][$method] =
+                new ParametersExpectation($args, $message);
+    }
+
+    /**
+     *    Sets an expectation for the number of times
+     *    a method will be called. The tally method
+     *    is used to check this.
+     *    @param string $method        Method call to test.
+     *    @param integer $count        Number of times it should
+     *                                 have been called at tally.
+     *    @param string $message       Overridden message.
+     */
+    function expectCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set expected call count');
+        $message .= Mock::getExpectationLine();
+        $this->expected_counts[strtolower($method)] =
+                new CallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Sets the number of times a method may be called
+     *    before a test failure is triggered.
+     *    @param string $method        Method call to test.
+     *    @param integer $count        Most number of times it should
+     *                                 have been called.
+     *    @param string $message       Overridden message.
+     */
+    function expectMaximumCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set maximum call count');
+        $message .= Mock::getExpectationLine();
+        $this->max_counts[strtolower($method)] =
+                new MaximumCallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Sets the number of times to call a method to prevent
+     *    a failure on the tally.
+     *    @param string $method      Method call to test.
+     *    @param integer $count      Least number of times it should
+     *                               have been called.
+     *    @param string $message     Overridden message.
+     */
+    function expectMinimumCallCount($method, $count, $message = '%s') {
+        $this->dieOnNoMethod($method, 'set minimum call count');
+        $message .= Mock::getExpectationLine();
+        $this->expected_counts[strtolower($method)] =
+                new MinimumCallCountExpectation($method, $count, $message);
+    }
+
+    /**
+     *    Convenience method for barring a method
+     *    call.
+     *    @param string $method        Method call to ban.
+     *    @param string $message       Overridden message.
+     */
+    function expectNever($method, $message = '%s') {
+        $this->expectMaximumCallCount($method, 0, $message);
+    }
+
+    /**
+     *    Convenience method for a single method
+     *    call.
+     *    @param string $method     Method call to track.
+     *    @param array $args        Expected argument list or
+     *                              false for any arguments.
+     *    @param string $message    Overridden message.
+     */
+    function expectOnce($method, $args = false, $message = '%s') {
+        $this->expectCallCount($method, 1, $message);
+        if ($args !== false) {
+            $this->expect($method, $args, $message);
+        }
+    }
+
+    /**
+     *    Convenience method for requiring a method
+     *    call.
+     *    @param string $method       Method call to track.
+     *    @param array $args          Expected argument list or
+     *                                false for any arguments.
+     *    @param string $message      Overridden message.
+     */
+    function expectAtLeastOnce($method, $args = false, $message = '%s') {
+        $this->expectMinimumCallCount($method, 1, $message);
+        if ($args !== false) {
+            $this->expect($method, $args, $message);
+        }
+    }
+
+    /**
+     *    Sets up a trigger to throw an exception upon the
+     *    method call.
+     *    @param string $method     Method name to throw on.
+     *    @param object $exception  Exception object to throw.
+     *                              If not given then a simple
+     *                              Exception object is thrown.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     */
+    function throwOn($method, $exception = false, $args = false) {
+        $this->dieOnNoMethod($method, "throw on");
+        $this->actions->register($method, $args,
+                new SimpleThrower($exception ? $exception : new Exception()));
+    }
+
+    /**
+     *    Sets up a trigger to throw an exception upon the
+     *    method call.
+     *    @param integer $timing    When to throw the exception. A
+     *                              value of 0 throws immediately.
+     *                              A value of 1 actually allows one call
+     *                              to this method before throwing. 2
+     *                              will allow two calls before throwing
+     *                              and so on.
+     *    @param string $method     Method name to throw on.
+     *    @param object $exception  Exception object to throw.
+     *                              If not given then a simple
+     *                              Exception object is thrown.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     */
+    function throwAt($timing, $method, $exception = false, $args = false) {
+        $this->dieOnNoMethod($method, "throw at");
+        $this->actions->registerAt($timing, $method, $args,
+                new SimpleThrower($exception ? $exception : new Exception()));
+    }
+
+    /**
+     *    Sets up a trigger to throw an error upon the
+     *    method call.
+     *    @param string $method     Method name to throw on.
+     *    @param object $error      Error message to trigger.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     *    @param integer $severity  The PHP severity level. Defaults
+     *                              to E_USER_ERROR.
+     */
+    function errorOn($method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
+        $this->dieOnNoMethod($method, "error on");
+        $this->actions->register($method, $args, new SimpleErrorThrower($error, $severity));
+    }
+
+    /**
+     *    Sets up a trigger to throw an error upon a specific
+     *    method call.
+     *    @param integer $timing    When to throw the exception. A
+     *                              value of 0 throws immediately.
+     *                              A value of 1 actually allows one call
+     *                              to this method before throwing. 2
+     *                              will allow two calls before throwing
+     *                              and so on.
+     *    @param string $method     Method name to throw on.
+     *    @param object $error      Error message to trigger.
+     *    @param array $args        Optional argument list filter.
+     *                              If given then the exception
+     *                              will only be thrown if the
+     *                              method call matches the arguments.
+     *    @param integer $severity  The PHP severity level. Defaults
+     *                              to E_USER_ERROR.
+     */
+    function errorAt($timing, $method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
+        $this->dieOnNoMethod($method, "error at");
+        $this->actions->registerAt($timing, $method, $args, new SimpleErrorThrower($error, $severity));
+    }
+
+    /**
+     *    Receives event from unit test that the current
+     *    test method has finished. Totals up the call
+     *    counts and triggers a test assertion if a test
+     *    is present for expected call counts.
+     *    @param string $test_method      Current method name.
+     *    @param SimpleTestCase $test     Test to send message to.
+     */
+    function atTestEnd($test_method, &$test) {
+        foreach ($this->expected_counts as $method => $expectation) {
+            $test->assert($expectation, $this->getCallCount($method));
+        }
+        foreach ($this->max_counts as $method => $expectation) {
+            if ($expectation->test($this->getCallCount($method))) {
+                $test->assert($expectation, $this->getCallCount($method));
+            }
+        }
+    }
+
+    /**
+     *    Returns the expected value for the method name
+     *    and checks expectations. Will generate any
+     *    test assertions as a result of expectations
+     *    if there is a test present.
+     *    @param string $method       Name of method to simulate.
+     *    @param array $args          Arguments as an array.
+     *    @return mixed               Stored return.
+     */
+    function &invoke($method, $args) {
+        $method = strtolower($method);
+        $step = $this->getCallCount($method);
+        $this->addCall($method, $args);
+        $this->checkExpectations($method, $args, $step);
+        $was = $this->disableEStrict();
+        try {
+            $result = &$this->emulateCall($method, $args, $step);
+        } catch (Exception $e) {
+            $this->restoreEStrict($was);
+            throw $e;
+        }
+        $this->restoreEStrict($was);
+        return $result;
+    }
+
+    /**
+     *    Finds the return value matching the incoming
+     *    arguments. If there is no matching value found
+     *    then an error is triggered.
+     *    @param string $method      Method name.
+     *    @param array $args         Calling arguments.
+     *    @param integer $step       Current position in the
+     *                               call history.
+     *    @return mixed              Stored return or other action.
+     */
+    protected function &emulateCall($method, $args, $step) {
+        return $this->actions->respond($step, $method, $args);
+    }
+
+    /**
+     *    Tests the arguments against expectations.
+     *    @param string $method        Method to check.
+     *    @param array $args           Argument list to match.
+     *    @param integer $timing       The position of this call
+     *                                 in the call history.
+     */
+    protected function checkExpectations($method, $args, $timing) {
+        $test = $this->getCurrentTestCase();
+        if (isset($this->max_counts[$method])) {
+            if (! $this->max_counts[$method]->test($timing + 1)) {
+                $test->assert($this->max_counts[$method], $timing + 1);
+            }
+        }
+        if (isset($this->expected_args_at[$timing][$method])) {
+            $test->assert(
+                    $this->expected_args_at[$timing][$method],
+                    $args,
+                    "Mock method [$method] at [$timing] -> %s");
+        } elseif (isset($this->expected_args[$method])) {
+            $test->assert(
+                    $this->expected_args[$method],
+                    $args,
+                    "Mock method [$method] -> %s");
+        }
+    }
+
+    /**
+     *   Our mock has to be able to return anything, including
+     *   variable references. To allow for these mixed returns
+     *   we have to disable the E_STRICT warnings while the
+     *   method calls are emulated.
+     */
+    private function disableEStrict() {
+        $was = error_reporting();
+        error_reporting($was & ~E_STRICT);
+        return $was;
+    }
+
+    /**
+     *  Restores the E_STRICT level if it was previously set.
+     *  @param integer $was     Previous error reporting level.
+     */
+    private function restoreEStrict($was) {
+        error_reporting($was);
+    }
+}
+
+/**
+ *    Static methods only service class for code generation of
+ *    mock objects.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class Mock {
+
+    /**
+     *    Factory for mock object classes.
+     */
+    function __construct() {
+        trigger_error('Mock factory methods are static.');
+    }
+
+    /**
+     *    Clones a class' interface and creates a mock version
+     *    that can have return values and expectations set.
+     *    @param string $class         Class to clone.
+     *    @param string $mock_class    New class name. Default is
+     *                                 the old name with "Mock"
+     *                                 prepended.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in the cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.sta
+     */
+    static function generate($class, $mock_class = false, $methods = false) {
+        $generator = new MockGenerator($class, $mock_class);
+        return @$generator->generateSubclass($methods);
+    }
+
+    /**
+     *    Generates a version of a class with selected
+     *    methods mocked only. Inherits the old class
+     *    and chains the mock methods of an aggregated
+     *    mock object.
+     *    @param string $class            Class to clone.
+     *    @param string $mock_class       New class name.
+     *    @param array $methods           Methods to be overridden
+     *                                    with mock versions.
+     */
+    static function generatePartial($class, $mock_class, $methods) {
+        $generator = new MockGenerator($class, $mock_class);
+        return @$generator->generatePartial($methods);
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     */
+    static function getExpectationLine() {
+        $trace = new SimpleStackTrace(array('expect'));
+        return $trace->traceMethod();
+    }
+}
+
+/**
+ *    Service class for code generation of mock objects.
+ *    @package SimpleTest
+ *    @subpackage MockObjects
+ */
+class MockGenerator {
+    private $class;
+    private $mock_class;
+    private $mock_base;
+    private $reflection;
+
+    /**
+     *    Builds initial reflection object.
+     *    @param string $class        Class to be mocked.
+     *    @param string $mock_class   New class with identical interface,
+     *                                but no behaviour.
+     */
+    function __construct($class, $mock_class) {
+        $this->class = $class;
+        $this->mock_class = $mock_class;
+        if (! $this->mock_class) {
+            $this->mock_class = 'Mock' . $this->class;
+        }
+        $this->mock_base = SimpleTest::getMockBaseClass();
+        $this->reflection = new SimpleReflection($this->class);
+    }
+
+    /**
+     *    Clones a class' interface and creates a mock version
+     *    that can have return values and expectations set.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in th cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.
+     */
+    function generate($methods) {
+        if (! $this->reflection->classOrInterfaceExists()) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            return false;
+        }
+        $code = $this->createClassCode($methods ? $methods : array());
+        return eval("$code return \$code;");
+    }
+
+    /**
+     *    Subclasses a class and overrides every method with a mock one
+     *    that can have return values and expectations set. Chains
+     *    to an aggregated SimpleMock.
+     *    @param array $methods        Additional methods to add beyond
+     *                                 those in the cloned class. Use this
+     *                                 to emulate the dynamic addition of
+     *                                 methods in the cloned class or when
+     *                                 the class hasn't been written yet.
+     */
+    function generateSubclass($methods) {
+        if (! $this->reflection->classOrInterfaceExists()) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            return false;
+        }
+        if ($this->reflection->isInterface() || $this->reflection->hasFinal()) {
+            $code = $this->createClassCode($methods ? $methods : array());
+            return eval("$code return \$code;");
+        } else {
+            $code = $this->createSubclassCode($methods ? $methods : array());
+            return eval("$code return \$code;");
+        }
+    }
+
+    /**
+     *    Generates a version of a class with selected
+     *    methods mocked only. Inherits the old class
+     *    and chains the mock methods of an aggregated
+     *    mock object.
+     *    @param array $methods           Methods to be overridden
+     *                                    with mock versions.
+     */
+    function generatePartial($methods) {
+        if (! $this->reflection->classExists($this->class)) {
+            return false;
+        }
+        $mock_reflection = new SimpleReflection($this->mock_class);
+        if ($mock_reflection->classExistsSansAutoload()) {
+            trigger_error('Partial mock class [' . $this->mock_class . '] already exists');
+            return false;
+        }
+        $code = $this->extendClassCode($methods);
+        return eval("$code return \$code;");
+    }
+
+    /**
+     *    The new mock class code as a string.
+     *    @param array $methods          Additional methods.
+     *    @return string                 Code for new mock class.
+     */
+    protected function createClassCode($methods) {
+        $implements = '';
+        $interfaces = $this->reflection->getInterfaces();
+        if (function_exists('spl_classes')) {
+            $interfaces = array_diff($interfaces, array('Traversable'));
+        }
+        if (count($interfaces) > 0) {
+            $implements = 'implements ' . implode(', ', $interfaces);
+        }
+        $code = "class " . $this->mock_class . " extends " . $this->mock_base . " $implements {\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->" . $this->mock_base . "();\n";
+        $code .= "    }\n";
+        if (in_array('__construct', $this->reflection->getMethods())) {
+            $code .= "    function __construct() {\n";
+            $code .= "        \$this->" . $this->mock_base . "();\n";
+            $code .= "    }\n";
+        }
+        $code .= $this->createHandlerCode($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    The new mock class code as a string. The mock will
+     *    be a subclass of the original mocked class.
+     *    @param array $methods          Additional methods.
+     *    @return string                 Code for new mock class.
+     */
+    protected function createSubclassCode($methods) {
+        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
+        $code .= "    public \$mock;\n";
+        $code .= $this->addMethodList(array_merge($methods, $this->reflection->getMethods()));
+        $code .= "\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
+        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
+        $code .= "    }\n";
+        $code .= $this->chainMockReturns();
+        $code .= $this->chainMockExpectations();
+        $code .= $this->chainThrowMethods();
+        $code .= $this->overrideMethods($this->reflection->getMethods());
+        $code .= $this->createNewMethodCode($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    The extension class code as a string. The class
+     *    composites a mock object and chains mocked methods
+     *    to it.
+     *    @param array  $methods       Mocked methods.
+     *    @return string               Code for a new class.
+     */
+    protected function extendClassCode($methods) {
+        $code  = "class " . $this->mock_class . " extends " . $this->class . " {\n";
+        $code .= "    protected \$mock;\n";
+        $code .= $this->addMethodList($methods);
+        $code .= "\n";
+        $code .= "    function " . $this->mock_class . "() {\n";
+        $code .= "        \$this->mock = new " . $this->mock_base . "();\n";
+        $code .= "        \$this->mock->disableExpectationNameChecks();\n";
+        $code .= "    }\n";
+        $code .= $this->chainMockReturns();
+        $code .= $this->chainMockExpectations();
+        $code .= $this->chainThrowMethods();
+        $code .= $this->overrideMethods($methods);
+        $code .= "}\n";
+        return $code;
+    }
+
+    /**
+     *    Creates code within a class to generate replaced
+     *    methods. All methods call the invoke() handler
+     *    with the method name and the arguments in an
+     *    array.
+     *    @param array $methods    Additional methods.
+     */
+    protected function createHandlerCode($methods) {
+        $code = '';
+        $methods = array_merge($methods, $this->reflection->getMethods());
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $mock_reflection = new SimpleReflection($this->mock_base);
+            if (in_array($method, $mock_reflection->getMethods())) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+
+    /**
+     *    Creates code within a class to generate a new
+     *    methods. All methods call the invoke() handler
+     *    on the internal mock with the method name and
+     *    the arguments in an array.
+     *    @param array $methods    Additional methods.
+     */
+    protected function createNewMethodCode($methods) {
+        $code = '';
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $mock_reflection = new SimpleReflection($this->mock_base);
+            if (in_array($method, $mock_reflection->getMethods())) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+
+    /**
+     *    Tests to see if a special PHP method is about to
+     *    be stubbed by mistake.
+     *    @param string $method    Method name.
+     *    @return boolean          True if special.
+     */
+    protected function isConstructor($method) {
+        return in_array(
+                strtolower($method),
+                array('__construct', '__destruct'));
+    }
+
+    /**
+     *    Creates a list of mocked methods for error checking.
+     *    @param array $methods       Mocked methods.
+     *    @return string              Code for a method list.
+     */
+    protected function addMethodList($methods) {
+        return "    protected \$mocked_methods = array('" .
+                implode("', '", array_map('strtolower', $methods)) .
+                "');\n";
+    }
+
+    /**
+     *    Creates code to abandon the expectation if not mocked.
+     *    @param string $alias       Parameter name of method name.
+     *    @return string             Code for bail out.
+     */
+    protected function bailOutIfNotMocked($alias) {
+        $code  = "        if (! in_array(strtolower($alias), \$this->mocked_methods)) {\n";
+        $code .= "            trigger_error(\"Method [$alias] is not mocked\");\n";
+        $code .= "            \$null = null;\n";
+        $code .= "            return \$null;\n";
+        $code .= "        }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code for chaining to the composited
+     *    mock object.
+     *    @return string           Code for mock set up.
+     */
+    protected function chainMockReturns() {
+        $code  = "    function returns(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->returns(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->returnsAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByValue(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByValueAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByReference(\$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function returnsByReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnValue(\$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValue(\$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnValueAt(\$timing, \$method, \$value, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnReference(\$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReference(\$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function setReturnReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code for chaining to an aggregated
+     *    mock object.
+     *    @return string                 Code for expectations.
+     */
+    protected function chainMockExpectations() {
+        $code  = "    function expect(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expect(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectAt(\$timing, \$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectCallCount(\$method, \$count) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectMaximumCallCount(\$method, \$count, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectMinimumCallCount(\$method, \$count, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
+        $code .= "    }\n";
+        $code .= "    function expectNever(\$method) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectNever(\$method);\n";
+        $code .= "    }\n";
+        $code .= "    function expectOnce(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectOnce(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        $code .= "    function expectAtLeastOnce(\$method, \$args = false, \$msg = '%s') {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Adds code for chaining the throw methods.
+     *    @return string           Code for chains.
+     */
+    protected function chainThrowMethods() {
+        $code  = "    function throwOn(\$method, \$exception = false, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->throwOn(\$method, \$exception, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function throwAt(\$timing, \$method, \$exception = false, \$args = false) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
+        $code .= "    }\n";
+        $code .= "    function errorOn(\$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->errorOn(\$method, \$error, \$args, \$severity);\n";
+        $code .= "    }\n";
+        $code .= "    function errorAt(\$timing, \$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
+        $code .= $this->bailOutIfNotMocked("\$method");
+        $code .= "        \$this->mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
+        $code .= "    }\n";
+        return $code;
+    }
+
+    /**
+     *    Creates source code to override a list of methods
+     *    with mock versions.
+     *    @param array $methods    Methods to be overridden
+     *                             with mock versions.
+     *    @return string           Code for overridden chains.
+     */
+    protected function overrideMethods($methods) {
+        $code = "";
+        foreach ($methods as $method) {
+            if ($this->isConstructor($method)) {
+                continue;
+            }
+            $code .= "    " . $this->reflection->getSignature($method) . " {\n";
+            $code .= "        \$args = func_get_args();\n";
+            $code .= "        \$result = &\$this->mock->invoke(\"$method\", \$args);\n";
+            $code .= "        return \$result;\n";
+            $code .= "    }\n";
+        }
+        return $code;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/page.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/page.php
new file mode 100644
index 000000000..5c0bce707
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/page.php
@@ -0,0 +1,542 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: page.php 1938 2009-08-05 17:16:23Z dgheath $
+ */
+
+/**#@+
+    *   include other SimpleTest class files
+    */
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/php_parser.php');
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/form.php');
+require_once(dirname(__FILE__) . '/selector.php');
+/**#@-*/
+
+/**
+ *    A wrapper for a web page.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePage {
+    private $links = array();
+    private $title = false;
+    private $last_widget;
+    private $label;
+    private $forms = array();
+    private $frames = array();
+    private $transport_error;
+    private $raw;
+    private $text = false;
+    private $sent;
+    private $headers;
+    private $method;
+    private $url;
+    private $base = false;
+    private $request_data;
+
+    /**
+     *    Parses a page ready to access it's contents.
+     *    @param SimpleHttpResponse $response     Result of HTTP fetch.
+     *    @access public
+     */
+    function __construct($response = false) {
+        if ($response) {
+            $this->extractResponse($response);
+        } else {
+            $this->noResponse();
+        }
+    }
+
+    /**
+     *    Extracts all of the response information.
+     *    @param SimpleHttpResponse $response    Response being parsed.
+     *    @access private
+     */
+    protected function extractResponse($response) {
+        $this->transport_error = $response->getError();
+        $this->raw = $response->getContent();
+        $this->sent = $response->getSent();
+        $this->headers = $response->getHeaders();
+        $this->method = $response->getMethod();
+        $this->url = $response->getUrl();
+        $this->request_data = $response->getRequestData();
+    }
+
+    /**
+     *    Sets up a missing response.
+     *    @access private
+     */
+    protected function noResponse() {
+        $this->transport_error = 'No page fetched yet';
+        $this->raw = false;
+        $this->sent = false;
+        $this->headers = false;
+        $this->method = 'GET';
+        $this->url = false;
+        $this->request_data = false;
+    }
+
+    /**
+     *    Original request as bytes sent down the wire.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequest() {
+        return $this->sent;
+    }
+
+    /**
+     *    Accessor for raw text of page.
+     *    @return string        Raw unparsed content.
+     *    @access public
+     */
+    function getRaw() {
+        return $this->raw;
+    }
+
+    /**
+     *    Accessor for plain text of page as a text browser
+     *    would see it.
+     *    @return string        Plain text of page.
+     *    @access public
+     */
+    function getText() {
+        if (! $this->text) {
+            $this->text = SimplePage::normalise($this->raw);
+        }
+        return $this->text;
+    }
+
+    /**
+     *    Accessor for raw headers of page.
+     *    @return string       Header block as text.
+     *    @access public
+     */
+    function getHeaders() {
+        if ($this->headers) {
+            return $this->headers->getRaw();
+        }
+        return false;
+    }
+
+    /**
+     *    Original request method.
+     *    @return string        GET, POST or HEAD.
+     *    @access public
+     */
+    function getMethod() {
+        return $this->method;
+    }
+
+    /**
+     *    Original resource name.
+     *    @return SimpleUrl        Current url.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->url;
+    }
+
+    /**
+     *    Base URL if set via BASE tag page url otherwise
+     *    @return SimpleUrl        Base url.
+     *    @access public
+     */
+    function getBaseUrl() {
+        return $this->base;
+    }
+
+    /**
+     *    Original request data.
+     *    @return mixed              Sent content.
+     *    @access public
+     */
+    function getRequestData() {
+        return $this->request_data;
+    }
+
+    /**
+     *    Accessor for last error.
+     *    @return string        Error from last response.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->transport_error;
+    }
+
+    /**
+     *    Accessor for current MIME type.
+     *    @return string    MIME type as string; e.g. 'text/html'
+     *    @access public
+     */
+    function getMimeType() {
+        if ($this->headers) {
+            return $this->headers->getMimeType();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for HTTP response code.
+     *    @return integer    HTTP response code received.
+     *    @access public
+     */
+    function getResponseCode() {
+        if ($this->headers) {
+            return $this->headers->getResponseCode();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for last Authentication type. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Description of challenge type.
+     *    @access public
+     */
+    function getAuthentication() {
+        if ($this->headers) {
+            return $this->headers->getAuthentication();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for last Authentication realm. Only valid
+     *    straight after a challenge (401).
+     *    @return string    Name of security realm.
+     *    @access public
+     */
+    function getRealm() {
+        if ($this->headers) {
+            return $this->headers->getRealm();
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false as no frames.
+     *    @return array    Always empty.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return array();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           Always false.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return false;
+    }
+
+    /**
+     *    Sets the focus by name. Always fails for a leaf page.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        False as no frames.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return false;
+    }
+
+    /**
+     *    Clears the frame focus. Does nothing for a leaf page.
+     *    @access public
+     */
+    function clearFrameFocus() {
+    }
+
+    /**
+     *    TODO: write docs
+     */
+    function setFrames($frames) {
+        $this->frames = $frames;
+    }
+
+    /**
+     *    Test to see if link is an absolute one.
+     *    @param string $url     Url to test.
+     *    @return boolean        True if absolute.
+     *    @access protected
+     */
+    protected function linkIsAbsolute($url) {
+        $parsed = new SimpleUrl($url);
+        return (boolean)($parsed->getScheme() && $parsed->getHost());
+    }
+
+    /**
+     *    Adds a link to the page.
+     *    @param SimpleAnchorTag $tag      Link to accept.
+     */
+    function addLink($tag) {
+        $this->links[] = $tag;
+    }
+
+    /**
+     *    Set the forms
+     *    @param array $forms           An array of SimpleForm objects
+     */
+    function setForms($forms) {
+        $this->forms = $forms;
+    }
+
+    /**
+     *    Test for the presence of a frameset.
+     *    @return boolean        True if frameset.
+     *    @access public
+     */
+    function hasFrames() {
+        return count($this->frames) > 0;
+    }
+
+    /**
+     *    Accessor for frame name and source URL for every frame that
+     *    will need to be loaded. Immediate children only.
+     *    @return boolean/array     False if no frameset or
+     *                              otherwise a hash of frame URLs.
+     *                              The key is either a numerical
+     *                              base one index or the name attribute.
+     *    @access public
+     */
+    function getFrameset() {
+        if (! $this->hasFrames()) {
+            return false;
+        }
+        $urls = array();
+        for ($i = 0; $i < count($this->frames); $i++) {
+            $name = $this->frames[$i]->getAttribute('name');
+            $url = new SimpleUrl($this->frames[$i]->getAttribute('src'));
+            $urls[$name ? $name : $i + 1] = $this->expandUrl($url);
+        }
+        return $urls;
+    }
+
+    /**
+     *    Fetches a list of loaded frames.
+     *    @return array/string    Just the URL for a single page.
+     *    @access public
+     */
+    function getFrames() {
+        $url = $this->expandUrl($this->getUrl());
+        return $url->asString();
+    }
+
+    /**
+     *    Accessor for a list of all links.
+     *    @return array   List of urls with scheme of
+     *                    http or https and hostname.
+     *    @access public
+     */
+    function getUrls() {
+        $all = array();
+        foreach ($this->links as $link) {
+            $url = $this->getUrlFromLink($link);
+            $all[] = $url->asString();
+        }
+        return $all;
+    }
+
+    /**
+     *    Accessor for URLs by the link label. Label will match
+     *    regardess of whitespace issues and case.
+     *    @param string $label    Text of link.
+     *    @return array           List of links with that label.
+     *    @access public
+     */
+    function getUrlsByLabel($label) {
+        $matches = array();
+        foreach ($this->links as $link) {
+            if ($link->getText() == $label) {
+                $matches[] = $this->getUrlFromLink($link);
+            }
+        }
+        return $matches;
+    }
+
+    /**
+     *    Accessor for a URL by the id attribute.
+     *    @param string $id       Id attribute of link.
+     *    @return SimpleUrl       URL with that id of false if none.
+     *    @access public
+     */
+    function getUrlById($id) {
+        foreach ($this->links as $link) {
+            if ($link->getAttribute('id') === (string)$id) {
+                return $this->getUrlFromLink($link);
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Converts a link tag into a target URL.
+     *    @param SimpleAnchor $link    Parsed link.
+     *    @return SimpleUrl            URL with frame target if any.
+     *    @access private
+     */
+    protected function getUrlFromLink($link) {
+        $url = $this->expandUrl($link->getHref());
+        if ($link->getAttribute('target')) {
+            $url->setTarget($link->getAttribute('target'));
+        }
+        return $url;
+    }
+
+    /**
+     *    Expands expandomatic URLs into fully qualified
+     *    URLs.
+     *    @param SimpleUrl $url        Relative URL.
+     *    @return SimpleUrl            Absolute URL.
+     *    @access public
+     */
+    function expandUrl($url) {
+        if (! is_object($url)) {
+            $url = new SimpleUrl($url);
+        }
+        $location = $this->getBaseUrl() ? $this->getBaseUrl() : new SimpleUrl();
+        return $url->makeAbsolute($location->makeAbsolute($this->getUrl()));
+    }
+
+    /**
+     *    Sets the base url for the page.
+     *    @param string $url    Base URL for page.
+     */
+    function setBase($url) {
+        $this->base = new SimpleUrl($url);
+    }
+
+    /**
+     *    Sets the title tag contents.
+     *    @param SimpleTitleTag $tag    Title of page.
+     */
+    function setTitle($tag) {
+        $this->title = $tag;
+    }
+
+    /**
+     *    Accessor for parsed title.
+     *    @return string     Title or false if no title is present.
+     *    @access public
+     */
+    function getTitle() {
+        if ($this->title) {
+            return $this->title->getText();
+        }
+        return false;
+    }
+
+    /**
+     *    Finds a held form by button label. Will only
+     *    search correctly built forms.
+     *    @param SimpleSelector $selector       Button finder.
+     *    @return SimpleForm                    Form object containing
+     *                                          the button.
+     *    @access public
+     */
+    function getFormBySubmit($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->hasSubmit($selector)) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Finds a held form by image using a selector.
+     *    Will only search correctly built forms.
+     *    @param SimpleSelector $selector  Image finder.
+     *    @return SimpleForm               Form object containing
+     *                                     the image.
+     *    @access public
+     */
+    function getFormByImage($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->hasImage($selector)) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Finds a held form by the form ID. A way of
+     *    identifying a specific form when we have control
+     *    of the HTML code.
+     *    @param string $id     Form label.
+     *    @return SimpleForm    Form object containing the matching ID.
+     *    @access public
+     */
+    function getFormById($id) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->getId() == $id) {
+                return $this->forms[$i];
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Sets a field on each form in which the field is
+     *    available.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @param string $value               Value to set field to.
+     *    @return boolean                    True if value is valid.
+     *    @access public
+     */
+    function setField($selector, $value, $position=false) {
+        $is_set = false;
+        for ($i = 0; $i < count($this->forms); $i++) {
+            if ($this->forms[$i]->setField($selector, $value, $position)) {
+                $is_set = true;
+            }
+        }
+        return $is_set;
+    }
+
+    /**
+     *    Accessor for a form element value within a page.
+     *    @param SimpleSelector $selector    Field finder.
+     *    @return string/boolean             A string if the field is
+     *                                       present, false if unchecked
+     *                                       and null if missing.
+     *    @access public
+     */
+    function getField($selector) {
+        for ($i = 0; $i < count($this->forms); $i++) {
+            $value = $this->forms[$i]->getValue($selector);
+            if (isset($value)) {
+                return $value;
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Turns HTML into text browser visible text. Images
+     *    are converted to their alt text and tags are supressed.
+     *    Entities are converted to their visible representation.
+     *    @param string $html        HTML to convert.
+     *    @return string             Plain text.
+     *    @access public
+     */
+    static function normalise($html) {
+        $text = preg_replace('#<!--.*?-->#si', '', $html);
+        $text = preg_replace('#<(script|option|textarea)[^>]*>.*?</\1>#si', '', $text);
+        $text = preg_replace('#<img[^>]*alt\s*=\s*("([^"]*)"|\'([^\']*)\'|([a-zA-Z_]+))[^>]*>#', ' \2\3\4 ', $text);
+        $text = preg_replace('#<[^>]*>#', '', $text);
+        $text = html_entity_decode($text, ENT_QUOTES);
+        $text = preg_replace('#\s+#', ' ', $text);
+        return trim(trim($text), "\xA0");        // TODO: The \xAO is a &nbsp;. Add a test for this.
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/php_parser.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/php_parser.php
new file mode 100644
index 000000000..4c5b8f00b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/php_parser.php
@@ -0,0 +1,1054 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: php_parser.php 1927 2009-07-31 12:45:36Z dgheath $
+ */
+
+/**#@+
+ * Lexer mode stack constants
+ */
+foreach (array('LEXER_ENTER', 'LEXER_MATCHED',
+                'LEXER_UNMATCHED', 'LEXER_EXIT',
+                'LEXER_SPECIAL') as $i => $constant) {
+    if (! defined($constant)) {
+        define($constant, $i + 1);
+    }
+}
+/**#@-*/
+
+/**
+ *    Compounded regular expression. Any of
+ *    the contained patterns could match and
+ *    when one does, it's label is returned.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class ParallelRegex {
+    private $patterns;
+    private $labels;
+    private $regex;
+    private $case;
+
+    /**
+     *    Constructor. Starts with no patterns.
+     *    @param boolean $case    True for case sensitive, false
+     *                            for insensitive.
+     *    @access public
+     */
+    function __construct($case) {
+        $this->case = $case;
+        $this->patterns = array();
+        $this->labels = array();
+        $this->regex = null;
+    }
+
+    /**
+     *    Adds a pattern with an optional label.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $label        Label of regex to be returned
+     *                                on a match.
+     *    @access public
+     */
+    function addPattern($pattern, $label = true) {
+        $count = count($this->patterns);
+        $this->patterns[$count] = $pattern;
+        $this->labels[$count] = $label;
+        $this->regex = null;
+    }
+
+    /**
+     *    Attempts to match all patterns at once against
+     *    a string.
+     *    @param string $subject      String to match against.
+     *    @param string $match        First matched portion of
+     *                                subject.
+     *    @return boolean             True on success.
+     *    @access public
+     */
+    function match($subject, &$match) {
+        if (count($this->patterns) == 0) {
+            return false;
+        }
+        if (! preg_match($this->getCompoundedRegex(), $subject, $matches)) {
+            $match = '';
+            return false;
+        }
+        $match = $matches[0];
+        for ($i = 1; $i < count($matches); $i++) {
+            if ($matches[$i]) {
+                return $this->labels[$i - 1];
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Compounds the patterns into a single
+     *    regular expression separated with the
+     *    "or" operator. Caches the regex.
+     *    Will automatically escape (, ) and / tokens.
+     *    @param array $patterns    List of patterns in order.
+     *    @access private
+     */
+    protected function getCompoundedRegex() {
+        if ($this->regex == null) {
+            for ($i = 0, $count = count($this->patterns); $i < $count; $i++) {
+                $this->patterns[$i] = '(' . str_replace(
+                        array('/', '(', ')'),
+                        array('\/', '\(', '\)'),
+                        $this->patterns[$i]) . ')';
+            }
+            $this->regex = "/" . implode("|", $this->patterns) . "/" . $this->getPerlMatchingFlags();
+        }
+        return $this->regex;
+    }
+
+    /**
+     *    Accessor for perl regex mode flags to use.
+     *    @return string       Perl regex flags.
+     *    @access private
+     */
+    protected function getPerlMatchingFlags() {
+        return ($this->case ? "msS" : "msSi");
+    }
+}
+
+/**
+ *    States for a stack machine.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleStateStack {
+    private $stack;
+
+    /**
+     *    Constructor. Starts in named state.
+     *    @param string $start        Starting state name.
+     *    @access public
+     */
+    function __construct($start) {
+        $this->stack = array($start);
+    }
+
+    /**
+     *    Accessor for current state.
+     *    @return string       State.
+     *    @access public
+     */
+    function getCurrent() {
+        return $this->stack[count($this->stack) - 1];
+    }
+
+    /**
+     *    Adds a state to the stack and sets it
+     *    to be the current state.
+     *    @param string $state        New state.
+     *    @access public
+     */
+    function enter($state) {
+        array_push($this->stack, $state);
+    }
+
+    /**
+     *    Leaves the current state and reverts
+     *    to the previous one.
+     *    @return boolean    False if we drop off
+     *                       the bottom of the list.
+     *    @access public
+     */
+    function leave() {
+        if (count($this->stack) == 1) {
+            return false;
+        }
+        array_pop($this->stack);
+        return true;
+    }
+}
+
+/**
+ *    Accepts text and breaks it into tokens.
+ *    Some optimisation to make the sure the
+ *    content is only scanned by the PHP regex
+ *    parser once. Lexer modes must not start
+ *    with leading underscores.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleLexer {
+    private $regexes;
+    private $parser;
+    private $mode;
+    private $mode_handlers;
+    private $case;
+
+    /**
+     *    Sets up the lexer in case insensitive matching
+     *    by default.
+     *    @param SimpleSaxParser $parser  Handling strategy by
+     *                                    reference.
+     *    @param string $start            Starting handler.
+     *    @param boolean $case            True for case sensitive.
+     *    @access public
+     */
+    function __construct($parser, $start = "accept", $case = false) {
+        $this->case = $case;
+        $this->regexes = array();
+        $this->parser = $parser;
+        $this->mode = new SimpleStateStack($start);
+        $this->mode_handlers = array($start => $start);
+    }
+
+    /**
+     *    Adds a token search pattern for a particular
+     *    parsing mode. The pattern does not change the
+     *    current mode.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @access public
+     */
+    function addPattern($pattern, $mode = "accept") {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern);
+        if (! isset($this->mode_handlers[$mode])) {
+            $this->mode_handlers[$mode] = $mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that will enter a new parsing
+     *    mode. Useful for entering parenthesis, strings,
+     *    tags, etc.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $new_mode     Change parsing to this new
+     *                                nested mode.
+     *    @access public
+     */
+    function addEntryPattern($pattern, $mode, $new_mode) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, $new_mode);
+        if (! isset($this->mode_handlers[$new_mode])) {
+            $this->mode_handlers[$new_mode] = $new_mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that will exit the current mode
+     *    and re-enter the previous one.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Mode to leave.
+     *    @access public
+     */
+    function addExitPattern($pattern, $mode) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, "__exit");
+        if (! isset($this->mode_handlers[$mode])) {
+            $this->mode_handlers[$mode] = $mode;
+        }
+    }
+
+    /**
+     *    Adds a pattern that has a special mode. Acts as an entry
+     *    and exit pattern in one go, effectively calling a special
+     *    parser handler for this token only.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $special      Use this mode for this one token.
+     *    @access public
+     */
+    function addSpecialPattern($pattern, $mode, $special) {
+        if (! isset($this->regexes[$mode])) {
+            $this->regexes[$mode] = new ParallelRegex($this->case);
+        }
+        $this->regexes[$mode]->addPattern($pattern, "_$special");
+        if (! isset($this->mode_handlers[$special])) {
+            $this->mode_handlers[$special] = $special;
+        }
+    }
+
+    /**
+     *    Adds a mapping from a mode to another handler.
+     *    @param string $mode        Mode to be remapped.
+     *    @param string $handler     New target handler.
+     *    @access public
+     */
+    function mapHandler($mode, $handler) {
+        $this->mode_handlers[$mode] = $handler;
+    }
+
+    /**
+     *    Splits the page text into tokens. Will fail
+     *    if the handlers report an error or if no
+     *    content is consumed. If successful then each
+     *    unparsed and parsed token invokes a call to the
+     *    held listener.
+     *    @param string $raw        Raw HTML text.
+     *    @return boolean           True on success, else false.
+     *    @access public
+     */
+    function parse($raw) {
+        if (! isset($this->parser)) {
+            return false;
+        }
+        $length = strlen($raw);
+        while (is_array($parsed = $this->reduce($raw))) {
+            list($raw, $unmatched, $matched, $mode) = $parsed;
+            if (! $this->dispatchTokens($unmatched, $matched, $mode)) {
+                return false;
+            }
+            if ($raw === '') {
+                return true;
+            }
+            if (strlen($raw) == $length) {
+                return false;
+            }
+            $length = strlen($raw);
+        }
+        if (! $parsed) {
+            return false;
+        }
+        return $this->invokeParser($raw, LEXER_UNMATCHED);
+    }
+
+    /**
+     *    Sends the matched token and any leading unmatched
+     *    text to the parser changing the lexer to a new
+     *    mode if one is listed.
+     *    @param string $unmatched    Unmatched leading portion.
+     *    @param string $matched      Actual token match.
+     *    @param string $mode         Mode after match. A boolean
+     *                                false mode causes no change.
+     *    @return boolean             False if there was any error
+     *                                from the parser.
+     *    @access private
+     */
+    protected function dispatchTokens($unmatched, $matched, $mode = false) {
+        if (! $this->invokeParser($unmatched, LEXER_UNMATCHED)) {
+            return false;
+        }
+        if (is_bool($mode)) {
+            return $this->invokeParser($matched, LEXER_MATCHED);
+        }
+        if ($this->isModeEnd($mode)) {
+            if (! $this->invokeParser($matched, LEXER_EXIT)) {
+                return false;
+            }
+            return $this->mode->leave();
+        }
+        if ($this->isSpecialMode($mode)) {
+            $this->mode->enter($this->decodeSpecial($mode));
+            if (! $this->invokeParser($matched, LEXER_SPECIAL)) {
+                return false;
+            }
+            return $this->mode->leave();
+        }
+        $this->mode->enter($mode);
+        return $this->invokeParser($matched, LEXER_ENTER);
+    }
+
+    /**
+     *    Tests to see if the new mode is actually to leave
+     *    the current mode and pop an item from the matching
+     *    mode stack.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    protected function isModeEnd($mode) {
+        return ($mode === "__exit");
+    }
+
+    /**
+     *    Test to see if the mode is one where this mode
+     *    is entered for this token only and automatically
+     *    leaves immediately afterwoods.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    protected function isSpecialMode($mode) {
+        return (strncmp($mode, "_", 1) == 0);
+    }
+
+    /**
+     *    Strips the magic underscore marking single token
+     *    modes.
+     *    @param string $mode    Mode to decode.
+     *    @return string         Underlying mode name.
+     *    @access private
+     */
+    protected function decodeSpecial($mode) {
+        return substr($mode, 1);
+    }
+
+    /**
+     *    Calls the parser method named after the current
+     *    mode. Empty content will be ignored. The lexer
+     *    has a parser handler for each mode in the lexer.
+     *    @param string $content        Text parsed.
+     *    @param boolean $is_match      Token is recognised rather
+     *                                  than unparsed data.
+     *    @access private
+     */
+    protected function invokeParser($content, $is_match) {
+        if (($content === '') || ($content === false)) {
+            return true;
+        }
+        $handler = $this->mode_handlers[$this->mode->getCurrent()];
+        return $this->parser->$handler($content, $is_match);
+    }
+
+    /**
+     *    Tries to match a chunk of text and if successful
+     *    removes the recognised chunk and any leading
+     *    unparsed data. Empty strings will not be matched.
+     *    @param string $raw         The subject to parse. This is the
+     *                               content that will be eaten.
+     *    @return array/boolean      Three item list of unparsed
+     *                               content followed by the
+     *                               recognised token and finally the
+     *                               action the parser is to take.
+     *                               True if no match, false if there
+     *                               is a parsing error.
+     *    @access private
+     */
+    protected function reduce($raw) {
+        if ($action = $this->regexes[$this->mode->getCurrent()]->match($raw, $match)) {
+            $unparsed_character_count = strpos($raw, $match);
+            $unparsed = substr($raw, 0, $unparsed_character_count);
+            $raw = substr($raw, $unparsed_character_count + strlen($match));
+            return array($raw, $unparsed, $match, $action);
+        }
+        return true;
+    }
+}
+
+/**
+ *    Breaks HTML into SAX events.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHtmlLexer extends SimpleLexer {
+
+    /**
+     *    Sets up the lexer with case insensitive matching
+     *    and adds the HTML handlers.
+     *    @param SimpleSaxParser $parser  Handling strategy by
+     *                                    reference.
+     *    @access public
+     */
+    function __construct($parser) {
+        parent::__construct($parser, 'text');
+        $this->mapHandler('text', 'acceptTextToken');
+        $this->addSkipping();
+        foreach ($this->getParsedTags() as $tag) {
+            $this->addTag($tag);
+        }
+        $this->addInTagTokens();
+    }
+
+    /**
+     *    List of parsed tags. Others are ignored.
+     *    @return array        List of searched for tags.
+     *    @access private
+     */
+    protected function getParsedTags() {
+        return array('a', 'base', 'title', 'form', 'input', 'button', 'textarea', 'select',
+                'option', 'frameset', 'frame', 'label');
+    }
+
+    /**
+     *    The lexer has to skip certain sections such
+     *    as server code, client code and styles.
+     *    @access private
+     */
+    protected function addSkipping() {
+        $this->mapHandler('css', 'ignore');
+        $this->addEntryPattern('<style', 'text', 'css');
+        $this->addExitPattern('</style>', 'css');
+        $this->mapHandler('js', 'ignore');
+        $this->addEntryPattern('<script', 'text', 'js');
+        $this->addExitPattern('</script>', 'js');
+        $this->mapHandler('comment', 'ignore');
+        $this->addEntryPattern('<!--', 'text', 'comment');
+        $this->addExitPattern('-->', 'comment');
+    }
+
+    /**
+     *    Pattern matches to start and end a tag.
+     *    @param string $tag          Name of tag to scan for.
+     *    @access private
+     */
+    protected function addTag($tag) {
+        $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
+        $this->addEntryPattern("<$tag", 'text', 'tag');
+    }
+
+    /**
+     *    Pattern matches to parse the inside of a tag
+     *    including the attributes and their quoting.
+     *    @access private
+     */
+    protected function addInTagTokens() {
+        $this->mapHandler('tag', 'acceptStartToken');
+        $this->addSpecialPattern('\s+', 'tag', 'ignore');
+        $this->addAttributeTokens();
+        $this->addExitPattern('/>', 'tag');
+        $this->addExitPattern('>', 'tag');
+    }
+
+    /**
+     *    Matches attributes that are either single quoted,
+     *    double quoted or unquoted.
+     *    @access private
+     */
+    protected function addAttributeTokens() {
+        $this->mapHandler('dq_attribute', 'acceptAttributeToken');
+        $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
+        $this->addPattern("\\\\\"", 'dq_attribute');
+        $this->addExitPattern('"', 'dq_attribute');
+        $this->mapHandler('sq_attribute', 'acceptAttributeToken');
+        $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
+        $this->addPattern("\\\\'", 'sq_attribute');
+        $this->addExitPattern("'", 'sq_attribute');
+        $this->mapHandler('uq_attribute', 'acceptAttributeToken');
+        $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
+    }
+}
+
+/**
+ *    Converts HTML tokens into selected SAX events.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleHtmlSaxParser {
+    private $lexer;
+    private $listener;
+    private $tag;
+    private $attributes;
+    private $current_attribute;
+
+    /**
+     *    Sets the listener.
+     *    @param SimplePhpPageBuilder $listener    SAX event handler.
+     *    @access public
+     */
+    function __construct($listener) {
+        $this->listener = $listener;
+        $this->lexer = $this->createLexer($this);
+        $this->tag = '';
+        $this->attributes = array();
+        $this->current_attribute = '';
+    }
+
+    /**
+     *    Runs the content through the lexer which
+     *    should call back to the acceptors.
+     *    @param string $raw      Page text to parse.
+     *    @return boolean         False if parse error.
+     *    @access public
+     */
+    function parse($raw) {
+        return $this->lexer->parse($raw);
+    }
+
+    /**
+     *    Sets up the matching lexer. Starts in 'text' mode.
+     *    @param SimpleSaxParser $parser    Event generator, usually $self.
+     *    @return SimpleLexer               Lexer suitable for this parser.
+     *    @access public
+     */
+    static function createLexer(&$parser) {
+        return new SimpleHtmlLexer($parser);
+    }
+
+    /**
+     *    Accepts a token from the tag mode. If the
+     *    starting element completes then the element
+     *    is dispatched and the current attributes
+     *    set back to empty. The element or attribute
+     *    name is converted to lower case.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptStartToken($token, $event) {
+        if ($event == LEXER_ENTER) {
+            $this->tag = strtolower(substr($token, 1));
+            return true;
+        }
+        if ($event == LEXER_EXIT) {
+            $success = $this->listener->startElement(
+                    $this->tag,
+                    $this->attributes);
+            $this->tag = '';
+            $this->attributes = array();
+            return $success;
+        }
+        if ($token != '=') {
+            $this->current_attribute = strtolower(html_entity_decode($token, ENT_QUOTES));
+            $this->attributes[$this->current_attribute] = '';
+        }
+        return true;
+    }
+
+    /**
+     *    Accepts a token from the end tag mode.
+     *    The element name is converted to lower case.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptEndToken($token, $event) {
+        if (! preg_match('/<\/(.*)>/', $token, $matches)) {
+            return false;
+        }
+        return $this->listener->endElement(strtolower($matches[1]));
+    }
+
+    /**
+     *    Part of the tag data.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptAttributeToken($token, $event) {
+        if ($this->current_attribute) {
+            if ($event == LEXER_UNMATCHED) {
+                $this->attributes[$this->current_attribute] .=
+                        html_entity_decode($token, ENT_QUOTES);
+            }
+            if ($event == LEXER_SPECIAL) {
+                $this->attributes[$this->current_attribute] .=
+                        preg_replace('/^=\s*/' , '', html_entity_decode($token, ENT_QUOTES));
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    A character entity.
+     *    @param string $token    Incoming characters.
+     *    @param integer $event   Lexer event type.
+     *    @return boolean         False if parse error.
+     *    @access public
+     */
+    function acceptEntityToken($token, $event) {
+    }
+
+    /**
+     *    Character data between tags regarded as
+     *    important.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function acceptTextToken($token, $event) {
+        return $this->listener->addContent($token);
+    }
+
+    /**
+     *    Incoming data to be ignored.
+     *    @param string $token     Incoming characters.
+     *    @param integer $event    Lexer event type.
+     *    @return boolean          False if parse error.
+     *    @access public
+     */
+    function ignore($token, $event) {
+        return true;
+    }
+}
+
+/**
+ *    SAX event handler. Maintains a list of
+ *    open tags and dispatches them as they close.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimplePhpPageBuilder {
+    private $tags;
+    private $page;
+    private $private_content_tag;
+    private $open_forms = array();
+    private $complete_forms = array();
+    private $frameset = false;
+    private $loading_frames = array();
+    private $frameset_nesting_level = 0;
+    private $left_over_labels = array();
+
+    /**
+     *    Frees up any references so as to allow the PHP garbage
+     *    collection from unset() to work.
+     *    @access public
+     */
+    function free() {
+        unset($this->tags);
+        unset($this->page);
+        unset($this->private_content_tags);
+        $this->open_forms = array();
+        $this->complete_forms = array();
+        $this->frameset = false;
+        $this->loading_frames = array();
+        $this->frameset_nesting_level = 0;
+        $this->left_over_labels = array();
+    }
+
+    /**
+     *    This builder is always available.
+     *    @return boolean       Always true.
+     */
+    function can() {
+        return true;
+    }
+
+    /**
+     *    Reads the raw content and send events
+     *    into the page to be built.
+     *    @param $response SimpleHttpResponse  Fetched response.
+     *    @return SimplePage                   Newly parsed page.
+     *    @access public
+     */
+    function parse($response) {
+        $this->tags = array();
+        $this->page = $this->createPage($response);
+        $parser = $this->createParser($this);
+        $parser->parse($response->getContent());
+        $this->acceptPageEnd();
+        $page = $this->page;
+        $this->free();
+        return $page;
+    }
+
+    /**
+     *    Creates an empty page.
+     *    @return SimplePage        New unparsed page.
+     *    @access protected
+     */
+    protected function createPage($response) {
+        return new SimplePage($response);
+    }
+
+    /**
+     *    Creates the parser used with the builder.
+     *    @param SimplePhpPageBuilder $listener   Target of parser.
+     *    @return SimpleSaxParser              Parser to generate
+     *                                         events for the builder.
+     *    @access protected
+     */
+    protected function createParser(&$listener) {
+        return new SimpleHtmlSaxParser($listener);
+    }
+
+    /**
+     *    Start of element event. Opens a new tag.
+     *    @param string $name         Element name.
+     *    @param hash $attributes     Attributes without content
+     *                                are marked as true.
+     *    @return boolean             False on parse error.
+     *    @access public
+     */
+    function startElement($name, $attributes) {
+        $factory = new SimpleTagBuilder();
+        $tag = $factory->createTag($name, $attributes);
+        if (! $tag) {
+            return true;
+        }
+        if ($tag->getTagName() == 'label') {
+            $this->acceptLabelStart($tag);
+            $this->openTag($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'form') {
+            $this->acceptFormStart($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'frameset') {
+            $this->acceptFramesetStart($tag);
+            return true;
+        }
+        if ($tag->getTagName() == 'frame') {
+            $this->acceptFrame($tag);
+            return true;
+        }
+        if ($tag->isPrivateContent() && ! isset($this->private_content_tag)) {
+            $this->private_content_tag = &$tag;
+        }
+        if ($tag->expectEndTag()) {
+            $this->openTag($tag);
+            return true;
+        }
+        $this->acceptTag($tag);
+        return true;
+    }
+
+    /**
+     *    End of element event.
+     *    @param string $name        Element name.
+     *    @return boolean            False on parse error.
+     *    @access public
+     */
+    function endElement($name) {
+        if ($name == 'label') {
+            $this->acceptLabelEnd();
+            return true;
+        }
+        if ($name == 'form') {
+            $this->acceptFormEnd();
+            return true;
+        }
+        if ($name == 'frameset') {
+            $this->acceptFramesetEnd();
+            return true;
+        }
+        if ($this->hasNamedTagOnOpenTagStack($name)) {
+            $tag = array_pop($this->tags[$name]);
+            if ($tag->isPrivateContent() && $this->private_content_tag->getTagName() == $name) {
+                unset($this->private_content_tag);
+            }
+            $this->addContentTagToOpenTags($tag);
+            $this->acceptTag($tag);
+            return true;
+        }
+        return true;
+    }
+
+    /**
+     *    Test to see if there are any open tags awaiting
+     *    closure that match the tag name.
+     *    @param string $name        Element name.
+     *    @return boolean            True if any are still open.
+     *    @access private
+     */
+    protected function hasNamedTagOnOpenTagStack($name) {
+        return isset($this->tags[$name]) && (count($this->tags[$name]) > 0);
+    }
+
+    /**
+     *    Unparsed, but relevant data. The data is added
+     *    to every open tag.
+     *    @param string $text        May include unparsed tags.
+     *    @return boolean            False on parse error.
+     *    @access public
+     */
+    function addContent($text) {
+        if (isset($this->private_content_tag)) {
+            $this->private_content_tag->addContent($text);
+        } else {
+            $this->addContentToAllOpenTags($text);
+        }
+        return true;
+    }
+
+    /**
+     *    Any content fills all currently open tags unless it
+     *    is part of an option tag.
+     *    @param string $text        May include unparsed tags.
+     *    @access private
+     */
+    protected function addContentToAllOpenTags($text) {
+        foreach (array_keys($this->tags) as $name) {
+            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
+                $this->tags[$name][$i]->addContent($text);
+            }
+        }
+    }
+
+    /**
+     *    Parsed data in tag form. The parsed tag is added
+     *    to every open tag. Used for adding options to select
+     *    fields only.
+     *    @param SimpleTag $tag        Option tags only.
+     *    @access private
+     */
+    protected function addContentTagToOpenTags(&$tag) {
+        if ($tag->getTagName() != 'option') {
+            return;
+        }
+        foreach (array_keys($this->tags) as $name) {
+            for ($i = 0, $count = count($this->tags[$name]); $i < $count; $i++) {
+                $this->tags[$name][$i]->addTag($tag);
+            }
+        }
+    }
+
+    /**
+     *    Opens a tag for receiving content. Multiple tags
+     *    will be receiving input at the same time.
+     *    @param SimpleTag $tag        New content tag.
+     *    @access private
+     */
+    protected function openTag($tag) {
+        $name = $tag->getTagName();
+        if (! in_array($name, array_keys($this->tags))) {
+            $this->tags[$name] = array();
+        }
+        $this->tags[$name][] = $tag;
+    }
+
+    /**
+     *    Adds a tag to the page.
+     *    @param SimpleTag $tag        Tag to accept.
+     *    @access public
+     */
+    protected function acceptTag($tag) {
+        if ($tag->getTagName() == "a") {
+            $this->page->addLink($tag);
+        } elseif ($tag->getTagName() == "base") {
+            $this->page->setBase($tag->getAttribute('href'));
+        } elseif ($tag->getTagName() == "title") {
+            $this->page->setTitle($tag);
+        } elseif ($this->isFormElement($tag->getTagName())) {
+            for ($i = 0; $i < count($this->open_forms); $i++) {
+                $this->open_forms[$i]->addWidget($tag);
+            }
+            $this->last_widget = $tag;
+        }
+    }
+
+    /**
+     *    Opens a label for a described widget.
+     *    @param SimpleFormTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptLabelStart($tag) {
+        $this->label = $tag;
+        unset($this->last_widget);
+    }
+
+    /**
+     *    Closes the most recently opened label.
+     *    @access public
+     */
+    protected function acceptLabelEnd() {
+        if (isset($this->label)) {
+            if (isset($this->last_widget)) {
+                $this->last_widget->setLabel($this->label->getText());
+                unset($this->last_widget);
+            } else {
+                $this->left_over_labels[] = SimpleTestCompatibility::copy($this->label);
+            }
+            unset($this->label);
+        }
+    }
+
+    /**
+     *    Tests to see if a tag is a possible form
+     *    element.
+     *    @param string $name     HTML element name.
+     *    @return boolean         True if form element.
+     *    @access private
+     */
+    protected function isFormElement($name) {
+        return in_array($name, array('input', 'button', 'textarea', 'select'));
+    }
+
+    /**
+     *    Opens a form. New widgets go here.
+     *    @param SimpleFormTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFormStart($tag) {
+        $this->open_forms[] = new SimpleForm($tag, $this->page);
+    }
+
+    /**
+     *    Closes the most recently opened form.
+     *    @access public
+     */
+    protected function acceptFormEnd() {
+        if (count($this->open_forms)) {
+            $this->complete_forms[] = array_pop($this->open_forms);
+        }
+    }
+
+    /**
+     *    Opens a frameset. A frameset may contain nested
+     *    frameset tags.
+     *    @param SimpleFramesetTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFramesetStart($tag) {
+        if (! $this->isLoadingFrames()) {
+            $this->frameset = $tag;
+        }
+        $this->frameset_nesting_level++;
+    }
+
+    /**
+     *    Closes the most recently opened frameset.
+     *    @access public
+     */
+    protected function acceptFramesetEnd() {
+        if ($this->isLoadingFrames()) {
+            $this->frameset_nesting_level--;
+        }
+    }
+
+    /**
+     *    Takes a single frame tag and stashes it in
+     *    the current frame set.
+     *    @param SimpleFrameTag $tag      Tag to accept.
+     *    @access public
+     */
+    protected function acceptFrame($tag) {
+        if ($this->isLoadingFrames()) {
+            if ($tag->getAttribute('src')) {
+                $this->loading_frames[] = $tag;
+            }
+        }
+    }
+
+    /**
+     *    Test to see if in the middle of reading
+     *    a frameset.
+     *    @return boolean        True if inframeset.
+     *    @access private
+     */
+    protected function isLoadingFrames() {
+        return $this->frameset and $this->frameset_nesting_level > 0;
+    }
+
+    /**
+     *    Marker for end of complete page. Any work in
+     *    progress can now be closed.
+     *    @access public
+     */
+    protected function acceptPageEnd() {
+        while (count($this->open_forms)) {
+            $this->complete_forms[] = array_pop($this->open_forms);
+        }
+        foreach ($this->left_over_labels as $label) {
+            for ($i = 0, $count = count($this->complete_forms); $i < $count; $i++) {
+                $this->complete_forms[$i]->attachLabelBySelector(
+                        new SimpleById($label->getFor()),
+                        $label->getText());
+            }
+        }
+        $this->page->setForms($this->complete_forms);
+        $this->page->setFrames($this->loading_frames);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php4.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php4.php
new file mode 100644
index 000000000..39801ea1b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php4.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reflection_php4.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *  Version specific reflection API.
+ *  @package SimpleTest
+ *  @subpackage UnitTester
+ *  @ignore duplicate with reflection_php5.php
+ */
+class SimpleReflection {
+    var $_interface;
+
+    /**
+     *    Stashes the class/interface.
+     *    @param string $interface    Class or interface
+     *                                to inspect.
+     */
+    function SimpleReflection($interface) {
+        $this->_interface = $interface;
+    }
+
+    /**
+     *    Checks that a class has been declared.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExists() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExistsSansAutoload() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Checks that a class or interface has been
+     *    declared.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExists() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExistsSansAutoload() {
+        return class_exists($this->_interface);
+    }
+
+    /**
+     *    Gets the list of methods on a class or
+     *    interface.
+     *    @returns array          List of method names.
+     *    @access public
+     */
+    function getMethods() {
+        return get_class_methods($this->_interface);
+    }
+
+    /**
+     *    Gets the list of interfaces from a class. If the
+     *    class name is actually an interface then just that
+     *    interface is returned.
+     *    @returns array          List of interfaces.
+     *    @access public
+     */
+    function getInterfaces() {
+        return array();
+    }
+
+    /**
+     *    Finds the parent class name.
+     *    @returns string      Parent class name.
+     *    @access public
+     */
+    function getParent() {
+        return strtolower(get_parent_class($this->_interface));
+    }
+
+    /**
+     *    Determines if the class is abstract, which for PHP 4
+     *    will never be the case.
+     *    @returns boolean      True if abstract.
+     *    @access public
+     */
+    function isAbstract() {
+        return false;
+    }
+
+    /**
+     *    Determines if the the entity is an interface, which for PHP 4
+     *    will never be the case.
+     *    @returns boolean      True if interface.
+     *    @access public
+     */
+    function isInterface() {
+        return false;
+    }
+
+    /**
+     *    Scans for final methods, but as it's PHP 4 there
+     *    aren't any.
+     *    @returns boolean   True if the class has a final method.
+     *    @access public
+     */
+    function hasFinal() {
+        return false;
+    }
+
+    /**
+     *    Gets the source code matching the declaration
+     *    of a method.
+     *    @param string $method       Method name.
+     *    @access public
+     */
+    function getSignature($method) {
+        return "function &$method()";
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php5.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php5.php
new file mode 100644
index 000000000..43d8a7b28
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/reflection_php5.php
@@ -0,0 +1,386 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reflection_php5.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**
+ *    Version specific reflection API.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReflection {
+    private $interface;
+
+    /**
+     *    Stashes the class/interface.
+     *    @param string $interface    Class or interface
+     *                                to inspect.
+     */
+    function __construct($interface) {
+        $this->interface = $interface;
+    }
+
+    /**
+     *    Checks that a class has been declared. Versions
+     *    before PHP5.0.2 need a check that it's not really
+     *    an interface.
+     *    @return boolean            True if defined.
+     *    @access public
+     */
+    function classExists() {
+        if (! class_exists($this->interface)) {
+            return false;
+        }
+        $reflection = new ReflectionClass($this->interface);
+        return ! $reflection->isInterface();
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classExistsSansAutoload() {
+        return class_exists($this->interface, false);
+    }
+
+    /**
+     *    Checks that a class or interface has been
+     *    declared.
+     *    @return boolean            True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExists() {
+        return $this->classOrInterfaceExistsWithAutoload($this->interface, true);
+    }
+
+    /**
+     *    Needed to kill the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @return boolean        True if defined.
+     *    @access public
+     */
+    function classOrInterfaceExistsSansAutoload() {
+        return $this->classOrInterfaceExistsWithAutoload($this->interface, false);
+    }
+
+    /**
+     *    Needed to select the autoload feature in PHP5
+     *    for classes created dynamically.
+     *    @param string $interface       Class or interface name.
+     *    @param boolean $autoload       True totriggerautoload.
+     *    @return boolean                True if interface defined.
+     *    @access private
+     */
+    protected function classOrInterfaceExistsWithAutoload($interface, $autoload) {
+        if (function_exists('interface_exists')) {
+            if (interface_exists($this->interface, $autoload)) {
+                return true;
+            }
+        }
+        return class_exists($this->interface, $autoload);
+    }
+
+    /**
+     *    Gets the list of methods on a class or
+     *    interface.
+     *    @returns array              List of method names.
+     *    @access public
+     */
+    function getMethods() {
+        return array_unique(get_class_methods($this->interface));
+    }
+
+    /**
+     *    Gets the list of interfaces from a class. If the
+     *    class name is actually an interface then just that
+     *    interface is returned.
+     *    @returns array          List of interfaces.
+     *    @access public
+     */
+    function getInterfaces() {
+        $reflection = new ReflectionClass($this->interface);
+        if ($reflection->isInterface()) {
+            return array($this->interface);
+        }
+        return $this->onlyParents($reflection->getInterfaces());
+    }
+
+    /**
+     *    Gets the list of methods for the implemented
+     *    interfaces only.
+     *    @returns array      List of enforced method signatures.
+     *    @access public
+     */
+    function getInterfaceMethods() {
+        $methods = array();
+        foreach ($this->getInterfaces() as $interface) {
+            $methods = array_merge($methods, get_class_methods($interface));
+        }
+        return array_unique($methods);
+    }
+
+    /**
+     *    Checks to see if the method signature has to be tightly
+     *    specified.
+     *    @param string $method        Method name.
+     *    @returns boolean             True if enforced.
+     *    @access private
+     */
+    protected function isInterfaceMethod($method) {
+        return in_array($method, $this->getInterfaceMethods());
+    }
+
+    /**
+     *    Finds the parent class name.
+     *    @returns string      Parent class name.
+     *    @access public
+     */
+    function getParent() {
+        $reflection = new ReflectionClass($this->interface);
+        $parent = $reflection->getParentClass();
+        if ($parent) {
+            return $parent->getName();
+        }
+        return false;
+    }
+
+    /**
+     *    Trivially determines if the class is abstract.
+     *    @returns boolean      True if abstract.
+     *    @access public
+     */
+    function isAbstract() {
+        $reflection = new ReflectionClass($this->interface);
+        return $reflection->isAbstract();
+    }
+
+    /**
+     *    Trivially determines if the class is an interface.
+     *    @returns boolean      True if interface.
+     *    @access public
+     */
+    function isInterface() {
+        $reflection = new ReflectionClass($this->interface);
+        return $reflection->isInterface();
+    }
+
+    /**
+     *    Scans for final methods, as they screw up inherited
+     *    mocks by not allowing you to override them.
+     *    @returns boolean   True if the class has a final method.
+     *    @access public
+     */
+    function hasFinal() {
+        $reflection = new ReflectionClass($this->interface);
+        foreach ($reflection->getMethods() as $method) {
+            if ($method->isFinal()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Whittles a list of interfaces down to only the
+     *    necessary top level parents.
+     *    @param array $interfaces     Reflection API interfaces
+     *                                 to reduce.
+     *    @returns array               List of parent interface names.
+     *    @access private
+     */
+    protected function onlyParents($interfaces) {
+        $parents = array();
+        $blacklist = array();
+        foreach ($interfaces as $interface) {
+            foreach($interfaces as $possible_parent) {
+                if ($interface->getName() == $possible_parent->getName()) {
+                    continue;
+                }
+                if ($interface->isSubClassOf($possible_parent)) {
+                    $blacklist[$possible_parent->getName()] = true;
+                }
+            }
+            if (!isset($blacklist[$interface->getName()])) {
+                $parents[] = $interface->getName();
+            }
+        }
+        return $parents;
+    }
+
+    /**
+     * Checks whether a method is abstract or not.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is abstract, else false
+     * @access  private
+     */
+    protected function isAbstractMethod($name) {
+        $interface = new ReflectionClass($this->interface);
+        if (! $interface->hasMethod($name)) {
+            return false;
+        }
+        return $interface->getMethod($name)->isAbstract();
+    }
+
+    /**
+     * Checks whether a method is the constructor.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is the constructor
+     * @access  private
+     */
+    protected function isConstructor($name) {
+        return ($name == '__construct') || ($name == $this->interface);
+    }
+
+    /**
+     * Checks whether a method is abstract in all parents or not.
+     * @param   string   $name  Method name.
+     * @return  bool            true if method is abstract in parent, else false
+     * @access  private
+     */
+    protected function isAbstractMethodInParents($name) {
+        $interface = new ReflectionClass($this->interface);
+        $parent = $interface->getParentClass();
+        while($parent) {
+            if (! $parent->hasMethod($name)) {
+                return false;
+            }
+            if ($parent->getMethod($name)->isAbstract()) {
+                return true;
+            }
+            $parent = $parent->getParentClass();
+        }
+        return false;
+    }
+
+    /**
+     * Checks whether a method is static or not.
+     * @param   string  $name   Method name
+     * @return  bool            true if method is static, else false
+     * @access  private
+     */
+    protected function isStaticMethod($name) {
+        $interface = new ReflectionClass($this->interface);
+        if (! $interface->hasMethod($name)) {
+            return false;
+        }
+        return $interface->getMethod($name)->isStatic();
+    }
+
+    /**
+     *    Writes the source code matching the declaration
+     *    of a method.
+     *    @param string $name    Method name.
+     *    @return string         Method signature up to last
+     *                           bracket.
+     *    @access public
+     */
+    function getSignature($name) {
+        if ($name == '__set') {
+            return 'function __set($key, $value)';
+        }
+        if ($name == '__call') {
+            return 'function __call($method, $arguments)';
+        }
+        if (version_compare(phpversion(), '5.1.0', '>=')) {
+            if (in_array($name, array('__get', '__isset', $name == '__unset'))) {
+                return "function {$name}(\$key)";
+            }
+        }
+        if ($name == '__toString') {
+            return "function $name()";
+        }
+
+        // This wonky try-catch is a work around for a faulty method_exists()
+        // in early versions of PHP 5 which would return false for static
+        // methods. The Reflection classes work fine, but hasMethod()
+        // doesn't exist prior to PHP 5.1.0, so we need to use a more crude
+        // detection method.
+        try {
+            $interface = new ReflectionClass($this->interface);
+            $interface->getMethod($name);
+        } catch (ReflectionException $e) {
+            return "function $name()";
+        }
+        return $this->getFullSignature($name);
+    }
+
+    /**
+     *    For a signature specified in an interface, full
+     *    details must be replicated to be a valid implementation.
+     *    @param string $name    Method name.
+     *    @return string         Method signature up to last
+     *                           bracket.
+     *    @access private
+     */
+    protected function getFullSignature($name) {
+        $interface = new ReflectionClass($this->interface);
+        $method = $interface->getMethod($name);
+        $reference = $method->returnsReference() ? '&' : '';
+        $static = $method->isStatic() ? 'static ' : '';
+        return "{$static}function $reference$name(" .
+                implode(', ', $this->getParameterSignatures($method)) .
+                ")";
+    }
+
+    /**
+     *    Gets the source code for each parameter.
+     *    @param ReflectionMethod $method   Method object from
+     *                                      reflection API
+     *    @return array                     List of strings, each
+     *                                      a snippet of code.
+     *    @access private
+     */
+    protected function getParameterSignatures($method) {
+        $signatures = array();
+        foreach ($method->getParameters() as $parameter) {
+            $signature = '';
+            $type = $parameter->getClass();
+            if (is_null($type) && version_compare(phpversion(), '5.1.0', '>=') && $parameter->isArray()) {
+                $signature .= 'array ';
+            } elseif (!is_null($type)) {
+                $signature .= $type->getName() . ' ';
+            }
+            if ($parameter->isPassedByReference()) {
+                $signature .= '&';
+            }
+            $signature .= '$' . $this->suppressSpurious($parameter->getName());
+            if ($this->isOptional($parameter)) {
+                $signature .= ' = null';
+            }
+            $signatures[] = $signature;
+        }
+        return $signatures;
+    }
+
+    /**
+     *    The SPL library has problems with the
+     *    Reflection library. In particular, you can
+     *    get extra characters in parameter names :(.
+     *    @param string $name    Parameter name.
+     *    @return string         Cleaner name.
+     *    @access private
+     */
+    protected function suppressSpurious($name) {
+        return str_replace(array('[', ']', ' '), '', $name);
+    }
+
+    /**
+     *    Test of a reflection parameter being optional
+     *    that works with early versions of PHP5.
+     *    @param reflectionParameter $parameter    Is this optional.
+     *    @return boolean                          True if optional.
+     *    @access private
+     */
+    protected function isOptional($parameter) {
+        if (method_exists($parameter, 'isOptional')) {
+            return $parameter->isOptional();
+        }
+        return false;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/remote.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/remote.php
new file mode 100644
index 000000000..4bb37b7c5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/remote.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: remote.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/browser.php');
+require_once(dirname(__FILE__) . '/xml.php');
+require_once(dirname(__FILE__) . '/test_case.php');
+/**#@-*/
+
+/**
+ *    Runs an XML formated test on a remote server.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class RemoteTestCase {
+    private $url;
+    private $dry_url;
+    private $size;
+
+    /**
+     *    Sets the location of the remote test.
+     *    @param string $url       Test location.
+     *    @param string $dry_url   Location for dry run.
+     *    @access public
+     */
+    function __construct($url, $dry_url = false) {
+        $this->url = $url;
+        $this->dry_url = $dry_url ? $dry_url : $url;
+        $this->size = false;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->url;
+    }
+
+    /**
+     *    Runs the top level test for this class. Currently
+     *    reads the data as a single chunk. I'll fix this
+     *    once I have added iteration to the browser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @returns boolean                   True if no failures.
+     *    @access public
+     */
+    function run($reporter) {
+        $browser = $this->createBrowser();
+        $xml = $browser->get($this->url);
+        if (! $xml) {
+            trigger_error('Cannot read remote test URL [' . $this->url . ']');
+            return false;
+        }
+        $parser = $this->createParser($reporter);
+        if (! $parser->parse($xml)) {
+            trigger_error('Cannot parse incoming XML from [' . $this->url . ']');
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Creates a new web browser object for fetching
+     *    the XML report.
+     *    @return SimpleBrowser           New browser.
+     *    @access protected
+     */
+    protected function createBrowser() {
+        return new SimpleBrowser();
+    }
+
+    /**
+     *    Creates the XML parser.
+     *    @param SimpleReporter $reporter    Target of test results.
+     *    @return SimpleTestXmlListener      XML reader.
+     *    @access protected
+     */
+    protected function createParser($reporter) {
+        return new SimpleTestXmlParser($reporter);
+    }
+
+    /**
+     *    Accessor for the number of subtests.
+     *    @return integer           Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        if ($this->size === false) {
+            $browser = $this->createBrowser();
+            $xml = $browser->get($this->dry_url);
+            if (! $xml) {
+                trigger_error('Cannot read remote test URL [' . $this->dry_url . ']');
+                return false;
+            }
+            $reporter = new SimpleReporter();
+            $parser = $this->createParser($reporter);
+            if (! $parser->parse($xml)) {
+                trigger_error('Cannot parse incoming XML from [' . $this->dry_url . ']');
+                return false;
+            }
+            $this->size = $reporter->getTestCaseCount();
+        }
+        return $this->size;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/reporter.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/reporter.php
new file mode 100644
index 000000000..bf8d2ac11
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/reporter.php
@@ -0,0 +1,445 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: reporter.php 1995 2010-04-06 12:57:40Z lastcraft $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+//require_once(dirname(__FILE__) . '/arguments.php');
+/**#@-*/
+
+/**
+ *    Sample minimal test displayer. Generates only
+ *    failure messages and a pass count.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class HtmlReporter extends SimpleReporter {
+    private $character_set;
+
+    /**
+     *    Does nothing yet. The first output will
+     *    be sent on the first test start. For use
+     *    by a web browser.
+     *    @access public
+     */
+    function __construct($character_set = 'ISO-8859-1') {
+        parent::__construct();
+        $this->character_set = $character_set;
+    }
+
+    /**
+     *    Paints the top of the web page setting the
+     *    title to the name of the starting test.
+     *    @param string $test_name      Name class of test.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+        $this->sendNoCacheHeaders();
+        print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
+        print "<html>\n<head>\n<title>$test_name</title>\n";
+        print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
+                $this->character_set . "\">\n";
+        print "<style type=\"text/css\">\n";
+        print $this->getCss() . "\n";
+        print "</style>\n";
+        print "</head>\n<body>\n";
+        print "<h1>$test_name</h1>\n";
+        flush();
+    }
+
+    /**
+     *    Send the headers necessary to ensure the page is
+     *    reloaded on every request. Otherwise you could be
+     *    scratching your head over out of date test data.
+     *    @access public
+     */
+    static function sendNoCacheHeaders() {
+        if (! headers_sent()) {
+            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+            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");
+        }
+    }
+
+    /**
+     *    Paints the CSS. Add additional styles here.
+     *    @return string            CSS code as text.
+     *    @access protected
+     */
+    protected function getCss() {
+        return ".fail { background-color: inherit; color: red; }" .
+                ".pass { background-color: inherit; color: green; }" .
+                " pre { background-color: lightgray; color: inherit; }";
+    }
+
+    /**
+     *    Paints the end of the test with a summary of
+     *    the passes and failures.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+        $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
+        print "<div style=\"";
+        print "padding: 8px; margin-top: 1em; background-color: $colour; color: white;";
+        print "\">";
+        print $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
+        print " test cases complete:\n";
+        print "<strong>" . $this->getPassCount() . "</strong> passes, ";
+        print "<strong>" . $this->getFailCount() . "</strong> fails and ";
+        print "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
+        print "</div>\n";
+        print "</body>\n</html>\n";
+    }
+
+    /**
+     *    Paints the test failure with a breadcrumbs
+     *    trail of the nesting test suites below the
+     *    top level test.
+     *    @param string $message    Failure message displayed in
+     *                              the context of the other tests.
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print "<span class=\"fail\">Fail</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
+    }
+
+    /**
+     *    Paints a PHP error.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print "<span class=\"fail\">Exception</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
+    }
+
+    /**
+     *    Paints a PHP exception.
+     *    @param Exception $exception        Exception to display.
+     *    @access public
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        print "<span class=\"fail\">Exception</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print " -&gt; <strong>" . $this->htmlEntities($message) . "</strong><br />\n";
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print "<span class=\"pass\">Skipped</span>: ";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print implode(" -&gt; ", $breadcrumb);
+        print " -&gt; " . $this->htmlEntities($message) . "<br />\n";
+    }
+
+    /**
+     *    Paints formatted text such as dumped privateiables.
+     *    @param string $message        Text to show.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        print '<pre>' . $this->htmlEntities($message) . '</pre>';
+    }
+
+    /**
+     *    Character set adjusted entity conversion.
+     *    @param string $message    Plain text or Unicode message.
+     *    @return string            Browser readable message.
+     *    @access protected
+     */
+    protected function htmlEntities($message) {
+        return htmlentities($message, ENT_COMPAT, $this->character_set);
+    }
+}
+
+/**
+ *    Sample minimal test displayer. Generates only
+ *    failure messages and a pass count. For command
+ *    line use. I've tried to make it look like JUnit,
+ *    but I wanted to output the errors as they arrived
+ *    which meant dropping the dots.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class TextReporter extends SimpleReporter {
+
+    /**
+     *    Does nothing yet. The first output will
+     *    be sent on the first test start.
+     */
+    function __construct() {
+        parent::__construct();
+    }
+
+    /**
+     *    Paints the title only.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintHeader($test_name) {
+        if (! SimpleReporter::inCli()) {
+            header('Content-type: text/plain');
+        }
+        print "$test_name\n";
+        flush();
+    }
+
+    /**
+     *    Paints the end of the test with a summary of
+     *    the passes and failures.
+     *    @param string $test_name        Name class of test.
+     *    @access public
+     */
+    function paintFooter($test_name) {
+        if ($this->getFailCount() + $this->getExceptionCount() == 0) {
+            print "OK\n";
+        } else {
+            print "FAILURES!!!\n";
+        }
+        print "Test cases run: " . $this->getTestCaseProgress() .
+                "/" . $this->getTestCaseCount() .
+                ", Passes: " . $this->getPassCount() .
+                ", Failures: " . $this->getFailCount() .
+                ", Exceptions: " . $this->getExceptionCount() . "\n";
+    }
+
+    /**
+     *    Paints the test failure as a stack trace.
+     *    @param string $message    Failure message displayed in
+     *                              the context of the other tests.
+     *    @access public
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print $this->getFailCount() . ") $message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Paints a PHP error or exception.
+     *    @param string $message        Message to be shown.
+     *    @access public
+     *    @abstract
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Paints a PHP error or exception.
+     *    @param Exception $exception      Exception to describe.
+     *    @access public
+     *    @abstract
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
+        $breadcrumb = $this->getTestList();
+        array_shift($breadcrumb);
+        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
+        print "\n";
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print "Skip: $message\n";
+    }
+
+    /**
+     *    Paints formatted text such as dumped privateiables.
+     *    @param string $message        Text to show.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        print "$message\n";
+        flush();
+    }
+}
+
+/**
+ *    Runs just a single test group, a single case or
+ *    even a single test within that case.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SelectiveReporter extends SimpleReporterDecorator {
+    private $just_this_case = false;
+    private $just_this_test = false;
+    private $on;
+
+    /**
+     *    Selects the test case or group to be run,
+     *    and optionally a specific test.
+     *    @param SimpleScorer $reporter    Reporter to receive events.
+     *    @param string $just_this_case    Only this case or group will run.
+     *    @param string $just_this_test    Only this test method will run.
+     */
+    function __construct($reporter, $just_this_case = false, $just_this_test = false) {
+        if (isset($just_this_case) && $just_this_case) {
+            $this->just_this_case = strtolower($just_this_case);
+            $this->off();
+        } else {
+            $this->on();
+        }
+        if (isset($just_this_test) && $just_this_test) {
+            $this->just_this_test = strtolower($just_this_test);
+        }
+        parent::__construct($reporter);
+    }
+
+    /**
+     *    Compares criteria to actual the case/group name.
+     *    @param string $test_case    The incoming test.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function matchesTestCase($test_case) {
+        return $this->just_this_case == strtolower($test_case);
+    }
+
+    /**
+     *    Compares criteria to actual the test name. If no
+     *    name was specified at the beginning, then all tests
+     *    can run.
+     *    @param string $method       The incoming test method.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function shouldRunTest($test_case, $method) {
+        if ($this->isOn() || $this->matchesTestCase($test_case)) {
+            if ($this->just_this_test) {
+                return $this->just_this_test == strtolower($method);
+            } else {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Switch on testing for the group or subgroup.
+     *    @access private
+     */
+    protected function on() {
+        $this->on = true;
+    }
+
+    /**
+     *    Switch off testing for the group or subgroup.
+     *    @access private
+     */
+    protected function off() {
+        $this->on = false;
+    }
+
+    /**
+     *    Is this group actually being tested?
+     *    @return boolean     True if the current test group is active.
+     *    @access private
+     */
+    protected function isOn() {
+        return $this->on;
+    }
+
+    /**
+     *    Veto everything that doesn't match the method wanted.
+     *    @param string $test_case       Name of test case.
+     *    @param string $method          Name of test method.
+     *    @return boolean                True if test should be run.
+     *    @access public
+     */
+    function shouldInvoke($test_case, $method) {
+        if ($this->shouldRunTest($test_case, $method)) {
+            return $this->reporter->shouldInvoke($test_case, $method);
+        }
+        return false;
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_case     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_case, $size) {
+        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
+            $this->on();
+        }
+        $this->reporter->paintGroupStart($test_case, $size);
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_case     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_case) {
+        $this->reporter->paintGroupEnd($test_case);
+        if ($this->just_this_case && $this->matchesTestCase($test_case)) {
+            $this->off();
+        }
+    }
+}
+
+/**
+ *    Suppresses skip messages.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoSkipsReporter extends SimpleReporterDecorator {
+
+    /**
+     *    Does nothing.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) { }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/scorer.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/scorer.php
new file mode 100644
index 000000000..27776f4b6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/scorer.php
@@ -0,0 +1,875 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: scorer.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+*/
+require_once(dirname(__FILE__) . '/invoker.php');
+/**#@-*/
+
+/**
+ *    Can receive test events and display them. Display
+ *    is achieved by making display methods available
+ *    and visiting the incoming event.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ *    @abstract
+ */
+class SimpleScorer {
+    private $passes;
+    private $fails;
+    private $exceptions;
+    private $is_dry_run;
+
+    /**
+     *    Starts the test run with no results.
+     *    @access public
+     */
+    function __construct() {
+        $this->passes = 0;
+        $this->fails = 0;
+        $this->exceptions = 0;
+        $this->is_dry_run = false;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        $this->is_dry_run = $is_dry;
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    @param string $test_case_name  name of test case.
+     *    @param string $method          Name of test method.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        return ! $this->is_dry_run;
+    }
+
+    /**
+     *    Can wrap the invoker in preperation for running
+     *    a test.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        return $invoker;
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    Used for command line tools.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        if ($this->exceptions + $this->fails > 0) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+    }
+
+    /**
+     *    Increments the pass count.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        $this->passes++;
+    }
+
+    /**
+     *    Increments the fail count.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        $this->fails++;
+    }
+
+    /**
+     *    Deals with PHP 4 throwing an error.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        $this->exceptions++;
+    }
+
+    /**
+     *    Deals with PHP 5 throwing an exception.
+     *    @param Exception $exception    The actual exception thrown.
+     *    @access public
+     */
+    function paintException($exception) {
+        $this->exceptions++;
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+    }
+
+    /**
+     *    Accessor for the number of passes so far.
+     *    @return integer       Number of passes.
+     *    @access public
+     */
+    function getPassCount() {
+        return $this->passes;
+    }
+
+    /**
+     *    Accessor for the number of fails so far.
+     *    @return integer       Number of fails.
+     *    @access public
+     */
+    function getFailCount() {
+        return $this->fails;
+    }
+
+    /**
+     *    Accessor for the number of untrapped errors
+     *    so far.
+     *    @return integer       Number of exceptions.
+     *    @access public
+     */
+    function getExceptionCount() {
+        return $this->exceptions;
+    }
+
+    /**
+     *    Paints a simple supplementary message.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+    }
+
+    /**
+     *    Paints a formatted ASCII message such as a
+     *    privateiable dump.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+    }
+
+    /**
+     *    By default just ignores user generated events.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+    }
+}
+
+/**
+ *    Recipient of generated test messages that can display
+ *    page footers and headers. Also keeps track of the
+ *    test nesting. This is the main base class on which
+ *    to build the finished test (page based) displays.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReporter extends SimpleScorer {
+    private $test_stack;
+    private $size;
+    private $progress;
+
+    /**
+     *    Starts the display with no results in.
+     *    @access public
+     */
+    function __construct() {
+        parent::__construct();
+        $this->test_stack = array();
+        $this->size = null;
+        $this->progress = 0;
+    }
+
+    /**
+     *    Gets the formatter for small generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Paints the start of a group test. Will also paint
+     *    the page header and footer if this is the
+     *    first test. Will stash the size if the first
+     *    start.
+     *    @param string $test_name   Name of test that is starting.
+     *    @param integer $size       Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        if (! isset($this->size)) {
+            $this->size = $size;
+        }
+        if (count($this->test_stack) == 0) {
+            $this->paintHeader($test_name);
+        }
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a group test. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @param integer $progress   Number of test cases ending.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        array_pop($this->test_stack);
+        if (count($this->test_stack) == 0) {
+            $this->paintFooter($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test case. Will also paint
+     *    the page header and footer if this is the
+     *    first test. Will stash the size if the first
+     *    start.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        if (! isset($this->size)) {
+            $this->size = 1;
+        }
+        if (count($this->test_stack) == 0) {
+            $this->paintHeader($test_name);
+        }
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a test case. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        $this->progress++;
+        array_pop($this->test_stack);
+        if (count($this->test_stack) == 0) {
+            $this->paintFooter($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        $this->test_stack[] = $test_name;
+    }
+
+    /**
+     *    Paints the end of a test method. Will paint the page
+     *    footer if the stack of tests has unwound.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        array_pop($this->test_stack);
+    }
+
+    /**
+     *    Paints the test document header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     *    @abstract
+     */
+    function paintHeader($test_name) {
+    }
+
+    /**
+     *    Paints the test document footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     *    @abstract
+     */
+    function paintFooter($test_name) {
+    }
+
+    /**
+     *    Accessor for internal test stack. For
+     *    subclasses that need to see the whole test
+     *    history for display purposes.
+     *    @return array     List of methods in nesting order.
+     *    @access public
+     */
+    function getTestList() {
+        return $this->test_stack;
+    }
+
+    /**
+     *    Accessor for total test size in number
+     *    of test cases. Null until the first
+     *    test is started.
+     *    @return integer   Total number of cases at start.
+     *    @access public
+     */
+    function getTestCaseCount() {
+        return $this->size;
+    }
+
+    /**
+     *    Accessor for the number of test cases
+     *    completed so far.
+     *    @return integer   Number of ended cases.
+     *    @access public
+     */
+    function getTestCaseProgress() {
+        return $this->progress;
+    }
+
+    /**
+     *    Static check for running in the comand line.
+     *    @return boolean        True if CLI.
+     *    @access public
+     */
+    static function inCli() {
+        return php_sapi_name() == 'cli';
+    }
+}
+
+/**
+ *    For modifying the behaviour of the visual reporters.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleReporterDecorator {
+    protected $reporter;
+
+    /**
+     *    Mediates between the reporter and the test case.
+     *    @param SimpleScorer $reporter       Reporter to receive events.
+     */
+    function __construct($reporter) {
+        $this->reporter = $reporter;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        $this->reporter->makeDry($is_dry);
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    Used for command line tools.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        return $this->reporter->getStatus();
+    }
+
+    /**
+     *    The nesting of the test cases so far. Not
+     *    all reporters have this facility.
+     *    @return array        Test list if accessible.
+     *    @access public
+     */
+    function getTestList() {
+        if (method_exists($this->reporter, 'getTestList')) {
+            return $this->reporter->getTestList();
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    @param string $test_case_name  Name of test case.
+     *    @param string $method          Name of test method.
+     *    @return boolean                True if test should be run.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        return $this->reporter->shouldInvoke($test_case_name, $method);
+    }
+
+    /**
+     *    Can wrap the invoker in preparation for running
+     *    a test.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        return $this->reporter->createInvoker($invoker);
+    }
+
+    /**
+     *    Gets the formatter for privateiables and other small
+     *    generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return $this->reporter->getDumper();
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        $this->reporter->paintGroupStart($test_name, $size);
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        $this->reporter->paintGroupEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        $this->reporter->paintCaseStart($test_name);
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        $this->reporter->paintCaseEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        $this->reporter->paintMethodStart($test_name);
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        $this->reporter->paintMethodEnd($test_name);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        $this->reporter->paintPass($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        $this->reporter->paintFail($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        $this->reporter->paintError($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param Exception $exception        Exception to show.
+     *    @access public
+     */
+    function paintException($exception) {
+        $this->reporter->paintException($exception);
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        $this->reporter->paintSkip($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        $this->reporter->paintMessage($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        $this->reporter->paintFormattedMessage($message);
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @return boolean            Should return false if this
+     *                               type of signal should fail the
+     *                               test suite.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        $this->reporter->paintSignal($type, $payload);
+    }
+}
+
+/**
+ *    For sending messages to multiple reporters at
+ *    the same time.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class MultipleReporter {
+    private $reporters = array();
+
+    /**
+     *    Adds a reporter to the subscriber list.
+     *    @param SimpleScorer $reporter     Reporter to receive events.
+     *    @access public
+     */
+    function attachReporter($reporter) {
+        $this->reporters[] = $reporter;
+    }
+
+    /**
+     *    Signals that the next evaluation will be a dry
+     *    run. That is, the structure events will be
+     *    recorded, but no tests will be run.
+     *    @param boolean $is_dry        Dry run if true.
+     *    @access public
+     */
+    function makeDry($is_dry = true) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->makeDry($is_dry);
+        }
+    }
+
+    /**
+     *    Accessor for current status. Will be false
+     *    if there have been any failures or exceptions.
+     *    If any reporter reports a failure, the whole
+     *    suite fails.
+     *    @return boolean        True if no failures.
+     *    @access public
+     */
+    function getStatus() {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            if (! $this->reporters[$i]->getStatus()) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    The reporter has a veto on what should be run.
+     *    It requires all reporters to want to run the method.
+     *    @param string $test_case_name  name of test case.
+     *    @param string $method          Name of test method.
+     *    @access public
+     */
+    function shouldInvoke($test_case_name, $method) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            if (! $this->reporters[$i]->shouldInvoke($test_case_name, $method)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Every reporter gets a chance to wrap the invoker.
+     *    @param SimpleInvoker $invoker   Individual test runner.
+     *    @return SimpleInvoker           Wrapped test runner.
+     *    @access public
+     */
+    function createInvoker($invoker) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $invoker = $this->reporters[$i]->createInvoker($invoker);
+        }
+        return $invoker;
+    }
+
+    /**
+     *    Gets the formatter for privateiables and other small
+     *    generic data items.
+     *    @return SimpleDumper          Formatter.
+     *    @access public
+     */
+    function getDumper() {
+        return new SimpleDumper();
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @param integer $size         Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintGroupStart($test_name, $size);
+        }
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintGroupEnd($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintCaseStart($test_name);
+        }
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintCaseEnd($test_name);
+        }
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMethodStart($test_name);
+        }
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name     Name of test or other label.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMethodEnd($test_name);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintPass($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintPass($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Message is ignored.
+     *    @access public
+     */
+    function paintFail($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintFail($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message    Text of error formatted by
+     *                              the test case.
+     *    @access public
+     */
+    function paintError($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintError($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param Exception $exception    Exception to display.
+     *    @access public
+     */
+    function paintException($exception) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintException($exception);
+        }
+    }
+
+    /**
+     *    Prints the message for skipping tests.
+     *    @param string $message    Text of skip condition.
+     *    @access public
+     */
+    function paintSkip($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintSkip($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintMessage($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintFormattedMessage($message);
+        }
+    }
+
+    /**
+     *    Chains to the wrapped reporter.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @return boolean            Should return false if this
+     *                               type of signal should fail the
+     *                               test suite.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        for ($i = 0; $i < count($this->reporters); $i++) {
+            $this->reporters[$i]->paintSignal($type, $payload);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/selector.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/selector.php
new file mode 100644
index 000000000..ba2fed312
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/selector.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: selector.php 1786 2008-04-26 17:32:20Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/tag.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by name attribute.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByName {
+    private $name;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $name     Name attribute to match.
+     */
+    function __construct($name) {
+        $this->name = $name;
+    }
+
+    /**
+     *  Accessor for name.
+     *  @returns string $name       Name to match.
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Compares with name attribute of widget.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        return ($widget->getName() == $this->name);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by visible label or alt text.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByLabel {
+    private $label;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $label     Visible text to match.
+     */
+    function __construct($label) {
+        $this->label = $label;
+    }
+
+    /**
+     *    Comparison. Compares visible text of widget or
+     *    related label.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        if (! method_exists($widget, 'isLabel')) {
+            return false;
+        }
+        return $widget->isLabel($this->label);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches dy id attribute.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleById {
+    private $id;
+
+    /**
+     *    Stashes the name for later comparison.
+     *    @param string $id     ID atribute to match.
+     */
+    function __construct($id) {
+        $this->id = $id;
+    }
+
+    /**
+     *    Comparison. Compares id attribute of widget.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        return $widget->isId($this->id);
+    }
+}
+
+/**
+ *    Used to extract form elements for testing against.
+ *    Searches by visible label, name or alt text.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleByLabelOrName {
+    private $label;
+
+    /**
+     *    Stashes the name/label for later comparison.
+     *    @param string $label     Visible text to match.
+     */
+    function __construct($label) {
+        $this->label = $label;
+    }
+
+    /**
+     *    Comparison. Compares visible text of widget or
+     *    related label or name.
+     *    @param SimpleWidget $widget    Control to compare.
+     *    @access public
+     */
+    function isMatch($widget) {
+        if (method_exists($widget, 'isLabel')) {
+            if ($widget->isLabel($this->label)) {
+                return true;
+            }
+        }
+        return ($widget->getName() == $this->label);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/shell_tester.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/shell_tester.php
new file mode 100644
index 000000000..9a3bd389e
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/shell_tester.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: shell_tester.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+/**#@-*/
+
+/**
+ *    Wrapper for exec() functionality.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleShell {
+    private $output;
+
+    /**
+     *    Executes the shell comand and stashes the output.
+     *    @access public
+     */
+    function __construct() {
+        $this->output = false;
+    }
+
+    /**
+     *    Actually runs the command. Does not trap the
+     *    error stream output as this need PHP 4.3+.
+     *    @param string $command    The actual command line
+     *                              to run.
+     *    @return integer           Exit code.
+     *    @access public
+     */
+    function execute($command) {
+        $this->output = false;
+        exec($command, $this->output, $ret);
+        return $ret;
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return string        Output as text.
+     *    @access public
+     */
+    function getOutput() {
+        return implode("\n", $this->output);
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return array         Output as array of lines.
+     *    @access public
+     */
+    function getOutputAsList() {
+        return $this->output;
+    }
+}
+
+/**
+ *    Test case for testing of command line scripts and
+ *    utilities. Usually scripts that are external to the
+ *    PHP code, but support it in some way.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class ShellTestCase extends SimpleTestCase {
+    private $current_shell;
+    private $last_status;
+    private $last_command;
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        parent::__construct($label);
+        $this->current_shell = $this->createShell();
+        $this->last_status = false;
+        $this->last_command = '';
+    }
+
+    /**
+     *    Executes a command and buffers the results.
+     *    @param string $command     Command to run.
+     *    @return boolean            True if zero exit code.
+     *    @access public
+     */
+    function execute($command) {
+        $shell = $this->getShell();
+        $this->last_status = $shell->execute($command);
+        $this->last_command = $command;
+        return ($this->last_status === 0);
+    }
+
+    /**
+     *    Dumps the output of the last command.
+     *    @access public
+     */
+    function dumpOutput() {
+        $this->dump($this->getOutput());
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return string        Output as text.
+     *    @access public
+     */
+    function getOutput() {
+        $shell = $this->getShell();
+        return $shell->getOutput();
+    }
+
+    /**
+     *    Accessor for the last output.
+     *    @return array         Output as array of lines.
+     *    @access public
+     */
+    function getOutputAsList() {
+        $shell = $this->getShell();
+        return $shell->getOutputAsList();
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = false) {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = "%s") {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = "%s") {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Tests the last status code from the shell.
+     *    @param integer $status   Expected status of last
+     *                             command.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertExitCode($status, $message = "%s") {
+        $message = sprintf($message, "Expected status code of [$status] from [" .
+                $this->last_command . "], but got [" .
+                $this->last_status . "]");
+        return $this->assertTrue($status === $this->last_status, $message);
+    }
+
+    /**
+     *    Attempt to exactly match the combined STDERR and
+     *    STDOUT output.
+     *    @param string $expected  Expected output.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertOutput($expected, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new EqualExpectation($expected),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    Scans the output for a Perl regex. If found
+     *    anywhere it passes, else it fails.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertOutputPattern($pattern, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    If a Perl regex is found anywhere in the current
+     *    output then a failure is generated, else a pass.
+     *    @param string $pattern    Regex to search for.
+     *    @param $message           Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoOutputPattern($pattern, $message = "%s") {
+        $shell = $this->getShell();
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $shell->getOutput(),
+                $message);
+    }
+
+    /**
+     *    File existence check.
+     *    @param string $path      Full filename and path.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertFileExists($path, $message = "%s") {
+        $message = sprintf($message, "File [$path] should exist");
+        return $this->assertTrue(file_exists($path), $message);
+    }
+
+    /**
+     *    File non-existence check.
+     *    @param string $path      Full filename and path.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertFileNotExists($path, $message = "%s") {
+        $message = sprintf($message, "File [$path] should not exist");
+        return $this->assertFalse(file_exists($path), $message);
+    }
+
+    /**
+     *    Scans a file for a Perl regex. If found
+     *    anywhere it passes, else it fails.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $path       Full filename and path.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertFilePattern($pattern, $path, $message = "%s") {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                implode('', file($path)),
+                $message);
+    }
+
+    /**
+     *    If a Perl regex is found anywhere in the named
+     *    file then a failure is generated, else a pass.
+     *    @param string $pattern    Regex to search for.
+     *    @param string $path       Full filename and path.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoFilePattern($pattern, $path, $message = "%s") {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                implode('', file($path)),
+                $message);
+    }
+
+    /**
+     *    Accessor for current shell. Used for testing the
+     *    the tester itself.
+     *    @return Shell        Current shell.
+     *    @access protected
+     */
+    protected function getShell() {
+        return $this->current_shell;
+    }
+
+    /**
+     *    Factory for the shell to run the command on.
+     *    @return Shell        New shell object.
+     *    @access protected
+     */
+    protected function createShell() {
+        return new SimpleShell();
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/simpletest.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/simpletest.php
new file mode 100644
index 000000000..425c869a8
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/simpletest.php
@@ -0,0 +1,391 @@
+<?php
+/**
+ *  Global state for SimpleTest and kicker script in future versions.
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: simpletest.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+require_once(dirname(__FILE__) . '/default_reporter.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Registry and test context. Includes a few
+ *    global options that I'm slowly getting rid of.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleTest {
+
+    /**
+     *    Reads the SimpleTest version from the release file.
+     *    @return string        Version string.
+     */
+    static function getVersion() {
+        $content = file(dirname(__FILE__) . '/VERSION');
+        return trim($content[0]);
+    }
+
+    /**
+     *    Sets the name of a test case to ignore, usually
+     *    because the class is an abstract case that should
+     *    @param string $class        Add a class to ignore.
+     */
+    static function ignore($class) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['IgnoreList'][strtolower($class)] = true;
+    }
+
+    /**
+     *    Scans the now complete ignore list, and adds
+     *    all parent classes to the list. If a class
+     *    is not a runnable test case, then it's parents
+     *    wouldn't be either. This is syntactic sugar
+     *    to cut down on ommissions of ignore()'s or
+     *    missing abstract declarations. This cannot
+     *    be done whilst loading classes wiithout forcing
+     *    a particular order on the class declarations and
+     *    the ignore() calls. It's just nice to have the ignore()
+     *    calls at the top of the file before the actual declarations.
+     *    @param array $classes     Class names of interest.
+     */
+    static function ignoreParentsIfIgnored($classes) {
+        $registry = &SimpleTest::getRegistry();
+        foreach ($classes as $class) {
+            if (SimpleTest::isIgnored($class)) {
+                $reflection = new SimpleReflection($class);
+                if ($parent = $reflection->getParent()) {
+                    SimpleTest::ignore($parent);
+                }
+            }
+        }
+    }
+
+    /**
+     *   Puts the object to the global pool of 'preferred' objects
+     *   which can be retrieved with SimpleTest :: preferred() method.
+     *   Instances of the same class are overwritten.
+     *   @param object $object      Preferred object
+     *   @see preferred()
+     */
+    static function prefer($object) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['Preferred'][] = $object;
+    }
+
+    /**
+     *   Retrieves 'preferred' objects from global pool. Class filter
+     *   can be applied in order to retrieve the object of the specific
+     *   class
+     *   @param array|string $classes       Allowed classes or interfaces.
+     *   @return array|object|null
+     *   @see prefer()
+     */
+    static function preferred($classes) {
+        if (! is_array($classes)) {
+            $classes = array($classes);
+        }
+        $registry = &SimpleTest::getRegistry();
+        for ($i = count($registry['Preferred']) - 1; $i >= 0; $i--) {
+            foreach ($classes as $class) {
+                if (SimpleTestCompatibility::isA($registry['Preferred'][$i], $class)) {
+                    return $registry['Preferred'][$i];
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     *    Test to see if a test case is in the ignore
+     *    list. Quite obviously the ignore list should
+     *    be a separate object and will be one day.
+     *    This method is internal to SimpleTest. Don't
+     *    use it.
+     *    @param string $class        Class name to test.
+     *    @return boolean             True if should not be run.
+     */
+    static function isIgnored($class) {
+        $registry = &SimpleTest::getRegistry();
+        return isset($registry['IgnoreList'][strtolower($class)]);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set host
+     *    to false to disable. This will take effect
+     *    if there are no other proxy settings.
+     *    @param string $proxy     Proxy host as URL.
+     *    @param string $username  Proxy username for authentication.
+     *    @param string $password  Proxy password for authentication.
+     */
+    static function useProxy($proxy, $username = false, $password = false) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['DefaultProxy'] = $proxy;
+        $registry['DefaultProxyUsername'] = $username;
+        $registry['DefaultProxyPassword'] = $password;
+    }
+
+    /**
+     *    Accessor for default proxy host.
+     *    @return string       Proxy URL.
+     */
+    static function getDefaultProxy() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxy'];
+    }
+
+    /**
+     *    Accessor for default proxy username.
+     *    @return string    Proxy username for authentication.
+     */
+    static function getDefaultProxyUsername() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxyUsername'];
+    }
+
+    /**
+     *    Accessor for default proxy password.
+     *    @return string    Proxy password for authentication.
+     */
+    static function getDefaultProxyPassword() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['DefaultProxyPassword'];
+    }
+
+    /**
+     *    Accessor for default HTML parsers.
+     *    @return array     List of parsers to try in
+     *                      order until one responds true
+     *                      to can().
+     */
+    static function getParsers() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['Parsers'];
+    }
+
+    /**
+     *    Set the list of HTML parsers to attempt to use by default.
+     *    @param array $parsers    List of parsers to try in
+     *                             order until one responds true
+     *                             to can().
+     */
+    static function setParsers($parsers) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['Parsers'] = $parsers;
+    }
+
+    /**
+     *    Accessor for global registry of options.
+     *    @return hash           All stored values.
+     */
+    protected static function &getRegistry() {
+        static $registry = false;
+        if (! $registry) {
+            $registry = SimpleTest::getDefaults();
+        }
+        return $registry;
+    }
+
+    /**
+     *    Accessor for the context of the current
+     *    test run.
+     *    @return SimpleTestContext    Current test run.
+     */
+    static function getContext() {
+        static $context = false;
+        if (! $context) {
+            $context = new SimpleTestContext();
+        }
+        return $context;
+    }
+
+    /**
+     *    Constant default values.
+     *    @return hash       All registry defaults.
+     */
+    protected static function getDefaults() {
+        return array(
+                'Parsers' => false,
+                'MockBaseClass' => 'SimpleMock',
+                'IgnoreList' => array(),
+                'DefaultProxy' => false,
+                'DefaultProxyUsername' => false,
+                'DefaultProxyPassword' => false,
+                'Preferred' => array(new HtmlReporter(), new TextReporter(), new XmlReporter()));
+    }
+
+    /**
+     *    @deprecated
+     */
+    static function setMockBaseClass($mock_base) {
+        $registry = &SimpleTest::getRegistry();
+        $registry['MockBaseClass'] = $mock_base;
+    }
+
+    /**
+     *    @deprecated
+     */
+    static function getMockBaseClass() {
+        $registry = &SimpleTest::getRegistry();
+        return $registry['MockBaseClass'];
+    }
+}
+
+/**
+ *    Container for all components for a specific
+ *    test run. Makes things like error queues
+ *    available to PHP event handlers, and also
+ *    gets around some nasty reference issues in
+ *    the mocks.
+ *    @package  SimpleTest
+ */
+class SimpleTestContext {
+    private $test;
+    private $reporter;
+    private $resources;
+
+    /**
+     *    Clears down the current context.
+     *    @access public
+     */
+    function clear() {
+        $this->resources = array();
+    }
+
+    /**
+     *    Sets the current test case instance. This
+     *    global instance can be used by the mock objects
+     *    to send message to the test cases.
+     *    @param SimpleTestCase $test        Test case to register.
+     */
+    function setTest($test) {
+        $this->clear();
+        $this->test = $test;
+    }
+
+    /**
+     *    Accessor for currently running test case.
+     *    @return SimpleTestCase    Current test.
+     */
+    function getTest() {
+        return $this->test;
+    }
+
+    /**
+     *    Sets the current reporter. This
+     *    global instance can be used by the mock objects
+     *    to send messages.
+     *    @param SimpleReporter $reporter     Reporter to register.
+     */
+    function setReporter($reporter) {
+        $this->clear();
+        $this->reporter = $reporter;
+    }
+
+    /**
+     *    Accessor for current reporter.
+     *    @return SimpleReporter    Current reporter.
+     */
+    function getReporter() {
+        return $this->reporter;
+    }
+
+    /**
+     *    Accessor for the Singleton resource.
+     *    @return object       Global resource.
+     */
+    function get($resource) {
+        if (! isset($this->resources[$resource])) {
+            $this->resources[$resource] = new $resource();
+        }
+        return $this->resources[$resource];
+    }
+}
+
+/**
+ *    Interrogates the stack trace to recover the
+ *    failure point.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleStackTrace {
+    private $prefixes;
+
+    /**
+     *    Stashes the list of target prefixes.
+     *    @param array $prefixes      List of method prefixes
+     *                                to search for.
+     */
+    function __construct($prefixes) {
+        $this->prefixes = $prefixes;
+    }
+
+    /**
+     *    Extracts the last method name that was not within
+     *    Simpletest itself. Captures a stack trace if none given.
+     *    @param array $stack      List of stack frames.
+     *    @return string           Snippet of test report with line
+     *                             number and file.
+     */
+    function traceMethod($stack = false) {
+        $stack = $stack ? $stack : $this->captureTrace();
+        foreach ($stack as $frame) {
+            if ($this->frameLiesWithinSimpleTestFolder($frame)) {
+                continue;
+            }
+            if ($this->frameMatchesPrefix($frame)) {
+                return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
+            }
+        }
+        return '';
+    }
+
+    /**
+     *    Test to see if error is generated by SimpleTest itself.
+     *    @param array $frame     PHP stack frame.
+     *    @return boolean         True if a SimpleTest file.
+     */
+    protected function frameLiesWithinSimpleTestFolder($frame) {
+        if (isset($frame['file'])) {
+            $path = substr(SIMPLE_TEST, 0, -1);
+            if (strpos($frame['file'], $path) === 0) {
+                if (dirname($frame['file']) == $path) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Tries to determine if the method call is an assert, etc.
+     *    @param array $frame     PHP stack frame.
+     *    @return boolean         True if matches a target.
+     */
+    protected function frameMatchesPrefix($frame) {
+        foreach ($this->prefixes as $prefix) {
+            if (strncmp($frame['function'], $prefix, strlen($prefix)) == 0) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Grabs a current stack trace.
+     *    @return array        Fulle trace.
+     */
+    protected function captureTrace() {
+        if (function_exists('debug_backtrace')) {
+            return array_reverse(debug_backtrace());
+        }
+        return array();
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/socket.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/socket.php
new file mode 100644
index 000000000..06e8ca62d
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/socket.php
@@ -0,0 +1,312 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage MockObjects
+ *  @version    $Id: socket.php 1953 2009-09-20 01:26:25Z jsweat $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/compatibility.php');
+/**#@-*/
+
+/**
+ *    Stashes an error for later. Useful for constructors
+ *    until PHP gets exceptions.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleStickyError {
+    private $error = 'Constructor not chained';
+
+    /**
+     *    Sets the error to empty.
+     *    @access public
+     */
+    function __construct() {
+        $this->clearError();
+    }
+
+    /**
+     *    Test for an outstanding error.
+     *    @return boolean           True if there is an error.
+     *    @access public
+     */
+    function isError() {
+        return ($this->error != '');
+    }
+
+    /**
+     *    Accessor for an outstanding error.
+     *    @return string     Empty string if no error otherwise
+     *                       the error message.
+     *    @access public
+     */
+    function getError() {
+        return $this->error;
+    }
+
+    /**
+     *    Sets the internal error.
+     *    @param string       Error message to stash.
+     *    @access protected
+     */
+    function setError($error) {
+        $this->error = $error;
+    }
+
+    /**
+     *    Resets the error state to no error.
+     *    @access protected
+     */
+    function clearError() {
+        $this->setError('');
+    }
+}
+
+/**
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFileSocket extends SimpleStickyError {
+    private $handle;
+    private $is_open = false;
+    private $sent = '';
+    private $block_size;
+
+    /**
+     *    Opens a socket for reading and writing.
+     *    @param SimpleUrl $file       Target URI to fetch.
+     *    @param integer $block_size   Size of chunk to read.
+     *    @access public
+     */
+    function __construct($file, $block_size = 1024) {
+        parent::__construct();
+        if (! ($this->handle = $this->openFile($file, $error))) {
+            $file_string = $file->asString();
+            $this->setError("Cannot open [$file_string] with [$error]");
+            return;
+        }
+        $this->is_open = true;
+        $this->block_size = $block_size;
+    }
+
+    /**
+     *    Writes some data to the socket and saves alocal copy.
+     *    @param string $message       String to send to socket.
+     *    @return boolean              True if successful.
+     *    @access public
+     */
+    function write($message) {
+        return true;
+    }
+
+    /**
+     *    Reads data from the socket. The error suppresion
+     *    is a workaround for PHP4 always throwing a warning
+     *    with a secure socket.
+     *    @return integer/boolean           Incoming bytes. False
+     *                                     on error.
+     *    @access public
+     */
+    function read() {
+        $raw = @fread($this->handle, $this->block_size);
+        if ($raw === false) {
+            $this->setError('Cannot read from socket');
+            $this->close();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for socket open state.
+     *    @return boolean           True if open.
+     *    @access public
+     */
+    function isOpen() {
+        return $this->is_open;
+    }
+
+    /**
+     *    Closes the socket preventing further reads.
+     *    Cannot be reopened once closed.
+     *    @return boolean           True if successful.
+     *    @access public
+     */
+    function close() {
+        if (!$this->is_open) return false;
+        $this->is_open = false;
+        return fclose($this->handle);
+    }
+
+    /**
+     *    Accessor for content so far.
+     *    @return string        Bytes sent only.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param SimpleUrl $file       SimpleUrl file target.
+     *    @param string $error         Recipient of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    protected function openFile($file, &$error) {
+        return @fopen($file->asString(), 'r');
+    }
+}
+
+/**
+ *    Wrapper for TCP/IP socket.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSocket extends SimpleStickyError {
+    private $handle;
+    private $is_open = false;
+    private $sent = '';
+    private $lock_size;
+
+    /**
+     *    Opens a socket for reading and writing.
+     *    @param string $host          Hostname to send request to.
+     *    @param integer $port         Port on remote machine to open.
+     *    @param integer $timeout      Connection timeout in seconds.
+     *    @param integer $block_size   Size of chunk to read.
+     *    @access public
+     */
+    function __construct($host, $port, $timeout, $block_size = 255) {
+        parent::__construct();
+        if (! ($this->handle = $this->openSocket($host, $port, $error_number, $error, $timeout))) {
+            $this->setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
+            return;
+        }
+        $this->is_open = true;
+        $this->block_size = $block_size;
+        SimpleTestCompatibility::setTimeout($this->handle, $timeout);
+    }
+
+    /**
+     *    Writes some data to the socket and saves alocal copy.
+     *    @param string $message       String to send to socket.
+     *    @return boolean              True if successful.
+     *    @access public
+     */
+    function write($message) {
+        if ($this->isError() || ! $this->isOpen()) {
+            return false;
+        }
+        $count = fwrite($this->handle, $message);
+        if (! $count) {
+            if ($count === false) {
+                $this->setError('Cannot write to socket');
+                $this->close();
+            }
+            return false;
+        }
+        fflush($this->handle);
+        $this->sent .= $message;
+        return true;
+    }
+
+    /**
+     *    Reads data from the socket. The error suppresion
+     *    is a workaround for PHP4 always throwing a warning
+     *    with a secure socket.
+     *    @return integer/boolean           Incoming bytes. False
+     *                                     on error.
+     *    @access public
+     */
+    function read() {
+        if ($this->isError() || ! $this->isOpen()) {
+            return false;
+        }
+        $raw = @fread($this->handle, $this->block_size);
+        if ($raw === false) {
+            $this->setError('Cannot read from socket');
+            $this->close();
+        }
+        return $raw;
+    }
+
+    /**
+     *    Accessor for socket open state.
+     *    @return boolean           True if open.
+     *    @access public
+     */
+    function isOpen() {
+        return $this->is_open;
+    }
+
+    /**
+     *    Closes the socket preventing further reads.
+     *    Cannot be reopened once closed.
+     *    @return boolean           True if successful.
+     *    @access public
+     */
+    function close() {
+        $this->is_open = false;
+        return fclose($this->handle);
+    }
+
+    /**
+     *    Accessor for content so far.
+     *    @return string        Bytes sent only.
+     *    @access public
+     */
+    function getSent() {
+        return $this->sent;
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param string $host          Host to connect to.
+     *    @param integer $port         Port on host.
+     *    @param integer $error_number Recipient of error code.
+     *    @param string $error         Recipoent of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    protected function openSocket($host, $port, &$error_number, &$error, $timeout) {
+        return @fsockopen($host, $port, $error_number, $error, $timeout);
+    }
+}
+
+/**
+ *    Wrapper for TCP/IP socket over TLS.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSecureSocket extends SimpleSocket {
+
+    /**
+     *    Opens a secure socket for reading and writing.
+     *    @param string $host      Hostname to send request to.
+     *    @param integer $port     Port on remote machine to open.
+     *    @param integer $timeout  Connection timeout in seconds.
+     *    @access public
+     */
+    function __construct($host, $port, $timeout) {
+        parent::__construct($host, $port, $timeout);
+    }
+
+    /**
+     *    Actually opens the low level socket.
+     *    @param string $host          Host to connect to.
+     *    @param integer $port         Port on host.
+     *    @param integer $error_number Recipient of error code.
+     *    @param string $error         Recipient of error message.
+     *    @param integer $timeout      Maximum time to wait for connection.
+     *    @access protected
+     */
+    function openSocket($host, $port, &$error_number, &$error, $timeout) {
+        return parent::openSocket("tls://$host", $port, $error_number, $error, $timeout);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/tag.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/tag.php
new file mode 100644
index 000000000..afe649ec5
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/tag.php
@@ -0,0 +1,1527 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: tag.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ * include SimpleTest files
+ */
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    Creates tags and widgets given HTML tag
+ *    attributes.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTagBuilder {
+
+    /**
+     *    Factory for the tag objects. Creates the
+     *    appropriate tag object for the incoming tag name
+     *    and attributes.
+     *    @param string $name        HTML tag name.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access public
+     */
+    function createTag($name, $attributes) {
+        static $map = array(
+                'a' => 'SimpleAnchorTag',
+                'title' => 'SimpleTitleTag',
+                'base' => 'SimpleBaseTag',
+                'button' => 'SimpleButtonTag',
+                'textarea' => 'SimpleTextAreaTag',
+                'option' => 'SimpleOptionTag',
+                'label' => 'SimpleLabelTag',
+                'form' => 'SimpleFormTag',
+                'frame' => 'SimpleFrameTag');
+        $attributes = $this->keysToLowerCase($attributes);
+        if (array_key_exists($name, $map)) {
+            $tag_class = $map[$name];
+            return new $tag_class($attributes);
+        } elseif ($name == 'select') {
+            return $this->createSelectionTag($attributes);
+        } elseif ($name == 'input') {
+            return $this->createInputTag($attributes);
+        }
+        return new SimpleTag($name, $attributes);
+    }
+
+    /**
+     *    Factory for selection fields.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access protected
+     */
+    protected function createSelectionTag($attributes) {
+        if (isset($attributes['multiple'])) {
+            return new MultipleSelectionTag($attributes);
+        }
+        return new SimpleSelectionTag($attributes);
+    }
+
+    /**
+     *    Factory for input tags.
+     *    @param hash $attributes    Element attributes.
+     *    @return SimpleTag          Tag object.
+     *    @access protected
+     */
+    protected function createInputTag($attributes) {
+        if (! isset($attributes['type'])) {
+            return new SimpleTextTag($attributes);
+        }
+        $type = strtolower(trim($attributes['type']));
+        $map = array(
+                'submit' => 'SimpleSubmitTag',
+                'image' => 'SimpleImageSubmitTag',
+                'checkbox' => 'SimpleCheckboxTag',
+                'radio' => 'SimpleRadioButtonTag',
+                'text' => 'SimpleTextTag',
+                'hidden' => 'SimpleTextTag',
+                'password' => 'SimpleTextTag',
+                'file' => 'SimpleUploadTag');
+        if (array_key_exists($type, $map)) {
+            $tag_class = $map[$type];
+            return new $tag_class($attributes);
+        }
+        return false;
+    }
+
+    /**
+     *    Make the keys lower case for case insensitive look-ups.
+     *    @param hash $map   Hash to convert.
+     *    @return hash       Unchanged values, but keys lower case.
+     *    @access private
+     */
+    protected function keysToLowerCase($map) {
+        $lower = array();
+        foreach ($map as $key => $value) {
+            $lower[strtolower($key)] = $value;
+        }
+        return $lower;
+    }
+}
+
+/**
+ *    HTML or XML tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTag {
+    private $name;
+    private $attributes;
+    private $content;
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param string $name        Tag name.
+     *    @param hash $attributes    Attribute names and
+     *                               string values. Note that
+     *                               the keys must have been
+     *                               converted to lower case.
+     */
+    function __construct($name, $attributes) {
+        $this->name = strtolower(trim($name));
+        $this->attributes = $attributes;
+        $this->content = '';
+    }
+
+    /**
+     *    Check to see if the tag can have both start and
+     *    end tags with content in between.
+     *    @return boolean        True if content allowed.
+     *    @access public
+     */
+    function expectEndTag() {
+        return true;
+    }
+
+    /**
+     *    The current tag should not swallow all content for
+     *    itself as it's searchable page content. Private
+     *    content tags are usually widgets that contain default
+     *    values.
+     *    @return boolean        False as content is available
+     *                           to other tags by default.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return false;
+    }
+
+    /**
+     *    Appends string content to the current content.
+     *    @param string $content        Additional text.
+     *    @access public
+     */
+    function addContent($content) {
+        $this->content .= (string)$content;
+        return $this;
+    }
+
+    /**
+     *    Adds an enclosed tag to the content.
+     *    @param SimpleTag $tag    New tag.
+     *    @access public
+     */
+    function addTag($tag) {
+    }
+
+    /**
+     *    Adds multiple enclosed tags to the content.
+     *    @param array            List of SimpleTag objects to be added.
+     */
+    function addTags($tags) {
+        foreach ($tags as $tag) {
+            $this->addTag($tag);
+        }
+    }
+
+    /**
+     *    Accessor for tag name.
+     *    @return string       Name of tag.
+     *    @access public
+     */
+    function getTagName() {
+        return $this->name;
+    }
+
+    /**
+     *    List of legal child elements.
+     *    @return array        List of element names.
+     *    @access public
+     */
+    function getChildElements() {
+        return array();
+    }
+
+    /**
+     *    Accessor for an attribute.
+     *    @param string $label    Attribute name.
+     *    @return string          Attribute value.
+     *    @access public
+     */
+    function getAttribute($label) {
+        $label = strtolower($label);
+        if (! isset($this->attributes[$label])) {
+            return false;
+        }
+        return (string)$this->attributes[$label];
+    }
+
+    /**
+     *    Sets an attribute.
+     *    @param string $label    Attribute name.
+     *    @return string $value   New attribute value.
+     *    @access protected
+     */
+    protected function setAttribute($label, $value) {
+        $this->attributes[strtolower($label)] = $value;
+    }
+
+    /**
+     *    Accessor for the whole content so far.
+     *    @return string       Content as big raw string.
+     *    @access public
+     */
+    function getContent() {
+        return $this->content;
+    }
+
+    /**
+     *    Accessor for content reduced to visible text. Acts
+     *    like a text mode browser, normalising space and
+     *    reducing images to their alt text.
+     *    @return string       Content as plain text.
+     *    @access public
+     */
+    function getText() {
+        return SimplePage::normalise($this->content);
+    }
+
+    /**
+     *    Test to see if id attribute matches.
+     *    @param string $id        ID to test against.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isId($id) {
+        return ($this->getAttribute('id') == $id);
+    }
+}
+
+/**
+ *    Base url.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleBaseTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('base', $attributes);
+    }
+
+    /**
+     *    Base tag is not a block tag.
+     *    @return boolean       false
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+}
+
+/**
+ *    Page title.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTitleTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('title', $attributes);
+    }
+}
+
+/**
+ *    Link.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleAnchorTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('a', $attributes);
+    }
+
+    /**
+     *    Accessor for URL as string.
+     *    @return string    Coerced as string.
+     *    @access public
+     */
+    function getHref() {
+        $url = $this->getAttribute('href');
+        if (is_bool($url)) {
+            $url = '';
+        }
+        return $url;
+    }
+}
+
+/**
+ *    Form element.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleWidget extends SimpleTag {
+    private $value;
+    private $label;
+    private $is_set;
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param string $name        Tag name.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($name, $attributes) {
+        parent::__construct($name, $attributes);
+        $this->value = false;
+        $this->label = false;
+        $this->is_set = false;
+    }
+
+    /**
+     *    Accessor for name submitted as the key in
+     *    GET/POST privateiables hash.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getName() {
+        return $this->getAttribute('name');
+    }
+
+    /**
+     *    Accessor for default value parsed with the tag.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        return $this->getAttribute('value');
+    }
+
+    /**
+     *    Accessor for currently set value or default if
+     *    none.
+     *    @return string      Value set by form or default
+     *                        if none.
+     *    @access public
+     */
+    function getValue() {
+        if (! $this->is_set) {
+            return $this->getDefault();
+        }
+        return $this->value;
+    }
+
+    /**
+     *    Sets the current form element value.
+     *    @param string $value       New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        $this->value = $value;
+        $this->is_set = true;
+        return true;
+    }
+
+    /**
+     *    Resets the form element value back to the
+     *    default.
+     *    @access public
+     */
+    function resetValue() {
+        $this->is_set = false;
+    }
+
+    /**
+     *    Allows setting of a label externally, say by a
+     *    label tag.
+     *    @param string $label    Label to attach.
+     *    @access public
+     */
+    function setLabel($label) {
+        $this->label = trim($label);
+        return $this;
+    }
+
+    /**
+     *    Reads external or internal label.
+     *    @param string $label    Label to test.
+     *    @return boolean         True is match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return $this->label == trim($label);
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        if ($this->getName()) {
+            $encoding->add($this->getName(), $this->getValue());
+        }
+    }
+}
+
+/**
+ *    Text, password and hidden field.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTextTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', '');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Sets the current form element value. Cannot
+     *    change the value of a hidden field.
+     *    @param string $value       New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($this->getAttribute('type') == 'hidden') {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+}
+
+/**
+ *    Submit button as input tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSubmitTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'Submit');
+        }
+    }
+
+    /**
+     *    Tag contains no end element.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->getValue();
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+}
+
+/**
+ *    Image button as input tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleImageSubmitTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+    }
+
+    /**
+     *    Tag contains no end element.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        if ($this->getAttribute('title')) {
+            return $this->getAttribute('title');
+        }
+        return $this->getAttribute('alt');
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @param integer $x                  X coordinate of click.
+     *    @param integer $y                  Y coordinate of click.
+     *    @access public
+     */
+    function write($encoding, $x = 1, $y = 1) {
+        if ($this->getName()) {
+            $encoding->add($this->getName() . '.x', $x);
+            $encoding->add($this->getName() . '.y', $y);
+        } else {
+            $encoding->add('x', $x);
+            $encoding->add('y', $y);
+        }
+    }
+}
+
+/**
+ *    Submit button as button tag.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleButtonTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    Defaults are very browser dependent.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('button', $attributes);
+    }
+
+    /**
+     *    Check to see if the tag can have both start and
+     *    end tags with content in between.
+     *    @return boolean        True if content allowed.
+     *    @access public
+     */
+    function expectEndTag() {
+        return true;
+    }
+
+    /**
+     *    Disables the setting of the button value.
+     *    @param string $value       Ignored.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Value of browser visible text.
+     *    @return string        Visible label.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->getContent();
+    }
+
+    /**
+     *    Test for a label match when searching.
+     *    @param string $label     Label to test.
+     *    @return boolean          True on match.
+     *    @access public
+     */
+    function isLabel($label) {
+        return trim($label) == trim($this->getLabel());
+    }
+}
+
+/**
+ *    Content tag for text area.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTextAreaTag extends SimpleWidget {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('textarea', $attributes);
+    }
+
+    /**
+     *    Accessor for starting value.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        return $this->wrap(html_entity_decode($this->getContent(), ENT_QUOTES));
+    }
+
+    /**
+     *    Applies word wrapping if needed.
+     *    @param string $value      New value.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return parent::setValue($this->wrap($value));
+    }
+
+    /**
+     *    Test to see if text should be wrapped.
+     *    @return boolean        True if wrapping on.
+     *    @access private
+     */
+    function wrapIsEnabled() {
+        if ($this->getAttribute('cols')) {
+            $wrap = $this->getAttribute('wrap');
+            if (($wrap == 'physical') || ($wrap == 'hard')) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Performs the formatting that is peculiar to
+     *    this tag. There is strange behaviour in this
+     *    one, including stripping a leading new line.
+     *    Go figure. I am using Firefox as a guide.
+     *    @param string $text    Text to wrap.
+     *    @return string         Text wrapped with carriage
+     *                           returns and line feeds
+     *    @access private
+     */
+    protected function wrap($text) {
+        $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
+        $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
+        if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
+            $text = substr($text, strlen("\r\n"));
+        }
+        if ($this->wrapIsEnabled()) {
+            return wordwrap(
+                    $text,
+                    (integer)$this->getAttribute('cols'),
+                    "\r\n");
+        }
+        return $text;
+    }
+
+    /**
+     *    The content of textarea is not part of the page.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return true;
+    }
+}
+
+/**
+ *    File upload widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUploadTag extends SimpleWidget {
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        if (! file_exists($this->getValue())) {
+            return;
+        }
+        $encoding->attach(
+                $this->getName(),
+                implode('', file($this->getValue())),
+                basename($this->getValue()));
+    }
+}
+
+/**
+ *    Drop down widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleSelectionTag extends SimpleWidget {
+    private $options;
+    private $choice;
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('select', $attributes);
+        $this->options = array();
+        $this->choice = false;
+    }
+
+    /**
+     *    Adds an option tag to a selection field.
+     *    @param SimpleOptionTag $tag     New option.
+     *    @access public
+     */
+    function addTag($tag) {
+        if ($tag->getTagName() == 'option') {
+            $this->options[] = $tag;
+        }
+    }
+
+    /**
+     *    Text within the selection element is ignored.
+     *    @param string $content        Ignored.
+     *    @access public
+     */
+    function addContent($content) {
+        return $this;
+    }
+
+    /**
+     *    Scans options for defaults. If none, then
+     *    the first option is selected.
+     *    @return string        Selected field.
+     *    @access public
+     */
+    function getDefault() {
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->getAttribute('selected') !== false) {
+                return $this->options[$i]->getDefault();
+            }
+        }
+        if ($count > 0) {
+            return $this->options[0]->getDefault();
+        }
+        return '';
+    }
+
+    /**
+     *    Can only set allowed values.
+     *    @param string $value       New choice.
+     *    @return boolean            True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->isValue($value)) {
+                $this->choice = $i;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current selection value.
+     *    @return string      Value attribute or
+     *                        content of opton.
+     *    @access public
+     */
+    function getValue() {
+        if ($this->choice === false) {
+            return $this->getDefault();
+        }
+        return $this->options[$this->choice]->getValue();
+    }
+}
+
+/**
+ *    Drop down widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class MultipleSelectionTag extends SimpleWidget {
+    private $options;
+    private $values;
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('select', $attributes);
+        $this->options = array();
+        $this->values = false;
+    }
+
+    /**
+     *    Adds an option tag to a selection field.
+     *    @param SimpleOptionTag $tag     New option.
+     *    @access public
+     */
+    function addTag($tag) {
+        if ($tag->getTagName() == 'option') {
+            $this->options[] = &$tag;
+        }
+    }
+
+    /**
+     *    Text within the selection element is ignored.
+     *    @param string $content        Ignored.
+     *    @access public
+     */
+    function addContent($content) {
+        return $this;
+    }
+
+    /**
+     *    Scans options for defaults to populate the
+     *    value array().
+     *    @return array        Selected fields.
+     *    @access public
+     */
+    function getDefault() {
+        $default = array();
+        for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+            if ($this->options[$i]->getAttribute('selected') !== false) {
+                $default[] = $this->options[$i]->getDefault();
+            }
+        }
+        return $default;
+    }
+
+    /**
+     *    Can only set allowed values. Any illegal value
+     *    will result in a failure, but all correct values
+     *    will be set.
+     *    @param array $desired      New choices.
+     *    @return boolean            True if all allowed.
+     *    @access public
+     */
+    function setValue($desired) {
+        $achieved = array();
+        foreach ($desired as $value) {
+            $success = false;
+            for ($i = 0, $count = count($this->options); $i < $count; $i++) {
+                if ($this->options[$i]->isValue($value)) {
+                    $achieved[] = $this->options[$i]->getValue();
+                    $success = true;
+                    break;
+                }
+            }
+            if (! $success) {
+                return false;
+            }
+        }
+        $this->values = $achieved;
+        return true;
+    }
+
+    /**
+     *    Accessor for current selection value.
+     *    @return array      List of currently set options.
+     *    @access public
+     */
+    function getValue() {
+        if ($this->values === false) {
+            return $this->getDefault();
+        }
+        return $this->values;
+    }
+}
+
+/**
+ *    Option for selection field.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleOptionTag extends SimpleWidget {
+
+    /**
+     *    Stashes the attributes.
+     */
+    function __construct($attributes) {
+        parent::__construct('option', $attributes);
+    }
+
+    /**
+     *    Does nothing.
+     *    @param string $value      Ignored.
+     *    @return boolean           Not allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        return false;
+    }
+
+    /**
+     *    Test to see if a value matches the option.
+     *    @param string $compare    Value to compare with.
+     *    @return boolean           True if possible match.
+     *    @access public
+     */
+    function isValue($compare) {
+        $compare = trim($compare);
+        if (trim($this->getValue()) == $compare) {
+            return true;
+        }
+        return trim(strip_tags($this->getContent())) == $compare;
+    }
+
+    /**
+     *    Accessor for starting value. Will be set to
+     *    the option label if no value exists.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('value') === false) {
+            return strip_tags($this->getContent());
+        }
+        return $this->getAttribute('value');
+    }
+
+    /**
+     *    The content of options is not part of the page.
+     *    @return boolean        True.
+     *    @access public
+     */
+    function isPrivateContent() {
+        return true;
+    }
+}
+
+/**
+ *    Radio button.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRadioButtonTag extends SimpleWidget {
+
+    /**
+     *    Stashes the attributes.
+     *    @param array $attributes        Hash of attributes.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'on');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    The only allowed value sn the one in the
+     *    "value" attribute.
+     *    @param string $value      New value.
+     *    @return boolean           True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($value === false) {
+            return parent::setValue($value);
+        }
+        if ($value != $this->getAttribute('value')) {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+
+    /**
+     *    Accessor for starting value.
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('checked') !== false) {
+            return $this->getAttribute('value');
+        }
+        return false;
+    }
+}
+
+/**
+ *    Checkbox widget.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCheckboxTag extends SimpleWidget {
+
+    /**
+     *    Starts with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('input', $attributes);
+        if ($this->getAttribute('value') === false) {
+            $this->setAttribute('value', 'on');
+        }
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+
+    /**
+     *    The only allowed value in the one in the
+     *    "value" attribute. The default for this
+     *    attribute is "on". If this widget is set to
+     *    true, then the usual value will be taken.
+     *    @param string $value      New value.
+     *    @return boolean           True if allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if ($value === false) {
+            return parent::setValue($value);
+        }
+        if ($value === true) {
+            return parent::setValue($this->getAttribute('value'));
+        }
+        if ($value != $this->getAttribute('value')) {
+            return false;
+        }
+        return parent::setValue($value);
+    }
+
+    /**
+     *    Accessor for starting value. The default
+     *    value is "on".
+     *    @return string        Parsed value.
+     *    @access public
+     */
+    function getDefault() {
+        if ($this->getAttribute('checked') !== false) {
+            return $this->getAttribute('value');
+        }
+        return false;
+    }
+}
+
+/**
+ *    A group of multiple widgets with some shared behaviour.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTagGroup {
+    private $widgets = array();
+
+    /**
+     *    Adds a tag to the group.
+     *    @param SimpleWidget $widget
+     *    @access public
+     */
+    function addWidget($widget) {
+        $this->widgets[] = $widget;
+    }
+
+    /**
+     *    Accessor to widget set.
+     *    @return array        All widgets.
+     *    @access protected
+     */
+    protected function &getWidgets() {
+        return $this->widgets;
+    }
+
+    /**
+     *    Accessor for an attribute.
+     *    @param string $label    Attribute name.
+     *    @return boolean         Always false.
+     *    @access public
+     */
+    function getAttribute($label) {
+        return false;
+    }
+
+    /**
+     *    Fetches the name for the widget from the first
+     *    member.
+     *    @return string        Name of widget.
+     *    @access public
+     */
+    function getName() {
+        if (count($this->widgets) > 0) {
+            return $this->widgets[0]->getName();
+        }
+    }
+
+    /**
+     *    Scans the widgets for one with the appropriate
+     *    ID field.
+     *    @param string $id        ID value to try.
+     *    @return boolean          True if matched.
+     *    @access public
+     */
+    function isId($id) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($this->widgets[$i]->isId($id)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Scans the widgets for one with the appropriate
+     *    attached label.
+     *    @param string $label     Attached label to try.
+     *    @return boolean          True if matched.
+     *    @access public
+     */
+    function isLabel($label) {
+        for ($i = 0, $count = count($this->widgets); $i < $count; $i++) {
+            if ($this->widgets[$i]->isLabel($label)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Dispatches the value into the form encoded packet.
+     *    @param SimpleEncoding $encoding    Form packet.
+     *    @access public
+     */
+    function write($encoding) {
+        $encoding->add($this->getName(), $this->getValue());
+    }
+}
+
+/**
+ *    A group of tags with the same name within a form.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleCheckboxGroup extends SimpleTagGroup {
+
+    /**
+     *    Accessor for current selected widget or false
+     *    if none.
+     *    @return string/array     Widget values or false if none.
+     *    @access public
+     */
+    function getValue() {
+        $values = array();
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getValue() !== false) {
+                $values[] = $widgets[$i]->getValue();
+            }
+        }
+        return $this->coerceValues($values);
+    }
+
+    /**
+     *    Accessor for starting value that is active.
+     *    @return string/array      Widget values or false if none.
+     *    @access public
+     */
+    function getDefault() {
+        $values = array();
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getDefault() !== false) {
+                $values[] = $widgets[$i]->getDefault();
+            }
+        }
+        return $this->coerceValues($values);
+    }
+
+    /**
+     *    Accessor for current set values.
+     *    @param string/array/boolean $values   Either a single string, a
+     *                                          hash or false for nothing set.
+     *    @return boolean                       True if all values can be set.
+     *    @access public
+     */
+    function setValue($values) {
+        $values = $this->makeArray($values);
+        if (! $this->valuesArePossible($values)) {
+            return false;
+        }
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            $possible = $widgets[$i]->getAttribute('value');
+            if (in_array($widgets[$i]->getAttribute('value'), $values)) {
+                $widgets[$i]->setValue($possible);
+            } else {
+                $widgets[$i]->setValue(false);
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests to see if a possible value set is legal.
+     *    @param string/array/boolean $values   Either a single string, a
+     *                                          hash or false for nothing set.
+     *    @return boolean                       False if trying to set a
+     *                                          missing value.
+     *    @access private
+     */
+    protected function valuesArePossible($values) {
+        $matches = array();
+        $widgets = &$this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            $possible = $widgets[$i]->getAttribute('value');
+            if (in_array($possible, $values)) {
+                $matches[] = $possible;
+            }
+        }
+        return ($values == $matches);
+    }
+
+    /**
+     *    Converts the output to an appropriate format. This means
+     *    that no values is false, a single value is just that
+     *    value and only two or more are contained in an array.
+     *    @param array $values           List of values of widgets.
+     *    @return string/array/boolean   Expected format for a tag.
+     *    @access private
+     */
+    protected function coerceValues($values) {
+        if (count($values) == 0) {
+            return false;
+        } elseif (count($values) == 1) {
+            return $values[0];
+        } else {
+            return $values;
+        }
+    }
+
+    /**
+     *    Converts false or string into array. The opposite of
+     *    the coercian method.
+     *    @param string/array/boolean $value  A single item is converted
+     *                                        to a one item list. False
+     *                                        gives an empty list.
+     *    @return array                       List of values, possibly empty.
+     *    @access private
+     */
+    protected function makeArray($value) {
+        if ($value === false) {
+            return array();
+        }
+        if (is_string($value)) {
+            return array($value);
+        }
+        return $value;
+    }
+}
+
+/**
+ *    A group of tags with the same name within a form.
+ *    Used for radio buttons.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleRadioGroup extends SimpleTagGroup {
+
+    /**
+     *    Each tag is tried in turn until one is
+     *    successfully set. The others will be
+     *    unchecked if successful.
+     *    @param string $value      New value.
+     *    @return boolean           True if any allowed.
+     *    @access public
+     */
+    function setValue($value) {
+        if (! $this->valueIsPossible($value)) {
+            return false;
+        }
+        $index = false;
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if (! $widgets[$i]->setValue($value)) {
+                $widgets[$i]->setValue(false);
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Tests to see if a value is allowed.
+     *    @param string    Attempted value.
+     *    @return boolean  True if a valid value.
+     *    @access private
+     */
+    protected function valueIsPossible($value) {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getAttribute('value') == $value) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for current selected widget or false
+     *    if none.
+     *    @return string/boolean   Value attribute or
+     *                             content of opton.
+     *    @access public
+     */
+    function getValue() {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getValue() !== false) {
+                return $widgets[$i]->getValue();
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Accessor for starting value that is active.
+     *    @return string/boolean      Value of first checked
+     *                                widget or false if none.
+     *    @access public
+     */
+    function getDefault() {
+        $widgets = $this->getWidgets();
+        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
+            if ($widgets[$i]->getDefault() !== false) {
+                return $widgets[$i]->getDefault();
+            }
+        }
+        return false;
+    }
+}
+
+/**
+ *    Tag to keep track of labels.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleLabelTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('label', $attributes);
+    }
+
+    /**
+     *    Access for the ID to attach the label to.
+     *    @return string        For attribute.
+     *    @access public
+     */
+    function getFor() {
+        return $this->getAttribute('for');
+    }
+}
+
+/**
+ *    Tag to aid parsing the form.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFormTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('form', $attributes);
+    }
+}
+
+/**
+ *    Tag to aid parsing the frames in a page.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleFrameTag extends SimpleTag {
+
+    /**
+     *    Starts with a named tag with attributes only.
+     *    @param hash $attributes    Attribute names and
+     *                               string values.
+     */
+    function __construct($attributes) {
+        parent::__construct('frame', $attributes);
+    }
+
+    /**
+     *    Tag contains no content.
+     *    @return boolean        False.
+     *    @access public
+     */
+    function expectEndTag() {
+        return false;
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/test_case.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/test_case.php
new file mode 100644
index 000000000..ba023c3b2
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/test_case.php
@@ -0,0 +1,658 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: test_case.php 2012 2011-04-29 08:57:00Z pp11 $
+ */
+
+/**#@+
+ * Includes SimpleTest files and defined the root constant
+ * for dependent libraries.
+ */
+require_once(dirname(__FILE__) . '/invoker.php');
+require_once(dirname(__FILE__) . '/errors.php');
+require_once(dirname(__FILE__) . '/compatibility.php');
+require_once(dirname(__FILE__) . '/scorer.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+require_once(dirname(__FILE__) . '/simpletest.php');
+require_once(dirname(__FILE__) . '/exceptions.php');
+require_once(dirname(__FILE__) . '/reflection_php5.php');
+/**#@-*/
+if (! defined('SIMPLE_TEST')) {
+    /**
+     * @ignore
+     */
+    define('SIMPLE_TEST', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+}
+
+/**
+ *    Basic test case. This is the smallest unit of a test
+ *    suite. It searches for
+ *    all methods that start with the the string "test" and
+ *    runs them. Working test cases extend this class.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleTestCase {
+    private $label = false;
+    protected $reporter;
+    private $observers;
+    private $should_skip = false;
+
+    /**
+     *    Sets up the test with no display.
+     *    @param string $label    If no test name is given then
+     *                            the class name is used.
+     *    @access public
+     */
+    function __construct($label = false) {
+        if ($label) {
+            $this->label = $label;
+        }
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->label ? $this->label : get_class($this);
+    }
+
+    /**
+     *    This is a placeholder for skipping tests. In this
+     *    method you place skipIf() and skipUnless() calls to
+     *    set the skipping state.
+     *    @access public
+     */
+    function skip() {
+    }
+
+    /**
+     *    Will issue a message to the reporter and tell the test
+     *    case to skip if the incoming flag is true.
+     *    @param string $should_skip    Condition causing the tests to be skipped.
+     *    @param string $message        Text of skip condition.
+     *    @access public
+     */
+    function skipIf($should_skip, $message = '%s') {
+        if ($should_skip && ! $this->should_skip) {
+            $this->should_skip = true;
+            $message = sprintf($message, 'Skipping [' . get_class($this) . ']');
+            $this->reporter->paintSkip($message . $this->getAssertionLine());
+        }
+    }
+
+    /**
+     *    Accessor for the private variable $_shoud_skip
+     *    @access public
+     */
+    function shouldSkip() {
+        return $this->should_skip;
+    }
+
+    /**
+     *    Will issue a message to the reporter and tell the test
+     *    case to skip if the incoming flag is false.
+     *    @param string $shouldnt_skip  Condition causing the tests to be run.
+     *    @param string $message        Text of skip condition.
+     *    @access public
+     */
+    function skipUnless($shouldnt_skip, $message = false) {
+        $this->skipIf(! $shouldnt_skip, $message);
+    }
+
+    /**
+     *    Used to invoke the single tests.
+     *    @return SimpleInvoker        Individual test runner.
+     *    @access public
+     */
+    function createInvoker() {
+        return new SimpleErrorTrappingInvoker(
+                new SimpleExceptionTrappingInvoker(new SimpleInvoker($this)));
+    }
+
+    /**
+     *    Uses reflection to run every method within itself
+     *    starting with the string "test" unless a method
+     *    is specified.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @return boolean                    True if all tests passed.
+     *    @access public
+     */
+    function run($reporter) {
+        $context = SimpleTest::getContext();
+        $context->setTest($this);
+        $context->setReporter($reporter);
+        $this->reporter = $reporter;
+        $started = false;
+        foreach ($this->getTests() as $method) {
+            if ($reporter->shouldInvoke($this->getLabel(), $method)) {
+                $this->skip();
+                if ($this->should_skip) {
+                    break;
+                }
+                if (! $started) {
+                    $reporter->paintCaseStart($this->getLabel());
+                    $started = true;
+                }
+                $invoker = $this->reporter->createInvoker($this->createInvoker());
+                $invoker->before($method);
+                $invoker->invoke($method);
+                $invoker->after($method);
+            }
+        }
+        if ($started) {
+            $reporter->paintCaseEnd($this->getLabel());
+        }
+        unset($this->reporter);
+        $context->setTest(null);
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Gets a list of test names. Normally that will
+     *    be all internal methods that start with the
+     *    name "test". This method should be overridden
+     *    if you want a different rule.
+     *    @return array        List of test names.
+     *    @access public
+     */
+    function getTests() {
+        $methods = array();
+        foreach (get_class_methods(get_class($this)) as $method) {
+            if ($this->isTest($method)) {
+                $methods[] = $method;
+            }
+        }
+        return $methods;
+    }
+
+    /**
+     *    Tests to see if the method is a test that should
+     *    be run. Currently any method that starts with 'test'
+     *    is a candidate unless it is the constructor.
+     *    @param string $method        Method name to try.
+     *    @return boolean              True if test method.
+     *    @access protected
+     */
+    protected function isTest($method) {
+        if (strtolower(substr($method, 0, 4)) == 'test') {
+            return ! SimpleTestCompatibility::isA($this, strtolower($method));
+        }
+        return false;
+    }
+
+    /**
+     *    Announces the start of the test.
+     *    @param string $method    Test method just started.
+     *    @access public
+     */
+    function before($method) {
+        $this->reporter->paintMethodStart($method);
+        $this->observers = array();
+    }
+
+    /**
+     *    Sets up unit test wide variables at the start
+     *    of each test method. To be overridden in
+     *    actual user test cases.
+     *    @access public
+     */
+    function setUp() {
+    }
+
+    /**
+     *    Clears the data set in the setUp() method call.
+     *    To be overridden by the user in actual user test cases.
+     *    @access public
+     */
+    function tearDown() {
+    }
+
+    /**
+     *    Announces the end of the test. Includes private clean up.
+     *    @param string $method    Test method just finished.
+     *    @access public
+     */
+    function after($method) {
+        for ($i = 0; $i < count($this->observers); $i++) {
+            $this->observers[$i]->atTestEnd($method, $this);
+        }
+        $this->reporter->paintMethodEnd($method);
+    }
+
+    /**
+     *    Sets up an observer for the test end.
+     *    @param object $observer    Must have atTestEnd()
+     *                               method.
+     *    @access public
+     */
+    function tell($observer) {
+        $this->observers[] = &$observer;
+    }
+
+    /**
+     *    @deprecated
+     */
+    function pass($message = "Pass") {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintPass(
+                $message . $this->getAssertionLine());
+        return true;
+    }
+
+    /**
+     *    Sends a fail event with a message.
+     *    @param string $message        Message to send.
+     *    @access public
+     */
+    function fail($message = "Fail") {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintFail(
+                $message . $this->getAssertionLine());
+        return false;
+    }
+
+    /**
+     *    Formats a PHP error and dispatches it to the
+     *    reporter.
+     *    @param integer $severity  PHP error code.
+     *    @param string $message    Text of error.
+     *    @param string $file       File error occoured in.
+     *    @param integer $line      Line number of error.
+     *    @access public
+     */
+    function error($severity, $message, $file, $line) {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintError(
+                "Unexpected PHP error [$message] severity [$severity] in [$file line $line]");
+    }
+
+    /**
+     *    Formats an exception and dispatches it to the
+     *    reporter.
+     *    @param Exception $exception    Object thrown.
+     *    @access public
+     */
+    function exception($exception) {
+        $this->reporter->paintException($exception);
+    }
+
+    /**
+     *    For user defined expansion of the available messages.
+     *    @param string $type       Tag for sorting the signals.
+     *    @param mixed $payload     Extra user specific information.
+     */
+    function signal($type, $payload) {
+        if (! isset($this->reporter)) {
+            trigger_error('Can only make assertions within test methods');
+        }
+        $this->reporter->paintSignal($type, $payload);
+    }
+
+    /**
+     *    Runs an expectation directly, for extending the
+     *    tests with new expectation classes.
+     *    @param SimpleExpectation $expectation  Expectation subclass.
+     *    @param mixed $compare               Value to compare.
+     *    @param string $message                 Message to display.
+     *    @return boolean                        True on pass
+     *    @access public
+     */
+    function assert($expectation, $compare, $message = '%s') {
+        if ($expectation->test($compare)) {
+            return $this->pass(sprintf(
+                    $message,
+                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
+        } else {
+            return $this->fail(sprintf(
+                    $message,
+                    $expectation->overlayMessage($compare, $this->reporter->getDumper())));
+        }
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     *    @return string           Line number of first assert*
+     *                             method embedded in format string.
+     *    @access public
+     */
+    function getAssertionLine() {
+        $trace = new SimpleStackTrace(array('assert', 'expect', 'pass', 'fail', 'skip'));
+        return $trace->traceMethod();
+    }
+
+    /**
+     *    Sends a formatted dump of a variable to the
+     *    test suite for those emergency debugging
+     *    situations.
+     *    @param mixed $variable    Variable to display.
+     *    @param string $message    Message to display.
+     *    @return mixed             The original variable.
+     *    @access public
+     */
+    function dump($variable, $message = false) {
+        $dumper = $this->reporter->getDumper();
+        $formatted = $dumper->dump($variable);
+        if ($message) {
+            $formatted = $message . "\n" . $formatted;
+        }
+        $this->reporter->paintFormattedMessage($formatted);
+        return $variable;
+    }
+
+    /**
+     *    Accessor for the number of subtests including myelf.
+     *    @return integer           Number of test cases.
+     *    @access public
+     */
+    function getSize() {
+        return 1;
+    }
+}
+
+/**
+ *  Helps to extract test cases automatically from a file.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class SimpleFileLoader {
+
+    /**
+     *    Builds a test suite from a library of test cases.
+     *    The new suite is composed into this one.
+     *    @param string $test_file        File name of library with
+     *                                    test case classes.
+     *    @return TestSuite               The new test suite.
+     *    @access public
+     */
+    function load($test_file) {
+        $existing_classes = get_declared_classes();
+        $existing_globals = get_defined_vars();
+        include_once($test_file);
+        $new_globals = get_defined_vars();
+        $this->makeFileVariablesGlobal($existing_globals, $new_globals);
+        $new_classes = array_diff(get_declared_classes(), $existing_classes);
+        if (empty($new_classes)) {
+            $new_classes = $this->scrapeClassesFromFile($test_file);
+        }
+        $classes = $this->selectRunnableTests($new_classes);
+        return $this->createSuiteFromClasses($test_file, $classes);
+    }
+
+    /**
+     *    Imports new variables into the global namespace.
+     *    @param hash $existing   Variables before the file was loaded.
+     *    @param hash $new        Variables after the file was loaded.
+     *    @access private
+     */
+    protected function makeFileVariablesGlobal($existing, $new) {
+        $globals = array_diff(array_keys($new), array_keys($existing));
+        foreach ($globals as $global) {
+            $GLOBALS[$global] = $new[$global];
+        }
+    }
+
+    /**
+     *    Lookup classnames from file contents, in case the
+     *    file may have been included before.
+     *    Note: This is probably too clever by half. Figuring this
+     *    out after a failed test case is going to be tricky for us,
+     *    never mind the user. A test case should not be included
+     *    twice anyway.
+     *    @param string $test_file        File name with classes.
+     *    @access private
+     */
+    protected function scrapeClassesFromFile($test_file) {
+        preg_match_all('~^\s*class\s+(\w+)(\s+(extends|implements)\s+\w+)*\s*\{~mi',
+                        file_get_contents($test_file),
+                        $matches );
+        return $matches[1];
+    }
+
+    /**
+     *    Calculates the incoming test cases. Skips abstract
+     *    and ignored classes.
+     *    @param array $candidates   Candidate classes.
+     *    @return array              New classes which are test
+     *                               cases that shouldn't be ignored.
+     *    @access public
+     */
+    function selectRunnableTests($candidates) {
+        $classes = array();
+        foreach ($candidates as $class) {
+            if (TestSuite::getBaseTestCase($class)) {
+                $reflection = new SimpleReflection($class);
+                if ($reflection->isAbstract()) {
+                    SimpleTest::ignore($class);
+                } else {
+                    $classes[] = $class;
+                }
+            }
+        }
+        return $classes;
+    }
+
+    /**
+     *    Builds a test suite from a class list.
+     *    @param string $title       Title of new group.
+     *    @param array $classes      Test classes.
+     *    @return TestSuite          Group loaded with the new
+     *                               test cases.
+     *    @access public
+     */
+    function createSuiteFromClasses($title, $classes) {
+        if (count($classes) == 0) {
+            $suite = new BadTestSuite($title, "No runnable test cases in [$title]");
+            return $suite;
+        }
+        SimpleTest::ignoreParentsIfIgnored($classes);
+        $suite = new TestSuite($title);
+        foreach ($classes as $class) {
+            if (! SimpleTest::isIgnored($class)) {
+                $suite->add($class);
+            }
+        }
+        return $suite;
+    }
+}
+
+/**
+ *    This is a composite test class for combining
+ *    test cases and other RunnableTest classes into
+ *    a group test.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class TestSuite {
+    private $label;
+    private $test_cases;
+
+    /**
+     *    Sets the name of the test suite.
+     *    @param string $label    Name sent at the start and end
+     *                            of the test.
+     *    @access public
+     */
+    function TestSuite($label = false) {
+        $this->label = $label;
+        $this->test_cases = array();
+    }
+
+    /**
+     *    Accessor for the test name for subclasses. If the suite
+     *    wraps a single test case the label defaults to the name of that test.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        if (! $this->label) {
+            return ($this->getSize() == 1) ?
+                    get_class($this->test_cases[0]) : get_class($this);
+        } else {
+            return $this->label;
+        }
+    }
+
+    /**
+     *    Adds a test into the suite by instance or class. The class will
+     *    be instantiated if it's a test suite.
+     *    @param SimpleTestCase $test_case  Suite or individual test
+     *                                      case implementing the
+     *                                      runnable test interface.
+     *    @access public
+     */
+    function add($test_case) {
+        if (! is_string($test_case)) {
+            $this->test_cases[] = $test_case;
+        } elseif (TestSuite::getBaseTestCase($test_case) == 'testsuite') {
+            $this->test_cases[] = new $test_case();
+        } else {
+            $this->test_cases[] = $test_case;
+        }
+    }
+
+    /**
+     *    Builds a test suite from a library of test cases.
+     *    The new suite is composed into this one.
+     *    @param string $test_file        File name of library with
+     *                                    test case classes.
+     *    @access public
+     */
+    function addFile($test_file) {
+        $extractor = new SimpleFileLoader();
+        $this->add($extractor->load($test_file));
+    }
+
+    /**
+     *    Delegates to a visiting collector to add test
+     *    files.
+     *    @param string $path                  Path to scan from.
+     *    @param SimpleCollector $collector    Directory scanner.
+     *    @access public
+     */
+    function collect($path, $collector) {
+        $collector->collect($this, $path);
+    }
+
+    /**
+     *    Invokes run() on all of the held test cases, instantiating
+     *    them if necessary.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @access public
+     */
+    function run($reporter) {
+        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
+        for ($i = 0, $count = count($this->test_cases); $i < $count; $i++) {
+            if (is_string($this->test_cases[$i])) {
+                $class = $this->test_cases[$i];
+                $test = new $class();
+                $test->run($reporter);
+                unset($test);
+            } else {
+                $this->test_cases[$i]->run($reporter);
+            }
+        }
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Number of contained test cases.
+     *    @return integer     Total count of cases in the group.
+     *    @access public
+     */
+    function getSize() {
+        $count = 0;
+        foreach ($this->test_cases as $case) {
+            if (is_string($case)) {
+                if (! SimpleTest::isIgnored($case)) {
+                    $count++;
+                }
+            } else {
+                $count += $case->getSize();
+            }
+        }
+        return $count;
+    }
+
+    /**
+     *    Test to see if a class is derived from the
+     *    SimpleTestCase class.
+     *    @param string $class     Class name.
+     *    @access public
+     */
+    static function getBaseTestCase($class) {
+        while ($class = get_parent_class($class)) {
+            $class = strtolower($class);
+            if ($class == 'simpletestcase' || $class == 'testsuite') {
+                return $class;
+            }
+        }
+        return false;
+    }
+}
+
+/**
+ *    This is a failing group test for when a test suite hasn't
+ *    loaded properly.
+ *    @package      SimpleTest
+ *    @subpackage   UnitTester
+ */
+class BadTestSuite {
+    private $label;
+    private $error;
+
+    /**
+     *    Sets the name of the test suite and error message.
+     *    @param string $label    Name sent at the start and end
+     *                            of the test.
+     *    @access public
+     */
+    function BadTestSuite($label, $error) {
+        $this->label = $label;
+        $this->error = $error;
+    }
+
+    /**
+     *    Accessor for the test name for subclasses.
+     *    @return string           Name of the test.
+     *    @access public
+     */
+    function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     *    Sends a single error to the reporter.
+     *    @param SimpleReporter $reporter    Current test reporter.
+     *    @access public
+     */
+    function run($reporter) {
+        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
+        $reporter->paintFail('Bad TestSuite [' . $this->getLabel() .
+                '] with error [' . $this->error . ']');
+        $reporter->paintGroupEnd($this->getLabel());
+        return $reporter->getStatus();
+    }
+
+    /**
+     *    Number of contained test cases. Always zero.
+     *    @return integer     Total count of cases in the group.
+     *    @access public
+     */
+    function getSize() {
+        return 0;
+    }
+}
+?>
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/tidy_parser.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/tidy_parser.php
new file mode 100644
index 000000000..3d8b4b2ac
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/tidy_parser.php
@@ -0,0 +1,382 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: php_parser.php 1911 2009-07-29 16:38:04Z lastcraft $
+ */
+
+/**
+ *    Builds the page object.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleTidyPageBuilder {
+    private $page;
+    private $forms = array();
+    private $labels = array();
+    private $widgets_by_id = array();
+
+    public function __destruct() {
+        $this->free();
+    }
+
+    /**
+     *    Frees up any references so as to allow the PHP garbage
+     *    collection from unset() to work.
+     */
+    private function free() {
+        unset($this->page);
+        $this->forms = array();
+        $this->labels = array();
+    }
+
+    /**
+     *    This builder is only available if the 'tidy' extension is loaded.
+     *    @return boolean       True if available.
+     */
+    function can() {
+        return extension_loaded('tidy');
+    }
+
+    /**
+     *    Reads the raw content the page using HTML Tidy.
+     *    @param $response SimpleHttpResponse  Fetched response.
+     *    @return SimplePage                   Newly parsed page.
+     */
+    function parse($response) {
+        $this->page = new SimplePage($response);
+        $tidied = tidy_parse_string($input = $this->insertGuards($response->getContent()),
+                                    array('output-xml' => false, 'wrap' => '0', 'indent' => 'no'),
+                                    'latin1');
+        $this->walkTree($tidied->html());
+        $this->attachLabels($this->widgets_by_id, $this->labels);
+        $this->page->setForms($this->forms);
+        $page = $this->page;
+        $this->free();
+        return $page;
+    }
+
+    /**
+     *    Stops HTMLTidy stripping content that we wish to preserve.
+     *    @param string      The raw html.
+     *    @return string     The html with guard tags inserted.
+     */
+    private function insertGuards($html) {
+        return $this->insertEmptyTagGuards($this->insertTextareaSimpleWhitespaceGuards($html));
+    }
+
+    /**
+     *    Removes the extra content added during the parse stage
+     *    in order to preserve content we don't want stripped
+     *    out by HTMLTidy.
+     *    @param string      The raw html.
+     *    @return string     The html with guard tags removed.
+     */
+    private function stripGuards($html) {
+        return $this->stripTextareaWhitespaceGuards($this->stripEmptyTagGuards($html));
+    }
+
+    /**
+     *    HTML tidy strips out empty tags such as <option> which we
+     *    need to preserve. This method inserts an additional marker.
+     *    @param string      The raw html.
+     *    @return string     The html with guards inserted.
+     */
+    private function insertEmptyTagGuards($html) {
+        return preg_replace('#<(option|textarea)([^>]*)>(\s*)</(option|textarea)>#is',
+                            '<\1\2>___EMPTY___\3</\4>',
+                            $html);
+    }
+
+    /**
+     *    HTML tidy strips out empty tags such as <option> which we
+     *    need to preserve. This method strips additional markers
+     *    inserted by SimpleTest to the tidy output used to make the
+     *    tags non-empty. This ensures their preservation.
+     *    @param string      The raw html.
+     *    @return string     The html with guards removed.
+     */
+    private function stripEmptyTagGuards($html) {
+        return preg_replace('#(^|>)(\s*)___EMPTY___(\s*)(</|$)#i', '\2\3', $html);
+    }
+
+    /**
+     *    By parsing the XML output of tidy, we lose some whitespace
+     *    information in textarea tags. We temporarily recode this
+     *    data ourselves so as not to lose it.
+     *    @param string      The raw html.
+     *    @return string     The html with guards inserted.
+     */
+    private function insertTextareaSimpleWhitespaceGuards($html) {
+        return preg_replace_callback('#<textarea([^>]*)>(.*?)</textarea>#is',
+                                     array($this, 'insertWhitespaceGuards'),
+                                     $html);
+    }
+
+    /**
+     *  Callback for insertTextareaSimpleWhitespaceGuards().
+     *  @param array $matches       Result of preg_replace_callback().
+     *  @return string              Guard tags now replace whitespace.
+     */
+    private function insertWhitespaceGuards($matches) {
+        return '<textarea' . $matches[1] . '>' .
+                str_replace(array("\n", "\r", "\t", ' '),
+                            array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
+                            $matches[2]) .
+                '</textarea>';
+    }
+
+    /**
+     *    Removes the whitespace preserving guards we added
+     *    before parsing.
+     *    @param string      The raw html.
+     *    @return string     The html with guards removed.
+     */
+    private function stripTextareaWhitespaceGuards($html) {
+        return str_replace(array('___NEWLINE___', '___CR___', '___TAB___', '___SPACE___'),
+                           array("\n", "\r", "\t", ' '),
+                           $html);
+    }
+
+    /**
+     *  Visits the given node and all children
+     *  @param object $node      Tidy XML node.
+     */
+    private function walkTree($node) {
+        if ($node->name == 'a') {
+            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
+                                        ->addContent($this->innerHtml($node)));
+        } elseif ($node->name == 'base' and isset($node->attribute['href'])) {
+            $this->page->setBase($node->attribute['href']);
+        } elseif ($node->name == 'title') {
+            $this->page->setTitle($this->tags()->createTag($node->name, (array)$node->attribute)
+                                         ->addContent($this->innerHtml($node)));
+        } elseif ($node->name == 'frameset') {
+            $this->page->setFrames($this->collectFrames($node));
+        } elseif ($node->name == 'form') {
+            $this->forms[] = $this->walkForm($node, $this->createEmptyForm($node));
+        } elseif ($node->name == 'label') {
+            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
+                                           ->addContent($this->innerHtml($node));
+        } else {
+            $this->walkChildren($node);
+        }
+    }
+
+    /**
+     *  Helper method for traversing the XML tree.
+     *  @param object $node     Tidy XML node.
+     */
+    private function walkChildren($node) {
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $this->walkTree($child);
+            }
+        }
+    }
+
+    /**
+     *  Facade for forms containing preparsed widgets.
+     *  @param object $node     Tidy XML node.
+     *  @return SimpleForm      Facade for SimpleBrowser.
+     */
+    private function createEmptyForm($node) {
+        return new SimpleForm($this->tags()->createTag($node->name, (array)$node->attribute), $this->page);
+    }
+
+    /**
+     *  Visits the given node and all children
+     *  @param object $node      Tidy XML node.
+     */
+    private function walkForm($node, $form, $enclosing_label = '') {
+        if ($node->name == 'a') {
+            $this->page->addLink($this->tags()->createTag($node->name, (array)$node->attribute)
+                                              ->addContent($this->innerHtml($node)));
+        } elseif (in_array($node->name, array('input', 'button', 'textarea', 'select'))) {
+            $this->addWidgetToForm($node, $form, $enclosing_label);
+        } elseif ($node->name == 'label') {
+            $this->labels[] = $this->tags()->createTag($node->name, (array)$node->attribute)
+                                           ->addContent($this->innerHtml($node));
+            if ($node->hasChildren()) {
+                foreach ($node->child as $child) {
+                    $this->walkForm($child, $form, SimplePage::normalise($this->innerHtml($node)));
+                }
+            }
+        } elseif ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $this->walkForm($child, $form);
+            }
+        }
+        return $form;
+    }
+
+    /**
+     *  Tests a node for a "for" atribute. Used for
+     *  attaching labels.
+     *  @param object $node      Tidy XML node.
+     *  @return boolean          True if the "for" attribute exists.
+     */
+    private function hasFor($node) {
+        return isset($node->attribute) and $node->attribute['for'];
+    }
+
+    /**
+     *  Adds the widget into the form container.
+     *  @param object $node             Tidy XML node of widget.
+     *  @param SimpleForm $form         Form to add it to.
+     *  @param string $enclosing_label  The label of any label
+     *                                  tag we might be in.
+     */
+    private function addWidgetToForm($node, $form, $enclosing_label) {
+        $widget = $this->tags()->createTag($node->name, $this->attributes($node));
+        if (! $widget) {
+            return;
+        }
+        $widget->setLabel($enclosing_label)
+               ->addContent($this->innerHtml($node));
+        if ($node->name == 'select') {
+            $widget->addTags($this->collectSelectOptions($node));
+        }
+        $form->addWidget($widget);
+        $this->indexWidgetById($widget);
+    }
+
+    /**
+     *  Fills the widget cache to speed up searching.
+     *  @param SimpleTag $widget    Parsed widget to cache.
+     */
+    private function indexWidgetById($widget) {
+        $id = $widget->getAttribute('id');
+        if (! $id) {
+            return;
+        }
+        if (! isset($this->widgets_by_id[$id])) {
+            $this->widgets_by_id[$id] = array();
+        }
+        $this->widgets_by_id[$id][] = $widget;
+    }
+
+    /**
+     *  Parses the options from inside an XML select node.
+     *  @param object $node      Tidy XML node.
+     *  @return array            List of SimpleTag options.
+     */
+    private function collectSelectOptions($node) {
+        $options = array();
+        if ($node->name == 'option') {
+            $options[] = $this->tags()->createTag($node->name, $this->attributes($node))
+                                      ->addContent($this->innerHtml($node));
+        }
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $options = array_merge($options, $this->collectSelectOptions($child));
+            }
+        }
+        return $options;
+    }
+
+    /**
+     *  Convenience method for collecting all the attributes
+     *  of a tag. Not sure why Tidy does not have this.
+     *  @param object $node      Tidy XML node.
+     *  @return array            Hash of attribute strings.
+     */
+    private function attributes($node) {
+        if (! preg_match('|<[^ ]+\s(.*?)/?>|s', $node->value, $first_tag_contents)) {
+            return array();
+        }
+        $attributes = array();
+        preg_match_all('/\S+\s*=\s*\'[^\']*\'|(\S+\s*=\s*"[^"]*")|([^ =]+\s*=\s*[^ "\']+?)|[^ "\']+/', $first_tag_contents[1], $matches);
+        foreach($matches[0] as $unparsed) {
+            $attributes = $this->mergeAttribute($attributes, $unparsed);
+        }
+        return $attributes;
+    }
+
+    /**
+     *  Overlay an attribute into the attributes hash.
+     *  @param array $attributes        Current attribute list.
+     *  @param string $raw              Raw attribute string with
+     *                                  both key and value.
+     *  @return array                   New attribute hash.
+     */
+    private function mergeAttribute($attributes, $raw) {
+        $parts = explode('=', $raw);
+        list($name, $value) = count($parts) == 1 ? array($parts[0], $parts[0]) : $parts;
+        $attributes[trim($name)] = html_entity_decode($this->dequote(trim($value)), ENT_QUOTES);
+        return $attributes;
+    }
+
+    /**
+     *  Remove start and end quotes.
+     *  @param string $quoted    A quoted string.
+     *  @return string           Quotes are gone.
+     */
+    private function dequote($quoted) {
+        if (preg_match('/^(\'([^\']*)\'|"([^"]*)")$/', $quoted, $matches)) {
+            return isset($matches[3]) ? $matches[3] : $matches[2];
+        }
+        return $quoted;
+    }
+
+    /**
+     *  Collects frame information inside a frameset tag.
+     *  @param object $node     Tidy XML node.
+     *  @return array           List of SimpleTag frame descriptions.
+     */
+    private function collectFrames($node) {
+        $frames = array();
+        if ($node->name == 'frame') {
+            $frames = array($this->tags()->createTag($node->name, (array)$node->attribute));
+        } else if ($node->hasChildren()) {
+            $frames = array();
+            foreach ($node->child as $child) {
+                $frames = array_merge($frames, $this->collectFrames($child));
+            }
+        }
+        return $frames;
+    }
+
+    /**
+     *  Extracts the XML node text.
+     *  @param object $node     Tidy XML node.
+     *  @return string          The text only.
+     */
+    private function innerHtml($node) {
+        $raw = '';
+        if ($node->hasChildren()) {
+            foreach ($node->child as $child) {
+                $raw .= $child->value;
+            }
+        }
+        return $this->stripGuards($raw);
+    }
+
+    /**
+     *  Factory for parsed content holders.
+     *  @return SimpleTagBuilder    Factory.
+     */
+    private function tags() {
+        return new SimpleTagBuilder();
+    }
+
+    /**
+     *  Called at the end of a parse run. Attaches any
+     *  non-wrapping labels to their form elements.
+     *  @param array $widgets_by_id     Cached SimpleTag hash.
+     *  @param array $labels            SimpleTag label elements.
+     */
+    private function attachLabels($widgets_by_id, $labels) {
+        foreach ($labels as $label) {
+            $for = $label->getFor();
+            if ($for and isset($widgets_by_id[$for])) {
+                $text = $label->getText();
+                foreach ($widgets_by_id[$for] as $widget) {
+                    $widget->setLabel($text);
+                }
+            }
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/unit_tester.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/unit_tester.php
new file mode 100644
index 000000000..ce82660af
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/unit_tester.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: unit_tester.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+require_once(dirname(__FILE__) . '/dumper.php');
+/**#@-*/
+
+/**
+ *    Standard unit test class for day to day testing
+ *    of PHP code XP style. Adds some useful standard
+ *    assertions.
+ *    @package  SimpleTest
+ *    @subpackage   UnitTester
+ */
+class UnitTestCase extends SimpleTestCase {
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        if (! $label) {
+            $label = get_class($this);
+        }
+        parent::__construct($label);
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = '%s') {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true if the value is null.
+     *    @param null $value       Supposedly null value.
+     *    @param string $message   Message to display.
+     *    @return boolean                        True on pass
+     *    @access public
+     */
+    function assertNull($value, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($value) . '] should be null');
+        return $this->assertTrue(! isset($value), $message);
+    }
+
+    /**
+     *    Will be true if the value is set.
+     *    @param mixed $value           Supposedly set value.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass.
+     *    @access public
+     */
+    function assertNotNull($value, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($value) . '] should not be null');
+        return $this->assertTrue(isset($value), $message);
+    }
+
+    /**
+     *    Type and class test. Will pass if class
+     *    matches the type name or is a subclass or
+     *    if not an object, but the type is correct.
+     *    @param mixed $object         Object to test.
+     *    @param string $type          Type name as string.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass.
+     *    @access public
+     */
+    function assertIsA($object, $type, $message = '%s') {
+        return $this->assert(
+                new IsAExpectation($type),
+                $object,
+                $message);
+    }
+
+    /**
+     *    Type and class mismatch test. Will pass if class
+     *    name or underling type does not match the one
+     *    specified.
+     *    @param mixed $object         Object to test.
+     *    @param string $type          Type name as string.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass.
+     *    @access public
+     */
+    function assertNotA($object, $type, $message = '%s') {
+        return $this->assert(
+                new NotAExpectation($type),
+                $object,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the if the first parameter
+     *    is near enough to the second by the margin.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param mixed $margin         Fuzziness of match.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertWithinMargin($first, $second, $margin, $message = '%s') {
+        return $this->assert(
+                new WithinMarginExpectation($first, $margin),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters differ
+     *    by more than the margin.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param mixed $margin         Fuzziness of match.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertOutsideMargin($first, $second, $margin, $message = '%s') {
+        return $this->assert(
+                new OutsideMarginExpectation($first, $margin),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value and same type. Otherwise a fail.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertIdentical($first, $second, $message = '%s') {
+        return $this->assert(
+                new IdenticalExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the different value or different type.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotIdentical($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotIdenticalExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to the same object or value. Fail otherwise.
+     *    This will cause problems testing objects under
+     *    E_STRICT.
+     *    TODO: Replace with expectation.
+     *    @param mixed $first           Reference to check.
+     *    @param mixed $second          Hopefully the same variable.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertReference(&$first, &$second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should reference the same object');
+        return $this->assertTrue(
+                SimpleTestCompatibility::isReference($first, $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to the same object. Fail otherwise. This has
+     *    the same semantics at the PHPUnit assertSame.
+     *    That is, if values are passed in it has roughly
+     *    the same affect as assertIdentical.
+     *    TODO: Replace with expectation.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertSame($first, $second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should reference the same object');
+        return $this->assertTrue($first === $second, $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to different objects. Fail otherwise. The objects
+     *    have to be identical though.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully not the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertClone($first, $second, $message = '%s') {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                '[' . $dumper->describeValue($first) .
+                        '] and [' . $dumper->describeValue($second) .
+                        '] should not be the same object');
+        $identical = new IdenticalExpectation($first);
+        return $this->assertTrue(
+                $identical->test($second) && ! ($first === $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if both parameters refer
+     *    to different variables. Fail otherwise. The objects
+     *    have to be identical references though.
+     *    This will fail under E_STRICT with objects. Use
+     *    assertClone() for this.
+     *    @param mixed $first           Object reference to check.
+     *    @param mixed $second          Hopefully not the same object.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertCopy(&$first, &$second, $message = "%s") {
+        $dumper = new SimpleDumper();
+        $message = sprintf(
+                $message,
+                "[" . $dumper->describeValue($first) .
+                        "] and [" . $dumper->describeValue($second) .
+                        "] should not be the same object");
+        return $this->assertFalse(
+                SimpleTestCompatibility::isReference($first, $second),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the Perl regex pattern
+     *    is found in the subject. Fail otherwise.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $subject    String to search in.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertPattern($pattern, $subject, $message = '%s') {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $subject,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the perl regex pattern
+     *    is not present in subject. Fail if found.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $subject    String to search in.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertNoPattern($pattern, $subject, $message = '%s') {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $subject,
+                $message);
+    }
+
+    /**
+     *    Prepares for an error. If the error mismatches it
+     *    passes through, otherwise it is swallowed. Any
+     *    left over errors trigger failures.
+     *    @param SimpleExpectation/string $expected   The error to match.
+     *    @param string $message                      Message on failure.
+     *    @access public
+     */
+    function expectError($expected = false, $message = '%s') {
+        $queue = SimpleTest::getContext()->get('SimpleErrorQueue');
+        $queue->expectError($this->coerceExpectation($expected), $message);
+    }
+
+    /**
+     *    Prepares for an exception. If the error mismatches it
+     *    passes through, otherwise it is swallowed. Any
+     *    left over errors trigger failures.
+     *    @param SimpleExpectation/Exception $expected  The error to match.
+     *    @param string $message                        Message on failure.
+     *    @access public
+     */
+    function expectException($expected = false, $message = '%s') {
+        $queue = SimpleTest::getContext()->get('SimpleExceptionTrap');
+        $line = $this->getAssertionLine();
+        $queue->expectException($expected, $message . $line);
+    }
+
+    /**
+     *    Tells SimpleTest to ignore an upcoming exception as not relevant
+     *    to the current test. It doesn't affect the test, whether thrown or
+     *    not.
+     *    @param SimpleExpectation/Exception $ignored  The error to ignore.
+     *    @access public
+     */
+    function ignoreException($ignored = false) {
+        SimpleTest::getContext()->get('SimpleExceptionTrap')->ignoreException($ignored);
+    }
+
+    /**
+     *    Creates an equality expectation if the
+     *    object/value is not already some type
+     *    of expectation.
+     *    @param mixed $expected      Expected value.
+     *    @return SimpleExpectation   Expectation object.
+     *    @access private
+     */
+    protected function coerceExpectation($expected) {
+        if ($expected == false) {
+            return new TrueExpectation();
+        }
+        if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
+            return $expected;
+        }
+        return new EqualExpectation(
+                is_string($expected) ? str_replace('%', '%%', $expected) : $expected);
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/url.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/url.php
new file mode 100644
index 000000000..11d70e745
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/url.php
@@ -0,0 +1,550 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: url.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/encoding.php');
+/**#@-*/
+
+/**
+ *    URL parser to replace parse_url() PHP function which
+ *    got broken in PHP 4.3.0. Adds some browser specific
+ *    functionality such as expandomatics.
+ *    Guesses a bit trying to separate the host from
+ *    the path and tries to keep a raw, possibly unparsable,
+ *    request string as long as possible.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUrl {
+    private $scheme;
+    private $username;
+    private $password;
+    private $host;
+    private $port;
+    public $path;
+    private $request;
+    private $fragment;
+    private $x;
+    private $y;
+    private $target;
+    private $raw = false;
+
+    /**
+     *    Constructor. Parses URL into sections.
+     *    @param string $url        Incoming URL.
+     *    @access public
+     */
+    function __construct($url = '') {
+        list($x, $y) = $this->chompCoordinates($url);
+        $this->setCoordinates($x, $y);
+        $this->scheme = $this->chompScheme($url);
+        if ($this->scheme === 'file') {
+            // Unescaped backslashes not used in directory separator context
+            // will get caught by this, but they should have been urlencoded
+            // anyway so we don't care. If this ends up being a problem, the
+            // host regexp must be modified to match for backslashes when
+            // the scheme is file.
+            $url = str_replace('\\', '/', $url);
+        }
+        list($this->username, $this->password) = $this->chompLogin($url);
+        $this->host = $this->chompHost($url);
+        $this->port = false;
+        if (preg_match('/(.*?):(.*)/', $this->host, $host_parts)) {
+            if ($this->scheme === 'file' && strlen($this->host) === 2) {
+                // DOS drive was placed in authority; promote it to path.
+                $url = '/' . $this->host . $url;
+                $this->host = false;
+            } else {
+                $this->host = $host_parts[1];
+                $this->port = (integer)$host_parts[2];
+            }
+        }
+        $this->path = $this->chompPath($url);
+        $this->request = $this->parseRequest($this->chompRequest($url));
+        $this->fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
+        $this->target = false;
+    }
+
+    /**
+     *    Extracts the X, Y coordinate pair from an image map.
+     *    @param string $url   URL so far. The coordinates will be
+     *                         removed.
+     *    @return array        X, Y as a pair of integers.
+     *    @access private
+     */
+    protected function chompCoordinates(&$url) {
+        if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
+            $url = $matches[1];
+            return array((integer)$matches[2], (integer)$matches[3]);
+        }
+        return array(false, false);
+    }
+
+    /**
+     *    Extracts the scheme part of an incoming URL.
+     *    @param string $url   URL so far. The scheme will be
+     *                         removed.
+     *    @return string       Scheme part or false.
+     *    @access private
+     */
+    protected function chompScheme(&$url) {
+        if (preg_match('#^([^/:]*):(//)(.*)#', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return $matches[1];
+        }
+        return false;
+    }
+
+    /**
+     *    Extracts the username and password from the
+     *    incoming URL. The // prefix will be reattached
+     *    to the URL after the doublet is extracted.
+     *    @param string $url    URL so far. The username and
+     *                          password are removed.
+     *    @return array         Two item list of username and
+     *                          password. Will urldecode() them.
+     *    @access private
+     */
+    protected function chompLogin(&$url) {
+        $prefix = '';
+        if (preg_match('#^(//)(.*)#', $url, $matches)) {
+            $prefix = $matches[1];
+            $url = $matches[2];
+        }
+        if (preg_match('#^([^/]*)@(.*)#', $url, $matches)) {
+            $url = $prefix . $matches[2];
+            $parts = explode(":", $matches[1]);
+            return array(
+                    urldecode($parts[0]),
+                    isset($parts[1]) ? urldecode($parts[1]) : false);
+        }
+        $url = $prefix . $url;
+        return array(false, false);
+    }
+
+    /**
+     *    Extracts the host part of an incoming URL.
+     *    Includes the port number part. Will extract
+     *    the host if it starts with // or it has
+     *    a top level domain or it has at least two
+     *    dots.
+     *    @param string $url    URL so far. The host will be
+     *                          removed.
+     *    @return string        Host part guess or false.
+     *    @access private
+     */
+    protected function chompHost(&$url) {
+        if (preg_match('!^(//)(.*?)(/.*|\?.*|#.*|$)!', $url, $matches)) {
+            $url = $matches[3];
+            return $matches[2];
+        }
+        if (preg_match('!(.*?)(\.\./|\./|/|\?|#|$)(.*)!', $url, $matches)) {
+            $tlds = SimpleUrl::getAllTopLevelDomains();
+            if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
+                $url = $matches[2] . $matches[3];
+                return $matches[1];
+            } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
+                $url = $matches[2] . $matches[3];
+                return $matches[1];
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Extracts the path information from the incoming
+     *    URL. Strips this path from the URL.
+     *    @param string $url     URL so far. The host will be
+     *                           removed.
+     *    @return string         Path part or '/'.
+     *    @access private
+     */
+    protected function chompPath(&$url) {
+        if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return ($matches[1] ? $matches[1] : '');
+        }
+        return '';
+    }
+
+    /**
+     *    Strips off the request data.
+     *    @param string $url  URL so far. The request will be
+     *                        removed.
+     *    @return string      Raw request part.
+     *    @access private
+     */
+    protected function chompRequest(&$url) {
+        if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
+            $url = $matches[2] . $matches[3];
+            return $matches[1];
+        }
+        return '';
+    }
+
+    /**
+     *    Breaks the request down into an object.
+     *    @param string $raw           Raw request.
+     *    @return SimpleFormEncoding    Parsed data.
+     *    @access private
+     */
+    protected function parseRequest($raw) {
+        $this->raw = $raw;
+        $request = new SimpleGetEncoding();
+        foreach (explode("&", $raw) as $pair) {
+            if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
+                $request->add(urldecode($matches[1]), urldecode($matches[2]));
+            } elseif ($pair) {
+                $request->add(urldecode($pair), '');
+            }
+        }
+        return $request;
+    }
+
+    /**
+     *    Accessor for protocol part.
+     *    @param string $default    Value to use if not present.
+     *    @return string            Scheme name, e.g "http".
+     *    @access public
+     */
+    function getScheme($default = false) {
+        return $this->scheme ? $this->scheme : $default;
+    }
+
+    /**
+     *    Accessor for user name.
+     *    @return string    Username preceding host.
+     *    @access public
+     */
+    function getUsername() {
+        return $this->username;
+    }
+
+    /**
+     *    Accessor for password.
+     *    @return string    Password preceding host.
+     *    @access public
+     */
+    function getPassword() {
+        return $this->password;
+    }
+
+    /**
+     *    Accessor for hostname and port.
+     *    @param string $default    Value to use if not present.
+     *    @return string            Hostname only.
+     *    @access public
+     */
+    function getHost($default = false) {
+        return $this->host ? $this->host : $default;
+    }
+
+    /**
+     *    Accessor for top level domain.
+     *    @return string       Last part of host.
+     *    @access public
+     */
+    function getTld() {
+        $path_parts = pathinfo($this->getHost());
+        return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
+    }
+
+    /**
+     *    Accessor for port number.
+     *    @return integer    TCP/IP port number.
+     *    @access public
+     */
+    function getPort() {
+        return $this->port;
+    }
+
+    /**
+     *    Accessor for path.
+     *    @return string    Full path including leading slash if implied.
+     *    @access public
+     */
+    function getPath() {
+        if (! $this->path && $this->host) {
+            return '/';
+        }
+        return $this->path;
+    }
+
+    /**
+     *    Accessor for page if any. This may be a
+     *    directory name if ambiguious.
+     *    @return            Page name.
+     *    @access public
+     */
+    function getPage() {
+        if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
+            return false;
+        }
+        return $matches[1];
+    }
+
+    /**
+     *    Gets the path to the page.
+     *    @return string       Path less the page.
+     *    @access public
+     */
+    function getBasePath() {
+        if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
+            return false;
+        }
+        return $matches[1];
+    }
+
+    /**
+     *    Accessor for fragment at end of URL after the "#".
+     *    @return string    Part after "#".
+     *    @access public
+     */
+    function getFragment() {
+        return $this->fragment;
+    }
+
+    /**
+     *    Sets image coordinates. Set to false to clear
+     *    them.
+     *    @param integer $x    Horizontal position.
+     *    @param integer $y    Vertical position.
+     *    @access public
+     */
+    function setCoordinates($x = false, $y = false) {
+        if (($x === false) || ($y === false)) {
+            $this->x = $this->y = false;
+            return;
+        }
+        $this->x = (integer)$x;
+        $this->y = (integer)$y;
+    }
+
+    /**
+     *    Accessor for horizontal image coordinate.
+     *    @return integer        X value.
+     *    @access public
+     */
+    function getX() {
+        return $this->x;
+    }
+
+    /**
+     *    Accessor for vertical image coordinate.
+     *    @return integer        Y value.
+     *    @access public
+     */
+    function getY() {
+        return $this->y;
+    }
+
+    /**
+     *    Accessor for current request parameters
+     *    in URL string form. Will return teh original request
+     *    if at all possible even if it doesn't make much
+     *    sense.
+     *    @return string   Form is string "?a=1&b=2", etc.
+     *    @access public
+     */
+    function getEncodedRequest() {
+        if ($this->raw) {
+            $encoded = $this->raw;
+        } else {
+            $encoded = $this->request->asUrlRequest();
+        }
+        if ($encoded) {
+            return '?' . preg_replace('/^\?/', '', $encoded);
+        }
+        return '';
+    }
+
+    /**
+     *    Adds an additional parameter to the request.
+     *    @param string $key            Name of parameter.
+     *    @param string $value          Value as string.
+     *    @access public
+     */
+    function addRequestParameter($key, $value) {
+        $this->raw = false;
+        $this->request->add($key, $value);
+    }
+
+    /**
+     *    Adds additional parameters to the request.
+     *    @param hash/SimpleFormEncoding $parameters   Additional
+     *                                                parameters.
+     *    @access public
+     */
+    function addRequestParameters($parameters) {
+        $this->raw = false;
+        $this->request->merge($parameters);
+    }
+
+    /**
+     *    Clears down all parameters.
+     *    @access public
+     */
+    function clearRequest() {
+        $this->raw = false;
+        $this->request = new SimpleGetEncoding();
+    }
+
+    /**
+     *    Gets the frame target if present. Although
+     *    not strictly part of the URL specification it
+     *    acts as similarily to the browser.
+     *    @return boolean/string    Frame name or false if none.
+     *    @access public
+     */
+    function getTarget() {
+        return $this->target;
+    }
+
+    /**
+     *    Attaches a frame target.
+     *    @param string $frame        Name of frame.
+     *    @access public
+     */
+    function setTarget($frame) {
+        $this->raw = false;
+        $this->target = $frame;
+    }
+
+    /**
+     *    Renders the URL back into a string.
+     *    @return string        URL in canonical form.
+     *    @access public
+     */
+    function asString() {
+        $path = $this->path;
+        $scheme = $identity = $host = $port = $encoded = $fragment = '';
+        if ($this->username && $this->password) {
+            $identity = $this->username . ':' . $this->password . '@';
+        }
+        if ($this->getHost()) {
+            $scheme = $this->getScheme() ? $this->getScheme() : 'http';
+            $scheme .= '://';
+            $host = $this->getHost();
+        } elseif ($this->getScheme() === 'file') {
+            // Safest way; otherwise, file URLs on Windows have an extra
+            // leading slash. It might be possible to convert file://
+            // URIs to local file paths, but that requires more research.
+            $scheme = 'file://';
+        }
+        if ($this->getPort() && $this->getPort() != 80 ) {
+            $port = ':'.$this->getPort();
+        }
+
+        if (substr($this->path, 0, 1) == '/') {
+            $path = $this->normalisePath($this->path);
+        }
+        $encoded = $this->getEncodedRequest();
+        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+        return "$scheme$identity$host$port$path$encoded$fragment$coords";
+    }
+
+    /**
+     *    Replaces unknown sections to turn a relative
+     *    URL into an absolute one. The base URL can
+     *    be either a string or a SimpleUrl object.
+     *    @param string/SimpleUrl $base       Base URL.
+     *    @access public
+     */
+    function makeAbsolute($base) {
+        if (! is_object($base)) {
+            $base = new SimpleUrl($base);
+        }
+        if ($this->getHost()) {
+            $scheme = $this->getScheme();
+            $host = $this->getHost();
+            $port = $this->getPort() ? ':' . $this->getPort() : '';
+            $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
+            if (! $identity) {
+                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+            }
+        } else {
+            $scheme = $base->getScheme();
+            $host = $base->getHost();
+            $port = $base->getPort() ? ':' . $base->getPort() : '';
+            $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
+        }
+        $path = $this->normalisePath($this->extractAbsolutePath($base));
+        $encoded = $this->getEncodedRequest();
+        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
+        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
+        return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
+    }
+
+    /**
+     *    Replaces unknown sections of the path with base parts
+     *    to return a complete absolute one.
+     *    @param string/SimpleUrl $base       Base URL.
+     *    @param string                       Absolute path.
+     *    @access private
+     */
+    protected function extractAbsolutePath($base) {
+        if ($this->getHost()) {
+            return $this->path;
+        }
+        if (! $this->isRelativePath($this->path)) {
+            return $this->path;
+        }
+        if ($this->path) {
+            return $base->getBasePath() . $this->path;
+        }
+        return $base->getPath();
+    }
+
+    /**
+     *    Simple test to see if a path part is relative.
+     *    @param string $path        Path to test.
+     *    @return boolean            True if starts with a "/".
+     *    @access private
+     */
+    protected function isRelativePath($path) {
+        return (substr($path, 0, 1) != '/');
+    }
+
+    /**
+     *    Extracts the username and password for use in rendering
+     *    a URL.
+     *    @return string/boolean    Form of username:password or false.
+     *    @access public
+     */
+    function getIdentity() {
+        if ($this->username && $this->password) {
+            return $this->username . ':' . $this->password;
+        }
+        return false;
+    }
+
+    /**
+     *    Replaces . and .. sections of the path.
+     *    @param string $path    Unoptimised path.
+     *    @return string         Path with dots removed if possible.
+     *    @access public
+     */
+    function normalisePath($path) {
+        $path = preg_replace('|/\./|', '/', $path);
+        return preg_replace('|/[^/]+/\.\./|', '/', $path);
+    }
+
+    /**
+     *    A pipe seperated list of all TLDs that result in two part
+     *    domain names.
+     *    @return string        Pipe separated list.
+     *    @access public
+     */
+    static function getAllTopLevelDomains() {
+        return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/user_agent.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/user_agent.php
new file mode 100644
index 000000000..aff7ee6e6
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/user_agent.php
@@ -0,0 +1,328 @@
+<?php
+/**
+ *  Base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: user_agent.php 2011 2011-04-29 08:22:48Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/cookies.php');
+require_once(dirname(__FILE__) . '/http.php');
+require_once(dirname(__FILE__) . '/encoding.php');
+require_once(dirname(__FILE__) . '/authentication.php');
+/**#@-*/
+
+if (! defined('DEFAULT_MAX_REDIRECTS')) {
+    define('DEFAULT_MAX_REDIRECTS', 3);
+}
+if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
+    define('DEFAULT_CONNECTION_TIMEOUT', 15);
+}
+
+/**
+ *    Fetches web pages whilst keeping track of
+ *    cookies and authentication.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class SimpleUserAgent {
+    private $cookie_jar;
+    private $cookies_enabled = true;
+    private $authenticator;
+    private $max_redirects = DEFAULT_MAX_REDIRECTS;
+    private $proxy = false;
+    private $proxy_username = false;
+    private $proxy_password = false;
+    private $connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
+    private $additional_headers = array();
+
+    /**
+     *    Starts with no cookies, realms or proxies.
+     *    @access public
+     */
+    function __construct() {
+        $this->cookie_jar = new SimpleCookieJar();
+        $this->authenticator = new SimpleAuthenticator();
+    }
+
+    /**
+     *    Removes expired and temporary cookies as if
+     *    the browser was closed and re-opened. Authorisation
+     *    has to be obtained again as well.
+     *    @param string/integer $date   Time when session restarted.
+     *                                  If omitted then all persistent
+     *                                  cookies are kept.
+     *    @access public
+     */
+    function restart($date = false) {
+        $this->cookie_jar->restartSession($date);
+        $this->authenticator->restartSession();
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->additional_headers[] = $header;
+    }
+
+    /**
+     *    Ages the cookies by the specified time.
+     *    @param integer $interval    Amount in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->cookie_jar->agePrematurely($interval);
+    }
+
+    /**
+     *    Sets an additional cookie. If a cookie has
+     *    the same name and path it is replaced.
+     *    @param string $name            Cookie key.
+     *    @param string $value           Value of cookie.
+     *    @param string $host            Host upon which the cookie is valid.
+     *    @param string $path            Cookie path if not host wide.
+     *    @param string $expiry          Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->cookie_jar->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Reads the most specific cookie value from the
+     *    browser cookies.
+     *    @param string $host        Host to search.
+     *    @param string $path        Applicable path.
+     *    @param string $name        Name of cookie to read.
+     *    @return string             False if not present, else the
+     *                               value as a string.
+     *    @access public
+     */
+    function getCookieValue($host, $path, $name) {
+        return $this->cookie_jar->getCookieValue($host, $path, $name);
+    }
+
+    /**
+     *    Reads the current cookies within the base URL.
+     *    @param string $name     Key of cookie to find.
+     *    @param SimpleUrl $base  Base URL to search from.
+     *    @return string/boolean  Null if there is no base URL, false
+     *                            if the cookie is not set.
+     *    @access public
+     */
+    function getBaseCookieValue($name, $base) {
+        if (! $base) {
+            return null;
+        }
+        return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->cookies_enabled = false;
+    }
+
+    /**
+     *    Switches back on the cookie sending and recieving.
+     *    @access public
+     */
+    function useCookies() {
+        $this->cookies_enabled = true;
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->connection_timeout = $timeout;
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    a page will be loaded anyway.
+     *    @param integer $max        Most hops allowed.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        $this->max_redirects = $max;
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username, $password) {
+        if (! $proxy) {
+            $this->proxy = false;
+            return;
+        }
+        if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
+            $proxy = 'http://'. $proxy;
+        }
+        $this->proxy = new SimpleUrl($proxy);
+        $this->proxy_username = $username;
+        $this->proxy_password = $password;
+    }
+
+    /**
+     *    Test to see if the redirect limit is passed.
+     *    @param integer $redirects        Count so far.
+     *    @return boolean                  True if over.
+     *    @access private
+     */
+    protected function isTooManyRedirects($redirects) {
+        return ($redirects > $this->max_redirects);
+    }
+
+    /**
+     *    Sets the identity for the current realm.
+     *    @param string $host        Host to which realm applies.
+     *    @param string $realm       Full name of realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @access public
+     */
+    function setIdentity($host, $realm, $username, $password) {
+        $this->authenticator->setIdentityForRealm($host, $realm, $username, $password);
+    }
+
+    /**
+     *    Fetches a URL as a response object. Will keep trying if redirected.
+     *    It will also collect authentication realm information.
+     *    @param string/SimpleUrl $url      Target to fetch.
+     *    @param SimpleEncoding $encoding   Additional parameters for request.
+     *    @return SimpleHttpResponse        Hopefully the target page.
+     *    @access public
+     */
+    function fetchResponse($url, $encoding) {
+        if ($encoding->getMethod() != 'POST') {
+            $url->addRequestParameters($encoding);
+            $encoding->clear();
+        }
+        $response = $this->fetchWhileRedirected($url, $encoding);
+        if ($headers = $response->getHeaders()) {
+            if ($headers->isChallenge()) {
+                $this->authenticator->addRealm(
+                        $url,
+                        $headers->getAuthentication(),
+                        $headers->getRealm());
+            }
+        }
+        return $response;
+    }
+
+    /**
+     *    Fetches the page until no longer redirected or
+     *    until the redirect limit runs out.
+     *    @param SimpleUrl $url                  Target to fetch.
+     *    @param SimpelFormEncoding $encoding    Additional parameters for request.
+     *    @return SimpleHttpResponse             Hopefully the target page.
+     *    @access private
+     */
+    protected function fetchWhileRedirected($url, $encoding) {
+        $redirects = 0;
+        do {
+            $response = $this->fetch($url, $encoding);
+            if ($response->isError()) {
+                return $response;
+            }
+            $headers = $response->getHeaders();
+            $location = new SimpleUrl($headers->getLocation());
+            $url = $location->makeAbsolute($url);
+            if ($this->cookies_enabled) {
+                $headers->writeCookiesToJar($this->cookie_jar, $url);
+            }
+            if (! $headers->isRedirect()) {
+                break;
+            }
+            $encoding = new SimpleGetEncoding();
+        } while (! $this->isTooManyRedirects(++$redirects));
+        return $response;
+    }
+
+    /**
+     *    Actually make the web request.
+     *    @param SimpleUrl $url                   Target to fetch.
+     *    @param SimpleFormEncoding $encoding     Additional parameters for request.
+     *    @return SimpleHttpResponse              Headers and hopefully content.
+     *    @access protected
+     */
+    protected function fetch($url, $encoding) {
+        $request = $this->createRequest($url, $encoding);
+        return $request->fetch($this->connection_timeout);
+    }
+
+    /**
+     *    Creates a full page request.
+     *    @param SimpleUrl $url                 Target to fetch as url object.
+     *    @param SimpleFormEncoding $encoding   POST/GET parameters.
+     *    @return SimpleHttpRequest             New request.
+     *    @access private
+     */
+    protected function createRequest($url, $encoding) {
+        $request = $this->createHttpRequest($url, $encoding);
+        $this->addAdditionalHeaders($request);
+        if ($this->cookies_enabled) {
+            $request->readCookiesFromJar($this->cookie_jar, $url);
+        }
+        $this->authenticator->addHeaders($request, $url);
+        return $request;
+    }
+
+    /**
+     *    Builds the appropriate HTTP request object.
+     *    @param SimpleUrl $url                  Target to fetch as url object.
+     *    @param SimpleFormEncoding $parameters  POST/GET parameters.
+     *    @return SimpleHttpRequest              New request object.
+     *    @access protected
+     */
+    protected function createHttpRequest($url, $encoding) {
+        return new SimpleHttpRequest($this->createRoute($url), $encoding);
+    }
+
+    /**
+     *    Sets up either a direct route or via a proxy.
+     *    @param SimpleUrl $url   Target to fetch as url object.
+     *    @return SimpleRoute     Route to take to fetch URL.
+     *    @access protected
+     */
+    protected function createRoute($url) {
+        if ($this->proxy) {
+            return new SimpleProxyRoute(
+                    $url,
+                    $this->proxy,
+                    $this->proxy_username,
+                    $this->proxy_password);
+        }
+        return new SimpleRoute($url);
+    }
+
+    /**
+     *    Adds additional manual headers.
+     *    @param SimpleHttpRequest $request    Outgoing request.
+     *    @access private
+     */
+    protected function addAdditionalHeaders(&$request) {
+        foreach ($this->additional_headers as $header) {
+            $request->addHeaderLine($header);
+        }
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/web_tester.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/web_tester.php
new file mode 100644
index 000000000..a17230e7b
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/web_tester.php
@@ -0,0 +1,1532 @@
+<?php
+/**
+ *  Base include file for SimpleTest.
+ *  @package    SimpleTest
+ *  @subpackage WebTester
+ *  @version    $Id: web_tester.php 2013 2011-04-29 09:29:45Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/test_case.php');
+require_once(dirname(__FILE__) . '/browser.php');
+require_once(dirname(__FILE__) . '/page.php');
+require_once(dirname(__FILE__) . '/expectation.php');
+/**#@-*/
+
+/**
+ *    Test for an HTML widget value match.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class FieldExpectation extends SimpleExpectation {
+    private $value;
+
+    /**
+     *    Sets the field value to compare against.
+     *    @param mixed $value     Test value to match. Can be an
+     *                            expectation for say pattern matching.
+     *    @param string $message  Optiona message override. Can use %s as
+     *                            a placeholder for the original message.
+     *    @access public
+     */
+    function __construct($value, $message = '%s') {
+        parent::__construct($message);
+        if (is_array($value)) {
+            sort($value);
+        }
+        $this->value = $value;
+    }
+
+    /**
+     *    Tests the expectation. True if it matches
+     *    a string value or an array value in any order.
+     *    @param mixed $compare        Comparison value. False for
+     *                                 an unset field.
+     *    @return boolean              True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        if ($this->value === false) {
+            return ($compare === false);
+        }
+        if ($this->isSingle($this->value)) {
+            return $this->testSingle($compare);
+        }
+        if (is_array($this->value)) {
+            return $this->testMultiple($compare);
+        }
+        return false;
+    }
+
+    /**
+     *    Tests for valid field comparisons with a single option.
+     *    @param mixed $value       Value to type check.
+     *    @return boolean           True if integer, string or float.
+     *    @access private
+     */
+    protected function isSingle($value) {
+        return is_string($value) || is_integer($value) || is_float($value);
+    }
+
+    /**
+     *    String comparison for simple field with a single option.
+     *    @param mixed $compare    String to test against.
+     *    @returns boolean         True if matching.
+     *    @access private
+     */
+    protected function testSingle($compare) {
+        if (is_array($compare) && count($compare) == 1) {
+            $compare = $compare[0];
+        }
+        if (! $this->isSingle($compare)) {
+            return false;
+        }
+        return ($this->value == $compare);
+    }
+
+    /**
+     *    List comparison for multivalue field.
+     *    @param mixed $compare    List in any order to test against.
+     *    @returns boolean         True if matching.
+     *    @access private
+     */
+    protected function testMultiple($compare) {
+        if (is_string($compare)) {
+            $compare = array($compare);
+        }
+        if (! is_array($compare)) {
+            return false;
+        }
+        sort($compare);
+        return ($this->value === $compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $dumper = $this->getDumper();
+        if (is_array($compare)) {
+            sort($compare);
+        }
+        if ($this->test($compare)) {
+            return "Field expectation [" . $dumper->describeValue($this->value) . "]";
+        } else {
+            return "Field expectation [" . $dumper->describeValue($this->value) .
+                    "] fails with [" .
+                    $dumper->describeValue($compare) . "] " .
+                    $dumper->describeDifference($this->value, $compare);
+        }
+    }
+}
+
+/**
+ *    Test for a specific HTTP header within a header block.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class HttpHeaderExpectation extends SimpleExpectation {
+    private $expected_header;
+    private $expected_value;
+
+    /**
+     *    Sets the field and value to compare against.
+     *    @param string $header   Case insenstive trimmed header name.
+     *    @param mixed $value     Optional value to compare. If not
+     *                            given then any value will match. If
+     *                            an expectation object then that will
+     *                            be used instead.
+     *    @param string $message  Optiona message override. Can use %s as
+     *                            a placeholder for the original message.
+     */
+    function __construct($header, $value = false, $message = '%s') {
+        parent::__construct($message);
+        $this->expected_header = $this->normaliseHeader($header);
+        $this->expected_value = $value;
+    }
+
+    /**
+     *    Accessor for aggregated object.
+     *    @return mixed        Expectation set in constructor.
+     *    @access protected
+     */
+    protected function getExpectation() {
+        return $this->expected_value;
+    }
+
+    /**
+     *    Removes whitespace at ends and case variations.
+     *    @param string $header    Name of header.
+     *    @param string            Trimmed and lowecased header
+     *                             name.
+     *    @access private
+     */
+    protected function normaliseHeader($header) {
+        return strtolower(trim($header));
+    }
+
+    /**
+     *    Tests the expectation. True if it matches
+     *    a string value or an array value in any order.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return boolean         True if header present.
+     *    @access public
+     */
+    function test($compare) {
+        return is_string($this->findHeader($compare));
+    }
+
+    /**
+     *    Searches the incoming result. Will extract the matching
+     *    line as text.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return string          Matching header line.
+     *    @access protected
+     */
+    protected function findHeader($compare) {
+        $lines = explode("\r\n", $compare);
+        foreach ($lines as $line) {
+            if ($this->testHeaderLine($line)) {
+                return $line;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *    Compares a single header line against the expectation.
+     *    @param string $line      A single line to compare.
+     *    @return boolean          True if matched.
+     *    @access private
+     */
+    protected function testHeaderLine($line) {
+        if (count($parsed = explode(':', $line, 2)) < 2) {
+            return false;
+        }
+        list($header, $value) = $parsed;
+        if ($this->normaliseHeader($header) != $this->expected_header) {
+            return false;
+        }
+        return $this->testHeaderValue($value, $this->expected_value);
+    }
+
+    /**
+     *    Tests the value part of the header.
+     *    @param string $value        Value to test.
+     *    @param mixed $expected      Value to test against.
+     *    @return boolean             True if matched.
+     *    @access protected
+     */
+    protected function testHeaderValue($value, $expected) {
+        if ($expected === false) {
+            return true;
+        }
+        if (SimpleExpectation::isExpectation($expected)) {
+            return $expected->test(trim($value));
+        }
+        return (trim($value) == trim($expected));
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Raw header block to search.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if (SimpleExpectation::isExpectation($this->expected_value)) {
+            $message = $this->expected_value->overlayMessage($compare, $this->getDumper());
+        } else {
+            $message = $this->expected_header .
+                    ($this->expected_value ? ': ' . $this->expected_value : '');
+        }
+        if (is_string($line = $this->findHeader($compare))) {
+            return "Searching for header [$message] found [$line]";
+        } else {
+            return "Failed to find header [$message]";
+        }
+    }
+}
+
+/**
+ *    Test for a specific HTTP header within a header block that
+ *    should not be found.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class NoHttpHeaderExpectation extends HttpHeaderExpectation {
+    private $expected_header;
+    private $expected_value;
+
+    /**
+     *    Sets the field and value to compare against.
+     *    @param string $unwanted   Case insenstive trimmed header name.
+     *    @param string $message    Optiona message override. Can use %s as
+     *                              a placeholder for the original message.
+     */
+    function __construct($unwanted, $message = '%s') {
+        parent::__construct($unwanted, false, $message);
+    }
+
+    /**
+     *    Tests that the unwanted header is not found.
+     *    @param mixed $compare   Raw header block to search.
+     *    @return boolean         True if header present.
+     *    @access public
+     */
+    function test($compare) {
+        return ($this->findHeader($compare) === false);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Raw header block to search.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        $expectation = $this->getExpectation();
+        if (is_string($line = $this->findHeader($compare))) {
+            return "Found unwanted header [$expectation] with [$line]";
+        } else {
+            return "Did not find unwanted header [$expectation]";
+        }
+    }
+}
+
+/**
+ *    Test for a text substring.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class TextExpectation extends SimpleExpectation {
+    private $substring;
+
+    /**
+     *    Sets the value to compare against.
+     *    @param string $substring  Text to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($substring, $message = '%s') {
+        parent::__construct($message);
+        $this->substring = $substring;
+    }
+
+    /**
+     *    Accessor for the substring.
+     *    @return string       Text to match.
+     *    @access protected
+     */
+    protected function getSubstring() {
+        return $this->substring;
+    }
+
+    /**
+     *    Tests the expectation. True if the text contains the
+     *    substring.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return (strpos($compare, $this->substring) !== false);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param mixed $compare      Comparison value.
+     *    @return string             Description of success
+     *                               or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            return $this->describeTextMatch($this->getSubstring(), $compare);
+        } else {
+            $dumper = $this->getDumper();
+            return "Text [" . $this->getSubstring() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        }
+    }
+
+    /**
+     *    Describes a pattern match including the string
+     *    found and it's position.
+     *    @param string $substring      Text to search for.
+     *    @param string $subject        Subject to search.
+     *    @access protected
+     */
+    protected function describeTextMatch($substring, $subject) {
+        $position = strpos($subject, $substring);
+        $dumper = $this->getDumper();
+        return "Text [$substring] detected at character [$position] in [" .
+                $dumper->describeValue($subject) . "] in region [" .
+                $dumper->clipString($subject, 100, $position) . "]";
+    }
+}
+
+/**
+ *    Fail if a substring is detected within the
+ *    comparison text.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NoTextExpectation extends TextExpectation {
+
+    /**
+     *    Sets the reject pattern
+     *    @param string $substring  Text to search for.
+     *    @param string $message    Customised message on failure.
+     *    @access public
+     */
+    function __construct($substring, $message = '%s') {
+        parent::__construct($substring, $message);
+    }
+
+    /**
+     *    Tests the expectation. False if the substring appears
+     *    in the text.
+     *    @param string $compare        Comparison value.
+     *    @return boolean               True if correct.
+     *    @access public
+     */
+    function test($compare) {
+        return ! parent::test($compare);
+    }
+
+    /**
+     *    Returns a human readable test message.
+     *    @param string $compare      Comparison value.
+     *    @return string              Description of success
+     *                                or failure.
+     *    @access public
+     */
+    function testMessage($compare) {
+        if ($this->test($compare)) {
+            $dumper = $this->getDumper();
+            return "Text [" . $this->getSubstring() .
+                    "] not detected in [" .
+                    $dumper->describeValue($compare) . "]";
+        } else {
+            return $this->describeTextMatch($this->getSubstring(), $compare);
+        }
+    }
+}
+
+/**
+ *    Test case for testing of web pages. Allows
+ *    fetching of pages, parsing of HTML and
+ *    submitting forms.
+ *    @package SimpleTest
+ *    @subpackage WebTester
+ */
+class WebTestCase extends SimpleTestCase {
+    private $browser;
+    private $ignore_errors = false;
+
+    /**
+     *    Creates an empty test case. Should be subclassed
+     *    with test methods for a functional test case.
+     *    @param string $label     Name of test case. Will use
+     *                             the class name if none specified.
+     *    @access public
+     */
+    function __construct($label = false) {
+        parent::__construct($label);
+    }
+
+    /**
+     *    Announces the start of the test.
+     *    @param string $method    Test method just started.
+     *    @access public
+     */
+    function before($method) {
+        parent::before($method);
+        $this->setBrowser($this->createBrowser());
+    }
+
+    /**
+     *    Announces the end of the test. Includes private clean up.
+     *    @param string $method    Test method just finished.
+     *    @access public
+     */
+    function after($method) {
+        $this->unsetBrowser();
+        parent::after($method);
+    }
+
+    /**
+     *    Gets a current browser reference for setting
+     *    special expectations or for detailed
+     *    examination of page fetches.
+     *    @return SimpleBrowser     Current test browser object.
+     *    @access public
+     */
+    function getBrowser() {
+        return $this->browser;
+    }
+
+    /**
+     *    Gets a current browser reference for setting
+     *    special expectations or for detailed
+     *    examination of page fetches.
+     *    @param SimpleBrowser $browser    New test browser object.
+     *    @access public
+     */
+    function setBrowser($browser) {
+        return $this->browser = $browser;
+    }
+
+    /**
+     *    Sets the HTML parser to use within this browser.
+     *    @param object         The parser, one of SimplePHPPageBuilder or
+     *                          SimpleTidyPageBuilder.
+     */
+    function setParser($parser) {
+        $this->browser->setParser($parser);
+    }
+
+    /**
+     *    Clears the current browser reference to help the
+     *    PHP garbage collector.
+     *    @access public
+     */
+    function unsetBrowser() {
+        unset($this->browser);
+    }
+
+    /**
+     *    Creates a new default web browser object.
+     *    Will be cleared at the end of the test method.
+     *    @return TestBrowser           New browser.
+     *    @access public
+     */
+    function createBrowser() {
+        return new SimpleBrowser();
+    }
+
+    /**
+     *    Gets the last response error.
+     *    @return string    Last low level HTTP error.
+     *    @access public
+     */
+    function getTransportError() {
+        return $this->browser->getTransportError();
+    }
+
+    /**
+     *    Accessor for the currently selected URL.
+     *    @return string        Current location or false if
+     *                          no page yet fetched.
+     *    @access public
+     */
+    function getUrl() {
+        return $this->browser->getUrl();
+    }
+
+    /**
+     *    Dumps the current request for debugging.
+     *    @access public
+     */
+    function showRequest() {
+        $this->dump($this->browser->getRequest());
+    }
+
+    /**
+     *    Dumps the current HTTP headers for debugging.
+     *    @access public
+     */
+    function showHeaders() {
+        $this->dump($this->browser->getHeaders());
+    }
+
+    /**
+     *    Dumps the current HTML source for debugging.
+     *    @access public
+     */
+    function showSource() {
+        $this->dump($this->browser->getContent());
+    }
+
+    /**
+     *    Dumps the visible text only for debugging.
+     *    @access public
+     */
+    function showText() {
+        $this->dump(wordwrap($this->browser->getContentAsText(), 80));
+    }
+
+    /**
+     *    Simulates the closing and reopening of the browser.
+     *    Temporary cookies will be discarded and timed
+     *    cookies will be expired if later than the
+     *    specified time.
+     *    @param string/integer $date Time when session restarted.
+     *                                If ommitted then all persistent
+     *                                cookies are kept. Time is either
+     *                                Cookie format string or timestamp.
+     *    @access public
+     */
+    function restart($date = false) {
+        if ($date === false) {
+            $date = time();
+        }
+        $this->browser->restart($date);
+    }
+
+    /**
+     *    Moves cookie expiry times back into the past.
+     *    Useful for testing timeouts and expiries.
+     *    @param integer $interval    Amount to age in seconds.
+     *    @access public
+     */
+    function ageCookies($interval) {
+        $this->browser->ageCookies($interval);
+    }
+
+    /**
+     *    Disables frames support. Frames will not be fetched
+     *    and the frameset page will be used instead.
+     *    @access public
+     */
+    function ignoreFrames() {
+        $this->browser->ignoreFrames();
+    }
+
+    /**
+     *    Switches off cookie sending and recieving.
+     *    @access public
+     */
+    function ignoreCookies() {
+        $this->browser->ignoreCookies();
+    }
+
+    /**
+     *    Skips errors for the next request only. You might
+     *    want to confirm that a page is unreachable for
+     *    example.
+     *    @access public
+     */
+    function ignoreErrors() {
+        $this->ignore_errors = true;
+    }
+
+    /**
+     *    Issues a fail if there is a transport error anywhere
+     *    in the current frameset. Only one such error is
+     *    reported.
+     *    @param string/boolean $result   HTML or failure.
+     *    @return string/boolean $result  Passes through result.
+     *    @access private
+     */
+    protected function failOnError($result) {
+        if (! $this->ignore_errors) {
+            if ($error = $this->browser->getTransportError()) {
+                $this->fail($error);
+            }
+        }
+        $this->ignore_errors = false;
+        return $result;
+    }
+
+    /**
+     *    Adds a header to every fetch.
+     *    @param string $header       Header line to add to every
+     *                                request until cleared.
+     *    @access public
+     */
+    function addHeader($header) {
+        $this->browser->addHeader($header);
+    }
+
+    /**
+     *    Sets the maximum number of redirects before
+     *    the web page is loaded regardless.
+     *    @param integer $max        Maximum hops.
+     *    @access public
+     */
+    function setMaximumRedirects($max) {
+        if (! $this->browser) {
+            trigger_error(
+                    'Can only set maximum redirects in a test method, setUp() or tearDown()');
+        }
+        $this->browser->setMaximumRedirects($max);
+    }
+
+    /**
+     *    Sets the socket timeout for opening a connection and
+     *    receiving at least one byte of information.
+     *    @param integer $timeout      Maximum time in seconds.
+     *    @access public
+     */
+    function setConnectionTimeout($timeout) {
+        $this->browser->setConnectionTimeout($timeout);
+    }
+
+    /**
+     *    Sets proxy to use on all requests for when
+     *    testing from behind a firewall. Set URL
+     *    to false to disable.
+     *    @param string $proxy        Proxy URL.
+     *    @param string $username     Proxy username for authentication.
+     *    @param string $password     Proxy password for authentication.
+     *    @access public
+     */
+    function useProxy($proxy, $username = false, $password = false) {
+        $this->browser->useProxy($proxy, $username, $password);
+    }
+
+    /**
+     *    Fetches a page into the page buffer. If
+     *    there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional GET data.
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function get($url, $parameters = false) {
+        return $this->failOnError($this->browser->get($url, $parameters));
+    }
+
+    /**
+     *    Fetches a page by POST into the page buffer.
+     *    If there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param mixed $parameters    Optional POST parameters or content body to send
+     *    @param string $content_type Content type of provided body
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function post($url, $parameters = false, $content_type = false) {
+        return $this->failOnError($this->browser->post($url, $parameters, $content_type));
+    }
+
+    /**
+     *    Fetches a page by PUT into the page buffer.
+     *    If there is no base for the URL then the
+     *    current base URL is used. After the fetch
+     *    the base URL reflects the new location.
+     *    @param string $url          URL to fetch.
+     *    @param mixed $body          Optional content body to send
+     *    @param string $content_type Content type of provided body
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function put($url, $body = false, $content_type = false) {
+        return $this->failOnError($this->browser->put($url, $body, $content_type));
+    }
+
+    /**
+     *    Fetches a page by a DELETE request
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional parameters.
+     *    @return boolean/string      Raw page on success.
+     *    @access public
+     */
+    function delete($url, $parameters = false) {
+        return $this->failOnError($this->browser->delete($url, $parameters));
+    }
+
+
+    /**
+     *    Does a HTTP HEAD fetch, fetching only the page
+     *    headers. The current base URL is unchanged by this.
+     *    @param string $url          URL to fetch.
+     *    @param hash $parameters     Optional additional GET data.
+     *    @return boolean             True on success.
+     *    @access public
+     */
+    function head($url, $parameters = false) {
+        return $this->failOnError($this->browser->head($url, $parameters));
+    }
+
+    /**
+     *    Equivalent to hitting the retry button on the
+     *    browser. Will attempt to repeat the page fetch.
+     *    @return boolean     True if fetch succeeded.
+     *    @access public
+     */
+    function retry() {
+        return $this->failOnError($this->browser->retry());
+    }
+
+    /**
+     *    Equivalent to hitting the back button on the
+     *    browser.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded.
+     *    @access public
+     */
+    function back() {
+        return $this->failOnError($this->browser->back());
+    }
+
+    /**
+     *    Equivalent to hitting the forward button on the
+     *    browser.
+     *    @return boolean     True if history entry and
+     *                        fetch succeeded.
+     *    @access public
+     */
+    function forward() {
+        return $this->failOnError($this->browser->forward());
+    }
+
+    /**
+     *    Retries a request after setting the authentication
+     *    for the current realm.
+     *    @param string $username    Username for realm.
+     *    @param string $password    Password for realm.
+     *    @return boolean/string     HTML on successful fetch. Note
+     *                               that authentication may still have
+     *                               failed.
+     *    @access public
+     */
+    function authenticate($username, $password) {
+        return $this->failOnError(
+                $this->browser->authenticate($username, $password));
+    }
+
+    /**
+     *    Gets the cookie value for the current browser context.
+     *    @param string $name          Name of cookie.
+     *    @return string               Value of cookie or false if unset.
+     *    @access public
+     */
+    function getCookie($name) {
+        return $this->browser->getCurrentCookieValue($name);
+    }
+
+    /**
+     *    Sets a cookie in the current browser.
+     *    @param string $name          Name of cookie.
+     *    @param string $value         Cookie value.
+     *    @param string $host          Host upon which the cookie is valid.
+     *    @param string $path          Cookie path if not host wide.
+     *    @param string $expiry        Expiry date.
+     *    @access public
+     */
+    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
+        $this->browser->setCookie($name, $value, $host, $path, $expiry);
+    }
+
+    /**
+     *    Accessor for current frame focus. Will be
+     *    false if no frame has focus.
+     *    @return integer/string/boolean    Label if any, otherwise
+     *                                      the position in the frameset
+     *                                      or false if none.
+     *    @access public
+     */
+    function getFrameFocus() {
+        return $this->browser->getFrameFocus();
+    }
+
+    /**
+     *    Sets the focus by index. The integer index starts from 1.
+     *    @param integer $choice    Chosen frame.
+     *    @return boolean           True if frame exists.
+     *    @access public
+     */
+    function setFrameFocusByIndex($choice) {
+        return $this->browser->setFrameFocusByIndex($choice);
+    }
+
+    /**
+     *    Sets the focus by name.
+     *    @param string $name    Chosen frame.
+     *    @return boolean        True if frame exists.
+     *    @access public
+     */
+    function setFrameFocus($name) {
+        return $this->browser->setFrameFocus($name);
+    }
+
+    /**
+     *    Clears the frame focus. All frames will be searched
+     *    for content.
+     *    @access public
+     */
+    function clearFrameFocus() {
+        return $this->browser->clearFrameFocus();
+    }
+
+    /**
+     *    Clicks a visible text item. Will first try buttons,
+     *    then links and then images.
+     *    @param string $label        Visible text or alt text.
+     *    @return string/boolean      Raw page or false.
+     *    @access public
+     */
+    function click($label) {
+        return $this->failOnError($this->browser->click($label));
+    }
+
+    /**
+     *    Checks for a click target.
+     *    @param string $label        Visible text or alt text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertClickable($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isClickable($label),
+                sprintf($message, "Click target [$label] should exist"));
+    }
+
+    /**
+     *    Clicks the submit button by label. The owning
+     *    form will be submitted by this.
+     *    @param string $label    Button label. An unlabeled
+     *                            button can be triggered by 'Submit'.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success, else false.
+     *    @access public
+     */
+    function clickSubmit($label = 'Submit', $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmit($label, $additional));
+    }
+
+    /**
+     *    Clicks the submit button by name attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $name     Name attribute of button.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickSubmitByName($name, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmitByName($name, $additional));
+    }
+
+    /**
+     *    Clicks the submit button by ID attribute. The owning
+     *    form will be submitted by this.
+     *    @param string $id       ID attribute of button.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickSubmitById($id, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickSubmitById($id, $additional));
+    }
+
+    /**
+     *    Checks for a valid button label.
+     *    @param string $label        Visible text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertSubmit($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isSubmit($label),
+                sprintf($message, "Submit button [$label] should exist"));
+    }
+
+    /**
+     *    Clicks the submit image by some kind of label. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $label    Alt attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickImage($label, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImage($label, $x, $y, $additional));
+    }
+
+    /**
+     *    Clicks the submit image by the name. Usually
+     *    the alt tag or the nearest equivalent. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param string $name     Name attribute of button.
+     *    @param integer $x       X-coordinate of imaginary click.
+     *    @param integer $y       Y-coordinate of imaginary click.
+     *    @param hash $additional Additional form values.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImageByName($name, $x, $y, $additional));
+    }
+
+    /**
+     *    Clicks the submit image by ID attribute. The owning
+     *    form will be submitted by this. Clicking outside of
+     *    the boundary of the coordinates will result in
+     *    a failure.
+     *    @param integer/string $id   ID attribute of button.
+     *    @param integer $x           X-coordinate of imaginary click.
+     *    @param integer $y           Y-coordinate of imaginary click.
+     *    @param hash $additional     Additional form values.
+     *    @return boolean/string      Page on success.
+     *    @access public
+     */
+    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
+        return $this->failOnError(
+                $this->browser->clickImageById($id, $x, $y, $additional));
+    }
+
+    /**
+     *    Checks for a valid image with atht alt text or title.
+     *    @param string $label        Visible text.
+     *    @return boolean             True if click target.
+     *    @access public
+     */
+    function assertImage($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->isImage($label),
+                sprintf($message, "Image with text [$label] should exist"));
+    }
+
+    /**
+     *    Submits a form by the ID.
+     *    @param string $id       Form ID. No button information
+     *                            is submitted this way.
+     *    @return boolean/string  Page on success.
+     *    @access public
+     */
+    function submitFormById($id, $additional = false) {
+        return $this->failOnError($this->browser->submitFormById($id, $additional));
+    }
+
+    /**
+     *    Follows a link by name. Will click the first link
+     *    found with this link text by default, or a later
+     *    one if an index is given. Match is case insensitive
+     *    with normalised space.
+     *    @param string $label     Text between the anchor tags.
+     *    @param integer $index    Link position counting from zero.
+     *    @return boolean/string   Page on success.
+     *    @access public
+     */
+    function clickLink($label, $index = 0) {
+        return $this->failOnError($this->browser->clickLink($label, $index));
+    }
+
+    /**
+     *    Follows a link by id attribute.
+     *    @param string $id        ID attribute value.
+     *    @return boolean/string   Page on success.
+     *    @access public
+     */
+    function clickLinkById($id) {
+        return $this->failOnError($this->browser->clickLinkById($id));
+    }
+
+    /**
+     *    Tests for the presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string $label     Text between the anchor tags.
+     *    @param mixed $expected   Expected URL or expectation object.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link present.
+     *    @access public
+     */
+    function assertLink($label, $expected = true, $message = '%s') {
+        $url = $this->browser->getLink($label);
+        if ($expected === true || ($expected !== true && $url === false)) {
+            return $this->assertTrue($url !== false, sprintf($message, "Link [$label] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new IdenticalExpectation($expected);
+        }
+        return $this->assert($expected, $url->asString(), sprintf($message, "Link [$label] should match"));
+    }
+
+    /**
+     *    Tests for the non-presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string/integer $label    Text between the anchor tags
+     *                                    or ID attribute.
+     *    @param string $message          Message to display. Default
+     *                                    can be embedded with %s.
+     *    @return boolean                 True if link missing.
+     *    @access public
+     */
+    function assertNoLink($label, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->getLink($label) === false,
+                sprintf($message, "Link [$label] should not exist"));
+    }
+
+    /**
+     *    Tests for the presence of a link id attribute.
+     *    @param string $id        Id attribute value.
+     *    @param mixed $expected   Expected URL or expectation object.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link present.
+     *    @access public
+     */
+    function assertLinkById($id, $expected = true, $message = '%s') {
+        $url = $this->browser->getLinkById($id);
+        if ($expected === true) {
+            return $this->assertTrue($url !== false, sprintf($message, "Link ID [$id] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new IdenticalExpectation($expected);
+        }
+        return $this->assert($expected, $url->asString(), sprintf($message, "Link ID [$id] should match"));
+    }
+
+    /**
+     *    Tests for the non-presence of a link label. Match is
+     *    case insensitive with normalised space.
+     *    @param string $id        Id attribute value.
+     *    @param string $message   Message to display. Default
+     *                             can be embedded with %s.
+     *    @return boolean          True if link missing.
+     *    @access public
+     */
+    function assertNoLinkById($id, $message = '%s') {
+        return $this->assertTrue(
+                $this->browser->getLinkById($id) === false,
+                sprintf($message, "Link ID [$id] should not exist"));
+    }
+
+    /**
+     *    Sets all form fields with that label, or name if there
+     *    is no label attached.
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setField($label, $value, $position=false) {
+        return $this->browser->setField($label, $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that name.
+     *    @param string $name    Name of field in forms.
+     *    @param string $value   New value of field.
+     *    @return boolean        True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldByName($name, $value, $position=false) {
+        return $this->browser->setFieldByName($name, $value, $position);
+    }
+
+    /**
+     *    Sets all form fields with that id.
+     *    @param string/integer $id   Id of field in forms.
+     *    @param string $value        New value of field.
+     *    @return boolean             True if field exists, otherwise false.
+     *    @access public
+     */
+    function setFieldById($id, $value) {
+        return $this->browser->setFieldById($id, $value);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form will always
+     *    fail. If no value is given then only the existence
+     *    of the field is checked.
+     *    @param string $name       Name of field in forms.
+     *    @param mixed $expected    Expected string/array value or
+     *                              false for unset fields.
+     *    @param string $message    Message to display. Default
+     *                              can be embedded with %s.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertField($label, $expected = true, $message = '%s') {
+        $value = $this->browser->getField($label);
+        return $this->assertFieldValue($label, $value, $expected, $message);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form element will always
+     *    fail. If no value is given then only the existence
+     *    of the field is checked.
+     *    @param string $name       Name of field in forms.
+     *    @param mixed $expected    Expected string/array value or
+     *                              false for unset fields.
+     *    @param string $message    Message to display. Default
+     *                              can be embedded with %s.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertFieldByName($name, $expected = true, $message = '%s') {
+        $value = $this->browser->getFieldByName($name);
+        return $this->assertFieldValue($name, $value, $expected, $message);
+    }
+
+    /**
+     *    Confirms that the form element is currently set
+     *    to the expected value. A missing form will always
+     *    fail. If no ID is given then only the existence
+     *    of the field is checked.
+     *    @param string/integer $id  Name of field in forms.
+     *    @param mixed $expected     Expected string/array value or
+     *                               false for unset fields.
+     *    @param string $message     Message to display. Default
+     *                               can be embedded with %s.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertFieldById($id, $expected = true, $message = '%s') {
+        $value = $this->browser->getFieldById($id);
+        return $this->assertFieldValue($id, $value, $expected, $message);
+    }
+
+    /**
+     *    Tests the field value against the expectation.
+     *    @param string $identifier      Name, ID or label.
+     *    @param mixed $value            Current field value.
+     *    @param mixed $expected         Expected value to match.
+     *    @param string $message         Failure message.
+     *    @return boolean                True if pass
+     *    @access protected
+     */
+    protected function assertFieldValue($identifier, $value, $expected, $message) {
+        if ($expected === true) {
+            return $this->assertTrue(
+                    isset($value),
+                    sprintf($message, "Field [$identifier] should exist"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $identifier = str_replace('%', '%%', $identifier);
+            $expected = new FieldExpectation(
+                    $expected,
+                    "Field [$identifier] should match with [%s]");
+        }
+        return $this->assert($expected, $value, $message);
+    }
+
+    /**
+     *    Checks the response code against a list
+     *    of possible values.
+     *    @param array $responses    Possible responses for a pass.
+     *    @param string $message     Message to display. Default
+     *                               can be embedded with %s.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertResponse($responses, $message = '%s') {
+        $responses = (is_array($responses) ? $responses : array($responses));
+        $code = $this->browser->getResponseCode();
+        $message = sprintf($message, "Expecting response in [" .
+                implode(", ", $responses) . "] got [$code]");
+        return $this->assertTrue(in_array($code, $responses), $message);
+    }
+
+    /**
+     *    Checks the mime type against a list
+     *    of possible values.
+     *    @param array $types      Possible mime types for a pass.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertMime($types, $message = '%s') {
+        $types = (is_array($types) ? $types : array($types));
+        $type = $this->browser->getMimeType();
+        $message = sprintf($message, "Expecting mime type in [" .
+                implode(", ", $types) . "] got [$type]");
+        return $this->assertTrue(in_array($type, $types), $message);
+    }
+
+    /**
+     *    Attempt to match the authentication type within
+     *    the security realm we are currently matching.
+     *    @param string $authentication   Usually basic.
+     *    @param string $message          Message to display.
+     *    @return boolean                 True if pass.
+     *    @access public
+     */
+    function assertAuthentication($authentication = false, $message = '%s') {
+        if (! $authentication) {
+            $message = sprintf($message, "Expected any authentication type, got [" .
+                    $this->browser->getAuthentication() . "]");
+            return $this->assertTrue(
+                    $this->browser->getAuthentication(),
+                    $message);
+        } else {
+            $message = sprintf($message, "Expected authentication [$authentication] got [" .
+                    $this->browser->getAuthentication() . "]");
+            return $this->assertTrue(
+                    strtolower($this->browser->getAuthentication()) == strtolower($authentication),
+                    $message);
+        }
+    }
+
+    /**
+     *    Checks that no authentication is necessary to view
+     *    the desired page.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertNoAuthentication($message = '%s') {
+        $message = sprintf($message, "Expected no authentication type, got [" .
+                $this->browser->getAuthentication() . "]");
+        return $this->assertFalse($this->browser->getAuthentication(), $message);
+    }
+
+    /**
+     *    Attempts to match the current security realm.
+     *    @param string $realm     Name of security realm.
+     *    @param string $message   Message to display.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertRealm($realm, $message = '%s') {
+        if (! SimpleExpectation::isExpectation($realm)) {
+            $realm = new EqualExpectation($realm);
+        }
+        return $this->assert(
+                $realm,
+                $this->browser->getRealm(),
+                "Expected realm -> $message");
+    }
+
+    /**
+     *    Checks each header line for the required value. If no
+     *    value is given then only an existence check is made.
+     *    @param string $header    Case insensitive header name.
+     *    @param mixed $value      Case sensitive trimmed string to
+     *                             match against. An expectation object
+     *                             can be used for pattern matching.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertHeader($header, $value = false, $message = '%s') {
+        return $this->assert(
+                new HttpHeaderExpectation($header, $value),
+                $this->browser->getHeaders(),
+                $message);
+    }
+
+    /**
+     *    Confirms that the header type has not been received.
+     *    Only the landing page is checked. If you want to check
+     *    redirect pages, then you should limit redirects so
+     *    as to capture the page you want.
+     *    @param string $header    Case insensitive header name.
+     *    @return boolean          True if pass.
+     *    @access public
+     */
+    function assertNoHeader($header, $message = '%s') {
+        return $this->assert(
+                new NoHttpHeaderExpectation($header),
+                $this->browser->getHeaders(),
+                $message);
+    }
+
+    /**
+     *    Tests the text between the title tags.
+     *    @param string/SimpleExpectation $title    Expected title.
+     *    @param string $message                    Message to display.
+     *    @return boolean                           True if pass.
+     *    @access public
+     */
+    function assertTitle($title = false, $message = '%s') {
+        if (! SimpleExpectation::isExpectation($title)) {
+            $title = new EqualExpectation($title);
+        }
+        return $this->assert($title, $this->browser->getTitle(), $message);
+    }
+
+    /**
+     *    Will trigger a pass if the text is found in the plain
+     *    text form of the page.
+     *    @param string $text       Text to look for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertText($text, $message = '%s') {
+        return $this->assert(
+                new TextExpectation($text),
+                $this->browser->getContentAsText(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the text is not found in the plain
+     *    text form of the page.
+     *    @param string $text       Text to look for.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoText($text, $message = '%s') {
+        return $this->assert(
+                new NoTextExpectation($text),
+                $this->browser->getContentAsText(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the Perl regex pattern
+     *    is found in the raw content.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertPattern($pattern, $message = '%s') {
+        return $this->assert(
+                new PatternExpectation($pattern),
+                $this->browser->getContent(),
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the perl regex pattern
+     *    is not present in raw content.
+     *    @param string $pattern    Perl regex to look for including
+     *                              the regex delimiters.
+     *    @param string $message    Message to display.
+     *    @return boolean           True if pass.
+     *    @access public
+     */
+    function assertNoPattern($pattern, $message = '%s') {
+        return $this->assert(
+                new NoPatternExpectation($pattern),
+                $this->browser->getContent(),
+                $message);
+    }
+
+    /**
+     *    Checks that a cookie is set for the current page
+     *    and optionally checks the value.
+     *    @param string $name        Name of cookie to test.
+     *    @param string $expected    Expected value as a string or
+     *                               false if any value will do.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertCookie($name, $expected = false, $message = '%s') {
+        $value = $this->getCookie($name);
+        if (! $expected) {
+            return $this->assertTrue(
+                    $value,
+                    sprintf($message, "Expecting cookie [$name]"));
+        }
+        if (! SimpleExpectation::isExpectation($expected)) {
+            $expected = new EqualExpectation($expected);
+        }
+        return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
+    }
+
+    /**
+     *    Checks that no cookie is present or that it has
+     *    been successfully cleared.
+     *    @param string $name        Name of cookie to test.
+     *    @param string $message     Message to display.
+     *    @return boolean            True if pass.
+     *    @access public
+     */
+    function assertNoCookie($name, $message = '%s') {
+        return $this->assertTrue(
+                $this->getCookie($name) === null or $this->getCookie($name) === false,
+                sprintf($message, "Not expecting cookie [$name]"));
+    }
+
+    /**
+     *    Called from within the test methods to register
+     *    passes and failures.
+     *    @param boolean $result    Pass on true.
+     *    @param string $message    Message to display describing
+     *                              the test state.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertTrue($result, $message = '%s') {
+        return $this->assert(new TrueExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will be true on false and vice versa. False
+     *    is the PHP definition of false, so that null,
+     *    empty strings, zero and an empty array all count
+     *    as false.
+     *    @param boolean $result    Pass on false.
+     *    @param string $message    Message to display.
+     *    @return boolean           True on pass
+     *    @access public
+     */
+    function assertFalse($result, $message = '%s') {
+        return $this->assert(new FalseExpectation(), $result, $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    the same value only. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first          Value to compare.
+     *    @param mixed $second         Value to compare.
+     *    @param string $message       Message to display.
+     *    @return boolean              True on pass
+     *    @access public
+     */
+    function assertEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new EqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Will trigger a pass if the two parameters have
+     *    a different value. Otherwise a fail. This
+     *    is for testing hand extracted text, etc.
+     *    @param mixed $first           Value to compare.
+     *    @param mixed $second          Value to compare.
+     *    @param string $message        Message to display.
+     *    @return boolean               True on pass
+     *    @access public
+     */
+    function assertNotEqual($first, $second, $message = '%s') {
+        return $this->assert(
+                new NotEqualExpectation($first),
+                $second,
+                $message);
+    }
+
+    /**
+     *    Uses a stack trace to find the line of an assertion.
+     *    @return string           Line number of first assert*
+     *                             method embedded in format string.
+     *    @access public
+     */
+    function getAssertionLine() {
+        $trace = new SimpleStackTrace(array('assert', 'click', 'pass', 'fail'));
+        return $trace->traceMethod();
+    }
+}
+?>
\ No newline at end of file
diff --git a/code/ryzom/tools/server/www/webtt/vendors/simpletest/xml.php b/code/ryzom/tools/server/www/webtt/vendors/simpletest/xml.php
new file mode 100644
index 000000000..54fb6f5b1
--- /dev/null
+++ b/code/ryzom/tools/server/www/webtt/vendors/simpletest/xml.php
@@ -0,0 +1,647 @@
+<?php
+/**
+ *  base include file for SimpleTest
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: xml.php 1787 2008-04-26 20:35:39Z pp11 $
+ */
+
+/**#@+
+ *  include other SimpleTest class files
+ */
+require_once(dirname(__FILE__) . '/scorer.php');
+/**#@-*/
+
+/**
+ *    Creates the XML needed for remote communication
+ *    by SimpleTest.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class XmlReporter extends SimpleReporter {
+    private $indent;
+    private $namespace;
+
+    /**
+     *    Sets up indentation and namespace.
+     *    @param string $namespace        Namespace to add to each tag.
+     *    @param string $indent           Indenting to add on each nesting.
+     *    @access public
+     */
+    function __construct($namespace = false, $indent = '  ') {
+        parent::__construct();
+        $this->namespace = ($namespace ? $namespace . ':' : '');
+        $this->indent = $indent;
+    }
+
+    /**
+     *    Calculates the pretty printing indent level
+     *    from the current level of nesting.
+     *    @param integer $offset  Extra indenting level.
+     *    @return string          Leading space.
+     *    @access protected
+     */
+    protected function getIndent($offset = 0) {
+        return str_repeat(
+                $this->indent,
+                count($this->getTestList()) + $offset);
+    }
+
+    /**
+     *    Converts character string to parsed XML
+     *    entities string.
+     *    @param string text        Unparsed character data.
+     *    @return string            Parsed character data.
+     *    @access public
+     */
+    function toParsedXml($text) {
+        return str_replace(
+                array('&', '<', '>', '"', '\''),
+                array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
+                $text);
+    }
+
+    /**
+     *    Paints the start of a group test.
+     *    @param string $test_name   Name of test that is starting.
+     *    @param integer $size       Number of test cases starting.
+     *    @access public
+     */
+    function paintGroupStart($test_name, $size) {
+        parent::paintGroupStart($test_name, $size);
+        print $this->getIndent();
+        print "<" . $this->namespace . "group size=\"$size\">\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a group test.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintGroupEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "group>\n";
+        parent::paintGroupEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test case.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintCaseStart($test_name) {
+        parent::paintCaseStart($test_name);
+        print $this->getIndent();
+        print "<" . $this->namespace . "case>\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a test case.
+     *    @param string $test_name   Name of test that is ending.
+     *    @access public
+     */
+    function paintCaseEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "case>\n";
+        parent::paintCaseEnd($test_name);
+    }
+
+    /**
+     *    Paints the start of a test method.
+     *    @param string $test_name   Name of test that is starting.
+     *    @access public
+     */
+    function paintMethodStart($test_name) {
+        parent::paintMethodStart($test_name);
+        print $this->getIndent();
+        print "<" . $this->namespace . "test>\n";
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "name>" .
+                $this->toParsedXml($test_name) .
+                "</" . $this->namespace . "name>\n";
+    }
+
+    /**
+     *    Paints the end of a test method.
+     *    @param string $test_name   Name of test that is ending.
+     *    @param integer $progress   Number of test cases ending.
+     *    @access public
+     */
+    function paintMethodEnd($test_name) {
+        print $this->getIndent();
+        print "</" . $this->namespace . "test>\n";
+        parent::paintMethodEnd($test_name);
+    }
+
+    /**
+     *    Paints pass as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintPass($message) {
+        parent::paintPass($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "pass>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "pass>\n";
+    }
+
+    /**
+     *    Paints failure as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintFail($message) {
+        parent::paintFail($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "fail>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "fail>\n";
+    }
+
+    /**
+     *    Paints error as XML.
+     *    @param string $message        Message to encode.
+     *    @access public
+     */
+    function paintError($message) {
+        parent::paintError($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "exception>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "exception>\n";
+    }
+
+    /**
+     *    Paints exception as XML.
+     *    @param Exception $exception    Exception to encode.
+     *    @access public
+     */
+    function paintException($exception) {
+        parent::paintException($exception);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "exception>";
+        $message = 'Unexpected exception of type [' . get_class($exception) .
+                '] with message ['. $exception->getMessage() .
+                '] in ['. $exception->getFile() .
+                ' line ' . $exception->getLine() . ']';
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "exception>\n";
+    }
+
+    /**
+     *    Paints the skipping message and tag.
+     *    @param string $message        Text to display in skip tag.
+     *    @access public
+     */
+    function paintSkip($message) {
+        parent::paintSkip($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "skip>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "skip>\n";
+    }
+
+    /**
+     *    Paints a simple supplementary message.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintMessage($message) {
+        parent::paintMessage($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "message>";
+        print $this->toParsedXml($message);
+        print "</" . $this->namespace . "message>\n";
+    }
+
+    /**
+     *    Paints a formatted ASCII message such as a
+     *    privateiable dump.
+     *    @param string $message        Text to display.
+     *    @access public
+     */
+    function paintFormattedMessage($message) {
+        parent::paintFormattedMessage($message);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "formatted>";
+        print "<![CDATA[$message]]>";
+        print "</" . $this->namespace . "formatted>\n";
+    }
+
+    /**
+     *    Serialises the event object.
+     *    @param string $type        Event type as text.
+     *    @param mixed $payload      Message or object.
+     *    @access public
+     */
+    function paintSignal($type, $payload) {
+        parent::paintSignal($type, $payload);
+        print $this->getIndent(1);
+        print "<" . $this->namespace . "signal type=\"$type\">";
+        print "<![CDATA[" . serialize($payload) . "]]>";
+        print "</" . $this->namespace . "signal>\n";
+    }
+
+    /**
+     *    Paints the test document header.
+     *    @param string $test_name     First test top level
+     *                                 to start.
+     *    @access public
+     *    @abstract
+     */
+    function paintHeader($test_name) {
+        if (! SimpleReporter::inCli()) {
+            header('Content-type: text/xml');
+        }
+        print "<?xml version=\"1.0\"";
+        if ($this->namespace) {
+            print " xmlns:" . $this->namespace .
+                    "=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
+        }
+        print "?>\n";
+        print "<" . $this->namespace . "run>\n";
+    }
+
+    /**
+     *    Paints the test document footer.
+     *    @param string $test_name        The top level test.
+     *    @access public
+     *    @abstract
+     */
+    function paintFooter($test_name) {
+        print "</" . $this->namespace . "run>\n";
+    }
+}
+
+/**
+ *    Accumulator for incoming tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingXmlTag {
+    private $name;
+    private $attributes;
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingXmlTag($attributes) {
+        $this->name = false;
+        $this->attributes = $attributes;
+    }
+
+    /**
+     *    Sets the test case/method name.
+     *    @param string $name        Name of test.
+     *    @access public
+     */
+    function setName($name) {
+        $this->name = $name;
+    }
+
+    /**
+     *    Accessor for name.
+     *    @return string        Name of test.
+     *    @access public
+     */
+    function getName() {
+        return $this->name;
+    }
+
+    /**
+     *    Accessor for attributes.
+     *    @return hash        All attributes.
+     *    @access protected
+     */
+    protected function getAttributes() {
+        return $this->attributes;
+    }
+}
+
+/**
+ *    Accumulator for incoming method tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingMethodTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingMethodTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintMethodStart($this->getName());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintMethodEnd($this->getName());
+    }
+}
+
+/**
+ *    Accumulator for incoming case tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingCaseTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingCaseTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintCaseStart($this->getName());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintCaseEnd($this->getName());
+    }
+}
+
+/**
+ *    Accumulator for incoming group tag. Holds the
+ *    incoming test structure information for
+ *    later dispatch to the reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class NestingGroupTag extends NestingXmlTag {
+
+    /**
+     *    Sets the basic test information except
+     *    the name.
+     *    @param hash $attributes   Name value pairs.
+     *    @access public
+     */
+    function NestingGroupTag($attributes) {
+        $this->NestingXmlTag($attributes);
+    }
+
+    /**
+     *    Signals the appropriate start event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintStart(&$listener) {
+        $listener->paintGroupStart($this->getName(), $this->getSize());
+    }
+
+    /**
+     *    Signals the appropriate end event on the
+     *    listener.
+     *    @param SimpleReporter $listener    Target for events.
+     *    @access public
+     */
+    function paintEnd(&$listener) {
+        $listener->paintGroupEnd($this->getName());
+    }
+
+    /**
+     *    The size in the attributes.
+     *    @return integer     Value of size attribute or zero.
+     *    @access public
+     */
+    function getSize() {
+        $attributes = $this->getAttributes();
+        if (isset($attributes['SIZE'])) {
+            return (integer)$attributes['SIZE'];
+        }
+        return 0;
+    }
+}
+
+/**
+ *    Parser for importing the output of the XmlReporter.
+ *    Dispatches that output to another reporter.
+ *    @package SimpleTest
+ *    @subpackage UnitTester
+ */
+class SimpleTestXmlParser {
+    private $listener;
+    private $expat;
+    private $tag_stack;
+    private $in_content_tag;
+    private $content;
+    private $attributes;
+
+    /**
+     *    Loads a listener with the SimpleReporter
+     *    interface.
+     *    @param SimpleReporter $listener   Listener of tag events.
+     *    @access public
+     */
+    function SimpleTestXmlParser(&$listener) {
+        $this->listener = &$listener;
+        $this->expat = &$this->createParser();
+        $this->tag_stack = array();
+        $this->in_content_tag = false;
+        $this->content = '';
+        $this->attributes = array();
+    }
+
+    /**
+     *    Parses a block of XML sending the results to
+     *    the listener.
+     *    @param string $chunk        Block of text to read.
+     *    @return boolean             True if valid XML.
+     *    @access public
+     */
+    function parse($chunk) {
+        if (! xml_parse($this->expat, $chunk)) {
+            trigger_error('XML parse error with ' .
+                    xml_error_string(xml_get_error_code($this->expat)));
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *    Sets up expat as the XML parser.
+     *    @return resource        Expat handle.
+     *    @access protected
+     */
+    protected function &createParser() {
+        $expat = xml_parser_create();
+        xml_set_object($expat, $this);
+        xml_set_element_handler($expat, 'startElement', 'endElement');
+        xml_set_character_data_handler($expat, 'addContent');
+        xml_set_default_handler($expat, 'defaultContent');
+        return $expat;
+    }
+
+    /**
+     *    Opens a new test nesting level.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             to start.
+     *    @access private
+     */
+    protected function pushNestingTag($nested) {
+        array_unshift($this->tag_stack, $nested);
+    }
+
+    /**
+     *    Accessor for current test structure tag.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             being parsed.
+     *    @access private
+     */
+    protected function &getCurrentNestingTag() {
+        return $this->tag_stack[0];
+    }
+
+    /**
+     *    Ends a nesting tag.
+     *    @return NestedXmlTag     The group, case or method tag
+     *                             just finished.
+     *    @access private
+     */
+    protected function popNestingTag() {
+        return array_shift($this->tag_stack);
+    }
+
+    /**
+     *    Test if tag is a leaf node with only text content.
+     *    @param string $tag        XML tag name.
+     *    @return @boolean          True if leaf, false if nesting.
+     *    @private
+     */
+    protected function isLeaf($tag) {
+        return in_array($tag, array(
+                'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'SKIP', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
+    }
+
+    /**
+     *    Handler for start of event element.
+     *    @param resource $expat     Parser handle.
+     *    @param string $tag         Element name.
+     *    @param hash $attributes    Name value pairs.
+     *                               Attributes without content
+     *                               are marked as true.
+     *    @access protected
+     */
+    protected function startElement($expat, $tag, $attributes) {
+        $this->attributes = $attributes;
+        if ($tag == 'GROUP') {
+            $this->pushNestingTag(new NestingGroupTag($attributes));
+        } elseif ($tag == 'CASE') {
+            $this->pushNestingTag(new NestingCaseTag($attributes));
+        } elseif ($tag == 'TEST') {
+            $this->pushNestingTag(new NestingMethodTag($attributes));
+        } elseif ($this->isLeaf($tag)) {
+            $this->in_content_tag = true;
+            $this->content = '';
+        }
+    }
+
+    /**
+     *    End of element event.
+     *    @param resource $expat     Parser handle.
+     *    @param string $tag         Element name.
+     *    @access protected
+     */
+    protected function endElement($expat, $tag) {
+        $this->in_content_tag = false;
+        if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
+            $nesting_tag = $this->popNestingTag();
+            $nesting_tag->paintEnd($this->listener);
+        } elseif ($tag == 'NAME') {
+            $nesting_tag = &$this->getCurrentNestingTag();
+            $nesting_tag->setName($this->content);
+            $nesting_tag->paintStart($this->listener);
+        } elseif ($tag == 'PASS') {
+            $this->listener->paintPass($this->content);
+        } elseif ($tag == 'FAIL') {
+            $this->listener->paintFail($this->content);
+        } elseif ($tag == 'EXCEPTION') {
+            $this->listener->paintError($this->content);
+        } elseif ($tag == 'SKIP') {
+            $this->listener->paintSkip($this->content);
+        } elseif ($tag == 'SIGNAL') {
+            $this->listener->paintSignal(
+                    $this->attributes['TYPE'],
+                    unserialize($this->content));
+        } elseif ($tag == 'MESSAGE') {
+            $this->listener->paintMessage($this->content);
+        } elseif ($tag == 'FORMATTED') {
+            $this->listener->paintFormattedMessage($this->content);
+        }
+    }
+
+    /**
+     *    Content between start and end elements.
+     *    @param resource $expat     Parser handle.
+     *    @param string $text        Usually output messages.
+     *    @access protected
+     */
+    protected function addContent($expat, $text) {
+        if ($this->in_content_tag) {
+            $this->content .= $text;
+        }
+        return true;
+    }
+
+    /**
+     *    XML and Doctype handler. Discards all such content.
+     *    @param resource $expat     Parser handle.
+     *    @param string $default     Text of default content.
+     *    @access protected
+     */
+    protected function defaultContent($expat, $default) {
+    }
+}
+?>
diff --git a/code/ryzom/tools/stats_scan/char_filter_factory.h b/code/ryzom/tools/stats_scan/char_filter_factory.h
index ebfd2a964..35ee52a07 100644
--- a/code/ryzom/tools/stats_scan/char_filter_factory.h
+++ b/code/ryzom/tools/stats_scan/char_filter_factory.h
@@ -39,6 +39,7 @@ class CStatsScanCharacter;
 class ICharFilter: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharFilter() {}
 	virtual std::string toString() const=0;
 	virtual bool evaluate(const CStatsScanCharacter* c)=0;
 };
@@ -51,6 +52,7 @@ public:
 class ICharFilterBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharFilterBuilder() {}
 	virtual const char* getName()=0;
 	virtual const char* getDescription()=0;
 	virtual ICharFilter* build(const std::string& rawArgs)=0;
diff --git a/code/ryzom/tools/stats_scan/char_info_extractor_factory.h b/code/ryzom/tools/stats_scan/char_info_extractor_factory.h
index 781a3d2d3..35e3e7b68 100644
--- a/code/ryzom/tools/stats_scan/char_info_extractor_factory.h
+++ b/code/ryzom/tools/stats_scan/char_info_extractor_factory.h
@@ -41,6 +41,7 @@ class CStatsScanCharacter;
 class ICharInfoExtractor: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharInfoExtractor() {}
 	virtual std::string toString() const=0;
 	virtual void execute(CCharacterScanJob* job,const CStatsScanCharacter* c)=0;
 };
@@ -53,6 +54,7 @@ public:
 class ICharInfoExtractorBuilder: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharInfoExtractorBuilder() {}
 	virtual const char* getName()=0;
 	virtual const char* getDescription()=0;
 	virtual const char* getFields()=0;
diff --git a/code/ryzom/tools/stats_scan/char_scan_script.h b/code/ryzom/tools/stats_scan/char_scan_script.h
index 5f4a4d107..ac3a6780b 100644
--- a/code/ryzom/tools/stats_scan/char_scan_script.h
+++ b/code/ryzom/tools/stats_scan/char_scan_script.h
@@ -97,6 +97,7 @@ private:
 class ICharScanScriptCommand: public NLMISC::CRefCount
 {
 public:
+	virtual ~ICharScanScriptCommand() {}
 	virtual const char* getName()=0;
 	virtual const char* getSyntax()=0;
 	virtual const char* getDescription()=0;
diff --git a/code/ryzom/tools/stats_scan/job_manager.h b/code/ryzom/tools/stats_scan/job_manager.h
index 136ac77be..a318cffdc 100644
--- a/code/ryzom/tools/stats_scan/job_manager.h
+++ b/code/ryzom/tools/stats_scan/job_manager.h
@@ -31,6 +31,9 @@ public:
 	class IJob: public NLMISC::CRefCount
 	{
 	public:
+		// virtual dtor
+		virtual ~IJob() {}
+
 		// return true if the job is finished -> the job object can be deleted
 		virtual bool finished()=0;
 
diff --git a/code/snowballs2/Makefile.am b/code/snowballs2/Makefile.am
deleted file mode 100644
index 8e8eb83a5..000000000
--- a/code/snowballs2/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in configure config.guess missing \
-                       config.sub ltconfig aclocal.m4 config.h.in \
-                       install-sh mkinstalldirs
-
-EXTRA_DIST	     = autogen.sh \
-		       snowballs2.dsw \
-		       snowballs2.sln \
-		       snowballs2_8.sln \
-		       kdevelop
-
-DIST_SUBDIRS	     = client server
-
-dist-hook:
-	find $(distdir) -name CVS -print | xargs rm -fr
-	find $(distdir) -name .svn -print | xargs rm -fr
-
-SUBDIRS              = @SNO_SUBDIRS@
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/acinclude.m4 b/code/snowballs2/acinclude.m4
deleted file mode 100644
index f34400c1d..000000000
--- a/code/snowballs2/acinclude.m4
+++ /dev/null
@@ -1,1213 +0,0 @@
-# =========================================================================
-#
-# Macros used by Nevrax in configure.in files.
-#
-# =========================================================================
-
-# =========================================================================
-# WARNING: The original version of this file is placed in the $CVSROOT/code
-#          directory.
-#          There is links in the $CVSROOT/code sub-directories to that file
-#          (ex: $CVSROOT/code/nel), so be careful of the consequences of
-#          any modification of that file.
-# =========================================================================
-
-# =========================================================================
-# Macros available in that file.
-#
-#
-# AM_NEL_DEBUG
-#
-#    Option:      none.
-#    Description: manage the different debug and the release mode by setting
-#                 correctly the CFLAGS and CXXFLAGS variables.
-#
-#
-# AM_PATH_NEL
-#
-#    Option:      none.
-#    Description: check the instalation of the NeL library and set the
-#                 CXXFLAGS and LIBS variables to use it.
-#
-#
-# AM_PATH_OPENGL
-#
-#    Option:      "yes" if the use of the OpenGL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENGL_CFLAGS and OPENGL_LIBS variables to use it.
-#
-#
-# AM_PATH_FREETYPE
-#
-#    Option:      "yes" if the use of the Freetype library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 FREETYPE_CFLAGS and FREETYPE_LIBS variables to use it.
-#
-#
-# AM_PATH_XF86VIDMODE
-#
-#    Option:      none.
-#    Description: check the instalation of the OpenGL library and set the
-#                 XF86VIDMODE_CFLAGS and XF86VIDMODE_LIBS variables to use it.
-#
-#
-# AM_PATH_OPENAL
-#
-#    Option:      "yes" if the use of the OpenAL library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 OPENAL_CFLAGS and OPENAL_LIBS variables to use it.
-#
-#
-# AM_PATH_PYTHON
-#
-#    Option:      "yes" if the use of the Python library is mandatory.
-#    Description: check the instalation of the OpenGL library and set the
-#                 PYTHON_CFLAGS and PYTHON_LIBS variables to use it.
-#
-# =========================================================================
-
-
-# =========================================================================
-# AM_NEL_DEBUG
-
-AC_DEFUN([AM_NEL_DEBUG],
-[
-
-MAX_C_OPTIMIZE="-O6"
-
-NL_DEBUG="-DNL_DEBUG"
-NL_RELEASE="-DNL_RELEASE"
-
-AC_ARG_WITH(debug,
-    [  --with-debug[=full|medium|fast]
-                          Build a debug version (huge libraries).
-                          Full mode set only NeL.
-                          Medium mode set NeL debug flags with inline
-                          optimization (default mode).
-                          Fast mode is like the Medium mode with some basic
-                          optimization.
-  --without-debug         Build without debugging code (default)],
-    [with_debug=$withval],
-    [with_debug=no])
-
-# Build optimized or debug version ?
-# First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
-then
-    DEBUG_CFLAGS="-g"
-    DEBUG_OPTIMIZE_CC="-O"
-    OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
-else
-    DEBUG_CFLAGS="-g"
-    DEBUG_OPTIMIZE_CC=""
-    OPTIMIZE_CFLAGS=""
-fi
-
-if test "$ac_cv_prog_cxx_g" = "yes"
-then
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_OPTIMIZE_CXX="-O"
-    OPTIMIZE_CXXFLAGS="-O3"
-    OPTIMIZE_INLINE_CXXFLAGS="-finline-functions"
-else
-    DEBUG_CXXFLAGS="-g"
-    DEBUG_OPTIMIZE_CXX=""
-    OPTIMIZE_CXXFLAGS=""
-    OPTIMIZE_INLINE_CXXFLAGS=""
-fi
-
-if test "$with_debug" = "yes" -o "$with_debug" = "medium"
-then
-    # Medium debug. Inline optimization
-    CFLAGS="$DEBUG_CFLAGS $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS"
-    CXXFLAGS="$DEBUG_CXXFLAGS $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-else
-    if test "$with_debug" = "full"
-    then
-        # Full debug. Very slow in some cases
-        CFLAGS="$DEBUG_CFLAGS $NL_DEBUG $CFLAGS"
-        CXXFLAGS="$DEBUG_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-    else
-        if test "$with_debug" = "fast"
-        then
-            # Fast debug.
-            CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $OPTIMIZE_INLINE_CFLAGS $NL_DEBUG $CFLAGS"
-            CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $OPTIMIZE_INLINE_CXXFLAGS $NL_DEBUG $CXXFLAGS"
-        else
-            # Optimized version. No debug
-            CFLAGS="$OPTIMIZE_CFLAGS $NL_RELEASE $CFLAGS"
-            CXXFLAGS="$OPTIMIZE_CXXFLAGS $NL_RELEASE $CXXFLAGS"
-        fi
-    fi
-fi
-
-# AC_MSG_RESULT([CFLAGS = $CFLAGS])
-# AC_MSG_RESULT([CXXGLAGS = $CXXFLAGS])
-
-])
-
-
-# =========================================================================
-# MY_NEL_HEADER_CHK : NeL header files checking macros
-
-AC_DEFUN([MY_NEL_HEADER_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-header="$2"
-macro="$3"
-is_mandatory="$4"
-
-if test $is_mandatory = "yes"
-then
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $NEL_CFLAGS"
-
-    AC_MSG_CHECKING(for $header)
-
-    AC_EGREP_CPP( yo_header,
-[#include <$header>
-#ifdef $macro
-   yo_header
-#endif],
-  have_header="yes",
-  have_header="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_header" = "yes"
-    then
-        AC_MSG_RESULT(yes)
-    else
-        if test "$is_mandatory" = "yes"
-        then
-            AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).])
-        else
-            AC_MSG_RESULT(no)
-        fi
-    fi
-fi
-
-        
-])
-
-
-# =========================================================================
-# MY_NEL_LIB_CHK : NeL library checking macros
-
-AC_DEFUN([MY_NEL_LIB_CHK],
-[ AC_REQUIRE_CPP()
-
-chk_message_obj="$1"
-nel_test_lib="$2"
-is_mandatory="$3"
-
-if test $is_mandatory = "yes"
-then
-
-    AC_CHECK_LIB($nel_test_lib, main,,[AC_MSG_ERROR([$chk_message_obj must be installed (http://dev.ryzom.com).])])
-fi
-])
-
-
-# =========================================================================
-# AM_PATH_NEL : NeL checking macros
-AC_DEFUN([AM_PATH_NEL],
-[ AC_REQUIRE_CPP()
-
-AC_ARG_WITH( nel,
-    [  --with-nel=<path>       path to the NeL install files directory.
-                          e.g. /usr/local/nel])
-
-AC_ARG_WITH( nel-include,
-    [  --with-nel-include=<path>
-                          path to the NeL header files directory.
-                          e.g. /usr/local/nel/include])
-
-AC_ARG_WITH( nel-lib,
-    [  --with-nel-lib=<path>
-                          path to the NeL library files directory.
-                          e.g. /usr/local/nel/lib])
-
-
-nelmisc_is_mandatory="$1"
-nelnet_is_mandatory="$2"
-nel3d_is_mandatory="$3"
-nelpacs_is_mandatory="$4"
-nelsound_is_mandatory="$5"
-nelai_is_mandatory="$6"
-nelgeorges_is_mandatory="$7"
-
-# Check for nel-config
-AC_PATH_PROG(NEL_CONFIG, nel-config, no)
-
-# 
-# Configure options (--with-nel*) have precendence 
-# over nel-config only set variables if they are not 
-# specified
-#
-if test "$NEL_CONFIG" != "no"
-then
-    if test -z "$with_nel" -a -z "$with_nel_include"
-    then
-	CXXFLAGS="$CXXFLAGS `nel-config --cflags`"
-    fi
-
-    if test -z "$with_nel" -a -z "$with_nel_lib"
-    then
-	LDFLAGS="`nel-config --ldflags` $LDFLAGS"
-    fi
-fi
-
-#
-# Set nel_libraries and nel_includes according to
-# user specification (--with-nel*) if any. 
-# --with-nel-include and --with-nel-lib have precendence
-# over --with-nel
-#
-if test "$with_nel" = "no"
-then
-    # The user explicitly disabled the use of the NeL
-    AC_MSG_ERROR([NeL is mandatory: do not specify --without-nel])
-else
-    if test "$with_nel" -a "$with_nel" != "yes"
-    then
-	nel_includes="$with_nel/include"
-	nel_libraries="$with_nel/lib"
-    fi
-fi
-
-if test "$with_nel_include"
-then
-    nel_includes="$with_nel_include"
-fi
-
-if test "$with_nel_lib"
-then
-    nel_libraries="$with_nel_lib"
-fi
-
-#
-# Set compilation variables 
-#
-if test "$nel_includes"
-then
-    CXXFLAGS="$CXXFLAGS -I$nel_includes"
-fi
-
-if test "$nel_libraries"
-then
-    LDFLAGS="-L$nel_libraries $LDFLAGS"
-fi
-
-#
-# Collect headers information and bark if missing and
-# mandatory
-#
-
-MY_NEL_HEADER_CHK([NeL Misc], [nel/misc/types_nl.h], [NL_TYPES_H], $nelmisc_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Network], [nel/net/sock.h], [NL_SOCK_H], $nelnet_is_mandatory)
-MY_NEL_HEADER_CHK([NeL 3D], [nel/3d/u_camera.h], [NL_U_CAMERA_H], $nel3d_is_mandatory)
-MY_NEL_HEADER_CHK([NeL PACS], [nel/pacs/u_global_position.h], [NL_U_GLOBAL_POSITION_H], $nelpacs_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Sound], [nel/sound/u_source.h], [NL_U_SOURCE_H], $nelsound_is_mandatory)
-MY_NEL_HEADER_CHK([NeL AI], [nel/ai/nl_ai.h], [_IA_NEL_H], $nelai_is_mandatory)
-MY_NEL_HEADER_CHK([NeL Georges], [nel/georges/common.h], [NLGEORGES_COMMON_H], $nelgeorges_is_mandatory)
-
-#
-# Collect libraries information and bark if missing and
-# mandatory
-#
-
-MY_NEL_LIB_CHK([NeL Misc], [nelmisc], $nelmisc_is_mandatory)
-MY_NEL_LIB_CHK([NeL Network], [nelnet], $nelnet_is_mandatory)
-MY_NEL_LIB_CHK([NeL 3D], [nel3d], $nel3d_is_mandatory)
-MY_NEL_LIB_CHK([NeL PACS], [nelpacs], $nelpacs_is_mandatory)
-MY_NEL_LIB_CHK([NeL Sound], [nelsnd], $nelsound_is_mandatory)
-MY_NEL_LIB_CHK([NeL AI], [nelai], $nelai_is_mandatory)
-MY_NEL_LIB_CHK([NeL Georges], [nelgeorges], $nelgeorges_is_mandatory)
-
-])
-
-# =========================================================================
-# AM_PATH_OPENGL : OpenGL checking macros
-
-AC_DEFUN([AM_PATH_OPENGL],
-[ AC_MSG_CHECKING(for OpenGL headers and GL Version >= 1.2)
-
-is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( opengl,
-    [  --with-opengl=<path>    path to the OpenGL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( opengl-include,
-    [  --with-opengl-include=<path>
-                          path to the OpenGL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( opengl-lib,
-    [  --with-opengl-lib=<path>
-                          path to the OpenGL library files directory.
-                          e.g. /usr/local/lib])
-
-opengl_lib="GL"
-
-if test "$with_opengl"
-then
-    opengl_includes="$with_opengl/include"
-    opengl_libraries="$with_opengl/lib"
-fi
-
-if test "$with_opengl_include"
-then
-    opengl_includes="$with_opengl_include"
-fi
-
-if test "$with_opengl_lib"
-then
-    opengl_libraries="$with_opengl_lib"
-fi
-
-# Set OPENGL_CFLAGS
-if test "$opengl_includes"
-then
-    OPENGL_CFLAGS="-I$opengl_includes"
-fi
-
-# Set OPENGL_LIBS
-if test "$opengl_libraries"
-then
-    OPENGL_LIBS="-L$opengl_libraries"
-fi
-OPENGL_LIBS="$OPENGL_LIBS -l$opengl_lib"
-
-# Test the headers
-_CPPFLAGS="$CPPFLAGS"
-
-CPPFLAGS="$CXXFLAGS $OPENGL_CFLAGS"
-
-AC_EGREP_CPP( yo_opengl,
-[#include <GL/gl.h>       
-#if defined(GL_VERSION_1_2)
-   yo_opengl
-#endif],
-  have_opengl_headers="yes", 
-  have_opengl_headers="no" )
-
-if test "$have_opengl_headers" = "yes"
-then
-    if test "$opengl_includes"
-    then
-        AC_MSG_RESULT([$opengl_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Checking the GLEXT version >= 7
-AC_MSG_CHECKING(for <GL/glext.h> and GLEXT version >= 7)
-
-AC_EGREP_CPP( yo_glext_version,
-[#include <GL/glext.h>
-#ifdef GL_GLEXT_VERSION
-#if GL_GLEXT_VERSION >= 7
-   yo_glext_version
-#endif
-#endif],
-  have_glext="yes",
-  have_glext="no" )
-
-if test "$have_glext" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT([no, <GL/glext.h> can be downloaded from http://www.opengl.org/registry/])
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for OpenGL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENGL_LIBS"
-
-AC_TRY_LINK( , , have_opengl_libraries="yes", have_opengl_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_opengl_libraries" = "yes"
-then
-    if test "$opengl_libraries"
-    then
-        AC_MSG_RESULT([$opengl_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-opengl_libraries="$opengl_libraries"
-
-if test "$have_opengl_headers" = "yes" \
-        -a "$have_glext" = "yes" \
-        -a "$have_opengl_libraries" = "yes"
-then
-    have_opengl="yes"
-else
-    have_opengl="no"
-fi
-
-if test "$have_opengl" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenGL >= 1.2 must be installed (http://www.mesa3d.org)])
-fi
-
-AC_SUBST(OPENGL_CFLAGS)
-AC_SUBST(OPENGL_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_FREETYPE : FreeType checking macros
-
-AC_DEFUN([AM_PATH_FREETYPE],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( freetype,
-    [  --with-freetype=<path>   path to the FreeType install files directory.
-                          e.g. /usr/local/freetype])
-
-AC_ARG_WITH( freetype-include,
-    [  --with-freetype-include=<path>
-                          path to the FreeType header files directory.
-                          e.g. /usr/local/freetype/include])
-
-AC_ARG_WITH( freetype-lib,
-    [  --with-freetype-lib=<path>
-                          path to the FreeType library files directory.
-                          e.g. /usr/local/freetype/lib])
-
-freetype_lib="freetype"
-
-
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-  
-if test "$FREETYPE_CONFIG" = "no"
-then
-    have_freetype_config="no"
-else
-    FREETYPE_CFLAGS=`freetype-config --cflags`
-    FREETYPE_LIBS=`freetype-config --libs`
-    have_freetype_config="yes"
-fi
-
-if test "$with_freetype"
-then
-    freetype_includes="$with_freetype/include"
-    freetype_libraries="$with_freetype/lib"
-fi
-
-if test "$with_freetype_include"
-then
-    freetype_includes="$with_freetype_include"
-fi
-
-if test "$with_freetype_lib"
-then
-    freetype_libraries="$with_freetype_lib"
-fi
-
-if test "$freetype_includes"
-then
-    FREETYPE_CFLAGS="-I$freetype_includes"
-fi
-
-# Checking the FreeType 2 instalation
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
-
-AC_MSG_CHECKING(for FreeType version = 2)
-
-AC_EGREP_CPP( yo_freetype2,
-[#include <freetype/freetype.h>
-#if FREETYPE_MAJOR == 2
-   yo_freetype2
-#endif],
-  have_freetype2="yes",
-  have_freetype2="no")
-
-if test "$have_freetype2" = "yes"
-then
-    AC_MSG_RESULT(yes)
-else
-    AC_MSG_RESULT(no)
-fi
-    
-# Test the libraries
-AC_MSG_CHECKING(for FreeType libraries)
-        
-if test $freetype_libraries
-then
-    FREETYPE_LIBS="-L$freetype_libraries -l$freetype_lib"
-fi
-
-CPPFLAGS="$FREETYPE_LIBS $CXXFLAGS"
-    
-AC_TRY_LINK( , , have_freetype_libraries="yes", have_freetype_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_freetype_libraries" = "yes"
-then    
-    if test "$freetype_libraries"
-    then
-        AC_MSG_RESULT([$freetype_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-if test "$have_freetype2" = "yes" && test "$have_freetype_libraries" = "yes"
-then
-    have_freetype="yes"
-else
-    have_freetype="no"
-fi
-
-if test "$have_freetype" = "no" && test "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FreeType 2 must be installed (http://freetype.sourceforge.net)])
-fi
-
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_XF86VIDMODE : XF86VidMode checking macros
-
-AC_DEFUN([AM_PATH_XF86VIDMODE],
-[ AC_MSG_CHECKING(for XF86VidMode extension)
-
-AC_REQUIRE_CPP()
-
-AC_ARG_WITH( xf86vidmode-lib,
-    [  --with-xf86vidmode-lib=<path>
-                          path to the XF86VidMode library.
-                          e.g. /usr/X11R6/lib] )
-
-xf86vidmode_lib="Xxf86vm"
-
-if test "$with_xf86vidmode_lib" = no
-then
-    # The user explicitly disabled the use of XF86VidMode
-    have_xf86vidmode="disabled"
-    AC_MSG_RESULT(disabled)
-else
-    if test "$with_xf86vidmode_lib"
-    then
-        xf86vidmode_libraries="$with_xf86vidmode_lib"
-    fi
-
-    XF86VIDMODE_CFLAGS="-DXF86VIDMODE"
-fi
-
-if test -z "$have_xf86vidmode"
-# -a "$with_xf86vidmode_lib"
-then
-    if test "$xf86vidmode_libraries"
-    then
-        XF86VIDMODE_LIBS="-L$xf86vidmode_libraries"
-    fi
-
-    XF86VIDMODE_LIBS="$XF86VIDMODE_LIBS -l$xf86vidmode_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-
-    CPPFLAGS="$CXXFLAGS $XF86VIDMODE_LIBS"
-
-    AC_TRY_LINK( , , have_xf86vidmode_libraries="yes", have_xf86vidmode_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_xf86vidmode_libraries" = "yes"
-    then
-        have_xf86vidmode="yes"
-        if test "$xf86vidmode_libraries"
-        then
-            AC_MSG_RESULT($xf86vidmode_libraries)
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        have_xf86vidmode="no"
-        AC_MSG_RESULT(no, no fullscreen support available.)
-    fi
-
-    xf86vidmode_libraries="$xf86vidmode_libraries"
-
-fi
-
-AC_SUBST(XF86VIDMODE_CFLAGS)
-AC_SUBST(XF86VIDMODE_LIBS)
-
-])
-
-
-# =========================================================================
-# AM_PATH_OPENAL : OpenAL checking macros
-
-AC_DEFUN([AM_PATH_OPENAL],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the OpenAL files location
-AC_ARG_WITH( openal,
-    [  --with-openal=<path>   path to the OpenAL install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( openal-include,
-    [  --with-openal-include=<path>
-                          path to the OpenAL header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( openal-lib,
-    [  --with-openal-lib=<path>
-                          path to the OpenAL library files directory.
-                          e.g. /usr/local/lib])
-
-openal_lib="openal"
-alut_lib="alut"
-
-if test $with_openal
-then
-    openal_includes="$with_openal/include"
-    openal_libraries="$with_openal/lib"
-fi
-
-if test "$with_openal_include"
-then
-    openal_includes="$with_openal_include"
-fi
-
-if test "$with_openal_lib"
-then
-    openal_libraries="$with_openal_lib"
-fi
-
-
-# Set OPENAL_CFLAGS
-if test "$openal_includes"
-then
-    OPENAL_CFLAGS="-I$openal_includes"
-fi
-
-# Set OPENAL_LIBS
-if test "$openal_libraries"
-then
-    OPENAL_LIBS="-L$openal_libraries"
-fi
-OPENAL_LIBS="$OPENAL_LIBS -l$openal_lib -l$alut_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $OPENAL_CFLAGS"
-
-AC_MSG_CHECKING(for OpenAL headers)
-AC_EGREP_CPP( yo_openal,
-[#include <AL/al.h>
-#include <AL/alut.h>
-#ifdef AL_VERSION
-   yo_openal
-#endif],
-  have_openal_headers="yes",
-  have_openal_headers="no" )
-
-if test "$have_openal_headers" = "yes"
-then
-    if test "$openal_includes"
-    then
-        AC_MSG_RESULT([$openal_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for OpenAL libraries)
-
-CPPFLAGS="$CXXFLAGS $OPENAL_LIBS"
-
-AC_TRY_LINK( , , have_openal_libraries="yes", have_openal_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_openal_libraries" = "yes"
-then
-    if test "$openal_libraries"
-    then
-        AC_MSG_RESULT([$openal_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-openal_libraries="$openal_libraries"
-
-if test "$have_openal_headers" = "yes" \
-   && test "$have_openal_libraries" = "yes"
-then
-    have_openal="yes"
-else
-    have_openal="no"
-fi
-
-if test "$have_openal" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([OpenAL is needed to compile NeL (http://www.openal.org).])
-fi
-
-AC_SUBST(OPENAL_CFLAGS)
-AC_SUBST(OPENAL_LIBS)
-AC_SUBST([have_openal])
-
-])
-
-
-# =========================================================================
-# AM_PATH_PYTHON : Python checking macros
-
-AC_DEFUN([AM_PATH_PYTHON],
-[ python_version_required="$1"
-
-is_mandatory="$2"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the Python files location
-AC_ARG_WITH( python,
-    [  --with-python=<path>    path to the Python prefix installation directory.
-                          e.g. /usr/local],
-    [ PYTHON_PREFIX=$with_python ]
-)
-
-AC_ARG_WITH( python-version,
-    [  --with-python-version=<version>
-                          Python version to use, e.g. 1.5],
-    [ PYTHON_VERSION=$with_python_version ]
-)
-
-if test ! "$PYTHON_PREFIX" = ""
-then
-    PATH="$PYTHON_PREFIX/bin:$PATH"
-fi
-
-if test ! "$PYTHON_VERSION" = ""
-then
-    PYTHON_EXEC="python$PYTHON_VERSION"
-else
-    PYTHON_EXEC="python python2.1 python2.0 python1.5"
-fi
-
-AC_PATH_PROGS(PYTHON, $PYTHON_EXEC, no, $PATH)
-
-if test "$PYTHON" != "no"
-then
-    PYTHON_PREFIX=`$PYTHON -c 'import sys; print "%s" % (sys.prefix)'`
-    PYTHON_VERSION=`$PYTHON -c 'import sys; print "%s" % (sys.version[[:3]])'`
-
-    is_python_version_enough=`expr $python_version_required \<= $PYTHON_VERSION`
-fi
-
-
-if test "$PYTHON" = "no" || test "$is_python_version_enough" != "1"
-then
-
-    if test "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python $python_version_required must be installed (http://www.python.org)])
-    else
-        have_python="no"
-    fi
-
-else
-
-    python_includes="$PYTHON_PREFIX/include/python$PYTHON_VERSION"
-    python_libraries="$PYTHON_PREFIX/lib/python$PYTHON_VERSION/config"
-    python_lib="python$PYTHON_VERSION"
-
-    PYTHON_CFLAGS="-I$python_includes"
-    PYTHON_LIBS="-L$python_libraries -l$python_lib"
-
-    _CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CXXFLAGS ${PYTHON_CFLAGS}"
-
-    # Test the headers
-    AC_MSG_CHECKING(for Python headers)
-
-    AC_EGREP_CPP( yo_python,
-    [#include <Python.h>
-   yo_python
-    ],
-      have_python_headers="yes",
-      have_python_headers="no" )
-
-    if test "$have_python_headers" = "yes"
-    then
-        AC_MSG_RESULT([$python_includes])
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    # Test the libraries
-    AC_MSG_CHECKING(for Python libraries)
-
-    CPPFLAGS="$CXXFLAGS $PYTHON_CFLAGS"
-
-    AC_TRY_LINK( , , have_python_libraries="yes", have_python_libraries="no")
-
-    CPPFLAGS="$_CPPFLAGS"
-
-    if test "$have_python_libraries" = "yes"
-    then
-        if test "$python_libraries"
-        then
-            AC_MSG_RESULT([$python_libraries])
-        else
-            AC_MSG_RESULT(yes)
-        fi
-    else
-        AC_MSG_RESULT(no)
-    fi
-
-    if test "$have_python_headers" = "yes" \
-       && test "$have_python_libraries" = "yes"
-    then
-        have_python="yes"
-    else
-        have_python="no"
-    fi
-
-    if test "$have_python" = "no" -a "$is_mandatory" = "yes"
-    then
-        AC_MSG_ERROR([Python is needed to compile NeL (http://www.python.org).])
-    fi
-
-    AC_SUBST(PYTHON_CFLAGS)
-    AC_SUBST(PYTHON_LIBS)
-
-fi
-
-])
-
-# =========================================================================
-# AM_PATH_MYSQL : MySQL library
-
-# AM_PATH_MYSQL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-# Test for MYSQL, and define MYSQL_CFLAGS and MYSQL_LIBS
-#
-AC_DEFUN([AM_PATH_MYSQL],
-[# 
-# Get the cflags and libraries from the mysql_config script
-#
-AC_ARG_WITH(mysql-prefix,[  --with-mysql-prefix=PFX   Prefix where MYSQL is installed (optional)],
-            mysql_prefix="$withval", mysql_prefix="")
-AC_ARG_WITH(mysql-exec-prefix,[  --with-mysql-exec-prefix=PFX Exec prefix where MYSQL is installed (optional)],
-            mysql_exec_prefix="$withval", mysql_exec_prefix="")
-AC_ARG_ENABLE(mysqltest, [  --disable-mysqltest       Do not try to compile and run a test MYSQL program],
-		    , enable_mysqltest=yes)
-
-  if test x$mysql_exec_prefix != x ; then
-     mysql_args="$mysql_args --exec-prefix=$mysql_exec_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_exec_prefix/bin/mysql_config
-     fi
-  fi
-  if test x$mysql_prefix != x ; then
-     mysql_args="$mysql_args --prefix=$mysql_prefix"
-     if test x${MYSQL_CONFIG+set} != xset ; then
-        MYSQL_CONFIG=$mysql_prefix/bin/mysql_config
-     fi
-  fi
-
-  AC_REQUIRE([AC_CANONICAL_TARGET])
-  AC_PATH_PROG(MYSQL_CONFIG, mysql_config, no)
-  min_mysql_version=ifelse([$1], ,0.11.0,$1)
-  AC_MSG_CHECKING(for MYSQL - version >= $min_mysql_version)
-  no_mysql=""
-  if test "$MYSQL_CONFIG" = "no" ; then
-    no_mysql=yes
-  else
-    MYSQL_CFLAGS=`$MYSQL_CONFIG $mysqlconf_args --cflags | sed -e "s/'//g"`
-    MYSQL_LIBS=`$MYSQL_CONFIG $mysqlconf_args --libs | sed -e "s/'//g"`
-
-    mysql_major_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-    mysql_minor_version=`$MYSQL_CONFIG $mysql_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-    mysql_micro_version=`$MYSQL_CONFIG $mysql_config_args --version | \
-           sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-    if test "x$enable_mysqltest" = "xyes" ; then
-      ac_save_CFLAGS="$CFLAGS"
-      ac_save_LIBS="$LIBS"
-      CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-      LIBS="$LIBS $MYSQL_LIBS"
-#
-# Now check if the installed MYSQL is sufficiently new. (Also sanity
-# checks the results of mysql_config to some extent
-#
-      rm -f conf.mysqltest
-      AC_TRY_RUN([
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mysql.h>
-
-char*
-my_strdup (char *str)
-{
-  char *new_str;
-  
-  if (str)
-    {
-      new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-      strcpy (new_str, str);
-    }
-  else
-    new_str = NULL;
-  
-  return new_str;
-}
-
-int main (int argc, char *argv[])
-{
-  int major, minor, micro;
-  char *tmp_version;
-
-  /* This hangs on some systems (?)
-  system ("touch conf.mysqltest");
-  */
-  { FILE *fp = fopen("conf.mysqltest", "a"); if ( fp ) fclose(fp); }
-
-  /* HP/UX 9 (%@#!) writes to sscanf strings */
-  tmp_version = my_strdup("$min_mysql_version");
-  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_mysql_version");
-     exit(1);
-   }
-
-   if (($mysql_major_version > major) ||
-      (($mysql_major_version == major) && ($mysql_minor_version > minor)) ||
-      (($mysql_major_version == major) && ($mysql_minor_version == minor) && ($mysql_micro_version >= micro)))
-    {
-      return 0;
-    }
-  else
-    {
-      printf("\n*** 'mysql_config --version' returned %d.%d.%d, but the minimum version\n", $mysql_major_version, $mysql_minor_version, $mysql_micro_version);
-      printf("*** of MYSQL required is %d.%d.%d. If mysql_config is correct, then it is\n", major, minor, micro);
-      printf("*** best to upgrade to the required version.\n");
-      printf("*** If mysql_config was wrong, set the environment variable MYSQL_CONFIG\n");
-      printf("*** to point to the correct copy of mysql_config, and remove the file\n");
-      printf("*** config.cache before re-running configure\n");
-      return 1;
-    }
-}
-
-],, no_mysql=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-       CFLAGS="$ac_save_CFLAGS"
-       LIBS="$ac_save_LIBS"
-     fi
-  fi
-  if test "x$no_mysql" = x ; then
-     AC_MSG_RESULT(yes)
-     ifelse([$2], , :, [$2])     
-  else
-     AC_MSG_RESULT(no)
-     if test "$MYSQL_CONFIG" = "no" ; then
-       echo "*** The mysql_config script installed by MYSQL could not be found"
-       echo "*** If MYSQL was installed in PREFIX, make sure PREFIX/bin is in"
-       echo "*** your path, or set the MYSQL_CONFIG environment variable to the"
-       echo "*** full path to mysql_config."
-     else
-       if test -f conf.mysqltest ; then
-        :
-       else
-          echo "*** Could not run MYSQL test program, checking why..."
-          CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-          LIBS="$LIBS $MYSQL_LIBS"
-          AC_TRY_LINK([
-#include <stdio.h>
-#include <mysql.h>
-
-int main(int argc, char *argv[])
-{ return 0; }
-#undef  main
-#define main K_and_R_C_main
-],      [ return 0; ],
-        [ echo "*** The test program compiled, but did not run. This usually means"
-          echo "*** that the run-time linker is not finding MYSQL or finding the wrong"
-          echo "*** version of MYSQL. If it is not finding MYSQL, you'll need to set your"
-          echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-          echo "*** to the installed location  Also, make sure you have run ldconfig if that"
-          echo "*** is required on your system"
-	  echo "***"
-          echo "*** If you have an old version installed, it is best to remove it, although"
-          echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-        [ echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means MYSQL was incorrectly installed"
-          echo "*** or that you have moved MYSQL since it was installed. In the latter case, you"
-          echo "*** may want to edit the mysql_config script: $MYSQL_CONFIG" ])
-          CFLAGS="$ac_save_CFLAGS"
-          LIBS="$ac_save_LIBS"
-       fi
-     fi
-     MYSQL_CFLAGS=""
-     MYSQL_LIBS=""
-     ifelse([$3], , :, [$3])
-  fi
-  AC_SUBST(MYSQL_CFLAGS)
-  AC_SUBST(MYSQL_LIBS)
-  rm -f conf.mysqltest
-])
-
-# =========================================================================
-# AM_PATH_FMOD : FMOD checking macros
-
-AC_DEFUN([AM_PATH_FMOD],
-[ is_mandatory="$1"
-
-AC_REQUIRE_CPP()
-
-# Get from the user option the path to the FMOD files location
-AC_ARG_WITH( fmod,
-    [  --with-fmod=<path>   path to the FMOD install files directory.
-                          e.g. /usr/local])
-
-AC_ARG_WITH( fmod-include,
-    [  --with-fmod-include=<path>
-                          path to the FMOD header files directory.
-                          e.g. /usr/local/include])
-
-AC_ARG_WITH( fmod-lib,
-    [  --with-fmod-lib=<path>
-                          path to the FMOD library files directory.
-                          e.g. /usr/local/lib])
-
-fmod_lib="fmod"
-
-if test $with_fmod
-then
-    fmod_includes="$with_fmod/include"
-    fmod_libraries="$with_fmod/lib"
-fi
-
-if test "$with_fmod_include"
-then
-    fmod_includes="$with_fmod_include"
-fi
-
-if test "$with_fmod_lib"
-then
-    fmod_libraries="$with_fmod_lib"
-fi
-
-
-# Set FMOD_CFLAGS
-if test "$fmod_includes"
-then
-    FMOD_CFLAGS="-I$fmod_includes"
-fi
-
-# Set FMOD_LIBS
-if test "$fmod_libraries"
-then
-    FMOD_LIBS="-L$fmod_libraries"
-fi
-FMOD_LIBS="$FMOD_LIBS -l$fmod_lib"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $FMOD_CFLAGS"
-
-AC_MSG_CHECKING(for FMOD headers)
-AC_EGREP_CPP( yo_fmod,
-[#include <fmod.h>
-#ifdef FMOD_VERSION
-   yo_fmod
-#endif],
-  have_fmod_headers="yes",
-  have_fmod_headers="no" )
-
-if test "$have_fmod_headers" = "yes"
-then
-    if test "$fmod_includes"
-    then
-        AC_MSG_RESULT([$fmod_includes])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-# Test the libraries
-AC_MSG_CHECKING(for FMOD libraries)
-
-CPPFLAGS="$CXXFLAGS $FMOD_LIBS"
-
-AC_TRY_LINK( , , have_fmod_libraries="yes", have_fmod_libraries="no")
-
-CPPFLAGS="$_CPPFLAGS"
-
-if test "$have_fmod_libraries" = "yes"
-then
-    if test "$fmod_libraries"
-    then
-        AC_MSG_RESULT([$fmod_libraries])
-    else
-        AC_MSG_RESULT(yes)
-    fi
-else
-    AC_MSG_RESULT(no)
-fi
-
-fmod_libraries="$fmod_libraries"
-
-if test "$have_fmod_headers" = "yes" \
-   && test "$have_fmod_libraries" = "yes"
-then
-    have_fmod="yes"
-else
-    have_fmod="no"
-fi
-
-if test "$have_fmod" = "no" -a "$is_mandatory" = "yes"
-then
-    AC_MSG_ERROR([FMOD is needed to compile NeL (http://www.fmod.org).])
-fi
-
-AC_SUBST(FMOD_CFLAGS)
-AC_SUBST(FMOD_LIBS)
-AC_SUBST([have_fmod])
-
-])
-
-# =========================================================================
-# End of file
-
diff --git a/code/snowballs2/autogen.sh b/code/snowballs2/autogen.sh
deleted file mode 100755
index 934ea0041..000000000
--- a/code/snowballs2/autogen.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh -
-
-WANT_AUTOMAKE="1.6"
-
-case `uname -s` in
-Darwin)
-	LIBTOOLIZE=glibtoolize
-	;;
-*)
-	LIBTOOLIZE=libtoolize
-	;;
-esac
-
-echo "Creating macros..." && \
-aclocal && \
-echo "Creating library tools..." && \
-$LIBTOOLIZE --force && \
-echo "Creating header templates..." && \
-autoheader && \
-echo "Creating Makefile templates..." && \
-automake --gnu --add-missing && \
-echo "Creating 'configure'..." && \
-autoconf && \
-echo "" && \
-echo "Run: ./configure; make; make install" && \
-echo ""
diff --git a/code/snowballs2/client/Makefile.am b/code/snowballs2/client/Makefile.am
deleted file mode 100644
index 028aaefa1..000000000
--- a/code/snowballs2/client/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $
-#
-
-SUBDIRS			= src data
-
-EXTRA_DIST		=	client.cfg.in \
-				client.dsp \
-				data
-
-AM_CXXFLAGS		=	-DSNOWBALLS_CONFIG="\"$pkgsysconfdir\""
-
-clientdir		=	${pkgsysconfdir}
-client_DATA		=	client.cfg
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/client/configure.in b/code/snowballs2/client/configure.in
deleted file mode 100644
index d725b29f7..000000000
--- a/code/snowballs2/client/configure.in
+++ /dev/null
@@ -1,260 +0,0 @@
-dnl
-dnl Configuration script for client
-dnl
-dnl $Id: configure.in,v 1.1 2001-07-11 15:17:40 legros Exp $
-dnl 
-
-dnl Process this file with autoconf to produce a configure script.
-
-AC_INIT(src/client.cpp)
-
-MAJOR_VERSION=0
-MINOR_VERSION=2
-PICO_VERSION=0
-
-AM_INIT_AUTOMAKE(client, $MAJOR_VERSION.$MINOR_VERSION.$PICO_VERSION)
-
-AM_CONFIG_HEADER(config.h)
-
-
-dnl The following hack should ensure that configure doesn't add optimizing
-dnl or debugging flags to CFLAGS or CXXFLAGS
-CFLAGS="$CFLAGS "
-CXXFLAGS="$CXXFLAGS "
-
-
-dnl ====================================================================
-dnl Checks for programs.
-
-AC_PROG_MAKE_SET
-
-AC_PROG_CC
-AC_PROG_CXX
-
-AM_SANITY_CHECK
-
-AC_PROG_INSTALL
-
-
-dnl ====================================================================
-dnl Configure Settings
-
-AC_LANG_CPLUSPLUS
-
-
-dnl ====================================================================
-dnl Checks for typedefs, structures, and compiler characteristics.
-
-
-dnl ====================================================================
-dnl Checks for header files.
-
-AC_STDC_HEADERS
-AC_CHECK_HEADERS(fcntl.h unistd.h)
-
-
-dnl ==========
-dnl X11
-dnl ==========
-
-AC_PATH_X
-
-if test ! "$no_x" = "yes" ; then
-    if test ! X"$x_libraries" = X ; then
-        LIBS="$LIBS -L$x_libraries"
-    fi
-    if test ! X"$x_includes" = X ; then
-        CXXFLAGS="$CXXFLAGS -I$x_includes"
-    fi
-else
-    AC_MSG_ERROR(X11 must be installed.)
-fi
-
-
-dnl ==========
-dnl STLPort
-dnl ==========
-
-dnl Ask user for path to the STLport header files
-AC_ARG_WITH( stlport,
-    [  --with-stlport=<path>   path to the STLPort header files directory.
-                          e.g. /usr/local/include/stlport],
-    [STLPORT_DIR=$with_stlport
-      AC_MSG_RESULT(using STLPort header files located in $with_stlport)],
-    AC_MSG_ERROR([You must call configure with the --with-stlport option.
-    This tells configure where to find the STLPort header files.
-    e.g. --with-stlport=/usr/local/include/stlport])
-)
-
-if test X"$STLPORT_DIR" != X"";
-then
-    CXXFLAGS="-I$STLPORT_DIR $CXXFLAGS"
-fi
-
-dnl Ask user for path to the STLPort library files
-AC_ARG_WITH( stllib,
-    [  --with-stllib=<path>    path to the STLPort installation directory.
-                          e.g. /usr/local/lib/stlport],
-    [STLLIB_DIR=$with_stllib
-      AC_MSG_RESULT(using STLPort library located in $with_stllib)]
-)
-
-if test X"$STLLIB_DIR" != X"";
-then
-    LIBS="-L$STLLIB_DIR $LIBS"
-fi
-
-LIBS="$LIBS -lstlport_gcc"
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS"
-
-AC_MSG_CHECKING(for STLPort)
-AC_EGREP_CPP( yo_stlport,
-[#include <algorithm>
-#ifdef __SGI_STL_PORT
-   yo_stlport
-#endif],
-[AC_MSG_RESULT(yes)],
-AC_MSG_ERROR([STLPort is needed to compile the client (www.stlport.org)])
-)
-
-CPPFLAGS="$_CPPFLAGS"
-
-
-dnl ==========
-dnl NeL
-dnl ==========
-
-dnl Ask user for path to the NeL header files
-AC_ARG_WITH( nel,
-    [  --with-nel=<prefix>     prefix to the NeL files installation.
-                          e.g. /usr/local/include],
-    [NEL_DIR=$with_nel
-      AC_MSG_RESULT(using NeL header files located in $with_nel)]
-)
-
-if test X"$NEL_DIR" != X"";
-then
-    CXXFLAGS="-I$NEL_DIR/include $CXXFLAGS"
-    LIBS="-L$NEL_DIR/lib $LIBS"
-fi
-
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS"
-
-AC_MSG_CHECKING(for NeL)
-AC_EGREP_CPP( yo_nel,
-[#include <nel/net.h>
-#ifdef NL_NET_H
-   yo_nel
-#endif],
-[AC_MSG_RESULT(yes)],
-AC_MSG_ERROR([NeL is needed to compile the client (www.nevrax.org)])
-)
-
-
-dnl ==========
-dnl FreeType 2
-dnl ==========
-
-dnl Check for the FreeType 2 library files
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-
-if test "$FREETYPE_CONFIG" = "no"; then
-    AC_MSG_ERROR([Cannot find freetype-config: check your path.
-    FreeType 2 library is needed to compile the client (www.freetype.org).])
-else
-    FREETYPE_CFLAGS=`freetype-config --cflags`
-    FREETYPE_LIBS=`freetype-config --libs`
-fi
-
-dnl CXXFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
-dnl LIBS="$LIBS ${FREETYPE_LIBS}"
-AC_SUBST(FREETYPE_CFLAGS)
-AC_SUBST(FREETYPE_LIBS)
-
-dnl Checking the FreeType 2 instalation
-_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS ${FREETYPE_CFLAGS}"
-
-AC_MSG_CHECKING(for FreeType 2 installation)
-AC_EGREP_CPP( yo_freetype2,
-[#include <freetype/freetype.h>
-#if FREETYPE_MAJOR == 2
-   yo_freetype2
-#endif],
-[AC_MSG_RESULT(yes)],
-AC_MSG_ERROR([Freetype 2 library is needed to compile the client (www.stlport.org).])
-)
-
-CPPFLAGS="$_CPPFLAGS"
-
-
-dnl ==========
-dnl Debug/optimized compilation mode
-dnl ==========
-
-MAX_C_OPTIMIZE="-O6"
-
-dnl Build optimized or debug version ?
-dnl First check for gcc and g++
-if test "$ac_cv_prog_gcc" = "yes"
-then
-  DEBUG_CFLAGS="-g"
-  DEBUG_OPTIMIZE_CC="-O"
-  OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
-else
-  DEBUG_CFLAGS="-g"
-  DEBUG_OPTIMIZE_CC=""
-  OPTIMIZE_CFLAGS="-O"
-fi
-if test "$ac_cv_prog_cxx_g" = "yes"
-then
-  DEBUG_CXXFLAGS="-g"
-  DEBUG_OPTIMIZE_CXX="-O"
-  OPTIMIZE_CXXFLAGS="-O3"
-else
-  DEBUG_CXXFLAGS="-g"
-  DEBUG_OPTIMIZE_CXX=""
-  OPTIMIZE_CXXFLAGS="-O"
-fi
-AC_ARG_WITH(debug,
-    [  --with-debug[=full]     Build a debug version (huge libraries)
-  --without-debug         Build withoug debugging code (default)],
-    [with_debug=$withval],
-    [with_debug=no])
-if test "$with_debug" = "yes"
-then
-  dnl Medium debug.
-  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC $CFLAGS"
-  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX $CXXFLAGS"
-elif test "$with_debug" = "full"
-then
-  dnl Full debug. Very slow in some cases
-  CFLAGS="$DEBUG_CFLAGS $CFLAGS"
-  CXXFLAGS="$DEBUG_CXXFLAGS $CXXFLAGS"
-else
-  dnl Optimized version. No debug
-  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
-  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
-fi
-
-
-dnl ====================================================================
-dnl Checks for libraries.
-
-
-dnl ====================================================================
-dnl Checks for library functions.
-
-
-dnl ====================================================================
-dnl Output files to generate.
-
-AC_OUTPUT( Makefile     \
-           src/Makefile \
-)
-
-
-dnl End of configure.in
diff --git a/code/snowballs2/client/src/Makefile.am b/code/snowballs2/client/src/Makefile.am
deleted file mode 100644
index 81fdfaf10..000000000
--- a/code/snowballs2/client/src/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# $Id: Makefile.am,v 1.10 2003-04-07 14:06:08 lecroart Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-bin_PROGRAMS         = snowballs
-
-snowballs_SOURCES    = animation.cpp                       \
-                       animation.h                         \
-                       camera.cpp                          \
-                       camera.h                            \
-                       commands.cpp                        \
-                       commands.h                          \
-                       compass.cpp                         \
-                       compass.h                           \
-                       configuration.cpp                   \
-                       configuration.h                     \
-                       entities.cpp                        \
-                       entities.h                          \
-                       game_time.cpp                       \
-                       game_time.h                         \
-                       graph.cpp                           \
-                       graph.h                             \
-                       interface.cpp                       \
-                       interface.h                         \
-                       internationalization.cpp            \
-                       internationalization.h              \
-                       landscape.cpp                       \
-                       landscape.h                         \
-                       lens_flare.cpp                      \
-                       lens_flare.h                        \
-                       mouse_listener.cpp                  \
-                       mouse_listener.h                    \
-                       network.cpp                         \
-                       network.h                           \
-                       pacs.cpp                            \
-                       pacs.h                              \
-                       physics.cpp                         \
-                       physics.h                           \
-                       radar.cpp                           \
-                       radar.h                             \
-                       snowballs_client.cpp                \
-                       snowballs_client.h                  \
-                       snowballs_config.h                  \
-                       sound.cpp                           \
-                       sound.h
-
-snowballs_LDADD      = @FREETYPE_LIBS@ @OPENAL_LIBS@
-
-AM_CXXFLAGS          = -DSNOWBALLS_CONFIG="\"${pkgsysconfdir}/\"" @FREETYPE_CFLAGS@
-
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/configure.ac b/code/snowballs2/configure.ac
deleted file mode 100644
index 7ca02a78b..000000000
--- a/code/snowballs2/configure.ac
+++ /dev/null
@@ -1,264 +0,0 @@
-dnl ====================================================================
-dnl Configuration script for Snowballs 2
-dnl ====================================================================
-
-
-dnl ====================================================================
-dnl Process this file with autoconf to produce a configure script.
-dnl ====================================================================
-
-# If you want to change the version, must must change AC_INIT
-# *and* AC_SUBST(LIBTOOL_VERSION)
-
-AC_PREREQ(2.57)
-AC_INIT([snowballs],[0.3.0],[nel-all@nevrax.org])
-AM_INIT_AUTOMAKE([tar-ustar])
-
-AM_CONFIG_HEADER(config.h)
-
-AC_SUBST(LIBTOOL_VERSION, [0:3:0])
-
-dnl ====================================================================
-dnl Checks for programs.
-dnl ====================================================================
-AC_CANONICAL_HOST
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL
-AM_PROG_LIBTOOL
-AM_SANITY_CHECK
-
-AC_SYS_LARGEFILE
-
-AM_MAINTAINER_MODE
-
-dnl The following hack should ensure that configure doesn't add optimizing
-dnl or debugging flags to CFLAGS or CXXFLAGS
-CXXFLAGS="$CXXFLAGS -ftemplate-depth-24"
-
-AC_CHECK_LIB([pthread], [pthread_create])
-AC_CHECK_LIB([dl], [dlopen])
-AC_CHECK_LIB([rt], [clock_gettime])
-
-dnl ====================================================================
-dnl Checks Snowballs modules (Client / Server) to install / Disable
-dnl ====================================================================
-
-SNO_SUBDIRS=""
-
-dnl Client
-AC_ARG_ENABLE( client,
-    [  --disable-client        disable compilation and install of Snowballs Client.],
-    [ AC_MSG_RESULT(disable Snowballs Client.) ],
-    [ SNO_SUBDIRS="$SNO_SUBDIRS client"
-      enable_client="yes" ] )
-
-dnl Server
-AC_ARG_ENABLE( server,
-    [  --disable-server        disable compilation and install of Snowballs Server.],
-    [ AC_MSG_RESULT(disable Snowballs Server.) ],
-    [ SNO_SUBDIRS="$SNO_SUBDIRS server"
-      enable_server="yes" ] )
-
-AC_SUBST(SNO_SUBDIRS)
-
-
-dnl ====================================================================
-dnl Configure Settings
-dnl ====================================================================
-
-dnl Set the C++ compiler as the default compiler for the configure script
-dnl compilation tests
-AC_LANG_CPLUSPLUS
-
-
-dnl ====================================================================
-dnl Debug/optimized compilation mode
-dnl ====================================================================
-
-AM_NEL_DEBUG
-
-
-dnl ====================================================================
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl ====================================================================
-
-# Test endianness
-AC_C_BIGENDIAN
-
-# Supress GCC "multi-character character constant" warnings.
-if test "X$CC" = "Xgcc";
-then
-    if test "$with_debug" = "yes"
-    then
-        #
-        # When debugging variables are declared for the sole purpose of
-        # inspecting their content with a debugger. They are not used
-        # in the code itself and this is legitimate, hence the -Wno-unused
-        #
-        CXXFLAGS="$CXXFLAGS -Wno-unused"
-    fi
-fi
-
-# Add some common define
-if test "$ac_cv_cxx_compiler_gnu" = "yes";
-then
-    CXXFLAGS="$CXXFLAGS -D_REENTRANT -Wall -ansi -W -Wpointer-arith -Wsign-compare -Wno-deprecated-declarations -Wno-multichar -Wno-long-long -Wno-unused"
-fi
-
-
-dnl ====================================================================
-dnl Checks for header and lib files.
-dnl ====================================================================
-
-AC_FUNC_ALLOCA
-AC_HEADER_DIRENT
-AC_HEADER_STDC
-AC_HEADER_TIME
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h malloc.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/ioctl.h sys/socket.h unistd.h sys/time.h])
-AC_CHECK_LIB([pthread], [pthread_create])
-AC_CHECK_LIB([dl], [dlopen])
-
-dnl ====================================================================
-dnl Checks for typedefs, structures, and compiler characteristics.
-dnl ====================================================================
-
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_C_INLINE
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_C_VOLATILE
-AC_CHECK_TYPES([ptrdiff_t])
-AC_CHECK_TYPES([size_t])
-AC_CHECK_TYPES([uintptr_t])
-
-dnl ====================================================================
-dnl X11
-
-AC_PATH_X
-
-if test ! "$no_x" = "yes" ; then
-    if test ! X"$x_libraries" = X
-    then
-        LIBS="$LIBS -L$x_libraries"
-    fi
-    if test ! X"$x_includes" = X
-    then
-        CXXFLAGS="$CXXFLAGS -I$x_includes"
-    fi
-else
-    if test "$enable_client" = "yes"
-    then
-        AC_MSG_ERROR(X11 must be installed.)
-    fi
-fi
-
-
-dnl ====================================================================
-dnl Checks for libraries.
-dnl ====================================================================
-
-dnl ====================================================================
-dnl OpenAL
-
-AM_PATH_OPENAL($enable_client)
-
-
-dnl ====================================================================
-dnl LibXML
-
-dnl Use C compiler as a default for the libxml tests.
-AC_LANG([C])
-
-AM_PATH_XML2([2.0.0], [], [AC_MSG_ERROR([libxml2 must be installed])])
-
-CXXFLAGS="$CXXFLAGS $XML_CFLAGS $XML_CPPFLAGS"
-
-LIBS="$LIBS $XML_LIBS"
-
-dnl ====================================================================
-dnl NeL
-
-dnl         misc   net    3d              pacs            sound ai    georges
-AM_PATH_NEL("yes", "yes", $enable_client, $enable_client, "no", "no", "no")
-
-dnl ====================================================================
-dnl FreeType 2
-
-AM_PATH_FREETYPE($enable_client)
-
-dnl ====================================================================
-dnl Checks for library functions.
-dnl ====================================================================
-
-dnl ====================================================================
-dnl Snowballs data, configuration and logs file location
-dnl ====================================================================
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-
-AC_ARG_WITH(database,
-    [  --with-database[=DIR]
-                          use DIR instead of the default prefix/share//games/snowballs],
-    [database=$withval],
-    [database="${prefix}/share/games/snowballs"])
-AC_SUBST(database)
-
-SNOWBALLS_DATABASE='$database'
-AC_SUBST([SNOWBALLS_DATABASE])
-
-AC_ARG_WITH(sysconfdir,
-    [  --with-sysconfdir[=DIR]
-                          use DIR instead of the default sysconfdir/snowballs],
-    [pkgsysconfdir=$withval],
-    [pkgsysconfdir='${sysconfdir}/snowballs'])
-AC_SUBST(pkgsysconfdir)
-
-SNOWBALLS_CONFIG='$pkgsysconfdir'
-AC_SUBST([SNOWBALLS_CONFIG])
-
-AC_ARG_WITH(logdir,
-    [  --with-logdir[=DIR]
-                          use DIR instead of the default localstatedir/log/snowballs],
-    [logdir=$withval],
-    [logdir='${localstatedir}/log/snowballs'])
-AC_SUBST(logdir)
-
-SNOWBALLS_LOGS='$logdir'
-#AH_TEMPLATE([SNOWBALLS_LOGS], [The path to where Snowballs logs should be stored.])
-#AC_DEFINE_UNQUOTED([SNOWBALLS_LOGS], "$log_dir")
-AC_SUBST([SNOWBALLS_LOGS])
-
-dnl ====================================================================
-dnl Output files to generate.
-dnl ====================================================================
-
-AC_CONFIG_FILES([Makefile					\
-		client/Makefile					\
-		client/client.cfg				\
-		client/src/Makefile				\
-		client/data/Makefile				\
-		client/data/anims/Makefile			\
-		client/data/maps/Makefile			\
-		client/data/maps/texture_croisi/Makefile	\
-		client/data/pacs/Makefile			\
-		client/data/shapes/Makefile			\
-		client/data/tiles/Makefile			\
-		client/data/zones/Makefile			\
-		server/Makefile					\
-		server/frontend/Makefile			\
-		server/frontend/src/Makefile			\
-		server/chat/Makefile				\
-		server/chat/src/Makefile			\
-		server/position/Makefile			\
-		server/position/src/Makefile			\
-])
-AC_OUTPUT
-
-dnl End of configure.in
-
diff --git a/code/snowballs2/server/Makefile.am b/code/snowballs2/server/Makefile.am
deleted file mode 100644
index fbfdffccb..000000000
--- a/code/snowballs2/server/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# $Id: Makefile.am,v 1.3 2001-07-23 13:30:41 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = frontend chat position
-
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/server/chat/Makefile.am b/code/snowballs2/server/chat/Makefile.am
deleted file mode 100644
index c69f53af6..000000000
--- a/code/snowballs2/server/chat/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $
-#
-
-MAINTAINERCLEANFILES	= Makefile.in
-
-SUBDIRS			= src
-
-EXTRA_DIST		= chat_service.cfg chat_8.vcproj chat.dsp chat.vcproj
-
-sno_chatdir		= ${pkgsysconfdir}
-sno_chat_DATA		= chat_service.cfg
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/server/chat/src/Makefile.am b/code/snowballs2/server/chat/src/Makefile.am
deleted file mode 100644
index 08616097a..000000000
--- a/code/snowballs2/server/chat/src/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# $Id: Makefile.am,v 1.7 2002-03-19 17:42:49 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-sbin_PROGRAMS        = sno_chat
-
-sno_chat_SOURCES     = main.cpp
-
-AM_CXXFLAGS             =       -DSNOWBALLS_CONFIG="\"${pkgsysconfdir}\"" -DSNOWBALLS_LOGS="\"${logdir}\""
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/server/frontend/Makefile.am b/code/snowballs2/server/frontend/Makefile.am
deleted file mode 100644
index 1abddddfd..000000000
--- a/code/snowballs2/server/frontend/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = src
-
-EXTRA_DIST	     = frontend_service.cfg frontend_8.vcproj frontend.dsp frontend.vcproj
-
-sno_frontenddir		= ${pkgsysconfdir}
-sno_frontend_DATA	= frontend_service.cfg
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/server/frontend/src/Makefile.am b/code/snowballs2/server/frontend/src/Makefile.am
deleted file mode 100644
index 249a25c06..000000000
--- a/code/snowballs2/server/frontend/src/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# $Id: Makefile.am,v 1.7 2002-03-19 17:42:49 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-sbin_PROGRAMS        = sno_frontend
-
-sno_frontend_SOURCES = main.cpp
-
-AM_CXXFLAGS		=	-DSNOWBALLS_CONFIG="\"${pkgsysconfdir}\"" -DSNOWBALLS_LOGS="\"${logdir}\""
-# End of Makefile.am
-
diff --git a/code/snowballs2/server/position/Makefile.am b/code/snowballs2/server/position/Makefile.am
deleted file mode 100644
index cc183c787..000000000
--- a/code/snowballs2/server/position/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# $Id: Makefile.am,v 1.3 2002-04-10 07:32:46 lecroart Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS              = src
-
-EXTRA_DIST	     = position_service.cfg position_8.vcproj position.dsp position.vcproj
-
-sno_posdir		= ${pkgsysconfdir}
-sno_pos_DATA		= position_service.cfg
-
-# End of Makefile.am
-
diff --git a/code/snowballs2/server/position/src/Makefile.am b/code/snowballs2/server/position/src/Makefile.am
deleted file mode 100644
index b34ee14ba..000000000
--- a/code/snowballs2/server/position/src/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# $Id: Makefile.am,v 1.7 2002-03-19 17:42:49 valignat Exp $
-#
-
-MAINTAINERCLEANFILES = Makefile.in
-
-sbin_PROGRAMS        = sno_position
-
-sno_position_SOURCES = main.cpp      \
-                       physics.h     \
-		       physics.cpp
-
-AM_CXXFLAGS		=	-DSNOWBALLS_CONFIG="\"${pkgsysconfdir}\"" -DSNOWBALLS_LOGS="\"${logdir}\""
-
-# End of Makefile.am
-